Skip to content

fix(desktop): add timeout guards to prevent Windows startup hang #19281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pengzha0 wants to merge 1 commit into
base: dev
Choose a base branch
from
+16 −4
Open

fix(desktop): add timeout guards to prevent Windows startup hang #19281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions packages/desktop-electron/src/main/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,10 @@ async function initialize() {
})

if (needsMigration) {
await sqliteDone?.promise
await Promise.race([
sqliteDone?.promise,
delay(30_000),
])
}

await Promise.race([
Expand Down Expand Up @@ -182,7 +185,10 @@ async function initialize() {
setInitStep({ phase: "done" })

if (overlay) {
await loadingComplete.promise
await Promise.race([
loadingComplete.promise,
delay(10_000),
])
}

mainWindow = createMainWindow(globals)
Expand Down Expand Up @@ -301,8 +307,14 @@ async function getSidecarPort() {

function sqliteFileExists() {
const xdg = process.env.XDG_DATA_HOME
const base = xdg && xdg.length > 0 ? xdg : join(homedir(), ".local", "share")
return existsSync(join(base, "opencode", "opencode.db"))
const base =
xdg && xdg.length > 0
? xdg
: process.platform === "win32"
? join(process.env.APPDATA || homedir(), "opencode")
: join(homedir(), ".local", "share", "opencode")
const dbPath = process.platform === "win32" ? join(base, "opencode.db") : join(base, "opencode", "opencode.db")
return existsSync(dbPath)
}

function setupAutoUpdater() {
Expand Down
Loading