@napp/dti-client 4.4.5 → 4.5.4

package/builder.d.ts

@@ -10,5 +10,10 @@ export declare class DtiClientBuilder {
     getBaseUrl(name: string): string | undefined;
     header(route: DtiRoute, builder: ODtiClientHeaderBuilder): this;
     getHeader(name: string): ODtiClientHeaderBuilder | undefined;
+    private signatureSecretResolver;
+    signatureSecret(resolver: {
+        (): Promise<string>;
+    } | undefined): this;
+    getSignatureResolver(): (() => Promise<string>) | undefined;
     build(): DtiClient;
 }

package/builder.js

@@ -7,6 +7,7 @@ class DtiClientBuilder {
     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);
@@ -30,6 +31,13 @@ class DtiClientBuilder {
         }
         return undefined;
     }
+    signatureSecret(resolver) {
+        this.signatureSecretResolver = resolver;
+        return this;
+    }
+    getSignatureResolver() {
+        return this.signatureSecretResolver;
+    }
     build() {
         return new client_1.DtiClient(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

@@ -64,17 +64,17 @@ class DtiClientBandler {
         headers["Content-Type"] = "application/json";
         return headers;
     }
-    call() {
+    call(opt) {
         return __awaiter(this, void 0, void 0, function* () {
             this.validate();
             let method = this.getMethod();
             if (method === 'get') {
-                return yield this.callGet();
+                return yield this.callGet(opt);
             }
-            return yield this.callPost();
+            return yield this.callPost(opt);
         });
     }
-    callGet() {
+    callGet(opt) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 let baseUrl = this.getBase();
@@ -83,7 +83,7 @@ class DtiClientBandler {
                 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
+                    method: 'get', headers, signal: opt === null || opt === void 0 ? void 0 : opt.signal
                 });
                 return yield (0, errorhandle_1.responseHandle)(resp);
             }
@@ -92,14 +92,14 @@ class DtiClientBandler {
             }
         });
     }
-    callPost() {
+    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)
+                    method: 'post', headers, body: JSON.stringify(param), signal: opt === null || opt === void 0 ? void 0 : opt.signal
                 });
                 return yield (0, errorhandle_1.responseHandle)(resp);
             }

package/caller.d.ts

@@ -12,8 +12,13 @@ export declare class DtiClientCaller<RESULT, PARAM> {
     private getBody;
     private getQeury;
     private getHeaders;
+    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

@@ -14,6 +14,24 @@ const dti_core_1 = require("@napp/dti-core");
 const cross_fetch_1 = require("cross-fetch");
 const route_1 = require("./route");
 const errorhandle_1 = require("./errorhandle");
+function getRandomInt(min, max) {
+    const minCeiled = Math.ceil(min);
+    const maxFloored = Math.floor(max);
+    // The maximum is exclusive and the minimum is inclusive
+    return Math.floor(Math.random() * (maxFloored - minCeiled) + minCeiled);
+}
+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 {
     constructor(meta, builder) {
         this.meta = meta;
@@ -80,19 +98,39 @@ class DtiClientCaller {
         }
         return headers;
     }
+    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: ''
+            };
+        });
+    }
     getUrl() {
         return this.routeClient.buildUrl(this.meta.getPath());
     }
     bundler(param) {
         return { meta: this.meta, param };
     }
