@onekeyfe/hd-transport-usb 1.2.0-alpha.21 → 1.2.0-alpha.22

package/__tests__/protocol-v2-link.test.ts

@@ -290,19 +290,19 @@ describe('NodeUsbTransport Protocol V2 link lifecycle', () => {
     expect(transport.getProtocolType(path)).toBeUndefined();
   });
 
-  test('trusts explicit Protocol V2 during bootloader reconnect without probing Ping', async () => {
+  test('actively probes explicit Protocol V2 during bootloader reconnect', async () => {
     const harness = createHarness();
     const { transport, path, epOut } = harness;
 
     await transport.enumerate();
     await transport.acquire({ path, expectedProtocol: 'V2' });
 
-    expect(epOut.makeTransfer).not.toHaveBeenCalled();
+    expect(epOut.makeTransfer).toHaveBeenCalledTimes(1);
     expect(transport.getProtocolType(path)).toBe('V2');
     await transport.release(path);
   });
 
-  test('keeps seq across calls and reacquire without probing explicit V2', async () => {
+  test('keeps seq across calls and actively probed reacquire', async () => {
     const harness = createHarness();
     const { transport, path, sentSeqs } = harness;
 
@@ -312,7 +312,7 @@ describe('NodeUsbTransport Protocol V2 link lifecycle', () => {
     await harness.acquire();
     await transport.call(path, 'Ping', { message: 'second' });
 
-    expect(sentSeqs).toEqual([1, 2]);
+    expect(sentSeqs).toEqual([1, 2, 3, 4]);
     await transport.release(path);
   });
 
@@ -381,7 +381,7 @@ describe('NodeUsbTransport Protocol V2 link lifecycle', () => {
     await harness.acquire();
     await transport.call(path, 'Ping', { message: 'after-timeout' });
 
-    expect(sentSeqs).toEqual([1, 2]);
+    expect(sentSeqs).toEqual([1, 2, 3, 4]);
     await transport.release(path);
   });
 });

package/dist/index.js

@@ -644,9 +644,12 @@ class NodeUsbTransport extends transport.ProtocolV2UsbTransportBase {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (expectedProtocol === 'V2') {
-                this.deviceProtocol.set(path, 'V2');
-                (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug(`[NodeUsbTransport] detectProtocol: path=${path} -> V2 (expected)`);
-                return 'V2';
+                if (yield this.probeProtocolV2(path)) {
+                    this.deviceProtocol.set(path, 'V2');
+                    (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug(`[NodeUsbTransport] detectProtocol: path=${path} -> V2 (expected)`);
+                    return 'V2';
+                }
+                throw this.createProtocolMismatchError(expectedProtocol);
             }
             if (expectedProtocol === 'V1') {
                 if (yield this.probeProtocolV1(path)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-usb",
-  "version": "1.2.0-alpha.21",
+  "version": "1.2.0-alpha.22",
   "description": "OneKey hardware wallet direct USB transport plugin (libusb)",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
@@ -20,10 +20,10 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.0-alpha.21",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.21",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.22",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.22",
     "bytebuffer": "^5.0.1",
     "usb": "^2.14.0"
   },
-  "gitHead": "efe594367fb3b196a5126baee7e2aba3e94986cd"
+  "gitHead": "ce94a5ebbe141b0c15db7c68d08085ca1ddb0166"
 }

package/src/index.ts

@@ -833,12 +833,12 @@ export default class NodeUsbTransport extends ProtocolV2UsbTransportBase<string>
     expectedProtocol?: ProtocolType
   ): Promise<ProtocolType> {
     if (expectedProtocol === 'V2') {
-      // Bootloader may not answer Ping after an update reboot. An explicit V2 hint means
-      // the protocol was confirmed earlier; establish the link and let the first command
-      // verify that USB initialization completed.
-      this.deviceProtocol.set(path, 'V2');
-      this.Log?.debug(`[NodeUsbTransport] detectProtocol: path=${path} -> V2 (expected)`);
-      return 'V2';
+      if (await this.probeProtocolV2(path)) {
+        this.deviceProtocol.set(path, 'V2');
+        this.Log?.debug(`[NodeUsbTransport] detectProtocol: path=${path} -> V2 (expected)`);
+        return 'V2';
+      }
+      throw this.createProtocolMismatchError(expectedProtocol);
     }
 
     if (expectedProtocol === 'V1') {