whai/cherry-studio
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat: improve proxy configuration handling

Browse Source
This commit is contained in:
kangfenmao 2024-11-23 14:21:08 +08:00
parent 2e34b79f26
commit ad625b23a7
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/ipc.ts
View File

@ -1,7 +1,7 @@
import path from 'node:path' import path from 'node:path'
import { ThemeMode } from '@types' import { ThemeMode } from '@types'
import { BrowserWindow, ipcMain, session, shell } from 'electron' import { BrowserWindow, ipcMain, ProxyConfig, session, shell } from 'electron'
import log from 'electron-log' import log from 'electron-log'
import { titleBarOverlayDark, titleBarOverlayLight } from './config' import { titleBarOverlayDark, titleBarOverlayLight } from './config'
@ -30,20 +30,12 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
})) }))
ipcMain.handle('app:proxy', async (_, proxy: string) => { ipcMain.handle('app:proxy', async (_, proxy: string) => {
if (proxy === 'system') { const sessions = [session.defaultSession, session.fromPartition('persist:webview')]
await session.defaultSession.setProxy({ mode: 'system' }) const proxyConfig: ProxyConfig =
const webviewSession = session.fromPartition('persist:webview') proxy === 'system' ? { mode: 'system' } : proxy ? { proxyRules: proxy } : { mode: 'direct' }
await webviewSession.setProxy({ mode: 'system' }) await Promise.all(sessions.map((session) => session.setProxy(proxyConfig)))
} else if (proxy) {
await session.defaultSession.setProxy({ proxyRules: proxy })
const webviewSession = session.fromPartition('persist:webview')
await webviewSession.setProxy({ proxyRules: proxy })
} else {
await session.defaultSession.setProxy({})
const webviewSession = session.fromPartition('persist:webview')
await webviewSession.setProxy({})
}
}) })
ipcMain.handle('app:reload', () => mainWindow.reload()) ipcMain.handle('app:reload', () => mainWindow.reload())
ipcMain.handle('open:website', (_, url: string) => shell.openExternal(url)) ipcMain.handle('open:website', (_, url: string) => shell.openExternal(url))