Sort non managed stack to the end

.github/DISCUSSION_TEMPLATE/ask-for-help.yml

@@ -1,3 +1,4 @@
+title: "❓ Ask for help"
 labels: [help] 
 body:
   - type: checkboxes

.github/DISCUSSION_TEMPLATE/feature-request.yml

@@ -1,3 +1,4 @@
+title: 🚀 Feature Request
 labels: [feature-request]
 body:
   - type: checkboxes

.github/ISSUE_TEMPLATE/ask-for-help.yaml

@@ -1,14 +1,14 @@
-name: "⚠️ Ask for help (Please go to the \"Discussions\" tab to submit a Help Request)"
-description: "⚠️ Please go to the \"Discussions\" tab to submit a Help Request"
+name: "❓ Ask for help"
+description: "Please go to the Discussions tab to submit a Help Request"
 body:
   - type: markdown
     attributes:
       value: |
-        ⚠️ ⚠️ ⚠️ ⚠️ ⚠️ ⚠️ ⚠️  Please go to https://github.com/louislam/dockge/discussions/new?category=ask-for-help
+        Please go to https://github.com/louislam/dockge/discussions/new?category=ask-for-help
   - type: checkboxes
     id: no-duplicate-issues
     attributes:
-      label: "Issues are for bug reports only, please go to the \"Discussions\" tab to submit a Feature Request"
+      label: "Issues are for bug reports only"
       options:
         - label: "I understand"
           required: true

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -1,14 +1,14 @@
-name: 🚀 Feature Request (Please go to the "Discussions" tab to submit a Feature Request)
-description: "⚠️ Please go to the \"Discussions\" tab to submit a Feature Request"
+name: 🚀 Feature Request
+description: "Please go to the Discussions tab to submit a Feature Request"
 body:
   - type: markdown
     attributes:
       value: |
-        ⚠️ ⚠️ ⚠️ ⚠️ ⚠️ ⚠️ ⚠️  Please go to https://github.com/louislam/dockge/discussions/new?category=ask-for-help
+        Please go to https://github.com/louislam/dockge/discussions/new?category=feature-request
   - type: checkboxes
     id: no-duplicate-issues
     attributes:
-      label: "Issues are for bug reports only, please go to the \"Discussions\" tab to submit a Feature Request"
+      label: "Issues are for bug reports only"
       options:
         - label: "I understand"
           required: true

.github/workflows/ci.yml

@@ -14,8 +14,8 @@ jobs:
   ci:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest, ARM, ARM64]
-        node: [22] # Can be changed
+        os: [ubuntu-latest, windows-latest, macos-latest, ARM64]
+        node: [18.17.1] # Can be changed
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout Code

.github/workflows/json-yaml-validate.yml

@@ -17,11 +17,11 @@ jobs:
   json-yaml-validate:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: json-yaml-validate
         id: json-yaml-validate
-        uses: GrantBirki/json-yaml-validate@v2.6.1
+        uses: GrantBirki/json-yaml-validate@v1.3.0
         with:
           comment: "false" # enable comment mode
           exclude_file: ".github/config/exclude.txt" # gitignore style file for exclusions

README.md

@@ -6,7 +6,7 @@
 
 A fancy, easy-to-use and reactive self-hosted docker compose.yaml stack-oriented manager.
 
