Update

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

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) ![GitHub issues](https://img.shields.io/github/issues/louislam/dockge?logo=github) ![GitHub pull requests](https://img.shields.io/github/issues-pr/louislam/dockge?logo=github) ![Docker Pulls](https://img.shields.io/docker/pulls/louislam/dockge?logo=docker) ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/louislam/dockge/latest?label=docker%20image%20ver.) ![GitHub last commit (branch)](https://img.shields.io/github/last-commit/louislam/dockge/master?logo=github) ![GitHub](https://img.shields.io/github/license/louislam/dockge?logo=github)
+![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)
 
 <img src="https://github.com/louislam/dockge/assets/1336778/26a583e1-ecb1-4a8d-aedf-76157d714ad7" width="900" alt="" />
 

backend/dockge-server.ts

@@ -194,6 +194,39 @@ export class DockgeServer {
         // Create Socket.io
         this.io = new socketIO.Server(this.httpServer, {
             cors,
+            allowRequest: (req, callback) => {
+                let isOriginValid = true;
+                const bypass = isDev;
+
+                if (!bypass) {
+                    let host = req.headers.host;
+
+                    // If this is set, it means the request is from the browser
+                    let origin = req.headers.origin;
+
+                    // If this is from the browser, check if the origin is allowed
+                    if (origin) {
+                        try {
+                            let originURL = new URL(origin);
+
+                            if (host !== originURL.host) {
+                                isOriginValid = false;
+                                log.error("auth", `Origin (${origin}) does not match host (${host}), IP: ${req.socket.remoteAddress}`);
+                            }
+                        } catch (e) {
+                            // Invalid origin url, probably not from browser
+                            isOriginValid = false;
+                            log.error("auth", `Invalid origin url (${origin}), IP: ${req.socket.remoteAddress}`);
+                        }
+                    } else {
+                        log.info("auth", `Origin is not set, IP: ${req.socket.remoteAddress}`);
+                    }
+                } else {
+                    log.debug("auth", "Origin check is bypassed");
+                }
+
+                callback(null, isOriginValid);
+            }
         });
 
         this.io.on("connection", async (socket: Socket) => {
@@ -578,4 +611,35 @@ export class DockgeServer {
     finalFunction() {
         log.info("server", "Graceful shutdown successful!");
     }
+
+    /**
+     * Force connected sockets of a user to refresh and disconnect.
+     * Used for resetting password.
+     * @param {string} userID
+     * @param {string?} currentSocketID
+     */
+    disconnectAllSocketClients(userID: number, currentSocketID? : string) {
+        for (const rawSocket of this.io.sockets.sockets.values()) {
+            let socket = rawSocket as DockgeSocket;
+            if (socket.userID === userID && socket.id !== currentSocketID) {
+                try {
+                    socket.emit("refresh");
+                    socket.disconnect();
+                } catch (e) {
+
+                }
+            }
+        }
+    }
+
+    isSSL() {
+        return this.config.sslKey && this.config.sslCert;
+    }
+
+    getLocalWebSocketURL() {
+        const protocol = this.isSSL() ? "wss" : "ws";
+        const host = this.config.hostname || "localhost";
+        return `${protocol}://${host}:${this.config.port}`;
+    }
+
 }

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

@@ -211,6 +211,8 @@ export class MainSocketHandler extends SocketHandler {
                 let user = await doubleCheckPassword(socket, password.currentPassword);
                 await user.resetPassword(password.newPassword);
 
+                server.disconnectAllSocketClients(user.id, socket.id);
+
                 callback({
                     ok: true,
                     msg: "Password has been updated successfully.",
@@ -280,6 +282,18 @@ export class MainSocketHandler extends SocketHandler {
                 }
             }
         });
+
+        // Disconnect all other socket clients of the user
+        socket.on("disconnectOtherSocketClients", async () => {
+            try {
+                checkLogin(socket);
+                server.disconnectAllSocketClients(socket.userID, socket.id);
+            } catch (e) {
+                if (e instanceof Error) {
+                    log.warn("disconnectOtherSocketClients", e.message);
+                }
+            }
+        });
     }
 
     async login(username : string, password : string) : Promise<User | null> {

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

@@ -162,9 +162,44 @@ export class TerminalSocketHandler extends SocketHandler {
             }
         });
 
-        // TODO: Resize Terminal
-        socket.on("terminalResize", async (rows : unknown) => {
+        // 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.");
+                    }
 
-        });
+                    if (typeof rows !== "number") {
+                        throw new Error("Command must be a number.");
+                    }
+                    if (typeof cols !== "number") {
+                        throw new Error("Command must be a number.");
+                    }
+
+                    let terminal = Terminal.getTerminal(terminalName);
+
+                    // log.info("terminal", terminal);
+                    if (terminal instanceof Terminal) {
+                        //log.debug("terminalInput", "Terminal found, writing to terminal.");
+                        terminal.rows = rows;
+                        terminal.cols = cols;
+                    } else {
+                        throw new Error(`${terminalName} Terminal not found.`);
+                    }
+                } catch (e) {
+                    log.debug(
+                        "terminalResize",
+                        // Added to prevent the lint error when adding the type
+                        // and ts type checker saying type is unknown.
+                        // @ts-ignore
+                        `Error on ${terminalName}: ${e.message}`
+                    );
+                }
+            }
+        );
     }
 }

