@onekeyfe/hardware-cli 1.1.28 → 1.2.0-alpha.1

package/dist/cli.js

@@ -5,6 +5,32 @@ const commander_1 = require("commander");
 const sdk_1 = require("./sdk");
 const session_1 = require("./session");
 const chains_1 = require("./chains");
+const hd_shared_1 = require("@onekeyfe/hd-shared");
+const hd_core_1 = require("@onekeyfe/hd-core");
+function extractPassphraseSession(payload) {
+    if (typeof payload === 'string') {
+        return { passphraseState: payload };
+    }
+    if (!payload || typeof payload !== 'object') {
+        return {};
+    }
+    const statePayload = payload;
+    let passphraseState;
+    if (typeof statePayload.passphrase_state === 'string') {
+        passphraseState = statePayload.passphrase_state;
+    }
+    else if (typeof statePayload.passphraseState === 'string') {
+        passphraseState = statePayload.passphraseState;
+    }
+    let sessionId;
+    if (typeof statePayload.session_id === 'string') {
+        sessionId = statePayload.session_id;
+    }
+    else if (typeof statePayload.sessionId === 'string') {
+        sessionId = statePayload.sessionId;
+    }
+    return { passphraseState, sessionId };
+}
 const program = new commander_1.Command();
 program
     .name('onekey-hw')
@@ -33,8 +59,8 @@ program
                     const features = await sdk.getFeatures(device.connectId);
                     if (features?.success && features.payload) {
                         device.features = features.payload;
-                        device.name = features.payload.label || features.payload.ble_name || device.name;
-                        const devType = features.payload.onekey_device_type?.toLowerCase();
+                        device.name = features.payload.label || features.payload.bleName || device.name;
+                        const devType = features.payload.deviceType?.toLowerCase();
                         if (devType) {
                             device.deviceType = devType;
                         }
@@ -537,7 +563,14 @@ sessionCmd
         outputResult(globalOpts, psResult);
         return;
     }
-    const passphraseState = psResult.payload;
+    const { passphraseState, sessionId: passphraseSessionId } = extractPassphraseSession(psResult.payload);
+    if (!passphraseState) {
+        outputResult(globalOpts, {
+            success: false,
+            payload: { error: 'getPassphraseState did not return passphraseState' },
+        });
+        return;
+    }
     // 4. Get address to verify + extract deviceId
     const addrResult = await sdk.evmGetAddress(connectId, device.deviceId || '', {
         path: "m/44'/60'/0'/0/0",
@@ -559,8 +592,8 @@ sessionCmd
         skipPassphraseCheck: true,
     });
     const featPayload = featResult?.success ? featResult.payload : undefined;
