@napp/dti-client 4.2.3 → 4.3.3

package/caller.d.ts

@@ -15,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

@@ -87,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();
@@ -94,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<T>;

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.3",
+    "version": "4.3.3",
     "description": "data transaction interface client library",
     "repository": {
         "type": "git",
@@ -16,8 +16,8 @@
     "author": "Farcek <farcek@gmail.com>",
     "license": "ISC",
     "dependencies": {
-        "@napp/exception": "^4.1.2",
-        "@napp/dti-core": "4.2.3",
+        "@napp/exception": "^5.1.7",
+        "@napp/dti-core": "4.3.3",
         "cross-fetch": "latest"
     }
 }