@onekeyfe/hd-transport-http 1.1.26 → 1.1.27-alpha.30

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _onekeyfe_hd_transport from '@onekeyfe/hd-transport';
-import _onekeyfe_hd_transport__default, { OneKeyDeviceInfoWithSession, AcquireInput } from '@onekeyfe/hd-transport';
+import _onekeyfe_hd_transport__default, { ProtocolType, OneKeyDeviceInfoWithSession, AcquireInput } from '@onekeyfe/hd-transport';
 
 type IncompleteRequestOptions = {
     body?: Array<any> | Record<string, unknown> | string;
@@ -13,6 +13,7 @@ declare class HttpTransport {
     stopped: boolean;
     url: string;
     Log?: any;
+    getProtocolType(_path: string): ProtocolType;
     constructor(url?: string);
     _post(options: IncompleteRequestOptions): Promise<any>;
     init(logger: any): Promise<string>;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAA8B,MAAM,wBAAwB,CAAC;AAMpE,OAAO,KAAK,EAAE,YAAY,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAIxF,KAAK,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;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,aAAa;IAChC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,IAAI,SAAmB;IAEvB,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;IAS3B,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;IAyBjE,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,SAA8B,MAAM,wBAAwB,CAAC;AAMpE,OAAO,KAAK,EACV,YAAY,EACZ,2BAA2B,EAC3B,YAAY,EACb,MAAM,wBAAwB,CAAC;AAIhC,KAAK,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;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,aAAa;IAChC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,IAAI,SAAmB;IAEvB,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,GAAG,EAAE,MAAM,CAAC;IAEZ,GAAG,CAAC,EAAE,GAAG,CAAC;IAGV,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY;gBAIhC,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;IAS3B,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;IAyBjE,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

@@ -127,8 +127,11 @@ axios__default["default"].interceptors.request.use((config) => {
 
 const DEFAULT_URL = 'http://localhost:21320';
 
-const { check, buildOne, receiveOne, parseConfigure } = transport__default["default"];
+const { check, ProtocolV1, parseConfigure } = transport__default["default"];
 class HttpTransport {
+    getProtocolType(_path) {
+        return 'V1';
+    }
     constructor(url) {
         this.name = 'HttpTransport';
         this.configured = false;
@@ -219,7 +222,7 @@ class HttpTransport {
             else {
                 this.Log.debug('call-', ' name: ', name, ' data: ', data);
             }
-            const o = buildOne(messages, name, data);
+            const o = ProtocolV1.encodeEnvelope(messages, name, data);
             const outData = o.toString('hex');
             const resData = yield this._post({
                 url: `/call/${session}`,
@@ -229,7 +232,7 @@ class HttpTransport {
             if (typeof resData !== 'string') {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NetworkError, 'Returning data is not string.');
             }
-            const jsonData = receiveOne(messages, resData);
+            const jsonData = ProtocolV1.decodeMessage(messages, resData);
             return check.call(jsonData);
         });
     }
@@ -239,7 +242,7 @@ class HttpTransport {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
             const messages = this._messages;
-            const outData = buildOne(messages, name, data).toString('hex');
+            const outData = ProtocolV1.encodeEnvelope(messages, name, data).toString('hex');
             yield this._post({
                 url: `/post/${session}`,
                 body: outData,
@@ -258,7 +261,7 @@ class HttpTransport {
             if (typeof resData !== 'string') {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NetworkError, 'Returning data is not string.');
             }
-            const jsonData = receiveOne(messages, resData);
+            const jsonData = ProtocolV1.decodeMessage(messages, resData);
             return check.call(jsonData);
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-http",
-  "version": "1.1.26",
+  "version": "1.1.27-alpha.30",
   "description": "hardware http transport",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,10 +24,10 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.1.26",
-    "@onekeyfe/hd-transport": "1.1.26",
+    "@onekeyfe/hd-shared": "1.1.27-alpha.30",
+    "@onekeyfe/hd-transport": "1.1.27-alpha.30",
     "axios": "1.15.2",
     "secure-json-parse": "^4.0.0"
   },
-  "gitHead": "25f2737f5e9d357764fb82f558b024f763cdd30d"
+  "gitHead": "f1e3a93e766463007436eaa9aff4a271ffd8830c"
 }

package/src/index.ts

@@ -4,9 +4,13 @@ import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import { request as http } from './http';
 import { DEFAULT_URL } from './constants';
 
-import type { AcquireInput, OneKeyDeviceInfoWithSession } from '@onekeyfe/hd-transport';
+import type {
+  AcquireInput,
+  OneKeyDeviceInfoWithSession,
+  ProtocolType,
+} from '@onekeyfe/hd-transport';
 
-const { check, buildOne, receiveOne, parseConfigure } = transport;
+const { check, ProtocolV1, parseConfigure } = transport;
 
 type IncompleteRequestOptions = {
   body?: Array<any> | Record<string, unknown> | string;
@@ -27,6 +31,11 @@ export default class HttpTransport {
 
   Log?: any;
 
+  // HttpTransport (Bridge) speaks Protocol V1 only.
+  getProtocolType(_path: string): ProtocolType {
+    return 'V1';
+  }
+
   constructor(url?: string) {
     this.url = url == null ? DEFAULT_URL : url;
   }
@@ -117,7 +126,7 @@ export default class HttpTransport {
       this.Log.debug('call-', ' name: ', name, ' data: ', data);
     }
 
-    const o = buildOne(messages, name, data);
+    const o = ProtocolV1.encodeEnvelope(messages, name, data);
     const outData = o.toString('hex');
     const resData = await this._post({
       url: `/call/${session}`,
@@ -127,7 +136,7 @@ export default class HttpTransport {
     if (typeof resData !== 'string') {
       throw ERRORS.TypedError(HardwareErrorCode.NetworkError, 'Returning data is not string.');
     }
-    const jsonData = receiveOne(messages, resData);
+    const jsonData = ProtocolV1.decodeMessage(messages, resData);
     return check.call(jsonData);
   }
 
@@ -136,7 +145,7 @@ export default class HttpTransport {
       throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
     }
     const messages = this._messages;
-    const outData = buildOne(messages, name, data).toString('hex');
+    const outData = ProtocolV1.encodeEnvelope(messages, name, data).toString('hex');
     await this._post({
       url: `/post/${session}`,
       body: outData,
@@ -154,7 +163,7 @@ export default class HttpTransport {
     if (typeof resData !== 'string') {
       throw ERRORS.TypedError(HardwareErrorCode.NetworkError, 'Returning data is not string.');
     }
-    const jsonData = receiveOne(messages, resData);
+    const jsonData = ProtocolV1.decodeMessage(messages, resData);
     return check.call(jsonData);
   }