hardware-example 1.0.38-alpha.0 → 1.0.39-alpha.1

package/package.json

@@ -2,7 +2,7 @@
   "name": "hardware-example",
   "productName": "HardwareExample",
   "executableName": "onekey-hardware-example",
-  "version": "1.0.38-alpha.0",
+  "version": "1.0.39-alpha.1",
   "author": "OneKey",
   "description": "End-to-end encrypted workspaces for teams",
   "main": "dist/index.js",
@@ -20,7 +20,6 @@
     "ts:check": "yarn tsc --noEmit"
   },
   "dependencies": {
-    "@abandonware/noble": "^1.9.2-26",
     "debug": "4.3.4",
     "electron-is-dev": "^3.0.1",
     "electron-log": "^5.1.5",
@@ -38,8 +37,5 @@
     "webpack": "^5.90.2",
     "webpack-node-externals": "^3.0.0"
   },
-  "resolutions": {
-    "**/node-gyp": "^10.0.1"
-  },
-  "gitHead": "d33215ecb015dcaf397d2ad4787a641299932cf4"
+  "gitHead": "68ee1f51daddb1fed1193f60a584ccdc97339ce5"
 }

package/src/config.ts

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

package/src/index.ts

@@ -1,10 +1,18 @@
-import { screen, app, BrowserWindow, session, ipcMain } from 'electron';
+import {
+  screen,
+  app,
+  BrowserWindow,
+  session,
+  ipcMain,
+  USBDevice,
+  SerialPort,
+  HIDDevice,
+} 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 { initNobleBleSupport } from '@onekeyfe/hd-transport-electron';
 import initProcess, { restartBridge } from './process';
 import { ipcMessageKeys } from './config';
 
@@ -80,7 +88,6 @@ 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.
@@ -256,12 +263,6 @@ function createMainWindow() {
     }
   });
 
-  initNobleBleSupport(browserWindow.webContents);
-
-  ipcMain.on(ipcMessageKeys.APP_RESTART, () => {
-    browserWindow?.reload();
-  });
-
   return browserWindow;
 }
 

package/src/preload.ts

@@ -1,24 +1,12 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unused-vars,@typescript-eslint/require-await */
 import { ipcRenderer, contextBridge } from 'electron';
-import { EOneKeyBleMessageKeys } from '@onekeyfe/hd-shared';
-import type { DesktopAPI as BaseDesktopAPI, NobleBleAPI } from '@onekeyfe/hd-transport-electron';
+import { off } from 'process';
 import { ipcMessageKeys } from './config';
 
