@ukeyfe/hardware-transport-electron 1.1.25 → 1.1.27

package/dist/{index-60176982.js → index-5c4c1f33.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-37d3b074.js'); });
+        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-3c136b8c.js'); });
         setupNobleBleHandlers(webContents);
     });
 }

package/dist/index.d.ts

@@ -1,7 +1,8 @@
 import { WebContents } from 'electron';
 import { Characteristic, Peripheral } from '@stoprocent/noble';
+import { UKeyDeviceInfoBase } from '@ukeyfe/hardware-transport';
 
-interface DeviceInfo {
+interface DeviceInfo extends UKeyDeviceInfoBase {
     id: string;
     name: string;
     state: string;

package/dist/index.js

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

package/dist/{noble-ble-handler-37d3b074.js → noble-ble-handler-3c136b8c.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-60176982.js');
+var index = require('./index-5c4c1f33.js');
 var hardwareShared = require('@ukeyfe/hardware-shared');
 var hardwareTransport = require('@ukeyfe/hardware-transport');
 var pRetry = require('p-retry');
@@ -614,6 +614,7 @@ function enumerateDevices() {
                         if (!existingDevice) {
                             const deviceName = ((_a = peripheral.advertisement) === null || _a === void 0 ? void 0 : _a.localName) || 'Unknown Device';
                             devices.push({
+                                commType: 'electron-ble',
                                 id,
                                 name: deviceName,
                                 state: peripheral.state || 'disconnected',
@@ -663,6 +664,7 @@ function getDevice(deviceId) {
     if (peripheral) {
         const deviceName = ((_a = peripheral.advertisement) === null || _a === void 0 ? void 0 : _a.localName) || 'Unknown Device';
         return {
+            commType: 'electron-ble',
             id: peripheral.id,
             name: deviceName,
             state: peripheral.state || 'disconnected',
@@ -672,12 +674,14 @@ function getDevice(deviceId) {
     if (connectedPeripheral) {
         const deviceName = ((_b = connectedPeripheral.advertisement) === null || _b === void 0 ? void 0 : _b.localName) || 'Unknown Device';
         return {
+            commType: 'electron-ble',
             id: connectedPeripheral.id,
             name: deviceName,
             state: connectedPeripheral.state || 'connected',
         };
     }
     return {
+        commType: 'electron-ble',
         id: deviceId,
         name: 'UKey Device',
         state: 'disconnected',
@@ -1001,22 +1005,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 +1037,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 hardwareShared.ERRORS.TypedError(hardwareShared.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":"AAwBA,OAAO,KAAK,EAAsB,WAAW,EAAE,MAAM,UAAU,CAAC;AA0+ChE,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAsKpE"}

package/dist/types/noble-extended.d.ts

@@ -1,5 +1,6 @@
-import type { Peripheral, Characteristic } from '@stoprocent/noble';
-export interface DeviceInfo {
+import type { Characteristic, Peripheral } from '@stoprocent/noble';
+import type { UKeyDeviceInfoBase } from '@ukeyfe/hardware-transport';
+export interface DeviceInfo extends UKeyDeviceInfoBase {
     id: string;
     name: string;
     state: string;

package/dist/types/noble-extended.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"noble-extended.d.ts","sourceRoot":"","sources":["../../src/types/noble-extended.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGpE,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,cAAc,CAAC;IACtB,MAAM,EAAE,cAAc,CAAC;CACxB;AAGD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CACX,YAAY,EAAE,MAAM,EAAE,EACtB,eAAe,EAAE,OAAO,EACxB,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,GACjC,IAAI,CAAC;IACR,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IAC1C,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAClE,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAAC;IACxE,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAC9E,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAAC;CACrF;AAGD,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC5C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC7C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;CAC9C;AAGD,wBAAgB,OAAO,CACrB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,EACjC,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,GAAG,EAAE,GACb,IAAI,CAMN"}
+{"version":3,"file":"noble-extended.d.ts","sourceRoot":"","sources":["../../src/types/noble-extended.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAGrE,MAAM,WAAW,UAAW,SAAQ,kBAAkB;IACpD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,cAAc,CAAC;IACtB,MAAM,EAAE,cAAc,CAAC;CACxB;AAGD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CACX,YAAY,EAAE,MAAM,EAAE,EACtB,eAAe,EAAE,OAAO,EACxB,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,GACjC,IAAI,CAAC;IACR,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IAC1C,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAClE,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAAC;IACxE,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAC9E,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAAC;CACrF;AAGD,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC5C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC7C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;CAC9C;AAGD,wBAAgB,OAAO,CACrB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,EACjC,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,GAAG,EAAE,GACb,IAAI,CAMN"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukeyfe/hardware-transport-electron",
-  "version": "1.1.25",
+  "version": "1.1.27",
   "author": "UKey",
   "homepage": "https://github.com/UKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
@@ -11,7 +11,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/bestyourwallet/hardware-js-sdk"
+    "url": "git+https://github.com/UKeyHQ/hardware-js-sdk.git"
   },
   "scripts": {
     "dev": "rimraf dist && rollup -c ../../build/rollup.config.js -w",
@@ -26,9 +26,9 @@
   },
   "dependencies": {
     "@stoprocent/noble": "2.3.4",
-    "@ukeyfe/hardware-core": "1.1.25",
-    "@ukeyfe/hardware-shared": "1.1.25",
-    "@ukeyfe/hardware-transport": "1.1.25",
+    "@ukeyfe/hardware-core": "1.1.27",
+    "@ukeyfe/hardware-shared": "1.1.27",
+    "@ukeyfe/hardware-transport": "1.1.27",
     "p-retry": "^4.6.2"
   },
   "devDependencies": {
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "8f4ecd5e78a8cade44224204c4cf102e6e2a1712"
+  "gitHead": "4ee8e8dcee0fd7e1a361d4f8935856c80e292805"
 }

package/src/noble-ble-handler.ts

@@ -6,24 +6,26 @@
 /* eslint-disable @typescript-eslint/no-var-requires, import/no-extraneous-dependencies */
 
 import {
-  isUkeyDevice,
   EUKeyBleMessageKeys,
+  ERRORS,
+  HardwareErrorCode,
+  UKEY_NOTIFY_CHARACTERISTIC_UUID,
   UKEY_SERVICE_UUID,
   UKEY_WRITE_CHARACTERISTIC_UUID,
-  UKEY_NOTIFY_CHARACTERISTIC_UUID,
   isHeaderChunk,
-  ERRORS,
-  HardwareErrorCode,
+  isUkeyDevice,
   wait,
 } from '@ukeyfe/hardware-shared';
 import { COMMON_HEADER_SIZE } from '@ukeyfe/hardware-transport';
-import type { WebContents, IpcMainInvokeEvent } from 'electron';
-import type { Peripheral, Service, Characteristic } from '@stoprocent/noble';
 import pRetry from 'p-retry';
-import type { NobleModule, Logger, DeviceInfo, CharacteristicPair } from './types/noble-extended';
+
 import { safeLog } from './types/noble-extended';
 import { softRefreshSubscription } from './ble-ops';
 
+import type { IpcMainInvokeEvent, WebContents } from 'electron';
+import type { Characteristic, Peripheral, Service } from '@stoprocent/noble';
+import type { CharacteristicPair, DeviceInfo, Logger, NobleModule } from './types/noble-extended';
+
 // Noble will be dynamically imported to avoid bundlinpissues
 let noble: NobleModule | null = null;
 let logger: Logger | null = null;
@@ -50,7 +52,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
@@ -824,6 +826,7 @@ async function enumerateDevices(): Promise<DeviceInfo[]> {
           if (!existingDevice) {
             const deviceName = peripheral.advertisement?.localName || 'Unknown Device';
             devices.push({
+              commType: 'electron-ble',
               id,
               name: deviceName,
               state: peripheral.state || 'disconnected',
@@ -882,6 +885,7 @@ function getDevice(deviceId: string): DeviceInfo | null {
   if (peripheral) {
     const deviceName = peripheral.advertisement?.localName || 'Unknown Device';
     return {
+      commType: 'electron-ble',
       id: peripheral.id,
       name: deviceName,
       state: peripheral.state || 'disconnected',
@@ -893,6 +897,7 @@ function getDevice(deviceId: string): DeviceInfo | null {
   if (connectedPeripheral) {
     const deviceName = connectedPeripheral.advertisement?.localName || 'Unknown Device';
     return {
+      commType: 'electron-ble',
       id: connectedPeripheral.id,
       name: deviceName,
       state: connectedPeripheral.state || 'connected',
@@ -902,6 +907,7 @@ function getDevice(deviceId: string): DeviceInfo | null {
   // For direct connection mode, return a placeholder device info
   // This allows the connection process to proceed without prior discovery
   return {
+    commType: 'electron-ble',
     id: deviceId,
     name: 'UKey Device',
     state: 'disconnected',
@@ -1367,25 +1373,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 +1415,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');
 

package/src/types/noble-extended.ts

@@ -3,10 +3,11 @@
  * Supplements @types/noble with additional interfaces
  */
 
-import type { Peripheral, Characteristic } from '@stoprocent/noble';
+import type { Characteristic, Peripheral } from '@stoprocent/noble';
+import type { UKeyDeviceInfoBase } from '@ukeyfe/hardware-transport';
 
 // Device info interface for our API
-export interface DeviceInfo {
+export interface DeviceInfo extends UKeyDeviceInfoBase {
   id: string;
   name: string;
   state: string;