@onekeyfe/hd-transport-electron 1.2.0-alpha.161 → 1.2.0-alpha.163

package/dist/{index-fea7f7d5.js → index-b18020df.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-e87ba8bc.js'); });
+        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-8b4037fe.js'); });
         setupNobleBleHandlers(webContents);
     });
 }

package/dist/index.js

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

package/dist/{noble-ble-handler-e87ba8bc.js → noble-ble-handler-8b4037fe.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-fea7f7d5.js');
+var index = require('./index-b18020df.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -1046,7 +1046,7 @@ function tryDirectConnectById(deviceId) {
     });
 }
 function connectDevice(deviceId, webContents) {
-    var _a;
+    var _a, _b;
     return index.__awaiter(this, void 0, void 0, function* () {
         logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Connect device request:', {
             deviceId,
@@ -1058,29 +1058,28 @@ function connectDevice(deviceId, webContents) {
         });
         let peripheral = (_a = discoveredDevices.get(deviceId)) !== null && _a !== void 0 ? _a : connectedDevices.get(deviceId);
         if (!peripheral) {
-            logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Device not discovered, attempting targeted scan for:', deviceId);
             if (!noble) {
                 yield initializeNoble();
             }
             if (!noble) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Noble not available');
             }
-            peripheral = yield tryDirectConnectById(deviceId);
-            if (peripheral) {
-                discoveredDevices.set(deviceId, peripheral);
-            }
-        }
-        if (!peripheral) {
+            logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Device not cached, scanning for:', deviceId);
             try {
-                const foundPeripheral = yield performTargetedScan(deviceId);
-                if (!foundPeripheral) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound, `Device ${deviceId} not found even after targeted scan`);
-                }
-                peripheral = foundPeripheral;
+                peripheral = (_b = (yield performTargetedScan(deviceId))) !== null && _b !== void 0 ? _b : undefined;
             }
-            catch (error) {
-                logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Targeted scan failed:', error);
-                throw error;
+            catch (scanError) {
+                logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Targeted scan failed, falling back to direct connect', {
+                    deviceId,
+                    error: scanError instanceof Error ? scanError.message : String(scanError),
+                });
+            }
+            if (!peripheral) {
+                logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Device not advertising, attempting direct connect by id:', deviceId);
+                peripheral = yield tryDirectConnectById(deviceId);
+                if (peripheral) {
+                    discoveredDevices.set(deviceId, peripheral);
+                }
             }
         }
         if (!peripheral) {

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":"AA+BA,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;AAuoDD,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":"AA+BA,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;AAwoDD,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.161",
+  "version": "1.2.0-alpha.163",
   "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.161",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.161",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.161",
+    "@onekeyfe/hd-core": "1.2.0-alpha.163",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.163",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.163",
     "@stoprocent/noble": "2.3.16",
     "p-retry": "^4.6.2"
   },
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "06316117fc9a7ebaecea1ca583b2d105709361bf"
+  "gitHead": "afed1c82345fc277cadf49677ab8371e6c6f3f9a"
 }

package/src/noble-ble-handler.ts

@@ -1444,10 +1444,7 @@ async function connectDevice(deviceId: string, webContents: WebContents): Promis
   // enumerate clears the discovery map; a kept-alive link outlives it.
   let peripheral = discoveredDevices.get(deviceId) ?? connectedDevices.get(deviceId);
 
-  // If device not discovered, try a targeted scan for this specific device
   if (!peripheral) {
-    logger?.info('[NobleBLE] Device not discovered, attempting targeted scan for:', deviceId);
-
     // Initialize Noble if not already done
     if (!noble) {
       await initializeNoble();
@@ -1457,27 +1454,31 @@ async function connectDevice(deviceId: string, webContents: WebContents): Promis
       throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'Noble not available');
     }
 
-    // Reaches a bonded device that is not advertising; else falls to the scan.
-    peripheral = await tryDirectConnectById(deviceId);
-    if (peripheral) {
-      discoveredDevices.set(deviceId, peripheral);
+    // Scan before connecting by id. A live advertisement proves the device
+    // holds no link and will open a fresh session, and it is how 6.5.0 reached
+    // every cold connect (control logs: found in ~52ms, 16/16 sessions
+    // answered within ~1s). Connecting by id resolves through the OS cache
+    // instead: on a Classic 1S that can hand back a session the device no
+    // longer serves, where the link comes up and GATT resolves from cache but
+    // the device answers no protocol traffic at all.
+    logger?.info('[NobleBLE] Device not cached, scanning for:', deviceId);
+    try {
+      peripheral = (await performTargetedScan(deviceId)) ?? undefined;
+    } catch (scanError) {
+      logger?.info('[NobleBLE] Targeted scan failed, falling back to direct connect', {
+        deviceId,
+        error: scanError instanceof Error ? scanError.message : String(scanError),
+      });
     }
-  }
 
-  if (!peripheral) {
-    // Perform a targeted scan to find the specific device
-    try {
-      const foundPeripheral = await performTargetedScan(deviceId);
-      if (!foundPeripheral) {
-        throw ERRORS.TypedError(
-          HardwareErrorCode.DeviceNotFound,
-          `Device ${deviceId} not found even after targeted scan`
-        );
+    if (!peripheral) {
+      // Not advertising: held by another host, or bonded and silent. Connect
+      // by id is then the only way in.
+      logger?.info('[NobleBLE] Device not advertising, attempting direct connect by id:', deviceId);
+      peripheral = await tryDirectConnectById(deviceId);
+      if (peripheral) {
+        discoveredDevices.set(deviceId, peripheral);
       }
-      peripheral = foundPeripheral;
-    } catch (error) {
-      logger?.error('[NobleBLE] Targeted scan failed:', error);
-      throw error;
     }
   }