Skip to content

fix(dashboard): derive WebSocket URL from API base (no localhost fallback in prod) #106

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

Merged
jeffgreendesign merged 2 commits into from
Jun 10, 2026
+18 −2
Merged

fix(dashboard): derive WebSocket URL from API base (no localhost fallback in prod) #106

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43d12fd
fix(dashboard): derive WebSocket URL from API base so prod doesn't fa…
jeffgreendesign Jun 10, 2026
c845ced
fix(dashboard): normalize trailing /api when deriving WebSocket path
jeffgreendesign Jun 10, 2026
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: 18 additions & 2 deletions dashboard/lib/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
*/

const ENV_API_BASE = process.env.NEXT_PUBLIC_API_URL ?? 'http://localhost:3000/api';
const WS_BASE = process.env.NEXT_PUBLIC_WS_URL ?? 'ws://localhost:3000/ws';

/** Resolve API base URL: localStorage override → env var → localhost default. */
export function getApiBase(): string {
Expand Down Expand Up @@ -45,6 +44,23 @@ export function getServerBase(): string {
return getApiBase().replace(/\/api$/, '');
}

/**
* WebSocket URL. Prefers an explicit `NEXT_PUBLIC_WS_URL`, otherwise derives it
* from the resolved server origin (`http(s)` → `ws(s)`, `/ws` path) so production
* never falls back to `ws://localhost:3000` when only the API URL is configured.
*/
export function getWsBase(): string {
if (process.env.NEXT_PUBLIC_WS_URL) {
return process.env.NEXT_PUBLIC_WS_URL;
}
// Normalize a trailing `/api` or `/api/` (and any stray trailing slash) so the
// derived path is exactly `/ws` — the server's upgrade handler rejects anything else.
const base = getServerBase()
.replace(/\/api\/?$/, '')
.replace(/\/+$/, '');
return `${base.replace(/^http/, 'ws')}/ws`;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

// --- Health ---

export interface HealthResult {
Expand Down Expand Up @@ -385,7 +401,7 @@ export type EventHandler = (event: { event: string; data: unknown }) => void;
export function connectWebSocket(onEvent: EventHandler): WebSocket | null {
const token = typeof window !== 'undefined' ? localStorage.getItem('textrawl_token') : null;

const url = WS_BASE;
const url = getWsBase();

try {
// Auth via subprotocol to avoid exposing token in URL/logs
Expand Down
Loading