@onekeyfe/hd-shared 1.2.2-alpha.15 → 1.2.2-alpha.17

package/dist/HardwareError.d.ts

@@ -87,6 +87,7 @@ export declare const HardwareErrorCode: {
     readonly BlePoweredOff: 721;
     readonly BleUnsupported: 722;
     readonly BleUnavailableWhileUsbConnected: 723;
+    readonly BleBondInvalid: 724;
     readonly RuntimeError: 800;
     readonly PinInvalid: 801;
     readonly PinCancelled: 802;

package/dist/HardwareError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HardwareError.d.ts","sourceRoot":"","sources":["../src/HardwareError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,OAAO,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED,KAAK,OAAO,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAE5C,KAAK,+BAA+B,GAAG;KAAG,CAAC,IAAI,OAAO,CAAC,OAAO,iBAAiB,CAAC,GAAG,MAAM;CAAE,CAAC;AAE5F,KAAK,cAAc,GAAG,OAAO,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAsCxD,qBAAa,aAAc,SAAQ,KAAK;IACtC,SAAS,EAAE,cAAc,CAAkC;IAE3D,OAAO,SAAM;IAEb,MAAM,EAAE,GAAG,CAAM;gBAEL,aAAa,EAAE,cAAc,GAAG,MAAM;CAmBnD;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAybpB,CAAC;AAEX,eAAO,MAAM,wBAAwB,EAAE,+BAsJ7B,CAAC;AAEX,eAAO,MAAM,UAAU,kBACN,cAAc,GAAG,MAAM,YAC5B,MAAM,WACP,GAAG,kBAMb,CAAC;AAEF,eAAO,MAAM,2BAA2B,UAAW,OAAO,KAAG,OAM5D,CAAC;AAEF,eAAO,MAAM,uBAAuB,SAAU,MAAM,KAAG,OAQtD,CAAC;AAEF,eAAO,MAAM,cAAc,YAAa,GAAG,QAe1C,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAa,MAAM,KAAG,aAOtD,CAAC;AAGF,eAAO,MAAM,gCAAgC,QAAS,MAAM,KAAG,aAQ9D,CAAC;AAEF,QAAA,MAAM,uCAAuC;oBAM3B,MAAM;oBACN,MAAM;;;mBAcvB,CAAC;AAEF,QAAA,MAAM,sCAAsC;oBAM1B,MAAM;oBACN,MAAM;;;mBAcvB,CAAC;AAEF,QAAA,MAAM,yCAAyC,cAClC,MAAM,GAAG,SAAS,YACnB,MAAM,GAAG,SAAS,iBACb,CAAC,UAAU,GAAG,KAAK,CAAC,EAAE,oBACnB;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,kBAsBF,CAAC;AAEF,QAAA,MAAM,6BAA6B,mBACjB,MAAM,qBACH,MAAM,eACZ,MAAM,kBAQpB,CAAC;AAEF,QAAA,MAAM,4BAA4B,aACtB,MAAM,aACL,MAAM,cACL,MAAM,cACN,MAAM,aACP,MAAM,kBAWlB,CAAC;AAEF,QAAA,MAAM,iCAAiC,eAAgB,MAAM,gBAAgB,aAAa,kBAItF,CAAC;AAEL,OAAO,EACL,uCAAuC,EACvC,sCAAsC,EACtC,yCAAyC,EACzC,6BAA6B,EAC7B,4BAA4B,EAC5B,iCAAiC,GAClC,CAAC"}
+{"version":3,"file":"HardwareError.d.ts","sourceRoot":"","sources":["../src/HardwareError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,OAAO,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED,KAAK,OAAO,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAE5C,KAAK,+BAA+B,GAAG;KAAG,CAAC,IAAI,OAAO,CAAC,OAAO,iBAAiB,CAAC,GAAG,MAAM;CAAE,CAAC;AAE5F,KAAK,cAAc,GAAG,OAAO,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAsCxD,qBAAa,aAAc,SAAQ,KAAK;IACtC,SAAS,EAAE,cAAc,CAAkC;IAE3D,OAAO,SAAM;IAEb,MAAM,EAAE,GAAG,CAAM;gBAEL,aAAa,EAAE,cAAc,GAAG,MAAM;CAmBnD;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8bpB,CAAC;AAEX,eAAO,MAAM,wBAAwB,EAAE,+BAyJ7B,CAAC;AAEX,eAAO,MAAM,UAAU,kBACN,cAAc,GAAG,MAAM,YAC5B,MAAM,WACP,GAAG,kBAMb,CAAC;AAEF,eAAO,MAAM,2BAA2B,UAAW,OAAO,KAAG,OAO5D,CAAC;AAEF,eAAO,MAAM,uBAAuB,SAAU,MAAM,KAAG,OAStD,CAAC;AAEF,eAAO,MAAM,cAAc,YAAa,GAAG,QAe1C,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAa,MAAM,KAAG,aAOtD,CAAC;AAGF,eAAO,MAAM,gCAAgC,QAAS,MAAM,KAAG,aAQ9D,CAAC;AAEF,QAAA,MAAM,uCAAuC;oBAM3B,MAAM;oBACN,MAAM;;;mBAcvB,CAAC;AAEF,QAAA,MAAM,sCAAsC;oBAM1B,MAAM;oBACN,MAAM;;;mBAcvB,CAAC;AAEF,QAAA,MAAM,yCAAyC,cAClC,MAAM,GAAG,SAAS,YACnB,MAAM,GAAG,SAAS,iBACb,CAAC,UAAU,GAAG,KAAK,CAAC,EAAE,oBACnB;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,kBAsBF,CAAC;AAEF,QAAA,MAAM,6BAA6B,mBACjB,MAAM,qBACH,MAAM,eACZ,MAAM,kBAQpB,CAAC;AAEF,QAAA,MAAM,4BAA4B,aACtB,MAAM,aACL,MAAM,cACL,MAAM,cACN,MAAM,aACP,MAAM,kBAWlB,CAAC;AAEF,QAAA,MAAM,iCAAiC,eAAgB,MAAM,gBAAgB,aAAa,kBAItF,CAAC;AAEL,OAAO,EACL,uCAAuC,EACvC,sCAAsC,EACtC,yCAAyC,EACzC,6BAA6B,EAC7B,4BAA4B,EAC5B,iCAAiC,GAClC,CAAC"}

package/dist/index.d.ts

@@ -361,6 +361,11 @@ declare const HardwareErrorCode: {
     readonly BlePoweredOff: 721;
     readonly BleUnsupported: 722;
     readonly BleUnavailableWhileUsbConnected: 723;
+    /**
+     * The host OS still has a stale BLE bond after the device pairing state was reset.
+     * The user must forget the device in system Bluetooth settings and pair it again.
+     */
+    readonly BleBondInvalid: 724;
     /**
      * Hardware runtiome errors
      */

package/dist/index.js

@@ -136,6 +136,7 @@ const HardwareErrorCode = {
     BlePoweredOff: 721,
     BleUnsupported: 722,
     BleUnavailableWhileUsbConnected: 723,
+    BleBondInvalid: 724,
     RuntimeError: 800,
     PinInvalid: 801,
     PinCancelled: 802,
@@ -183,7 +184,7 @@ const HardwareErrorCodeMessage = {
     [HardwareErrorCode.DeviceInterruptedFromOutside]: 'Device interrupted',
     [HardwareErrorCode.DeviceInterruptedFromUser]: 'Device interrupted',
     [HardwareErrorCode.RequiredButInBootloaderMode]: 'Device should be in bootloader mode',
-    [HardwareErrorCode.DeviceCheckDeviceIdError]: 'Device Id in the features is not same.',
+    [HardwareErrorCode.DeviceCheckDeviceIdError]: 'The connected device does not match this wallet. Reconnect the correct device, or add it again after a reset or recovery.',
     [HardwareErrorCode.DeviceNotSupportPassphrase]: 'Device not support passphrase',
     [HardwareErrorCode.DeviceCheckPassphraseStateError]: 'Device passphrase state error',
     [HardwareErrorCode.DeviceNotOpenedPassphrase]: 'Device not opened passphrase',
@@ -191,7 +192,7 @@ const HardwareErrorCodeMessage = {
     [HardwareErrorCode.DeviceDetectInBootloaderMode]: 'Device in bootloader mode',
     [HardwareErrorCode.NotAllowInBootloaderMode]: 'Device not allow in bootloader mode',
     [HardwareErrorCode.DeviceBusy]: 'Device is busy',
-    [HardwareErrorCode.DeviceCheckUnlockTypeError]: 'Device check unlock type not match error',
+    [HardwareErrorCode.DeviceCheckUnlockTypeError]: 'The unlocked wallet does not match the selected wallet. Use the corresponding PIN or passphrase and try again.',
     [HardwareErrorCode.NotInitialized]: 'Not initialized',
     [HardwareErrorCode.IFrameNotInitialized]: 'IFrame not initialized',
     [HardwareErrorCode.IFrameAleradyInitialized]: 'IFrame alerady initialized',
@@ -244,6 +245,7 @@ const HardwareErrorCodeMessage = {
     [HardwareErrorCode.BlePoweredOff]: 'Bluetooth is turned off',
     [HardwareErrorCode.BleUnsupported]: 'Bluetooth is not supported on this device',
     [HardwareErrorCode.BleUnavailableWhileUsbConnected]: 'Bluetooth is unavailable while USB is connected. Unplug USB and try again.',
+    [HardwareErrorCode.BleBondInvalid]: 'Bluetooth pairing information is no longer valid. Forget the device in system Bluetooth settings and pair it again.',
     [HardwareErrorCode.RuntimeError]: 'Runtime error',
     [HardwareErrorCode.PinInvalid]: 'Pin invalid',
     [HardwareErrorCode.PinCancelled]: 'Pin cancelled',
@@ -289,13 +291,15 @@ const TypedError = (hardwareError, message, params) => {
 const isBleStaleBondHardwareError = (error) => {
     const code = error === null || error === void 0 ? void 0 : error.errorCode;
     return (code === HardwareErrorCode.BleDeviceBondError ||
-        code === HardwareErrorCode.BlePeerRemovedPairingInformation);
+        code === HardwareErrorCode.BlePeerRemovedPairingInformation ||
+        code === HardwareErrorCode.BleBondInvalid);
 };
 const isBleStaleBondErrorText = (text) => {
     const value = text.toLowerCase();
     return (value.includes('encryption is insufficient') ||
         value.includes('insufficient encryption') ||
         value.includes('peer removed pairing information') ||
+        value.includes('cberrordomain:14') ||
         value.includes('gatt_insuf_authentication'));
 };
 const serializeError = (payload) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-shared",
-  "version": "1.2.2-alpha.15",
+  "version": "1.2.2-alpha.17",
   "description": "Hardware SDK's shared tool library",
   "keywords": [
     "Hardware-SDK",
@@ -26,5 +26,5 @@
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },
-  "gitHead": "ea66eff5817385ee2144d8e037c385342e44e21f"
+  "gitHead": "b6c48b842d1c325dcd5ce42c03a07ee4377002dd"
 }

package/src/HardwareError.test.ts

@@ -2,6 +2,7 @@ import {
   HardwareErrorCode,
   HardwareErrorCodeMessage,
   TypedError,
+  isBleStaleBondErrorText,
   serializeError,
 } from './HardwareError';
 
@@ -12,6 +13,15 @@ describe('HardwareErrorCode compatibility', () => {
     expect(HardwareErrorCode.WalletSessionInvalid).toBe(831);
   });
 
+  test('uses actionable wallet-context messages', () => {
+    expect(HardwareErrorCodeMessage[HardwareErrorCode.DeviceCheckDeviceIdError]).toContain(
+      'does not match this wallet'
+    );
+    expect(HardwareErrorCodeMessage[HardwareErrorCode.DeviceCheckUnlockTypeError]).toContain(
+      'corresponding PIN or passphrase'
+    );
+  });
+
   test('reserves the BLE and USB conflict code for app error mapping', () => {
     expect(HardwareErrorCode.BleUnavailableWhileUsbConnected).toBe(723);
     expect(HardwareErrorCodeMessage[HardwareErrorCode.BleUnavailableWhileUsbConnected]).toBe(
@@ -33,4 +43,21 @@ describe('HardwareErrorCode compatibility', () => {
       },
     });
   });
+
+  test('reserves a dedicated hd-core code for an invalid OS BLE bond', () => {
+    expect(HardwareErrorCode.BleBondInvalid).toBe(724);
+    expect(HardwareErrorCodeMessage[HardwareErrorCode.BleBondInvalid]).toContain(
+      'pairing information is no longer valid'
+    );
+  });
+
+  test('recognizes the macOS CoreBluetooth stale-pairing error without matching generic failures', () => {
+    expect(
+      isBleStaleBondErrorText(
+        'CBErrorDomain:14 Peer removed pairing information on the device side'
+      )
+    ).toBe(true);
+    expect(isBleStaleBondErrorText('CBATTErrorDomain:14 localized native message')).toBe(false);
+    expect(isBleStaleBondErrorText('connection failed')).toBe(false);
+  });
 });

package/src/HardwareError.ts

@@ -346,6 +346,11 @@ export const HardwareErrorCode = {
   BlePoweredOff: 721,
   BleUnsupported: 722,
   BleUnavailableWhileUsbConnected: 723,
+  /**
+   * The host OS still has a stale BLE bond after the device pairing state was reset.
+   * The user must forget the device in system Bluetooth settings and pair it again.
+   */
+  BleBondInvalid: 724,
 
   /**
    * Hardware runtiome errors
@@ -534,7 +539,8 @@ export const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping = {
   [HardwareErrorCode.DeviceInterruptedFromOutside]: 'Device interrupted',
   [HardwareErrorCode.DeviceInterruptedFromUser]: 'Device interrupted',
   [HardwareErrorCode.RequiredButInBootloaderMode]: 'Device should be in bootloader mode',
-  [HardwareErrorCode.DeviceCheckDeviceIdError]: 'Device Id in the features is not same.',
+  [HardwareErrorCode.DeviceCheckDeviceIdError]:
+    'The connected device does not match this wallet. Reconnect the correct device, or add it again after a reset or recovery.',
   [HardwareErrorCode.DeviceNotSupportPassphrase]: 'Device not support passphrase',
   [HardwareErrorCode.DeviceCheckPassphraseStateError]: 'Device passphrase state error',
   [HardwareErrorCode.DeviceNotOpenedPassphrase]: 'Device not opened passphrase',
@@ -542,7 +548,8 @@ export const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping = {
   [HardwareErrorCode.DeviceDetectInBootloaderMode]: 'Device in bootloader mode',
   [HardwareErrorCode.NotAllowInBootloaderMode]: 'Device not allow in bootloader mode',
   [HardwareErrorCode.DeviceBusy]: 'Device is busy',
-  [HardwareErrorCode.DeviceCheckUnlockTypeError]: 'Device check unlock type not match error',
+  [HardwareErrorCode.DeviceCheckUnlockTypeError]:
+    'The unlocked wallet does not match the selected wallet. Use the corresponding PIN or passphrase and try again.',
   /**
    * Node Errors
    */
@@ -622,6 +629,8 @@ export const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping = {
   [HardwareErrorCode.BleUnsupported]: 'Bluetooth is not supported on this device',
   [HardwareErrorCode.BleUnavailableWhileUsbConnected]:
     'Bluetooth is unavailable while USB is connected. Unplug USB and try again.',
+  [HardwareErrorCode.BleBondInvalid]:
+    'Bluetooth pairing information is no longer valid. Forget the device in system Bluetooth settings and pair it again.',
 
   /**
    * Runtime Error
@@ -660,7 +669,6 @@ export const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping = {
   [HardwareErrorCode.WalletSessionInvalid]: 'Wallet session is invalid or expired',
   [HardwareErrorCode.NftStorageLimitReached]:
     'NFT storage limit reached. Remove an NFT from the device and try again.',
-
   /**
    * Lowlevel transport
    */
@@ -686,7 +694,8 @@ export const isBleStaleBondHardwareError = (error: unknown): boolean => {
   const code = (error as { errorCode?: unknown })?.errorCode;
   return (
     code === HardwareErrorCode.BleDeviceBondError ||
-    code === HardwareErrorCode.BlePeerRemovedPairingInformation
+    code === HardwareErrorCode.BlePeerRemovedPairingInformation ||
+    code === HardwareErrorCode.BleBondInvalid
   );
 };
 
@@ -696,6 +705,7 @@ export const isBleStaleBondErrorText = (text: string): boolean => {
     value.includes('encryption is insufficient') ||
     value.includes('insufficient encryption') ||
     value.includes('peer removed pairing information') ||
+    value.includes('cberrordomain:14') ||
     value.includes('gatt_insuf_authentication')
   );
 };