Merge fb86933558 into cd5644d6d2

Co-authored-by: Frank Elsinga <frank@elsinga.de>

package-lock.json

@@ -32,7 +32,7 @@
                 "express-basic-auth": "~1.2.1",
                 "express-static-gzip": "~2.1.7",
                 "form-data": "~4.0.0",
-                "gamedig": "^4.2.0",
+                "gamedig": "^5.0.1",
                 "html-escaper": "^3.0.3",
                 "http-cookie-agent": "~5.0.4",
                 "http-graceful-shutdown": "~3.1.7",
@@ -3788,7 +3788,6 @@
             "version": "5.6.0",
             "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz",
             "integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==",
-            "license": "MIT",
             "engines": {
                 "node": ">=14.16"
             },
@@ -4409,7 +4408,6 @@
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
             "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
-            "license": "MIT",
             "dependencies": {
                 "defer-to-connect": "^2.0.1"
             },
@@ -4543,8 +4541,7 @@
         "node_modules/@types/http-cache-semantics": {
             "version": "4.0.4",
             "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
-            "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==",
-            "license": "MIT"
+            "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA=="
         },
         "node_modules/@types/http-errors": {
             "version": "2.0.4",
@@ -6078,7 +6075,6 @@
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
             "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
-            "license": "MIT",
             "engines": {
                 "node": ">=14.16"
             }
@@ -6087,7 +6083,6 @@
             "version": "10.2.14",
             "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz",
             "integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==",
-            "license": "MIT",
             "dependencies": {
                 "@types/http-cache-semantics": "^4.0.2",
                 "get-stream": "^6.0.1",
@@ -7036,7 +7031,6 @@
             "version": "6.0.0",
             "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
             "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-            "license": "MIT",
             "dependencies": {
                 "mimic-response": "^3.1.0"
             },
@@ -7051,7 +7045,6 @@
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
             "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-            "license": "MIT",
             "engines": {
                 "node": ">=10"
             },
@@ -7100,7 +7093,6 @@
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
             "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-            "license": "MIT",
             "engines": {
                 "node": ">=10"
             }
@@ -8489,7 +8481,6 @@
             "version": "2.1.4",
             "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz",
             "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==",
-            "license": "MIT",
             "engines": {
                 "node": ">= 14.17"
             }
@@ -8660,18 +8651,17 @@
             }
         },
         "node_modules/gamedig": {
-            "version": "4.3.1",
-            "resolved": "https://registry.npmjs.org/gamedig/-/gamedig-4.3.1.tgz",
-            "integrity": "sha512-et9Aq4wlD0cExXEO3r3LWiEEjOzsnG5l/0YSqza7FZLoJqunNT6DedkAXAdeOqAqStkRQahQiPFjx2WCg4SOtg==",
-            "license": "MIT",
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/gamedig/-/gamedig-5.0.1.tgz",
+            "integrity": "sha512-iCjgMbpYxUof+4bdACZzQrDuhBHcn72nnxNReoEljc2aNWr/tPgYjqKeoj9TFtlXkh2+PMIod/5w52fwzvf1Jg==",
             "dependencies": {
-                "cheerio": "^1.0.0-rc.10",
+                "cheerio": "^1.0.0-rc.12",
                 "gbxremote": "^0.2.1",
-                "got": "^12.1.0",
+                "got": "^13.0.0",
                 "iconv-lite": "^0.6.3",
-                "long": "^5.2.0",
-                "minimist": "^1.2.6",
-                "punycode": "^2.1.1",
+                "long": "^5.2.3",
+                "minimist": "^1.2.8",
+                "punycode": "^2.3.0",
                 "seek-bzip": "^2.0.0",
                 "varint": "^6.0.0"
             },
@@ -8679,7 +8669,7 @@
                 "gamedig": "bin/gamedig.js"
             },
             "engines": {
-                "node": ">=14.0.0"
+                "node": ">=16.20.0"
             }
         },
         "node_modules/gauge": {
@@ -8794,7 +8784,6 @@
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
             "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-            "license": "MIT",
             "engines": {
                 "node": ">=10"
             },
@@ -8997,10 +8986,9 @@
             }
         },
         "node_modules/got": {
-            "version": "12.6.1",
-            "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz",
-            "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==",
-            "license": "MIT",
+            "version": "13.0.0",
+            "resolved": "https://registry.npmjs.org/got/-/got-13.0.0.tgz",
+            "integrity": "sha512-XfBk1CxOOScDcMr9O1yKkNaQyy865NbYs+F7dr4H0LZMVgCj2Le59k6PqbNHoL5ToeaEQUYh6c6yMfVcc6SJxA==",
             "dependencies": {
                 "@sindresorhus/is": "^5.2.0",
                 "@szmarczak/http-timer": "^5.0.1",
@@ -9015,7 +9003,7 @@
                 "responselike": "^3.0.0"
             },
             "engines": {
-                "node": ">=14.16"
+                "node": ">=16"
             },
             "funding": {
                 "url": "https://github.com/sindresorhus/got?sponsor=1"
@@ -9302,7 +9290,6 @@
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
             "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
-            "license": "MIT",
             "dependencies": {
                 "quick-lru": "^5.1.1",
                 "resolve-alpn": "^1.2.0"
@@ -10511,7 +10498,6 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
             "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
-            "license": "MIT",
             "engines": {
                 "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
             },
@@ -10834,7 +10820,6 @@
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
             "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
-            "license": "MIT",
             "engines": {
                 "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
             },
@@ -11299,22 +11284,6 @@
                 "smart-buffer": "^4.1.0"
             }
         },
-        "node_modules/node-abi": {
-            "version": "3.62.0",
-            "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.62.0.tgz",
-            "integrity": "sha512-CPMcGa+y33xuL1E0TcNIu4YyaZCxnnvkVaEXrsosR3FxN+fV8xvb7Mzpb7IgKler10qeMkE6+Dp8qJhpzdq35g==",
-            "dependencies": {
-                "semver": "^7.3.5"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/node-abort-controller": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
-            "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ=="
-        },
         "node_modules/node-cloudflared-tunnel": {
             "version": "1.0.10",
             "resolved": "https://registry.npmjs.org/node-cloudflared-tunnel/-/node-cloudflared-tunnel-1.0.10.tgz",
@@ -11488,7 +11457,6 @@
             "version": "8.0.1",
             "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz",
             "integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==",
-            "license": "MIT",
             "engines": {
                 "node": ">=14.16"
             },
@@ -11762,7 +11730,6 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz",
             "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==",
-            "license": "MIT",
             "engines": {
                 "node": ">=12.20"
             }
@@ -13193,8 +13160,7 @@
         "node_modules/resolve-alpn": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-            "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
-            "license": "MIT"
+            "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="
         },
         "node_modules/resolve-from": {
             "version": "4.0.0",
@@ -13210,7 +13176,6 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
             "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
-            "license": "MIT",
             "dependencies": {
                 "lowercase-keys": "^3.0.0"
             },

package.json

@@ -97,7 +97,7 @@
         "express-basic-auth": "~1.2.1",
         "express-static-gzip": "~2.1.7",
         "form-data": "~4.0.0",
-        "gamedig": "^4.2.0",
+        "gamedig": "^5.0.1",
         "html-escaper": "^3.0.3",
         "http-cookie-agent": "~5.0.4",
         "http-graceful-shutdown": "~3.1.7",
@@ -211,4 +211,4 @@
         "wait-on": "^7.2.0",
         "whatwg-url": "~12.0.1"
     }
-}
+}

