@napp/dti-client 4.2.2 → 4.3.2

package/bundler.d.ts

@@ -7,6 +7,7 @@ export interface BundleMeta<RESULT, PARAM> {
 export declare class DtiClientBandler {
     private bundleMetas;
     private builder;
+    private base62;
     constructor(bundleMetas: Array<BundleMeta<any, any>>, builder: DtiClientBuilder);
     validate(): void;
     private getMethod;

package/bundler.js

@@ -8,20 +8,17 @@ 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.DtiClientBandler = void 0;
 const dti_core_1 = require("@napp/dti-core");
 const exception_1 = require("@napp/exception");
 const cross_fetch_1 = require("cross-fetch");
-const base64url_1 = __importDefault(require("base64url"));
 const errorhandle_1 = require("./errorhandle");
 class DtiClientBandler {
     constructor(bundleMetas, builder) {
         this.bundleMetas = bundleMetas;
         this.builder = builder;
+        this.base62 = new dti_core_1.Base62();
     }
     validate() {
         for (let it of this.bundleMetas) {
@@ -83,7 +80,7 @@ class DtiClientBandler {
                 let baseUrl = this.getBase();
                 let param = this.getParam();
                 let headers = this.getHeaders();
-                let p = base64url_1.default.encode(JSON.stringify(param));
+                let p = this.base62.encode(JSON.stringify(param));
                 let q = new URLSearchParams({ p }).toString();
                 let resp = yield (0, cross_fetch_1.fetch)(`${baseUrl}/__bundler_get__?${q}`, {
                     method: 'get', headers

package/caller.d.ts

@@ -4,6 +4,7 @@ import { BundleMeta } from "./bundler";
 export declare class DtiClientCaller<RESULT, PARAM> {
     private meta;
     private builder;
+    private base62;
     private routeClient;
     constructor(meta: DtiAction<RESULT, PARAM>, builder: DtiClientBuilder);
     validate(param: PARAM): void;
@@ -14,4 +15,5 @@ export declare class DtiClientCaller<RESULT, PARAM> {
     private getUrl;
     bundler(param: PARAM): BundleMeta<RESULT, PARAM>;
     call(param: PARAM): Promise<RESULT>;
+    callRaw(param: PARAM): Promise<Response>;
 }

package/caller.js

@@ -8,20 +8,17 @@ 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.DtiClientCaller = void 0;
 const dti_core_1 = require("@napp/dti-core");
 const cross_fetch_1 = require("cross-fetch");
-const base64url_1 = __importDefault(require("base64url"));
 const route_1 = require("./route");
 const errorhandle_1 = require("./errorhandle");
 class DtiClientCaller {
     constructor(meta, builder) {
         this.meta = meta;
         this.builder = builder;
+        this.base62 = new dti_core_1.Base62();
         this.routeClient = new route_1.DtiClientRoute(meta.getRoute(), builder);
     }
     validate(param) {
@@ -54,7 +51,7 @@ class DtiClientCaller {
         let m = this.meta.getMode();
         if (m === dti_core_1.DtiMode.QJson) {
             if (param) {
-                let p = base64url_1.default.encode(JSON.stringify(param));
+                let p = this.base62.encode(JSON.stringify(param));
                 return new URLSearchParams({ p }).toString();
             }
         }
@@ -90,6 +87,12 @@ class DtiClientCaller {
         return { meta: this.meta, param };
     }
     call(param) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let resp = yield this.callRaw(param);
+            return yield (0, errorhandle_1.responseHandle)(resp);
+        });
+    }
+    callRaw(param) {
         return __awaiter(this, void 0, void 0, function* () {
             this.validate(param);
             let url = this.getUrl();
@@ -97,10 +100,9 @@ class DtiClientCaller {
             let method = this.getMethod();
             let headers = this.getHeaders(param);
             let body = this.getBody(param);
-            let resp = yield (0, cross_fetch_1.fetch)(url + (query ? `?${query}` : ''), {
+            return yield (0, cross_fetch_1.fetch)(url + (query ? `?${query}` : ''), {
                 method, headers, body
             });
-            return (0, errorhandle_1.responseHandle)(resp);
         });
     }
 }

package/errorhandle.d.ts

@@ -1 +1 @@
-export declare function responseHandle(resp: Response): Promise<any>;
+export declare function responseHandle<T>(resp: Response): Promise<any>;

package/errorhandle.js

@@ -14,21 +14,37 @@ const exception_1 = require("@napp/exception");
 function responseHandle(resp) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            let resu = yield resp.text();
+            let rsu = yield resp.text();
             if (resp.ok) {
+                if (rsu) {
+                    try {
+                        let value = JSON.parse(rsu);
+                        return value;
+                    }
+                    catch (error) {
+                        throw new exception_1.Exception(rsu, {
+                            name: exception_1.ExceptionNames.Server,
+                        });
+                    }
+                }
+                return void 0;
+            }
+            if (rsu) {
+                let err;
                 try {
-                    return resu ? JSON.parse(resu) : undefined;
+                    let errObject = JSON.parse(rsu);
+                    err = exception_1.Exception.from(errObject);
                 }
                 catch (error) {
-                    throw new exception_1.Exception("api response invalid json")
-                        .addException(exception_1.Exception.from(error));
+                    err = new exception_1.Exception(rsu, {
+                        name: exception_1.ExceptionNames.Server,
+                    });
                 }
+                throw err;
             }
-            if (resu) {
-                let errObject = JSON.parse(resu);
-                throw exception_1.Exception.from(errObject);
-            }
-            throw new exception_1.Exception(resp.statusText).setStatus(resp.status);
+            throw new exception_1.Exception(`status=${resp.status}. ${resp.statusText}`, {
+                name: exception_1.ExceptionNames.Server,
+            });
         }
         catch (error) {
             throw exception_1.Exception.from(error);

package/index.d.ts

@@ -3,3 +3,4 @@ export * from './caller';
 export * from './client';
 export * from './route';
 export * from './tree';
+export * from './errorhandle';

package/index.js

@@ -19,3 +19,4 @@ __exportStar(require("./caller"), exports);
 __exportStar(require("./client"), exports);
 __exportStar(require("./route"), exports);
 __exportStar(require("./tree"), exports);
+__exportStar(require("./errorhandle"), exports);

package/package.json

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