fix: make it harder to initialize OWWS

Parkreiner · Parkreiner · commit bfe4d9f5ad79 · 2025-03-12T18:16:40.000Z
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -108,21 +108,19 @@ const getMissingParameters = (
  * (ServerSentEvent)
  */
 export const watchAgentMetadata = (agentId: string): OneWayWebSocket => {
-	const protocol = location.protocol === "https:" ? "wss:" : "ws:";
-	return new OneWayWebSocket(
-		`${protocol}//${location.host}/api/v2/workspaceagents/${agentId}/watch-metadata-ws`,
-	);
+	return new OneWayWebSocket({
+		apiRoute: `/api/v2/workspaceagents/${agentId}/watch-metadata-ws`,
+	});
 };
 
 /**
  * @returns {EventSource} An EventSource that emits workspace event objects
  * (ServerSentEvent)
  */
 export const watchWorkspace = (workspaceId: string): OneWayWebSocket => {
-	const protocol = location.protocol === "https:" ? "wss:" : "ws:";
-	return new OneWayWebSocket(
-		`${protocol}//${location.host}/api/v2/workspaces/${workspaceId}/watch-ws`,
-	);
+	return new OneWayWebSocket({
+		apiRoute: `/api/v2/workspaces/${workspaceId}/watch-ws`,
+	});
 };
 
 export const getURLWithSearchParams = (
diff --git a/site/src/utils/OneWayWebSocket.ts b/site/src/utils/OneWayWebSocket.ts
@@ -44,13 +44,23 @@ interface OneWayWebSocketApi {
 	close: (closeCode?: number, reason?: string) => void;
 }
 
+type OneWayWebSocketInit = Readonly<{
+	apiRoute: `/${string}`;
+	location?: Location;
+	protocols?: string | string[];
+}>;
+
 // Implementing wrapper around the base WebSocket class instead of doing fancy
 // compile-time type-casts so that we have more runtime assurance that we won't
 // accidentally send a message from the client to the server
 export class OneWayWebSocket implements OneWayWebSocketApi {
 	#socket: WebSocket;
 
-	constructor(url: string | URL, protocols?: string | string[]) {
+	constructor(init: OneWayWebSocketInit) {
+		const { apiRoute, protocols, location = window.location } = init;
+
+		const protocol = location.protocol === "https:" ? "wss:" : "ws:";
+		const url = `${protocol}//${location.host}${apiRoute}`;
 		this.#socket = new WebSocket(url, protocols);
 	}
 
