@onekeyfe/hd-transport-http 0.1.13 → 0.1.17

package/dist/http.d.ts

@@ -2,6 +2,7 @@ export declare type HttpRequestOptions = {
     body?: Array<any> | Record<string, unknown> | string;
     url: string;
     method: 'POST' | 'GET';
+    timeout?: number;
 };
 export declare function request(options: HttpRequestOptions): Promise<any>;
 //# sourceMappingURL=http.d.ts.map

package/dist/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../src/http.ts"],"names":[],"mappings":"AAGA,oBAAY,kBAAkB,GAAG;IAC/B,IAAI,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;IACrD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;CACxB,CAAC;AAwBF,wBAAsB,OAAO,CAAC,OAAO,EAAE,kBAAkB,gBAsBxD"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../src/http.ts"],"names":[],"mappings":"AAGA,oBAAY,kBAAkB,GAAG;IAC/B,IAAI,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;IACrD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAwBF,wBAAsB,OAAO,CAAC,OAAO,EAAE,kBAAkB,gBAuBxD"}

package/dist/index.d.ts

@@ -10,9 +10,10 @@ declare class HttpTransport {
     configured: boolean;
     stopped: boolean;
     url: string;
+    Log?: any;
     constructor(url?: string);
     _post(options: IncompleteRequestOptions): Promise<any>;
-    init(): Promise<string>;
+    init(logger: any): Promise<string>;
     _silentInit(): Promise<string>;
     configure(signedData: any): void;
     listen(old?: Array<OneKeyDeviceInfoWithSession>): Promise<OneKeyDeviceInfoWithSession[]>;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAMxF,aAAK,wBAAwB,GAAG;IAC9B,IAAI,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;IACrD,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAIF,MAAM,CAAC,OAAO,OAAO,aAAa;IAChC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,GAAG,EAAE,MAAM,CAAC;gBAEA,GAAG,CAAC,EAAE,MAAM;IAKxB,KAAK,CAAC,OAAO,EAAE,wBAAwB;IAWjC,IAAI;IAKJ,WAAW;IASjB,SAAS,CAAC,UAAU,EAAE,GAAG;IAMnB,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,2BAA2B,CAAC;IAY/C,SAAS;IAMf,aAAa,CAAC,KAAK,EAAE,YAAY;IAO3B,OAAO,CAAC,KAAK,EAAE,YAAY;IAK3B,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAUzC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAmBjE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAYjE,IAAI,CAAC,OAAO,EAAE,MAAM;IAe1B,aAAa;IAKb,IAAI;IAIJ,MAAM;CAGP"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAMxF,aAAK,wBAAwB,GAAG;IAC9B,IAAI,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;IACrD,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,aAAa;IAChC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,GAAG,EAAE,MAAM,CAAC;IAEZ,GAAG,CAAC,EAAE,GAAG,CAAC;gBAEE,GAAG,CAAC,EAAE,MAAM;IAIxB,KAAK,CAAC,OAAO,EAAE,wBAAwB;IAWjC,IAAI,CAAC,MAAM,EAAE,GAAG;IAMhB,WAAW;IAUjB,SAAS,CAAC,UAAU,EAAE,GAAG;IAMnB,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,2BAA2B,CAAC;IAY/C,SAAS;IAMf,aAAa,CAAC,KAAK,EAAE,YAAY;IAO3B,OAAO,CAAC,KAAK,EAAE,YAAY;IAK3B,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAUzC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAmBjE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAYjE,IAAI,CAAC,OAAO,EAAE,MAAM;IAe1B,aAAa;IAKb,IAAI;IAIJ,MAAM;CAGP"}

package/dist/index.js

