@onekeyfe/hd-transport-electron 1.2.8-alpha.5 → 1.2.8-alpha.7

package/dist/{index-2231e562.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-804f0a41.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-804f0a41.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-2231e562.js');
+var index = require('./index-21e34fdb.js');
 
 
 

package/dist/{noble-ble-handler-804f0a41.js → noble-ble-handler-c4530a1b.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-2231e562.js');
+var index = require('./index-21e34fdb.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -1259,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;
         }

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;AAszDD,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.5",
+  "version": "1.2.8-alpha.7",
   "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.5",
-    "@onekeyfe/hd-shared": "1.2.8-alpha.5",
-    "@onekeyfe/hd-transport": "1.2.8-alpha.5",
+    "@onekeyfe/hd-core": "1.2.8-alpha.7",
+    "@onekeyfe/hd-shared": "1.2.8-alpha.7",
+    "@onekeyfe/hd-transport": "1.2.8-alpha.7",
     "@stoprocent/noble": "2.3.16",
     "p-retry": "^4.6.2"
   },
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "c1f24dc0a59d0c02fe05594a9c4ae7652ec9cc32"
+  "gitHead": "1d94e4a83f9a145af366094a63308370465f9a73"
 }

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', () => ({

package/src/noble-ble-handler.ts

@@ -1740,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 {