hardware-example 1.0.32 → 1.0.34-alpha.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "hardware-example",
   "productName": "HardwareExample",
   "executableName": "onekey-hardware-example",
-  "version": "1.0.32",
+  "version": "1.0.34-alpha.0",
   "author": "OneKey",
   "description": "End-to-end encrypted workspaces for teams",
   "main": "dist/index.js",
@@ -37,5 +37,5 @@
     "webpack": "^5.90.2",
     "webpack-node-externals": "^3.0.0"
   },
-  "gitHead": "b84a301dc0cb1cb39a0b0c33536c21d8f2433755"
+  "gitHead": "a910879dea6198bd96016aec81429f31b9692bf1"
 }

package/src/config.ts

@@ -7,4 +7,6 @@ export const ipcMessageKeys = {
   APP_RELOAD_BRIDGE_PROCESS: 'app/reloadBridgeProcess',
 
   INJECT_ONEKEY_DESKTOP_GLOBALS: 'inject/onekeyDesktop',
+
+  APP_RESTART: 'app/restart',
 };

package/src/index.ts

@@ -1,18 +1,10 @@
-import {
-  screen,
-  app,
-  BrowserWindow,
-  session,
-  ipcMain,
-  USBDevice,
-  SerialPort,
-  HIDDevice,
-} from 'electron';
+import { screen, app, BrowserWindow, session, ipcMain } from 'electron';
 import path from 'path';
 import isDevelopment from 'electron-is-dev';
 import { format as formatUrl } from 'url';
 import log from 'electron-log';
 import { autoUpdater } from 'electron-updater';
+import { initElectronBleBridge } from '@onekeyfe/hd-transport-electron';
 import initProcess, { restartBridge } from './process';
 import { ipcMessageKeys } from './config';
 
@@ -88,6 +80,7 @@ function createMainWindow() {
       spellcheck: false,
       webviewTag: true,
       webSecurity: !isDevelopment,
+      // @ts-expect-error
       nativeWindowOpen: true,
       allowRunningInsecureContent: isDevelopment,
       // webview injected js needs isolation=false, because property can not be exposeInMainWorld() when isolation enabled.
@@ -263,6 +256,12 @@ function createMainWindow() {
     }
   });
 
+  initElectronBleBridge(browserWindow.webContents);
+
+  ipcMain.on(ipcMessageKeys.APP_RESTART, () => {
+    browserWindow?.reload();
+  });
+
   return browserWindow;
 }
 

package/src/preload.ts

@@ -1,16 +1,24 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unused-vars,@typescript-eslint/require-await */
-import { ipcRenderer, contextBridge } from 'electron';
-import { off } from 'process';
+import { ipcRenderer } from 'electron';
+import { EOneKeyBleMessageKeys } from '@onekeyfe/hd-shared';
+import type {
+  ElectronBleAPI,
+  BluetoothPairingDetails,
+  BluetoothPairingResponse,
+} from '@onekeyfe/hd-transport-electron';
 import { ipcMessageKeys } from './config';
 
 export type DesktopAPI = {
+  restart: () => void;
   reloadBridgeProcess: () => void;
 };
+
 declare global {
   interface Window {
     desktopApi: DesktopAPI;
     INJECT_PATH: string;
+    electronBleAPI: ElectronBleAPI;
   }
 }
 
@@ -32,12 +40,101 @@ const desktopApi = {
       ipcRenderer.on(channel, (_, ...args) => func(...args));
     }
   },
+  restart: () => {
+    ipcRenderer.send(ipcMessageKeys.APP_RESTART);
+  },
   updateReload: () => {
     ipcRenderer.send(ipcMessageKeys.UPDATE_RESTART);
   },
   reloadBridgeProcess: () => {
     ipcRenderer.send(ipcMessageKeys.APP_RELOAD_BRIDGE_PROCESS);
   },