-    const deviceId = featPayload?.device_id || device.deviceId || '';
-    const sessionId = featPayload?.session_id || '';
+    const deviceId = featPayload?.deviceId || device.deviceId || '';
+    const sessionId = passphraseSessionId || featPayload?.sessionId || '';
     // 6. Save to keychain
     if (passphraseState && deviceId && sessionId) {
         await (0, session_1.saveSessionToKeychain)(deviceId, passphraseState, sessionId);
@@ -582,7 +615,7 @@ sessionCmd
     const searchResult = await sdk.searchDevices();
     const device = // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
      searchResult?.payload?.[0];
-    const deviceId = device?.features?.device_id || device?.deviceId;
+    const deviceId = device?.deviceId || device?.features?.device_id;
     if (deviceId) {
         await (0, session_1.clearSessionFromKeychain)(deviceId);
     }
@@ -690,16 +723,18 @@ globalOpts) {
     // ── Step 2: Get features if searchDevices didn't populate them ──
     // getFeatures failures here are non-fatal — we fall through to Step 3
     // which will fail with a clearer error if the device is truly unreachable.
-    let deviceId = device.features?.device_id || device.deviceId || '';
+    let deviceId = device.features?.deviceId || device.deviceId || '';
+    let deviceType = (0, hd_core_1.getDeviceType)(device.features);
     let unlocked = device.features?.unlocked;
-    let passphraseProtection = device.features?.passphrase_protection;
+    let passphraseProtection = device.features?.passphraseProtection;
     if (!deviceId || unlocked == null || passphraseProtection == null) {
         try {
             const featResult = await sdk.getFeatures(connectId);
             if (featResult?.success && featResult.payload) {
-                deviceId = featResult.payload.device_id || deviceId;
+                deviceId = featResult.payload.deviceId || deviceId;
+                deviceType = (0, hd_core_1.getDeviceType)(featResult.payload) || deviceType;
                 unlocked = featResult.payload.unlocked;
-                passphraseProtection = featResult.payload.passphrase_protection;
+                passphraseProtection = featResult.payload.passphraseProtection;
             }
         }
         catch {
@@ -715,15 +750,15 @@ globalOpts) {
     if (wasLocked) {
         process.stderr.write('[onekey-hw] Device is locked. Unlocking (PIN required)...\n');
         const { payload: feat } = await unlockWithRetry(sdk, connectId);
-        deviceId = feat.device_id || deviceId;
+        deviceId = feat.deviceId || deviceId;
         unlocked = feat.unlocked;
-        passphraseProtection = feat.passphrase_protection;
+        passphraseProtection = feat.passphraseProtection;
     }
     if (!globalOpts.deviceId && deviceId) {
         globalOpts.deviceId = deviceId;
     }
     // ── Step 4: Check passphrase protection ──────────────────────────
-    if (passphraseProtection === false) {
+    if (passphraseProtection === false && deviceType !== hd_shared_1.EDeviceType.Pro2) {
         return undefined;
     }
     // ── Step 5: Try keychain session reuse ───────────────────────────
@@ -742,7 +777,10 @@ globalOpts) {
         useEmptyPassphrase: false,
     });
     if (psResult.success && psResult.payload) {
-        const passphraseState = psResult.payload;
+        const { passphraseState, sessionId: passphraseSessionId } = extractPassphraseSession(psResult.payload);
+        if (!passphraseState) {
+            return undefined;
+        }
         globalOpts.passphraseState = passphraseState;
         // Save session to keychain for next invocation.
         //
@@ -755,7 +793,7 @@ globalOpts) {
                 passphraseState,
                 skipPassphraseCheck: true,
             });
-            const sessionId = featAfter?.success ? featAfter.payload?.session_id : undefined;
+            const sessionId = passphraseSessionId || (featAfter?.success ? featAfter.payload?.sessionId : undefined);
             if (sessionId) {
                 await (0, session_1.saveSessionToKeychain)(deviceId, passphraseState, sessionId);
                 await (0, session_1.preloadSessionFromKeychain)(deviceId);

package/jest.config.js

@@ -1,4 +1,5 @@
 module.exports = {
   preset: '../../jest.config.js',
   testEnvironment: 'node',
+  modulePathIgnorePatterns: ['node_modules', '<rootDir>/dist'],
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hardware-cli",
-  "version": "1.1.28",
+  "version": "1.2.0-alpha.1",
   "description": "OneKey hardware wallet CLI for testing device communication",
   "author": "OneKey",
   "license": "Apache-2.0",
@@ -30,11 +30,11 @@
     "test": "jest"
   },
   "dependencies": {
-    "@onekeyfe/hd-common-connect-sdk": "1.1.28",
-    "@onekeyfe/hd-core": "1.1.28",
-    "@onekeyfe/hd-shared": "1.1.28",
-    "@onekeyfe/hd-transport-usb": "1.1.28",
+    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.1",
+    "@onekeyfe/hd-core": "1.2.0-alpha.1",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.1",
+    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.1",
     "commander": "^12.0.0"
   },
-  "gitHead": "9cfd4f7f00a2b7317325161d666a7b0173345995"
+  "gitHead": "4f4aae3a47be7bd54b4db4a10c400056784e01bd"
 }

package/src/cli.ts

@@ -14,6 +14,8 @@ import {
   resolveSignTransaction,
 } from './chains';
 
+import { EDeviceType } from '@onekeyfe/hd-shared';
+import { getDeviceType } from '@onekeyfe/hd-core';
 import type {
   EthereumSignTypedDataMessage,
   EthereumSignTypedDataTypes,
@@ -25,6 +27,41 @@ import type {
 /** SearchDevice enriched with features fetched after discovery */
 type EnrichedSearchDevice = SearchDevice & { features?: Features };
 
+function extractPassphraseSession(payload: unknown): {
+  passphraseState?: string;
+  sessionId?: string;
+} {
+  if (typeof payload === 'string') {
+    return { passphraseState: payload };
+  }
+  if (!payload || typeof payload !== 'object') {
+    return {};
+  }
+
+  const statePayload = payload as {
+    passphrase_state?: unknown;
+    passphraseState?: unknown;
+    session_id?: unknown;
+    sessionId?: unknown;
+  };
+
+  let passphraseState: string | undefined;
+  if (typeof statePayload.passphrase_state === 'string') {
+    passphraseState = statePayload.passphrase_state;
+  } else if (typeof statePayload.passphraseState === 'string') {
+    passphraseState = statePayload.passphraseState;
+  }
+
+  let sessionId: string | undefined;
+  if (typeof statePayload.session_id === 'string') {
+    sessionId = statePayload.session_id;
+  } else if (typeof statePayload.sessionId === 'string') {
+    sessionId = statePayload.sessionId;
+  }
+
+  return { passphraseState, sessionId };
+}
+
 const program = new Command();
 
 program
@@ -63,8 +100,8 @@ program
               const features = await sdk.getFeatures(device.connectId);
               if (features?.success && features.payload) {
                 device.features = features.payload;
-                device.name = features.payload.label || features.payload.ble_name || device.name;
-                const devType = features.payload.onekey_device_type?.toLowerCase();
+                device.name = features.payload.label || features.payload.bleName || device.name;
+                const devType = features.payload.deviceType?.toLowerCase();
                 if (devType) {
                   device.deviceType = devType as IDeviceType;
                 }
@@ -687,7 +724,16 @@ sessionCmd
         outputResult(globalOpts, psResult);
         return;
       }
-      const passphraseState = psResult.payload;
+      const { passphraseState, sessionId: passphraseSessionId } = extractPassphraseSession(
+        psResult.payload
+      );
+      if (!passphraseState) {
+        outputResult(globalOpts, {
+          success: false,
+          payload: { error: 'getPassphraseState did not return passphraseState' },
+        });
+        return;
+      }
 
       // 4. Get address to verify + extract deviceId
       const addrResult = await sdk.evmGetAddress(connectId, device.deviceId || '', {
@@ -711,8 +757,8 @@ sessionCmd
         skipPassphraseCheck: true,
       });
       const featPayload = featResult?.success ? featResult.payload : undefined;
-      const deviceId = featPayload?.device_id || device.deviceId || '';
-      const sessionId = featPayload?.session_id || '';
+      const deviceId = featPayload?.deviceId || device.deviceId || '';
+      const sessionId = passphraseSessionId || featPayload?.sessionId || '';
 
       // 6. Save to keychain
       if (passphraseState && deviceId && sessionId) {
@@ -739,7 +785,7 @@ sessionCmd
       const searchResult = await sdk.searchDevices();
       const device = // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
         (searchResult?.payload as any)?.[0];
-      const deviceId = device?.features?.device_id || device?.deviceId;
+      const deviceId = device?.deviceId || device?.features?.device_id;
       if (deviceId) {
         await clearSessionFromKeychain(deviceId);
       }
@@ -868,9 +914,10 @@ async function prepareSession(
     connectId?: string;
     deviceId?: string;
     features?: {
-      device_id?: string;
-      session_id?: string;
-      passphrase_protection?: boolean | null;
+      deviceId?: string | null;
+      deviceType?: string;
+      sessionId?: string | null;
+      passphraseProtection?: boolean | null;
       unlocked?: boolean | null;
     };
   };
@@ -882,17 +929,19 @@ async function prepareSession(
   // ── Step 2: Get features if searchDevices didn't populate them ──
   // getFeatures failures here are non-fatal — we fall through to Step 3
   // which will fail with a clearer error if the device is truly unreachable.
-  let deviceId = device.features?.device_id || device.deviceId || '';
+  let deviceId = device.features?.deviceId || device.deviceId || '';
+  let deviceType = getDeviceType(device.features as Features | undefined);
   let unlocked = device.features?.unlocked;
-  let passphraseProtection = device.features?.passphrase_protection;
+  let passphraseProtection = device.features?.passphraseProtection;
 
   if (!deviceId || unlocked == null || passphraseProtection == null) {
     try {
       const featResult = await sdk.getFeatures(connectId);
       if (featResult?.success && featResult.payload) {
-        deviceId = featResult.payload.device_id || deviceId;
+        deviceId = featResult.payload.deviceId || deviceId;
+        deviceType = getDeviceType(featResult.payload) || deviceType;
         unlocked = featResult.payload.unlocked;
-        passphraseProtection = featResult.payload.passphrase_protection;
+        passphraseProtection = featResult.payload.passphraseProtection;
       }
     } catch {
       /* non-fatal — Step 3 will surface a clear error if device is gone */
@@ -908,9 +957,9 @@ async function prepareSession(
   if (wasLocked) {
     process.stderr.write('[onekey-hw] Device is locked. Unlocking (PIN required)...\n');
     const { payload: feat } = await unlockWithRetry(sdk, connectId);
-    deviceId = feat.device_id || deviceId;
+    deviceId = feat.deviceId || deviceId;
     unlocked = feat.unlocked;
-    passphraseProtection = feat.passphrase_protection;
+    passphraseProtection = feat.passphraseProtection;
   }
 
   if (!globalOpts.deviceId && deviceId) {
@@ -918,7 +967,7 @@ async function prepareSession(
   }
 
   // ── Step 4: Check passphrase protection ──────────────────────────
-  if (passphraseProtection === false) {
+  if (passphraseProtection === false && deviceType !== EDeviceType.Pro2) {
     return undefined;
   }
 
@@ -940,7 +989,12 @@ async function prepareSession(
   });
 
   if (psResult.success && psResult.payload) {
-    const passphraseState = psResult.payload;
+    const { passphraseState, sessionId: passphraseSessionId } = extractPassphraseSession(
+      psResult.payload
+    );
+    if (!passphraseState) {
+      return undefined;
+    }
     globalOpts.passphraseState = passphraseState;
 
     // Save session to keychain for next invocation.
@@ -954,7 +1008,8 @@ async function prepareSession(
         passphraseState,
         skipPassphraseCheck: true,
       });
-      const sessionId = featAfter?.success ? featAfter.payload?.session_id : undefined;
+      const sessionId =
+        passphraseSessionId || (featAfter?.success ? featAfter.payload?.sessionId : undefined);
       if (sessionId) {
         await saveSessionToKeychain(deviceId, passphraseState, sessionId);
         await preloadSessionFromKeychain(deviceId);