server/model/monitor.js

@@ -16,7 +16,7 @@ const version = require("../../package.json").version;
 const apicache = require("../modules/apicache");
 const { UptimeKumaServer } = require("../uptime-kuma-server");
 const { DockerHost } = require("../docker");
-const Gamedig = require("gamedig");
+const { GameDig } = require("gamedig");
 const jwt = require("jsonwebtoken");
 const crypto = require("crypto");
 const { UptimeCalculator } = require("../uptime-calculator");
@@ -696,7 +696,7 @@ class Monitor extends BeanModel {
                     }
                 } else if (this.type === "gamedig") {
                     try {
-                        const state = await Gamedig.query({
+                        const state = await GameDig.query({
                             type: this.game,
                             host: this.hostname,
                             port: this.port,

server/model/status_page.js

@@ -4,6 +4,7 @@ const cheerio = require("cheerio");
 const { UptimeKumaServer } = require("../uptime-kuma-server");
 const jsesc = require("jsesc");
 const googleAnalytics = require("../google-analytics");
+const { marked } = require("marked");
 
 class StatusPage extends BeanModel {
 
@@ -46,7 +47,11 @@ class StatusPage extends BeanModel {
      */
     static async renderHTML(indexHTML, statusPage) {
         const $ = cheerio.load(indexHTML);
-        const description155 = statusPage.description?.substring(0, 155) ?? "";
+
+        const description155 = marked(statusPage.description ?? "")
+            .replace(/<[^>]+>/gm, "")
+            .trim()
+            .substring(0, 155);
 
         $("title").text(statusPage.title);
         $("meta[name=description]").attr("content", description155);

server/socket-handlers/general-socket-handler.js

@@ -2,31 +2,36 @@ const { log } = require("../../src/util");
 const { Settings } = require("../settings");
 const { sendInfo } = require("../client");
 const { checkLogin } = require("../util-server");
-const GameResolver = require("gamedig/lib/GameResolver");
+const { games } = require("gamedig");
 const { testChrome } = require("../monitor-types/real-browser-monitor-type");
 const fs = require("fs");
 const path = require("path");
 
-let gameResolver = new GameResolver();
-let gameList = null;
-
 /**
  * Get a game list via GameDig
- * @returns {object[]} list of games supported by GameDig
+ * @returns {object} list of games supported by GameDig
  */
 function getGameList() {
-    if (gameList == null) {
-        gameList = gameResolver._readGames().games.sort((a, b) => {
-            if ( a.pretty < b.pretty ) {
-                return -1;
-            }
-            if ( a.pretty > b.pretty ) {
-                return 1;
-            }
-            return 0;
-        });
-    }
-    return gameList;
+    let gamelist = [];
+    gamelist = Object.keys(games).map(key => {
+        const item = games[key];
+        return {
+            keys: [ key ],
+            pretty: item.name,
+            options: item.options,
+            extra: item.extra || {}
+        };
+    });
+    gamelist.sort((a, b) => {
+        if ( a.pretty < b.pretty ) {
+            return -1;
+        }
+        if ( a.pretty > b.pretty ) {
+            return 1;
+        }
+        return 0;
+    });
+    return gamelist;
 }
 
 module.exports.generalSocketHandler = (socket, server) => {