@napp/dti-server 4.2.2 → 4.3.2

package/bundler.d.ts

@@ -6,6 +6,7 @@ interface IMeteParam {
 }
 export declare class BundlerServer {
     private server;
+    private base62;
     constructor(server: DtiServer);
     action(meta: Array<IMeteParam>, ctx: IContext): Promise<any[]>;
     setup(expressRoute: any, setuper: OSetupParam): void;

package/bundler.js

@@ -8,15 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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"));
+const dti_core_1 = require("@napp/dti-core");
 class BundlerServer {
     constructor(server) {
         this.server = server;
+        this.base62 = new dti_core_1.Base62();
     }
     action(meta, ctx) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -52,7 +50,7 @@ class BundlerServer {
                 try {
                     let p = (_a = req.query) === null || _a === void 0 ? void 0 : _a.p;
                     if (p) {
-                        let json = base64url_1.default.decode(p);
+                        let json = this.base62.decode(p);
                         let meta = JSON.parse(json);
                         let result = yield this.action(meta, { req, res });
                         res.json(result);

package/common.d.ts

@@ -6,16 +6,17 @@ export interface IContext {
 export interface IMiddleware {
     (req: any, res: any, next: any): void;
 }
+export interface IErrorHandle {
+    (req: any, res: any, next: any): void;
+}
 export interface IExpressRoute {
     get(path: string, handlers: IMiddleware[]): void;
     post(path: string, handlers: IMiddleware[]): void;
     use(path: string, route: IExpressRoute): void;
 }
-export interface Logger {
-    (level: string, message: string): void;
-}
 export interface OSetupParam {
     factoryExpressRouter(dtiRouter: DtiRoute): any;
     factoryBodyparseJson?: () => IMiddleware;
     factoryBodyparseUrlencode?: () => IMiddleware;
+    errorHandle?: IErrorHandle;
 }

package/package.json

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

package/route.d.ts

@@ -4,6 +4,7 @@ import { DtiServer } from "./server";
 export declare class DtiServerRoute {
     private meta;
     private server;
+    private base62;
     constructor(meta: DtiRoute, server: DtiServer);
     private param;
     private callAction;

package/route.js

@@ -1,15 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DtiServerRoute = void 0;
 const dti_core_1 = require("@napp/dti-core");
-const base64url_1 = __importDefault(require("base64url"));
 class DtiServerRoute {
     constructor(meta, server) {
         this.meta = meta;
         this.server = server;
+        this.base62 = new dti_core_1.Base62();
     }
     param(action, req) {
         var _a;
@@ -21,7 +18,7 @@ class DtiServerRoute {
             try {
                 let p = (_a = req.query) === null || _a === void 0 ? void 0 : _a.p;
                 if (p) {
-                    let json = base64url_1.default.decode(p);
+                    let json = this.base62.decode(p);
                     return JSON.parse(json);
                 }
             }
@@ -40,7 +37,9 @@ class DtiServerRoute {
             sa.validation(param);
             return sa.action(param, { req, res })
                 .then(rsu => {
-                return res.json(rsu);
+                if (dti_core_1.DtiRawResponse.is(rsu) === false) {
+                    return res.json(rsu);
+                }
             })
                 .catch(err => next(err));
         }

package/server.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DtiServer = void 0;
 const route_1 = require("./route");
 const bundler_1 = require("./bundler");
-const exception_1 = require("@napp/exception");
 class DtiServer {
     constructor(root) {
         this.root = root;
@@ -41,11 +40,9 @@ class DtiServer {
         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) => {
-            let error = exception_1.Exception.from(err);
-            let status = error.status || 500;
-            res.status(status).json(error.toPlan());
-        });
+        if (setuper.errorHandle) {
+            route.use(setuper.errorHandle);
+        }
         return route;
     }
 }