@onekeyfe/hd-transport-electron 1.2.0-alpha.122 → 1.2.0-alpha.124

package/dist/{index-6da32f94.js → index-fe6d3919.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-ce551d9a.js'); });
+        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-c88e98df.js'); });
         setupNobleBleHandlers(webContents);
     });
 }

package/dist/index.js

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

package/dist/{noble-ble-handler-ce551d9a.js → noble-ble-handler-c88e98df.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-6da32f94.js');
+var index = require('./index-fe6d3919.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -135,7 +135,7 @@ function isOneKeyPeripheral(peripheral) {
     var _a, _b;
     const serviceUuids = (_a = peripheral.advertisement) === null || _a === void 0 ? void 0 : _a.serviceUuids;
     const localName = (_b = peripheral.advertisement) === null || _b === void 0 ? void 0 : _b.localName;
-    if (!(localName === null || localName === void 0 ? void 0 : localName.trim()) || hdShared.isPro2FindMyAdvertisementName(localName)) {
+    if (!(localName === null || localName === void 0 ? void 0 : localName.trim())) {
         return false;
     }
     return (hdShared.hasOnekeyCommunicationService(serviceUuids) &&
@@ -667,7 +667,7 @@ function performTargetedScan(targetDeviceId) {
                 finish(null).catch(reject);
             }, NOBLE_BLE_TARGETED_SCAN_TIMEOUT_MS);
             nobleInstance.on('discover', onDiscover);
-            nobleInstance.startScanning([], false, (error) => {
+            nobleInstance.startScanning([], true, (error) => {
                 if (error) {
                     finish(null, error).catch(reject);
                     return;
@@ -720,7 +720,7 @@ function enumerateDevices() {
                 resolve(devices);
             }), DEVICE_SCAN_TIMEOUT);
             logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Scanning for OneKey BLE devices');
-            nobleInstance.startScanning([], false, (error) => index.__awaiter(this, void 0, void 0, function* () {
+            nobleInstance.startScanning([], true, (error) => index.__awaiter(this, void 0, void 0, function* () {
                 if (error) {
                     yield cleanup();
                     logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Failed to start scanning:', 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":"AA+BA,OAAO,KAAK,EAA+B,WAAW,EAAE,MAAM,UAAU,CAAC;AAEzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AA0EhE,wBAAgB,+BAA+B,CAAC,OAAO,CAAC,EAAE,oBAAoB,UAI7E;AA8lDD,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAgMpE"}
+{"version":3,"file":"noble-ble-handler.d.ts","sourceRoot":"","sources":["../src/noble-ble-handler.ts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAA+B,WAAW,EAAE,MAAM,UAAU,CAAC;AAEzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AA0EhE,wBAAgB,+BAA+B,CAAC,OAAO,CAAC,EAAE,oBAAoB,UAI7E;AA8lDD,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAgMpE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-electron",
-  "version": "1.2.0-alpha.122",
+  "version": "1.2.0-alpha.124",
   "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.0-alpha.122",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.122",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.122",
+    "@onekeyfe/hd-core": "1.2.0-alpha.124",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.124",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.124",
     "@stoprocent/noble": "2.3.16",
     "p-retry": "^4.6.2"
   },
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "f0a85119fe7f8607768bc77b0ac4eb527d55e1cc"
+  "gitHead": "939229b4fe0dd7939b6fa3b2f6801f4e6b055c3b"
 }

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

@@ -10,12 +10,12 @@ import type { WebContents } from 'electron';
 
 type IpcHandler = (...args: unknown[]) => Promise<unknown> | unknown;
 
-const createPeripheral = (id: string, localName?: string) => ({
+const createPeripheral = (id: string, localName?: string, serviceUuids = ['0001', 'fffd']) => ({
   id,
   state: 'disconnected',
   advertisement: {
     localName,
-    serviceUuids: ['0001', 'fffd'],
+    serviceUuids,
   },
 });
 
@@ -171,6 +171,7 @@ describe('Electron Noble BLE device discovery', () => {
     const connectPromise = Promise.resolve(connect(undefined, 'target-device'));
     await scanStarted;
 
+    expect(noble.startScanning).toHaveBeenCalledWith([], true, expect.any(Function));
     expect(noble.stopScanning).toHaveBeenCalledTimes(1);
     expect(peripheral.connect).not.toHaveBeenCalled();
 
@@ -250,7 +251,7 @@ describe('Electron Noble BLE device discovery', () => {
     expect(peripheral.disconnect).toHaveBeenCalledTimes(1);
   });
 
-  test('does not enumerate a Pro2 Find My advertisement with the communication service', async () => {
+  test('enumerates a Pro2 communication advertisement after Find My changes its name', async () => {
     jest.useFakeTimers({ doNotFake: ['performance'] });
 
     const handlers = new Map<string, IpcHandler>();
@@ -274,8 +275,8 @@ describe('Electron Noble BLE device discovery', () => {
     noble.state = 'poweredOn';
     noble.startScanning = jest.fn((_services, _duplicates, callback) => {
       callback?.();
-      noble.emit('discover', createPeripheral('find-my-device', 'Pro2 A1B2 - Find My'));
-      noble.emit('discover', createPeripheral('onekey-device', 'Pro2 A1B2'));
+      noble.emit('discover', createPeripheral('find-my-device', 'Pro2 A1B2 - Find My', ['fffd']));
+      noble.emit('discover', createPeripheral('onekey-device', 'Pro2 A1B2 - Find My'));
       resolveScanStarted();
     });
     noble.stopScanning = jest.fn(callback => callback?.());
@@ -301,17 +302,18 @@ describe('Electron Noble BLE device discovery', () => {
 
     const devicesPromise = Promise.resolve(enumerate());
     await scanStarted;
+    expect(noble.startScanning).toHaveBeenCalledWith([], true, expect.any(Function));
     jest.advanceTimersByTime(5000);
 
     await expect(devicesPromise).resolves.toEqual([
       expect.objectContaining({
         id: 'onekey-device',
-        name: 'Pro2 A1B2',
+        name: 'Pro2 A1B2 - Find My',
       }),
     ]);
   });
 
-  test('does not enumerate a Find My peripheral first discovered without a name', async () => {
+  test('accepts a communication peripheral after its scan response gains a name', async () => {
     jest.useFakeTimers({ doNotFake: ['performance'] });
 
     const handlers = new Map<string, IpcHandler>();
@@ -368,6 +370,10 @@ describe('Electron Noble BLE device discovery', () => {
     jest.advanceTimersByTime(5000);
 
     await expect(devicesPromise).resolves.toEqual([
+      expect.objectContaining({
+        id: 'find-my-device',
+        name: 'Pro2 A1B2 - Find My',
+      }),
       expect.objectContaining({
         id: 'onekey-device',
         name: 'Pro2 A1B2',

package/src/noble-ble-handler.ts

@@ -15,7 +15,6 @@ import {
   createKnownBleUuidAliases,
   hasOnekeyCommunicationService,
   isOnekeyBluetoothDevice,
-  isPro2FindMyAdvertisementName,
   matchesKnownBleUuid,
   wait,
 } from '@onekeyfe/hd-shared';
@@ -115,9 +114,7 @@ function isOneKeyPeripheral(peripheral: Peripheral) {
   const serviceUuids = peripheral.advertisement?.serviceUuids;
   const localName = peripheral.advertisement?.localName;
 
-  // Noble localName is the current advertisement name, so reject the Pro2
-  // Find My endpoint before the communication-service fast path accepts it.
-  if (!localName?.trim() || isPro2FindMyAdvertisementName(localName)) {
+  if (!localName?.trim()) {
     return false;
   }
 
@@ -843,8 +840,9 @@ async function performTargetedScan(targetDeviceId: string): Promise<Peripheral |
     // Add local listener for this scan
     nobleInstance.on('discover', onDiscover);
 
-    // Start scanning — no service UUID filter (Pro2 may use different service UUID)
-    nobleInstance.startScanning([], false, (error?: Error) => {
+    // Allow repeated advertisements so a service-only packet can be followed by
+    // the named scan response needed to validate the target peripheral.
+    nobleInstance.startScanning([], true, (error?: Error) => {
       if (error) {
         finish(null, error).catch(reject);
         return;
@@ -915,9 +913,10 @@ async function enumerateDevices(): Promise<DeviceInfo[]> {
     }, DEVICE_SCAN_TIMEOUT);
 
     // Start scanning without a service UUID filter so Pro2 advertisements with
-    // short vendor UUIDs can be found, but only OneKey candidates are logged/returned.
+    // short vendor UUIDs can be found. Repeated advertisements are required when
+    // the local name arrives in a later scan response; discoveredDevices handles deduplication.
     logger?.info('[NobleBLE] Scanning for OneKey BLE devices');
-    nobleInstance.startScanning([], false, async (error?: Error) => {
+    nobleInstance.startScanning([], true, async (error?: Error) => {
       if (error) {
         await cleanup();
         logger?.error('[NobleBLE] Failed to start scanning:', error);