@onekeyfe/hardware-cli 1.2.0-alpha.34 → 1.2.0-alpha.35

package/dist/cli.js

@@ -633,7 +633,14 @@ sessionCmd
         });
         return;
     }
-    const device = searchResult.payload[0];
+    const device = (0, deviceSelection_1.selectSearchDevice)(searchResult.payload, globalOpts.connectId);
+    if (!device) {
+        outputResult(globalOpts, {
+            success: false,
+            payload: { error: 'No matching device found', code: 'NO_DEVICE' },
+        });
+        return;
+    }
     const connectId = device.connectId || globalOpts.connectId;
     // 2. Unlock if locked — getPassphraseState below talks to a live
     // device session, which a locked device will reject with an obscure
@@ -678,8 +685,7 @@ sessionCmd
     .description('Clear cached device session')
     .action(() => runCommand({}, async ({ sdk, globalOpts }) => {
     const searchResult = await sdk.searchDevices();
-    const device = // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-     searchResult?.payload?.[0];
+    const device = (0, deviceSelection_1.selectSearchDevice)(searchResult?.payload ?? [], globalOpts.connectId);
     const deviceId = device?.deviceId || device?.features?.device_id;
     if (deviceId) {
         await (0, session_1.clearSessionFromKeychain)(deviceId);

package/dist/deviceSelection.d.ts

@@ -1,3 +1,3 @@
 export declare function selectSearchDevice<T extends {
-    connectId?: string;
+    connectId?: string | null;
 }>(devices: T[], preferredConnectId?: string): T | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hardware-cli",
-  "version": "1.2.0-alpha.34",
+  "version": "1.2.0-alpha.35",
   "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.34",
-    "@onekeyfe/hd-core": "1.2.0-alpha.34",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.34",
-    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.34",
+    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.35",
+    "@onekeyfe/hd-core": "1.2.0-alpha.35",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.35",
+    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.35",
     "@stoprocent/noble": "2.3.16",
     "commander": "^12.0.0"
   },
-  "gitHead": "07f10b4c9fab177da7c36d976ec18b075492b57f"
+  "gitHead": "638bd33030686c4a3321e4feb4924c3f9f5c81a8"
 }

package/src/cli.ts

@@ -808,7 +808,17 @@ sessionCmd
         });
         return;
       }
-      const device = searchResult.payload[0] as SearchDevice & { features?: Features };
+      const device = selectSearchDevice(
+        searchResult.payload as Array<SearchDevice & { features?: Features }>,
+        globalOpts.connectId
+      );
+      if (!device) {
+        outputResult(globalOpts, {
+          success: false,
+          payload: { error: 'No matching device found', code: 'NO_DEVICE' },
+        });
+        return;
+      }
       const connectId = device.connectId || globalOpts.connectId;
 
       // 2. Unlock if locked — getPassphraseState below talks to a live
@@ -860,8 +870,10 @@ sessionCmd
   .action(() =>
     runCommand({}, async ({ sdk, globalOpts }) => {
       const searchResult = await sdk.searchDevices();
-      const device = // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-        (searchResult?.payload as any)?.[0];
+      const device = selectSearchDevice(
+        (searchResult?.payload as Array<SearchDevice & { features?: Features }>) ?? [],
+        globalOpts.connectId
+      );
       const deviceId = device?.deviceId || device?.features?.device_id;
       if (deviceId) {
         await clearSessionFromKeychain(deviceId);

package/src/deviceSelection.ts

@@ -1,4 +1,4 @@
-export function selectSearchDevice<T extends { connectId?: string }>(
+export function selectSearchDevice<T extends { connectId?: string | null }>(
   devices: T[],
   preferredConnectId?: string
 ): T | undefined {