fix: fix screen module before app ready causes error on electron & fi…

…x missing AutoUpdate Module on Android in store channel (#6451)
OneKeyHQ · Jan 7, 2025 · c8027cc · c8027cc
1 parent 9dc08d6
commit c8027cc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/apps/desktop/src-electron/app.ts b/apps/desktop/src-electron/app.ts
@@ -14,7 +14,6 @@ import {
   ipcMain,
   nativeTheme,
   powerMonitor,
-  screen,
   session,
   shell,
   systemPreferences,
@@ -388,6 +387,8 @@ const getBackgroundColor = (key: string) =>
   themeColors[nativeTheme.shouldUseDarkColors ? 'dark' : 'light'];
 
 function createMainWindow() {
+  // https://github.com/electron/electron/issues/16168
+  const { screen } = require('electron');
   const display = screen.getPrimaryDisplay();
   const dimensions = display.workAreaSize;
   const ratio = 16 / 9;

diff --git a/packages/shared/src/modules3rdParty/auto-update/index.android.ts b/packages/shared/src/modules3rdParty/auto-update/index.android.ts
@@ -39,6 +39,9 @@ const { AutoUpdateModule } = NativeModules as {
 };
 
 export const clearPackage: IClearPackage = async () => {
+  if (!AutoUpdateModule) {
+    return;
+  }
   await AutoUpdateModule.clearCache();
   if (!RNFS) {
     return;
@@ -53,6 +56,11 @@ export const downloadPackage: IDownloadPackage = async ({
   downloadUrl,
   latestVersion,
 }) => {
+  if (!AutoUpdateModule) {
+    return {
+      downloadedFile: '',
+    };
+  }
   await RNFS?.mkdir(DIR_PATH);
   if (!downloadUrl || !latestVersion) {
     throw new Error('Invalid version or downloadUrl');
@@ -69,19 +77,25 @@ export const downloadPackage: IDownloadPackage = async ({
 };
 
 export const verifyPackage: IVerifyPackage = async (params) => {
+  if (!AutoUpdateModule) {
+    return;
+  }
   await AutoUpdateModule.verifyAPK({
     filePath: params.downloadedFile,
     downloadUrl: params.downloadUrl || '',
   });
 };
 
-export const installPackage: IInstallPackage = ({
+export const installPackage: IInstallPackage = async ({
   latestVersion,
   downloadUrl,
 }) => {
+  if (!AutoUpdateModule) {
+    return;
+  }
   defaultLogger.update.app.log('install', latestVersion);
   if (!latestVersion) {
-    return Promise.resolve();
+    return;
   }
   return AutoUpdateModule.installAPK({
     filePath: buildFilePath(latestVersion),