Merge branch 'x' into new-purchase-flow

OneKeyHQ · Feb 14, 2025 · 781e2db · 781e2db
2 parents f7faccb + 6de17f1
commit 781e2db
Show file tree

Hide file tree

Showing 62 changed files with 1,771 additions and 317 deletions.
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
@@ -36,7 +36,7 @@
     "@onekeyhq/kit": "*",
     "@sentry/electron": "5.8.0",
     "adm-zip": "^0.5.10",
-    "electron-check-biometric-auth-changed": "0.0.4",
+    "electron-check-biometric-auth-changed": "0.0.6",
     "electron-context-menu": "^3.5.0",
     "electron-is-dev": "^2.0.0",
     "electron-log": "5.2.0",

diff --git a/apps/desktop/scripts/build.js b/apps/desktop/scripts/build.js
@@ -1,6 +1,7 @@
 const path = require('path');
 const childProcess = require('child_process');
 const { build } = require('esbuild');
+const glob = require('glob');
 const pkg = require('../package.json');
 
 const electronSource = path.join(__dirname, '..', 'src-electron');
@@ -13,8 +14,14 @@ const gitRevision = childProcess
 const isProduction = process.env.NODE_ENV === 'production';
 
 const hrstart = process.hrtime();
+
+// Get all .js files in service directory
+const serviceFiles = glob
+  .sync(path.join(electronSource, 'service', '*.ts'))
+  .map((name) => name.split('src-electron/').pop());
+
 build({
-  entryPoints: ['app.ts', 'preload.ts', 'service/windowsHello.ts'].map((f) =>
+  entryPoints: ['app.ts', 'preload.ts', ...serviceFiles].map((f) =>
     path.join(electronSource, f),
   ),
   platform: 'node',

diff --git a/apps/desktop/src-electron/app.ts b/apps/desktop/src-electron/app.ts
@@ -18,7 +18,6 @@ import {
   shell,
   systemPreferences,
 } from 'electron';
-import { checkBiometricAuthChanged } from 'electron-check-biometric-auth-changed';
 import contextMenu from 'electron-context-menu';
 import isDev from 'electron-is-dev';
 import logger from 'electron-log/main';
@@ -47,6 +46,7 @@ import { resourcesPath, staticPath } from './resoucePath';
 import { initSentry } from './sentry';
 import {
   checkAvailabilityAsync,
+  checkBiometricAuthChanged,
   requestVerificationAsync,
   startServices,
 } from './service';
@@ -581,12 +581,18 @@ function createMainWindow() {
     event.returnValue = isDev;
   });
 
-  ipcMain.on(ipcMessageKeys.CHECK_BIOMETRIC_AUTH_CHANGED, (event) => {
+  ipcMain.on(ipcMessageKeys.CHECK_BIOMETRIC_AUTH_CHANGED, async (event) => {
     if (!isMac) {
       event.returnValue = false;
       return;
     }
-    event.returnValue = checkBiometricAuthChanged();
+    try {
+      const result = await checkBiometricAuthChanged();
+      event.returnValue = result;
+    } catch (error) {
+      logger.error('[CHECK_BIOMETRIC_AUTH_CHANGED] Error:', error);
+      event.returnValue = false;
+    }
   });
 
   ipcMain.on(ipcMessageKeys.TOUCH_ID_CAN_PROMPT, async (event) => {

diff --git a/apps/desktop/src-electron/service/checkBiometricAuthChanged.ts b/apps/desktop/src-electron/service/checkBiometricAuthChanged.ts
@@ -0,0 +1,25 @@
+import { checkBiometricAuthChanged } from 'electron-check-biometric-auth-changed';
+
+import { ECheckBiometricAuthChangedEventType } from './enum';
+
+// Child process
+process.parentPort.on(
+  'message',
+  (e: {
+    data: { type: ECheckBiometricAuthChangedEventType; params: unknown };
+  }) => {
+    switch (e.data.type) {
+      case ECheckBiometricAuthChangedEventType.CheckBiometricAuthChanged:
+        {
+          const result = checkBiometricAuthChanged();
+          process.parentPort.postMessage({
+            type: ECheckBiometricAuthChangedEventType.CheckBiometricAuthChanged,
+            result,
+          });
+        }
+        break;
+      default:
+        break;
+    }
+  },
+);
diff --git a/apps/desktop/src-electron/service/enum.ts b/apps/desktop/src-electron/service/enum.ts
@@ -2,3 +2,7 @@ export enum EWindowHelloEventType {
   CheckAvailabilityAsync = 'checkAvailabilityAsync',
   RequestVerificationAsync = 'requestVerificationAsync',
 }
+
+export enum ECheckBiometricAuthChangedEventType {
+  CheckBiometricAuthChanged = 'checkBiometricAuthChanged',
+}
diff --git a/apps/desktop/src-electron/service/index.ts b/apps/desktop/src-electron/service/index.ts
@@ -3,26 +3,51 @@ import path from 'path';
 import { utilityProcess } from 'electron/main';
 import Logger from 'electron-log/main';
 
-import { EWindowHelloEventType } from './enum';
+import {
+  ECheckBiometricAuthChangedEventType,
+  EWindowHelloEventType,
+} from './enum';
 
 import type { UtilityProcess } from 'electron/main';
 
-let windowsHelloChildProcess: UtilityProcess | null = null;
-let windowsHelloCallbacks: {
-  type: string;
-  callback: (e: any) => void;
-  timestamp: number;
-}[] = [];
-export const startServices = () => {
-  windowsHelloChildProcess = utilityProcess.fork(
-    // After build, the directory is 'dist' and WindowsHello file is located in 'dist/service'
-    path.join(__dirname, './service/windowsHello.js'),
-  );
-  windowsHelloChildProcess.on(
+enum EServiceName {
+  WindowsHello = 'windowsHello',
+  CheckBiometricAuthChanged = 'checkBiometricAuthChanged',
+}
+
+const processConfig: Record<
+  EServiceName,
+  {
+    childProcess: UtilityProcess | null;
+    callbacks: {
+      type: string;
+      callback: (e: any) => void;
+      timestamp: number;
+    }[];
+  }
+> = {
+  [EServiceName.WindowsHello]: {
+    childProcess: null,
+    callbacks: [],
+  },
+  [EServiceName.CheckBiometricAuthChanged]: {
+    childProcess: null,
+    callbacks: [],
+  },
+};
+
+const startService = (key: EServiceName) => {
+  if (!processConfig[key].childProcess) {
+    processConfig[key].childProcess = utilityProcess.fork(
+      path.join(__dirname, `./service/${key}.js`),
+    );
+  }
+
+  processConfig[key].childProcess?.on(
     'message',
     (e: { type: string; result: boolean }) => {
-      Logger.info('windowsHelloChildProcess-onMessage', e);
-      const callbacks = windowsHelloCallbacks.filter(
+      Logger.info(`${key}ChildProcess-onMessage`, e);
+      const callbacks = processConfig[key].callbacks.filter(
         (callbackItem) => callbackItem.type === e.type,
       );
       if (callbacks.length) {
@@ -32,31 +57,47 @@ export const startServices = () => {
             callbackItem.callback(e.result);
           }
         });
-        windowsHelloCallbacks = windowsHelloCallbacks.filter(
+        processConfig[key].callbacks = processConfig[key].callbacks.filter(
           (callbackItem) => !callbacks.includes(callbackItem),
         );
       }
     },
   );
-  windowsHelloChildProcess.on('exit', (code) => {
-    Logger.info('windowsHelloChildProcess--onExit', code);
+  processConfig[key].childProcess?.on('exit', (code) => {
+    Logger.info(`${key}ChildProcess--onExit`, code);
+  });
+};
+export const startServices = () => {
+  (Object.keys(processConfig) as EServiceName[]).forEach((key) => {
+    startService(key);
   });
 };
 
+const postServiceMessage = <T>(
+  serviceName: EServiceName,
+  type: string,
+  params?: any,
+): Promise<T> =>
+  new Promise<T>((resolve) => {
+    processConfig[serviceName].callbacks.push({
+      type,
+      callback: resolve,
+      timestamp: Date.now(),
+    });
+    processConfig[serviceName].childProcess?.postMessage({
+      type,
+      params,
+    });
+  });
+
 let cacheWindowsHelloSupported: boolean | null = null;
 export const checkAvailabilityAsync = async () => {
   if (cacheWindowsHelloSupported === null) {
     cacheWindowsHelloSupported = await Promise.race<boolean>([
-      new Promise<boolean>((resolve) => {
-        windowsHelloCallbacks.push({
-          type: EWindowHelloEventType.CheckAvailabilityAsync,
-          callback: resolve,
-          timestamp: Date.now(),
-        });
-        windowsHelloChildProcess?.postMessage({
-          type: EWindowHelloEventType.CheckAvailabilityAsync,
-        });
-      }),
+      postServiceMessage<boolean>(
+        EServiceName.WindowsHello,
+        EWindowHelloEventType.CheckAvailabilityAsync,
+      ),
       new Promise((resolve) =>
         setTimeout(() => {
           cacheWindowsHelloSupported = false;
@@ -69,17 +110,24 @@ export const checkAvailabilityAsync = async () => {
 };
 
 export const requestVerificationAsync = (message: string) =>
-  new Promise<{
+  postServiceMessage<{
     success: boolean;
     error?: string;
-  }>((resolve) => {
-    windowsHelloCallbacks.push({
-      type: EWindowHelloEventType.RequestVerificationAsync,
-      callback: resolve,
-      timestamp: Date.now(),
-    });
-    windowsHelloChildProcess?.postMessage({
-      type: EWindowHelloEventType.RequestVerificationAsync,
-      params: message,
-    });
-  });
+  }>(
+    EServiceName.WindowsHello,
+    EWindowHelloEventType.RequestVerificationAsync,
+    message,
+  );
+
+export const checkBiometricAuthChanged = async () =>
+  Promise.race<boolean>([
+    postServiceMessage<boolean>(
+      EServiceName.CheckBiometricAuthChanged,
+      ECheckBiometricAuthChangedEventType.CheckBiometricAuthChanged,
+    ),
+    new Promise((resolve) =>
+      setTimeout(() => {
+        resolve(false);
+      }, 500),
+    ),
+  ]);
diff --git a/apps/desktop/src-electron/service/windowsHello.ts b/apps/desktop/src-electron/service/windowsHello.ts
@@ -45,17 +45,17 @@ function requestVerificationAsync(
 // Child process
 process.parentPort.on(
   'message',
-  (e: { data: { type: string; params: unknown } }) => {
+  (e: { data: { type: EWindowHelloEventType; params: unknown } }) => {
     switch (e.data.type) {
-      case 'checkAvailabilityAsync':
+      case EWindowHelloEventType.CheckAvailabilityAsync:
         checkWindowsHelloAvailability((result) => {
           process.parentPort.postMessage({
             type: EWindowHelloEventType.CheckAvailabilityAsync,
             result,
           });
         });
         break;
-      case 'requestVerificationAsync':
+      case EWindowHelloEventType.RequestVerificationAsync:
         requestVerificationAsync(e.data.params as string, (result) => {
           process.parentPort.postMessage({
             type: EWindowHelloEventType.RequestVerificationAsync,

diff --git a/package.json b/package.json
@@ -65,11 +65,11 @@
     "@onekeyfe/cross-inpage-provider-injected": "2.2.10",
     "@onekeyfe/cross-inpage-provider-types": "2.2.10",
     "@onekeyfe/extension-bridge-hosted": "2.2.10",
-    "@onekeyfe/hd-ble-sdk": "1.0.20-alpha.1",
-    "@onekeyfe/hd-core": "1.0.20-alpha.1",
-    "@onekeyfe/hd-shared": "1.0.20-alpha.1",
-    "@onekeyfe/hd-transport": "1.0.20-alpha.1",
-    "@onekeyfe/hd-web-sdk": "1.0.20-alpha.1",
+    "@onekeyfe/hd-ble-sdk": "^1.0.20-alpha.2",
+    "@onekeyfe/hd-core": "^1.0.20-alpha.2",
+    "@onekeyfe/hd-shared": "^1.0.20-alpha.2",
+    "@onekeyfe/hd-transport": "^1.0.20-alpha.2",
+    "@onekeyfe/hd-web-sdk": "^1.0.20-alpha.2",
     "@onekeyfe/onekey-cross-webview": "2.2.10",
     "@polkadot/extension-inject": "0.46.6",
     "@polkadot/types": "11.3.1",