From b53961201fd9d96ffa7c0b4943c3f4b7a368b5a5 Mon Sep 17 00:00:00 2001 From: ezequielnick <107352853+ezequielnick@users.noreply.github.com> Date: Wed, 3 Sep 2025 20:39:56 +0800 Subject: [PATCH] feat: add socket management --- changelog.md | 4 +- src/main/core/manager.ts | 240 ++++++++++++++++++++++++++++++++++--- src/main/core/mihomoApi.ts | 42 +++++-- src/main/index.ts | 4 +- 4 files changed, 263 insertions(+), 27 deletions(-) diff --git a/changelog.md b/changelog.md index cd17567..21befb1 100644 --- a/changelog.md +++ b/changelog.md @@ -3,7 +3,9 @@ ### 新功能 (Feat) - 增加关闭动画开关 - 增加订阅超时时间设置 - - + +### 优化 (Optimize) + - socket 管理防止内核通信失败 ### 样式调整 (Sytle) - 改进 logo 设计 diff --git a/src/main/core/manager.ts b/src/main/core/manager.ts index 2aa99c8..12c250f 100644 --- a/src/main/core/manager.ts +++ b/src/main/core/manager.ts @@ -28,7 +28,8 @@ import { stopMihomoTraffic, stopMihomoLogs, stopMihomoMemory, - patchMihomoConfig + patchMihomoConfig, + getAxios } from './mihomoApi' import chokidar from 'chokidar' import { readFile, rm, writeFile } from 'fs/promises' @@ -52,8 +53,29 @@ chokidar.watch(path.join(mihomoCoreDir(), 'meta-update'), {}).on('unlinkDir', as } }) -export const mihomoIpcPath = - process.platform === 'win32' ? '\\\\.\\pipe\\MihomoParty\\mihomo' : '/tmp/mihomo-party.sock' +// 动态生成 IPC 路径 +export const getMihomoIpcPath = (): string => { + if (process.platform === 'win32') { + const isAdmin = getSessionAdminStatus() + const sessionId = process.env.SESSIONNAME || process.env.USERNAME || 'default' + const processId = process.pid + + if (isAdmin) { + return `\\\\.\\pipe\\MihomoParty\\mihomo-admin-${sessionId}-${processId}` + } else { + return `\\\\.\\pipe\\MihomoParty\\mihomo-user-${sessionId}-${processId}` + } + } + + const uid = process.getuid?.() || 0 + + if (uid === 0) { + return '/tmp/mihomo-party-admin.sock' + } else { + return `/tmp/mihomo-party-${uid}.sock` + } +} + const ctlParam = process.platform === 'win32' ? '-ext-ctl-pipe' : '-ext-ctl-unix' let setPublicDNSTimer: NodeJS.Timeout | null = null @@ -93,6 +115,9 @@ export async function startCore(detached = false): Promise[]> { await generateProfile() await checkProfile() await stopCore() + + await cleanupSocketFile() + if (tun?.enable && autoSetDNS) { try { await setPublicDNS() @@ -100,6 +125,15 @@ export async function startCore(detached = false): Promise[]> { await managerLogger.error('set dns failed', error) } } + + // 获取动态 IPC 路径 + const dynamicIpcPath = getMihomoIpcPath() + await managerLogger.info(`Using IPC path: ${dynamicIpcPath}`) + + if (process.platform === 'win32') { + await validateWindowsPipeAccess(dynamicIpcPath) + } + // 内核日志输出到独立的 core-日期.log 文件 const stdout = createWriteStream(coreLogPath(), { flags: 'a' }) const stderr = createWriteStream(coreLogPath(), { flags: 'a' }) @@ -111,7 +145,7 @@ export async function startCore(detached = false): Promise[]> { } child = spawn( corePath, - ['-d', diffWorkDir ? mihomoProfileWorkDir(current) : mihomoWorkDir(), ctlParam, mihomoIpcPath], + ['-d', diffWorkDir ? mihomoProfileWorkDir(current) : mihomoWorkDir(), ctlParam, dynamicIpcPath], { detached: true, stdio: detached ? 'ignore' : undefined, @@ -152,6 +186,18 @@ export async function startCore(detached = false): Promise[]> { if ((process.platform !== 'win32' && str.includes('External controller unix listen error')) || (process.platform === 'win32' && str.includes('External controller pipe listen error')) ) { + await managerLogger.error('External controller listen error detected:', str) + + if (process.platform === 'win32') { + await managerLogger.info('Attempting Windows pipe cleanup and retry...') + try { + await cleanupWindowsNamedPipes() + await new Promise(resolve => setTimeout(resolve, 2000)) + } catch (cleanupError) { + await managerLogger.error('Pipe cleanup failed:', cleanupError) + } + } + reject(i18next.t('mihomo.error.externalControllerListenError')) } @@ -176,6 +222,11 @@ export async function startCore(detached = false): Promise[]> { }) }) ]) + + await waitForCoreReady() + + // 强制刷新 axios 实例以使用新的管道路径 + await getAxios(true) await startMihomoTraffic() await startMihomoConnections() await startMihomoLogs() @@ -203,6 +254,118 @@ export async function stopCore(force = false): Promise { stopMihomoConnections() stopMihomoLogs() stopMihomoMemory() + + // 强制刷新 axios + try { + await getAxios(true) + } catch (error) { + await managerLogger.warn('Failed to refresh axios instance:', error) + } + + // 清理 Socket 文件 + await cleanupSocketFile() +} +async function cleanupSocketFile(): Promise { + if (process.platform === 'win32') { + await cleanupWindowsNamedPipes() + } else { + await cleanupUnixSockets() + } +} + +// Windows 命名管道清理 +async function cleanupWindowsNamedPipes(): Promise { + try { + const execPromise = promisify(exec) + + try { + const { stdout } = await execPromise( + `powershell -Command "[Console]::OutputEncoding = [System.Text.Encoding]::UTF8; Get-Process | Where-Object {$_.ProcessName -like '*mihomo*'} | Select-Object Id,ProcessName | ConvertTo-Json"`, + { encoding: 'utf8' } + ) + + if (stdout.trim()) { + await managerLogger.info(`Found potential pipe-blocking processes: ${stdout}`) + + try { + const processes = JSON.parse(stdout) + const processArray = Array.isArray(processes) ? processes : [processes] + + for (const proc of processArray) { + const pid = proc.Id + if (pid && pid !== process.pid) { + try { + process.kill(pid, 'SIGTERM') + await managerLogger.info(`Terminated process ${pid} to free pipe`) + } catch (error) { + await managerLogger.warn(`Failed to terminate process ${pid}:`, error) + } + } + } + } catch (parseError) { + await managerLogger.warn('Failed to parse process list JSON:', parseError) + + // 回退到文本解析 + const lines = stdout.split('\n').filter(line => line.includes('mihomo')) + for (const line of lines) { + const match = line.match(/(\d+)/) + if (match) { + const pid = parseInt(match[1]) + if (pid !== process.pid) { + try { + process.kill(pid, 'SIGTERM') + await managerLogger.info(`Terminated process ${pid} to free pipe`) + } catch (error) { + await managerLogger.warn(`Failed to terminate process ${pid}:`, error) + } + } + } + } + } + } + } catch (error) { + await managerLogger.warn('Failed to check mihomo processes:', error) + } + + await new Promise(resolve => setTimeout(resolve, 1000)) + + } catch (error) { + await managerLogger.error('Windows named pipe cleanup failed:', error) + } +} + +// Unix Socket 清理 +async function cleanupUnixSockets(): Promise { + try { + const socketPaths = [ + '/tmp/mihomo-party.sock', + '/tmp/mihomo-party-admin.sock', + `/tmp/mihomo-party-${process.getuid?.() || 'user'}.sock` + ] + + for (const socketPath of socketPaths) { + try { + if (existsSync(socketPath)) { + await rm(socketPath) + await managerLogger.info(`Cleaned up socket file: ${socketPath}`) + } + } catch (error) { + await managerLogger.warn(`Failed to cleanup socket file ${socketPath}:`, error) + } + } + } catch (error) { + await managerLogger.error('Unix socket cleanup failed:', error) + } +} + +// Windows 命名管道访问验证 +async function validateWindowsPipeAccess(pipePath: string): Promise { + try { + await managerLogger.info(`Validating pipe access for: ${pipePath}`) + await managerLogger.info(`Pipe validation completed for: ${pipePath}`) + } catch (error) { + await managerLogger.error('Windows pipe validation failed:', error) + } } export async function restartCore(): Promise { @@ -330,28 +493,66 @@ export async function grantTunPermissions(): Promise { } } +// 在应用启动时检测一次权限 +let sessionAdminStatus: boolean | null = null + +export async function initAdminStatus(): Promise { + if (process.platform === 'win32' && sessionAdminStatus === null) { + sessionAdminStatus = await checkAdminPrivileges().catch(() => false) + } +} + +export function getSessionAdminStatus(): boolean { + if (process.platform !== 'win32') { + return true + } + return sessionAdminStatus ?? false +} + +// 等待内核完全启动并创建管道 +async function waitForCoreReady(): Promise { + const maxRetries = 30 + const retryInterval = 500 + + for (let i = 0; i < maxRetries; i++) { + try { + const axios = await getAxios(true) + await axios.get('/') + await managerLogger.info(`Core ready after ${i + 1} attempts (${(i + 1) * retryInterval}ms)`) + return + } catch (error) { + if (i === 0) { + await managerLogger.info('Waiting for core to be ready...') + } + + if (i === maxRetries - 1) { + await managerLogger.warn(`Core not ready after ${maxRetries} attempts, proceeding anyway`) + return + } + + await new Promise(resolve => setTimeout(resolve, retryInterval)) + } + } +} + export async function checkAdminPrivileges(): Promise { if (process.platform !== 'win32') { return true } const execPromise = promisify(exec) - + try { // 首先尝试 fltmc 命令检测管理员权限 - await execPromise('fltmc') - await managerLogger.info('Admin privileges confirmed via fltmc') + // 使用 chcp 65001 设置 UTF-8 编码，避免中文乱码 + await execPromise('chcp 65001 >nul 2>&1 && fltmc', { encoding: 'utf8' }) return true - } catch (fltmcError) { - await managerLogger.info('fltmc failed, trying net session as fallback', fltmcError) - + } catch (fltmcError: any) { try { // 如果 fltmc 失败，尝试 net session 命令作为备用检测方法 - await execPromise('net session') - await managerLogger.info('Admin privileges confirmed via net session') + await execPromise('chcp 65001 >nul 2>&1 && net session', { encoding: 'utf8' }) return true - } catch (netSessionError) { - await managerLogger.info('Both fltmc and net session failed, no admin privileges', netSessionError) + } catch (netSessionError: any) { return false } } @@ -514,7 +715,8 @@ async function checkHighPrivilegeMihomoProcess(): Promise { for (const executable of mihomoExecutables) { try { - const { stdout } = await execPromise(`tasklist /FI "IMAGENAME eq ${executable}" /FO CSV`) + // 使用 UTF-8 编码执行 tasklist 命令 + const { stdout } = await execPromise(`chcp 65001 >nul 2>&1 && tasklist /FI "IMAGENAME eq ${executable}" /FO CSV`, { encoding: 'utf8' }) const lines = stdout.split('\n').filter(line => line.includes(executable)) if (lines.length > 0) { @@ -525,8 +727,12 @@ async function checkHighPrivilegeMihomoProcess(): Promise { if (parts.length >= 2) { const pid = parts[1].replace(/"/g, '').trim() try { - const { stdout: processInfo } = await execPromise(`powershell -Command "Get-Process -Id ${pid} | Select-Object Name,Id,Path,CommandLine | ConvertTo-Json"`) - const processJson = JSON.parse(processInfo) + // 使用 UTF-8 编码执行 PowerShell 命令 + const { stdout: processInfo } = await execPromise( + `powershell -Command "[Console]::OutputEncoding = [System.Text.Encoding]::UTF8; Get-Process -Id ${pid} | Select-Object Name,Id,Path,CommandLine | ConvertTo-Json"`, + { encoding: 'utf8' } + ) + const processJson = JSON.parse(processInfo) await managerLogger.info(`Process ${pid} info: ${processInfo.substring(0, 200)}`) if (processJson.Name.includes('mihomo') && processJson.Path === null) { diff --git a/src/main/core/mihomoApi.ts b/src/main/core/mihomoApi.ts index c5c2888..c37280d 100644 --- a/src/main/core/mihomoApi.ts +++ b/src/main/core/mihomoApi.ts @@ -6,9 +6,10 @@ import { tray } from '../resolve/tray' import { calcTraffic } from '../utils/calc' import { getRuntimeConfig } from './factory' import { floatingWindow } from '../resolve/floatingWindow' -import { mihomoIpcPath } from './manager' +import { getMihomoIpcPath } from './manager' let axiosIns: AxiosInstance = null! +let currentIpcPath: string = '' let mihomoTrafficWs: WebSocket | null = null let trafficRetry = 10 let mihomoMemoryWs: WebSocket | null = null @@ -19,11 +20,19 @@ let mihomoConnectionsWs: WebSocket | null = null let connectionsRetry = 10 export const getAxios = async (force: boolean = false): Promise => { - if (axiosIns && !force) return axiosIns + const dynamicIpcPath = getMihomoIpcPath() + + // 如路径改变 强制重新创建实例 + if (axiosIns && !force && currentIpcPath === dynamicIpcPath) { + return axiosIns + } + + currentIpcPath = dynamicIpcPath + console.log(`[mihomoApi] Creating axios instance with path: ${dynamicIpcPath}`) axiosIns = axios.create({ baseURL: `http://localhost`, - socketPath: mihomoIpcPath, + socketPath: dynamicIpcPath, timeout: 15000 }) @@ -32,6 +41,12 @@ export const getAxios = async (force: boolean = false): Promise = return response.data }, (error) => { + if (error.code === 'ENOENT') { + console.debug(`[mihomoApi] Pipe not ready: ${error.config?.socketPath}`) + } else { + console.error(`[mihomoApi] Axios error with path ${dynamicIpcPath}:`, error.message) + } + if (error.response && error.response.data) { return Promise.reject(error.response.data) } @@ -200,7 +215,11 @@ export const stopMihomoTraffic = (): void => { } const mihomoTraffic = async (): Promise => { - mihomoTrafficWs = new WebSocket(`ws+unix:${mihomoIpcPath}:/traffic`) + const dynamicIpcPath = getMihomoIpcPath() + const wsUrl = `ws+unix:${dynamicIpcPath}:/traffic` + + console.log(`[mihomoApi] Creating traffic WebSocket with URL: ${wsUrl}`) + mihomoTrafficWs = new WebSocket(wsUrl) mihomoTrafficWs.onmessage = async (e): Promise => { const data = e.data as string @@ -229,7 +248,8 @@ const mihomoTraffic = async (): Promise => { } } - mihomoTrafficWs.onerror = (): void => { + mihomoTrafficWs.onerror = (error): void => { + console.error(`[mihomoApi] Traffic WebSocket error:`, error) if (mihomoTrafficWs) { mihomoTrafficWs.close() mihomoTrafficWs = null @@ -252,7 +272,9 @@ export const stopMihomoMemory = (): void => { } const mihomoMemory = async (): Promise => { - mihomoMemoryWs = new WebSocket(`ws+unix:${mihomoIpcPath}:/memory`) + const dynamicIpcPath = getMihomoIpcPath() + const wsUrl = `ws+unix:${dynamicIpcPath}:/memory` + mihomoMemoryWs = new WebSocket(wsUrl) mihomoMemoryWs.onmessage = (e): void => { const data = e.data as string @@ -295,8 +317,10 @@ export const stopMihomoLogs = (): void => { const mihomoLogs = async (): Promise => { const { 'log-level': logLevel = 'info' } = await getControledMihomoConfig() + const dynamicIpcPath = getMihomoIpcPath() + const wsUrl = `ws+unix:${dynamicIpcPath}:/logs?level=${logLevel}` - mihomoLogsWs = new WebSocket(`ws+unix:${mihomoIpcPath}:/logs?level=${logLevel}`) + mihomoLogsWs = new WebSocket(wsUrl) mihomoLogsWs.onmessage = (e): void => { const data = e.data as string @@ -338,7 +362,9 @@ export const stopMihomoConnections = (): void => { } const mihomoConnections = async (): Promise => { - mihomoConnectionsWs = new WebSocket(`ws+unix:${mihomoIpcPath}:/connections`) + const dynamicIpcPath = getMihomoIpcPath() + const wsUrl = `ws+unix:${dynamicIpcPath}:/connections` + mihomoConnectionsWs = new WebSocket(wsUrl) mihomoConnectionsWs.onmessage = (e): void => { const data = e.data as string diff --git a/src/main/index.ts b/src/main/index.ts index 6efdc36..3ee3b3b 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -3,7 +3,7 @@ import { registerIpcMainHandlers } from './utils/ipc' import windowStateKeeper from 'electron-window-state' import { app, shell, BrowserWindow, Menu, dialog, Notification, powerMonitor } from 'electron' import { addProfileItem, getAppConfig, patchAppConfig } from './config' -import { quitWithoutCore, startCore, stopCore, checkAdminRestartForTun, checkHighPrivilegeCore, restartAsAdmin } from './core/manager' +import { quitWithoutCore, startCore, stopCore, checkAdminRestartForTun, checkHighPrivilegeCore, restartAsAdmin, initAdminStatus } from './core/manager' import { triggerSysProxy } from './sys/sysproxy' import icon from '../../resources/icon.png?asset' import { createTray, hideDockIcon, showDockIcon } from './resolve/tray' @@ -223,6 +223,8 @@ app.whenReady().then(async () => { await checkHighPrivilegeCoreEarly() + await initAdminStatus() + try { await init()