Added new finish event to unify sending the remote result back to the dashboard

Author: kevinwang5658

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

@@ -17,7 +17,7 @@ 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;
+  onExit?: (exitCode: number, ws: WebSocket, session: Session) => Promise<Record<string, unknown> | undefined | void>;
 }
 
 export function createCommandHandler({ name, command, spawnCommand, onExit }: Params): Router {
@@ -47,7 +47,7 @@ export function createCommandHandler({ name, command, spawnCommand, onExit }: Pa
       return res.status(400).json({ error: 'SessionId does not exist' });
     }
 
-    const { ws, server } = session;
+    const { ws, server, clientId } = session;
     if (!ws) {
       return res.status(400).json({ error: 'SessionId not open' });
     }
@@ -80,7 +80,11 @@ export function createCommandHandler({ name, command, spawnCommand, onExit }: Pa
       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)
+      const mainWs = SocketServer.get().getMainConnection(clientId);
+      if (mainWs) {
+        const data = await onExit?.(exitCode, ws, session) ?? {}
+        mainWs.send(JSON.stringify({ key: `finish:${sessionId}`, success: exitCode === 0, data })) // Send finish command only if client connection is still open
+      }
 
       ws.terminate();
       server.close();

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

@@ -76,14 +76,10 @@ export function importHandler() {
         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 });
+      return { updated: updatedFile }
     }
   }
 

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

@@ -39,13 +39,9 @@ export function initHandler() {
           throw new Error(`Unable to find client for clientId ${session.clientId}`);
         }
 
-        ws.send(JSON.stringify({ key: 'new_init', data: {
-          updated: updatedFile,
-        } }))
+        await fs.rm(session.additionalData.filePath as string, { recursive: true, force: true });
+        return { updated: updatedFile };
       }
-
-
-      await fs.rm(session.additionalData.filePath as string, { recursive: true, force: true });
     }
   }
 

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

@@ -72,18 +72,9 @@ export function refreshHandler() {
       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 });
+        return { updated: updatedFile };
       }
-
-
-      await fs.rm(session.additionalData.filePath as string, { recursive: true, force: true });
     }
   }