Skip to content

fix(installation): guard startup package-manager probes with timeout #13287

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

fix(installation): guard startup package-manager probes with timeout #13287

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: 17 additions & 3 deletions packages/opencode/src/installation/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { NamedError } from "@opencode-ai/util/error"
import { Log } from "../util/log"
import { iife } from "@/util/iife"
import { Flag } from "../flag/flag"
import { withTimeout } from "@/util/timeout"

declare global {
const OPENCODE_VERSION: string
Expand All @@ -14,6 +15,7 @@ declare global {

export namespace Installation {
const log = Log.create({ service: "installation" })
const TIMEOUT = 5000

export type Method = Awaited<ReturnType<typeof method>>

Expand Down Expand Up @@ -102,7 +104,13 @@ export namespace Installation {
})

for (const check of checks) {
const output = await check.command()
const output = await withTimeout<string>(check.command(), TIMEOUT).catch((error) => {
log.warn("package manager check failed", {
name: check.name,
error: error instanceof Error ? error.message : String(error),
})
return ""
})
const installedName =
check.name === "brew" || check.name === "choco" || check.name === "scoop" ? "opencode" : "opencode-ai"
if (output.includes(installedName)) {
Expand Down Expand Up @@ -215,8 +223,14 @@ export namespace Installation {

if (detectedMethod === "npm" || detectedMethod === "bun" || detectedMethod === "pnpm") {
const registry = await iife(async () => {
const r = (await $`npm config get registry`.quiet().nothrow().text()).trim()
const reg = r || "https://registry.npmjs.org"
const reg = (
await withTimeout<string>($`npm config get registry`.quiet().nothrow().text(), TIMEOUT).catch((error) => {
log.warn("npm registry check failed", {
error: error instanceof Error ? error.message : String(error),
})
return ""
})
).trim() || "https://registry.npmjs.org"
return reg.endsWith("/") ? reg.slice(0, -1) : reg
})
const channel = CHANNEL
Expand Down
Loading