hardware-example 1.1.11-alpha.1 → 1.1.11-alpha.2

package/electron-builder.config.js

@@ -11,6 +11,11 @@ module.exports = {
   productName: 'HardwareExample',
   copyright: 'Copyright © OeKey 2024',
   asar: true,
+  // Unpack native modules so they can be loaded at runtime
+  asarUnpack: [
+    'node_modules/@stoprocent/noble/**',
+    'node_modules/@stoprocent/bluetooth-hci-socket/**',
+  ],
   buildVersion: version,
   directories: {
     output: 'out',

package/package.json

@@ -2,7 +2,7 @@
   "name": "hardware-example",
   "productName": "HardwareExample",
   "executableName": "onekey-hardware-example",
-  "version": "1.1.11-alpha.1",
+  "version": "1.1.11-alpha.2",
   "author": "OneKey",
   "description": "End-to-end encrypted workspaces for teams",
   "main": "dist/index.js",
@@ -15,12 +15,15 @@
     "dev": "npx concurrently \"yarn dev:electron\" \"cross-env TRANSFORM_REGENERATOR_DISABLED=true BROWSER=none yarn dev-electron-web\"",
     "dev:electron": "electron --inspect=5858 dist/index.js",
     "build:main": "webpack --config webpack.config.ts",
-    "make": "yarn clean:build && yarn build-electron-web && electron-builder build -mw --config electron-builder.config.js --publish always",
+    "rebuild:deps": "electron-builder install-app-deps",
+    "make:mac": "yarn rebuild:deps && yarn clean:build && yarn build-electron-web && electron-builder build --mac --config electron-builder.config.js --publish always",
+    "make:win": "yarn rebuild:deps && yarn clean:build && yarn build-electron-web && electron-builder build --win --config electron-builder.config.js --publish always",
     "lint": "eslint --ext .tsx --ext .ts ./",
     "ts:check": "yarn tsc --noEmit"
   },
   "dependencies": {
-    "@abandonware/noble": "^1.9.2-26",
+    "@onekeyfe/hd-transport-electron": "1.1.11-alpha.2",
+    "@stoprocent/noble": "2.3.4",
     "debug": "4.3.4",
     "electron-is-dev": "^3.0.1",
     "electron-log": "^5.1.5",
@@ -41,5 +44,5 @@
   "resolutions": {
     "**/node-gyp": "^10.0.1"
   },
-  "gitHead": "160f065737c84886f317a23058304584333bc885"
+  "gitHead": "4c2adec6fa4eaca0b5b97cdfbdca8cebfa10943d"
 }

package/src/index.ts

@@ -257,8 +257,6 @@ function createMainWindow() {
     }
   });
 
-  initNobleBleSupport(browserWindow.webContents);
-
   ipcMain.on(ipcMessageKeys.APP_RESTART, () => {
     browserWindow?.reload();
   });
@@ -283,6 +281,15 @@ if (!singleInstance && !process.mas) {
     if (!mainWindow) {
       mainWindow = createMainWindow();
     }
+
+    try {
+      log.info('Initializing Noble BLE support...');
+      initNobleBleSupport(mainWindow.webContents);
+      log.info('Noble BLE support initialized successfully.');
+    } catch (e) {
+      log.error('Failed to initialize Noble BLE support:', e);
+    }
+
     initChildProcess();
     showMainWindow();
     console.log('日志文件位置:', log.transports.file.getFile().path);

package/webpack.config.ts

@@ -48,8 +48,9 @@ module.exports = {
       }),
     }),
     {
-      '@abandonware/noble': 'commonjs @abandonware/noble',
-      '@abandonware/bluetooth-hci-socket': 'commonjs @abandonware/bluetooth-hci-socket',
+      '@onekeyfe/hd-transport-electron': 'commonjs @onekeyfe/hd-transport-electron',
+      '@stoprocent/noble': 'commonjs @stoprocent/noble',
+      '@stoprocent/bluetooth-hci-socket': 'commonjs @stoprocent/bluetooth-hci-socket',
       bufferutil: 'commonjs bufferutil',
       'utf-8-validate': 'commonjs utf-8-validate',
     },