@onekeyfe/hd-transport-electron 1.2.0-alpha.13 → 1.2.0-alpha.130

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

@@ -1,3 +1,5 @@
 import type { WebContents } from 'electron';
+import type { NobleBleWriteOptions } from './types/desktop-api';
+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":"AAoBA,OAAO,KAAK,EAAsB,WAAW,EAAE,MAAM,UAAU,CAAC;AAw8ChE,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAiKpE"}
+{"version":3,"file":"noble-ble-handler.d.ts","sourceRoot":"","sources":["../src/noble-ble-handler.ts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAA+B,WAAW,EAAE,MAAM,UAAU,CAAC;AAEzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AA0EhE,wBAAgB,+BAA+B,CAAC,OAAO,CAAC,EAAE,oBAAoB,UAI7E;AA8lDD,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAgMpE"}

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

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

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

@@ -0,0 +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,+BAA+B,QAAS,CAAC"}

package/dist/types/desktop-api.d.ts

@@ -1,3 +1,6 @@
+export interface NobleBleWriteOptions {
+    pacingDelayMs?: number;
+}
 export interface NobleBleAPI {
     enumerate: () => Promise<{
         id: string;
@@ -6,13 +9,19 @@ export interface NobleBleAPI {
     getDevice: (uuid: string) => Promise<{
         id: string;
         name: string;
+        mtu?: number;
     } | null>;
     connect: (uuid: string) => Promise<void>;
+    release?: (uuid: string, keepSession?: boolean) => Promise<void>;
     disconnect: (uuid: string) => Promise<void>;
     subscribe: (uuid: string) => Promise<void>;
     unsubscribe: (uuid: string) => Promise<void>;
-    write: (uuid: string, data: string) => Promise<void>;
+    write: (uuid: string, data: string, options?: NobleBleWriteOptions) => Promise<void>;
     onNotification: (callback: (deviceId: string, data: string) => void) => () => void;
+    onMtuChanged?: (callback: (device: {
+        id: string;
+        mtu: number;
+    }) => void) => () => void;
     onDeviceDisconnected: (callback: (device: {
         id: string;
         name: string;

package/dist/types/desktop-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"desktop-api.d.ts","sourceRoot":"","sources":["../../src/types/desktop-api.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC,CAAC;IACzD,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IAC1E,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,cAAc,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,KAAK,MAAM,IAAI,CAAC;IACnF,oBAAoB,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,KAAK,MAAM,IAAI,CAAC;IAC/F,iBAAiB,EAAE,MAAM,OAAO,CAAC;QAC/B,SAAS,EAAE,OAAO,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,OAAO,CAAC;QACrB,WAAW,EAAE,OAAO,CAAC;KACtB,CAAC,CAAC;CACJ;AAGD,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,EAAE,WAAW,CAAC;CACxB"}
+{"version":3,"file":"desktop-api.d.ts","sourceRoot":"","sources":["../../src/types/desktop-api.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,oBAAoB;IACnC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC,CAAC;IACzD,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IACxF,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAGzC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrF,cAAc,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,KAAK,MAAM,IAAI,CAAC;IACnF,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,KAAK,MAAM,IAAI,CAAC;IACvF,oBAAoB,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,KAAK,MAAM,IAAI,CAAC;IAC/F,iBAAiB,EAAE,MAAM,OAAO,CAAC;QAC/B,SAAS,EAAE,OAAO,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,OAAO,CAAC;QACrB,WAAW,EAAE,OAAO,CAAC;KACtB,CAAC,CAAC;CACJ;AAGD,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,EAAE,WAAW,CAAC;CACxB"}

package/dist/types/noble-extended.d.ts

@@ -4,6 +4,7 @@ export interface DeviceInfo extends OneKeyDeviceInfoBase {
     id: string;
     name: string;
     state: string;
+    mtu?: number;
 }
 export interface CharacteristicPair {
     write: Characteristic;

package/dist/types/noble-extended.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"noble-extended.d.ts","sourceRoot":"","sources":["../../src/types/noble-extended.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAGnE,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IACtD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,cAAc,CAAC;IACtB,MAAM,EAAE,cAAc,CAAC;CACxB;AAGD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CACX,YAAY,EAAE,MAAM,EAAE,EACtB,eAAe,EAAE,OAAO,EACxB,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,GACjC,IAAI,CAAC;IACR,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IAC1C,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAClE,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAAC;IACxE,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAC9E,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAAC;CACrF;AAGD,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC5C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC7C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;CAC9C;AAGD,wBAAgB,OAAO,CACrB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,EACjC,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,GAAG,EAAE,GACb,IAAI,CAMN"}
+{"version":3,"file":"noble-extended.d.ts","sourceRoot":"","sources":["../../src/types/noble-extended.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAGnE,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IACtD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAGD,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,cAAc,CAAC;IACtB,MAAM,EAAE,cAAc,CAAC;CACxB;AAGD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CACX,YAAY,EAAE,MAAM,EAAE,EACtB,eAAe,EAAE,OAAO,EACxB,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,GACjC,IAAI,CAAC;IACR,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IAC1C,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAClE,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAAC;IACxE,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAC9E,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAAC;CACrF;AAGD,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC5C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC7C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;CAC9C;AAGD,wBAAgB,OAAO,CACrB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,EACjC,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,GAAG,EAAE,GACb,IAAI,CAMN"}

package/package.json

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

package/src/__tests__/ble-ops.test.ts

@@ -0,0 +1,21 @@
+import { runBleCallbackOperation } from '../ble-ops';
+
+describe('Electron Noble callback operations', () => {
+  test('settles when Noble never invokes the callback', async () => {
+    const result = await runBleCallbackOperation(() => undefined, {
+      timeoutMs: 5,
+      timeoutBehavior: 'resolve',
+    });
+
+    expect(result).toBeUndefined();
+  });
+
+  test('rejects callback errors before the timeout', async () => {
+    await expect(
+      runBleCallbackOperation(callback => callback(new Error('operation failed')), {
+        timeoutMs: 50,
+        timeoutBehavior: 'reject',
+      })
+    ).rejects.toThrow('operation failed');
+  });
+});

package/src/__tests__/ble-packet-capacity.test.ts

@@ -0,0 +1,13 @@
+import { resolveBlePacketCapacity } from '../ble-packet-capacity';
+
+describe('resolveBlePacketCapacity', () => {
+  test('uses ATT MTU payload capacity with an upper bound', () => {
+    expect(resolveBlePacketCapacity(247, 244, 192)).toBe(244);
+    expect(resolveBlePacketCapacity(185, 244, 192)).toBe(182);
+  });
+
+  test('preserves the compatibility fallback when MTU is unavailable', () => {
+    expect(resolveBlePacketCapacity(null, 244, 192)).toBe(192);
+    expect(resolveBlePacketCapacity(undefined, 244, 192)).toBe(192);
+  });
+});

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

@@ -0,0 +1,383 @@
+import { EventEmitter } from 'events';
+import { EOneKeyBleMessageKeys } from '@onekeyfe/hd-shared';
+
+import {
+  NOBLE_BLE_CONNECTION_TIMEOUT_MS,
+  NOBLE_BLE_TARGETED_SCAN_TIMEOUT_MS,
+} from '../noble-ble-timeouts';
+
+import type { WebContents } from 'electron';
+
+type IpcHandler = (...args: unknown[]) => Promise<unknown> | unknown;
+
+const createPeripheral = (id: string, localName?: string, serviceUuids = ['0001', 'fffd']) => ({
+  id,
+  state: 'disconnected',
+  advertisement: {
+    localName,
+    serviceUuids,
+  },
+});
+
+describe('Electron Noble BLE device discovery', () => {
+  afterEach(() => {
+    jest.useRealTimers();
+    jest.resetModules();
+    jest.clearAllMocks();
+  });
+
+  test('allows enough time for a slow targeted scan and connection', () => {
+    expect(NOBLE_BLE_TARGETED_SCAN_TIMEOUT_MS).toBe(5_000);
+    expect(NOBLE_BLE_CONNECTION_TIMEOUT_MS).toBe(10_000);
+  });
+
+  test('keeps safe pacing by default and allows an explicit high-throughput bypass', async () => {
+    const { resolveNobleBleWritePacingDelay } = await import('../noble-ble-handler');
+
+    expect(resolveNobleBleWritePacingDelay()).toBe(5);
+    expect(resolveNobleBleWritePacingDelay({ pacingDelayMs: 0 })).toBe(0);
+    expect(resolveNobleBleWritePacingDelay({ pacingDelayMs: 3.8 })).toBe(3);
+  });
+
+  test('waits for Noble to stop scanning before enumeration resolves', 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 resolveScanStarted = () => undefined;
+    const scanStarted = new Promise<void>(resolve => {
+      resolveScanStarted = resolve;
+    });
+    let stopScanningCallback: (() => void) | undefined;
+    noble.state = 'poweredOn';
+    noble.startScanning = jest.fn((_services, _duplicates, callback) => {
+      callback?.();
+      noble.emit('discover', createPeripheral('onekey-device', 'Pro2 A1B2'));
+      resolveScanStarted();
+    });
+    noble.stopScanning = jest.fn(callback => {
+      stopScanningCallback = callback;
+    });
+
+    jest.doMock('@stoprocent/noble', () => noble);
+    jest.doMock('electron', () => ({ ipcMain }));
+    jest.doMock('electron-log', () => ({
+      info: jest.fn(),
+      debug: jest.fn(),
+      error: jest.fn(),
+    }));
+
+    const { setupNobleBleHandlers } = await import('../noble-ble-handler');
+    setupNobleBleHandlers({
+      on: jest.fn(),
+      send: jest.fn(),
+    } as unknown as WebContents);
+
+    const enumerate = handlers.get(EOneKeyBleMessageKeys.NOBLE_BLE_ENUMERATE);
+    if (!enumerate) {
+      throw new Error('Electron Noble BLE enumerate handler was not registered');
+    }
+
+    let enumerationResolved = false;
+    const devicesPromise = Promise.resolve(enumerate()).then(devices => {
+      enumerationResolved = true;
+      return devices;
+    });
+    await scanStarted;
+    jest.advanceTimersByTime(5_000);
+    await Promise.resolve();
+
+    expect(noble.stopScanning).toHaveBeenCalledTimes(1);
+    expect(enumerationResolved).toBe(false);
+
+    stopScanningCallback?.();
+    await expect(devicesPromise).resolves.toEqual([
+      expect.objectContaining({ id: 'onekey-device' }),
+    ]);
+  });
+
+  test('waits for a targeted scan to stop before connecting', 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 resolveScanStarted = () => undefined;
+    const scanStarted = new Promise<void>(resolve => {
+      resolveScanStarted = resolve;
+    });
+    let stopScanningCallback: (() => void) | undefined;
+    const peripheral = Object.assign(
+      new EventEmitter(),
+      createPeripheral('target-device', 'Pro2 A1B2'),
+      {
+        connect: jest.fn((callback: (error?: Error) => void) => {
+          callback(new Error('expected test connection failure'));
+        }),
+      }
+    );
+    noble.state = 'poweredOn';
+    noble.startScanning = jest.fn((_services, _duplicates, callback) => {
+      callback?.();
+      noble.emit('discover', peripheral);
+      resolveScanStarted();
+    });
+    noble.stopScanning = jest.fn(callback => {
+      stopScanningCallback = callback;
+    });
+
+    jest.doMock('@stoprocent/noble', () => noble);
+    jest.doMock('electron', () => ({ ipcMain }));
+    jest.doMock('electron-log', () => ({
+      info: jest.fn(),
+      debug: jest.fn(),
+      error: jest.fn(),
+    }));
+
+    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, 'target-device'));
+    await scanStarted;
+
+    expect(noble.startScanning).toHaveBeenCalledWith([], true, expect.any(Function));
+    expect(noble.stopScanning).toHaveBeenCalledTimes(1);
+    expect(peripheral.connect).not.toHaveBeenCalled();
+
+    stopScanningCallback?.();
+    await expect(connectPromise).rejects.toThrow('expected test connection failure');
+    expect(peripheral.connect).toHaveBeenCalledTimes(1);
+  });
+
+  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 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()),
+      }
+    );
+    noble.state = 'poweredOn';
+    noble.startScanning = jest.fn((_services, _duplicates, callback) => {
+      callback?.();
+      noble.emit('discover', peripheral);
+    });
+    noble.stopScanning = jest.fn(callback => callback?.());
+
+    jest.doMock('@stoprocent/noble', () => noble);
+    jest.doMock('electron', () => ({ ipcMain }));
+    jest.doMock('electron-log', () => ({
+      info: jest.fn(),
+      debug: jest.fn(),
+      error: jest.fn(),
+    }));
+
+    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 () => {
+    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 resolveScanStarted = () => undefined;
+    const scanStarted = new Promise<void>(resolve => {
+      resolveScanStarted = resolve;
+    });
+    noble.state = 'poweredOn';
+    noble.startScanning = jest.fn((_services, _duplicates, callback) => {
+      callback?.();
+      noble.emit('discover', createPeripheral('find-my-device', 'Pro2 A1B2 - Find My', ['fffd']));
+      noble.emit('discover', createPeripheral('onekey-device', 'Pro2 A1B2 - Find My'));
+      resolveScanStarted();
+    });
+    noble.stopScanning = jest.fn(callback => callback?.());
+
+    jest.doMock('@stoprocent/noble', () => noble);
+    jest.doMock('electron', () => ({ ipcMain }));
+    jest.doMock('electron-log', () => ({
+      info: jest.fn(),
+      debug: jest.fn(),
+      error: jest.fn(),
+    }));
+
+    const { setupNobleBleHandlers } = await import('../noble-ble-handler');
+    setupNobleBleHandlers({
+      on: jest.fn(),
+      send: jest.fn(),
+    } as unknown as WebContents);
+
+    const enumerate = handlers.get(EOneKeyBleMessageKeys.NOBLE_BLE_ENUMERATE);
+    if (!enumerate) {
+      throw new Error('Electron Noble BLE enumerate handler was not registered');
+    }
+
+    const devicesPromise = Promise.resolve(enumerate());
+    await scanStarted;
+    expect(noble.startScanning).toHaveBeenCalledWith([], true, expect.any(Function));
+    jest.advanceTimersByTime(5000);
+
+    await expect(devicesPromise).resolves.toEqual([
+      expect.objectContaining({
+        id: 'onekey-device',
+        name: 'Pro2 A1B2 - Find My',
+      }),
+    ]);
+  });
+
+  test('accepts a communication peripheral after its scan response gains a name', 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 resolveScanStarted = () => undefined;
+    const scanStarted = new Promise<void>(resolve => {
+      resolveScanStarted = resolve;
+    });
+    const findMyPeripheral = createPeripheral('find-my-device');
+    noble.state = 'poweredOn';
+    noble.startScanning = jest.fn((_services, _duplicates, callback) => {
+      callback?.();
+      noble.emit('discover', findMyPeripheral);
+      findMyPeripheral.advertisement.localName = 'Pro2 A1B2 - Find My';
+      noble.emit('discover', findMyPeripheral);
+      noble.emit('discover', createPeripheral('onekey-device', 'Pro2 A1B2'));
+      resolveScanStarted();
+    });
+    noble.stopScanning = jest.fn(callback => callback?.());
+
+    jest.doMock('@stoprocent/noble', () => noble);
+    jest.doMock('electron', () => ({ ipcMain }));
+    jest.doMock('electron-log', () => ({
+      info: jest.fn(),
+      debug: jest.fn(),
+      error: jest.fn(),
+    }));
+
+    const { setupNobleBleHandlers } = await import('../noble-ble-handler');
+    setupNobleBleHandlers({
+      on: jest.fn(),
+      send: jest.fn(),
+    } as unknown as WebContents);
+
+    const enumerate = handlers.get(EOneKeyBleMessageKeys.NOBLE_BLE_ENUMERATE);
+    if (!enumerate) {
+      throw new Error('Electron Noble BLE enumerate handler was not registered');
+    }
+
+    const devicesPromise = Promise.resolve(enumerate());
+    await scanStarted;
+    jest.advanceTimersByTime(5000);
+
+    await expect(devicesPromise).resolves.toEqual([
+      expect.objectContaining({
+        id: 'find-my-device',
+        name: 'Pro2 A1B2 - Find My',
+      }),
+      expect.objectContaining({
+        id: 'onekey-device',
+        name: 'Pro2 A1B2',
+      }),
+    ]);
+  });
+});

package/src/ble-ops.ts

@@ -1,6 +1,40 @@
 import type { Characteristic } from '@stoprocent/noble';
 import type { Logger } from './types/noble-extended';
 
+type BleCallback = (error?: Error) => void;
+
+export function runBleCallbackOperation(
+  operation: (callback: BleCallback) => void,
+  options: { timeoutMs: number; timeoutBehavior: 'resolve' | 'reject' }
+): Promise<void> {
+  return new Promise<void>((resolve, reject) => {
+    let settled = false;
+    const settle = (error?: Error) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timeout);
+      if (error) {
+        reject(error);
+      } else {
+        resolve();
+      }
+    };
+    const timeout = setTimeout(() => {
+      if (options.timeoutBehavior === 'reject') {
+        settle(new Error(`BLE operation timed out after ${options.timeoutMs}ms`));
+      } else {
+        settle();
+      }
+    }, options.timeoutMs);
+
+    try {
+      operation(settle);
+    } catch (error) {
+      settle(error instanceof Error ? error : new Error(String(error)));
+    }
+  });
+}
+
 export interface SoftRefreshParams {
   deviceId: string;
   notifyCharacteristic: Characteristic | null | undefined;
@@ -30,18 +64,14 @@ export async function softRefreshSubscription(params: SoftRefreshParams): Promis
 
   subscriptionOperations.set(deviceId, 'subscribing');
 
-  await new Promise<void>(resolve => {
-    notifyCharacteristic.unsubscribe(() => resolve());
+  await runBleCallbackOperation(callback => notifyCharacteristic.unsubscribe(callback), {
+    timeoutMs: 250,
+    timeoutBehavior: 'resolve',
   });
 
-  await new Promise<void>((resolve, reject) => {
-    notifyCharacteristic.subscribe((error?: Error) => {
-      if (error) {
-        reject(error);
-        return;
-      }
-      resolve();
-    });
+  await runBleCallbackOperation(callback => notifyCharacteristic.subscribe(callback), {
+    timeoutMs: 8_000,
+    timeoutBehavior: 'reject',
   });
 
   notifyCharacteristic.removeAllListeners('data');

package/src/ble-packet-capacity.ts

@@ -0,0 +1,13 @@
+const BLE_ATT_HEADER_BYTES = 3;
+
+export function resolveBlePacketCapacity(
+  mtu: number | null | undefined,
+  maximumPacketCapacity: number,
+  fallbackPacketCapacity: number
+): number {
+  if (typeof mtu !== 'number' || !Number.isFinite(mtu) || mtu <= BLE_ATT_HEADER_BYTES) {
+    return fallbackPacketCapacity;
+  }
+
+  return Math.min(maximumPacketCapacity, Math.floor(mtu) - BLE_ATT_HEADER_BYTES);
+}

package/src/index.ts

@@ -3,7 +3,7 @@ import type { WebContents } from 'electron';
 export * from './types';
 
 // Export Desktop API types for other packages to reuse
-export type { DesktopAPI, NobleBleAPI } from './types/desktop-api';
+export type { DesktopAPI, NobleBleAPI, NobleBleWriteOptions } from './types/desktop-api';
 
 export async function initNobleBleSupport(webContents: WebContents) {
   const { setupNobleBleHandlers } = await import('./noble-ble-handler');