@onekeyfe/hd-transport-web-device 1.2.3-alpha.3 → 1.2.3-alpha.5

package/README.md

@@ -26,4 +26,4 @@ yar update:protobuf to generate new ./messages.json and ./src/types/messages.ts
 
 ## Docs
 
-Documentation is available [hardware-js-sdk](https://developer.onekey.so/connect-to-hardware/hardware-sdk/start)
+Documentation is available [Hardware SDK Getting Started](https://developer.onekey.so/en/hardware-sdk/getting-started)

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

@@ -205,12 +205,52 @@ describe('ElectronBleTransport protocol detection', () => {
     expect(nobleBle.disconnect).toHaveBeenCalledWith(device.id);
   });
 
-  test('sends a native disconnect even before acquire marks the device connected', async () => {
+  test('cancels a pending native connect acquire has not registered yet', async () => {
     const device = { id: 'pending-connect-id', name: 'OneKey Pro 2' };
     const nobleBle = createNobleBle(device);
+    // Never calls back: the field case the Core acquire deadline has to break.
+    nobleBle.connect.mockImplementation(
+      () =>
+        new Promise<void>(() => {
+          // intentionally never settles
+        })
+    );
+    const bleTransport = configureTransport(nobleBle) as any;
+
+    const pendingAcquire = bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+    pendingAcquire.catch(() => undefined);
+    await new Promise(resolve => {
+      setTimeout(resolve, 10);
+    });
+
+    // What the deadline / user abort calls. connectedDevices is still empty
+    // here, so this only works because the acquire is tracked as in flight.
+    await bleTransport.disconnect(device.id);
+
+    expect(nobleBle.unsubscribe).not.toHaveBeenCalled();
+    expect(nobleBle.disconnect).toHaveBeenCalledWith(device.id);
+  });
+
+  test('leaves a kept-alive link up when a released device is disconnected', async () => {
+    const device = { id: 'kept-alive-id', name: 'OneKey Pro 2' };
+    const nobleBle = createNobleBle(device);
+    const bleTransport = configureTransport(nobleBle) as any;
+
+    // No acquire in flight and nothing in connectedDevices: the link was
+    // released logically and belongs to the main-process keep-alive timer.
+    // The routine post-call cancel must not cost the next call a cold connect.
+    await bleTransport.disconnect(device.id);
+
+    expect(nobleBle.disconnect).not.toHaveBeenCalled();
+    expect(nobleBle.unsubscribe).not.toHaveBeenCalled();
+  });
+
+  test('forceNative disconnects a device the renderer no longer tracks', async () => {
+    const device = { id: 'presumed-dead-id', name: 'OneKey Pro 2' };
+    const nobleBle = createNobleBle(device);
     const bleTransport = configureTransport(nobleBle) as any;
 
-    await bleTransport.releaseNative(device.id);
+    await bleTransport.releaseNative(device.id, { forceNative: true });
 
     expect(nobleBle.unsubscribe).not.toHaveBeenCalled();
     expect(nobleBle.disconnect).toHaveBeenCalledWith(device.id);
@@ -498,7 +538,7 @@ describe('ElectronBleTransport protocol detection', () => {
     await expect(result).resolves.toBe('rejected');
   });
 
-  test('throws when both protocol probes fail', async () => {
+  test('disconnects when both protocol probes fail and reconnects for the next acquire', async () => {
     const device = { id: 'dead-device-id', name: 'Unknown Device' };
     const nobleBle = createNobleBle(device);
 
@@ -510,7 +550,25 @@ describe('ElectronBleTransport protocol detection', () => {
     await expect(transport.acquire({ uuid: device.id })).rejects.toThrow(
       /Unable to detect BLE protocol/
     );
+    expect(nobleBle.unsubscribe).toHaveBeenCalledWith(device.id);
+    expect(nobleBle.disconnect).toHaveBeenCalledWith(device.id);
     expect(transport.getProtocolType(device.id)).toBeUndefined();
+
+    echoProtocolV2(nobleBle, device.id);
+    await expect(
+      transport.acquire({ uuid: device.id, expectedProtocol: 'V2' })
+    ).resolves.toMatchObject({ uuid: device.id });
+    expect(nobleBle.connect).toHaveBeenCalledTimes(2);
+    expect(nobleBle.disconnect.mock.invocationCallOrder.at(-1)).toBeLessThan(
+      nobleBle.connect.mock.invocationCallOrder[1]
+    );
+    await expect(
+      transport.call(device.id, 'Ping', { message: 'after-reconnect' })
+    ).resolves.toMatchObject({
+      type: 'Success',
+      message: { message: 'ok' },
+    });
+    await transport.release(device.id);
   });
 
   test('surfaces Protocol V2 link disabled while the initial V1 probe is active', async () => {
@@ -673,7 +731,7 @@ describe('ElectronBleTransport protocol detection', () => {
     }
   });
 
-  test('reports a stale bond when a previously confirmed Protocol V2 device stops responding', async () => {
+  test('keeps a probe miss retryable after a previously confirmed Protocol V2 connection', async () => {
     const device = { id: 'reset-pro2-id', name: 'OneKey Pro 2' };
     const nobleBle = createNobleBle(device);
     const transport = configureTransport(nobleBle);
@@ -686,7 +744,7 @@ describe('ElectronBleTransport protocol detection', () => {
     await expect(
       transport.acquire({ uuid: device.id, expectedProtocol: 'V2' })
     ).rejects.toMatchObject({
-      errorCode: HardwareErrorCode.BleDeviceBondError,
+      errorCode: HardwareErrorCode.RuntimeError,
     });
 
     expect(nobleBle.unsubscribe).toHaveBeenCalledWith(device.id);
@@ -694,6 +752,52 @@ describe('ElectronBleTransport protocol detection', () => {
     expect(transport.getProtocolType(device.id)).toBeUndefined();
   });
 
+  test.each([false, true])(
+    'preserves an expected Protocol V2 Ping timeout with a prior successful connection: %s',
+    async previouslyConnected => {
+      const device = { id: 'timeout-pro2-id', name: 'OneKey Pro 2' };
+      const nobleBle = createNobleBle(device);
+      const transport = configureTransport(nobleBle);
+
+      if (previouslyConnected) {
+        echoProtocolV2(nobleBle, device.id);
+        await transport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+        await transport.release(device.id);
+      }
+      // Keep the real probe and response timer, but drop its notification.
+      nobleBle.write.mockImplementation(() => Promise.resolve());
+
+      await expect(
+        transport.acquire({ uuid: device.id, expectedProtocol: 'V2' })
+      ).rejects.toMatchObject({
+        errorCode: HardwareErrorCode.BleTimeoutError,
+        message: 'BLE response timeout after 5000ms for Ping',
+      });
+
+      expect(nobleBle.unsubscribe).toHaveBeenCalledWith(device.id);
+      expect(nobleBle.disconnect).toHaveBeenCalledWith(device.id);
+      expect(transport.getProtocolType(device.id)).toBeUndefined();
+    }
+  );
+
+  test('preserves a native stale-bond error during an expected Protocol V2 probe', async () => {
+    const device = { id: 'stale-bond-probe-id', name: 'OneKey Pro 2' };
+    const nobleBle = createNobleBle(device);
+    nobleBle.write.mockRejectedValue({
+      name: 'HardwareError',
+      message: 'Bluetooth pairing information is no longer valid',
+      errorCode: HardwareErrorCode.BleBondInvalid,
+    });
+    const transport = configureTransport(nobleBle);
+
+    await expect(
+      transport.acquire({ uuid: device.id, expectedProtocol: 'V2' })
+    ).rejects.toMatchObject({ errorCode: HardwareErrorCode.BleBondInvalid });
+
+    expect(nobleBle.unsubscribe).toHaveBeenCalledWith(device.id);
+    expect(nobleBle.disconnect).toHaveBeenCalledWith(device.id);
+  });
+
   test('does not take a Protocol V2 hint from the BLE name', async () => {
     const device = { id: 'named-pro2-id', name: 'OneKey Pro 2' };
     const nobleBle = createNobleBle(device);

package/__tests__/webusb-protocol-cache.test.ts

@@ -31,6 +31,87 @@ function buildAcquirableTransport(path = 'pro-webusb') {
 }
 
 describe('WebUsbTransport protocol probe cache', () => {
+  test.each([
+    ['V1', false, 0],
+    ['V1', true, 1],
+    ['V2', false, 1],
+    [undefined, false, 1],
+  ] as const)(
+    'reconnect protocol=%s first=%s resets USB %s times',
+    async (protocol, first, resets) => {
+      const webusb = new WebUsbTransport();
+      const path = 'connected-usb-device';
+      const device = {
+        opened: true,
+        configuration: { configurationValue: 1 },
+        configurations: [],
+        reset: jest.fn().mockResolvedValue(undefined),
+        selectConfiguration: jest.fn().mockResolvedValue(undefined),
+        claimInterface: jest.fn().mockResolvedValue(undefined),
+        clearHalt: jest.fn().mockResolvedValue(undefined),
+      };
+      jest.spyOn(webusb, 'findDevice').mockResolvedValue(device as unknown as USBDevice);
+      jest.spyOn(webusb, 'getConnectedDevices').mockResolvedValue([]);
+      if (protocol) {
+        const state = webusb as unknown as { deviceProtocol: Map<string, 'V1' | 'V2'> };
+        state.deviceProtocol.set(path, protocol);
+      }
+
+      await webusb.connectToDevice(path, first);
+
+      expect(device.reset).toHaveBeenCalledTimes(resets);
+      expect(device.claimInterface).toHaveBeenCalledWith(0);
+    }
+  );
+
+  test('reports claimInterface failures as WebUSB device access errors', async () => {
+    const webusb = new WebUsbTransport();
+    const path = 'connected-usb-device';
+    const claimError = Object.assign(new Error('Unable to claim interface'), {
+      name: 'NetworkError',
+    });
+    const device = {
+      opened: true,
+      configuration: { configurationValue: 1 },
+      configurations: [],
+      claimInterface: jest.fn().mockRejectedValue(claimError),
+    };
+    jest.spyOn(webusb, 'findDevice').mockResolvedValue(device as unknown as USBDevice);
+    jest.spyOn(webusb, 'getConnectedDevices').mockResolvedValue([]);
+    const state = webusb as unknown as { deviceProtocol: Map<string, 'V1' | 'V2'> };
+    state.deviceProtocol.set(path, 'V1');
+
+    await expect(webusb.connectToDevice(path, false)).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.WebUsbDeviceAccessError,
+      params: {
+        operation: 'claimInterface',
+        nativeErrorName: 'NetworkError',
+        nativeErrorMessage: 'Unable to claim interface',
+      },
+    });
+  });
+
+  test('reports transferIn failures as WebUSB device access errors', async () => {
+    const webusb = new WebUsbTransport() as any;
+    const path = 'connected-usb-device';
+    const transferError = Object.assign(new Error('Transfer endpoint is unavailable'), {
+      name: 'NetworkError',
+    });
+    webusb.findDevice = jest.fn().mockResolvedValue({
+      opened: true,
+      transferIn: jest.fn().mockRejectedValue(transferError),
+    });
+
+    await expect(webusb.transferInWithRetry(path, 64)).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.WebUsbDeviceAccessError,
+      params: {
+        operation: 'transferIn',
+        nativeErrorName: 'NetworkError',
+        nativeErrorMessage: 'Transfer endpoint is unavailable',
+      },
+    });
+  });
+
   test('acquire skips the wire probe when the protocol is already cached', async () => {
     const webusb = buildAcquirableTransport();
     const path = 'pro-webusb';

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

@@ -238,9 +238,15 @@ describe('WebUsbTransport Protocol V2 timeout recovery', () => {
     webusb.resetConnectionAfterProbe = jest.fn();
     await webusb.rotateProtocolV2UsbGeneration(path, 'test connection');
 
-    await expect(webusb.callProtocolV2(path, 'Ping', { message: 'read-error' })).rejects.toThrow(
-      'NetworkError'
-    );
+    await expect(
+      webusb.callProtocolV2(path, 'Ping', { message: 'read-error' })
+    ).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.BridgeDeviceDisconnected,
+      params: {
+        operation: 'transferIn',
+        nativeErrorMessage: 'NetworkError: transferIn device disconnected',
+      },
+    });
 
     expect(webusb.readProtocolV2UsbPacket).toHaveBeenCalledTimes(1);
     expect(webusb.resetProtocolV2UsbNativeLink).toHaveBeenCalledWith(

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

@@ -25,9 +25,9 @@ export default class ElectronBleTransport {
     Log?: any;
     emitter?: EventEmitter;
     private connectedDevices;
+    private acquiringDevices;
     private deviceProtocol;
     private deviceProtocolHints;
-    private confirmedProtocolV2;
     private deviceMtus;
     private devicePacketCapacities;
     private v1Buffers;

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":"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"}
+{"version":3,"file":"electron-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-ble-transport.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -118,7 +118,7 @@ declare class WebUsbTransport extends ProtocolV2UsbTransportBase<string> {
     /**
      * Connect to device with retry mechanism
      */
-    connect(path: string, first: boolean): Promise<void>;
+    connect(path: string, first: boolean): Promise<undefined>;
     /**
      * Discover vendor-class (0xFF) interface and its IN/OUT endpoint numbers from USB descriptors.
      * Falls back to legacy hardcoded values if no vendor interface is found.
@@ -128,7 +128,7 @@ declare class WebUsbTransport extends ProtocolV2UsbTransportBase<string> {
      * Connect to specific device.
      * Discovers interface/endpoint numbers from USB descriptors on first connection.
      */
-    connectToDevice(path: string, first: boolean): Promise<void>;
+    connectToDevice(path: string, first: boolean): Promise<undefined>;
     private closeOpenDevice;
     private clearEndpointHalt;
     /**
@@ -141,6 +141,10 @@ declare class WebUsbTransport extends ProtocolV2UsbTransportBase<string> {
     private assertAcquired;
     post(session: string, name: string, data: Record<string, unknown>): Promise<void>;
     private getErrorMessage;
+    private getErrorName;
+    private isWebUsbIoHardwareError;
+    private isDeviceStillEnumerated;
+    private throwWebUsbIoError;
     private isRetryablePacketIoError;
     private reconnectForPacketIoRetry;
     private getTransferInData;
@@ -216,10 +220,16 @@ declare class ElectronBleTransport {
     Log?: any;
     emitter?: EventEmitter;
     private connectedDevices;
+    /**
+     * Devices whose acquire() is still in flight.
+     *
+     * A native connect that never calls back has not reached `connectedDevices`
+     * yet, so this is the only record that the renderer is still trying to own
+     * the link; `releaseNative()` needs it to cancel that pending connect.
+     */
+    private acquiringDevices;
     private deviceProtocol;
     private deviceProtocolHints;
-    /** Endpoints that answered a V2 probe in this transport lifetime. Survives disconnect. */
-    private confirmedProtocolV2;
     private deviceMtus;
     private devicePacketCapacities;
     private v1Buffers;

package/dist/index.js

@@ -375,11 +375,13 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             if (!device.opened) {
                 yield device.open();
             }
-            try {
-                yield device.reset();
-            }
-            catch (error) {
-                (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[WebUsbTransport] reset before claim failed, continuing:', error);
+            if (first || this.deviceProtocol.get(path) !== 'V1') {
+                try {
+                    yield device.reset();
+                }
+                catch (error) {
+                    (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[WebUsbTransport] reset before claim failed, continuing:', error);
+                }
             }
             yield this.getConnectedDevices();
             device = yield this.findDevice(path);
@@ -393,7 +395,12 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             }
             const endpoints = this.discoverEndpoints(device);
             this.deviceEndpoints.set(path, endpoints);
-            yield device.claimInterface(endpoints.interfaceNumber);
+            try {
+                yield device.claimInterface(endpoints.interfaceNumber);
+            }
+            catch (error) {
+                return this.throwWebUsbIoError(path, 'claimInterface', error);
+            }
             yield this.clearEndpointHalt(device, 'in', endpoints.endpointIn);
             yield this.clearEndpointHalt(device, 'out', endpoints.endpointOut);
         });
@@ -457,6 +464,59 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
         }
         return String(error);
     }
+    getErrorName(error) {
+        if (typeof error === 'object' && error && 'name' in error) {
+            const { name } = error;
+            return typeof name === 'string' ? name : String(name !== null && name !== void 0 ? name : '');
+        }
+        return '';
+    }
+    isWebUsbIoHardwareError(error) {
+        return (error instanceof hdShared.HardwareError &&
+            (error.errorCode === hdShared.HardwareErrorCode.BridgeDeviceDisconnected ||
+                error.errorCode === hdShared.HardwareErrorCode.WebUsbDeviceAccessError));
+    }
+    isDeviceStillEnumerated(path) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.usb)
+                return undefined;
+            try {
+                const devices = yield this.usb.getDevices();
+                return devices.some(device => hdShared.resolveOneKeyUsbDevicePath(device) === path);
+            }
+            catch (error) {
+                (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[WebUsbTransport] failed to verify WebUSB device presence:', error);
+                return undefined;
+            }
+        });
+    }
+    throwWebUsbIoError(path, operation, error) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.isWebUsbIoHardwareError(error))
+                throw error;
+            if (error instanceof transport.ProtocolV2LinkError && error.code !== 'io')
+                throw error;
+            const nativeError = error instanceof transport.ProtocolV2LinkError ? (_a = error.cause) !== null && _a !== void 0 ? _a : error : error;
+            if (this.isWebUsbIoHardwareError(nativeError))
+                throw nativeError;
+            const nativeErrorName = this.getErrorName(nativeError);
+            const nativeErrorMessage = this.getErrorMessage(nativeError);
+            const disconnectedByMessage = /(?:device )?disconnected|device not found|action was interrupted/i.test(`${nativeErrorName}: ${nativeErrorMessage}`);
+            const stillEnumerated = disconnectedByMessage
+                ? false
+                : yield this.isDeviceStillEnumerated(path);
+            const errorCode = disconnectedByMessage || stillEnumerated === false
+                ? hdShared.HardwareErrorCode.BridgeDeviceDisconnected
+                : hdShared.HardwareErrorCode.WebUsbDeviceAccessError;
+            throw hdShared.ERRORS.TypedError(errorCode, nativeErrorMessage || undefined, {
+                operation,
+                nativeErrorName: nativeErrorName || undefined,
+                nativeErrorMessage: nativeErrorMessage || undefined,
+            });
+        });
+    }
     isRetryablePacketIoError(error) {
         const message = this.getErrorMessage(error).toLowerCase();
         return (message.includes('transferout') ||
@@ -523,7 +583,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                     lastError = error;
                     const shouldRetry = attempt < PACKET_IO_MAX_RETRIES && this.isRetryablePacketIoError(error);
                     if (!shouldRetry) {
-                        throw error;
+                        return this.throwWebUsbIoError(path, 'transferOut', error);
                     }
                     try {
                         yield this.reconnectForPacketIoRetry(path, 'out', attempt, error);
@@ -534,7 +594,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                     }
                 }
             }
-            throw lastError;
+            return this.throwWebUsbIoError(path, 'transferOut', lastError);
         });
     }
     transferOutOnce(path, packet) {
@@ -575,7 +635,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                     }
                     const shouldRetry = attempt < PACKET_IO_MAX_RETRIES && this.isRetryablePacketIoError(error);
                     if (!shouldRetry) {
-                        throw error;
+                        return this.throwWebUsbIoError(path, 'transferIn', error);
                     }
                     try {
                         yield this.reconnectForPacketIoRetry(path, 'in', attempt, error);
@@ -586,7 +646,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                     }
                 }
             }
-            throw lastError;
+            return this.throwWebUsbIoError(path, 'transferIn', lastError);
         });
     }
     transferInOnce(path, length) {
@@ -663,7 +723,9 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                 });
                 return true;
             }
-            catch (_error) {
+            catch (error) {
+                if (this.isWebUsbIoHardwareError(error))
+                    throw error;
                 return false;
             }
         });
@@ -678,6 +740,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                 timeoutMs: PROTOCOL_V2_PROBE_TIMEOUT,
                 logger: this.Log,
                 logPrefix: 'ProtocolV2 WebUSB',
+                shouldRethrow: error => this.isWebUsbIoHardwareError(error),
             });
         });
     }
