@onekeyfe/hardware-cli 1.2.0-alpha.157 → 1.2.0-alpha.159

package/dist/cli.js

@@ -932,17 +932,18 @@ async function resolveLegacyFirmwareConnectId(sdk, explicitConnectId, deviceName
         throw new Error('Unable to scan BLE devices');
     }
     const devices = searchResult.payload;
-    const normalizedName = deviceName?.trim().toLowerCase();
-    const matches = normalizedName
-        ? devices.filter(device => device.name?.trim().toLowerCase() === normalizedName)
+    const requestedName = deviceName?.trim();
+    const matches = requestedName
+        ? devices.filter(device => (0, hd_shared_1.isSameOnekeyBleName)(device.name, requestedName) ||
+            device.name?.trim().toLowerCase() === requestedName.toLowerCase())
         : devices.filter(device => device.deviceType?.toLowerCase() === 'classic');
     if (matches.length === 0) {
-        throw new Error(normalizedName
+        throw new Error(requestedName
             ? `BLE device not found by name: ${deviceName}`
             : 'No Classic/Pure BLE device found');
     }
     if (matches.length > 1) {
-        throw new Error(normalizedName
+        throw new Error(requestedName
             ? `Multiple BLE devices found by name: ${deviceName}`
             : 'Multiple Classic/Pure BLE devices found; specify --device-name');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hardware-cli",
-  "version": "1.2.0-alpha.157",
+  "version": "1.2.0-alpha.159",
   "description": "OneKey hardware wallet CLI for testing device communication",
   "author": "OneKey",
   "license": "Apache-2.0",
@@ -31,12 +31,12 @@
     "test": "jest"
   },
   "dependencies": {
-    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.157",
-    "@onekeyfe/hd-core": "1.2.0-alpha.157",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.157",
-    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.157",
+    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.159",
+    "@onekeyfe/hd-core": "1.2.0-alpha.159",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.159",
+    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.159",
     "@stoprocent/noble": "2.3.16",
     "commander": "^12.0.0"
   },
-  "gitHead": "1e9aaf5fbf64562504ebc22dc34fb22220ba0b0b"
+  "gitHead": "302f9ff916b3769cdb0cf79d58d09a87eeac68c2"
 }

package/src/cli.ts

@@ -2,7 +2,7 @@ import { readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { Command } from 'commander';
 import { UI_EVENT, UI_REQUEST, getDeviceType } from '@onekeyfe/hd-core';
-import { EDeviceType } from '@onekeyfe/hd-shared';
+import { EDeviceType, isSameOnekeyBleName } from '@onekeyfe/hd-shared';
 
 import {
   resolveBatchGetAddress,
@@ -1217,21 +1217,25 @@ async function resolveLegacyFirmwareConnectId(
   }
 
   const devices = searchResult.payload as EnrichedSearchDevice[];
-  const normalizedName = deviceName?.trim().toLowerCase();
-  const matches = normalizedName
-    ? devices.filter(device => device.name?.trim().toLowerCase() === normalizedName)
+  const requestedName = deviceName?.trim();
+  const matches = requestedName
+    ? devices.filter(
+        device =>
+          isSameOnekeyBleName(device.name, requestedName) ||
+          device.name?.trim().toLowerCase() === requestedName.toLowerCase()
+      )
     : devices.filter(device => device.deviceType?.toLowerCase() === 'classic');
 
   if (matches.length === 0) {
     throw new Error(
-      normalizedName
+      requestedName
         ? `BLE device not found by name: ${deviceName}`
         : 'No Classic/Pure BLE device found'
     );
   }
   if (matches.length > 1) {
     throw new Error(
-      normalizedName
+      requestedName
         ? `Multiple BLE devices found by name: ${deviceName}`
         : 'Multiple Classic/Pure BLE devices found; specify --device-name'
     );