-[![GitHub Repo stars](https://img.shields.io/github/stars/louislam/dockge?logo=github&style=flat)](https://github.com/louislam/dockge) [![Docker Pulls](https://img.shields.io/docker/pulls/louislam/dockge?logo=docker)](https://hub.docker.com/r/louislam/dockge/tags) [![Docker Image Version (latest semver)](https://img.shields.io/docker/v/louislam/dockge/latest?label=docker%20image%20ver.)](https://hub.docker.com/r/louislam/dockge/tags) [![GitHub last commit (branch)](https://img.shields.io/github/last-commit/louislam/dockge/master?logo=github)](https://github.com/louislam/dockge/commits/master/)
+![GitHub Repo stars](https://img.shields.io/github/stars/louislam/dockge?logo=github) ![GitHub issues](https://img.shields.io/github/issues/louislam/dockge?logo=github) ![GitHub pull requests](https://img.shields.io/github/issues-pr/louislam/dockge?logo=github) ![Docker Pulls](https://img.shields.io/docker/pulls/louislam/dockge?logo=docker) ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/louislam/dockge/latest?label=docker%20image%20ver.) ![GitHub last commit (branch)](https://img.shields.io/github/last-commit/louislam/dockge/master?logo=github) ![GitHub](https://img.shields.io/github/license/louislam/dockge?logo=github)
 
 <img src="https://github.com/louislam/dockge/assets/1336778/26a583e1-ecb1-4a8d-aedf-76157d714ad7" width="900" alt="" />
 
@@ -14,19 +14,20 @@ View Video: https://youtu.be/AWAlOQeNpgU?t=48
 
 ## ⭐ Features
 
-- 🧑‍💼 Manage your `compose.yaml` files
+- Manage `compose.yaml`
   - Create/Edit/Start/Stop/Restart/Delete
   - Update Docker Images
-- ⌨️ Interactive Editor for `compose.yaml`
-- 🦦 Interactive Web Terminal
-- 🕷️ (1.4.0 🆕) Multiple agents support - You can manage multiple stacks from different Docker hosts in one single interface
-- 🏪 Convert `docker run ...` commands into `compose.yaml`
-- 📙 File based structure - Dockge won't kidnap your compose files, they are stored on your drive as usual. You can interact with them using normal `docker compose` commands
-
+- Interactive Editor for `compose.yaml`
+- Interactive Web Terminal
+- Reactive
+   - Everything is just responsive. Progress (Pull/Up/Down) and terminal output are in real-time
+- Easy-to-use & fancy UI
+   - If you love Uptime Kuma's UI/UX, you will love this one too
+- Convert `docker run ...` commands into `compose.yaml`
+- File based structure
+   - Dockge won't kidnap your compose files, they are stored on your drive as usual. You can interact with them using normal `docker compose` commands
    <img src="https://github.com/louislam/dockge/assets/1336778/cc071864-592e-4909-b73a-343a57494002" width=300 />
 
-- 🚄 Reactive - Everything is just responsive. Progress (Pull/Up/Down) and terminal output are in real-time
-- 🐣 Easy-to-use & fancy UI - If you love Uptime Kuma's UI/UX, you will love this one too
 
 ![](https://github.com/louislam/dockge/assets/1336778/89fc1023-b069-42c0-a01c-918c495f1a6a)
 
@@ -130,7 +131,7 @@ Be sure to read the [guide](https://github.com/louislam/dockge/blob/master/CONTR
 
 #### "Dockge"?
 
-"Dockge" is a coinage word which is created by myself. I originally hoped it sounds like `Dodge`, but apparently many people called it `Dockage`, it is also acceptable.
+"Dockge" is a coinage word which is created by myself. I hope it sounds like `Dodge`.
 
 The naming idea came from Twitch emotes like `sadge`, `bedge` or `wokege`. They all end in `-ge`.
 
@@ -147,13 +148,13 @@ Yes, you can. However, you need to move your compose file into the stacks direct
 3. In Dockge, click the " Scan Stacks Folder" button in the top-right corner's dropdown menu
 4. Now you should see your stack in the list
 
-#### Is Dockge a Portainer replacement?
+#### Is Dockge a Portainer replcement?
 
 Yes or no. Portainer provides a lot of Docker features. While Dockge is currently only focusing on docker-compose with a better user interface and better user experience.
 
 If you want to manage your container with docker-compose only, the answer may be yes.
 
-If you still need to manage something like docker networks, single containers, the answer may be no.
+If you still need to manage something like docker networks, signle containers, the answer may be no.
 
 #### Can I install both Dockge and Portainer?
 

backend/agent-manager.ts

@@ -1,293 +0,0 @@
-import { DockgeSocket } from "./util-server";
-import { io, Socket as SocketClient } from "socket.io-client";
-import { log } from "./log";
-import { Agent } from "./models/agent";
-import { isDev, LooseObject, sleep } from "../common/util-common";
-import semver from "semver";
-import { R } from "redbean-node";
-import dayjs, { Dayjs } from "dayjs";
-
-/**
- * Dockge Instance Manager
- * One AgentManager per Socket connection
- */
-export class AgentManager {
-
-    protected socket : DockgeSocket;
-    protected agentSocketList : Record<string, SocketClient> = {};
-    protected agentLoggedInList : Record<string, boolean> = {};
-    protected _firstConnectTime : Dayjs = dayjs();
-
-    constructor(socket: DockgeSocket) {
-        this.socket = socket;
-    }
-
-    get firstConnectTime() : Dayjs {
-        return this._firstConnectTime;
-    }
-
-    test(url : string, username : string, password : string) : Promise<void> {
-        return new Promise((resolve, reject) => {
-            let obj = new URL(url);
-            let endpoint = obj.host;
-
-            if (!endpoint) {
-                reject(new Error("Invalid Dockge URL"));
-            }
-
-            if (this.agentSocketList[endpoint]) {
-                reject(new Error("The Dockge URL already exists"));
-            }
-
-            let client = io(url, {
-                reconnection: false,
-                extraHeaders: {
-                    endpoint,
-                }
-            });
-
-            client.on("connect", () => {
-                client.emit("login", {
-                    username: username,
-                    password: password,
-                }, (res : LooseObject) => {
-                    if (res.ok) {
-                        resolve();
-                    } else {
-                        reject(new Error(res.msg));
-                    }
-                    client.disconnect();
-                });
-            });
-
-            client.on("connect_error", (err) => {
-                if (err.message === "xhr poll error") {
-                    reject(new Error("Unable to connect to the Dockge instance"));
-                } else {
-                    reject(err);
-                }
-                client.disconnect();
-            });
-        });
-    }
-
-    /**
-     *
-     * @param url
-     * @param username
-     * @param password
-     */
-    async add(url : string, username : string, password : string) : Promise<Agent> {
-        let bean = R.dispense("agent") as Agent;
-        bean.url = url;
-        bean.username = username;
-        bean.password = password;
-        await R.store(bean);
-        return bean;
-    }
-
-    /**
-     *
-     * @param url
-     */
-    async remove(url : string) {
-        let bean = await R.findOne("agent", " url = ? ", [
-            url,
-        ]);
-
-        if (bean) {
-            await R.trash(bean);
-            let endpoint = bean.endpoint;
-            this.disconnect(endpoint);
-            this.sendAgentList();
-            delete this.agentSocketList[endpoint];
-        } else {
-            throw new Error("Agent not found");
-        }
-    }
-
-    connect(url : string, username : string, password : string) {
-        let obj = new URL(url);
-        let endpoint = obj.host;
-
-        this.socket.emit("agentStatus", {
-            endpoint: endpoint,
-            status: "connecting",
-        });
-
-        if (!endpoint) {
-            log.error("agent-manager", "Invalid endpoint: " + endpoint + " URL: " + url);
-            return;
-        }
-
-        if (this.agentSocketList[endpoint]) {
-            log.debug("agent-manager", "Already connected to the socket server: " + endpoint);
-            return;
-        }
-
-        log.info("agent-manager", "Connecting to the socket server: " + endpoint);
-        let client = io(url, {
-            extraHeaders: {
-                endpoint,
-            }
-        });
-
-        client.on("connect", () => {
-            log.info("agent-manager", "Connected to the socket server: " + endpoint);
-
-            client.emit("login", {
-                username: username,
-                password: password,
-            }, (res : LooseObject) => {
-                if (res.ok) {
-                    log.info("agent-manager", "Logged in to the socket server: " + endpoint);
-                    this.agentLoggedInList[endpoint] = true;
-                    this.socket.emit("agentStatus", {
-                        endpoint: endpoint,
-                        status: "online",
-                    });
-                } else {
-                    log.error("agent-manager", "Failed to login to the socket server: " + endpoint);
-                    this.agentLoggedInList[endpoint] = false;
-                    this.socket.emit("agentStatus", {
-                        endpoint: endpoint,
-                        status: "offline",
-                    });
-                }
-            });
-        });
-
-        client.on("connect_error", (err) => {
-            log.error("agent-manager", "Error from the socket server: " + endpoint);
-            this.socket.emit("agentStatus", {
-                endpoint: endpoint,
-                status: "offline",
-            });
-        });
-
-        client.on("disconnect", () => {
-            log.info("agent-manager", "Disconnected from the socket server: " + endpoint);
-            this.socket.emit("agentStatus", {
-                endpoint: endpoint,
-                status: "offline",
-            });
-        });
-
-        client.on("agent", (...args : unknown[]) => {
-            this.socket.emit("agent", ...args);
-        });
-
-        client.on("info", (res) => {
-            log.debug("agent-manager", res);
-
-            // Disconnect if the version is lower than 1.4.0
-            if (!isDev && semver.satisfies(res.version, "< 1.4.0")) {
-                this.socket.emit("agentStatus", {
-                    endpoint: endpoint,
-                    status: "offline",
-                    msg: `${endpoint}: Unsupported version: ` + res.version,
-                });
-                client.disconnect();
-            }
-        });
-
-        this.agentSocketList[endpoint] = client;
-    }
-
-    disconnect(endpoint : string) {
-        let client = this.agentSocketList[endpoint];
-        client?.disconnect();
-    }
-
-    async connectAll() {
-        this._firstConnectTime = dayjs();
-
-        if (this.socket.endpoint) {
-            log.info("agent-manager", "This connection is connected as an agent, skip connectAll()");
-            return;
-        }
-
-        let list : Record<string, Agent> = await Agent.getAgentList();
-
-        if (Object.keys(list).length !== 0) {
-            log.info("agent-manager", "Connecting to all instance socket server(s)...");
-        }
-
-        for (let endpoint in list) {
-            let agent = list[endpoint];
-            this.connect(agent.url, agent.username, agent.password);
-        }
-    }
-
-    disconnectAll() {
-        for (let endpoint in this.agentSocketList) {
-            this.disconnect(endpoint);
-        }
-    }
-
-    async emitToEndpoint(endpoint: string, eventName: string, ...args : unknown[]) {
-        log.debug("agent-manager", "Emitting event to endpoint: " + endpoint);
-        let client = this.agentSocketList[endpoint];
-
-        if (!client) {
-            log.error("agent-manager", "Socket client not found for endpoint: " + endpoint);
-            throw new Error("Socket client not found for endpoint: " + endpoint);
-        }
-
-        if (!client.connected || !this.agentLoggedInList[endpoint]) {
-            // Maybe the request is too quick, the socket is not connected yet, check firstConnectTime
-            // If it is within 10 seconds, we should apply retry logic here
-            let diff = dayjs().diff(this.firstConnectTime, "second");
-            log.debug("agent-manager", endpoint + ": diff: " + diff);
-            let ok = false;
-            while (diff < 10) {
-                if (client.connected && this.agentLoggedInList[endpoint]) {
-                    log.debug("agent-manager", `${endpoint}: Connected & Logged in`);
-                    ok = true;
-                    break;
-                }
-                log.debug("agent-manager", endpoint + ": not ready yet, retrying in 1 second...");
-                await sleep(1000);
-                diff = dayjs().diff(this.firstConnectTime, "second");
-            }
-
-            if (!ok) {
-                log.error("agent-manager", `${endpoint}: Socket client not connected`);
-                throw new Error("Socket client not connected for endpoint: " + endpoint);
-            }
-        }
-
-        client.emit("agent", endpoint, eventName, ...args);
-    }
-
-    emitToAllEndpoints(eventName: string, ...args : unknown[]) {
-        log.debug("agent-manager", "Emitting event to all endpoints");
-        for (let endpoint in this.agentSocketList) {
-            this.emitToEndpoint(endpoint, eventName, ...args).catch((e) => {
-                log.warn("agent-manager", e.message);
-            });
-        }
-    }
-
-    async sendAgentList() {
-        let list = await Agent.getAgentList();
-        let result : Record<string, LooseObject> = {};
-
-        // Myself
-        result[""] = {
-            url: "",
-            username: "",
-            endpoint: "",
-        };
-
-        for (let endpoint in list) {
-            let agent = list[endpoint];
-            result[endpoint] = agent.toJSON();
-        }
-
-        this.socket.emit("agentList", {
-            ok: true,
-            agentList: result,
-        });
-    }
-}

backend/agent-socket-handler.ts

@@ -1,7 +0,0 @@
-import { DockgeServer } from "./dockge-server";
-import { AgentSocket } from "../common/agent-socket";
-import { DockgeSocket } from "./util-server";
-
-export abstract class AgentSocketHandler {
-    abstract create(socket : DockgeSocket, server : DockgeServer, agentSocket : AgentSocket): void;
-}

backend/check-version.ts

@@ -3,16 +3,19 @@ import compareVersions from "compare-versions";
 import packageJSON from "../package.json";
 import { Settings } from "./settings";
 
+export const obj = {
+    version: packageJSON.version,
+    latestVersion: null,
+};
+export default obj;
+
 // How much time in ms to wait between update checks
 const UPDATE_CHECKER_INTERVAL_MS = 1000 * 60 * 60 * 48;
 const CHECK_URL = "https://dockge.kuma.pet/version";
 
-class CheckVersion {
-    version = packageJSON.version;
-    latestVersion? : string;
-    interval? : NodeJS.Timeout;
+let interval : NodeJS.Timeout;
 
-    async startInterval() {
+export function startInterval() {
     const check = async () => {
         if (await Settings.get("checkUpdate") === false) {
             return;
@@ -33,13 +36,13 @@ class CheckVersion {
 
             if (checkBeta && data.beta) {
                 if (compareVersions.compare(data.beta, data.slow, ">")) {
-                        this.latestVersion = data.beta;
+                    obj.latestVersion = data.beta;
                     return;
                 }
             }
 
             if (data.slow) {
-                    this.latestVersion = data.slow;
+                obj.latestVersion = data.slow;
             }
 
         } catch (_) {
@@ -48,10 +51,21 @@ class CheckVersion {
 
     };
 
-        await check();
-        this.interval = setInterval(check, UPDATE_CHECKER_INTERVAL_MS);
-    }
+    check();
+    interval = setInterval(check, UPDATE_CHECKER_INTERVAL_MS);
 }
 
-const checkVersion = new CheckVersion();
-export default checkVersion;
+/**
+ * Enable the check update feature
+ * @param value Should the check update feature be enabled?
+ * @returns
+ */
+export async function enableCheckUpdate(value : boolean) {
+    await Settings.set("checkUpdate", value);
+
+    clearInterval(interval);
+
+    if (value) {
+        startInterval();
+    }
+}

backend/database.ts

@@ -9,7 +9,7 @@ import knex from "knex";
 import Dialect from "knex/lib/dialects/sqlite3/index.js";
 
 import sqlite from "@louislam/sqlite3";
-import { sleep } from "../common/util-common";
+import { sleep } from "./util-common";
 
 interface DBConfig {
     type?: "sqlite" | "mysql";

backend/docker.ts

@@ -0,0 +1,3 @@
+export class Docker {
+
+}

backend/dockge-server.ts

@@ -1,4 +1,3 @@
-import "dotenv/config";
 import { MainRouter } from "./routers/main-router";
 import * as fs from "node:fs";
 import { PackageJson } from "type-fest";
@@ -18,24 +17,19 @@ import { Settings } from "./settings";
 import checkVersion from "./check-version";
 import dayjs from "dayjs";
 import { R } from "redbean-node";
-import { genSecret, isDev, LooseObject } from "../common/util-common";
+import { genSecret, isDev } from "./util-common";
 import { generatePasswordHash } from "./password-hash";
 import { Bean } from "redbean-node/dist/bean";
 import { Arguments, Config, DockgeSocket } from "./util-server";
-import { DockerSocketHandler } from "./agent-socket-handlers/docker-socket-handler";
+import { DockerSocketHandler } from "./socket-handlers/docker-socket-handler";
 import expressStaticGzip from "express-static-gzip";
 import path from "path";
-import { TerminalSocketHandler } from "./agent-socket-handlers/terminal-socket-handler";
+import { TerminalSocketHandler } from "./socket-handlers/terminal-socket-handler";
 import { Stack } from "./stack";
 import { Cron } from "croner";
 import gracefulShutdown from "http-graceful-shutdown";
 import User from "./models/user";
-import childProcessAsync from "promisify-child-process";
-import { AgentManager } from "./agent-manager";
-import { AgentProxySocketHandler } from "./socket-handlers/agent-proxy-socket-handler";
-import { AgentSocketHandler } from "./agent-socket-handler";
-import { AgentSocket } from "../common/agent-socket";
-import { ManageAgentSocketHandler } from "./socket-handlers/manage-agent-socket-handler";
+import childProcess from "child_process";
 import { Terminal } from "./terminal";
 
 export class DockgeServer {
@@ -54,19 +48,10 @@ export class DockgeServer {
     ];
 
     /**
-     * List of socket handlers (no agent support)
+     * List of socket handlers
      */
     socketHandlerList : SocketHandler[] = [
         new MainSocketHandler(),
-        new ManageAgentSocketHandler(),
-    ];
-
-    agentProxySocketHandler = new AgentProxySocketHandler();
-
-    /**
-     * List of socket handlers (support agent)
-     */
-    agentSocketHandlerList : AgentSocketHandler[] = [
         new DockerSocketHandler(),
         new TerminalSocketHandler(),
     ];
@@ -207,88 +192,23 @@ export class DockgeServer {
         // Create Socket.io
         this.io = new socketIO.Server(this.httpServer, {
             cors,
-            allowRequest: (req, callback) => {
-                let isOriginValid = true;
-                const bypass = isDev || process.env.UPTIME_KUMA_WS_ORIGIN_CHECK === "bypass";
-
-                if (!bypass) {
-                    let host = req.headers.host;
-
-                    // If this is set, it means the request is from the browser
-                    let origin = req.headers.origin;
-
-                    // If this is from the browser, check if the origin is allowed
-                    if (origin) {
-                        try {
-                            let originURL = new URL(origin);
-
-                            if (host !== originURL.host) {
-                                isOriginValid = false;
-                                log.error("auth", `Origin (${origin}) does not match host (${host}), IP: ${req.socket.remoteAddress}`);
-                            }
-                        } catch (e) {
-                            // Invalid origin url, probably not from browser
-                            isOriginValid = false;
-                            log.error("auth", `Invalid origin url (${origin}), IP: ${req.socket.remoteAddress}`);
-                        }
-                    } else {
-                        log.info("auth", `Origin is not set, IP: ${req.socket.remoteAddress}`);
-                    }
-                } else {
-                    log.debug("auth", "Origin check is bypassed");
-                }
-
-                callback(null, isOriginValid);
-            }
         });
 
         this.io.on("connection", async (socket: Socket) => {
-            let dockgeSocket = socket as DockgeSocket;
-            dockgeSocket.instanceManager = new AgentManager(dockgeSocket);
-            dockgeSocket.emitAgent = (event : string, ...args : unknown[]) => {
-                let obj = args[0];
-                if (typeof(obj) === "object") {
-                    let obj2 = obj as LooseObject;
-                    obj2.endpoint = dockgeSocket.endpoint;
-                }
-                dockgeSocket.emit("agent", event, ...args);
-            };
+            log.info("server", "Socket connected!");
 
-            if (typeof(socket.request.headers.endpoint) === "string") {
-                dockgeSocket.endpoint = socket.request.headers.endpoint;
-            } else {
-                dockgeSocket.endpoint = "";
-            }
-
-            if (dockgeSocket.endpoint) {
-                log.info("server", "Socket connected (agent), as endpoint " + dockgeSocket.endpoint);
-            } else {
-                log.info("server", "Socket connected (direct)");
-            }
-
-            this.sendInfo(dockgeSocket, true);
+            this.sendInfo(socket, true);
 
             if (this.needSetup) {
                 log.info("server", "Redirect to setup page");
-                dockgeSocket.emit("setup");
+                socket.emit("setup");
             }
 
-            // Create socket handlers (original, no agent support)
+            // Create socket handlers
             for (const socketHandler of this.socketHandlerList) {
-                socketHandler.create(dockgeSocket, this);
+                socketHandler.create(socket as DockgeSocket, this);
             }
 
-            // Create Agent Socket
-            let agentSocket = new AgentSocket();
-
-            // Create agent socket handlers
-            for (const socketHandler of this.agentSocketHandlerList) {
-                socketHandler.create(dockgeSocket, this, agentSocket);
-            }
-
-            // Create agent proxy socket handlers
-            this.agentProxySocketHandler.create2(dockgeSocket, this, agentSocket);
-
             // ***************************
             // Better do anything after added all socket handlers here
             // ***************************
@@ -296,18 +216,12 @@ export class DockgeServer {
             log.debug("auth", "check auto login");
             if (await Settings.get("disableAuth")) {
                 log.info("auth", "Disabled Auth: auto login to admin");
-                this.afterLogin(dockgeSocket, await R.findOne("user") as User);
-                dockgeSocket.emit("autoLogin");
+                this.afterLogin(socket as DockgeSocket, await R.findOne("user") as User);
+                socket.emit("autoLogin");
             } else {
                 log.debug("auth", "need auth");
             }
 
-            // Socket disconnect
-            dockgeSocket.on("disconnect", () => {
-                log.info("server", "Socket disconnected!");
-                dockgeSocket.instanceManager.disconnectAll();
-            });
-
         });
 
         this.io.on("disconnect", () => {
@@ -332,11 +246,6 @@ export class DockgeServer {
         } catch (e) {
             log.error("server", e);
         }
-
-        socket.instanceManager.sendAgentList();
-
-        // Also connect to other dockge instances
-        socket.instanceManager.connectAll();
     }
 
     /**
@@ -397,7 +306,6 @@ export class DockgeServer {
                 this.sendStackList(true);
             });
 
-            checkVersion.startInterval();
         });
 
         gracefulShutdown(this.httpServer, {
@@ -575,34 +483,26 @@ export class DockgeServer {
         return jwtSecretBean;
     }
 
-    /**
-     * Send stack list to all connected sockets
-     * @param useCache
-     */
-    async sendStackList(useCache = false) {
-        let socketList = this.io.sockets.sockets.values();
-
-        let stackList;
-
-        for (let socket of socketList) {
-            let dockgeSocket = socket as DockgeSocket;
+    sendStackList(useCache = false) {
+        let roomList = this.io.sockets.adapter.rooms.keys();
+        let map : Map<string, object> | undefined;
 
+        for (let room of roomList) {
             // Check if the room is a number (user id)
-            if (dockgeSocket.userID) {
+            if (Number(room)) {
 
-                // Get the list only if there is a logged in user
-                if (!stackList) {
-                    stackList = await Stack.getStackList(this, useCache);
-                }
-
-                let map : Map<string, object> = new Map();
+                // Get the list only if there is a room
+                if (!map) {
+                    map = new Map();
+                    let stackList = Stack.getStackList(this, useCache);
 
                     for (let [ stackName, stack ] of stackList) {
-                    map.set(stackName, stack.toSimpleJSON(dockgeSocket.endpoint));
+                        map.set(stackName, stack.toSimpleJSON());
+                    }
                 }
 
-                log.debug("server", "Send stack list to user: " + dockgeSocket.id + " (" + dockgeSocket.endpoint + ")");
-                dockgeSocket.emitAgent("stackList", {
+                log.debug("server", "Send stack list to room " + room);
+                this.io.to(room).emit("stackList", {
                     ok: true,
                     stackList: Object.fromEntries(map),
                 });
@@ -610,15 +510,27 @@ export class DockgeServer {
         }
     }
 
-    async getDockerNetworkList() : Promise<string[]> {
-        let res = await childProcessAsync.spawn("docker", [ "network", "ls", "--format", "{{.Name}}" ], {
-            encoding: "utf-8",
-        });
+    sendStackStatusList() {
+        let statusList = Stack.getStatusList();
 
-        if (!res.stdout) {
-            return [];
+        let roomList = this.io.sockets.adapter.rooms.keys();
+
+        for (let room of roomList) {
+            // Check if the room is a number (user id)
+            if (Number(room)) {
+                log.debug("server", "Send stack status list to room " + room);
+                this.io.to(room).emit("stackStatusList", {
+                    ok: true,
+                    stackStatusList: Object.fromEntries(statusList),
+                });
+            } else {
+                log.debug("server", "Skip sending stack status list to room " + room);
+            }
+        }
     }
 
+    getDockerNetworkList() : string[] {
+        let res = childProcess.spawnSync("docker", [ "network", "ls", "--format", "{{.Name}}" ]);
         let list = res.stdout.toString().split("\n");
 
         // Remove empty string item
@@ -656,35 +568,4 @@ export class DockgeServer {
     finalFunction() {
         log.info("server", "Graceful shutdown successful!");
     }
-
-    /**
-     * Force connected sockets of a user to refresh and disconnect.
-     * Used for resetting password.
-     * @param {string} userID
-     * @param {string?} currentSocketID
-     */
-    disconnectAllSocketClients(userID: number | undefined, currentSocketID? : string) {
-        for (const rawSocket of this.io.sockets.sockets.values()) {
-            let socket = rawSocket as DockgeSocket;
-            if ((!userID || socket.userID === userID) && socket.id !== currentSocketID) {
-                try {
-                    socket.emit("refresh");
-                    socket.disconnect();
-                } catch (e) {
-
-                }
-            }
-        }
-    }
-
-    isSSL() {
-        return this.config.sslKey && this.config.sslCert;
-    }
-
-    getLocalWebSocketURL() {
-        const protocol = this.isSSL() ? "wss" : "ws";
-        const host = this.config.hostname || "localhost";
-        return `${protocol}://${host}:${this.config.port}`;
-    }
-
 }

backend/log.ts

@@ -1,6 +1,6 @@
 // Console colors
 // https://stackoverflow.com/questions/9781218/how-to-change-node-jss-console-font-color
-import { intHash, isDev } from "../common/util-common";
+import { intHash, isDev } from "./util-common";
 import dayjs from "dayjs";
 
 export const CONSOLE_STYLE_Reset = "\x1b[0m";

backend/migrations/2023-12-20-2117-agent-table.ts

@@ -1,16 +0,0 @@
-import { Knex } from "knex";
-
-export async function up(knex: Knex): Promise<void> {
-    // Create the user table
-    return knex.schema.createTable("agent", (table) => {
-        table.increments("id");
-        table.string("url", 255).notNullable().unique();
-        table.string("username", 255).notNullable();
-        table.string("password", 255).notNullable();
-        table.boolean("active").notNullable().defaultTo(true);
-    });
-}
-
-export async function down(knex: Knex): Promise<void> {
-    return knex.schema.dropTable("agent");
-}

backend/models/agent.ts

@@ -1,31 +0,0 @@
-import { BeanModel } from "redbean-node/dist/bean-model";
-import { R } from "redbean-node";
-import { LooseObject } from "../../common/util-common";
-
-export class Agent extends BeanModel {
-
-    static async getAgentList() : Promise<Record<string, Agent>> {
-        let list = await R.findAll("agent") as Agent[];
-        let result : Record<string, Agent> = {};
-        for (let agent of list) {
-            result[agent.endpoint] = agent;
-        }
-        return result;
-    }
-
-    get endpoint() : string {
-        let obj = new URL(this.url);
-        return obj.host;
-    }
-
-    toJSON() : LooseObject {
-        return {
-            url: this.url,
-            username: this.username,
-            endpoint: this.endpoint,
-        };
-    }
-
-}
-
-export default Agent;

backend/settings.ts

@@ -1,6 +1,6 @@
 import { R } from "redbean-node";
 import { log } from "./log";
-import { LooseObject } from "../common/util-common";
+import { LooseObject } from "./util-common";
 
 export class Settings {
 

backend/socket-handlers/agent-proxy-socket-handler.ts

@@ -1,47 +0,0 @@
-import { SocketHandler } from "../socket-handler.js";
-import { DockgeServer } from "../dockge-server";
-import { log } from "../log";
-import { checkLogin, DockgeSocket } from "../util-server";
-import { AgentSocket } from "../../common/agent-socket";
-import { ALL_ENDPOINTS } from "../../common/util-common";
-
-export class AgentProxySocketHandler extends SocketHandler {
-
-    create2(socket : DockgeSocket, server : DockgeServer, agentSocket : AgentSocket) {
-        // Agent - proxying requests if needed
-        socket.on("agent", async (endpoint : unknown, eventName : unknown, ...args : unknown[]) => {
-            try {
-                checkLogin(socket);
-
-                // Check Type
-                if (typeof(endpoint) !== "string") {
-                    throw new Error("Endpoint must be a string: " + endpoint);
-                }
-                if (typeof(eventName) !== "string") {
-                    throw new Error("Event name must be a string");
-                }
-
-                if (endpoint === ALL_ENDPOINTS) {      // Send to all endpoints
-                    log.debug("agent", "Sending to all endpoints: " + eventName);
-                    socket.instanceManager.emitToAllEndpoints(eventName, ...args);
-
-                } else if (!endpoint || endpoint === socket.endpoint) {      // Direct connection or matching endpoint
-                    log.debug("agent", "Matched endpoint: " + eventName);
-                    agentSocket.call(eventName, ...args);
-
-                } else {
-                    log.debug("agent", "Proxying request to " + endpoint + " for " + eventName);
-                    await socket.instanceManager.emitToEndpoint(endpoint, eventName, ...args);
-                }
-            } catch (e) {
-                if (e instanceof Error) {
-                    log.warn("agent", e.message);
-                }
-            }
-        });
-    }
-
-    create(socket : DockgeSocket, server : DockgeServer) {
-        throw new Error("Method not implemented. Please use create2 instead.");
-    }
-}

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

@@ -1,50 +1,51 @@
-import { AgentSocketHandler } from "../agent-socket-handler";
+import { SocketHandler } from "../socket-handler.js";
 import { DockgeServer } from "../dockge-server";
-import { callbackError, callbackResult, checkLogin, DockgeSocket, ValidationError } from "../util-server";
+import { callbackError, checkLogin, DockgeSocket, ValidationError } from "../util-server";
 import { Stack } from "../stack";
-import { AgentSocket } from "../../common/agent-socket";
 
-export class DockerSocketHandler extends AgentSocketHandler {
-    create(socket : DockgeSocket, server : DockgeServer, agentSocket : AgentSocket) {
-        // Do not call super.create()
+// @ts-ignore
+import composerize from "composerize";
 
-        agentSocket.on("deployStack", async (name : unknown, composeYAML : unknown, composeENV : unknown, isAdd : unknown, callback) => {
+export class DockerSocketHandler extends SocketHandler {
+    create(socket : DockgeSocket, server : DockgeServer) {
+
+        socket.on("deployStack", async (name : unknown, composeYAML : unknown, composeENV : unknown, isAdd : unknown, callback) => {
             try {
                 checkLogin(socket);
-                const stack = await this.saveStack(server, name, composeYAML, composeENV, isAdd);
+                const stack = this.saveStack(socket, server, name, composeYAML, composeENV, isAdd);
                 await stack.deploy(socket);
                 server.sendStackList();
-                callbackResult({
+                callback({
                     ok: true,
                     msg: "Deployed",
-                }, callback);
+                });
                 stack.joinCombinedTerminal(socket);
             } catch (e) {
                 callbackError(e, callback);
             }
         });
 
-        agentSocket.on("saveStack", async (name : unknown, composeYAML : unknown, composeENV : unknown, isAdd : unknown, callback) => {
+        socket.on("saveStack", async (name : unknown, composeYAML : unknown, composeENV : unknown, isAdd : unknown, callback) => {
             try {
                 checkLogin(socket);
-                await this.saveStack(server, name, composeYAML, composeENV, isAdd);
-                callbackResult({
+                this.saveStack(socket, server, name, composeYAML, composeENV, isAdd);
+                callback({
                     ok: true,
                     "msg": "Saved"
-                }, callback);
+                });
                 server.sendStackList();
             } catch (e) {
                 callbackError(e, callback);
             }
         });
 
-        agentSocket.on("deleteStack", async (name : unknown, callback) => {
+        socket.on("deleteStack", async (name : unknown, callback) => {
             try {
                 checkLogin(socket);
                 if (typeof(name) !== "string") {
                     throw new ValidationError("Name must be a string");
                 }
-                const stack = await Stack.getStack(server, name);
+                const stack = Stack.getStack(server, name);
 
                 try {
                     await stack.delete(socket);
@@ -54,17 +55,17 @@ export class DockerSocketHandler extends AgentSocketHandler {
                 }
 
                 server.sendStackList();
-                callbackResult({
+                callback({
                     ok: true,
                     msg: "Deleted"
-                }, callback);
+                });
 
             } catch (e) {
                 callbackError(e, callback);
             }
         });
 
-        agentSocket.on("getStack", async (stackName : unknown, callback) => {
+        socket.on("getStack", (stackName : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -72,37 +73,37 @@ export class DockerSocketHandler extends AgentSocketHandler {
                     throw new ValidationError("Stack name must be a string");
                 }
 
-                const stack = await Stack.getStack(server, stackName);
+                const stack = Stack.getStack(server, stackName);
 
                 if (stack.isManagedByDockge) {
                     stack.joinCombinedTerminal(socket);
                 }
 
-                callbackResult({
+                callback({
                     ok: true,
-                    stack: await stack.toJSON(socket.endpoint),
-                }, callback);
+                    stack: stack.toJSON(),
+                });
             } catch (e) {
                 callbackError(e, callback);
             }
         });
 
         // requestStackList
-        agentSocket.on("requestStackList", async (callback) => {
+        socket.on("requestStackList", async (callback) => {
             try {
                 checkLogin(socket);
                 server.sendStackList();
-                callbackResult({
+                callback({
                     ok: true,
                     msg: "Updated"
-                }, callback);
+                });
             } catch (e) {
                 callbackError(e, callback);
             }
         });
 
         // startStack
-        agentSocket.on("startStack", async (stackName : unknown, callback) => {
+        socket.on("startStack", async (stackName : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -110,12 +111,12 @@ export class DockerSocketHandler extends AgentSocketHandler {
                     throw new ValidationError("Stack name must be a string");
                 }
 
-                const stack = await Stack.getStack(server, stackName);
+                const stack = Stack.getStack(server, stackName);
                 await stack.start(socket);
-                callbackResult({
+                callback({
                     ok: true,
                     msg: "Started"
-                }, callback);
+                });
                 server.sendStackList();
 
                 stack.joinCombinedTerminal(socket);
@@ -126,7 +127,7 @@ export class DockerSocketHandler extends AgentSocketHandler {
         });
 
         // stopStack
-        agentSocket.on("stopStack", async (stackName : unknown, callback) => {
+        socket.on("stopStack", async (stackName : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -134,12 +135,12 @@ export class DockerSocketHandler extends AgentSocketHandler {
                     throw new ValidationError("Stack name must be a string");
                 }
 
-                const stack = await Stack.getStack(server, stackName);
+                const stack = Stack.getStack(server, stackName);
                 await stack.stop(socket);
-                callbackResult({
+                callback({
                     ok: true,
                     msg: "Stopped"
-                }, callback);
+                });
                 server.sendStackList();
             } catch (e) {
                 callbackError(e, callback);
@@ -147,7 +148,7 @@ export class DockerSocketHandler extends AgentSocketHandler {
         });
 
         // restartStack
-        agentSocket.on("restartStack", async (stackName : unknown, callback) => {
+        socket.on("restartStack", async (stackName : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -155,12 +156,12 @@ export class DockerSocketHandler extends AgentSocketHandler {
                     throw new ValidationError("Stack name must be a string");
                 }
 
-                const stack = await Stack.getStack(server, stackName);
+                const stack = Stack.getStack(server, stackName);
                 await stack.restart(socket);
-                callbackResult({
+                callback({
                     ok: true,
                     msg: "Restarted"
-                }, callback);
+                });
                 server.sendStackList();
             } catch (e) {
                 callbackError(e, callback);
@@ -168,7 +169,7 @@ export class DockerSocketHandler extends AgentSocketHandler {
         });
 
         // updateStack
-        agentSocket.on("updateStack", async (stackName : unknown, callback) => {
+        socket.on("updateStack", async (stackName : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -176,12 +177,12 @@ export class DockerSocketHandler extends AgentSocketHandler {
                     throw new ValidationError("Stack name must be a string");
                 }
 
-                const stack = await Stack.getStack(server, stackName);
+                const stack = Stack.getStack(server, stackName);
                 await stack.update(socket);
-                callbackResult({
+                callback({
                     ok: true,
                     msg: "Updated"
-                }, callback);
+                });
                 server.sendStackList();
             } catch (e) {
                 callbackError(e, callback);
@@ -189,7 +190,7 @@ export class DockerSocketHandler extends AgentSocketHandler {
         });
 
         // down stack
-        agentSocket.on("downStack", async (stackName : unknown, callback) => {
+        socket.on("downStack", async (stackName : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -197,12 +198,12 @@ export class DockerSocketHandler extends AgentSocketHandler {
                     throw new ValidationError("Stack name must be a string");
                 }
 
-                const stack = await Stack.getStack(server, stackName);
+                const stack = Stack.getStack(server, stackName);
                 await stack.down(socket);
-                callbackResult({
+                callback({
                     ok: true,
                     msg: "Downed"
-                }, callback);
+                });
                 server.sendStackList();
             } catch (e) {
                 callbackError(e, callback);
@@ -210,7 +211,7 @@ export class DockerSocketHandler extends AgentSocketHandler {
         });
 
         // Services status
-        agentSocket.on("serviceStatusList", async (stackName : unknown, callback) => {
+        socket.on("serviceStatusList", async (stackName : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -218,33 +219,52 @@ export class DockerSocketHandler extends AgentSocketHandler {
                     throw new ValidationError("Stack name must be a string");
                 }
 
-                const stack = await Stack.getStack(server, stackName, true);
+                const stack = Stack.getStack(server, stackName, true);
                 const serviceStatusList = Object.fromEntries(await stack.getServiceStatusList());
-                callbackResult({
+                callback({
                     ok: true,
                     serviceStatusList,
-                }, callback);
+                });
             } catch (e) {
                 callbackError(e, callback);
             }
         });
 
         // getExternalNetworkList
-        agentSocket.on("getDockerNetworkList", async (callback) => {
+        socket.on("getDockerNetworkList", async (callback) => {
             try {
                 checkLogin(socket);
-                const dockerNetworkList = await server.getDockerNetworkList();
-                callbackResult({
+                const dockerNetworkList = server.getDockerNetworkList();
+                callback({
                     ok: true,
                     dockerNetworkList,
-                }, callback);
+                });
+            } catch (e) {
+                callbackError(e, callback);
+            }
+        });
+
+        // composerize
+        socket.on("composerize", async (dockerRunCommand : unknown, callback) => {
+            try {
+                checkLogin(socket);
+
+                if (typeof(dockerRunCommand) !== "string") {
+                    throw new ValidationError("dockerRunCommand must be a string");
+                }
+
+                const composeTemplate = composerize(dockerRunCommand);
+                callback({
+                    ok: true,
+                    composeTemplate,
+                });
             } catch (e) {
                 callbackError(e, callback);
             }
         });
     }
 
-    async saveStack(server : DockgeServer, name : unknown, composeYAML : unknown, composeENV : unknown, isAdd : unknown) : Promise<Stack> {
+    saveStack(socket : DockgeSocket, server : DockgeServer, name : unknown, composeYAML : unknown, composeENV : unknown, isAdd : unknown) : Stack {
         // Check types
         if (typeof(name) !== "string") {
             throw new ValidationError("Name must be a string");
@@ -260,7 +280,7 @@ export class DockerSocketHandler extends AgentSocketHandler {
         }
 
         const stack = new Stack(server, name, composeYAML, composeENV, false);
-        await stack.save(isAdd);
+        stack.save(isAdd);
         return stack;
     }
 

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

@@ -1,5 +1,3 @@
-// @ts-ignore
-import composerize from "composerize";
 import { SocketHandler } from "../socket-handler.js";
 import { DockgeServer } from "../dockge-server";
 import { log } from "../log";
@@ -7,14 +5,7 @@ import { R } from "redbean-node";
 import { loginRateLimiter, twoFaRateLimiter } from "../rate-limiter";
 import { generatePasswordHash, needRehashPassword, shake256, SHAKE256_LENGTH, verifyPassword } from "../password-hash";
 import { User } from "../models/user";
-import {
-    callbackError,
-    checkLogin,
-    DockgeSocket,
-    doubleCheckPassword,
-    JWTDecoded,
-    ValidationError
-} from "../util-server";
+import { checkLogin, DockgeSocket, doubleCheckPassword, JWTDecoded } from "../util-server";
 import { passwordStrength } from "check-password-strength";
 import jwt from "jsonwebtoken";
 import { Settings } from "../settings";
@@ -220,8 +211,6 @@ export class MainSocketHandler extends SocketHandler {
                 let user = await doubleCheckPassword(socket, password.currentPassword);
                 await user.resetPassword(password.newPassword);
 
-                server.disconnectAllSocketClients(user.id, socket.id);
-
                 callback({
                     ok: true,
                     msg: "Password has been updated successfully.",
@@ -271,6 +260,8 @@ export class MainSocketHandler extends SocketHandler {
                     await doubleCheckPassword(socket, currentPassword);
                 }
 
+                console.log(data);
+
                 await Settings.setSettings("general", data);
 
                 callback({
@@ -289,37 +280,6 @@ export class MainSocketHandler extends SocketHandler {
                 }
             }
         });
-
-        // Disconnect all other socket clients of the user
-        socket.on("disconnectOtherSocketClients", async () => {
-            try {
-                checkLogin(socket);
-                server.disconnectAllSocketClients(socket.userID, socket.id);
-            } catch (e) {
-                if (e instanceof Error) {
-                    log.warn("disconnectOtherSocketClients", e.message);
-                }
-            }
-        });
-
-        // composerize
-        socket.on("composerize", async (dockerRunCommand : unknown, callback) => {
-            try {
-                checkLogin(socket);
-
-                if (typeof(dockerRunCommand) !== "string") {
-                    throw new ValidationError("dockerRunCommand must be a string");
-                }
-
-                const composeTemplate = composerize(dockerRunCommand);
-                callback({
-                    ok: true,
-                    composeTemplate,
-                });
-            } catch (e) {
-                callbackError(e, callback);
-            }
-        });
     }
 
     async login(username : string, password : string) : Promise<User | null> {

backend/socket-handlers/manage-agent-socket-handler.ts

@@ -1,70 +0,0 @@
-import { SocketHandler } from "../socket-handler.js";
-import { DockgeServer } from "../dockge-server";
-import { log } from "../log";
-import { callbackError, callbackResult, checkLogin, DockgeSocket } from "../util-server";
-import { LooseObject } from "../../common/util-common";
-
-export class ManageAgentSocketHandler extends SocketHandler {
-
-    create(socket : DockgeSocket, server : DockgeServer) {
-        // addAgent
-        socket.on("addAgent", async (requestData : unknown, callback : unknown) => {
-            try {
-                log.debug("manage-agent-socket-handler", "addAgent");
-                checkLogin(socket);
-
-                if (typeof(requestData) !== "object") {
-                    throw new Error("Data must be an object");
-                }
-
-                let data = requestData as LooseObject;
-                let manager = socket.instanceManager;
-                await manager.test(data.url, data.username, data.password);
-                await manager.add(data.url, data.username, data.password);
-
-                // connect to the agent
-                manager.connect(data.url, data.username, data.password);
-
-                // Refresh another sockets
-                // It is a bit difficult to control another browser sessions to connect/disconnect agents, so force them to refresh the page will be easier.
-                server.disconnectAllSocketClients(undefined, socket.id);
-                manager.sendAgentList();
-
-                callbackResult({
-                    ok: true,
-                    msg: "agentAddedSuccessfully",
-                    msgi18n: true,
-                }, callback);
-
-            } catch (e) {
-                callbackError(e, callback);
-            }
-        });
-
-        // removeAgent
-        socket.on("removeAgent", async (url : unknown, callback : unknown) => {
-            try {
-                log.debug("manage-agent-socket-handler", "removeAgent");
-                checkLogin(socket);
-
-                if (typeof(url) !== "string") {
-                    throw new Error("URL must be a string");
-                }
-
-                let manager = socket.instanceManager;
-                await manager.remove(url);
-
-                server.disconnectAllSocketClients(undefined, socket.id);
-                manager.sendAgentList();
-
-                callbackResult({
-                    ok: true,
-                    msg: "agentRemovedSuccessfully",
-                    msgi18n: true,
-                }, callback);
-            } catch (e) {
-                callbackError(e, callback);
-            }
-        });
-    }
-}

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

@@ -1,15 +1,24 @@
+import { SocketHandler } from "../socket-handler.js";
 import { DockgeServer } from "../dockge-server";
-import { callbackError, callbackResult, checkLogin, DockgeSocket, ValidationError } from "../util-server";
+import { callbackError, checkLogin, DockgeSocket, ValidationError } from "../util-server";
 import { log } from "../log";
+import yaml from "yaml";
+import path from "path";
+import fs from "fs";
+import {
+    allowedCommandList,
+    allowedRawKeys,
+    getComposeTerminalName, getContainerExecTerminalName,
+    isDev,
+    PROGRESS_TERMINAL_ROWS
+} from "../util-common";
 import { InteractiveTerminal, MainTerminal, Terminal } from "../terminal";
 import { Stack } from "../stack";
-import { AgentSocketHandler } from "../agent-socket-handler";
-import { AgentSocket } from "../../common/agent-socket";
 
-export class TerminalSocketHandler extends AgentSocketHandler {
-    create(socket : DockgeSocket, server : DockgeServer, agentSocket : AgentSocket) {
+export class TerminalSocketHandler extends SocketHandler {
+    create(socket : DockgeSocket, server : DockgeServer) {
 
-        agentSocket.on("terminalInput", async (terminalName : unknown, cmd : unknown, callback) => {
+        socket.on("terminalInput", async (terminalName : unknown, cmd : unknown, errorCallback) => {
             try {
                 checkLogin(socket);
 
@@ -29,12 +38,17 @@ export class TerminalSocketHandler extends AgentSocketHandler {
                     throw new Error("Terminal not found or it is not a Interactive Terminal.");
                 }
             } catch (e) {
-                callbackError(e, callback);
+                if (e instanceof Error) {
+                    errorCallback({
+                        ok: false,
+                        msg: e.message,
+                    });
+                }
             }
         });
 
         // Main Terminal
-        agentSocket.on("mainTerminal", async (terminalName : unknown, callback) => {
+        socket.on("mainTerminal", async (terminalName : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -45,29 +59,29 @@ export class TerminalSocketHandler extends AgentSocketHandler {
                     throw new ValidationError("Terminal name must be a string.");
                 }
 
-                log.debug("mainTerminal", "Terminal name: " + terminalName);
+                log.debug("deployStack", "Terminal name: " + terminalName);
 
                 let terminal = Terminal.getTerminal(terminalName);
 
                 if (!terminal) {
                     terminal = new MainTerminal(server, terminalName);
                     terminal.rows = 50;
-                    log.debug("mainTerminal", "Terminal created");
+                    log.debug("deployStack", "Terminal created");
                 }
 
                 terminal.join(socket);
                 terminal.start();
 
-                callbackResult({
+                callback({
                     ok: true,
-                }, callback);
+                });
             } catch (e) {
                 callbackError(e, callback);
             }
         });
 
         // Interactive Terminal for containers
-        agentSocket.on("interactiveTerminal", async (stackName : unknown, serviceName : unknown, shell : unknown, callback) => {
+        socket.on("interactiveTerminal", async (stackName : unknown, serviceName : unknown, shell : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -87,19 +101,19 @@ export class TerminalSocketHandler extends AgentSocketHandler {
                 log.debug("interactiveTerminal", "Service name: " + serviceName);
 
                 // Get stack
-                const stack = await Stack.getStack(server, stackName);
+                const stack = Stack.getStack(server, stackName);
                 stack.joinContainerTerminal(socket, serviceName, shell);
 
-                callbackResult({
+                callback({
                     ok: true,
-                }, callback);
+                });
             } catch (e) {
                 callbackError(e, callback);
             }
         });
 
         // Join Output Terminal
-        agentSocket.on("terminalJoin", async (terminalName : unknown, callback) => {
+        socket.on("terminalJoin", async (terminalName : unknown, callback) => {
             if (typeof(callback) !== "function") {
                 log.debug("console", "Callback is not a function.");
                 return;
@@ -127,7 +141,7 @@ export class TerminalSocketHandler extends AgentSocketHandler {
         });
 
         // Leave Combined Terminal
-        agentSocket.on("leaveCombinedTerminal", async (stackName : unknown, callback) => {
+        socket.on("leaveCombinedTerminal", async (stackName : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -137,51 +151,20 @@ export class TerminalSocketHandler extends AgentSocketHandler {
                     throw new ValidationError("Stack name must be a string.");
                 }
 
-                const stack = await Stack.getStack(server, stackName);
+                const stack = Stack.getStack(server, stackName);
                 await stack.leaveCombinedTerminal(socket);
 
-                callbackResult({
+                callback({
                     ok: true,
-                }, callback);
+                });
             } catch (e) {
                 callbackError(e, callback);
             }
         });
 
-        // Resize Terminal
-        agentSocket.on("terminalResize", async (terminalName: unknown, rows: unknown, cols: unknown) => {
-            log.info("terminalResize", `Terminal: ${terminalName}`);
-            try {
-                checkLogin(socket);
-                if (typeof terminalName !== "string") {
-                    throw new Error("Terminal name must be a string.");
-                }
+        // TODO: Resize Terminal
+        socket.on("terminalResize", async (rows : unknown) => {
 
-                if (typeof rows !== "number") {
-                    throw new Error("Command must be a number.");
-                }
-                if (typeof cols !== "number") {
-                    throw new Error("Command must be a number.");
-                }
-
-                let terminal = Terminal.getTerminal(terminalName);
-
-                // log.info("terminal", terminal);
-                if (terminal instanceof Terminal) {
-                    //log.debug("terminalInput", "Terminal found, writing to terminal.");
-                    terminal.rows = rows;
-                    terminal.cols = cols;
-                } else {
-                    throw new Error(`${terminalName} Terminal not found.`);
-                }
-            } catch (e) {
-                log.debug("terminalResize",
-                        // Added to prevent the lint error when adding the type
-                        // and ts type checker saying type is unknown.
-                        // @ts-ignore
-                        `Error on ${terminalName}: ${e.message}`
-                );
-            }
         });
     }
 }

backend/stack.ts

@@ -1,11 +1,10 @@
 import { DockgeServer } from "./dockge-server";
-import fs, { promises as fsAsync } from "fs";
+import fs from "fs";
 import { log } from "./log";
 import yaml from "yaml";
-import { DockgeSocket, fileExists, ValidationError } from "./util-server";
+import { DockgeSocket, ValidationError } from "./util-server";
 import path from "path";
 import {
-    acceptedComposeFileNames,
     COMBINED_TERMINAL_COLS,
     COMBINED_TERMINAL_ROWS,
     CREATED_FILE,
@@ -15,10 +14,9 @@ import {
     PROGRESS_TERMINAL_ROWS,
     RUNNING, TERMINAL_ROWS,
     UNKNOWN
-} from "../common/util-common";
+} from "./util-common";
 import { InteractiveTerminal, Terminal } from "./terminal";
-import childProcessAsync from "promisify-child-process";
-import { Settings } from "./settings";
+import childProcess from "child_process";
 
 export class Stack {
 
@@ -42,7 +40,8 @@ export class Stack {
 
         if (!skipFSOperations) {
             // Check if compose file name is different from compose.yaml
-            for (const filename of acceptedComposeFileNames) {
+            const supportedFileNames = [ "compose.yaml", "compose.yml", "docker-compose.yml", "docker-compose.yaml" ];
+            for (const filename of supportedFileNames) {
                 if (fs.existsSync(path.join(this.path, filename))) {
                     this._composeFileName = filename;
                     break;
@@ -51,56 +50,33 @@ export class Stack {
         }
     }
 
-    async toJSON(endpoint : string) : Promise<object> {
-
-        // Since we have multiple agents now, embed primary hostname in the stack object too.
-        let primaryHostname = await Settings.get("primaryHostname");
-        if (!primaryHostname) {
-            if (!endpoint) {
-                primaryHostname = "localhost";
-            } else {
-                // Use the endpoint as the primary hostname
-                try {
-                    primaryHostname = (new URL("https://" + endpoint).hostname);
-                } catch (e) {
-                    // Just in case if the endpoint is in a incorrect format
-                    primaryHostname = "localhost";
-                }
-            }
-        }
-
-        let obj = this.toSimpleJSON(endpoint);
+    toJSON() : object {
+        let obj = this.toSimpleJSON();
         return {
             ...obj,
             composeYAML: this.composeYAML,
             composeENV: this.composeENV,
-            primaryHostname,
         };
     }
 
-    toSimpleJSON(endpoint : string) : object {
+    toSimpleJSON() : object {
         return {
             name: this.name,
             status: this._status,
             tags: [],
             isManagedByDockge: this.isManagedByDockge,
             composeFileName: this._composeFileName,
-            endpoint,
         };
     }
 
     /**
      * Get the status of the stack from `docker compose ps --format json`
      */
-    async ps() : Promise<object> {
-        let res = await childProcessAsync.spawn("docker", [ "compose", "ps", "--format", "json" ], {
-            cwd: this.path,
-            encoding: "utf-8",
+    ps() : object {
+        let res = childProcess.execSync("docker compose ps --format json", {
+            cwd: this.path
         });
-        if (!res.stdout) {
-            return {};
-        }
-        return JSON.parse(res.stdout.toString());
+        return JSON.parse(res.toString());
     }
 
     get isManagedByDockge() : boolean {
@@ -119,15 +95,6 @@ export class Stack {
 
         // Check YAML format
         yaml.parse(this.composeYAML);
-
-        let lines = this.composeENV.split("\n");
-
-        // Check if the .env is able to pass docker-compose
-        // Prevent "setenv: The parameter is incorrect"
-        // It only happens when there is one line and it doesn't contain "="
-        if (lines.length === 1 && !lines[0].includes("=") && lines[0].length > 0) {
-            throw new ValidationError("Invalid .env format");
-        }
     }
 
     get composeYAML() : string {
@@ -175,39 +142,33 @@ export class Stack {
      * Save the stack to the disk
      * @param isAdd
      */
-    async save(isAdd : boolean) {
+    save(isAdd : boolean) {
         this.validate();
 
         let dir = this.path;
 
         // Check if the name is used if isAdd
         if (isAdd) {
-            if (await fileExists(dir)) {
+            if (fs.existsSync(dir)) {
                 throw new ValidationError("Stack name already exists");
             }
 
             // Create the stack folder
-            await fsAsync.mkdir(dir);
+            fs.mkdirSync(dir);
         } else {
-            if (!await fileExists(dir)) {
+            if (!fs.existsSync(dir)) {
                 throw new ValidationError("Stack not found");
             }
         }
 
         // Write or overwrite the compose.yaml
-        await fsAsync.writeFile(path.join(dir, this._composeFileName), this.composeYAML);
-
-        const envPath = path.join(dir, ".env");
-
+        fs.writeFileSync(path.join(dir, this._composeFileName), this.composeYAML);
         // Write or overwrite the .env
-        // If .env is not existing and the composeENV is empty, we don't need to write it
-        if (await fileExists(envPath) || this.composeENV.trim() !== "") {
-            await fsAsync.writeFile(envPath, this.composeENV);
-        }
+        fs.writeFileSync(path.join(dir, ".env"), this.composeENV);
     }
 
-    async deploy(socket : DockgeSocket) : Promise<number> {
-        const terminalName = getComposeTerminalName(socket.endpoint, this.name);
+    async deploy(socket? : DockgeSocket) : Promise<number> {
+        const terminalName = getComposeTerminalName(this.name);
         let exitCode = await Terminal.exec(this.server, socket, terminalName, "docker", [ "compose", "up", "-d", "--remove-orphans" ], this.path);
         if (exitCode !== 0) {
             throw new Error("Failed to deploy, please check the terminal output for more information.");
@@ -215,15 +176,15 @@ export class Stack {
         return exitCode;
     }
 
-    async delete(socket: DockgeSocket) : Promise<number> {
-        const terminalName = getComposeTerminalName(socket.endpoint, this.name);
+    async delete(socket?: DockgeSocket) : Promise<number> {
+        const terminalName = getComposeTerminalName(this.name);
         let exitCode = await Terminal.exec(this.server, socket, terminalName, "docker", [ "compose", "down", "--remove-orphans" ], this.path);
         if (exitCode !== 0) {
             throw new Error("Failed to delete, please check the terminal output for more information.");
         }
 
         // Remove the stack folder
-        await fsAsync.rm(this.path, {
+        fs.rmSync(this.path, {
             recursive: true,
             force: true
         });
@@ -231,8 +192,8 @@ export class Stack {
         return exitCode;
     }
 
-    async updateStatus() {
-        let statusList = await Stack.getStatusList();
+    updateStatus() {
+        let statusList = Stack.getStatusList();
         let status = statusList.get(this.name);
 
         if (status) {
@@ -242,27 +203,7 @@ export class Stack {
         }
     }
 
-    /**
-     * Checks if a compose file exists in the specified directory.
-     * @async
-     * @static
-     * @param {string} stacksDir - The directory of the stack.
-     * @param {string} filename - The name of the directory to check for the compose file.
-     * @returns {Promise<boolean>} A promise that resolves to a boolean indicating whether any compose file exists.
-     */
-    static async composeFileExists(stacksDir : string, filename : string) : Promise<boolean> {
-        let filenamePath = path.join(stacksDir, filename);
-        // Check if any compose file exists
-        for (const filename of acceptedComposeFileNames) {
-            let composeFile = path.join(filenamePath, filename);
-            if (await fileExists(composeFile)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    static async getStackList(server : DockgeServer, useCacheForManaged = false) : Promise<Map<string, Stack>> {
+    static getStackList(server : DockgeServer, useCacheForManaged = false) : Map<string, Stack> {
         let stacksDir = server.stacksDir;
         let stackList : Map<string, Stack>;
 
@@ -273,20 +214,16 @@ export class Stack {
             stackList = new Map<string, Stack>();
 
             // Scan the stacks directory, and get the stack list
-            let filenameList = await fsAsync.readdir(stacksDir);
+            let filenameList = fs.readdirSync(stacksDir);
 
             for (let filename of filenameList) {
                 try {
                     // Check if it is a directory
-                    let stat = await fsAsync.stat(path.join(stacksDir, filename));
+                    let stat = fs.statSync(path.join(stacksDir, filename));
                     if (!stat.isDirectory()) {
                         continue;
                     }
-                    // If no compose file exists, skip it
-                    if (!await Stack.composeFileExists(stacksDir, filename)) {
-                        continue;
-                    }
-                    let stack = await this.getStack(server, filename);
+                    let stack = this.getStack(server, filename);
                     stack._status = CREATED_FILE;
                     stackList.set(filename, stack);
                 } catch (e) {
@@ -301,15 +238,8 @@ export class Stack {
         }
 
         // Get status from docker compose ls
-        let res = await childProcessAsync.spawn("docker", [ "compose", "ls", "--all", "--format", "json" ], {
-            encoding: "utf-8",
-        });
-
-        if (!res.stdout) {
-            return stackList;
-        }
-
-        let composeList = JSON.parse(res.stdout.toString());
+        let res = childProcess.execSync("docker compose ls --all --format json");
+        let composeList = JSON.parse(res.toString());
 
         for (let composeStack of composeList) {
             let stack = stackList.get(composeStack.Name);
@@ -335,18 +265,11 @@ export class Stack {
      * Get the status list, it will be used to update the status of the stacks
      * Not all status will be returned, only the stack that is deployed or created to `docker compose` will be returned
      */
-    static async getStatusList() : Promise<Map<string, number>> {
+    static getStatusList() : Map<string, number> {
         let statusList = new Map<string, number>();
 
-        let res = await childProcessAsync.spawn("docker", [ "compose", "ls", "--all", "--format", "json" ], {
-            encoding: "utf-8",
-        });
-
-        if (!res.stdout) {
-            return statusList;
-        }
-
-        let composeList = JSON.parse(res.stdout.toString());
+        let res = childProcess.execSync("docker compose ls --all --format json");
+        let composeList = JSON.parse(res.toString());
 
         for (let composeStack of composeList) {
             statusList.set(composeStack.Name, this.statusConvert(composeStack.Status));
@@ -374,13 +297,13 @@ export class Stack {
         }
     }
 
-    static async getStack(server: DockgeServer, stackName: string, skipFSOperations = false) : Promise<Stack> {
+    static getStack(server: DockgeServer, stackName: string, skipFSOperations = false) : Stack {
         let dir = path.join(server.stacksDir, stackName);
 
         if (!skipFSOperations) {
-            if (!await fileExists(dir) || !(await fsAsync.stat(dir)).isDirectory()) {
+            if (!fs.existsSync(dir) || !fs.statSync(dir).isDirectory()) {
                 // Maybe it is a stack managed by docker compose directly
-                let stackList = await this.getStackList(server, true);
+                let stackList = this.getStackList(server, true);
                 let stack = stackList.get(stackName);
 
                 if (stack) {
@@ -408,7 +331,7 @@ export class Stack {
     }
 
     async start(socket: DockgeSocket) {
-        const terminalName = getComposeTerminalName(socket.endpoint, this.name);
+        const terminalName = getComposeTerminalName(this.name);
         let exitCode = await Terminal.exec(this.server, socket, terminalName, "docker", [ "compose", "up", "-d", "--remove-orphans" ], this.path);
         if (exitCode !== 0) {
             throw new Error("Failed to start, please check the terminal output for more information.");
@@ -417,7 +340,7 @@ export class Stack {
     }
 
     async stop(socket: DockgeSocket) : Promise<number> {
-        const terminalName = getComposeTerminalName(socket.endpoint, this.name);
+        const terminalName = getComposeTerminalName(this.name);
         let exitCode = await Terminal.exec(this.server, socket, terminalName, "docker", [ "compose", "stop" ], this.path);
         if (exitCode !== 0) {
             throw new Error("Failed to stop, please check the terminal output for more information.");
@@ -426,7 +349,7 @@ export class Stack {
     }
 
     async restart(socket: DockgeSocket) : Promise<number> {
-        const terminalName = getComposeTerminalName(socket.endpoint, this.name);
+        const terminalName = getComposeTerminalName(this.name);
         let exitCode = await Terminal.exec(this.server, socket, terminalName, "docker", [ "compose", "restart" ], this.path);
         if (exitCode !== 0) {
             throw new Error("Failed to restart, please check the terminal output for more information.");
@@ -435,7 +358,7 @@ export class Stack {
     }
 
     async down(socket: DockgeSocket) : Promise<number> {
-        const terminalName = getComposeTerminalName(socket.endpoint, this.name);
+        const terminalName = getComposeTerminalName(this.name);
         let exitCode = await Terminal.exec(this.server, socket, terminalName, "docker", [ "compose", "down" ], this.path);
         if (exitCode !== 0) {
             throw new Error("Failed to down, please check the terminal output for more information.");
@@ -444,14 +367,14 @@ export class Stack {
     }
 
     async update(socket: DockgeSocket) {
-        const terminalName = getComposeTerminalName(socket.endpoint, this.name);
+        const terminalName = getComposeTerminalName(this.name);
         let exitCode = await Terminal.exec(this.server, socket, terminalName, "docker", [ "compose", "pull" ], this.path);
         if (exitCode !== 0) {
             throw new Error("Failed to pull, please check the terminal output for more information.");
         }
 
         // If the stack is not running, we don't need to restart it
-        await this.updateStatus();
+        this.updateStatus();
         log.debug("update", "Status: " + this.status);
         if (this.status !== RUNNING) {
             return exitCode;
@@ -465,7 +388,7 @@ export class Stack {
     }
 
     async joinCombinedTerminal(socket: DockgeSocket) {
-        const terminalName = getCombinedTerminalName(socket.endpoint, this.name);
+        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;
@@ -475,7 +398,7 @@ export class Stack {
     }
 
     async leaveCombinedTerminal(socket: DockgeSocket) {
-        const terminalName = getCombinedTerminalName(socket.endpoint, this.name);
+        const terminalName = getCombinedTerminalName(this.name);
         const terminal = Terminal.getTerminal(terminalName);
         if (terminal) {
             terminal.leave(socket);
@@ -483,7 +406,7 @@ export class Stack {
     }
 
     async joinContainerTerminal(socket: DockgeSocket, serviceName: string, shell : string = "sh", index: number = 0) {
-        const terminalName = getContainerExecTerminalName(socket.endpoint, this.name, serviceName, index);
+        const terminalName = getContainerExecTerminalName(this.name, serviceName, index);
         let terminal = Terminal.getTerminal(terminalName);
 
         if (!terminal) {
@@ -499,17 +422,11 @@ export class Stack {
     async getServiceStatusList() {
         let statusList = new Map<string, number>();
 
-        try {
-            let res = await childProcessAsync.spawn("docker", [ "compose", "ps", "--format", "json" ], {
+        let res = childProcess.spawnSync("docker", [ "compose", "ps", "--format", "json" ], {
             cwd: this.path,
-                encoding: "utf-8",
         });
 
-            if (!res.stdout) {
-                return statusList;
-            }
-
-            let lines = res.stdout?.toString().split("\n");
+        let lines = res.stdout.toString().split("\n");
 
         for (let line of lines) {
             try {
@@ -524,10 +441,5 @@ export class Stack {
         }
 
         return statusList;
-        } catch (e) {
-            log.error("getServiceStatusList", e);
-            return statusList;
-        }
-
     }
 }

backend/terminal.ts

@@ -8,7 +8,7 @@ import {
     PROGRESS_TERMINAL_ROWS,
     TERMINAL_COLS,
     TERMINAL_ROWS
-} from "../common/util-common";
+} from "./util-common";
 import { sync as commandExistsSync } from "command-exists";
 import { log } from "./log";
 
@@ -34,9 +34,6 @@ export class Terminal {
 
     public enableKeepAlive : boolean = false;
     protected keepAliveInterval? : NodeJS.Timeout;
-    protected kickDisconnectedClientsInterval? : NodeJS.Timeout;
-
-    protected socketList : Record<string, DockgeSocket> = {};
 
     constructor(server : DockgeServer, name : string, file : string, args : string | string[], cwd : string) {
         this.server = server;
@@ -70,7 +67,6 @@ export class Terminal {
 
     set cols(cols : number) {
         this._cols = cols;
-        log.debug("Terminal", `Terminal cols: ${this._cols}`); // Added to check if cols is being set when changing terminal size.
         try {
             this.ptyProcess?.resize(this.cols, this.rows);
         } catch (e) {
@@ -85,22 +81,13 @@ export class Terminal {
             return;
         }
 
-        this.kickDisconnectedClientsInterval = setInterval(() => {
-            for (const socketID in this.socketList) {
-                const socket = this.socketList[socketID];
-                if (!socket.connected) {
-                    log.debug("Terminal", "Kicking disconnected client " + socket.id + " from terminal " + this.name);
-                    this.leave(socket);
-                }
-            }
-        }, 60 * 1000);
-
         if (this.enableKeepAlive) {
             log.debug("Terminal", "Keep alive enabled for terminal " + this.name);
 
             // Close if there is no clients
             this.keepAliveInterval = setInterval(() => {
-                const numClients = Object.keys(this.socketList).length;
+                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...");
@@ -124,10 +111,8 @@ export class Terminal {
             // On Data
             this._ptyProcess.onData((data) => {
                 this.buffer.pushItem(data);
-
-                for (const socketID in this.socketList) {
-                    const socket = this.socketList[socketID];
-                    socket.emitAgent("terminalWrite", this.name, data);
+                if (this.server.io) {
+                    this.server.io.to(this.name).emit("terminalWrite", this.name, data);
                 }
             });
 
@@ -151,19 +136,15 @@ export class Terminal {
      * @param res
      */
     protected exit = (res : {exitCode: number, signal?: number | undefined}) => {
-        for (const socketID in this.socketList) {
-            const socket = this.socketList[socketID];
-            socket.emitAgent("terminalExit", this.name, res.exitCode);
-        }
+        this.server.io.to(this.name).emit("terminalExit", this.name, res.exitCode);
 
-        // Remove all clients
-        this.socketList = {};
+        // Remove room
+        this.server.io.in(this.name).socketsLeave(this.name);
 
         Terminal.terminalMap.delete(this.name);
         log.debug("Terminal", "Terminal " + this.name + " exited with code " + res.exitCode);
 
         clearInterval(this.keepAliveInterval);
-        clearInterval(this.kickDisconnectedClientsInterval);
 
         if (this.callback) {
             this.callback(res.exitCode);
@@ -175,11 +156,11 @@ export class Terminal {
     }
 
     public join(socket : DockgeSocket) {
-        this.socketList[socket.id] = socket;
+        socket.join(this.name);
     }
 
     public leave(socket : DockgeSocket) {
-        delete this.socketList[socket.id];
+        socket.leave(this.name);
     }
 
     public get ptyProcess() {

backend/util-common.ts

@@ -1,17 +1,13 @@
 /*
  * Common utilities for backend and frontend
  */
-import yaml, { Document, Pair, Scalar } from "yaml";
-import { DotenvParseOutput } from "dotenv";
+import { Document } from "yaml";
 
 // Init dayjs
 import dayjs from "dayjs";
 import timezone from "dayjs/plugin/timezone";
 import utc from "dayjs/plugin/utc";
 import relativeTime from "dayjs/plugin/relativeTime";
-// @ts-ignore
-import { replaceVariablesSync } from "@inventage/envsubst";
-
 dayjs.extend(utc);
 dayjs.extend(timezone);
 dayjs.extend(relativeTime);
@@ -21,11 +17,6 @@ export interface LooseObject {
     [key: string]: any
 }
 
-export interface BaseRes {
-    ok: boolean;
-    msg?: string;
-}
-
 let randomBytes : (numBytes: number) => Uint8Array;
 initRandomBytes();
 
@@ -43,8 +34,6 @@ async function initRandomBytes() {
     }
 }
 
-export const ALL_ENDPOINTS = "##ALL_DOCKGE_ENDPOINTS##";
-
 // Stack Status
 export const UNKNOWN = 0;
 export const CREATED_FILE = 1;
@@ -118,13 +107,6 @@ export const allowedRawKeys = [
     "\u0003", // Ctrl + C
 ];
 
-export const acceptedComposeFileNames = [
-    "compose.yaml",
-    "docker-compose.yaml",
-    "docker-compose.yml",
-    "compose.yml",
-];
-
 /**
  * Generate a decimal integer number from a string
  * @param str Input
@@ -208,20 +190,20 @@ export function getCryptoRandomInt(min: number, max: number):number {
     }
 }
 
-export function getComposeTerminalName(endpoint : string, stack : string) {
-    return "compose-" + endpoint + "-" + stack;
+export function getComposeTerminalName(stack : string) {
+    return "compose-" + stack;
 }
 
-export function getCombinedTerminalName(endpoint : string, stack : string) {
-    return "combined-" + endpoint + "-" + stack;
+export function getCombinedTerminalName(stack : string) {
+    return "combined-" + stack;
 }
 
-export function getContainerTerminalName(endpoint : string, container : string) {
-    return "container-" + endpoint + "-" + container;
+export function getContainerTerminalName(container : string) {
+    return "container-" + container;
 }
 
-export function getContainerExecTerminalName(endpoint : string, stackName : string, container : string, index : number) {
-    return "container-exec-" + endpoint + "-" + stackName + "-" + container + "-" + index;
+export function getContainerExecTerminalName(stackName : string, container : string, index : number) {
+    return "container-exec-" + stackName + "-" + container + "-" + index;
 }
 
 export function copyYAMLComments(doc : Document, src : Document) {
@@ -291,9 +273,10 @@ function copyYAMLCommentsItems(items : any, srcItems : any) {
  *   - "127.0.0.1:5000-5010:5000-5010"
  *   - "6060:6060/udp"
  * @param input
- * @param hostname
+ * @param defaultHostname
  */
-export function parseDockerPort(input : string, hostname : string) {
+export function parseDockerPort(input : string, defaultHostname : string = "localhost") {
+    let hostname = defaultHostname;
     let port;
     let display;
 
@@ -357,53 +340,3 @@ export function parseDockerPort(input : string, hostname : string) {
         display: display,
     };
 }
-
-export function envsubst(string : string, variables : LooseObject) : string {
-    return replaceVariablesSync(string, variables)[0];
-}
-
-/**
- * Traverse all values in the yaml and for each value, if there are template variables, replace it environment variables
- * Emulates the behavior of how docker-compose handles environment variables in yaml files
- * @param content Yaml string
- * @param env Environment variables
- * @returns string Yaml string with environment variables replaced
- */
-export function envsubstYAML(content : string, env : DotenvParseOutput) : string {
-    const doc = yaml.parseDocument(content);
-    if (doc.contents) {
-        // @ts-ignore
-        for (const item of doc.contents.items) {
-            traverseYAML(item, env);
-        }
-    }
-    return doc.toString();
-}
-
-/**
- * Used for envsubstYAML(...)
- * @param pair
- * @param env
- */
-function traverseYAML(pair : Pair, env : DotenvParseOutput) : void {
-    // @ts-ignore
-    if (pair.value && pair.value.items) {
-        // @ts-ignore
-        for (const item of pair.value.items) {
-            if (item instanceof Pair) {
-                traverseYAML(item, env);
-            } else if (item instanceof Scalar) {
-                let value = item.value as unknown;
-
-                if (typeof(value) === "string") {
-                    item.value = envsubst(value, env);
-                }
-            }
-        }
-    // @ts-ignore
-    } else if (pair.value && typeof(pair.value.value) === "string") {
-        // @ts-ignore
-        pair.value.value = envsubst(pair.value.value, env);
-    }
-}
-

backend/util-server.ts

@@ -2,11 +2,9 @@ import { Socket } from "socket.io";
 import { Terminal } from "./terminal";
 import { randomBytes } from "crypto";
 import { log } from "./log";
-import { ERROR_TYPE_VALIDATION } from "../common/util-common";
+import { ERROR_TYPE_VALIDATION } from "./util-common";
 import { R } from "redbean-node";
 import { verifyPassword } from "./password-hash";
-import fs from "fs";
-import { AgentManager } from "./agent-manager";
 
 export interface JWTDecoded {
     username : string;
@@ -16,9 +14,6 @@ export interface JWTDecoded {
 export interface DockgeSocket extends Socket {
     userID: number;
     consoleTerminal? : Terminal;
-    instanceManager : AgentManager;
-    endpoint : string;
-    emitAgent : (eventName : string, ...args : unknown[]) => void;
 }
 
 // For command line arguments, so they are nullable
@@ -60,28 +55,18 @@ export function callbackError(error : unknown, callback : unknown) {
         callback({
             ok: false,
             msg: error.message,
-            msgi18n: true,
         });
     } else if (error instanceof ValidationError) {
         callback({
             ok: false,
             type: ERROR_TYPE_VALIDATION,
             msg: error.message,
-            msgi18n: true,
         });
     } else {
         log.debug("console", "Unknown error: " + error);
     }
 }
 
-export function callbackResult(result : unknown, callback : unknown) {
-    if (typeof(callback) !== "function") {
-        log.error("console", "Callback is not a function");
-        return;
-    }
-    callback(result);
-}
-
 export async function doubleCheckPassword(socket : DockgeSocket, currentPassword : unknown) {
     if (typeof currentPassword !== "string") {
         throw new Error("Wrong data type?");
@@ -97,9 +82,3 @@ export async function doubleCheckPassword(socket : DockgeSocket, currentPassword
 
     return user;
 }
-
-export function fileExists(file : string) {
-    return fs.promises.access(file, fs.constants.F_OK)
-        .then(() => true)
-        .catch(() => false);
-}

common/agent-socket.ts

@@ -1,15 +0,0 @@
-export class AgentSocket {
-
-    eventList : Map<string, (...args : unknown[]) => void> = new Map();
-
-    on(event : string, callback : (...args : unknown[]) => void) {
-        this.eventList.set(event, callback);
-    }
-
-    call(eventName : string, ...args : unknown[]) {
-        const callback = this.eventList.get(eventName);
-        if (callback) {
-            callback(...args);
-        }
-    }
-}

compose.yaml

@@ -1,3 +1,4 @@
+version: "3.8"
 services:
   dockge:
     image: louislam/dockge:1

docker/Base.Dockerfile

@@ -1,4 +1,5 @@
-FROM node:22-bookworm-slim
+# Due to the bug of #145, Node.js's version cannot be changed, unless upstream is fixed.
+FROM node:18.17.1-bookworm-slim
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN apt update && apt install --yes --no-install-recommends \

docker/Dockerfile

@@ -22,18 +22,11 @@ COPY --from=build /app/node_modules /app/node_modules
 COPY --chown=node:node  . .
 RUN mkdir ./data
 
-
-# It is just for safe, as by default, it is disabled in the latest Node.js now.
-# Read more:
-# - https://github.com/sagemathinc/cocalc/issues/6963
-# - https://github.com/microsoft/node-pty/issues/630#issuecomment-1987212447
-ENV UV_USE_IO_URING=0
-
 VOLUME /app/data
 EXPOSE 5001
 HEALTHCHECK --interval=60s --timeout=30s --start-period=60s --retries=5 CMD extra/healthcheck
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
-CMD ["bash", "-c", "node ./extra/clean-tsx-tmp.js && tsx ./backend/index.ts"]
+CMD ["tsx", "./backend/index.ts"]
 
 ############################################
 # Mark as Nightly

extra/clean-tsx-tmp.js

@@ -1,13 +0,0 @@
-/*
- * This script is used to clean up the tmp directory.
- * A workaround for https://github.com/louislam/dockge/issues/353
- */
-import * as fs from "fs";
-
-try {
-    fs.rmSync("/tmp/tsx-0", {
-        recursive: true,
-    });
-} catch (e) {
-
-}

extra/reformat-changelog.ts

@@ -1,37 +1,19 @@
 // Generate on GitHub
 const input = `
-* Fixed envsubst issue by @louislam in https://github.com/louislam/dockge/pull/301
-* Fix: Only adding folders to stack with a compose file. by @Ozy-Viking in https://github.com/louislam/dockge/pull/299
-* Terminal text cols adjusts to terminal container.  by @Ozy-Viking in https://github.com/louislam/dockge/pull/285
-* Update Docker Dompose plugin to 2.23.3 by @louislam in https://github.com/louislam/dockge/pull/303
-* Translations update from Kuma Weblate by @UptimeKumaBot in https://github.com/louislam/dockge/pull/302
+* Add Korean translation by @Alanimdeo in https://github.com/louislam/dockge/pull/86
 `;
 
 const template = `
-
-> [!WARNING]
->
-
 ### 🆕 New Features
--
 
-### ⬆️ Improvements
--
+### Improvements
 
-### 🐛 Bug Fixes
--
+### 🐞 Bug Fixes
 
 ### 🦎 Translation Contributions
--
-
-### ⬆️ Security Fixes
--
 
 ### Others
 - Other small changes, code refactoring and comment/doc updates in this repo:
-- 
-
-Please let me know if your username is missing, if your pull request has been merged in this version, or your commit has been included in one of the pull requests.
 `;
 
 const lines = input.split("\n").filter((line) => line.trim() !== "");
@@ -55,12 +37,6 @@ for (const line of lines) {
     }
 
     message = message.split("* ").pop();
-
-    let thanks = "";
-    if (username != "@louislam") {
-        thanks = `(Thanks ${username})`;
-    }
-
-    console.log(pullRequestID, message, thanks);
+    console.log("-", pullRequestID, message, `(Thanks ${username})`);
 }
 console.log(template);

extra/reset-password.ts

@@ -4,8 +4,6 @@ import readline from "readline";
 import { User } from "../backend/models/user";
 import { DockgeServer } from "../backend/dockge-server";
 import { log } from "../backend/log";
-import { io } from "socket.io-client";
-import { BaseRes } from "../common/util-common";
 
 console.log("== Dockge Reset Password Tool ==");
 
@@ -14,10 +12,11 @@ const rl = readline.createInterface({
     output: process.stdout
 });
 
+export const main = async () => {
     const server = new DockgeServer();
 
-export const main = async () => {
     // Check if
+
     console.log("Connecting the database");
     try {
         await Database.init(server);
@@ -48,16 +47,12 @@ export const main = async () => {
                     // Reset all sessions by reset jwt secret
                     await server.initJWTSecret();
 
-                    console.log("Password reset successfully.");
-
-                    // Disconnect all other socket clients of the user
-                    await disconnectAllSocketClients(user.username, password);
-
                     break;
                 } else {
                     console.log("Passwords do not match, please try again.");
                 }
             }
+            console.log("Password reset successfully.");
         }
     } catch (e) {
         if (e instanceof Error) {
@@ -84,46 +79,6 @@ function question(question : string) : Promise<string> {
     });
 }
 
-function disconnectAllSocketClients(username : string, password : string) : Promise<void> {
-    return new Promise((resolve) => {
-        const url = server.getLocalWebSocketURL();
-
-        console.log("Connecting to " + url + " to disconnect all other socket clients");
-
-        // Disconnect all socket connections
-        const socket = io(url, {
-            reconnection: false,
-            timeout: 5000,
-        });
-        socket.on("connect", () => {
-            socket.emit("login", {
-                username,
-                password,
-            }, (res : BaseRes) => {
-                if (res.ok) {
-                    console.log("Logged in.");
-                    socket.emit("disconnectOtherSocketClients");
-                } else {
-                    console.warn("Login failed.");
-                    console.warn("Please restart the server to disconnect all sessions.");
-                }
-                socket.close();
-            });
-        });
-
-        socket.on("connect_error", function () {
-            // The localWebSocketURL is not guaranteed to be working for some complicated Uptime Kuma setup
-            // Ask the user to restart the server manually
-            console.warn("Failed to connect to " + url);
-            console.warn("Please restart the server to disconnect all sessions manually.");
-            resolve();
-        });
-        socket.on("disconnect", () => {
-            resolve();
-        });
-    });
-}
-
 if (!process.env.TEST_BACKEND) {
     main();
 }

extra/templates/mariadb/compose.yaml

@@ -1,3 +1,4 @@
+version: "3.8"
 services:
   mariadb:
     image: mariadb:latest

extra/templates/nginx-proxy-manager/compose.yaml

@@ -1,3 +1,4 @@
+version: '3.8'
 services:
   nginx-proxy-manager:
     image: 'jc21/nginx-proxy-manager:latest'

extra/templates/uptime-kuma/compose.yaml

@@ -1,3 +1,4 @@
+version: '3.8'
 services:
   uptime-kuma:
     image: louislam/uptime-kuma:1

frontend/src/components/ArrayInput.vue

@@ -11,7 +11,7 @@
             <button class="btn btn-normal btn-sm mt-3" @click="addField">{{ $t("addListItem", [ displayName ]) }}</button>
         </div>
         <div v-else>
-            {{ $t("LongSyntaxNotSupported") }}
+            Long syntax is not supported here. Please use the YAML editor.
         </div>
     </div>
 </template>

frontend/src/components/Container.vue

@@ -9,7 +9,7 @@
                 <div v-if="!isEditMode">
                     <span class="badge me-1" :class="bgStyle">{{ status }}</span>
 
-                    <a v-for="port in envsubstService.ports" :key="port" :href="parsePort(port).url" target="_blank">
+                    <a v-for="port in service.ports" :key="port" :href="parsePort(port).url" target="_blank">
                         <span class="badge me-1 bg-secondary">{{ parsePort(port).display }}</span>
                     </a>
                 </div>
@@ -137,7 +137,7 @@
 <script>
 import { defineComponent } from "vue";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import { parseDockerPort } from "../../../common/util-common";
+import { parseDockerPort } from "../../../backend/util-common";
 
 export default defineComponent({
     components: {
@@ -189,17 +189,6 @@ export default defineComponent({
         },
 
         terminalRouteLink() {
-            if (this.endpoint) {
-                return {
-                    name: "containerTerminalEndpoint",
-                    params: {
-                        endpoint: this.endpoint,
-                        stackName: this.stackName,
-                        serviceName: this.name,
-                        type: "bash",
-                    },
-                };
-            } else {
             return {
                 name: "containerTerminal",
                 params: {
@@ -208,15 +197,6 @@ export default defineComponent({
                     type: "bash",
                 },
             };
-            }
-        },
-
-        endpoint() {
-            return this.$parent.$parent.endpoint;
-        },
-
-        stack() {
-            return this.$parent.$parent.stack;
         },
 
         stackName() {
@@ -233,29 +213,16 @@ export default defineComponent({
         jsonObject() {
             return this.$parent.$parent.jsonConfig;
         },
-
-        envsubstJSONConfig() {
-            return this.$parent.$parent.envsubstJSONConfig;
-        },
-
-        envsubstService() {
-            if (!this.envsubstJSONConfig.services[this.name]) {
-                return {};
-            }
-            return this.envsubstJSONConfig.services[this.name];
-        },
-
         imageName() {
-            if (this.envsubstService.image) {
-                return this.envsubstService.image.split(":")[0];
+            if (this.service.image) {
+                return this.service.image.split(":")[0];
             } else {
                 return "";
             }
         },
-
         imageTag() {
-            if (this.envsubstService.image) {
-                let tag = this.envsubstService.image.split(":")[1];
+            if (this.service.image) {
+                let tag = this.service.image.split(":")[1];
 
                 if (tag) {
                     return tag;
@@ -274,12 +241,8 @@ export default defineComponent({
     },
     methods: {
         parsePort(port) {
-            if (this.stack.endpoint) {
-                return parseDockerPort(port, this.stack.primaryHostname);
-            } else {
             let hostname = this.$root.info.primaryHostname || location.hostname;
             return parseDockerPort(port, hostname);
-            }
         },
         remove() {
             delete this.jsonObject.services[this.name];

frontend/src/components/NetworkInput.vue

@@ -65,10 +65,6 @@ export default {
         editorFocus() {
             return this.$parent.$parent.editorFocus;
         },
-
-        endpoint() {
-            return this.$parent.$parent.endpoint;
-        },
     },
     watch: {
         "jsonConfig.networks": {
@@ -138,7 +134,7 @@ export default {
         },
 
         loadExternalNetworkList() {
-            this.$root.emitAgent(this.endpoint, "getDockerNetworkList", (res) => {
+            this.$root.getSocket().emit("getDockerNetworkList", (res) => {
                 if (res.ok) {
                     this.externalNetworkList = res.dockerNetworkList.filter((n) => {
                         // Filter out this stack networks

frontend/src/components/StackList.vue

@@ -43,7 +43,7 @@
             </div>
         </div>
         <div ref="stackList" class="stack-list" :class="{ scrollbar: scrollbar }" :style="stackListStyle">
-            <div v-if="Object.keys(sortedStackList).length === 0" class="text-center mt-3">
+            <div v-if="Object.keys($root.stackList).length === 0" class="text-center mt-3">
                 <router-link to="/compose">{{ $t("addFirstStackMsg") }}</router-link>
             </div>
 
@@ -67,7 +67,7 @@
 <script>
 import Confirm from "../components/Confirm.vue";
 import StackListItem from "../components/StackListItem.vue";
-import { CREATED_FILE, CREATED_STACK, EXITED, RUNNING, UNKNOWN } from "../../../common/util-common";
+import { CREATED_FILE, CREATED_STACK, EXITED, RUNNING, UNKNOWN } from "../../../backend/util-common";
 
 export default {
     components: {
@@ -120,7 +120,7 @@ export default {
          * @returns {Array} The sorted list of stacks.
          */
         sortedStackList() {
-            let result = Object.values(this.$root.completeStackList);
+            let result = Object.values(this.$root.stackList);
 
             result = result.filter(stack => {
                 // filter by search text
@@ -160,7 +160,6 @@ export default {
                     return 1;
                 }
 
-                // sort by status
                 if (m1.status !== m2.status) {
                     if (m2.status === RUNNING) {
                         return 1;

frontend/src/components/StackListItem.vue

@@ -1,14 +1,12 @@
 <template>
-    <router-link :to="url" :class="{ 'dim' : !stack.isManagedByDockge }" class="item">
+    <router-link :to="`/compose/${stack.name}`" :class="{ 'dim' : !stack.isManagedByDockge }" class="item">
         <Uptime :stack="stack" :fixed-width="true" class="me-2" />
-        <div class="title">
-            <span>{{ stackName }}</span>
-            <div v-if="$root.agentCount > 1" class="endpoint">{{ endpointDisplay }}</div>
-        </div>
+        <span class="title">{{ stackName }}</span>
     </router-link>
 </template>
 
 <script>
+
 import Uptime from "./Uptime.vue";
 
 export default {
@@ -53,16 +51,6 @@ export default {
         };
     },
     computed: {
-        endpointDisplay() {
-            return this.$root.endpointDisplayFunction(this.stack.endpoint);
-        },
-        url() {
-            if (this.stack.endpoint) {
-                return `/compose/${this.stack.name}/${this.stack.endpoint}`;
-            } else {
-                return `/compose/${this.stack.name}`;
-            }
-        },
         depthMargin() {
             return {
                 marginLeft: `${31 * this.depth}px`,
@@ -129,31 +117,16 @@ export default {
     padding-right: 2px !important;
 }
 
-.item {
-    text-decoration: none;
+// .stack-item {
+//     width: 100%;
+// }
+
+.tags {
+    margin-top: 4px;
+    padding-left: 67px;
     display: flex;
-    align-items: center;
-    min-height: 52px;
-    border-radius: 10px;
-    transition: all ease-in-out 0.15s;
-    width: 100%;
-    padding: 5px 8px;
-    &.disabled {
-        opacity: 0.3;
-    }
-    &:hover {
-        background-color: $highlight-white;
-    }
-    &.active {
-        background-color: #cdf8f4;
-    }
-    .title {
-        margin-top: -4px;
-    }
-    .endpoint {
-        font-size: 12px;
-        color: $dark-font-color3;
-    }
+    flex-wrap: wrap;
+    gap: 0;
 }
 
 .collapsed {

frontend/src/components/Terminal.vue

@@ -5,9 +5,9 @@
 </template>
 
 <script>
-import { Terminal } from "@xterm/xterm";
-import { FitAddon } from "@xterm/addon-fit";
-import { TERMINAL_COLS, TERMINAL_ROWS } from "../../../common/util-common";
+import { Terminal } from "xterm";
+import { WebLinksAddon } from "xterm-addon-web-links";
+import { TERMINAL_COLS, TERMINAL_ROWS } from "../../../backend/util-common";
 
 export default {
     /**
@@ -23,11 +23,6 @@ export default {
             require: true,
         },
 
-        endpoint: {
-            type: String,
-            require: true,
-        },
-
         // Require if mode is interactive
         stackName: {
             type: String,
@@ -114,39 +109,37 @@ export default {
 
         // Create a new Terminal
         if (this.mode === "mainTerminal") {
-            this.$root.emitAgent(this.endpoint, "mainTerminal", this.name, (res) => {
+            this.$root.getSocket().emit("mainTerminal", this.name, (res) => {
                 if (!res.ok) {
                     this.$root.toastRes(res);
                 }
             });
         } else if (this.mode === "interactive") {
             console.debug("Create Interactive terminal:", this.name);
-            this.$root.emitAgent(this.endpoint, "interactiveTerminal", this.stackName, this.serviceName, this.shell, (res) => {
+            this.$root.getSocket().emit("interactiveTerminal", this.stackName, this.serviceName, this.shell, (res) => {
                 if (!res.ok) {
                     this.$root.toastRes(res);
                 }
             });
         }
-        // Fit the terminal width to the div container size after terminal is created.
-        this.updateTerminalSize();
+
     },
 
     unmounted() {
-        window.removeEventListener("resize", this.onResizeEvent); // Remove the resize event listener from the window object.
         this.$root.unbindTerminal(this.name);
         this.terminal.dispose();
     },
 
     methods: {
-        bind(endpoint, name) {
+        bind(name) {
             // Workaround: normally this.name should be set, but it is not sometimes, so we use the parameter, but eventually this.name and name must be the same name
             if (name) {
                 this.$root.unbindTerminal(name);
-                this.$root.bindTerminal(endpoint, name, this.terminal);
+                this.$root.bindTerminal(name, this.terminal);
                 console.debug("Terminal bound via parameter: " + name);
             } else if (this.name) {
                 this.$root.unbindTerminal(this.name);
-                this.$root.bindTerminal(this.endpoint, this.name, this.terminal);
+                this.$root.bindTerminal(this.name, this.terminal);
                 console.debug("Terminal bound: " + this.name);
             } else {
                 console.debug("Terminal name not set");
@@ -177,7 +170,7 @@ export default {
                     // Remove the input from the terminal
                     this.removeInput();
 
-                    this.$root.emitAgent(this.endpoint, "terminalInput", this.name, buffer + e.key, (err) => {
+                    this.$root.getSocket().emit("terminalInput", this.name, buffer + e.key, (err) => {
                         this.$root.toastError(err.msg);
                     });
 
@@ -196,7 +189,7 @@ export default {
                     // TODO
                 } else if (e.key === "\u0003") {      // Ctrl + C
                     console.debug("Ctrl + C");
-                    this.$root.emitAgent(this.endpoint, "terminalInput", this.name, e.key);
+                    this.$root.getSocket().emit("terminalInput", this.name, e.key);
                     this.removeInput();
                 } else {
                     this.cursorPosition++;
@@ -209,36 +202,12 @@ export default {
 
         interactiveTerminalConfig() {
             this.terminal.onKey(e => {
-                this.$root.emitAgent(this.endpoint, "terminalInput", this.name, e.key, (res) => {
+                this.$root.getSocket().emit("terminalInput", this.name, e.key, (res) => {
                     if (!res.ok) {
                         this.$root.toastRes(res);
                     }
                 });
             });
-        },
-
-        /**
-         * Update the terminal size to fit the container size.
-         *
-         * If the terminalFitAddOn is not created, creates it, loads it and then fits the terminal to the appropriate size.
-         * It then addes an event listener to the window object to listen for resize events and calls the fit method of the terminalFitAddOn.
-         */
-        updateTerminalSize() {
-            if (!Object.hasOwn(this, "terminalFitAddOn")) {
-                this.terminalFitAddOn = new FitAddon();
-                this.terminal.loadAddon(this.terminalFitAddOn);
-                window.addEventListener("resize", this.onResizeEvent);
-            }
-            this.terminalFitAddOn.fit();
-        },
-        /**
-         * Handles the resize event of the terminal component.
-         */
-        onResizeEvent() {
-            this.terminalFitAddOn.fit();
-            let rows = this.terminal.rows;
-            let cols = this.terminal.cols;
-            this.$root.emitAgent(this.endpoint, "terminalResize", this.name, rows, cols);
         }
     }
 };
@@ -253,7 +222,7 @@ export default {
 
 <style lang="scss">
 .terminal {
-    background-color: black !important;
+    padding: 10px 15px;
     height: 100%;
 }
 </style>

frontend/src/components/Uptime.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import { statusColor, statusNameShort } from "../../../common/util-common";
+import { statusColor, statusNameShort } from "../../../backend/util-common";
 
 export default {
     props: {

frontend/src/i18n.ts

@@ -27,11 +27,6 @@ const languageList = {
     "ja": "日本語",
     "nl": "Nederlands",
     "ro": "Română",
-    "id": "Bahasa Indonesia (Indonesian)",
-    "vi": "Tiếng Việt",
-    "hu": "Magyar",
-    "ca": "Català",
-    "ga": "Gaeilge",
 };
 
 let messages = {
@@ -44,7 +39,7 @@ for (let lang in languageList) {
     };
 }
 
-const rtlLangs = [ "fa", "ar-SY", "ur", "ar" ];
+const rtlLangs = [ "fa", "ar-SY", "ur" ];
 
 export const currentLocale = () => localStorage.locale
     || languageList[navigator.language] && navigator.language

frontend/src/lang/ar.json

@@ -35,7 +35,7 @@
     "restartPolicyAlways": "دائماً",
     "restartPolicyOnFailure": "عند الفشل",
     "restartPolicyNo": "لا",
-    "environmentVariable": "متغير | متغيرات",
+    "environmentVariable": "متغير البيئة | متغيرات البيئة",
     "restartPolicy": "سياسة إعادة التشغيل",
     "containerName": "اسم الحاوية",
     "port": "منفذ | منافذ",
@@ -98,16 +98,5 @@
     "url": "رابط | روابط",
     "extra": "إضافات",
     "reverseProxyMsg1": "هل تستدخم خادم عكسي؟",
-    "connecting...": "جاري الاتصال بخادم المقبس…",
-    "newUpdate": "تحديث جديد",
-    "currentEndpoint": "السياق: الوكيل الحالي",
-    "dockgeURL": "رابط Dockge (مثلا http://127.0.0.1:5001)",
-    "agentOnline": "متصل",
-    "agentOffline": "غير متصل",
-    "connecting": "جاري الإتصال",
-    "connect": "ارتبط",
-    "dockgeAgent": "سيرفر Dockge",
-    "removeAgent": "حذف الوكيل",
-    "removeAgentMsg": "هل انت متأكد من حذف هذا الوكيل؟",
-    "LongSyntaxNotSupported": "كتابة النصوص المدعومة غير المدعومة هنا. الرجاء استخدام محرر YAML."
+    "connecting...": "جاري الاتصال بخادم المقبس…"
 }

frontend/src/lang/be.json

@@ -1,116 +0,0 @@
-{
-    "active": "акт.",
-    "LongSyntaxNotSupported": "Доўгі сінтаксіс тут не падтрымліваецца. Выкарыстоўвайце рэдактар YAML.",
-    "removeAgentMsg": "Вы ўпэўнены, што хочаце выдаліць гэтага агента?",
-    "languageName": "Беларуская",
-    "Create your admin account": "Стварыце ўліковы запіс адміністратара",
-    "authIncorrectCreds": "Няправільны лагін ці пароль.",
-    "PasswordsDoNotMatch": "Паролі не супадаюць.",
-    "Repeat Password": "Паўтарыце пароль",
-    "Create": "Стварыць",
-    "signedInDisp": "Аўтарызаваны як {0}",
-    "signedInDispDisabled": "Аўтарызацыя выключана.",
-    "home": "Галоўная",
-    "console": "Кансоль",
-    "registry": "Рэестр (Registry)",
-    "compose": "Compose",
-    "addFirstStackMsg": "Стварыце свой першы стэк!",
-    "stackName": "Назва стэка",
-    "deployStack": "Разгарнуць",
-    "deleteStack": "Выдаліць",
-    "stopStack": "Спыніць",
-    "restartStack": "Перазапусціць",
-    "updateStack": "Абнавіць",
-    "startStack": "Запусціць",
-    "downStack": "Спыніць і дэактываваць",
-    "editStack": "Рэдагаваць",
-    "discardStack": "Скасаваць",
-    "saveStackDraft": "Захаваць",
-    "notAvailableShort": "Н/Д",
-    "deleteStackMsg": "Вы ўпэўнены, што хочаце выдаліць гэты стэк?",
-    "stackNotManagedByDockgeMsg": "Дадзены стэк не кіруецца Dockge.",
-    "primaryHostname": "Імя хоста",
-    "general": "Агульныя",
-    "container": "Кантэйнер | Кантэйнеры",
-    "scanFolder": "Сканаваць папку стэкаў",
-    "dockerImage": "Вобраз",
-    "restartPolicyUnlessStopped": "Пакуль не будзе спынены",
-    "restartPolicyAlways": "Заўсёды",
-    "restartPolicyOnFailure": "Пры падзенні",
-    "restartPolicyNo": "Ніколі",
-    "environmentVariable": "Зменная асяроддзя | Зменныя асяроддзя",
-    "restartPolicy": "Палітыка рэстарту",
-    "containerName": "Імя кантэйнера",
-    "port": "Порт | Порты",
-    "volume": "Сховішча | Сховішчы",
-    "network": "Сетка | Сеткі",
-    "dependsOn": "Залежнасць кантэйнера | Залежнасці кантэйнера",
-    "addListItem": "Дадаць {0}",
-    "deleteContainer": "Выдаліць",
-    "addContainer": "Дадаць кантэйнер",
-    "addNetwork": "Дадаць сетку",
-    "disableauth.message1": "Вы ўпэўнены, што хочаце <strong>адключыць аўтэнтыфікацыю</strong>?",
-    "Show update if available": "Паказаць абнаўленне, калі яно даступна",
-    "Also check beta release": "Атрымліваць бэта-версіі",
-    "disableauth.message2": "Гэта прызначана для сцэнарыяў, <strong>калі вы збіраецеся выкарыстоўваць староннюю аўтэнтыфікацыю</strong> перад Dockge, напрыклад, Cloudflare Access, Authelia або іншыя механізмы аўтэнтыфікацыі.",
-    "passwordNotMatchMsg": "Паўторны пароль не супадае.",
-    "autoGet": "Аўта",
-    "add": "Дадаць",
-    "Edit": "Змяніць",
-    "applyToYAML": "Ужыць да YAML",
-    "createExternalNetwork": "Стварыць",
-    "addInternalNetwork": "Дадаць",
-    "Save": "Захаваць",
-    "Language": "Мова",
-    "Current User": "Бягучы карыстальнік",
-    "Change Password": "Змяніць пароль",
-    "Current Password": "Бягучы пароль",
-    "New Password": "Новы пароль",
-    "Repeat New Password": "Паўтарыце новы пароль",
-    "Update Password": "Абнавіць пароль",
-    "Advanced": "Пашыраныя",
-    "Please use this option carefully!": "Выкарыстоўвайце гэтую опцыю асцярожна!",
-    "Enable Auth": "Уключыць аўтэнтыфікацыю",
-    "Disable Auth": "Адключыць аўтэнтыфікацыю",
-    "I understand, please disable": "Я разумею, адключыце",
-    "Leave": "Пакінуць",
-    "Frontend Version": "Версія знешняга інтэрфейсу",
-    "Check Update On GitHub": "Праверыць абнаўленні на GitHub",
-    "Remember me": "Запомніць мяне",
-    "Login": "Лагін",
-    "Username": "Імя карыстальніка",
-    "Password": "Пароль",
-    "Settings": "Налады",
-    "Logout": "Выйсці",
-    "Lowercase only": "Толькі ніжні рэгістр",
-    "Convert to Compose": "Пераўтварыць у Compose",
-    "Docker Run": "Docker Run",
-    "exited": "спын.",
-    "inactive": "неакт.",
-    "Appearance": "Знешні выгляд",
-    "Security": "Бяспека",
-    "About": "Аб праграме",
-    "Allowed commands:": "Дазволеныя каманды:",
-    "Internal Networks": "Унутраныя сеткі",
-    "External Networks": "Знешнія сеткі",
-    "No External Networks": "Няма знешніх сетак",
-    "reverseProxyMsg1": "Выкарыстоўваеце зваротны проксі?",
-    "reverseProxyMsg2": "Праверце, як наладзіць яго для WebSocket",
-    "Cannot connect to the socket server.": "Не ўдалося падключыцца да сокет-сервера.",
-    "reconnecting...": "Перападключэнне…",
-    "connecting...": "Падключэнне да сокет-сервера…",
-    "url": "URL-адрас | URL-адрасы",
-    "extra": "Дадаткова",
-    "newUpdate": "Даступна абнаўленне",
-    "dockgeAgent": "Агент Dockge | Агенты Dockge",
-    "currentEndpoint": "Бягучы",
-    "dockgeURL": "URL-адрас Dockge (напрыклад: http://127.0.0.1:5001)",
-    "agentOnline": "У сетцы",
-    "agentOffline": "Не ў сетцы",
-    "connecting": "Падключэнне",
-    "connect": "Падключыць",
-    "addAgent": "Дадаць Агента",
-    "agentAddedSuccessfully": "Агент паспяхова дададзены.",
-    "agentRemovedSuccessfully": "Агент паспяхова выдалены.",
-    "removeAgent": "Выдаліць агента"
-}

frontend/src/lang/bg-BG.json

@@ -90,27 +90,5 @@
     "Allowed commands:": "Позволени команди:",
     "Internal Networks": "Вътрешни мрежи",
     "External Networks": "Външни мрежи",
-    "No External Networks": "Не са налични външни мрежи",
-    "reverseProxyMsg2": "Проверете как да го конфигурирате за WebSocket",
-    "downStack": "Спри & Неактивен",
-    "reverseProxyMsg1": "Използвате ревърс прокси?",
-    "Cannot connect to the socket server.": "Не може да се свърже със сокет сървъра.",
-    "url": "URL адрес | URL адреси",
-    "extra": "Допълнително",
-    "reconnecting...": "Повторно свързване…",
-    "connecting...": "Свързване със сокет сървъра…",
-    "newUpdate": "Нова актуализация",
-    "currentEndpoint": "Текущ",
-    "dockgeURL": "Dockge URL адрес (напр. http://127.0.0.1:5001)",
-    "agentOnline": "Онлайн",
-    "agentOffline": "Офлайн",
-    "connect": "Свържи",
-    "addAgent": "Добави агент",
-    "agentAddedSuccessfully": "Агентът е добавен успешно.",
-    "removeAgent": "Премахни агент",
-    "removeAgentMsg": "Сигурни ли сте, че желаете да премахнете този агент?",
-    "dockgeAgent": "Dockge агент | Dockge агенти",
-    "connecting": "Свързване",
-    "agentRemovedSuccessfully": "Агентът е премахнат успешно.",
-    "LongSyntaxNotSupported": "Дългият синтаксис не се поддържа тук. Моля, използвайте YAML редактора."
+    "No External Networks": "Не са налични външни мрежи"
 }

frontend/src/lang/ca.json

@@ -1,116 +0,0 @@
-{
-    "Create your admin account": "Crea el teu compte d'administrador",
-    "Repeat Password": "Repeteix la contrasenya",
-    "Create": "Crea",
-    "signedInDisp": "S'ha iniciat sessió com a {0}",
-    "home": "Inici",
-    "console": "Consola",
-    "registry": "Registre",
-    "compose": "Compondre",
-    "addFirstStackMsg": "Compondre la teva primera pila!",
-    "stackName": "Nom de la pila",
-    "deployStack": "Desplegar",
-    "deleteStack": "Eliminar",
-    "stopStack": "Aturar",
-    "restartStack": "Reiniciar",
-    "updateStack": "Actualitzar",
-    "startStack": "Inicia",
-    "downStack": "Atura i inactiva",
-    "languageName": "Català",
-    "authIncorrectCreds": "Usuari o contrasenya incorrecte.",
-    "PasswordsDoNotMatch": "Les contrasenyes no coincideixen.",
-    "signedInDispDisabled": "Autenticació deshabilitada.",
-    "discardStack": "Descartar",
-    "saveStackDraft": "Guardar",
-    "notAvailableShort": "N/D",
-    "primaryHostname": "Nom del host primari",
-    "general": "General",
-    "container": "Contenidor | Contenidors",
-    "scanFolder": "Escaneja la carpeta de piles",
-    "dockerImage": "Imatge",
-    "restartPolicyAlways": "Sempre",
-    "restartPolicyOnFailure": "En cas de fallada",
-    "restartPolicyNo": "No",
-    "environmentVariable": "Variable d'entorn | Variables d'entorn",
-    "restartPolicy": "Política de reinici",
-    "containerName": "Nom del contenidor",
-    "port": "Port | Ports",
-    "volume": "Volum | Volums",
-    "network": "Xarxa | Xarxes",
-    "addListItem": "Afegir {0}",
-    "deleteContainer": "Eliminar",
-    "addContainer": "Afegir contenidor",
-    "addNetwork": "Afegir xarxa",
-    "passwordNotMatchMsg": "La contrasenya repetida no coincideix.",
-    "autoGet": "Obtenir automàticament",
-    "add": "Afegir",
-    "Edit": "Editar",
-    "applyToYAML": "Aplicar a YAML",
-    "createExternalNetwork": "Crear",
-    "addInternalNetwork": "Afegir",
-    "Save": "Guardar",
-    "Language": "Idioma",
-    "Current User": "Usuari actual",
-    "Change Password": "Canviar la contrasenya",
-    "Current Password": "Contrasenya actual",
-    "New Password": "Nova contrasenya",
-    "stackNotManagedByDockgeMsg": "Aquesta pila no està gestionada per Dockge.",
-    "Update Password": "Actualitzar contrasenya",
-    "Advanced": "Avançat",
-    "Disable Auth": "Deshabilitar autenticació",
-    "Leave": "Sortir",
-    "Frontend Version": "Versió del frontend",
-    "Check Update On GitHub": "Comprova les actualitzacions a GitHub",
-    "Show update if available": "Mostra si hi ha disponible una nova actualització",
-    "Also check beta release": "Comprovar també la versió beta",
-    "Remember me": "Recorda'm",
-    "Login": "Inici de sesió",
-    "Username": "Usuari",
-    "Settings": "Configuració",
-    "Logout": "Tanca sessió",
-    "Lowercase only": "Només minúscules",
-    "Convert to Compose": "Convertir a Compose",
-    "Docker Run": "Executar Docker",
-    "active": "actiu",
-    "exited": "finalitzat",
-    "inactive": "inactiu",
-    "Appearance": "Aparença",
-    "Security": "Seguretat",
-    "About": "Sobre",
-    "Allowed commands:": "Comandes permeses:",
-    "Internal Networks": "Xarxes internes",
-    "External Networks": "Xarxes externes",
-    "No External Networks": "No hi ha xarxes externes",
-    "reverseProxyMsg1": "Estàs fent servir un proxy invers?",
-    "reverseProxyMsg2": "Comproveu com configurar-lo per a WebSocket",
-    "Cannot connect to the socket server.": "No es pot connectar al servidor del socket.",
-    "reconnecting...": "S'està tornant a connectar…",
-    "connecting...": "S'està connectant al servidor del socket…",
-    "url": "URL | URLs",
-    "extra": "Extra",
-    "newUpdate": "Nova actualització",
-    "dockgeAgent": "Agent Dockge | Agents Dockge",
-    "currentEndpoint": "Actual",
-    "dockgeURL": "URL de Dockge (ex. http://127.0.0.1:5001)",
-    "agentOnline": "En línia",
-    "agentOffline": "Fora de línia",
-    "connecting": "Connectant",
-    "connect": "Connectar",
-    "addAgent": "Afegir agent",
-    "agentAddedSuccessfully": "Agent afegit correctament.",
-    "agentRemovedSuccessfully": "Agent eliminat correctament.",
-    "removeAgent": "Eliminar agent",
-    "removeAgentMsg": "Esteu segur que voleu eliminar aquest agent?",
-    "editStack": "Editar",
-    "deleteStackMsg": "Estàs segur que vols eliminar aquesta pila?",
-    "restartPolicyUnlessStopped": "A menys que s'aturi",
-    "dependsOn": "Dependència del contenidor | Dependències del contenidor",
-    "disableauth.message1": "Esteu segur que voleu <strong>desactivar l'autenticació</strong>?",
-    "disableauth.message2": "Està dissenyat per a escenaris <strong>on voleu implementar l'autenticació de tercers</strong> per davant de Dockge, com ara Cloudflare Access, Authelia o altres mecanismes d'autenticació.",
-    "Repeat New Password": "Repetiu la nova contrasenya",
-    "Please use this option carefully!": "Si us plau, utilitzeu aquesta opció amb cura!",
-    "Enable Auth": "Habilitar autenticació",
-    "I understand, please disable": "Ho entenc, si us plau deshabilita",
-    "Password": "Contrasenya",
-    "LongSyntaxNotSupported": "La sintaxi llarga no està suportada aquí. Si us plau, fes servir l'editor YAML."
-}

frontend/src/lang/cs-CZ.json

@@ -3,39 +3,39 @@
     "Create your admin account": "Vytvořit účet administrátora",
     "authIncorrectCreds": "Nesprávné uživatelské jméno nebo heslo.",
     "PasswordsDoNotMatch": "Hesla se neshodují.",
-    "Repeat Password": "Napište Heslo Znovu",
+    "Repeat Password": "Opakujte heslo",
     "Create": "Vytvořit",
     "signedInDisp": "Přihlášen jako {0}",
-    "signedInDispDisabled": "Ověření Zakázáno.",
+    "signedInDispDisabled": "Ověření zakázáno.",
     "home": "Domů",
     "console": "Konzole",
     "registry": "Registry",
-    "compose": "Komponovat",
-    "addFirstStackMsg": "Vytvořte svůj první zásobník!",
-    "stackName": "Název Zásobníku",
+    "compose": "Compose",
+    "addFirstStackMsg": "Vytvořte svůj první stack!",
+    "stackName": "Název stacku",
     "deployStack": "Nainstalovat",
     "deleteStack": "Smazat",
     "stopStack": "Zastavit",
     "restartStack": "Restartovat",
     "updateStack": "Aktualizovat",
     "startStack": "Spustit",
-    "downStack": "Zastavit & Vypnout",
+    "downStack": "Zastavit a vypnout",
     "editStack": "Upravit",
     "discardStack": "Zahodit",
     "saveStackDraft": "Uložit",
     "notAvailableShort": "N/A",
-    "deleteStackMsg": "Opravdu chcete smazat tento zásobník?",
+    "deleteStackMsg": "Opravdu chcete smazat tento stack?",
     "stackNotManagedByDockgeMsg": "Tento stack není spravován systémem Dockge.",
     "primaryHostname": "Primární název hostitele",
     "general": "Obecné",
     "container": "Kontejner | Kontejnery",
-    "scanFolder": "Prohledat složku se zásobníky",
+    "scanFolder": "Prohledat složku se stacky",
     "dockerImage": "Obrázek",
     "restartPolicyUnlessStopped": "Pokud není zastaveno",
     "restartPolicyAlways": "Vždy",
-    "restartPolicyOnFailure": "Při Selhání",
+    "restartPolicyOnFailure": "Při selhání",
     "restartPolicyNo": "Ne",
-    "environmentVariable": "Proměnná Prostředí | Proměnné Prostředí",
+    "environmentVariable": "Proměnná prostředí | Proměnné prostředí",
     "restartPolicy": "Politika restartu",
     "containerName": "Název kontejneru",
     "port": "Port | Porty",
@@ -91,11 +91,5 @@
     "Allowed commands:": "Povolené příkazy:",
     "Internal Networks": "Interní sítě",
     "External Networks": "Externí sítě",
-    "No External Networks": "Žádné externí sítě",
-    "reconnecting...": "Opětovné připojení…",
-    "url": "Adresa URL | Adresy URL",
-    "extra": "Extra",
-    "reverseProxyMsg1": "Používáte Reverzní proxy server?",
-    "reverseProxyMsg2": "Podívat se jak to nastavit pro WebSocket",
-    "Cannot connect to the socket server.": "Nelze se připojit k serveru ."
+    "No External Networks": "Žádné externí sítě"
 }

frontend/src/lang/da.json

@@ -1,32 +1,32 @@
 {
     "languageName": "Dansk",
     "authIncorrectCreds": "Forkert brugernavn eller adgangskode.",
-    "PasswordsDoNotMatch": "Adgangskoder stemmer ikke overens.",
+    "PasswordsDoNotMatch": "Adgangskode stemmer ikke overens.",
     "Repeat Password": "Gentag adgangskode",
     "Create": "Opret",
     "signedInDisp": "Logget ind som {0}",
-    "signedInDispDisabled": "Godkendelse deaktiveret.",
+    "signedInDispDisabled": "Auth Deaktiveret.",
     "home": "Hjem",
     "console": "Konsol",
-    "registry": "Register",
-    "compose": "Komponer",
-    "stackName": "Stak-navn",
+    "registry": "Registry",
+    "compose": "Compose",
+    "stackName": "Stack-navn",
     "deployStack": "Udrulle",
     "deleteStack": "Slet",
     "stopStack": "Stop",
     "restartStack": "Genstart",
-    "updateStack": "Opdater",
+    "updateStack": "Opdatere",
     "startStack": "Start",
-    "downStack": "Stop & Deaktiver",
-    "editStack": "Rediger",
-    "discardStack": "Kassér",
+    "downStack": "Stop & Sluk",
+    "editStack": "Editere",
+    "discardStack": "Annuller",
     "saveStackDraft": "Gem",
-    "notAvailableShort": "N/A",
-    "stackNotManagedByDockgeMsg": "Denne stak administreres ikke af Dockge.",
+    "notAvailableShort": "Ugyldig",
+    "stackNotManagedByDockgeMsg": "Denne stack administreres ikke af Dockge.",
     "primaryHostname": "Primært værtsnavn",
     "general": "Generelt",
     "container": "Container | Containere",
-    "scanFolder": "Scan Stak-mappe",
+    "scanFolder": "Scan Stack-mappe",
     "dockerImage": "Billede",
     "restartPolicyUnlessStopped": "Medmindre stoppet",
     "restartPolicyAlways": "Altid",
@@ -37,7 +37,7 @@
     "port": "Port | Porte",
     "volume": "Volumen | Voluminer",
     "network": "Netværk | Netværker",
-    "dependsOn": "Containerafhængighed | Containerafhængigheder",
+    "dependsOn": "Container Dependency | Container Dependencies",
     "addListItem": "Tilføj {0}",
     "deleteContainer": "Slet",
     "addNetwork": "Tilføj Netværk",
@@ -46,7 +46,7 @@
     "add": "Tilføj",
     "Edit": "Redigere",
     "applyToYAML": "Anvend til YAML",
-    "createExternalNetwork": "Skab",
+    "createExternalNetwork": "Skabe",
     "addInternalNetwork": "Tilføj",
     "Save": "Gem",
     "Language": "Sprog",
@@ -58,11 +58,11 @@
     "Update Password": "Opdater adgangskode",
     "Advanced": "Avanceret",
     "Please use this option carefully!": "Brug venligst denne indstilling forsigtigt!",
-    "Enable Auth": "Aktiver godkændelse",
-    "Disable Auth": "Deaktiver godkændelse",
+    "Enable Auth": "Aktiver Auth",
+    "Disable Auth": "Deaktiver Auth",
     "I understand, please disable": "Jeg forstår, venligst deaktiver",
     "Leave": "Forlad",
-    "Frontend Version": "Version",
+    "Frontend Version": "Frontend Version",
     "Check Update On GitHub": "Tjek opdatering på GitHub",
     "Also check beta release": "Tjek også betaversionen",
     "Remember me": "Husk mig",
@@ -91,26 +91,12 @@
     "url": "URL | URL'er",
     "extra": "Ekstra",
     "Create your admin account": "Opret din administratorkonto",
-    "addFirstStackMsg": "Komponer din første stak!",
-    "deleteStackMsg": "Er du sikker på, at du vil slette denne stak?",
+    "addFirstStackMsg": "Compose din første stack!",
+    "deleteStackMsg": "Er du sikker på, at du vil slette denne stack?",
     "environmentVariable": "Miljøvariabel | miljøvariabler",
     "addContainer": "Tilføj Container",
     "disableauth.message1": "Er du sikker på, at du vil <strong>deaktivere godkendelse</strong>?",
     "disableauth.message2": "Det er designet til scenarier <strong>hvor du har til hensigt at implementere tredjepartsgodkendelse</strong> foran Dockge såsom Cloudflare Access, Authelia eller andre godkendelsesmekanismer.",
     "Show update if available": "Vis opdatering, hvis tilgængelig",
-    "Lowercase only": "Kun små bogstaver",
-    "newUpdate": "Ny Opdatering",
-    "dockgeAgent": "Dockge Agent | Dockge Agenter",
-    "currentEndpoint": "Nuværende",
-    "dockgeURL": "Dockge URL (f.eks. http://127.0.0.1:5001)",
-    "agentOnline": "Online",
-    "agentOffline": "Offline",
-    "connecting": "Tilslutter",
-    "connect": "Tilslut",
-    "addAgent": "Tilføj agent",
-    "agentAddedSuccessfully": "Agent succesfuld tilføjet.",
-    "agentRemovedSuccessfully": "Agent succesfuld fjernet.",
-    "removeAgent": "Fjern agent",
-    "removeAgentMsg": "Er du sikker på at du vil fjerne denne agent?",
-    "LongSyntaxNotSupported": "Langt syntaks er ikke understøttet her. Forsøg venligst med YAML-editoren."
+    "Lowercase only": "Kun små bogstaver"
 }

frontend/src/lang/de.json

@@ -10,7 +10,7 @@
     "home": "Startseite",
     "console": "Konsole",
     "registry": "Container Registry",
-    "compose": "Compose",
+    "compose": "",
     "addFirstStackMsg": "Stelle deinen ersten Stack zusammen!",
     "stackName": "Stack-Name",
     "deployStack": "Deployen",
@@ -72,15 +72,15 @@
     "Check Update On GitHub": "Update auf GitHub überprüfen",
     "Show update if available": "Update anzeigen, wenn verfügbar",
     "Also check beta release": "Auch Beta-Version überprüfen",
-    "Remember me": "Angemeldet bleiben",
+    "Remember me": "Anmeldung beibehalten",
     "Login": "Anmelden",
     "Username": "Benutzername",
     "Password": "Passwort",
     "Settings": "Einstellungen",
     "Logout": "Abmelden",
     "Lowercase only": "Nur Kleinbuchstaben",
-    "Convert to Compose": "In Compose-Syntax umwandeln",
-    "Docker Run": "Docker Run",
+    "Convert to Compose": "In Compose Syntax umwandeln",
+    "Docker Run": "Docker ausführen",
     "active": "aktiv",
     "exited": "beendet",
     "inactive": "inaktiv",
@@ -94,23 +94,9 @@
     "Cannot connect to the socket server.": "Keine Verbindung zum Socket Server.",
     "reverseProxyMsg1": "Wird ein Reverse Proxy genutzt?",
     "reconnecting...": "Erneuter Verbindungsaufbau…",
-    "downStack": "Stoppen & Deaktivieren",
+    "downStack": "Stoppen & Aus",
     "extra": "Extra",
     "url": "URL / URLs",
     "reverseProxyMsg2": "Lerne wie dieser für WebSockets zu konfigurieren ist.",
-    "connecting...": "Verbindungsaufbau zum Socket Server…",
-    "newUpdate": "Neues Update",
-    "dockgeAgent": "Dockge Agent | Dockge Agenten",
-    "currentEndpoint": "Aktuell",
-    "dockgeURL": "Dockge URL (z. B. http://127.0.0.1:5001)",
-    "agentOnline": "Online",
-    "agentOffline": "Offline",
-    "connecting": "Verbinden",
-    "connect": "Verbinden",
-    "addAgent": "Agent Hinzufügen",
-    "agentAddedSuccessfully": "Agent erfolgreich hinzugefügt.",
-    "agentRemovedSuccessfully": "Agent erfolgreich entfernt.",
-    "removeAgent": "Agent Entfernen",
-    "removeAgentMsg": "Bist Du sicher, dass Du diesen Agent entfernen möchtest?",
-    "LongSyntaxNotSupported": "Lange Syntax wird nicht unterstützt. Bitte verwende den YAML-Editor."
+    "connecting...": "Verbindungsaufbau zum Socket Server…"
 }

frontend/src/lang/en.json

@@ -19,7 +19,7 @@
     "restartStack": "Restart",
     "updateStack": "Update",
     "startStack": "Start",
-    "downStack": "Stop & Inactive",
+    "downStack": "Stop & Down",
     "editStack": "Edit",
     "discardStack": "Discard",
     "saveStackDraft": "Save",
@@ -98,19 +98,5 @@
     "reconnecting...": "Reconnecting…",
     "connecting...": "Connecting to the socket server…",
     "url": "URL | URLs",
-    "extra": "Extra",
-    "newUpdate": "New Update",
-    "dockgeAgent": "Dockge Agent | Dockge Agents",
-    "currentEndpoint": "Current",
-    "dockgeURL": "Dockge URL (e.g. http://127.0.0.1:5001)",
-    "agentOnline": "Online",
-    "agentOffline": "Offline",
-    "connecting": "Connecting",
-    "connect": "Connect",
-    "addAgent": "Add Agent",
-    "agentAddedSuccessfully": "Agent added successfully.",
-    "agentRemovedSuccessfully": "Agent removed successfully.",
-    "removeAgent": "Remove Agent",
-    "removeAgentMsg": "Are you sure you want to remove this agent?",
-    "LongSyntaxNotSupported": "Long syntax is not supported here. Please use the YAML editor."
+    "extra": "Extra"
 }

frontend/src/lang/es.json

@@ -1,5 +1,5 @@
 {
-    "languageName": "Inglés",
+    "languageName": "Español",
     "Create your admin account": "Crea tu cuenta de administrador",
     "authIncorrectCreds": "Nombre de usuario o contraseña incorrectos.",
     "PasswordsDoNotMatch": "Las contraseñas no coinciden.",
@@ -90,27 +90,5 @@
     "Allowed commands:": "Comandos permitidos:",
     "Internal Networks": "Redes Internas",
     "External Networks": "Redes Externas",
-    "No External Networks": "Sin Redes Externas",
-    "reverseProxyMsg1": "¿Usando un proxy inverso?",
-    "reverseProxyMsg2": "Compruebe cómo configurarlo para WebSocket",
-    "newUpdate": "Nueva actualización",
-    "downStack": "Detener y desactivar",
-    "Cannot connect to the socket server.": "No se puede conectar al servidor del socket.",
-    "reconnecting...": "Reconectando…",
-    "connecting...": "Conectando al servidor del socket…",
-    "url": "Dirección URL | Direcciones URLs",
-    "extra": "Addicional",
-    "currentEndpoint": "Corriente",
-    "dockgeURL": "URL de Dockge (ej. http://127.0.0.1:5001)",
-    "agentOnline": "Conectado",
-    "agentOffline": "Desconectado",
-    "connect": "Conectar",
-    "addAgent": "Añadir Agente",
-    "agentAddedSuccessfully": "Agente añadido satisfactoriamente.",
-    "removeAgent": "Remover Agente",
-    "removeAgentMsg": "Estás seguro que deseas remover este agente?",
-    "dockgeAgent": "Agentes Dockge",
-    "connecting": "Conectando",
-    "agentRemovedSuccessfully": "Agente removido satisfactoriamente.",
-    "LongSyntaxNotSupported": "Aquí no hay soporte para la sintaxis larga. Por favor use el editor de YAML."
+    "No External Networks": "Sin Redes Externas"
 }

frontend/src/lang/fr.json

@@ -95,22 +95,8 @@
     "connecting...": "Connexion au serveur socket…",
     "url": "URL | URLs",
     "extra": "Supplémentaire",
-    "downStack": "Arrêtez et rendre inactif",
+    "downStack": "Arrêter et désactiver",
     "reverseProxyMsg1": "Utilisez vous un proxy inverse ?",
     "Cannot connect to the socket server.": "Impossible de se connecter au serveur socket.",
-    "reconnecting...": "Reconnexion…",
-    "newUpdate": "Nouvelle mise à jour",
-    "dockgeURL": "URL de Dockge (e.g. http://127.0.0.1:5001)",
-    "agentOnline": "En ligne",
-    "agentOffline": "Hors ligne",
-    "connecting": "Connexion",
-    "addAgent": "Ajouter un agent",
-    "agentAddedSuccessfully": "Agent ajouté avec succès.",
-    "agentRemovedSuccessfully": "Agent supprimé avec succès.",
-    "removeAgent": "Supprimer l'agent",
-    "dockgeAgent": "Dockge Agent | Dockge Agents",
-    "currentEndpoint": "Actuel",
-    "connect": "Connecter",
-    "removeAgentMsg": "Êtes-vous sûr de vouloir supprimer cet agent ?",
-    "LongSyntaxNotSupported": "La syntaxe longue n'est pas prise en charge ici. Veuillez utiliser l'éditeur YAML."
+    "reconnecting...": "Reconnexion…"
 }

frontend/src/lang/ga.json

@@ -1,116 +0,0 @@
-{
-    "Create your admin account": "Cruthaigh do chuntas riaracháin",
-    "authIncorrectCreds": "Ainm úsáideora nó pasfhocal mícheart.",
-    "PasswordsDoNotMatch": "Níl na pasfhocail comhthráthacha.",
-    "Repeat Password": "Athscríobh an Pasfhocal",
-    "Create": "Cruthaigh",
-    "signedInDisp": "Sínithe isteach mar {0}",
-    "languageName": "Gaeilge",
-    "console": "Consól",
-    "registry": "Clárlann",
-    "compose": "Scríobh",
-    "stackName": "Ainm an Staca",
-    "deployStack": "Deighil",
-    "deleteStack": "Scrios",
-    "stopStack": "Stad",
-    "restartStack": "Atosaigh",
-    "updateStack": "Nuashonraigh",
-    "startStack": "Tosaigh",
-    "downStack": "Stad & Neamhghníomhach",
-    "editStack": "Cuir in Eagar",
-    "discardStack": "Caith amach",
-    "saveStackDraft": "Sábháil",
-    "deleteStackMsg": "An bhfuil tú cinnte go bhfuil tú ag iarraidh an staca seo a scriosadh?",
-    "primaryHostname": "Príomhainm óstáin",
-    "general": "Ginearálta",
-    "container": "Coimeádán | Coimeádáin",
-    "scanFolder": "Scanáil Fillteáin na dStacanna",
-    "dockerImage": "Íomha",
-    "restartPolicyUnlessStopped": "Mura Stadfar",
-    "restartPolicyAlways": "I gcónaí",
-    "restartPolicyOnFailure": "Ar theip",
-    "restartPolicyNo": "Níl",
-    "environmentVariable": "Athróg Timpeallacht | Athróga Timpeallacht",
-    "restartPolicy": "Polasaí Atosaigh",
-    "port": "Port | Portanna",
-    "volume": "Toirt | Toirteanna",
-    "network": "Líonra | Líonraí",
-    "dependsOn": "Spleáchas Coimeádán | Spleáchais Coimeádán",
-    "addListItem": "Cuir {0}",
-    "deleteContainer": "Scrios",
-    "addContainer": "Cuir Coimeádán leis",
-    "addNetwork": "Cuir Líonra leis",
-    "add": "Cuir",
-    "Edit": "Cuir in eagar",
-    "applyToYAML": "Déan iarratas ar YAML",
-    "createExternalNetwork": "Cruthaigh",
-    "disableauth.message1": "An bhfuil tú cinnte gur mhaith leat <strong>fíordheimhniú a dhíchumasú</strong>?",
-    "passwordNotMatchMsg": "Ní hionann an pasfhocal athfhillteach.",
-    "autoGet": "Faigh Uathoibríoch",
-    "addInternalNetwork": "Cuir",
-    "Save": "Sábháil",
-    "Language": "Teanga",
-    "Current User": "Úsáideoir Reatha",
-    "New Password": "Pasfhocal Nua",
-    "Current Password": "Pasfhocal Reatha",
-    "Change Password": "Athraigh do Phasfhocal",
-    "Repeat New Password": "Déan Pasfhocal Nua arís",
-    "Update Password": "Nuashonraigh Pasfhocal",
-    "Advanced": "Ardleibhéal",
-    "Please use this option carefully!": "Bain úsáid as an rogha seo go cúramach, le do thoil!",
-    "Enable Auth": "Cumasaigh Auth",
-    "Disable Auth": "Auth dhíchumasú",
-    "I understand, please disable": "Tuigim, le do thoil, múch",
-    "Leave": "Fág",
-    "Frontend Version": "Leagan Frontend",
-    "Check Update On GitHub": "Seiceáil an Nuashonrú ar GitHub",
-    "Show update if available": "Taispeáin an Nuashonrú más ar fáil",
-    "Also check beta release": "Seiceáil an scaoileadh beta freisin",
-    "Remember me": "Cuimhnigh orm",
-    "Login": "Logáil isteach",
-    "Username": "Ainm úsáideora",
-    "Password": "Pasfhocal",
-    "Logout": "Logáil Amach",
-    "Lowercase only": "Cás íochtair amháin",
-    "Convert to Compose": "Tiontaigh go Compóidh",
-    "Docker Run": "Docker Rith",
-    "exited": "scoir",
-    "inactive": "neamhghníomhach",
-    "Appearance": "Dealramh",
-    "Security": "Slándáil",
-    "About": "Maidir le",
-    "Allowed commands:": "Orduithe ceadaithe:",
-    "Internal Networks": "Líonraí Inmheánacha",
-    "External Networks": "Líonraí Seachtracha",
-    "No External Networks": "Gan Líonraí Seachtracha",
-    "reverseProxyMsg1": "Ag Úsáid Seachfhreastalaí Réabhlóideach?",
-    "reverseProxyMsg2": "Seiceáil conas é a shocraigh don WebSocket",
-    "Cannot connect to the socket server.": "Ní féidir ceangal a dhéanamh leis an freastalaí soicéad.",
-    "reconnecting...": "Ag athcheangal…",
-    "connecting...": "Ag nascadh leis an freastalaí soicéad…",
-    "url": "URL | URLanna",
-    "extra": "Breise",
-    "newUpdate": "Nuashonrú Nua",
-    "dockgeAgent": "Aighne Dockge | Aighnithe Dockge",
-    "currentEndpoint": "Reatha",
-    "dockgeURL": "Dockge URL (e.g. http://127.0.0.1:5001)",
-    "agentOnline": "Ar Líne",
-    "agentOffline": "As Líne",
-    "connecting": "Ag Nascadh",
-    "connect": "Ceangail",
-    "addAgent": "Cuir Aighne",
-    "agentAddedSuccessfully": "Aighne curtha leis go rathúil.",
-    "agentRemovedSuccessfully": "Aighne bhaint as go rathúil.",
-    "removeAgent": "Bain Aighne",
-    "removeAgentMsg": "An bhfuil tú cinnte gur mhaith leat an t-aighne seo a bhaint?",
-    "LongSyntaxNotSupported": "Ní thacaítear leis an níochán fada anseo. Úsáid an Eagarthóir YAML, le do thoil.",
-    "signedInDispDisabled": "Auth Díchumasaithe.",
-    "home": "Abhaile",
-    "addFirstStackMsg": "Scríobh do chéad stac!",
-    "notAvailableShort": "Níl ar Fáil",
-    "stackNotManagedByDockgeMsg": "Ní bhainistítear an staca seo ag Dockge.",
-    "containerName": "Ainm na gCoimeádán",
-    "disableauth.message2": "Tá sé deartha do chúinsí <strong>ina bhfuil sé beartaithe agat tríú páirtí athbhreithniú a chur i bhfeidhm</strong> os comhair Dockge cosúil le Rochtain Cloudflare, Authelia nó múnlaí deimhniú eile.",
-    "Settings": "Socruithe",
-    "active": "gníomhach"
-}

frontend/src/lang/hu.json

@@ -1,116 +0,0 @@
-{
-    "languageName": "Angol",
-    "Repeat Password": "Jelszó Ismétlése",
-    "Create": "Létrehozás",
-    "signedInDisp": "Bejelentkezve {0}-ként",
-    "home": "Főképernyő",
-    "registry": "Bejegyzések",
-    "compose": "Összeállít",
-    "addFirstStackMsg": "Állítsd össze az első stack-odat!",
-    "stackName": "Stack Neve",
-    "deployStack": "Telepítés",
-    "deleteStack": "Törlés",
-    "stopStack": "Leállítás",
-    "restartStack": "Újraindítás",
-    "downStack": "Leállítva",
-    "editStack": "Szerkesztés",
-    "discardStack": "Eldobás",
-    "saveStackDraft": "Mentés",
-    "notAvailableShort": "N/A",
-    "stackNotManagedByDockgeMsg": "Ez a stack nem a Dockge kezelése alatt áll.",
-    "primaryHostname": "Elsődleges Gazdagépnév",
-    "general": "Általános",
-    "container": "Konténer | Konténerek",
-    "scanFolder": "Stack Mappa Beolvasása",
-    "dockerImage": "Applikáció-kép",
-    "restartPolicyNo": "Nem",
-    "environmentVariable": "Környezeti Változó | Környezeti Változók",
-    "containerName": "Konténer Neve",
-    "port": "Port | Portok",
-    "volume": "Tárhely | Tárhelyek",
-    "network": "Hálózat | Hálózatok",
-    "addListItem": "{0} Hozzáadása",
-    "deleteContainer": "Törlés",
-    "addContainer": "Konténer Hozzáadása",
-    "addNetwork": "Hálózat Hozzáadása",
-    "add": "Hozzáadás",
-    "Edit": "Szerkesztés",
-    "applyToYAML": "Alkalmazás YAML Formátumba",
-    "addInternalNetwork": "Hozzáadás",
-    "Save": "Mentés",
-    "Language": "Nyelv",
-    "Current User": "Jelenlegi Felhasználó",
-    "Change Password": "Jelszó Módosítása",
-    "Current Password": "Jelenlegi Jelszó",
-    "New Password": "Új Jelszó",
-    "Update Password": "Jelszó Cserélése",
-    "Advanced": "Fejlett",
-    "Enable Auth": "Hitelesítés Bekapcsolása",
-    "Disable Auth": "Hitelesítés Kikapcsolása",
-    "I understand, please disable": "Megértetten, kapcsolja ki",
-    "Leave": "Kilépés",
-    "Frontend Version": "Frontend Verzió",
-    "Also check beta release": "Béta kiadás is",
-    "Remember me": "Emlékezz rám",
-    "Login": "Belépés",
-    "Username": "Felhasználónév",
-    "Password": "Jelszó",
-    "Settings": "Beállítások",
-    "Convert to Compose": "Átalakítás Compose-ra",
-    "Docker Run": "Docker Futtatása",
-    "active": "aktív",
-    "inactive": "inaktív",
-    "Appearance": "Megjelenés",
-    "Security": "Biztonság",
-    "Allowed commands:": "Megengedett parancsok:",
-    "Internal Networks": "Belső Hálózatok",
-    "External Networks": "Kölső Hálózatok",
-    "No External Networks": "Nincs Külső Hálózat",
-    "reverseProxyMsg1": "Proxy-t használ?",
-    "reverseProxyMsg2": "Javasolt WebSocket konfiguráció megtekintése",
-    "reconnecting...": "Újracsatlakozás…",
-    "extra": "Extra",
-    "newUpdate": "Új Frissítés",
-    "currentEndpoint": "Jelenlegi",
-    "agentOnline": "Online",
-    "dockgeAgent": "Dockge Felügyelő | Dockge Felügyelők",
-    "agentOffline": "Offline",
-    "connecting": "Csatlakozás",
-    "connect": "Csatlakozás",
-    "agentAddedSuccessfully": "Felügyelő hozzáadva.",
-    "agentRemovedSuccessfully": "Felügyelő törölve.",
-    "removeAgent": "Felügyelő Törlése",
-    "addAgent": "Felügyelő Hozzáadása",
-    "removeAgentMsg": "Biztos hogy törli ezt a Felügyelőt?",
-    "Create your admin account": "Adminisztrátor felhasználó létrehozása",
-    "authIncorrectCreds": "Helytelen felhasználónév vagy jelszó.",
-    "PasswordsDoNotMatch": "Jelszavak nem eggyeznek.",
-    "signedInDispDisabled": "Hitelesítés Kikapcsolva.",
-    "console": "Konzol",
-    "updateStack": "Frissítés",
-    "startStack": "Indítás",
-    "deleteStackMsg": "Biztos hogy törli ezt a stack-ot?",
-    "restartPolicyUnlessStopped": "Ha Nincs Leállítva",
-    "restartPolicyAlways": "Mindig",
-    "restartPolicyOnFailure": "Hibába Futáskor",
-    "restartPolicy": "Újraindítási Elv",
-    "dependsOn": "Konténer Függés | Konténer Függései",
-    "disableauth.message1": "Biztos hogy szeretné a <strong>hitelesítést kikapcsolni</strong>?",
-    "disableauth.message2": "Olyan esetekre ahol <strong>harmadfél általi hitelesítést szeretne alkalmazni</strong> a Dockge elött, mint például Cloudflare Access, Authelia vagy egyéb hitelesítő program.",
-    "passwordNotMatchMsg": "Az ismételt jelszó nem eggyezik.",
-    "autoGet": "Automatikus Megszerzés",
-    "createExternalNetwork": "Készítés",
-    "Repeat New Password": "Új Jelszó Megerősítése",
-    "Please use this option carefully!": "Ezt a lehetőséget használja óvatosan!",
-    "Check Update On GitHub": "Fríssítés Keresése Github-on",
-    "Show update if available": "Elérhető frissítések megjelenítése",
-    "Logout": "Kilépés",
-    "Lowercase only": "Csak kisbetűvel",
-    "exited": "végzett",
-    "About": "Az Alkalmazásról",
-    "Cannot connect to the socket server.": "A Socket csatlakozás nem elérhető.",
-    "connecting...": "Csatlakozás a socket szerver-hez…",
-    "url": "URL | URL-ek",
-    "dockgeURL": "Dockge URL (pl. http://127.0.0.1:5001)",
-    "LongSyntaxNotSupported": "A hosszú szintaxis itt nem támogatott. Használja a YAML szerkesztőt."
-}

frontend/src/lang/id.json

@@ -1,116 +0,0 @@
-{
-    "Create your admin account": "Buat akun admin Anda",
-    "PasswordsDoNotMatch": "Kata sandi tidak sama.",
-    "Repeat Password": "Ulangi Kata Sandi",
-    "Create": "Buat",
-    "signedInDisp": "Masuk sebagai {0}",
-    "signedInDispDisabled": "Otentikasi Dinonaktifkan.",
-    "home": "Beranda",
-    "console": "Konsol",
-    "registry": "Registri",
-    "compose": "Menyusun",
-    "addFirstStackMsg": "Buat tumpukan pertama Anda!",
-    "stackName": "Nama Tumpukan",
-    "deployStack": "Terapkan",
-    "stopStack": "Hentikan",
-    "restartStack": "Mulai ulang",
-    "updateStack": "Pembaruan",
-    "downStack": "Hentikan & Tidak aktif",
-    "editStack": "Sunting",
-    "discardStack": "Buang",
-    "saveStackDraft": "Simpan",
-    "notAvailableShort": "T/A",
-    "stackNotManagedByDockgeMsg": "Tumpukan ini tidak dikelola oleh Dockge.",
-    "primaryHostname": "Nama Host Utama",
-    "general": "Umum",
-    "container": "Kontainer | Wadah",
-    "scanFolder": "Pindai Folder Tumpukan",
-    "restartPolicyUnlessStopped": "Kecuali Dihentikan",
-    "restartPolicyAlways": "Selalu",
-    "restartPolicyNo": "Tidak",
-    "environmentVariable": "Variabel Lingkungan | Variabel Lingkungan",
-    "dockerImage": "Image",
-    "startStack": "Mulai",
-    "restartPolicy": "Kebijakan Mulai Ulang",
-    "containerName": "Nama Kontainer",
-    "network": "Jaringan",
-    "dependsOn": "Ketergantungan Kontainer",
-    "addListItem": "Tambah {0}",
-    "deleteContainer": "Hapus",
-    "addContainer": "Tambah Kontainer",
-    "addNetwork": "Tambah Jaringan",
-    "disableauth.message1": "Apakah Anda yakin untuk <strong>mematikan otentikasi</strong>?",
-    "passwordNotMatchMsg": "Kata sandi berulang tidak cocok.",
-    "autoGet": "Otomatis Dapatkan",
-    "add": "Tambah",
-    "Edit": "Sunting",
-    "port": "Port",
-    "volume": "Volume",
-    "createExternalNetwork": "Buat",
-    "addInternalNetwork": "Tambah",
-    "Save": "Simpan",
-    "Language": "Bahasa",
-    "Change Password": "Ubah Kata Sandi",
-    "Current Password": "Ubah Kata Sandi",
-    "New Password": "Kata Sandi Baru",
-    "Repeat New Password": "Ulangi Kata Sandi",
-    "Update Password": "Perbarui Kata Sandi",
-    "Advanced": "Lanjutan",
-    "Enable Auth": "Hidupkan Otentikasi",
-    "Disable Auth": "Matikan Otentikasi",
-    "I understand, please disable": "Saya mengerti, tolong nonaktifkan",
-    "Leave": "Pergi",
-    "Frontend Version": "Versi Antarmuka",
-    "Check Update On GitHub": "Cek pembaruan di Github",
-    "Show update if available": "Tampilkan pembaruan jika tersedia",
-    "Remember me": "Ingat saya",
-    "Login": "Masuk",
-    "Username": "Nama Pengguna",
-    "Password": "Kata Sandi",
-    "Settings": "Pengaturan",
-    "Logout": "Keluar",
-    "Lowercase only": "Huruf kecil saja",
-    "Convert to Compose": "Ubah ke Tumpukan",
-    "active": "aktif",
-    "exited": "keluar",
-    "inactive": "nonaktif",
-    "Appearance": "Tampilan",
-    "Security": "Keamanan",
-    "About": "Tentang",
-    "Internal Networks": "Jaringan internal",
-    "External Networks": "Jaringan eksternal",
-    "No External Networks": "Tanpa Jaringan Eksternal",
-    "reverseProxyMsg1": "Menggunakan Reverse Proxy ?",
-    "Cannot connect to the socket server.": "Tidak bisa terhubung dengan server socket.",
-    "reconnecting...": "Menghubungkan kembali…",
-    "connecting...": "Menyambungkan ke server socket…",
-    "url": "TAUTAN",
-    "extra": "Ekstra",
-    "Docker Run": "Jalankan Docker",
-    "newUpdate": "Pembaruan Baru",
-    "languageName": "Bahasa Indonesia (Indonesian)",
-    "authIncorrectCreds": "Nama pengguna atau sandi salah.",
-    "deleteStack": "Hapus",
-    "deleteStackMsg": "Apakah Anda yakin Anda ingin menghapus tumpukan ini ?",
-    "restartPolicyOnFailure": "Ketika Gagal",
-    "disableauth.message2": "Ini dirancang untuk skenario <strong>di mana Anda bermaksud untuk mengimplementasikan otentikasi pihak ketiga</strong> di depan Dockge seperti Cloudflare Access, Authelia, atau mekanisme otentikasi lainnya.",
-    "applyToYAML": "Aplikasikan ke YAML",
-    "Current User": "Pengguna Saat Ini",
-    "Please use this option carefully!": "Mohon berhati - hati menggunakan opsi ini!",
-    "Also check beta release": "Juga cek keluaran beta",
-    "Allowed commands:": "Perintah yang diperbolehkan:",
-    "reverseProxyMsg2": "Lihat cara mengonfigurasinya untuk WebSocket",
-    "dockgeURL": "Alamat Dockge (cth. http://127.0.0.1:5001)",
-    "connecting": "Menghubungkan",
-    "addAgent": "Tambah Agen",
-    "agentAddedSuccessfully": "Agen sukses ditambahkan.",
-    "agentRemovedSuccessfully": "Agen sukses dihapus.",
-    "removeAgent": "Hapus Agen",
-    "connect": "Hubungkan",
-    "dockgeAgent": "Agen Dockge",
-    "currentEndpoint": "Sekarang",
-    "agentOnline": "Terhubung",
-    "agentOffline": "Terputus",
-    "removeAgentMsg": "Apakah anda yakin untuk menghapus agen ini?",
-    "LongSyntaxNotSupported": "Sintaks yang panjang tidak didukung di sini. Silakan gunakan editor YAML."
-}

frontend/src/lang/it-IT.json

@@ -10,16 +10,16 @@
     "home": "Home",
     "console": "Console",
     "registry": "Registro",
-    "compose": "Componi",
+    "compose": "Compose",
     "addFirstStackMsg": "Componi il tuo primo stack!",
     "stackName" : "Nome dello stack",
-    "deployStack": "Rilascia",
+    "deployStack": "Deploy",
     "deleteStack": "Cancella",
     "stopStack": "Stop",
     "restartStack": "Riavvia",
     "updateStack": "Aggiorna",
     "startStack": "Avvia",
-    "downStack": "Stop & Inattivo",
+    "downStack": "Stop & Down",
     "editStack": "Modifica",
     "discardStack": "Annulla",
     "saveStackDraft": "Salva",
@@ -75,7 +75,7 @@
     "Also check beta release": "Controlla anche le release in beta",
     "Remember me": "Ricordami",
     "Login": "Login",
-    "Username": "Nome Utente",
+    "Username": "Username",
     "Password": "Password",
     "Settings": "Impostazioni",
     "Logout": "Logout",
@@ -91,26 +91,5 @@
     "Allowed commands:": "Comandi permessi:",
     "Internal Networks": "Reti interne",
     "External Networks": "Reti esterne",
-    "No External Networks": "Nessuna rete esterna",
-    "reverseProxyMsg1": "Stai usando Reverse Proxy?",
-    "reverseProxyMsg2": "Verifica come configurarlo per il WebSocket",
-    "Cannot connect to the socket server.": "impossibile collegarsi al socket server",
-    "connecting...": "connettendosi al socket server…",
-    "extra": "Extra",
-    "reconnecting...": "Riconnessione…",
-    "url": "URL | URLs",
-    "newUpdate": "Nuovo aggiornamento",
-    "dockgeAgent": "Agente Dockge | Agenti Dockge",
-    "currentEndpoint": "Corrente",
-    "agentOnline": "Online",
-    "agentOffline": "Offline",
-    "connecting": "In connessione",
-    "connect": "Connetti",
-    "dockgeURL": "Dockge URL (ad esempio http://127.0.0.1:5001)",
-    "agentRemovedSuccessfully": "Agente rimosso con successo.",
-    "removeAgent": "Rimuovi Agente",
-    "removeAgentMsg": "Sei sicuro di voler rimuovere questo agente?",
-    "addAgent": "Aggungi Agente",
-    "agentAddedSuccessfully": "Agente aggiunto correttamente.",
-    "LongSyntaxNotSupported": "La sintassi lunga non è supportata qui. Utilizzare l'editor YAML."
+    "No External Networks": "Nessuna rete esterna"
 }

frontend/src/lang/ja.json

@@ -17,7 +17,7 @@
     "editStack": "編集",
     "discardStack": "破棄",
     "saveStackDraft": "保存",
-    "stackNotManagedByDockgeMsg": "このスタックはDockgeによって管理されていません。",
+    "stackNotManagedByDockgeMsg": "このスタックはDockageによって管理されていません。",
     "general": "一般",
     "scanFolder": "スタックフォルダをスキャン",
     "dockerImage": "イメージ",
@@ -34,7 +34,7 @@
     "primaryHostname": "主ホスト名",
     "container": "コンテナ",
     "dependsOn": "コンテナ依存関係",
-    "downStack": "停止して非アクティブ化",
+    "downStack": "停止して削除",
     "notAvailableShort": "N/A",
     "restartPolicyUnlessStopped": "手動で停止されるまで",
     "restartPolicyAlways": "常時",
@@ -94,18 +94,5 @@
     "I understand, please disable": "理解しました。無効化してください",
     "Lowercase only": "小文字のみ",
     "reverseProxyMsg1": "リバースプロキシを使用していますか？",
-    "connecting...": "ソケットサーバーに接続中…",
-    "newUpdate": "新しいバージョン",
-    "dockgeAgent": "Dockge エージェント",
-    "dockgeURL": "DockgeのURL (例: http://127.0.0.1:5001)",
-    "agentOnline": "オンライン",
-    "agentOffline": "オフライン",
-    "connecting": "接続中",
-    "connect": "接続",
-    "addAgent": "エージェントを追加",
-    "agentAddedSuccessfully": "エージェントが正常に追加されました。",
-    "agentRemovedSuccessfully": "エージェントは正常に削除されました。",
-    "removeAgent": "エージェントを削除",
-    "removeAgentMsg": "本当にこのエージェントを削除しますか?",
-    "url": "URL | URL"
+    "connecting...": "ソケットサーバーに接続中…"
 }

frontend/src/lang/ko-KR.json

@@ -90,27 +90,5 @@
     "Allowed commands:": "허용된 명령어:",
     "Internal Networks": "내부 네트워크",
     "External Networks": "외부 네트워크",
-    "No External Networks": "외부 네트워크 없음",
-    "reverseProxyMsg2": "여기서 WebSocket을 위한 설정을 확인해 보세요",
-    "downStack": "정지 & 비활성화",
-    "reverseProxyMsg1": "리버스 프록시를 사용하고 계신가요?",
-    "Cannot connect to the socket server.": "소켓 서버에 연결하지 못했습니다.",
-    "connecting...": "소켓 서버에 연결하는 중…",
-    "extra": "기타",
-    "url": "URL | URL",
-    "reconnecting...": "재연결 중…",
-    "newUpdate": "새 업데이트",
-    "dockgeURL": "Dockge URL (예. http://127.0.0.1:5001)",
-    "agentOnline": "온라인",
-    "agentOffline": "오프라인",
-    "connect": "연결",
-    "addAgent": "에이전트 추가",
-    "agentAddedSuccessfully": "에이전트를 성공적으로 추가했습니다.",
-    "removeAgent": "에이전트 삭제",
-    "removeAgentMsg": "정말로 이 에이전트를 삭제하시겠습니까?",
-    "dockgeAgent": "Dockge 에이전트",
-    "currentEndpoint": "현재",
-    "connecting": "연결 중",
-    "agentRemovedSuccessfully": "에이전트를 성공적으로 삭제했습니다.",
-    "LongSyntaxNotSupported": "긴 문법은 여기서 지원되지 않습니다. YAML 에디터를 사용하세요."
+    "No External Networks": "외부 네트워크 없음"
 }

frontend/src/lang/nb_NO.json

@@ -1,34 +0,0 @@
-{
-    "Create your admin account": "Lag din administrator konto",
-    "authIncorrectCreds": "Brukernavn eller passord stemmer ikke.",
-    "PasswordsDoNotMatch": "Passord stemmer ikke.",
-    "Repeat Password": "Gjenta passord",
-    "Create": "Lag",
-    "signedInDisp": "Logg in som {0}",
-    "signedInDispDisabled": "Auth deaktivert.",
-    "home": "Hjem",
-    "console": "Konsoll",
-    "registry": "Register",
-    "compose": "Skriv",
-    "addFirstStackMsg": "Lag din første stack!",
-    "stackName": "Navn på stack",
-    "deployStack": "Utplassere",
-    "deleteStack": "Slett",
-    "stopStack": "Stoppe",
-    "restartStack": "Omstart",
-    "updateStack": "Oppdater",
-    "downStack": "Stop & Inaktiver",
-    "editStack": "Rediger",
-    "discardStack": "Kast",
-    "saveStackDraft": "Lagre",
-    "notAvailableShort": "N/A",
-    "deleteStackMsg": "Er du sikker på at du vil slette denne stacken?",
-    "stackNotManagedByDockgeMsg": "Denne stacken er ikke styrt av Dockge.",
-    "primaryHostname": "Primært vertsnavn",
-    "general": "Generell",
-    "container": "Container | Containers",
-    "scanFolder": "Skann Stacks mappe",
-    "dockerImage": "Bilde",
-    "languageName": "Engelsk",
-    "startStack": "Start"
-}

frontend/src/lang/nl.json

@@ -1,14 +1,14 @@
 {
     "languageName": "Nederlands",
     "authIncorrectCreds": "Onjuiste gebruikersnaam of wachtwoord.",
-    "PasswordsDoNotMatch": "Wachtwoorden komen niet overeen.",
+    "PasswordsDoNotMatch": "Paswoorden komen niet overeen.",
     "Repeat Password": "Herhaal wachtwoord",
     "Create": "Aanmaken",
     "signedInDisp": "Ingelogd als {0}",
-    "home": "Home",
+    "home": "Startpagina",
     "console": "Console",
     "registry": "Register",
-    "compose": "Nieuwe stack",
+    "compose": "Samenstellen",
     "stackName": "Stack naam",
     "deployStack": "Opzetten",
     "deleteStack": "Verwijder",
@@ -16,11 +16,11 @@
     "restartStack": "Herstart",
     "updateStack": "Update",
     "startStack": "Start",
-    "downStack": "Stop & Afsluiten",
+    "downStack": "Stop & Down",
     "editStack": "Bewerken",
     "discardStack": "Verwijderen",
     "saveStackDraft": "Opslaan",
-    "notAvailableShort": "n.v.t.",
+    "notAvailableShort": "NVT",
     "stackNotManagedByDockgeMsg": "Deze stack wordt niet beheerd door Dockge.",
     "primaryHostname": "Primaire hostnaam",
     "general": "Algemeen",
@@ -83,9 +83,9 @@
     "reverseProxyMsg1": "Reverse proxy in gebruik?",
     "reverseProxyMsg2": "Controleer hoe te configureren voor WebSocket",
     "Cannot connect to the socket server.": "Kan geen verbinding maken met de socket server.",
-    "reconnecting...": "Herverbinden…",
-    "connecting...": "Verbinden met de socket server…",
-    "url": "Adres(sen)",
+    "reconnecting...": "Herverbinden...",
+    "connecting...": "Verbinden met de socket server...",
+    "url": "Url(s)",
     "extra": "Extra",
     "Create your admin account": "Creëer je beheerders-account",
     "addFirstStackMsg": "Maak je eerste stack!",
@@ -98,19 +98,5 @@
     "Please use this option carefully!": "Wees voorzichtig met deze optie!",
     "Also check beta release": "Controleer ook op beta releases",
     "Convert to Compose": "Converteer naar compose",
-    "External Networks": "Externe netwerken",
-    "newUpdate": "Nieuwe update",
-    "dockgeAgent": "Dockge Agent | Dockge Agenten",
-    "currentEndpoint": "Huidige",
-    "dockgeURL": "Dockge Adres (bijv. http://127.0.0.1:5001)",
-    "agentOnline": "Online",
-    "agentOffline": "Offline",
-    "connecting": "Verbinden",
-    "connect": "Verbind",
-    "addAgent": "Agent toevoegen",
-    "agentAddedSuccessfully": "Agent toegevoegd.",
-    "agentRemovedSuccessfully": "Agent verwijderd.",
-    "removeAgent": "Verwijder agent",
-    "removeAgentMsg": "Weet je zeker dat je deze agent wilt verwijderen?",
-    "LongSyntaxNotSupported": "Lange syntax wordt hier niet ondersteund. Gebruik de YAML editor."
+    "External Networks": "Externe netwerken"
 }

frontend/src/lang/pl-PL.json

@@ -90,27 +90,5 @@
     "Allowed commands:": "Dozwolone polecenia:",
     "Internal Networks": "Sieci wewnętrzne",
     "External Networks": "Sieci zewnętrzne",
-    "No External Networks": "Brak sieci zewnętrznych",
-    "newUpdate": "Nowa Aktualizacja",
-    "dockgeAgent": "Agent Dockge | Agenci Dockge",
-    "currentEndpoint": "Obecny",
-    "connecting": "Łączenie",
-    "connect": "Połącz",
-    "addAgent": "Dodaj Agenta",
-    "agentAddedSuccessfully": "Agent pomyślnie dodany.",
-    "agentRemovedSuccessfully": "Agent pomyślnie usunięty.",
-    "removeAgent": "Usuń Agenta",
-    "removeAgentMsg": "Czy na pewno usunąć tego Agenta?",
-    "dockgeURL": "Dockge URL (e.g. http://127.0.0.1:5001)",
-    "agentOnline": "Online",
-    "agentOffline": "Offline",
-    "downStack": "Zatrzymaj i Dezaktywuj",
-    "reverseProxyMsg1": "Używasz Serwer Proxy?",
-    "reverseProxyMsg2": "Sprawdź w jaki sposób skonfigurować dla WebSocketów",
-    "Cannot connect to the socket server.": "Brak połączenia z socket serwera.",
-    "connecting...": "Łączenie z socketem serwera…",
-    "extra": "Ekstra",
-    "url": "URL | URLe",
-    "reconnecting...": "Wznawianie połączenia…",
-    "LongSyntaxNotSupported": "Nieobsługiwana składnia. Użyj edytora YAML."
+    "No External Networks": "Brak sieci zewnętrznych"
 }

frontend/src/lang/pt-BR.json

@@ -90,27 +90,5 @@
     "Allowed commands:": "Comandos permitidos:",
     "Internal Networks": "Redes internas",
     "External Networks": "Redes externas",
-    "No External Networks": "Sem redes externas",
-    "reverseProxyMsg2": "Veja como configurar para WebSocket",
-    "downStack": "Parar & Inativar",
-    "reverseProxyMsg1": "Utiliza proxy reverso?",
-    "Cannot connect to the socket server.": "Não é possível conectar ao socket server.",
-    "connecting...": "Conectando ao socket server…",
-    "url": "URL | URLs",
-    "extra": "Extra",
-    "reconnecting...": "Reconectando…",
-    "newUpdate": "Nova Atualização",
-    "dockgeAgent": "Agente Dockge | Agentes Dockge",
-    "currentEndpoint": "Atual",
-    "dockgeURL": "Dockge URL (ex. http://127.0.0.1:5001)",
-    "agentOnline": "Online",
-    "agentOffline": "Offline",
-    "connecting": "Conectando",
-    "connect": "Conectar",
-    "addAgent": "Adicionar agente",
-    "agentAddedSuccessfully": "Agente adicionado com sucesso.",
-    "agentRemovedSuccessfully": "Agente removido com sucesso.",
-    "removeAgent": "Remover Agente",
-    "removeAgentMsg": "Tem certeza de que deseja remover este agente?",
-    "LongSyntaxNotSupported": "Sintaxe longa não é suportada aqui. Por favor, use o editor de YAML."
+    "No External Networks": "Sem redes externas"
 }

frontend/src/lang/pt.json

@@ -90,27 +90,5 @@
     "Allowed commands:": "Comandos permitidos:",
     "Internal Networks": "Redes Internas",
     "External Networks": "Redes Externas",
-    "No External Networks": "Sem Redes Externas",
-    "newUpdate": "Nova Atualização",
-    "currentEndpoint": "Atual",
-    "dockgeURL": "Dockge URL (e.g. http://127.0.0.1:5001)",
-    "agentOnline": "Online",
-    "agentOffline": "Offline",
-    "connecting": "Conectando",
-    "addAgent": "Adicionar Agente",
-    "agentAddedSuccessfully": "Agente adicionado com sucesso.",
-    "agentRemovedSuccessfully": "Agente removido com sucesso.",
-    "removeAgent": "Remover Agente",
-    "downStack": "Parar & Desativar",
-    "dockgeAgent": "Dockge Agente | Dockge Agentes",
-    "connect": "Conectar",
-    "removeAgentMsg": "Tem certeza de que deseja remover este agente?",
-    "reverseProxyMsg1": "Usando um Proxy Reverso?",
-    "reverseProxyMsg2": "Verifique para configurá-lo como WebSocket",
-    "Cannot connect to the socket server.": "Não é possível se conectar ao servidor socket.",
-    "url": "URL | URL's",
-    "extra": "Extra",
-    "reconnecting...": "Reconectando…",
-    "connecting...": "Conectando ao servidor de socket…",
-    "LongSyntaxNotSupported": "Sintaxes longas não são suportadas aqui. Por favor, utilize um editor YAML."
+    "No External Networks": "Sem Redes Externas"
 }

frontend/src/lang/ru.json

@@ -1,15 +1,15 @@
 {
     "languageName": "Русский",
-    "Create your admin account": "Создайте учетную запись администратора",
+    "Create your admin account": "Создайте учетку администратора",
     "authIncorrectCreds": "Неверный логин или пароль.",
-    "PasswordsDoNotMatch": "Пароли не совпадают.",
+    "PasswordsDoNotMatch": "Пароль не совпадает.",
     "Repeat Password": "Повторите пароль",
     "Create": "Создать",
-    "signedInDisp": "Авторизован как {0}",
+    "signedInDisp": "Авторизован как",
     "signedInDispDisabled": "Авторизация выключена.",
     "home": "Главная",
     "console": "Консоль",
-    "registry": "Реестр (Registry)",
+    "registry": "Registry",
     "compose": "Compose",
     "addFirstStackMsg": "Создайте свой первый стек!",
     "stackName": "Имя стека",
@@ -24,9 +24,9 @@
     "saveStackDraft": "Сохранить",
     "notAvailableShort": "Н/Д",
     "deleteStackMsg": "Вы уверены что хотите удалить этот стек?",
-    "stackNotManagedByDockgeMsg": "Данный стек не управляется Dockge.",
+    "stackNotManagedByDockgeMsg": "Данный стек не обслуживается Dockge.",
     "primaryHostname": "Имя хоста",
-    "general": "Основные",
+    "general": "Главное",
     "container": "Контейнер | Контейнеры",
     "scanFolder": "Сканировать папку стеков",
     "dockerImage": "Образ",
@@ -43,12 +43,12 @@
     "dependsOn": "Зависимость контейнера | Зависимости контейнера",
     "addListItem": "Добавить {0}",
     "deleteContainer": "Удалить",
-    "addContainer": "Добавить контейнер",
-    "addNetwork": "Добавить сеть",
-    "disableauth.message1": "Вы уверены что хотите <strong>отключить аутентификацию</strong>?",
-    "disableauth.message2": "Это предназначено для сценариев, <strong>когда Вы собираетесь использовать стороннюю аутентификацию</strong> перед Dockge, например Cloudflare Access, Authelia или другие механизмы аутентификации.",
+    "addContainer": "Добавить Контейнер",
+    "addNetwork": "Добавить Сеть",
+    "disableauth.message1": "Вы уверены что хотите <strong>выключить авторизацию</strong>?",
+    "disableauth.message2": "Он предназначен для сценариев, <strong>где вы собираетесь реализовать стороннюю аутентификацию</strong> перед Dockge, например Cloudflare Access, Authelia или другие механизмы аутентификации.",
     "passwordNotMatchMsg": "Повторный пароль не совпадает.",
-    "autoGet": "Авто",
+    "autoGet": "Auto Get",
     "add": "Добавить",
     "Edit": "Изменить",
     "applyToYAML": "Применить к YAML",
@@ -62,16 +62,16 @@
     "New Password": "Новый пароль",
     "Repeat New Password": "Повторите новый пароль",
     "Update Password": "Обновить пароль",
-    "Advanced": "Расширенные",
+    "Advanced": "Продвинутые опции",
     "Please use this option carefully!": "Пожалуйста, используйте эту опцию осторожно!",
     "Enable Auth": "Включить аутентификацию",
     "Disable Auth": "Отключить аутентификацию",
     "I understand, please disable": "Я понимаю, пожалуйста, отключите",
     "Leave": "Покинуть",
     "Frontend Version": "Версия внешнего интерфейса",
-    "Check Update On GitHub": "Проверить обновления на GitHub",
+    "Check Update On GitHub": "Проверьте обновление на GitHub",
     "Show update if available": "Показать обновление, если оно доступно",
-    "Also check beta release": "Получать бета-версии",
+    "Also check beta release": "Также проверьте бета-версию",
     "Remember me": "Запомнить меня",
     "Login": "Логин",
     "Username": "Имя пользователя",
@@ -80,37 +80,15 @@
     "Logout": "Выйти",
     "Lowercase only": "Только нижний регистр",
     "Convert to Compose": "Преобразовать в Compose",
-    "Docker Run": "Docker Run",
-    "active": "акт.",
-    "exited": "ост.",
-    "inactive": "неакт.",
+    "Docker Run": "Запустить Docker",
+    "active": "активный",
+    "exited": "завершенный",
+    "inactive": "неактинвый",
     "Appearance": "Внешний вид",
     "Security": "Безопасность",
     "About": "О продукте",
     "Allowed commands:": "Разрешенные команды:",
     "Internal Networks": "Внутренние сети",
     "External Networks": "Внешние сети",
-    "No External Networks": "Нет внешних сетей",
-    "downStack": "Остановить и деактивировать",
-    "reverseProxyMsg1": "Используете обратный прокси?",
-    "reconnecting...": "Переподключение…",
-    "Cannot connect to the socket server.": "Не удается подключиться к сокет-серверу.",
-    "url": "URL-адрес | URL-адреса",
-    "extra": "Дополнительно",
-    "reverseProxyMsg2": "Проверьте, как настроить его для WebSocket",
-    "connecting...": "Подключение к сокет-серверу…",
-    "newUpdate": "Доступно обновление",
-    "currentEndpoint": "Текущий",
-    "agentOnline": "В сети",
-    "agentOffline": "Не в сети",
-    "connecting": "Подключение",
-    "connect": "Подключить",
-    "addAgent": "Добавить Агента",
-    "agentAddedSuccessfully": "Агент успешно добавлен.",
-    "removeAgent": "Удалить агента",
-    "removeAgentMsg": "Вы уверены, что хотите удалить этого агента?",
-    "dockgeAgent": "Агент Dockge | Агенты Dockge",
-    "dockgeURL": "URL-адрес Dockge (например: http://127.0.0.1:5001)",
-    "agentRemovedSuccessfully": "Агент успешно удален.",
-    "LongSyntaxNotSupported": "Длинный синтаксис здесь не поддерживается. Пожалуйста, используйте редактор YAML."
+    "No External Networks": "Нет внешних сетей"
 }

frontend/src/lang/sl.json

@@ -90,27 +90,5 @@
     "Allowed commands:": "Dovoljeni ukazi:",
     "Internal Networks": "Notranja omrežja",
     "External Networks": "Zunanja omrežja",
-    "No External Networks": "Ni zunanjih omrežij",
-    "downStack": "Ustavi & Deaktiviraj",
-    "connecting...": "Povezovanje s strežnikom…",
-    "reverseProxyMsg1": "Uporabljate obratni proxy?",
-    "extra": "Dodatno",
-    "reconnecting...": "Ponovna povezava …",
-    "newUpdate": "Nova posodobitev",
-    "reverseProxyMsg2": "Preverite, kako ga konfigurirati za WebSocket",
-    "Cannot connect to the socket server.": "Ni mogoče vzpostaviti povezave s strežnikom vtičnic.",
-    "url": "URL | URL-ji",
-    "currentEndpoint": "Trenutni",
-    "dockgeURL": "Dockge URL (npr. http://127.0.0.1:5001)",
-    "agentOnline": "Aktivno",
-    "agentOffline": "Neaktivno",
-    "connecting": "Povezujem",
-    "connect": "Poveži",
-    "addAgent": "Dodaj agenta",
-    "dockgeAgent": "Dockge agent | Dockge agenti",
-    "agentAddedSuccessfully": "Agent dodan uspešno.",
-    "agentRemovedSuccessfully": "Agent uspešno odstranjen.",
-    "removeAgent": "Odstrani agent",
-    "removeAgentMsg": "Ali ste prepričani, da želite odstraniti agenta?",
-    "LongSyntaxNotSupported": "Long syntax-a ni podprta tukaj. Prosim uporabite YAML urejevalnik."
+    "No External Networks": "Ni zunanjih omrežij"
 }

frontend/src/lang/sv-SE.json

@@ -1,6 +1,6 @@
 {
     "languageName": "Svenska",
-    "Create your admin account": "Skapa ditt Admin-konto",
+    "Create your admin account": "Skapa ditt Admin-konto.",
     "authIncorrectCreds": "Fel användarnamn eller lösenord.",
     "PasswordsDoNotMatch": "Lösenorden matchar inte.",
     "Repeat Password": "Repetera lösenord",
@@ -15,11 +15,11 @@
     "stackName" : "Stacknamn",
     "deployStack": "Distribuera",
     "deleteStack": "Radera",
-    "stopStack": "Stoppa",
+    "stopStack": "Stop",
     "restartStack": "Starta om",
     "updateStack": "Uppdatera",
     "startStack": "Starta",
-    "downStack": "Stoppa & Inaktivera",
+    "downStack": "Stop & Ner",
     "editStack": "Redigera",
     "discardStack": "Kasta",
     "saveStackDraft": "Spara",
@@ -29,11 +29,11 @@
     "primaryHostname": "Primärt värdnamn",
     "general": "Allmän",
     "container": "Container | Containrar",
-    "scanFolder": "Skanna Stackmapp",
-    "dockerImage": "Avbild",
-    "restartPolicyUnlessStopped": "Om inte stoppad",
+    "scanFolder": "Scanna Stackfolder",
+    "dockerImage": "Bild",
+    "restartPolicyUnlessStopped": "Om inte stoppas",
     "restartPolicyAlways": "Alltid",
-    "restartPolicyOnFailure": "Vid misslyckande",
+    "restartPolicyOnFailure": "Vid Misslyckande",
     "restartPolicyNo": "Nej",
     "environmentVariable": "Miljövariabel | Miljövariabler",
     "restartPolicy": "Omstartspolicy",
@@ -44,12 +44,12 @@
     "dependsOn": "Containerberoende | Containerberoenden",
     "addListItem": "Lägg till {0}",
     "deleteContainer": "Radera",
-    "addContainer": "Lägg till container",
-    "addNetwork": "Lägg till nätverk",
+    "addContainer": "Lägg till Container",
+    "addNetwork": "Lägg till Nätverk",
     "disableauth.message1": "Är du säker på att du vill <strong>inaktivera autentisering</strong>?",
-    "disableauth.message2": "Det är designat för scenarion <strong>där du ska implementera tredjepartsautentisering</strong> framför Dockge som Cloudflare Access, Authelia eller andra autentiseringsmekanismer.",
-    "passwordNotMatchMsg": "Det upprepade lösenordet matchar inte.",
-    "autoGet": "Auto-hämta",
+    "disableauth.message2": "Det är designat för senarion <stong>när du ska implementera tredjeparts autentisering</strong> framör Dockge som Cloudflare Access, Authelia eller andra autentiseringsmekanismer.",
+    "passwordNotMatchMsg": "Det upprepade lösenordet matchar inte",
+    "autoGet": "Auto Hämta",
     "add": "Lägg till",
     "Edit": "Redigera",
     "applyToYAML": "Lägg till i YAML",
@@ -57,8 +57,8 @@
     "addInternalNetwork": "Lägg till",
     "Save": "Spara",
     "Language": "Språk",
-    "Current User": "Nuvarande användare",
-    "Change Password": "Ändra lösenord",
+    "Current User": "Nuvarande användaren",
+    "Change Password": "Byt lösenord",
     "Current Password": "Nuvarande lösenord",
     "New Password": "Nytt lösenord",
     "Repeat New Password": "Upprepa nytt lösenord",
@@ -70,9 +70,9 @@
     "I understand, please disable": "Jag förstår, vänligen inaktivera",
     "Leave": "Lämna",
     "Frontend Version": "Frontendversion",
-    "Check Update On GitHub": "Kontrollera uppdatering på GitHub",
+    "Check Update On GitHub": "Kontrollera Uppdatering på GitHub",
     "Show update if available": "Visa uppdatering om tillgänglig",
-    "Also check beta release": "Kontrollera även betaversioner",
+    "Also check beta release": "Kontrollera även betaversionen",
     "Remember me": "Kom ihåg mig",
     "Login": "Logga in",
     "Username": "Användarnamn",
@@ -80,8 +80,8 @@
     "Settings": "Inställningar",
     "Logout": "Logga ut",
     "Lowercase only": "Endast små tecken",
-    "Convert to Compose": "Omvandla till compose",
-    "Docker Run": "Docker kör",
+    "Convert to Compose": "Omvandla till Compose",
+    "Docker Run": "Docker Run",
     "active": "aktiv",
     "exited": "avslutad",
     "inactive": "inaktiv",
@@ -89,28 +89,7 @@
     "Security": "Säkerhet",
     "About": "Om",
     "Allowed commands:": "Tillåtna kommandon:",
-    "Internal Networks": "Interna nätverk",
-    "External Networks": "Externa nätverk",
-    "No External Networks": "Inga externa nätverk",
-    "reverseProxyMsg1": "Används omvänd proxy?",
-    "connecting...": "Ansluter till socketserver…",
-    "Cannot connect to the socket server.": "Kan inte ansluta till socketservern.",
-    "reverseProxyMsg2": "Kontrollera hur man konfigurerar webbsocket",
-    "url": "URL | URLer",
-    "extra": "Extra",
-    "reconnecting...": "Återansluter…",
-    "newUpdate": "Ny uppdatering",
-    "currentEndpoint": "Nuvarande",
-    "dockgeURL": "Dockge URL (ex. http://127.0.0.1:5001)",
-    "agentOnline": "On-line",
-    "agentOffline": "Off-line",
-    "connecting": "Ansluter",
-    "connect": "Ansluten",
-    "addAgent": "Lägg till agent",
-    "agentRemovedSuccessfully": "Agent borttagen.",
-    "removeAgent": "Ta bort agent",
-    "removeAgentMsg": "Är du säker att du vill ta bort denna agent?",
-    "dockgeAgent": "Dockge agenter | Dockge agenter",
-    "agentAddedSuccessfully": "Agent tillagd.",
-    "LongSyntaxNotSupported": "Lång syntax stöds inte här. Använd YAML-redigeraren."
+    "Internal Networks": "Interna Nätverk",
+    "External Networks": "Externa Nätverk",
+    "No External Networks": "Inga Externa Nätverk"
 }

frontend/src/lang/th.json

@@ -1,17 +1,17 @@
 {
-    "languageName": "อังกฤษ",
+    "languageName": "ไทย",
     "Create your admin account": "สร้างบัญชีผู้ดูแลระบบของคุณ",
     "authIncorrectCreds": "ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง",
     "PasswordsDoNotMatch": "รหัสผ่านไม่ตรงกัน",
     "Repeat Password": "ยืนยันรหัสผ่าน",
     "Create": "สร้าง",
-    "signedInDisp": "ลงชื่อเข้าใช้ในนาม {0}",
+    "signedInDisp": "ลงชื่อเข้าใช้ในชื่อ {0}",
     "signedInDispDisabled": "ปิดใช้งาน Auth",
-    "home": "หน้าหลัก",
+    "home": "หน้าหลักe",
     "console": "คอนโซล",
     "registry": "Registry",
     "compose": "Compose",
-    "addFirstStackMsg": "Compose stack แรกของคุณ!",
+    "addFirstStackMsg": "Compose stack แรกของคุณ",
     "stackName": "ชื่อ Stack",
     "deployStack": "ปรับใช้",
     "deleteStack": "ลบ",
@@ -19,7 +19,7 @@
     "restartStack": "เริ่มใหม่",
     "updateStack": "อัปเดต",
     "startStack": "เริ่มต้น",
-    "downStack": "หยุดการทำงาน",
+    "downStack": "หยุดและปิด",
     "editStack": "แก้ไข",
     "discardStack": "ยกเลิก",
     "saveStackDraft": "บันทึก",
@@ -91,26 +91,5 @@
     "Allowed commands:": "คำสั่งที่อนุญาต:",
     "Internal Networks": "เครือข่ายภายใน",
     "External Networks": "เครือข่ายภายนอก",
-    "No External Networks": "ไม่มีเครือข่ายภายนอก",
-    "reverseProxyMsg2": "ตรวจสอบวิธีกำหนดค่าสำหรับ WebSocket",
-    "Cannot connect to the socket server.": "ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ socket ได้",
-    "reverseProxyMsg1": "ใช้ Reverse Proxy หรือไม่?",
-    "connecting...": "กำลังเชื่อมต่อกับเซิร์ฟเวอร์ socket…",
-    "url": "URL | URLs",
-    "extra": "พิเศษ",
-    "reconnecting...": "กำลังเชื่อมต่อใหม่…",
-    "newUpdate": "อัปเดตใหม่",
-    "dockgeAgent": "เอเย่นต์ Dockge | เอเย่นต์ Dockge",
-    "currentEndpoint": "ปัจุบัน",
-    "agentOnline": "ออนไลน์",
-    "agentOffline": "ออฟไลน์",
-    "connecting": "กำลังเชื่อมต่อ",
-    "connect": "เชื่อมต่อ",
-    "addAgent": "เพิ่มเอเย่นต์",
-    "agentAddedSuccessfully": "เพิ่มเอเย่นต์สำเร็จ",
-    "agentRemovedSuccessfully": "ลบเอเย่นต์สำเร็จ",
-    "removeAgent": "ลบเอเย่นต์",
-    "removeAgentMsg": "คุณแน่ใจหรือไม่ที่จะลบเอเย่นต์นี้?",
-    "dockgeURL": "ลิ้งก์ Dockge (เช่น http://127.0.0.1:5001)",
-    "LongSyntaxNotSupported": "Syntax แบบยาสไม่รองรับที่นี่ กรุณาใช้ตัวแก้ไข YAML"
+    "No External Networks": "ไม่มีเครือข่ายภายนอก"
 }

frontend/src/lang/tr.json

@@ -7,22 +7,22 @@
     "Create": "Oluştur",
     "signedInDisp": "{0} olarak oturum açıldı",
     "signedInDispDisabled": "Yetkilendirme Devre Dışı.",
-    "home": "Ana Sayfa",
+    "home": "Anasayfa",
     "console": "Konsol",
     "registry": "Kayıt Defteri",
-    "compose": "Oluştur",
+    "compose": "Compose",
     "addFirstStackMsg": "İlk yığınınızı oluşturun!",
     "stackName": "Yığın Adı",
-    "deployStack": "Dağıt",
+    "deployStack": "Dağıtmak",
     "deleteStack": "Sil",
-    "stopStack": "Durdur",
+    "stopStack": "Dudur",
     "restartStack": "Yeniden Başlat",
     "updateStack": "Güncelle",
     "startStack": "Başlat",
     "editStack": "Düzenle",
-    "discardStack": "İptal Et",
+    "discardStack": "Çıkar",
     "saveStackDraft": "Kaydet",
-    "notAvailableShort": "YOK",
+    "notAvailableShort": "N/A",
     "deleteStackMsg": "Bu yığını silmek istediğinizden emin misiniz?",
     "stackNotManagedByDockgeMsg": "Bu yığın Dockge tarafından yönetilmemektedir.",
     "primaryHostname": "Birincil Ana Bilgisayar Adı",
@@ -45,19 +45,19 @@
     "deleteContainer": "Sil",
     "addContainer": "Konteyner Ekle",
     "addNetwork": "Ağ Ekle",
-    "disableauth.message1": "<strong>Kimlik doğrulamayı devre dışı bırakmak</strong> istediğinizden emin misiniz?",
-    "disableauth.message2": "Cloudflare Access, Authelia veya diğer kimlik doğrulama mekanizmaları Dockge önünde <strong>üçüncü taraf kimlik doğrulaması uygulamak</strong> istediğiniz senaryolar için tasarlanmıştır.",
+    "disableauth.message1": "<strong>Kimlik doğrulamayı devre dışı</strong> bırakmak istediğinizden emin misiniz?",
+    "disableauth.message2": "Cloudflare Access, Authelia veya diğer kimlik doğrulama mekanizmaları gibi Uptime Kuma'nın önünde <strong>üçüncü taraf kimlik doğrulaması uygulamak</strong> istediğiniz senaryolar için tasarlanmıştır.",
     "passwordNotMatchMsg": "Tekrarlanan parola eşleşmiyor.",
     "autoGet": "Otomatik Al",
     "add": "Ekle",
     "Edit": "Düzenle",
-    "applyToYAML": "YAML dosyasına uygula",
+    "applyToYAML": "YAML'ye uygulayın",
     "createExternalNetwork": "Oluştur",
     "addInternalNetwork": "Ekle",
     "Save": "Kaydet",
     "Language": "Dil",
     "Current User": "Mevcut Kullanıcı",
-    "Change Password": "Parolayı Değiştir",
+    "Change Password": "Mevcut Parola",
     "Current Password": "Mevcut Parola",
     "New Password": "Yeni Parola",
     "Repeat New Password": "Yeni Parolayı Tekrarla",
@@ -66,31 +66,31 @@
     "Please use this option carefully!": "Lütfen bu seçeneği dikkatli kullanın!",
     "Enable Auth": "Kimlik Doğrulamayı Etkinleştir",
     "Disable Auth": "Kimlik Doğrulamayı Devre Dışı Bırak",
-    "I understand, please disable": "Anlıyorum, lütfen devre dışı bırak",
+    "I understand, please disable": "Anlıyorum, lütfen devre dışı bırakın",
     "Leave": "Ayrıl",
-    "Frontend Version": "Ön Uç Sürümü",
+    "Frontend Version": "Frontend Versiyon",
     "Check Update On GitHub": "GitHub'da Güncellemeyi Kontrol Edin",
     "Show update if available": "Varsa güncellemeyi göster",
     "Also check beta release": "Ayrıca beta sürümünü kontrol edin",
-    "Remember me": "Beni hatırla",
+    "Remember me": "Beni Hatırla",
     "Login": "Oturum Aç",
     "Username": "Kullanıcı Adı",
     "Password": "Parola",
     "Settings": "Ayarlar",
     "Logout": "Oturumu Kapat",
     "Lowercase only": "Yalnızca küçük harf",
-    "Convert to Compose": "Compose dosyasına dönüştür",
+    "Convert to Compose": "Compose'a Dönüştür",
     "Docker Run": "Docker Run",
-    "active": "etkin",
-    "exited": "çıktı",
-    "inactive": "devre dışı",
+    "active": "aktif",
+    "exited": "çıkış yaptı",
+    "inactive": "aktif değil",
     "Appearance": "Görünüm",
     "Security": "Güvenlik",
     "About": "Hakkında",
     "Allowed commands:": "İzin verilen komutlar:",
-    "Internal Networks": "Dahili Ağlar",
-    "External Networks": "Harici Ağlar",
-    "No External Networks": "Harici Ağ Yok",
+    "Internal Networks": "İç Ağlar",
+    "External Networks": "Dış Ağlar",
+    "No External Networks": "Dış Ağ Yok",
     "extra": "Ekstra",
     "reverseProxyMsg1": "Ters Proxy mi kullanıyorsunuz?",
     "reverseProxyMsg2": "WebSocket için nasıl yapılandırma yapılacağını kontrol edin",
@@ -98,19 +98,5 @@
     "connecting...": "Soket sunucusuna bağlanıyor…",
     "url": "URL | URL’ler",
     "Cannot connect to the socket server.": "Soket sunucusuna bağlanılamıyor.",
-    "downStack": "Durdur ve Devre Dışı Bırak",
-    "newUpdate": "Yeni Güncelleme",
-    "dockgeAgent": "Dockge Aracısı | Dockge Aracıları",
-    "currentEndpoint": "Varsayılan",
-    "dockgeURL": "Dockge URL (ör. http://127.0.0.1:5001)",
-    "agentOnline": "Çevrimiçi",
-    "agentOffline": "Çevrimdışı",
-    "connecting": "Bağlanıyor",
-    "connect": "Bağlan",
-    "addAgent": "Aracı Ekle",
-    "agentAddedSuccessfully": "Aracı başarıyla eklendi.",
-    "agentRemovedSuccessfully": "Aracı başarıyla kaldırıldı.",
-    "removeAgent": "Aracıyı Kaldır",
-    "removeAgentMsg": "Bu aracıyı kaldırmak istediğinize emin misiniz?",
-    "LongSyntaxNotSupported": "Uzun syntax burada desteklenmiyor. Lütfen YAML editörünü kullanın."
+    "downStack": "Durdur & Kapat"
 }

frontend/src/lang/uk-UA.json

@@ -80,7 +80,7 @@
     "Logout": "Вийти",
     "Lowercase only": "Тільки нижній регістр",
     "Convert to Compose": "Конвертувати в Compose",
-    "Docker Run": "Docker Run",
+    "Docker Run": "Запустити Docker",
     "active": "активно",
     "exited": "завершено",
     "inactive": "неактивно",
@@ -92,25 +92,11 @@
     "External Networks": "Зовнішні мережі",
     "No External Networks": "Немає зовнішніх мереж",
     "downStack": "Зупинити і вимкнути",
-    "reverseProxyMsg1": "Використовуєте зворотній проксі?",
+    "reverseProxyMsg1": "Використовувати зворотній проксі?",
     "Cannot connect to the socket server.": "Не вдається підключитися до сервера сокетів.",
     "reconnecting...": "Повторне підключення…",
     "connecting...": "Підключення до сервера сокетів…",
     "url": "URL-адреса | URL-адреси",
     "reverseProxyMsg2": "Перевірте, як налаштувати його для WebSocket",
-    "extra": "Додатково",
-    "newUpdate": "Оновлення",
-    "currentEndpoint": "Поточний",
-    "agentOnline": "Онлайн",
-    "agentOffline": "Офлайн",
-    "connecting": "Підключення",
-    "connect": "Підключитися",
-    "addAgent": "Додати агент",
-    "removeAgent": "Видалити агент",
-    "dockgeAgent": "Dockge-агент | Dockge-агенти",
-    "dockgeURL": "Dockge URL (напр. http://127.0.0.1:5001)",
-    "agentRemovedSuccessfully": "Агент успішно видалено.",
-    "agentAddedSuccessfully": "Агент успішно додано.",
-    "removeAgentMsg": "Ви впевнені, що хочете видалити цей агент?",
-    "LongSyntaxNotSupported": "Довгий синтаксис тут не підтримується. Будь ласка, використовуйте редактор YAML."
+    "extra": "Додатково"
 }

frontend/src/lang/ur.json

@@ -97,20 +97,6 @@
     "connecting...": "ساکٹ سرور سے منسلک ہو رہا ہے…",
     "url": "یو آر ایل | یو آر ایل",
     "extra": "اضافی",
-    "downStack": "روکیں اور غیر فعال",
-    "reverseProxyMsg2": "اسے WebSocket کے لیے ترتیب دینے کا طریقہ چیک کریں",
-    "newUpdate": "نئی تازہ کاری",
-    "dockgeAgent": "ڈاکج ایجنٹ | ڈاکج ایجنٹس",
-    "currentEndpoint": "کرنٹ",
-    "dockgeURL": "Dockge URL (جیسے http://127.0.0.1:5001)",
-    "agentOnline": "آن لائن",
-    "agentOffline": "آف لائن",
-    "connecting": "جڑ رہا ہے",
-    "connect": "جڑیں",
-    "addAgent": "ایجنٹ شامل کریں",
-    "agentAddedSuccessfully": "ایجنٹ کامیابی کے ساتھ شامل ہو گیا۔",
-    "agentRemovedSuccessfully": "ایجنٹ کو کامیابی سے ہٹا دیا گیا۔",
-    "removeAgent": "ایجنٹ کو ہٹا دیں",
-    "removeAgentMsg": "کیا آپ واقعی اس ایجنٹ کو ہٹانا چاہتے ہیں؟",
-    "LongSyntaxNotSupported": "لمبا نحو یہاں تعاون یافتہ نہیں ہے۔ براہ کرم YAML ایڈیٹر استعمال کریں۔"
+    "downStack": "اسٹاپ اینڈ ڈاؤن",
+    "reverseProxyMsg2": "اسے WebSocket کے لیے ترتیب دینے کا طریقہ چیک کریں"
 }

frontend/src/lang/vi.json

@@ -1,115 +0,0 @@
-{
-    "authIncorrectCreds": "Sai tên người dùng hoặc mật khẩu.",
-    "PasswordsDoNotMatch": "Mật khẩu không khớp.",
-    "Repeat Password": "Lặp Lại Mật Khẩu",
-    "Create": "Tạo",
-    "signedInDisp": "Đã đăng nhập với tư cách {0}",
-    "home": "Trang chủ",
-    "console": "Console",
-    "compose": "Compose",
-    "registry": "Registry",
-    "stackName": "Tên Stack",
-    "deployStack": "Triển khai",
-    "deleteStack": "Xoá",
-    "stopStack": "Dừng",
-    "restartStack": "Khởi động lại",
-    "signedInDispDisabled": "Đã Tắt Xác Thực Đăng Nhập.",
-    "startStack": "Bắt đầu",
-    "downStack": "Dừng & Ngưng hoạt động",
-    "editStack": "Chỉnh sửa",
-    "saveStackDraft": "Lưu",
-    "notAvailableShort": "N/A",
-    "deleteStackMsg": "Bạn có chắc chắn muốn xoá stack này?",
-    "primaryHostname": "Tên Host Chính",
-    "scanFolder": "Quét Thư Mục Stack",
-    "restartPolicyAlways": "Luôn Luôn",
-    "restartPolicyOnFailure": "Khi Có Lỗi",
-    "restartPolicyNo": "Không",
-    "environmentVariable": "Biến Môi Trường | Các Biến Môi Trường",
-    "restartPolicy": "Chính Sách Khởi Động Lại",
-    "containerName": "Tên Container",
-    "port": "Cổng | Cổng",
-    "addListItem": "Thêm {0}",
-    "deleteContainer": "Xoá",
-    "addContainer": "Thêm Container",
-    "addNetwork": "Thêm Mạng",
-    "passwordNotMatchMsg": "Mật khẩu nhập lại không khớp.",
-    "autoGet": "Tự Động Lấy",
-    "add": "Thêm",
-    "Edit": "Chỉnh sửa",
-    "applyToYAML": "Áp dụng cho YAML",
-    "createExternalNetwork": "Tạo",
-    "addInternalNetwork": "Thêm",
-    "Save": "Lưu",
-    "Language": "Ngôn ngữ",
-    "Current User": "Người Dùng Hiện Tại",
-    "Change Password": "Đổi Mật Khẩu",
-    "Current Password": "Mật Khẩu Hiện Tại",
-    "New Password": "Mật Khẩu Mới",
-    "Repeat New Password": "Nhập Lại Mật Khẩu Mới",
-    "Update Password": "Cập Nhật Mật Khẩu",
-    "Advanced": "Nâng cao",
-    "Please use this option carefully!": "Vui lòng sử dụng tuỳ chọn này cẩn thận!",
-    "Enable Auth": "Kích Hoạt Xác Thực Đăng Nhập",
-    "Disable Auth": "Vô Hiệu Xác Thực Đăng Nhập",
-    "I understand, please disable": "Tôi hiểu, vui lòng vô hiệu",
-    "Leave": "Rời",
-    "Frontend Version": "Phiên Bản Giao Diện Người Dùng",
-    "Check Update On GitHub": "Kiểm Tra Cập Nhật Trên Github",
-    "Also check beta release": "Kiểm tra cả bản phát hành beta",
-    "Remember me": "Ghi nhớ tôi",
-    "Login": "Đăng nhập",
-    "Username": "Tên người dùng",
-    "Password": "Mật khẩu",
-    "Settings": "Cài đặt",
-    "Logout": "Đăng xuất",
-    "Lowercase only": "Chỉ viết thường",
-    "Convert to Compose": "Chuyển đổi sang Compose",
-    "Docker Run": "Chạy Docker",
-    "active": "hoạt động",
-    "exited": "đã thoát",
-    "inactive": "không hoạt động",
-    "Security": "Bảo Mật",
-    "Appearance": "Giao Diện",
-    "About": "Về",
-    "Allowed commands:": "Các lệnh được cho phép:",
-    "Internal Networks": "Mạng Nội Bộ",
-    "External Networks": "Mạng Ngoại Vi",
-    "No External Networks": "Không Có Mạng Ngoại Vi",
-    "reverseProxyMsg1": "Đang sử dụng Reverse Proxy?",
-    "reverseProxyMsg2": "Xem cách để cấu hình nó cho WebSocket",
-    "Cannot connect to the socket server.": "Không thể kết nối tới máy chủ socket.",
-    "reconnecting...": "Đang kết nối lại…",
-    "connecting...": "Đang kết nối tới máy chủ socket…",
-    "url": "URL",
-    "extra": "Bổ sung",
-    "newUpdate": "Cập Nhật Mới",
-    "dockgeAgent": "Dockge Agent",
-    "currentEndpoint": "Đang sử dụng",
-    "dockgeURL": "URL của Dockge (v.d. http://127.0.0.1:5001)",
-    "agentOnline": "Trực tuyến",
-    "agentOffline": "Ngoại tuyến",
-    "connecting": "Đang kết nối",
-    "connect": "Kết nối",
-    "addAgent": "Thêm Agent",
-    "agentAddedSuccessfully": "Agent đã được thêm thành công.",
-    "agentRemovedSuccessfully": "Agent đã được xoá thành công.",
-    "removeAgent": "Xoá Agent",
-    "removeAgentMsg": "Bạn có chắc chắn muốn xoá agent này?",
-    "languageName": "Tiếng Việt",
-    "Create your admin account": "Tạo tài khoản admin của bạn",
-    "addFirstStackMsg": "Tạo stack đầu tiên của bạn!",
-    "volume": "Volume | Volume",
-    "updateStack": "Cập nhật",
-    "network": "Mạng | Mạng",
-    "discardStack": "Huỷ",
-    "stackNotManagedByDockgeMsg": "Stack này không được quản lý bởi Dockge.",
-    "dependsOn": "Container Phụ Thuộc | Các Container Phụ Thuộc",
-    "general": "Tổng Quan",
-    "disableauth.message1": "Bạn có chắc chắn muốn <strong>tắt xác thực đăng nhập</strong>?",
-    "container": "Container",
-    "disableauth.message2": "Nó được thiết kế trong hoàn cảnh <strong>mà bạn dự định triển khai xác thực đăng nhập bên thứ ba</strong> trước Dockge như là Cloudflare Access, Authelia hay các phương thức xác minh đăng nhập khác.",
-    "dockerImage": "Image",
-    "Show update if available": "Hiển thị cập nhật nếu có",
-    "restartPolicyUnlessStopped": "Trừ Khi Dừng Lại"
-}

frontend/src/lang/zh-CN.json

@@ -98,19 +98,5 @@
     "Cannot connect to the socket server.": "无法连接到socket服务器。",
     "url": "网址 | 网址",
     "extra": "额外",
-    "downStack": "停止并置于非活动状态",
-    "newUpdate": "新版本",
-    "dockgeURL": "Dockge地址 (例如 http://127.0.0.1:5001)",
-    "agentOnline": "在线",
-    "agentOffline": "离线",
-    "connecting": "连接中",
-    "connect": "连接",
-    "dockgeAgent": "Dockge代理",
-    "currentEndpoint": "当前",
-    "addAgent": "添加代理",
-    "agentRemovedSuccessfully": "代理移除成功。",
-    "removeAgent": "移除代理",
-    "removeAgentMsg": "您确定要移除此代理？",
-    "agentAddedSuccessfully": "代理添加成功。",
-    "LongSyntaxNotSupported": "此处不支持Long syntax，请使用YAML编辑器。"
+    "downStack": "停止并删除"
 }

frontend/src/lang/zh-TW.json

@@ -51,7 +51,7 @@
     "autoGet": "自動取得",
     "add": "新增",
     "Edit": "編輯",
-    "applyToYAML": "套用到 YAML",
+    "applyToYAML": "應用到YAML",
     "createExternalNetwork": "建立",
     "addInternalNetwork": "新增",
     "Save": "儲存",
@@ -71,7 +71,7 @@
     "Frontend Version": "前端版本",
     "Check Update On GitHub": "在 GitHub 上檢查更新",
     "Show update if available": "有更新時提醒我",
-    "Also check beta release": "同時檢查 Beta 版更新",
+    "Also check beta release": "同時檢查 Beta 渠道更新",
     "Remember me": "記住我",
     "Login": "登入",
     "Username": "使用者名稱",
@@ -91,14 +91,12 @@
     "Internal Networks": "內部網路",
     "External Networks": "外部網路",
     "No External Networks": "無外部網路",
-    "downStack": "停止及未啟動化",
-    "reverseProxyMsg1": "在使用反向代理嗎？",
+    "downStack": "停止",
+    "reverseProxyMsg1": "在使用反向代理吗？",
     "reverseProxyMsg2": "點擊這裡了解如何為 WebSocket 配置反向代理",
     "Cannot connect to the socket server.": "無法連接到 Socket 伺服器。",
     "reconnecting...": "重新連線中…",
     "connecting...": "連線至 Socket 伺服器中…",
     "url": "網址 | 網址",
-    "extra": "額外",
-    "newUpdate": "新版本",
-    "currentEndpoint": "目前"
+    "extra": "額外"
 }

frontend/src/layouts/Layout.vue

@@ -16,8 +16,8 @@
                 <span class="fs-4 title">Dockge</span>
             </router-link>
 
-            <a v-if="hasNewVersion" target="_blank" href="https://github.com/louislam/dockge/releases" class="btn btn-warning me-3">
-                <font-awesome-icon icon="arrow-alt-circle-up" /> {{ $t("newUpdate") }}
+            <a v-if="hasNewVersion" target="_blank" href="https://github.com/louislam/dockge/releases" class="btn btn-info me-3">
+                <font-awesome-icon icon="arrow-alt-circle-up" /> {{ $t("New Update") }}
             </a>
 
             <ul class="nav nav-pills">
@@ -98,7 +98,6 @@
 <script>
 import Login from "../components/Login.vue";
 import { compareVersions } from "compare-versions";
-import { ALL_ENDPOINTS } from "../../../common/util-common";
 
 export default {
 
@@ -146,7 +145,7 @@ export default {
 
     methods: {
         scanFolder() {
-            this.$root.emitAgent(ALL_ENDPOINTS, "requestStackList", (res) => {
+            this.$root.getSocket().emit("requestStackList", (res) => {
                 this.$root.toastRes(res);
             });
         },

frontend/src/main.ts

@@ -1,5 +1,5 @@
 // Dayjs init inside this, so it has to be the first import
-import "../../common/util-common";
+import "../../backend/util-common";
 
 import { createApp, defineComponent, h } from "vue";
 import App from "./App.vue";
@@ -10,12 +10,12 @@ import { i18n } from "./i18n";
 // Dependencies
 import "bootstrap";
 import Toast, { POSITION, useToast } from "vue-toastification";
-import "@xterm/xterm/lib/xterm.js";
+import "xterm/lib/xterm.js";
 
 // CSS
 import "@fontsource/jetbrains-mono";
 import "vue-toastification/dist/index.css";
-import "@xterm/xterm/css/xterm.css";
+import "xterm/css/xterm.css";
 import "./styles/main.scss";
 
 // Minxins

frontend/src/mixins/socket.ts

@@ -2,8 +2,7 @@ import { io } from "socket.io-client";
 import { Socket } from "socket.io-client";
 import { defineComponent } from "vue";
 import jwtDecode from "jwt-decode";
-import { Terminal } from "@xterm/xterm";
-import { AgentSocket } from "../../../common/agent-socket";
+import { Terminal } from "xterm";
 
 let socket : Socket;
 
@@ -29,51 +28,16 @@ export default defineComponent({
             loggedIn: false,
             allowLoginDialog: false,
             username: null,
-            composeTemplate: "",
-
             stackList: {},
-
-            // All stack list from all agents
-            allAgentStackList: {} as Record<string, object>,
-
-            // online / offline / connecting
-            agentStatusList: {
-
-            },
-
-            // Agent List
-            agentList: {
-
-            },
+            composeTemplate: "",
         };
     },
     computed: {
-
-        agentCount() {
-            return Object.keys(this.agentList).length;
-        },
-
-        completeStackList() {
-            let list : Record<string, object> = {};
-
-            for (let stackName in this.stackList) {
-                list[stackName + "_"] = this.stackList[stackName];
-            }
-
-            for (let endpoint in this.allAgentStackList) {
-                let instance = this.allAgentStackList[endpoint];
-                for (let stackName in instance.stackList) {
-                    list[stackName + "_" + endpoint] = instance.stackList[stackName];
-                }
-            }
-            return list;
-        },
-
         usernameFirstChar() {
             if (typeof this.username == "string" && this.username.length >= 1) {
                 return this.username.charAt(0).toUpperCase();
             } else {
-                return "🐬";
+                return "🐻";
             }
         },
 
@@ -101,15 +65,6 @@ export default defineComponent({
 
     },
     watch: {
-
-        "socketIO.connected"() {
-            if (this.socketIO.connected) {
-                this.agentStatusList[""] = "online";
-            } else {
-                this.agentStatusList[""] = "offline";
-            }
-        },
-
         remember() {
             localStorage.remember = (this.remember) ? "1" : "0";
         },
@@ -129,15 +84,6 @@ export default defineComponent({
 
     },
     methods: {
-
-        endpointDisplayFunction(endpoint : string) {
-            if (endpoint) {
-                return endpoint;
-            } else {
-                return this.$t("currentEndpoint");
-            }
-        },
-
         /**
          * Initialize connection to socket server
          * @param bypass Should the check for if we
@@ -162,12 +108,8 @@ export default defineComponent({
                 this.socketIO.connecting = true;
             }, 1500);
 
-            socket = io(url);
-
-            // Handling events from agents
-            let agentSocket = new AgentSocket();
-            socket.on("agent", (eventName : unknown, ...args : unknown[]) => {
-                agentSocket.call(eventName, ...args);
+            socket = io(url, {
+                transports: [ "websocket", "polling" ]
             });
 
             socket.on("connect", () => {
@@ -235,7 +177,7 @@ export default defineComponent({
                 this.$router.push("/setup");
             });
 
-            agentSocket.on("terminalWrite", (terminalName, data) => {
+            socket.on("terminalWrite", (terminalName, data) => {
                 const terminal = terminalMap.get(terminalName);
                 if (!terminal) {
                     //console.error("Terminal not found: " + terminalName);
@@ -244,18 +186,9 @@ export default defineComponent({
                 terminal.write(data);
             });
 
-            agentSocket.on("stackList", (res) => {
+            socket.on("stackList", (res) => {
                 if (res.ok) {
-                    if (!res.endpoint) {
                     this.stackList = res.stackList;
-                    } else {
-                        if (!this.allAgentStackList[res.endpoint]) {
-                            this.allAgentStackList[res.endpoint] = {
-                                stackList: {},
-                            };
-                        }
-                        this.allAgentStackList[res.endpoint].stackList = res.stackList;
-                    }
                 }
             });
 
@@ -269,25 +202,6 @@ export default defineComponent({
                     }
                 }
             });
-
-            socket.on("agentStatus", (res) => {
-                this.agentStatusList[res.endpoint] = res.status;
-
-                if (res.msg) {
-                    this.toastError(res.msg);
-                }
-            });
-
-            socket.on("agentList", (res) => {
-                console.log(res);
-                if (res.ok) {
-                    this.agentList = res.agentList;
-                }
-            });
-
-            socket.on("refresh", () => {
-                location.reload();
-            });
         },
 
         /**
@@ -302,10 +216,6 @@ export default defineComponent({
             return socket;
         },
 
-        emitAgent(endpoint : string, eventName : string, ...args : unknown[]) {
-            this.getSocket().emit("agent", endpoint, eventName, ...args);
-        },
-
         /**
          * Get payload of JWT cookie
          * @returns {(object | undefined)} JWT payload
@@ -396,9 +306,9 @@ export default defineComponent({
 
         },
 
-        bindTerminal(endpoint : string, terminalName : string, terminal : Terminal) {
+        bindTerminal(terminalName : string, terminal : Terminal) {
             // Load terminal, get terminal screen
-            this.emitAgent(endpoint, "terminalJoin", terminalName, (res) => {
+            socket.emit("terminalJoin", terminalName, (res) => {
                 if (res.ok) {
                     terminal.write(res.buffer);
                     terminalMap.set(terminalName, terminal);

frontend/src/pages/Compose.vue

@@ -2,12 +2,7 @@
     <transition name="slide-fade" appear>
         <div>
             <h1 v-if="isAdd" class="mb-3">Compose</h1>
-            <h1 v-else class="mb-3">
-                <Uptime :stack="globalStack" :pill="true" /> {{ stack.name }}
-                <span v-if="$root.agentCount > 1" class="agent-name">
-                    ({{ endpointDisplay }})
-                </span>
-            </h1>
+            <h1 v-else class="mb-3"><Uptime :stack="globalStack" :pill="true" /> {{ stack.name }}</h1>
 
             <div v-if="stack.isManagedByDockge" class="mb-3">
                 <div class="btn-group me-2" role="group">
@@ -75,7 +70,6 @@
                     ref="progressTerminal"
                     class="mb-3 terminal"
                     :name="terminalName"
-                    :endpoint="endpoint"
                     :rows="progressTerminalRows"
                     @has-data="showProgressTerminal = true; submitted = true;"
                 ></Terminal>
@@ -93,16 +87,6 @@
                                 <input id="name" v-model="stack.name" type="text" class="form-control" required @blur="stackNameToLowercase">
                                 <div class="form-text">{{ $t("Lowercase only") }}</div>
                             </div>
-
-                            <!-- Endpoint -->
-                            <div class="mt-3">
-                                <label for="name" class="form-label">{{ $t("dockgeAgent") }}</label>
-                                <select v-model="stack.endpoint" class="form-select">
-                                    <option v-for="(agent, endpoint) in $root.agentList" :key="endpoint" :value="endpoint" :disabled="$root.agentStatusList[endpoint] != 'online'">
-                                        ({{ $root.agentStatusList[endpoint] }}) {{ (endpoint) ? endpoint : $t("currentEndpoint") }}
-                                    </option>
-                                </select>
-                            </div>
                         </div>
                     </div>
 
@@ -155,10 +139,9 @@
                             ref="combinedTerminal"
                             class="mb-3 terminal"
                             :name="combinedTerminalName"
-                            :endpoint="endpoint"
                             :rows="combinedTerminalRows"
                             :cols="combinedTerminalCols"
-                            style="height: 315px;"
+                            style="height: 350px;"
                         ></Terminal>
                     </div>
                 </div>
@@ -248,17 +231,16 @@ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import {
     COMBINED_TERMINAL_COLS,
     COMBINED_TERMINAL_ROWS,
-    copyYAMLComments, envsubstYAML,
+    copyYAMLComments,
     getCombinedTerminalName,
     getComposeTerminalName,
     PROGRESS_TERMINAL_ROWS,
     RUNNING
-} from "../../../common/util-common";
+} from "../../../backend/util-common";
 import { BModal } from "bootstrap-vue-next";
 import NetworkInput from "../components/NetworkInput.vue";
-import dotenv from "dotenv";
 
-const template = `
+const template = `version: "3.8"
 services:
   nginx:
     image: nginx:latest
@@ -295,7 +277,6 @@ export default {
         return {
             editorFocus: false,
             jsonConfig: {},
-            envsubstJSONConfig: {},
             yamlError: "",
             processing: true,
             showProgressTerminal: false,
@@ -315,17 +296,13 @@ export default {
     },
     computed: {
 
-        endpointDisplay() {
-            return this.$root.endpointDisplayFunction(this.endpoint);
-        },
-
         urls() {
-            if (!this.envsubstJSONConfig["x-dockge"] || !this.envsubstJSONConfig["x-dockge"].urls || !Array.isArray(this.envsubstJSONConfig["x-dockge"].urls)) {
+            if (!this.jsonConfig["x-dockge"] || !this.jsonConfig["x-dockge"].urls || !Array.isArray(this.jsonConfig["x-dockge"].urls)) {
                 return [];
             }
 
             let urls = [];
-            for (const url of this.envsubstJSONConfig["x-dockge"].urls) {
+            for (const url of this.jsonConfig["x-dockge"].urls) {
                 let display;
                 try {
                     let obj = new URL(url);
@@ -355,7 +332,7 @@ export default {
          * @return {*}
          */
         globalStack() {
-            return this.$root.completeStackList[this.stack.name + "_" + this.endpoint];
+            return this.$root.stackList[this.stack.name];
         },
 
         status() {
@@ -370,31 +347,20 @@ export default {
             if (!this.stack.name) {
                 return "";
             }
-            return getComposeTerminalName(this.endpoint, this.stack.name);
+            return getComposeTerminalName(this.stack.name);
         },
 
         combinedTerminalName() {
             if (!this.stack.name) {
                 return "";
             }
-            return getCombinedTerminalName(this.endpoint, this.stack.name);
+            return getCombinedTerminalName(this.stack.name);
         },
 
         networks() {
             return this.jsonConfig.networks;
-        },
-
-        endpoint() {
-            return this.stack.endpoint || this.$route.params.endpoint || "";
-        },
-
-        url() {
-            if (this.stack.endpoint) {
-                return `/compose/${this.stack.name}/${this.stack.endpoint}`;
-            } else {
-                return `/compose/${this.stack.name}`;
         }
-        },
+
     },
     watch: {
         "stack.composeYAML": {
@@ -406,17 +372,6 @@ export default {
             },
             deep: true,
         },
-
-        "stack.composeENV": {
-            handler() {
-                if (this.editorFocus) {
-                    console.debug("env code changed");
-                    this.yamlCodeChange();
-                }
-            },
-            deep: true,
-        },
-
         jsonConfig: {
             handler() {
                 if (!this.editorFocus) {
@@ -437,7 +392,9 @@ export default {
         },
 
         $route(to, from) {
-
+            // Leave Combined Terminal
+            console.debug("leaveCombinedTerminal", from.params.stackName);
+            this.$root.getSocket().emit("leaveCombinedTerminal", this.stack.name, () => {});
         }
     },
     mounted() {
@@ -467,7 +424,6 @@ export default {
                 composeYAML,
                 composeENV,
                 isManagedByDockge: true,
-                endpoint: "",
             };
 
             this.yamlCodeChange();
@@ -480,9 +436,11 @@ export default {
         this.requestServiceStatus();
     },
     unmounted() {
-
+        this.stopServiceStatusTimeout = true;
+        clearTimeout(serviceStatusTimeout);
     },
     methods: {
+
         startServiceStatusTimeout() {
             clearTimeout(serviceStatusTimeout);
             serviceStatusTimeout = setTimeout(async () => {
@@ -491,7 +449,7 @@ export default {
         },
 
         requestServiceStatus() {
-            this.$root.emitAgent(this.endpoint, "serviceStatusList", this.stack.name, (res) => {
+            this.$root.getSocket().emit("serviceStatusList", this.stack.name, (res) => {
                 if (res.ok) {
                     this.serviceStatusList = res.serviceStatusList;
                 }
@@ -504,34 +462,22 @@ export default {
         exitConfirm(next) {
             if (this.isEditMode) {
                 if (confirm("You are currently editing a stack. Are you sure you want to leave?")) {
-                    this.exitAction();
                     next();
                 } else {
                     next(false);
                 }
             } else {
-                this.exitAction();
                 next();
             }
         },
 
-        exitAction() {
-            console.log("exitAction");
-            this.stopServiceStatusTimeout = true;
-            clearTimeout(serviceStatusTimeout);
-
-            // Leave Combined Terminal
-            console.debug("leaveCombinedTerminal", this.endpoint, this.stack.name);
-            this.$root.emitAgent(this.endpoint, "leaveCombinedTerminal", this.stack.name, () => {});
-        },
-
         bindTerminal() {
-            this.$refs.progressTerminal?.bind(this.endpoint, this.terminalName);
+            this.$refs.progressTerminal?.bind(this.terminalName);
         },
 
         loadStack() {
             this.processing = true;
-            this.$root.emitAgent(this.endpoint, "getStack", this.stack.name, (res) => {
+            this.$root.getSocket().emit("getStack", this.stack.name, (res) => {
                 if (res.ok) {
                     this.stack = res.stack;
                     this.yamlCodeChange();
@@ -573,15 +519,15 @@ export default {
                 }
             }
 
-            this.bindTerminal();
+            this.bindTerminal(this.terminalName);
 
-            this.$root.emitAgent(this.stack.endpoint, "deployStack", this.stack.name, this.stack.composeYAML, this.stack.composeENV, this.isAdd, (res) => {
+            this.$root.getSocket().emit("deployStack", this.stack.name, this.stack.composeYAML, this.stack.composeENV, this.isAdd, (res) => {
                 this.processing = false;
                 this.$root.toastRes(res);
 
                 if (res.ok) {
                     this.isEditMode = false;
-                    this.$router.push(this.url);
+                    this.$router.push("/compose/" + this.stack.name);
                 }
             });
         },
@@ -589,13 +535,13 @@ export default {
         saveStack() {
             this.processing = true;
 
-            this.$root.emitAgent(this.stack.endpoint, "saveStack", this.stack.name, this.stack.composeYAML, this.stack.composeENV, this.isAdd, (res) => {
+            this.$root.getSocket().emit("saveStack", this.stack.name, this.stack.composeYAML, this.stack.composeENV, this.isAdd, (res) => {
                 this.processing = false;
                 this.$root.toastRes(res);
 
                 if (res.ok) {
                     this.isEditMode = false;
-                    this.$router.push(this.url);
+                    this.$router.push("/compose/" + this.stack.name);
                 }
             });
         },
@@ -603,7 +549,7 @@ export default {
         startStack() {
             this.processing = true;
 
-            this.$root.emitAgent(this.endpoint, "startStack", this.stack.name, (res) => {
+            this.$root.getSocket().emit("startStack", this.stack.name, (res) => {
                 this.processing = false;
                 this.$root.toastRes(res);
             });
@@ -612,7 +558,7 @@ export default {
         stopStack() {
             this.processing = true;
 
-            this.$root.emitAgent(this.endpoint, "stopStack", this.stack.name, (res) => {
+            this.$root.getSocket().emit("stopStack", this.stack.name, (res) => {
                 this.processing = false;
                 this.$root.toastRes(res);
             });
@@ -621,7 +567,7 @@ export default {
         downStack() {
             this.processing = true;
 
-            this.$root.emitAgent(this.endpoint, "downStack", this.stack.name, (res) => {
+            this.$root.getSocket().emit("downStack", this.stack.name, (res) => {
                 this.processing = false;
                 this.$root.toastRes(res);
             });
@@ -630,7 +576,7 @@ export default {
         restartStack() {
             this.processing = true;
 
-            this.$root.emitAgent(this.endpoint, "restartStack", this.stack.name, (res) => {
+            this.$root.getSocket().emit("restartStack", this.stack.name, (res) => {
                 this.processing = false;
                 this.$root.toastRes(res);
             });
@@ -639,14 +585,14 @@ export default {
         updateStack() {
             this.processing = true;
 
-            this.$root.emitAgent(this.endpoint, "updateStack", this.stack.name, (res) => {
+            this.$root.getSocket().emit("updateStack", this.stack.name, (res) => {
                 this.processing = false;
                 this.$root.toastRes(res);
             });
         },
 
         deleteDialog() {
-            this.$root.emitAgent(this.endpoint, "deleteStack", this.stack.name, (res) => {
+            this.$root.getSocket().emit("deleteStack", this.stack.name, (res) => {
                 this.$root.toastRes(res);
                 if (res.ok) {
                     this.$router.push("/");
@@ -676,7 +622,7 @@ export default {
                         greedy: true
                     },
                     "keyword": {
-                        pattern: /^\w*(?=[:=])/m,
+                        pattern: /^[^ :=]*(?=[:=])/m,
                         greedy: true
                     },
                     "value": {
@@ -699,8 +645,9 @@ export default {
             return highlight(code, languages.docker_env);
         },
 
-        yamlToJSON(yaml) {
-            let doc = parseDocument(yaml);
+        yamlCodeChange() {
+            try {
+                let doc = parseDocument(this.stack.composeYAML);
                 if (doc.errors.length > 0) {
                     throw doc.errors[0];
                 }
@@ -717,23 +664,9 @@ export default {
                     throw new Error("Services must be an object");
                 }
 
-            return {
-                config,
-                doc,
-            };
-        },
-
-        yamlCodeChange() {
-            try {
-                let { config, doc } = this.yamlToJSON(this.stack.composeYAML);
-
                 this.yamlDoc = doc;
                 this.jsonConfig = config;
 
-                let env = dotenv.parse(this.stack.composeENV);
-                let envYAML = envsubstYAML(this.stack.composeYAML, env);
-                this.envsubstJSONConfig = this.yamlToJSON(envYAML).config;
-
                 clearTimeout(yamlErrorTimeout);
                 this.yamlError = "";
             } catch (e) {
@@ -791,8 +724,6 @@ export default {
 </script>
 
 <style scoped lang="scss">
-@import "../styles/vars.scss";
-
 .terminal {
     height: 200px;
 }
@@ -804,9 +735,4 @@ export default {
         background-color: #2c2f38 !important;
     }
 }
-
-.agent-name {
-    font-size: 13px;
-    color: $dark-font-color3;
-}
 </style>

frontend/src/pages/Console.vue

@@ -15,14 +15,14 @@
                 </p>
             </div>
 
-            <Terminal class="terminal" :rows="20" mode="mainTerminal" name="console" :endpoint="endpoint"></Terminal>
+            <Terminal class="terminal" :rows="20" mode="mainTerminal" name="console"></Terminal>
         </div>
     </transition>
 </template>
 
 <script>
 
-import { allowedCommandList } from "../../../common/util-common";
+import { allowedCommandList } from "../../../backend/util-common";
 
 export default {
     components: {
@@ -32,11 +32,6 @@ export default {
             allowedCommandList,
         };
     },
-    computed: {
-        endpoint() {
-            return this.$route.params.endpoint || "";
-        },
-    },
     mounted() {
 
     },

frontend/src/pages/ContainerTerminal.vue

@@ -7,13 +7,13 @@
                 <router-link :to="sh" class="btn btn-normal me-2">Switch to sh</router-link>
             </div>
 
-            <Terminal class="terminal" :rows="20" mode="interactive" :name="terminalName" :stack-name="stackName" :service-name="serviceName" :shell="shell" :endpoint="endpoint"></Terminal>
+            <Terminal class="terminal" :rows="20" mode="interactive" :name="terminalName" :stack-name="stackName" :service-name="serviceName" :shell="shell"></Terminal>
         </div>
     </transition>
 </template>
 
 <script>
-import { getContainerExecTerminalName } from "../../../common/util-common";
+import { getContainerExecTerminalName } from "../../../backend/util-common";
 
 export default {
     components: {
@@ -27,9 +27,6 @@ export default {
         stackName() {
             return this.$route.params.stackName;
         },
-        endpoint() {
-            return this.$route.params.endpoint || "";
-        },
         shell() {
             return this.$route.params.type;
         },
@@ -37,12 +34,10 @@ export default {
             return this.$route.params.serviceName;
         },
         terminalName() {
-            return getContainerExecTerminalName(this.endpoint, this.stackName, this.serviceName, 0);
+            return getContainerExecTerminalName(this.stackName, this.serviceName, 0);
         },
         sh() {
-            let endpoint = this.$route.params.endpoint;
-
-            let data = {
+            return {
                 name: "containerTerminal",
                 params: {
                     stackName: this.stackName,
@@ -50,13 +45,6 @@ export default {
                     type: "sh",
                 },
             };
-
-            if (endpoint) {
-                data.name = "containerTerminalEndpoint";
-                data.params.endpoint = endpoint;
-            }
-
-            return data;
         },
     },
     mounted() {

frontend/src/pages/DashboardHome.vue

@@ -5,10 +5,6 @@
                 {{ $t("home") }}
             </h1>
 
-            <div class="row first-row">
-                <!-- Left -->
-                <div class="col-md-7">
-                    <!-- Stats -->
             <div class="shadow-box big-padding text-center mb-4">
                 <div class="row">
                     <div class="col">
@@ -26,76 +22,19 @@
                 </div>
             </div>
 
-                    <!-- Docker Run -->
             <h2 class="mb-3">{{ $t("Docker Run") }}</h2>
             <div class="mb-3">
                 <textarea id="name" v-model="dockerRunCommand" type="text" class="form-control docker-run" required placeholder="docker run ..."></textarea>
             </div>
 
-                    <button class="btn-normal btn mb-4" @click="convertDockerRun">{{ $t("Convert to Compose") }}</button>
-                </div>
-                <!-- Right -->
-                <div class="col-md-5">
-                    <!-- Agent List -->
-                    <div class="shadow-box big-padding">
-                        <h4 class="mb-3">{{ $tc("dockgeAgent", 2) }} <span class="badge bg-warning" style="font-size: 12px;">beta</span></h4>
-
-                        <div v-for="(agent, endpoint) in $root.agentList" :key="endpoint" class="mb-3 agent">
-                            <!-- Agent Status -->
-                            <template v-if="$root.agentStatusList[endpoint]">
-                                <span v-if="$root.agentStatusList[endpoint] === 'online'" class="badge bg-primary me-2">{{ $t("agentOnline") }}</span>
-                                <span v-else-if="$root.agentStatusList[endpoint] === 'offline'" class="badge bg-danger me-2">{{ $t("agentOffline") }}</span>
-                                <span v-else class="badge bg-secondary me-2">{{ $t($root.agentStatusList[endpoint]) }}</span>
-                            </template>
-
-                            <!-- Agent Display Name -->
-                            <span v-if="endpoint === ''">{{ $t("currentEndpoint") }}</span>
-                            <a v-else :href="agent.url" target="_blank">{{ endpoint }}</a>
-
-                            <!-- Remove Button -->
-                            <font-awesome-icon v-if="endpoint !== ''" class="ms-2 remove-agent" icon="trash" @click="showRemoveAgentDialog[agent.url] = !showRemoveAgentDialog[agent.url]" />
-
-                            <!-- Remoe Agent Dialog -->
-                            <BModal v-model="showRemoveAgentDialog[agent.url]" :okTitle="$t('removeAgent')" okVariant="danger" @ok="removeAgent(agent.url)">
-                                <p>{{ agent.url }}</p>
-                                {{ $t("removeAgentMsg") }}
-                            </BModal>
-                        </div>
-
-                        <button v-if="!showAgentForm" class="btn btn-normal" @click="showAgentForm = !showAgentForm">{{ $t("addAgent") }}</button>
-
-                        <!-- Add Agent Form -->
-                        <form v-if="showAgentForm" @submit.prevent="addAgent">
-                            <div class="mb-3">
-                                <label for="url" class="form-label">{{ $t("dockgeURL") }}</label>
-                                <input id="url" v-model="agent.url" type="url" class="form-control" required placeholder="http://">
-                            </div>
-
-                            <div class="mb-3">
-                                <label for="username" class="form-label">{{ $t("Username") }}</label>
-                                <input id="username" v-model="agent.username" type="text" class="form-control" required>
-                            </div>
-
-                            <div class="mb-3">
-                                <label for="password" class="form-label">{{ $t("Password") }}</label>
-                                <input id="password" v-model="agent.password" type="password" class="form-control" required autocomplete="new-password">
-                            </div>
-
-                            <button type="submit" class="btn btn-primary" :disabled="connectingAgent">
-                                <template v-if="connectingAgent">{{ $t("connecting") }}</template>
-                                <template v-else>{{ $t("connect") }}</template>
-                            </button>
-                        </form>
-                    </div>
-                </div>
-            </div>
+            <button class="btn-normal btn" @click="convertDockerRun">{{ $t("Convert to Compose") }}</button>
         </div>
     </transition>
     <router-view ref="child" />
 </template>
 
 <script>
-import { statusNameShort } from "../../../common/util-common";
+import { statusNameShort } from "../../../backend/util-common";
 
 export default {
     components: {
@@ -119,14 +58,6 @@ export default {
             importantHeartBeatListLength: 0,
             displayedRecords: [],
             dockerRunCommand: "",
-            showAgentForm: false,
-            showRemoveAgentDialog: {},
-            connectingAgent: false,
-            agent: {
-                url: "http://",
-                username: "",
-                password: "",
-            }
         };
     },
 
@@ -167,43 +98,11 @@ export default {
 
     methods: {
 
-        addAgent() {
-            this.connectingAgent = true;
-            this.$root.getSocket().emit("addAgent", this.agent, (res) => {
-                this.$root.toastRes(res);
-
-                if (res.ok) {
-                    this.showAgentForm = false;
-                    this.agent = {
-                        url: "http://",
-                        username: "",
-                        password: "",
-                    };
-                }
-
-                this.connectingAgent = false;
-            });
-        },
-
-        removeAgent(url) {
-            this.$root.getSocket().emit("removeAgent", url, (res) => {
-                if (res.ok) {
-                    this.$root.toastRes(res);
-
-                    let urlObj = new URL(url);
-                    let endpoint = urlObj.host;
-
-                    // Remove the stack list and status list of the removed agent
-                    delete this.$root.allAgentStackList[endpoint];
-                }
-            });
-        },
-
         getStatusNum(statusName) {
             let num = 0;
 
-            for (let stackName in this.$root.completeStackList) {
-                const stack = this.$root.completeStackList[stackName];
+            for (let stackName in this.$root.stackList) {
+                const stack = this.$root.stackList[stackName];
                 if (statusNameShort(stack.status) === statusName) {
                     num += 1;
                 }
@@ -331,20 +230,4 @@ table {
     font-family: 'JetBrains Mono', monospace;
     font-size: 15px;
 }
-
-.first-row .shadow-box {
-
-}
-
-.remove-agent {
-    cursor: pointer;
-    color: rgba(255, 255, 255, 0.3);
-}
-
-.agent {
-    a {
-        text-decoration: none;
-    }
-}
-
 </style>

frontend/src/router.ts

@@ -34,34 +34,23 @@ const routes = [
                                 path: "/compose",
                                 component: Compose,
                             },
-                            {
-                                path: "/compose/:stackName/:endpoint",
-                                component: Compose,
-                            },
                             {
                                 path: "/compose/:stackName",
+                                name: "compose",
                                 component: Compose,
+                                props: true,
                             },
                             {
                                 path: "/terminal/:stackName/:serviceName/:type",
                                 component: ContainerTerminal,
                                 name: "containerTerminal",
                             },
-                            {
-                                path: "/terminal/:stackName/:serviceName/:type/:endpoint",
-                                component: ContainerTerminal,
-                                name: "containerTerminalEndpoint",
-                            },
                         ]
                     },
                     {
                         path: "/console",
                         component: Console,
                     },
-                    {
-                        path: "/console/:endpoint",
-                        component: Console,
-                    },
                     {
                         path: "/settings",
                         component: Settings,

frontend/src/styles/main.scss

@@ -36,7 +36,7 @@ textarea.form-control {
 }
 
 ::placeholder {
-    color: $dark-font-color3;
+    color: $dark-font-color3 !important;
 }
 
 .incident a,
@@ -422,8 +422,9 @@ optgroup {
 // Floating Label
 .form-floating > .form-control:focus ~ label::after, .form-floating > .form-control:not(:placeholder-shown) ~ label::after, .form-floating > .form-control-plaintext ~ label::after, .form-floating > .form-select ~ label::after {
     background-color: transparent;
-}
 
+
+}
 .form-floating > label {
     .dark & {
         color: $dark-font-color3 !important;
@@ -656,6 +657,13 @@ $shadow-box-padding: 20px;
     }
 }
 
+.main-terminal {
+    .xterm-viewport {
+        border-radius: 10px;
+        background-color: $dark-bg !important;
+    }
+}
+
 code {
     padding: .2em .4em;
     margin: 0;

package.json

@@ -1,6 +1,6 @@
 {
     "name": "dockge",
-    "version": "1.4.2",
+    "version": "1.2.0",
     "type": "module",
     "engines": {
         "node": ">= 18.0.0 && <= 18.17.1"
@@ -10,15 +10,12 @@
         "lint": "eslint \"**/*.{ts,vue}\"",
         "check-ts": "tsc --noEmit",
         "start": "tsx ./backend/index.ts",
-        "dev": "concurrently -k -r \"wait-on tcp:5000 && pnpm run dev:backend \" \"pnpm run dev:frontend\"",
         "dev:backend": "cross-env NODE_ENV=development tsx watch --inspect ./backend/index.ts",
         "dev:frontend": "cross-env NODE_ENV=development vite --host --config ./frontend/vite.config.ts",
         "release-final": "tsx ./extra/test-docker.ts && tsx extra/update-version.ts && pnpm run build:frontend && npm run build:docker",
-        "release-beta": "tsx ./extra/test-docker.ts && tsx extra/update-version.ts && pnpm run build:frontend && npm run build:docker-beta",
         "build:frontend": "vite build --config ./frontend/vite.config.ts",
         "build:docker-base": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/dockge:base -f ./docker/Base.Dockerfile . --push",
-        "build:docker": "node ./extra/env2arg.js docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/dockge:latest -t louislam/dockge:1 -t louislam/dockge:$VERSION -t louislam/dockge:beta -t louislam/dockge:nightly --target release -f ./docker/Dockerfile . --push",
-        "build:docker-beta": "node ./extra/env2arg.js docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/dockge:beta -t louislam/dockge:$VERSION --target release -f ./docker/Dockerfile . --push",
+        "build:docker": "node ./extra/env2arg.js docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/dockge:latest -t louislam/dockge:1 -t louislam/dockge:$VERSION --target release -f ./docker/Dockerfile . --push",
         "build:docker-nightly": "pnpm run build:frontend && docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/dockge:nightly --target nightly -f ./docker/Dockerfile . --push",
         "build:healthcheck": "docker buildx build -f docker/BuildHealthCheck.Dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/dockge:build-healthcheck . --push",
         "start-docker": "docker run --rm -p 5001:5001 --name dockge louislam/dockge:latest",
@@ -27,57 +24,49 @@
         "reset-password": "tsx ./extra/reset-password.ts"
     },
     "dependencies": {
-        "@homebridge/node-pty-prebuilt-multiarch": "0.11.14",
-        "@inventage/envsubst": "^0.16.0",
+        "@homebridge/node-pty-prebuilt-multiarch": "~0.11.11",
         "@louislam/sqlite3": "~15.1.6",
         "bcryptjs": "~2.4.3",
-        "check-password-strength": "~2.0.10",
+        "check-password-strength": "~2.0.7",
         "command-exists": "~1.2.9",
-        "compare-versions": "~6.1.1",
+        "compare-versions": "~6.1.0",
         "composerize": "~1.4.1",
-        "croner": "~8.1.2",
-        "dayjs": "~1.11.13",
-        "dotenv": "~16.3.2",
-        "express": "~4.21.1",
-        "express-static-gzip": "~2.1.8",
+        "croner": "~7.0.5",
+        "dayjs": "~1.11.10",
+        "express": "~4.18.2",
+        "express-static-gzip": "~2.1.7",
         "http-graceful-shutdown": "~3.1.13",
         "jsonwebtoken": "~9.0.2",
         "jwt-decode": "~3.1.2",
         "knex": "~2.5.1",
         "limiter-es6-compat": "~2.1.2",
-        "mysql2": "~3.11.3",
-        "promisify-child-process": "~4.1.2",
+        "mysql2": "~3.6.3",
         "redbean-node": "~0.3.3",
-        "semver": "^7.6.3",
-        "socket.io": "~4.8.0",
-        "socket.io-client": "~4.8.0",
-        "timezones-list": "~3.0.3",
+        "socket.io": "~4.7.2",
+        "socket.io-client": "~4.7.2",
+        "timezones-list": "~3.0.2",
         "ts-command-line-args": "~2.5.1",
-        "tsx": "~4.6.2",
+        "tsx": "~3.14.0",
         "type-fest": "~4.3.3",
         "yaml": "~2.3.4"
     },
     "devDependencies": {
         "@actions/github": "^6.0.0",
-        "@fontsource/jetbrains-mono": "^5.1.1",
+        "@fontsource/jetbrains-mono": "^5.0.17",
         "@fortawesome/fontawesome-svg-core": "6.4.2",
         "@fortawesome/free-regular-svg-icons": "6.4.2",
         "@fortawesome/free-solid-svg-icons": "6.4.2",
         "@fortawesome/vue-fontawesome": "3.0.3",
         "@types/bcryptjs": "^2.4.6",
-        "@types/bootstrap": "~5.2.10",
+        "@types/bootstrap": "~5.2.9",
         "@types/command-exists": "~1.2.3",
         "@types/express": "~4.17.21",
-        "@types/jsonwebtoken": "~9.0.7",
-        "@types/semver": "^7.5.8",
+        "@types/jsonwebtoken": "~9.0.5",
         "@typescript-eslint/eslint-plugin": "~6.8.0",
         "@typescript-eslint/parser": "~6.8.0",
-        "@vitejs/plugin-vue": "~4.5.2",
-        "@xterm/addon-fit": "beta",
-        "@xterm/xterm": "beta",
+        "@vitejs/plugin-vue": "~4.5.0",
         "bootstrap": "5.3.2",
         "bootstrap-vue-next": "~0.14.10",
-        "concurrently": "^8.2.2",
         "cross-env": "~7.0.3",
         "eslint": "~8.50.0",
         "eslint-plugin-jsdoc": "~46.8.2",
@@ -86,16 +75,16 @@
         "sass": "~1.68.0",
         "typescript": "~5.2.2",
         "unplugin-vue-components": "~0.25.2",
-        "vite": "~5.4.8",
+        "vite": "~5.0.0",
         "vite-plugin-compression": "~0.5.1",
-        "vue": "~3.5.12",
+        "vue": "~3.3.8",
         "vue-eslint-parser": "~9.3.2",
         "vue-i18n": "~9.5.0",
         "vue-prism-editor": "2.0.0-alpha.2",
-        "vue-qrcode": "~2.2.2",
+        "vue-qrcode": "~2.2.0",
         "vue-router": "~4.2.5",
         "vue-toastification": "2.0.0-rc.5",
-        "wait-on": "^7.2.0",
+        "xterm": "5.4.0-beta.37",
         "xterm-addon-web-links": "~0.9.0"
     }
 }

tsconfig.json

@@ -7,7 +7,6 @@
         "skipLibCheck": true
     },
     "include": [
-        "backend/**/*",
-        "common/**/*"
+        "backend/**/*"
     ]
 }