@onekeyfe/hd-transport-electron 1.2.3-alpha.5 → 1.2.3-alpha.6

package/dist/{index-474dbbae.js → index-63b1f562.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-23c86603.js'); });
+        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-46832360.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-23c86603.js'); });
+        const handler = yield Promise.resolve().then(function () { return require('./noble-ble-handler-46832360.js'); });
         yield handler.disposeNobleBleSupport(releaseNoble);
     });
 }

package/dist/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-474dbbae.js');
+var index = require('./index-63b1f562.js');
 
 
 

package/dist/{noble-ble-handler-23c86603.js → noble-ble-handler-46832360.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-474dbbae.js');
+var index = require('./index-63b1f562.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -123,8 +123,7 @@ function assertBleActive() {
 }
 function createNobleBleConnectionError(error, messagePrefix = '') {
     const errorMessage = error.message;
-    const isInvalidMacOsBond = (error.nativeErrorCode === 14 && error.nativeErrorDomain === 'CBErrorDomain') ||
-        (error.nativeErrorCode === 15 && error.nativeErrorDomain === 'CBATTErrorDomain');
+    const isInvalidMacOsBond = error.nativeErrorCode === 14 && error.nativeErrorDomain === 'CBErrorDomain';
     if (isInvalidMacOsBond) {
         const nativeErrorMessage = `${messagePrefix}${errorMessage}`;
         return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleBondInvalid, `${hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.BleBondInvalid]} (${nativeErrorMessage})`, {
@@ -1517,7 +1516,12 @@ function subscribeNotifications(deviceId, callback) {
             });
         }
         catch (error) {
-            throw createNobleBleConnectionError(error, 'Notification subscription failed: ');
+            const nativeError = error;
+            if (nativeError.nativeErrorCode === 15 &&
+                nativeError.nativeErrorDomain === 'CBATTErrorDomain') {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded, hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.BleDeviceNotBonded], { nativeErrorMessage: `Notification subscription failed: ${nativeError.message}` });
+            }
+            throw createNobleBleConnectionError(nativeError, 'Notification subscription failed: ');
         }
         finally {
             if (!disposing)

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":"AAkCA,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,+CAiB3F;AAED,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,OAAO,GAAG,wBAAwB,CAgCvF;AA+KD,wBAAgB,+BAA+B,CAAC,OAAO,CAAC,EAAE,oBAAoB,UAI7E;AAqyDD,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":"AAkCA,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,+CAgB3F;AAED,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,OAAO,GAAG,wBAAwB,CAgCvF;AA+KD,wBAAgB,+BAA+B,CAAC,OAAO,CAAC,EAAE,oBAAoB,UAI7E;AA6yDD,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.3-alpha.5",
+  "version": "1.2.3-alpha.6",
   "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.3-alpha.5",
-    "@onekeyfe/hd-shared": "1.2.3-alpha.5",
-    "@onekeyfe/hd-transport": "1.2.3-alpha.5",
+    "@onekeyfe/hd-core": "1.2.3-alpha.6",
+    "@onekeyfe/hd-shared": "1.2.3-alpha.6",
+    "@onekeyfe/hd-transport": "1.2.3-alpha.6",
     "@stoprocent/noble": "2.3.16",
     "p-retry": "^4.6.2"
   },
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "ee493c3ad41a6bc7fb249fba71d4b9bf8efcced8"
+  "gitHead": "80a130479ef3ca8479cfb9041d80097ae43d2574"
 }

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

@@ -68,7 +68,7 @@ describe('Electron Noble BLE device discovery', () => {
         })
       )
     ).toMatchObject({
-      errorCode: HardwareErrorCode.BleBondInvalid,
+      errorCode: HardwareErrorCode.BleConnectedError,
     });
     expect(createNobleBleConnectionError(new Error('connection failed'))).toMatchObject({
       errorCode: HardwareErrorCode.BleConnectedError,
@@ -705,7 +705,7 @@ describe('Electron Noble BLE device discovery', () => {
         type: 'NobleBleIpcError',
         success: false,
         error: {
-          errorCode: HardwareErrorCode.BleBondInvalid,
+          errorCode: HardwareErrorCode.BleDeviceNotBonded,
           params: {
             nativeErrorMessage: 'Notification subscription failed: Encryption is insufficient',
           },

package/src/noble-ble-handler.ts

@@ -75,8 +75,7 @@ type NobleBleNativeError = Error & {
 export function createNobleBleConnectionError(error: NobleBleNativeError, messagePrefix = '') {
   const errorMessage = error.message;
   const isInvalidMacOsBond =
-    (error.nativeErrorCode === 14 && error.nativeErrorDomain === 'CBErrorDomain') ||
-    (error.nativeErrorCode === 15 && error.nativeErrorDomain === 'CBATTErrorDomain');
+    error.nativeErrorCode === 14 && error.nativeErrorDomain === 'CBErrorDomain';
   if (isInvalidMacOsBond) {
     const nativeErrorMessage = `${messagePrefix}${errorMessage}`;
     return ERRORS.TypedError(
@@ -2120,10 +2119,18 @@ async function subscribeNotifications(
       ms: Date.now() - subscribeStartedAt,
     });
   } catch (error) {
-    throw createNobleBleConnectionError(
-      error as NobleBleNativeError,
-      'Notification subscription failed: '
-    );
+    const nativeError = error as NobleBleNativeError;
+    if (
+      nativeError.nativeErrorCode === 15 &&
+      nativeError.nativeErrorDomain === 'CBATTErrorDomain'
+    ) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.BleDeviceNotBonded,
+        HardwareErrorCodeMessage[HardwareErrorCode.BleDeviceNotBonded],
+        { nativeErrorMessage: `Notification subscription failed: ${nativeError.message}` }
+      );
+    }
+    throw createNobleBleConnectionError(nativeError, 'Notification subscription failed: ');
   } finally {
     // 🔒 CRITICAL: Always clear operation state (even on error)
     if (!disposing) subscriptionOperations.set(deviceId, 'idle');