changelog.md

@@ -13,8 +13,6 @@
 - 改名后潜在的 MacOS 安装失败
 - 改名后 WinGet 上传失败
 - MacOS 首次启动时的 ENOENT: no such file or directory
-- 修复 Gist url 404 error
-- MacOS 下状态栏图标 Logo
 
 ### 优化 (Optimize)
  - socket 管理防止内核通信失败

src/main/config/profile.ts

@@ -13,8 +13,6 @@ import { join } from 'path'
 import { app } from 'electron'
 
 let profileConfig: IProfileConfig // profile.yaml
-// 最终选中订阅ID
-let targetProfileId: string | null = null
 
 export async function getProfileConfig(force = false): Promise<IProfileConfig> {
   if (force || !profileConfig) {
@@ -40,35 +38,22 @@ export async function changeCurrentProfile(id: string): Promise<void> {
   const config = await getProfileConfig()
   const current = config.current
 
-  if (current === id && targetProfileId !== id) {
+  if (current === id) {
     return
   }
 
-  targetProfileId = id
-
   config.current = id
-  const configSavePromise = setProfileConfig(config)
+  await setProfileConfig(config)
 
   try {
-    await configSavePromise
-
-    // 检查订阅切换是否中断
-    if (targetProfileId !== id) {
-      return
-    }
     await restartCore()
-    if (targetProfileId === id) {
-      targetProfileId = null
-    }
   } catch (e) {
-    if (targetProfileId === id) {
+    // 如果重启失败，恢复原来的配置
     config.current = current
     await setProfileConfig(config)
-      targetProfileId = null
     throw e
   }
 }
-}
 
 export async function updateProfileItem(item: IProfileItem): Promise<void> {
   const config = await getProfileConfig()
@@ -218,8 +203,7 @@ export async function getProfileStr(id: string | undefined): Promise<string> {
 }
 
 export async function setProfileStr(id: string, content: string): Promise<void> {
-  // 读取最新的配置
+  const { current } = await getProfileConfig()
-  const { current } = await getProfileConfig(true)
   await writeFile(profilePath(id), content, 'utf-8')
   if (current === id) await restartCore()
 }

src/main/core/factory.ts

@@ -25,8 +25,7 @@ let runtimeConfigStr: string
 let runtimeConfig: IMihomoConfig
 
 export async function generateProfile(): Promise<void> {
-  // 读取最新的配置
+  const { current } = await getProfileConfig()
-  const { current } = await getProfileConfig(true)
   const { diffWorkDir = false, controlDns = true, controlSniff = true, useNameserverPolicy } = await getAppConfig()
   const currentProfile = await overrideProfile(current, await getProfile(current))
   let controledMihomoConfig = await getControledMihomoConfig()

src/main/core/manager.ts

@@ -79,7 +79,6 @@ let setPublicDNSTimer: NodeJS.Timeout | null = null
 let recoverDNSTimer: NodeJS.Timeout | null = null
 let child: ChildProcess
 let retry = 10
-let isRestarting = false
 
 export async function startCore(detached = false): Promise<Promise<void>[]> {
   const {
@@ -103,7 +102,7 @@ export async function startCore(detached = false): Promise<Promise<void>[]> {
       await rm(path.join(dataDir(), 'core.pid'))
     }
   }
-  const { current } = await getProfileConfig(true)
+  const { current } = await getProfileConfig()
   const { tun } = await getControledMihomoConfig()
   const corePath = mihomoCorePath(core)
 
@@ -162,12 +161,6 @@ export async function startCore(detached = false): Promise<Promise<void>[]> {
   }
   child.on('close', async (code, signal) => {
     await managerLogger.info(`Core closed, code: ${code}, signal: ${signal}`)
-
-    if (isRestarting) {
-      await managerLogger.info('Core closed during restart, skipping auto-restart')
-      return
-    }
-
     if (retry) {
       await managerLogger.info('Try Restart Core')
       retry--
@@ -300,17 +293,13 @@ async function cleanupWindowsNamedPipes(): Promise<void> {
             const pid = proc.Id
             if (pid && pid !== process.pid) {
               try {
-                // 先检查进程是否存在
-                process.kill(pid, 0)
                 process.kill(pid, 'SIGTERM')
                 await managerLogger.info(`Terminated process ${pid} to free pipe`)
-              } catch (error: any) {
+              } catch (error) {
-                if (error.code !== 'ESRCH') {
                 await managerLogger.warn(`Failed to terminate process ${pid}:`, error)
               }
             }
           }
-          }
         } catch (parseError) {
           await managerLogger.warn('Failed to parse process list JSON:', parseError)
 
@@ -322,11 +311,9 @@ async function cleanupWindowsNamedPipes(): Promise<void> {
               const pid = parseInt(match[1])
               if (pid !== process.pid) {
                 try {
-                  process.kill(pid, 0)
                   process.kill(pid, 'SIGTERM')
                   await managerLogger.info(`Terminated process ${pid} to free pipe`)
-                } catch (error: any) {
+                } catch (error) {
-                  if (error.code !== 'ESRCH') {
                   await managerLogger.warn(`Failed to terminate process ${pid}:`, error)
                 }
               }
@@ -334,7 +321,6 @@ async function cleanupWindowsNamedPipes(): Promise<void> {
           }
         }
       }
-      }
     } catch (error) {
       await managerLogger.warn('Failed to check mihomo processes:', error)
     }
@@ -381,20 +367,13 @@ async function validateWindowsPipeAccess(pipePath: string): Promise<void> {
 }
 
 export async function restartCore(): Promise<void> {
-  // 防止并发重启
-  if (isRestarting) {
-    await managerLogger.info('Core restart already in progress, skipping duplicate request')
-    return
-  }
-
-  isRestarting = true
   try {
     await startCore()
   } catch (e) {
+    // 记录错误到日志而不是显示阻塞对话框
     await managerLogger.error('restart core failed', e)
+    // 重新抛出错误，让调用者处理
     throw e
-  } finally {
-    isRestarting = false
   }
 }
 

src/main/core/mihomoApi.ts

@@ -205,8 +205,6 @@ export const startMihomoTraffic = async (): Promise<void> => {
 }
 
 export const stopMihomoTraffic = (): void => {
-  trafficRetry = 0
-
   if (mihomoTrafficWs) {
     mihomoTrafficWs.removeAllListeners()
     if (mihomoTrafficWs.readyState === WebSocket.OPEN) {
@@ -264,8 +262,6 @@ export const startMihomoMemory = async (): Promise<void> => {
 }
 
 export const stopMihomoMemory = (): void => {
-  memoryRetry = 0
-
   if (mihomoMemoryWs) {
     mihomoMemoryWs.removeAllListeners()
     if (mihomoMemoryWs.readyState === WebSocket.OPEN) {
@@ -310,8 +306,6 @@ export const startMihomoLogs = async (): Promise<void> => {
 }
 
 export const stopMihomoLogs = (): void => {
-  logsRetry = 0
-
   if (mihomoLogsWs) {
     mihomoLogsWs.removeAllListeners()
     if (mihomoLogsWs.readyState === WebSocket.OPEN) {
@@ -358,8 +352,6 @@ export const startMihomoConnections = async (): Promise<void> => {
 }
 
 export const stopMihomoConnections = (): void => {
-  connectionsRetry = 0
-
   if (mihomoConnectionsWs) {
     mihomoConnectionsWs.removeAllListeners()
     if (mihomoConnectionsWs.readyState === WebSocket.OPEN) {

src/renderer/src/components/profiles/profile-item.tsx

@@ -57,6 +57,7 @@ const ProfileItem: React.FC<Props> = (props) => {
   const { appConfig, patchAppConfig } = useAppConfig()
   const { profileDisplayDate = 'expire' } = appConfig || {}
   const [updating, setUpdating] = useState(false)
+  const [selecting, setSelecting] = useState(false)
   const [openInfoEditor, setOpenInfoEditor] = useState(false)
   const [openFileEditor, setOpenFileEditor] = useState(false)
   const [dropdownOpen, setDropdownOpen] = useState(false)
@@ -184,7 +185,8 @@ const ProfileItem: React.FC<Props> = (props) => {
 
     // 处理卡片选中
     if (!isActuallyDragging && !isDragging && clickStartPos) {
-      onPress()
+      setSelecting(true)
+      onPress().finally(() => setSelecting(false))
     }
 
     cleanup()
@@ -214,7 +216,7 @@ const ProfileItem: React.FC<Props> = (props) => {
         fullWidth
         isPressable={false}
         onContextMenu={handleContextMenu}
-        className={`${isCurrent ? 'bg-primary' : ''} cursor-pointer transition-colors duration-150`}
+        className={`${isCurrent ? 'bg-primary' : ''} ${selecting ? 'blur-sm' : ''} cursor-pointer`}
       >
         <div
           ref={setNodeRef}

src/renderer/src/components/settings/mihomo-config.tsx

@@ -119,7 +119,7 @@ const MihomoConfig: React.FC = () => {
               try {
                 const url = await getGistUrl()
                 if (url !== '') {
-                  await navigator.clipboard.writeText(`${url}/raw/clash-party.yaml`)
+                  await navigator.clipboard.writeText(`${url}/raw/mihomo-party.yaml`)
                 }
               } catch (e) {
                 alert(e)

src/renderer/src/hooks/use-profile-config.tsx

@@ -25,7 +25,6 @@ export const ProfileConfigProvider: React.FC<{ children: ReactNode }> = ({ child
   const { data: profileConfig, mutate: mutateProfileConfig } = useSWR('getProfileConfig', () =>
     getProfileConfig()
   )
-  const [targetProfileId, setTargetProfileId] = React.useState<string | null>(null)
 
   const setProfileConfig = async (config: IProfileConfig): Promise<void> => {
     try {
@@ -72,31 +71,23 @@ export const ProfileConfigProvider: React.FC<{ children: ReactNode }> = ({ child
   }
 
   const changeCurrentProfile = async (id: string): Promise<void> => {
-    if (targetProfileId === id) {
+    if (profileConfig?.current === id) {
       return
     }
 
-    setTargetProfileId(id)
+    // 乐观更新：立即更新 UI 状态，提供即时反馈
-
-    // 立即更新 UI 状态和托盘菜单，提供即时反馈
     if (profileConfig) {
       const optimisticUpdate = { ...profileConfig, current: id }
       mutateProfileConfig(optimisticUpdate, false)
-      window.electron.ipcRenderer.send('updateTrayMenu')
     }
 
-    // 异步执行后台切换，不阻塞 UI
     try {
-      await change(id)
+      // 异步执行后台切换，不阻塞 UI
-
+      change(id).then(() => {
-      if (targetProfileId === id) {
+        window.electron.ipcRenderer.send('updateTrayMenu')
         mutateProfileConfig()
-        setTargetProfileId(null)
+      }).catch((e) => {
-      } else {
+        const errorMsg = e?.message || String(e)
-      }
-    } catch (e) {
-      if (targetProfileId === id) {
-        const errorMsg = (e as any)?.message || String(e)
         // 处理 IPC 超时错误
         if (errorMsg.includes('reply was never sent')) {
           setTimeout(() => mutateProfileConfig(), 1000)
@@ -104,8 +95,10 @@ export const ProfileConfigProvider: React.FC<{ children: ReactNode }> = ({ child
           alert(`切换 Profile 失败: ${errorMsg}`)
           mutateProfileConfig()
         }
-        setTargetProfileId(null)
+      })
-      }
+    } catch (e) {
+      alert(`切换 Profile 失败: ${e}`)
+      mutateProfileConfig()
     }
   }