@onekeyfe/hd-transport-electron 1.2.2-alpha.103 → 1.2.2-alpha.104

package/dist/{index-052b4b5b.js → index-985e2bf3.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-eff26dd3.js'); });
+        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-263d4736.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-eff26dd3.js'); });
+        const handler = yield Promise.resolve().then(function () { return require('./noble-ble-handler-263d4736.js'); });
         yield handler.disposeNobleBleSupport(releaseNoble);
     });
 }

package/dist/index.js

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

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

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-052b4b5b.js');
+var index = require('./index-985e2bf3.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -106,6 +106,7 @@ let disposePromise;
 let windowCleanup;
 let removeIpcHandlers;
 const pendingCancellations = new Set();
+const pendingEnumerations = new Set();
 const nativeConnections = new Set();
 function trackNativeConnection(operation, cancel) {
     const connection = {
@@ -873,7 +874,7 @@ function performTargetedScan(targetDeviceId, timeoutMs = NOBLE_BLE_TARGETED_SCAN
         });
     });
 }
-function enumerateDevices() {
+function enumerateDevices(isWindowDestroyed) {
     return index.__awaiter(this, void 0, void 0, function* () {
         if (!noble) {
             yield initializeNoble();
@@ -882,6 +883,8 @@ function enumerateDevices() {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Noble not available');
         }
         assertBleActive();
+        if (isWindowDestroyed())
+            return [];
         const nobleInstance = noble;
         logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Starting device enumeration');
         discoveredDevices.clear();
@@ -890,14 +893,20 @@ function enumerateDevices() {
             const devices = [];
             let settled = false;
             let intervalId;
-            const cleanup = () => index.__awaiter(this, void 0, void 0, function* () {
-                settled = true;
-                pendingCancellations.delete(cancel);
-                clearTimeout(timeoutId);
-                if (intervalId)
-                    clearInterval(intervalId);
-                yield waitForNobleScanStop(nobleInstance);
-            });
+            let cleanupPromise;
+            const cleanup = () => {
+                if (!cleanupPromise) {
+                    settled = true;
+                    pendingCancellations.delete(cancel);
+                    clearTimeout(timeoutId);
+                    if (intervalId)
+                        clearInterval(intervalId);
+                    cleanupPromise = waitForNobleScanStop(nobleInstance).finally(() => {
+                        pendingEnumerations.delete(cancel);
+                    });
+                }
+                return cleanupPromise;
+            };
             const pushDevice = (peripheral, id) => {
                 var _a;
                 if (devices.some(d => d.id === id))
@@ -921,10 +930,9 @@ function enumerateDevices() {
                 logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Scan completed, found devices:', devices.length);
                 resolve(devices);
             }), DEVICE_SCAN_TIMEOUT);
-            const cancel = () => {
-                cleanup().then(() => resolve([]), reject);
-            };
+            const cancel = () => cleanup().then(() => resolve([]), reject);
             pendingCancellations.add(cancel);
+            pendingEnumerations.add(cancel);
             logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Scanning for OneKey BLE devices');
             nobleInstance.startScanning([], true, (error) => index.__awaiter(this, void 0, void 0, function* () {
                 if (settled)
@@ -1545,7 +1553,7 @@ function setupNobleBleHandlers(webContents) {
         safeLog(logger, 'info', 'Setting up Noble BLE IPC handlers');
         handle(hdShared.EOneKeyBleMessageKeys.NOBLE_BLE_ENUMERATE, () => index.__awaiter(this, void 0, void 0, function* () {
             try {
-                const devices = yield enumerateDevices();
+                const devices = yield enumerateDevices(() => windowDestroyed);
                 safeLog(logger, 'debug', 'Enumeration completed', {
                     count: devices.length,
                     devices: devices.map(device => ({ id: device.id, name: device.name })),
@@ -1642,9 +1650,11 @@ function setupNobleBleHandlers(webContents) {
                 return;
             safeLog(logger, 'info', 'Cleaning up Noble BLE handlers');
             const previousCleanup = windowCleanup;
+            const enumerations = Array.from(pendingEnumerations, cancel => cancel());
             windowCleanup = (() => index.__awaiter(this, void 0, void 0, function* () {
                 if (previousCleanup)
                     yield previousCleanup;
+                yield Promise.allSettled(enumerations);
                 if (disposing)
                     return;
                 const deviceIds = Array.from(connectedDevices.keys());

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;AAgC1F,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;AA4xDD,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CA+NpE;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;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"}

package/package.json

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

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

@@ -947,4 +947,72 @@ describe('Noble BLE process shutdown', () => {
     await sdk.disposeNobleBleSupport();
     expect(native.stop).toHaveBeenCalledTimes(1);
   });
+
+  test.each(['started', 'late-start-callback'])(
+    'retires an old enumeration before a shared native scan resumes: %s',
+    async scanState => {
+      jest.useFakeTimers({ doNotFake: ['performance', 'setImmediate'] });
+      const { sdk, native, handlers, window } = await setup();
+      let lateStart: (() => void) | undefined;
+      if (scanState === 'late-start-callback') {
+        native.startScanning.mockImplementationOnce((_uuids, _duplicates, callback) => {
+          lateStart = callback;
+        });
+      }
+      let oldScanSettled = false;
+      const oldScan = Promise.resolve(
+        handlers.get(EOneKeyBleMessageKeys.NOBLE_BLE_ENUMERATE)?.({})
+      ).then(result => {
+        oldScanSettled = true;
+        return result;
+      });
+      await flushCallbacks();
+      jest.advanceTimersByTime(1000);
+
+      let finishOldScan: (() => void) | undefined;
+      native.stopScanning.mockImplementationOnce(callback => {
+        finishOldScan = callback;
+      });
+      window.emit('destroyed');
+      sdk.setupNobleBleHandlers(new EventEmitter() as unknown as WebContents);
+      const replacementReady = handlers.get(EOneKeyBleMessageKeys.BLE_AVAILABILITY_CHECK)?.({});
+      let replacementSettled = false;
+      Promise.resolve(replacementReady).then(() => {
+        replacementSettled = true;
+      });
+      await flushCallbacks();
+      expect(replacementSettled).toBe(false);
+      finishOldScan?.();
+      await replacementReady;
+      await flushCallbacks();
+      expect(oldScanSettled).toBe(true);
+      expect(await oldScan).toEqual([]);
+
+      // Another transport can now scan on the same process-wide Noble instance.
+      native.startScanning([], true, () => undefined);
+      const stopCount = native.stopScanning.mock.calls.length;
+      lateStart?.();
+      jest.advanceTimersByTime(5000);
+      await flushCallbacks();
+      expect(native.stopScanning).toHaveBeenCalledTimes(stopCount);
+      expect(jest.getTimerCount()).toBe(0);
+      expect(native.stop).not.toHaveBeenCalled();
+      await sdk.disposeNobleBleSupport();
+    }
+  );
+
+  test('does not start an old window enumeration after Bluetooth becomes ready', async () => {
+    const { sdk, native, handlers, window } = await setup('unknown');
+    const oldScan = handlers.get(EOneKeyBleMessageKeys.NOBLE_BLE_ENUMERATE)?.({});
+    await flushCallbacks();
+    window.emit('destroyed');
+    sdk.setupNobleBleHandlers(new EventEmitter() as unknown as WebContents);
+    await handlers.get(EOneKeyBleMessageKeys.BLE_AVAILABILITY_CHECK)?.({});
+
+    native.state = 'poweredOn';
+    native.emit('stateChange', 'poweredOn');
+    expect(await oldScan).toEqual([]);
+    expect(native.startScanning).not.toHaveBeenCalled();
+    await sdk.disposeNobleBleSupport();
+  });
 });

package/src/noble-ble-handler.ts

@@ -46,6 +46,7 @@ let disposePromise: Promise<void> | undefined;
 let windowCleanup: Promise<void> | undefined;
 let removeIpcHandlers: (() => void) | undefined;
 const pendingCancellations = new Set<() => void>();
+const pendingEnumerations = new Set<() => Promise<void>>();
 const nativeConnections = new Set<{ cancel: () => void; settled: Promise<void> }>();
 
 function trackNativeConnection(operation: Promise<unknown>, cancel: () => void): void {
@@ -1150,7 +1151,7 @@ async function performTargetedScan(
 }
 
 // Enumerate devices
-async function enumerateDevices(): Promise<DeviceInfo[]> {
+async function enumerateDevices(isWindowDestroyed: () => boolean): Promise<DeviceInfo[]> {
   if (!noble) {
     await initializeNoble();
   }
@@ -1160,6 +1161,7 @@ async function enumerateDevices(): Promise<DeviceInfo[]> {
   }
 
   assertBleActive();
+  if (isWindowDestroyed()) return [];
   // Capture noble reference for use in closures (TypeScript narrowing)
   const nobleInstance = noble;
 
@@ -1176,16 +1178,22 @@ async function enumerateDevices(): Promise<DeviceInfo[]> {
     const devices: DeviceInfo[] = [];
     let settled = false;
     let intervalId: ReturnType<typeof setInterval> | undefined;
+    let cleanupPromise: Promise<void> | undefined;
 
     // Cleanup function: clears timers and waits until Noble confirms scanning
     // has stopped. Resolving enumerate before this callback creates a race with
     // an immediately-following connection attempt.
-    const cleanup = async () => {
-      settled = true;
-      pendingCancellations.delete(cancel);
-      clearTimeout(timeoutId);
-      if (intervalId) clearInterval(intervalId);
-      await waitForNobleScanStop(nobleInstance);
+    const cleanup = () => {
+      if (!cleanupPromise) {
+        settled = true;
+        pendingCancellations.delete(cancel);
+        clearTimeout(timeoutId);
+        if (intervalId) clearInterval(intervalId);
+        cleanupPromise = waitForNobleScanStop(nobleInstance).finally(() => {
+          pendingEnumerations.delete(cancel);
+        });
+      }
+      return cleanupPromise;
     };
 
     // Collect discovered devices into the devices array
@@ -1214,10 +1222,9 @@ async function enumerateDevices(): Promise<DeviceInfo[]> {
       resolve(devices);
     }, DEVICE_SCAN_TIMEOUT);
 
-    const cancel = () => {
-      cleanup().then(() => resolve([]), reject);
-    };
+    const cancel = () => cleanup().then(() => resolve([]), reject);
     pendingCancellations.add(cancel);
+    pendingEnumerations.add(cancel);
 
     // Start scanning without a service UUID filter so Pro2 advertisements with
     // short vendor UUIDs can be found. Repeated advertisements are required when
@@ -2163,7 +2170,7 @@ export function setupNobleBleHandlers(webContents: WebContents): void {
     // Handle enumerate request
     handle(EOneKeyBleMessageKeys.NOBLE_BLE_ENUMERATE, async () => {
       try {
-        const devices = await enumerateDevices();
+        const devices = await enumerateDevices(() => windowDestroyed);
         safeLog(logger, 'debug', 'Enumeration completed', {
           count: devices.length,
           devices: devices.map(device => ({ id: device.id, name: device.name })),
@@ -2312,8 +2319,11 @@ export function setupNobleBleHandlers(webContents: WebContents): void {
       if (disposing) return;
       safeLog(logger, 'info', 'Cleaning up Noble BLE handlers');
       const previousCleanup = windowCleanup;
+      // Cancel before yielding so old timers cannot stop a replacement renderer's scan.
+      const enumerations = Array.from(pendingEnumerations, cancel => cancel());
       windowCleanup = (async () => {
         if (previousCleanup) await previousCleanup;
+        await Promise.allSettled(enumerations);
         if (disposing) return;
         const deviceIds = Array.from(connectedDevices.keys());
         for (const deviceId of deviceIds) {