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

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

package/dist/index.js

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

package/dist/{noble-ble-handler-0fb76826.js → noble-ble-handler-4ab8a151.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-2b9e4f42.js');
+var index = require('./index-d72435df.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -609,6 +609,7 @@ function transmitHexDataToDevice(deviceId, hexData, options) {
     });
 }
 const BLE_COLD_CONNECT_SCAN_TIMEOUT_MS = 1500;
+const SERVICE_DISCOVERY_MAX_ATTEMPTS = 2;
 const bleNamesById = new Map();
 function rememberBleName(deviceId, name) {
     const trimmed = name === null || name === void 0 ? void 0 : name.trim();
@@ -966,11 +967,11 @@ function discoverServicesAndCharacteristicsWithRetry(peripheral, deviceId) {
                 deviceId,
                 peripheralState: peripheral.state,
                 attempt: attemptNumber,
-                maxRetries: 5,
+                maxRetries: SERVICE_DISCOVERY_MAX_ATTEMPTS,
                 targetUUIDs: ONEKEY_SERVICE_UUIDS,
             });
             if (attemptNumber > 1) {
-                logger === null || logger === void 0 ? void 0 : logger.info(`[NobleBLE] Service discovery retry attempt ${attemptNumber}/5`);
+                logger === null || logger === void 0 ? void 0 : logger.info(`[NobleBLE] Service discovery retry attempt ${attemptNumber}/${SERVICE_DISCOVERY_MAX_ATTEMPTS}`);
             }
             if (peripheral.state !== 'connected') {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, `Device not connected: ${peripheral.state}`);
@@ -979,16 +980,16 @@ function discoverServicesAndCharacteristicsWithRetry(peripheral, deviceId) {
                 return yield discoverServicesAndCharacteristics(peripheral);
             }
             catch (error) {
-                logger === null || logger === void 0 ? void 0 : logger.error(`[NobleBLE] No services found (attempt ${attemptNumber}/5)`);
-                if (attemptNumber < 5) {
-                    logger === null || logger === void 0 ? void 0 : logger.error(`[NobleBLE] Will retry service discovery (attempt ${attemptNumber + 1}/5)`);
+                logger === null || logger === void 0 ? void 0 : logger.error(`[NobleBLE] No services found (attempt ${attemptNumber}/${SERVICE_DISCOVERY_MAX_ATTEMPTS})`);
+                if (attemptNumber < SERVICE_DISCOVERY_MAX_ATTEMPTS) {
+                    logger === null || logger === void 0 ? void 0 : logger.error(`[NobleBLE] Will retry service discovery (attempt ${attemptNumber + 1}/${SERVICE_DISCOVERY_MAX_ATTEMPTS})`);
                 }
                 throw error;
             }
         }), {
-            retries: 4,
+            retries: SERVICE_DISCOVERY_MAX_ATTEMPTS - 1,
             factor: 1.5,
-            minTimeout: 1000,
+            minTimeout: 500,
             maxTimeout: 3000,
             onFailedAttempt: error => {
                 logger === null || logger === void 0 ? void 0 : logger.error(`[NobleBLE] Service discovery attempt ${error.attemptNumber} failed:`, {

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

package/src/noble-ble-handler.ts

@@ -807,6 +807,9 @@ async function transmitHexDataToDevice(
 // 631ms, so this leaves ~2x headroom while keeping a miss cheap.
 const BLE_COLD_CONNECT_SCAN_TIMEOUT_MS = 1500;
 
+// Attempts before a link is written off as unable to serve the OneKey service.
+const SERVICE_DISCOVERY_MAX_ATTEMPTS = 2;
+
 // 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.
@@ -1336,12 +1339,14 @@ async function discoverServicesAndCharacteristicsWithRetry(
         deviceId,
         peripheralState: peripheral.state,
         attempt: attemptNumber,
-        maxRetries: 5,
+        maxRetries: SERVICE_DISCOVERY_MAX_ATTEMPTS,
         targetUUIDs: ONEKEY_SERVICE_UUIDS,
       });
 
       if (attemptNumber > 1) {
-        logger?.info(`[NobleBLE] Service discovery retry attempt ${attemptNumber}/5`);
+        logger?.info(
+          `[NobleBLE] Service discovery retry attempt ${attemptNumber}/${SERVICE_DISCOVERY_MAX_ATTEMPTS}`
+        );
       }
 
       // Verify connection state before attempting service discovery
@@ -1355,20 +1360,32 @@ async function discoverServicesAndCharacteristicsWithRetry(
       try {
         return await discoverServicesAndCharacteristics(peripheral);
       } catch (error) {
-        logger?.error(`[NobleBLE] No services found (attempt ${attemptNumber}/5)`);
+        logger?.error(
+          `[NobleBLE] No services found (attempt ${attemptNumber}/${SERVICE_DISCOVERY_MAX_ATTEMPTS})`
+        );
 
-        if (attemptNumber < 5) {
-          logger?.error(`[NobleBLE] Will retry service discovery (attempt ${attemptNumber + 1}/5)`);
+        if (attemptNumber < SERVICE_DISCOVERY_MAX_ATTEMPTS) {
+          logger?.error(
+            `[NobleBLE] Will retry service discovery (attempt ${
+              attemptNumber + 1
+            }/${SERVICE_DISCOVERY_MAX_ATTEMPTS})`
+          );
         }
 
         throw error; // p-retry will handle the retry logic
       }
     },
     {
-      retries: 4, // Total 5 attempts (initial + 4 retries)
-      factor: 1.5, // Exponential backoff: 1000ms → 1500ms → 2250ms → 3000ms
-      minTimeout: 1000, // Start with 1 second delay
-      maxTimeout: 3000, // Maximum 3 seconds delay
+      // One retry, not four. An empty result here is the signature of a device
+      // whose stack no longer serves its application layer, and retrying the
+      // same link has never recovered it — every observed run failed all the
+      // way through. The recovery is the teardown and cold reconnect the caller
+      // performs afterwards, so reaching it sooner is what shortens the wait.
+      // The single retry stays for a genuinely transient miss.
+      retries: SERVICE_DISCOVERY_MAX_ATTEMPTS - 1,
+      factor: 1.5,
+      minTimeout: 500,
+      maxTimeout: 3000,
       onFailedAttempt: error => {
         // This runs after each failed attempt
         logger?.error(`[NobleBLE] Service discovery attempt ${error.attemptNumber} failed:`, {