@onekeyfe/hd-transport-electron 1.2.0-alpha.164 → 1.2.0-alpha.166

package/dist/{index-5478256a.js → index-f4b406db.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-255383f1.js'); });
+        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-038532d9.js'); });
         setupNobleBleHandlers(webContents);
     });
 }

package/dist/index.js

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

package/dist/{noble-ble-handler-255383f1.js → noble-ble-handler-038532d9.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-5478256a.js');
+var index = require('./index-f4b406db.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -396,6 +396,10 @@ function cleanupDevice(deviceId, webContents, options = {}) {
         pairedDevices.delete(deviceId);
     }
     if (cleanupDiscoveredCache) {
+        const evicted = discoveredDevices.get(deviceId);
+        if (evicted) {
+            stalePeripherals.set(deviceId, evicted);
+        }
         discoveredDevices.delete(deviceId);
     }
     if (sendDisconnectEvent) {
@@ -600,6 +604,7 @@ function transmitHexDataToDevice(deviceId, hexData, options) {
     });
 }
 const BLE_COLD_CONNECT_SCAN_TIMEOUT_MS = 1500;
+const stalePeripherals = new Map();
 const bleNamesById = new Map();
 function rememberBleName(deviceId, name) {
     const trimmed = name === null || name === void 0 ? void 0 : name.trim();
@@ -909,7 +914,12 @@ function forceReconnectPeripheral(peripheral, deviceId) {
             yield runBleCallbackOperation(callback => peripheral.disconnect(() => {
                 logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Force disconnect completed');
                 callback();
-            }), { timeoutMs: BLE_CLEANUP_TIMEOUT, timeoutBehavior: 'resolve' });
+            }), { timeoutMs: BLE_DISCONNECT_CONFIRM_TIMEOUT_MS, timeoutBehavior: 'resolve' });
+            if (peripheral.state === 'connected') {
+                logger === null || logger === void 0 ? void 0 : logger.warn('[NobleBLE] Reset disconnect did not confirm, reconnecting anyway', {
+                    deviceId,
+                });
+            }
         }
         yield runBleCallbackOperation(callback => peripheral.connect(callback), {
             timeoutMs: NOBLE_BLE_CONNECTION_TIMEOUT_MS,
@@ -1112,6 +1122,16 @@ function connectDevice(deviceId, webContents) {
             if (!peripheral) {
                 peripheral = byIdFirst ? yield scanForPeripheral() : yield connectById();
             }
+            if (!peripheral) {
+                const stale = stalePeripherals.get(deviceId);
+                if (stale) {
+                    logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Falling back to the last known peripheral:', deviceId);
+                    peripheral = stale;
+                }
+            }
+            else {
+                stalePeripherals.delete(deviceId);
+            }
         }
         if (!peripheral) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound, `Device ${deviceId} not found`);

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":"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;AAksDD,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;AAkuDD,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAkMpE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-electron",
-  "version": "1.2.0-alpha.164",
+  "version": "1.2.0-alpha.166",
   "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.164",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.164",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.164",
+    "@onekeyfe/hd-core": "1.2.0-alpha.166",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.166",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.166",
     "@stoprocent/noble": "2.3.16",
     "p-retry": "^4.6.2"
   },
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "8a6f829b0ea1544d2c5f7a1fd0cc0f08d6df7dcd"
+  "gitHead": "3dd1b964d8503ee800f44466b8c08e3d59be67e8"
 }

package/src/noble-ble-handler.ts

@@ -503,8 +503,16 @@ function cleanupDevice(
     pairedDevices.delete(deviceId);
   }
 
-  // 2. Clean up discovered cache (optional)
+  // 2. Clean up discovered cache (optional). A peripheral that has been
+  // through a disconnect is never preferred again — reconnecting it is what
+  // produces stale-session links — but it is kept aside as the last resort for
+  // a bonded device that stays silent, so eviction cannot turn a working
+  // reconnect into DeviceNotFound.
   if (cleanupDiscoveredCache) {
+    const evicted = discoveredDevices.get(deviceId);
+    if (evicted) {
+      stalePeripherals.set(deviceId, evicted);
+    }
     discoveredDevices.delete(deviceId);
   }
 
@@ -796,6 +804,10 @@ async function transmitHexDataToDevice(
 // 631ms, so this leaves ~2x headroom while keeping a miss cheap.
 const BLE_COLD_CONNECT_SCAN_TIMEOUT_MS = 1500;
 
+// Peripherals evicted by a disconnect, kept only as the fallback of last
+// resort in connectDevice (see cleanupDevice).
+const stalePeripherals = new Map<string, Peripheral>();
+
 // Advertised names, kept for the life of the process: device caches are purged
 // on every disconnect, but the family a device belongs to never changes and
 // decides which connection strategy is safe for it.
@@ -1225,7 +1237,10 @@ async function forceReconnectPeripheral(peripheral: Peripheral, deviceId: string
     reason: 'force-reconnect',
   });
 
-  // Step 2: Force disconnect if connected
+  // Step 2: Force disconnect if connected. Wait for the teardown to be
+  // confirmed: reconnecting while CoreBluetooth is still closing the old link
+  // rebuilds the very stale-session state this reset exists to clear, and
+  // 250ms is not enough to prove a physical teardown on macOS.
   if (peripheral.state === 'connected') {
     await runBleCallbackOperation(
       callback =>
@@ -1233,8 +1248,13 @@ async function forceReconnectPeripheral(peripheral: Peripheral, deviceId: string
           logger?.info('[NobleBLE] Force disconnect completed');
           callback();
         }),
-      { timeoutMs: BLE_CLEANUP_TIMEOUT, timeoutBehavior: 'resolve' }
+      { timeoutMs: BLE_DISCONNECT_CONFIRM_TIMEOUT_MS, timeoutBehavior: 'resolve' }
     );
+    if (peripheral.state === 'connected') {
+      logger?.warn('[NobleBLE] Reset disconnect did not confirm, reconnecting anyway', {
+        deviceId,
+      });
+    }
   }
 
   // Step 3: Re-establish connection
@@ -1535,6 +1555,18 @@ async function connectDevice(deviceId: string, webContents: WebContents): Promis
       // silent), or not reachable by id. Try the other one before giving up.
       peripheral = byIdFirst ? await scanForPeripheral() : await connectById();
     }
+    if (!peripheral) {
+      // Neither route resolved a peripheral: a bonded device that has gone
+      // silent, or connect-by-id sitting in its cooldown. The evicted object is
+      // worse than a fresh one, but it beats failing the call outright.
+      const stale = stalePeripherals.get(deviceId);
+      if (stale) {
+        logger?.info('[NobleBLE] Falling back to the last known peripheral:', deviceId);
+        peripheral = stale;
+      }
+    } else {
+      stalePeripherals.delete(deviceId);
+    }
   }
 
   // At this point, peripheral is guaranteed to be defined