@onekeyfe/hardware-cli 1.2.8-alpha.20 → 1.2.8-alpha.22

package/dist/cli.js

@@ -964,20 +964,12 @@ function getFirmwareUpdateV4TotalBytes(params) {
         params.se04Binary,
     ].reduce((total, binary) => total + (binary?.byteLength ?? 0), 0);
 }
-function getFirmwareUpdateV4ErrorText(result) {
+function isProtocolV2UsbProbeTransientResult(result) {
     if (!result || typeof result !== 'object')
-        return '';
+        return false;
     const { payload } = result;
-    if (!payload || typeof payload !== 'object')
-        return '';
-    const { error } = payload;
-    return typeof error === 'string' ? error : '';
-}
-function isProtocolV2UsbProbeTransientResult(result) {
-    const error = getFirmwareUpdateV4ErrorText(result);
-    return (error.includes('Device protocol mismatch') &&
-        error.includes('expected V2') &&
-        error.includes('did not respond to expected protocol'));
+    return (payload?.code === hd_shared_1.HardwareErrorCode.TransportProtocolProbeFailed &&
+        payload.params?.expectedProtocol === 'V2');
 }
 function isSuccessResult(result) {
     return (!!result && typeof result === 'object' && result.success === true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hardware-cli",
-  "version": "1.2.8-alpha.20",
+  "version": "1.2.8-alpha.22",
   "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.8-alpha.20",
-    "@onekeyfe/hd-core": "1.2.8-alpha.20",
-    "@onekeyfe/hd-shared": "1.2.8-alpha.20",
-    "@onekeyfe/hd-transport-usb": "1.2.8-alpha.20",
+    "@onekeyfe/hd-common-connect-sdk": "1.2.8-alpha.22",
+    "@onekeyfe/hd-core": "1.2.8-alpha.22",
+    "@onekeyfe/hd-shared": "1.2.8-alpha.22",
+    "@onekeyfe/hd-transport-usb": "1.2.8-alpha.22",
     "@stoprocent/noble": "2.3.16",
     "commander": "^12.0.0"
   },
-  "gitHead": "973f059fe93a58fdcf098ddb32ba63f621a2c78e"
+  "gitHead": "94bc5d4b79170d7113d26f0d5ad67e166538824d"
 }

package/src/__tests__/firmware-update-v4-command.test.ts

@@ -1,3 +1,5 @@
+import { HardwareErrorCode } from '@onekeyfe/hd-shared';
+
 import { createSDK, disposeSDK } from '../sdk';
 import { program, runFirmwareUpdateV4WithRetry } from '../cli';
 
@@ -9,7 +11,9 @@ jest.mock('../sdk', () => ({
 const transientProbeFailure = {
   success: false,
   payload: {
-    error: 'Device protocol mismatch: expected V2; device did not respond to expected protocol',
+    code: HardwareErrorCode.TransportProtocolProbeFailed,
+    error: 'probe diagnostic wording may change',
+    params: { expectedProtocol: 'V2' },
   },
 };
 

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, isSameOnekeyBleName } from '@onekeyfe/hd-shared';
+import { EDeviceType, HardwareErrorCode, isSameOnekeyBleName } from '@onekeyfe/hd-shared';
 
 import {
   resolveBatchGetAddress,
@@ -1259,20 +1259,14 @@ function getFirmwareUpdateV4TotalBytes(params: ReturnType<typeof buildFirmwareUp
   ].reduce((total, binary) => total + (binary?.byteLength ?? 0), 0);
 }
 
-function getFirmwareUpdateV4ErrorText(result: unknown) {
-  if (!result || typeof result !== 'object') return '';
-  const { payload } = result as { payload?: unknown };
-  if (!payload || typeof payload !== 'object') return '';
-  const { error } = payload as { error?: unknown };
-  return typeof error === 'string' ? error : '';
-}
-
 function isProtocolV2UsbProbeTransientResult(result: unknown) {
-  const error = getFirmwareUpdateV4ErrorText(result);
+  if (!result || typeof result !== 'object') return false;
+  const { payload } = result as {
+    payload?: { code?: unknown; params?: { expectedProtocol?: unknown } };
+  };
   return (
-    error.includes('Device protocol mismatch') &&
-    error.includes('expected V2') &&
-    error.includes('did not respond to expected protocol')
+    payload?.code === HardwareErrorCode.TransportProtocolProbeFailed &&
+    payload.params?.expectedProtocol === 'V2'
   );
 }