Refactored how commands are handled. Allows for greater flexibility.

kevinwang5658 · kevinwang5658 · commit add4147a87fd · 2025-09-24T21:49:26.000-04:00
diff --git a/codify-imports/neal.codify.jsonc b/codify-imports/neal.codify.jsonc
@@ -0,0 +1,98 @@
+[
+  // Installs homebrew and packages
+  {
+    "type": "homebrew",
+    "formulae": [
+      "dopplerhq/cli/doppler",
+      "gnupg",
+      "hookdeck/hookdeck/hookdeck",
+      "libpq",
+      "temporal"
+    ],
+    "casks": [
+      "google-chrome",
+      "slack",
+      "sublime-text"
+    ]
+  },
+
+  // Sets up SSH keys and helps setup github SSH
+  {
+    "type": "ssh-config",
+    "hosts": [
+      {
+        "Host": "github.com",
+        "AddKeysToAgent": true,
+        "UseKeychain": true,
+        "IgnoreUnknown": "UseKeychain",
+        "IdentityFile": "~/.ssh/id_ed25519"
+      }
+    ]
+  },
+  {
+    "type": "ssh-key",
+    "fileName": "id_ed25519",
+    "passphrase": "my_temp_pass",
+    "keyType": "ed25519"
+  },
+  {
+    "type": "ssh-add",
+    "path": "~/.ssh/id_ed25519",
+    "appleUseKeychain": true
+  },
+  { "type": "wait-github-ssh-key" },
+
+  // Configs global git username and email
+  {
+    "type": "git",
+    "email": "chandra.neal@gmail.com",
+    "username": "neal"
+  },
+
+  // Setup node
+  {
+    "type": "nvm",
+    "global": "23",
+    "nodeVersions": [
+      "23"
+    ]
+  },
+  { "type": "pnpm" },
+
+  // Docker. This will install docker, docker engine, docker compose docker cli
+  { "type": "docker" },
+
+  // You can add your git repos here to clone
+//  {
+//    "type": "git-repository",
+//    "directory": "~/Projects/example-project",
+//    "repository": "git@github.com:kevinwang5658/codify-homebrew-plugin.git"
+//  },
+//  {
+//    "type": "git-repository",
+//    "directory": "~/Projects/example-project",
+//    "repository": "git@github.com:my_repo"
+//  },
+
+
+  // Actions are custom commands you can run
+  {
+    "type": "action",
+    "action": "brew link --force libpq",
+    "dependsOn": [
+      "homebrew"
+    ]
+  },
+  {
+    "type": "action",
+    "action": "doppler login && doppler setup",
+    "dependsOn": [
+      "homebrew"
+    ]
+  },
+  {
+    "type": "action",
+    "action": "hookdeck login"
+  }
+]
+
diff --git a/src/connect/http-routes/handlers/apply-handler.ts b/src/connect/http-routes/handlers/apply-handler.ts
@@ -0,0 +1,52 @@
+import { spawn } from '@homebridge/node-pty-prebuilt-multiarch';
+import { ConfigFileSchema } from 'codify-schemas';
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { WebSocket } from 'ws';
+
+import { ConnectOrchestrator } from '../../../orchestrators/connect.js';
+import { ajv } from '../../../utils/ajv.js';
+import { Session } from '../../socket-server.js';
+import { ConnectCommand, createCommandHandler } from './create-command.js';
+
+const validator = ajv.compile(ConfigFileSchema);
+
+export function applyHandler() {
+  const spawnCommand = async (body: Record<string, unknown>, ws: WebSocket, session: Session) => {
+    const codifyConfig = body.config;
+    if (!codifyConfig) {
+      throw new Error('Unable to parse codify config');
+    }
+
+    if (!validator(codifyConfig)) {
+      throw new Error('Invalid codify config');
+    }
+    
+    const tmpDir = await fs.mkdtemp(os.tmpdir());
+    const filePath = path.join(tmpDir, 'codify.jsonc');
+    await fs.writeFile(filePath, JSON.stringify(codifyConfig, null, 2));
+    
+    session.additionalData.filePath = filePath;
+
+    return spawn('zsh', ['-c', `${ConnectOrchestrator.rootCommand} apply -p ${filePath}`], {
+      name: 'xterm-color',
+      cols: 80,
+      rows: 30,
+      cwd: process.env.HOME,
+      env: process.env
+    });
+  }
+
+  const onExit = async (exitCode: number, ws: WebSocket, session: Session) => {
+    if (session.additionalData.filePath) {
+      await fs.rm(session.additionalData.filePath as string, { recursive: true, force: true });
+    }
+  }
+
+  return createCommandHandler({
+    name: ConnectCommand.APPLY,
+    spawnCommand,
+    onExit
+  });
+}
diff --git a/src/connect/http-routes/handlers/create-command.ts b/src/connect/http-routes/handlers/create-command.ts
@@ -1,9 +1,10 @@
-import { spawn } from '@homebridge/node-pty-prebuilt-multiarch';
+import { IPty, spawn } from '@homebridge/node-pty-prebuilt-multiarch';
 import chalk from 'chalk';
 import { Router } from 'express';
 
 import { ConnectOrchestrator } from '../../../orchestrators/connect.js';
