Improved session ending logic.

Author: kevinwang5658

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

@@ -1,4 +1,5 @@
 import { spawn } from '@homebridge/node-pty-prebuilt-multiarch';
+import chalk from 'chalk';
 import { Router } from 'express';
 
 import { SocketServer } from '../../socket-server.js';
@@ -92,10 +93,17 @@ export function createCommandHandler(command: ConnectCommand): Router {
 
     pty.onExit(({ exitCode, signal }) => {
       console.log('pty exit', exitCode, signal);
+      ws.send(Buffer.from(chalk.blue(`Session ended exit code ${exitCode}`), 'utf8'))
+
       ws.terminate();
       server.close();
     })
 
+    ws.on('close', () => {
+      console.log('Session ws closed. Shutting down pty');
+      pty.kill();
+      manager.removeSession(sessionId)
+    })
 
     return res.status(204).json({});
   });

src/connect/socket-server.ts

@@ -56,6 +56,10 @@ export class SocketServer {
     )
   }
 
+  removeSession(id: string) {
+    this.sessions.delete(id);
+  }
+
   // Under normal use, there should only be 1 socket (1 connection) per namespace.
   getSession(id: string): Session | undefined {
     return this.sessions.get(id);
@@ -124,4 +128,4 @@ export class SocketServer {
     })
   }
 
-}
+}