update docs, koa driver changes

Author: rustamwin

Diff for: .gitignore

@@ -4,3 +4,5 @@
 build/
 node_modules/
 npm-debug.log
+coverage.lcov
+.nyc_output/

Diff for: .travis.yml

@@ -1,8 +1,8 @@
 language: node_js
 node_js:
-- stable
-- 8
-- 6
+  - stable
+  - 8
+  - 6
 
 after_success:
-- bash <(curl -s https://codecov.io/bash)
+  - bash <(curl -s https://codecov.io/bash)

Diff for: README.md

@@ -1,7 +1,6 @@
 # rpc-controllers
 
 [![Build Status](https://travis-ci.org/rustamwin/rpc-controllers.svg?branch=master)](https://travis-ci.org/rustamwin/rpc-controllers)
-[![codecov](https://codecov.io/gh/rustamwin/rpc-controllers/branch/master/graph/badge.svg)](https://codecov.io/gh/rustamwin/rpc-controllers)
 [![npm version](https://badge.fury.io/js/rpc-controllers.svg)](https://badge.fury.io/js/rpc-controllers)
 [![Dependency Status](https://david-dm.org/rustamwin/rpc-controllers.svg)](https://david-dm.org/rustamwin/rpc-controllers)
 
@@ -136,6 +135,8 @@ useExpressServer(app, { // register created express server in rpc-controllers
 app.listen(3000); // run your express server
 ```
 
+> Note: Koa driver is experimental
+
 #### Using DI container
 
 `rpc-controllers` supports a DI container out of the box.

Diff for: package-lock.json

@@ -45,6 +45,7 @@
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chakram": "^1.5.0",
+    "cors": "^2.8.5",
     "del": "^3.0.0",
     "express": "^4.16.4",
     "gulp": "^3.9.1",
@@ -57,7 +58,10 @@
     "gulp-typescript": "^5.0.0",
     "gulpclass": "^0.1.2",
     "jayson": "^2.1.1",
+    "kcors": "^2.2.2",
     "koa": "^2.6.2",
+    "koa-bodyparser": "^4.2.1",
+    "koa-router": "^7.4.0",
     "mocha": "^5.2.0",
     "ts-node": "^7.0.1",
     "tslint": "^5.12.1",

Diff for: package.json

@@ -1,8 +1,11 @@
-import {Action} from "../../Action";
 import {MethodMetadata} from "../../metadata/MethodMetadata";
-import {BaseDriver} from "../BaseDriver";
+import {Action} from "../../Action";
 import {ParamMetadata} from "../../metadata/ParamMetadata";
-import {error} from "util";
+import {BaseDriver} from "../BaseDriver";
+import {MethodNotAllowedError} from "../../http-error/MethodNotAllowedError";
+import {MethodNotFoundError} from "../../rpc-error/MethodNotFoundError";
+import {ParseError} from "../../rpc-error/ParseError";
+import {InvalidRequestError} from "../../rpc-error/InvalidRequestError";
 
 /**
  * Integration with koa framework.
@@ -21,11 +24,15 @@ export class KoaDriver extends BaseDriver {
      */
     initialize() {
         const bodyParser = require("koa-bodyparser");
-        this.koa.use(bodyParser());
+        this.koa.use(bodyParser({
+            enableTypes: ["json"]
+        }));
         if (this.cors) {
             const cors = require("kcors");
             if (this.cors === true) {
-                this.koa.use(cors());
+                this.koa.use(cors({
+                    origin: "POST"
+                }));
             } else {
                 this.koa.use(cors(this.cors));
             }
@@ -35,19 +42,45 @@ export class KoaDriver extends BaseDriver {
     /**
      * Registers action in the driver.
      */
-    registerMethod(methods: MethodMetadata[], executeCallback: (methodMetadata: MethodMetadata, action: Action, error: any) => any): void {
+    registerMethod(methods: MethodMetadata[], executeCallback: (error: any, action: Action, method?: MethodMetadata) => any): void {
 
         // prepare route and route handler function
         const route = this.routePrefix + "*";
+        const errorHandler = async (request: any, next: Function) => {
+            try {
+                await next();
+            } catch (e) {
+                console.log(e);
+            }
+        };
         const routeHandler = (context: any, next: () => Promise<any>) => {
             const action: Action = {request: context.request, response: context.response, context, next};
-            const method = methods.find(method => method.fullName === action.request.method);
-            return executeCallback(method, action, error);
+            const method: MethodMetadata = methods.find((methodMetadata) => methodMetadata.fullName === action.request.body.method);
+            try {
+                if (action.request.method.toLowerCase() !== "post") {
+
+                    return next();
+                } else if (!action.request.body || typeof action.request.body !== "object") {
+
+                    return executeCallback(new ParseError(), action, method);
+                } else if (!action.request.body.params) {
+
+                    return executeCallback(new InvalidRequestError(), action, method);
+                } else if (!action.request.body.method || !method) {
+
+                    return executeCallback(new MethodNotFoundError(), action, method);
+                }
+
+                return executeCallback(null, action, method);
+            } catch (e) {
+                return executeCallback(new ParseError(), action, method);
+            }
         };
 
         // finally register action in koa
-        this.router.use(...[
+        this.router.all(...[
             route,
+            errorHandler,
             routeHandler,
         ]);
     }
@@ -107,24 +140,38 @@ export class KoaDriver extends BaseDriver {
             action.response.set(name, method.headers[name]);
         });
 
-        return action.next();
+        if (result === undefined) { // throw NotFoundError on undefined response
+            // todo send error
+
+        } else if (result === null) { // send null response
+            // todo send null response
+            action.next();
+        } else { // send regular result
+            action.response.body = {
+                jsonrpc: "2.0",
+                id: action.request.body.id,
+                result: result
+            };
+            action.next();
+        }
     }
 
     /**
      * Handles result of failed executed controller action.
      */
     handleError(error: any, action: Action) {
         return new Promise((resolve, reject) => {
-            if (this.isDefaultErrorHandlingEnabled) {
+            if (true) {
 
                 // send error content
+                console.log("aasf");
                 action.response.body = this.processJsonError(error);
 
                 // todo set http status
 
                 return resolve();
             }
-            return reject(error);
+            // return reject(error);
         });
     }
 
@@ -162,4 +209,4 @@ export class KoaDriver extends BaseDriver {
         }
     }
 
-}
+}