From d9fa67ae0300ecd88d587c5bb6abb35fb5dcc72a Mon Sep 17 00:00:00 2001
From: Mario Garrido <login@mariogarrido.pt>
Date: Tue, 1 Jul 2025 05:36:58 +0100
Subject: [PATCH 1/7] Monitor GameDig: Resolve domain to IP before request

---
 server/model/monitor.js         | 16 ----------
 server/monitor-types/gamedig.js | 56 +++++++++++++++++++++++++++++++++
 server/uptime-kuma-server.js    |  2 ++
 src/pages/EditMonitor.vue       | 28 ++++++++++++-----
 4 files changed, 78 insertions(+), 24 deletions(-)
 create mode 100644 server/monitor-types/gamedig.js

diff --git a/server/model/monitor.js b/server/model/monitor.js
index 3be8267c9..c492c9e7b 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -20,7 +20,6 @@ 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 jwt = require("jsonwebtoken");
 const crypto = require("crypto");
 const { UptimeCalculator } = require("../uptime-calculator");
@@ -702,21 +701,6 @@ class Monitor extends BeanModel {
                     } else {
                         throw new Error("Server not found on Steam");
                     }
-                } else if (this.type === "gamedig") {
-                    try {
-                        const state = await Gamedig.query({
-                            type: this.game,
-                            host: this.hostname,
-                            port: this.port,
-                            givenPortOnly: this.getGameDigGivenPortOnly(),
-                        });
-
-                        bean.msg = state.name;
-                        bean.status = UP;
-                        bean.ping = state.ping;
-                    } catch (e) {
-                        throw new Error(e.message);
-                    }
                 } else if (this.type === "docker") {
                     log.debug("monitor", `[${this.name}] Prepare Options for Axios`);
 
diff --git a/server/monitor-types/gamedig.js b/server/monitor-types/gamedig.js
new file mode 100644
index 000000000..b1fa64347
--- /dev/null
+++ b/server/monitor-types/gamedig.js
@@ -0,0 +1,56 @@
+const { MonitorType } = require("./monitor-type");
+const { UP, DOWN } = require("../../src/util");
+const Gamedig = require("gamedig");
+const dns = require("dns").promises;
+
+class GameDigMonitorType extends MonitorType {
+    name = "gamedig";
+
+    /**
+     * @inheritdoc
+     */
+    async check(monitor, heartbeat, server) {
+        heartbeat.status = DOWN;
+
+        let host = monitor.hostname;
+
+        if (monitor.gamedigResolveHostToIP) {
+            host = await this.resolveHostname(monitor.hostname);
+        }
+
+        try {
+            const state = await Gamedig.query({
+                type: monitor.game,
+                host: host,
+                port: monitor.port,
+                givenPortOnly: Boolean(monitor.gamedigGivenPortOnly),
+            });
+
+            heartbeat.msg = state.name;
+            heartbeat.status = UP;
+            heartbeat.ping = state.ping;
+        } catch (e) {
+            throw new Error(e.message);
+        }
+    }
+
+    /**
+     * Resolves a domain name to its IPv4 address.
+     * 
+     * @param {string} hostname - The domain name to resolve (e.g., "example.dyndns.org").
+     * @returns {Promise<string>} - The resolved IP address.
+     * @throws Will throw an error if the DNS resolution fails.
+     */
+    async resolveHostname(hostname) {
+        try {
+            const result = await dns.lookup(hostname);
+            return result.address;
+        } catch (err) {
+            throw new Error(`DNS resolution failed for ${hostname}: ${err.message}`);
+        }
+    }
+}
+
+module.exports = {
+    GameDigMonitorType,
+};
diff --git a/server/uptime-kuma-server.js b/server/uptime-kuma-server.js
index a04e6bd49..0ea60178c 100644
--- a/server/uptime-kuma-server.js
+++ b/server/uptime-kuma-server.js
@@ -118,6 +118,7 @@ class UptimeKumaServer {
         UptimeKumaServer.monitorTypeList["snmp"] = new SNMPMonitorType();
         UptimeKumaServer.monitorTypeList["mongodb"] = new MongodbMonitorType();
         UptimeKumaServer.monitorTypeList["rabbitmq"] = new RabbitMqMonitorType();
+        UptimeKumaServer.monitorTypeList["gamedig"] = new GameDigMonitorType();
         UptimeKumaServer.monitorTypeList["manual"] = new ManualMonitorType();
 
         // Allow all CORS origins (polling) in development
@@ -559,5 +560,6 @@ const { GroupMonitorType } = require("./monitor-types/group");
 const { SNMPMonitorType } = require("./monitor-types/snmp");
 const { MongodbMonitorType } = require("./monitor-types/mongodb");
 const { RabbitMqMonitorType } = require("./monitor-types/rabbitmq");
+const { GameDigMonitorType } = require("./monitor-types/gamedig");
 const { ManualMonitorType } = require("./monitor-types/manual");
 const Monitor = require("./model/monitor");
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 1b7af4184..01a4425ae 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -201,14 +201,25 @@
 
                             <!-- Game -->
                             <!-- GameDig only -->
-                            <div v-if="monitor.type === 'gamedig'" class="my-3">
-                                <label for="game" class="form-label"> {{ $t("Game") }} </label>
-                                <select id="game" v-model="monitor.game" class="form-select" required>
-                                    <option v-for="game in gameList" :key="game.keys[0]" :value="game.keys[0]">
-                                        {{ game.pretty }}
-                                    </option>
-                                </select>
-                            </div>
+                            <template v-if="monitor.type === 'gamedig'">
+                                <!-- GameDig Game list -->
+                                <div class="my-3">
+                                    <label for="game" class="form-label"> {{ $t("Game") }} </label>
+                                    <select id="game" v-model="monitor.game" class="form-select" required>
+                                        <option v-for="game in gameList" :key="game.keys[0]" :value="game.keys[0]">
+                                            {{ game.pretty }}
+                                        </option>
+                                    </select>
+                                </div>
+
+                                <!-- GameDig resolve Host to IP --> 
+                                <div class="my-3 form-check">
+                                    <input id="gamedigResolveHostToIP" v-model="monitor.gamedigResolveHostToIP" class="form-check-input" type="checkbox">
+                                    <label class="form-check-label" for="gamedigResolveHostToIP">
+                                        {{ $t("Resolve GameDig Host IP") }}
+                                    </label>
+                                </div>
+                            </template>
 
                             <template v-if="monitor.type === 'kafka-producer'">
                                 <!-- Kafka Brokers List -->
@@ -1186,6 +1197,7 @@ const monitorDefaults = {
     authMethod: null,
     oauth_auth_method: "client_secret_basic",
     httpBodyEncoding: "json",
+    gamedigResolveHostToIP: false,
     kafkaProducerBrokers: [],
     kafkaProducerSaslOptions: {
         mechanism: "None",

From dea4a2b45a400977b368645bfcafb50fc0b3df46 Mon Sep 17 00:00:00 2001
From: Mario Garrido <login@mariogarrido.pt>
Date: Tue, 1 Jul 2025 06:21:18 +0100
Subject: [PATCH 2/7] add text into language file

---
 src/lang/en.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lang/en.json b/src/lang/en.json
index b6449371b..a979e6eba 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -1125,5 +1125,6 @@
     "Staged Tags for Batch Add": "Staged Tags for Batch Add",
     "Clear Form": "Clear Form",
     "pause": "Pause",
-    "Manual": "Manual"
+    "Manual": "Manual",
+    "Resolve GameDig Host IP": "Resolve domain to IP before request"
 }

From 4367d5686f49c72d2c12ef3d152c5c89ac6df7c2 Mon Sep 17 00:00:00 2001
From: Mario Garrido <login@mariogarrido.pt>
Date: Fri, 4 Jul 2025 15:41:04 +0100
Subject: [PATCH 3/7] rever changes to interface

---
 src/lang/en.json          |  3 +--
 src/pages/EditMonitor.vue | 28 ++++++++--------------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/lang/en.json b/src/lang/en.json
index a979e6eba..b6449371b 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -1125,6 +1125,5 @@
     "Staged Tags for Batch Add": "Staged Tags for Batch Add",
     "Clear Form": "Clear Form",
     "pause": "Pause",
-    "Manual": "Manual",
-    "Resolve GameDig Host IP": "Resolve domain to IP before request"
+    "Manual": "Manual"
 }
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 01a4425ae..1b7af4184 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -201,25 +201,14 @@
 
                             <!-- Game -->
                             <!-- GameDig only -->
-                            <template v-if="monitor.type === 'gamedig'">
-                                <!-- GameDig Game list -->
-                                <div class="my-3">
-                                    <label for="game" class="form-label"> {{ $t("Game") }} </label>
-                                    <select id="game" v-model="monitor.game" class="form-select" required>
-                                        <option v-for="game in gameList" :key="game.keys[0]" :value="game.keys[0]">
-                                            {{ game.pretty }}
-                                        </option>
-                                    </select>
-                                </div>
-
-                                <!-- GameDig resolve Host to IP --> 
-                                <div class="my-3 form-check">
-                                    <input id="gamedigResolveHostToIP" v-model="monitor.gamedigResolveHostToIP" class="form-check-input" type="checkbox">
-                                    <label class="form-check-label" for="gamedigResolveHostToIP">
-                                        {{ $t("Resolve GameDig Host IP") }}
-                                    </label>
-                                </div>
-                            </template>
+                            <div v-if="monitor.type === 'gamedig'" class="my-3">
+                                <label for="game" class="form-label"> {{ $t("Game") }} </label>
+                                <select id="game" v-model="monitor.game" class="form-select" required>
+                                    <option v-for="game in gameList" :key="game.keys[0]" :value="game.keys[0]">
+                                        {{ game.pretty }}
+                                    </option>
+                                </select>
+                            </div>
 
                             <template v-if="monitor.type === 'kafka-producer'">
                                 <!-- Kafka Brokers List -->
@@ -1197,7 +1186,6 @@ const monitorDefaults = {
     authMethod: null,
     oauth_auth_method: "client_secret_basic",
     httpBodyEncoding: "json",
-    gamedigResolveHostToIP: false,
     kafkaProducerBrokers: [],
     kafkaProducerSaslOptions: {
         mechanism: "None",

From 23f5b0cefd5b8578390f7d05765cb996ac2df311 Mon Sep 17 00:00:00 2001
From: Mario Garrido <login@mariogarrido.pt>
Date: Fri, 4 Jul 2025 15:57:32 +0100
Subject: [PATCH 4/7] fix: Check if it is an IP or a hostname

---
 server/monitor-types/gamedig.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/monitor-types/gamedig.js b/server/monitor-types/gamedig.js
index b1fa64347..c0c6dd97f 100644
--- a/server/monitor-types/gamedig.js
+++ b/server/monitor-types/gamedig.js
@@ -2,6 +2,7 @@ const { MonitorType } = require("./monitor-type");
 const { UP, DOWN } = require("../../src/util");
 const Gamedig = require("gamedig");
 const dns = require("dns").promises;
+const net = require('net');
 
 class GameDigMonitorType extends MonitorType {
     name = "gamedig";
@@ -12,12 +13,12 @@ class GameDigMonitorType extends MonitorType {
     async check(monitor, heartbeat, server) {
         heartbeat.status = DOWN;
 
-        let host = monitor.hostname;
-
-        if (monitor.gamedigResolveHostToIP) {
-            host = await this.resolveHostname(monitor.hostname);
+        if (net.isIP(host) === 0) {
+            host = await this.resolveHostname(host);
         }
 
+        host = await this.resolveHostname(monitor.hostname);
+        
         try {
             const state = await Gamedig.query({
                 type: monitor.game,

From 193e1ebfca55def62dc297d828d277d708ec870a Mon Sep 17 00:00:00 2001
From: Mario Garrido <login@mariogarrido.pt>
Date: Fri, 4 Jul 2025 16:11:16 +0100
Subject: [PATCH 5/7] fix: set var

---
 server/monitor-types/gamedig.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/monitor-types/gamedig.js b/server/monitor-types/gamedig.js
index c0c6dd97f..b09b5d717 100644
--- a/server/monitor-types/gamedig.js
+++ b/server/monitor-types/gamedig.js
@@ -13,6 +13,7 @@ class GameDigMonitorType extends MonitorType {
     async check(monitor, heartbeat, server) {
         heartbeat.status = DOWN;
 
+        let host = monitor.hostname;
         if (net.isIP(host) === 0) {
             host = await this.resolveHostname(host);
         }

From ae499cc3453a4b32fb8bb2e488e0702693ade2cd Mon Sep 17 00:00:00 2001
From: Mario Garrido <login@mariogarrido.pt>
Date: Fri, 4 Jul 2025 16:22:07 +0100
Subject: [PATCH 6/7] fix: lint

---
 server/monitor-types/gamedig.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/server/monitor-types/gamedig.js b/server/monitor-types/gamedig.js
index b09b5d717..5f11b82af 100644
--- a/server/monitor-types/gamedig.js
+++ b/server/monitor-types/gamedig.js
@@ -2,7 +2,7 @@ const { MonitorType } = require("./monitor-type");
 const { UP, DOWN } = require("../../src/util");
 const Gamedig = require("gamedig");
 const dns = require("dns").promises;
-const net = require('net');
+const net = require("net");
 
 class GameDigMonitorType extends MonitorType {
     name = "gamedig";
@@ -19,7 +19,7 @@ class GameDigMonitorType extends MonitorType {
         }
 
         host = await this.resolveHostname(monitor.hostname);
-        
+
         try {
             const state = await Gamedig.query({
                 type: monitor.game,
@@ -38,7 +38,6 @@ class GameDigMonitorType extends MonitorType {
 
     /**
      * Resolves a domain name to its IPv4 address.
-     * 
      * @param {string} hostname - The domain name to resolve (e.g., "example.dyndns.org").
      * @returns {Promise<string>} - The resolved IP address.
      * @throws Will throw an error if the DNS resolution fails.

From 095a44fac0bea87dd87363a32fc135fbb5d9dc4e Mon Sep 17 00:00:00 2001
From: Mario Garrido <login@mariogarrido.pt>
Date: Fri, 4 Jul 2025 16:31:30 +0100
Subject: [PATCH 7/7] fix: redundant function call

---
 server/monitor-types/gamedig.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/server/monitor-types/gamedig.js b/server/monitor-types/gamedig.js
index 5f11b82af..b20c2435c 100644
--- a/server/monitor-types/gamedig.js
+++ b/server/monitor-types/gamedig.js
@@ -18,8 +18,6 @@ class GameDigMonitorType extends MonitorType {
             host = await this.resolveHostname(host);
         }
 
-        host = await this.resolveHostname(monitor.hostname);
-
         try {
             const state = await Gamedig.query({
                 type: monitor.game,