diff options
| author | Adam <[email protected]> | 2025-12-22 06:05:10 -0600 |
|---|---|---|
| committer | Adam <[email protected]> | 2025-12-22 06:05:46 -0600 |
| commit | 2c16b9fa61b8d8c333c9fb1a1ab51f1089f69079 (patch) | |
| tree | 5afdf1c6941f3401b88dfc8b5c20de37e42c732b | |
| parent | 240ad31edd412ca370c5e54dbf4abd5d6eca5c67 (diff) | |
| download | opencode-2c16b9fa61b8d8c333c9fb1a1ab51f1089f69079.tar.gz opencode-2c16b9fa61b8d8c333c9fb1a1ab51f1089f69079.zip | |
Revert "server: ensure frontend has correct port for PTY websocket connections (#5898)"
This reverts commit a05915ddc8f34d592c05ac6a4f4e8d932a9a0964.
| -rw-r--r-- | packages/desktop/src/app.tsx | 2 | ||||
| -rw-r--r-- | packages/opencode/src/server/server.ts | 34 |
2 files changed, 13 insertions, 23 deletions
diff --git a/packages/desktop/src/app.tsx b/packages/desktop/src/app.tsx index e5607fd33..2ed529bbc 100644 --- a/packages/desktop/src/app.tsx +++ b/packages/desktop/src/app.tsx @@ -35,7 +35,7 @@ const url = new URLSearchParams(document.location.search).get("url") || (location.hostname.includes("opencode.ai") || location.hostname.includes("localhost") ? `http://${host}:${port}` - : window.location.origin) + : "/") export function App() { return ( diff --git a/packages/opencode/src/server/server.ts b/packages/opencode/src/server/server.ts index 69bd5e3be..e92c46225 100644 --- a/packages/opencode/src/server/server.ts +++ b/packages/opencode/src/server/server.ts @@ -6,6 +6,7 @@ import { describeRoute, generateSpecs, validator, resolver, openAPIRouteHandler import { Hono } from "hono" import { cors } from "hono/cors" import { stream, streamSSE } from "hono/streaming" +import { proxy } from "hono/proxy" import { Session } from "../session" import z from "zod" import { Provider } from "../provider/provider" @@ -53,9 +54,6 @@ globalThis.AI_SDK_LOG_WARNINGS = false export namespace Server { const log = Log.create({ service: "server" }) - // Port that the server is running on, used to inject into frontend HTML - let serverPort: number = 4096 - export const Event = { Connected: BusEvent.define("server.connected", z.object({})), Disposed: BusEvent.define("global.disposed", z.object({})), @@ -2580,25 +2578,12 @@ export namespace Server { }, ) .all("/*", async (c) => { - const response = await fetch(`https://desktop.opencode.ai${c.req.path}`, { - method: c.req.method, + return proxy(`https://desktop.opencode.ai${c.req.path}`, { + ...c.req, headers: { host: "desktop.opencode.ai", }, }) - - const contentType = response.headers.get("content-type") || "" - - // If this is an HTML response, inject the server port - if (contentType.includes("text/html")) { - const html = await response.text() - const portScript = `<script>window.__OPENCODE__ = window.__OPENCODE__ || {}; window.__OPENCODE__.port = ${serverPort};</script>` - // Inject the script right after the opening <head> tag - const modifiedHtml = html.replace("<head>", `<head>${portScript}`) - return c.html(modifiedHtml) - } - - return response }), ) @@ -2622,9 +2607,14 @@ export namespace Server { idleTimeout: 0, fetch: App().fetch, websocket: websocket, - }) - // Store the actual port for injection into frontend HTML - serverPort = server.port ?? opts.port - return server + } as const + if (opts.port === 0) { + try { + return Bun.serve({ ...args, port: 4096 }) + } catch { + // port 4096 not available, fall through to use port 0 + } + } + return Bun.serve({ ...args, port: opts.port }) } } |