@napp/dti-client 4.4.5 → 4.5.2

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

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

package/bundler.js

@@ -1,13 +1,4 @@
 "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");
@@ -15,10 +6,12 @@ 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) {
@@ -58,55 +51,49 @@ class DtiClientBandler {
         for (let it of this.bundleMetas) {
             let _headers = this.builder.getHeader(it.meta.getRoute().getFullname());
             if (_headers) {
-                headers = Object.assign(Object.assign({}, headers), _headers);
+                headers = { ...headers, ..._headers };
             }
         }
         headers["Content-Type"] = "application/json";
         return headers;
     }
-    call() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.validate();
-            let method = this.getMethod();
-            if (method === 'get') {
-                return yield this.callGet();
-            }
-            return yield this.callPost();
-        });
+    async call() {
+        this.validate();
+        let method = this.getMethod();
+        if (method === 'get') {
+            return await this.callGet();
+        }
+        return await this.callPost();
     }
-    callGet() {
-        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
-                });
-                return yield (0, errorhandle_1.responseHandle)(resp);
-            }
-            catch (error) {
-                throw exception_1.Exception.from(error);
-            }
-        });
+    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);
+        }
     }
-    callPost() {
-        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)
-                });
-                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);
+        }
     }
 }
 exports.DtiClientBandler = DtiClientBandler;

package/caller.d.ts

@@ -12,6 +12,7 @@ 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>;

package/caller.js

@@ -1,24 +1,34 @@
 "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");
 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);
+}
+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);
+}
 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) {
@@ -70,7 +80,7 @@ class DtiClientCaller {
         let confHeaderBuilder = this.builder.getHeader(this.meta.getRoute().getFullname());
         if (confHeaderBuilder) {
             let confHeaders = confHeaderBuilder(this.meta);
-            headers = Object.assign(Object.assign({}, headers), confHeaders);
+            headers = { ...headers, ...confHeaders };
         }
         if (m === dti_core_1.DtiMode.BFrom) {
             headers["Content-Type"] = "application/x-www-form-urlencoded";
@@ -80,29 +90,57 @@ 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 };
     }
-    call(param) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let resp = yield this.callRaw(param);
-            return yield (0, errorhandle_1.responseHandle)(resp);
-        });
+    async call(param) {
+        let resp = await this.callRaw(param);
+        return await (0, errorhandle_1.responseHandle)(resp);
     }
-    callRaw(param) {
-        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);
-            return yield (0, cross_fetch_1.fetch)(url + (query ? `?${query}` : ''), {
-                method, headers, body
-            });
+    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;
+            }
+        }
+        return await (0, cross_fetch_1.fetch)(url + (query ? `?${query}` : ''), {
+            method, headers, body
         });
     }
 }

package/client.js

@@ -1,19 +1,11 @@
 "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;
     }
@@ -23,26 +15,24 @@ class DtiClient {
     buildUrl(route, actionPath) {
         return new route_1.DtiClientRoute(route, this.builder).buildUrl(actionPath);
     }
-    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();
-        });
+    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();
     }
 }
 exports.DtiClient = DtiClient;

package/errorhandle.js

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

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.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) {

package/esm/caller.d.ts

@@ -12,6 +12,7 @@ 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>;

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,6 +87,24 @@ 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());
     }
@@ -85,6 +122,20 @@ export 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 } = 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
         });

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.2",
     "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.2"
     },
     "peerDependencies": {
         "@napp/exception": "^9.1.4",

package/route.js

@@ -2,6 +2,8 @@
 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,10 +2,14 @@
 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;
@@ -65,10 +69,9 @@ class TreeNamer {
         return this.childs[name] = new TreeNamer(name, this);
     }
     toObj() {
-        var _a;
         let obj = {
             name: this.name,
-            parent: (_a = this.parent) === null || _a === void 0 ? void 0 : _a.name,
+            parent: this.parent?.name,
             value: this.value
         };
         if (this.childs) {