Updates

src/websocket/(utils)/kill-port.ts

@@ -6,7 +6,7 @@ type Params = {
 };
 
 export default async function killPort({ port, exec_options }: Params) {
-    const kill_ports_cmd = `ss -tlnp | awk -v p=${port} 'NR>1 {split($4,a,":"); if(a[length(a)]==p) print $6}' | grep -oP 'pid=\K[0-9]+' | xargs -r kill -9`;
+    const kill_ports_cmd = `ss -tlnp | awk -v p=${port} 'NR>1 {split($4,a,":"); if(a[length(a)]==p) print $6}' | grep -oP 'pid=\\K[0-9]+' | xargs -r kill -9`;
 
     execSync(kill_ports_cmd, {
         ...exec_options,

src/websocket/events/client-kill-port.ts

@@ -2,6 +2,7 @@ import { WebSocketMessageParam } from "@/src/types";
 import sendData from "../(utils)/send-data";
 import sendError from "../(utils)/send-error";
 import grabConnectedWebsocketUserdata from "../(utils)/grab-connected-websocket-user-data";
+import killPort from "../(utils)/kill-port";
 
 export default async function socketClientKillPort({
     ws,
@@ -15,7 +16,15 @@ export default async function socketClientKillPort({
 
         const connected_user_data = grabConnectedWebsocketUserdata({ user });
 
-        console.log("connected_user_data", connected_user_data);
+        console.log("port", port);
+
+        if (port) {
+            await killPort({ port, exec_options: { stdio: "inherit" } });
+
+            connected_user_data.ports = connected_user_data.ports.filter(
+                (p) => p != port,
+            );
+        }
 
         sendData(ws, {
             event: "server:killed-port",

src/websocket/events/client-service-server-logs.ts

@@ -19,8 +19,6 @@ export default async function socketClientServiceServerLogs({
             paradigm: "logs",
         });
 
-        console.log("ttyd", ttyd);
-
         sendData(ws, {
             event: "server:service-server-logs",
             ttyd,

src/websocket/events/client-service-server-shell.ts

@@ -0,0 +1,30 @@
+import { WebSocketMessageParam } from "@/src/types";
+import sendData from "../(utils)/send-data";
+import sendError from "../(utils)/send-error";
+import grabTtydServerInfo from "@/src/functions/ttyd/grab-ttyd-service-info";
+
+export default async function socketClientServiceServerShell({
+    ws,
+    data,
+}: WebSocketMessageParam) {
+    try {
+        const user = ws.data.user;
+        const service = data?.service;
+        const server = data?.server;
+
+        const ttyd = await grabTtydServerInfo({
+            server,
+            service,
+            user,
+            paradigm: "terminal",
+        });
+
+        sendData(ws, {
+            event: "server:service-server-shell",
+            ttyd,
+            server,
+        });
+    } catch (error: any) {
+        sendError(ws, "Service Server Logs Error! " + error.message);
+    }
+}

src/websocket/socket-message.ts

@@ -9,6 +9,7 @@ import socketClientPing from "./events/client-ping";
 import debugLog from "@moduletrace/datasquirel/dist/package-shared/utils/logging/debug-log";
 import socketClientServiceServerLogs from "./events/client-service-server-logs";
 import socketClientKillPort from "./events/client-kill-port";
+import socketClientServiceServerShell from "./events/client-service-server-shell";
 
 type Param = {
     ws: ServerWebSocket<WebSocketData>;
@@ -47,6 +48,14 @@ export default async function socketMessage({ ws, message }: Param) {
             });
             await socketClientServiceServerLogs(websocketMessageParams);
             break;
+        case "client:service-server-shell":
+            debugLog({
+                log: `${userRef} Getting Service Server Shell ...`,
+                addTime: true,
+                label,
+            });
+            await socketClientServiceServerShell(websocketMessageParams);
+            break;
         case "client:kill-port":
             debugLog({
                 log: `${userRef} Killing Port ${data.port} ...`,