feat: support common-sdk webusb (#587)

* feat: support common-sdk webusb

* fix: delete unuse code

* chore: 1.1.16-alpha.2

* chore: lint

* fix: desktop-web-usb dispose

* fix: delete unuse code

* chore: fix dispose

* chore: 1.1.16-alpha.3

* feat: use skipWebDevicePrompt while firmware upgrade

* chore: 1.1.16-alpha.5

Author: wabicai

.github/workflows/build-example-desktop-mac.yml

@@ -26,6 +26,11 @@ jobs:
           yarn
           yarn bootstrap
 
+      - name: Build all packages
+        run: |
+          echo "🔨 Building all packages..."
+          yarn build
+
       - name: Build macOS App
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-example-desktop-win.yml

@@ -30,6 +30,11 @@ jobs:
           yarn
           yarn bootstrap
 
+      - name: Build all packages
+        run: |
+          echo "🔨 Building all packages..."
+          yarn build
+
       - name: Build Windows App
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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.4",
+  "version": "1.1.16-alpha.5",
   "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.4",
+    "@onekeyfe/hd-transport-electron": "1.1.16-alpha.5",
     "@stoprocent/noble": "2.3.4",
     "debug": "4.3.4",
     "electron-is-dev": "^3.0.1",

packages/connect-examples/electron-example/src/index.ts

@@ -195,7 +195,8 @@ function createMainWindow() {
     log.debug('WebUSB: select-usb-device 事件触发');
     log.debug('WebUSB: 可用设备列表:', JSON.stringify(details.deviceList, null, 2));
 
-    // 阻止默认行为，以便我们可以自定义设备选择
+    // 阻止默认行为，以便我们可以自动选择设备
+    // 这是 Electron 的优势：不像浏览器必须显示弹窗，桌面应用可以自动化处理
     event.preventDefault();
 
     // 直接选择第一个设备

packages/connect-examples/electron-example/webpack.config.ts

@@ -43,7 +43,8 @@ module.exports = {
   externals: [
     nodeExternals({
       allowlist: [
-        '@onekeyfe/hd-transport-electron',
+        // Include all @onekeyfe packages to handle transitive dependencies
+        /^@onekeyfe\//,
         ...Object.keys({
           ...pkg.dependencies,
           ...pkg.devDependencies,

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

@@ -16,9 +16,6 @@
       "fallbackToCacheTimeout": 0
     },
     "assetBundlePatterns": ["**/*"],
-    "headers": {
-      "Permissions-Policy": "usb=(self)"
-    },
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "com.onekey.dev.hardware.example"

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

@@ -1,6 +1,6 @@
 {
   "name": "expo-example",
-  "version": "1.1.16-alpha.4",
+  "version": "1.1.16-alpha.5",
   "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.4",
-    "@onekeyfe/hd-common-connect-sdk": "1.1.16-alpha.4",
-    "@onekeyfe/hd-core": "1.1.16-alpha.4",
-    "@onekeyfe/hd-web-sdk": "1.1.16-alpha.4",
+    "@onekeyfe/hd-ble-sdk": "1.1.16-alpha.5",
+    "@onekeyfe/hd-common-connect-sdk": "1.1.16-alpha.5",
+    "@onekeyfe/hd-core": "1.1.16-alpha.5",
+    "@onekeyfe/hd-web-sdk": "1.1.16-alpha.5",
     "@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-example/src/atoms/deviceConnectAtoms.ts

@@ -1,6 +1,5 @@
 import { atom } from 'jotai';
 
-// Connection type atom: 'bridge' | 'webusb' | 'emulator' | 'desktop-web-ble'
 export type ConnectionType = 'bridge' | 'webusb' | 'emulator' | 'desktop-web-ble';
 
 // Use plain atom - persistence will be handled manually

packages/connect-examples/expo-example/src/components/DeviceList.tsx

@@ -33,6 +33,21 @@ export type Device = {
 
 const CONNECTION_TYPE_STORE_KEY = '@onekey/connectionType';
 
+/**
+ * Determine if the connection type should use hd-common-connect-sdk
+ */
+const shouldUseCommonSdk = (connectionType: ConnectionType | null): boolean =>
+  connectionType === 'desktop-web-ble' || connectionType === 'webusb';
+
+/**
+ * Check if switching between connection types requires app restart
+ */
+const needsRestartForSwitch = (from: ConnectionType | null, to: ConnectionType | null): boolean => {
+  const fromUsesCommonSdk = shouldUseCommonSdk(from);
+  const toUsesCommonSdk = shouldUseCommonSdk(to);
+  return fromUsesCommonSdk !== toUsesCommonSdk;
+};
+
 const storeConnectionType = async (value: ConnectionType) => {
   try {
     await setItem(CONNECTION_TYPE_STORE_KEY, value);
@@ -161,14 +176,17 @@ function DeviceListFC(
         setConnectionType(value);
         await storeConnectionType(value);
 
-        // Restart desktop client when switching between desktop-web-ble and other modes
-        const needsRestart =
-          Platform.OS === 'web' &&
-          (previousConnectionType === 'desktop-web-ble' || value === 'desktop-web-ble') &&
-          previousConnectionType !== value;
+        // Restart desktop client when switching between different SDK types
+        // (e.g., bridge <-> webusb, bridge <-> desktop-web-ble, webusb <-> desktop-web-ble)
+        const shouldRestart =
+          Platform.OS === 'web' && needsRestartForSwitch(previousConnectionType, value);
 
         // @ts-expect-error
-        if (needsRestart && window.desktopApi?.restart) {
+        if (shouldRestart && window.desktopApi?.restart) {
+          console.log('Restarting app due to SDK type change:', {
+            from: previousConnectionType,
+            to: value,
+          });
           // @ts-expect-error
           window.desktopApi.restart();
           return; // Exit early as the app will restart

packages/connect-examples/expo-example/src/utils/hardwareInstance.ts

@@ -13,6 +13,31 @@ let initialized = false;
 
 const CONNECTION_TYPE_STORE_KEY = '@onekey/connectionType';
 
+/**
+ * Determine if the connection type should use hd-common-connect-sdk
+ */
+const shouldUseCommonSdk = (connectionType: ConnectionType | null): boolean =>
+  connectionType === 'desktop-web-ble' || connectionType === 'webusb';
+
+/**
+ * Map connection type to SDK env parameter
+ */
+const getSDKEnv = (
+  connectionType: ConnectionType | null
+): 'webusb' | 'emulator' | 'desktop-web-ble' | 'web' => {
+  switch (connectionType) {
+    case 'desktop-web-ble':
+      return 'desktop-web-ble';
+    case 'webusb':
+      return 'webusb';
+    case 'emulator':
+      return 'emulator';
+    case 'bridge':
+    default:
+      return 'web';
+  }
+};
+
 const getStoredConnectionType = async (): Promise<ConnectionType | null> => {
   try {
     const value = await getItem(CONNECTION_TYPE_STORE_KEY);
@@ -44,19 +69,24 @@ export const getHardwareSDKInstance = memoizee(
           fetchConfig: true,
         };
 
-        // Get stored connection type to determine useCommonSdk
+        // Get stored connection type to determine SDK type and transport
         const storedConnectionType = await getStoredConnectionType();
-        const isDesktopWebBleEnv = storedConnectionType === 'desktop-web-ble';
+        const useCommonSdk = shouldUseCommonSdk(storedConnectionType);
+
+        console.log('SDK Configuration: =====> ', {
+          connectionType: storedConnectionType,
+          useCommonSdk,
+          sdkEnv: getSDKEnv(storedConnectionType),
+        });
 
-        console.log('isDesktopWebBleEnv: =====> ', isDesktopWebBleEnv, storedConnectionType);
         HardwareSDK = await importSdk({
-          useCommonSdk: isDesktopWebBleEnv,
+          useCommonSdk,
         });
         console.log(HardwareSDK);
 
         if (Platform.OS === 'web') {
           settings.connectSrc = CONNECT_SRC;
-          settings.env = isDesktopWebBleEnv ? 'desktop-web-ble' : 'web';
+          settings.env = getSDKEnv(storedConnectionType);
           settings.preRelease = true;
           HardwareLowLevelSDK = await importLowLevelSDK();