@napp/dti-client 4.1.4 → 4.2.1

package/bundler.d.ts

@@ -19,5 +19,4 @@ export declare class DtiClientBandler {
     call(): Promise<any>;
     private callGet;
     private callPost;
-    private respHandle;
 }

package/bundler.js

@@ -14,8 +14,10 @@ var __importDefault = (this && this.__importDefault) || function (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;
@@ -67,12 +69,7 @@ class DtiClientBandler {
     }
     call() {
         return __awaiter(this, void 0, void 0, function* () {
-            try {
-                this.validate();
-            }
-            catch (error) {
-                throw dti_core_1.DtiError.fromCode('validation', error);
-            }
+            this.validate();
             let method = this.getMethod();
             if (method === 'get') {
                 return yield this.callGet();
@@ -91,10 +88,10 @@ class DtiClientBandler {
                 let resp = yield (0, cross_fetch_1.fetch)(`${baseUrl}/__bundler_get__?${q}`, {
                     method: 'get', headers
                 });
-                return yield this.respHandle(resp);
+                return yield (0, errorhandle_1.responseHandle)(resp);
             }
             catch (error) {
-                throw dti_core_1.DtiError.from(error);
+                throw exception_1.Exception.from(error);
             }
         });
     }
@@ -107,39 +104,10 @@ class DtiClientBandler {
                 let resp = yield (0, cross_fetch_1.fetch)(`${baseUrl}/__bundler_post__`, {
                     method: 'post', headers, body: JSON.stringify(param)
                 });
-                return yield this.respHandle(resp);
-            }
-            catch (error) {
-                throw dti_core_1.DtiError.from(error);
-            }
-        });
-    }
-    respHandle(resp) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                let resu = yield resp.text();
-                if (resp.ok) {
-                    try {
-                        return JSON.parse(resu);
-                    }
-                    catch (error) {
-                        throw dti_core_1.DtiError.fromCode("InvalidJSON", resu);
-                    }
-                }
-                try {
-                    let errObject = JSON.parse(resu);
-                    let error = dti_core_1.DtiError.from(errObject);
-                    if (error instanceof dti_core_1.DtiErrorUnknown) {
-                        throw new dti_core_1.DtiError('' + resp.status, resp.statusText);
-                    }
-                    throw error;
-                }
-                catch (error) {
-                    throw new dti_core_1.DtiErrorUnknown(resu);
-                }
+                return yield (0, errorhandle_1.responseHandle)(resp);
             }
             catch (error) {
-                throw dti_core_1.DtiError.from(error);
+                throw exception_1.Exception.from(error);
             }
         });
     }

package/caller.js

@@ -17,6 +17,7 @@ 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;
@@ -88,12 +89,7 @@ class DtiClientCaller {
     }
     call(param) {
         return __awaiter(this, void 0, void 0, function* () {
-            try {
-                this.validate(param);
-            }
-            catch (error) {
-                throw dti_core_1.DtiError.fromCode('validation', error);
-            }
+            this.validate(param);
             let url = this.getUrl();
             let query = this.getQeury(param);
             let method = this.getMethod();
@@ -102,31 +98,7 @@ class DtiClientCaller {
             let resp = yield (0, cross_fetch_1.fetch)(url + (query ? `?${query}` : ''), {
                 method, headers, body
             });
-            try {
-                let resu = yield resp.text();
-                if (resp.ok) {
-                    try {
-                        return JSON.parse(resu);
-                    }
-                    catch (error) {
-                        throw dti_core_1.DtiError.fromCode("InvalidJSON", resu);
-                    }
-                }
-                try {
-                    let errObject = JSON.parse(resu);
-                    let error = dti_core_1.DtiError.from(errObject);
-                    if (error instanceof dti_core_1.DtiErrorUnknown) {
-                        throw new dti_core_1.DtiError('' + resp.status, resp.statusText);
-                    }
-                    throw error;
-                }
-                catch (error) {
-                    throw new dti_core_1.DtiErrorUnknown(resu);
-                }
-            }
-            catch (error) {
-                throw dti_core_1.DtiError.from(error);
-            }
+            return (0, errorhandle_1.responseHandle)(resp);
         });
     }
 }

package/errorhandle.d.ts

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

package/errorhandle.js

@@ -0,0 +1,38 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.responseHandle = void 0;
+const exception_1 = require("@napp/exception");
+function responseHandle(resp) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            let resu = yield resp.text();
+            if (resp.ok) {
+                try {
+                    return resu ? JSON.parse(resu) : undefined;
+                }
+                catch (error) {
+                    throw new exception_1.Exception("api response invalid json")
+                        .addException(exception_1.Exception.from(error));
+                }
+            }
+            if (resu) {
+                let errObject = JSON.parse(resu);
+                throw exception_1.Exception.from(errObject);
+            }
+            throw new exception_1.Exception(resp.statusText).setStatus(resp.status);
+        }
+        catch (error) {
+            throw exception_1.Exception.from(error);
+        }
+    });
+}
+exports.responseHandle = responseHandle;

package/package.json

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