程序员阿江(Relakkes) 16f4137954 fix(desktop): stabilize Electron proxy and fullscreen handling
Electron desktop runs network-sensitive OpenAI OAuth token exchange in the sidecar process, so the sidecar now receives system proxy env derived from Electron's cross-platform proxy resolver and the OAuth token client uses the existing proxy fetch options. General manual proxy settings also document and preserve authenticated proxy URLs.

The macOS fullscreen black-screen path is addressed by avoiding native fullscreen Spaces for app fullscreen toggles and by leaving fullscreen before hiding or closing the window.

Constraint: Electron packaged apps may not inherit shell HTTPS_PROXY env when launched from Finder.
Constraint: Manual authenticated proxies must remain standard HTTP(S) proxy URLs for Bun/undici compatibility.
Rejected: Store proxy username and password as separate fields | would require new secret-storage semantics and migration beyond this bugfix.
Rejected: Use native macOS fullscreen Spaces for the desktop app | reproduced black-screen behavior when hiding/closing from fullscreen.
Confidence: high
Scope-risk: moderate
Directive: Do not remove sidecar proxy env injection without retesting OpenAI OAuth from a packaged app launched outside a shell.
Tested: bun test src/services/openaiAuth/client.test.ts src/server/__tests__/haha-openai-oauth-service.test.ts
Tested: bun test src/server/__tests__/network-settings.test.ts
Tested: cd desktop && bun run test -- src/__tests__/generalSettings.test.tsx --run
Tested: cd desktop && bun run check:electron
Tested: git diff --check
Not-tested: bun run check:server blocked by expired quarantine entries server:cron-scheduler, server:providers-real, server:tasks, server:e2e:business-flow, server:e2e:full-flow
Not-tested: live OpenAI OAuth through a corporate authenticated proxy
2026-06-02 21:37:35 +08:00

176 lines
5.1 KiB
TypeScript

import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
import path from 'node:path'
import type { App, BrowserWindow, Display } from 'electron'
export const WINDOW_STATE_FILE = 'window-state.json'
export const DEFAULT_WINDOW_WIDTH = 1280
export const DEFAULT_WINDOW_HEIGHT = 820
export const MIN_WINDOW_WIDTH = 960
export const MIN_WINDOW_HEIGHT = 640
const MIN_VISIBLE_PIXELS = 80
export type StoredWindowState = {
x: number
y: number
width: number
height: number
maximized: boolean
}
export type WindowStateBounds = Pick<StoredWindowState, 'x' | 'y' | 'width' | 'height'>
export type WindowCreateBounds =
& Partial<Pick<StoredWindowState, 'x' | 'y'>>
& Pick<StoredWindowState, 'width' | 'height'>
export function windowStatePath(app: App, env: NodeJS.ProcessEnv = process.env): string {
return path.join(env.CLAUDE_CONFIG_DIR || app.getPath('userData'), WINDOW_STATE_FILE)
}
export function isPersistableWindowState(state: StoredWindowState): boolean {
return Number.isFinite(state.x)
&& Number.isFinite(state.y)
&& state.width >= MIN_WINDOW_WIDTH
&& state.height >= MIN_WINDOW_HEIGHT
}
export function hasMeaningfulIntersection(
state: WindowStateBounds,
displayBounds: WindowStateBounds,
): boolean {
const stateRight = state.x + state.width
const stateBottom = state.y + state.height
const displayRight = displayBounds.x + displayBounds.width
const displayBottom = displayBounds.y + displayBounds.height
return stateRight > displayBounds.x + MIN_VISIBLE_PIXELS
&& stateBottom > displayBounds.y + MIN_VISIBLE_PIXELS
&& state.x < displayRight - MIN_VISIBLE_PIXELS
&& state.y < displayBottom - MIN_VISIBLE_PIXELS
}
export function isWindowStateVisibleOnAnyDisplay(
state: StoredWindowState,
displays: Array<Pick<Display, 'bounds' | 'workArea'>>,
): boolean {
if (displays.length === 0) return true
return displays.some(display =>
hasMeaningfulIntersection(state, display.workArea ?? display.bounds),
)
}
export function readWindowState(
app: App,
displays: Array<Pick<Display, 'bounds' | 'workArea'>>,
env: NodeJS.ProcessEnv = process.env,
): StoredWindowState | null {
const statePath = windowStatePath(app, env)
if (!existsSync(statePath)) return null
try {
const parsed = JSON.parse(readFileSync(statePath, 'utf-8')) as StoredWindowState
if (!isPersistableWindowState(parsed)) return null
if (!isWindowStateVisibleOnAnyDisplay(parsed, displays)) return null
return parsed
} catch (error) {
console.error(`[desktop] failed to read Electron window state ${statePath}:`, error)
return null
}
}
export function writeWindowState(
app: App,
state: StoredWindowState,
env: NodeJS.ProcessEnv = process.env,
) {
if (!isPersistableWindowState(state)) return
const statePath = windowStatePath(app, env)
mkdirSync(path.dirname(statePath), { recursive: true })
writeFileSync(statePath, `${JSON.stringify(state, null, 2)}\n`)
}
export function captureWindowState(window: BrowserWindow): StoredWindowState | null {
if (window.isMinimized()) return null
const bounds = window.getBounds()
const state = {
x: bounds.x,
y: bounds.y,
width: bounds.width,
height: bounds.height,
maximized: window.isMaximized(),
}
return isPersistableWindowState(state) ? state : null
}
export function windowOptionsFromState(state: StoredWindowState | null): WindowCreateBounds {
return state
? { x: state.x, y: state.y, width: state.width, height: state.height }
: { width: DEFAULT_WINDOW_WIDTH, height: DEFAULT_WINDOW_HEIGHT }
}
export function restoreWindowMaximized(window: BrowserWindow, state: StoredWindowState | null) {
if (state?.maximized) window.maximize()
}
export function saveWindowState(app: App, window: BrowserWindow) {
const state = captureWindowState(window)
if (state) writeWindowState(app, state)
}
export function hideWindowSafely(window: BrowserWindow, afterHide?: () => void) {
if (window.isSimpleFullScreen()) {
window.setSimpleFullScreen(false)
window.hide()
afterHide?.()
return
}
if (!window.isFullScreen()) {
window.hide()
afterHide?.()
return
}
window.once('leave-full-screen', () => {
if (!window.isDestroyed()) {
window.hide()
afterHide?.()
}
})
window.setFullScreen(false)
}
export function toggleWindowFullScreen(window: BrowserWindow, platform = process.platform) {
if (platform === 'darwin') {
window.setSimpleFullScreen(!window.isSimpleFullScreen())
return
}
window.setFullScreen(!window.isFullScreen())
}
export function showMainWindow(window: BrowserWindow | null) {
if (!window) return
if (!window.isVisible()) window.show()
if (window.isMinimized()) window.restore()
window.focus()
}
export function installWindowLifecycle({
app,
window,
shouldQuit,
}: {
app: App
window: BrowserWindow
shouldQuit: () => boolean
}) {
window.on('close', (event) => {
saveWindowState(app, window)
if (shouldQuit()) return
event.preventDefault()
hideWindowSafely(window)
})
window.on('move', () => saveWindowState(app, window))
window.on('resize', () => saveWindowState(app, window))
}