- Update sources

Author: ParticleG

src-electron/service/app/index.ts

@@ -57,15 +57,15 @@ export class AppService implements AppServiceTrait {
     });
     app.whenReady().then(
       async () => {
-        log.info(`Starting service ${ServiceType.maa}...`);
         await this._maaService.create();
         log.info(`Service ${ServiceType.maa} started`);
-        log.info(`Starting service ${ServiceType.tray}...`);
+
         this._trayService.create();
         log.info(`Service ${ServiceType.tray} started`);
-        log.info(`Starting service ${ServiceType.window}...`);
+
         this._windowService.getWindow(WindowType.main).create();
         log.info(`Service ${ServiceType.window} started`);
+
         log.info(`${packageJson.productName} is ready`);
       },
       () => {},

src-electron/service/window/base/index.ts

@@ -1,23 +1,23 @@
 import { BrowserWindow } from 'electron';
-import Logger from 'electron-log';
 
 import { DEFAULT_CONSTRUCT_OPTIONS } from 'app/src-electron/service/window/base/constants';
 import type { ConstructOptions } from 'app/src-electron/service/window/base/types';
 
 import { WINDOW_URL_MAPPING } from 'src/types/service/window/constants';
 import type { WindowType } from 'src/types/service/window/types';
+import log from 'electron-log';
 
 export abstract class BaseWindow {
   private readonly _constructOptions: ConstructOptions;
-  private readonly _url: string;
+  private readonly _hash: string;
   protected _window?: BrowserWindow | undefined;
 
   protected constructor(windowType: WindowType, constructOptions?: ConstructOptions) {
     this._constructOptions = {
       ...DEFAULT_CONSTRUCT_OPTIONS,
       ...constructOptions,
     };
-    this._url = `${process.env.APP_URL}#${WINDOW_URL_MAPPING[windowType]}`;
+    this._hash = WINDOW_URL_MAPPING[windowType];
   }
 
   create() {
@@ -41,7 +41,11 @@ export abstract class BaseWindow {
         }
       }
     });
-    this._window.loadURL(this._url).catch((e) => Logger.warn('loadURL', e));
+    if (process.env.DEV) {
+      this._window.loadURL(`${process.env.APP_URL}#${this._hash}`).catch((e) => log.warn('loadURL', e));
+    } else {
+      this._window.loadFile('index.html', { hash: this._hash }).catch((e) => log.warn('loadFile', e));
+    }
 
     return this._window;
   }