Merge branch 'main' into dev

electron/main/index.ts

@@ -12,8 +12,16 @@ if (!app.requestSingleInstanceLock()) {
   app.quit()
   process.exit(0)
 }
+
 process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true'
 
+export const ROOT_PATH = {
+  // /dist
+  dist: join(__dirname, '../..'),
+  // /dist or /public
+  public: join(__dirname, app.isPackaged ? '../..' : '../../../public'),
+}
+
 let win: BrowserWindow | null = null
 // Here, you can also use other preload
 const preload = join(__dirname, '../preload/index.js')
@@ -22,6 +30,7 @@ const url = `http://${process.env.VITE_DEV_SERVER_HOST}:${process.env.VITE_DEV_S
 async function createWindow() {
   win = new BrowserWindow({
     title: 'Main window',
+    icon: join(ROOT_PATH.public, 'favicon.ico'),
     webPreferences: {
       preload,
       nodeIntegration: true,
@@ -30,13 +39,13 @@ async function createWindow() {
   })
 
   if (app.isPackaged) {
-    win.loadFile(join(__dirname, '../../index.html'))
+    win.loadFile(indexHtml)
   } else {
     win.loadURL(url)
     // win.webContents.openDevTools()
   }
 
-  // Test active push message to Renderer-process
+  // Test actively push message to the Electron-Renderer
   win.webContents.on('did-finish-load', () => {
     win?.webContents.send('main-process-message', new Date().toLocaleString())
   })
@@ -73,7 +82,7 @@ app.on('activate', () => {
 })
 
 // new window example arg: new windows url
-ipcMain.handle("open-win", (event, arg) => {
+ipcMain.handle('open-win', (event, arg) => {
   const childWindow = new BrowserWindow({
     webPreferences: {
       preload,
@@ -81,9 +90,7 @@ ipcMain.handle("open-win", (event, arg) => {
   })
 
   if (app.isPackaged) {
-    childWindow.loadFile(join(__dirname, `../renderer/index.html`), {
-      hash: `${arg}`,
-    })
+    childWindow.loadFile(indexHtml, { hash: arg })
   } else {
     childWindow.loadURL(`${url}/#${arg}`)
     // childWindow.webContents.openDevTools({ mode: "undocked", activate: true })

electron/preload/index.ts

@@ -1,4 +1,3 @@
-
 function domReady(condition: DocumentReadyState[] = ['complete', 'interactive']) {
   return new Promise(resolve => {
     if (condition.includes(document.readyState)) {
@@ -84,5 +83,10 @@ function useLoading() {
 // ----------------------------------------------------------------------
 
 const { appendLoading, removeLoading } = useLoading()
-window.removeLoading = removeLoading
 domReady().then(appendLoading)
+
+window.onmessage = ev => {
+  ev.data.payload === 'removeLoading' && removeLoading()
+}
+
+setTimeout(removeLoading, 4999)