@onekeyfe/hd-transport-electron 1.2.2-alpha.13 → 1.2.2-alpha.15

package/dist/{index-ef6298f9.js → index-00297050.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-de8d60e9.js'); });
+        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-95c5cf0d.js'); });
         setupNobleBleHandlers(webContents);
     });
 }

package/dist/index.js

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

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

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-ef6298f9.js');
+var index = require('./index-00297050.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -96,20 +96,10 @@ function softRefreshSubscription(params) {
 }
 
 const NOBLE_BLE_TARGETED_SCAN_TIMEOUT_MS = 5000;
-const NOBLE_BLE_SUBSCRIBE_TIMEOUT_MS = 10000;
+const NOBLE_BLE_CONNECTION_TIMEOUT_MS = 10000;
 
 let noble = null;
 let logger = null;
-function createNobleBleConnectionError(error, messagePrefix = '') {
-    const errorMessage = error.message;
-    if (hdShared.isBleStaleBondErrorText(errorMessage)) {
-        const nativeErrorMessage = `${messagePrefix}${errorMessage}`;
-        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleBondInvalid, `${hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.BleBondInvalid]} (${nativeErrorMessage})`, {
-            nativeErrorMessage,
-        });
-    }
-    return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, `${messagePrefix}${errorMessage}`);
-}
 const bluetoothState = {
     available: false,
     unsupported: false,
@@ -934,14 +924,9 @@ function forceReconnectPeripheral(peripheral, deviceId) {
                 callback();
             }), { timeoutMs: BLE_CLEANUP_TIMEOUT, timeoutBehavior: 'resolve' });
         }
