opencode/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(web): derive WebSocket URL from browser location instead of backend (#2405)

Browse source 
The frontend previously used ws_url returned by /api/pico/token, which
is built from the launcher's own port. Behind a reverse proxy this can
produce incorrect URLs (e.g. ws://localhost:18800 instead of the
proxy's public address).

Since the launcher already proxies /pico/ws on the same port, the
frontend can simply use window.location.host to construct the
WebSocket URL, which is always correct regardless of proxy layers.

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Guoguo 2026-04-07 17:37:01 +08:00 • committed by GitHub
parent 7bf6cbe1fa
commit 6a8552a664
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
web/frontend/src/features/chat/controller.ts
View file

@ -15,7 +15,6 @@ import {
import { import {
invalidateSocket, invalidateSocket,
isCurrentSocket, isCurrentSocket,
normalizeWsUrlForBrowser,
} from "@/features/chat/websocket" } from "@/features/chat/websocket"
import i18n from "@/i18n" import i18n from "@/i18n"
import { import {
@ -135,7 +134,7 @@ export async function connectChat() {
updateChatStore({ connectionState: "connecting" }) updateChatStore({ connectionState: "connecting" })
try { try {
const { token, ws_url } = await getPicoToken() const { token } = await getPicoToken()
const sessionId = activeSessionIdRef const sessionId = activeSessionIdRef
if (generation !== connectionGeneration) { if (generation !== connectionGeneration) {
@ -151,8 +150,9 @@ export async function connectChat() {
return return
} }
const finalWsUrl = normalizeWsUrlForBrowser(ws_url) const wsScheme = window.location.protocol === "https:" ? "wss:" : "ws:"
const url = `${finalWsUrl}?session_id=${encodeURIComponent(sessionId)}` const wsUrl = `${wsScheme}//${window.location.host}/pico/ws`
const url = `${wsUrl}?session_id=${encodeURIComponent(sessionId)}`
const socket = new WebSocket(url, [`token.${token}`]) const socket = new WebSocket(url, [`token.${token}`])
if (generation !== connectionGeneration) { if (generation !== connectionGeneration) {