@onekeyfe/hd-transport-web-device 1.2.2-alpha.15 → 1.2.2-alpha.17

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

@@ -553,14 +553,19 @@ describe('ElectronBleTransport protocol detection', () => {
   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(new Error('Encryption is insufficient'));
+    nobleBle.subscribe.mockRejectedValue({
+      name: 'HardwareError',
+      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');
 
     await expect(
       transport.acquire({ uuid: device.id, expectedProtocol: 'V2' })
     ).rejects.toMatchObject({
-      errorCode: HardwareErrorCode.BleDeviceBondError,
+      errorCode: HardwareErrorCode.BleBondInvalid,
     });
 
     expect(probe).not.toHaveBeenCalled();
@@ -568,6 +573,56 @@ describe('ElectronBleTransport protocol detection', () => {
     expect(nobleBle.disconnect).toHaveBeenCalledWith(device.id);
   });
 
+  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 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.BleBondInvalid,
+      params: { nativeErrorMessage: 'CBErrorDomain:14 native message' },
+    });
+  });
+
+  test('does not infer hardware errors from native error text in the renderer', async () => {
+    const device = { id: 'reset-pro2-localized-id', name: 'OneKey Pro 2' };
+    const nobleBle = createNobleBle(device);
+    nobleBle.connect.mockRejectedValue(new Error('CBATTErrorDomain:14 localized native message'));
+    const transport = configureTransport(nobleBle);
+
+    try {
+      await transport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+      throw new Error('Expected acquire to fail');
+    } catch (error) {
+      expect(error).toBeInstanceOf(Error);
+      expect((error as Error).message).toBe('CBATTErrorDomain:14 localized native message');
+      expect((error as { errorCode?: unknown }).errorCode).toBeUndefined();
+    }
+  });
+
+  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'));
+    const transport = configureTransport(nobleBle);
+
+    try {
+      await transport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+      throw new Error('Expected acquire to fail');
+    } catch (error) {
+      expect(error).toBeInstanceOf(Error);
+      expect((error as Error).message).toBe('connection failed');
+      expect((error as { errorCode?: unknown }).errorCode).toBeUndefined();
+    }
+  });
+
   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);

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

@@ -41,7 +41,7 @@ export default class ElectronBleTransport {
     private hostDisconnectCleanup?;
     private notificationTokens;
     private nextNotificationToken;
-    private toStaleBondError;
+    private normalizeBluetoothError;
     private handleBluetoothError;
     private cleanupDeviceState;
     init(logger: any, emitter?: EventEmitter): void;

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

@@ -242,7 +242,7 @@ declare class ElectronBleTransport {
     private hostDisconnectCleanup?;
     private notificationTokens;
     private nextNotificationToken;
-    private toStaleBondError;
+    private normalizeBluetoothError;
     private handleBluetoothError;
     private cleanupDeviceState;
     init(logger: any, emitter?: EventEmitter): void;

package/dist/index.js

@@ -871,39 +871,20 @@ class ElectronBleTransport {
         this.notificationTokens = new Map();
         this.nextNotificationToken = 1;
     }
-    toStaleBondError(error) {
-        var _a;
-        if (hdShared.isBleStaleBondHardwareError(error)) {
-            return error;
-        }
-        const errorMessage = error && typeof error === 'object' && 'message' in error
-            ? String((_a = error.message) !== null && _a !== void 0 ? _a : '')
-            : String(error !== null && error !== void 0 ? error : '');
-        if (!hdShared.isBleStaleBondErrorText(errorMessage)) {
-            return null;
-        }
-        const normalizedErrorMessage = errorMessage.toLowerCase();
-        return hdShared.ERRORS.TypedError(normalizedErrorMessage.includes('peer removed pairing information')
-            ? hdShared.HardwareErrorCode.BlePeerRemovedPairingInformation
-            : hdShared.HardwareErrorCode.BleDeviceBondError, errorMessage);
-    }
-    handleBluetoothError(error, mapProtocolV2StaleBond = false) {
-        if (mapProtocolV2StaleBond) {
-            const staleBondError = this.toStaleBondError(error);
-            if (staleBondError) {
-                throw staleBondError;
-            }
-        }
+    normalizeBluetoothError(error) {
         if (error && typeof error === 'object') {
+            if (typeof error.errorCode === 'number') {
+                return hdShared.ERRORS.TypedError(error.errorCode, typeof error.message === 'string' ? error.message : undefined, error.params);
+            }
             if ('code' in error) {
                 if (error.code === hdShared.HardwareErrorCode.BlePoweredOff) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePoweredOff);
+                    return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePoweredOff);
                 }
                 if (error.code === hdShared.HardwareErrorCode.BleUnsupported) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleUnsupported);
+                    return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleUnsupported);
                 }
                 if (error.code === hdShared.HardwareErrorCode.BlePermissionError) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError);
+                    return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError);
                 }
             }
             const errorMessage = error.message || String(error);
