From f7312697e7c4700dd035fb4b78b7d07dedc93dd0 Mon Sep 17 00:00:00 2001
From: Kejiang Ma <kj.ma@intel.com>
Date: Wed, 24 Dec 2025 15:26:19 +0800
Subject: [PATCH] feat: close ovms process when app quit (#12101)

* feat:close ovms process while app quit

* add await for execAsync

* update 'will-quit' event
---
 src/main/index.ts                |  4 ++++
 src/main/ipc.ts                  |  3 +--
 src/main/services/OvmsManager.ts | 33 ++++++--------------------------
 3 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/src/main/index.ts b/src/main/index.ts
index 657c31dfc4..ec16475d3f 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -37,6 +37,7 @@ import { versionService } from './services/VersionService'
 import { windowService } from './services/WindowService'
 import { initWebviewHotkeys } from './services/WebviewService'
 import { runAsyncFunction } from './utils'
+import { ovmsManager } from './services/OvmsManager'
 
 const logger = loggerService.withContext('MainEntry')
 
@@ -247,12 +248,15 @@ if (!app.requestSingleInstanceLock()) {
 
   app.on('will-quit', async () => {
     // 简单的资源清理，不阻塞退出流程
+    await ovmsManager.stopOvms()
+
     try {
       await mcpService.cleanup()
       await apiServerService.stop()
     } catch (error) {
       logger.warn('Error cleaning up MCP service:', error as Error)
     }
+
     // finish the logger
     logger.finish()
   })
diff --git a/src/main/ipc.ts b/src/main/ipc.ts
index 08bfbac6f8..8f86a93075 100644
--- a/src/main/ipc.ts
+++ b/src/main/ipc.ts
@@ -59,7 +59,7 @@ import NotificationService from './services/NotificationService'
 import * as NutstoreService from './services/NutstoreService'
 import ObsidianVaultService from './services/ObsidianVaultService'
 import { ocrService } from './services/ocr/OcrService'
-import OvmsManager from './services/OvmsManager'
+import { ovmsManager } from './services/OvmsManager'
 import powerMonitorService from './services/PowerMonitorService'
 import { proxyManager } from './services/ProxyManager'
 import { pythonService } from './services/PythonService'
@@ -107,7 +107,6 @@ const obsidianVaultService = new ObsidianVaultService()
 const vertexAIService = VertexAIService.getInstance()
 const memoryService = MemoryService.getInstance()
 const dxtService = new DxtService()
-const ovmsManager = new OvmsManager()
 const pluginService = PluginService.getInstance()
 
 function normalizeError(error: unknown): Error {
diff --git a/src/main/services/OvmsManager.ts b/src/main/services/OvmsManager.ts
index 3a32d74ecf..54e0a1bb8b 100644
--- a/src/main/services/OvmsManager.ts
+++ b/src/main/services/OvmsManager.ts
@@ -102,32 +102,10 @@ class OvmsManager {
    */
   public async stopOvms(): Promise<{ success: boolean; message?: string }> {
     try {
-      // Check if OVMS process is running
-      const psCommand = `Get-Process -Name "ovms" -ErrorAction SilentlyContinue | Select-Object Id, Path | ConvertTo-Json`
-      const { stdout } = await execAsync(`powershell -Command "${psCommand}"`)
-
-      if (!stdout.trim()) {
-        logger.info('OVMS process is not running')
-        return { success: true, message: 'OVMS process is not running' }
-      }
-
-      const processes = JSON.parse(stdout)
-      const processList = Array.isArray(processes) ? processes : [processes]
-
-      if (processList.length === 0) {
-        logger.info('OVMS process is not running')
-        return { success: true, message: 'OVMS process is not running' }
-      }
-
-      // Terminate all OVMS processes using terminalProcess
-      for (const process of processList) {
-        const result = await this.terminalProcess(process.Id)
-        if (!result.success) {
-          logger.error(`Failed to terminate OVMS process with PID: ${process.Id}, ${result.message}`)
-          return { success: false, message: `Failed to terminate OVMS process: ${result.message}` }
-        }
-        logger.info(`Terminated OVMS process with PID: ${process.Id}`)
-      }
+      // close the OVMS process
+      await execAsync(
+        `powershell -Command "Get-WmiObject Win32_Process | Where-Object { $_.CommandLine -like 'ovms.exe*' } | ForEach-Object { Stop-Process -Id $_.ProcessId -Force }"`
+      )
 
       // Reset the ovms instance
       this.ovms = null
@@ -584,4 +562,5 @@ class OvmsManager {
   }
 }
 
-export default OvmsManager
+// Export singleton instance
+export const ovmsManager = new OvmsManager()