Added concept of clientId. Added import writer

Author: kevinwang5658

src/connect/http-routes/handlers/import-handler.ts

@@ -1,5 +1,6 @@
 import { spawn } from '@homebridge/node-pty-prebuilt-multiarch';
 import { ConfigFileSchema } from 'codify-schemas';
+import { diffChars } from 'diff';
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
@@ -41,6 +42,7 @@ export function importHandler() {
     const filePath = path.join(tmpDir, 'codify.jsonc');
     await fs.writeFile(filePath, JSON.stringify(codifyConfig, null, 2));
     session.additionalData.filePath = filePath;
+    session.additionalData.existingFile = codifyConfig;
 
     let args = '';
     switch (type as ImportType) {
@@ -70,6 +72,23 @@ export function importHandler() {
 
   const onExit = async (exitCode: number, ws: WebSocket, session: Session) => {
     if (session.additionalData.filePath) {
+      const updatedFile = await fs.readFile(session.additionalData.filePath as string, 'utf8')
+
+      // Changes were found
+      if (diffChars(updatedFile, session.additionalData.existingFile as string).length > 0) {
+        console.log('Writing imported changes to Codify dashboard');
+
+        const ws = SocketServer.get().getMainConnection(session.clientId);
+        if (!ws) {
+          throw new Error(`Unable to find client for clientId ${session.clientId}`);
+        }
+
+        ws.send(JSON.stringify({ key: 'new_import', data: {
+          updated: updatedFile,
+        } }))
+      }
+
+
       await fs.rm(session.additionalData.filePath as string, { recursive: true, force: true });
     }
   }

src/connect/http-routes/handlers/index.ts

@@ -1,5 +1,4 @@
 import { Router } from 'express';
-import { v4 as uuid } from 'uuid';
 
 import { SocketServer } from '../../socket-server.js';
 
@@ -8,13 +7,20 @@ const router = Router({
 });
 
 router.post('/session', (req, res) => {
-  const sessionId = uuid();
+  const { clientId } = req.body;
+  if (!clientId) {
+    throw new Error('connectionId is required');
+  }
+
   const socketServer = SocketServer.get();
+  if (!socketServer.getMainConnection(clientId)) {
+    throw new Error('Invalid connection id');
+  }
 
-  socketServer.addSession(sessionId);
+  const sessionId = socketServer.createSession(clientId);
   console.log('Terminal session created!', sessionId)
 
   return res.status(200).json({ sessionId });
 })
 
-export default router;
+export default router;

src/connect/socket-server.ts

@@ -1,12 +1,14 @@
 import { IPty } from '@homebridge/node-pty-prebuilt-multiarch';
 import { Server as HttpServer, IncomingMessage } from 'node:http';
 import { Duplex } from 'node:stream';
+import { v4 as uuid } from 'uuid';
 import WebSocket, { WebSocketServer } from 'ws';
 
 import { config } from '../config.js';
 
 export interface Session {
   server: WebSocketServer;
+  clientId: string;
   ws?: WebSocket;
   pty?: IPty;
   additionalData: Record<string, unknown>;
@@ -23,7 +25,8 @@ export class SocketServer {
 
   private server: HttpServer;
   private connectionSecret: string;
-  private sessions = new Map<string, Session>()
+  private mainConnections = new Map<string, WebSocket>(); // These are per webpage
+  private sessions = new Map<string, Session>();
 
   static init(server: HttpServer, connectionSecret: string): SocketServer {
     instance = new SocketServer(server, connectionSecret);
@@ -45,11 +48,19 @@ export class SocketServer {
     this.server.on('upgrade', this.onUpgrade);
   }
 
-  addSession(id: string): void {
+  getMainConnection(id: string): WebSocket | undefined {
+    return this.mainConnections.get(id);
+  }
+
+  createSession(clientId: string): string {
+    const sessionId = uuid();
+
     this.sessions.set(
-      id,
-      { server: this.createWssServer(), additionalData: {} }
+      sessionId,
+      { server: this.createWssServer(), clientId, additionalData: {} }
     )
+
+    return sessionId;
   }
 
   removeSession(id: string) {
@@ -79,7 +90,7 @@ export class SocketServer {
     if (pathname === '/ws') {
       console.log('Client connected!')
       const wss = this.createWssServer();
-      wss.handleUpgrade(request, socket, head, (ws: WebSocket) => {});
+      wss.handleUpgrade(request, socket, head, this.handleClientConnected);
     }
 
     const pathSections = pathname.split('/').filter(Boolean);
@@ -110,6 +121,16 @@ export class SocketServer {
     }
   }
 
+  private handleClientConnected = (ws: WebSocket) => {
+    const clientId = uuid();
+    this.mainConnections.set(clientId, ws);
+    ws.send(JSON.stringify({ key: 'opened', data: { clientId: uuid } }))
+
+    ws.on('close', () => {
+      this.mainConnections.delete(clientId);
+    })
+  }
+
   private validateOrigin = (origin: string): boolean =>
     config.corsAllowedOrigins.includes(origin)