Try to fix crlf issue on Windows

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>

.github/workflows/ci.yml

@@ -14,50 +14,31 @@ jobs:
   ci:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest, ARM64]
-        node: [18.17.1] # Can be changed
+        os: [ubuntu-latest, windows-latest, macos-latest, ARM, ARM64]
+        node: [22] # Can be changed
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout Code
+        run: |  # Mainly for Windows
+          git config --global core.autocrlf false
+          git config --global core.eol lf
         uses: actions/checkout@v4
 
-      - run: git config --global core.autocrlf false  # Mainly for Windows
-      - uses: actions/checkout@v3
-
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
           node-version: ${{matrix.node}}
 
-      - uses: pnpm/action-setup@v2
-        name: Install pnpm
-        with:
-          version: 8
-          run_install: false
-
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
       - name: Install dependencies
-        run: pnpm install
+        run: npm install
 
       - name: Lint
-        run: pnpm run lint
+        run: npm run lint
 
       - name: Check Typescript
-        run: pnpm run check-ts
+        run: npm run check-ts
 
       - name: Build
-        run: pnpm run build:frontend
+        run: npm run build:frontend
       # more things can be add later like tests etc..
 

.github/workflows/close-incorrect-issue.yml

@@ -16,27 +16,5 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - uses: pnpm/action-setup@v2
-      name: Install pnpm
-      with:
-        version: 8
-        run_install: false
-
-    - name: Get pnpm store directory
-      shell: bash
-      run: |
-        echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-
-    - uses: actions/cache@v3
-      name: Setup pnpm cache
-      with:
-        path: ${{ env.STORE_PATH }}
-        key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-        restore-keys: |
-          ${{ runner.os }}-pnpm-store-
-
-    - name: Install dependencies
-      run: pnpm install
-
     - name: Close Incorrect Issue
       run: node extra/close-incorrect-issue.js ${{ secrets.GITHUB_TOKEN }} ${{ github.event.issue.number }} ${{ github.event.issue.user.login }}

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

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

CONTRIBUTING.md

@@ -58,8 +58,7 @@ I personally do not like something that requires so many configurations before y
 
 ## Tools
 