@@ -724,7 +787,15 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
     }
     callProtocolV2(path, name, data, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.callProtocolV2Usb(path, name, data, options);
+            try {
+                return yield this.callProtocolV2Usb(path, name, data, options);
+            }
+            catch (error) {
+                if (!(error instanceof transport.ProtocolV2LinkError) || error.code !== 'io')
+                    throw error;
+                const operation = error.message.includes(' USB write failed:') ? 'transferOut' : 'transferIn';
+                return this.throwWebUsbIoError(path, operation, error);
+            }
         });
     }
     receiveData(path, timeoutMs) {
@@ -848,9 +919,9 @@ class ElectronBleTransport {
         this.runPromise = null;
         this.runPromiseDeviceId = null;
         this.connectedDevices = new Set();
+        this.acquiringDevices = new Set();
         this.deviceProtocol = new Map();
         this.deviceProtocolHints = new Map();
-        this.confirmedProtocolV2 = new Set();
         this.deviceMtus = new Map();
         this.devicePacketCapacities = new Map();
         this.v1Buffers = new Map();
@@ -874,7 +945,7 @@ class ElectronBleTransport {
                 this.rejectProtocolV2Frames(uuid, new Error(reason));
                 (_b = this.Log) === null || _b === void 0 ? void 0 : _b.debug('[Electron BLE] Protocol V2 link invalidated:', uuid, reason);
                 if (reason.startsWith('Protocol V2 link-fatal error:')) {
-                    yield this.releaseNative(uuid);
+                    yield this.releaseNative(uuid, { forceNative: true });
                 }
             }),
         });
