@napp/dti-client 4.5.2 → 4.5.4

package/builder.js

@@ -4,8 +4,11 @@ exports.DtiClientBuilder = void 0;
 const tree_1 = require("./tree");
 const client_1 = require("./client");
 class DtiClientBuilder {
-    _baseUrls = new tree_1.TreeNamer("root");
-    _headers = new tree_1.TreeNamer("root");
+    constructor() {
+        this._baseUrls = new tree_1.TreeNamer("root");
+        this._headers = new tree_1.TreeNamer("root");
+        this.signatureSecretResolver = undefined;
+    }
     baseUrl(route, url) {
         this._baseUrls.set(route.getFullname(), url);
         return this;
@@ -28,7 +31,6 @@ class DtiClientBuilder {
         }
         return undefined;
     }
-    signatureSecretResolver = undefined;
     signatureSecret(resolver) {
         this.signatureSecretResolver = resolver;
         return this;

package/bundler.d.ts

@@ -17,7 +17,9 @@ export declare class DtiClientBandler {
         param: any;
     }[];
     private getHeaders;
-    call(): Promise<any>;
+    call(opt?: {
+        signal?: AbortSignal;
+    }): Promise<any>;
     private callGet;
     private callPost;
 }

package/bundler.js

@@ -1,4 +1,13 @@
 "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.DtiClientBandler = void 0;
 const dti_core_1 = require("@napp/dti-core");
@@ -6,12 +15,10 @@ const exception_1 = require("@napp/exception");
 const cross_fetch_1 = require("cross-fetch");
 const errorhandle_1 = require("./errorhandle");
 class DtiClientBandler {
-    bundleMetas;
-    builder;
-    base62 = new dti_core_1.Base62();
     constructor(bundleMetas, builder) {
         this.bundleMetas = bundleMetas;
         this.builder = builder;
+        this.base62 = new dti_core_1.Base62();
     }
     validate() {
         for (let it of this.bundleMetas) {
@@ -51,49 +58,55 @@ class DtiClientBandler {
         for (let it of this.bundleMetas) {
             let _headers = this.builder.getHeader(it.meta.getRoute().getFullname());
             if (_headers) {
-                headers = { ...headers, ..._headers };
+                headers = Object.assign(Object.assign({}, headers), _headers);
             }
         }
         headers["Content-Type"] = "application/json";
         return headers;
     }
-    async call() {
-        this.validate();
-        let method = this.getMethod();
-        if (method === 'get') {
-            return await this.callGet();
-        }
-        return await this.callPost();
+    call(opt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.validate();
+            let method = this.getMethod();
+            if (method === 'get') {
+                return yield this.callGet(opt);
+            }
+            return yield this.callPost(opt);
+        });
     }
-    async callGet() {
-        try {
-            let baseUrl = this.getBase();
-            let param = this.getParam();
-            let headers = this.getHeaders();
-            let p = this.base62.encode(JSON.stringify(param));
-            let q = new URLSearchParams({ p }).toString();
-            let resp = await (0, cross_fetch_1.fetch)(`${baseUrl}/__bundler_get__?${q}`, {
-                method: 'get', headers
-            });
-            return await (0, errorhandle_1.responseHandle)(resp);
-        }
-        catch (error) {
-            throw exception_1.Exception.from(error);
-        }
+    callGet(opt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let baseUrl = this.getBase();
+                let param = this.getParam();
+                let headers = this.getHeaders();
+                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, signal: opt === null || opt === void 0 ? void 0 : opt.signal
+                });
+                return yield (0, errorhandle_1.responseHandle)(resp);
+            }
+            catch (error) {
+                throw exception_1.Exception.from(error);
+            }
+        });
     }
