Merge pull request #25 from rogelio-o/develop

Develop

Author: rogelio-o

README.md

@@ -62,7 +62,7 @@ import { AWSHandler } from "lambda-framework-aws";
 const app: IApp = new App();
 ...
 const handler: AWSHandler = new AWSHandler(app);
-export.handler = handler.handle;
+export const handle = handler.handle.bind(handler);
 ```
 
 ### Event handling

package.json

@@ -29,7 +29,6 @@
   "devDependencies": {
     "@types/chai": "^4.0.4",
     "@types/mocha": "^2.2.43",
-    "@types/node": "^8.0.28",
     "@types/sinon": "^2.3.7",
     "chai": "^4.1.2",
     "coveralls": "^3.0.0",
@@ -43,6 +42,7 @@
     "typescript": "^2.5.2"
   },
   "dependencies": {
+    "@types/node": "^8.0.28",
     "accepts": "^1.3.4",
     "bytes": "^3.0.0",
     "content-type": "^1.0.4",

src/index.ts

@@ -10,6 +10,7 @@ export { default as configuration } from "./lib/configuration/configuration";
 export { default as IApp } from "./lib/types/IApp";
 export { default as INext } from "./lib/types/INext";
 export { default as IRouter } from "./lib/types/IRouter";
+export { default as Router } from "./lib/Router";
 
 export { default as IEventHandler } from "./lib/types/event/IEventHandler";
 export { default as IEventLayer } from "./lib/types/event/IEventLayer";

src/lib/App.ts

@@ -118,7 +118,9 @@ export default class App implements IApp {
         console.error(err instanceof HttpError ? err.cause.message : err.message);
       } else {
         if (req instanceof EventRequest) {
-          console.log("No handlers for " + JSON.parse(req.event));
+          if (!req.processed) {
+            console.log("No handlers for " + JSON.stringify(req.event.original));
+          }
         } else if (req instanceof HttpRequest) {
           console.log("No handlers for " + req.method + " " + req.path);
         } else {

src/lib/event/EventRequest.ts

@@ -8,11 +8,13 @@ import IRawEvent from "./../types/IRawEvent";
 export default class EventRequest implements IEventRequest {
 
   public next: INext;
+  public processed: boolean;
 
   private _event: IRawEvent;
   private _context: { [name: string]: any };
 
   constructor(event: IRawEvent) {
+    this.processed = false;
     this._event = event;
     this._context = {};
   }

src/lib/event/EventRouterExecutor.ts

@@ -54,6 +54,7 @@ export default class EventRouterExecutor implements IEventRouterExecutor {
         // We process only error handlers if there is an error
         this.next(error);
       } else {
+        this._req.processed = true;
         layer.handle(this._req, this.next.bind(this), error);
       }
     } else if (this._subrouterIndex < this._router.subrouters.length) {

src/lib/http/bodyParsers/UrlEncodedParser.ts

@@ -81,7 +81,7 @@ export default class UrlEncodedParser implements IBodyParser {
     const queryParser: (body: string, parameterLimit: number, arrayLimit: number) => {[name: string]: string|string[]} = extended
       ? extendedParser
       : simpleParser;
-    const parser: (body: string) => {[name: string]: string|string[]} = abstractParser(options, queryParser);
+    const parser: (body: string) => {[name: string]: string|string[]} = abstractParser(opts, queryParser);
 
     return parserHelper(
       (initialBody: string, req: IHttpRequest): void => {

src/lib/http/bodyParsers/parserHelper.ts

@@ -4,6 +4,10 @@ import IHttpRequest from "./../../types/http/IHttpRequest";
 import IHttpResponse from "./../../types/http/IHttpResponse";
 import INext from "./../../types/INext";
 
+const canBeParsed = (body: string | { [name: string]: any }) => {
+  return body && typeof body === "string";
+};
+
 /**
  * Abtraction of the parser conditions and fallback mechanism.
  *
@@ -16,15 +20,16 @@ const parserHelper = (func: (body: string, req: IHttpRequest) => void, allowCont
   return (req: IHttpRequest, res: IHttpResponse, next: INext) => {
     let error;
 
-    if (req.body && !req.context._previouslyBodyParsed) {
+    if (canBeParsed(req.body) && !req.context._previouslyBodyParsed) {
+      const initialBody = req.body;
       if (!allowContentTypes || req.is(allowContentTypes)) {
         const contentType = req.header("content-type");
         try {
           func(req.body as string, req);
 
           req.context._previouslyBodyParsed = true;
         } catch (e) {
-          console.log("400 " + req.method + " " + req.path + ": Body can not be parsed: " + req.body, e);
+          console.log("400 " + req.method + " " + req.path + ": Body can not be parsed: " + JSON.stringify(initialBody), e);
           if (e instanceof HttpError) {
             error = e;
           } else if (contentType) {

src/lib/types/event/IEventRequest.ts

@@ -11,6 +11,8 @@ export default interface IEventRequest {
 
     next: INext;
 
+    processed: boolean;
+
     /**
      * Context to save thins and use it
      * in other handlers.