@@ -1033,6 +1104,7 @@ class ElectronBleTransport {
                 this.runPromise = null;
                 this.runPromiseDeviceId = null;
             }
+            this.acquiringDevices.add(uuid);
             try {
                 if (!((_a = window.desktopApi) === null || _a === void 0 ? void 0 : _a.nobleBle)) {
                     throw new Error('Noble BLE API not available');
@@ -1099,6 +1171,9 @@ class ElectronBleTransport {
                 this.cleanupDeviceState(uuid);
                 this.handleBluetoothError(error);
             }
+            finally {
+                this.acquiringDevices.delete(uuid);
+            }
         });
     }
     release(id, _onclose, keepSession) {
@@ -1119,12 +1194,14 @@ class ElectronBleTransport {
             return this.releaseNative(id);
         });
     }
-    releaseNative(id) {
+    releaseNative(id, options) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            const rendererOwnsLink = this.connectedDevices.has(id) || this.acquiringDevices.has(id);
+            const shouldDisconnect = (options === null || options === void 0 ? void 0 : options.forceNative) === true || rendererOwnsLink;
             try {
                 const nobleBle = (_a = window.desktopApi) === null || _a === void 0 ? void 0 : _a.nobleBle;
-                if (nobleBle) {
+                if (nobleBle && shouldDisconnect) {
                     if (this.connectedDevices.has(id)) {
                         yield invokeNobleBle(nobleBle.unsubscribe(id)).catch(error => {
                             var _a;
@@ -1165,9 +1242,8 @@ class ElectronBleTransport {
             }
         });
     }
-    createProtocolMismatchError(expected, uuid) {
-        const isStaleV2Bond = expected === 'V2' && this.confirmedProtocolV2.has(uuid);
-        return hdShared.ERRORS.TypedError(isStaleV2Bond ? hdShared.HardwareErrorCode.BleDeviceBondError : hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`);
+    createProtocolMismatchError(expected) {
+        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`);
     }
     createProtocolDetectionError() {
         return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, 'Unable to detect BLE protocol: device did not respond to Protocol V1 GetFeatures or Protocol V2 Ping');
@@ -1186,13 +1262,12 @@ class ElectronBleTransport {
                 return 'V1';
             }
             if (expectedProtocol === 'V2') {
-                if (yield this.probeProtocolV2(uuid)) {
+                if (yield this.probeProtocolV2(uuid, expectedProtocol)) {
                     this.deviceProtocol.set(uuid, 'V2');
-                    this.confirmedProtocolV2.add(uuid);
                     (_b = this.Log) === null || _b === void 0 ? void 0 : _b.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> V2 (expected)`);
                     return 'V2';
                 }
-                throw this.createProtocolMismatchError(expectedProtocol, uuid);
+                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) {
@@ -1203,9 +1278,6 @@ class ElectronBleTransport {
                 const detected = protocol === 'V1' ? yield this.probeProtocolV1(uuid) : yield this.probeProtocolV2(uuid);
                 if (detected) {
                     this.deviceProtocol.set(uuid, protocol);
-                    if (protocol === 'V2') {
-                        this.confirmedProtocolV2.add(uuid);
-                    }
                     (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> ${protocol}`);
                     return protocol;
                 }
@@ -1268,7 +1340,7 @@ class ElectronBleTransport {
             }
         });
     }
-    probeProtocolV2(uuid) {
+    probeProtocolV2(uuid, expectedProtocol) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this._messages || !this._messagesV2) {
@@ -1286,7 +1358,9 @@ class ElectronBleTransport {
                     (_a = this.v2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
                     this.resetProtocolV2Frames(uuid);
                 },
-                shouldRethrow: error => hdShared.isBleStaleBondHardwareError(error) || transport.isProtocolV2LinkDisabledError(error),
+                shouldRethrow: error => expectedProtocol === 'V2' ||
+                    hdShared.isBleStaleBondHardwareError(error) ||
+                    transport.isProtocolV2LinkDisabledError(error),
             });
             if (!detected) {
                 this.clearProbeProtocol(uuid, 'V2');
@@ -1566,7 +1640,7 @@ class ElectronBleTransport {
                     this.notificationCleanups.delete(uuid);
                     this.notificationTokens.delete(uuid);
                     if (!isProbeTimeout) {
-                        yield this.releaseNative(uuid);
+                        yield this.releaseNative(uuid, { forceNative: true });
                     }
                 }
                 throw this.normalizeBluetoothError(e);

package/dist/webusb.d.ts

@@ -44,14 +44,18 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     private createProtocolDetectionError;
     private detectProtocol;
     findDevice(path: string): Promise<USBDevice>;
-    connect(path: string, first: boolean): Promise<void>;
+    connect(path: string, first: boolean): Promise<undefined>;
     private discoverEndpoints;
-    connectToDevice(path: string, first: boolean): Promise<void>;
+    connectToDevice(path: string, first: boolean): Promise<undefined>;
     private closeOpenDevice;
     private clearEndpointHalt;
     private assertAcquired;
     post(session: string, name: string, data: Record<string, unknown>): Promise<void>;
     private getErrorMessage;
+    private getErrorName;
+    private isWebUsbIoHardwareError;
+    private isDeviceStillEnumerated;
+    private throwWebUsbIoError;
     private isRetryablePacketIoError;
     private reconnectForPacketIoRetry;
     private getTransferInData;

package/dist/webusb.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webusb.d.ts","sourceRoot":"","sources":["../src/webusb.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webusb.d.ts","sourceRoot":"","sources":["../src/webusb.ts"],"names":[],"mappings":";;AACA,OAAO,SAAS,EAAE,EAQhB,0BAA0B,EAG3B,MAAM,wBAAwB,CAAC;AAahC,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EACV,YAAY,EACZ,oBAAoB,EACpB,YAAY,EACZ,qBAAqB,EACrB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAuBhC,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAyCD,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,0BAA0B,CAAC,MAAM,CAAC;IAC7E,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;IAEpE,OAAO,CAAC,sBAAsB,CAAqB;IAGnD,OAAO,CAAC,cAAc,CAAwC;IAG9D,OAAO,CAAC,wBAAwB,CAAwC;IAExE,OAAO,CAAC,mBAAmB,CAAwC;IAMnE,OAAO,CAAC,kBAAkB,CAA0B;IAGpD,OAAO,CAAC,aAAa,CAA0B;IAS/C,OAAO,CAAC,mBAAmB,CAAqC;IAGhE,OAAO,CAAC,eAAe,CAA2C;IAElE,IAAI,SAAqB;IAEzB,OAAO,UAAS;IAEhB,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAMvB,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAM;IAEnC,eAAe,SAAoB;IAEnC,UAAU,SAAe;IAEzB,WAAW,SAAgB;;IAa3B,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAmBxC,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS;IAkBrD,iBAAiB,CAAC,IAAI,EAAE,MAAM;IAQ9B,SAAS,CAAC,UAAU,EAAE,GAAG;IASzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAsB7B,kBAAkB;IAmBlB,SAAS;IAQT,mBAAmB;IAmCnB,OAAO,CAAC,KAAK,EAAE,YAAY;IA+FjC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,+BAA+B;IAOvC,OAAO,CAAC,4BAA4B;YAItB,cAAc;IAmEtB,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;YAwCpC,eAAe;YAkBf,iBAAiB;IAsB/B,OAAO,CAAC,cAAc;IAMhB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IASvE,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,uBAAuB;YAQjB,uBAAuB;YAWvB,kBAAkB;IAgChC,OAAO,CAAC,wBAAwB;YAalB,yBAAyB;IAsCvC,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,aAAa;YASP,oBAAoB;YA2BpB,eAAe;YAaf,mBAAmB;YA2CnB,cAAc;YAWd,yBAAyB;YAKzB,yBAAyB;YAMzB,uBAAuB;YA0CvB,eAAe;YAqBf,eAAe;IAiBvB,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;YAkCd,cAAc;IAkBtB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;IAgD5C,OAAO,CAAC,IAAI,EAAE,MAAM;IAY1B,SAAS,CAAC,uBAAuB,IAAI,iBAAiB;IAUtD,SAAS,CAAC,sBAAsB;cAIhB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,qBAAqB,GAC9B,OAAO,CAAC,IAAI,CAAC;cAIA,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,qBAAqB,GAC9B,OAAO,CAAC,UAAU,CAAC;cASN,4BAA4B,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1F,SAAS,CAAC,8BAA8B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAKrE,SAAS,CAAC,+BAA+B,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,KAAK;IAWjF,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.3-alpha.3",
+  "version": "1.2.3-alpha.5",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
@@ -21,13 +21,13 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.3-alpha.3",
-    "@onekeyfe/hd-transport": "1.2.3-alpha.3"
+    "@onekeyfe/hd-shared": "1.2.3-alpha.5",
+    "@onekeyfe/hd-transport": "1.2.3-alpha.5"
   },
   "devDependencies": {
-    "@onekeyfe/hd-transport-electron": "1.2.3-alpha.3",
+    "@onekeyfe/hd-transport-electron": "1.2.3-alpha.5",
     "@types/w3c-web-usb": "^1.0.6",
     "@types/web-bluetooth": "^0.0.17"
   },
-  "gitHead": "8b116adb144b967f042f189cd27384a75ca1f7ae"
+  "gitHead": "ee493c3ad41a6bc7fb249fba71d4b9bf8efcced8"
 }

package/src/electron-ble-transport.ts

@@ -117,13 +117,19 @@ export default class ElectronBleTransport {
 
   private connectedDevices: Set<string> = new Set();
 
+  /**
+   * Devices whose acquire() is still in flight.
+   *
+   * A native connect that never calls back has not reached `connectedDevices`
+   * yet, so this is the only record that the renderer is still trying to own
+   * the link; `releaseNative()` needs it to cancel that pending connect.
+   */
+  private acquiringDevices: Set<string> = new Set();
+
   private deviceProtocol: Map<string, ProtocolType> = new Map();
 
   private deviceProtocolHints: Map<string, ProtocolType> = new Map();
 
-  /** Endpoints that answered a V2 probe in this transport lifetime. Survives disconnect. */
-  private confirmedProtocolV2 = new Set<string>();
-
   private deviceMtus: Map<string, number> = new Map();
 
   private devicePacketCapacities: Map<string, number> = new Map();
@@ -152,7 +158,7 @@ export default class ElectronBleTransport {
       this.rejectProtocolV2Frames(uuid, new Error(reason));
       this.Log?.debug('[Electron BLE] Protocol V2 link invalidated:', uuid, reason);
       if (reason.startsWith('Protocol V2 link-fatal error:')) {
-        await this.releaseNative(uuid);
+        await this.releaseNative(uuid, { forceNative: true });
       }
     },
   });
