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

package/__tests__/electron-ble-transport.test.ts

@@ -141,7 +141,6 @@ describe('ElectronBleTransport protocol detection', () => {
       { message: 'ok' },
       { router: PROTOCOL_V2_CHANNEL_BLE_UART }
     );
-
     nobleBle.onNotification.mockImplementation(handler => {
       notificationHandler = handler;
       return jest.fn();
@@ -220,19 +219,21 @@ describe('ElectronBleTransport protocol detection', () => {
     const device = { id: 'named-pro2-id', name: 'OneKey Pro 2' };
     const nobleBle = createNobleBle(device);
     let notificationHandler: ((deviceId: string, data: string) => void) | undefined;
-    const probeResponse = ProtocolV2.encodeFrame(
-      schemas,
-      'Success',
-      { message: 'ok' },
-      { router: PROTOCOL_V2_CHANNEL_BLE_UART }
-    );
 
     nobleBle.onNotification.mockImplementation(handler => {
       notificationHandler = handler;
       return jest.fn();
     });
+    let responseSeq = 0;
     nobleBle.write.mockImplementation(() => {
-      setTimeout(() => notificationHandler?.(device.id, bytesToHex(probeResponse)), 0);
+      responseSeq += 1;
+      const response = ProtocolV2.encodeFrame(
+        schemas,
+        'Success',
+        { message: 'ok' },
+        { router: PROTOCOL_V2_CHANNEL_BLE_UART, seq: responseSeq }
+      );
+      setTimeout(() => notificationHandler?.(device.id, bytesToHex(response)), 0);
       return Promise.resolve();
     });
     const transport = configureTransport(nobleBle);
@@ -304,19 +305,20 @@ describe('ElectronBleTransport protocol detection', () => {
     const device = { id: 'repeated-acquire-pro2-id', name: 'OneKey Pro 2' };
     const nobleBle = createNobleBle(device);
     let notificationHandler: ((deviceId: string, data: string) => void) | undefined;
-    const response = ProtocolV2.encodeFrame(
-      schemas,
-      'Success',
-      { message: 'ok' },
-      { router: PROTOCOL_V2_CHANNEL_BLE_UART }
-    );
-
     nobleBle.onNotification.mockImplementation(handler => {
       notificationHandler = handler;
       return jest.fn();
     });
+    let responseSeq = 0;
     nobleBle.write.mockImplementation(() => {
-      setTimeout(() => notificationHandler?.(device.id, bytesToHex(response)), 0);
+      responseSeq += 1;
+      const sequencedResponse = ProtocolV2.encodeFrame(
+        schemas,
+        'Success',
+        { message: 'ok' },
+        { router: PROTOCOL_V2_CHANNEL_BLE_UART, seq: responseSeq }
+      );
+      setTimeout(() => notificationHandler?.(device.id, bytesToHex(sequencedResponse)), 0);
       return Promise.resolve();
     });
     const transport = configureTransport(nobleBle);
@@ -334,7 +336,7 @@ describe('ElectronBleTransport protocol detection', () => {
       const sentSeqs = nobleBle.write.mock.calls.map(([, hex]) =>
         Number.parseInt(hex.slice(12, 14), 16)
       );
-      expect(sentSeqs).toEqual([1, 2]);
+      expect(sentSeqs).toEqual([1, 2, 3]);
     } finally {
       await transport.release(device.id);
     }

package/__tests__/webusb-protocol-v2-timeout.test.ts

@@ -1,4 +1,8 @@
-import transport, { ProtocolV2FrameAssembler } from '@onekeyfe/hd-transport';
+import transport, {
+  ProtocolV2,
+  ProtocolV2FrameAssembler,
+  ProtocolV2LinkError,
+} from '@onekeyfe/hd-transport';
 
 import WebUsbTransport from '../src/webusb';
 
@@ -49,7 +53,6 @@ describe('WebUsbTransport Protocol V2 timeout recovery', () => {
     webusb.receiveProtocolV2Frame = jest.fn(() => new Promise<void>(() => {}));
     webusb.resetConnectionAfterProbe = jest.fn().mockImplementation(() => {
       webusb.protocolV2Sessions.delete(path);
-      webusb.protocolV2ReadTimeouts.delete(path);
       webusb.protocolV2Assemblers.get(path)?.reset();
     });
 
@@ -60,4 +63,102 @@ describe('WebUsbTransport Protocol V2 timeout recovery', () => {
     expect(webusb.resetConnectionAfterProbe).toHaveBeenCalledWith(path);
     expect(webusb.protocolV2Sessions.has(path)).toBe(false);
   });
+
+  test.each(['router', 'packet-source', 'ack-sequence', 'response-sequence', 'frame'] as const)(
+    'invalidates cached state for typed Protocol V2 %s errors',
+    async code => {
+      const webusb = new WebUsbTransport() as any;
+      const path = 'pro2-webusb';
+      webusb.messages = transport.parseConfigure(schema);
+      webusb.messagesV2 = transport.parseConfigure(schema);
+      webusb.protocolV2Assemblers.set(path, new ProtocolV2FrameAssembler());
+      webusb.transferOutOnce = jest.fn().mockResolvedValue(undefined);
+      const recoveredResponse = ProtocolV2.encodeFrame(
+        { protocolV1: webusb.messages, protocolV2: webusb.messagesV2 },
+        'Success',
+        { message: 'recovered' },
+        { seq: 1 }
+      );
+      webusb.receiveProtocolV2Frame = jest
+        .fn()
+        .mockRejectedValueOnce(
+          new ProtocolV2LinkError(code, `Protocol V2 ${code} validation failed`)
+        )
+        .mockResolvedValue(recoveredResponse);
+      webusb.resetConnectionAfterProbe = jest.fn().mockImplementation(() => {
+        webusb.protocolV2Sessions.delete(path);
+        webusb.protocolV2Assemblers.get(path)?.reset();
+      });
+
+      await expect(webusb.callProtocolV2(path, 'Ping', { message: 'mismatch' })).rejects.toThrow(
+        `${code} validation failed`
+      );
+
+      expect(webusb.resetConnectionAfterProbe).toHaveBeenCalledWith(path);
+      expect(webusb.protocolV2Sessions.has(path)).toBe(false);
+
+      await expect(
+        webusb.callProtocolV2(path, 'Ping', { message: 'after-reset' })
+      ).resolves.toMatchObject({
+        type: 'Success',
+        message: { message: 'recovered' },
+      });
+    }
+  );
+
+  test('does not discard buffered Protocol V2 frames before each call', async () => {
+    const webusb = new WebUsbTransport() as any;
+    const path = 'pro2-webusb';
+    const assembler = new ProtocolV2FrameAssembler();
+    const reset = jest.spyOn(assembler, 'reset');
+    let responseSequence = 0;
+    webusb.messages = transport.parseConfigure(schema);
+    webusb.messagesV2 = transport.parseConfigure(schema);
+    webusb.protocolV2Assemblers.set(path, assembler);
+    webusb.transferOutOnce = jest.fn().mockResolvedValue(undefined);
+    webusb.receiveProtocolV2Frame = jest.fn().mockImplementation(() => {
+      responseSequence += 1;
+      const response = ProtocolV2.encodeFrame(
+        { protocolV1: webusb.messages, protocolV2: webusb.messagesV2 },
+        'Success',
+        { message: 'ok' },
+        { seq: responseSequence }
+      );
+      return Promise.resolve(response);
+    });
+
+    await webusb.callProtocolV2(path, 'Ping', { message: 'first' });
+    await webusb.callProtocolV2(path, 'Ping', { message: 'second' });
+
+    expect(reset).not.toHaveBeenCalled();
+  });
+
+  test('keeps queued Protocol V2 read timeouts scoped to each call', async () => {
+    const webusb = new WebUsbTransport() as any;
+    const path = 'pro2-webusb';
+    let responseSequence = 0;
+    webusb.messages = transport.parseConfigure(schema);
+    webusb.messagesV2 = transport.parseConfigure(schema);
+    webusb.transferOutOnce = jest.fn().mockResolvedValue(undefined);
+    webusb.receiveProtocolV2Frame = jest.fn().mockImplementation(() => {
+      responseSequence += 1;
+      return Promise.resolve(
+        ProtocolV2.encodeFrame(
+          { protocolV1: webusb.messages, protocolV2: webusb.messagesV2 },
+          'Success',
+          { message: 'ok' },
+          { seq: responseSequence }
+        )
+      );
+    });
+
+    await Promise.all([
+      webusb.callProtocolV2(path, 'Ping', { message: 'long' }, { timeoutMs: 1_000 }),
+      webusb.callProtocolV2(path, 'Ping', { message: 'short' }, { timeoutMs: 25 }),
+    ]);
+
+    expect(
+      webusb.receiveProtocolV2Frame.mock.calls.map(([, timeoutMs]: unknown[]) => timeoutMs)
+    ).toEqual([1_000, 25]);
+  });
 });

package/dist/electron-ble-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"electron-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-ble-transport.ts"],"names":[],"mappings":";AAoBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACnG,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAIvC,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,UAAU,CAAC,EAAE,UAAU,CAAC;KACzB;CACF;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,gBAAgB,CAAC,EAAE,YAAY,CAAC;CACjC,CAAC;AAqCF,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC,OAAO,CAAC,SAAS,CAA0D;IAE3E,OAAO,CAAC,WAAW,CAA0D;IAE7E,IAAI,SAA0B;IAE9B,UAAU,UAAS;IAEnB,UAAU,EAAE,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,GAAG,IAAI,CAAQ;IAExD,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,OAAO,CAAC,SAAS,CAAsE;IAEvF,OAAO,CAAC,YAAY,CAAoD;IAExE,OAAO,CAAC,aAAa,CAAwC;IAE7D,OAAO,CAAC,eAAe,CAAgD;IAEvE,OAAO,CAAC,eAAe,CAmBpB;IAEH,OAAO,CAAC,oBAAoB,CAAsC;IAElE,OAAO,CAAC,kBAAkB,CAAsC;IAEhE,OAAO,CAAC,kBAAkB,CAAkC;IAE5D,OAAO,CAAC,qBAAqB,CAAK;IAElC,OAAO,CAAC,oBAAoB;IA+B5B,OAAO,CAAC,kBAAkB;IA0B1B,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAcxC,SAAS,CAAC,UAAU,EAAE,GAAG;IAKzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAO7B,MAAM;IAIN,SAAS,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAqBxC,OAAO,CAAC,KAAK,EAAE,eAAe;;;;;;;;;;;IA0F9B,OAAO,CAAC,EAAE,EAAE,MAAM;IAgBxB,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;IA8C5B,OAAO,CAAC,8BAA8B;YAgBxB,iCAAiC;YAqCjC,eAAe;YAgBf,eAAe;YAuBf,iBAAiB;YAsBjB,SAAS;IASvB,OAAO,CAAC,kBAAkB;IAwB1B,OAAO,CAAC,4BAA4B;IAkBpC,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,qBAAqB;IAK7B,OAAO,CAAC,sBAAsB;YAShB,mBAAmB;IAiBjC,OAAO,CAAC,4BAA4B;IAgB9B,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YA2BlB,cAAc;YAuEd,cAAc;IA6B5B,OAAO,CAAC,uBAAuB;IA0C/B,OAAO,CAAC,6BAA6B;IAsCrC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;CAGxD"}
+{"version":3,"file":"electron-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-ble-transport.ts"],"names":[],"mappings":";AAoBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACnG,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAIvC,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,UAAU,CAAC,EAAE,UAAU,CAAC;KACzB;CACF;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,gBAAgB,CAAC,EAAE,YAAY,CAAC;CACjC,CAAC;AAoCF,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC,OAAO,CAAC,SAAS,CAA0D;IAE3E,OAAO,CAAC,WAAW,CAA0D;IAE7E,IAAI,SAA0B;IAE9B,UAAU,UAAS;IAEnB,UAAU,EAAE,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,GAAG,IAAI,CAAQ;IAExD,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,OAAO,CAAC,SAAS,CAAsE;IAEvF,OAAO,CAAC,YAAY,CAAoD;IAExE,OAAO,CAAC,aAAa,CAAwC;IAE7D,OAAO,CAAC,eAAe,CAAgD;IAEvE,OAAO,CAAC,eAAe,CAmBpB;IAEH,OAAO,CAAC,oBAAoB,CAAsC;IAElE,OAAO,CAAC,kBAAkB,CAAsC;IAEhE,OAAO,CAAC,kBAAkB,CAAkC;IAE5D,OAAO,CAAC,qBAAqB,CAAK;IAElC,OAAO,CAAC,oBAAoB;IA+B5B,OAAO,CAAC,kBAAkB;IA0B1B,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAcxC,SAAS,CAAC,UAAU,EAAE,GAAG;IAKzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAO7B,MAAM;IAIN,SAAS,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAqBxC,OAAO,CAAC,KAAK,EAAE,eAAe;;;;;;;;;;;IA0F9B,OAAO,CAAC,EAAE,EAAE,MAAM;IAgBxB,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;IA+C5B,OAAO,CAAC,8BAA8B;YAgBxB,iCAAiC;YAqCjC,eAAe;YAgBf,eAAe;YAuBf,iBAAiB;YAsBjB,SAAS;IASvB,OAAO,CAAC,kBAAkB;IAwB1B,OAAO,CAAC,4BAA4B;IAkBpC,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,qBAAqB;IAK7B,OAAO,CAAC,sBAAsB;YAShB,mBAAmB;IAiBjC,OAAO,CAAC,4BAA4B;IAgB9B,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YA2BlB,cAAc;YAuEd,cAAc;IA0B5B,OAAO,CAAC,uBAAuB;IA0C/B,OAAO,CAAC,6BAA6B;IAsCrC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;CAGxD"}

package/dist/index.d.ts

@@ -25,8 +25,6 @@ declare class WebUsbTransport {
     private protocolV2Sessions;
     /** Sequence cursors survive ordinary reconnects and cached session rebuilds. */
     private protocolV2Sequences;
-    /** Read timeout for the current Protocol V2 call, consumed by cached readFrame. */
-    private protocolV2ReadTimeouts;
     /** Per-path USB endpoint / interface numbers (discovered from USB descriptors) */
     private deviceEndpoints;
     /**

package/dist/index.js

@@ -70,7 +70,6 @@ class WebUsbTransport {
         this.protocolV2Assemblers = new Map();
         this.protocolV2Sessions = new Map();
         this.protocolV2Sequences = new Map();
-        this.protocolV2ReadTimeouts = new Map();
         this.deviceEndpoints = new Map();
         this.mockSerialPaths = new WeakMap();
         this.mockSerialCounter = 0;
@@ -98,7 +97,6 @@ class WebUsbTransport {
     configureProtocolV2(signedData) {
         this.messagesV2 = parseConfigure$1(signedData);
         this.protocolV2Sessions.clear();
-        this.protocolV2ReadTimeouts.clear();
     }
     promptDeviceAccess() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -199,8 +197,11 @@ class WebUsbTransport {
                 throw this.createProtocolMismatchError(expectedProtocol);
             }
             if (expectedProtocol === 'V2') {
-                this.deviceProtocol.set(path, 'V2');
-                return 'V2';
+                if (yield this.probeProtocolV2(path)) {
+                    this.deviceProtocol.set(path, 'V2');
+                    return 'V2';
+                }
+                throw this.createProtocolMismatchError(expectedProtocol);
             }
             const probeOrder = protocolHint === 'V2' || this.deviceProtocol.get(path) === 'V2' ? ['V2', 'V1'] : ['V1', 'V2'];
             for (const protocol of probeOrder) {
@@ -495,7 +496,6 @@ class WebUsbTransport {
         return __awaiter(this, void 0, void 0, function* () {
             (_a = this.protocolV2Assemblers.get(path)) === null || _a === void 0 ? void 0 : _a.reset();
             this.protocolV2Sessions.delete(path);
-            this.protocolV2ReadTimeouts.delete(path);
             try {
                 const device = yield this.findDevice(path);
                 if (device.opened) {
@@ -517,7 +517,7 @@ class WebUsbTransport {
             yield this.connect(path, false);
         });
     }
-    withProtocolReadTimeout(_path, promise, timeoutMs, protocol, onTimeout) {
+    withProtocolReadTimeout(path, promise, timeoutMs, protocol, onTimeout) {
         return __awaiter(this, void 0, void 0, function* () {
             let timer;
             let timedOut = false;
@@ -532,11 +532,19 @@ class WebUsbTransport {
                 return yield Promise.race([
                     guardedPromise,
                     new Promise((_, reject) => {
-                        timer = setTimeout(() => {
+                        timer = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
                             timedOut = true;
                             onTimeout === null || onTimeout === void 0 ? void 0 : onTimeout();
+                            if (protocol === 'V1') {
+                                try {
+                                    yield this.resetConnectionAfterProbe(path);
+                                }
+                                catch (error) {
+                                    this.Log.debug('[WebUsbTransport] reset after Protocol V1 timeout failed:', error);
+                                }
+                            }
                             reject(new Error(`Protocol ${protocol} read timeout after ${timeoutMs}ms`));
-                        }, timeoutMs);
+                        }), timeoutMs);
                     }),
                 ]);
             }
@@ -617,7 +625,6 @@ class WebUsbTransport {
         });
     }
     callProtocolV2(path, name, data, options) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const protocolV1Messages = this.messages;
             if (!this.messagesV2) {
@@ -641,33 +648,27 @@ class WebUsbTransport {
                     router: transport.PROTOCOL_V2_CHANNEL_USB,
                     sequenceCursor,
                     writeFrame: (frame) => this.transferOutOnce(path, frame),
-                    readFrame: () => this.receiveProtocolV2Frame(path, this.protocolV2ReadTimeouts.get(path)),
+                    readFrame: context => this.receiveProtocolV2Frame(path, context.timeoutMs),
                     logger: this.Log,
                     logPrefix: 'ProtocolV2 WebUSB',
-                    createTimeoutError: (messageName, timeoutMs) => new Error(`Protocol V2 response timeout after ${timeoutMs}ms for ${messageName}`),
+                    createTimeoutError: (messageName, timeoutMs) => new transport.ProtocolV2LinkError('response-timeout', `Protocol V2 response timeout after ${timeoutMs}ms for ${messageName}`),
                 });
                 this.protocolV2Sessions.set(path, session);
             }
-            this.protocolV2ReadTimeouts.set(path, options === null || options === void 0 ? void 0 : options.timeoutMs);
-            (_a = this.protocolV2Assemblers.get(path)) === null || _a === void 0 ? void 0 : _a.reset();
             try {
                 return yield session.call(name, data, options);
             }
             catch (error) {
-                const message = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
-                if (message.includes('protocol v2 read timeout') || message.includes('response timeout')) {
+                if (transport.isProtocolV2LinkError(error) || this.isRetryablePacketIoError(error)) {
                     try {
                         yield this.resetConnectionAfterProbe(path);
                     }
                     catch (resetError) {
-                        this.Log.debug('[WebUsbTransport] Protocol V2 timeout reset failed:', resetError);
+                        this.Log.debug('[WebUsbTransport] Protocol V2 link reset failed:', resetError);
                     }
                 }
                 throw error;
             }
-            finally {
-                this.protocolV2ReadTimeouts.delete(path);
-            }
         });
     }
     receiveProtocolV2Frame(path, timeoutMs) {
@@ -688,12 +689,7 @@ class WebUsbTransport {
                     })
                     : yield transferIn;
                 const bytes = new Uint8Array(this.toArrayBuffer(dataView.buffer.slice(dataView.byteOffset, dataView.byteOffset + dataView.byteLength)));
-                try {
-                    frame = assembler.push(bytes);
-                }
-                catch (error) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NetworkError, error instanceof Error ? error.message : String(error));
-                }
+                frame = assembler.push(bytes);
             }
             return frame;
         });
@@ -748,7 +744,6 @@ class WebUsbTransport {
             (_b = this.protocolV2Assemblers.get(path)) === null || _b === void 0 ? void 0 : _b.reset();
             this.protocolV2Assemblers.delete(path);
             this.protocolV2Sessions.delete(path);
-            this.protocolV2ReadTimeouts.delete(path);
             this.deviceEndpoints.delete(path);
         });
     }
@@ -764,7 +759,6 @@ function inferProtocolHintFromDeviceName(name) {
 const toBleDescriptor = (device, protocolType) => (Object.assign({ id: device.id, name: device.name, path: device.id, debug: false, commType: 'electron-ble' }, (protocolType ? { protocolType } : {})));
 const BLE_PACKET_SIZE = 192;
 const BLE_WRITE_DELAY_MS = 5;
-const BLE_RESPONSE_TIMEOUT_MS = 30000;
 const PROTOCOL_PROBE_TIMEOUT_MS = 1000;
 const PROTOCOL_V2_PROBE_TIMEOUT_MS = 5000;
 class ElectronBleTransport {
@@ -1023,9 +1017,12 @@ class ElectronBleTransport {
                 throw this.createProtocolMismatchError(expectedProtocol);
             }
             if (expectedProtocol === 'V2') {
-                this.deviceProtocol.set(uuid, 'V2');
-                (_b = this.Log) === null || _b === void 0 ? void 0 : _b.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> V2 (expected)`);
-                return 'V2';
+                if (yield this.probeProtocolV2(uuid)) {
+                    this.deviceProtocol.set(uuid, 'V2');
+                    (_b = this.Log) === null || _b === void 0 ? void 0 : _b.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> V2 (expected)`);
+                    return 'V2';
+                }
+                throw this.createProtocolMismatchError(expectedProtocol);
             }
             const probeOrder = protocolHint === 'V2' || this.deviceProtocol.get(uuid) === 'V2' ? ['V2', 'V1'] : ['V1', 'V2'];
             for (let i = 0; i < probeOrder.length; i += 1) {
@@ -1361,17 +1358,17 @@ class ElectronBleTransport {
         });
     }
     callProtocolV2(uuid, name, data, options) {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this._messages || !this._messagesV2) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
-            const callOptions = Object.assign(Object.assign({}, options), { timeoutMs: (_a = options === null || options === void 0 ? void 0 : options.timeoutMs) !== null && _a !== void 0 ? _a : BLE_RESPONSE_TIMEOUT_MS });
+            const callOptions = options;
             try {
                 return yield this.protocolV2Links.call(uuid, () => this.createProtocolV2Adapter(uuid), name, data, callOptions);
             }
             catch (e) {
-                (_b = this.Log) === null || _b === void 0 ? void 0 : _b.error('[Electron BLE] Protocol V2 call error:', e);
+                (_a = this.Log) === null || _a === void 0 ? void 0 : _a.error('[Electron BLE] Protocol V2 call error:', e);
                 throw e;
             }
         });

package/dist/webusb.d.ts

@@ -14,7 +14,6 @@ export default class WebUsbTransport {
     private protocolV2Assemblers;
     private protocolV2Sessions;
     private protocolV2Sequences;
-    private protocolV2ReadTimeouts;
     private deviceEndpoints;
     private mockSerialPaths;
     private mockSerialCounter;

package/dist/webusb.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webusb.d.ts","sourceRoot":"","sources":["../src/webusb.ts"],"names":[],"mappings":";AACA,OAAO,SAWN,MAAM,wBAAwB,CAAC;AAYhC,OAAO,KAAK,EACV,YAAY,EACZ,oBAAoB,EACpB,YAAY,EACZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAqBhC,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAaD,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,QAAQ,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAGlE,UAAU,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAGpE,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAGnE,OAAO,CAAC,oBAAoB,CAAoD;IAGhF,OAAO,CAAC,kBAAkB,CAA6C;IAGvE,OAAO,CAAC,mBAAmB,CAAoD;IAG/E,OAAO,CAAC,sBAAsB,CAA8C;IAG5E,OAAO,CAAC,eAAe,CAA2C;IAMlE,OAAO,CAAC,eAAe,CAA6C;IAEpE,OAAO,CAAC,iBAAiB,CAAK;IAE9B,IAAI,SAAqB;IAEzB,OAAO,UAAS;IAEhB,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,GAAG,CAAC,EAAE,GAAG,CAAC;IAMV,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAM;IAEnC,eAAe,SAAoB;IAEnC,UAAU,SAAe;IAEzB,WAAW,SAAgB;IAK3B,IAAI,CAAC,MAAM,EAAE,GAAG;IAgBhB,SAAS,CAAC,UAAU,EAAE,GAAG;IASzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAW7B,kBAAkB;IAmBlB,SAAS;IAQf,OAAO,CAAC,aAAa;IAmBf,mBAAmB;IAgCnB,OAAO,CAAC,KAAK,EAAE,YAAY;IA0BjC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;YAOtB,cAAc;IAgDtB,UAAU,CAAC,IAAI,EAAE,MAAM;IAwBvB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAkB1C,OAAO,CAAC,iBAAiB;IAiCnB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;YAmCpC,eAAe;YAmBf,iBAAiB;IAezB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAIvE,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,wBAAwB;YAalB,yBAAyB;IAiCvC,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,aAAa;YASP,oBAAoB;YA2BpB,eAAe;YAaf,mBAAmB;YA2CnB,yBAAyB;YAyBzB,uBAAuB;YAmCvB,eAAe;YAaf,eAAe;IAgBvB,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YA8BlB,cAAc;YAkCd,cAAc;YA6Dd,sBAAsB;IA4C9B,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;IAgD5C,OAAO,CAAC,IAAI,EAAE,MAAM;IAmB1B,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;CAGxD"}
+{"version":3,"file":"webusb.d.ts","sourceRoot":"","sources":["../src/webusb.ts"],"names":[],"mappings":";AACA,OAAO,SAaN,MAAM,wBAAwB,CAAC;AAYhC,OAAO,KAAK,EACV,YAAY,EACZ,oBAAoB,EACpB,YAAY,EACZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAqBhC,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAaD,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,QAAQ,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAGlE,UAAU,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAGpE,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAGnE,OAAO,CAAC,oBAAoB,CAAoD;IAGhF,OAAO,CAAC,kBAAkB,CAA6C;IAGvE,OAAO,CAAC,mBAAmB,CAAoD;IAG/E,OAAO,CAAC,eAAe,CAA2C;IAMlE,OAAO,CAAC,eAAe,CAA6C;IAEpE,OAAO,CAAC,iBAAiB,CAAK;IAE9B,IAAI,SAAqB;IAEzB,OAAO,UAAS;IAEhB,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,GAAG,CAAC,EAAE,GAAG,CAAC;IAMV,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAM;IAEnC,eAAe,SAAoB;IAEnC,UAAU,SAAe;IAEzB,WAAW,SAAgB;IAK3B,IAAI,CAAC,MAAM,EAAE,GAAG;IAgBhB,SAAS,CAAC,UAAU,EAAE,GAAG;IASzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAU7B,kBAAkB;IAmBlB,SAAS;IAQf,OAAO,CAAC,aAAa;IAmBf,mBAAmB;IAgCnB,OAAO,CAAC,KAAK,EAAE,YAAY;IA0BjC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;YAOtB,cAAc;IAiDtB,UAAU,CAAC,IAAI,EAAE,MAAM;IAwBvB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAkB1C,OAAO,CAAC,iBAAiB;IAiCnB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;YAmCpC,eAAe;YAmBf,iBAAiB;IAezB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAIvE,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,wBAAwB;YAalB,yBAAyB;IAiCvC,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,aAAa;YASP,oBAAoB;YA2BpB,eAAe;YAaf,mBAAmB;YA2CnB,yBAAyB;YAwBzB,uBAAuB;YA0CvB,eAAe;YAaf,eAAe;IAgBvB,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YA8BlB,cAAc;YAkCd,cAAc;YA0Dd,sBAAsB;IAqC9B,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;IAgD5C,OAAO,CAAC,IAAI,EAAE,MAAM;IAkB1B,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;CAGxD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-web-device",
-  "version": "1.2.0-alpha.21",
+  "version": "1.2.0-alpha.22",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
@@ -20,13 +20,13 @@
     "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"
   },
   "devDependencies": {
-    "@onekeyfe/hd-transport-electron": "1.2.0-alpha.21",
+    "@onekeyfe/hd-transport-electron": "1.2.0-alpha.22",
     "@types/w3c-web-usb": "^1.0.6",
     "@types/web-bluetooth": "^0.0.17"
   },
-  "gitHead": "efe594367fb3b196a5126baee7e2aba3e94986cd"
+  "gitHead": "ce94a5ebbe141b0c15db7c68d08085ca1ddb0166"
 }

package/src/electron-ble-transport.ts

@@ -62,7 +62,6 @@ const toBleDescriptor = (
 
 const BLE_PACKET_SIZE = 192;
 const BLE_WRITE_DELAY_MS = 5;
-const BLE_RESPONSE_TIMEOUT_MS = 30_000;
 const PROTOCOL_PROBE_TIMEOUT_MS = 1000;
 const PROTOCOL_V2_PROBE_TIMEOUT_MS = 5000;
 
@@ -379,11 +378,12 @@ export default class ElectronBleTransport {
     }
 
     if (expectedProtocol === 'V2') {
-      // Skip probing when the caller explicitly confirms V2, such as reconnect after a
-      // firmware reboot where expectedProtocol carries the previously probed result.
-      this.deviceProtocol.set(uuid, 'V2');
-      this.Log?.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> V2 (expected)`);
-      return 'V2';
+      if (await this.probeProtocolV2(uuid)) {
+        this.deviceProtocol.set(uuid, 'V2');
+        this.Log?.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> V2 (expected)`);
+        return 'V2';
+      }
+      throw this.createProtocolMismatchError(expectedProtocol);
     }
 
     // Protocol must be actively probed after connection. Name, PID, and descriptors only
@@ -761,10 +761,7 @@ export default class ElectronBleTransport {
       throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
     }
 
-    const callOptions = {
-      ...options,
-      timeoutMs: options?.timeoutMs ?? BLE_RESPONSE_TIMEOUT_MS,
-    };
+    const callOptions = options;
 
     try {
       return await this.protocolV2Links.call(

package/src/webusb.ts

@@ -7,8 +7,10 @@ import transport, {
   PROTOCOL_V2_CHANNEL_USB,
   PROTOCOL_V2_FRAME_MAX_BYTES,
   ProtocolV2FrameAssembler,
+  ProtocolV2LinkError,
   ProtocolV2SequenceCursor,
   ProtocolV2Session,
+  isProtocolV2LinkError,
   probeProtocolV2 as probeProtocolV2Helper,
 } from '@onekeyfe/hd-transport';
 import {
@@ -85,9 +87,6 @@ export default class WebUsbTransport {
   /** Sequence cursors survive ordinary reconnects and cached session rebuilds. */
   private protocolV2Sequences: Map<string, ProtocolV2SequenceCursor> = new Map();
 
-  /** Read timeout for the current Protocol V2 call, consumed by cached readFrame. */
-  private protocolV2ReadTimeouts: Map<string, number | undefined> = new Map();
-
   /** Per-path USB endpoint / interface numbers (discovered from USB descriptors) */
   private deviceEndpoints: Map<string, DeviceEndpoints> = new Map();
 
@@ -152,7 +151,6 @@ export default class WebUsbTransport {
   configureProtocolV2(signedData: any) {
     this.messagesV2 = parseConfigure(signedData);
     this.protocolV2Sessions.clear();
-    this.protocolV2ReadTimeouts.clear();
   }
 
   /**
@@ -293,10 +291,11 @@ export default class WebUsbTransport {
     }
 
     if (expectedProtocol === 'V2') {
-      // Skip probing when the caller explicitly confirms V2, such as reconnect after a
-      // firmware reboot where expectedProtocol carries the previously probed result.
-      this.deviceProtocol.set(path, 'V2');
-      return 'V2';
+      if (await this.probeProtocolV2(path)) {
+        this.deviceProtocol.set(path, 'V2');
+        return 'V2';
+      }
+      throw this.createProtocolMismatchError(expectedProtocol);
     }
 
     // Protocol must be actively probed after connection. Name, PID, and descriptors only
@@ -635,7 +634,6 @@ export default class WebUsbTransport {
   private async resetConnectionAfterProbe(path: string) {
     this.protocolV2Assemblers.get(path)?.reset();
     this.protocolV2Sessions.delete(path);
-    this.protocolV2ReadTimeouts.delete(path);
 
     try {
       const device = await this.findDevice(path);
@@ -658,7 +656,7 @@ export default class WebUsbTransport {
   }
 
   private async withProtocolReadTimeout<T>(
-    _path: string,
+    path: string,
     promise: Promise<T>,
     timeoutMs: number,
     protocol: ProtocolType,
@@ -680,9 +678,16 @@ export default class WebUsbTransport {
       return await Promise.race([
         guardedPromise,
         new Promise<never>((_, reject) => {
-          timer = setTimeout(() => {
+          timer = setTimeout(async () => {
             timedOut = true;
             onTimeout?.();
+            if (protocol === 'V1') {
+              try {
+                await this.resetConnectionAfterProbe(path);
+              } catch (error) {
+                this.Log.debug('[WebUsbTransport] reset after Protocol V1 timeout failed:', error);
+              }
+            }
             reject(new Error(`Protocol ${protocol} read timeout after ${timeoutMs}ms`));
           }, timeoutMs);
         }),
@@ -821,32 +826,29 @@ export default class WebUsbTransport {
         router: PROTOCOL_V2_CHANNEL_USB,
         sequenceCursor,
         writeFrame: (frame: Uint8Array) => this.transferOutOnce(path, frame),
-        readFrame: () => this.receiveProtocolV2Frame(path, this.protocolV2ReadTimeouts.get(path)),
+        readFrame: context => this.receiveProtocolV2Frame(path, context.timeoutMs),
         logger: this.Log,
         logPrefix: 'ProtocolV2 WebUSB',
         createTimeoutError: (messageName: string, timeoutMs: number) =>
-          new Error(`Protocol V2 response timeout after ${timeoutMs}ms for ${messageName}`),
+          new ProtocolV2LinkError(
+            'response-timeout',
+            `Protocol V2 response timeout after ${timeoutMs}ms for ${messageName}`
+          ),
       });
       this.protocolV2Sessions.set(path, session);
     }
 
-    this.protocolV2ReadTimeouts.set(path, options?.timeoutMs);
-    this.protocolV2Assemblers.get(path)?.reset();
     try {
       return await session.call(name, data, options);
     } catch (error) {
-      const message =
-        error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
-      if (message.includes('protocol v2 read timeout') || message.includes('response timeout')) {
+      if (isProtocolV2LinkError(error) || this.isRetryablePacketIoError(error)) {
         try {
           await this.resetConnectionAfterProbe(path);
         } catch (resetError) {
-          this.Log.debug('[WebUsbTransport] Protocol V2 timeout reset failed:', resetError);
+          this.Log.debug('[WebUsbTransport] Protocol V2 link reset failed:', resetError);
         }
       }
       throw error;
-    } finally {
-      this.protocolV2ReadTimeouts.delete(path);
     }
   }
 
@@ -879,14 +881,7 @@ export default class WebUsbTransport {
           dataView.buffer.slice(dataView.byteOffset, dataView.byteOffset + dataView.byteLength)
         )
       );
-      try {
-        frame = assembler.push(bytes);
-      } catch (error) {
-        throw ERRORS.TypedError(
-          HardwareErrorCode.NetworkError,
-          error instanceof Error ? error.message : String(error)
-        );
-      }
+      frame = assembler.push(bytes);
     }
     return frame;
   }
@@ -953,7 +948,6 @@ export default class WebUsbTransport {
     this.protocolV2Assemblers.get(path)?.reset();
     this.protocolV2Assemblers.delete(path);
     this.protocolV2Sessions.delete(path);
-    this.protocolV2ReadTimeouts.delete(path);
     this.deviceEndpoints.delete(path);
   }