-import { SocketServer } from '../../socket-server.js';
+import { Session, SocketServer } from '../../socket-server.js';
+import WebSocket from 'ws';
 
 export enum ConnectCommand {
   TERMINAL = 'terminal',
@@ -12,33 +13,20 @@ export enum ConnectCommand {
   IMPORT = 'import'
 }
 
-const CommandInfo = {
-  [ConnectCommand.TERMINAL]: {
-    command: () => [],
-    requiresDocumentId: false,
-  },
-  [ConnectCommand.APPLY]: {
-    command: (args) => ['-c', `${ConnectOrchestrator.rootCommand} apply ${args}`],
-    requiresDocumentId: true,
-  },
-  [ConnectCommand.PLAN]: {
-    command: (args) => ['-c', `${ConnectOrchestrator.rootCommand} plan ${args}`],
-    requiresDocumentId: true,
-  },
-  [ConnectCommand.IMPORT]: {
-    command: (args) => ['-c', `${ConnectOrchestrator.rootCommand} import -p ${args}`],
-    requiresDocumentId: true,
-  }
+interface Params {
+  name: ConnectCommand;
+  command?: string[];
+  spawnCommand?: (body: Record<string, unknown>, ws: WebSocket, session: Session) => IPty | Promise<IPty>;
+  onExit?: (exitCode: number, ws: WebSocket, session: Session) => Promise<void> | void;
 }
 
-export function createCommandHandler(command: ConnectCommand): Router {
-  if (!Object.values(ConnectCommand).includes(command)) {
-    throw new Error(`Unknown command ${command}. Please check code`);
+export function createCommandHandler({ name, command, spawnCommand, onExit }: Params): Router {
+  if (!Object.values(ConnectCommand).includes(name)) {
+    throw new Error(`Unknown command ${name}. Please check code`);
   }
 
-  const commandInfo = CommandInfo[command];
-  if (!commandInfo) {
-    throw new Error(`Command info not provided for ${command}. Please check code`);
+  if (!command && !spawnCommand) {
+    throw new Error('One of command or spawnCommand must be provided to createCommandHandler');
   }
 
   const router = Router({
@@ -47,17 +35,12 @@ export function createCommandHandler(command: ConnectCommand): Router {
 
   router.post('/:sessionId/start', async (req, res) => {
     const { sessionId } = req.params;
-    const { documentId } = req.body;
-    console.log(`Received request to ${command}, sessionId: ${sessionId}`)
+    console.log(`Received request to ${name}, 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) {
@@ -73,8 +56,9 @@ export function createCommandHandler(command: ConnectCommand): Router {
       return res.status(304).json({ status: 'Already started' })
     }
 
-    console.log('Running command:', commandInfo.command(documentId))
-    const pty = spawn('zsh', commandInfo.command(documentId), {
+    console.log(req.body);
+
+    const pty = spawnCommand ? await spawnCommand(req.body, ws, session) : spawn('zsh', command!, {
       name: 'xterm-color',
       cols: 80,
       rows: 30,
@@ -92,10 +76,12 @@ export function createCommandHandler(command: ConnectCommand): Router {
       pty.write(message.toString('utf8'));
     })
 
-    pty.onExit(({ exitCode, signal }) => {
-      console.log('pty exit', exitCode, signal);
+    pty.onExit(async ({ exitCode, signal }) => {
+      console.log(`Command ${name} exited with exit code`, exitCode);
       ws.send(Buffer.from(chalk.blue(`Session ended exit code ${exitCode}`), 'utf8'))
 
+      await onExit?.(exitCode, ws, session)
+
       ws.terminate();
       server.close();
     })
diff --git a/src/connect/http-routes/handlers/plan-handler.ts b/src/connect/http-routes/handlers/plan-handler.ts
@@ -0,0 +1,52 @@
+import { spawn } from '@homebridge/node-pty-prebuilt-multiarch';
+import { ConfigFileSchema } from 'codify-schemas';
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { WebSocket } from 'ws';
+
+import { ConnectOrchestrator } from '../../../orchestrators/connect.js';
+import { ajv } from '../../../utils/ajv.js';
+import { Session } from '../../socket-server.js';
+import { ConnectCommand, createCommandHandler } from './create-command.js';
+
+const validator = ajv.compile(ConfigFileSchema);
+
+export function planHandler() {
+  const spawnCommand = async (body: Record<string, unknown>, ws: WebSocket, session: Session) => {
+    const codifyConfig = body.config;
+    if (!codifyConfig) {
+      throw new Error('Unable to parse codify config');
+    }
+
+    if (!validator(codifyConfig)) {
+      throw new Error('Invalid codify config');
+    }
+
+    const tmpDir = await fs.mkdtemp(os.tmpdir());
+    const filePath = path.join(tmpDir, 'codify.jsonc');
+    await fs.writeFile(filePath, JSON.stringify(codifyConfig, null, 2));
+
+    session.additionalData.filePath = filePath;
+
+    return spawn('zsh', ['-c', `${ConnectOrchestrator.rootCommand} plan -p ${filePath}`], {
+      name: 'xterm-color',
+      cols: 80,
+      rows: 30,
+      cwd: process.env.HOME,
+      env: process.env
+    });
+  }
+
+  const onExit = async (exitCode: number, ws: WebSocket, session: Session) => {
+    if (session.additionalData.filePath) {
+      await fs.rm(session.additionalData.filePath as string, { recursive: true, force: true });
+    }
+  }
+
+  return createCommandHandler({
+    name: ConnectCommand.APPLY,
+    spawnCommand,
+    onExit
+  });
+}
diff --git a/src/connect/http-routes/handlers/terminal-handler.ts b/src/connect/http-routes/handlers/terminal-handler.ts
@@ -0,0 +1,8 @@
+import { ConnectCommand, createCommandHandler } from './create-command.js';
+
+export function terminalHandler() {
+  return createCommandHandler({
+    name: ConnectCommand.TERMINAL,
+    command: [],
+  })
+}
diff --git a/src/connect/http-routes/router.ts b/src/connect/http-routes/router.ts
@@ -2,13 +2,16 @@ import { Router } from 'express';
 
 import { ConnectCommand, createCommandHandler } from './handlers/create-command.js';
 import defaultHandler from './handlers/index.js';
+import { terminalHandler } from './handlers/terminal-handler.js';
+import { applyHandler } from './handlers/apply-handler.js';
+import { planHandler } from './handlers/plan-handler.js';
 
 const router = Router();
 
 router.use('/', defaultHandler);
-router.use('/apply', createCommandHandler(ConnectCommand.APPLY));
-router.use('/plan', createCommandHandler(ConnectCommand.PLAN))
-router.use('/import', createCommandHandler(ConnectCommand.IMPORT));
-router.use('/terminal', createCommandHandler(ConnectCommand.TERMINAL));
+router.use('/apply', applyHandler());
+router.use('/plan', planHandler())
+// router.use('/import', createCommandHandler(ConnectCommand.IMPORT));
+router.use('/terminal', terminalHandler());
 
-export default router;
+export default router;
diff --git a/src/connect/socket-server.ts b/src/connect/socket-server.ts
@@ -9,6 +9,7 @@ export interface Session {
   server: WebSocketServer;
   ws?: WebSocket;
   pty?: IPty;
+  additionalData: Record<string, unknown>;
 }
 
 let instance: SocketServer | undefined;
@@ -45,14 +46,9 @@ export class SocketServer {
   }
 
   addSession(id: string): void {
-    // this.io.of(`/ws/session/${id}`).on('connection', (socket) => {
-    //   console.log(`Session ${id} connected!!`);
-    //   handler?.(this.io, socket);
-    // })
-
     this.sessions.set(
       id,
-      { server: this.createWssServer() }
+      { server: this.createWssServer(), additionalData: {} }
     )
   }
 

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ export interface Session {`
`9`	`9`	`server: WebSocketServer;`
`10`	`10`	`ws?: WebSocket;`
`11`	`11`	`pty?: IPty;`
	`12`	`+ additionalData: Record<string, unknown>;`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`let instance: SocketServer \| undefined;`
`@@ -45,14 +46,9 @@ export class SocketServer {`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`addSession(id: string): void {`
`48`		- // this.io.of(`/ws/session/${id}`).on('connection', (socket) => {
`49`		- // console.log(`Session ${id} connected!!`);
`50`		`- // handler?.(this.io, socket);`
`51`		`- // })`
`52`		`-`
`53`	`49`	`this.sessions.set(`
`54`	`50`	`id,`
`55`		`- { server: this.createWssServer() }`
	`51`	`+ { server: this.createWssServer(), additionalData: {} }`
`56`	`52`	`)`
`57`	`53`	`}`
`58`	`54`