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

package/dist/{index-60f89cbb.js → index-696b29dd.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-848639db.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-696b29dd.js');
 
 
 

package/dist/{noble-ble-handler-796173e1.js → noble-ble-handler-848639db.js}

@@ -1,7 +1,8 @@
 'use strict';
 
-var index = require('./index-60f89cbb.js');
+var index = require('./index-696b29dd.js');
 var hdShared = require('@onekeyfe/hd-shared');
+var hdTransport = require('@onekeyfe/hd-transport');
 var pRetry = require('p-retry');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -453,6 +454,15 @@ function setupMtuListener(peripheral, deviceId, webContents) {
     deviceMtuListeners.set(deviceId, { peripheral, listener });
     peripheral.on('mtu', listener);
 }
+function frameHeadPreview(packet) {
+    if (hdShared.isHeaderChunk(packet)) {
+        return packet.subarray(0, 8).toString('hex');
+    }
+    if (packet.length >= 1 && packet[0] === hdTransport.protocolV2.PROTO_HEAD_SOF) {
+        return packet.subarray(0, 7).toString('hex');
+    }
+    return undefined;
+}
 function writeCharacteristicWithoutResponse(deviceId, writeCharacteristic, buffer) {
     return index.__awaiter(this, void 0, void 0, function* () {
         return new Promise((resolve, reject) => {
@@ -560,7 +570,7 @@ function transmitHexDataToDevice(deviceId, hexData, options) {
         logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Write frame', {
             deviceId,
             bytes: toBuffer.length,
-            head: toBuffer.subarray(0, 8).toString('hex'),
+            head: frameHeadPreview(toBuffer),
             packetCapacity,
             mtu: (_a = peripheral.mtu) !== null && _a !== void 0 ? _a : null,
             pacingDelayMs,
@@ -1015,11 +1025,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 +1217,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));
                 }
             }));
         });
@@ -1320,7 +1331,7 @@ function subscribeNotifications(deviceId, callback) {
                     logger === null || logger === void 0 ? void 0 : logger.debug('[NobleBLE] Notify frame', {
                         deviceId,
                         bytes: data.length,
-                        head: data.subarray(0, 8).toString('hex'),
+                        head: frameHeadPreview(data),
                     });
                     if (!pairedDevices.has(deviceId)) {
                         pairedDevices.add(deviceId);

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":"AAkCA,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;AA4xDD,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.182",
   "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.182",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.182",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.182",
     "@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": "86d5a6b9be303da50566b6a4865a015829c15341"
 }

package/src/noble-ble-handler.ts

@@ -15,11 +15,13 @@ import {
   ONEKEY_WRITE_CHARACTERISTIC_UUID,
   createKnownBleUuidAliases,
   hasOnekeyCommunicationService,
+  isHeaderChunk,
   isOnekeyBluetoothDevice,
   isPro2FamilyBleName,
   matchesKnownBleUuid,
   wait,
 } from '@onekeyfe/hd-shared';
+import { protocolV2 } from '@onekeyfe/hd-transport';
 import pRetry from 'p-retry';
 
 import { resolveBlePacketCapacity } from './ble-packet-capacity';
@@ -588,6 +590,28 @@ function setupMtuListener(
 
 // ===== Write helpers (inline) =====
 
+/**
+ * Hex preview of a BLE packet, for diagnostics only.
+ *
+ * Only a frame header is safe to print: a multi-packet message calls the write
+ * hook and the notify listener once per packet, and every continuation packet
+ * starts in raw protobuf payload (field logs have shown a device serial and a
+ * firmware string land in the log this way).
+ *
+ * V1 header: report id 0x3f + magic 0x23 0x23 + message type (2) + length (4).
+ * V2 header: SOF 0x5A + frame length (2) + CRC8 + router + attr + seq, i.e.
+ * bytes 0-6; byte 7 is already payload.
+ */
+function frameHeadPreview(packet: Buffer): string | undefined {
+  if (isHeaderChunk(packet)) {
+    return packet.subarray(0, 8).toString('hex');
+  }
+  if (packet.length >= 1 && packet[0] === protocolV2.PROTO_HEAD_SOF) {
+    return packet.subarray(0, 7).toString('hex');
+  }
+  return undefined;
+}
+
 async function writeCharacteristicWithoutResponse(
   deviceId: string,
   writeCharacteristic: Characteristic,
@@ -733,12 +757,12 @@ async function transmitHexDataToDevice(
   );
   const pacingDelayMs = resolveNobleBleWritePacingDelay(options);
 
-  // Diagnostics: the frame header alone (report id + magic + message type +
-  // length) identifies which protocol frame went out, without logging payload.
+  // Diagnostics: a frame header identifies which protocol frame went out.
+  // Continuation packets carry payload, so they report scalars only.
   logger?.info('[NobleBLE] Write frame', {
     deviceId,
     bytes: toBuffer.length,
-    head: toBuffer.subarray(0, 8).toString('hex'),
+    head: frameHeadPreview(toBuffer),
     packetCapacity,
     mtu: peripheral.mtu ?? null,
     pacingDelayMs,
@@ -1431,21 +1455,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 +1743,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));
       }
     });
   });
@@ -1883,7 +1915,7 @@ async function subscribeNotifications(
       logger?.debug('[NobleBLE] Notify frame', {
         deviceId,
         bytes: data.length,
-        head: data.subarray(0, 8).toString('hex'),
+        head: frameHeadPreview(data),
       });
       // Windows BLE pairing detection: receiving any data means device is paired
       if (!pairedDevices.has(deviceId)) {