-    async callPost() {
-        try {
-            let baseUrl = this.getBase();
-            let param = this.getParam();
-            let headers = this.getHeaders();
-            let resp = await (0, cross_fetch_1.fetch)(`${baseUrl}/__bundler_post__`, {
-                method: 'post', headers, body: JSON.stringify(param)
-            });
-            return await (0, errorhandle_1.responseHandle)(resp);
-        }
-        catch (error) {
-            throw exception_1.Exception.from(error);
-        }
+    callPost(opt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let baseUrl = this.getBase();
+                let param = this.getParam();
+                let headers = this.getHeaders();
+                let resp = yield (0, cross_fetch_1.fetch)(`${baseUrl}/__bundler_post__`, {
+                    method: 'post', headers, body: JSON.stringify(param), signal: opt === null || opt === void 0 ? void 0 : opt.signal
+                });
+                return yield (0, errorhandle_1.responseHandle)(resp);
+            }
+            catch (error) {
+                throw exception_1.Exception.from(error);
+            }
+        });
     }
 }
 exports.DtiClientBandler = DtiClientBandler;

package/caller.d.ts

@@ -15,6 +15,10 @@ export declare class DtiClientCaller<RESULT, PARAM> {
     private signature;
     private getUrl;
     bundler(param: PARAM): BundleMeta<RESULT, PARAM>;
-    call(param: PARAM): Promise<RESULT>;
-    callRaw(param: PARAM): Promise<Response>;
+    call(param: PARAM, opt?: {
+        signal?: AbortSignal;
+    }): Promise<RESULT>;
+    callRaw(param: PARAM, opt?: {
+        signal?: AbortSignal;
+    }): Promise<Response>;
 }

package/caller.js

@@ -1,4 +1,13 @@
 "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.DtiClientCaller = void 0;
 const dti_core_1 = require("@napp/dti-core");
@@ -11,24 +20,23 @@ function getRandomInt(min, max) {
     // The maximum is exclusive and the minimum is inclusive
     return Math.floor(Math.random() * (maxFloored - minCeiled) + minCeiled);
 }
