Switched to socketIO

Author: kevinwang5658

README.md

@@ -26,7 +26,7 @@ USAGE
 ```
 <!-- usagestop -->
 # Commands
-<!-- commands -->
+<!-- handlers -->
 * [`codify apply`](#codify-apply)
 * [`codify destroy`](#codify-destroy)
 * [`codify help [COMMAND]`](#codify-help-command)

esbuild.ts

@@ -1,7 +1,7 @@
 import { build } from 'esbuild';
 
 const result = await build({
-  entryPoints: ['src/commands/**/index.ts', 'src/commands/*.ts', 'src/index.ts'],
+  entryPoints: ['src/handlers/**/router.ts', 'src/handlers/*.ts', 'src/router.ts'],
   bundle: true,
   minify: true,
   splitting: true,

src/commands/apply.ts

@@ -22,7 +22,7 @@ For more information, visit: https://docs.codifycli.com/commands/apply
   static flags = {
     'sudoPassword': Flags.string({
       optional: true,
-      description: 'Automatically use this password for any commands that require elevated permissions.',
+      description: 'Automatically use this password for any handlers that require elevated permissions.',
       char: 'S'
     }),
   }

src/commands/destroy.ts

@@ -29,7 +29,7 @@ For more information, visit: https://docs.codifycli.com/commands/destory`
   static flags = {
     'sudoPassword': Flags.string({
       optional: true,
-      description: 'Automatically use this password for any commands that require elevated permissions.',
+      description: 'Automatically use this password for any handlers that require elevated permissions.',
       char: 'S',
       helpValue: '<password>'
     }),

src/config.ts

@@ -3,7 +3,7 @@ export const config = {
   connectServerPort: 51_040,
 
   corsAllowedOrigins: [
-    'https://codify-dashboard.com',
+    'https://dashboard.codifycli.com',
     'https://https://codify-dashboard.kevinwang5658.workers.dev',
     'http://localhost:3000'
   ]

src/connect/apply.ts

@@ -0,0 +1,52 @@
+import { spawn } from '@homebridge/node-pty-prebuilt-multiarch';
+import { Router } from 'express';
+
+import { SocketServer } from '../../socket-server.js';
+
+export function createCommandHandler(command: string, args?: string): Router {
+  const router = Router({
+    mergeParams: true,
+  });
+
+  router.post('/:sessionId/start', async (req, res) => {
+    const { sessionId } = req.params;
+    console.log(`Received request to ${command}, sessionId: ${sessionId}`)
+
+    if (!sessionId) {
+      return res.status(400).json({ error: 'SessionId must be provided' });
+    }
+
+    const server = SocketServer.get();
+    const socket = server.getSession(sessionId);
+    if (!socket) {
+      return res.status(400).json({ error: 'SessionId does not exist' });
+    }
+
+    if (!socket.connected) {
+      return res.status(400).json({ error: 'Socket not connected. Connect to socket before calling this endpoint' });
+    }
+
+    const pty = spawn('zsh', ['-c',  `codify ${command} ${args ?? ''}`], {
+      name: 'xterm-color',
+      cols: 80,
+      rows: 30,
+      cwd: process.env.HOME,
+      env: process.env
+    });
+
+    pty.onData((data) => {
+      socket.emit('data', Buffer.from(data, 'utf8'));
+    });
+
+    socket.on('data', (message) => {
+      pty.write(message.toString('utf8'));
+    })
+
+    pty.onExit(({ exitCode, signal }) => {
+      console.log('pty exit', exitCode, signal);
+      // socket.disconnect();
+    })
+  });
+
+  return router;
+}

src/connect/http-route-handler.ts

@@ -0,0 +1,20 @@
+import { Router } from 'express';
+import { v4 as uuid } from 'uuid';
+
+import { SocketServer } from '../../socket-server.js';
+
+const router = Router({
+  mergeParams: true,
+});
+
+router.post('/session', (req, res) => {
+  const sessionId = uuid();
+  const socketServer = SocketServer.get();
+
+  socketServer.addSession(sessionId);
+  console.log('Terminal session created!', sessionId)
+
+  return res.status(200).json({ sessionId });
+})
+
+export default router;

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

@@ -0,0 +1,13 @@
+import { Router } from 'express';
+
+import { 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'));
+
+export default router;