fix: firmwareEmmcUpdate error (#598)

Author: wabicai

packages/connect-examples/electron-example/package.json

@@ -2,7 +2,7 @@
   "name": "hardware-example",
   "productName": "HardwareExample",
   "executableName": "onekey-hardware-example",
-  "version": "1.1.16-alpha.7",
+  "version": "1.1.16-alpha.8",
   "author": "OneKey",
   "description": "End-to-end encrypted workspaces for teams",
   "main": "dist/index.js",
@@ -22,7 +22,7 @@
     "ts:check": "yarn tsc --noEmit"
   },
   "dependencies": {
-    "@onekeyfe/hd-transport-electron": "1.1.16-alpha.7",
+    "@onekeyfe/hd-transport-electron": "1.1.16-alpha.8",
     "@stoprocent/noble": "2.3.4",
     "debug": "4.3.4",
     "electron-is-dev": "^3.0.1",

packages/connect-examples/expo-example/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-example",
-  "version": "1.1.16-alpha.7",
+  "version": "1.1.16-alpha.8",
   "scripts": {
     "start": "cross-env CONNECT_SRC=https://localhost:8087/ yarn expo start --dev-client",
     "android": "yarn expo run:android",
@@ -19,10 +19,10 @@
     "@noble/ed25519": "^2.1.0",
     "@noble/hashes": "^1.3.3",
     "@noble/secp256k1": "^1.7.1",
-    "@onekeyfe/hd-ble-sdk": "1.1.16-alpha.7",
-    "@onekeyfe/hd-common-connect-sdk": "1.1.16-alpha.7",
-    "@onekeyfe/hd-core": "1.1.16-alpha.7",
-    "@onekeyfe/hd-web-sdk": "1.1.16-alpha.7",
+    "@onekeyfe/hd-ble-sdk": "1.1.16-alpha.8",
+    "@onekeyfe/hd-common-connect-sdk": "1.1.16-alpha.8",
+    "@onekeyfe/hd-core": "1.1.16-alpha.8",
+    "@onekeyfe/hd-web-sdk": "1.1.16-alpha.8",
     "@onekeyfe/react-native-ble-utils": "^0.1.3",
     "@polkadot/util-crypto": "13.1.1",
     "@react-native-async-storage/async-storage": "1.21.0",

packages/connect-examples/expo-playground/ArchitectureDiagram.drawio

@@ -51,18 +51,17 @@ const initConfig: Partial<ConnectSettings> = {
   debug: true,
   fetchConfig: true,
   env: sdkEnv,
-  connectSrc: CONNECT_SRC,
 };
 ```
 
 ### 4. 初始化SDK
 ```typescript
 // 执行SDK初始化
-const res = await HardwareWebSdk.init(initConfig);
+const res = await HardwareCommonConnectSdk.init(initConfig);
 if (res === false) {
   throw new Error(t('sdk.initError'));
 }
-sdkInstance = HardwareWebSdk;
+sdkInstance = HardwareCommonConnectSdk;
 
 // 设置事件监听器
 setupSDKEventListeners(sdkInstance);

packages/connect-examples/expo-playground/app/components/providers/README.md

@@ -1,11 +1,8 @@
 import memoizee from 'memoizee';
 import { ConnectSettings, CoreApi } from '@onekeyfe/hd-core';
-import SDK from '@onekeyfe/hd-web-sdk';
-import { CONNECT_SRC } from '../constants/connect';
+import HardwareCommonConnectSdk from '@onekeyfe/hd-common-connect-sdk';
 import { logInfo, logError } from './logger';
 
-const { HardwareWebSdk } = SDK;
-
 let initialized = false;
 
 export type TransportType = 'webusb' | 'jsbridge' | 'emulator';
@@ -24,8 +21,8 @@ function getSDKEnv(transport: TransportType): ConnectSettings['env'] {
       return 'emulator';
     case 'webusb':
     default:
-      // 对于WebUSB，使用 'web' 环境配置，这与expo-example保持一致
-      return 'web';
+      // WebUSB 场景直接使用 common-connect-sdk 的 WebUSB 传输
+      return 'webusb';
   }
 }
 
@@ -36,7 +33,7 @@ export const getHardwareSDKInstance = memoizee(
       // 如果已经初始化且transport相同，直接返回
       if (initialized) {
         logInfo('SDK already initialized, returning cached instance');
-        return { HardwareSDK: HardwareWebSdk, initialized: true };
+        return { HardwareSDK: HardwareCommonConnectSdk, initialized: true };
       }
 
       logInfo(`Initializing SDK with transport: ${transport}`);
@@ -45,12 +42,11 @@ export const getHardwareSDKInstance = memoizee(
         debug: true,
         fetchConfig: true,
         env: getSDKEnv(transport),
-        connectSrc: CONNECT_SRC,
       };
 
       logInfo('SDK initialization settings:', settings as Record<string, unknown>);
 
-      const result = await HardwareWebSdk.init(settings);
+      const result = await HardwareCommonConnectSdk.init(settings);
 
       if (result === false) {
         throw new Error('SDK initialization returned false');
@@ -59,21 +55,8 @@ export const getHardwareSDKInstance = memoizee(
       initialized = true;
       logInfo('SDK initialized successfully');
 
-      return { HardwareSDK: HardwareWebSdk, initialized: true };
+      return { HardwareSDK: HardwareCommonConnectSdk, initialized: true };
     } catch (error) {
-      // 处理iframe已存在的情况
-      if (error && typeof error === 'object' && 'message' in error) {
-        const errorMessage = (error as Error).message || '';
-        if (
-          errorMessage.includes('IFrame alerady initialized') ||
-          errorMessage.includes('IFrame already initialized')
-        ) {
-          logInfo('SDK iframe already exists, using existing instance');
-          initialized = true;
-          return { HardwareSDK: HardwareWebSdk, initialized: true };
-        }
-      }
-
       logError('SDK initialization failed:', { error });
       throw error;
     }

packages/connect-examples/expo-playground/app/constants/connect.ts

@@ -1,14 +1,14 @@
 {
   "name": "onekey-hardware-playground",
-  "version": "1.1.16-alpha.7",
+  "version": "1.1.16-alpha.8",
   "private": true,
   "sideEffects": [
     "app/utils/shim.js",
     "app/i18n/config.ts",
     "**/*.css"
   ],
   "scripts": {
-    "dev": "cross-env CONNECT_SRC=https://localhost:8087/ webpack serve --mode=development --config webpack.config.js",
+    "dev": "webpack serve --mode=development --config webpack.config.js",
     "start": "webpack serve --mode=development --config webpack.config.js",
     "build": "webpack --mode=production --config webpack.config.js",
     "lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint --ignore-pattern 'dist/**' . ",
@@ -17,9 +17,9 @@
   },
   "dependencies": {
     "@noble/hashes": "^1.8.0",
-    "@onekeyfe/hd-core": "1.1.16-alpha.7",
-    "@onekeyfe/hd-shared": "1.1.16-alpha.7",
-    "@onekeyfe/hd-web-sdk": "1.1.16-alpha.7",
+    "@onekeyfe/hd-common-connect-sdk": "1.1.16-alpha.8",
+    "@onekeyfe/hd-core": "1.1.16-alpha.8",
+    "@onekeyfe/hd-shared": "1.1.16-alpha.8",
     "@radix-ui/react-checkbox": "^1.3.2",
     "@radix-ui/react-dialog": "^1.1.14",
     "@radix-ui/react-dropdown-menu": "^2.1.15",

packages/connect-examples/expo-playground/app/utils/hardwareInstance.ts

@@ -151,9 +151,6 @@ module.exports = async (env, argv) => {
         'process.env.NODE_ENV': JSON.stringify(isProduction ? 'production' : 'development'),
         'process.env.COMMIT_SHA': JSON.stringify(process.env.COMMIT_SHA || 'dev'),
         'process.env.BUILD_TIME': JSON.stringify(new Date().toISOString()),
-        ...(process.env.CONNECT_SRC !== undefined
-          ? { 'process.env.CONNECT_SRC': JSON.stringify(process.env.CONNECT_SRC) }
-          : {}),
       }),
     ],