chore: take inspiration from existing websocket

coder · DanielleMaywood · Mar 21, 2025 · Mar 3, 2025 · Mar 3, 2025 · Mar 4, 2025
commit 2de7f12ae0ac6aaa5456f62415a79cce2f0f8343
diff --git a/src/api.ts b/src/api.ts
@@ -28,7 +28,7 @@ export function needToken(): boolean {
 /**
  * Create a new agent based off the current settings.
  */
-async function createHttpAgent(): Promise<ProxyAgent> {
+export async function createHttpAgent(): Promise<ProxyAgent> {
   const cfg = vscode.workspace.getConfiguration()
   const insecure = Boolean(cfg.get("coder.insecure"))
  const certFile = expandPath(String(cfg.get("coder.tlsCertFile") ?? "").trim())

diff --git a/src/inbox.ts b/src/inbox.ts
@@ -3,6 +3,7 @@
 import { WebSocket } from "ws"
 import { errToStr } from "./api-helper"
 import { Storage } from "./storage"
+import { ProxyAgent } from "proxy-agent"
 
 type InboxMessage = {
   unread_count: number
@@ -29,31 +30,33 @@
   private socket: WebSocket
 
   constructor(
-    private readonly restClient: Api,
+    httpAgent: ProxyAgent,
+    restClient: Api,
     private readonly storage: Storage,
   ) {
-    // const url = this.restClient.getAxiosInstance().defaults.baseURL
-    const token = this.restClient.getAxiosInstance().defaults.headers.common["Coder-Session-Token"] as
-      | string
-      | undefined
-    // const inboxUrl = new URL(`${url}/api/v2/notifications/watch`);
-    const inboxUrl = new URL(`ws://localhost:8080`)
-
-    this.storage.writeToCoderOutputChannel("Listening to Coder Inbox")
-
-    // We're gonna connect over WebSocket so replace the scheme.
-    if (inboxUrl.protocol === "https") {
-      inboxUrl.protocol = "wss"
-    } else if (inboxUrl.protocol === "http") {
-      inboxUrl.protocol = "ws"
+    const baseUrlRaw = restClient.getAxiosInstance().defaults.baseURL
+    if (!baseUrlRaw) {
+      throw new Error("No base URL set on REST client")
     }
 
-    this.socket = new WebSocket(inboxUrl, {
+    const baseUrl = new URL(baseUrlRaw)
+    const socketProto = baseUrl.protocol === "https:" ? "wss:" : "ws:"
+    const socketUrlRaw = `${socketProto}//${baseUrl.host}/api/v2/notifications/watch`
+
+    this.socket = new WebSocket(new URL(socketUrlRaw), {
+      followRedirects: true,
+      agent: httpAgent,
       headers: {
-        "Coder-Session-Token": token,
+        "Coder-Session-Token": restClient.getAxiosInstance().defaults.headers.common["Coder-Session-Token"] as
+          | string
+          | undefined,
       },
     })
 
+    this.socket.on("open", () => {
+      this.storage.writeToCoderOutputChannel("Listening to Coder Inbox")
+    })
+
     this.socket.on("error", (error) => {
       this.notifyError(error)
     })

diff --git a/src/remote.ts b/src/remote.ts
@@ -9,7 +9,7 @@
 import prettyBytes from "pretty-bytes"
 import * as semver from "semver"
 import * as vscode from "vscode"
-import { makeCoderSdk, needToken, startWorkspaceIfStoppedOrFailed, waitForBuild } from "./api"
+import { createHttpAgent, makeCoderSdk, needToken, startWorkspaceIfStoppedOrFailed, waitForBuild } from "./api"
 import { extractA
7EA3
gents } from "./api-helper"
 import * as cli from "./cliManager"
 import { Commands } from "./commands"
@@ -405,7 +405,8 @@
     disposables.push(monitor.onChange.event((w) => (this.commands.workspace = w)))
 
     // Watch coder inbox for messages
-    const inbox = new Inbox(workspaceRestClient, this.storage)
+    const httpAgent = await createHttpAgent();
+    const inbox = new Inbox(httpAgent, workspaceRestClient, this.storage)
     disposables.push(inbox)
 
     // Wait for the agent to connect.