@@ -911,16 +892,19 @@ class ElectronBleTransport {
             const unsupportedMessage = hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.BleUnsupported];
             const permissionMessage = hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.BlePermissionError];
             if (errorMessage.includes(poweredOffMessage) || errorMessage.includes('poweredOff')) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePoweredOff);
+                return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePoweredOff);
             }
             if (errorMessage.includes(unsupportedMessage) || errorMessage.includes('unsupported')) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleUnsupported);
+                return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleUnsupported);
             }
             if (errorMessage.includes(permissionMessage) || errorMessage.includes('unauthorized')) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError);
+                return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError);
             }
         }
-        throw error;
+        return error;
+    }
+    handleBluetoothError(error) {
+        throw this.normalizeBluetoothError(error);
     }
     cleanupDeviceState(deviceId) {
         this.protocolV2Links
@@ -1024,9 +1008,6 @@ class ElectronBleTransport {
         var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
             const { uuid, forceCleanRunPromise, expectedProtocol } = input;
-            const shouldMapProtocolV2StaleBond = expectedProtocol
-                ? expectedProtocol === 'V2'
-                : this.confirmedProtocolV2.has(uuid);
             if (!uuid) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleRequiredUUID);
             }
@@ -1058,7 +1039,7 @@ class ElectronBleTransport {
                     this.connectedDevices.add(uuid);
                 }
                 catch (error) {
-                    this.handleBluetoothError(error, shouldMapProtocolV2StaleBond);
+                    this.handleBluetoothError(error);
                 }
                 const mtuCleanup = this.createMtuSubscription(uuid);
                 if (mtuCleanup) {
@@ -1070,7 +1051,7 @@ class ElectronBleTransport {
                     yield window.desktopApi.nobleBle.subscribe(uuid);
                 }
                 catch (error) {
-                    this.handleBluetoothError(error, shouldMapProtocolV2StaleBond);
+                    this.handleBluetoothError(error);
                 }
                 yield this.refreshBlePacketCapacity(uuid);
                 const cleanup = this.createNotificationSubscription(uuid);
@@ -1097,7 +1078,7 @@ class ElectronBleTransport {
                     (_g = this.Log) === null || _g === void 0 ? void 0 : _g.debug('[Electron BLE] acquire cleanup failed:', cleanupError);
                 }
                 this.cleanupDeviceState(uuid);
-                throw error;
+                this.handleBluetoothError(error);
             }
         });
     }
@@ -1301,11 +1282,7 @@ class ElectronBleTransport {
                 yield nobleBle.write(uuid, hexData, { pacingDelayMs: 0 });
             }
             catch (error) {
-                const staleBondError = this.toStaleBondError(error);
-                if (staleBondError) {
-                    throw staleBondError;
-                }
-                throw error;
+                this.handleBluetoothError(error);
             }
         });
     }
@@ -1568,7 +1545,7 @@ class ElectronBleTransport {
                         yield this.releaseNative(uuid);
                     }
                 }
-                throw e;
+                throw this.normalizeBluetoothError(e);
             }
             finally {
                 if (timeout)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-web-device",
-  "version": "1.2.2-alpha.15",
+  "version": "1.2.2-alpha.17",
   "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.2-alpha.15",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.15"
+    "@onekeyfe/hd-shared": "1.2.2-alpha.17",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.17"
   },
   "devDependencies": {
-    "@onekeyfe/hd-transport-electron": "1.2.2-alpha.15",
+    "@onekeyfe/hd-transport-electron": "1.2.2-alpha.17",
     "@types/w3c-web-usb": "^1.0.6",
     "@types/web-bluetooth": "^0.0.17"
   },
-  "gitHead": "ea66eff5817385ee2144d8e037c385342e44e21f"
+  "gitHead": "b6c48b842d1c325dcd5ce42c03a07ee4377002dd"
 }

package/src/electron-ble-transport.ts

@@ -18,7 +18,6 @@ import {
   HardwareErrorCode,
   HardwareErrorCodeMessage,
   createDeferred,
-  isBleStaleBondErrorText,
   isBleStaleBondHardwareError,
   isHeaderChunk,
 } from '@onekeyfe/hd-shared';
