fix: update websocket close code and encode api-key

microsoft · Dec 3, 2024 · e0ff8b8 · e0ff8b8
1 parent b7f9567
commit e0ff8b8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/packages/cli/src/server.ts b/packages/cli/src/server.ts
@@ -176,7 +176,7 @@ export async function startServer(options: { port: string; apiKey?: string }) {
             const hash = search.get("api-key")
             if (req.headers.authorization !== apiKey && hash !== apiKey) {
                 logError(`clients: connection unauthorized ${url}, ${hash}`)
-                ws.close(401, "Unauthorized")
+                ws.close(1008, "Unauthorized")
                 return
             }
         }

diff --git a/packages/vscode/src/servermanager.ts b/packages/vscode/src/servermanager.ts
@@ -43,7 +43,7 @@ export class TerminalServerManager implements ServerManager {
         )
 
         this.client = new WebSocketClient(
-            `http://localhost:${SERVER_PORT}?api-key=${sessionApiKey}`
+            `http://localhost:${SERVER_PORT}?api-key=${encodeURIComponent(sessionApiKey)}`
         )
         this.client.chatRequest = createChatModelRunner(this.state)
         this.client.addEventListener(OPEN, async () => {

diff --git a/packages/vscode/src/state.ts b/packages/vscode/src/state.ts
@@ -102,7 +102,7 @@ export class ExtensionState extends EventTarget {
         AIRequestSnapshot
     > = undefined
     readonly output: vscode.LogOutputChannel
-    readonly sessionApiKey = randomHex(128)
+    readonly sessionApiKey = randomHex(64)
 
     constructor(public readonly context: ExtensionContext) {
         super()
@@ -365,8 +365,7 @@ export class ExtensionState extends EventTarget {
     }
 
     get project() {
-        if (!this._project)
-            this.parseWorkspace()
+        if (!this._project) this.parseWorkspace()
         return this._project
     }