Prevent multiple pty instances from being created

Author: kevinwang5658

src/connect/http-routes/handlers/create-command.ts

@@ -3,7 +3,33 @@ import { Router } from 'express';
 
 import { SocketServer } from '../../socket-server.js';
 
-export function createCommandHandler(command: string, args?: string): Router {
+export enum ConnectCommand {
+  TERMINAL = 'terminal',
+  APPLY = 'apply',
+  PLAN = 'plan',
+  IMPORT = 'import'
+}
+
+const CommandInfo = {
+  [ConnectCommand.TERMINAL]: {
+    args: [],
+  },
+  [ConnectCommand.APPLY]: {
+    args: ['-c', 'codify apply']
+  }
+
+}
+
+export function createCommandHandler(command: ConnectCommand): Router {
+  // if (!Object.values(ConnectCommand).includes(command)) {
+  //   throw new Error(`Unknown command ${command}. Please check code`);
+  // }
+  //
+  // const commandInfo = CommandInfo[command];
+  // if (!commandInfo) {
+  //   throw new Error(`Command info not provided for ${command}. Please check code`);
+  // }
+
   const router = Router({
     mergeParams: true,
   });
@@ -22,11 +48,15 @@ export function createCommandHandler(command: string, args?: string): Router {
       return res.status(400).json({ error: 'SessionId does not exist' });
     }
 
-    const {ws, server} = session;
+    const { ws, server } = session;
     if (!ws) {
       return res.status(400).json({ error: 'SessionId not open' });
     }
 
+    if (session.pty) {
+      return res.status(304).json({ status: 'Already started' })
+    }
+
     const pty = spawn('zsh', [], {
       name: 'xterm-color',
       cols: 80,
@@ -35,6 +65,8 @@ export function createCommandHandler(command: string, args?: string): Router {
       env: process.env
     });
 
+    session.pty = pty;
+
     pty.onData((data) => {
       ws.send(Buffer.from(data, 'utf8'));
     });
@@ -48,6 +80,9 @@ export function createCommandHandler(command: string, args?: string): Router {
       ws.terminate();
       server.close();
     })
+
+
+    return res.status(204).json({});
   });
 
   return router;

src/connect/http-routes/router.ts

@@ -9,5 +9,6 @@ router.use('/', defaultHandler);
 router.use('/apply', createCommandHandler('apply'));
 router.use('/plan', createCommandHandler('plan'));
 router.use('/import', createCommandHandler('import'));
+router.use('/terminal', createCommandHandler(''));
 
 export default router;

src/connect/socket-server.ts

@@ -1,3 +1,4 @@
+import { IPty } from '@homebridge/node-pty-prebuilt-multiarch';
 import { Server as HttpServer, IncomingMessage } from 'node:http';
 import { Duplex } from 'node:stream';
 import WebSocket, { WebSocketServer } from 'ws';
@@ -7,6 +8,7 @@ import { config } from '../config.js';
 export interface Session {
   server: WebSocketServer;
   ws?: WebSocket;
+  pty?: IPty;
 }
 
 let instance: SocketServer | undefined;
@@ -67,7 +69,7 @@ export class SocketServer {
       return;
     }
 
-    if (/*!this.validateOrigin(request.headers.origin ?? request.headers.referer ?? '') ||*/ !this.validateConnectionSecret(request)) {
+    if (/*! this.validateOrigin(request.headers.origin ?? request.headers.referer ?? '') || */ !this.validateConnectionSecret(request)) {
       console.error('Unauthorized request. Connection code:', request.headers['sec-websocket-protocol']);
       socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n')
       socket.destroy();