-async function hmacSignBase64(secret, data) {
-    const enc = new TextEncoder();
-    const key = await crypto.subtle.importKey("raw", enc.encode(secret), { name: "HMAC", hash: "SHA-256" }, false, ["sign"]);
-    const sigBuf = await crypto.subtle.sign("HMAC", key, enc.encode(data));
-    const sigBytes = new Uint8Array(sigBuf);
-    // base64 encode
-    let bin = "";
-    sigBytes.forEach(b => (bin += String.fromCharCode(b)));
-    return btoa(bin);
+function hmacSignBase64(secret, data) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const enc = new TextEncoder();
+        const key = yield crypto.subtle.importKey("raw", enc.encode(secret), { name: "HMAC", hash: "SHA-256" }, false, ["sign"]);
+        const sigBuf = yield crypto.subtle.sign("HMAC", key, enc.encode(data));
+        const sigBytes = new Uint8Array(sigBuf);
+        // base64 encode
+        let bin = "";
+        sigBytes.forEach(b => (bin += String.fromCharCode(b)));
+        return btoa(bin);
+    });
 }
 class DtiClientCaller {
-    meta;
-    builder;
-    base62 = new dti_core_1.Base62();
-    routeClient;
     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) {
@@ -80,7 +88,7 @@ class DtiClientCaller {
         let confHeaderBuilder = this.builder.getHeader(this.meta.getRoute().getFullname());
         if (confHeaderBuilder) {
             let confHeaders = confHeaderBuilder(this.meta);
-            headers = { ...headers, ...confHeaders };
+            headers = Object.assign(Object.assign({}, headers), confHeaders);
         }
         if (m === dti_core_1.DtiMode.BFrom) {
             headers["Content-Type"] = "application/x-www-form-urlencoded";
@@ -90,23 +98,25 @@ class DtiClientCaller {
         }
         return headers;
     }
-    async signature(data) {
-        const nonce = '' + getRandomInt(10000, 99999);
-        const timestamp = '' + Math.round(Date.now() / 1000);
-        const secretResolver = this.builder.getSignatureResolver();
-        if (secretResolver) {
-            const secret = await secretResolver();
-            if (secret) {
-                const signature = await hmacSignBase64(secret, `${timestamp}.${nonce}.${data}`);
-                return {
-                    nonce, timestamp, signature
-                };
+    signature(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const nonce = '' + getRandomInt(10000, 99999);
+            const timestamp = '' + Math.round(Date.now() / 1000);
+            const secretResolver = this.builder.getSignatureResolver();
+            if (secretResolver) {
+                const secret = yield secretResolver();
+                if (secret) {
+                    const signature = yield hmacSignBase64(secret, `${timestamp}.${nonce}.${data}`);
+                    return {
+                        nonce, timestamp, signature
+                    };
+                }
             }
-        }
-        return {
-            nonce, timestamp,
-            signature: ''
-        };
+            return {
+                nonce, timestamp,
+                signature: ''
+            };
+        });
     }
     getUrl() {
         return this.routeClient.buildUrl(this.meta.getPath());
@@ -114,33 +124,37 @@ class DtiClientCaller {
     bundler(param) {
         return { meta: this.meta, param };
     }
-    async call(param) {
-        let resp = await this.callRaw(param);
-        return await (0, errorhandle_1.responseHandle)(resp);
+    call(param, opt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let resp = yield this.callRaw(param, opt);
+            return yield (0, errorhandle_1.responseHandle)(resp);
+        });
     }
-    async callRaw(param) {
-        this.validate(param);
-        let url = this.getUrl();
-        let query = this.getQeury(param);
-        let method = this.getMethod();
-        let headers = this.getHeaders(param);
-        let body = this.getBody(param);
-        const signData = this.meta.sign(param);
-        if (signData) {
-            const { nonce, signature, timestamp } = await this.signature(signData);
-            if (signature) {
-                // console.log('method', method)
-                // console.log('------------method', method, this.meta.getFullname())
-                // console.log('timestamp', timestamp)
-                // console.log('nonce', nonce)
-                // console.log('signature', signature)
-                headers["X-DTI-Timestamp"] = timestamp;
-                headers["X-DTI-Nonce"] = nonce;
-                headers["X-DTI-Signature"] = signature;
+    callRaw(param, opt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.validate(param);
+            let url = this.getUrl();
+            let query = this.getQeury(param);
+            let method = this.getMethod();
+            let headers = this.getHeaders(param);
+            let body = this.getBody(param);
+            const signData = this.meta.sign(param);
+            if (signData) {
+                const { nonce, signature, timestamp } = yield this.signature(signData);
+                if (signature) {
+                    // console.log('method', method)
+                    // console.log('------------method', method, this.meta.getFullname())
+                    // console.log('timestamp', timestamp)
+                    // console.log('nonce', nonce)
+                    // console.log('signature', signature)
+                    headers["X-DTI-Timestamp"] = timestamp;
+                    headers["X-DTI-Nonce"] = nonce;
+                    headers["X-DTI-Signature"] = signature;
+                }
             }
-        }
-        return await (0, cross_fetch_1.fetch)(url + (query ? `?${query}` : ''), {
-            method, headers, body
+            return yield (0, cross_fetch_1.fetch)(url + (query ? `?${query}` : ''), {
+                method, headers, body, signal: opt === null || opt === void 0 ? void 0 : opt.signal
+            });
         });
     }
 }

package/client.js

@@ -1,11 +1,19 @@
 "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.DtiClient = void 0;
 const route_1 = require("./route");
 const caller_1 = require("./caller");
 const bundler_1 = require("./bundler");
 class DtiClient {
-    builder;
     constructor(builder) {
         this.builder = builder;
     }
@@ -15,24 +23,26 @@ class DtiClient {
     buildUrl(route, actionPath) {
         return new route_1.DtiClientRoute(route, this.builder).buildUrl(actionPath);
     }
-    async bundle(m1, m2, m3, m4, m5, m6) {
-        let bundleMetas = [m1];
-        if (m2) {
-            bundleMetas.push(m2);
-        }
-        if (m3) {
-            bundleMetas.push(m3);
-        }
-        if (m4) {
-            bundleMetas.push(m4);
-        }
-        if (m5) {
-            bundleMetas.push(m5);
-        }
-        if (m6) {
-            bundleMetas.push(m6);
-        }
-        return await new bundler_1.DtiClientBandler(bundleMetas, this.builder).call();
+    bundle(m1, m2, m3, m4, m5, m6) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let bundleMetas = [m1];
+            if (m2) {
+                bundleMetas.push(m2);
+            }
+            if (m3) {
+                bundleMetas.push(m3);
+            }
+            if (m4) {
+                bundleMetas.push(m4);
+            }
+            if (m5) {
+                bundleMetas.push(m5);
+            }
+            if (m6) {
+                bundleMetas.push(m6);
+            }
+            return yield new bundler_1.DtiClientBandler(bundleMetas, this.builder).call();
+        });
     }
 }
 exports.DtiClient = DtiClient;

package/errorhandle.js

@@ -1,54 +1,65 @@
 "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");
-async function responseHandle(resp, parser) {
-    try {
-        let rsu = await resp.text();
-        if (resp.ok) {
-            if (rsu) {
-                try {
-                    let value = JSON.parse(rsu);
-                    return value;
-                }
-                catch (error) {
-                    throw new exception_1.Exception(rsu, {
-                        kind: 'serviceunavailable',
-                    });
+function responseHandle(resp, parser) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            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, {
+                            kind: 'serviceunavailable',
+                        });
+                    }
                 }
+                return void 0;
             }
-            return void 0;
-        }
-        if (rsu) {
-            let err;
-            try {
-                let errObject = JSON.parse(rsu);
-                if (parser) {
-                    let e1 = parser(errObject);
-                    if (e1) {
-                        err = e1;
+            if (rsu) {
+                let err;
+                try {
+                    let errObject = JSON.parse(rsu);
+                    if (parser) {
+                        let e1 = parser(errObject);
+                        if (e1) {
+                            err = e1;
+                        }
+                        else {
+                            err = exception_1.Exception.from(errObject);
+                        }
                     }
                     else {
                         err = exception_1.Exception.from(errObject);
                     }
                 }
-                else {
-                    err = exception_1.Exception.from(errObject);
+                catch (error) {
+                    err = new exception_1.Exception(rsu, {
+                        kind: 'serviceunavailable',
+                    });
                 }
+                throw err;
             }
-            catch (error) {
-                err = new exception_1.Exception(rsu, {
-                    kind: 'serviceunavailable',
-                });
-            }
-            throw err;
+            throw new exception_1.Exception(`status=${resp.status}. ${resp.statusText}`, {
+                kind: 'serviceunavailable',
+            });
+        }
+        catch (error) {
+            throw exception_1.Exception.from(error);
         }
-        throw new exception_1.Exception(`status=${resp.status}. ${resp.statusText}`, {
-            kind: 'serviceunavailable',
-        });
-    }
-    catch (error) {
-        throw exception_1.Exception.from(error);
-    }
+    });
 }
 exports.responseHandle = responseHandle;

package/esm/bundler.d.ts

@@ -17,7 +17,9 @@ export declare class DtiClientBandler {
         param: any;
     }[];
     private getHeaders;
-    call(): Promise<any>;
+    call(opt?: {
+        signal?: AbortSignal;
+    }): Promise<any>;
     private callGet;
     private callPost;
 }

package/esm/bundler.js

@@ -54,15 +54,15 @@ export class DtiClientBandler {
         headers["Content-Type"] = "application/json";
         return headers;
     }
-    async call() {
+    async call(opt) {
         this.validate();
         let method = this.getMethod();
         if (method === 'get') {
-            return await this.callGet();
+            return await this.callGet(opt);
         }
-        return await this.callPost();
+        return await this.callPost(opt);
     }
-    async callGet() {
+    async callGet(opt) {
         try {
             let baseUrl = this.getBase();
             let param = this.getParam();
@@ -70,7 +70,7 @@ export class DtiClientBandler {
             let p = this.base62.encode(JSON.stringify(param));
             let q = new URLSearchParams({ p }).toString();
             let resp = await fetch(`${baseUrl}/__bundler_get__?${q}`, {
-                method: 'get', headers
+                method: 'get', headers, signal: opt?.signal
             });
             return await responseHandle(resp);
         }
@@ -78,13 +78,13 @@ export class DtiClientBandler {
             throw Exception.from(error);
         }
     }
-    async callPost() {
+    async callPost(opt) {
         try {
             let baseUrl = this.getBase();
             let param = this.getParam();
             let headers = this.getHeaders();
             let resp = await fetch(`${baseUrl}/__bundler_post__`, {
-                method: 'post', headers, body: JSON.stringify(param)
+                method: 'post', headers, body: JSON.stringify(param), signal: opt?.signal
             });
             return await responseHandle(resp);
         }

package/esm/caller.d.ts

@@ -15,6 +15,10 @@ export declare class DtiClientCaller<RESULT, PARAM> {
     private signature;
     private getUrl;
     bundler(param: PARAM): BundleMeta<RESULT, PARAM>;
-    call(param: PARAM): Promise<RESULT>;
-    callRaw(param: PARAM): Promise<Response>;
+    call(param: PARAM, opt?: {
+        signal?: AbortSignal;
+    }): Promise<RESULT>;
+    callRaw(param: PARAM, opt?: {
+        signal?: AbortSignal;
+    }): Promise<Response>;
 }

package/esm/caller.js

@@ -111,11 +111,11 @@ export class DtiClientCaller {
     bundler(param) {
         return { meta: this.meta, param };
     }
-    async call(param) {
-        let resp = await this.callRaw(param);
+    async call(param, opt) {
+        let resp = await this.callRaw(param, opt);
         return await responseHandle(resp);
     }
-    async callRaw(param) {
+    async callRaw(param, opt) {
         this.validate(param);
         let url = this.getUrl();
         let query = this.getQeury(param);
@@ -137,7 +137,7 @@ export class DtiClientCaller {
             }
         }
         return await fetch(url + (query ? `?${query}` : ''), {
-            method, headers, body
+            method, headers, body, signal: opt?.signal
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@napp/dti-client",
-    "version": "4.5.2",
+    "version": "4.5.4",
     "description": "data transaction interface client library",
     "repository": {
         "type": "git",
@@ -24,7 +24,7 @@
     "author": "Farcek <farcek@gmail.com>",
     "license": "ISC",
     "dependencies": {
-        "@napp/dti-core": "4.5.2"
+        "@napp/dti-core": "4.5.4"
     },
     "peerDependencies": {
         "@napp/exception": "^9.1.4",

package/route.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DtiClientRoute = void 0;
 class DtiClientRoute {
-    meta;
-    builder;
     constructor(meta, builder) {
         this.meta = meta;
         this.builder = builder;

package/tree.js

@@ -2,14 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TreeNamer = void 0;
 class TreeNamer {
-    name;
-    parent;
     constructor(name, parent) {
         this.name = name;
         this.parent = parent;
     }
-    value;
-    childs;
     set(name, value) {
         let names = (name || '').split('.').filter(it => !!it);
         let curr = this;
@@ -69,9 +65,10 @@ class TreeNamer {
         return this.childs[name] = new TreeNamer(name, this);
     }
     toObj() {
+        var _a;
         let obj = {
             name: this.name,
-            parent: this.parent?.name,
+            parent: (_a = this.parent) === null || _a === void 0 ? void 0 : _a.name,
             value: this.value
         };
         if (this.childs) {