@onekeyfe/hd-transport-electron 1.2.0-alpha.180 → 1.2.0-alpha.181

package/dist/{index-60f89cbb.js → index-e30b8ae0.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-796173e1.js'); });
+        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-424cf446.js'); });
         setupNobleBleHandlers(webContents);
     });
 }

package/dist/index.js

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

package/dist/{noble-ble-handler-796173e1.js → noble-ble-handler-424cf446.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-60f89cbb.js');
+var index = require('./index-e30b8ae0.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -1015,11 +1015,12 @@ function setupConnectionAndDiscoverServices(peripheral, deviceId, webContents) {
         }
         catch (discoveryError) {
             if (peripheral.state === 'connected') {
-                logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Service discovery failed on a live link, dropping it for a cold retry', discoveryError);
+                logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Service discovery failed on a live link, dropping it before the fresh scan', discoveryError);
                 yield disconnectDevice(deviceId).catch(() => undefined);
-                throw discoveryError;
             }
-            logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Service discovery failed, attempting fresh scan...', discoveryError);
+            else {
+                logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Service discovery failed, attempting fresh scan...', discoveryError);
+            }
             return freshScanAndDiscover(deviceId, webContents);
         }
     });
@@ -1206,9 +1207,9 @@ function connectDevice(deviceId, webContents) {
                 }
                 catch (setupError) {
                     logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Connection setup failed:', setupError);
-                    connectedPeripheral.disconnect(() => {
-                        reject(setupError);
-                    });
+                    disconnectDevice(deviceId)
+                        .catch(() => undefined)
+                        .then(() => reject(setupError));
                 }
             }));
         });

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;AA8vDD,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;AAswDD,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.180",
+  "version": "1.2.0-alpha.181",
   "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.180",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.180",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.180",
+    "@onekeyfe/hd-core": "1.2.0-alpha.181",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.181",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.181",
     "@stoprocent/noble": "2.3.16",
     "p-retry": "^4.6.2"
   },
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "37976e13bb904ec6167ccba67a7b497e5a3744a2"
+  "gitHead": "cb79652ebe130ceb01490195aa8903715f267e36"
 }

package/src/noble-ble-handler.ts

@@ -1431,21 +1431,24 @@ async function setupConnectionAndDiscoverServices(
   try {
     return await discoverServicesAndCharacteristicsWithRetry(peripheral, deviceId);
   } catch (discoveryError) {
-    // A connected peripheral does not advertise, so the fresh scan below can
-    // only run out its timeout. Drop the link instead and let the caller come
-    // back with a cold connect: that reconnect is what recovers a device whose
-    // stack stopped serving its application layer, and it starts seconds
-    // earlier this way. The scan still runs when the link is already down,
-    // which is the case it was written for.
+    // A connected peripheral does not advertise, so the fresh scan below would
+    // only run out its timeout. Drop the link first, then rescan: the cold
+    // reconnect is what recovers a device whose stack stopped serving its
+    // application layer. Recover here rather than throwing to the caller —
+    // one acquire pays ~2s for the rescan, while a thrown error costs the
+    // renderer a full retry round trip.
     if (peripheral.state === 'connected') {
       logger?.error(
-        '[NobleBLE] Service discovery failed on a live link, dropping it for a cold retry',
+        '[NobleBLE] Service discovery failed on a live link, dropping it before the fresh scan',
         discoveryError
       );
       await disconnectDevice(deviceId).catch(() => undefined);
-      throw discoveryError;
+    } else {
+      logger?.error(
+        '[NobleBLE] Service discovery failed, attempting fresh scan...',
+        discoveryError
+      );
     }
-    logger?.error('[NobleBLE] Service discovery failed, attempting fresh scan...', discoveryError);
     return freshScanAndDiscover(deviceId, webContents);
   }
 }
@@ -1716,9 +1719,14 @@ async function connectDevice(deviceId: string, webContents: WebContents): Promis
         resolve();
       } catch (setupError) {
         logger?.error('[NobleBLE] Connection setup failed:', setupError);
-        connectedPeripheral.disconnect(() => {
-          reject(setupError);
-        });
+        // Never reject from inside a raw disconnect callback: noble only fires
+        // it on a real 'disconnect' event, so a peripheral that is already
+        // down leaves this promise — and the renderer acquire awaiting it —
+        // pending forever. disconnectDevice always settles (it no-ops on an
+        // unknown peripheral and caps the confirm wait).
+        disconnectDevice(deviceId)
+          .catch(() => undefined)
+          .then(() => reject(setupError));
       }
     });
   });