Improved the command handler to support more variations

Author: kevinwang5658

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

@@ -12,36 +12,50 @@ export enum ConnectCommand {
 
 const CommandInfo = {
   [ConnectCommand.TERMINAL]: {
-    args: [],
+    command: () => [],
+    requiresDocumentId: false,
   },
   [ConnectCommand.APPLY]: {
-    args: ['-c', 'codify apply']
+    command: (args) => ['-c', `codify apply ${args}`],
+    requiresDocumentId: true,
+  },
+  [ConnectCommand.PLAN]: {
+    command: (args) => ['-c', `codify plan ${args}`],
+    requiresDocumentId: true,
+  },
+  [ConnectCommand.IMPORT]: {
+    command: (args) => ['-c', `codify import ${args}`],
+    requiresDocumentId: true,
   }
-
 }
 
 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`);
-  // }
+  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,
   });
 
   router.post('/:sessionId/start', async (req, res) => {
     const { sessionId } = req.params;
+    const { documentId } = req.body;
     console.log(`Received request to ${command}, sessionId: ${sessionId}`)
 
     if (!sessionId) {
       return res.status(400).json({ error: 'SessionId must be provided' });
     }
 
+    if (commandInfo.requiresDocumentId && !documentId) {
+      return res.status(400).json({ error: 'Document id must be provided' });
+    }
+
     const manager = SocketServer.get();
     const session = manager.getSession(sessionId);
     if (!session) {
@@ -57,7 +71,8 @@ export function createCommandHandler(command: ConnectCommand): Router {
       return res.status(304).json({ status: 'Already started' })
     }
 
-    const pty = spawn('zsh', [], {
+    console.log('Running command:', commandInfo.command(documentId))
+    const pty = spawn('zsh', commandInfo.command(documentId), {
       name: 'xterm-color',
       cols: 80,
       rows: 30,

src/connect/http-routes/router.ts

@@ -1,14 +1,14 @@
 import { Router } from 'express';
 
-import { createCommandHandler } from './handlers/create-command.js';
+import { ConnectCommand, createCommandHandler } from './handlers/create-command.js';
 import defaultHandler from './handlers/index.js';
 
 const router = Router();
 
 router.use('/', defaultHandler);
-router.use('/apply', createCommandHandler('apply'));
-router.use('/plan', createCommandHandler('plan'));
-router.use('/import', createCommandHandler('import'));
-router.use('/terminal', createCommandHandler(''));
+router.use('/apply', createCommandHandler(ConnectCommand.APPLY));
+router.use('/plan', createCommandHandler(ConnectCommand.PLAN))
+router.use('/import', createCommandHandler(ConnectCommand.IMPORT));
+router.use('/terminal', createCommandHandler(ConnectCommand.TERMINAL));
 
 export default router;