WIP

.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

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,37 +14,32 @@ 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 />
 
-<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)
 
 ## 🔧 How to Install
 
 Requirements:
-- [Docker](https://docs.docker.com/engine/install/) 20+ / Podman
+- [Docker CE](https://docs.docker.com/engine/install/) 20+ is recommended / Podman
+- (Docker only) [Docker Compose Plugin](https://docs.docker.com/compose/install/linux/)
 - (Podman only) podman-docker (Debian: `apt install podman-docker`)
 - OS:
-  - Major Linux distros that can run Docker/Podman such as:
-     - ✅ Ubuntu
-     - ✅ Debian (Bullseye or newer)
-     - ✅ Raspbian (Bullseye or newer)
-     - ✅ CentOS
-     - ✅ Fedora
-     - ✅ ArchLinux
-  - ❌ Debian/Raspbian Buster or lower is not supported
-  - ❌ Windows (Will be supported later)
+  - As long as you can run Docker CE / Podman, it should be fine, but:
+  - Debian/Raspbian Buster or lower is not supported, please upgrade to Bullseye or higher
 - Arch: armv7, arm64, amd64 (a.k.a x86_64)
 
 ### Basic
@@ -84,6 +79,9 @@ curl "https://dockge.kuma.pet/compose.yaml?port=5001&stacksPath=/opt/stacks" --o
 Interactive compose.yaml generator is available on: 
 https://dockge.kuma.pet
 
+You can also view compose.yaml here: 
+https://github.com/louislam/dockge/blob/master/compose.yaml
+
 ## How to Update
 
 ```bash
@@ -111,7 +109,7 @@ docker compose pull && docker compose up -d
 If you love this project, please consider giving it a ⭐.
 
 
-## 🗣️ Community and Contribution
+## 🗣️
 
 ### Bug Report
 https://github.com/louislam/dockge/issues
@@ -119,18 +117,15 @@ https://github.com/louislam/dockge/issues
 ### Ask for Help / Discussions
 https://github.com/louislam/dockge/discussions
 
-### Translation
+## Translation
+
 If you want to translate Dockge into your language, please read [Translation Guide](https://github.com/louislam/dockge/blob/master/frontend/src/lang/README.md)
 
-### Create a Pull Request
-
-Be sure to read the [guide](https://github.com/louislam/dockge/blob/master/CONTRIBUTING.md), as we don't accept all types of pull requests and don't want to waste your time.
-
 ## FAQ
 
 #### "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,18 +142,17 @@ 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?
+## More Ideas?
 
-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.
+- Stats
+- File manager
+- App store for yaml templates
+- Get app icons
+- Switch Docker context
+- Support Dockerfile and build
+- Support Docker swarm
 
-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.
-
-#### Can I install both Dockge and Portainer?
-
-Yes, you can.
-
-## Others
+# Others
 
 Dockge is built on top of [Compose V2](https://docs.docker.com/compose/migrate/). `compose.yaml`  also known as `docker-compose.yml`.

backend/agent-manager.ts

@@ -1,291 +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;
-            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,55 +3,69 @@ 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() {
-        const check = async () => {
-            if (await Settings.get("checkUpdate") === false) {
-                return;
+export function startInterval() {
+    const check = async () => {
+        if (await Settings.get("checkUpdate") === false) {
+            return;
+        }
+
+        log.debug("update-checker", "Retrieving latest versions");
+
+        try {
+            const res = await fetch(CHECK_URL);
+            const data = await res.json();
+
+            // For debug
+            if (process.env.TEST_CHECK_VERSION === "1") {
+                data.slow = "1000.0.0";
             }
 
-            log.debug("update-checker", "Retrieving latest versions");
+            const checkBeta = await Settings.get("checkBeta");
 
-            try {
-                const res = await fetch(CHECK_URL);
-                const data = await res.json();
-
-                // For debug
-                if (process.env.TEST_CHECK_VERSION === "1") {
-                    data.slow = "1000.0.0";
+            if (checkBeta && data.beta) {
+                if (compareVersions.compare(data.beta, data.slow, ">")) {
+                    obj.latestVersion = data.beta;
+                    return;
                 }
-
-                const checkBeta = await Settings.get("checkBeta");
-
-                if (checkBeta && data.beta) {
-                    if (compareVersions.compare(data.beta, data.slow, ">")) {
-                        this.latestVersion = data.beta;
-                        return;
-                    }
-                }
-
-                if (data.slow) {
-                    this.latestVersion = data.slow;
-                }
-
-            } catch (_) {
-                log.info("update-checker", "Failed to check for new versions");
             }
 
-        };
+            if (data.slow) {
+                obj.latestVersion = data.slow;
+            }
 
-        await check();
-        this.interval = setInterval(check, UPDATE_CHECKER_INTERVAL_MS);
-    }
+        } catch (_) {
+            log.info("update-checker", "Failed to check for new versions");
+        }
+
+    };
+
+    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(),
     ];
@@ -165,6 +150,9 @@ export class DockgeServer {
             }
         }
 
+        // Create all the necessary directories
+        this.initDataDir();
+
         // Create express
         this.app = express();
 
@@ -207,88 +195,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 +219,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,20 +249,12 @@ export class DockgeServer {
         } catch (e) {
             log.error("server", e);
         }
-
-        socket.instanceManager.sendAgentList();
-
-        // Also connect to other dockge instances
-        socket.instanceManager.connectAll();
     }
 
     /**
      *
      */
     async serve() {
-        // Create all the necessary directories
-        this.initDataDir();
-
         // Connect to database
         try {
             await Database.init(this);
@@ -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);
+                // 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());
+                    }
                 }
 
-                let map : Map<string, object> = new Map();
-
-                for (let [ stackName, stack ] of stackList) {
-                    map.set(stackName, stack.toSimpleJSON(dockgeSocket.endpoint));
-                }
-
-                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, isAdd : unknown, callback) => {
             try {
                 checkLogin(socket);
-                const stack = await this.saveStack(server, name, composeYAML, composeENV, isAdd);
+                const stack = this.saveStack(socket, server, name, composeYAML, 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, isAdd : unknown, callback) => {
             try {
                 checkLogin(socket);
-                await this.saveStack(server, name, composeYAML, composeENV, isAdd);
-                callbackResult({
+                this.saveStack(socket, server, name, composeYAML, 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, isAdd : unknown) : Stack {
         // Check types
         if (typeof(name) !== "string") {
             throw new ValidationError("Name must be a string");
@@ -252,15 +272,12 @@ export class DockerSocketHandler extends AgentSocketHandler {
         if (typeof(composeYAML) !== "string") {
             throw new ValidationError("Compose YAML must be a string");
         }
-        if (typeof(composeENV) !== "string") {
-            throw new ValidationError("Compose ENV must be a string");
-        }
         if (typeof(isAdd) !== "boolean") {
             throw new ValidationError("isAdd must be a boolean");
         }
 
-        const stack = new Stack(server, name, composeYAML, composeENV, false);
-        await stack.save(isAdd);
+        const stack = new Stack(server, name, composeYAML);
+        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,17 +14,15 @@ 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 {
 
     name: string;
     protected _status: number = UNKNOWN;
     protected _composeYAML?: string;
-    protected _composeENV?: string;
     protected _configFilePath?: string;
     protected _composeFileName: string = "compose.yaml";
     protected server: DockgeServer;
@@ -34,15 +31,15 @@ export class Stack {
 
     protected static managedStackList: Map<string, Stack> = new Map();
 
-    constructor(server : DockgeServer, name : string, composeYAML? : string, composeENV? : string, skipFSOperations = false) {
+    constructor(server : DockgeServer, name : string, composeYAML? : string, skipFSOperations = false) {
         this.name = name;
         this.server = server;
         this._composeYAML = composeYAML;
-        this._composeENV = composeENV;
 
         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 +48,32 @@ 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 +92,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 {
@@ -141,17 +105,6 @@ export class Stack {
         return this._composeYAML;
     }
 
-    get composeENV() : string {
-        if (this._composeENV === undefined) {
-            try {
-                this._composeENV = fs.readFileSync(path.join(this.path, ".env"), "utf-8");
-            } catch (e) {
-                this._composeENV = "";
-            }
-        }
-        return this._composeENV;
-    }
-
     get path() : string {
         return path.join(this.server.stacksDir, this.name);
     }
@@ -175,39 +128,31 @@ 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");
-
-        // 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, this._composeFileName), this.composeYAML);
     }
 
-    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 +160,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 +176,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 +187,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 +198,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 +222,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 +249,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 +281,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) {
@@ -399,7 +306,7 @@ export class Stack {
         if (!skipFSOperations) {
             stack = new Stack(server, stackName);
         } else {
-            stack = new Stack(server, stackName, undefined, undefined, true);
+            stack = new Stack(server, stackName, undefined, true);
         }
 
         stack._status = UNKNOWN;
@@ -408,7 +315,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 +324,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 +333,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 +342,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 +351,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 +372,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 +382,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 +390,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,35 +406,24 @@ export class Stack {
     async getServiceStatusList() {
         let statusList = new Map<string, number>();
 
-        try {
-            let res = await childProcessAsync.spawn("docker", [ "compose", "ps", "--format", "json" ], {
-                cwd: this.path,
-                encoding: "utf-8",
-            });
+        let res = childProcess.spawnSync("docker", [ "compose", "ps", "--format", "json" ], {
+            cwd: this.path,
+        });
 
-            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 {
-                    let obj = JSON.parse(line);
-                    if (obj.Health === "") {
-                        statusList.set(obj.Service, obj.State);
-                    } else {
-                        statusList.set(obj.Service, obj.Health);
-                    }
-                } catch (e) {
+        for (let line of lines) {
+            try {
+                let obj = JSON.parse(line);
+                if (obj.Health === "") {
+                    statusList.set(obj.Service, obj.State);
+                } else {
+                    statusList.set(obj.Service, obj.Health);
                 }
+            } catch (e) {
             }
-
-            return statusList;
-        } catch (e) {
-            log.error("getServiceStatusList", e);
-            return statusList;
         }
 
+        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-" + 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

@@ -13,10 +13,10 @@ services:
       # If you want to use private registries, you need to share the auth file with Dockge:
       # - /root/.docker/:/root/.docker
 
-      # Stacks Directory
-      # ⚠️ READ IT CAREFULLY. If you did it wrong, your data could end up writing into a WRONG PATH.
-      # ⚠️ 1. FULL path only. No relative path (MUST)
-      # ⚠️ 2. Left Stacks Path === Right Stacks Path (MUST)
+      # Your stacks directory in the host (The paths inside container must be the same as the host)
+      # ⚠️⚠️ If you did it wrong, your data could end up be written into a wrong path.
+      # ✔️✔️✔️✔️ CORRECT: - /my-stacks:/my-stacks (Both paths match)
+      # ❌❌❌❌ WRONG: - /docker:/my-stacks (Both paths do not match)
       - /opt/stacks:/opt/stacks
     environment:
       # Tell Dockge where is your stacks directory

docker/BuildHealthCheck.Dockerfile

@@ -1,10 +0,0 @@
-############################################
-# Build in Golang
-############################################
-FROM golang:1.21.4-bookworm
-WORKDIR /app
-ARG TARGETPLATFORM
-COPY ./extra/healthcheck.go ./extra/healthcheck.go
-
-# Compile healthcheck.go
-RUN go build -x -o ./extra/healthcheck ./extra/healthcheck.go

docker/Dockerfile

@@ -1,8 +1,3 @@
-############################################
-# Healthcheck Binary
-############################################
-FROM louislam/dockge:build-healthcheck AS build_healthcheck
-
 ############################################
 # Build
 ############################################
@@ -17,17 +12,16 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prod --frozen-l
 ############################################
 FROM louislam/dockge:base AS release
 WORKDIR /app
-COPY --chown=node:node --from=build_healthcheck /app/extra/healthcheck /app/extra/healthcheck
-COPY --from=build /app/node_modules /app/node_modules
 COPY --chown=node:node  . .
+COPY --from=build /app/node_modules /app/node_modules
 RUN mkdir ./data
 
 VOLUME /app/data
 EXPOSE 5001
-HEALTHCHECK --interval=60s --timeout=30s --start-period=60s --retries=5 CMD extra/healthcheck
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 CMD ["tsx", "./backend/index.ts"]
 
+
 ############################################
 # Mark as Nightly
 ############################################

extra/healthcheck.go

@@ -1,74 +0,0 @@
-/*
- * If changed, have to run `npm run build-docker-builder-go`.
- * This script should be run after a period of time (180s), because the server may need some time to prepare.
- */
-package main
-
-import (
-	"crypto/tls"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"os"
-	"strings"
-	"time"
-)
-
-func main() {
-	// Is K8S + "dockge" as the container name
-	// See https://github.com/louislam/uptime-kuma/pull/2083
-	isK8s := strings.HasPrefix(os.Getenv("DOCKGE_PORT"), "tcp://")
-
-	// process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
-	http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{
-		InsecureSkipVerify: true,
-	}
-
-	client := http.Client{
-		Timeout: 28 * time.Second,
-	}
-
-	sslKey := os.Getenv("DOCKGE_SSL_KEY")
-	sslCert := os.Getenv("DOCKGE_SSL_CERT")
-
-	hostname := os.Getenv("DOCKGE_HOST")
-	if len(hostname) == 0 {
-		hostname = "127.0.0.1"
-	}
-
-	port := ""
-	// DOCKGE_PORT is override by K8S unexpectedly,
-	if !isK8s {
-		port = os.Getenv("DOCKGE_PORT")
-	}
-	if len(port) == 0 {
-		port = "5001"
-	}
-
-	protocol := ""
-	if len(sslKey) != 0 && len(sslCert) != 0 {
-		protocol = "https"
-	} else {
-		protocol = "http"
-	}
-
-	url := protocol + "://" + hostname + ":" + port
-
-	log.Println("Checking " + url)
-	resp, err := client.Get(url)
-
-	if err != nil {
-		log.Fatalln(err)
-	}
-
-	defer resp.Body.Close()
-
-	_, err = ioutil.ReadAll(resp.Body)
-
-	if err != nil {
-		log.Fatalln(err)
-	}
-
-	log.Printf("Health Check OK [Res Code: %d]\n", resp.StatusCode)
-
-}

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

@@ -1,129 +0,0 @@
-import { Database } from "../backend/database";
-import { R } from "redbean-node";
-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 ==");
-
-const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout
-});
-
-const server = new DockgeServer();
-
-export const main = async () => {
-    // Check if
-    console.log("Connecting the database");
-    try {
-        await Database.init(server);
-    } catch (e) {
-        if (e instanceof Error) {
-            log.error("server", "Failed to connect to your database: " + e.message);
-        }
-        process.exit(1);
-    }
-
-    try {
-        // No need to actually reset the password for testing, just make sure no connection problem. It is ok for now.
-        if (!process.env.TEST_BACKEND) {
-            const user = await R.findOne("user");
-            if (! user) {
-                throw new Error("user not found, have you installed?");
-            }
-
-            console.log("Found user: " + user.username);
-
-            while (true) {
-                let password = await question("New Password: ");
-                let confirmPassword = await question("Confirm New Password: ");
-
-                if (password === confirmPassword) {
-                    await User.resetPassword(user.id, password);
-
-                    // 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.");
-                }
-            }
-        }
-    } catch (e) {
-        if (e instanceof Error) {
-            console.error("Error: " + e.message);
-        }
-    }
-
-    await Database.close();
-    rl.close();
-
-    console.log("Finished.");
-};
-
-/**
- * Ask question of user
- * @param question Question to ask
- * @returns Users response
- */
-function question(question : string) : Promise<string> {
-    return new Promise((resolve) => {
-        rl.question(question, (answer) => {
-            resolve(answer);
-        });
-    });
-}
-
-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();
-}

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,34 +189,14 @@ 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: {
-                        stackName: this.stackName,
-                        serviceName: this.name,
-                        type: "bash",
-                    },
-                };
-            }
-        },
-
-        endpoint() {
-            return this.$parent.$parent.endpoint;
-        },
-
-        stack() {
-            return this.$parent.$parent.stack;
+            return {
+                name: "containerTerminal",
+                params: {
+                    stackName: this.stackName,
+                    serviceName: this.name,
+                    type: "bash",
+                },
+            };
         },
 
         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);
-            }
+            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
@@ -152,15 +152,6 @@ export default {
             });
 
             result.sort((m1, m2) => {
-
-                // sort by managed by dockge
-                if (m1.isManagedByDockge && !m2.isManagedByDockge) {
-                    return -1;
-                } else if (!m1.isManagedByDockge && m2.isManagedByDockge) {
-                    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);
         }
     }
 };

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

@@ -19,16 +19,10 @@ const languageList = {
     "ru": "Русский",
     "cs-CZ": "Čeština",
     "ar": "العربية",
-    "th": "ไทย",
-    "it-IT": "Italiano",
-    "sv-SE": "Svenska",
-    "uk-UA": "Українська",
-    "da": "Dansk",
-    "ja": "日本語",
-    "nl": "Nederlands",
-    "ro": "Română",
-    "id": "Bahasa Indonesia (Indonesian)",
-    "vi": "Tiếng Việt",
+    "th":"ไทย",
+    "it-IT":"Italiano",
+    "sv-SE":"Svenska",
+    "uk-UA":"Українська"
 };
 
 let messages = {
@@ -41,7 +35,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

@@ -12,8 +12,8 @@
     "registry": "السجل",
     "compose": "أنشاء كمبوز",
     "addFirstStackMsg": "أنشيء أول كمبوز!",
-    "stackName": "اسم المكدسة",
-    "deployStack": "نشر",
+    "stackName" : "اسم المكدسة",
+    "deployStack": "شنر",
     "deleteStack": "حذف",
     "stopStack": "إيقاف",
     "restartStack": "إعادة تشغيل",
@@ -23,7 +23,7 @@
     "editStack": "تعديل",
     "discardStack": "إهمال",
     "saveStackDraft": "حفظ",
-    "notAvailableShort": "غير متوفر",
+    "notAvailableShort" : "غير متوفر",
     "deleteStackMsg": "هل أنت متأكد أنك تريد حذف هذه المكدسة؟",
     "stackNotManagedByDockgeMsg": "لا يتم إدارة هذه المكدس بواسطة Dockge.",
     "primaryHostname": "اسم المضيف الرئيسي",
@@ -46,7 +46,7 @@
     "deleteContainer": "حذف",
     "addContainer": "أضافة حاوية",
     "addNetwork": "أضافة شبكة",
-    "disableauth.message1": "هل أنت متأكد أنك تريد <strong>تعطيل المصادقة</strong>؟",
+    "disableauth.message1": "هل أنت متأكد أنك تريد  <strong>تعطيل المصادقة</strong>?",
     "disableauth.message2": "إنه مصمم للحالات <strong>التي تنوي فيها مصادقة الطرف الثالث</strong> أمام Dockge مثل Cloudflare Access, Authelia أو أي من آليات المصادقة الأخرى.",
     "passwordNotMatchMsg": "كلمة المرور المكررة غير متطابقة.",
     "autoGet": "الجلب التلقائي",
@@ -91,12 +91,5 @@
     "Allowed commands:": "الأوامر المسموح بها:",
     "Internal Networks": "الشبكات الداخلية",
     "External Networks": "الشبكات الخارجية",
-    "No External Networks": "لا توجد شبكات خارجية",
-    "reverseProxyMsg2": "تحقق كيف يتم إعداده لمقبس ويب",
-    "Cannot connect to the socket server.": "تعذر الاتصال بخادم المقبس.",
-    "reconnecting...": "إعادة الاتصال…",
-    "url": "رابط | روابط",
-    "extra": "إضافات",
-    "reverseProxyMsg1": "هل تستدخم خادم عكسي؟",
-    "connecting...": "جاري الاتصال بخادم المقبس…"
+    "No External Networks": "لا توجد شبكات خارجية"
 }

frontend/src/lang/bg-BG.json

@@ -12,7 +12,7 @@
     "registry": "Регистър",
     "compose": "Compose",
     "addFirstStackMsg": "Създайте вашия първи стак!",
-    "stackName": "Име на стак",
+    "stackName" : "Име на стак",
     "deployStack": "Разположи",
     "deleteStack": "Изтрий",
     "stopStack": "Спри",
@@ -22,7 +22,7 @@
     "editStack": "Редактирай",
     "discardStack": "Отхвърли",
     "saveStackDraft": "Запази",
-    "notAvailableShort": "N/A",
+    "notAvailableShort" : "N/A",
     "deleteStackMsg": "Сигурни ли сте, че желаете да изтриете този стак?",
     "stackNotManagedByDockgeMsg": "Този стак не се управлява от Dockge.",
     "primaryHostname": "Основно име на хост",
@@ -90,26 +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": "Агентът е премахнат успешно."
+    "No External Networks": "Не са налични външни мрежи"
 }

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,103 +0,0 @@
-{
-    "languageName": "Dansk",
-    "authIncorrectCreds": "Forkert brugernavn eller adgangskode.",
-    "PasswordsDoNotMatch": "Adgangskode stemmer ikke overens.",
-    "Repeat Password": "Gentag adgangskode",
-    "Create": "Opret",
-    "signedInDisp": "Logget ind som {0}",
-    "signedInDispDisabled": "Auth Deaktiveret.",
-    "home": "Hjem",
-    "console": "Konsol",
-    "registry": "Registry",
-    "compose": "Compose",
-    "stackName": "Stack-navn",
-    "deployStack": "Udrulle",
-    "deleteStack": "Slet",
-    "stopStack": "Stop",
-    "restartStack": "Genstart",
-    "updateStack": "Opdatere",
-    "startStack": "Start",
-    "downStack": "Stop & Sluk",
-    "editStack": "Editere",
-    "discardStack": "Annuller",
-    "saveStackDraft": "Gem",
-    "notAvailableShort": "Ugyldig",
-    "stackNotManagedByDockgeMsg": "Denne stack administreres ikke af Dockge.",
-    "primaryHostname": "Primært værtsnavn",
-    "general": "Generelt",
-    "container": "Container | Containere",
-    "scanFolder": "Scan Stack-mappe",
-    "dockerImage": "Billede",
-    "restartPolicyUnlessStopped": "Medmindre stoppet",
-    "restartPolicyAlways": "Altid",
-    "restartPolicyOnFailure": "Ved fejl",
-    "restartPolicyNo": "Nej",
-    "restartPolicy": "Genstart politik",
-    "containerName": "Container navn",
-    "port": "Port | Porte",
-    "volume": "Volumen | Voluminer",
-    "network": "Netværk | Netværker",
-    "dependsOn": "Container Dependency | Container Dependencies",
-    "addListItem": "Tilføj {0}",
-    "deleteContainer": "Slet",
-    "addNetwork": "Tilføj Netværk",
-    "passwordNotMatchMsg": "Koden du gentog stemmer ikke overens.",
-    "autoGet": "Auto Get",
-    "add": "Tilføj",
-    "Edit": "Redigere",
-    "applyToYAML": "Anvend til YAML",
-    "createExternalNetwork": "Skabe",
-    "addInternalNetwork": "Tilføj",
-    "Save": "Gem",
-    "Language": "Sprog",
-    "Current User": "Nuværende bruger",
-    "Change Password": "Ændre adgangskode",
-    "Current Password": "Nuværende adgangskode",
-    "New Password": "Ny adgangskode",
-    "Repeat New Password": "Gentag ny adgangskode",
-    "Update Password": "Opdater adgangskode",
-    "Advanced": "Avanceret",
-    "Please use this option carefully!": "Brug venligst denne indstilling forsigtigt!",
-    "Enable Auth": "Aktiver Auth",
-    "Disable Auth": "Deaktiver Auth",
-    "I understand, please disable": "Jeg forstår, venligst deaktiver",
-    "Leave": "Forlad",
-    "Frontend Version": "Frontend Version",
-    "Check Update On GitHub": "Tjek opdatering på GitHub",
-    "Also check beta release": "Tjek også betaversionen",
-    "Remember me": "Husk mig",
-    "Login": "Login",
-    "Username": "Brugernavn",
-    "Password": "Adgangskode",
-    "Settings": "Indstillinger",
-    "Logout": "Log ud",
-    "Convert to Compose": "Konverter til Compose",
-    "active": "aktive",
-    "exited": "forladt",
-    "inactive": "inaktive",
-    "Appearance": "Udseende",
-    "Security": "Sikkerhed",
-    "Docker Run": "Docker Kør",
-    "About": "Om",
-    "Allowed commands:": "Tilladte kommandoer:",
-    "Internal Networks": "Interne netværk",
-    "External Networks": "Eksterne netværk",
-    "No External Networks": "Ingen eksterne netværk",
-    "reverseProxyMsg1": "Bruger du en Reverse-Proxy?",
-    "reverseProxyMsg2": "Tjek, hvordan du konfigurerer det til WebSocket",
-    "Cannot connect to the socket server.": "Kan ikke oprette forbindelse til socket-serveren.",
-    "reconnecting...": "Genopretter forbindelse…",
-    "connecting...": "Opretter forbindelse til socket-serveren…",
-    "url": "URL | URL'er",
-    "extra": "Ekstra",
-    "Create your admin account": "Opret din administratorkonto",
-    "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"
-}

frontend/src/lang/de.json

@@ -6,14 +6,14 @@
     "Repeat Password": "Passwort wiederholen",
     "Create": "Erstellen",
     "signedInDisp": "Angemeldet als {0}",
-    "signedInDispDisabled": "Anmeldung deaktiviert.",
+    "signedInDispDisabled": "Authentifizierung deaktiviert.",
     "home": "Startseite",
     "console": "Konsole",
-    "registry": "Container Registry",
-    "compose": "Compose",
+    "registry": "Register",
+    "compose": "Zusammenstellen",
     "addFirstStackMsg": "Stelle deinen ersten Stack zusammen!",
-    "stackName": "Stack-Name",
-    "deployStack": "Deployen",
+    "stackName" : "Stack-Name",
+    "deployStack": "Bereitstellen",
     "deleteStack": "Löschen",
     "stopStack": "Anhalten",
     "restartStack": "Neustarten",
@@ -22,33 +22,33 @@
     "editStack": "Bearbeiten",
     "discardStack": "Verwerfen",
     "saveStackDraft": "Speichern",
-    "notAvailableShort": "N/V",
+    "notAvailableShort" : "N/A",
     "deleteStackMsg": "Möchtest du diesen Stack wirklich löschen?",
     "stackNotManagedByDockgeMsg": "Dieser Stack wird nicht von Dockge verwaltet.",
     "primaryHostname": "Primärer Hostname",
     "general": "Allgemein",
-    "container": "Container",
+    "container": "Container | Container",
     "scanFolder": "Stacks-Ordner durchsuchen",
     "dockerImage": "Image",
     "restartPolicyUnlessStopped": "Falls nicht gestoppt",
     "restartPolicyAlways": "Immer",
     "restartPolicyOnFailure": "Bei Fehler",
     "restartPolicyNo": "Kein Neustart",
-    "environmentVariable": "Umgebungsvariable/n",
+    "environmentVariable": "Umgebungsvariable | Umgebungsvariablen",
     "restartPolicy": "Neustart Richtlinie",
     "containerName": "Container-Name",
-    "port": "Port / Ports",
-    "volume": "Volume / Volumes",
+    "port": "Port | Ports",
+    "volume": "Volume | Volumes",
     "network": "Netzwerk | Netzwerke",
-    "dependsOn": "Container-Abhängigkeit/en",
+    "dependsOn": "Container-Abhängigkeit | Container-Abhängigkeiten",
     "addListItem": "{0} hinzufügen",
     "deleteContainer": "Löschen",
     "addContainer": "Container hinzufügen",
     "addNetwork": "Netzwerk hinzufügen",
-    "disableauth.message1": "Bist du sicher, dass du die <strong>Anmeldung deaktivieren</strong> möchtest?",
+    "disableauth.message1": "Bist du sicher, dass du die <strong>Authentifizierung deaktivieren</strong> möchtest?",
     "disableauth.message2": "Es ist für Szenarien vorgesehen, <strong>in denen du beabsichtigst, eine Drittanbieter-Authentifizierung</strong> vor Dockge zu implementieren, wie zum Beispiel Cloudflare Access, Authelia oder andere Authentifizierungsmechanismen.",
     "passwordNotMatchMsg": "Das wiederholte Passwort stimmt nicht überein.",
-    "autoGet": "Automatisch laden",
+    "autoGet": "Automatisch holen",
     "add": "Hinzufügen",
     "Edit": "Bearbeiten",
     "applyToYAML": "Auf YAML anwenden",
@@ -64,23 +64,23 @@
     "Update Password": "Passwort aktualisieren",
     "Advanced": "Erweitert",
     "Please use this option carefully!": "Bitte verwende diese Option sorgfältig!",
-    "Enable Auth": "Anmeldung aktivieren",
-    "Disable Auth": "Anmeldung deaktivieren",
+    "Enable Auth": "Authentifizierung aktivieren",
+    "Disable Auth": "Authentifizierung deaktivieren",
     "I understand, please disable": "Ich verstehe, bitte deaktivieren",
     "Leave": "Verlassen",
     "Frontend Version": "Frontend Version",
     "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",
@@ -90,26 +90,5 @@
     "Allowed commands:": "Zugelassene Befehle:",
     "Internal Networks": "Interne Netzwerke",
     "External Networks": "Externe Netzwerke",
-    "No External Networks": "Keine externen Netzwerke",
-    "Cannot connect to the socket server.": "Keine Verbindung zum Socket Server.",
-    "reverseProxyMsg1": "Wird ein Reverse Proxy genutzt?",
-    "reconnecting...": "Erneuter Verbindungsaufbau…",
-    "downStack": "Stopp & Inaktiv",
-    "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?"
+    "No External Networks": "Keine externen Netzwerke"
 }

frontend/src/lang/en.json

@@ -12,18 +12,18 @@
     "registry": "Registry",
     "compose": "Compose",
     "addFirstStackMsg": "Compose your first stack!",
-    "stackName": "Stack Name",
+    "stackName" : "Stack Name",
     "deployStack": "Deploy",
     "deleteStack": "Delete",
     "stopStack": "Stop",
     "restartStack": "Restart",
     "updateStack": "Update",
     "startStack": "Start",
-    "downStack": "Stop & Inactive",
+    "downStack": "Stop & Down",
     "editStack": "Edit",
     "discardStack": "Discard",
     "saveStackDraft": "Save",
-    "notAvailableShort": "N/A",
+    "notAvailableShort" : "N/A",
     "deleteStackMsg": "Are you sure you want to delete this stack?",
     "stackNotManagedByDockgeMsg": "This stack is not managed by Dockge.",
     "primaryHostname": "Primary Hostname",
@@ -95,21 +95,8 @@
     "reverseProxyMsg1": "Using a Reverse Proxy?",
     "reverseProxyMsg2": "Check how to config it for WebSocket",
     "Cannot connect to the socket server.": "Cannot connect to the socket server.",
-    "reconnecting...": "Reconnecting…",
-    "connecting...": "Connecting to the socket server…",
+    "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?"
+    "extra": "Extra"
 }

frontend/src/lang/es.json

@@ -12,7 +12,7 @@
     "registry": "Registro",
     "compose": "Componer",
     "addFirstStackMsg": "¡Compón tu primera pila!",
-    "stackName": "Nombre de la Pila",
+    "stackName" : "Nombre de la Pila",
     "deployStack": "Desplegar",
     "deleteStack": "Eliminar",
     "stopStack": "Detener",
@@ -22,7 +22,7 @@
     "editStack": "Editar",
     "discardStack": "Descartar",
     "saveStackDraft": "Guardar",
-    "notAvailableShort": "N/D",
+    "notAvailableShort" : "N/D",
     "deleteStackMsg": "¿Estás seguro de que quieres eliminar esta pila?",
     "stackNotManagedByDockgeMsg": "Esta pila no está gestionada por Dockge.",
     "primaryHostname": "Nombre de Host Primario",
@@ -90,26 +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": "URL | 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."
+    "No External Networks": "Sin Redes Externas"
 }

frontend/src/lang/fr.json

@@ -1,5 +1,5 @@
 {
-    "languageName": "Français",
+    "languageName": "Francais",
     "Create your admin account": "Créez votre compte administrateur",
     "authIncorrectCreds": "identifiant ou mot de passe incorrect.",
     "Repeat Password": "Répéter le mot de passe",
@@ -11,8 +11,8 @@
     "console": "Console",
     "registry": "Registre",
     "compose": "Compose",
-    "addFirstStackMsg": "Créez votre première pile !",
-    "stackName": "Nom de la pile",
+    "addFirstStackMsg": "Créez votre première pile!",
+    "stackName" : "Nom de la pile",
     "deployStack": "Déployer",
     "deleteStack": "Supprimer",
     "stopStack": "Arrêter",
@@ -22,11 +22,11 @@
     "editStack": "Modifier",
     "discardStack": "Ignorer",
     "saveStackDraft": "Sauvegarder",
-    "notAvailableShort": "N/A",
+    "notAvailableShort" : "N/A",
     "deleteStackMsg": "Êtes-vous sûr de vouloir supprimer cette pile ?",
     "stackNotManagedByDockgeMsg": "Cette pile n'est pas gérée par Dockge.",
     "primaryHostname": "Nom d'hôte principal",
-    "general": "Général",
+    "general": "Générale",
     "container": "Conteneur | Conteneurs",
     "scanFolder": "Analyser le dossier des piles",
     "dockerImage": "Image",
@@ -51,7 +51,7 @@
     "autoGet": "Obtention automatique",
     "add": "Ajouter",
     "Edit": "Modifier",
-    "applyToYAML": "Appliquer au YAML",
+    "applyToYAML": "Appliquer à YAML",
     "createExternalNetwork": "Créer",
     "addInternalNetwork": "Ajouter",
     "Save": "Enregistrer",
@@ -87,29 +87,8 @@
     "Appearance": "Apparence",
     "Security": "Sécurité",
     "About": "À propos",
-    "Allowed commands:": "Commandes autorisées :",
+    "Allowed commands:": "Commandes autorisées:",
     "Internal Networks": "Réseaux Internes",
     "External Networks": "Réseaux Externes",
-    "No External Networks": "Aucun Réseau Externe",
-    "reverseProxyMsg2": "Vérifier comment le configurer pour WebSocket",
-    "connecting...": "Connexion au serveur socket…",
-    "url": "URL | URLs",
-    "extra": "Supplémentaire",
-    "downStack": "Arrêtez et rendre inactif",
-    "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 ?"
+    "No External Networks": "Aucun Réseau Externe"
 }

frontend/src/lang/id.json

@@ -1,115 +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 & Turun",
-    "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?"
-}

frontend/src/lang/it-IT.json

@@ -10,10 +10,10 @@
     "home": "Home",
     "console": "Console",
     "registry": "Registro",
-    "compose": "Componi",
+    "compose": "Compose",
     "addFirstStackMsg": "Componi il tuo primo stack!",
-    "stackName": "Nome dello stack",
-    "deployStack": "Rilascia",
+    "stackName" : "Nome dello stack",
+    "deployStack": "Deploy",
     "deleteStack": "Cancella",
     "stopStack": "Stop",
     "restartStack": "Riavvia",
@@ -23,7 +23,7 @@
     "editStack": "Modifica",
     "discardStack": "Annulla",
     "saveStackDraft": "Salva",
-    "notAvailableShort": "N/D",
+    "notAvailableShort" : "N/D",
     "deleteStackMsg": "Sei sicuro di voler eliminare questo stack?",
     "stackNotManagedByDockgeMsg": "Questo stack non è gestito da Dockge.",
     "primaryHostname": "Hostname primario",
@@ -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,12 +91,5 @@
     "Allowed commands:": "Comandi permessi:",
     "Internal Networks": "Reti interne",
     "External Networks": "Reti esterne",
-    "No External Networks": "Nessuna rete esterna",
-    "reverseProxyMsg1": "Utilizzando un proxy inverso?",
-    "reverseProxyMsg2": "Controlla come configurarlo per WebSocket",
-    "Cannot connect to the socket server.": "Impossibile connettersi al server socket.",
-    "connecting...": "Connessione al server socket…",
-    "extra": "Extra",
-    "reconnecting...": "Riconnessione…",
-    "url": "Indirizzo | Indirizzi"
+    "No External Networks": "Nessuna rete esterna"
 }

frontend/src/lang/ja.json

@@ -1,98 +0,0 @@
-{
-    "authIncorrectCreds": "ユーザーネームまたはパスワードが正しくありません。",
-    "PasswordsDoNotMatch": "パスワードが一致しません。",
-    "Repeat Password": "パスワードを再度入力してください",
-    "Create": "作成",
-    "signedInDispDisabled": "認証が無効化されています。",
-    "home": "ホーム",
-    "console": "コンソール",
-    "registry": "レジストリ",
-    "stackName": "スタック名",
-    "deployStack": "デプロイ",
-    "deleteStack": "削除",
-    "stopStack": "停止",
-    "restartStack": "再起動",
-    "updateStack": "更新",
-    "startStack": "起動",
-    "editStack": "編集",
-    "discardStack": "破棄",
-    "saveStackDraft": "保存",
-    "stackNotManagedByDockgeMsg": "このスタックはDockgeによって管理されていません。",
-    "general": "一般",
-    "scanFolder": "スタックフォルダをスキャン",
-    "dockerImage": "イメージ",
-    "environmentVariable": "環境変数",
-    "restartPolicy": "再起動ポリシー",
-    "containerName": "コンテナ名",
-    "port": "ポート",
-    "volume": "ボリューム",
-    "network": "ネットワーク",
-    "addListItem": "{0} を追加",
-    "addContainer": "コンテナを追加",
-    "addNetwork": "ネットワークを追加",
-    "compose": "Compose",
-    "primaryHostname": "主ホスト名",
-    "container": "コンテナ",
-    "dependsOn": "コンテナ依存関係",
-    "downStack": "停止してInactive",
-    "notAvailableShort": "N/A",
-    "restartPolicyUnlessStopped": "手動で停止されるまで",
-    "restartPolicyAlways": "常時",
-    "restartPolicyOnFailure": "失敗時",
-    "restartPolicyNo": "しない",
-    "passwordNotMatchMsg": "繰り返しのパスワードが一致しません。",
-    "autoGet": "自動取得",
-    "add": "追加",
-    "Edit": "編集",
-    "applyToYAML": "YAMLに適用",
-    "createExternalNetwork": "作成",
-    "addInternalNetwork": "追加",
-    "Save": "保存",
-    "Language": "言語",
-    "Change Password": "パスワードを変更する",
-    "Current Password": "現在のパスワード",
-    "New Password": "新しいパスワード",
-    "Update Password": "パスワードを更新",
-    "Advanced": "高度",
-    "Please use this option carefully!": "このオプションは注意して使用してください！",
-    "Enable Auth": "認証を有効化",
-    "Disable Auth": "認証を無効化",
-    "Check Update On GitHub": "GitHubで更新を確認",
-    "Show update if available": "アップデートがある場合表示",
-    "Also check beta release": "ベータ版のリリースも確認する",
-    "Login": "ログイン",
-    "Username": "ユーザー名",
-    "Password": "パスワード",
-    "Settings": "設定",
-    "Logout": "ログアウト",
-    "Convert to Compose": "Composeに変換",
-    "Appearance": "外観",
-    "Security": "セキュリティ",
-    "Allowed commands:": "許可されたコマンド:",
-    "Internal Networks": "内部ネットワーク",
-    "External Networks": "外部ネットワーク",
-    "reverseProxyMsg2": "WebSocketの設定方法を確認",
-    "Cannot connect to the socket server.": "ソケットサーバーに接続できません。",
-    "reconnecting...": "再接続中…",
-    "Leave": "やめる",
-    "Frontend Version": "フロントエンドバージョン",
-    "Remember me": "覚えておく",
-    "No External Networks": "外部ネットワークなし",
-    "exited": "終了済み",
-    "inactive": "非アクティブ",
-    "active": "アクティブ",
-    "languageName": "日本語",
-    "Create your admin account": "管理者アカウントを作成してください",
-    "signedInDisp": "{0} としてログイン中",
-    "addFirstStackMsg": "最初のスタックを組み立てましょう！",
-    "deleteStackMsg": "本当にこのスタックを削除しますか？",
-    "deleteContainer": "削除",
-    "disableauth.message1": "本当に<strong>認証を無効化</strong>しますか?",
-    "disableauth.message2": "これはCloudflare AccessやAutheliaなどの認証手段をDockgeの前段に置いて<strong>サードパーティー認証を実装することをあなたが意図している</strong>場合のために設計されています。",
-    "Current User": "現在のユーザー",
-    "Repeat New Password": "新しいパスワードを繰り返してください",
-    "I understand, please disable": "理解しました。無効化してください",
-    "Lowercase only": "小文字のみ",
-    "reverseProxyMsg1": "リバースプロキシを使用していますか？",
-    "connecting...": "ソケットサーバーに接続中…"
-}

frontend/src/lang/ko-KR.json

@@ -90,26 +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": "에이전트를 성공적으로 삭제했습니다."
+    "No External Networks": "외부 네트워크 없음"
 }

frontend/src/lang/nl.json

@@ -1,115 +0,0 @@
-{
-    "languageName": "Nederlands",
-    "authIncorrectCreds": "Onjuiste gebruikersnaam of wachtwoord.",
-    "PasswordsDoNotMatch": "Wachtwoorden komen niet overeen.",
-    "Repeat Password": "Herhaal wachtwoord",
-    "Create": "Aanmaken",
-    "signedInDisp": "Ingelogd als {0}",
-    "home": "Home",
-    "console": "Console",
-    "registry": "Register",
-    "compose": "Nieuwe stack",
-    "stackName": "Stack naam",
-    "deployStack": "Opzetten",
-    "deleteStack": "Verwijder",
-    "stopStack": "Stop",
-    "restartStack": "Herstart",
-    "updateStack": "Update",
-    "startStack": "Start",
-    "downStack": "Stop & Afsluiten",
-    "editStack": "Bewerken",
-    "discardStack": "Verwijderen",
-    "saveStackDraft": "Opslaan",
-    "notAvailableShort": "n.v.t.",
-    "stackNotManagedByDockgeMsg": "Deze stack wordt niet beheerd door Dockge.",
-    "primaryHostname": "Primaire hostnaam",
-    "general": "Algemeen",
-    "scanFolder": "Scan stacks folder",
-    "dockerImage": "Image",
-    "restartPolicyUnlessStopped": "Tenzij gestopt",
-    "restartPolicyAlways": "Altijd",
-    "restartPolicyOnFailure": "Bij fout",
-    "restartPolicyNo": "Neen",
-    "environmentVariable": "Omgevings variabele(n)",
-    "restartPolicy": "Herstart policy",
-    "containerName": "Containernaam",
-    "port": "Poort(en)",
-    "volume": "Volume(s)",
-    "network": "Netwerk(en)",
-    "addListItem": "Voeg {0} toe",
-    "deleteContainer": "Verwijder",
-    "addContainer": "Container toevoegen",
-    "addNetwork": "Netwerk toevoegen",
-    "signedInDispDisabled": "Aanmelden uitgeschakeld.",
-    "container": "Container(s)",
-    "autoGet": "Auto ophalen",
-    "add": "Toevoegen",
-    "Edit": "Bewerken",
-    "applyToYAML": "Toevoegen aan YAML",
-    "createExternalNetwork": "Aanmaken",
-    "addInternalNetwork": "Toevoegen",
-    "Save": "Opslaan",
-    "Language": "Taal",
-    "Change Password": "Verander wachtwoord",
-    "Current Password": "Huidig wachtwoord",
-    "New Password": "Nieuw wachtwoord",
-    "Repeat New Password": "Herhaal nieuw wachtwoord",
-    "Update Password": "Update wachtwoord",
-    "Advanced": "Geavanceerd",
-    "I understand, please disable": "Begrepen, dit uitschakelen",
-    "Disable Auth": "Aanmelden uitschakelen",
-    "Enable Auth": "Aanmelden inschakelen",
-    "Leave": "Afmelden",
-    "Frontend Version": "Frontend versie",
-    "Check Update On GitHub": "Controleer via GitHub op updates",
-    "Show update if available": "Toon update indien beschikbaar",
-    "Remember me": "Onthoud mij",
-    "Login": "Inloggen",
-    "Username": "Gebruikersnaam",
-    "Password": "Wachtwoord",
-    "Settings": "Instellingen",
-    "Logout": "Uitloggen",
-    "Lowercase only": "Geen hoofdletters",
-    "Docker Run": "Docker run",
-    "active": "actief",
-    "exited": "gestopt",
-    "inactive": "inactief",
-    "Appearance": "Uiterlijk",
-    "Security": "Beveiliging",
-    "About": "Over",
-    "Allowed commands:": "Toegelaten commando's:",
-    "Internal Networks": "Interne netwerken",
-    "No External Networks": "Geen externe netwerken",
-    "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)",
-    "extra": "Extra",
-    "Create your admin account": "Creëer je beheerders-account",
-    "addFirstStackMsg": "Maak je eerste stack!",
-    "deleteStackMsg": "Zeker dat je deze stack wilt verwijderen?",
-    "dependsOn": "Container afhankelijkheid | afhankelijkheden",
-    "disableauth.message1": "Zeker dat u <strong>aanmelden</strong> wilt uitschakelen?",
-    "disableauth.message2": "Dit is enkel bedoeld om te gebruiken wanneer je<strong> third-party autorisatie wilt gebruiken voor Dockge</strong>, zoals Cloudflare Acces, Authelia, ...",
-    "passwordNotMatchMsg": "De wachtwoorden komen niet overeen.",
-    "Current User": "Huidige gebruiker",
-    "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 Agents",
-    "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?"
-}

frontend/src/lang/pt-BR.json

@@ -12,7 +12,7 @@
     "registry": "Registro",
     "compose": "Compose",
     "addFirstStackMsg": "Crie sua primeira stack!",
-    "stackName": "Nome da stack",
+    "stackName" : "Nome da stack",
     "deployStack": "Deploy",
     "deleteStack": "Excluir",
     "stopStack": "Parar",
@@ -22,7 +22,7 @@
     "editStack": "Editar",
     "discardStack": "Descartar",
     "saveStackDraft": "Salvar",
-    "notAvailableShort": "N/D",
+    "notAvailableShort" : "N/D",
     "deleteStackMsg": "Tem certeza que deseja excluir esta stack?",
     "stackNotManagedByDockgeMsg": "Esta stack não é gerenciada pelo Dockge.",
     "primaryHostname": "Nome do Host Primário",
@@ -90,26 +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?"
+    "No External Networks": "Sem redes externas"
 }

frontend/src/lang/pt.json

@@ -12,7 +12,7 @@
     "registry": "Registro",
     "compose": "Compor",
     "addFirstStackMsg": "Componha sua primeira pilha!",
-    "stackName": "Nome da Pilha",
+    "stackName" : "Nome da Pilha",
     "deployStack": "Implantar",
     "deleteStack": "Excluir",
     "stopStack": "Parar",
@@ -22,7 +22,7 @@
     "editStack": "Editar",
     "discardStack": "Descartar",
     "saveStackDraft": "Salvar",
-    "notAvailableShort": "N/D",
+    "notAvailableShort" : "N/D",
     "deleteStackMsg": "Tem certeza de que deseja excluir esta pilha?",
     "stackNotManagedByDockgeMsg": "Esta pilha não é gerenciada pelo Dockge.",
     "primaryHostname": "Nome do Host Primário",
@@ -90,26 +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 & Inativar",
-    "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 | URLs",
-    "extra": "Extra",
-    "reconnecting...": "Reconectando…",
-    "connecting...": "Conectando ao servidor de socket…"
+    "No External Networks": "Sem Redes Externas"
 }

frontend/src/lang/ro.json

@@ -1,102 +0,0 @@
-{
-    "Create your admin account": "Creați-vă contul de administrator",
-    "PasswordsDoNotMatch": "Parolele nu se potrivesc.",
-    "Repeat Password": "Repetați parola",
-    "signedInDisp": "Conectat ca {0}",
-    "signedInDispDisabled": "Autentificare dezactivată.",
-    "Create": "Creează",
-    "home": "Acasă",
-    "console": "Consolă",
-    "registry": "Registru",
-    "compose": "Compune",
-    "addFirstStackMsg": "Compune prima ta stivă!",
-    "stackName": "Nume stivă",
-    "deployStack": "Lansează",
-    "deleteStack": "Șterge",
-    "stopStack": "Oprește",
-    "restartStack": "Repornire",
-    "updateStack": "Actualizare",
-    "languageName": "Română",
-    "authIncorrectCreds": "Numele de utilizator sau parola incorectă.",
-    "startStack": "Pornește",
-    "editStack": "Editați",
-    "discardStack": "Renunţa",
-    "notAvailableShort": "N/A",
-    "deleteStackMsg": "Sigur doriți să ștergeți această stivă?",
-    "stackNotManagedByDockgeMsg": "Această stivă nu este gestionată de Dockge.",
-    "primaryHostname": "Numele gazdei principale",
-    "general": "General",
-    "container": "Container | Containere",
-    "scanFolder": "Scanează folderul cu stive",
-    "dockerImage": "Imagine",
-    "restartPolicyOnFailure": "La Defecţiune",
-    "restartPolicyNo": "Nu",
-    "restartPolicy": "Politica de repornire",
-    "restartPolicyAlways": "Mereu",
-    "containerName": "Numele Containerului",
-    "port": "Port | Porturi",
-    "volume": "Volum | Volume",
-    "network": "Reţea | Reţele",
-    "dependsOn": "Dependența containerului | Dependențele containerelor",
-    "addListItem": "Adaugă {0}",
-    "deleteContainer": "Șterge",
-    "addContainer": "Adaugă Container",
-    "addNetwork": "Adaugă Rețea",
-    "addInternalNetwork": "Adaugă",
-    "Save": "Salvează",
-    "Current User": "Utilizator Curent",
-    "Change Password": "Schimbă Parola",
-    "Current Password": "Parolă Curenta",
-    "New Password": "Parolă Nouă",
-    "Repeat New Password": "Repetă Parola Nouă",
-    "Update Password": "Actualizează Parola",
-    "Advanced": "Avansat",
-    "Enable Auth": "Activați Autentificarea",
-    "Disable Auth": "Dezactivați Autentificarea",
-    "I understand, please disable": "Am înțeles, vă rog dezactivați",
-    "Leave": "Părăsiți",
-    "Frontend Version": "Versiunea Frontend",
-    "Check Update On GitHub": "Verificați actualizarea pe GitHub",
-    "Also check beta release": "Verificați și versiunea beta",
-    "Remember me": "Ține-mă minte",
-    "Login": "Autentificare",
-    "Username": "Nume de utilizator",
-    "Password": "Parolă",
-    "passwordNotMatchMsg": "Parola repetată nu se potrivește.",
-    "autoGet": "Obținere automată",
-    "add": "Adăuga",
-    "Edit": "Editați",
-    "applyToYAML": "Aplicați la YAML",
-    "createExternalNetwork": "Creează",
-    "Settings": "Setări",
-    "Logout": "Deconectare",
-    "Lowercase only": "Doar litere mici",
-    "Convert to Compose": "Convertiți în Compose",
-    "Docker Run": "Docker Run",
-    "active": "activ",
-    "exited": "ieșit",
-    "inactive": "inactiv",
-    "Appearance": "Aspect",
-    "Security": "Securitate",
-    "About": "Despre",
-    "Allowed commands:": "Comenzi permise:",
-    "Internal Networks": "Rețele interne",
-    "External Networks": "Rețele externe",
-    "No External Networks": "Fără rețele externe",
-    "reverseProxyMsg1": "Folosești un proxy invers?",
-    "reverseProxyMsg2": "Verificați cum să-l configurați pentru WebSocket",
-    "Cannot connect to the socket server.": "Nu se poate conecta la serverul socket.",
-    "reconnecting...": "Reconectare...",
-    "connecting...": "Se conectează la serverul socket...",
-    "url": "URL | URLs",
-    "extra": "Suplimentar",
-    "downStack": "Opriți & Coborâți",
-    "saveStackDraft": "Salvați",
-    "restartPolicyUnlessStopped": "Dacă nu este oprit",
-    "environmentVariable": "Variabila de mediu | Variabile de mediu",
-    "Language": "Limbă",
-    "Please use this option carefully!": "Vă rugăm să utilizați această opțiune cu atenție!",
-    "Show update if available": "Afișează actualizarea dacă este disponibilă",
-    "disableauth.message1": "Sigur doriți să <strong>dezactivați autentificarea</strong>?",
-    "disableauth.message2": "Este conceput pentru scenarii <strong>în care intenționați să implementați autentificarea terță</strong> în fața Dockge-lui, cum ar fi Cloudflare Access, Authelia sau alte mecanisme de autentificare."
-}

frontend/src/lang/ru.json

@@ -5,14 +5,14 @@
     "PasswordsDoNotMatch": "Пароль не совпадает.",
     "Repeat Password": "Повторите пароль",
     "Create": "Создать",
-    "signedInDisp": "Авторизован как {0}",
+    "signedInDisp": "Авторизлван как {0}",
     "signedInDispDisabled": "Авторизация выключена.",
     "home": "Главная",
     "console": "Консоль",
-    "registry": "Реестр (Registry)",
-    "compose": "Составить (Compose)",
+    "registry": "Registry",
+    "compose": "Compose",
     "addFirstStackMsg": "Создайте свой первый стек!",
-    "stackName": "Имя стека",
+    "stackName" : "Имя стека",
     "deployStack": "Развернуть",
     "deleteStack": "Удалить",
     "stopStack": "Остановить",
@@ -22,7 +22,7 @@
     "editStack": "Изменить",
     "discardStack": "Отменить",
     "saveStackDraft": "Сохранить",
-    "notAvailableShort": "Н/Д",
+    "notAvailableShort" : "Н/Д",
     "deleteStackMsg": "Вы уверены что хотите удалить этот стек?",
     "stackNotManagedByDockgeMsg": "Данный стек не обслуживается Dockge.",
     "primaryHostname": "Имя хоста",
@@ -79,37 +79,16 @@
     "Settings": "Настройки",
     "Logout": "Выйти",
     "Lowercase only": "Только нижний регистр",
-    "Convert to Compose": "Преобразовать в Compose",
+    "Convert to Compose": "Преобразовать вCompose",
     "Docker Run": "Запустить Docker",
-    "active": "активные",
-    "exited": "остановленные",
-    "inactive": "неактивных",
+    "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 адрес(а)",
-    "extra": "Дополнительно",
-    "reverseProxyMsg2": "Проверьте, как настроить его для WebSocket",
-    "connecting...": "Подключение к серверу сокетов…",
-    "newUpdate": "Доступно обновление",
-    "currentEndpoint": "Текущий",
-    "agentOnline": "В сети",
-    "agentOffline": "Не в сети",
-    "connecting": "Подключение",
-    "connect": "Подключен",
-    "addAgent": "Добавить Агента",
-    "agentAddedSuccessfully": "Агент добавлен успешно.",
-    "removeAgent": "Удалить Агента",
-    "removeAgentMsg": "Вы уверены, что хотите удалить этого агента?",
-    "dockgeAgent": "Dockge Агент | Dockge Агенты",
-    "dockgeURL": "Dockge URL (например http://127.0.0.1:5001)",
-    "agentRemovedSuccessfully": "Агент удален успешно."
+    "No External Networks": "Нет внешних сетей"
 }

frontend/src/lang/sl.json

@@ -90,14 +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 & Odstrani",
-    "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"
+    "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",
@@ -12,28 +12,28 @@
     "registry": "Register",
     "compose": "Komponera",
     "addFirstStackMsg": "Komponera din första stack!",
-    "stackName": "Stacknamn",
+    "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",
-    "notAvailableShort": "N/A",
+    "notAvailableShort" : "N/A",
     "deleteStackMsg": "Är du säker på att du vill radera stacken?",
     "stackNotManagedByDockgeMsg": "Denna stacken hanteras inte av Dockge.",
     "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,27 +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."
+    "Internal Networks": "Interna Nätverk",
+    "External Networks": "Externa Nätverk",
+    "No External Networks": "Inga Externa Nätverk"
 }

frontend/src/lang/th.json

@@ -91,12 +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...": "กำลังเชื่อมต่อใหม่…"
+    "No External Networks": "ไม่มีเครือข่ายภายนอก"
 }

frontend/src/lang/tr.json

@@ -12,7 +12,7 @@
     "registry": "Kayıt Defteri",
     "compose": "Compose",
     "addFirstStackMsg": "İlk yığınınızı oluşturun!",
-    "stackName": "Yığın Adı",
+    "stackName" : "Yığın Adı",
     "deployStack": "Dağıtmak",
     "deleteStack": "Sil",
     "stopStack": "Dudur",
@@ -22,7 +22,7 @@
     "editStack": "Düzenle",
     "discardStack": "Çıkar",
     "saveStackDraft": "Kaydet",
-    "notAvailableShort": "N/A",
+    "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ı",
@@ -90,13 +90,5 @@
     "Allowed commands:": "İzin verilen komutlar:",
     "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",
-    "reconnecting...": "Yeniden bağlanıyor…",
-    "connecting...": "Soket sunucusuna bağlanıyor…",
-    "url": "URL | URL’ler",
-    "Cannot connect to the socket server.": "Soket sunucusuna bağlanılamıyor.",
-    "downStack": "Durdur & Kapat"
+    "No External Networks": "Dış Ağ Yok"
 }

frontend/src/lang/uk-UA.json

@@ -1,8 +1,8 @@
 {
     "languageName": "Українська",
     "Create your admin account": "Створити акаунт адміністратора",
-    "authIncorrectCreds": "Неправильне ім'я користувача або пароль.",
-    "PasswordsDoNotMatch": "Паролі не збігаються.",
+    "authIncorrectCreds": "Невірний логін чи пароль",
+    "PasswordsDoNotMatch": "Паролі не співпадають.",
     "Repeat Password": "Повторіть пароль",
     "Create": "Створити",
     "signedInDisp": "Авторизовано як {0}",
@@ -12,8 +12,8 @@
     "registry": "Registry",
     "compose": "Compose",
     "addFirstStackMsg": "Додайте свій перший стек!",
-    "stackName": "Назва стеку",
-    "deployStack": "Розгорнути",
+    "stackName" : "Назва стеку",
+    "deployStack": "Розрознути",
     "deleteStack": "Видалити",
     "stopStack": "Зупинити",
     "restartStack": "Перезапустити",
@@ -22,7 +22,7 @@
     "editStack": "Редагувати",
     "discardStack": "Відмінити",
     "saveStackDraft": "Зберегти",
-    "notAvailableShort": "Н/Д",
+    "notAvailableShort" : "Н/Д",
     "deleteStackMsg": "Ви впевнені що хочете видалити цей стек?",
     "stackNotManagedByDockgeMsg": "Даний стек не управляється Dockge.",
     "primaryHostname": "Назва хосту",
@@ -47,7 +47,7 @@
     "addNetwork": "Додати Мережу",
     "disableauth.message1": "Ви впевнені що хочете <strong>вимкнути авторизацію</strong>?",
     "disableauth.message2": "Це призначено для сценаріїв, <strong>де ви збираєтесь використати сторонню авторизацію</strong> перед Dockge, наприклад Cloudflare Access, Authelia чи інші.",
-    "passwordNotMatchMsg": "Повторення паролю не збігається.",
+    "passwordNotMatchMsg": "Паролі не співпадають.",
     "autoGet": "Отримати",
     "add": "Додати",
     "Edit": "Змінити",
@@ -63,10 +63,10 @@
     "Repeat New Password": "Повторіть новий пароль",
     "Update Password": "Оновити пароль",
     "Advanced": "Розширені опції",
-    "Please use this option carefully!": "Будь ласка, використовуйте цю опцію з обережністю!",
+    "Please use this option carefully!": "Будь-ласка, використовуйте цю опцію з обережністю!",
     "Enable Auth": "Увімкнути автентифікацію",
     "Disable Auth": "Вимкнути автентифікацію",
-    "I understand, please disable": "Зрозуміло, все одно вимкнути",
+    "I understand, please disable": "Зрозуміло, все-одно вимкнути",
     "Leave": "Покинути",
     "Frontend Version": "Версія інтерфейсу",
     "Check Update On GitHub": "Перевірити оновлення на GitHub",
@@ -90,26 +90,5 @@
     "Allowed commands:": "Дозволені команди:",
     "Internal Networks": "Внутрішні мережі",
     "External Networks": "Зовнішні мережі",
-    "No External Networks": "Немає зовнішніх мереж",
-    "downStack": "Зупинити і вимкнути",
-    "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": "Ви впевнені, що хочете видалити цей агент?"
+    "No External Networks": "Немає зовнішніх мереж"
 }

frontend/src/lang/ur.json

@@ -18,9 +18,9 @@
     "stopStack": "روکو",
     "restartStack": "دوبارہ شروع کریں",
     "updateStack": "اپ ڈیٹ",
-    "startStack": "شروع کریں",
+    "startStack": "شروع کریں۔",
     "editStack": "ترمیم",
-    "discardStack": "رد کر دیں",
+    "discardStack": "رد کر دیں۔",
     "saveStackDraft": "محفوظ کریں۔",
     "notAvailableShort": "N / A",
     "deleteStackMsg": "کیا آپ واقعی اس اسٹیک کو حذف کرنا چاہتے ہیں؟",
@@ -28,7 +28,7 @@
     "primaryHostname": "بنیادی میزبان نام",
     "general": "جنرل",
     "container": "کنٹینر | کنٹینرز",
-    "scanFolder": "اسٹیک فولڈر کو اسکین کریں",
+    "scanFolder": "اسٹیک فولڈر کو اسکین کریں۔",
     "dockerImage": "تصویر",
     "restartPolicyUnlessStopped": "جب تک روکا نہیں جاتا",
     "restartPolicyAlways": "ہمیشہ",
@@ -51,7 +51,7 @@
     "autoGet": "آٹو حاصل کریں",
     "add": "شامل کریں",
     "Edit": "ترمیم",
-    "applyToYAML": "YAML پر درخواست دیں",
+    "applyToYAML": "YAML پر درخواست دیں۔",
     "createExternalNetwork": "بنانا",
     "addInternalNetwork": "شامل کریں",
     "Save": "محفوظ کریں",
@@ -64,12 +64,12 @@
     "Update Password": "پاس ورڈ اپ ڈیٹ کریں",
     "Advanced": "ترقی یافتہ",
     "Please use this option carefully!": "براہ کرم اس اختیار کو احتیاط سے استعمال کریں!",
-    "Enable Auth": "تصدیق کو فعال کریں",
-    "Disable Auth": "توثیق کو غیر فعال کریں",
-    "I understand, please disable": "میں سمجھتا ہوں، براہ کرم غیر فعال کریں",
+    "Enable Auth": "تصدیق کو فعال کریں۔",
+    "Disable Auth": "توثیق کو غیر فعال کریں۔",
+    "I understand, please disable": "میں سمجھتا ہوں، براہ کرم غیر فعال کریں۔",
     "Leave": "چھوڑ دو",
     "Frontend Version": "فرنٹ اینڈ ورژن",
-    "Check Update On GitHub": "گیتوب پر اپ ڈیٹ چیک کریں",
+    "Check Update On GitHub": "گیتوب پر اپ ڈیٹ چیک کریں۔",
     "Show update if available": "اگر دستیاب ہو تو اپ ڈیٹ دکھائیں",
     "Also check beta release": "بیٹا ریلیز بھی چیک کریں",
     "Remember me": "مجھے پہچانتے ہو",
@@ -93,8 +93,8 @@
     "No External Networks": "کوئی بیرونی نیٹ ورک نہیں",
     "reverseProxyMsg1": "ایک ریورس پراکسی کا استعمال کرتے ہوئے؟",
     "Cannot connect to the socket server.": "ساکٹ سرور سے منسلک نہیں ہو سکتا۔",
-    "reconnecting...": "دوبارہ منسلک ہو رہا ہے…",
-    "connecting...": "ساکٹ سرور سے منسلک ہو رہا ہے…",
+    "reconnecting...": "دوبارہ منسلک ہو رہا ہے...",
+    "connecting...": "ساکٹ سرور سے منسلک ہو رہا ہے...",
     "url": "یو آر ایل | یو آر ایل",
     "extra": "اضافی",
     "downStack": "اسٹاپ اینڈ ڈاؤن",

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": "Loại bỏ",
-    "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

@@ -1,12 +1,12 @@
 {
     "languageName": "简体中文",
     "Create your admin account": "创建你的管理员账号",
-    "authIncorrectCreds": "用户名或密码错误。",
+    "authIncorrectCreds": "用户名或密码错误",
     "PasswordsDoNotMatch": "两次输入的密码不一致。",
     "Repeat Password": "重复以确认密码",
     "Create": "创建",
     "signedInDisp": "当前用户： {0}",
-    "signedInDispDisabled": "已禁用身份验证。",
+    "signedInDispDisabled": "已禁用身份验证",
     "home": "主页",
     "console": "终端",
     "registry": "镜像仓库",
@@ -24,7 +24,7 @@
     "saveStackDraft": "保存",
     "notAvailableShort": "不可用",
     "deleteStackMsg": "你确定要删除这个堆栈吗?",
-    "stackNotManagedByDockgeMsg": "这个堆栈不由Dockge管理。",
+    "stackNotManagedByDockgeMsg": "这个堆栈不由Dockge管理",
     "primaryHostname": "主机名",
     "general": "常规",
     "container": "容器 | 容器组",
@@ -91,12 +91,9 @@
     "Internal Networks": "内部网络",
     "External Networks": "外部网络",
     "No External Networks": "无外部网络",
-    "reconnecting...": "重连中…",
+    "reconnecting...": "重连中...",
     "reverseProxyMsg2": "检查如何配置WebSocket",
     "reverseProxyMsg1": "正在使用反向代理？",
-    "connecting...": "正在连接到socket服务器…",
-    "Cannot connect to the socket server.": "无法连接到socket服务器。",
-    "url": "网址 | 网址",
-    "extra": "额外",
-    "downStack": "停止并置于非活动状态"
+    "connecting...": "正在连接到socket服务器...",
+    "Cannot connect to the socket server.": "无法连接到socket服务器。"
 }

frontend/src/lang/zh-TW.json

@@ -1,12 +1,12 @@
 {
-    "languageName": "繁體中文 (台灣)",
+    "languageName": "繁體中文(台灣)",
     "Create your admin account": "建立您的管理員帳號",
-    "authIncorrectCreds": "使用者名稱或密碼錯誤。",
+    "authIncorrectCreds": "使用者名稱或密碼錯誤",
     "PasswordsDoNotMatch": "兩次輸入的密碼不一致。",
     "Repeat Password": "重複以確認密碼",
     "Create": "建立",
     "signedInDisp": "目前使用者：{0}",
-    "signedInDispDisabled": "已停用身份驗證。",
+    "signedInDispDisabled": "已停用身份驗證",
     "home": "首頁",
     "console": "主控台",
     "registry": "映像倉庫",
@@ -24,7 +24,7 @@
     "saveStackDraft": "儲存",
     "notAvailableShort": "不可用",
     "deleteStackMsg": "您確定要刪除這個堆疊嗎？",
-    "stackNotManagedByDockgeMsg": "這個堆疊不由 Dockge 管理。",
+    "stackNotManagedByDockgeMsg": "這個堆疊不由 Dockge 管理",
     "primaryHostname": "主機名稱",
     "general": "一般",
     "container": "容器 | 容器群組",
@@ -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": "使用者名稱",
@@ -90,15 +90,5 @@
     "Allowed commands:": "允許使用的指令:",
     "Internal Networks": "內部網路",
     "External Networks": "外部網路",
-    "No External Networks": "無外部網路",
-    "downStack": "停止及未啟動化",
-    "reverseProxyMsg1": "在使用反向代理嗎？",
-    "reverseProxyMsg2": "點擊這裡了解如何為 WebSocket 配置反向代理",
-    "Cannot connect to the socket server.": "無法連接到 Socket 伺服器。",
-    "reconnecting...": "重新連線中…",
-    "connecting...": "連線至 Socket 伺服器中…",
-    "url": "網址 | 網址",
-    "extra": "額外",
-    "newUpdate": "新版本",
-    "currentEndpoint": "目前"
+    "No External Networks": "無外部網路"
 }

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;
-                    }
+                    this.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,7 +139,6 @@
                             ref="combinedTerminal"
                             class="mb-3 terminal"
                             :name="combinedTerminalName"
-                            :endpoint="endpoint"
                             :rows="combinedTerminalRows"
                             :cols="combinedTerminalCols"
                             style="height: 350px;"
@@ -171,7 +154,7 @@
                             ref="editor"
                             v-model="stack.composeYAML"
                             class="yaml-editor"
-                            :highlight="highlighterYAML"
+                            :highlight="highlighter"
                             line-numbers :readonly="!isEditMode"
                             @input="yamlCodeChange"
                             @focus="editorFocus = true"
@@ -182,22 +165,6 @@
                         {{ yamlError }}
                     </div>
 
-                    <!-- ENV editor -->
-                    <div v-if="isEditMode">
-                        <h4 class="mb-3">.env</h4>
-                        <div class="shadow-box mb-3 editor-box" :class="{'edit-mode' : isEditMode}">
-                            <prism-editor
-                                ref="editor"
-                                v-model="stack.composeENV"
-                                class="env-editor"
-                                :highlight="highlighterENV"
-                                line-numbers :readonly="!isEditMode"
-                                @focus="editorFocus = true"
-                                @blur="editorFocus = false"
-                            ></prism-editor>
-                        </div>
-                    </div>
-
                     <div v-if="isEditMode">
                         <!-- Volumes -->
                         <div v-if="false">
@@ -248,15 +215,14 @@ 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 = `version: "3.8"
 services:
@@ -266,16 +232,10 @@ services:
     ports:
       - "8080:80"
 `;
-const envDefault = "# VARIABLE=value #comment";
 
 let yamlErrorTimeout = null;
 
 let serviceStatusTimeout = null;
-let prismjsSymbolDefinition = {
-    "symbol": {
-        pattern: /(?<!\$)\$(\{[^{}]*\}|\w+)/,
-    }
-};
 
 export default {
     components: {
@@ -295,7 +255,6 @@ export default {
         return {
             editorFocus: false,
             jsonConfig: {},
-            envsubstJSONConfig: {},
             yamlError: "",
             processing: true,
             showProgressTerminal: false,
@@ -315,17 +274,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 +310,7 @@ export default {
          * @return {*}
          */
         globalStack() {
-            return this.$root.completeStackList[this.stack.name + "_" + this.endpoint];
+            return this.$root.stackList[this.stack.name];
         },
 
         status() {
@@ -370,31 +325,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 +350,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 +370,9 @@ export default {
         },
 
         $route(to, from) {
-
+            // Leave Combined Terminal
+            console.debug("leaveCombinedTerminal", from.params.stackName);
+            this.$root.getSocket().emit("leaveCombinedTerminal", this.stack.name, () => {});
         }
     },
     mounted() {
@@ -446,28 +381,20 @@ export default {
             this.isEditMode = true;
 
             let composeYAML;
-            let composeENV;
 
             if (this.$root.composeTemplate) {
                 composeYAML = this.$root.composeTemplate;
                 this.$root.composeTemplate = "";
+
             } else {
                 composeYAML = template;
             }
-            if (this.$root.envTemplate) {
-                composeENV = this.$root.envTemplate;
-                this.$root.envTemplate = "";
-            } else {
-                composeENV = envDefault;
-            }
 
             // Default Values
             this.stack = {
                 name: "",
                 composeYAML,
-                composeENV,
                 isManagedByDockge: true,
-                endpoint: "",
             };
 
             this.yamlCodeChange();
@@ -480,9 +407,11 @@ export default {
         this.requestServiceStatus();
     },
     unmounted() {
-
+        this.stopServiceStatusTimeout = true;
+        clearTimeout(serviceStatusTimeout);
     },
     methods: {
+
         startServiceStatusTimeout() {
             clearTimeout(serviceStatusTimeout);
             serviceStatusTimeout = setTimeout(async () => {
@@ -491,7 +420,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 +433,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 +490,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.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 +506,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.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 +520,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 +529,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 +538,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 +547,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 +556,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("/");
@@ -659,81 +576,32 @@ export default {
             this.isEditMode = false;
         },
 
-        highlighterYAML(code) {
-            if (!languages.yaml_with_symbols) {
-                languages.yaml_with_symbols = languages.insertBefore("yaml", "punctuation", {
-                    "symbol": prismjsSymbolDefinition["symbol"]
-                });
-            }
-            return highlight(code, languages.yaml_with_symbols);
-        },
-
-        highlighterENV(code) {
-            if (!languages.docker_env) {
-                languages.docker_env = {
-                    "comment": {
-                        pattern: /(^#| #).*$/m,
-                        greedy: true
-                    },
-                    "keyword": {
-                        pattern: /^\w*(?=[:=])/m,
-                        greedy: true
-                    },
-                    "value": {
-                        pattern: /(?<=[:=]).*?((?= #)|$)/m,
-                        greedy: true,
-                        inside: {
-                            "string": [
-                                {
-                                    pattern: /^ *'.*?(?<!\\)'/m,
-                                },
-                                {
-                                    pattern: /^ *".*?(?<!\\)"|^.*$/m,
-                                    inside: prismjsSymbolDefinition
-                                },
-                            ],
-                        },
-                    },
-                };
-            }
-            return highlight(code, languages.docker_env);
-        },
-
-        yamlToJSON(yaml) {
-            let doc = parseDocument(yaml);
-            if (doc.errors.length > 0) {
-                throw doc.errors[0];
-            }
-
-            const config = doc.toJS() ?? {};
-
-            // Check data types
-            // "services" must be an object
-            if (!config.services) {
-                config.services = {};
-            }
-
-            if (Array.isArray(config.services) || typeof config.services !== "object") {
-                throw new Error("Services must be an object");
-            }
-
-            return {
-                config,
-                doc,
-            };
+        highlighter(code) {
+            return highlight(code, languages.yaml);
         },
 
         yamlCodeChange() {
             try {
-                let { config, doc } = this.yamlToJSON(this.stack.composeYAML);
+                let doc = parseDocument(this.stack.composeYAML);
+                if (doc.errors.length > 0) {
+                    throw doc.errors[0];
+                }
+
+                const config = doc.toJS() ?? {};
+
+                // Check data types
+                // "services" must be an object
+                if (!config.services) {
+                    config.services = {};
+                }
+
+                if (Array.isArray(config.services) || typeof config.services !== "object") {
+                    throw new Error("Services must be an object");
+                }
 
                 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 +659,6 @@ export default {
 </script>
 
 <style scoped lang="scss">
-@import "../styles/vars.scss";
-
 .terminal {
     height: 200px;
 }
@@ -804,9 +670,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,97 +5,36 @@
                 {{ $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">
-                                <h3>{{ $t("active") }}</h3>
-                                <span class="num active">{{ activeNum }}</span>
-                            </div>
-                            <div class="col">
-                                <h3>{{ $t("exited") }}</h3>
-                                <span class="num exited">{{ exitedNum }}</span>
-                            </div>
-                            <div class="col">
-                                <h3>{{ $t("inactive") }}</h3>
-                                <span class="num inactive">{{ inactiveNum }}</span>
-                            </div>
-                        </div>
+            <div class="shadow-box big-padding text-center mb-4">
+                <div class="row">
+                    <div class="col">
+                        <h3>{{ $t("active") }}</h3>
+                        <span class="num active">{{ activeNum }}</span>
                     </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 class="col">
+                        <h3>{{ $t("exited") }}</h3>
+                        <span class="num exited">{{ exitedNum }}</span>
                     </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 class="col">
+                        <h3>{{ $t("inactive") }}</h3>
+                        <span class="num inactive">{{ inactiveNum }}</span>
                     </div>
                 </div>
             </div>
+
+            <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" @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,

package.json

@@ -1,6 +1,6 @@
 {
     "name": "dockge",
-    "version": "1.4.0",
+    "version": "1.2.0",
     "type": "module",
     "engines": {
         "node": ">= 18.0.0 && <= 18.17.1"
@@ -10,25 +10,19 @@
         "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",
         "mark-as-nightly": "tsx ./extra/mark-as-nightly.ts",
-        "reformat-changelog": "tsx ./extra/reformat-changelog.ts",
-        "reset-password": "tsx ./extra/reset-password.ts"
+        "reformat-changelog": "tsx ./extra/reformat-changelog.ts"
     },
     "dependencies": {
-        "@homebridge/node-pty-prebuilt-multiarch": "~0.11.12",
-        "@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.7",
@@ -37,7 +31,6 @@
         "composerize": "~1.4.1",
         "croner": "~7.0.5",
         "dayjs": "~1.11.10",
-        "dotenv": "~16.3.1",
         "express": "~4.18.2",
         "express-static-gzip": "~2.1.7",
         "http-graceful-shutdown": "~3.1.13",
@@ -45,39 +38,33 @@
         "jwt-decode": "~3.1.2",
         "knex": "~2.5.1",
         "limiter-es6-compat": "~2.1.2",
-        "mysql2": "~3.6.5",
-        "promisify-child-process": "~4.1.2",
+        "mysql2": "~3.6.3",
         "redbean-node": "~0.3.3",
-        "semver": "^7.5.4",
         "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.0.18",
+        "@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.5",
-        "@types/semver": "^7.5.6",
         "@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 +73,16 @@
         "sass": "~1.68.0",
         "typescript": "~5.2.2",
         "unplugin-vue-components": "~0.25.2",
-        "vite": "~5.0.10",
+        "vite": "~5.0.0",
         "vite-plugin-compression": "~0.5.1",
-        "vue": "~3.3.13",
+        "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.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/**/*"
     ]
 }