@@ -55,6 +55,7 @@ function parseResult(text) {
     }
 }
 function request(options) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const fetchOptions = {
             url: options.url,
@@ -64,6 +65,7 @@ function request(options) {
             headers: {
                 'Content-Type': contentType(options.body == null ? '' : options.body),
             },
+            timeout: (_a = options.timeout) !== null && _a !== void 0 ? _a : undefined,
         };
         const res = yield axios__default["default"].request(fetchOptions);
         if (+res.status === 200) {
@@ -82,13 +84,11 @@ function request(options) {
 const DEFAULT_URL = 'http://localhost:21320';
 
 const { check, buildOne, receiveOne, parseConfigure } = transport__default["default"];
-const Log = hdShared.initLog('@onekey/hd-transport-http');
 class HttpTransport {
     constructor(url) {
         this.configured = false;
         this.stopped = false;
         this.url = url == null ? DEFAULT_URL : url;
-        hdShared.enableLog(true);
     }
     _post(options) {
         if (this.stopped) {
@@ -96,8 +96,9 @@ class HttpTransport {
         }
         return request(Object.assign(Object.assign({}, options), { method: 'POST', url: this.url + options.url }));
     }
-    init() {
+    init(logger) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.Log = logger;
             const bridgeVersion = yield this._silentInit();
             return bridgeVersion;
         });
@@ -107,6 +108,7 @@ class HttpTransport {
             const infoS = yield request({
                 url: this.url,
                 method: 'POST',
+                timeout: 3000,
             });
             const info = check.info(infoS);
             return info.version;
@@ -165,7 +167,7 @@ class HttpTransport {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
             const messages = this._messages;
-            Log.debug('call-', ' name: ', name, ' data: ', data);
+            this.Log.debug('call-', ' name: ', name, ' data: ', data);
             const o = buildOne(messages, name, data);
             const outData = o.toString('hex');
             const resData = yield this._post({
@@ -215,7 +217,7 @@ class HttpTransport {
         this.stopped = true;
     }
     cancel() {
-        Log.debug('canceled');
+        this.Log.debug('canceled');
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-http",
-  "version": "0.1.13",
+  "version": "0.1.17",
   "description": "hardware http transport",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,9 +24,9 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.1.13",
-    "@onekeyfe/hd-transport": "^0.1.13",
+    "@onekeyfe/hd-shared": "^0.1.17",
+    "@onekeyfe/hd-transport": "^0.1.17",
     "axios": "^0.27.2"
   },
-  "gitHead": "f69fd0696e38efbc838848fb361cb900043bb2ec"
+  "gitHead": "65350a66c7f2b1e80cb1d413ee56da4aef507fa3"
 }

package/src/http.ts

@@ -5,6 +5,7 @@ export type HttpRequestOptions = {
   body?: Array<any> | Record<string, unknown> | string;
   url: string;
   method: 'POST' | 'GET';
+  timeout?: number;
 };
 
 function contentType(body: any) {
@@ -38,6 +39,7 @@ export async function request(options: HttpRequestOptions) {
     headers: {
       'Content-Type': contentType(options.body == null ? '' : options.body),
     },
+    timeout: options.timeout ?? undefined,
   };
 
   const res = await axios.request(fetchOptions);

package/src/index.ts

@@ -1,5 +1,5 @@
 import transport from '@onekeyfe/hd-transport';
-import { ERRORS, HardwareErrorCode, enableLog, initLog } from '@onekeyfe/hd-shared';
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import type { AcquireInput, OneKeyDeviceInfoWithSession } from '@onekeyfe/hd-transport';
 import { request as http } from './http';
 import { DEFAULT_URL } from './constants';
@@ -11,8 +11,6 @@ type IncompleteRequestOptions = {
   url: string;
 };
 
-const Log = initLog('@onekey/hd-transport-http');
-
 export default class HttpTransport {
   _messages: ReturnType<typeof transport.parseConfigure> | undefined;
 
@@ -22,9 +20,10 @@ export default class HttpTransport {
 
   url: string;
 
+  Log?: any;
+
   constructor(url?: string) {
     this.url = url == null ? DEFAULT_URL : url;
-    enableLog(true);
   }
 
   _post(options: IncompleteRequestOptions) {
@@ -38,7 +37,8 @@ export default class HttpTransport {
     });
   }
 
-  async init() {
+  async init(logger: any) {
+    this.Log = logger;
     const bridgeVersion = await this._silentInit();
     return bridgeVersion;
   }
@@ -47,6 +47,7 @@ export default class HttpTransport {
     const infoS = await http({
       url: this.url,
       method: 'POST',
+      timeout: 3000,
     });
     const info = check.info(infoS);
     return info.version;
@@ -103,7 +104,7 @@ export default class HttpTransport {
       throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
     }
     const messages = this._messages;
-    Log.debug('call-', ' name: ', name, ' data: ', data);
+    this.Log.debug('call-', ' name: ', name, ' data: ', data);
     const o = buildOne(messages, name, data);
     const outData = o.toString('hex');
     const resData = await this._post({
@@ -154,6 +155,6 @@ export default class HttpTransport {
   }
 
   cancel() {
-    Log.debug('canceled');
+    this.Log.debug('canceled');
   }
 }