feat: add startup prompt for core permission check

changelog.md

@@ -2,6 +2,7 @@
 
 ### 新功能 (Feat)
 - 如果当前没有以管理员模式运行，TUN 开关保持关闭
+- 区分 app 日志与 core 日志输出为不同文件
 
 ### 修复 (Fix)
 - 修复某些系统下的悬浮窗开启崩溃的问题

src/main/config/smartOverride.ts

@@ -1,5 +1,6 @@
 import { getAppConfig } from './app'
 import { addOverrideItem, removeOverrideItem, getOverrideItem } from './override'
+import { overrideLogger } from '../utils/logger'
 
 const SMART_OVERRIDE_ID = 'smart-core-override'
 
@@ -237,7 +238,7 @@ export async function createSmartOverride(): Promise<void> {
       })
     }
   } catch (error) {
-    console.error('Failed to create Smart override:', error)
+    await overrideLogger.error('Failed to create Smart override', error)
     throw error
   }
 }
@@ -252,7 +253,7 @@ export async function removeSmartOverride(): Promise<void> {
       await removeOverrideItem(SMART_OVERRIDE_ID)
     }
   } catch (error) {
-    console.error('Failed to remove Smart override:', error)
+    await overrideLogger.error('Failed to remove Smart override', error)
     throw error
   }
 }

src/main/core/manager.ts

