Skip to content

fix(cli): show a proper error message when port is already in use for web and serve #46262

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

fix(cli): show a proper error message when port is already in use for web and serve #46262

Show file tree
Hide file tree
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
10 changes: 7 additions & 3 deletions packages/opencode/src/cli/cmd/serve.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Effect } from "effect"
import { effectCmd } from "../effect-cmd"
import { withNetworkOptions, resolveNetworkOptions } from "../network"
import { effectCmd, fail } from "../effect-cmd"
import { isPortInUseError, withNetworkOptions, resolveNetworkOptions } from "../network"
import { Flag } from "@opencode-ai/core/flag/flag"

export const ServeCommand = effectCmd({
Expand All @@ -16,7 +16,11 @@ export const ServeCommand = effectCmd({
console.log("Warning: OPENCODE_SERVER_PASSWORD is not set; server is unsecured.")
}
const opts = yield* resolveNetworkOptions(args)
const server = yield* Effect.promise(() => Server.listen(opts))
const server = yield* Effect.promise(() => Server.listen(opts)).pipe(
Effect.catchDefect((error) =>
isPortInUseError(error) ? fail(`Port ${opts.port} is already in use`) : Effect.die(error),
),
)
console.log(`opencode server listening on http://${server.hostname}:${server.port}`)

yield* Effect.never
Expand Down
10 changes: 7 additions & 3 deletions packages/opencode/src/cli/cmd/web.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Effect } from "effect"
import { UI } from "../ui"
import { effectCmd } from "../effect-cmd"
import { withNetworkOptions, resolveNetworkOptions } from "../network"
import { effectCmd, fail } from "../effect-cmd"
import { isPortInUseError, resolveNetworkOptions, withNetworkOptions } from "../network"
import { Flag } from "@opencode-ai/core/flag/flag"
import open from "open"
import { networkInterfaces } from "os"
Expand Down Expand Up @@ -41,7 +41,11 @@ export const WebCommand = effectCmd({
UI.println(UI.Style.TEXT_WARNING_BOLD + "! OPENCODE_SERVER_PASSWORD is not set; server is unsecured.")
}
const opts = yield* resolveNetworkOptions(args)
const server = yield* Effect.promise(() => Server.listen(opts))
const server = yield* Effect.promise(() => Server.listen(opts)).pipe(
Effect.catchDefect((error) =>
isPortInUseError(error) ? fail(`Port ${opts.port} is already in use`) : Effect.die(error),
),
)
UI.empty()
UI.println(UI.logo(" "))
UI.empty()
Expand Down
5 changes: 5 additions & 0 deletions packages/opencode/src/cli/network.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { Argv, InferredOptionTypes } from "yargs"
import { ConfigV1 } from "@opencode-ai/core/v1/config/config"
import type { Config } from "@/config/config"
import { isRecord } from "@/util/record"
import { Effect } from "effect"

const options = {
Expand Down Expand Up @@ -78,3 +79,7 @@ export function resolveNetworkOptionsNoConfig(args: NetworkOptions, config?: Con

return { hostname, port, mdns, mdnsDomain, cors }
}

export function isPortInUseError(error: unknown) {
return isRecord(error) && isRecord(error.cause) && error.cause.code === "EADDRINUSE"
}
Loading