@onekeyfe/hd-transport-lowlevel 1.2.0-alpha.147 → 1.2.0-alpha.149

package/__tests__/protocol-v2.test.js

@@ -249,7 +249,11 @@ describe('LowlevelTransport protocol framing', () => {
     );
     const plugin = createPlugin({
       devices: [{ id: 'pro2-id', name: 'OneKey Pro 2', commType: 'ble' }],
-      responses: [...splitFrame(probeResponse, 4), ...splitFrame(callResponse, 5)],
+      responses: [
+        new Error('Protocol V1 probe timed out'),
+        ...splitFrame(probeResponse, 4),
+        ...splitFrame(callResponse, 5),
+      ],
     });
     const lowlevel = configureTransport(plugin);
 
@@ -269,9 +273,9 @@ describe('LowlevelTransport protocol framing', () => {
       },
     });
     expect(plugin.send).toHaveBeenCalled();
-    const sentSeqs = plugin.send.mock.calls.map(([, hex]) =>
-      Number.parseInt(hex.slice(12, 14), 16)
-    );
+    const sentSeqs = plugin.send.mock.calls
+      .map(([, hex]) => Number.parseInt(hex.slice(12, 14), 16))
+      .filter(seq => seq > 0);
     expect(sentSeqs).toEqual([1, 2]);
   });
 
@@ -295,7 +299,7 @@ describe('LowlevelTransport protocol framing', () => {
     expect(lowlevel.getProtocolType('unknown-pro2-id')).toBe('V2');
   });
 
