@napp/dti-server 4.0.2 → 4.1.3

package/action.d.ts

@@ -1,15 +1,13 @@
 import { DtiAction } from "@napp/dti-core";
-import { IContext, IMiddleware } from "./common";
+import { IContext } from "./common";
 export interface ODtiServerAction<RESULT, PARAM> {
     action: (param: PARAM, ctx: IContext) => Promise<RESULT>;
-    before?: Array<IMiddleware>;
 }
 export declare class DtiServerAction<RESULT, PARAM> {
     meta: DtiAction<RESULT, PARAM>;
     private opt;
     private constructor();
     action(param: PARAM, ctx: IContext): Promise<RESULT>;
-    before(): Array<IMiddleware>;
     validation(param: PARAM): void;
     static factory<RESULT, PARAM>(meta: DtiAction<RESULT, PARAM>, opt: ODtiServerAction<RESULT, PARAM>): DtiServerAction<RESULT, PARAM>;
 }

package/action.js

@@ -9,9 +9,6 @@ class DtiServerAction {
     action(param, ctx) {
         return this.opt.action(param, ctx);
     }
-    before() {
-        return this.opt.before || [];
-    }
     validation(param) {
         this.meta.validate(param);
     }

package/bundler.d.ts

@@ -0,0 +1,13 @@
+import { IContext, OSetupParam } from "./common";
+import { DtiServer } from "./server";
+interface IMeteParam {
+    name: string;
+    param: any;
+}
+export declare class BundlerServer {
+    private server;
+    constructor(server: DtiServer);
+    action(meta: Array<IMeteParam>, ctx: IContext): Promise<any[]>;
+    setup(expressRoute: any, setuper: OSetupParam): void;
+}
+export {};

package/bundler.js

@@ -0,0 +1,74 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BundlerServer = void 0;
+const base64url_1 = __importDefault(require("base64url"));
+class BundlerServer {
+    constructor(server) {
+        this.server = server;
+    }
+    action(meta, ctx) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let actions = [];
+            for (let it of meta) {
+                let action = this.server.getActionByName(it.name);
+                if (action) {
+                    action.validation(it.param);
+                    // console.log('call', it.name, it.param, await action?.action(it.param, ctx))
+                    actions.push(() => __awaiter(this, void 0, void 0, function* () { return yield (action === null || action === void 0 ? void 0 : action.action(it.param, ctx)); }));
+                }
+                else {
+                    throw new Error('not defined action. name=' + it.name);
+                }
+            }
+            return yield Promise.all(actions.map(it => it()));
+        });
+    }
+    setup(expressRoute, setuper) {
+        if (setuper.factoryBodyparseJson) {
+            expressRoute.post('/__bundler_post__', setuper.factoryBodyparseJson(), (req, res, next) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    let meta = req.body || [];
+                    let result = yield this.action(meta, { req, res });
+                    res.json(result);
+                }
+                catch (error) {
+                    next(error);
+                }
+            }));
+            expressRoute.get('/__bundler_get__', (req, res, next) => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                try {
+                    let p = (_a = req.query) === null || _a === void 0 ? void 0 : _a.p;
+                    if (p) {
+                        let json = base64url_1.default.decode(p);
+                        let meta = JSON.parse(json);
+                        let result = yield this.action(meta, { req, res });
+                        res.json(result);
+                    }
+                    else {
+                        res.json([]);
+                    }
+                }
+                catch (error) {
+                    next(error);
+                }
+            }));
+        }
+        else {
+            throw new Error('not defined server.factoryBodyparseJson');
+        }
+    }
+}
+exports.BundlerServer = BundlerServer;

package/common.d.ts

