@onekeyfe/hd-transport-electron 1.2.8-alpha.2 → 1.2.8-alpha.21

package/dist/{index-5135e7b9.js → index-21e34fdb.js}

@@ -55,13 +55,13 @@ function invokeNobleBleIpc(request) {
 
 function initNobleBleSupport(webContents) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-043a7c23.js'); });
+        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-c4530a1b.js'); });
         setupNobleBleHandlers(webContents);
     });
 }
 function disposeNobleBleSupport(releaseNoble) {
     return __awaiter(this, void 0, void 0, function* () {
-        const handler = yield Promise.resolve().then(function () { return require('./noble-ble-handler-043a7c23.js'); });
+        const handler = yield Promise.resolve().then(function () { return require('./noble-ble-handler-c4530a1b.js'); });
         yield handler.disposeNobleBleSupport(releaseNoble);
     });
 }

package/dist/index.js

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

package/dist/{noble-ble-handler-043a7c23.js → noble-ble-handler-c4530a1b.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-5135e7b9.js');
+var index = require('./index-21e34fdb.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -376,8 +376,18 @@ function updateBluetoothState(state) {
 function initializeNoble() {
     return index.__awaiter(this, void 0, void 0, function* () {
         assertBleActive();
-        if (noble)
+        if (noble) {
+            if (noble.state === 'poweredOff') {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePoweredOff);
+            }
+            if (noble.state === 'unsupported') {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleUnsupported);
+            }
+            if (noble.state === 'unauthorized') {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleLocationError);
+            }
             return;
+        }
         try {
             noble = require('@stoprocent/noble');
             logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Noble library loaded');
@@ -418,7 +428,7 @@ function initializeNoble() {
                     }
                     else if (state === 'unauthorized') {
                         cleanup();
-                        reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError));
+                        reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleLocationError));
                     }
                 };
                 const cancel = () => {
@@ -427,6 +437,7 @@ function initializeNoble() {
                 };
                 pendingCancellations.add(cancel);
                 noble.on('stateChange', onStateChange);
+                onStateChange(noble.state);
             });
             assertBleActive();
             if (!persistentDiscoverListener) {
@@ -439,7 +450,7 @@ function initializeNoble() {
         }
         catch (error) {
             logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Failed to initialize Noble:', error);
-            bluetoothState.unsupported = true;
+            bluetoothState.unsupported = (noble === null || noble === void 0 ? void 0 : noble.state) === 'unsupported';
             bluetoothState.initialized = true;
             throw error;
         }
@@ -868,9 +879,7 @@ function performTargetedScan(targetDeviceId, timeoutMs = NOBLE_BLE_TARGETED_SCAN
 }
 function enumerateDevices(isWindowDestroyed) {
     return index.__awaiter(this, void 0, void 0, function* () {
-        if (!noble) {
-            yield initializeNoble();
-        }
+        yield initializeNoble();
         if (!noble) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Noble not available');
         }
@@ -1250,10 +1259,6 @@ function tryDirectConnectById(deviceId) {
                 deviceId,
                 error: String(error),
             });
-            const nativeError = error;
-            if (nativeError.nativeErrorCode === 14 && nativeError.nativeErrorDomain === 'CBErrorDomain') {
-                throw createNobleBleConnectionError(nativeError);
-            }
             directConnectCooldownUntil.set(deviceId, Date.now() + DIRECT_CONNECT_COOLDOWN_MS);
             return undefined;
         }
@@ -1267,6 +1272,7 @@ function tryDirectConnectById(deviceId) {
 function connectDevice(deviceId, webContents) {
     var _a, _b, _c;
     return index.__awaiter(this, void 0, void 0, function* () {
+        yield initializeNoble();
         logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Connect device request:', {
             deviceId,
             hasDiscovered: discoveredDevices.has(deviceId),
@@ -1280,9 +1286,6 @@ function connectDevice(deviceId, webContents) {
             peripheral = undefined;
         }
         if (!peripheral) {
-            if (!noble) {
-                yield initializeNoble();
-            }
             if (!noble) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Noble not available');
             }

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":"AAiCA,OAAO,KAAK,EAA+B,WAAW,EAAE,MAAM,UAAU,CAAC;AAEzE,OAAO,KAAK,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAiC1F,KAAK,mBAAmB,GAAG,KAAK,GAAG;IACjC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,mBAAmB,EAAE,aAAa,SAAK,+CAG3F;AAED,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,OAAO,GAAG,wBAAwB,CAgCvF;AA+KD,wBAAgB,+BAA+B,CAAC,OAAO,CAAC,EAAE,oBAAoB,UAI7E;AAgzDD,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAkOpE;AAOD,wBAAgB,sBAAsB,CACpC,YAAY,GAAE,CAAC,QAAQ,EAAE;IAAE,IAAI,IAAI,IAAI,CAAA;CAAE,KAAK,IAAkC,GAC/E,OAAO,CAAC,IAAI,CAAC,CAiEf"}
+{"version":3,"file":"noble-ble-handler.d.ts","sourceRoot":"","sources":["../src/noble-ble-handler.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAA+B,WAAW,EAAE,MAAM,UAAU,CAAC;AAEzE,OAAO,KAAK,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAiC1F,KAAK,mBAAmB,GAAG,KAAK,GAAG;IACjC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,mBAAmB,EAAE,aAAa,SAAK,+CAG3F;AAED,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,OAAO,GAAG,wBAAwB,CAgCvF;AA+KD,wBAAgB,+BAA+B,CAAC,OAAO,CAAC,EAAE,oBAAoB,UAI7E;AAkzDD,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAkOpE;AAOD,wBAAgB,sBAAsB,CACpC,YAAY,GAAE,CAAC,QAAQ,EAAE;IAAE,IAAI,IAAI,IAAI,CAAA;CAAE,KAAK,IAAkC,GAC/E,OAAO,CAAC,IAAI,CAAC,CAiEf"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-electron",
-  "version": "1.2.8-alpha.2",
+  "version": "1.2.8-alpha.21",
   "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.8-alpha.2",
-    "@onekeyfe/hd-shared": "1.2.8-alpha.2",
-    "@onekeyfe/hd-transport": "1.2.8-alpha.2",
+    "@onekeyfe/hd-core": "1.2.8-alpha.21",
+    "@onekeyfe/hd-shared": "1.2.8-alpha.21",
+    "@onekeyfe/hd-transport": "1.2.8-alpha.21",
     "@stoprocent/noble": "2.3.16",
     "p-retry": "^4.6.2"
   },
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "74ac64464df3806ef44ad54d313378754c3eaed2"
+  "gitHead": "acc31b02db0a507a597775fc88306c9104c1b5d1"
 }

package/src/__tests__/noble-ble-handler.test.ts

@@ -292,9 +292,13 @@ describe('Electron Noble BLE device discovery', () => {
     }
   );
 
-  test.each(['Pro A1B2', 'Pro2 A1B2'])(
-    'refreshes a retained disconnected %s peripheral before cold connecting',
-    async name => {
+  test.each([
+    ['Pro A1B2', 'unavailable'],
+    ['Pro2 A1B2', 'unavailable'],
+    ['Pro2 A1B2', 'native error 14'],
+  ])(
+    'refreshes a retained disconnected %s peripheral before cold connecting (direct: %s)',
+    async (name, directConnectResult) => {
       const handlers = new Map<string, IpcHandler>();
       const stalePeripheral = Object.assign(new EventEmitter(), createPeripheral('device', name), {
         connect: jest.fn(),
@@ -311,7 +315,16 @@ describe('Electron Noble BLE device discovery', () => {
           noble.emit('discover', freshPeripheral);
         }),
         stopScanning: jest.fn(callback => callback?.()),
-        connectAsync: jest.fn(() => Promise.resolve(undefined)),
+        connectAsync: jest.fn(() =>
+          directConnectResult === 'native error 14'
+            ? Promise.reject(
+                Object.assign(new Error('native direct connection failure'), {
+                  nativeErrorDomain: 'CBErrorDomain',
+                  nativeErrorCode: 14,
+                })
+              )
+            : Promise.resolve(undefined)
+        ),
       });
       jest.doMock('@stoprocent/noble', () => noble);
       jest.doMock('electron', () => ({
@@ -918,6 +931,59 @@ describe('Noble BLE process shutdown', () => {
     expect(handlers.size).toBe(0);
   });
 
+  test.each([
+    ['poweredOff', HardwareErrorCode.BlePoweredOff],
+    ['unauthorized', HardwareErrorCode.BleLocationError],
+    ['unsupported', HardwareErrorCode.BleUnsupported],
+  ])(
+    'preserves adapter state %s across repeated scans and connections',
+    async (state, errorCode) => {
+      jest.useFakeTimers({ doNotFake: ['performance'] });
+      const { sdk, native, handlers } = await setup(state);
+      for (let attempt = 0; attempt < 2; attempt += 1) {
+        for (const channel of [
+          EOneKeyBleMessageKeys.NOBLE_BLE_ENUMERATE,
+          EOneKeyBleMessageKeys.NOBLE_BLE_CONNECT,
+        ]) {
+          await expect(handlers.get(channel)?.({}, 'device')).resolves.toMatchObject({
+            success: false,
+            error: { errorCode },
+          });
+        }
+      }
+      expect(native.startScanning).not.toHaveBeenCalled();
+      expect(native.listenerCount('stateChange')).toBe(1);
+      expect(jest.getTimerCount()).toBe(0);
+      await sdk.disposeNobleBleSupport();
+    }
+  );
+
+  test.each([
+    ['poweredOff', HardwareErrorCode.BlePoweredOff],
+    ['unauthorized', HardwareErrorCode.BleLocationError],
+    ['unsupported', HardwareErrorCode.BleUnsupported],
+  ])('checks adapter state %s again after initialization', async (state, errorCode) => {
+    const { sdk, native, handlers } = await setup();
+    const checkAvailability = handlers.get(EOneKeyBleMessageKeys.BLE_AVAILABILITY_CHECK);
+    await expect(checkAvailability?.({})).resolves.toMatchObject({ available: true });
+    native.state = state;
+    native.emit('stateChange', state);
+    for (const channel of [
+      EOneKeyBleMessageKeys.NOBLE_BLE_ENUMERATE,
+      EOneKeyBleMessageKeys.NOBLE_BLE_CONNECT,
+    ]) {
+      await expect(handlers.get(channel)?.({}, 'device')).resolves.toMatchObject({
+        success: false,
+        error: { errorCode },
+      });
+    }
+    expect(native.startScanning).not.toHaveBeenCalled();
+    native.state = 'poweredOn';
+    native.emit('stateChange', native.state);
+    await expect(checkAvailability?.({})).resolves.toMatchObject({ available: true });
+    await sdk.disposeNobleBleSupport();
+  });
+
   test('cancels an active scan, ignores its late callback and releases native once', async () => {
     jest.useFakeTimers({ doNotFake: ['performance'] });
     const { sdk, native, handlers } = await setup();

package/src/noble-ble-handler.ts

@@ -429,7 +429,18 @@ function updateBluetoothState(state: string): void {
 // Initialize Noble
 async function initializeNoble(): Promise<void> {
   assertBleActive();
-  if (noble) return;
+  if (noble) {
+    if (noble.state === 'poweredOff') {
+      throw ERRORS.TypedError(HardwareErrorCode.BlePoweredOff);
+    }
+    if (noble.state === 'unsupported') {
+      throw ERRORS.TypedError(HardwareErrorCode.BleUnsupported);
+    }
+    if (noble.state === 'unauthorized') {
+      throw ERRORS.TypedError(HardwareErrorCode.BleLocationError);
+    }
+    return;
+  }
 
   try {
     // eslint-disable-next-line @typescript-eslint/no-var-requires, global-require
@@ -482,7 +493,7 @@ async function initializeNoble(): Promise<void> {
           reject(ERRORS.TypedError(HardwareErrorCode.BlePoweredOff));
         } else if (state === 'unauthorized') {
           cleanup();
-          reject(ERRORS.TypedError(HardwareErrorCode.BlePermissionError));
+          reject(ERRORS.TypedError(HardwareErrorCode.BleLocationError));
         }
       };
 
@@ -494,6 +505,7 @@ async function initializeNoble(): Promise<void> {
       };
       pendingCancellations.add(cancel);
       noble.on('stateChange', onStateChange);
+      onStateChange(noble.state);
     });
 
     assertBleActive();
@@ -508,7 +520,7 @@ async function initializeNoble(): Promise<void> {
     logger?.info('[NobleBLE] Noble initialized successfully');
   } catch (error) {
     logger?.error('[NobleBLE] Failed to initialize Noble:', error);
-    bluetoothState.unsupported = true;
+    bluetoothState.unsupported = noble?.state === 'unsupported';
     bluetoothState.initialized = true;
     throw error;
   }
@@ -1137,9 +1149,7 @@ async function performTargetedScan(
 
 // Enumerate devices
 async function enumerateDevices(isWindowDestroyed: () => boolean): Promise<DeviceInfo[]> {
-  if (!noble) {
-    await initializeNoble();
-  }
+  await initializeNoble();
 
   if (!noble) {
     throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'Noble not available');
@@ -1730,10 +1740,6 @@ async function tryDirectConnectById(deviceId: string): Promise<Peripheral | unde
       deviceId,
       error: String(error),
     });
-    const nativeError = error as NobleBleNativeError;
-    if (nativeError.nativeErrorCode === 14 && nativeError.nativeErrorDomain === 'CBErrorDomain') {
-      throw createNobleBleConnectionError(nativeError);
-    }
     directConnectCooldownUntil.set(deviceId, Date.now() + DIRECT_CONNECT_COOLDOWN_MS);
     return undefined;
   } finally {
@@ -1744,6 +1750,7 @@ async function tryDirectConnectById(deviceId: string): Promise<Peripheral | unde
 
 // Connect to device - supports both discovered and direct connection modes
 async function connectDevice(deviceId: string, webContents: WebContents): Promise<void> {
+  await initializeNoble();
   logger?.info('[NobleBLE] Connect device request:', {
     deviceId,
     hasDiscovered: discoveredDevices.has(deviceId),
@@ -1761,11 +1768,6 @@ async function connectDevice(deviceId: string, webContents: WebContents): Promis
   }
 
   if (!peripheral) {
-    // Initialize Noble if not already done
-    if (!noble) {
-      await initializeNoble();
-    }
-
     if (!noble) {
       throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'Noble not available');
     }