Fixed codify apply via connect to supply tmpFile path. Added helpful log messages. Fixed header name error for websocket validation. Reduced size of token

Author: kevinwang5658

src/connect/apply.ts

@@ -17,11 +17,11 @@ export function connectApplyInitHandler(msg: any, initWs: WebSocket, manager: Ws
     console.log('apply ws open', config);
 
     const tmpDir = await fs.mkdtemp(os.tmpdir());
-    const filePath = path.join(tmpDir, 'codify.json');
+    const filePath = path.join(tmpDir, 'codify.jsonc');
 
     await fs.writeFile(filePath, JSON.stringify(config));
 
-    const pty = spawn('zsh', ['-c',  'codify apply'], {
+    const pty = spawn('zsh', ['-c',  `codify apply ${tmpDir}`], {
       name: 'xterm-color',
       cols: 80,
       rows: 30,

src/connect/server.ts

@@ -53,8 +53,7 @@ export class WsServerManager {
   private onUpgrade = (request: IncomingMessage, socket: Duplex, head: Buffer): void => {
     const { pathname } = new URL(request.url!, 'ws://localhost:51040')
 
-    if (!this.validateOrigin(request.headers.origin!)
-       || this.validateConnectionSecret(request)) {
+    if (!this.validateOrigin(request.headers.origin ?? '') || !this.validateConnectionSecret(request)) {
       console.error('Unauthorized request from', request.headers.origin);
       socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n')
       socket.destroy();
@@ -63,7 +62,10 @@ export class WsServerManager {
 
     if (pathname === '/ws' && this.handlerMap.has('default')) {
       const wss = this.wsServerMap.get('default');
-      wss?.handleUpgrade(request, socket, head, (ws, request) => this.handlerMap.get('default')!(ws, this, request));
+      wss?.handleUpgrade(request, socket, head, (ws, request) => {
+        console.log('New client connected!')
+        this.handlerMap.get('default')!(ws, this, request)
+      });
       return;
     }
 
@@ -79,15 +81,18 @@ export class WsServerManager {
 
       const wss = this.wsServerMap.get(sessionId)!;
 
-      wss.handleUpgrade(request, socket, head, (ws, request) => this.handlerMap.get(sessionId)!(ws, this, request));
+      wss.handleUpgrade(request, socket, head, (ws, request) => {
+        console.log('New ws session!')
+        this.handlerMap.get(sessionId)!(ws, this, request)
+      });
     }
   }
 
   private validateOrigin = (origin: string): boolean =>
     config.corsAllowedOrigins.includes(origin)
 
   private validateConnectionSecret = (request: IncomingMessage): boolean => {
-    const connectionSecret = request.headers['connection-secret'] as string;
+    const connectionSecret = request.headers['sec-websocket-protocol'] as string;
     return connectionSecret === this.connectionSecret;
   }
 

src/orchestrators/connect.ts

@@ -29,7 +29,7 @@ ${connectionSecret}`)
       .setDefaultHandler(defaultWsHandler)
   }
 
-  private static tokenGenerate(length = 20): string {
-    return Buffer.from(randomBytes(length)).toString('hex')
+  private static tokenGenerate(bytes = 4): string {
+    return Buffer.from(randomBytes(bytes)).toString('hex')
   }
 }