@onekeyfe/hd-transport-emulator 1.1.34-alpha.3 → 1.1.34-alpha.4

package/dist/index.d.ts

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

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;AAM/C,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,iBAAiB;IACpC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,IAAI,SAAuB;IAE3B,OAAO,SAAW;IAElB,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,UAAU,UAAS;IAGnB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY;IAI5C,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;IAqBjE,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,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,iBAAiB;IACpC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,IAAI,SAAuB;IAE3B,OAAO,SAAW;IAElB,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,UAAU,UAAS;IAEnB,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"}

package/dist/index.js

@@ -102,6 +102,7 @@ axios__default["default"].interceptors.request.use((config) => {
     }
     if ((_a = config.url) === null || _a === void 0 ? void 0 : _a.startsWith('http://localhost:21333')) {
         if (!config.headers.get('Origin')) {
+            console.log('set node request origin');
             config.headers.set('Origin', 'https://jssdk.onekey.so');
         }
     }
@@ -110,11 +111,8 @@ axios__default["default"].interceptors.request.use((config) => {
 
 const DEFAULT_URL = 'http://localhost:21333';
 
-const { check, ProtocolV1, parseConfigure } = transport__default["default"];
+const { check, buildOne, receiveOne, parseConfigure } = transport__default["default"];
 class EmulatorTransport {
-    getProtocolType(_path) {
-        return 'V1';
-    }
     constructor(url) {
         this.name = 'EmulatorTransport';
         this.version = '1.0.0';
@@ -201,8 +199,13 @@ class EmulatorTransport {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
             const messages = this._messages;
-            this.Log.debug('transport call', { name, protocol: 'V1' });
-            const o = ProtocolV1.encodeEnvelope(messages, name, data);
+            if (transport.LogBlockCommand.has(name)) {
+                this.Log.debug('call-', ' name: ', name);
+            }
+            else {
+                this.Log.debug('call-', ' name: ', name, ' data: ', data);
+            }
+            const o = buildOne(messages, name, data);
             const outData = o.toString('hex');
             const resData = yield this._post({
                 url: `/call/${session}`,
@@ -212,7 +215,7 @@ class EmulatorTransport {
             if (typeof resData !== 'string') {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NetworkError, 'Returning data is not string.');
             }
-            const jsonData = ProtocolV1.decodeMessage(messages, resData);
+            const jsonData = receiveOne(messages, resData);
             return check.call(jsonData);
         });
     }
@@ -222,7 +225,7 @@ class EmulatorTransport {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
             const messages = this._messages;
-            const outData = ProtocolV1.encodeEnvelope(messages, name, data).toString('hex');
+            const outData = buildOne(messages, name, data).toString('hex');
             yield this._post({
                 url: `/post/${session}`,
                 body: outData,
@@ -241,7 +244,7 @@ class EmulatorTransport {
             if (typeof resData !== 'string') {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NetworkError, 'Returning data is not string.');
             }
-            const jsonData = ProtocolV1.decodeMessage(messages, resData);
+            const jsonData = receiveOne(messages, resData);
             return check.call(jsonData);
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-emulator",
-  "version": "1.1.34-alpha.3",
+  "version": "1.1.34-alpha.4",
   "description": "hardware emulator 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.34-alpha.3",
-    "@onekeyfe/hd-transport": "1.1.34-alpha.3",
+    "@onekeyfe/hd-shared": "1.1.34-alpha.4",
+    "@onekeyfe/hd-transport": "1.1.34-alpha.4",
     "axios": "1.15.2",
     "secure-json-parse": "^4.0.0"
   },
-  "gitHead": "3688bc8495eeb2ffd5616270d13fa29e8967623a"
+  "gitHead": "d546bc55410990351d34009230aefea77725d0d6"
 }

package/src/http.ts

@@ -75,6 +75,7 @@ axios.interceptors.request.use((config: InternalAxiosRequestConfig) => {
   // node environment
   if (config.url?.startsWith('http://localhost:21333')) {
     if (!config.headers.get('Origin')) {
+      console.log('set node request origin');
       // add Origin field for request headers
       config.headers.set('Origin', 'https://jssdk.onekey.so');
     }

package/src/index.ts

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