-        yield new Promise((resolve, reject) => {
-            peripheral.connect(error => {
-                if (error) {
-                    reject(createNobleBleConnectionError(error));
-                    return;
-                }
-                resolve();
-            });
+        yield runBleCallbackOperation(callback => peripheral.connect(callback), {
+            timeoutMs: NOBLE_BLE_CONNECTION_TIMEOUT_MS,
+            timeoutBehavior: 'reject',
         });
         logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Force reconnect successful');
         connectedDevices.set(deviceId, peripheral);
@@ -964,7 +949,7 @@ function freshScanAndDiscover(deviceId, webContents) {
         yield new Promise((resolve, reject) => {
             freshPeripheral.connect((error) => {
                 if (error) {
-                    reject(createNobleBleConnectionError(error, 'Fresh peripheral connection failed: '));
+                    reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, `Fresh peripheral connection failed: ${error.message}`));
                 }
                 else {
                     connectedDevices.set(deviceId, freshPeripheral);
@@ -1025,9 +1010,6 @@ function setupConnectionAndDiscoverServices(peripheral, deviceId, webContents) {
             yield forceReconnectPeripheral(peripheral, deviceId);
         }
         catch (resetError) {
-            if (hdShared.isBleStaleBondHardwareError(resetError)) {
-                throw resetError;
-            }
             logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Connection reset before discovery failed, continuing', resetError);
         }
         setupDisconnectListener(peripheral, deviceId, webContents);
@@ -1195,11 +1177,27 @@ function connectDevice(deviceId, webContents) {
             return;
         }
         return new Promise((resolve, reject) => {
+            let connectionTimedOut = false;
+            const timeout = setTimeout(() => {
+                connectionTimedOut = true;
+                reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, 'Connection timeout'));
+            }, NOBLE_BLE_CONNECTION_TIMEOUT_MS);
             const connectedPeripheral = peripheral;
             connectedPeripheral.connect((error) => index.__awaiter(this, void 0, void 0, function* () {
+                clearTimeout(timeout);
+                if (connectionTimedOut) {
+                    if (!error) {
+                        try {
+                            connectedPeripheral.disconnect(() => undefined);
+                        }
+                        catch (_a) {
+                        }
+                    }
+                    return;
+                }
                 if (error) {
                     logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Connection failed:', error);
-                    reject(createNobleBleConnectionError(error));
+                    reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, error.message));
                     return;
                 }
                 logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Connected to device:', deviceId);
@@ -1319,7 +1317,7 @@ function subscribeNotifications(deviceId, callback) {
                     timeoutBehavior: 'resolve',
                 });
                 yield runBleCallbackOperation(callback => notifyCharacteristic.subscribe(callback), {
-                    timeoutMs: NOBLE_BLE_SUBSCRIBE_TIMEOUT_MS,
+                    timeoutMs: NOBLE_BLE_CONNECTION_TIMEOUT_MS,
                     timeoutBehavior: 'reject',
                 });
                 notifyCharacteristic.on('data', (data) => {
@@ -1471,6 +1469,5 @@ function setupNobleBleHandlers(webContents) {
     }
 }
 
-exports.createNobleBleConnectionError = createNobleBleConnectionError;
 exports.resolveNobleBleWritePacingDelay = resolveNobleBleWritePacingDelay;
 exports.setupNobleBleHandlers = setupNobleBleHandlers;

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

@@ -1,6 +1,5 @@
 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":"AAmCA,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,+CAc7E;AA+ED,wBAAgB,+BAA+B,CAAC,OAAO,CAAC,EAAE,oBAAoB,UAI7E;AAuuDD,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":"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"}

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

@@ -1,3 +1,3 @@
 export declare const NOBLE_BLE_TARGETED_SCAN_TIMEOUT_MS = 5000;
-export declare const NOBLE_BLE_SUBSCRIBE_TIMEOUT_MS = 10000;
+export declare const NOBLE_BLE_CONNECTION_TIMEOUT_MS = 10000;
 //# sourceMappingURL=noble-ble-timeouts.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"noble-ble-timeouts.d.ts","sourceRoot":"","sources":["../src/noble-ble-timeouts.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kCAAkC,OAAQ,CAAC;AACxD,eAAO,MAAM,8BAA8B,QAAS,CAAC"}
+{"version":3,"file":"noble-ble-timeouts.d.ts","sourceRoot":"","sources":["../src/noble-ble-timeouts.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kCAAkC,OAAQ,CAAC;AACxD,eAAO,MAAM,+BAA+B,QAAS,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-electron",
-  "version": "1.2.2-alpha.13",
+  "version": "1.2.2-alpha.15",
   "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.13",
-    "@onekeyfe/hd-shared": "1.2.2-alpha.13",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.13",
+    "@onekeyfe/hd-core": "1.2.2-alpha.15",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.15",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.15",
     "@stoprocent/noble": "2.3.16",
     "p-retry": "^4.6.2"
   },
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "c901cdc6b474d015c7f50390fc5dc3db0ca4fbdb"
+  "gitHead": "ea66eff5817385ee2144d8e037c385342e44e21f"
 }

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

@@ -1,8 +1,8 @@
 import { EventEmitter } from 'events';
-import { EOneKeyBleMessageKeys, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import { EOneKeyBleMessageKeys } from '@onekeyfe/hd-shared';
 
 import {
-  NOBLE_BLE_SUBSCRIBE_TIMEOUT_MS,
+  NOBLE_BLE_CONNECTION_TIMEOUT_MS,
   NOBLE_BLE_TARGETED_SCAN_TIMEOUT_MS,
 } from '../noble-ble-timeouts';
 
@@ -26,40 +26,9 @@ describe('Electron Noble BLE device discovery', () => {
     jest.clearAllMocks();
   });
 
-  test('bounds targeted scans and subscription callbacks independently', () => {
+  test('allows enough time for a slow targeted scan and connection', () => {
     expect(NOBLE_BLE_TARGETED_SCAN_TIMEOUT_MS).toBe(5_000);
-    expect(NOBLE_BLE_SUBSCRIBE_TIMEOUT_MS).toBe(10_000);
-  });
-
-  test('maps macOS stale pairing failures without reclassifying generic connection errors', async () => {
-    const { createNobleBleConnectionError } = await import('../noble-ble-handler');
-
-    const staleBondError = createNobleBleConnectionError(
-      new Error('CBErrorDomain:14 Peer removed pairing information on the device side')
-    );
-    expect(staleBondError).toMatchObject({
-      errorCode: HardwareErrorCode.BleBondInvalid,
-      params: {
-        nativeErrorMessage: 'CBErrorDomain:14 Peer removed pairing information on the device side',
-      },
-    });
-    expect(staleBondError.message).toContain(
-      'CBErrorDomain:14 Peer removed pairing information on the device side'
-    );
-    expect(createNobleBleConnectionError(new Error('Encryption is insufficient'))).toMatchObject({
-      errorCode: HardwareErrorCode.BleBondInvalid,
-      params: {
-        nativeErrorMessage: 'Encryption is insufficient',
-      },
-    });
-    expect(
-      createNobleBleConnectionError(new Error('CBATTErrorDomain:14 localized native message'))
-    ).toMatchObject({
-      errorCode: HardwareErrorCode.BleBondInvalid,
-    });
-    expect(createNobleBleConnectionError(new Error('connection failed'))).toMatchObject({
-      errorCode: HardwareErrorCode.BleConnectedError,
-    });
+    expect(NOBLE_BLE_CONNECTION_TIMEOUT_MS).toBe(10_000);
   });
 
   test('keeps safe pacing by default and allows an explicit high-throughput bypass', async () => {
@@ -211,33 +180,75 @@ describe('Electron Noble BLE device discovery', () => {
     expect(peripheral.connect).toHaveBeenCalledTimes(1);
   });
 
-  test('settles a pending Noble connect with the native disconnect error', () => {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires, global-require
-    const Noble = require('@stoprocent/noble/lib/noble');
-    const bindings = Object.assign(new EventEmitter(), {
-      connect: jest.fn(),
+  test('disconnects a connection callback that arrives after timeout', async () => {
+    jest.useFakeTimers({ doNotFake: ['performance'] });
+
+    const handlers = new Map<string, IpcHandler>();
+    const ipcMain = {
+      handle: jest.fn((channel: string, handler: IpcHandler) => {
+        handlers.set(channel, handler);
+      }),
+      removeHandler: jest.fn((channel: string) => {
+        handlers.delete(channel);
+      }),
+    };
+    const noble = new EventEmitter() as EventEmitter & {
+      state: string;
+      startScanning: jest.Mock;
+      stopScanning: jest.Mock;
+    };
+    let connectCallback: ((error?: Error) => void) | undefined;
+    let resolveConnectStarted = () => undefined;
+    const connectStarted = new Promise<void>(resolve => {
+      resolveConnectStarted = resolve;
     });
-    const noble = new Noble(bindings);
-    noble._registerListeners();
-    const peripheral = noble._createPeripheral(
-      'aabbccdd',
-      '',
-      'unknown',
-      true,
-      { localName: 'Pro2 A1B2', serviceUuids: ['0001'] },
-      -50,
-      false
+    const peripheral = Object.assign(
+      new EventEmitter(),
+      createPeripheral('slow-device', 'Pro2 A1B2'),
+      {
+        connect: jest.fn((callback: (error?: Error) => void) => {
+          connectCallback = callback;
+          resolveConnectStarted();
+        }),
+        disconnect: jest.fn((callback: () => void) => callback()),
+      }
     );
-    const connectCallback = jest.fn();
+    noble.state = 'poweredOn';
+    noble.startScanning = jest.fn((_services, _duplicates, callback) => {
+      callback?.();
+      noble.emit('discover', peripheral);
+    });
+    noble.stopScanning = jest.fn(callback => callback?.());
 
-    peripheral.connect(connectCallback);
-    const nativeError = new Error(
-      'CBATTErrorDomain:14 Peer removed pairing information on the device side'
-    );
-    bindings.emit('disconnect', 'aabbccdd', nativeError);
+    jest.doMock('@stoprocent/noble', () => noble);
+    jest.doMock('electron', () => ({ ipcMain }));
+    jest.doMock('electron-log', () => ({
+      info: jest.fn(),
+      debug: jest.fn(),
+      error: jest.fn(),
+    }));
 
-    expect(connectCallback).toHaveBeenCalledWith(nativeError);
-    expect(peripheral.state).toBe('disconnected');
+    const { setupNobleBleHandlers } = await import('../noble-ble-handler');
+    setupNobleBleHandlers({
+      on: jest.fn(),
+      send: jest.fn(),
+    } as unknown as WebContents);
+
+    const connect = handlers.get(EOneKeyBleMessageKeys.NOBLE_BLE_CONNECT);
+    if (!connect) {
+      throw new Error('Electron Noble BLE connect handler was not registered');
+    }
+
+    const connectPromise = Promise.resolve(connect(undefined, 'slow-device'));
+    await connectStarted;
+    expect(peripheral.connect).toHaveBeenCalledTimes(1);
+
+    jest.advanceTimersByTime(NOBLE_BLE_CONNECTION_TIMEOUT_MS);
+    await expect(connectPromise).rejects.toThrow('Connection timeout');
+
+    connectCallback?.();
+    await Promise.resolve();
+    expect(peripheral.disconnect).toHaveBeenCalledTimes(1);
   });
 
   test('enumerates a Pro2 communication advertisement after Find My changes its name', async () => {

package/src/noble-ble-handler.ts

@@ -10,14 +10,11 @@ import {
   EOneKeyBleMessageKeys,
   ERRORS,
   HardwareErrorCode,
-  HardwareErrorCodeMessage,
   ONEKEY_NOTIFY_CHARACTERISTIC_UUID,
   ONEKEY_SERVICE_UUID,
   ONEKEY_WRITE_CHARACTERISTIC_UUID,
   createKnownBleUuidAliases,
   hasOnekeyCommunicationService,
-  isBleStaleBondErrorText,
-  isBleStaleBondHardwareError,
   isOnekeyBluetoothDevice,
   isPro2FamilyBleName,
   matchesKnownBleUuid,
@@ -29,7 +26,7 @@ import { resolveBlePacketCapacity, resolveNobleAttMtu } from './ble-packet-capac
 import { safeLog } from './types/noble-extended';
 import { runBleCallbackOperation, softRefreshSubscription } from './ble-ops';
 import {
-  NOBLE_BLE_SUBSCRIBE_TIMEOUT_MS,
+  NOBLE_BLE_CONNECTION_TIMEOUT_MS,
   NOBLE_BLE_TARGETED_SCAN_TIMEOUT_MS,
 } from './noble-ble-timeouts';
 
@@ -42,22 +39,6 @@ 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;
-  if (isBleStaleBondErrorText(errorMessage)) {
-    const nativeErrorMessage = `${messagePrefix}${errorMessage}`;
-    return ERRORS.TypedError(
-      HardwareErrorCode.BleBondInvalid,
-      `${HardwareErrorCodeMessage[HardwareErrorCode.BleBondInvalid]} (${nativeErrorMessage})`,
-      {
-        nativeErrorMessage,
-      }
-    );
-  }
-
-  return ERRORS.TypedError(HardwareErrorCode.BleConnectedError, `${messagePrefix}${errorMessage}`);
-}
-
 // Bluetooth state management
 const bluetoothState: {
   available: boolean;
@@ -1271,14 +1252,9 @@ async function forceReconnectPeripheral(peripheral: Peripheral, deviceId: string
   }
 
   // Step 3: Re-establish connection
-  await new Promise<void>((resolve, reject) => {
-    peripheral.connect(error => {
-      if (error) {
-        reject(createNobleBleConnectionError(error));
-        return;
-      }
-      resolve();
-    });
+  await runBleCallbackOperation(callback => peripheral.connect(callback), {
+    timeoutMs: NOBLE_BLE_CONNECTION_TIMEOUT_MS,
+    timeoutBehavior: 'reject',
   });
   logger?.info('[NobleBLE] Force reconnect successful');
   connectedDevices.set(deviceId, peripheral);
@@ -1320,7 +1296,12 @@ async function freshScanAndDiscover(
   await new Promise<void>((resolve, reject) => {
     freshPeripheral.connect((error: Error | undefined) => {
       if (error) {
-        reject(createNobleBleConnectionError(error, 'Fresh peripheral connection failed: '));
+        reject(
+          ERRORS.TypedError(
+            HardwareErrorCode.BleConnectedError,
+            `Fresh peripheral connection failed: ${error.message}`
+          )
+        );
       } else {
         connectedDevices.set(deviceId, freshPeripheral);
         resolve();
@@ -1433,9 +1414,6 @@ async function setupConnectionAndDiscoverServices(
   try {
     await forceReconnectPeripheral(peripheral, deviceId);
   } catch (resetError) {
-    if (isBleStaleBondHardwareError(resetError)) {
-      throw resetError;
-    }
     // A failed reset must not abort the attempt: discovery on the existing
     // link, then the fresh-scan fallback, still have a chance to recover.
     logger?.error('[NobleBLE] Connection reset before discovery failed, continuing', resetError);
@@ -1688,12 +1666,33 @@ async function connectDevice(deviceId: string, webContents: WebContents): Promis
   }
 
   return new Promise((resolve, reject) => {
+    let connectionTimedOut = false;
+    const timeout = setTimeout(() => {
+      connectionTimedOut = true;
+      reject(ERRORS.TypedError(HardwareErrorCode.BleConnectedError, 'Connection timeout'));
+    }, NOBLE_BLE_CONNECTION_TIMEOUT_MS);
+
     // TypeScript type assertion - peripheral is guaranteed to be defined at this point
     const connectedPeripheral = peripheral as Peripheral;
     connectedPeripheral.connect(async (error: Error | undefined) => {
+      clearTimeout(timeout);
+
+      // Noble may invoke the callback after the SDK timed out and released the request.
+      // Ignore it to avoid initializing disposed commands or leaving an orphaned connection.
+      if (connectionTimedOut) {
+        if (!error) {
+          try {
+            connectedPeripheral.disconnect(() => undefined);
+          } catch {
+            // Best-effort cleanup only.
+          }
+        }
+        return;
+      }
+
       if (error) {
         logger?.error('[NobleBLE] Connection failed:', error);
-        reject(createNobleBleConnectionError(error));
+        reject(ERRORS.TypedError(HardwareErrorCode.BleConnectedError, error.message));
         return;
       }
 
@@ -1876,7 +1875,7 @@ async function subscribeNotifications(
       timeoutBehavior: 'resolve',
     });
     await runBleCallbackOperation(callback => notifyCharacteristic.subscribe(callback), {
-      timeoutMs: NOBLE_BLE_SUBSCRIBE_TIMEOUT_MS,
+      timeoutMs: NOBLE_BLE_CONNECTION_TIMEOUT_MS,
       timeoutBehavior: 'reject',
     });
 

package/src/noble-ble-timeouts.ts

@@ -1,2 +1,2 @@
 export const NOBLE_BLE_TARGETED_SCAN_TIMEOUT_MS = 5_000;
-export const NOBLE_BLE_SUBSCRIBE_TIMEOUT_MS = 10_000;
+export const NOBLE_BLE_CONNECTION_TIMEOUT_MS = 10_000;