@onekeyfe/hd-transport-electron 1.2.2-alpha.108 → 1.2.2-alpha.109

package/dist/{index-47669b97.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-d146f264.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-d146f264.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-47669b97.js');
+var index = require('./index-474dbbae.js');
 
 
 

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

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-47669b97.js');
+var index = require('./index-474dbbae.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -1280,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;AAiyDD,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.2-alpha.108",
+  "version": "1.2.2-alpha.109",
   "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.108",
-    "@onekeyfe/hd-shared": "1.2.2-alpha.108",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.108",
+    "@onekeyfe/hd-core": "1.2.2-alpha.109",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.109",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.109",
     "@stoprocent/noble": "2.3.16",
     "p-retry": "^4.6.2"
   },
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "962db9ecea348976a93de3c3039ac171ca0086d8"
+  "gitHead": "4ee0588f08abdde1c72b8044091a76106e4770c4"
 }

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

@@ -299,6 +299,59 @@ describe('Electron Noble BLE device discovery', () => {
     }
   );
 
+  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'] });
 
@@ -920,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();
@@ -960,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

@@ -1765,8 +1765,12 @@ async function connectDevice(deviceId: string, webContents: WebContents): Promis
     totalConnected: connectedDevices.size,
   });
 
-  // A kept-alive link can outlive the discovery cache.
-  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