Fix #234

README.md

@@ -131,7 +131,7 @@ Be sure to read the [guide](https://github.com/louislam/dockge/blob/master/CONTR
 
 #### "Dockge"?
 
-"Dockge" is a coinage word which is created by myself. I originally hoped it sounds like `Dodge`, but apparently many people called it `Dockage`, it is also acceptable.
+"Dockge" is a coinage word which is created by myself. I hope it sounds like `Dodge`.
 
 The naming idea came from Twitch emotes like `sadge`, `bedge` or `wokege`. They all end in `-ge`.
 
@@ -148,13 +148,13 @@ Yes, you can. However, you need to move your compose file into the stacks direct
 3. In Dockge, click the " Scan Stacks Folder" button in the top-right corner's dropdown menu
 4. Now you should see your stack in the list
 
-#### Is Dockge a Portainer replacement?
+#### Is Dockge a Portainer replcement?
 
 Yes or no. Portainer provides a lot of Docker features. While Dockge is currently only focusing on docker-compose with a better user interface and better user experience.
 
 If you want to manage your container with docker-compose only, the answer may be yes.
 
-If you still need to manage something like docker networks, single containers, the answer may be no.
+If you still need to manage something like docker networks, signle containers, the answer may be no.
 
 #### Can I install both Dockge and Portainer?
 

backend/check-version.ts

@@ -3,55 +3,69 @@ import compareVersions from "compare-versions";
 import packageJSON from "../package.json";
 import { Settings } from "./settings";
 
+export const obj = {
+    version: packageJSON.version,
+    latestVersion: null,
+};
+export default obj;
+
 // How much time in ms to wait between update checks
 const UPDATE_CHECKER_INTERVAL_MS = 1000 * 60 * 60 * 48;
 const CHECK_URL = "https://dockge.kuma.pet/version";
 
-class CheckVersion {
-    version = packageJSON.version;
-    latestVersion? : string;
-    interval? : NodeJS.Timeout;
+let interval : NodeJS.Timeout;
 
-    async startInterval() {
-        const check = async () => {
-            if (await Settings.get("checkUpdate") === false) {
-                return;
+export function startInterval() {
+    const check = async () => {
+        if (await Settings.get("checkUpdate") === false) {
+            return;
+        }
+
+        log.debug("update-checker", "Retrieving latest versions");
+
+        try {
+            const res = await fetch(CHECK_URL);
+            const data = await res.json();
+
+            // For debug
+            if (process.env.TEST_CHECK_VERSION === "1") {
+                data.slow = "1000.0.0";
             }
 
-            log.debug("update-checker", "Retrieving latest versions");
+            const checkBeta = await Settings.get("checkBeta");
 
-            try {
-                const res = await fetch(CHECK_URL);
-                const data = await res.json();
-
-                // For debug
-                if (process.env.TEST_CHECK_VERSION === "1") {
-                    data.slow = "1000.0.0";
+            if (checkBeta && data.beta) {
+                if (compareVersions.compare(data.beta, data.slow, ">")) {
+                    obj.latestVersion = data.beta;
+                    return;
                 }
-
-                const checkBeta = await Settings.get("checkBeta");
-
-                if (checkBeta && data.beta) {
-                    if (compareVersions.compare(data.beta, data.slow, ">")) {
-                        this.latestVersion = data.beta;
-                        return;
-                    }
-                }
-
-                if (data.slow) {
-                    this.latestVersion = data.slow;
-                }
-
-            } catch (_) {
-                log.info("update-checker", "Failed to check for new versions");
             }
 
-        };
+            if (data.slow) {
+                obj.latestVersion = data.slow;
+            }
 
-        await check();
-        this.interval = setInterval(check, UPDATE_CHECKER_INTERVAL_MS);
-    }
+        } catch (_) {
+            log.info("update-checker", "Failed to check for new versions");
+        }
+
+    };
+
+    check();
+    interval = setInterval(check, UPDATE_CHECKER_INTERVAL_MS);
 }
 
-const checkVersion = new CheckVersion();
-export default checkVersion;
+/**
+ * Enable the check update feature
+ * @param value Should the check update feature be enabled?
+ * @returns
+ */
+export async function enableCheckUpdate(value : boolean) {
+    await Settings.set("checkUpdate", value);
+
+    clearInterval(interval);
+
+    if (value) {
+        startInterval();
+    }
+}

backend/dockge-server.ts

@@ -308,7 +308,6 @@ export class DockgeServer {
                 this.sendStackList(true);
             });
 
-            checkVersion.startInterval();
         });
 
         gracefulShutdown(this.httpServer, {

backend/stack.ts

@@ -297,12 +297,7 @@ export class Stack {
         let res = await childProcessAsync.spawn("docker", [ "compose", "ls", "--all", "--format", "json" ], {
             encoding: "utf-8",
         });
-
-        if (!res.stdout) {
-            return statusList;
-        }
-
-        let composeList = JSON.parse(res.stdout.toString());
+        let composeList = JSON.parse(res.toString());
 
         for (let composeStack of composeList) {
             statusList.set(composeStack.Name, this.statusConvert(composeStack.Status));

frontend/src/i18n.ts

@@ -39,7 +39,7 @@ for (let lang in languageList) {
     };
 }
 
-const rtlLangs = [ "fa", "ar-SY", "ur", "ar" ];
+const rtlLangs = [ "fa", "ar-SY", "ur" ];
 
 export const currentLocale = () => localStorage.locale
     || languageList[navigator.language] && navigator.language

frontend/src/lang/en.json

@@ -98,6 +98,5 @@
     "reconnecting...": "Reconnecting…",
     "connecting...": "Connecting to the socket server…",
     "url": "URL | URLs",
-    "extra": "Extra",
-    "newUpdate": "New Update"
+    "extra": "Extra"
 }

frontend/src/layouts/Layout.vue

@@ -16,8 +16,8 @@
                 <span class="fs-4 title">Dockge</span>
             </router-link>
 
-            <a v-if="hasNewVersion" target="_blank" href="https://github.com/louislam/dockge/releases" class="btn btn-warning me-3">
-                <font-awesome-icon icon="arrow-alt-circle-up" /> {{ $t("newUpdate") }}
+            <a v-if="hasNewVersion" target="_blank" href="https://github.com/louislam/dockge/releases" class="btn btn-info me-3">
+                <font-awesome-icon icon="arrow-alt-circle-up" /> {{ $t("New Update") }}
             </a>
 
             <ul class="nav nav-pills">

frontend/src/pages/Compose.vue

@@ -622,7 +622,7 @@ export default {
                         greedy: true
                     },
                     "keyword": {
-                        pattern: /^\w*(?=[:=])/m,
+                        pattern: /^[^ :=]*(?=[:=])/m,
                         greedy: true
                     },
                     "value": {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "dockge",
-    "version": "1.3.2",
+    "version": "1.3.0",
     "type": "module",
     "engines": {
         "node": ">= 18.0.0 && <= 18.17.1"