fix: wrap websocket in proxy

Author: jsjoeio

src/node/routes/vscode.ts

@@ -5,6 +5,7 @@ import { logError } from "../../common/util"
 import { toVsCodeArgs } from "../cli"
 import { isDevMode } from "../constants"
 import { authenticated, ensureAuthenticated, redirect, self } from "../http"
+import { SocketProxyProvider } from "../socket"
 import { loadAMDModule } from "../util"
 import { Router as WsRouter } from "../wsRouter"
 import { errorHandler } from "./errors"
@@ -13,6 +14,7 @@ export class CodeServerRouteWrapper {
   /** Assigned in `ensureCodeServerLoaded` */
   private _codeServerMain!: CodeServerLib.IServerAPI
   private _wsRouterWrapper = WsRouter()
+  private _socketProxyProvider = new SocketProxyProvider()
   public router = express.Router()
 
   public get wsRouter() {
@@ -77,9 +79,10 @@ export class CodeServerRouteWrapper {
   }
 
   private $proxyWebsocket = async (req: WebsocketRequest) => {
-    this._codeServerMain.handleUpgrade(req, req.socket)
+    const wrappedSocket = await this._socketProxyProvider.createProxy(req.ws)
+    this._codeServerMain.handleUpgrade(req, wrappedSocket)
 
-    req.socket.resume()
+    req.ws.resume()
   }
 
   //#endregion
@@ -130,5 +133,6 @@ export class CodeServerRouteWrapper {
 
   dispose() {
     this._codeServerMain?.dispose()
+    this._socketProxyProvider.stop()
   }
 }

test/e2e/baseFixture.ts

@@ -9,7 +9,12 @@ import { CodeServer, CodeServerPage } from "./models/CodeServer"
  *
  * If `includeCredentials` is `true` page requests will be authenticated.
  */
-export const describe = (name: string, includeCredentials: boolean, codeServerArgs: string[], fn: (codeServer: CodeServer) => void) => {
+export const describe = (
+  name: string,
+  includeCredentials: boolean,
+  codeServerArgs: string[],
+  fn: (codeServer: CodeServer) => void,
+) => {
   test.describe(name, () => {
     // This will spawn on demand so nothing is necessary on before.
     const codeServer = new CodeServer(name, codeServerArgs)
@@ -37,7 +42,7 @@ export const describe = (name: string, includeCredentials: boolean, codeServerAr
       // This provides a cookie that authenticates with code-server.
       storageState: includeCredentials ? storageState : {},
       // TODO@jsjoeio add note why we do this for testing cert stuff
-      ignoreHTTPSErrors: true
+      ignoreHTTPSErrors: true,
     })
 
     fn(codeServer)

test/e2e/extensions.test.ts

@@ -7,7 +7,7 @@ function runTestExtensionTests() {
 
     await codeServerPage.executeCommandViaMenus("code-server: Get proxy URI")
 
-  // Click span:has-text("https://localhost:57989/proxy/{{port}}")
+    // Click span:has-text("https://localhost:57989/proxy/{{port}}")
     await codeServerPage.page.waitForSelector(`span:has-text("${address}/proxy/{{port}}")`)
   })
 }
@@ -18,4 +18,4 @@ describe("Extensions", true, [], () => {
 
 describe("Extensions with --cert", true, ["--cert"], () => {
   runTestExtensionTests()
-})
+})