Compare commits

...

3 Commits

Author SHA1 Message Date
ezequielnick
6172cadca8 chore: add dev release 2025-08-09 19:02:08 +08:00
ezequielnick
b5ee701530 feat: validate TUN configuration and permission compatibility 2025-08-09 15:43:40 +08:00
ezequielnick
58732ce653 feat: add fallback mechanism for floating window startup failure 2025-08-09 13:48:55 +08:00
4 changed files with 186 additions and 59 deletions

View File

@ -67,6 +67,18 @@ jobs:
dist/*portable.7z dist/*portable.7z
body_path: changelog.md body_path: changelog.md
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: Publish Dev Release
if: github.event_name == 'workflow_dispatch'
uses: softprops/action-gh-release@v2
with:
tag_name: dev
files: |
dist/*.sha256
dist/*setup.exe
dist/*portable.7z
body: "Development build from ${{ github.sha }}"
prerelease: true
token: ${{ secrets.GITHUB_TOKEN }}
windows7: windows7:
strategy: strategy:
@ -124,6 +136,18 @@ jobs:
dist/*portable.7z dist/*portable.7z
body_path: changelog.md body_path: changelog.md
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: Publish Dev Release
if: github.event_name == 'workflow_dispatch'
uses: softprops/action-gh-release@v2
with:
tag_name: dev
files: |
dist/*.sha256
dist/*setup.exe
dist/*portable.7z
body: "Development build from ${{ github.sha }}"
prerelease: true
token: ${{ secrets.GITHUB_TOKEN }}
linux: linux:
strategy: strategy:
@ -174,6 +198,18 @@ jobs:
dist/*.rpm dist/*.rpm
body_path: changelog.md body_path: changelog.md
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: Publish Dev Release
if: github.event_name == 'workflow_dispatch'
uses: softprops/action-gh-release@v2
with:
tag_name: dev
files: |
dist/*.sha256
dist/*.deb
dist/*.rpm
body: "Development build from ${{ github.sha }}"
prerelease: true
token: ${{ secrets.GITHUB_TOKEN }}
macos: macos:
strategy: strategy:
@ -247,6 +283,17 @@ jobs:
dist/*.pkg dist/*.pkg
body_path: changelog.md body_path: changelog.md
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: Publish Dev Release
if: github.event_name == 'workflow_dispatch'
uses: softprops/action-gh-release@v2
with:
tag_name: dev
files: |
dist/*.sha256
dist/*.pkg
body: "Development build from ${{ github.sha }}"
prerelease: true
token: ${{ secrets.GITHUB_TOKEN }}
macos10: macos10:
strategy: strategy:
@ -322,9 +369,20 @@ jobs:
dist/*.pkg dist/*.pkg
body_path: changelog.md body_path: changelog.md
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: Publish Dev Release
if: github.event_name == 'workflow_dispatch'
uses: softprops/action-gh-release@v2
with:
tag_name: dev
files: |
dist/*.sha256
dist/*.pkg
body: "Development build from ${{ github.sha }}"
prerelease: true
token: ${{ secrets.GITHUB_TOKEN }}
updater: updater:
if: startsWith(github.ref, 'refs/tags/v') if: startsWith(github.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch'
needs: [windows, macos, windows7, macos10] needs: [windows, macos, windows7, macos10]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
@ -335,17 +393,28 @@ jobs:
- name: Install Dependencies - name: Install Dependencies
run: pnpm install run: pnpm install
- name: Telegram Notification - name: Telegram Notification
if: startsWith(github.ref, 'refs/tags/v')
env: env:
TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }} TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
run: pnpm telegram run: pnpm telegram
- name: Generate latest.yml - name: Generate latest.yml
run: pnpm updater run: pnpm updater
- name: Publish Release - name: Publish Release
if: startsWith(github.ref, 'refs/tags/v')
uses: softprops/action-gh-release@v2 uses: softprops/action-gh-release@v2
with: with:
files: latest.yml files: latest.yml
body_path: changelog.md body_path: changelog.md
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: Publish Dev Release
if: github.event_name == 'workflow_dispatch'
uses: softprops/action-gh-release@v2
with:
tag_name: dev
files: latest.yml
body: "Development build updater from ${{ github.sha }}"
prerelease: true
token: ${{ secrets.GITHUB_TOKEN }}
aur-release-updater: aur-release-updater:
strategy: strategy:

View File

@ -458,19 +458,37 @@ export async function checkAdminRestartForTun(): Promise<void> {
} catch (error) { } catch (error) {
console.error('Failed to auto-enable TUN after admin restart:', error) console.error('Failed to auto-enable TUN after admin restart:', error)
} }
} else if (process.platform === 'win32') { } else {
// 检查TUN配置与权限的匹配
await validateTunPermissionsOnStartup()
}
}
export async function validateTunPermissionsOnStartup(): Promise<void> {
try { try {
const hasAdminPrivileges = await checkAdminPrivileges()
const { tun } = await getControledMihomoConfig() const { tun } = await getControledMihomoConfig()
if (hasAdminPrivileges && !tun?.enable) { if (!tun?.enable) {
console.log('Running with admin privileges but TUN is disabled') return
}
const hasPermissions = await checkMihomoCorePermissions()
if (!hasPermissions) {
console.warn('TUN is enabled but insufficient permissions detected, auto-disabling TUN...')
await patchControledMihomoConfig({ tun: { enable: false } })
const { mainWindow } = await import('../index') const { mainWindow } = await import('../index')
mainWindow?.webContents.send('adminPrivilegesDetected', { tunEnabled: false }) mainWindow?.webContents.send('controledMihomoConfigUpdated')
ipcMain.emit('updateTrayMenu')
console.log('TUN auto-disabled due to insufficient permissions')
} else {
console.log('TUN permissions validated successfully')
} }
} catch (error) { } catch (error) {
console.error('Failed to check admin privileges on startup:', error) console.error('Failed to validate TUN permissions on startup:', error)
}
} }
} }

View File

@ -195,7 +195,11 @@ app.whenReady().then(async () => {
registerIpcMainHandlers() registerIpcMainHandlers()
await createWindow() await createWindow()
if (showFloating) { if (showFloating) {
showFloatingWindow() try {
await showFloatingWindow()
} catch (error) {
console.error('Failed to create floating window on startup:', error)
}
} }
if (!disableTray) { if (!disableTray) {
await createTray() await createTray()

View File

@ -9,11 +9,13 @@ import { buildContextMenu, showTrayIcon } from './tray'
export let floatingWindow: BrowserWindow | null = null export let floatingWindow: BrowserWindow | null = null
async function createFloatingWindow(): Promise<void> { async function createFloatingWindow(): Promise<void> {
try {
const floatingWindowState = windowStateKeeper({ const floatingWindowState = windowStateKeeper({
file: 'floating-window-state.json' file: 'floating-window-state.json'
}) })
const { customTheme = 'default.css' } = await getAppConfig() const { customTheme = 'default.css' } = await getAppConfig()
floatingWindow = new BrowserWindow({
const windowOptions: Electron.BrowserWindowConstructorOptions = {
width: 120, width: 120,
height: 42, height: 42,
x: floatingWindowState.x, x: floatingWindowState.x,
@ -28,18 +30,40 @@ async function createFloatingWindow(): Promise<void> {
maximizable: false, maximizable: false,
fullscreenable: false, fullscreenable: false,
closable: false, closable: false,
backgroundColor: '#00000000',
webPreferences: { webPreferences: {
preload: join(__dirname, '../preload/index.js'), preload: join(__dirname, '../preload/index.js'),
spellcheck: false, spellcheck: false,
sandbox: false sandbox: false,
nodeIntegration: false,
contextIsolation: true
} }
}) }
// windows 添加兼容性处理
if (process.platform === 'win32') {
windowOptions.hasShadow = false
windowOptions.webPreferences!.offscreen = false
}
floatingWindow = new BrowserWindow(windowOptions)
floatingWindowState.manage(floatingWindow) floatingWindowState.manage(floatingWindow)
floatingWindow.webContents.on('render-process-gone', (_, details) => {
console.error('Floating window render process gone:', details.reason)
floatingWindow = null
})
floatingWindow.on('ready-to-show', () => { floatingWindow.on('ready-to-show', () => {
try {
applyTheme(customTheme) applyTheme(customTheme)
floatingWindow?.show() floatingWindow?.show()
floatingWindow?.setAlwaysOnTop(true, 'screen-saver') floatingWindow?.setAlwaysOnTop(true, 'screen-saver')
} catch (error) {
console.error('Error in floating window ready-to-show:', error)
}
}) })
floatingWindow.on('moved', () => { floatingWindow.on('moved', () => {
if (floatingWindow) floatingWindowState.saveState(floatingWindow) if (floatingWindow) floatingWindowState.saveState(floatingWindow)
}) })
@ -49,18 +73,30 @@ async function createFloatingWindow(): Promise<void> {
floatingWindow?.webContents.send('appConfigUpdated') floatingWindow?.webContents.send('appConfigUpdated')
} }
}) })
if (is.dev && process.env['ELECTRON_RENDERER_URL']) { if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
floatingWindow.loadURL(`${process.env['ELECTRON_RENDERER_URL']}/floating.html`) await floatingWindow.loadURL(`${process.env['ELECTRON_RENDERER_URL']}/floating.html`)
} else { } else {
floatingWindow.loadFile(join(__dirname, '../renderer/floating.html')) await floatingWindow.loadFile(join(__dirname, '../renderer/floating.html'))
}
} catch (error) {
console.error('Failed to create floating window:', error)
floatingWindow = null
throw error
} }
} }
export async function showFloatingWindow(): Promise<void> { export async function showFloatingWindow(): Promise<void> {
if (floatingWindow) { try {
if (floatingWindow && !floatingWindow.isDestroyed()) {
floatingWindow.show() floatingWindow.show()
} else { } else {
createFloatingWindow() await createFloatingWindow()
}
} catch (error) {
console.error('Failed to show floating window:', error)
await patchAppConfig({ showFloatingWindow: false })
throw error
} }
} }