@onekeyfe/hd-transport-electron 1.2.3-alpha.2 → 1.2.3-alpha.4

package/dist/{index-985e2bf3.js → index-474dbbae.js}

@@ -55,13 +55,13 @@ function invokeNobleBleIpc(request) {
 
 function initNobleBleSupport(webContents) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-263d4736.js'); });
+        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-23c86603.js'); });
         setupNobleBleHandlers(webContents);
     });
 }
 function disposeNobleBleSupport(releaseNoble) {
     return __awaiter(this, void 0, void 0, function* () {
-        const handler = yield Promise.resolve().then(function () { return require('./noble-ble-handler-263d4736.js'); });
+        const handler = yield Promise.resolve().then(function () { return require('./noble-ble-handler-23c86603.js'); });
         yield handler.disposeNobleBleSupport(releaseNoble);
     });
 }

package/dist/index.js

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

package/dist/{noble-ble-handler-263d4736.js → noble-ble-handler-23c86603.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-985e2bf3.js');
+var index = require('./index-474dbbae.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -887,7 +887,6 @@ function enumerateDevices(isWindowDestroyed) {
             return [];
         const nobleInstance = noble;
         logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Starting device enumeration');
-        discoveredDevices.clear();
         ensureDiscoverListener();
         return new Promise((resolve, reject) => {
             const devices = [];
@@ -1281,7 +1280,10 @@ function connectDevice(deviceId, webContents) {
             totalDiscovered: discoveredDevices.size,
             totalConnected: connectedDevices.size,
         });
-        let peripheral = (_a = discoveredDevices.get(deviceId)) !== null && _a !== void 0 ? _a : connectedDevices.get(deviceId);
+        let peripheral = (_a = connectedDevices.get(deviceId)) !== null && _a !== void 0 ? _a : discoveredDevices.get(deviceId);
+        if ((peripheral === null || peripheral === void 0 ? void 0 : peripheral.state) !== 'connected') {
+            peripheral = undefined;
+        }
         if (!peripheral) {
             if (!noble) {
                 yield initializeNoble();

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":"AAkCA,OAAO,KAAK,EAA+B,WAAW,EAAE,MAAM,UAAU,CAAC;AAEzE,OAAO,KAAK,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAiC1F,KAAK,mBAAmB,GAAG,KAAK,GAAG;IACjC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,mBAAmB,EAAE,aAAa,SAAK,+CAiB3F;AAED,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,OAAO,GAAG,wBAAwB,CAgCvF;AA+KD,wBAAgB,+BAA+B,CAAC,OAAO,CAAC,EAAE,oBAAoB,UAI7E;AAkyDD,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAkOpE;AAOD,wBAAgB,sBAAsB,CACpC,YAAY,GAAE,CAAC,QAAQ,EAAE;IAAE,IAAI,IAAI,IAAI,CAAA;CAAE,KAAK,IAAkC,GAC/E,OAAO,CAAC,IAAI,CAAC,CAiEf"}
+{"version":3,"file":"noble-ble-handler.d.ts","sourceRoot":"","sources":["../src/noble-ble-handler.ts"],"names":[],"mappings":"AAkCA,OAAO,KAAK,EAA+B,WAAW,EAAE,MAAM,UAAU,CAAC;AAEzE,OAAO,KAAK,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAiC1F,KAAK,mBAAmB,GAAG,KAAK,GAAG;IACjC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,mBAAmB,EAAE,aAAa,SAAK,+CAiB3F;AAED,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,OAAO,GAAG,wBAAwB,CAgCvF;AA+KD,wBAAgB,+BAA+B,CAAC,OAAO,CAAC,EAAE,oBAAoB,UAI7E;AAqyDD,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAkOpE;AAOD,wBAAgB,sBAAsB,CACpC,YAAY,GAAE,CAAC,QAAQ,EAAE;IAAE,IAAI,IAAI,IAAI,CAAA;CAAE,KAAK,IAAkC,GAC/E,OAAO,CAAC,IAAI,CAAC,CAiEf"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-electron",
-  "version": "1.2.3-alpha.2",
+  "version": "1.2.3-alpha.4",
   "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.3-alpha.2",
-    "@onekeyfe/hd-shared": "1.2.3-alpha.2",
-    "@onekeyfe/hd-transport": "1.2.3-alpha.2",
+    "@onekeyfe/hd-core": "1.2.3-alpha.4",
+    "@onekeyfe/hd-shared": "1.2.3-alpha.4",
+    "@onekeyfe/hd-transport": "1.2.3-alpha.4",
     "@stoprocent/noble": "2.3.16",
     "p-retry": "^4.6.2"
   },
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "8b790c78394debdd3d9999db2f6a56235efb7a18"
+  "gitHead": "705729baaec54b86a4fc28cce310a85b67b82730"
 }

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

@@ -225,6 +225,133 @@ describe('Electron Noble BLE device discovery', () => {
     ]);
   });
 
+  test.each(['Pro A1B2', 'Pro2 A1B2'])(
+    'retains %s across scan rounds until Bluetooth is powered off',
+    async name => {
+      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 = Object.assign(new EventEmitter(), {
+        state: 'poweredOn',
+        startScanning: jest.fn(),
+        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 scan = async (peripherals: ReturnType<typeof createPeripheral>[]) => {
+        let resolveScanStarted = () => undefined;
+        const scanStarted = new Promise<void>(resolve => {
+          resolveScanStarted = resolve;
+        });
+        noble.startScanning.mockImplementationOnce((_services, _duplicates, callback) => {
+          callback?.();
+          peripherals.forEach(peripheral => noble.emit('discover', peripheral));
+          resolveScanStarted();
+        });
+        const devices = Promise.resolve(enumerate());
+        await scanStarted;
+        jest.advanceTimersByTime(5_000);
+        return devices;
+      };
+
+      const firstDevice = createPeripheral('first-device', name);
+      const secondDevice = createPeripheral('second-device', 'Pro2 C3D4');
+      await expect(scan([firstDevice])).resolves.toEqual([
+        expect.objectContaining({ id: 'first-device', name }),
+      ]);
+      await expect(scan([secondDevice, secondDevice])).resolves.toEqual([
+        expect.objectContaining({ id: 'first-device', name }),
+        expect.objectContaining({ id: 'second-device', name: 'Pro2 C3D4' }),
+      ]);
+      await expect(scan([])).resolves.toHaveLength(2);
+
+      noble.state = 'poweredOff';
+      noble.emit('stateChange', 'poweredOff');
+      noble.state = 'poweredOn';
+      noble.emit('stateChange', 'poweredOn');
+      await expect(scan([])).resolves.toEqual([]);
+    }
+  );
+
+  test.each(['Pro A1B2', 'Pro2 A1B2'])(
+    'refreshes a retained disconnected %s peripheral before cold connecting',
+    async name => {
+      const handlers = new Map<string, IpcHandler>();
+      const stalePeripheral = Object.assign(new EventEmitter(), createPeripheral('device', name), {
+        connect: jest.fn(),
+      });
+      const freshPeripheral = Object.assign(new EventEmitter(), createPeripheral('device', name), {
+        connect: jest.fn((callback: (error?: Error) => void) => {
+          callback(new Error('expected fresh connection failure'));
+        }),
+      });
+      const noble = Object.assign(new EventEmitter(), {
+        state: 'poweredOn',
+        startScanning: jest.fn((_services, _duplicates, callback) => {
+          callback?.();
+          noble.emit('discover', freshPeripheral);
+        }),
+        stopScanning: jest.fn(callback => callback?.()),
+        connectAsync: jest.fn(() => Promise.resolve(undefined)),
+      });
+      jest.doMock('@stoprocent/noble', () => noble);
+      jest.doMock('electron', () => ({
+        ipcMain: {
+          handle: (channel: string, handler: IpcHandler) => handlers.set(channel, handler),
+          removeHandler: (channel: string) => handlers.delete(channel),
+        },
+      }));
+      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 availability = handlers.get(EOneKeyBleMessageKeys.BLE_AVAILABILITY_CHECK);
+      const connect = handlers.get(EOneKeyBleMessageKeys.NOBLE_BLE_CONNECT);
+      if (!availability || !connect) throw new Error('Noble handlers were not registered');
+      await availability();
+      noble.emit('discover', stalePeripheral);
+
+      await expect(Promise.resolve(connect(undefined, stalePeripheral.id))).resolves.toMatchObject({
+        success: false,
+        error: { message: 'expected fresh connection failure' },
+      });
+
+      expect(stalePeripheral.connect).not.toHaveBeenCalled();
+      expect(freshPeripheral.connect).toHaveBeenCalledTimes(1);
+      expect(noble.startScanning).toHaveBeenCalledTimes(1);
+      expect(noble.connectAsync).toHaveBeenCalledTimes(name.startsWith('Pro2') ? 1 : 0);
+    }
+  );
+
   test('waits for a targeted scan to stop before connecting', async () => {
     jest.useFakeTimers({ doNotFake: ['performance'] });
 
@@ -846,9 +973,12 @@ describe('Noble BLE process shutdown', () => {
       discoverServices: jest.fn(),
     });
     native.emit('discover', peripheral);
+    native.startScanning.mockImplementationOnce((_uuids, _duplicates, callback) => {
+      callback?.();
+      native.emit('discover', peripheral);
+    });
     const connecting = handlers.get(EOneKeyBleMessageKeys.NOBLE_BLE_CONNECT)?.({}, peripheral.id);
-    await Promise.resolve();
-    await Promise.resolve();
+    await flushCallbacks();
     expect(peripheral.connect).toHaveBeenCalledTimes(1);
     const disposing = sdk.disposeNobleBleSupport();
     await flushCallbacks();
@@ -886,7 +1016,13 @@ describe('Noble BLE process shutdown', () => {
       );
       const cancelConnect = jest.fn();
       if (route === 'direct') Object.assign(native, { connectAsync, cancelConnect });
-      else native.emit('discover', peripheral);
+      else {
+        native.emit('discover', peripheral);
+        native.startScanning.mockImplementationOnce((_uuids, _duplicates, callback) => {
+          callback?.();
+          native.emit('discover', peripheral);
+        });
+      }
       const connecting = handlers.get(EOneKeyBleMessageKeys.NOBLE_BLE_CONNECT)?.({}, peripheral.id);
       await flushCallbacks();
       if (route === 'direct') {

package/src/noble-ble-handler.ts

@@ -1167,8 +1167,7 @@ async function enumerateDevices(isWindowDestroyed: () => boolean): Promise<Devic
 
   logger?.info('[NobleBLE] Starting device enumeration');
 
-  // Clear previous discoveries
-  discoveredDevices.clear();
+  // Keep prior discoveries when a polling round misses an advertisement.
 
   // Ensure discover listener is properly set up before scanning
   // This is crucial to fix the issue where devices are not found after web-usb failures
@@ -1766,8 +1765,12 @@ async function connectDevice(deviceId: string, webContents: WebContents): Promis
     totalConnected: connectedDevices.size,
   });
 
-  // enumerate clears the discovery map; a kept-alive link outlives it.
-  let peripheral = discoveredDevices.get(deviceId) ?? connectedDevices.get(deviceId);
+  // Retained discoveries are display metadata, not proof of a reusable native link.
+  // Prefer the live connection when an older discovery exists for the same device.
+  let peripheral = connectedDevices.get(deviceId) ?? discoveredDevices.get(deviceId);
+  if (peripheral?.state !== 'connected') {
+    peripheral = undefined;
+  }
 
   if (!peripheral) {
     // Initialize Noble if not already done