hardware-example 1.0.0-alpha.8 → 1.0.0

package/electron-builder.config.js

@@ -1,14 +1,17 @@
 /* eslint-disable no-template-curly-in-string */
+// eslint-disable-next-line import/no-import-module-exports, @typescript-eslint/no-var-requires
+const { version } = require('./package.json');
+
 module.exports = {
   extraMetadata: {
     main: 'dist/index.js',
-    version: '1',
+    version,
   },
   appId: 'so.onekey.example.hardware-desktop',
   productName: 'HardwareExample',
   copyright: 'Copyright © OeKey 2024',
   asar: true,
-  buildVersion: '1',
+  buildVersion: version,
   directories: {
     output: 'out',
   },
@@ -20,6 +23,7 @@ module.exports = {
     'dist/**/*.js',
     '!dist/__**',
     'package.json',
+    '!scripts/**',
   ],
   extraResources: [
     {
@@ -64,8 +68,8 @@ module.exports = {
     darkModeSupport: false,
     category: 'productivity',
     target: [
-      //   { target: 'dmg', arch: ['x64', 'arm64'] },
-      { target: 'zip', arch: ['x64', 'arm64'] },
+      { target: 'dmg', arch: ['x64', 'arm64'] },
+      // { target: 'zip', arch: ['x64', 'arm64'] },
     ],
     entitlements: 'entitlements.mac.plist',
     extendInfo: {
@@ -82,7 +86,12 @@ module.exports = {
     icon: 'public/icons/512x512.png',
     artifactName: 'Hardware-Example-win-${arch}.${ext}',
     verifyUpdateCodeSignature: false,
-    target: ['nsis'],
+    target: [
+      {
+        target: 'nsis',
+        arch: ['x64'],
+      },
+    ],
   },
   linux: {
     extraResources: [
@@ -97,4 +106,13 @@ module.exports = {
     category: 'Utility',
     target: ['AppImage'],
   },
+  publish: [
+    {
+      provider: 'github',
+      owner: 'OneKeyHQ',
+      repo: 'hardware-js-sdk',
+      private: false,
+      vPrefixedTagName: true,
+    },
+  ],
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "hardware-example",
   "productName": "HardwareExample",
   "executableName": "onekey-hardware-example",
-  "version": "1.0.0-alpha.8",
+  "version": "1.0.0",
   "author": "OneKey",
   "description": "End-to-end encrypted workspaces for teams",
   "main": "dist/index.js",
@@ -14,15 +14,17 @@
     "build-electron-web": "yarn copy:inject && yarn build:main && cd ../expo-example && yarn build:electron-web",
     "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:package": "yarn build-electron-web && electron-forge package",
     "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 never",
+    "make": "yarn clean:build && yarn build-electron-web && electron-builder build -mw --config electron-builder.config.js --publish always",
     "lint": "eslint --ext .tsx --ext .ts ./",
     "ts:check": "yarn tsc --noEmit"
   },
   "dependencies": {
     "debug": "4.3.4",
     "electron-is-dev": "^3.0.1",
+    "electron-log": "^5.1.5",
+    "electron-updater": "^6.2.1",
+    "fs-extra": "^11.2.0",
     "node-fetch": "^2.6.7"
   },
   "devDependencies": {
@@ -35,5 +37,5 @@
     "webpack": "^5.90.2",
     "webpack-node-externals": "^3.0.0"
   },
-  "gitHead": "b8ab573350323bc184b14b373881ad39a1f1afd8"
+  "gitHead": "95900f4bc9cb2a286b154e2e742cfe97c5c31b1e"
 }

package/src/config.ts

@@ -0,0 +1,10 @@
+export const ipcMessageKeys = {
+  // Updater
+  UPDATE_AVAILABLE: 'update/available',
+  UPDATE_DOWNLOADED: 'update/downloaded',
+  UPDATE_RESTART: 'update/restartApp',
+
+  APP_RELOAD_BRIDGE_PROCESS: 'app/reloadBridgeProcess',
+
+  INJECT_ONEKEY_DESKTOP_GLOBALS: 'inject/onekeyDesktop',
+};

package/src/index.ts

@@ -1,8 +1,16 @@
-import { screen, app, BrowserWindow, session } 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 initProcess from './process';
+import log from 'electron-log';
+import { autoUpdater } from 'electron-updater';
+import initProcess, { restartBridge } from './process';
+import { ipcMessageKeys } from './config';
+
+// Set log level
+log.transports.file.level = 'info';
+log.transports.console.level = 'info';
+autoUpdater.logger = log;
 
 const isMac = process.platform === 'darwin';
 const isWin = process.platform === 'win32';
@@ -86,7 +94,7 @@ function createMainWindow() {
 
   browserWindow.webContents.on('did-finish-load', () => {
     console.log('browserWindow >>>> did-finish-load');
-    browserWindow.webContents.send('SET_ONEKEY_DESKTOP_GLOBALS', {
+    browserWindow.webContents.send(ipcMessageKeys.INJECT_ONEKEY_DESKTOP_GLOBALS, {
       resourcesPath: (global as any).resourcesPath,
       staticPath: `file://${staticPath}`,
       sdkConnectSrc,
@@ -210,6 +218,42 @@ if (!singleInstance && !process.mas) {
   });
 }
 
+ipcMain.on(ipcMessageKeys.UPDATE_RESTART, () => {
+  log.info('App Quit And Install');
+  autoUpdater.quitAndInstall();
+});
+
+ipcMain.on(ipcMessageKeys.APP_RELOAD_BRIDGE_PROCESS, () => {
+  restartBridge();
+});
+
+// 配置 GitHub 发布提供者
+autoUpdater.setFeedURL({
+  provider: 'github',
+  owner: 'OneKeyHQ',
+  repo: 'hardware-js-sdk',
+  private: false,
+  releaseType: 'release',
+});
+
+// 检查更新
+app.on('ready', () => {
+  autoUpdater.on('update-available', () => {
+    log.info('Update available.');
+    mainWindow?.webContents?.send(ipcMessageKeys.UPDATE_AVAILABLE);
+  });
+
+  autoUpdater.on('update-downloaded', () => {
+    log.info('Update downloaded.');
+    mainWindow?.webContents?.send(ipcMessageKeys.UPDATE_DOWNLOADED);
+  });
+
+  setTimeout(() => {
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    autoUpdater.checkForUpdatesAndNotify();
+  }, 5000);
+});
+
 // wuit when all windows are closed, except on macOS. There, it's common
 // for applications and their menu bar to stay active until the user quits
 // explicitly with Cmd + Q

package/src/preload.ts

@@ -1,6 +1,8 @@
 /* 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 { ipcMessageKeys } from './config';
 
 export type DesktopAPI = {
   reloadBridgeProcess: () => void;
@@ -12,15 +14,29 @@ declare global {
   }
 }
 
-ipcRenderer.on('SET_ONEKEY_DESKTOP_GLOBALS', (_, globals) => {
+const validChannels = [
+  // Update events
+  ipcMessageKeys.UPDATE_AVAILABLE,
+  ipcMessageKeys.UPDATE_DOWNLOADED,
+];
+
+ipcRenderer.on(ipcMessageKeys.INJECT_ONEKEY_DESKTOP_GLOBALS, (_, globals) => {
   // @ts-expect-error
   window.ONEKEY_DESKTOP_GLOBALS = globals;
   // contextBridge.exposeInMainWorld('ONEKEY_DESKTOP_GLOBALS', globals);
 });
 
 const desktopApi = {
+  on: (channel: string, func: (...args: any[]) => any) => {
+    if (validChannels.includes(channel)) {
+      ipcRenderer.on(channel, (_, ...args) => func(...args));
+    }
+  },
+  updateReload: () => {
+    ipcRenderer.send(ipcMessageKeys.UPDATE_RESTART);
+  },
   reloadBridgeProcess: () => {
-    ipcRenderer.send('app/reloadBridgeProcess');
+    ipcRenderer.send(ipcMessageKeys.APP_RELOAD_BRIDGE_PROCESS);
   },
 };
 

package/forge.config.js

@@ -1,65 +0,0 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const path = require('path');
-const fs = require('fs-extra');
-const d = require('debug');
-
-const debug = d('forge config');
-
-module.exports = {
-  packagerConfig: {
-    name: 'HardwareExample',
-    appBundleId: 'so.onekey.example.hardware-desktop',
-    executableName: process.platform === 'linux' ? 'onekey-hardware-example' : 'HardwareExample',
-    appCategoryType: 'public.app-category.developer-tools',
-    appCopyright: 'Copyright 2024 OneKey Ltd',
-    asar: true,
-    icon: path.resolve(__dirname, 'public', 'icons', 'icon'),
-  },
-  rebuildConfig: {},
-  hooks: {
-    packageAfterCopy: async (forgeConfig, buildPath, electronVersion, platform, arch) => {
-      let originDir;
-      let binName;
-      const destDir = path.resolve(buildPath, '../', 'bin', 'bridge');
-
-      switch (platform) {
-        case 'darwin':
-          originDir = path.resolve(buildPath, 'public', 'bin', 'bridge', `mac-${arch}`);
-          binName = 'onekeyd';
-          break;
-        case 'win32':
-          originDir = path.resolve(buildPath, 'public', 'bin', 'bridge', 'win-x64');
-          binName = 'onekeyd.exe';
-          break;
-        case 'linux':
-          originDir = path.resolve(buildPath, 'public', 'bin', 'bridge', `linux-${arch}`);
-          binName = 'onekeyd';
-          break;
-        default:
-          originDir = '';
-          binName = 'onekeyd';
-          break;
-      }
-
-      debug(`Copy bridge bin: originDir:${originDir}, platform:${platform}, arch:${arch}`);
-      await fs.ensureDir(destDir);
-      await fs.copy(path.resolve(originDir, binName), path.resolve(destDir, binName));
-    },
-    packageAfterPrune: async (forgeConfig, buildPath, electronVersion, platform, arch) => {
-      const bridgeDir = path.resolve(buildPath, 'public', 'bin');
-      const scrDir = path.resolve(buildPath, 'src');
-      const buildScriptDir = path.resolve(buildPath, 'scripts');
-
-      await fs.remove(bridgeDir);
-      await fs.remove(scrDir);
-      await fs.remove(buildScriptDir);
-      return null;
-    },
-  },
-  makers: [
-    {
-      name: '@electron-forge/maker-zip',
-      platforms: ['darwin', 'win32'],
-    },
-  ],
-};