Merge branch 'main' into main

Author: matifali

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## Unreleased
 
+## [v1.7.0](https://github.com/coder/vscode-coder/releases/tag/v1.7.0) (2025-04-03)
+
+### Added
+
+- Add new `/openDevContainer` path, similar to the `/open` path, except this
+  allows connecting to a dev container inside a workspace. For now, the dev
+  container must already be running for this to work.
+
+### Fixed
+
+- When not using token authentication, avoid setting `undefined` for the token
+  header, as Node will throw an error when headers are undefined. Now, we will
+  not set any header at all.
+
 ## [v1.6.0](https://github.com/coder/vscode-coder/releases/tag/v1.6.0) (2025-04-01)
 
 ### Added

package.json

@@ -4,7 +4,7 @@
   "displayName": "Coder",
   "description": "Open any workspace with a single click.",
   "repository": "https://github.com/coder/vscode-coder",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "engines": {
     "vscode": "^1.73.0"
   },

src/api.ts

@@ -13,6 +13,8 @@ import { getProxyForUrl } from "./proxy"
 import { Storage } from "./storage"
 import { expandPath } from "./util"
 
+export const coderSessionTokenHeader = "Coder-Session-Token"
+
 /**
  * Return whether the API will need a token for authorization.
  * If mTLS is in use (as specified by the cert or key files being set) then
@@ -242,14 +244,15 @@ export async function waitForBuild(
       const baseUrl = new URL(baseUrlRaw)
       const proto = baseUrl.protocol === "https:" ? "wss:" : "ws:"
       const socketUrlRaw = `${proto}//${baseUrl.host}${path}`
+      const token = restClient.getAxiosInstance().defaults.headers.common[coderSessionTokenHeader] as string | undefined
       const socket = new ws.WebSocket(new URL(socketUrlRaw), {
-        headers: {
-          "Coder-Session-Token": restClient.getAxiosInstance().defaults.headers.common["Coder-Session-Token"] as
-            | string
-            | undefined,
-        },
-        followRedirects: true,
         agent: agent,
+        followRedirects: true,
+        headers: token
+          ? {
+              [coderSessionTokenHeader]: token,
+            }
+          : undefined,
       })
       socket.binaryType = "nodebuffer"
       socket.on("message", (data) => {

src/inbox.ts

@@ -3,6 +3,7 @@ import { Workspace, GetInboxNotificationResponse } from "coder/site/src/api/type
 import { ProxyAgent } from "proxy-agent"
 import * as vscode from "vscode"
 import { WebSocket } from "ws"
+import { coderSessionTokenHeader } from "./api"
 import { errToStr } from "./api-helper"
 import { type Storage } from "./storage"
 
@@ -37,15 +38,15 @@ export class Inbox implements vscode.Disposable {
     const socketProto = baseUrl.protocol === "https:" ? "wss:" : "ws:"
     const socketUrl = `${socketProto}//${baseUrl.host}/api/v2/notifications/inbox/watch?format=plaintext&templates=${watchTemplatesParam}&targets=${watchTargetsParam}`
 
-    const coderSessionTokenHeader = "Coder-Session-Token"
+    const token = restClient.getAxiosInstance().defaults.headers.common[coderSessionTokenHeader] as string | undefined
     this.#socket = new WebSocket(new URL(socketUrl), {
-      followRedirects: true,
       agent: httpAgent,
-      headers: {
-        [coderSessionTokenHeader]: restClient.getAxiosInstance().defaults.headers.common[coderSessionTokenHeader] as
-          | string
-          | undefined,
-      },
+      followRedirects: true,
+      headers: token
+        ? {
+            [coderSessionTokenHeader]: token,
+          }
+        : undefined,
     })
 
     this.#socket.on("open", () => {