-    call(param) {
+    call(param, opt) {
         return __awaiter(this, void 0, void 0, function* () {
-            let resp = yield this.callRaw(param);
+            let resp = yield this.callRaw(param, opt);
             return yield (0, errorhandle_1.responseHandle)(resp);
         });
     }
-    callRaw(param) {
+    callRaw(param, opt) {
         return __awaiter(this, void 0, void 0, function* () {
             this.validate(param);
             let url = this.getUrl();
@@ -100,8 +138,22 @@ class DtiClientCaller {
             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 yield (0, cross_fetch_1.fetch)(url + (query ? `?${query}` : ''), {
-                method, headers, body
+                method, headers, body, signal: opt === null || opt === void 0 ? void 0 : opt.signal
             });
         });
     }

package/esm/builder.d.ts

@@ -10,5 +10,10 @@ export declare class DtiClientBuilder {
     getBaseUrl(name: string): string | undefined;
     header(route: DtiRoute, builder: ODtiClientHeaderBuilder): this;
     getHeader(name: string): ODtiClientHeaderBuilder | undefined;
+    private signatureSecretResolver;
+    signatureSecret(resolver: {
+        (): Promise<string>;
+    } | undefined): this;
+    getSignatureResolver(): (() => Promise<string>) | undefined;
     build(): DtiClient;
 }

package/esm/builder.js

@@ -1,10 +1,8 @@
 import { TreeNamer } from "./tree";
 import { DtiClient } from "./client";
 export class DtiClientBuilder {
-    constructor() {
-        this._baseUrls = new TreeNamer("root");
-        this._headers = new TreeNamer("root");
-    }
+    _baseUrls = new TreeNamer("root");
+    _headers = new TreeNamer("root");
     baseUrl(route, url) {
         this._baseUrls.set(route.getFullname(), url);
         return this;
@@ -27,6 +25,14 @@ export class DtiClientBuilder {
         }
         return undefined;
     }
+    signatureSecretResolver = undefined;
+    signatureSecret(resolver) {
+        this.signatureSecretResolver = resolver;
+        return this;
+    }
+    getSignatureResolver() {
+        return this.signatureSecretResolver;
+    }
     build() {
         return new DtiClient(this);
     }

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

@@ -3,10 +3,12 @@ import { Exception } from "@napp/exception";
 import { fetch } from "cross-fetch";
 import { responseHandle } from "./errorhandle";
 export class DtiClientBandler {
+    bundleMetas;
+    builder;
+    base62 = new Base62();
     constructor(bundleMetas, builder) {
         this.bundleMetas = bundleMetas;
         this.builder = builder;
-        this.base62 = new Base62();
     }
     validate() {
         for (let it of this.bundleMetas) {
@@ -52,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();
@@ -68,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);
         }
@@ -76,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

@@ -12,8 +12,13 @@ export declare class DtiClientCaller<RESULT, PARAM> {
     private getBody;
     private getQeury;
     private getHeaders;
+    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

@@ -2,11 +2,30 @@ import { DtiMode, Base62 } from "@napp/dti-core";
 import { fetch } from "cross-fetch";
 import { DtiClientRoute } from "./route";
 import { responseHandle } from "./errorhandle";
+function getRandomInt(min, max) {
+    const minCeiled = Math.ceil(min);
+    const maxFloored = Math.floor(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);
+}
 export class DtiClientCaller {
+    meta;
+    builder;
+    base62 = new Base62();
+    routeClient;
     constructor(meta, builder) {
         this.meta = meta;
         this.builder = builder;
-        this.base62 = new Base62();
         this.routeClient = new DtiClientRoute(meta.getRoute(), builder);
     }
     validate(param) {
@@ -68,25 +87,57 @@ export 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
+                };
+            }
+        }
+        return {
+            nonce, timestamp,
+            signature: ''
+        };
+    }
     getUrl() {
         return this.routeClient.buildUrl(this.meta.getPath());
     }
     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);
         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;
+            }
+        }
         return await fetch(url + (query ? `?${query}` : ''), {
-            method, headers, body
+            method, headers, body, signal: opt?.signal
         });
     }
 }

package/esm/client.js

@@ -2,6 +2,7 @@ import { DtiClientRoute } from "./route";
 import { DtiClientCaller } from "./caller";
 import { DtiClientBandler } from "./bundler";
 export class DtiClient {
+    builder;
     constructor(builder) {
         this.builder = builder;
     }

package/esm/route.js

@@ -1,4 +1,6 @@
 export class DtiClientRoute {
+    meta;
+    builder;
     constructor(meta, builder) {
         this.meta = meta;
         this.builder = builder;

package/esm/tree.js

@@ -1,8 +1,12 @@
 export 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;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@napp/dti-client",
-    "version": "4.4.5",
+    "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.4.5"
+        "@napp/dti-core": "4.5.4"
     },
     "peerDependencies": {
         "@napp/exception": "^9.1.4",