+
+  // Bluetooth api
+  onBleSelect: (callback: (devices: Array<{ id: string; name: string }>) => void) => {
+    // console.log('[Preload] Setting up onBleSelect listener');
+    const subscription = (_: unknown, devices: Array<{ id: string; name: string }>) => {
+      // console.log('[Preload] Received devices in onBleSelect:', devices);
+      callback(devices);
+    };
+    ipcRenderer.on(EOneKeyBleMessageKeys.BLE_SELECT, subscription);
+    return () => {
+      // console.log('[Preload] Removing onBleSelect listener');
+      ipcRenderer.removeListener(EOneKeyBleMessageKeys.BLE_SELECT, subscription);
+    };
+  },
+  selectBleDevice: (deviceId: string) => {
+    // console.log('[Preload] Sending selectBleDevice:', deviceId);
+    ipcRenderer.send(EOneKeyBleMessageKeys.BLE_SELECT_RESULT, deviceId);
+  },
+  cancelBleRequest: () => {
+    // console.log('[Preload] Sending cancel-bluetooth-request');
+    ipcRenderer.send('cancel-bluetooth-request');
+  },
+
+  // 配对相关
+  onBlePairingRequest: (callback: (details: BluetoothPairingDetails) => void) => {
+    // console.log('[Preload] Setting up onBlePairingRequest listener');
+    const subscription = (_: unknown, details: BluetoothPairingDetails) => {
+      // console.log('[Preload] Received pairing request:', details);
+      callback(details);
+    };
+    ipcRenderer.on(EOneKeyBleMessageKeys.BLE_PAIRING_REQUEST, subscription);
+    return () => {
+      // console.log('[Preload] Removing onBlePairingRequest listener');
+      ipcRenderer.removeListener(EOneKeyBleMessageKeys.BLE_PAIRING_REQUEST, subscription);
+    };
+  },
+  respondToPairing: (response: BluetoothPairingResponse) => {
+    // console.log('[Preload] Sending pairing response:', response);
+    ipcRenderer.send(EOneKeyBleMessageKeys.BLE_PAIRING_RESPONSE, response);
+  },
+
+  // Add method to stop BLE scanning
+  stopBleScan: () => {
+    // console.log('[Preload] Sending stop BLE scan request');
+    ipcRenderer.send(EOneKeyBleMessageKeys.BLE_STOP_SCAN);
+  },
+
+  // 设备预选相关
+  preSelectDevice: (uuid: string) => {
+    // console.log('[Preload] Pre-selecting device:', uuid);
+    ipcRenderer.send(EOneKeyBleMessageKeys.BLE_PRE_SELECT, uuid);
+  },
+
+  clearPreSelect: () => {
+    // console.log('[Preload] Clearing pre-selected device');
+    ipcRenderer.send(EOneKeyBleMessageKeys.BLE_CLEAR_PRE_SELECT);
+  },
+
+  enumerate: () =>
+    new Promise(resolve => {
+      // 1. 监听结果
+      const handleResult = (_: any, devices: Array<{ id: string; name: string }>) => {
+        ipcRenderer.removeListener(EOneKeyBleMessageKeys.BLE_ENUMERATE_RESULT, handleResult);
+        resolve(devices);
+      };
+
+      // 2. 注册一次性监听
+      ipcRenderer.once(EOneKeyBleMessageKeys.BLE_ENUMERATE_RESULT, handleResult);
+
+      // 3. 发送枚举请求
+      ipcRenderer.send(EOneKeyBleMessageKeys.BLE_ENUMERATE);
+    }),
+
+  // 设备断开连接处理
+  onBleDeviceDisconnected: (callback: (device: { id: string; name: string | null }) => void) => {
+    // console.log('[Preload] Setting up onBleDeviceDisconnected listener');
+    const subscription = (_: unknown, device: { id: string; name: string | null }) => {
+      // console.log('[Preload] Device disconnected:', device);
+      callback(device);
+    };
+    ipcRenderer.on(EOneKeyBleMessageKeys.BLE_DEVICE_DISCONNECTED, subscription);
+    return () => {
+      // console.log('[Preload] Removing onBleDeviceDisconnected listener');
+      ipcRenderer.removeListener(EOneKeyBleMessageKeys.BLE_DEVICE_DISCONNECTED, subscription);
+    };
+  },
 };
 
 window.desktopApi = desktopApi;