optimize core manager

mihomo-party-org · Aug 12, 2024 · a15a2c2 · a15a2c2
1 parent 7902f92
commit a15a2c2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/src/main/core/manager.ts b/src/main/core/manager.ts
@@ -53,33 +53,28 @@ export async function startCore(): Promise<void> {
         }
       )
     })
-    child.on('error', (err) => {
-      if (retry) {
-        retry--
-        startCore()
-      } else {
-        dialog.showErrorBox('External controller listen error', err.toString())
-        reject(err)
-      }
-    })
     child.on('close', async (code, signal) => {
       fs.writeFileSync(logPath(), `[Manager]: Core closed, code: ${code}, signal: ${signal}\n`, {
         flag: 'a'
       })
       fs.writeFileSync(logPath(), `[Manager]: Restart Core\n`, {
         flag: 'a'
       })
-      await startCore()
+      if (retry) {
+        retry--
+        await restartCore()
+      } else {
+        dialog.showErrorBox('Mihomo Core Closed', `Core closed, code: ${code}, signal: ${signal}`)
+        stopCore()
+      }
     })
   })
 }
 
 export function stopCore(): void {
   if (child) {
     child.removeAllListeners()
-    if (!child.kill('SIGINT')) {
-      stopCore()
-    }
+    child.kill('SIGINT')
   }
 }
 

diff --git a/src/main/index.ts b/src/main/index.ts
@@ -139,6 +139,7 @@ function createWindow(): void {
     stopMihomoMemory()
     event.preventDefault()
     window?.hide()
+    window?.webContents.reload()
   })
 
   window.webContents.setWindowOpenHandler((details) => {