@onekeyfe/hd-transport-electron 1.2.0-alpha.53 → 1.2.0-alpha.55

package/dist/{index-3a48215e.js → index-c1642d47.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-16076f96.js'); });
+        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-e98d7b00.js'); });
         setupNobleBleHandlers(webContents);
     });
 }

package/dist/index.js

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

package/dist/{noble-ble-handler-16076f96.js → noble-ble-handler-e98d7b00.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-3a48215e.js');
+var index = require('./index-c1642d47.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -117,7 +117,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 (hdShared.isPro2FindMyAdvertisementName(localName)) {
+    if (!(localName === null || localName === void 0 ? void 0 : localName.trim()) || hdShared.isPro2FindMyAdvertisementName(localName)) {
         return false;
     }
     return (hdShared.hasOnekeyCommunicationService(serviceUuids) &&

package/package.json

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

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

@@ -6,7 +6,7 @@ import type { WebContents } from 'electron';
 
 type IpcHandler = (...args: unknown[]) => Promise<unknown> | unknown;
 
-const createPeripheral = (id: string, localName: string) => ({
+const createPeripheral = (id: string, localName?: string) => ({
   id,
   state: 'disconnected',
   advertisement: {
@@ -79,4 +79,65 @@ describe('Electron Noble BLE device discovery', () => {
       }),
     ]);
   });
+
+  test('does not enumerate a Find My peripheral first discovered without a name', async () => {
+    jest.useFakeTimers({ doNotFake: ['performance'] });
+
+    const handlers = new Map<string, IpcHandler>();
+    const ipcMain = {
+      handle: jest.fn((channel: string, handler: IpcHandler) => {
+        handlers.set(channel, handler);
+      }),
+    };
+    const noble = new EventEmitter() as EventEmitter & {
+      state: string;
+      startScanning: jest.Mock;
+      stopScanning: jest.Mock;
+    };
+    let resolveScanStarted = () => undefined;
+    const scanStarted = new Promise<void>(resolve => {
+      resolveScanStarted = resolve;
+    });
+    const findMyPeripheral = createPeripheral('find-my-device');
+    noble.state = 'poweredOn';
+    noble.startScanning = jest.fn((_services, _duplicates, callback) => {
+      callback?.();
+      noble.emit('discover', findMyPeripheral);
+      findMyPeripheral.advertisement.localName = 'Pro2 A1B2 - Find My';
+      noble.emit('discover', findMyPeripheral);
+      noble.emit('discover', createPeripheral('onekey-device', 'Pro2 A1B2'));
+      resolveScanStarted();
+    });
+    noble.stopScanning = jest.fn(callback => callback?.());
+
+    jest.doMock('@stoprocent/noble', () => noble);
+    jest.doMock('electron', () => ({ ipcMain }));
+    jest.doMock('electron-log', () => ({
+      info: jest.fn(),
+      debug: jest.fn(),
+      error: jest.fn(),
+    }));
+
+    const { setupNobleBleHandlers } = await import('../noble-ble-handler');
+    setupNobleBleHandlers({
+      on: jest.fn(),
+      send: jest.fn(),
+    } as unknown as WebContents);
+
+    const enumerate = handlers.get(EOneKeyBleMessageKeys.NOBLE_BLE_ENUMERATE);
+    if (!enumerate) {
+      throw new Error('Electron Noble BLE enumerate handler was not registered');
+    }
+
+    const devicesPromise = Promise.resolve(enumerate());
+    await scanStarted;
+    jest.advanceTimersByTime(5000);
+
+    await expect(devicesPromise).resolves.toEqual([
+      expect.objectContaining({
+        id: 'onekey-device',
+        name: 'Pro2 A1B2',
+      }),
+    ]);
+  });
 });

package/src/noble-ble-handler.ts

@@ -98,7 +98,7 @@ function isOneKeyPeripheral(peripheral: Peripheral) {
 
   // Noble localName is the current advertisement name, so reject the Pro2
   // Find My endpoint before the communication-service fast path accepts it.
-  if (isPro2FindMyAdvertisementName(localName)) {
+  if (!localName?.trim() || isPro2FindMyAdvertisementName(localName)) {
     return false;
   }