@onekeyfe/hd-transport-web-device 1.2.8-alpha.3 → 1.2.8-alpha.4

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

@@ -182,30 +182,16 @@ describe('ElectronBleTransport protocol detection', () => {
     jest.clearAllMocks();
   });
 
-  test.each([
-    { errorCode: HardwareErrorCode.BleLocationError, message: 'Permission denied' },
-    { code: HardwareErrorCode.BleLocationError },
-    { message: 'Bluetooth unauthorized' },
-  ])('preserves Bluetooth permission failures from the native bridge: %j', async error => {
-    const nobleBle = createNobleBle();
-    nobleBle.enumerate.mockRejectedValueOnce(error);
-    const bleTransport = configureTransport(nobleBle);
-
-    await expect(bleTransport.enumerate()).rejects.toMatchObject({
-      errorCode: HardwareErrorCode.BleLocationError,
-    });
-  });
-
   test('does not treat an error envelope from a legacy preload as a successful connect', async () => {
-    const device = { id: 'legacy-error-id', name: 'OneKey Pro 2' };
+    const device = { id: 'stale-bond-id', name: 'OneKey Pro 2' };
     const nobleBle = createNobleBle(device);
     nobleBle.connect.mockResolvedValue({
       type: 'NobleBleIpcError',
       success: false,
       error: {
         name: 'HardwareError',
-        message: 'Bluetooth connection failed',
-        errorCode: HardwareErrorCode.BleConnectedError,
+        message: 'Bluetooth pairing information is no longer valid',
+        errorCode: HardwareErrorCode.BleBondInvalid,
       },
     } as never);
     const bleTransport = configureTransport(nobleBle);
@@ -213,7 +199,7 @@ describe('ElectronBleTransport protocol detection', () => {
     await expect(
       bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' })
     ).rejects.toMatchObject({
-      errorCode: HardwareErrorCode.BleConnectedError,
+      errorCode: HardwareErrorCode.BleBondInvalid,
     });
     expect(nobleBle.subscribe).not.toHaveBeenCalled();
     expect(nobleBle.disconnect).toHaveBeenCalledWith(device.id);
@@ -656,13 +642,14 @@ describe('ElectronBleTransport protocol detection', () => {
     expect(transport.getProtocolType(device.id)).toBeUndefined();
   });
 
-  test('fails Protocol V2 acquire immediately when subscribe reports a connection error', async () => {
-    const device = { id: 'subscribe-error-pro2-id', name: 'OneKey Pro 2' };
+  test('fails Protocol V2 acquire immediately when subscribe reports insufficient encryption', async () => {
+    const device = { id: 'stale-bond-pro2-id', name: 'OneKey Pro 2' };
     const nobleBle = createNobleBle(device);
     nobleBle.subscribe.mockRejectedValue({
       name: 'HardwareError',
-      message: 'Bluetooth connection failed',
-      errorCode: HardwareErrorCode.BleConnectedError,
+      message: 'Bluetooth pairing information is no longer valid',
+      errorCode: HardwareErrorCode.BleBondInvalid,
+      params: { nativeErrorMessage: 'Encryption is insufficient' },
     });
     const transport = configureTransport(nobleBle);
     const probe = jest.spyOn(transport as any, 'probeProtocolV2');
@@ -670,7 +657,7 @@ describe('ElectronBleTransport protocol detection', () => {
     await expect(
       transport.acquire({ uuid: device.id, expectedProtocol: 'V2' })
     ).rejects.toMatchObject({
-      errorCode: HardwareErrorCode.BleConnectedError,
+      errorCode: HardwareErrorCode.BleBondInvalid,
     });
 
     expect(probe).not.toHaveBeenCalled();
@@ -678,19 +665,21 @@ describe('ElectronBleTransport protocol detection', () => {
     expect(nobleBle.disconnect).toHaveBeenCalledWith(device.id);
   });
 
-  test('rehydrates a structured connection error before the protocol is known', async () => {
+  test('rehydrates a structured stale-bond error before the protocol is known', async () => {
     const device = { id: 'reset-unknown-protocol-id', name: 'OneKey Pro 2' };
     const nobleBle = createNobleBle(device);
     nobleBle.connect.mockRejectedValue({
       name: 'HardwareError',
-      message: 'Bluetooth connection failed',
-      errorCode: HardwareErrorCode.BleConnectedError,
+      message: 'Bluetooth pairing information is no longer valid',
+      errorCode: HardwareErrorCode.BleBondInvalid,
+      params: { nativeErrorMessage: 'CBErrorDomain:14 native message' },
     });
     const transport = configureTransport(nobleBle);
 
     await expect(transport.acquire({ uuid: device.id })).rejects.toMatchObject({
       name: 'HardwareError',
-      errorCode: HardwareErrorCode.BleConnectedError,
+      errorCode: HardwareErrorCode.BleBondInvalid,
+      params: { nativeErrorMessage: 'CBErrorDomain:14 native message' },
     });
   });
 
@@ -710,7 +699,7 @@ describe('ElectronBleTransport protocol detection', () => {
     }
   });
 
-  test('preserves a generic macOS connection failure', async () => {
+  test('does not classify a generic macOS connection failure as a stale bond', async () => {
     const device = { id: 'offline-pro2-macos-id', name: 'OneKey Pro 2' };
     const nobleBle = createNobleBle(device);
     nobleBle.connect.mockRejectedValue(new Error('connection failed'));
@@ -726,7 +715,7 @@ describe('ElectronBleTransport protocol detection', () => {
     }
   });
 
-  test('preserves a native subscribe failure during Protocol V1 acquire', async () => {
+  test('keeps stale-bond subscribe mapping out of Protocol V1 acquire', async () => {
     const device = { id: 'classic-v1-id', name: 'OneKey Classic' };
     const nobleBle = createNobleBle(device);
     nobleBle.subscribe.mockRejectedValue(new Error('Encryption is insufficient'));
@@ -791,19 +780,19 @@ describe('ElectronBleTransport protocol detection', () => {
     }
   );
 
-  test('preserves a native connection error during an expected Protocol V2 probe', async () => {
-    const device = { id: 'connection-error-probe-id', name: 'OneKey Pro 2' };
+  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 connection failed',
-      errorCode: HardwareErrorCode.BleConnectedError,
+      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.BleConnectedError });
+    ).rejects.toMatchObject({ errorCode: HardwareErrorCode.BleBondInvalid });
 
     expect(nobleBle.unsubscribe).toHaveBeenCalledWith(device.id);
     expect(nobleBle.disconnect).toHaveBeenCalledWith(device.id);

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

@@ -64,127 +64,6 @@ describe('WebUsbTransport protocol probe cache', () => {
     }
   );
 
-  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.each(['LIBUSB_ERROR_ACCESS', "Failed to execute 'open' on 'USBDevice': Access denied."])(
-    'reports USB open permission failure: %s',
-    async message => {
-      const webusb = new WebUsbTransport();
-      const device = {
-        opened: false,
-        open: jest
-          .fn()
-          .mockRejectedValue(Object.assign(new Error(message), { name: 'SecurityError' })),
-      };
-      jest.spyOn(webusb, 'findDevice').mockResolvedValue(device as unknown as USBDevice);
-      await expect(webusb.connect('mock-usb', true)).rejects.toMatchObject({
-        errorCode: HardwareErrorCode.BridgeNeedsPermission,
-        params: {
-          operation: 'open',
-          nativeErrorName: 'SecurityError',
-          nativeErrorMessage: message,
-        },
-      });
-      expect(device.open).toHaveBeenCalledTimes(1);
-    }
-  );
-
-  test('does not classify protected-interface SecurityError as missing OS permission', async () => {
-    const webusb = new WebUsbTransport();
-    const device = {
-      opened: false,
-      open: jest
-        .fn()
-        .mockRejectedValue(
-          Object.assign(new Error('Protected interface'), { name: 'SecurityError' })
-        ),
-    };
-    jest.spyOn(webusb, 'findDevice').mockResolvedValue(device as unknown as USBDevice);
-    await expect(webusb.connectToDevice('mock-usb', true)).rejects.toMatchObject({
-      errorCode: HardwareErrorCode.WebUsbDeviceAccessError,
-    });
-  });
-
-  test.each(['claimInterface', 'transferIn', 'transferOut'] as const)(
-    'preserves USB permission failures during %s',
-    async operation => {
-      const webusb = new WebUsbTransport() as unknown as {
-        throwWebUsbIoError(path: string, operation: string, error: unknown): Promise<never>;
-      };
-      await expect(
-        webusb.throwWebUsbIoError('mock-usb', operation, new Error('LIBUSB_ERROR_ACCESS'))
-      ).rejects.toMatchObject({
-        errorCode: HardwareErrorCode.BridgeNeedsPermission,
-        params: { operation, nativeErrorMessage: 'LIBUSB_ERROR_ACCESS' },
-      });
-    }
-  );
-
-  test('fails a stalled USB write without replaying the packet', async () => {
-    const webusb = new WebUsbTransport();
-    const device = {
-      opened: true,
-      transferOut: jest.fn().mockResolvedValue({ status: 'stall', bytesWritten: 0 }),
-    };
-    jest.spyOn(webusb, 'findDevice').mockResolvedValue(device as unknown as USBDevice);
-    const state = webusb as unknown as {
-      transferOutWithRetry(path: string, packet: Uint8Array): Promise<void>;
-    };
-    await expect(state.transferOutWithRetry('mock-usb', new Uint8Array([1]))).rejects.toMatchObject(
-      {
-        errorCode: HardwareErrorCode.WebUsbDeviceAccessError,
-        params: { operation: 'transferOut', nativeErrorMessage: 'transferOut status: stall' },
-      }
-    );
-    expect(device.transferOut).toHaveBeenCalledTimes(1);
-  });
-
   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,15 +238,9 @@ 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.toMatchObject({
-      errorCode: HardwareErrorCode.BridgeDeviceDisconnected,
-      params: {
-        operation: 'transferIn',
-        nativeErrorMessage: 'NetworkError: transferIn device disconnected',
-      },
-    });
+    await expect(webusb.callProtocolV2(path, 'Ping', { message: 'read-error' })).rejects.toThrow(
+      'NetworkError'
+    );
 
     expect(webusb.readProtocolV2UsbPacket).toHaveBeenCalledTimes(1);
     expect(webusb.resetProtocolV2UsbNativeLink).toHaveBeenCalledWith(

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<undefined>;
+    connect(path: string, first: boolean): Promise<void>;
     /**
      * 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<undefined>;
+    connectToDevice(path: string, first: boolean): Promise<void>;
     private closeOpenDevice;
     private clearEndpointHalt;
     /**
@@ -141,11 +141,6 @@ 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 isWebUsbPermissionDeniedMessage;
     private isRetryablePacketIoError;
     private reconnectForPacketIoRetry;
     private getTransferInData;

package/dist/index.js

@@ -332,9 +332,6 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                     return yield this.connectToDevice(path, first);
                 }
                 catch (e) {
-                    if (e instanceof hdShared.HardwareError && e.errorCode === hdShared.HardwareErrorCode.BridgeNeedsPermission) {
-                        throw e;
-                    }
                     if (i === maxRetries - 1) {
                         throw e;
                     }
@@ -376,12 +373,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
         return __awaiter(this, void 0, void 0, function* () {
             let device = yield this.findDevice(path);
             if (!device.opened) {
-                try {
-                    yield device.open();
-                }
-                catch (error) {
-                    return this.throwWebUsbIoError(path, 'open', error);
-                }
+                yield device.open();
             }
             if (first || this.deviceProtocol.get(path) !== 'V1') {
                 try {
@@ -394,12 +386,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             yield this.getConnectedDevices();
             device = yield this.findDevice(path);
             if (!device.opened) {
-                try {
-                    yield device.open();
-                }
-                catch (error) {
-                    return this.throwWebUsbIoError(path, 'open', error);
-                }
+                yield device.open();
             }
             if (first ||
                 !device.configuration ||
@@ -408,12 +395,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             }
             const endpoints = this.discoverEndpoints(device);
             this.deviceEndpoints.set(path, endpoints);
-            try {
-                yield device.claimInterface(endpoints.interfaceNumber);
-            }
-            catch (error) {
-                return this.throwWebUsbIoError(path, 'claimInterface', error);
-            }
+            yield device.claimInterface(endpoints.interfaceNumber);
             yield this.clearEndpointHalt(device, 'in', endpoints.endpointIn);
             yield this.clearEndpointHalt(device, 'out', endpoints.endpointOut);
         });
@@ -477,76 +459,8 @@ 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.BridgeNeedsPermission ||
-                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);
-            if (this.isWebUsbPermissionDeniedMessage(nativeErrorMessage)) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BridgeNeedsPermission, nativeErrorMessage, {
-                    operation,
-                    nativeErrorName: nativeErrorName || undefined,
-                    nativeErrorMessage,
-                });
-            }
-            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,
-            });
-        });
-    }
-    isWebUsbPermissionDeniedMessage(message) {
-        return /LIBUSB_ERROR_ACCESS|\b(?:access|permission) denied\b/i.test(message);
-    }
     isRetryablePacketIoError(error) {
-        if (this.isWebUsbIoHardwareError(error))
-            return false;
         const message = this.getErrorMessage(error).toLowerCase();
-        if (this.isWebUsbPermissionDeniedMessage(message))
-            return false;
         return (message.includes('transferout') ||
             message.includes('transferin') ||
             message.includes('usbdevice') ||
@@ -611,7 +525,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                     lastError = error;
                     const shouldRetry = attempt < PACKET_IO_MAX_RETRIES && this.isRetryablePacketIoError(error);
                     if (!shouldRetry) {
-                        return this.throwWebUsbIoError(path, 'transferOut', error);
+                        throw error;
                     }
                     try {
                         yield this.reconnectForPacketIoRetry(path, 'out', attempt, error);
@@ -622,7 +536,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                     }
                 }
             }
-            return this.throwWebUsbIoError(path, 'transferOut', lastError);
+            throw lastError;
         });
     }
     transferOutOnce(path, packet) {
@@ -635,10 +549,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             const endpoints = this.deviceEndpoints.get(path);
             const endpointOut = (_a = endpoints === null || endpoints === void 0 ? void 0 : endpoints.endpointOut) !== null && _a !== void 0 ? _a : this.endpointId;
             const transferBuffer = this.toArrayBuffer(packet.buffer.slice(packet.byteOffset, packet.byteOffset + packet.byteLength));
-            const result = yield device.transferOut(endpointOut, transferBuffer);
-            if (result.status !== 'ok') {
-                return this.throwWebUsbIoError(path, 'transferOut', new Error(`transferOut status: ${String(result.status)}`));
-            }
+            yield device.transferOut(endpointOut, transferBuffer);
         });
     }
     transferInWithRetry(path, length, cancelToken) {
@@ -666,7 +577,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                     }
                     const shouldRetry = attempt < PACKET_IO_MAX_RETRIES && this.isRetryablePacketIoError(error);
                     if (!shouldRetry) {
-                        return this.throwWebUsbIoError(path, 'transferIn', error);
+                        throw error;
                     }
                     try {
                         yield this.reconnectForPacketIoRetry(path, 'in', attempt, error);
@@ -677,7 +588,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                     }
                 }
             }
-            return this.throwWebUsbIoError(path, 'transferIn', lastError);
+            throw lastError;
         });
     }
     transferInOnce(path, length) {
@@ -754,9 +665,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                 });
                 return true;
             }
-            catch (error) {
-                if (this.isWebUsbIoHardwareError(error))
-                    throw error;
+            catch (_error) {
                 return false;
             }
         });
@@ -771,7 +680,6 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                 timeoutMs: PROTOCOL_V2_PROBE_TIMEOUT,
                 logger: this.Log,
                 logPrefix: 'ProtocolV2 WebUSB',
-                shouldRethrow: error => this.isWebUsbIoHardwareError(error),
             });
         });
     }
@@ -818,15 +726,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
     }
     callProtocolV2(path, name, data, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            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);
-            }
+            return this.callProtocolV2Usb(path, name, data, options);
         });
     }
     receiveData(path, timeoutMs) {
@@ -1001,14 +901,11 @@ class ElectronBleTransport {
                 if (error.code === hdShared.HardwareErrorCode.BlePermissionError) {
                     return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError);
                 }
-                if (error.code === hdShared.HardwareErrorCode.BleLocationError) {
-                    return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleLocationError);
-                }
             }
             const errorMessage = error.message || String(error);
             const poweredOffMessage = hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.BlePoweredOff];
             const unsupportedMessage = hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.BleUnsupported];
-            const permissionMessage = hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.BleLocationError];
+            const permissionMessage = hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.BlePermissionError];
             if (errorMessage.includes(poweredOffMessage) || errorMessage.includes('poweredOff')) {
                 return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePoweredOff);
             }
@@ -1016,7 +913,7 @@ class ElectronBleTransport {
                 return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleUnsupported);
             }
             if (errorMessage.includes(permissionMessage) || errorMessage.includes('unauthorized')) {
-                return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleLocationError);
+                return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError);
             }
         }
         return error;
@@ -1392,7 +1289,9 @@ class ElectronBleTransport {
                     (_a = this.v2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
                     this.resetProtocolV2Frames(uuid);
                 },
-                shouldRethrow: error => expectedProtocol === 'V2' || transport.isProtocolV2LinkDisabledError(error),
+                shouldRethrow: error => expectedProtocol === 'V2' ||
+                    hdShared.isBleStaleBondHardwareError(error) ||
+                    transport.isProtocolV2LinkDisabledError(error),
             });
             if (!detected) {
                 this.clearProbeProtocol(uuid, 'V2');

package/dist/webusb.d.ts

@@ -44,19 +44,14 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     private createProtocolDetectionError;
     private detectProtocol;
     findDevice(path: string): Promise<USBDevice>;
-    connect(path: string, first: boolean): Promise<undefined>;
+    connect(path: string, first: boolean): Promise<void>;
     private discoverEndpoints;
-    connectToDevice(path: string, first: boolean): Promise<undefined>;
+    connectToDevice(path: string, first: boolean): Promise<void>;
     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 isWebUsbPermissionDeniedMessage;
     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":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-web-device",
-  "version": "1.2.8-alpha.3",
+  "version": "1.2.8-alpha.4",
   "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.8-alpha.3",
-    "@onekeyfe/hd-transport": "1.2.8-alpha.3"
+    "@onekeyfe/hd-shared": "1.2.8-alpha.4",
+    "@onekeyfe/hd-transport": "1.2.8-alpha.4"
   },
   "devDependencies": {
-    "@onekeyfe/hd-transport-electron": "1.2.8-alpha.3",
+    "@onekeyfe/hd-transport-electron": "1.2.8-alpha.4",
     "@types/w3c-web-usb": "^1.0.6",
     "@types/web-bluetooth": "^0.0.17"
   },
-  "gitHead": "18c57239359413a079fffa730b36149c8516aa85"
+  "gitHead": "82fcab32fa1a37d1b82f73da825e39360624e0c9"
 }

package/src/electron-ble-transport.ts

@@ -18,6 +18,7 @@ import {
   HardwareErrorCode,
   HardwareErrorCodeMessage,
   createDeferred,
+  isBleStaleBondHardwareError,
   isHeaderChunk,
 } from '@onekeyfe/hd-shared';
 
@@ -202,14 +203,11 @@ export default class ElectronBleTransport {
         if (error.code === HardwareErrorCode.BlePermissionError) {
           return ERRORS.TypedError(HardwareErrorCode.BlePermissionError);
         }
-        if (error.code === HardwareErrorCode.BleLocationError) {
-          return ERRORS.TypedError(HardwareErrorCode.BleLocationError);
-        }
       }
       const errorMessage = error.message || String(error);
       const poweredOffMessage = HardwareErrorCodeMessage[HardwareErrorCode.BlePoweredOff];
       const unsupportedMessage = HardwareErrorCodeMessage[HardwareErrorCode.BleUnsupported];
-      const permissionMessage = HardwareErrorCodeMessage[HardwareErrorCode.BleLocationError];
+      const permissionMessage = HardwareErrorCodeMessage[HardwareErrorCode.BlePermissionError];
 
       if (errorMessage.includes(poweredOffMessage) || errorMessage.includes('poweredOff')) {
         return ERRORS.TypedError(HardwareErrorCode.BlePoweredOff);
@@ -218,7 +216,7 @@ export default class ElectronBleTransport {
         return ERRORS.TypedError(HardwareErrorCode.BleUnsupported);
       }
       if (errorMessage.includes(permissionMessage) || errorMessage.includes('unauthorized')) {
-        return ERRORS.TypedError(HardwareErrorCode.BleLocationError);
+        return ERRORS.TypedError(HardwareErrorCode.BlePermissionError);
       }
     }
     return error;
@@ -678,7 +676,10 @@ export default class ElectronBleTransport {
         this.resetProtocolV2Frames(uuid);
       },
       // A declared V2 protocol needs no fallback; preserve the actual link failure.
-      shouldRethrow: error => expectedProtocol === 'V2' || isProtocolV2LinkDisabledError(error),
+      shouldRethrow: error =>
+        expectedProtocol === 'V2' ||
+        isBleStaleBondHardwareError(error) ||
+        isProtocolV2LinkDisabledError(error),
     });
     if (!detected) {
       this.clearProbeProtocol(uuid, 'V2');

package/src/webusb.ts

@@ -13,7 +13,6 @@ import transport, {
 } from '@onekeyfe/hd-transport';
 import {
   ERRORS,
-  HardwareError,
   HardwareErrorCode,
   ONEKEY_WEBUSB_FILTER,
   inferProtocolHintFromUsbId,
@@ -71,8 +70,6 @@ interface TransferCancelToken {
   cancelled: boolean;
 }
 
-type WebUsbOperation = 'open' | '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
@@ -519,9 +516,6 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
       try {
         return await this.connectToDevice(path, first);
       } catch (e) {
-        if (e instanceof HardwareError && e.errorCode === HardwareErrorCode.BridgeNeedsPermission) {
-          throw e;
-        }
         if (i === maxRetries - 1) {
           throw e;
         }
@@ -570,11 +564,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
   async connectToDevice(path: string, first: boolean) {
     let device: USBDevice = await this.findDevice(path);
     if (!device.opened) {
-      try {
-        await device.open();
-      } catch (error) {
-        return this.throwWebUsbIoError(path, 'open', error);
-      }
+      await device.open();
     }
     // A V1 packet retry continues an in-flight exchange. Preserve its endpoint
     // state as in the legacy transport; probing and V2 recovery still reset.
@@ -588,11 +578,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     await this.getConnectedDevices();
     device = await this.findDevice(path);
     if (!device.opened) {
-      try {
-        await device.open();
-      } catch (error) {
-        return this.throwWebUsbIoError(path, 'open', error);
-      }
+      await device.open();
     }
 
     if (
@@ -606,11 +592,7 @@ 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);
-    try {
-      await device.claimInterface(endpoints.interfaceNumber);
-    } catch (error) {
-      return this.throwWebUsbIoError(path, 'claimInterface', error);
-    }
+    await device.claimInterface(endpoints.interfaceNumber);
     await this.clearEndpointHalt(device, 'in', endpoints.endpointIn);
     await this.clearEndpointHalt(device, 'out', endpoints.endpointOut);
   }
@@ -680,82 +662,8 @@ 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.BridgeNeedsPermission ||
-        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);
-    // SecurityError alone may indicate a protected interface, not OS permissions.
-    if (this.isWebUsbPermissionDeniedMessage(nativeErrorMessage)) {
-      throw ERRORS.TypedError(HardwareErrorCode.BridgeNeedsPermission, nativeErrorMessage, {
-        operation,
-        nativeErrorName: nativeErrorName || undefined,
-        nativeErrorMessage,
-      });
-    }
-    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 isWebUsbPermissionDeniedMessage(message: string) {
-    return /LIBUSB_ERROR_ACCESS|\b(?:access|permission) denied\b/i.test(message);
-  }
-
   private isRetryablePacketIoError(error: unknown) {
-    if (this.isWebUsbIoHardwareError(error)) return false;
     const message = this.getErrorMessage(error).toLowerCase();
-    if (this.isWebUsbPermissionDeniedMessage(message)) return false;
     return (
       message.includes('transferout') ||
       message.includes('transferin') ||
@@ -834,7 +742,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         lastError = error;
         const shouldRetry = attempt < PACKET_IO_MAX_RETRIES && this.isRetryablePacketIoError(error);
         if (!shouldRetry) {
-          return this.throwWebUsbIoError(path, 'transferOut', error);
+          throw error;
         }
         try {
           await this.reconnectForPacketIoRetry(path, 'out', attempt, error);
@@ -848,7 +756,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         }
       }
     }
-    return this.throwWebUsbIoError(path, 'transferOut', lastError);
+    throw lastError;
   }
 
   private async transferOutOnce(path: string, packet: Uint8Array) {
@@ -861,14 +769,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     const transferBuffer = this.toArrayBuffer(
       packet.buffer.slice(packet.byteOffset, packet.byteOffset + packet.byteLength)
     );
-    const result = await device.transferOut(endpointOut, transferBuffer);
-    if (result.status !== 'ok') {
-      return this.throwWebUsbIoError(
-        path,
-        'transferOut',
-        new Error(`transferOut status: ${String(result.status)}`)
-      );
-    }
+    await device.transferOut(endpointOut, transferBuffer);
   }
 
   private async transferInWithRetry(
@@ -897,7 +798,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         }
         const shouldRetry = attempt < PACKET_IO_MAX_RETRIES && this.isRetryablePacketIoError(error);
         if (!shouldRetry) {
-          return this.throwWebUsbIoError(path, 'transferIn', error);
+          throw error;
         }
         try {
           await this.reconnectForPacketIoRetry(path, 'in', attempt, error);
@@ -911,7 +812,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         }
       }
     }
-    return this.throwWebUsbIoError(path, 'transferIn', lastError);
+    throw lastError;
   }
 
   private async transferInOnce(path: string, length: number): Promise<DataView> {
@@ -993,8 +894,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         }
       );
       return true;
-    } catch (error) {
-      if (this.isWebUsbIoHardwareError(error)) throw error;
+    } catch (_error) {
       return false;
     }
   }
@@ -1009,7 +909,6 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
       timeoutMs: PROTOCOL_V2_PROBE_TIMEOUT,
       logger: this.Log,
       logPrefix: 'ProtocolV2 WebUSB',
-      shouldRethrow: error => this.isWebUsbIoHardwareError(error),
     });
   }
 
@@ -1087,13 +986,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     data: Record<string, unknown>,
     options?: TransportCallOptions
   ) {
-    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);
-    }
+    return this.callProtocolV2Usb(path, name, data, options);
   }
 
   /**