@onekeyfe/hd-transport-electron 1.2.0-alpha.177 → 1.2.0-alpha.178

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

package/dist/index.js

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

package/dist/{noble-ble-handler-4ab8a151.js → noble-ble-handler-796173e1.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-d72435df.js');
+var index = require('./index-60f89cbb.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -1014,6 +1014,11 @@ function setupConnectionAndDiscoverServices(peripheral, deviceId, webContents) {
             return yield discoverServicesAndCharacteristicsWithRetry(peripheral, deviceId);
         }
         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);
+                yield disconnectDevice(deviceId).catch(() => undefined);
+                throw discoveryError;
+            }
             logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Service discovery failed, attempting fresh scan...', discoveryError);
             return freshScanAndDiscover(deviceId, webContents);
         }

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;AAgvDD,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;AA8vDD,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.177",
+  "version": "1.2.0-alpha.178",
   "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.177",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.177",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.177",
+    "@onekeyfe/hd-core": "1.2.0-alpha.178",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.178",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.178",
     "@stoprocent/noble": "2.3.16",
     "p-retry": "^4.6.2"
   },
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "294d4c3ce64a2036742447bcfada14eee6c9591e"
+  "gitHead": "5df24cf8ab1b0e1909e5d9715b15ab042bba3ac7"
 }

package/src/noble-ble-handler.ts

@@ -1431,6 +1431,20 @@ 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.
+    if (peripheral.state === 'connected') {
+      logger?.error(
+        '[NobleBLE] Service discovery failed on a live link, dropping it for a cold retry',
+        discoveryError
+      );
+      await disconnectDevice(deviceId).catch(() => undefined);
+      throw discoveryError;
+    }
     logger?.error('[NobleBLE] Service discovery failed, attempting fresh scan...', discoveryError);
     return freshScanAndDiscover(deviceId, webContents);
   }