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

package/dist/{index-5135e7b9.js → index-98d6f724.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-688faeb6.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-688faeb6.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-98d6f724.js');
 
 
 

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

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-5135e7b9.js');
+var index = require('./index-98d6f724.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -418,7 +418,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 +427,7 @@ function initializeNoble() {
                 };
                 pendingCancellations.add(cancel);
                 noble.on('stateChange', onStateChange);
+                onStateChange(noble.state);
             });
             assertBleActive();
             if (!persistentDiscoverListener) {
@@ -439,7 +440,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;
         }

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;AAizDD,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.3",
   "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.3",
+    "@onekeyfe/hd-shared": "1.2.8-alpha.3",
+    "@onekeyfe/hd-transport": "1.2.8-alpha.3",
     "@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": "18c57239359413a079fffa730b36149c8516aa85"
 }

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

@@ -918,6 +918,28 @@ describe('Noble BLE process shutdown', () => {
     expect(handlers.size).toBe(0);
   });
 
+  test.each([
+    ['poweredOff', HardwareErrorCode.BlePoweredOff],
+    ['unauthorized', HardwareErrorCode.BleLocationError],
+    ['unsupported', HardwareErrorCode.BleUnsupported],
+  ])(
+    'classifies the initial adapter state %s without waiting for another event',
+    async (state, errorCode) => {
+      jest.useFakeTimers({ doNotFake: ['performance'] });
+      const { sdk, native, handlers } = await setup(state);
+      await expect(
+        handlers.get(EOneKeyBleMessageKeys.NOBLE_BLE_ENUMERATE)?.({})
+      ).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('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

@@ -482,7 +482,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 +494,7 @@ async function initializeNoble(): Promise<void> {
       };
       pendingCancellations.add(cancel);
       noble.on('stateChange', onStateChange);
+      onStateChange(noble.state);
     });
 
     assertBleActive();
@@ -508,7 +509,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;
   }