-- [`Node.js`](https://nodejs.org/) >= 20
-- [`pnpm`](https://pnpm.io/)
+- [`Node.js`](https://nodejs.org/) >= 22.14.0
 - [`git`](https://git-scm.com/)
 - IDE that supports [`ESLint`](https://eslint.org/) and EditorConfig (I am using [`IntelliJ IDEA`](https://www.jetbrains.com/idea/))
 - A SQLite GUI tool (f.ex. [`SQLite Expert Personal`](https://www.sqliteexpert.com/download.html) or [`DBeaver Community`](https://dbeaver.io/download/))
@@ -67,14 +66,14 @@ I personally do not like something that requires so many configurations before y
 ## Install Dependencies for Development
 
 ```bash
-pnpm install
+npm install
 ```
 
 ## Dev Server
 
 ```
-pnpm run dev:frontend
-pnpm run dev:backend
+npm run dev:frontend
+npm run dev:backend
 ```
 
 ## Backend Dev Server
@@ -94,7 +93,7 @@ You can use Vue.js devtools Chrome extension for debugging.
 ### Build the frontend
 
 ```bash
-pnpm run build
+npm run build
 ```
 
 ## Database Migration
@@ -117,7 +116,7 @@ Both frontend and backend share the same package.json. However, the frontend dep
 Should only be done by the maintainer.
 
 ```bash
-pnpm update
+npm update
 ````
 
 It should update the patch release version only.

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) ![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 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/)
 
 <img src="https://github.com/louislam/dockge/assets/1336778/26a583e1-ecb1-4a8d-aedf-76157d714ad7" width="900" alt="" />
 
@@ -14,20 +14,19 @@ View Video: https://youtu.be/AWAlOQeNpgU?t=48
 
 ## ⭐ Features
 
-- Manage `compose.yaml`
+- 🧑‍💼 Manage your `compose.yaml` files
   - Create/Edit/Start/Stop/Restart/Delete
   - Update Docker Images
-- 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 />
+- ⌨️ 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
 
+<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)
 

backend/agent-manager.ts

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

backend/agent-socket-handler.ts

@@ -0,0 +1,7 @@
+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/agent-socket-handlers/docker-socket-handler.ts

@@ -1,45 +1,46 @@
-import { SocketHandler } from "../socket-handler.js";
+import { AgentSocketHandler } from "../agent-socket-handler";
 import { DockgeServer } from "../dockge-server";
-import { callbackError, checkLogin, DockgeSocket, ValidationError } from "../util-server";
+import { callbackError, callbackResult, checkLogin, DockgeSocket, ValidationError } from "../util-server";
 import { Stack } from "../stack";
+import { AgentSocket } from "../../common/agent-socket";
 
-// @ts-ignore
-import composerize from "composerize";
+export class DockerSocketHandler extends AgentSocketHandler {
+    create(socket : DockgeSocket, server : DockgeServer, agentSocket : AgentSocket) {
+        // Do not call super.create()
 
-export class DockerSocketHandler extends SocketHandler {
-    create(socket : DockgeSocket, server : DockgeServer) {
-
-        socket.on("deployStack", async (name : unknown, composeYAML : unknown, composeENV : unknown, isAdd : unknown, callback) => {
+        agentSocket.on("deployStack", async (name : unknown, composeYAML : unknown, composeENV : unknown, isAdd : unknown, callback) => {
             try {
                 checkLogin(socket);
-                const stack = await this.saveStack(socket, server, name, composeYAML, composeENV, isAdd);
+                const stack = await this.saveStack(server, name, composeYAML, composeENV, isAdd);
                 await stack.deploy(socket);
                 server.sendStackList();
-                callback({
+                callbackResult({
                     ok: true,
                     msg: "Deployed",
-                });
+                    msgi18n: true,
+                }, callback);
                 stack.joinCombinedTerminal(socket);
             } catch (e) {
                 callbackError(e, callback);
             }
         });
 
-        socket.on("saveStack", async (name : unknown, composeYAML : unknown, composeENV : unknown, isAdd : unknown, callback) => {
+        agentSocket.on("saveStack", async (name : unknown, composeYAML : unknown, composeENV : unknown, isAdd : unknown, callback) => {
             try {
                 checkLogin(socket);
-                this.saveStack(socket, server, name, composeYAML, composeENV, isAdd);
-                callback({
+                await this.saveStack(server, name, composeYAML, composeENV, isAdd);
+                callbackResult({
                     ok: true,
-                    "msg": "Saved"
-                });
+                    msg: "Saved",
+                    msgi18n: true,
+                }, callback);
                 server.sendStackList();
             } catch (e) {
                 callbackError(e, callback);
             }
         });
 
-        socket.on("deleteStack", async (name : unknown, callback) => {
+        agentSocket.on("deleteStack", async (name : unknown, callback) => {
             try {
                 checkLogin(socket);
                 if (typeof(name) !== "string") {
@@ -55,17 +56,18 @@ export class DockerSocketHandler extends SocketHandler {
                 }
 
                 server.sendStackList();
-                callback({
+                callbackResult({
                     ok: true,
-                    msg: "Deleted"
-                });
+                    msg: "Deleted",
+                    msgi18n: true,
+                }, callback);
 
             } catch (e) {
                 callbackError(e, callback);
             }
         });
 
-        socket.on("getStack", async (stackName : unknown, callback) => {
+        agentSocket.on("getStack", async (stackName : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -79,31 +81,32 @@ export class DockerSocketHandler extends SocketHandler {
                     stack.joinCombinedTerminal(socket);
                 }
 
-                callback({
+                callbackResult({
                     ok: true,
-                    stack: stack.toJSON(),
-                });
+                    stack: await stack.toJSON(socket.endpoint),
+                }, callback);
             } catch (e) {
                 callbackError(e, callback);
             }
         });
 
         // requestStackList
-        socket.on("requestStackList", async (callback) => {
+        agentSocket.on("requestStackList", async (callback) => {
             try {
                 checkLogin(socket);
                 server.sendStackList();
-                callback({
+                callbackResult({
                     ok: true,
-                    msg: "Updated"
-                });
+                    msg: "Updated",
+                    msgi18n: true,
+                }, callback);
             } catch (e) {
                 callbackError(e, callback);
             }
         });
 
         // startStack
-        socket.on("startStack", async (stackName : unknown, callback) => {
+        agentSocket.on("startStack", async (stackName : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -113,10 +116,11 @@ export class DockerSocketHandler extends SocketHandler {
 
                 const stack = await Stack.getStack(server, stackName);
                 await stack.start(socket);
-                callback({
+                callbackResult({
                     ok: true,
-                    msg: "Started"
-                });
+                    msg: "Started",
+                    msgi18n: true,
+                }, callback);
                 server.sendStackList();
 
                 stack.joinCombinedTerminal(socket);
@@ -127,7 +131,7 @@ export class DockerSocketHandler extends SocketHandler {
         });
 
         // stopStack
-        socket.on("stopStack", async (stackName : unknown, callback) => {
+        agentSocket.on("stopStack", async (stackName : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -137,10 +141,11 @@ export class DockerSocketHandler extends SocketHandler {
 
                 const stack = await Stack.getStack(server, stackName);
                 await stack.stop(socket);
-                callback({
+                callbackResult({
                     ok: true,
-                    msg: "Stopped"
-                });
+                    msg: "Stopped",
+                    msgi18n: true,
+                }, callback);
                 server.sendStackList();
             } catch (e) {
                 callbackError(e, callback);
@@ -148,7 +153,7 @@ export class DockerSocketHandler extends SocketHandler {
         });
 
         // restartStack
-        socket.on("restartStack", async (stackName : unknown, callback) => {
+        agentSocket.on("restartStack", async (stackName : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -158,10 +163,11 @@ export class DockerSocketHandler extends SocketHandler {
 
                 const stack = await Stack.getStack(server, stackName);
                 await stack.restart(socket);
-                callback({
+                callbackResult({
                     ok: true,
-                    msg: "Restarted"
-                });
+                    msg: "Restarted",
+                    msgi18n: true,
+                }, callback);
                 server.sendStackList();
             } catch (e) {
                 callbackError(e, callback);
@@ -169,7 +175,7 @@ export class DockerSocketHandler extends SocketHandler {
         });
 
         // updateStack
-        socket.on("updateStack", async (stackName : unknown, callback) => {
+        agentSocket.on("updateStack", async (stackName : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -179,10 +185,11 @@ export class DockerSocketHandler extends SocketHandler {
 
                 const stack = await Stack.getStack(server, stackName);
                 await stack.update(socket);
-                callback({
+                callbackResult({
                     ok: true,
-                    msg: "Updated"
-                });
+                    msg: "Updated",
+                    msgi18n: true,
+                }, callback);
                 server.sendStackList();
             } catch (e) {
                 callbackError(e, callback);
@@ -190,7 +197,7 @@ export class DockerSocketHandler extends SocketHandler {
         });
 
         // down stack
-        socket.on("downStack", async (stackName : unknown, callback) => {
+        agentSocket.on("downStack", async (stackName : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -200,10 +207,11 @@ export class DockerSocketHandler extends SocketHandler {
 
                 const stack = await Stack.getStack(server, stackName);
                 await stack.down(socket);
-                callback({
+                callbackResult({
                     ok: true,
-                    msg: "Downed"
-                });
+                    msg: "Downed",
+                    msgi18n: true,
+                }, callback);
                 server.sendStackList();
             } catch (e) {
                 callbackError(e, callback);
@@ -211,7 +219,7 @@ export class DockerSocketHandler extends SocketHandler {
         });
 
         // Services status
-        socket.on("serviceStatusList", async (stackName : unknown, callback) => {
+        agentSocket.on("serviceStatusList", async (stackName : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -221,50 +229,31 @@ export class DockerSocketHandler extends SocketHandler {
 
                 const stack = await Stack.getStack(server, stackName, true);
                 const serviceStatusList = Object.fromEntries(await stack.getServiceStatusList());
-                callback({
+                callbackResult({
                     ok: true,
                     serviceStatusList,
-                });
+                }, callback);
             } catch (e) {
                 callbackError(e, callback);
             }
         });
 
         // getExternalNetworkList
-        socket.on("getDockerNetworkList", async (callback) => {
+        agentSocket.on("getDockerNetworkList", async (callback) => {
             try {
                 checkLogin(socket);
                 const dockerNetworkList = await server.getDockerNetworkList();
-                callback({
+                callbackResult({
                     ok: true,
                     dockerNetworkList,
-                });
-            } 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,
-                });
+                }, callback);
             } catch (e) {
                 callbackError(e, callback);
             }
         });
     }
 
-    async saveStack(socket : DockgeSocket, server : DockgeServer, name : unknown, composeYAML : unknown, composeENV : unknown, isAdd : unknown) : Promise<Stack> {
+    async saveStack(server : DockgeServer, name : unknown, composeYAML : unknown, composeENV : unknown, isAdd : unknown) : Promise<Stack> {
         // Check types
         if (typeof(name) !== "string") {
             throw new ValidationError("Name must be a string");

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

@@ -1,24 +1,15 @@
-import { SocketHandler } from "../socket-handler.js";
 import { DockgeServer } from "../dockge-server";
-import { callbackError, checkLogin, DockgeSocket, ValidationError } from "../util-server";
+import { callbackError, callbackResult, 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 SocketHandler {
-    create(socket : DockgeSocket, server : DockgeServer) {
+export class TerminalSocketHandler extends AgentSocketHandler {
+    create(socket : DockgeSocket, server : DockgeServer, agentSocket : AgentSocket) {
 
-        socket.on("terminalInput", async (terminalName : unknown, cmd : unknown, errorCallback) => {
+        agentSocket.on("terminalInput", async (terminalName : unknown, cmd : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -38,17 +29,12 @@ export class TerminalSocketHandler extends SocketHandler {
                     throw new Error("Terminal not found or it is not a Interactive Terminal.");
                 }
             } catch (e) {
-                if (e instanceof Error) {
-                    errorCallback({
-                        ok: false,
-                        msg: e.message,
-                    });
-                }
+                callbackError(e, callback);
             }
         });
 
         // Main Terminal
-        socket.on("mainTerminal", async (terminalName : unknown, callback) => {
+        agentSocket.on("mainTerminal", async (terminalName : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -59,29 +45,29 @@ export class TerminalSocketHandler extends SocketHandler {
                     throw new ValidationError("Terminal name must be a string.");
                 }
 
-                log.debug("deployStack", "Terminal name: " + terminalName);
+                log.debug("mainTerminal", "Terminal name: " + terminalName);
 
                 let terminal = Terminal.getTerminal(terminalName);
 
                 if (!terminal) {
                     terminal = new MainTerminal(server, terminalName);
                     terminal.rows = 50;
-                    log.debug("deployStack", "Terminal created");
+                    log.debug("mainTerminal", "Terminal created");
                 }
 
                 terminal.join(socket);
                 terminal.start();
 
-                callback({
+                callbackResult({
                     ok: true,
-                });
+                }, callback);
             } catch (e) {
                 callbackError(e, callback);
             }
         });
 
         // Interactive Terminal for containers
-        socket.on("interactiveTerminal", async (stackName : unknown, serviceName : unknown, shell : unknown, callback) => {
+        agentSocket.on("interactiveTerminal", async (stackName : unknown, serviceName : unknown, shell : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -104,16 +90,16 @@ export class TerminalSocketHandler extends SocketHandler {
                 const stack = await Stack.getStack(server, stackName);
                 stack.joinContainerTerminal(socket, serviceName, shell);
 
-                callback({
+                callbackResult({
                     ok: true,
-                });
+                }, callback);
             } catch (e) {
                 callbackError(e, callback);
             }
         });
 
         // Join Output Terminal
-        socket.on("terminalJoin", async (terminalName : unknown, callback) => {
+        agentSocket.on("terminalJoin", async (terminalName : unknown, callback) => {
             if (typeof(callback) !== "function") {
                 log.debug("console", "Callback is not a function.");
                 return;
@@ -141,7 +127,7 @@ export class TerminalSocketHandler extends SocketHandler {
         });
 
         // Leave Combined Terminal
-        socket.on("leaveCombinedTerminal", async (stackName : unknown, callback) => {
+        agentSocket.on("leaveCombinedTerminal", async (stackName : unknown, callback) => {
             try {
                 checkLogin(socket);
 
@@ -154,52 +140,48 @@ export class TerminalSocketHandler extends SocketHandler {
                 const stack = await Stack.getStack(server, stackName);
                 await stack.leaveCombinedTerminal(socket);
 
-                callback({
+                callbackResult({
                     ok: true,
-                });
+                }, callback);
             } catch (e) {
                 callbackError(e, callback);
             }
         });
 
         // Resize Terminal
-        socket.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.");
-                    }
+        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.");
+                }
 
-                    if (typeof rows !== "number") {
-                        throw new Error("Command must be a number.");
-                    }
-                    if (typeof cols !== "number") {
-                        throw new Error("Command must be a number.");
-                    }
+                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);
+                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",
+                // 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/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 "./util-common";
+import { sleep } from "../common/util-common";
 
 interface DBConfig {
     type?: "sqlite" | "mysql";

backend/dockge-server.ts

@@ -1,3 +1,4 @@
+import "dotenv/config";
 import { MainRouter } from "./routers/main-router";
 import * as fs from "node:fs";
 import { PackageJson } from "type-fest";
@@ -17,23 +18,26 @@ import { Settings } from "./settings";
 import checkVersion from "./check-version";
 import dayjs from "dayjs";
 import { R } from "redbean-node";
-import { genSecret, isDev } from "./util-common";
+import { genSecret, isDev, LooseObject } from "../common/util-common";
 import { generatePasswordHash } from "./password-hash";
 import { Bean } from "redbean-node/dist/bean";
 import { Arguments, Config, DockgeSocket } from "./util-server";
-import { DockerSocketHandler } from "./socket-handlers/docker-socket-handler";
+import { DockerSocketHandler } from "./agent-socket-handlers/docker-socket-handler";
 import expressStaticGzip from "express-static-gzip";
 import path from "path";
-import { TerminalSocketHandler } from "./socket-handlers/terminal-socket-handler";
+import { TerminalSocketHandler } from "./agent-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 { Terminal } from "./terminal";
 
-import "dotenv/config";
-
 export class DockgeServer {
     app : Express;
     httpServer : http.Server;
@@ -50,10 +54,19 @@ export class DockgeServer {
     ];
 
     /**
-     * List of socket handlers
+     * List of socket handlers (no agent support)
      */
     socketHandlerList : SocketHandler[] = [
         new MainSocketHandler(),
+        new ManageAgentSocketHandler(),
+    ];
+
+    agentProxySocketHandler = new AgentProxySocketHandler();
+
+    /**
+     * List of socket handlers (support agent)
+     */
+    agentSocketHandlerList : AgentSocketHandler[] = [
         new DockerSocketHandler(),
         new TerminalSocketHandler(),
     ];
@@ -196,7 +209,7 @@ export class DockgeServer {
             cors,
             allowRequest: (req, callback) => {
                 let isOriginValid = true;
-                const bypass = isDev;
+                const bypass = isDev || process.env.UPTIME_KUMA_WS_ORIGIN_CHECK === "bypass";
 
                 if (!bypass) {
                     let host = req.headers.host;
@@ -230,20 +243,52 @@ export class DockgeServer {
         });
 
         this.io.on("connection", async (socket: Socket) => {
-            log.info("server", "Socket connected!");
+            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);
+            };
 
-            this.sendInfo(socket, true);
+            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);
 
             if (this.needSetup) {
                 log.info("server", "Redirect to setup page");
-                socket.emit("setup");
+                dockgeSocket.emit("setup");
             }
 
-            // Create socket handlers
+            // Create socket handlers (original, no agent support)
             for (const socketHandler of this.socketHandlerList) {
-                socketHandler.create(socket as DockgeSocket, this);
+                socketHandler.create(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
             // ***************************
@@ -251,12 +296,18 @@ 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(socket as DockgeSocket, await R.findOne("user") as User);
-                socket.emit("autoLogin");
+                this.afterLogin(dockgeSocket, await R.findOne("user") as User);
+                dockgeSocket.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", () => {
@@ -281,6 +332,11 @@ export class DockgeServer {
         } catch (e) {
             log.error("server", e);
         }
+
+        socket.instanceManager.sendAgentList();
+
+        // Also connect to other dockge instances
+        socket.instanceManager.connectAll();
     }
 
     /**
@@ -519,26 +575,34 @@ export class DockgeServer {
         return jwtSecretBean;
     }
 
+    /**
+     * Send stack list to all connected sockets
+     * @param useCache
+     */
     async sendStackList(useCache = false) {
-        let roomList = this.io.sockets.adapter.rooms.keys();
-        let map : Map<string, object> | undefined;
+        let socketList = this.io.sockets.sockets.values();
+
+        let stackList;
+
+        for (let socket of socketList) {
+            let dockgeSocket = socket as DockgeSocket;
 
-        for (let room of roomList) {
             // Check if the room is a number (user id)
-            if (Number(room)) {
+            if (dockgeSocket.userID) {
 
-                // Get the list only if there is a room
-                if (!map) {
-                    map = new Map();
-                    let stackList = await Stack.getStackList(this, useCache);
-
-                    for (let [ stackName, stack ] of stackList) {
-                        map.set(stackName, stack.toSimpleJSON());
-                    }
+                // Get the list only if there is a logged in user
+                if (!stackList) {
+                    stackList = await Stack.getStackList(this, useCache);
                 }
 
-                log.debug("server", "Send stack list to room " + room);
-                this.io.to(room).emit("stackList", {
+                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", {
                     ok: true,
                     stackList: Object.fromEntries(map),
                 });
@@ -546,25 +610,6 @@ export class DockgeServer {
         }
     }
 
-    async sendStackStatusList() {
-        let statusList = await Stack.getStatusList();
-
-        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);
-            }
-        }
-    }
-
     async getDockerNetworkList() : Promise<string[]> {
         let res = await childProcessAsync.spawn("docker", [ "network", "ls", "--format", "{{.Name}}" ], {
             encoding: "utf-8",
@@ -618,10 +663,10 @@ export class DockgeServer {
      * @param {string} userID
      * @param {string?} currentSocketID
      */
-    disconnectAllSocketClients(userID: number, currentSocketID? : string) {
+    disconnectAllSocketClients(userID: number | undefined, currentSocketID? : string) {
         for (const rawSocket of this.io.sockets.sockets.values()) {
             let socket = rawSocket as DockgeSocket;
-            if (socket.userID === userID && socket.id !== currentSocketID) {
+            if ((!userID || socket.userID === userID) && socket.id !== currentSocketID) {
                 try {
                     socket.emit("refresh");
                     socket.disconnect();

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 "./util-common";
+import { intHash, isDev } from "../common/util-common";
 import dayjs from "dayjs";
 
 export const CONSOLE_STYLE_Reset = "\x1b[0m";

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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,31 @@
+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 "./util-common";
+import { LooseObject } from "../common/util-common";
 
 export class Settings {
 

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

@@ -0,0 +1,47 @@
+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/main-socket-handler.ts

@@ -1,3 +1,5 @@
+// @ts-ignore
+import composerize from "composerize";
 import { SocketHandler } from "../socket-handler.js";
 import { DockgeServer } from "../dockge-server";
 import { log } from "../log";
@@ -5,7 +7,14 @@ 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 { checkLogin, DockgeSocket, doubleCheckPassword, JWTDecoded } from "../util-server";
+import {
+    callbackError,
+    checkLogin,
+    DockgeSocket,
+    doubleCheckPassword,
+    JWTDecoded,
+    ValidationError
+} from "../util-server";
 import { passwordStrength } from "check-password-strength";
 import jwt from "jsonwebtoken";
 import { Settings } from "../settings";
@@ -262,8 +271,6 @@ export class MainSocketHandler extends SocketHandler {
                     await doubleCheckPassword(socket, currentPassword);
                 }
 
-                console.log(data);
-
                 await Settings.setSettings("general", data);
 
                 callback({
@@ -294,6 +301,25 @@ export class MainSocketHandler extends SocketHandler {
                 }
             }
         });
+
+        // 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

@@ -0,0 +1,70 @@
+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/stack.ts

@@ -15,9 +15,10 @@ import {
     PROGRESS_TERMINAL_ROWS,
     RUNNING, TERMINAL_ROWS,
     UNKNOWN
-} from "./util-common";
+} from "../common/util-common";
 import { InteractiveTerminal, Terminal } from "./terminal";
 import childProcessAsync from "promisify-child-process";
+import { Settings } from "./settings";
 
 export class Stack {
 
@@ -50,22 +51,41 @@ export class Stack {
         }
     }
 
-    toJSON() : object {
-        let obj = this.toSimpleJSON();
+    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);
         return {
             ...obj,
             composeYAML: this.composeYAML,
             composeENV: this.composeENV,
+            primaryHostname,
         };
     }
 
-    toSimpleJSON() : object {
+    toSimpleJSON(endpoint : string) : object {
         return {
             name: this.name,
             status: this._status,
             tags: [],
             isManagedByDockge: this.isManagedByDockge,
             composeFileName: this._composeFileName,
+            endpoint,
         };
     }
 
@@ -186,8 +206,8 @@ export class Stack {
         }
     }
 
-    async deploy(socket? : DockgeSocket) : Promise<number> {
-        const terminalName = getComposeTerminalName(this.name);
+    async deploy(socket : DockgeSocket) : Promise<number> {
+        const terminalName = getComposeTerminalName(socket.endpoint, 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.");
@@ -195,8 +215,8 @@ export class Stack {
         return exitCode;
     }
 
-    async delete(socket?: DockgeSocket) : Promise<number> {
-        const terminalName = getComposeTerminalName(this.name);
+    async delete(socket: DockgeSocket) : Promise<number> {
+        const terminalName = getComposeTerminalName(socket.endpoint, 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.");
@@ -388,7 +408,7 @@ export class Stack {
     }
 
     async start(socket: DockgeSocket) {
-        const terminalName = getComposeTerminalName(this.name);
+        const terminalName = getComposeTerminalName(socket.endpoint, 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.");
@@ -397,7 +417,7 @@ export class Stack {
     }
 
     async stop(socket: DockgeSocket) : Promise<number> {
-        const terminalName = getComposeTerminalName(this.name);
+        const terminalName = getComposeTerminalName(socket.endpoint, 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.");
@@ -406,7 +426,7 @@ export class Stack {
     }
 
     async restart(socket: DockgeSocket) : Promise<number> {
-        const terminalName = getComposeTerminalName(this.name);
+        const terminalName = getComposeTerminalName(socket.endpoint, 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.");
@@ -415,7 +435,7 @@ export class Stack {
     }
 
     async down(socket: DockgeSocket) : Promise<number> {
-        const terminalName = getComposeTerminalName(this.name);
+        const terminalName = getComposeTerminalName(socket.endpoint, 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.");
@@ -424,7 +444,7 @@ export class Stack {
     }
 
     async update(socket: DockgeSocket) {
-        const terminalName = getComposeTerminalName(this.name);
+        const terminalName = getComposeTerminalName(socket.endpoint, 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.");
@@ -445,7 +465,7 @@ export class Stack {
     }
 
     async joinCombinedTerminal(socket: DockgeSocket) {
-        const terminalName = getCombinedTerminalName(this.name);
+        const terminalName = getCombinedTerminalName(socket.endpoint, 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;
@@ -455,7 +475,7 @@ export class Stack {
     }
 
     async leaveCombinedTerminal(socket: DockgeSocket) {
-        const terminalName = getCombinedTerminalName(this.name);
+        const terminalName = getCombinedTerminalName(socket.endpoint, this.name);
         const terminal = Terminal.getTerminal(terminalName);
         if (terminal) {
             terminal.leave(socket);
@@ -463,7 +483,7 @@ export class Stack {
     }
 
     async joinContainerTerminal(socket: DockgeSocket, serviceName: string, shell : string = "sh", index: number = 0) {
-        const terminalName = getContainerExecTerminalName(this.name, serviceName, index);
+        const terminalName = getContainerExecTerminalName(socket.endpoint, this.name, serviceName, index);
         let terminal = Terminal.getTerminal(terminalName);
 
         if (!terminal) {

backend/terminal.ts

@@ -8,7 +8,7 @@ import {
     PROGRESS_TERMINAL_ROWS,
     TERMINAL_COLS,
     TERMINAL_ROWS
-} from "./util-common";
+} from "../common/util-common";
 import { sync as commandExistsSync } from "command-exists";
 import { log } from "./log";
 
@@ -34,6 +34,9 @@ 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;
@@ -82,13 +85,22 @@ 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 clients = this.server.io.sockets.adapter.rooms.get(this.name);
-                const numClients = clients ? clients.size : 0;
+                const numClients = Object.keys(this.socketList).length;
 
                 if (numClients === 0) {
                     log.debug("Terminal", "Terminal " + this.name + " has no client, closing...");
@@ -112,8 +124,10 @@ export class Terminal {
             // On Data
             this._ptyProcess.onData((data) => {
                 this.buffer.pushItem(data);
-                if (this.server.io) {
-                    this.server.io.to(this.name).emit("terminalWrite", this.name, data);
+
+                for (const socketID in this.socketList) {
+                    const socket = this.socketList[socketID];
+                    socket.emitAgent("terminalWrite", this.name, data);
                 }
             });
 
@@ -137,15 +151,19 @@ export class Terminal {
      * @param res
      */
     protected exit = (res : {exitCode: number, signal?: number | undefined}) => {
-        this.server.io.to(this.name).emit("terminalExit", this.name, res.exitCode);
+        for (const socketID in this.socketList) {
+            const socket = this.socketList[socketID];
+            socket.emitAgent("terminalExit", this.name, res.exitCode);
+        }
 
-        // Remove room
-        this.server.io.in(this.name).socketsLeave(this.name);
+        // Remove all clients
+        this.socketList = {};
 
         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);
@@ -157,11 +175,11 @@ export class Terminal {
     }
 
     public join(socket : DockgeSocket) {
-        socket.join(this.name);
+        this.socketList[socket.id] = socket;
     }
 
     public leave(socket : DockgeSocket) {
-        socket.leave(this.name);
+        delete this.socketList[socket.id];
     }
 
     public get ptyProcess() {

backend/util-server.ts

@@ -2,10 +2,11 @@ import { Socket } from "socket.io";
 import { Terminal } from "./terminal";
 import { randomBytes } from "crypto";
 import { log } from "./log";
-import { ERROR_TYPE_VALIDATION } from "./util-common";
+import { ERROR_TYPE_VALIDATION } from "../common/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;
@@ -15,6 +16,9 @@ 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
@@ -56,18 +60,28 @@ 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?");

common/agent-socket.ts

@@ -0,0 +1,15 @@
+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);
+        }
+    }
+}

common/util-common.ts

@@ -43,6 +43,8 @@ async function initRandomBytes() {
     }
 }
 
+export const ALL_ENDPOINTS = "##ALL_DOCKGE_ENDPOINTS##";
+
 // Stack Status
 export const UNKNOWN = 0;
 export const CREATED_FILE = 1;
@@ -206,20 +208,20 @@ export function getCryptoRandomInt(min: number, max: number):number {
     }
 }
 
-export function getComposeTerminalName(stack : string) {
-    return "compose-" + stack;
+export function getComposeTerminalName(endpoint : string, stack : string) {
+    return "compose-" + endpoint + "-" + stack;
 }
 
-export function getCombinedTerminalName(stack : string) {
-    return "combined-" + stack;
+export function getCombinedTerminalName(endpoint : string, stack : string) {
+    return "combined-" + endpoint + "-" + stack;
 }
 
-export function getContainerTerminalName(container : string) {
-    return "container-" + container;
+export function getContainerTerminalName(endpoint : string, container : string) {
+    return "container-" + endpoint + "-" + container;
 }
 
-export function getContainerExecTerminalName(stackName : string, container : string, index : number) {
-    return "container-exec-" + stackName + "-" + container + "-" + index;
+export function getContainerExecTerminalName(endpoint : string, stackName : string, container : string, index : number) {
+    return "container-exec-" + endpoint + "-" + stackName + "-" + container + "-" + index;
 }
 
 export function copyYAMLComments(doc : Document, src : Document) {
@@ -234,42 +236,63 @@ export function copyYAMLComments(doc : Document, src : Document) {
 
 /**
  * Copy yaml comments from srcItems to items
- * Typescript is super annoying here, so I have to use any here
- * TODO: Since comments are belong to the array index, the comments will be lost if the order of the items is changed or removed or added.
+ * Attempts to preserve comments by matching content rather than just array indices
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function copyYAMLCommentsItems(items : any, srcItems : any) {
+function copyYAMLCommentsItems(items: any, srcItems: any) {
     if (!items || !srcItems) {
         return;
     }
 
+    // First pass - try to match items by their content
     for (let i = 0; i < items.length; i++) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const item : any = items[i];
+        const item: any = items[i];
 
+        // Try to find matching source item by content
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const srcItem : any = srcItems[i];
+        const srcIndex = srcItems.findIndex((srcItem: any) =>
+            JSON.stringify(srcItem.value) === JSON.stringify(item.value) &&
+            JSON.stringify(srcItem.key) === JSON.stringify(item.key)
+        );
 
-        if (!srcItem) {
-            continue;
-        }
+        if (srcIndex !== -1) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const srcItem: any = srcItems[srcIndex];
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const nextSrcItem: any = srcItems[srcIndex + 1];
 
-        if (item.key && srcItem.key) {
-            item.key.comment = srcItem.key.comment;
-            item.key.commentBefore = srcItem.key.commentBefore;
-        }
+            if (item.key && srcItem.key) {
+                item.key.comment = srcItem.key.comment;
+                item.key.commentBefore = srcItem.key.commentBefore;
+            }
 
-        if (srcItem.comment) {
-            item.comment = srcItem.comment;
-        }
+            if (srcItem.comment) {
+                item.comment = srcItem.comment;
+            }
 
-        if (item.value && srcItem.value) {
-            if (typeof item.value === "object" && typeof srcItem.value === "object") {
-                item.value.comment = srcItem.value.comment;
-                item.value.commentBefore = srcItem.value.commentBefore;
+            // Handle comments between array items
+            if (nextSrcItem && nextSrcItem.commentBefore) {
+                if (items[i + 1]) {
+                    items[i + 1].commentBefore = nextSrcItem.commentBefore;
+                }
+            }
 
-                if (item.value.items && srcItem.value.items) {
-                    copyYAMLCommentsItems(item.value.items, srcItem.value.items);
+            // Handle trailing comments after array items
+            if (srcItem.value && srcItem.value.comment) {
+                if (item.value) {
+                    item.value.comment = srcItem.value.comment;
+                }
+            }
+
+            if (item.value && srcItem.value) {
+                if (typeof item.value === "object" && typeof srcItem.value === "object") {
+                    item.value.comment = srcItem.value.comment;
+                    item.value.commentBefore = srcItem.value.commentBefore;
+
+                    if (item.value.items && srcItem.value.items) {
+                        copyYAMLCommentsItems(item.value.items, srcItem.value.items);
+                    }
                 }
             }
         }
@@ -289,10 +312,9 @@ function copyYAMLCommentsItems(items : any, srcItems : any) {
  *   - "127.0.0.1:5000-5010:5000-5010"
  *   - "6060:6060/udp"
  * @param input
- * @param defaultHostname
+ * @param hostname
  */
-export function parseDockerPort(input : string, defaultHostname : string = "localhost") {
-    let hostname = defaultHostname;
+export function parseDockerPort(input : string, hostname : string) {
     let port;
     let display;
 
@@ -405,3 +427,4 @@ function traverseYAML(pair : Pair, env : DotenvParseOutput) : void {
         pair.value.value = envsubst(pair.value.value, env);
     }
 }
+

compose.yaml

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

docker/Base.Dockerfile

@@ -1,15 +1,4 @@
-# Due to the bug of #145, Node.js's version cannot be changed, unless upstream is fixed.
-FROM node:18.17.1-bookworm-slim
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-
-
-# TARGETPLATFORM: linux/amd64, linux/arm64, linux/arm/v7
-ARG TARGETPLATFORM
-
-# TARGETARCH: amd64, arm64, arm/v7
-ARG TARGETARCH
-
+FROM node:22-bookworm-slim
 RUN apt update && apt install --yes --no-install-recommends \
     curl \
     ca-certificates \
@@ -26,12 +15,6 @@ RUN apt update && apt install --yes --no-install-recommends \
     && apt update \
     && apt --yes --no-install-recommends install \
          docker-ce-cli \
+         docker-compose-plugin \
     && rm -rf /var/lib/apt/lists/* \
-    && npm install pnpm -g \
-    && pnpm install -g tsx
-
-# Download docker-compose, as the repo's docker-compose is not up-to-date.
-COPY ./extra/download-docker-compose.ts ./extra/download-docker-compose.ts
-ARG DOCKER_COMPOSE_VERSION="2.23.3"
-RUN tsx ./extra/download-docker-compose.ts ${TARGETPLATFORM} ${DOCKER_COMPOSE_VERSION} \
-    && docker compose version
+    && npm install -g tsx

docker/Dockerfile

@@ -9,8 +9,8 @@ FROM louislam/dockge:build-healthcheck AS build_healthcheck
 FROM louislam/dockge:base AS build
 WORKDIR /app
 COPY --chown=node:node  ./package.json ./package.json
-COPY --chown=node:node  ./pnpm-lock.yaml ./pnpm-lock.yaml
-RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prod --frozen-lockfile
+COPY --chown=node:node  ./package-lock.json ./package-lock.json
+RUN npm ci
 
 ############################################
 # ⭐ Main Image
@@ -22,6 +22,13 @@ COPY --from=build /app/node_modules /app/node_modules
 COPY --chown=node:node  . .
 RUN mkdir ./data
 
+
+# It is just for safe, as by default, it is disabled in the latest Node.js now.
+# Read more:
+# - https://github.com/sagemathinc/cocalc/issues/6963
+# - https://github.com/microsoft/node-pty/issues/630#issuecomment-1987212447
+ENV UV_USE_IO_URING=0
+
 VOLUME /app/data
 EXPOSE 5001
 HEALTHCHECK --interval=60s --timeout=30s --start-period=60s --retries=5 CMD extra/healthcheck
@@ -32,4 +39,4 @@ CMD ["tsx", "./backend/index.ts"]
 # Mark as Nightly
 ############################################
 FROM release AS nightly
-RUN pnpm run mark-as-nightly
+RUN npm run mark-as-nightly

extra/download-docker-compose.ts

@@ -1,39 +0,0 @@
-import fs from "fs";
-
-async function main() {
-    // TARGETPLATFORM
-    const targetPlatform = process.argv[2];
-
-    // Docker Compose version
-    const dockerComposeVersion = process.argv[3];
-
-    // Arch
-    let arch = "";
-
-    if (targetPlatform === "linux/amd64") {
-        arch = "x86_64";
-    } else if (targetPlatform === "linux/arm64") {
-        arch = "aarch64";
-    } else if (targetPlatform === "linux/arm/v7") {
-        arch = "armv7";
-    } else {
-        throw new Error(`Unknown target platform: ${targetPlatform}`);
-    }
-
-    // mkdir -p /root/.docker/cli-plugins
-    fs.mkdirSync("/root/.docker/cli-plugins", { recursive: true });
-
-    // Download URL
-    const url = `https://github.com/docker/compose/releases/download/v${dockerComposeVersion}/docker-compose-linux-${arch}`;
-
-    console.log(url);
-
-    // Download docker-compose using fetch api, to "/root/.docker/cli-plugins/docker-compose"
-    const buffer = await (await fetch(url)).arrayBuffer();
-    fs.writeFileSync("/root/.docker/cli-plugins/docker-compose", Buffer.from(buffer));
-
-    // chmod +x /root/.docker/cli-plugins/docker-compose
-    fs.chmodSync("/root/.docker/cli-plugins/docker-compose", 0o111);
-}
-
-main();

extra/reformat-changelog.ts

@@ -1,6 +1,10 @@
 // Generate on GitHub
 const input = `
-* Add Korean translation by @Alanimdeo in https://github.com/louislam/dockge/pull/86
+* 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
 `;
 
 const template = `

extra/reset-password.ts

@@ -5,7 +5,7 @@ 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 "../backend/util-common";
+import { BaseRes } from "../common/util-common";
 
 console.log("== Dockge Reset Password Tool ==");
 
@@ -92,7 +92,6 @@ function disconnectAllSocketClients(username : string, password : string) : Prom
 
         // Disconnect all socket connections
         const socket = io(url, {
-            transports: [ "websocket" ],
             reconnection: false,
             timeout: 5000,
         });

extra/templates/mariadb/compose.yaml

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

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

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

extra/templates/uptime-kuma/compose.yaml

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

frontend/src/components/ArrayInput.vue

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

frontend/src/components/ArraySelect.vue

@@ -4,7 +4,7 @@
             <ul v-if="isArrayInited" class="list-group">
                 <li v-for="(value, index) in array" :key="index" class="list-group-item">
                     <select v-model="array[index]" class="no-bg domain-input">
-                        <option value="">Select a network...</option>
+                        <option value="">{{ $t(`Select a network...`) }}</option>
                         <option v-for="option in options" :key="option" :value="option">{{ option }}</option>
                     </select>
 

frontend/src/components/Container.vue

@@ -116,7 +116,7 @@
                     </label>
 
                     <div v-if="networkList.length === 0 && service.networks && service.networks.length > 0" class="text-warning mb-3">
-                        No networks available. You need to add internal networks or enable external networks in the right side first.
+                        {{ $t("NoNetworksAvailable") }}
                     </div>
 
                     <ArraySelect name="networks" :display-name="$t('network')" placeholder="Network Name" :options="networkList" />
@@ -127,7 +127,7 @@
                     <label class="form-label">
                         {{ $t("dependsOn") }}
                     </label>
-                    <ArrayInput name="depends_on" :display-name="$t('dependsOn')" placeholder="Container Name" />
+                    <ArrayInput name="depends_on" :display-name="$t('dependsOn')" :placeholder="$t(`containerName`)" />
                 </div>
             </div>
         </transition>
@@ -137,7 +137,7 @@
 <script>
 import { defineComponent } from "vue";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import { parseDockerPort } from "../../../backend/util-common";
+import { parseDockerPort } from "../../../common/util-common";
 
 export default defineComponent({
     components: {
@@ -189,14 +189,34 @@ export default defineComponent({
         },
 
         terminalRouteLink() {
-            return {
-                name: "containerTerminal",
-                params: {
-                    stackName: this.stackName,
-                    serviceName: this.name,
-                    type: "bash",
-                },
-            };
+            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;
         },
 
         stackName() {
@@ -254,8 +274,12 @@ export default defineComponent({
     },
     methods: {
         parsePort(port) {
-            let hostname = this.$root.info.primaryHostname || location.hostname;
-            return parseDockerPort(port, hostname);
+            if (this.stack.endpoint) {
+                return parseDockerPort(port, this.stack.primaryHostname);
+            } else {
+                let hostname = this.$root.info.primaryHostname || location.hostname;
+                return parseDockerPort(port, hostname);
+            }
         },
         remove() {
             delete this.jsonObject.services[this.name];

frontend/src/components/NetworkInput.vue

@@ -3,7 +3,7 @@
         <h5>{{ $t("Internal Networks") }}</h5>
         <ul class="list-group">
             <li v-for="(networkRow, index) in networkList" :key="index" class="list-group-item">
-                <input v-model="networkRow.key" type="text" class="no-bg domain-input" placeholder="Network name..." />
+                <input v-model="networkRow.key" type="text" class="no-bg domain-input" :placeholder="$t(`Network name...`)" />
                 <font-awesome-icon icon="times" class="action remove ms-2 me-3 text-danger" @click="remove(index)" />
             </li>
         </ul>
@@ -65,6 +65,10 @@ export default {
         editorFocus() {
             return this.$parent.$parent.editorFocus;
         },
+
+        endpoint() {
+            return this.$parent.$parent.endpoint;
+        },
     },
     watch: {
         "jsonConfig.networks": {
@@ -134,7 +138,7 @@ export default {
         },
 
         loadExternalNetworkList() {
-            this.$root.getSocket().emit("getDockerNetworkList", (res) => {
+            this.$root.emitAgent(this.endpoint, "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($root.stackList).length === 0" class="text-center mt-3">
+            <div v-if="Object.keys(sortedStackList).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 "../../../backend/util-common";
+import { CREATED_FILE, CREATED_STACK, EXITED, RUNNING, UNKNOWN } from "../../../common/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.stackList);
+            let result = Object.values(this.$root.completeStackList);
 
             result = result.filter(stack => {
                 // filter by search text
@@ -160,6 +160,7 @@ export default {
                     return 1;
                 }
 
+                // sort by status
                 if (m1.status !== m2.status) {
                     if (m2.status === RUNNING) {
                         return 1;

frontend/src/components/StackListItem.vue

@@ -1,12 +1,14 @@
 <template>
-    <router-link :to="`/compose/${stack.name}`" :class="{ 'dim' : !stack.isManagedByDockge }" class="item">
+    <router-link :to="url" :class="{ 'dim' : !stack.isManagedByDockge }" class="item">
         <Uptime :stack="stack" :fixed-width="true" class="me-2" />
-        <span class="title">{{ stackName }}</span>
+        <div class="title">
+            <span>{{ stackName }}</span>
+            <div v-if="$root.agentCount > 1" class="endpoint">{{ endpointDisplay }}</div>
+        </div>
     </router-link>
 </template>
 
 <script>
-
 import Uptime from "./Uptime.vue";
 
 export default {
@@ -51,6 +53,16 @@ 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`,
@@ -117,16 +129,31 @@ export default {
     padding-right: 2px !important;
 }
 
-// .stack-item {
-//     width: 100%;
-// }
-
-.tags {
-    margin-top: 4px;
-    padding-left: 67px;
+.item {
+    text-decoration: none;
     display: flex;
-    flex-wrap: wrap;
-    gap: 0;
+    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;
+    }
 }
 
 .collapsed {

frontend/src/components/Terminal.vue

@@ -7,8 +7,7 @@
 <script>
 import { Terminal } from "@xterm/xterm";
 import { FitAddon } from "@xterm/addon-fit";
-import { WebLinksAddon } from "xterm-addon-web-links";
-import { TERMINAL_COLS, TERMINAL_ROWS } from "../../../backend/util-common";
+import { TERMINAL_COLS, TERMINAL_ROWS } from "../../../common/util-common";
 
 export default {
     /**
@@ -24,6 +23,11 @@ export default {
             require: true,
         },
 
+        endpoint: {
+            type: String,
+            require: true,
+        },
+
         // Require if mode is interactive
         stackName: {
             type: String,
@@ -110,14 +114,14 @@ export default {
 
         // Create a new Terminal
         if (this.mode === "mainTerminal") {
-            this.$root.getSocket().emit("mainTerminal", this.name, (res) => {
+            this.$root.emitAgent(this.endpoint, "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.getSocket().emit("interactiveTerminal", this.stackName, this.serviceName, this.shell, (res) => {
+            this.$root.emitAgent(this.endpoint, "interactiveTerminal", this.stackName, this.serviceName, this.shell, (res) => {
                 if (!res.ok) {
                     this.$root.toastRes(res);
                 }
@@ -134,15 +138,15 @@ export default {
     },
 
     methods: {
-        bind(name) {
+        bind(endpoint, 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(name, this.terminal);
+                this.$root.bindTerminal(endpoint, name, this.terminal);
                 console.debug("Terminal bound via parameter: " + name);
             } else if (this.name) {
                 this.$root.unbindTerminal(this.name);
-                this.$root.bindTerminal(this.name, this.terminal);
+                this.$root.bindTerminal(this.endpoint, this.name, this.terminal);
                 console.debug("Terminal bound: " + this.name);
             } else {
                 console.debug("Terminal name not set");
@@ -173,7 +177,7 @@ export default {
                     // Remove the input from the terminal
                     this.removeInput();
 
-                    this.$root.getSocket().emit("terminalInput", this.name, buffer + e.key, (err) => {
+                    this.$root.emitAgent(this.endpoint, "terminalInput", this.name, buffer + e.key, (err) => {
                         this.$root.toastError(err.msg);
                     });
 
@@ -192,7 +196,7 @@ export default {
                     // TODO
                 } else if (e.key === "\u0003") {      // Ctrl + C
                     console.debug("Ctrl + C");
-                    this.$root.getSocket().emit("terminalInput", this.name, e.key);
+                    this.$root.emitAgent(this.endpoint, "terminalInput", this.name, e.key);
                     this.removeInput();
                 } else {
                     this.cursorPosition++;
@@ -205,7 +209,7 @@ export default {
 
         interactiveTerminalConfig() {
             this.terminal.onKey(e => {
-                this.$root.getSocket().emit("terminalInput", this.name, e.key, (res) => {
+                this.$root.emitAgent(this.endpoint, "terminalInput", this.name, e.key, (res) => {
                     if (!res.ok) {
                         this.$root.toastRes(res);
                     }
@@ -234,7 +238,7 @@ export default {
             this.terminalFitAddOn.fit();
             let rows = this.terminal.rows;
             let cols = this.terminal.cols;
-            this.$root.getSocket().emit("terminalResize", this.name, rows, cols);
+            this.$root.emitAgent(this.endpoint, "terminalResize", this.name, rows, cols);
         }
     }
 };
@@ -243,13 +247,12 @@ export default {
 <style scoped lang="scss">
 .main-terminal {
     height: 100%;
-    overflow-x: scroll;
 }
 </style>
 
 <style lang="scss">
 .terminal {
-    padding: 10px 15px;
+    background-color: black !important;
     height: 100%;
 }
 </style>

frontend/src/components/Uptime.vue

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

frontend/src/components/settings/General.vue

@@ -47,7 +47,7 @@
                     <input
                         v-model="settings.primaryHostname"
                         class="form-control"
-                        placeholder="(Unset: Follow current hostname)"
+                        :placeholder="$t(`CurrentHostname`)"
                     />
                     <button class="btn btn-outline-primary" type="button" @click="autoGetPrimaryHostname">
                         {{ $t("autoGet") }}

frontend/src/i18n.ts

@@ -27,6 +27,11 @@ const languageList = {
     "ja": "日本語",
     "nl": "Nederlands",
     "ro": "Română",
+    "id": "Bahasa Indonesia (Indonesian)",
+    "vi": "Tiếng Việt",
+    "hu": "Magyar",
+    "ca": "Català",
+    "ga": "Gaeilge",
 };
 
 let messages = {

frontend/src/lang/ar.json

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

frontend/src/lang/be.json

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

frontend/src/lang/bg-BG.json

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

frontend/src/lang/ca.json

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

frontend/src/lang/da.json

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

frontend/src/lang/de.json

@@ -94,9 +94,23 @@
     "Cannot connect to the socket server.": "Keine Verbindung zum Socket Server.",
     "reverseProxyMsg1": "Wird ein Reverse Proxy genutzt?",
     "reconnecting...": "Erneuter Verbindungsaufbau…",
-    "downStack": "Stoppen & Aus",
+    "downStack": "Stoppen & Deaktivieren",
     "extra": "Extra",
     "url": "URL / URLs",
     "reverseProxyMsg2": "Lerne wie dieser für WebSockets zu konfigurieren ist.",
-    "connecting...": "Verbindungsaufbau zum Socket Server…"
+    "connecting...": "Verbindungsaufbau zum Socket Server…",
+    "newUpdate": "Neues Update",
+    "dockgeAgent": "Dockge Agent | Dockge Agenten",
+    "currentEndpoint": "Aktuell",
+    "dockgeURL": "Dockge URL (z. B. http://127.0.0.1:5001)",
+    "agentOnline": "Online",
+    "agentOffline": "Offline",
+    "connecting": "Verbinden",
+    "connect": "Verbinden",
+    "addAgent": "Agent Hinzufügen",
+    "agentAddedSuccessfully": "Agent erfolgreich hinzugefügt.",
+    "agentRemovedSuccessfully": "Agent erfolgreich entfernt.",
+    "removeAgent": "Agent Entfernen",
+    "removeAgentMsg": "Bist Du sicher, dass Du diesen Agent entfernen möchtest?",
+    "LongSyntaxNotSupported": "Lange Syntax wird nicht unterstützt. Bitte verwende den YAML-Editor."
 }

frontend/src/lang/en.json

@@ -19,7 +19,7 @@
     "restartStack": "Restart",
     "updateStack": "Update",
     "startStack": "Start",
-    "downStack": "Stop & Down",
+    "downStack": "Stop & Inactive",
     "editStack": "Edit",
     "discardStack": "Discard",
     "saveStackDraft": "Save",
@@ -95,9 +95,38 @@
     "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.",
+    "Lost connection to the socket server. Reconnecting...": "Lost connection to the socket server. Reconnecting...",
     "reconnecting...": "Reconnecting…",
     "connecting...": "Connecting to the socket server…",
     "url": "URL | URLs",
     "extra": "Extra",
-    "newUpdate": "New Update"
+    "newUpdate": "New Update",
+    "dockgeAgent": "Dockge Agent | Dockge Agents",
+    "currentEndpoint": "Current",
+    "dockgeURL": "Dockge URL (e.g. http://127.0.0.1:5001)",
+    "agentOnline": "Online",
+    "agentOffline": "Offline",
+    "connecting": "Connecting",
+    "connect": "Connect",
+    "addAgent": "Add Agent",
+    "agentAddedSuccessfully": "Agent added successfully.",
+    "agentRemovedSuccessfully": "Agent removed successfully.",
+    "removeAgent": "Remove Agent",
+    "removeAgentMsg": "Are you sure you want to remove this agent?",
+    "LongSyntaxNotSupported": "Long syntax is not supported here. Please use the YAML editor.",
+    "Saved": "Saved",
+    "Deployed": "Deployed",
+    "Deleted": "Deleted",
+    "Updated": "Updated",
+    "Started": "Started",
+    "Stopped": "Stopped",
+    "Restarted": "Restarted",
+    "Downed": "Downed",
+    "Switch to sh": "Switch to sh",
+    "terminal": "Terminal",
+    "CurrentHostname": "(Unset: Follow current hostname)",
+    "New Container Name...": "New Container Name...",
+    "Network name...": "Network name...",
+    "Select a network...": "Select a network...",
+    "NoNetworksAvailable": "No networks available. You need to add internal networks or enable external networks in the right side first."
 }

frontend/src/lang/es.json

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

frontend/src/lang/fr.json

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

frontend/src/lang/ga.json

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

frontend/src/lang/hu.json

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

frontend/src/lang/id.json

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

frontend/src/lang/it-IT.json

@@ -19,7 +19,7 @@
     "restartStack": "Riavvia",
     "updateStack": "Aggiorna",
     "startStack": "Avvia",
-    "downStack": "Stop & Down",
+    "downStack": "Stop & Inattivo",
     "editStack": "Modifica",
     "discardStack": "Annulla",
     "saveStackDraft": "Salva",
@@ -92,11 +92,25 @@
     "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…",
+    "reverseProxyMsg1": "Stai usando Reverse Proxy?",
+    "reverseProxyMsg2": "Verifica come configurarlo per il WebSocket",
+    "Cannot connect to the socket server.": "impossibile collegarsi al socket server",
+    "connecting...": "connettendosi al socket server…",
     "extra": "Extra",
     "reconnecting...": "Riconnessione…",
-    "url": "Indirizzo | Indirizzi"
+    "url": "URL | URLs",
+    "newUpdate": "Nuovo aggiornamento",
+    "dockgeAgent": "Agente Dockge | Agenti Dockge",
+    "currentEndpoint": "Corrente",
+    "agentOnline": "Online",
+    "agentOffline": "Offline",
+    "connecting": "In connessione",
+    "connect": "Connetti",
+    "dockgeURL": "Dockge URL (ad esempio http://127.0.0.1:5001)",
+    "agentRemovedSuccessfully": "Agente rimosso con successo.",
+    "removeAgent": "Rimuovi Agente",
+    "removeAgentMsg": "Sei sicuro di voler rimuovere questo agente?",
+    "addAgent": "Aggungi Agente",
+    "agentAddedSuccessfully": "Agente aggiunto correttamente.",
+    "LongSyntaxNotSupported": "La sintassi lunga non è supportata qui. Utilizzare l'editor YAML."
 }

frontend/src/lang/ja.json

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

frontend/src/lang/ko-KR.json

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

frontend/src/lang/nb_NO.json

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

frontend/src/lang/nl.json

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

frontend/src/lang/pl-PL.json

@@ -12,7 +12,7 @@
     "registry": "Rejestr",
     "compose": "Stwórz",
     "addFirstStackMsg": "Stwórz swój pierwszy stos!",
-    "stackName" : "Nazwa stosu",
+    "stackName": "Nazwa stosu",
     "deployStack": "Wdroż",
     "deleteStack": "Usuń",
     "stopStack": "Zatrzymaj",
@@ -22,7 +22,7 @@
     "editStack": "Edytuj",
     "discardStack": "Odrzuć",
     "saveStackDraft": "Zapisz",
-    "notAvailableShort" : "N/A",
+    "notAvailableShort": "N/A",
     "deleteStackMsg": "Czy na pewno chcesz usunąć ten stos?",
     "stackNotManagedByDockgeMsg": "Ten stos nie jest zarządzany przez Dockge.",
     "primaryHostname": "Podstawowa nazwa hosta",
@@ -90,5 +90,27 @@
     "Allowed commands:": "Dozwolone polecenia:",
     "Internal Networks": "Sieci wewnętrzne",
     "External Networks": "Sieci zewnętrzne",
-    "No External Networks": "Brak sieci zewnętrznych"
+    "No External Networks": "Brak sieci zewnętrznych",
+    "newUpdate": "Nowa Aktualizacja",
+    "dockgeAgent": "Agent Dockge | Agenci Dockge",
+    "currentEndpoint": "Obecny",
+    "connecting": "Łączenie",
+    "connect": "Połącz",
+    "addAgent": "Dodaj Agenta",
+    "agentAddedSuccessfully": "Agent pomyślnie dodany.",
+    "agentRemovedSuccessfully": "Agent pomyślnie usunięty.",
+    "removeAgent": "Usuń Agenta",
+    "removeAgentMsg": "Czy na pewno usunąć tego Agenta?",
+    "dockgeURL": "Dockge URL (e.g. http://127.0.0.1:5001)",
+    "agentOnline": "Online",
+    "agentOffline": "Offline",
+    "downStack": "Zatrzymaj i Dezaktywuj",
+    "reverseProxyMsg1": "Używasz Serwer Proxy?",
+    "reverseProxyMsg2": "Sprawdź w jaki sposób skonfigurować dla WebSocketów",
+    "Cannot connect to the socket server.": "Brak połączenia z socket serwera.",
+    "connecting...": "Łączenie z socketem serwera…",
+    "extra": "Ekstra",
+    "url": "URL | URLe",
+    "reconnecting...": "Wznawianie połączenia…",
+    "LongSyntaxNotSupported": "Nieobsługiwana składnia. Użyj edytora YAML."
 }

frontend/src/lang/pt-BR.json

@@ -92,11 +92,25 @@
     "External Networks": "Redes externas",
     "No External Networks": "Sem redes externas",
     "reverseProxyMsg2": "Veja como configurar para WebSocket",
-    "downStack": "Parar & Encerrar",
+    "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…"
+    "reconnecting...": "Reconectando…",
+    "newUpdate": "Nova Atualização",
+    "dockgeAgent": "Agente Dockge | Agentes Dockge",
+    "currentEndpoint": "Atual",
+    "dockgeURL": "Dockge URL (ex. http://127.0.0.1:5001)",
+    "agentOnline": "Online",
+    "agentOffline": "Offline",
+    "connecting": "Conectando",
+    "connect": "Conectar",
+    "addAgent": "Adicionar agente",
+    "agentAddedSuccessfully": "Agente adicionado com sucesso.",
+    "agentRemovedSuccessfully": "Agente removido com sucesso.",
+    "removeAgent": "Remover Agente",
+    "removeAgentMsg": "Tem certeza de que deseja remover este agente?",
+    "LongSyntaxNotSupported": "Sintaxe longa não é suportada aqui. Por favor, use o editor de YAML."
 }

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

frontend/src/lang/ru.json

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

frontend/src/lang/sl.json

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

frontend/src/lang/sv-SE.json

@@ -19,7 +19,7 @@
     "restartStack": "Starta om",
     "updateStack": "Uppdatera",
     "startStack": "Starta",
-    "downStack": "Stoppa & Ner",
+    "downStack": "Stoppa & Inaktivera",
     "editStack": "Redigera",
     "discardStack": "Kasta",
     "saveStackDraft": "Spara",
@@ -98,5 +98,19 @@
     "reverseProxyMsg2": "Kontrollera hur man konfigurerar webbsocket",
     "url": "URL | URLer",
     "extra": "Extra",
-    "reconnecting...": "Återansluter…"
+    "reconnecting...": "Återansluter…",
+    "newUpdate": "Ny uppdatering",
+    "currentEndpoint": "Nuvarande",
+    "dockgeURL": "Dockge URL (ex. http://127.0.0.1:5001)",
+    "agentOnline": "On-line",
+    "agentOffline": "Off-line",
+    "connecting": "Ansluter",
+    "connect": "Ansluten",
+    "addAgent": "Lägg till agent",
+    "agentRemovedSuccessfully": "Agent borttagen.",
+    "removeAgent": "Ta bort agent",
+    "removeAgentMsg": "Är du säker att du vill ta bort denna agent?",
+    "dockgeAgent": "Dockge agenter | Dockge agenter",
+    "agentAddedSuccessfully": "Agent tillagd.",
+    "LongSyntaxNotSupported": "Lång syntax stöds inte här. Använd YAML-redigeraren."
 }

frontend/src/lang/th.json

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

frontend/src/lang/tr.json

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

frontend/src/lang/uk-UA.json

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

frontend/src/lang/ur.json

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

frontend/src/lang/vi.json

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

frontend/src/lang/zh-CN.json

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

frontend/src/lang/zh-TW.json

@@ -1,5 +1,5 @@
 {
-    "languageName": "繁體中文(台灣)",
+    "languageName": "繁體中文 (台灣)",
     "Create your admin account": "建立您的管理員帳號",
     "authIncorrectCreds": "使用者名稱或密碼錯誤。",
     "PasswordsDoNotMatch": "兩次輸入的密碼不一致。",
@@ -91,12 +91,14 @@
     "Internal Networks": "內部網路",
     "External Networks": "外部網路",
     "No External Networks": "無外部網路",
-    "downStack": "停止",
+    "downStack": "停止及未啟動化",
     "reverseProxyMsg1": "在使用反向代理嗎？",
     "reverseProxyMsg2": "點擊這裡了解如何為 WebSocket 配置反向代理",
     "Cannot connect to the socket server.": "無法連接到 Socket 伺服器。",
     "reconnecting...": "重新連線中…",
     "connecting...": "連線至 Socket 伺服器中…",
     "url": "網址 | 網址",
-    "extra": "額外"
+    "extra": "額外",
+    "newUpdate": "新版本",
+    "currentEndpoint": "目前"
 }

frontend/src/layouts/Layout.vue

@@ -98,6 +98,7 @@
 <script>
 import Login from "../components/Login.vue";
 import { compareVersions } from "compare-versions";
+import { ALL_ENDPOINTS } from "../../../common/util-common";
 
 export default {
 
@@ -145,7 +146,7 @@ export default {
 
     methods: {
         scanFolder() {
-            this.$root.getSocket().emit("requestStackList", (res) => {
+            this.$root.emitAgent(ALL_ENDPOINTS, "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 "../../backend/util-common";
+import "../../common/util-common";
 
 import { createApp, defineComponent, h } from "vue";
 import App from "./App.vue";

frontend/src/mixins/socket.ts

@@ -3,6 +3,7 @@ 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";
 
 let socket : Socket;
 
@@ -28,16 +29,51 @@ export default defineComponent({
             loggedIn: false,
             allowLoginDialog: false,
             username: null,
-            stackList: {},
             composeTemplate: "",
+
+            stackList: {},
+
+            // All stack list from all agents
+            allAgentStackList: {} as Record<string, object>,
+
+            // online / offline / connecting
+            agentStatusList: {
+
+            },
+
+            // Agent List
+            agentList: {
+
+            },
         };
     },
     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 "🐬";
             }
         },
 
@@ -65,6 +101,15 @@ export default defineComponent({
 
     },
     watch: {
+
+        "socketIO.connected"() {
+            if (this.socketIO.connected) {
+                this.agentStatusList[""] = "online";
+            } else {
+                this.agentStatusList[""] = "offline";
+            }
+        },
+
         remember() {
             localStorage.remember = (this.remember) ? "1" : "0";
         },
@@ -84,6 +129,15 @@ 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
@@ -108,8 +162,12 @@ export default defineComponent({
                 this.socketIO.connecting = true;
             }, 1500);
 
-            socket = io(url, {
-                transports: [ "websocket", "polling" ]
+            socket = io(url);
+
+            // Handling events from agents
+            let agentSocket = new AgentSocket();
+            socket.on("agent", (eventName : unknown, ...args : unknown[]) => {
+                agentSocket.call(eventName, ...args);
             });
 
             socket.on("connect", () => {
@@ -145,7 +203,7 @@ export default defineComponent({
 
             socket.on("disconnect", () => {
                 console.log("disconnect");
-                this.socketIO.connectionErrorMsg = "Lost connection to the socket server. Reconnecting...";
+                this.socketIO.connectionErrorMsg = `${this.$t("Lost connection to the socket server. Reconnecting...")}`;
                 this.socketIO.connected = false;
             });
 
@@ -177,7 +235,7 @@ export default defineComponent({
                 this.$router.push("/setup");
             });
 
-            socket.on("terminalWrite", (terminalName, data) => {
+            agentSocket.on("terminalWrite", (terminalName, data) => {
                 const terminal = terminalMap.get(terminalName);
                 if (!terminal) {
                     //console.error("Terminal not found: " + terminalName);
@@ -186,9 +244,18 @@ export default defineComponent({
                 terminal.write(data);
             });
 
-            socket.on("stackList", (res) => {
+            agentSocket.on("stackList", (res) => {
                 if (res.ok) {
-                    this.stackList = res.stackList;
+                    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;
+                    }
                 }
             });
 
@@ -203,6 +270,21 @@ 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();
             });
@@ -220,6 +302,10 @@ 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
@@ -310,9 +396,9 @@ export default defineComponent({
 
         },
 
-        bindTerminal(terminalName : string, terminal : Terminal) {
+        bindTerminal(endpoint : string, terminalName : string, terminal : Terminal) {
             // Load terminal, get terminal screen
-            socket.emit("terminalJoin", terminalName, (res) => {
+            this.emitAgent(endpoint, "terminalJoin", terminalName, (res) => {
                 if (res.ok) {
                     terminal.write(res.buffer);
                     terminalMap.set(terminalName, terminal);

frontend/src/pages/Compose.vue

@@ -1,8 +1,13 @@
 <template>
     <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 }}</h1>
+            <h1 v-if="isAdd" class="mb-3">{{$t("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>
 
             <div v-if="stack.isManagedByDockge" class="mb-3">
                 <div class="btn-group me-2" role="group">
@@ -70,6 +75,7 @@
                     ref="progressTerminal"
                     class="mb-3 terminal"
                     :name="terminalName"
+                    :endpoint="endpoint"
                     :rows="progressTerminalRows"
                     @has-data="showProgressTerminal = true; submitted = true;"
                 ></Terminal>
@@ -87,6 +93,16 @@
                                 <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>
 
@@ -96,7 +112,7 @@
                     <div v-if="isEditMode" class="input-group mb-3">
                         <input
                             v-model="newContainerName"
-                            placeholder="New Container Name..."
+                            :placeholder="$t(`New Container Name...`)"
                             class="form-control"
                             @keyup.enter="addContainer"
                         />
@@ -134,14 +150,15 @@
 
                     <!-- Combined Terminal Output -->
                     <div v-show="!isEditMode">
-                        <h4 class="mb-3">Terminal</h4>
+                        <h4 class="mb-3">{{$t("terminal")}}</h4>
                         <Terminal
                             ref="combinedTerminal"
                             class="mb-3 terminal"
                             :name="combinedTerminalName"
+                            :endpoint="endpoint"
                             :rows="combinedTerminalRows"
                             :cols="combinedTerminalCols"
-                            style="height: 350px;"
+                            style="height: 315px;"
                         ></Terminal>
                     </div>
                 </div>
@@ -236,12 +253,12 @@ import {
     getComposeTerminalName,
     PROGRESS_TERMINAL_ROWS,
     RUNNING
-} from "../../../backend/util-common";
+} from "../../../common/util-common";
 import { BModal } from "bootstrap-vue-next";
 import NetworkInput from "../components/NetworkInput.vue";
 import dotenv from "dotenv";
 
-const template = `version: "3.8"
+const template = `
 services:
   nginx:
     image: nginx:latest
@@ -298,6 +315,10 @@ 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)) {
                 return [];
@@ -334,7 +355,7 @@ export default {
          * @return {*}
          */
         globalStack() {
-            return this.$root.stackList[this.stack.name];
+            return this.$root.completeStackList[this.stack.name + "_" + this.endpoint];
         },
 
         status() {
@@ -349,20 +370,31 @@ export default {
             if (!this.stack.name) {
                 return "";
             }
-            return getComposeTerminalName(this.stack.name);
+            return getComposeTerminalName(this.endpoint, this.stack.name);
         },
 
         combinedTerminalName() {
             if (!this.stack.name) {
                 return "";
             }
-            return getCombinedTerminalName(this.stack.name);
+            return getCombinedTerminalName(this.endpoint, 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": {
@@ -405,9 +437,7 @@ export default {
         },
 
         $route(to, from) {
-            // Leave Combined Terminal
-            console.debug("leaveCombinedTerminal", from.params.stackName);
-            this.$root.getSocket().emit("leaveCombinedTerminal", this.stack.name, () => {});
+
         }
     },
     mounted() {
@@ -437,6 +467,7 @@ export default {
                 composeYAML,
                 composeENV,
                 isManagedByDockge: true,
+                endpoint: "",
             };
 
             this.yamlCodeChange();
@@ -449,11 +480,9 @@ export default {
         this.requestServiceStatus();
     },
     unmounted() {
-        this.stopServiceStatusTimeout = true;
-        clearTimeout(serviceStatusTimeout);
+
     },
     methods: {
-
         startServiceStatusTimeout() {
             clearTimeout(serviceStatusTimeout);
             serviceStatusTimeout = setTimeout(async () => {
@@ -462,7 +491,7 @@ export default {
         },
 
         requestServiceStatus() {
-            this.$root.getSocket().emit("serviceStatusList", this.stack.name, (res) => {
+            this.$root.emitAgent(this.endpoint, "serviceStatusList", this.stack.name, (res) => {
                 if (res.ok) {
                     this.serviceStatusList = res.serviceStatusList;
                 }
@@ -475,22 +504,34 @@ 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.terminalName);
+            this.$refs.progressTerminal?.bind(this.endpoint, this.terminalName);
         },
 
         loadStack() {
             this.processing = true;
-            this.$root.getSocket().emit("getStack", this.stack.name, (res) => {
+            this.$root.emitAgent(this.endpoint, "getStack", this.stack.name, (res) => {
                 if (res.ok) {
                     this.stack = res.stack;
                     this.yamlCodeChange();
@@ -532,15 +573,15 @@ export default {
                 }
             }
 
-            this.bindTerminal(this.terminalName);
+            this.bindTerminal();
 
-            this.$root.getSocket().emit("deployStack", this.stack.name, this.stack.composeYAML, this.stack.composeENV, this.isAdd, (res) => {
+            this.$root.emitAgent(this.stack.endpoint, "deployStack", this.stack.name, this.stack.composeYAML, this.stack.composeENV, this.isAdd, (res) => {
                 this.processing = false;
                 this.$root.toastRes(res);
 
                 if (res.ok) {
                     this.isEditMode = false;
-                    this.$router.push("/compose/" + this.stack.name);
+                    this.$router.push(this.url);
                 }
             });
         },
@@ -548,13 +589,13 @@ export default {
         saveStack() {
             this.processing = true;
 
-            this.$root.getSocket().emit("saveStack", this.stack.name, this.stack.composeYAML, this.stack.composeENV, this.isAdd, (res) => {
+            this.$root.emitAgent(this.stack.endpoint, "saveStack", this.stack.name, this.stack.composeYAML, this.stack.composeENV, this.isAdd, (res) => {
                 this.processing = false;
                 this.$root.toastRes(res);
 
                 if (res.ok) {
                     this.isEditMode = false;
-                    this.$router.push("/compose/" + this.stack.name);
+                    this.$router.push(this.url);
                 }
             });
         },
@@ -562,7 +603,7 @@ export default {
         startStack() {
             this.processing = true;
 
-            this.$root.getSocket().emit("startStack", this.stack.name, (res) => {
+            this.$root.emitAgent(this.endpoint, "startStack", this.stack.name, (res) => {
                 this.processing = false;
                 this.$root.toastRes(res);
             });
@@ -571,7 +612,7 @@ export default {
         stopStack() {
             this.processing = true;
 
-            this.$root.getSocket().emit("stopStack", this.stack.name, (res) => {
+            this.$root.emitAgent(this.endpoint, "stopStack", this.stack.name, (res) => {
                 this.processing = false;
                 this.$root.toastRes(res);
             });
@@ -580,7 +621,7 @@ export default {
         downStack() {
             this.processing = true;
 
-            this.$root.getSocket().emit("downStack", this.stack.name, (res) => {
+            this.$root.emitAgent(this.endpoint, "downStack", this.stack.name, (res) => {
                 this.processing = false;
                 this.$root.toastRes(res);
             });
@@ -589,7 +630,7 @@ export default {
         restartStack() {
             this.processing = true;
 
-            this.$root.getSocket().emit("restartStack", this.stack.name, (res) => {
+            this.$root.emitAgent(this.endpoint, "restartStack", this.stack.name, (res) => {
                 this.processing = false;
                 this.$root.toastRes(res);
             });
@@ -598,14 +639,14 @@ export default {
         updateStack() {
             this.processing = true;
 
-            this.$root.getSocket().emit("updateStack", this.stack.name, (res) => {
+            this.$root.emitAgent(this.endpoint, "updateStack", this.stack.name, (res) => {
                 this.processing = false;
                 this.$root.toastRes(res);
             });
         },
 
         deleteDialog() {
-            this.$root.getSocket().emit("deleteStack", this.stack.name, (res) => {
+            this.$root.emitAgent(this.endpoint, "deleteStack", this.stack.name, (res) => {
                 this.$root.toastRes(res);
                 if (res.ok) {
                     this.$router.push("/");
@@ -750,6 +791,8 @@ export default {
 </script>
 
 <style scoped lang="scss">
+@import "../styles/vars.scss";
+
 .terminal {
     height: 200px;
 }
@@ -761,4 +804,9 @@ 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"></Terminal>
+            <Terminal class="terminal" :rows="20" mode="mainTerminal" name="console" :endpoint="endpoint"></Terminal>
         </div>
     </transition>
 </template>
 
 <script>
 
-import { allowedCommandList } from "../../../backend/util-common";
+import { allowedCommandList } from "../../../common/util-common";
 
 export default {
     components: {
@@ -32,6 +32,11 @@ export default {
             allowedCommandList,
         };
     },
+    computed: {
+        endpoint() {
+            return this.$route.params.endpoint || "";
+        },
+    },
     mounted() {
 
     },

frontend/src/pages/ContainerTerminal.vue

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

frontend/src/pages/DashboardHome.vue

@@ -5,36 +5,97 @@
                 {{ $t("home") }}
             </h1>
 
-            <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 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>
-                    <div class="col">
-                        <h3>{{ $t("exited") }}</h3>
-                        <span class="num exited">{{ exitedNum }}</span>
+
+                    <!-- 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>
-                    <div class="col">
-                        <h3>{{ $t("inactive") }}</h3>
-                        <span class="num inactive">{{ inactiveNum }}</span>
+
+                    <button class="btn-normal btn mb-4" @click="convertDockerRun">{{ $t("Convert to Compose") }}</button>
+                </div>
+                <!-- Right -->
+                <div class="col-md-5">
+                    <!-- Agent List -->
+                    <div class="shadow-box big-padding">
+                        <h4 class="mb-3">{{ $tc("dockgeAgent", 2) }} <span class="badge bg-warning" style="font-size: 12px;">beta</span></h4>
+
+                        <div v-for="(agent, endpoint) in $root.agentList" :key="endpoint" class="mb-3 agent">
+                            <!-- Agent Status -->
+                            <template v-if="$root.agentStatusList[endpoint]">
+                                <span v-if="$root.agentStatusList[endpoint] === 'online'" class="badge bg-primary me-2">{{ $t("agentOnline") }}</span>
+                                <span v-else-if="$root.agentStatusList[endpoint] === 'offline'" class="badge bg-danger me-2">{{ $t("agentOffline") }}</span>
+                                <span v-else class="badge bg-secondary me-2">{{ $t($root.agentStatusList[endpoint]) }}</span>
+                            </template>
+
+                            <!-- Agent Display Name -->
+                            <span v-if="endpoint === ''">{{ $t("currentEndpoint") }}</span>
+                            <a v-else :href="agent.url" target="_blank">{{ endpoint }}</a>
+
+                            <!-- Remove Button -->
+                            <font-awesome-icon v-if="endpoint !== ''" class="ms-2 remove-agent" icon="trash" @click="showRemoveAgentDialog[agent.url] = !showRemoveAgentDialog[agent.url]" />
+
+                            <!-- Remoe Agent Dialog -->
+                            <BModal v-model="showRemoveAgentDialog[agent.url]" :okTitle="$t('removeAgent')" okVariant="danger" @ok="removeAgent(agent.url)">
+                                <p>{{ agent.url }}</p>
+                                {{ $t("removeAgentMsg") }}
+                            </BModal>
+                        </div>
+
+                        <button v-if="!showAgentForm" class="btn btn-normal" @click="showAgentForm = !showAgentForm">{{ $t("addAgent") }}</button>
+
+                        <!-- Add Agent Form -->
+                        <form v-if="showAgentForm" @submit.prevent="addAgent">
+                            <div class="mb-3">
+                                <label for="url" class="form-label">{{ $t("dockgeURL") }}</label>
+                                <input id="url" v-model="agent.url" type="url" class="form-control" required placeholder="http://">
+                            </div>
+
+                            <div class="mb-3">
+                                <label for="username" class="form-label">{{ $t("Username") }}</label>
+                                <input id="username" v-model="agent.username" type="text" class="form-control" required>
+                            </div>
+
+                            <div class="mb-3">
+                                <label for="password" class="form-label">{{ $t("Password") }}</label>
+                                <input id="password" v-model="agent.password" type="password" class="form-control" required autocomplete="new-password">
+                            </div>
+
+                            <button type="submit" class="btn btn-primary" :disabled="connectingAgent">
+                                <template v-if="connectingAgent">{{ $t("connecting") }}</template>
+                                <template v-else>{{ $t("connect") }}</template>
+                            </button>
+                        </form>
                     </div>
                 </div>
             </div>
-
-            <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 "../../../backend/util-common";
+import { statusNameShort } from "../../../common/util-common";
 
 export default {
     components: {
@@ -58,6 +119,14 @@ export default {
             importantHeartBeatListLength: 0,
             displayedRecords: [],
             dockerRunCommand: "",
+            showAgentForm: false,
+            showRemoveAgentDialog: {},
+            connectingAgent: false,
+            agent: {
+                url: "http://",
+                username: "",
+                password: "",
+            }
         };
     },
 
@@ -98,11 +167,43 @@ 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.stackList) {
-                const stack = this.$root.stackList[stackName];
+            for (let stackName in this.$root.completeStackList) {
+                const stack = this.$root.completeStackList[stackName];
                 if (statusNameShort(stack.status) === statusName) {
                     num += 1;
                 }
@@ -230,4 +331,20 @@ 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

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

frontend/src/styles/main.scss

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

package.json

@@ -1,23 +1,25 @@
 {
     "name": "dockge",
-    "version": "1.3.4",
+    "version": "1.4.2",
     "type": "module",
     "engines": {
-        "node": ">= 18.0.0 && <= 18.17.1"
+        "node": ">= 22.14.0"
     },
     "scripts": {
         "fmt": "eslint \"**/*.{ts,vue}\" --fix",
         "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": "concurrently -k -r \"wait-on tcp:5000 && npm run dev:backend \" \"npm 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-final": "tsx ./extra/test-docker.ts && tsx extra/update-version.ts && npm run build:frontend && npm run build:docker",
+        "release-beta": "tsx ./extra/test-docker.ts && tsx extra/update-version.ts && npm 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 --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: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-nightly": "npm 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",
@@ -25,38 +27,39 @@
         "reset-password": "tsx ./extra/reset-password.ts"
     },
     "dependencies": {
-        "@homebridge/node-pty-prebuilt-multiarch": "~0.11.12",
+        "@homebridge/node-pty-prebuilt-multiarch": "0.11.14",
         "@inventage/envsubst": "^0.16.0",
         "@louislam/sqlite3": "~15.1.6",
         "bcryptjs": "~2.4.3",
-        "check-password-strength": "~2.0.7",
+        "check-password-strength": "~2.0.10",
         "command-exists": "~1.2.9",
-        "compare-versions": "~6.1.0",
-        "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",
+        "compare-versions": "~6.1.1",
+        "composerize": "~1.7.1",
+        "croner": "~8.1.2",
+        "dayjs": "~1.11.13",
+        "dotenv": "~16.3.2",
+        "express": "~4.21.2",
+        "express-static-gzip": "~2.1.8",
+        "http-graceful-shutdown": "~3.1.14",
         "jsonwebtoken": "~9.0.2",
         "jwt-decode": "~3.1.2",
         "knex": "~2.5.1",
         "limiter-es6-compat": "~2.1.2",
-        "mysql2": "~3.6.5",
+        "mysql2": "~3.12.0",
         "promisify-child-process": "~4.1.2",
         "redbean-node": "~0.3.3",
-        "socket.io": "~4.7.2",
-        "socket.io-client": "~4.7.2",
-        "timezones-list": "~3.0.2",
+        "semver": "^7.7.1",
+        "socket.io": "~4.8.1",
+        "socket.io-client": "~4.8.1",
+        "timezones-list": "~3.0.3",
         "ts-command-line-args": "~2.5.1",
-        "tsx": "~4.6.2",
+        "tsx": "~4.19.3",
         "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.2.5",
         "@fortawesome/fontawesome-svg-core": "6.4.2",
         "@fortawesome/free-regular-svg-icons": "6.4.2",
         "@fortawesome/free-solid-svg-icons": "6.4.2",
@@ -65,7 +68,8 @@
         "@types/bootstrap": "~5.2.10",
         "@types/command-exists": "~1.2.3",
         "@types/express": "~4.17.21",
-        "@types/jsonwebtoken": "~9.0.5",
+        "@types/jsonwebtoken": "~9.0.9",
+        "@types/semver": "^7.7.0",
         "@typescript-eslint/eslint-plugin": "~6.8.0",
         "@typescript-eslint/parser": "~6.8.0",
         "@vitejs/plugin-vue": "~4.5.2",
@@ -77,19 +81,19 @@
         "cross-env": "~7.0.3",
         "eslint": "~8.50.0",
         "eslint-plugin-jsdoc": "~46.8.2",
-        "eslint-plugin-vue": "~9.17.0",
-        "prismjs": "~1.29.0",
+        "eslint-plugin-vue": "~9.32.0",
+        "prismjs": "~1.30.0",
         "sass": "~1.68.0",
         "typescript": "~5.2.2",
         "unplugin-vue-components": "~0.25.2",
-        "vite": "~5.0.7",
+        "vite": "~5.4.15",
         "vite-plugin-compression": "~0.5.1",
-        "vue": "~3.3.11",
+        "vue": "~3.5.13",
         "vue-eslint-parser": "~9.3.2",
-        "vue-i18n": "~9.5.0",
+        "vue-i18n": "~10.0.6",
         "vue-prism-editor": "2.0.0-alpha.2",
-        "vue-qrcode": "~2.2.0",
-        "vue-router": "~4.2.5",
+        "vue-qrcode": "~2.2.2",
+        "vue-router": "~4.5.0",
         "vue-toastification": "2.0.0-rc.5",
         "wait-on": "^7.2.0",
         "xterm-addon-web-links": "~0.9.0"

tsconfig.json

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