@@ -163,43 +162,24 @@ export default class ElectronBleTransport {
 
   private nextNotificationToken = 1;
 
-  private toStaleBondError(error: unknown): Error | null {
-    if (isBleStaleBondHardwareError(error)) {
-      return error as Error;
-    }
-    const errorMessage =
-      error && typeof error === 'object' && 'message' in error
-        ? String((error as { message?: unknown }).message ?? '')
-        : String(error ?? '');
-    if (!isBleStaleBondErrorText(errorMessage)) {
-      return null;
-    }
-    const normalizedErrorMessage = errorMessage.toLowerCase();
-    return ERRORS.TypedError(
-      normalizedErrorMessage.includes('peer removed pairing information')
-        ? HardwareErrorCode.BlePeerRemovedPairingInformation
-        : HardwareErrorCode.BleDeviceBondError,
-      errorMessage
-    );
-  }
-
-  private handleBluetoothError(error: any, mapProtocolV2StaleBond = false): never {
-    if (mapProtocolV2StaleBond) {
-      const staleBondError = this.toStaleBondError(error);
-      if (staleBondError) {
-        throw staleBondError;
-      }
-    }
+  private normalizeBluetoothError(error: any): any {
     if (error && typeof error === 'object') {
+      if (typeof error.errorCode === 'number') {
+        return ERRORS.TypedError(
+          error.errorCode,
+          typeof error.message === 'string' ? error.message : undefined,
+          error.params
+        );
+      }
       if ('code' in error) {
         if (error.code === HardwareErrorCode.BlePoweredOff) {
-          throw ERRORS.TypedError(HardwareErrorCode.BlePoweredOff);
+          return ERRORS.TypedError(HardwareErrorCode.BlePoweredOff);
         }
         if (error.code === HardwareErrorCode.BleUnsupported) {
-          throw ERRORS.TypedError(HardwareErrorCode.BleUnsupported);
+          return ERRORS.TypedError(HardwareErrorCode.BleUnsupported);
         }
         if (error.code === HardwareErrorCode.BlePermissionError) {
-          throw ERRORS.TypedError(HardwareErrorCode.BlePermissionError);
+          return ERRORS.TypedError(HardwareErrorCode.BlePermissionError);
         }
       }
       const errorMessage = error.message || String(error);
@@ -208,16 +188,20 @@ export default class ElectronBleTransport {
       const permissionMessage = HardwareErrorCodeMessage[HardwareErrorCode.BlePermissionError];
 
       if (errorMessage.includes(poweredOffMessage) || errorMessage.includes('poweredOff')) {
-        throw ERRORS.TypedError(HardwareErrorCode.BlePoweredOff);
+        return ERRORS.TypedError(HardwareErrorCode.BlePoweredOff);
       }
       if (errorMessage.includes(unsupportedMessage) || errorMessage.includes('unsupported')) {
-        throw ERRORS.TypedError(HardwareErrorCode.BleUnsupported);
+        return ERRORS.TypedError(HardwareErrorCode.BleUnsupported);
       }
       if (errorMessage.includes(permissionMessage) || errorMessage.includes('unauthorized')) {
-        throw ERRORS.TypedError(HardwareErrorCode.BlePermissionError);
+        return ERRORS.TypedError(HardwareErrorCode.BlePermissionError);
       }
     }
-    throw error;
+    return error;
+  }
+
+  private handleBluetoothError(error: any): never {
+    throw this.normalizeBluetoothError(error);
   }
 
   private cleanupDeviceState(deviceId: string): void {
@@ -350,9 +334,6 @@ export default class ElectronBleTransport {
 
   async acquire(input: BleAcquireInput) {
     const { uuid, forceCleanRunPromise, expectedProtocol } = input;
-    const shouldMapProtocolV2StaleBond = expectedProtocol
-      ? expectedProtocol === 'V2'
-      : this.confirmedProtocolV2.has(uuid);
 
     if (!uuid) {
       throw ERRORS.TypedError(HardwareErrorCode.BleRequiredUUID);
@@ -389,7 +370,7 @@ export default class ElectronBleTransport {
         await window.desktopApi.nobleBle.connect(uuid);
         this.connectedDevices.add(uuid);
       } catch (error) {
-        this.handleBluetoothError(error, shouldMapProtocolV2StaleBond);
+        this.handleBluetoothError(error);
       }
 
       const mtuCleanup = this.createMtuSubscription(uuid);
@@ -403,7 +384,7 @@ export default class ElectronBleTransport {
       try {
         await window.desktopApi.nobleBle.subscribe(uuid);
       } catch (error) {
-        this.handleBluetoothError(error, shouldMapProtocolV2StaleBond);
+        this.handleBluetoothError(error);
       }
       await this.refreshBlePacketCapacity(uuid);
 
@@ -434,7 +415,7 @@ export default class ElectronBleTransport {
         this.Log?.debug('[Electron BLE] acquire cleanup failed:', cleanupError);
       }
       this.cleanupDeviceState(uuid);
-      throw error;
+      this.handleBluetoothError(error);
     }
   }
 
@@ -673,11 +654,7 @@ export default class ElectronBleTransport {
     try {
       await nobleBle.write(uuid, hexData, { pacingDelayMs: 0 });
     } catch (error) {
-      const staleBondError = this.toStaleBondError(error);
-      if (staleBondError) {
-        throw staleBondError;
-      }
-      throw error;
+      this.handleBluetoothError(error);
     }
   }
 
@@ -978,7 +955,7 @@ export default class ElectronBleTransport {
           await this.releaseNative(uuid);
         }
       }
-      throw e;
+      throw this.normalizeBluetoothError(e);
     } finally {
       if (timeout) clearTimeout(timeout);
       if (this.runPromise === runPromise) {