@napp/dti-server 3.0.3 → 3.0.8

package/adapter.d.ts

@@ -27,6 +27,7 @@ export declare class ServerInstance<RES, PQ, PB> {
     get path(): string;
     get queryMode(): string;
     get bodyMode(): string;
+    check(q: PQ, b: PB): void;
     before(funcs: Array<IMiddleware>): this;
     handle(action: IAction<RES, PQ, PB>): this;
 }

package/adapter.js

@@ -1,8 +1,12 @@
 "use strict";
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerAdapter = exports.ServerInstance = void 0;
@@ -46,6 +50,10 @@ var ServerInstance = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    ServerInstance.prototype.check = function (q, b) {
+        this.meta.checkQ(q);
+        this.meta.checkB(b);
+    };
     ServerInstance.prototype.before = function (funcs) {
         this.beforeFuncs = funcs;
         return this;
@@ -93,22 +101,28 @@ var ServerAdapter = /** @class */ (function () {
         return req.query;
     };
     ServerAdapter.prototype.callAction = function (it, req, res, next) {
-        if (it.actionFunc) {
-            var q = this.qParam(it, req);
-            var b = req.body;
-            return it.actionFunc({ q: q, b: b }, { req: req, res: res })
-                .then(function (rsu) {
-                if (rsu instanceof response_1.DtiResponse) {
-                    if (rsu.handle) {
-                        return rsu.handle(res);
+        try {
+            if (it.actionFunc) {
+                var q = this.qParam(it, req);
+                var b = req.body;
+                it.check(q || {}, b || {});
+                return it.actionFunc({ q: q, b: b }, { req: req, res: res })
+                    .then(function (rsu) {
+                    if (rsu instanceof response_1.DtiResponse) {
+                        if (rsu.handle) {
+                            return rsu.handle(res);
+                        }
+                        return res.end();
                     }
-                    return res.end();
-                }
-                return res.json(rsu);
-            })
-                .catch(function (err) { return next(err); });
+                    return res.json(rsu);
+                })
+                    .catch(function (err) { return next(err); });
+            }
+            throw new Error('not found action handle');
+        }
+        catch (error) {
+            return next(error);
         }
-        return next(new Error('not found action handle'));
     };
     ServerAdapter.prototype.getBodyParser = function (it) {
         if (this.bodyParser) {
@@ -125,23 +139,23 @@ var ServerAdapter = /** @class */ (function () {
         var _loop_1 = function (it) {
             var befores = it.beforeFuncs || [];
             if (it.method === 'get') {
-                _route.get(it.path, __spreadArray(__spreadArray([], befores), [function (req, res, next) {
+                _route.get(it.path, __spreadArray(__spreadArray([], befores, true), [function (req, res, next) {
                         _this.callAction(it, req, res, next);
-                    }]));
+                    }], false));
             }
             else if (it.method === 'post') {
                 var bodyparser = this_1.getBodyParser(it);
                 if (bodyparser.length === 0) {
-                    this_1.logger('warn', "not found body parser. name=\"" + it.name + "\"; bodyMode=\"" + it.bodyMode + "\"");
+                    this_1.logger('warn', "not found body parser. name=\"".concat(it.name, "\"; bodyMode=\"").concat(it.bodyMode, "\""));
                 }
-                _route.post(it.path, __spreadArray(__spreadArray(__spreadArray([], bodyparser), befores), [function (req, res, next) {
+                _route.post(it.path, __spreadArray(__spreadArray(__spreadArray([], bodyparser, true), befores, true), [function (req, res, next) {
                         _this.callAction(it, req, res, next);
-                    }]));
+                    }], false));
             }
             else {
-                this_1.logger('warn', "not supored method. \"" + it.method + "\"");
+                this_1.logger('warn', "not supored method. \"".concat(it.method, "\""));
             }
-            this_1.logger('info', "[" + it.method + "] " + it.path);
+            this_1.logger('info', "[".concat(it.method, "] ").concat(it.path));
         };
         var this_1 = this;
         for (var _i = 0, _a = this.actions; _i < _a.length; _i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@napp/dti-server",
-    "version": "3.0.3",
+    "version": "3.0.8",
     "description": "data transaction interface server library",
     "types": "index.d.ts",
     "main": "index.js",
@@ -12,6 +12,6 @@
     "author": "Farcek <farcek@gmail.com>",
     "license": "ISC",
     "dependencies": {
-        "@napp/dti-core": "3.0.3"
+        "@napp/dti-core": "3.0.8"
     }
 }