Fix: dockge cannot be self-managed

backend/dockge-server.ts

@@ -30,7 +30,6 @@ import { Cron } from "croner";
 import gracefulShutdown from "http-graceful-shutdown";
 import User from "./models/user";
 import childProcess from "child_process";
-import { Terminal } from "./terminal";
 
 export class DockgeServer {
     app : Express;
@@ -231,11 +230,6 @@ export class DockgeServer {
 
         });
 
-        if (isDev) {
-            setInterval(() => {
-                log.debug("terminal", "Terminal count: " + Terminal.getTerminalCount());
-            }, 5000);
-        }
     }
 
     async afterLogin(socket : DockgeSocket, user : User) {
@@ -298,11 +292,11 @@ export class DockgeServer {
                 log.info("server", `Listening on ${this.config.port}`);
             }
 
-            // Run every 10 seconds
-            Cron("*/10 * * * * *", {
+            // Run every 5 seconds
+            Cron("*/2 * * * * *", {
                 protect: true,  // Enabled over-run protection.
             }, () => {
-                //log.debug("server", "Cron job running");
+                log.debug("server", "Cron job running");
                 this.sendStackList(true);
             });
 

backend/socket-handlers/docker-socket-handler.ts

@@ -75,9 +75,7 @@ export class DockerSocketHandler extends SocketHandler {
 
                 const stack = Stack.getStack(server, stackName);
 
-                if (stack.isManagedByDockge) {
                 stack.joinCombinedTerminal(socket);
-                }
 
                 callback({
                     ok: true,

backend/socket-handlers/terminal-socket-handler.ts

@@ -140,26 +140,9 @@ export class TerminalSocketHandler extends SocketHandler {
             }
         });
 
-        // Leave Combined Terminal
-        socket.on("leaveCombinedTerminal", async (stackName : unknown, callback) => {
-            try {
-                checkLogin(socket);
+        // Close Terminal
+        socket.on("terminalClose", async (terminalName : unknown, callback : unknown) => {
 
-                log.debug("leaveCombinedTerminal", "Stack name: " + stackName);
-
-                if (typeof(stackName) !== "string") {
-                    throw new ValidationError("Stack name must be a string.");
-                }
-
-                const stack = Stack.getStack(server, stackName);
-                await stack.leaveCombinedTerminal(socket);
-
-                callback({
-                    ok: true,
-                });
-            } catch (e) {
-                callbackError(e, callback);
-            }
         });
 
         // TODO: Resize Terminal

backend/stack.ts

@@ -298,7 +298,7 @@ export class Stack {
                 }
             }
         } else {
-            //log.debug("getStack", "Skip FS operations");
+            log.debug("getStack", "Skip FS operations");
         }
 
         let stack : Stack;
@@ -374,21 +374,12 @@ export class Stack {
     async joinCombinedTerminal(socket: DockgeSocket) {
         const terminalName = getCombinedTerminalName(this.name);
         const terminal = Terminal.getOrCreateTerminal(this.server, terminalName, "docker", [ "compose", "logs", "-f", "--tail", "100" ], this.path);
-        terminal.enableKeepAlive = true;
         terminal.rows = COMBINED_TERMINAL_ROWS;
         terminal.cols = COMBINED_TERMINAL_COLS;
         terminal.join(socket);
         terminal.start();
     }
 
-    async leaveCombinedTerminal(socket: DockgeSocket) {
-        const terminalName = getCombinedTerminalName(this.name);
-        const terminal = Terminal.getTerminal(terminalName);
-        if (terminal) {
-            terminal.leave(socket);
-        }
-    }
-
     async joinContainerTerminal(socket: DockgeSocket, serviceName: string, shell : string = "sh", index: number = 0) {
         const terminalName = getContainerExecTerminalName(this.name, serviceName, index);
         let terminal = Terminal.getTerminal(terminalName);

backend/terminal.ts

@@ -34,9 +34,6 @@ export class Terminal {
     protected _rows : number = TERMINAL_ROWS;
     protected _cols : number = TERMINAL_COLS;
 
-    public enableKeepAlive : boolean = false;
-    protected keepAliveInterval? : NodeJS.Timeout;
-
     constructor(server : DockgeServer, name : string, file : string, args : string | string[], cwd : string) {
         this.server = server;
         this._name = name;
@@ -83,25 +80,6 @@ export class Terminal {
             return;
         }
 
-        if (this.enableKeepAlive) {
-            log.debug("Terminal", "Keep alive enabled for terminal " + this.name);
-
-            // Close if there is no clients
-            this.keepAliveInterval = setInterval(() => {
-                const clients = this.server.io.sockets.adapter.rooms.get(this.name);
-                const numClients = clients ? clients.size : 0;
-
-                if (numClients === 0) {
-                    log.debug("Terminal", "Terminal " + this.name + " has no client, closing...");
-                    this.close();
-                } else {
-                    log.debug("Terminal", "Terminal " + this.name + " has " + numClients + " client(s)");
-                }
-            }, 60 * 1000);
-        } else {
-            log.debug("Terminal", "Keep alive disabled for terminal " + this.name);
-        }
-
         try {
             this._ptyProcess = pty.spawn(this.file, this.args, {
                 name: this.name,
@@ -122,8 +100,6 @@ export class Terminal {
             this._ptyProcess.onExit(this.exit);
         } catch (error) {
             if (error instanceof Error) {
-                clearInterval(this.keepAliveInterval);
-
                 log.error("Terminal", "Failed to start terminal: " + error.message);
                 const exitCode = Number(error.message.split(" ").pop());
                 this.exit({
@@ -146,8 +122,6 @@ export class Terminal {
         Terminal.terminalMap.delete(this.name);
         log.debug("Terminal", "Terminal " + this.name + " exited with code " + res.exitCode);
 
-        clearInterval(this.keepAliveInterval);
-
         if (this.callback) {
             this.callback(res.exitCode);
         }
@@ -184,9 +158,7 @@ export class Terminal {
     }
 
     close() {
-        clearInterval(this.keepAliveInterval);
-        // Send Ctrl+C to the terminal
-        this.ptyProcess?.write("\x03");
+        this._ptyProcess?.kill();
     }
 
     /**
@@ -221,10 +193,6 @@ export class Terminal {
             terminal.start();
         });
     }
-
-    public static getTerminalCount() {
-        return Terminal.terminalMap.size;
-    }
 }
 
 /**

frontend/src/pages/Compose.vue

@@ -319,12 +319,6 @@ export default {
             },
             deep: true,
         },
-
-        $route(to, from) {
-            // Leave Combined Terminal
-            console.debug("leaveCombinedTerminal", from.params.stackName);
-            this.$root.getSocket().emit("leaveCombinedTerminal", this.stack.name, () => {});
-        }
     },
     mounted() {
         if (this.isAdd) {
@@ -367,7 +361,7 @@ export default {
             clearTimeout(serviceStatusTimeout);
             serviceStatusTimeout = setTimeout(async () => {
                 this.requestServiceStatus();
-            }, 5000);
+            }, 2000);
         },
 
         requestServiceStatus() {