backend/stack.ts

@@ -5,6 +5,7 @@ import yaml from "yaml";
 import { DockgeSocket, fileExists, ValidationError } from "./util-server";
 import path from "path";
 import {
+    acceptedComposeFileNames,
     COMBINED_TERMINAL_COLS,
     COMBINED_TERMINAL_ROWS,
     CREATED_FILE,
@@ -40,8 +41,7 @@ export class Stack {
 
         if (!skipFSOperations) {
             // Check if compose file name is different from compose.yaml
-            const supportedFileNames = [ "compose.yaml", "compose.yml", "docker-compose.yml", "docker-compose.yaml" ];
-            for (const filename of supportedFileNames) {
+            for (const filename of acceptedComposeFileNames) {
                 if (fs.existsSync(path.join(this.path, filename))) {
                     this._composeFileName = filename;
                     break;
@@ -222,6 +222,26 @@ export class Stack {
         }
     }
 
+    /**
+     * Checks if a compose file exists in the specified directory.
+     * @async
+     * @static
+     * @param {string} stacksDir - The directory of the stack.
+     * @param {string} filename - The name of the directory to check for the compose file.
+     * @returns {Promise<boolean>} A promise that resolves to a boolean indicating whether any compose file exists.
+     */
+    static async composeFileExists(stacksDir : string, filename : string) : Promise<boolean> {
+        let filenamePath = path.join(stacksDir, filename);
+        // Check if any compose file exists
+        for (const filename of acceptedComposeFileNames) {
+            let composeFile = path.join(filenamePath, filename);
+            if (await fileExists(composeFile)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     static async getStackList(server : DockgeServer, useCacheForManaged = false) : Promise<Map<string, Stack>> {
         let stacksDir = server.stacksDir;
         let stackList : Map<string, Stack>;
@@ -242,6 +262,10 @@ export class Stack {
                     if (!stat.isDirectory()) {
                         continue;
                     }
+                    // If no compose file exists, skip it
+                    if (!await Stack.composeFileExists(stacksDir, filename)) {
+                        continue;
+                    }
                     let stack = await this.getStack(server, filename);
                     stack._status = CREATED_FILE;
                     stackList.set(filename, stack);

backend/terminal.ts

@@ -67,6 +67,7 @@ export class Terminal {
 
     set cols(cols : number) {
         this._cols = cols;
+        log.debug("Terminal", `Terminal cols: ${this._cols}`); // Added to check if cols is being set when changing terminal size.
         try {
             this.ptyProcess?.resize(this.cols, this.rows);
         } catch (e) {

backend/util-common.ts

@@ -21,6 +21,11 @@ export interface LooseObject {
     [key: string]: any
 }
 
+export interface BaseRes {
+    ok: boolean;
+    msg?: string;
+}
+
 let randomBytes : (numBytes: number) => Uint8Array;
 initRandomBytes();
 
@@ -111,6 +116,13 @@ export const allowedRawKeys = [
     "\u0003", // Ctrl + C
 ];
 
+export const acceptedComposeFileNames = [
+    "compose.yaml",
+    "docker-compose.yaml",
+    "docker-compose.yml",
+    "compose.yml",
+];
+
 /**
  * Generate a decimal integer number from a string
  * @param str Input
@@ -380,7 +392,11 @@ function traverseYAML(pair : Pair, env : DotenvParseOutput) : void {
             if (item instanceof Pair) {
                 traverseYAML(item, env);
             } else if (item instanceof Scalar) {
-                item.value = envsubst(item.value, env);
+                let value = item.value as unknown;
+
+                if (typeof(value) === "string") {
+                    item.value = envsubst(value, env);
+                }
             }
         }
     // @ts-ignore

docker/Base.Dockerfile

@@ -2,6 +2,14 @@
 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
+
 RUN apt update && apt install --yes --no-install-recommends \
     curl \
     ca-certificates \
@@ -18,7 +26,12 @@ 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

extra/download-docker-compose.ts

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

@@ -4,16 +4,30 @@ const input = `
 `;
 
 const template = `
+
+> [!WARNING]
+>
+
 ### 🆕 New Features
+-
 
-### Improvements
+### ⬆️ Improvements
+-
 
-### 🐞 Bug Fixes
+### 🐛 Bug Fixes
+-
 
 ### 🦎 Translation Contributions
+-
+
+### ⬆️ Security Fixes
+-
 
 ### Others
 - Other small changes, code refactoring and comment/doc updates in this repo:
+-
+
+Please let me know if your username is missing, if your pull request has been merged in this version, or your commit has been included in one of the pull requests.
 `;
 
 const lines = input.split("\n").filter((line) => line.trim() !== "");
@@ -37,6 +51,12 @@ for (const line of lines) {
     }
 
     message = message.split("* ").pop();
-    console.log("-", pullRequestID, message, `(Thanks ${username})`);
+
+    let thanks = "";
+    if (username != "@louislam") {
+        thanks = `(Thanks ${username})`;
+    }
+
+    console.log(pullRequestID, message, thanks);
 }
 console.log(template);

extra/reset-password.ts

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

frontend/src/components/Terminal.vue

@@ -5,7 +5,8 @@
 </template>
 
 <script>
-import { Terminal } from "xterm";
+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";
 
@@ -122,10 +123,12 @@ export default {
                 }
             });
         }
-
+        // Fit the terminal width to the div container size after terminal is created.
+        this.updateTerminalSize();
     },
 
     unmounted() {
+        window.removeEventListener("resize", this.onResizeEvent); // Remove the resize event listener from the window object.
         this.$root.unbindTerminal(this.name);
         this.terminal.dispose();
     },
@@ -208,6 +211,30 @@ export default {
                     }
                 });
             });
+        },
+
+        /**
+         * Update the terminal size to fit the container size.
+         *
+         * If the terminalFitAddOn is not created, creates it, loads it and then fits the terminal to the appropriate size.
+         * It then addes an event listener to the window object to listen for resize events and calls the fit method of the terminalFitAddOn.
+         */
+        updateTerminalSize() {
+            if (!Object.hasOwn(this, "terminalFitAddOn")) {
+                this.terminalFitAddOn = new FitAddon();
+                this.terminal.loadAddon(this.terminalFitAddOn);
+                window.addEventListener("resize", this.onResizeEvent);
+            }
+            this.terminalFitAddOn.fit();
+        },
+        /**
+         * Handles the resize event of the terminal component.
+         */
+        onResizeEvent() {
+            this.terminalFitAddOn.fit();
+            let rows = this.terminal.rows;
+            let cols = this.terminal.cols;
+            this.$root.getSocket().emit("terminalResize", this.name, rows, cols);
         }
     }
 };

frontend/src/lang/de.json

@@ -10,7 +10,7 @@
     "home": "Startseite",
     "console": "Konsole",
     "registry": "Container Registry",
-    "compose": "",
+    "compose": "Compose",
     "addFirstStackMsg": "Stelle deinen ersten Stack zusammen!",
     "stackName": "Stack-Name",
     "deployStack": "Deployen",
@@ -72,15 +72,15 @@
     "Check Update On GitHub": "Update auf GitHub überprüfen",
     "Show update if available": "Update anzeigen, wenn verfügbar",
     "Also check beta release": "Auch Beta-Version überprüfen",
-    "Remember me": "Anmeldung beibehalten",
+    "Remember me": "Angemeldet bleiben",
     "Login": "Anmelden",
     "Username": "Benutzername",
     "Password": "Passwort",
     "Settings": "Einstellungen",
     "Logout": "Abmelden",
     "Lowercase only": "Nur Kleinbuchstaben",
-    "Convert to Compose": "In Compose Syntax umwandeln",
-    "Docker Run": "Docker ausführen",
+    "Convert to Compose": "In Compose-Syntax umwandeln",
+    "Docker Run": "Docker Run",
     "active": "aktiv",
     "exited": "beendet",
     "inactive": "inaktiv",

frontend/src/lang/pt-BR.json

@@ -12,7 +12,7 @@
     "registry": "Registro",
     "compose": "Compose",
     "addFirstStackMsg": "Crie sua primeira stack!",
-    "stackName" : "Nome da stack",
+    "stackName": "Nome da stack",
     "deployStack": "Deploy",
     "deleteStack": "Excluir",
     "stopStack": "Parar",
@@ -22,7 +22,7 @@
     "editStack": "Editar",
     "discardStack": "Descartar",
     "saveStackDraft": "Salvar",
-    "notAvailableShort" : "N/D",
+    "notAvailableShort": "N/D",
     "deleteStackMsg": "Tem certeza que deseja excluir esta stack?",
     "stackNotManagedByDockgeMsg": "Esta stack não é gerenciada pelo Dockge.",
     "primaryHostname": "Nome do Host Primário",
@@ -90,5 +90,13 @@
     "Allowed commands:": "Comandos permitidos:",
     "Internal Networks": "Redes internas",
     "External Networks": "Redes externas",
-    "No External Networks": "Sem redes externas"
+    "No External Networks": "Sem redes externas",
+    "reverseProxyMsg2": "Veja como configurar para WebSocket",
+    "downStack": "Parar & Encerrar",
+    "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…"
 }

frontend/src/lang/ru.json

@@ -5,12 +5,12 @@
     "PasswordsDoNotMatch": "Пароль не совпадает.",
     "Repeat Password": "Повторите пароль",
     "Create": "Создать",
-    "signedInDisp": "Авторизован как",
+    "signedInDisp": "Авторизован как {0}",
     "signedInDispDisabled": "Авторизация выключена.",
     "home": "Главная",
     "console": "Консоль",
-    "registry": "Registry",
-    "compose": "Compose",
+    "registry": "Реестр (Registry)",
+    "compose": "Составить (Compose)",
     "addFirstStackMsg": "Создайте свой первый стек!",
     "stackName": "Имя стека",
     "deployStack": "Развернуть",
@@ -90,5 +90,13 @@
     "Allowed commands:": "Разрешенные команды:",
     "Internal Networks": "Внутренние сети",
     "External Networks": "Внешние сети",
-    "No External Networks": "Нет внешних сетей"
+    "No External Networks": "Нет внешних сетей",
+    "downStack": "Остановить и выключить",
+    "reverseProxyMsg1": "Использовать Реверс Прокси?",
+    "reconnecting...": "Переподключение…",
+    "Cannot connect to the socket server.": "Не удается подключиться к серверу сокетов.",
+    "url": "URL адрес(а)",
+    "extra": "Дополнительно",
+    "reverseProxyMsg2": "Проверьте, как настроить его для WebSocket",
+    "connecting...": "Подключение к серверу сокетов…"
 }

frontend/src/lang/sv-SE.json

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

frontend/src/lang/zh-TW.json

@@ -92,7 +92,7 @@
     "External Networks": "外部網路",
     "No External Networks": "無外部網路",
     "downStack": "停止",
-    "reverseProxyMsg1": "在使用反向代理吗？",
+    "reverseProxyMsg1": "在使用反向代理嗎？",
     "reverseProxyMsg2": "點擊這裡了解如何為 WebSocket 配置反向代理",
     "Cannot connect to the socket server.": "無法連接到 Socket 伺服器。",
     "reconnecting...": "重新連線中…",

frontend/src/main.ts

@@ -10,12 +10,12 @@ import { i18n } from "./i18n";
 // Dependencies
 import "bootstrap";
 import Toast, { POSITION, useToast } from "vue-toastification";
-import "xterm/lib/xterm.js";
+import "@xterm/xterm/lib/xterm.js";
 
 // CSS
 import "@fontsource/jetbrains-mono";
 import "vue-toastification/dist/index.css";
-import "xterm/css/xterm.css";
+import "@xterm/xterm/css/xterm.css";
 import "./styles/main.scss";
 
 // Minxins

frontend/src/mixins/socket.ts

@@ -2,7 +2,7 @@ import { io } from "socket.io-client";
 import { Socket } from "socket.io-client";
 import { defineComponent } from "vue";
 import jwtDecode from "jwt-decode";
-import { Terminal } from "xterm";
+import { Terminal } from "@xterm/xterm";
 
 let socket : Socket;
 
@@ -202,6 +202,10 @@ export default defineComponent({
                     }
                 }
             });
+
+            socket.on("refresh", () => {
+                location.reload();
+            });
         },
 
         /**

frontend/src/pages/Compose.vue

@@ -299,12 +299,12 @@ export default {
     computed: {
 
         urls() {
-            if (!this.jsonConfig["x-dockge"] || !this.jsonConfig["x-dockge"].urls || !Array.isArray(this.jsonConfig["x-dockge"].urls)) {
+            if (!this.envsubstJSONConfig["x-dockge"] || !this.envsubstJSONConfig["x-dockge"].urls || !Array.isArray(this.envsubstJSONConfig["x-dockge"].urls)) {
                 return [];
             }
 
             let urls = [];
-            for (const url of this.jsonConfig["x-dockge"].urls) {
+            for (const url of this.envsubstJSONConfig["x-dockge"].urls) {
                 let display;
                 try {
                     let obj = new URL(url);

package.json

@@ -1,6 +1,6 @@
 {
     "name": "dockge",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "type": "module",
     "engines": {
         "node": ">= 18.0.0 && <= 18.17.1"
@@ -10,6 +10,7 @@
         "lint": "eslint \"**/*.{ts,vue}\"",
         "check-ts": "tsc --noEmit",
         "start": "tsx ./backend/index.ts",
+        "dev": "concurrently -k -r \"wait-on tcp:5000 && pnpm run dev:backend \" \"pnpm run dev:frontend\"",
         "dev:backend": "cross-env NODE_ENV=development tsx watch --inspect ./backend/index.ts",
         "dev:frontend": "cross-env NODE_ENV=development vite --host --config ./frontend/vite.config.ts",
         "release-final": "tsx ./extra/test-docker.ts && tsx extra/update-version.ts && pnpm run build:frontend && npm run build:docker",
@@ -24,7 +25,7 @@
         "reset-password": "tsx ./extra/reset-password.ts"
     },
     "dependencies": {
-        "@homebridge/node-pty-prebuilt-multiarch": "~0.11.11",
+        "@homebridge/node-pty-prebuilt-multiarch": "~0.11.12",
         "@inventage/envsubst": "^0.16.0",
         "@louislam/sqlite3": "~15.1.6",
         "bcryptjs": "~2.4.3",
@@ -42,7 +43,7 @@
         "jwt-decode": "~3.1.2",
         "knex": "~2.5.1",
         "limiter-es6-compat": "~2.1.2",
-        "mysql2": "~3.6.3",
+        "mysql2": "~3.6.5",
         "promisify-child-process": "~4.1.2",
         "redbean-node": "~0.3.3",
         "socket.io": "~4.7.2",
@@ -55,21 +56,24 @@
     },
     "devDependencies": {
         "@actions/github": "^6.0.0",
-        "@fontsource/jetbrains-mono": "^5.0.17",
+        "@fontsource/jetbrains-mono": "^5.0.18",
         "@fortawesome/fontawesome-svg-core": "6.4.2",
         "@fortawesome/free-regular-svg-icons": "6.4.2",
         "@fortawesome/free-solid-svg-icons": "6.4.2",
         "@fortawesome/vue-fontawesome": "3.0.3",
         "@types/bcryptjs": "^2.4.6",
-        "@types/bootstrap": "~5.2.9",
+        "@types/bootstrap": "~5.2.10",
         "@types/command-exists": "~1.2.3",
         "@types/express": "~4.17.21",
         "@types/jsonwebtoken": "~9.0.5",
         "@typescript-eslint/eslint-plugin": "~6.8.0",
         "@typescript-eslint/parser": "~6.8.0",
-        "@vitejs/plugin-vue": "~4.5.0",
+        "@vitejs/plugin-vue": "~4.5.2",
+        "@xterm/addon-fit": "beta",
+        "@xterm/xterm": "beta",
         "bootstrap": "5.3.2",
         "bootstrap-vue-next": "~0.14.10",
+        "concurrently": "^8.2.2",
         "cross-env": "~7.0.3",
         "eslint": "~8.50.0",
         "eslint-plugin-jsdoc": "~46.8.2",
@@ -78,16 +82,16 @@
         "sass": "~1.68.0",
         "typescript": "~5.2.2",
         "unplugin-vue-components": "~0.25.2",
-        "vite": "~5.0.0",
+        "vite": "~5.0.7",
         "vite-plugin-compression": "~0.5.1",
-        "vue": "~3.3.8",
+        "vue": "~3.3.11",
         "vue-eslint-parser": "~9.3.2",
         "vue-i18n": "~9.5.0",
         "vue-prism-editor": "2.0.0-alpha.2",
         "vue-qrcode": "~2.2.0",
         "vue-router": "~4.2.5",
         "vue-toastification": "2.0.0-rc.5",
-        "xterm": "5.4.0-beta.37",
+        "wait-on": "^7.2.0",
         "xterm-addon-web-links": "~0.9.0"
     }
 }