@onekeyfe/hd-transport-electron 1.2.2-alpha.11 → 1.2.2-alpha.12

package/dist/{index-00297050.js → index-eea100c1.js}

@@ -32,7 +32,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
 
 function initNobleBleSupport(webContents) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-95c5cf0d.js'); });
+        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-e4eaea92.js'); });
         setupNobleBleHandlers(webContents);
     });
 }

package/dist/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-00297050.js');
+var index = require('./index-eea100c1.js');
 
 
 

package/dist/{noble-ble-handler-95c5cf0d.js → noble-ble-handler-e4eaea92.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-00297050.js');
+var index = require('./index-eea100c1.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -100,6 +100,19 @@ const NOBLE_BLE_CONNECTION_TIMEOUT_MS = 10000;
 
 let noble = null;
 let logger = null;
+function createNobleBleConnectionError(error, messagePrefix = '') {
+    const errorMessage = error.message;
+    const normalizedErrorMessage = errorMessage.toLowerCase();
+    let errorCode = hdShared.HardwareErrorCode.BleConnectedError;
+    if (hdShared.isBleStaleBondErrorText(errorMessage)) {
+        errorCode =
+            normalizedErrorMessage.includes('peer removed pairing information') ||
+                normalizedErrorMessage.includes('cberrordomain:14')
+                ? hdShared.HardwareErrorCode.BlePeerRemovedPairingInformation
+                : hdShared.HardwareErrorCode.BleDeviceBondError;
+    }
+    return hdShared.ERRORS.TypedError(errorCode, `${messagePrefix}${errorMessage}`);
+}
 const bluetoothState = {
     available: false,
     unsupported: false,
@@ -949,7 +962,7 @@ function freshScanAndDiscover(deviceId, webContents) {
         yield new Promise((resolve, reject) => {
             freshPeripheral.connect((error) => {
                 if (error) {
-                    reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, `Fresh peripheral connection failed: ${error.message}`));
+                    reject(createNobleBleConnectionError(error, 'Fresh peripheral connection failed: '));
                 }
                 else {
                     connectedDevices.set(deviceId, freshPeripheral);
@@ -1197,7 +1210,7 @@ function connectDevice(deviceId, webContents) {
                 }
                 if (error) {
                     logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Connection failed:', error);
-                    reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, error.message));
+                    reject(createNobleBleConnectionError(error));
                     return;
                 }
                 logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Connected to device:', deviceId);
@@ -1469,5 +1482,6 @@ function setupNobleBleHandlers(webContents) {
     }
 }
 
+exports.createNobleBleConnectionError = createNobleBleConnectionError;
 exports.resolveNobleBleWritePacingDelay = resolveNobleBleWritePacingDelay;
 exports.setupNobleBleHandlers = setupNobleBleHandlers;

package/dist/noble-ble-handler.d.ts

@@ -1,5 +1,6 @@
 import type { WebContents } from 'electron';
 import type { NobleBleWriteOptions } from './types/desktop-api';
+export declare function createNobleBleConnectionError(error: Error, messagePrefix?: string): import("@onekeyfe/hd-shared").HardwareError;
 export declare function resolveNobleBleWritePacingDelay(options?: NobleBleWriteOptions): number;
 export declare function setupNobleBleHandlers(webContents: WebContents): void;
 //# sourceMappingURL=noble-ble-handler.d.ts.map

package/dist/noble-ble-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"noble-ble-handler.d.ts","sourceRoot":"","sources":["../src/noble-ble-handler.ts"],"names":[],"mappings":"AAgCA,OAAO,KAAK,EAA+B,WAAW,EAAE,MAAM,UAAU,CAAC;AAEzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAoFhE,wBAAgB,+BAA+B,CAAC,OAAO,CAAC,EAAE,oBAAoB,UAI7E;AAyvDD,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAkMpE"}
+{"version":3,"file":"noble-ble-handler.d.ts","sourceRoot":"","sources":["../src/noble-ble-handler.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAA+B,WAAW,EAAE,MAAM,UAAU,CAAC;AAEzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAOhE,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,KAAK,EAAE,aAAa,SAAK,+CAa7E;AA+ED,wBAAgB,+BAA+B,CAAC,OAAO,CAAC,EAAE,oBAAoB,UAI7E;AAovDD,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAkMpE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-electron",
-  "version": "1.2.2-alpha.11",
+  "version": "1.2.2-alpha.12",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
@@ -25,9 +25,9 @@
     "electron-log": ">=4.0.0"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "1.2.2-alpha.11",
-    "@onekeyfe/hd-shared": "1.2.2-alpha.11",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.11",
+    "@onekeyfe/hd-core": "1.2.2-alpha.12",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.12",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.12",
     "@stoprocent/noble": "2.3.16",
     "p-retry": "^4.6.2"
   },
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "8928100acb893d72361eb74422d5e2a0f7af77d8"
+  "gitHead": "9b5a45bc55819d22ed752899b4c40aad70de4527"
 }

package/src/__tests__/noble-ble-handler.test.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'events';
-import { EOneKeyBleMessageKeys } from '@onekeyfe/hd-shared';
+import { EOneKeyBleMessageKeys, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import {
   NOBLE_BLE_CONNECTION_TIMEOUT_MS,
@@ -31,6 +31,24 @@ describe('Electron Noble BLE device discovery', () => {
     expect(NOBLE_BLE_CONNECTION_TIMEOUT_MS).toBe(10_000);
   });
 
+  test('maps macOS stale pairing failures without reclassifying generic connection errors', async () => {
+    const { createNobleBleConnectionError } = await import('../noble-ble-handler');
+
+    expect(
+      createNobleBleConnectionError(
+        new Error('CBErrorDomain:14 Peer removed pairing information on the device side')
+      )
+    ).toMatchObject({
+      errorCode: HardwareErrorCode.BlePeerRemovedPairingInformation,
+    });
+    expect(createNobleBleConnectionError(new Error('Encryption is insufficient'))).toMatchObject({
+      errorCode: HardwareErrorCode.BleDeviceBondError,
+    });
+    expect(createNobleBleConnectionError(new Error('connection failed'))).toMatchObject({
+      errorCode: HardwareErrorCode.BleConnectedError,
+    });
+  });
+
   test('keeps safe pacing by default and allows an explicit high-throughput bypass', async () => {
     const { resolveNobleBleWritePacingDelay } = await import('../noble-ble-handler');
 

package/src/noble-ble-handler.ts

@@ -15,6 +15,7 @@ import {
   ONEKEY_WRITE_CHARACTERISTIC_UUID,
   createKnownBleUuidAliases,
   hasOnekeyCommunicationService,
+  isBleStaleBondErrorText,
   isOnekeyBluetoothDevice,
   isPro2FamilyBleName,
   matchesKnownBleUuid,
@@ -39,6 +40,21 @@ import type { CharacteristicPair, DeviceInfo, Logger, NobleModule } from './type
 let noble: NobleModule | null = null;
 let logger: Logger | null = null;
 
+export function createNobleBleConnectionError(error: Error, messagePrefix = '') {
+  const errorMessage = error.message;
+  const normalizedErrorMessage = errorMessage.toLowerCase();
+  let errorCode = HardwareErrorCode.BleConnectedError;
+  if (isBleStaleBondErrorText(errorMessage)) {
+    errorCode =
+      normalizedErrorMessage.includes('peer removed pairing information') ||
+      normalizedErrorMessage.includes('cberrordomain:14')
+        ? HardwareErrorCode.BlePeerRemovedPairingInformation
+        : HardwareErrorCode.BleDeviceBondError;
+  }
+
+  return ERRORS.TypedError(errorCode, `${messagePrefix}${errorMessage}`);
+}
+
 // Bluetooth state management
 const bluetoothState: {
   available: boolean;
@@ -1296,12 +1312,7 @@ async function freshScanAndDiscover(
   await new Promise<void>((resolve, reject) => {
     freshPeripheral.connect((error: Error | undefined) => {
       if (error) {
-        reject(
-          ERRORS.TypedError(
-            HardwareErrorCode.BleConnectedError,
-            `Fresh peripheral connection failed: ${error.message}`
-          )
-        );
+        reject(createNobleBleConnectionError(error, 'Fresh peripheral connection failed: '));
       } else {
         connectedDevices.set(deviceId, freshPeripheral);
         resolve();
@@ -1692,7 +1703,7 @@ async function connectDevice(deviceId: string, webContents: WebContents): Promis
 
       if (error) {
         logger?.error('[NobleBLE] Connection failed:', error);
-        reject(ERRORS.TypedError(HardwareErrorCode.BleConnectedError, error.message));
+        reject(createNobleBleConnectionError(error));
         return;
       }