@@ -1,7 +1,7 @@
 import { ChildProcess, exec, execFile, spawn } from 'child_process'
 import {
   dataDir,
-  logPath,
+  coreLogPath,
   mihomoCoreDir,
   mihomoCorePath,
   mihomoProfileWorkDir,
@@ -41,6 +41,7 @@ import { uploadRuntimeConfig } from '../resolve/gistApi'
 import { startMonitor } from '../resolve/trafficMonitor'
 import { safeShowErrorBox } from '../utils/init'
 import i18next from '../../shared/i18n'
+import { managerLogger } from '../utils/logger'
 
 chokidar.watch(path.join(mihomoCoreDir(), 'meta-update'), {}).on('unlinkDir', async () => {
   try {
@@ -96,13 +97,12 @@ export async function startCore(detached = false): Promise<Promise<void>[]> {
     try {
       await setPublicDNS()
     } catch (error) {
-      await writeFile(logPath(), `[Manager]: set dns failed, ${error}`, {
-        flag: 'a'
-      })
+      await managerLogger.error('set dns failed', error)
     }
   }
-  const stdout = createWriteStream(logPath(), { flags: 'a' })
-  const stderr = createWriteStream(logPath(), { flags: 'a' })
+  // 内核日志输出到独立的 core-日期.log 文件
+  const stdout = createWriteStream(coreLogPath(), { flags: 'a' })
+  const stderr = createWriteStream(coreLogPath(), { flags: 'a' })
   const env = {
     DISABLE_LOOPBACK_DETECTOR: String(disableLoopbackDetector),
     DISABLE_EMBED_CA: String(disableEmbedCA),
@@ -128,11 +128,9 @@ export async function startCore(detached = false): Promise<Promise<void>[]> {
     })
   }
   child.on('close', async (code, signal) => {
-    await writeFile(logPath(), `[Manager]: Core closed, code: ${code}, signal: ${signal}\n`, {
-      flag: 'a'
-    })
+    await managerLogger.info(`Core closed, code: ${code}, signal: ${signal}`)
     if (retry) {
-      await writeFile(logPath(), `[Manager]: Try Restart Core\n`, { flag: 'a' })
+      await managerLogger.info('Try Restart Core')
       retry--
       await restartCore()
     } else {
@@ -194,9 +192,7 @@ export async function stopCore(force = false): Promise<void> {
       await recoverDNS()
     }
   } catch (error) {
-    await writeFile(logPath(), `[Manager]: recover dns failed, ${error}`, {
-      flag: 'a'
-    })
+    await managerLogger.error('recover dns failed', error)
   }
 
   if (child) {
@@ -214,9 +210,7 @@ export async function restartCore(): Promise<void> {
     await startCore()
   } catch (e) {
     // 记录错误到日志而不是显示阻塞对话框
-    await writeFile(logPath(), `[Manager]: restart core failed, ${e}\n`, {
-      flag: 'a'
-    })
+    await managerLogger.error('restart core failed', e)
     // 重新抛出错误，让调用者处理
     throw e
   }
@@ -260,12 +254,12 @@ async function checkProfile(): Promise<void> {
       mihomoTestDir()
     ], { env })
   } catch (error) {
-    console.error('Profile check failed:', error)
+    await managerLogger.error('Profile check failed', error)
 
     if (error instanceof Error && 'stdout' in error) {
       const { stdout, stderr } = error as { stdout: string; stderr?: string }
-      console.log('Profile check stdout:', stdout)
-      console.log('Profile check stderr:', stderr)
+      await managerLogger.info('Profile check stdout', stdout)
+      await managerLogger.info('Profile check stderr', stderr)
 
       const errorLines = stdout
         .split('\n')
@@ -356,14 +350,14 @@ export async function checkAdminPrivileges(): Promise<boolean> {
   }
 }
 
-export async function restartAsAdmin(): Promise<void> {
+export async function restartAsAdmin(addTunFlag = true): Promise<void> {
   if (process.platform !== 'win32') {
     throw new Error('This function is only available on Windows')
   }
 
   const exePath = process.execPath
   const args = process.argv.slice(1)
-  const restartArgs = [...args, '--admin-restart-for-tun']
+  const restartArgs = addTunFlag ? [...args, '--admin-restart-for-tun'] : args.filter(arg => arg !== '--admin-restart-for-tun')
 
   try {
     // 处理路径和参数的引号
@@ -377,15 +371,18 @@ export async function restartAsAdmin(): Promise<void> {
       command = `powershell -Command "Start-Process -FilePath '${escapedExePath}' -Verb RunAs"`
     }
 
-    console.log('Restarting as administrator with command:', command)
+    const logMessage = addTunFlag
+      ? 'Restarting as administrator for TUN mode with command'
+      : 'Restarting as normal user from high privilege detection with command'
+    await managerLogger.info(logMessage, command)
 
     // 执行PowerShell命令
-    exec(command, { windowsHide: true }, (error, _stdout, stderr) => {
+    exec(command, { windowsHide: true }, async (error, _stdout, stderr) => {
       if (error) {
-        console.error('PowerShell execution error:', error)
-        console.error('stderr:', stderr)
+        await managerLogger.error('PowerShell execution error', error)
+        await managerLogger.error('stderr', stderr)
       } else {
-        console.log('PowerShell command executed successfully')
+        await managerLogger.info('PowerShell command executed successfully')
       }
     })
 
@@ -394,7 +391,7 @@ export async function restartAsAdmin(): Promise<void> {
     const { app } = await import('electron')
     app.quit()
   } catch (error) {
-    console.error('Failed to restart as administrator:', error)
+    await managerLogger.error('Failed to restart as administrator', error)
     throw new Error(`Failed to restart as administrator: ${error}`)
   }
 }
@@ -437,7 +434,7 @@ export async function requestTunPermissions(): Promise<void> {
 
 export async function checkAdminRestartForTun(): Promise<void> {
   if (process.argv.includes('--admin-restart-for-tun')) {
-    console.log('Detected admin restart for TUN mode, auto-enabling TUN...')
+    await managerLogger.info('Detected admin restart for TUN mode, auto-enabling TUN...')
 
     try {
       if (process.platform === 'win32') {
@@ -446,24 +443,69 @@ export async function checkAdminRestartForTun(): Promise<void> {
           await patchControledMihomoConfig({ tun: { enable: true }, dns: { enable: true } })
           await restartCore()
 
-          console.log('TUN mode auto-enabled after admin restart')
+          await managerLogger.info('TUN mode auto-enabled after admin restart')
 
           const { mainWindow } = await import('../index')
           mainWindow?.webContents.send('controledMihomoConfigUpdated')
           ipcMain.emit('updateTrayMenu')
         } else {
-          console.warn('Admin restart detected but no admin privileges found')
+          await managerLogger.warn('Admin restart detected but no admin privileges found')
         }
       }
     } catch (error) {
-      console.error('Failed to auto-enable TUN after admin restart:', error)
+      await managerLogger.error('Failed to auto-enable TUN after admin restart', error)
     }
   } else {
+    await checkHighPrivilegeCore()
     // 检查TUN配置与权限的匹配
     await validateTunPermissionsOnStartup()
   }
 }
 
+export async function checkHighPrivilegeCore(): Promise<void> {
+  try {
+    // 在 Win 平台检查
+    if (process.platform !== 'win32') {
+      return
+    }
+
+    const hasAdminPrivileges = await checkAdminPrivileges()
+    if (hasAdminPrivileges) {
+      await managerLogger.info('Detected high privilege core startup, showing dialog...')
+
+      const { dialog, app } = await import('electron')
+      const { t } = await import('i18next')
+
+      // 对话框
+      const result = await dialog.showMessageBox({
+        type: 'warning',
+        title: t('tun.permissions.highPrivilegeDetected.title'),
+        message: t('tun.permissions.highPrivilegeDetected.message'),
+        detail: t('tun.permissions.highPrivilegeDetected.detail'),
+        buttons: [
+          t('tun.permissions.highPrivilegeDetected.restart'),
+          t('tun.permissions.highPrivilegeDetected.exit')
+        ],
+        defaultId: 0,
+        cancelId: 1,
+        noLink: true
+      })
+
+      if (result.response === 0) {
+        await managerLogger.info('User confirmed restart as normal user')
+        await restartAsAdmin(false)
+      } else {
+        await managerLogger.info('User cancelled, exiting application')
+        app.quit()
+      }
+    }
+  } catch (error) {
+    await managerLogger.error('Failed to check high privilege core', error)
+  }
+}
+
+
+
 export async function validateTunPermissionsOnStartup(): Promise<void> {
   try {
     const { tun } = await getControledMihomoConfig()
@@ -475,7 +517,7 @@ export async function validateTunPermissionsOnStartup(): Promise<void> {
     const hasPermissions = await checkMihomoCorePermissions()
 
     if (!hasPermissions) {
-      console.warn('TUN is enabled but insufficient permissions detected, auto-disabling TUN...')
+      await managerLogger.warn('TUN is enabled but insufficient permissions detected, auto-disabling TUN...')
 
       await patchControledMihomoConfig({ tun: { enable: false } })
 
@@ -483,12 +525,12 @@ export async function validateTunPermissionsOnStartup(): Promise<void> {
       mainWindow?.webContents.send('controledMihomoConfigUpdated')
       ipcMain.emit('updateTrayMenu')
 
-      console.log('TUN auto-disabled due to insufficient permissions')
+      await managerLogger.info('TUN auto-disabled due to insufficient permissions')
     } else {
-      console.log('TUN permissions validated successfully')
+      await managerLogger.info('TUN permissions validated successfully')
     }
   } catch (error) {
-    console.error('Failed to validate TUN permissions on startup:', error)
+    await managerLogger.error('Failed to validate TUN permissions on startup', error)
   }
 }
 

src/main/index.ts

@@ -20,6 +20,7 @@ import { startMonitor } from './resolve/trafficMonitor'
 import { showFloatingWindow } from './resolve/floatingWindow'
 import { initI18n } from '../shared/i18n'
 import i18next from 'i18next'
+import { logger } from './utils/logger'
 
 // 错误处理
 function showSafeErrorBox(titleKey: string, message: string): void {
@@ -198,7 +199,7 @@ app.whenReady().then(async () => {
     try {
       await showFloatingWindow()
     } catch (error) {
-      console.error('Failed to create floating window on startup:', error)
+      await logger.error('Failed to create floating window on startup', error)
     }
   }
   if (!disableTray) {

src/main/resolve/backup.ts

@@ -12,6 +12,7 @@ import {
   subStoreDir,
   themesDir
 } from '../utils/dirs'
+import { systemLogger } from '../utils/logger'
 
 export async function webdavBackup(): Promise<boolean> {
   const { createClient } = await import('webdav/dist/node/index.js')
@@ -75,7 +76,7 @@ export async function webdavBackup(): Promise<boolean> {
         }
       }
     } catch (error) {
-      console.error('Failed to clean up old backup files:', error)
+      await systemLogger.error('Failed to clean up old backup files', error)
     }
   }
 

src/main/resolve/floatingWindow.ts

@@ -5,54 +5,23 @@ import { join } from 'path'
 import { getAppConfig, patchAppConfig } from '../config'
 import { applyTheme } from './theme'
 import { buildContextMenu, showTrayIcon } from './tray'
-import { writeFile } from 'fs/promises'
-import { logDir } from '../utils/dirs'
-import path from 'path'
+import { floatingWindowLogger } from '../utils/logger'
 
 export let floatingWindow: BrowserWindow | null = null
 
-// 悬浮窗日志记录
-async function logFloatingWindow(message: string, error?: any): Promise<void> {
-  try {
-    const timestamp = new Date().toISOString()
-    const logMessage = error
-      ? `[${timestamp}] [FloatingWindow] ${message}: ${error}\n`
-      : `[${timestamp}] [FloatingWindow] ${message}\n`
-
-    const logPath = path.join(logDir(), 'floating-window.log')
-    await writeFile(logPath, logMessage, { flag: 'a' })
-
-    if (error) {
-      console.error(`[FloatingWindow] ${message}:`, error)
-    } else {
-      console.log(`[FloatingWindow] ${message}`)
-    }
-  } catch (logError) {
-
-    console.error('[FloatingWindow] Failed to write log:', logError)
-    console.log(`[FloatingWindow] Original message: ${message}`, error)
-  }
+function logError(message: string, error?: any): void {
+  floatingWindowLogger.log(`FloatingWindow Error: ${message}`, error).catch(() => {})
 }
 
 async function createFloatingWindow(): Promise<void> {
   try {
-    await logFloatingWindow('Starting to create floating window...')
-    const floatingWindowState = windowStateKeeper({
-      file: 'floating-window-state.json'
-    })
-    await logFloatingWindow('Window state keeper initialized')
+    const floatingWindowState = windowStateKeeper({ file: 'floating-window-state.json' })
     const { customTheme = 'default.css', floatingWindowCompatMode = true } = await getAppConfig()
-    await logFloatingWindow(`App config loaded, theme: ${customTheme}, compatMode: ${floatingWindowCompatMode}`)
 
     const safeMode = process.env.FLOATING_SAFE_MODE === 'true'
-    const forceWin10Mode = process.env.FLOATING_WIN10_MODE === 'true'
-    const useCompatMode = floatingWindowCompatMode || forceWin10Mode || safeMode
-
-    await logFloatingWindow(`Safe mode: ${safeMode}`)
-    await logFloatingWindow(`Force Win10 mode: ${forceWin10Mode}`)
-    await logFloatingWindow(`Compat mode from config: ${floatingWindowCompatMode}`)
-    await logFloatingWindow(`Platform: ${process.platform}, System version: ${process.getSystemVersion()}`)
-    await logFloatingWindow(`Using compatibility mode: ${useCompatMode}`)
+    const useCompatMode = floatingWindowCompatMode ||
+                         process.env.FLOATING_COMPAT_MODE === 'true' ||
+                         safeMode
 
     const windowOptions: Electron.BrowserWindowConstructorOptions = {
       width: 120,
@@ -60,16 +29,16 @@ async function createFloatingWindow(): Promise<void> {
       x: floatingWindowState.x,
       y: floatingWindowState.y,
       show: false,
-      frame: safeMode ? true : false,
+      frame: safeMode,
       alwaysOnTop: !safeMode,
       resizable: safeMode,
-      transparent: !safeMode && !useCompatMode, // 兼容模式下禁用透明
+      transparent: !safeMode && !useCompatMode,
       skipTaskbar: !safeMode,
       minimizable: safeMode,
       maximizable: safeMode,
       fullscreenable: false,
       closable: safeMode,
-      backgroundColor: safeMode ? '#ffffff' : (useCompatMode ? '#f0f0f0' : '#00000000'), // 兼容模式使用浅灰色
+      backgroundColor: safeMode ? '#ffffff' : (useCompatMode ? '#f0f0f0' : '#00000000'),
       webPreferences: {
         preload: join(__dirname, '../preload/index.js'),
         spellcheck: false,
@@ -79,91 +48,46 @@ async function createFloatingWindow(): Promise<void> {
       }
     }
 
-    // windows 添加兼容性处理
     if (process.platform === 'win32') {
       windowOptions.hasShadow = !safeMode
       windowOptions.webPreferences!.offscreen = false
     }
 
-    await logFloatingWindow(`Creating BrowserWindow with options: ${JSON.stringify(windowOptions, null, 2)}`)
+    floatingWindow = new BrowserWindow(windowOptions)
+    floatingWindowState.manage(floatingWindow)
 
-    try {
-      floatingWindow = new BrowserWindow(windowOptions)
-      await logFloatingWindow('BrowserWindow created successfully')
-    } catch (error) {
-      await logFloatingWindow('Failed to create BrowserWindow', error)
-      throw error
-    }
-
-    try {
-      await logFloatingWindow('Attaching window state management...')
-      floatingWindowState.manage(floatingWindow)
-      await logFloatingWindow('Window state management attached')
-    } catch (error) {
-      await logFloatingWindow('Failed to attach window state management', error)
-      throw error
-    }
-
-    await logFloatingWindow('Setting up event listeners...')
-
-    try {
-      await logFloatingWindow('Adding render-process-gone listener...')
-      floatingWindow.webContents.on('render-process-gone', async (_, details) => {
-        await logFloatingWindow('Render process gone', details.reason)
-        floatingWindow = null
-      })
-      await logFloatingWindow('Render-process-gone listener added')
-    } catch (error) {
-      await logFloatingWindow('Failed to add render-process-gone listener', error)
-      throw error
-    }
-
-    await logFloatingWindow('Adding ready-to-show listener...')
-    floatingWindow.on('ready-to-show', async () => {
-      try {
-        await logFloatingWindow('Window ready to show, applying theme...')
-        applyTheme(customTheme)
-        await logFloatingWindow('Theme applied, showing window...')
-        floatingWindow?.show()
-        await logFloatingWindow('Window shown, setting always on top...')
-        floatingWindow?.setAlwaysOnTop(true, 'screen-saver')
-        await logFloatingWindow('Floating window setup completed successfully')
-      } catch (error) {
-        await logFloatingWindow('Error in ready-to-show', error)
-      }
+    // 事件监听器
+    floatingWindow.webContents.on('render-process-gone', (_, details) => {
+      logError('Render process gone', details.reason)
+      floatingWindow = null
+    })
+
+    floatingWindow.on('ready-to-show', () => {
+      applyTheme(customTheme)
+      floatingWindow?.show()
+      floatingWindow?.setAlwaysOnTop(true, 'screen-saver')
     })
-    await logFloatingWindow('Ready-to-show listener added')
 
-    await logFloatingWindow('Adding moved listener...')
     floatingWindow.on('moved', () => {
-      if (floatingWindow) floatingWindowState.saveState(floatingWindow)
+      floatingWindow && floatingWindowState.saveState(floatingWindow)
     })
-    await logFloatingWindow('Moved listener added')
-    await logFloatingWindow('Adding IPC listener...')
+
+    // IPC 监听器
     ipcMain.on('updateFloatingWindow', () => {
       if (floatingWindow) {
-        floatingWindow?.webContents.send('controledMihomoConfigUpdated')
-        floatingWindow?.webContents.send('appConfigUpdated')
+        floatingWindow.webContents.send('controledMihomoConfigUpdated')
+        floatingWindow.webContents.send('appConfigUpdated')
       }
     })
-    await logFloatingWindow('IPC listener added')
 
-    await logFloatingWindow('Loading page...')
-    if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
-      const devUrl = `${process.env['ELECTRON_RENDERER_URL']}/floating.html`
-      await logFloatingWindow(`Loading dev URL: ${devUrl}`)
-      await floatingWindow.loadURL(devUrl)
-    } else {
-      const filePath = join(__dirname, '../renderer/floating.html')
-      await logFloatingWindow(`Loading file: ${filePath}`)
-      await floatingWindow.loadFile(filePath)
-    }
-    await logFloatingWindow('Page loaded successfully')
+    // 加载页面
+    const url = is.dev && process.env['ELECTRON_RENDERER_URL']
+      ? `${process.env['ELECTRON_RENDERER_URL']}/floating.html`
+      : join(__dirname, '../renderer/floating.html')
+
+    is.dev ? await floatingWindow.loadURL(url) : await floatingWindow.loadFile(url)
   } catch (error) {
-    await logFloatingWindow('Failed to create floating window', error)
-    if (error instanceof Error) {
-      await logFloatingWindow(`Error stack: ${error.stack}`)
-    }
+    logError('Failed to create floating window', error)
     floatingWindow = null
     throw error
   }
@@ -172,26 +96,20 @@ async function createFloatingWindow(): Promise<void> {
 export async function showFloatingWindow(): Promise<void> {
   try {
     if (floatingWindow && !floatingWindow.isDestroyed()) {
-      await logFloatingWindow('Showing existing floating window')
       floatingWindow.show()
     } else {
-      await logFloatingWindow('Creating new floating window')
       await createFloatingWindow()
     }
   } catch (error) {
-    await logFloatingWindow('Failed to show floating window', error)
+    logError('Failed to show floating window', error)
 
-    // 如果已经是兼容模式还是崩溃，说明问题很严重，自动禁用悬浮窗
+    // 如果已经是兼容模式还是崩溃，自动禁用悬浮窗
     const { floatingWindowCompatMode = true } = await getAppConfig()
     if (floatingWindowCompatMode) {
-      await logFloatingWindow('Compatibility mode was already enabled, disabling floating window completely')
       await patchAppConfig({ showFloatingWindow: false })
     } else {
-      await logFloatingWindow('Enabling compatibility mode and retrying')
       await patchAppConfig({ floatingWindowCompatMode: true })
     }
-
-    await logFloatingWindow('Disabled floating window in config due to error')
     throw error
   }
 }

src/main/resolve/server.ts

@@ -11,6 +11,7 @@ import { nativeImage } from 'electron'
 import express from 'express'
 import axios from 'axios'
 import AdmZip from 'adm-zip'
+import { systemLogger } from '../utils/logger'
 
 export let pacPort: number
 export let subStorePort: number
@@ -168,7 +169,6 @@ export async function downloadSubStore(): Promise<void> {
     )
     await writeFile(tempBackendPath, Buffer.from(backendRes.data))
     // 下载前端文件
-    const tempFrontendDir = path.join(tempDir, 'dist')
     const frontendRes = await axios.get(
       'https://github.com/sub-store-org/Sub-Store-Front-End/releases/latest/download/dist.zip',
       {
@@ -192,7 +192,7 @@ export async function downloadSubStore(): Promise<void> {
     await cp(path.join(tempDir, 'dist'), frontendDir, { recursive: true })
     await rm(tempDir, { recursive: true })
   } catch (error) {
-    console.error('substore.downloadFailed:', error)
+    await systemLogger.error('substore.downloadFailed', error)
     throw error
   }
 }

src/main/resolve/tray.ts

@@ -22,14 +22,15 @@ import { triggerSysProxy } from '../sys/sysproxy'
 import { quitWithoutCore, restartCore, checkMihomoCorePermissions, requestTunPermissions, restartAsAdmin } from '../core/manager'
 import { floatingWindow, triggerFloatingWindow } from './floatingWindow'
 import { t } from 'i18next'
+import { trayLogger } from '../utils/logger'
 
 export let tray: Tray | null = null
 
 export const buildContextMenu = async (): Promise<Menu> => {
   // 添加调试日志
-  console.log('Current translation for tray.showWindow:', t('tray.showWindow'))
-  console.log('Current translation for tray.hideFloatingWindow:', t('tray.hideFloatingWindow'))
-  console.log('Current translation for tray.showFloatingWindow:', t('tray.showFloatingWindow'))
+  await trayLogger.debug('Current translation for tray.showWindow', t('tray.showWindow'))
+  await trayLogger.debug('Current translation for tray.hideFloatingWindow', t('tray.hideFloatingWindow'))
+  await trayLogger.debug('Current translation for tray.showFloatingWindow', t('tray.showFloatingWindow'))
 
   const { mode, tun } = await getControledMihomoConfig()
   const {
@@ -187,7 +188,7 @@ export const buildContextMenu = async (): Promise<Menu> => {
                   try {
                     await restartAsAdmin()
                   } catch (error) {
-                    console.error('Failed to restart as admin from tray:', error)
+                    await trayLogger.error('Failed to restart as admin from tray', error)
                     item.checked = false
                     ipcMain.emit('updateTrayMenu')
                     return
@@ -196,7 +197,7 @@ export const buildContextMenu = async (): Promise<Menu> => {
                   try {
                     await requestTunPermissions()
                   } catch (error) {
-                    console.error('Failed to grant TUN permissions from tray:', error)
+                    await trayLogger.error('Failed to grant TUN permissions from tray', error)
                     item.checked = false
                     ipcMain.emit('updateTrayMenu')
                     return
@@ -204,7 +205,7 @@ export const buildContextMenu = async (): Promise<Menu> => {
                 }
               }
             } catch (error) {
-              console.warn('Permission check failed in tray:', error)
+              await trayLogger.warn('Permission check failed in tray', error)
             }
 
             await patchControledMihomoConfig({ tun: { enable }, dns: { enable: true } })
@@ -418,13 +419,13 @@ export async function closeTrayIcon(): Promise<void> {
 }
 
 export async function showDockIcon(): Promise<void> {
-  if (process.platform === 'darwin' && !app.dock.isVisible()) {
+  if (process.platform === 'darwin' && app.dock && !app.dock.isVisible()) {
     await app.dock.show()
   }
 }
 
 export async function hideDockIcon(): Promise<void> {
-  if (process.platform === 'darwin' && app.dock.isVisible()) {
+  if (process.platform === 'darwin' && app.dock && app.dock.isVisible()) {
     app.dock.hide()
   }
 }

src/main/sys/sysproxy.ts

@@ -8,6 +8,7 @@ import { resourcesFilesDir } from '../utils/dirs'
 import { net } from 'electron'
 import axios from 'axios'
 import fs from 'fs'
+import { proxyLogger } from '../utils/logger'
 
 let defaultBypass: string[]
 let triggerSysProxyTimer: NodeJS.Timeout | null = null
@@ -175,7 +176,7 @@ async function requestSocketRecreation(): Promise<void> {
     // Wait a bit for socket recreation
     await new Promise(resolve => setTimeout(resolve, 1000))
   } catch (error) {
-    console.log('Failed to send signal to helper:', error)
+    await proxyLogger.error('Failed to send signal to helper', error)
     throw error
   }
 }
@@ -197,16 +198,16 @@ async function helperRequest(requestFn: () => Promise<unknown>, maxRetries = 1):
            (error as Error).message?.includes('connect ECONNREFUSED') ||
            (error as Error).message?.includes('ENOENT'))) {
         
-        console.log(`Helper request failed (attempt ${attempt + 1}), checking socket file...`)
-        
+        await proxyLogger.info(`Helper request failed (attempt ${attempt + 1}), checking socket file...`)
+
         if (!isSocketFileExists()) {
-          console.log('Socket file missing, requesting recreation...')
+          await proxyLogger.info('Socket file missing, requesting recreation...')
           try {
             await requestSocketRecreation()
-            console.log('Socket recreation requested, retrying...')
+            await proxyLogger.info('Socket recreation requested, retrying...')
             continue
           } catch (signalError) {
-            console.log('Failed to request socket recreation:', signalError)
+            await proxyLogger.warn('Failed to request socket recreation', signalError)
           }
         }
       }

src/main/utils/dirs.ts

@@ -134,12 +134,27 @@ export function logDir(): string {
 
 export function logPath(): string {
   const date = new Date()
-  const name = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`
+  const year = date.getFullYear()
+  const month = String(date.getMonth() + 1).padStart(2, '0')
+  const day = String(date.getDate()).padStart(2, '0')
+  const name = `mihomo-party-${year}-${month}-${day}`
   return path.join(logDir(), `${name}.log`)
 }
 
 export function substoreLogPath(): string {
   const date = new Date()
-  const name = `sub-store-${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`
+  const year = date.getFullYear()
+  const month = String(date.getMonth() + 1).padStart(2, '0')
+  const day = String(date.getDate()).padStart(2, '0')
+  const name = `sub-store-${year}-${month}-${day}`
+  return path.join(logDir(), `${name}.log`)
+}
+
+export function coreLogPath(): string {
+  const date = new Date()
+  const year = date.getFullYear()
+  const month = String(date.getMonth() + 1).padStart(2, '0')
+  const day = String(date.getDate()).padStart(2, '0')
+  const name = `core-${year}-${month}-${day}`
   return path.join(logDir(), `${name}.log`)
 }

src/main/utils/init.ts

@@ -42,6 +42,7 @@ import {
 import { app, dialog } from 'electron'
 import { startSSIDCheck } from '../sys/ssid'
 import i18next from '../../shared/i18n'
+import { initLogger } from './logger'
 
 // 安全错误处理
 export function safeShowErrorBox(titleKey: string, message: string): void {
@@ -115,7 +116,7 @@ async function initDirs(): Promise<void> {
         await mkdir(dir, { recursive: true })
       }
     } catch (error) {
-      console.error(`Failed to create directory ${dir}:`, error)
+      await initLogger.error(`Failed to create directory ${dir}`, error)
       throw new Error(`Failed to create directory ${dir}: ${error}`)
     }
   }
@@ -136,7 +137,7 @@ async function initConfig(): Promise<void> {
         await writeFile(config.path, yaml.stringify(config.content))
       }
     } catch (error) {
-      console.error(`Failed to create ${config.name} at ${config.path}:`, error)
+      await initLogger.error(`Failed to create ${config.name} at ${config.path}`, error)
       throw new Error(`Failed to create ${config.name}: ${error}`)
     }
   }
@@ -163,7 +164,7 @@ async function initFiles(): Promise<void> {
         }
       }
     } catch (error) {
-      console.error(`Failed to copy ${file}:`, error)
+      await initLogger.error(`Failed to copy ${file}`, error)
       if (['country.mmdb', 'geoip.dat', 'geosite.dat'].includes(file)) {
         throw new Error(`Failed to copy critical file ${file}: ${error}`)
       }

src/main/utils/logger.ts

@@ -0,0 +1,108 @@
+import { writeFile } from 'fs/promises'
+import { logPath } from './dirs'
+
+export type LogLevel = 'debug' | 'info' | 'warn' | 'error'
+
+class Logger {
+  private moduleName: string
+
+  constructor(moduleName: string) {
+    this.moduleName = moduleName
+  }
+
+  private formatTimestamp(): string {
+    return new Date().toISOString()
+  }
+
+  private formatLogMessage(level: LogLevel, message: string, error?: any): string {
+    const timestamp = this.formatTimestamp()
+    const errorStr = error ? `: ${error}` : ''
+    return `[${timestamp}] [${level.toUpperCase()}] [${this.moduleName}] ${message}${errorStr}\n`
+  }
+
+  private async writeToFile(level: LogLevel, message: string, error?: any): Promise<void> {
+    try {
+      const appLogPath = logPath()
+      const logMessage = this.formatLogMessage(level, message, error)
+      await writeFile(appLogPath, logMessage, { flag: 'a' })
+    } catch (logError) {
+      // 如果写入日志文件失败，仍然输出到控制台
+      console.error(`[Logger] Failed to write to log file:`, logError)
+      console.error(`[Logger] Original message: [${level.toUpperCase()}] [${this.moduleName}] ${message}`, error)
+    }
+  }
+
+  private logToConsole(level: LogLevel, message: string, error?: any): void {
+    const prefix = `[${this.moduleName}] ${message}`
+    
+    switch (level) {
+      case 'debug':
+        console.debug(prefix, error || '')
+        break
+      case 'info':
+        console.log(prefix, error || '')
+        break
+      case 'warn':
+        console.warn(prefix, error || '')
+        break
+      case 'error':
+        console.error(prefix, error || '')
+        break
+    }
+  }
+
+  async debug(message: string, error?: any): Promise<void> {
+    await this.writeToFile('debug', message, error)
+    this.logToConsole('debug', message, error)
+  }
+
+  async info(message: string, error?: any): Promise<void> {
+    await this.writeToFile('info', message, error)
+    this.logToConsole('info', message, error)
+  }
+
+  async warn(message: string, error?: any): Promise<void> {
+    await this.writeToFile('warn', message, error)
+    this.logToConsole('warn', message, error)
+  }
+
+  async error(message: string, error?: any): Promise<void> {
+    await this.writeToFile('error', message, error)
+    this.logToConsole('error', message, error)
+  }
+
+  // 兼容原有的 logFloatingWindow 函数签名
+  async log(message: string, error?: any): Promise<void> {
+    if (error) {
+      await this.error(message, error)
+    } else {
+      await this.info(message)
+    }
+  }
+}
+
+// 创建不同模块的日志实例
+export const createLogger = (moduleName: string): Logger => {
+  return new Logger(moduleName)
+}
+
+// 统一的应用日志实例 - 所有模块共享同一个日志文件
+export const appLogger = createLogger('app')
+
+// 为了保持向后兼容性，创建各模块的日志实例（都指向同一个应用日志）
+export const floatingWindowLogger = createLogger('floating-window')
+export const coreLogger = createLogger('mihomo-core')
+export const apiLogger = createLogger('mihomo-api')
+export const configLogger = createLogger('config')
+export const systemLogger = createLogger('system')
+export const trafficLogger = createLogger('traffic-monitor')
+export const trayLogger = createLogger('tray')
+export const initLogger = createLogger('init')
+export const ipcLogger = createLogger('ipc')
+export const proxyLogger = createLogger('sysproxy')
+export const managerLogger = createLogger('manager')
+export const factoryLogger = createLogger('factory')
+export const overrideLogger = createLogger('override')
+
+// 默认日志实例
+export const logger = appLogger

src/main/utils/template.ts

@@ -22,6 +22,10 @@ export const defaultConfig: IAppConfig = {
   controlDns: true,
   controlSniff: true,
   floatingWindowCompatMode: true,
+  disableLoopbackDetector: false,
+  disableEmbedCA: false,
+  disableSystemCA: false,
+  skipSafePathCheck: false,
   nameserverPolicy: {},
   siderOrder: [
     'sysproxy',

src/renderer/src/locales/en-US.json

@@ -323,6 +323,11 @@
   "tun.permissions.windowsRestart": "On Windows, you need to restart the application as administrator to use TUN mode",
   "tun.permissions.requesting": "Requesting administrator privileges, please click 'Yes' in the UAC dialog...",
   "tun.permissions.restarting": "Restarting application with administrator privileges, please click 'Yes' in the UAC dialog...",
+  "tun.permissions.highPrivilegeDetected.title": "High Privilege Core Detected",
+  "tun.permissions.highPrivilegeDetected.message": "Application is running with administrator privileges",
+  "tun.permissions.highPrivilegeDetected.detail": "About to restart the application in administrator mode. Restart now?",
+  "tun.permissions.highPrivilegeDetected.restart": "Restart",
+  "tun.permissions.highPrivilegeDetected.exit": "Exit Application",
   "dns.title": "DNS Settings",
   "dns.enable": "Enable DNS",
   "dns.enhancedMode.title": "Domain Mapping Mode",

src/renderer/src/locales/fa-IR.json

@@ -307,6 +307,16 @@
   "tun.notifications.coreAuthSuccess": "مجوزدهی به هسته با موفقیت انجام شد",
   "tun.notifications.firewallResetSuccess": "بازنشانی دیوار آتش با موفقیت انجام شد",
   "tun.error.tunPermissionDenied": "راه‌اندازی رابط TUN با شکست مواجه شد، لطفا به صورت دستی به هسته مجوز دهید",
+  "tun.permissions.required": "حالت TUN نیاز به مجوزهای مدیر دارد. آیا اکنون برنامه را مجدداً راه‌اندازی کنیم تا مجوزها را دریافت کنیم؟",
+  "tun.permissions.failed": "مجوزدهی با شکست مواجه شد",
+  "tun.permissions.windowsRestart": "در ویندوز، برای استفاده از حالت TUN باید برنامه را به عنوان مدیر مجدداً راه‌اندازی کنید",
+  "tun.permissions.requesting": "درخواست مجوزهای مدیر، لطفا در دیالوگ UAC روی 'بله' کلیک کنید...",
+  "tun.permissions.restarting": "راه‌اندازی مجدد برنامه با مجوزهای مدیر، لطفا در دیالوگ UAC روی 'بله' کلیک کنید...",
+  "tun.permissions.highPrivilegeDetected.title": "هسته با مجوزهای بالا شناسایی شد",
+  "tun.permissions.highPrivilegeDetected.message": "برنامه با مجوزهای مدیر در حال اجرا است",
+  "tun.permissions.highPrivilegeDetected.detail": "برنامه در حالت مدیر سیستم دوباره راه‌اندازی خواهد شد. آیا می‌خواهید اکنون راه‌اندازی مجدد شود؟",
+  "tun.permissions.highPrivilegeDetected.restart": "راه‌اندازی مجدد",
+  "tun.permissions.highPrivilegeDetected.exit": "خروج از برنامه",
   "dns.title": "تنظیمات DNS",
   "dns.enable": "فعال‌سازی DNS",
   "dns.enhancedMode.title": "حالت نگاشت دامنه",

src/renderer/src/locales/ru-RU.json

@@ -307,6 +307,16 @@
   "tun.notifications.coreAuthSuccess": "Авторизация ядра успешна",
   "tun.notifications.firewallResetSuccess": "Брандмауэр успешно сброшен",
   "tun.error.tunPermissionDenied": "Ошибка запуска TUN, попробуйте вручную предоставить разрешения ядру",
+  "tun.permissions.required": "Режим TUN требует прав администратора. Перезапустить приложение сейчас для получения разрешений?",
+  "tun.permissions.failed": "Ошибка авторизации разрешений",
+  "tun.permissions.windowsRestart": "В Windows необходимо перезапустить приложение от имени администратора для использования режима TUN",
+  "tun.permissions.requesting": "Запрос прав администратора, пожалуйста, нажмите 'Да' в диалоге UAC...",
+  "tun.permissions.restarting": "Перезапуск приложения с правами администратора, пожалуйста, нажмите 'Да' в диалоге UAC...",
+  "tun.permissions.highPrivilegeDetected.title": "Обнаружено ядро с высокими привилегиями",
+  "tun.permissions.highPrivilegeDetected.message": "Приложение работает с правами администратора",
+  "tun.permissions.highPrivilegeDetected.detail": "Сейчас приложение будет перезапущено в режиме администратора. Перезапустить сейчас?",
+  "tun.permissions.highPrivilegeDetected.restart": "Перезапустить",
+  "tun.permissions.highPrivilegeDetected.exit": "Выйти из приложения",
   "dns.title": "Настройки DNS",
   "dns.enable": "Включить DNS",
   "dns.enhancedMode.title": "Режим маппинга доменов",

src/renderer/src/locales/zh-CN.json

@@ -323,6 +323,11 @@
   "tun.permissions.windowsRestart": "Windows下需要以管理员身份重新启动应用才能使用TUN模式",
   "tun.permissions.requesting": "正在请求管理员权限，请在UAC对话框中点击'是'...",
   "tun.permissions.restarting": "正在以管理员权限重启应用，请在UAC对话框中点击'是'...",
+  "tun.permissions.highPrivilegeDetected.title": "检测到高权限内核",
+  "tun.permissions.highPrivilegeDetected.message": "应用正在以管理员权限运行",
+  "tun.permissions.highPrivilegeDetected.detail": "即将以管理员模式重启应用，现在重新启动吗？",
+  "tun.permissions.highPrivilegeDetected.restart": "重新启动",
+  "tun.permissions.highPrivilegeDetected.exit": "退出应用",
   "dns.title": "DNS 设置",
   "dns.enable": "启用 DNS",
   "dns.enhancedMode.title": "域名映射模式",