-  test('retains the Protocol V2 hint and sequence cursor across release and reacquire', async () => {
+  test('detects Protocol V2 again after release without a name-derived hint', async () => {
     const probeResponse = ProtocolV2.encodeFrame(
       schemas,
       'Success',
@@ -304,7 +308,12 @@ describe('LowlevelTransport protocol framing', () => {
     );
     const plugin = createPlugin({
       devices: [{ id: 'reconnect-pro2-id', name: 'OneKey Pro 2', commType: 'ble' }],
-      responses: [bytesToHex(probeResponse), bytesToHex(probeResponse)],
+      responses: [
+        new Error('Protocol V1 probe timed out'),
+        bytesToHex(probeResponse),
+        new Error('Protocol V1 probe timed out'),
+        bytesToHex(probeResponse),
+      ],
     });
     const lowlevel = configureTransport(plugin);
 
@@ -319,9 +328,9 @@ describe('LowlevelTransport protocol framing', () => {
       protocolType: 'V2',
     });
 
-    const sentSeqs = plugin.send.mock.calls.map(([, hex]) =>
-      Number.parseInt(hex.slice(12, 14), 16)
-    );
+    const sentSeqs = plugin.send.mock.calls
+      .map(([, hex]) => Number.parseInt(hex.slice(12, 14), 16))
+      .filter(seq => seq > 0);
     expect(sentSeqs).toEqual([1, 2]);
   });
 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as transport from '@onekeyfe/hd-transport';
-import transport__default, { ProtocolType, LowlevelTransportSharedPlugin, LowLevelDevice, TransportCallOptions } from '@onekeyfe/hd-transport';
+import transport__default, { ProtocolType, LowlevelTransportSharedPlugin, TransportCallOptions } from '@onekeyfe/hd-transport';
 import EventEmitter from 'events';
 
 type LowLevelAcquireInput = {
@@ -36,7 +36,7 @@ declare class LowlevelTransport {
     configure(signedData: any): void;
     configureProtocolV2(signedData: any): void;
     listen(): void;
-    enumerate(): Promise<LowLevelDevice[]>;
+    enumerate(): Promise<transport.LowLevelDevice[]>;
     acquire(input: LowLevelAcquireInput): Promise<{
         uuid: string;
         protocolType: ProtocolType;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,SAYN,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,YAAY,EAEZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAUpD,wBAAgB,+BAA+B,CAAC,EAC9C,OAAO,EACP,iBAAiB,EACjB,GAAG,EACH,YAAY,GACb,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;CACtB,WAMA;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM;;cAEpD;AAcD,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,WAAW,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAErE,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB,MAAM,EAAE,6BAA6B,CAAuC;IAE5E,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,OAAO,CAAC,oBAAoB,CAAoD;IAEhF,OAAO,CAAC,qBAAqB,CAAkC;IAE/D,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO,CAAC,eAAe,CA6BpB;IAEH,OAAO,CAAC,6BAA6B,CAAqB;IAE1D,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIvD,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,6BAA6B;IAO9E,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAiBnC,MAAM;IAIA,SAAS;IAWT,OAAO,CAAC,KAAK,EAAE,oBAAoB;;;;IAmDnC,OAAO,CAAC,IAAI,EAAE,MAAM;IAgBpB,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;IAoB1B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;YAatD,cAAc;IA6E5B,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;YA2Cd,yBAAyB;YAiCzB,eAAe;YAgBf,eAAe;YA6Bf,UAAU;YAUV,qBAAqB;YAmBrB,mBAAmB;YAqBnB,oBAAoB;YAgBpB,cAAc;IAwB5B,OAAO,CAAC,uBAAuB;IAgC/B,OAAO,CAAC,2BAA2B;IAMnC,MAAM;CAGP"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,SAYN,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EACV,6BAA6B,EAC7B,YAAY,EAEZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAUpD,wBAAgB,+BAA+B,CAAC,EAC9C,OAAO,EACP,iBAAiB,EACjB,GAAG,EACH,YAAY,GACb,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;CACtB,WAMA;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM;;cAEpD;AAUD,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,WAAW,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAErE,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB,MAAM,EAAE,6BAA6B,CAAuC;IAE5E,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,OAAO,CAAC,oBAAoB,CAAoD;IAEhF,OAAO,CAAC,qBAAqB,CAAkC;IAE/D,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO,CAAC,eAAe,CA6BpB;IAEH,OAAO,CAAC,6BAA6B,CAAqB;IAE1D,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIvD,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,6BAA6B;IAO9E,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAiBnC,MAAM;IAIA,SAAS;IAKT,OAAO,CAAC,KAAK,EAAE,oBAAoB;;;;IAmDnC,OAAO,CAAC,IAAI,EAAE,MAAM;IAepB,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;IAoB1B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;YAatD,cAAc;IA6E5B,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;YA2Cd,yBAAyB;YAiCzB,eAAe;YAgBf,eAAe;YA6Bf,UAAU;YAUV,qBAAqB;YAmBrB,mBAAmB;YAqBnB,oBAAoB;YAgBpB,cAAc;IAwB5B,OAAO,CAAC,uBAAuB;IAgC/B,OAAO,CAAC,2BAA2B;IAMnC,MAAM;CAGP"}

package/dist/index.js

@@ -53,9 +53,6 @@ function shouldLogFirmwareUploadProgress({ percent, lastLoggedPercent, now, last
 function getProtocolV1SendOptions(name) {
     return name === 'FirmwareUpload' ? { withoutResponse: false } : undefined;
 }
-function inferProtocolHintFromDeviceName(name) {
-    return /\bpro\s*2\b/i.test(name !== null && name !== void 0 ? name : '') ? 'V2' : undefined;
-}
 function isProtocolV1TransportChunk(data) {
     return data.length >= 9 && data[0] === 0x3f && data[1] === 0x23 && data[2] === 0x23;
 }
@@ -135,13 +132,7 @@ class LowlevelTransport {
     enumerate() {
         return __awaiter(this, void 0, void 0, function* () {
             const devices = yield this.plugin.enumerate();
-            return devices.map((device) => {
-                const protocolHint = inferProtocolHintFromDeviceName(device.name);
-                if (protocolHint) {
-                    this.deviceProtocolHints.set(device.id, protocolHint);
-                }
-                return device;
-            });
+            return devices;
         });
     }
     acquire(input) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-lowlevel",
-  "version": "1.2.0-alpha.147",
+  "version": "1.2.0-alpha.149",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -20,8 +20,8 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.0-alpha.147",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.147"
+    "@onekeyfe/hd-shared": "1.2.0-alpha.149",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.149"
   },
-  "gitHead": "a34e98865e6be227cf3e00d486146e6592761db0"
+  "gitHead": "0c2b72c1edbafb2b738e3eb0b9ecdad8d8b92df7"
 }

package/src/index.ts

@@ -15,7 +15,6 @@ import transport, {
 
 import type EventEmitter from 'events';
 import type {
-  LowLevelDevice,
   LowlevelTransportSharedPlugin,
   ProtocolType,
   ProtocolV2CallContext,
@@ -53,10 +52,6 @@ export function getProtocolV1SendOptions(name: string) {
   return name === 'FirmwareUpload' ? { withoutResponse: false } : undefined;
 }
 
-function inferProtocolHintFromDeviceName(name?: string | null): ProtocolType | undefined {
-  return /\bpro\s*2\b/i.test(name ?? '') ? 'V2' : undefined;
-}
-
 function isProtocolV1TransportChunk(data: Uint8Array) {
   return data.length >= 9 && data[0] === 0x3f && data[1] === 0x23 && data[2] === 0x23;
 }
@@ -161,13 +156,7 @@ export default class LowlevelTransport {
 
   async enumerate() {
     const devices = await this.plugin.enumerate();
-    return devices.map((device: LowLevelDevice) => {
-      const protocolHint = inferProtocolHintFromDeviceName(device.name);
-      if (protocolHint) {
-        this.deviceProtocolHints.set(device.id, protocolHint);
-      }
-      return device;
-    });
+    return devices;
   }
 
   async acquire(input: LowLevelAcquireInput) {
@@ -227,8 +216,7 @@ export default class LowlevelTransport {
       await this.plugin.disconnect(uuid);
       this.connectedDevices.delete(uuid);
       this.deviceProtocol.delete(uuid);
-      // A name-derived protocol hint survives disconnect and lets fast reconnect probe
-      // Protocol V2 first without sending a redundant V1 Initialize.
+      // Confirmed protocol stays on the device endpoint; BLE names are not a probe hint.
       this.protocolV2Assemblers.delete(uuid);
       return true;
     } catch (error) {