@@ -366,6 +372,7 @@ export default class ElectronBleTransport {
       this.runPromiseDeviceId = null;
     }
 
+    this.acquiringDevices.add(uuid);
     try {
       if (!window.desktopApi?.nobleBle) {
         throw new Error('Noble BLE API not available');
@@ -437,6 +444,8 @@ export default class ElectronBleTransport {
       }
       this.cleanupDeviceState(uuid);
       this.handleBluetoothError(error);
+    } finally {
+      this.acquiringDevices.delete(uuid);
     }
   }
 
@@ -457,10 +466,23 @@ export default class ElectronBleTransport {
   }
 
   // Hard teardown, error paths only: a link presumed dead must not be reused.
-  private async releaseNative(id: string) {
+  //
+  // The native disconnect is sent while the renderer still owns the link, or is
+  // still trying to get it: a stuck acquire has not reached `connectedDevices`
+  // yet, and its pending native connect can only be cancelled from here, so the
+  // Core acquire deadline would otherwise be unable to terminate it.
+  //
+  // It is NOT sent for a device the renderer has already released logically.
+  // That link belongs to the main-process keep-alive timer, and dropping it on
+  // the routine post-call `cancel()` (Device.interruptionFromUser, no acquire
+  // held, empty request queue) costs a full cold reconnect on the very next
+  // operation — measured 2.93s on Pro and 17-26s on Pro 2.
+  private async releaseNative(id: string, options?: { forceNative?: boolean }) {
+    const rendererOwnsLink = this.connectedDevices.has(id) || this.acquiringDevices.has(id);
+    const shouldDisconnect = options?.forceNative === true || rendererOwnsLink;
     try {
       const nobleBle = window.desktopApi?.nobleBle;
-      if (nobleBle) {
+      if (nobleBle && shouldDisconnect) {
         if (this.connectedDevices.has(id)) {
           await invokeNobleBle(nobleBle.unsubscribe(id)).catch(error => {
             this.Log?.debug('[Electron BLE] release unsubscribe failed:', error);
@@ -501,12 +523,9 @@ export default class ElectronBleTransport {
     }
   }
 
-  private createProtocolMismatchError(expected: ProtocolType, uuid: string) {
-    // A generic Ping miss is not a bond failure. Only a later miss after this
-    // endpoint already answered V2, or a native encryption/pairing error, is.
-    const isStaleV2Bond = expected === 'V2' && this.confirmedProtocolV2.has(uuid);
+  private createProtocolMismatchError(expected: ProtocolType) {
     return ERRORS.TypedError(
-      isStaleV2Bond ? HardwareErrorCode.BleDeviceBondError : HardwareErrorCode.RuntimeError,
+      HardwareErrorCode.RuntimeError,
       `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`
     );
   }
@@ -546,13 +565,12 @@ export default class ElectronBleTransport {
     }
 
     if (expectedProtocol === 'V2') {
-      if (await this.probeProtocolV2(uuid)) {
+      if (await this.probeProtocolV2(uuid, expectedProtocol)) {
         this.deviceProtocol.set(uuid, 'V2');
-        this.confirmedProtocolV2.add(uuid);
         this.Log?.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> V2 (expected)`);
         return 'V2';
       }
-      throw this.createProtocolMismatchError(expectedProtocol, uuid);
+      throw this.createProtocolMismatchError(expectedProtocol);
     }
 
     // Protocol must be actively probed after connection. Name, PID, and descriptors only
@@ -571,9 +589,6 @@ export default class ElectronBleTransport {
         protocol === 'V1' ? await this.probeProtocolV1(uuid) : await this.probeProtocolV2(uuid);
       if (detected) {
         this.deviceProtocol.set(uuid, protocol);
-        if (protocol === 'V2') {
-          this.confirmedProtocolV2.add(uuid);
-        }
         this.Log?.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> ${protocol}`);
         return protocol;
       }
@@ -644,7 +659,7 @@ export default class ElectronBleTransport {
     }
   }
 
-  private async probeProtocolV2(uuid: string) {
+  private async probeProtocolV2(uuid: string, expectedProtocol?: ProtocolType) {
     if (!this._messages || !this._messagesV2) {
       return false;
     }
@@ -660,8 +675,11 @@ export default class ElectronBleTransport {
         this.v2Assemblers.get(uuid)?.reset();
         this.resetProtocolV2Frames(uuid);
       },
+      // A declared V2 protocol needs no fallback; preserve the actual link failure.
       shouldRethrow: error =>
-        isBleStaleBondHardwareError(error) || isProtocolV2LinkDisabledError(error),
+        expectedProtocol === 'V2' ||
+        isBleStaleBondHardwareError(error) ||
+        isProtocolV2LinkDisabledError(error),
     });
     if (!detected) {
       this.clearProbeProtocol(uuid, 'V2');
@@ -977,7 +995,7 @@ export default class ElectronBleTransport {
         this.notificationCleanups.delete(uuid);
         this.notificationTokens.delete(uuid);
         if (!isProbeTimeout) {
-          await this.releaseNative(uuid);
+          await this.releaseNative(uuid, { forceNative: true });
         }
       }
       throw this.normalizeBluetoothError(e);

package/src/webusb.ts

@@ -13,6 +13,7 @@ import transport, {
 } from '@onekeyfe/hd-transport';
 import {
   ERRORS,
+  HardwareError,
   HardwareErrorCode,
   ONEKEY_WEBUSB_FILTER,
   inferProtocolHintFromUsbId,
@@ -70,6 +71,8 @@ interface TransferCancelToken {
   cancelled: boolean;
 }
 
+type WebUsbOperation = 'claimInterface' | 'transferIn' | 'transferOut';
+
 /**
  * The navigator.usb disconnect listener is module-scoped and attached at most
  * once: listeners on navigator.usb are global and never garbage collected, so a
@@ -566,10 +569,14 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     if (!device.opened) {
       await device.open();
     }
-    try {
-      await device.reset();
-    } catch (error) {
-      this.Log?.debug('[WebUsbTransport] reset before claim failed, continuing:', error);
+    // A V1 packet retry continues an in-flight exchange. Preserve its endpoint
+    // state as in the legacy transport; probing and V2 recovery still reset.
+    if (first || this.deviceProtocol.get(path) !== 'V1') {
+      try {
+        await device.reset();
+      } catch (error) {
+        this.Log?.debug('[WebUsbTransport] reset before claim failed, continuing:', error);
+      }
     }
     await this.getConnectedDevices();
     device = await this.findDevice(path);
@@ -588,7 +595,11 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     // Discover endpoints from USB descriptors; descriptors are not used for protocol selection.
     const endpoints = this.discoverEndpoints(device);
     this.deviceEndpoints.set(path, endpoints);
-    await device.claimInterface(endpoints.interfaceNumber);
+    try {
+      await device.claimInterface(endpoints.interfaceNumber);
+    } catch (error) {
+      return this.throwWebUsbIoError(path, 'claimInterface', error);
+    }
     await this.clearEndpointHalt(device, 'in', endpoints.endpointIn);
     await this.clearEndpointHalt(device, 'out', endpoints.endpointOut);
   }
@@ -658,6 +669,65 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     return String(error);
   }
 
+  private getErrorName(error: unknown) {
+    if (typeof error === 'object' && error && 'name' in error) {
+      const { name } = error as { name?: unknown };
+      return typeof name === 'string' ? name : String(name ?? '');
+    }
+    return '';
+  }
+
+  private isWebUsbIoHardwareError(error: unknown): error is HardwareError {
+    return (
+      error instanceof HardwareError &&
+      (error.errorCode === HardwareErrorCode.BridgeDeviceDisconnected ||
+        error.errorCode === HardwareErrorCode.WebUsbDeviceAccessError)
+    );
+  }
+
+  private async isDeviceStillEnumerated(path: string): Promise<boolean | undefined> {
+    if (!this.usb) return undefined;
+    try {
+      const devices = await this.usb.getDevices();
+      return devices.some(device => resolveOneKeyUsbDevicePath(device) === path);
+    } catch (error) {
+      this.Log?.debug('[WebUsbTransport] failed to verify WebUSB device presence:', error);
+      return undefined;
+    }
+  }
+
+  private async throwWebUsbIoError(
+    path: string,
+    operation: WebUsbOperation,
+    error: unknown
+  ): Promise<never> {
+    if (this.isWebUsbIoHardwareError(error)) throw error;
+    if (error instanceof ProtocolV2LinkError && error.code !== 'io') throw error;
+
+    const nativeError = error instanceof ProtocolV2LinkError ? error.cause ?? error : error;
+    if (this.isWebUsbIoHardwareError(nativeError)) throw nativeError;
+
+    const nativeErrorName = this.getErrorName(nativeError);
+    const nativeErrorMessage = this.getErrorMessage(nativeError);
+    const disconnectedByMessage =
+      /(?:device )?disconnected|device not found|action was interrupted/i.test(
+        `${nativeErrorName}: ${nativeErrorMessage}`
+      );
+    const stillEnumerated = disconnectedByMessage
+      ? false
+      : await this.isDeviceStillEnumerated(path);
+    const errorCode =
+      disconnectedByMessage || stillEnumerated === false
+        ? HardwareErrorCode.BridgeDeviceDisconnected
+        : HardwareErrorCode.WebUsbDeviceAccessError;
+
+    throw ERRORS.TypedError(errorCode, nativeErrorMessage || undefined, {
+      operation,
+      nativeErrorName: nativeErrorName || undefined,
+      nativeErrorMessage: nativeErrorMessage || undefined,
+    });
+  }
+
   private isRetryablePacketIoError(error: unknown) {
     const message = this.getErrorMessage(error).toLowerCase();
     return (
@@ -738,7 +808,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         lastError = error;
         const shouldRetry = attempt < PACKET_IO_MAX_RETRIES && this.isRetryablePacketIoError(error);
         if (!shouldRetry) {
-          throw error;
+          return this.throwWebUsbIoError(path, 'transferOut', error);
         }
         try {
           await this.reconnectForPacketIoRetry(path, 'out', attempt, error);
@@ -752,7 +822,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         }
       }
     }
-    throw lastError;
+    return this.throwWebUsbIoError(path, 'transferOut', lastError);
   }
 
   private async transferOutOnce(path: string, packet: Uint8Array) {
@@ -794,7 +864,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         }
         const shouldRetry = attempt < PACKET_IO_MAX_RETRIES && this.isRetryablePacketIoError(error);
         if (!shouldRetry) {
-          throw error;
+          return this.throwWebUsbIoError(path, 'transferIn', error);
         }
         try {
           await this.reconnectForPacketIoRetry(path, 'in', attempt, error);
@@ -808,7 +878,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         }
       }
     }
-    throw lastError;
+    return this.throwWebUsbIoError(path, 'transferIn', lastError);
   }
 
   private async transferInOnce(path: string, length: number): Promise<DataView> {
@@ -890,7 +960,8 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         }
       );
       return true;
-    } catch (_error) {
+    } catch (error) {
+      if (this.isWebUsbIoHardwareError(error)) throw error;
       return false;
     }
   }
@@ -905,6 +976,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
       timeoutMs: PROTOCOL_V2_PROBE_TIMEOUT,
       logger: this.Log,
       logPrefix: 'ProtocolV2 WebUSB',
+      shouldRethrow: error => this.isWebUsbIoHardwareError(error),
     });
   }
 
@@ -982,7 +1054,13 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     data: Record<string, unknown>,
     options?: TransportCallOptions
   ) {
-    return this.callProtocolV2Usb(path, name, data, options);
+    try {
+      return await this.callProtocolV2Usb(path, name, data, options);
+    } catch (error) {
+      if (!(error instanceof ProtocolV2LinkError) || error.code !== 'io') throw error;
+      const operation = error.message.includes(' USB write failed:') ? 'transferOut' : 'transferIn';
+      return this.throwWebUsbIoError(path, operation, error);
+    }
   }
 
   /**