-// Extend the base DesktopAPI with this specific application's needs
-export interface DesktopAPI extends BaseDesktopAPI {
-  restart: () => void;
+export type DesktopAPI = {
   reloadBridgeProcess: () => void;
-
-  // Generic IPC methods
-  invoke: (channel: string, ...args: any[]) => Promise<any>;
-  on: (channel: string, callback: (...args: any[]) => void) => () => void;
-  off?: (channel: string, callback?: (...args: any[]) => void) => void;
-
-  // Make nobleBle required for this app
-  nobleBle: NobleBleAPI;
-}
-
+};
 declare global {
   interface Window {
     desktopApi: DesktopAPI;
@@ -33,30 +21,16 @@ const validChannels = [
 ];
 
 ipcRenderer.on(ipcMessageKeys.INJECT_ONEKEY_DESKTOP_GLOBALS, (_, globals) => {
-  try {
-    contextBridge.exposeInMainWorld('ONEKEY_DESKTOP_GLOBALS', globals);
-  } catch (error) {
-    // Fallback for development or when contextBridge is not available
-    console.warn('Failed to expose ONEKEY_DESKTOP_GLOBALS via contextBridge:', error);
-  }
+  // @ts-expect-error
+  window.ONEKEY_DESKTOP_GLOBALS = globals;
+  // contextBridge.exposeInMainWorld('ONEKEY_DESKTOP_GLOBALS', globals);
 });
 
 const desktopApi = {
-  // Generic IPC methods
-  invoke: (channel: string, ...args: any[]) => ipcRenderer.invoke(channel, ...args),
   on: (channel: string, func: (...args: any[]) => any) => {
     if (validChannels.includes(channel)) {
       ipcRenderer.on(channel, (_, ...args) => func(...args));
     }
-    // For other channels, set up listener and return cleanup function
-    const listener = (_: any, ...args: any[]) => func(...args);
-    ipcRenderer.on(channel, listener);
-    return () => {
-      ipcRenderer.removeListener(channel, listener);
-    };
-  },
-  restart: () => {
-    ipcRenderer.send(ipcMessageKeys.APP_RESTART);
   },
   updateReload: () => {
     ipcRenderer.send(ipcMessageKeys.UPDATE_RESTART);
@@ -64,47 +38,7 @@ const desktopApi = {
   reloadBridgeProcess: () => {
     ipcRenderer.send(ipcMessageKeys.APP_RELOAD_BRIDGE_PROCESS);
   },
-
-  // Noble BLE specific methods
-  nobleBle: {
-    enumerate: () => ipcRenderer.invoke(EOneKeyBleMessageKeys.NOBLE_BLE_ENUMERATE),
-    getDevice: (uuid: string) =>
-      ipcRenderer.invoke(EOneKeyBleMessageKeys.NOBLE_BLE_GET_DEVICE, uuid),
-    connect: (uuid: string) => ipcRenderer.invoke(EOneKeyBleMessageKeys.NOBLE_BLE_CONNECT, uuid),
-    disconnect: (uuid: string) =>
-      ipcRenderer.invoke(EOneKeyBleMessageKeys.NOBLE_BLE_DISCONNECT, uuid),
-    subscribe: (uuid: string) =>
-      ipcRenderer.invoke(EOneKeyBleMessageKeys.NOBLE_BLE_SUBSCRIBE, uuid),
-    unsubscribe: (uuid: string) =>
-      ipcRenderer.invoke(EOneKeyBleMessageKeys.NOBLE_BLE_UNSUBSCRIBE, uuid),
-    write: (uuid: string, data: string) =>
-      ipcRenderer.invoke(EOneKeyBleMessageKeys.NOBLE_BLE_WRITE, uuid, data),
-    onNotification: (callback: (deviceId: string, data: string) => void) => {
-      const subscription = (_: unknown, deviceId: string, data: string) => {
-        callback(deviceId, data);
-      };
-      ipcRenderer.on(EOneKeyBleMessageKeys.NOBLE_BLE_NOTIFICATION, subscription);
-      return () => {
-        ipcRenderer.removeListener(EOneKeyBleMessageKeys.NOBLE_BLE_NOTIFICATION, subscription);
-      };
-    },
-    onDeviceDisconnected: (callback: (device: { id: string; name: string }) => void) => {
-      const subscription = (_: unknown, device: { id: string; name: string }) => {
-        callback(device);
-      };
-      ipcRenderer.on(EOneKeyBleMessageKeys.BLE_DEVICE_DISCONNECTED, subscription);
-      return () => {
-        ipcRenderer.removeListener(EOneKeyBleMessageKeys.BLE_DEVICE_DISCONNECTED, subscription);
-      };
-    },
-  },
 };
 
-// Use contextBridge to safely expose the API
-try {
-  contextBridge.exposeInMainWorld('desktopApi', desktopApi);
-} catch (error) {
-  // Fallback for development or when contextBridge is not available
-  console.warn('Failed to expose desktopApi via contextBridge:', error);
-  (window as any).desktopApi = desktopApi;
-}
+window.desktopApi = desktopApi;
+// contextBridge.exposeInMainWorld('desktopApi', desktopApi);

package/webpack.config.ts

@@ -47,12 +47,6 @@ module.exports = {
         ...pkg.devDependencies,
       }),
     }),
-    {
-      '@abandonware/noble': 'commonjs @abandonware/noble',
-      '@abandonware/bluetooth-hci-socket': 'commonjs @abandonware/bluetooth-hci-socket',
-      bufferutil: 'commonjs bufferutil',
-      'utf-8-validate': 'commonjs utf-8-validate',
-    },
   ],
   output: {
     path: path.resolve(__dirname, 'dist'),