Skip to content

fix: add timeout to BunProc.run to fix network monitor related hangs #4701

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
ryanwinchester wants to merge 1 commit into
base: dev
Choose a base branch
from
+20 −5
Open

fix: add timeout to BunProc.run to fix network monitor related hangs #4701

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
25 changes: 20 additions & 5 deletions packages/opencode/src/bun/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ export namespace BunProc {
const log = Log.create({ service: "bun" })
const req = createRequire(import.meta.url)

export async function run(cmd: string[], options?: Bun.SpawnOptions.OptionsObject<any, any, any>) {
export async function run(cmd: string[], options?: Bun.SpawnOptions.OptionsObject<any, any, any>, timeout = 5_000) {
log.info("running", {
cmd: [which(), ...cmd],
timeout,
...options,
})
const result = Bun.spawn([which(), ...cmd], {
Expand All @@ -26,7 +27,15 @@ export namespace BunProc {
BUN_BE_BUN: "1",
},
})
const code = await result.exited

const timeoutPromise = new Promise<never>((_, reject) => {
setTimeout(() => {
result.kill()
reject(new Error(`Command timed out after ${timeout}ms`))
}, timeout)
})

const code = await Promise.race([result.exited, timeoutPromise])
const stdout = result.stdout
? typeof result.stdout === "number"
? result.stdout
Expand Down Expand Up @@ -95,9 +104,15 @@ export namespace BunProc {
attempt: count,
total,
})
await BunProc.run(args, {
cwd: Global.Path.cache,
}).catch(async (error) => {
// Increase timeout on each retry: 5s, 10s, 20s
const timeout = 5_000 * Math.pow(2, count - 1)
await BunProc.run(
args,
{
cwd: Global.Path.cache,
},
timeout,
).catch(async (error) => {
log.warn("bun install failed", {
pkg,
version,
Expand Down
Loading