e050902e7c
The Wayland launcher (#121377) passes --ozone-platform=wayland on every local Wayland session. On the NVIDIA proprietary driver (615.x) the GPU process dies under Wayland ozone with the bundled Chromium, while x11 launches. Default to x11 when /proc/driver/nvidia/version exists and the user set no platform or x11/wayland hint; explicit choices still win. Fixes #126013
66 lines
2.2 KiB
TypeScript
66 lines
2.2 KiB
TypeScript
import { existsSync, readFileSync } from 'node:fs'
|
|
import os from 'node:os'
|
|
import path from 'node:path'
|
|
|
|
import { app } from 'electron'
|
|
|
|
import { resolveDesktopHermesHome } from './data-paths'
|
|
import { readDesktopLaunchConfig } from './renderer-heap-flags'
|
|
import { wslgLaunchArgs } from './wslg-launch'
|
|
import { spawnWslgLaunch } from './wslg-launch-process'
|
|
|
|
function configuredElectronFlags(env: NodeJS.ProcessEnv): string[] {
|
|
// Resolve the home exactly like main.ts does, through the shared resolver:
|
|
// HERMES_DATA_DIR_SUFFIX channel installs and profiles/-rooted HERMES_HOME
|
|
// values must pick the same config.yaml before the relaunch and inside the
|
|
// app, or desktop.electron_flags silently never reaches the relaunch.
|
|
const home = resolveDesktopHermesHome({
|
|
home: os.homedir(),
|
|
env,
|
|
// Linux-only pre-launch path; the win32 legacy-migration probe is never
|
|
// consulted on posix, so its directoryExists callback is not needed here.
|
|
directoryExists: () => false,
|
|
readWindowsHome: () => null
|
|
})
|
|
|
|
try {
|
|
return readDesktopLaunchConfig(readFileSync(path.join(home, 'config.yaml'), 'utf8')).electronFlags
|
|
} catch {
|
|
return []
|
|
}
|
|
}
|
|
|
|
const linux = process.platform === 'linux'
|
|
const electronFlags = linux ? configuredElectronFlags(process.env) : []
|
|
// Present only when the NVIDIA proprietary kernel module is loaded (not
|
|
// nouveau, not WSL's dxg passthrough).
|
|
const nvidiaProprietaryDriver = linux && existsSync('/proc/driver/nvidia/version')
|
|
|
|
const args = wslgLaunchArgs(
|
|
process.argv.slice(1),
|
|
process.env,
|
|
process.platform,
|
|
electronFlags,
|
|
nvidiaProprietaryDriver
|
|
)
|
|
|
|
if (args) {
|
|
// Keep the launcher alive until the child exits: npm's concurrently must not
|
|
// tear down Vite during this handoff. No backend, windows or single-instance
|
|
// lock are created in this parent. The child has an explicit platform flag,
|
|
// so it goes straight into main on its first pass.
|
|
const child = spawnWslgLaunch(args)
|
|
|
|
child.once('error', error => {
|
|
console.error('[hermes] Wayland ozone launch failed:', error)
|
|
app.exit(1)
|
|
})
|
|
child.once('exit', code => app.exit(code ?? 1))
|
|
|
|
for (const signal of ['SIGINT', 'SIGTERM'] as const) {
|
|
process.once(signal, () => child.kill(signal))
|
|
}
|
|
} else {
|
|
await import('./main')
|
|
}
|