@@ -1,4 +1,4 @@
-import { DtiAction, DtiRoute } from "@napp/dti-core";
+import { DtiRoute } from "@napp/dti-core";
 export interface IContext {
     req: any;
     res: any;
@@ -16,6 +16,6 @@ export interface Logger {
 }
 export interface OSetupParam {
     factoryExpressRouter(dtiRouter: DtiRoute): any;
-    factoryBodyparseJson(action: DtiAction<any, any>): IMiddleware;
-    factoryBodyparseUrlencode(action: DtiAction<any, any>): IMiddleware;
+    factoryBodyparseJson?: () => IMiddleware;
+    factoryBodyparseUrlencode?: () => IMiddleware;
 }

package/index.d.ts

@@ -1,5 +1,4 @@
 export * from './action';
 export * from './common';
-export * from './response';
 export * from './route';
 export * from './server';

package/index.js

@@ -16,6 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./action"), exports);
 __exportStar(require("./common"), exports);
-__exportStar(require("./response"), exports);
 __exportStar(require("./route"), exports);
 __exportStar(require("./server"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@napp/dti-server",
-    "version": "4.0.2",
+    "version": "4.1.3",
     "description": "data transaction interface server library",
     "repository": {
         "type": "git",
@@ -16,7 +16,7 @@
     "author": "Farcek <farcek@gmail.com>",
     "license": "ISC",
     "dependencies": {
-        "@napp/dti-core": "4.0.2",
+        "@napp/dti-core": "4.1.3",
         "base64url": "latest"
     }
 }

package/route.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DtiServerRoute = void 0;
 const dti_core_1 = require("@napp/dti-core");
-const response_1 = require("./response");
 const base64url_1 = __importDefault(require("base64url"));
 class DtiServerRoute {
     constructor(meta, server) {
@@ -13,13 +12,14 @@ class DtiServerRoute {
         this.server = server;
     }
     param(action, req) {
+        var _a;
         let mode = action.meta.getMode();
         if (mode === dti_core_1.DtiMode.QString) {
             return req.query;
         }
         else if (mode === dti_core_1.DtiMode.QJson) {
             try {
-                let p = req.query.p;
+                let p = (_a = req.query) === null || _a === void 0 ? void 0 : _a.p;
                 if (p) {
                     let json = base64url_1.default.decode(p);
                     return JSON.parse(json);
@@ -40,12 +40,6 @@ class DtiServerRoute {
             sa.validation(param);
             return sa.action(param, { req, res })
                 .then(rsu => {
-                if (rsu instanceof response_1.DtiResponse) {
-                    if (rsu.handle) {
-                        return rsu.handle(res);
-                    }
-                    return res.end();
-                }
                 return res.json(rsu);
             })
                 .catch(err => next(err));
@@ -55,20 +49,29 @@ class DtiServerRoute {
         }
     }
     setupAction(expressRoute, action, setuper) {
-        let befores = action.before();
         let mode = action.meta.getMode();
         let path = action.meta.getPath();
         let endpoint = (req, res, next) => {
             this.callAction(action, req, res, next);
         };
         if (mode === dti_core_1.DtiMode.QString || mode === dti_core_1.DtiMode.QJson) {
-            expressRoute.get(path, [...befores, endpoint]);
+            expressRoute.get(path, endpoint);
         }
         else if (mode === dti_core_1.DtiMode.BJson) {
-            expressRoute.post(path, [setuper.factoryBodyparseJson(action.meta), ...befores, endpoint]);
+            if (setuper.factoryBodyparseJson) {
+                expressRoute.post(path, [setuper.factoryBodyparseJson(), endpoint]);
+            }
+            else {
+                throw new Error('not define server.factoryBodyparseJson');
+            }
         }
         else if (mode === dti_core_1.DtiMode.BFrom) {
-            expressRoute.post(path, [setuper.factoryBodyparseUrlencode(action.meta), ...befores, endpoint]);
+            if (setuper.factoryBodyparseUrlencode) {
+                expressRoute.post(path, [setuper.factoryBodyparseUrlencode(), endpoint]);
+            }
+            else {
+                throw new Error('not define server.factoryBodyparseUrlencode');
+            }
         }
         else {
             throw new Error("not support methid. logic error");

package/server.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DtiServer = void 0;
 const dti_core_1 = require("@napp/dti-core");
 const route_1 = require("./route");
+const bundler_1 = require("./bundler");
 class DtiServer {
     constructor(root) {
         this.root = root;
@@ -37,6 +38,7 @@ class DtiServer {
     }
     static setup(server, setuper) {
         let route = setuper.factoryExpressRouter(server.root);
+        new bundler_1.BundlerServer(server).setup(route, setuper);
         route.use(server.root.getLocalPath(), new route_1.DtiServerRoute(server.root, server).setup(setuper));
         route.use((err, req, res, next) => {
             res.status(500).json(dti_core_1.DtiError.from(err).toPlanObject());

package/response.d.ts

@@ -1,4 +0,0 @@
-export declare class DtiResponse {
-    handle?: ((res: any) => void) | undefined;
-    constructor(handle?: ((res: any) => void) | undefined);
-}

package/response.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DtiResponse = void 0;
-class DtiResponse {
-    constructor(handle) {
-        this.handle = handle;
-    }
-}
-exports.DtiResponse = DtiResponse;