@onekeyfe/hd-transport-electron 1.1.17 → 1.1.18-alpha.0

package/dist/{index-f13d8b92.js → index-28d46641.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-cdfacb43.js'); });
+        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-24e390db.js'); });
         setupNobleBleHandlers(webContents);
     });
 }

package/dist/index.js

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

package/dist/{noble-ble-handler-cdfacb43.js → noble-ble-handler-24e390db.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-f13d8b92.js');
+var index = require('./index-28d46641.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var hdTransport = require('@onekeyfe/hd-transport');
 var pRetry = require('p-retry');
@@ -1001,22 +1001,27 @@ function unsubscribeNotifications(deviceId) {
         const { notify: notifyCharacteristic } = characteristics;
         logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Unsubscribing from notifications for device:', deviceId);
         subscriptionOperations.set(deviceId, 'unsubscribing');
-        return new Promise(resolve => {
-            notifyCharacteristic.unsubscribe((error) => {
-                if (error) {
-                    logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Notification unsubscription failed:', error);
-                }
-                else {
-                    logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Notification unsubscription successful');
-                }
-                notifyCharacteristic.removeAllListeners('data');
-                notificationCallbacks.delete(deviceId);
-                devicePacketStates.delete(deviceId);
-                subscribedDevices.delete(deviceId);
-                subscriptionOperations.set(deviceId, 'idle');
-                resolve();
+        try {
+            yield new Promise((resolve, reject) => {
+                notifyCharacteristic.unsubscribe((error) => {
+                    if (error) {
+                        logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Notification unsubscription failed:', error);
+                        reject(error);
+                    }
+                    else {
+                        logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Notification unsubscription successful');
+                        resolve();
+                    }
+                });
             });
-        });
+            notifyCharacteristic.removeAllListeners('data');
+            notificationCallbacks.delete(deviceId);
+            devicePacketStates.delete(deviceId);
+            subscribedDevices.delete(deviceId);
+        }
+        finally {
+            subscriptionOperations.set(deviceId, 'idle');
+        }
     });
 }
 function subscribeNotifications(deviceId, callback) {
@@ -1028,17 +1033,25 @@ function subscribeNotifications(deviceId, callback) {
         }
         const { notify: notifyCharacteristic } = characteristics;
         logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Subscribing to notifications for device:', deviceId);
+        const opState = subscriptionOperations.get(deviceId);
         logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Subscribe context', {
             deviceId,
-            opStateBefore: subscriptionOperations.get(deviceId) || 'idle',
+            opStateBefore: opState || 'idle',
             paired: false,
             hasController: false,
         });
-        const opState = subscriptionOperations.get(deviceId);
         if (opState === 'subscribing') {
+            logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Subscription already in progress, updating callback only');
             notificationCallbacks.set(deviceId, callback);
             return Promise.resolve();
         }
+        if (opState === 'unsubscribing') {
+            logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Cannot subscribe while unsubscribe is in progress', {
+                deviceId,
+                opState,
+            });
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceBusy, `Device ${deviceId} is currently unsubscribing, please retry after reconnection`);
+        }
         subscriptionOperations.set(deviceId, 'subscribing');
         if (subscribedDevices.get(deviceId)) {
             logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Device already subscribed to characteristic, updating callback only');

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":"AAmBA,OAAO,KAAK,EAAE,WAAW,EAAsB,MAAM,UAAU,CAAC;AAq9ChE,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAsKpE"}
+{"version":3,"file":"noble-ble-handler.d.ts","sourceRoot":"","sources":["../src/noble-ble-handler.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,WAAW,EAAsB,MAAM,UAAU,CAAC;AAy+ChE,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAsKpE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-electron",
-  "version": "1.1.17",
+  "version": "1.1.18-alpha.0",
   "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.1.17",
-    "@onekeyfe/hd-shared": "1.1.17",
-    "@onekeyfe/hd-transport": "1.1.17",
+    "@onekeyfe/hd-core": "1.1.18-alpha.0",
+    "@onekeyfe/hd-shared": "1.1.18-alpha.0",
+    "@onekeyfe/hd-transport": "1.1.18-alpha.0",
     "@stoprocent/noble": "2.3.4",
     "p-retry": "^4.6.2"
   },
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "fc9276c5fdefe528e32f463446759ac74065e680"
+  "gitHead": "bec196c57a2a5be4e239dbb14338ddbcd8d4e14f"
 }

package/src/noble-ble-handler.ts

@@ -50,7 +50,7 @@ const deviceCharacteristics = new Map<string, CharacteristicPair>();
 const notificationCallbacks = new Map<string, (data: string) => void>();
 const subscribedDevices = new Map<string, boolean>(); // Track subscription status
 
-// 🔒 Add subscription operation state tracking to prevent race conditions
+// 🔒 Subscription operation state tracking to prevent race conditions
 const subscriptionOperations = new Map<string, 'subscribing' | 'unsubscribing' | 'idle'>();
 
 // Packet reassembly state for each device
@@ -1367,25 +1367,28 @@ async function unsubscribeNotifications(deviceId: string): Promise<void> {
   // 🔒 Set operation state to prevent race conditions
   subscriptionOperations.set(deviceId, 'unsubscribing');
 
-  return new Promise<void>(resolve => {
-    notifyCharacteristic.unsubscribe((error: Error | undefined) => {
-      if (error) {
-        logger?.error('[NobleBLE] Notification unsubscription failed:', error);
-      } else {
-        logger?.info('[NobleBLE] Notification unsubscription successful');
-      }
-
-      // Remove all listeners and clear subscription status
-      notifyCharacteristic.removeAllListeners('data');
-      notificationCallbacks.delete(deviceId);
-      devicePacketStates.delete(deviceId);
-      subscribedDevices.delete(deviceId);
-
-      // 🔒 Clear operation state
-      subscriptionOperations.set(deviceId, 'idle');
-      resolve();
+  try {
+    await new Promise<void>((resolve, reject) => {
+      notifyCharacteristic.unsubscribe((error: Error | undefined) => {
+        if (error) {
+          logger?.error('[NobleBLE] Notification unsubscription failed:', error);
+          reject(error);
+        } else {
+          logger?.info('[NobleBLE] Notification unsubscription successful');
+          resolve();
+        }
+      });
     });
-  });
+
+    // Remove all listeners and clear subscription status
+    notifyCharacteristic.removeAllListeners('data');
+    notificationCallbacks.delete(deviceId);
+    devicePacketStates.delete(deviceId);
+    subscribedDevices.delete(deviceId);
+  } finally {
+    // 🔒 CRITICAL: Always clear operation state (even on error)
+    subscriptionOperations.set(deviceId, 'idle');
+  }
 }
 
 // Subscribe to notifications
@@ -1406,20 +1409,37 @@ async function subscribeNotifications(
   const { notify: notifyCharacteristic } = characteristics;
 
   logger?.info('[NobleBLE] Subscribing to notifications for device:', deviceId);
+
+  // 🔒 CRITICAL: Check operation state FIRST to prevent race conditions
+  const opState = subscriptionOperations.get(deviceId);
+
   logger?.info('[NobleBLE] Subscribe context', {
     deviceId,
-    opStateBefore: subscriptionOperations.get(deviceId) || 'idle',
+    opStateBefore: opState || 'idle',
     paired: false,
     hasController: false,
   });
+
   // If a subscription is already in progress, dedupe
-  const opState = subscriptionOperations.get(deviceId);
   if (opState === 'subscribing') {
-    // Subscription in progress; update callback and return
+    logger?.info('[NobleBLE] Subscription already in progress, updating callback only');
     notificationCallbacks.set(deviceId, callback);
     return Promise.resolve();
   }
 
+  // 🚨 CRITICAL: Reject subscribe if unsubscribe is in progress
+  // Let upper layer handle retry after device reconnection
+  if (opState === 'unsubscribing') {
+    logger?.error('[NobleBLE] Cannot subscribe while unsubscribe is in progress', {
+      deviceId,
+      opState,
+    });
+    throw ERRORS.TypedError(
+      HardwareErrorCode.DeviceBusy,
+      `Device ${deviceId} is currently unsubscribing, please retry after reconnection`
+    );
+  }
+
   // 🔒 Set operation state to prevent race conditions
   subscriptionOperations.set(deviceId, 'subscribing');