@onekeyfe/hardware-cli 1.2.0-alpha.0 → 1.2.0-alpha.2

package/dist/cli.js

@@ -59,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;
                         if (devType) {
                             device.deviceType = devType;
                         }
@@ -592,8 +592,8 @@ sessionCmd
         skipPassphraseCheck: true,
     });
     const featPayload = featResult?.success ? featResult.payload : undefined;
-    const deviceId = featPayload?.device_id || device.deviceId || '';
-    const sessionId = passphraseSessionId || 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);
@@ -723,18 +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 {
@@ -750,9 +750,9 @@ 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;
@@ -793,7 +793,7 @@ globalOpts) {
                 passphraseState,
                 skipPassphraseCheck: true,
             });
-            const sessionId = passphraseSessionId || (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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hardware-cli",
-  "version": "1.2.0-alpha.0",
+  "version": "1.2.0-alpha.2",
   "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.2.0-alpha.0",
-    "@onekeyfe/hd-core": "1.2.0-alpha.0",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.0",
-    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.0",
+    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.2",
+    "@onekeyfe/hd-core": "1.2.0-alpha.2",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.2",
+    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.2",
     "commander": "^12.0.0"
   },
-  "gitHead": "de9efe20b83666b641ab9e8d945e6350f6450904"
+  "gitHead": "6c183b7f7027f4b4d3db4f427f6360351a6c6680"
 }

package/src/cli.ts

@@ -100,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;
                 if (devType) {
                   device.deviceType = devType as IDeviceType;
                 }
@@ -757,8 +757,8 @@ sessionCmd
         skipPassphraseCheck: true,
       });
       const featPayload = featResult?.success ? featResult.payload : undefined;
-      const deviceId = featPayload?.device_id || device.deviceId || '';
-      const sessionId = passphraseSessionId || featPayload?.session_id || '';
+      const deviceId = featPayload?.deviceId || device.deviceId || '';
+      const sessionId = passphraseSessionId || featPayload?.sessionId || '';
 
       // 6. Save to keychain
       if (passphraseState && deviceId && sessionId) {
@@ -910,17 +910,7 @@ async function prepareSession(
     return undefined;
   }
 
-  const device = searchResult.payload[0] as {
-    connectId?: string;
-    deviceId?: string;
-    features?: {
-      device_id?: string;
-      onekey_device_type?: string;
-      session_id?: string;
-      passphrase_protection?: boolean | null;
-      unlocked?: boolean | null;
-    };
-  };
+  const device = searchResult.payload[0] as EnrichedSearchDevice;
   const connectId = device.connectId || globalOpts.connectId || '';
   if (!globalOpts.connectId && connectId) {
     globalOpts.connectId = connectId;
@@ -929,19 +919,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 */
@@ -957,9 +947,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) {
@@ -1009,7 +999,7 @@ async function prepareSession(
         skipPassphraseCheck: true,
       });
       const sessionId =
-        passphraseSessionId || (featAfter?.success ? featAfter.payload?.session_id : undefined);
+        passphraseSessionId || (featAfter?.success ? featAfter.payload?.sessionId : undefined);
       if (sessionId) {
         await saveSessionToKeychain(deviceId, passphraseState, sessionId);
         await preloadSessionFromKeychain(deviceId);