From aaaeec1efd58a4dc4d77822ae85bbffa72d2a372 Mon Sep 17 00:00:00 2001
From: Hemanth <rachapalli.hemanth5544@gmail.com>
Date: Thu, 26 Jun 2025 23:43:39 +0530
Subject: [PATCH 01/14] rtsp client connection

---
 package.json                            |  1 +
 server/monitor-types/RtspMonitorType.js | 56 +++++++++++++++++++++++++
 server/uptime-kuma-server.js            |  2 +
 3 files changed, 59 insertions(+)
 create mode 100644 server/monitor-types/RtspMonitorType.js

diff --git a/package.json b/package.json
index 97b7bc339..327be7598 100644
--- a/package.json
+++ b/package.json
@@ -133,6 +133,7 @@
         "qs": "~6.10.4",
         "redbean-node": "~0.3.0",
         "redis": "~4.5.1",
+        "rtsp-client": "^1.4.5",
         "semver": "~7.5.4",
         "socket.io": "~4.8.0",
         "socket.io-client": "~4.8.0",
diff --git a/server/monitor-types/RtspMonitorType.js b/server/monitor-types/RtspMonitorType.js
new file mode 100644
index 000000000..bc4f57486
--- /dev/null
+++ b/server/monitor-types/RtspMonitorType.js
@@ -0,0 +1,56 @@
+const RTSPClient = require("rtsp-client");
+const { log, UP, DOWN } = require("../../src/util"); 
+class RtspMonitorType {
+  name = "rtsp";
+
+  /**
+   * @param {Object} monitor - monitor config containing rtspUrl and timeout
+   * @param {Object} heartbeat - object to update with status and message
+   */
+  async check(monitor, heartbeat) {
+    const url = monitor.rtspUrl;
+    const timeoutMs = (monitor.timeout || 10) * 1000;
+
+    heartbeat.status = DOWN;
+    heartbeat.msg = "Starting RTSP stream check...";
+
+    if (!url || !url.startsWith("rtsp://")) {
+      heartbeat.status = DOWN;
+      heartbeat.msg = "Invalid RTSP URL";
+      return;
+    }
+
+    const client = new RTSPClient();
+
+    // Timeout promise to kill hanging connections
+    const timeoutPromise = new Promise((_, reject) =>
+      setTimeout(() => reject(new Error("RTSP connection timed out")), timeoutMs)
+    );
+
+    try {
+      // Use Promise.race to enforce timeout
+      await Promise.race([
+        (async () => {
+          await client.connect(url);
+          const describe = await client.describe();
+          await client.close();
+
+          heartbeat.status = UP;
+          heartbeat.msg = "RTSP stream is accessible";
+        })(),
+        timeoutPromise,
+      ]);
+    } catch (error) {
+      heartbeat.status = DOWN;
+      heartbeat.msg = `Error: ${error.message}`;
+      log.debug("monitor", `[${monitor.name}] RTSP check failed: ${error.message}`);
+      try {
+        await client.close();
+      } catch {}
+    }
+  }
+}
+
+module.exports = {
+  RtspMonitorType,
+};
diff --git a/server/uptime-kuma-server.js b/server/uptime-kuma-server.js
index a04e6bd49..b410ae85a 100644
--- a/server/uptime-kuma-server.js
+++ b/server/uptime-kuma-server.js
@@ -119,6 +119,7 @@ class UptimeKumaServer {
         UptimeKumaServer.monitorTypeList["mongodb"] = new MongodbMonitorType();
         UptimeKumaServer.monitorTypeList["rabbitmq"] = new RabbitMqMonitorType();
         UptimeKumaServer.monitorTypeList["manual"] = new ManualMonitorType();
+        UptimeKumaServer.monitorTypeList["rtsp"] = new RtspMonitorType();
 
         // Allow all CORS origins (polling) in development
         let cors = undefined;
@@ -560,4 +561,5 @@ const { SNMPMonitorType } = require("./monitor-types/snmp");
 const { MongodbMonitorType } = require("./monitor-types/mongodb");
 const { RabbitMqMonitorType } = require("./monitor-types/rabbitmq");
 const { ManualMonitorType } = require("./monitor-types/manual");
+const {RtspMonitorType}= require("./monitor-types/RtspMonitorType")
 const Monitor = require("./model/monitor");

From 656c28e267a47e4c8ac431a86d0f325c5a8a5c33 Mon Sep 17 00:00:00 2001
From: Hemanth <rachapalli.hemanth5544@gmail.com>
Date: Fri, 27 Jun 2025 10:01:55 +0530
Subject: [PATCH 02/14] file name changed

---
 server/monitor-types/{RtspMonitorType.js => rtsp.js} | 0
 server/uptime-kuma-server.js                         | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename server/monitor-types/{RtspMonitorType.js => rtsp.js} (100%)

diff --git a/server/monitor-types/RtspMonitorType.js b/server/monitor-types/rtsp.js
similarity index 100%
rename from server/monitor-types/RtspMonitorType.js
rename to server/monitor-types/rtsp.js
diff --git a/server/uptime-kuma-server.js b/server/uptime-kuma-server.js
index b410ae85a..7bd7f6196 100644
--- a/server/uptime-kuma-server.js
+++ b/server/uptime-kuma-server.js
@@ -561,5 +561,5 @@ const { SNMPMonitorType } = require("./monitor-types/snmp");
 const { MongodbMonitorType } = require("./monitor-types/mongodb");
 const { RabbitMqMonitorType } = require("./monitor-types/rabbitmq");
 const { ManualMonitorType } = require("./monitor-types/manual");
-const {RtspMonitorType}= require("./monitor-types/RtspMonitorType")
+const {RtspMonitorType}= require("./monitor-types/rtsp")
 const Monitor = require("./model/monitor");

From bd3c8050c91ee302ac805b359e7428bd28a84947 Mon Sep 17 00:00:00 2001
From: Hemanth <rachapalli.hemanth5544@gmail.com>
Date: Fri, 27 Jun 2025 22:27:53 +0530
Subject: [PATCH 03/14] added new columns

---
 db/knex_migrations/2025-06-27-0001-add-rtsp.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 db/knex_migrations/2025-06-27-0001-add-rtsp.js

diff --git a/db/knex_migrations/2025-06-27-0001-add-rtsp.js b/db/knex_migrations/2025-06-27-0001-add-rtsp.js
new file mode 100644
index 000000000..ca43423e0
--- /dev/null
+++ b/db/knex_migrations/2025-06-27-0001-add-rtsp.js
@@ -0,0 +1,18 @@
+// Add new columns and alter 'manual_status' to smallint
+// migration file: add_rtsp_fields_to_monitor.js
+
+exports.up = function (knex) {
+    return knex.schema.alterTable("monitor", function (table) {
+        table.string("rtsp_username");
+        table.string("rtsp_password");
+        table.string("rtsp_path");
+    });
+};
+
+exports.down = function (knex) {
+    return knex.schema.alterTable("monitor", function (table) {
+        table.dropColumn("rtsp_username");
+        table.dropColumn("rtsp_password");
+        table.dropColumn("rtsp_path");
+    });
+};

From 6bc8936bc79688d6a664451fa5a5b7cc6644f4e8 Mon Sep 17 00:00:00 2001
From: Hemanth <rachapalli.hemanth5544@gmail.com>
Date: Fri, 27 Jun 2025 22:29:50 +0530
Subject: [PATCH 04/14] added rtsp option

---
 src/pages/EditMonitor.vue | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 0d628895d..0c2174a60 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -97,6 +97,9 @@
                                         <option v-if="!$root.info.isContainer" value="tailscale-ping">
                                             Tailscale Ping
                                         </option>
+                                        <option value="rtsp"> 
+                                            RTSP
+                                        </option>
                                     </optgroup>
                                 </select>
                                 <i18n-t v-if="monitor.type === 'rabbitmq'" keypath="rabbitmqHelpText" tag="div" class="form-text">
@@ -300,7 +303,7 @@
 
                             <!-- Hostname -->
                             <!-- TCP Port / Ping / DNS / Steam / MQTT / Radius / Tailscale Ping / SNMP / SMTP only -->
-                            <div v-if="monitor.type === 'port' || monitor.type === 'ping' || monitor.type === 'dns' || monitor.type === 'steam' || monitor.type === 'gamedig' || monitor.type === 'mqtt' || monitor.type === 'radius' || monitor.type === 'tailscale-ping' || monitor.type === 'smtp' || monitor.type === 'snmp'" class="my-3">
+                            <div v-if="monitor.type === 'port' || monitor.type === 'ping' || monitor.type === 'dns' || monitor.type === 'steam' || monitor.type === 'gamedig' || monitor.type === 'mqtt' || monitor.type === 'radius' || monitor.type === 'tailscale-ping' || monitor.type === 'smtp' || monitor.type === 'snmp' || monitor.type === 'rtsp'" class="my-3">
                                 <label for="hostname" class="form-label">{{ $t("Hostname") }}</label>
                                 <input
                                     id="hostname"
@@ -315,7 +318,7 @@
 
                             <!-- Port -->
                             <!-- For TCP Port / Steam / MQTT / Radius Type / SNMP -->
-                            <div v-if="monitor.type === 'port' || monitor.type === 'steam' || monitor.type === 'gamedig' || monitor.type === 'mqtt' || monitor.type === 'radius' || monitor.type === 'smtp' || monitor.type === 'snmp'" class="my-3">
+                            <div v-if="monitor.type === 'port' || monitor.type === 'steam' || monitor.type === 'gamedig' || monitor.type === 'mqtt' || monitor.type === 'radius' || monitor.type === 'smtp' || monitor.type === 'snmp' || monitor.type === 'rtsp'" class="my-3">
                                 <label for="port" class="form-label">{{ $t("Port") }}</label>
                                 <input id="port" v-model="monitor.port" type="number" class="form-control" required min="0" max="65535" step="1">
                             </div>
@@ -515,6 +518,23 @@
                                 </div>
                             </template>
 
+
+                              <template v-if="monitor.type === 'rtsp'">
+                                <div class="my-3">
+                                    <label for="rtspUsername" class="form-label">RTSP {{ $t("Username") }}</label>
+                                    <input id="rtspUsername" v-model="monitor.rtspUsername" type="text" class="form-control">
+                                </div>
+
+                                <div class="my-3">
+                                    <label for="rtspPassword" class="form-label">RTSP {{ $t("Password") }}</label>
+                                    <input id="rtspPassword" v-model="monitor.rtspPassword" type="password" class="form-control">
+                                </div>
+                                <div class="my-3">
+                                    <label for="rtspPath" class="form-label">RTSP {{ $t("path") }}</label>
+                                    <input id="rtspPath" v-model="monitor.rtspPath" type="text" class="form-control">
+                                </div>
+                            </template>
+
                             <template v-if="monitor.type === 'radius'">
                                 <div class="my-3">
                                     <label for="radius_username" class="form-label">Radius {{ $t("Username") }}</label>
@@ -1194,7 +1214,11 @@ const monitorDefaults = {
     rabbitmqNodes: [],
     rabbitmqUsername: "",
     rabbitmqPassword: "",
-    conditions: []
+    conditions: [],
+    rtspUsername:"",
+    rtspPassword:"",
+    rtspPath:""
+
 };
 
 export default {

From 152c93e7d3b50519d640e70d3383f77d87e67ea4 Mon Sep 17 00:00:00 2001
From: Hemanth <rachapalli.hemanth5544@gmail.com>
Date: Fri, 27 Jun 2025 22:30:33 +0530
Subject: [PATCH 05/14] added rtsp details

---
 server/model/monitor.js      |  6 ++++++
 server/monitor-types/rtsp.js | 18 +++++++++++++++---
 server/server.js             |  3 +++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/server/model/monitor.js b/server/model/monitor.js
index c1db77e8b..dbc365487 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -197,6 +197,12 @@ class Monitor extends BeanModel {
                 kafkaProducerSaslOptions: JSON.parse(this.kafkaProducerSaslOptions),
                 rabbitmqUsername: this.rabbitmqUsername,
                 rabbitmqPassword: this.rabbitmqPassword,
+                rtspUsername: this.rtspUsername,
+                rtspPassword: this.rtspPassword,
+                rtspPath:this.rtspPath
+
+
+
             };
         }
 
diff --git a/server/monitor-types/rtsp.js b/server/monitor-types/rtsp.js
index bc4f57486..a52e40aa4 100644
--- a/server/monitor-types/rtsp.js
+++ b/server/monitor-types/rtsp.js
@@ -4,12 +4,24 @@ class RtspMonitorType {
   name = "rtsp";
 
   /**
-   * @param {Object} monitor - monitor config containing rtspUrl and timeout
+   * @param {Object} monitor - monitor config containing hostname, port, username, password, path, and timeout
    * @param {Object} heartbeat - object to update with status and message
    */
   async check(monitor, heartbeat) {
-    const url = monitor.rtspUrl;
-    const timeoutMs = (monitor.timeout || 10) * 1000;
+    const { rtsp_username, rtsp_password, hostname, port, rtsp_path, timeout } = monitor;
+    const timeoutMs = (timeout || 10) * 1000;
+    
+    // Construct the RTSP URL from individual components
+    let url = `rtsp://${hostname}:${port}${rtsp_path}`;
+
+    // If username and password are provided, inject them into the URL
+    if (rtsp_username && rtsp_password !== undefined) {
+      const auth = `${rtsp_username}:${rtsp_password}@`;
+      const urlPattern = /^rtsp:\/\//;
+
+      // Inject authentication details into URL (before host)
+      url = url.replace(urlPattern, `rtsp://${auth}`);
+    }
 
     heartbeat.status = DOWN;
     heartbeat.msg = "Starting RTSP stream check...";
diff --git a/server/server.js b/server/server.js
index 5b2f41a2e..9a5042310 100644
--- a/server/server.js
+++ b/server/server.js
@@ -877,6 +877,9 @@ let needSetup = false;
                 bean.rabbitmqPassword = monitor.rabbitmqPassword;
                 bean.conditions = JSON.stringify(monitor.conditions);
                 bean.manual_status = monitor.manual_status;
+                bean.rtspUsername=monitor.rtspUsername
+                bean.rtspPassword=monitor.rtspPassword
+                bean.rtspPath=monitor.path
 
                 // ping advanced options
                 bean.ping_numeric = monitor.ping_numeric;

From 4490a05123dfb0e4e0a7449191fdd250f8400188 Mon Sep 17 00:00:00 2001
From: Hemanth <rachapalli.hemanth5544@gmail.com>
Date: Fri, 27 Jun 2025 22:55:34 +0530
Subject: [PATCH 06/14] eslint fix

---
 server/model/monitor.js      |   4 +-
 server/monitor-types/rtsp.js | 101 +++++++++++++++--------------------
 server/server.js             |   6 +--
 server/uptime-kuma-server.js |   2 +-
 4 files changed, 48 insertions(+), 65 deletions(-)

diff --git a/server/model/monitor.js b/server/model/monitor.js
index dbc365487..c8d7ddc6f 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -199,9 +199,7 @@ class Monitor extends BeanModel {
                 rabbitmqPassword: this.rabbitmqPassword,
                 rtspUsername: this.rtspUsername,
                 rtspPassword: this.rtspPassword,
-                rtspPath:this.rtspPath
-
-
+                rtspPath: this.rtspPath
 
             };
         }
diff --git a/server/monitor-types/rtsp.js b/server/monitor-types/rtsp.js
index a52e40aa4..e6a8571c3 100644
--- a/server/monitor-types/rtsp.js
+++ b/server/monitor-types/rtsp.js
@@ -1,68 +1,53 @@
 const RTSPClient = require("rtsp-client");
-const { log, UP, DOWN } = require("../../src/util"); 
+const { log, UP, DOWN } = require("../../src/util");
+
 class RtspMonitorType {
-  name = "rtsp";
+    name = "rtsp";
 
-  /**
-   * @param {Object} monitor - monitor config containing hostname, port, username, password, path, and timeout
-   * @param {Object} heartbeat - object to update with status and message
-   */
-  async check(monitor, heartbeat) {
-    const { rtsp_username, rtsp_password, hostname, port, rtsp_path, timeout } = monitor;
-    const timeoutMs = (timeout || 10) * 1000;
-    
-    // Construct the RTSP URL from individual components
-    let url = `rtsp://${hostname}:${port}${rtsp_path}`;
+    /**
+     * Check the availability of an RTSP stream.
+     * @param {object} monitor - Monitor config: hostname, port, username, password, path.
+     * @param {object} heartbeat - Heartbeat object to update with status and message.
+     */
+    async check(monitor, heartbeat) {
+        const { rtspUsername, rtspPassword, hostname, port, rtspPath } = monitor;
 
-    // If username and password are provided, inject them into the URL
-    if (rtsp_username && rtsp_password !== undefined) {
-      const auth = `${rtsp_username}:${rtsp_password}@`;
-      const urlPattern = /^rtsp:\/\//;
+        // Construct RTSP URL
+        let url = `rtsp://${hostname}:${port}${rtspPath}`;
+        if (rtspUsername && rtspPassword !== undefined) {
+            url = url.replace(/^rtsp:\/\//, `rtsp://${rtspUsername}:${rtspPassword}@`);
+        }
 
-      // Inject authentication details into URL (before host)
-      url = url.replace(urlPattern, `rtsp://${auth}`);
+        // Default heartbeat status
+        heartbeat.status = DOWN;
+        heartbeat.msg = "Starting RTSP stream check...";
+
+        // Validate URL
+        if (!url || !url.startsWith("rtsp://")) {
+            heartbeat.msg = "Invalid RTSP URL";
+            return;
+        }
+
+        const client = new RTSPClient();
+
+        try {
+            await client.connect(url);
+            await client.describe();
+            heartbeat.status = UP;
+            heartbeat.msg = "RTSP stream is accessible";
+        } catch (error) {
+            heartbeat.msg = `Error: ${error.message}`;
+            log.debug("monitor", `[${monitor.name}] RTSP check failed: ${error.message}`);
+        } finally {
+            try {
+                await client.close();
+            } catch (closeError) {
+                log.debug("monitor", `Error closing RTSP client: ${closeError.message}`);
+            }
+        }
     }
-
-    heartbeat.status = DOWN;
-    heartbeat.msg = "Starting RTSP stream check...";
-
-    if (!url || !url.startsWith("rtsp://")) {
-      heartbeat.status = DOWN;
-      heartbeat.msg = "Invalid RTSP URL";
-      return;
-    }
-
-    const client = new RTSPClient();
-
-    // Timeout promise to kill hanging connections
-    const timeoutPromise = new Promise((_, reject) =>
-      setTimeout(() => reject(new Error("RTSP connection timed out")), timeoutMs)
-    );
-
-    try {
-      // Use Promise.race to enforce timeout
-      await Promise.race([
-        (async () => {
-          await client.connect(url);
-          const describe = await client.describe();
-          await client.close();
-
-          heartbeat.status = UP;
-          heartbeat.msg = "RTSP stream is accessible";
-        })(),
-        timeoutPromise,
-      ]);
-    } catch (error) {
-      heartbeat.status = DOWN;
-      heartbeat.msg = `Error: ${error.message}`;
-      log.debug("monitor", `[${monitor.name}] RTSP check failed: ${error.message}`);
-      try {
-        await client.close();
-      } catch {}
-    }
-  }
 }
 
 module.exports = {
-  RtspMonitorType,
+    RtspMonitorType,
 };
diff --git a/server/server.js b/server/server.js
index 9a5042310..e7d480f64 100644
--- a/server/server.js
+++ b/server/server.js
@@ -877,9 +877,9 @@ let needSetup = false;
                 bean.rabbitmqPassword = monitor.rabbitmqPassword;
                 bean.conditions = JSON.stringify(monitor.conditions);
                 bean.manual_status = monitor.manual_status;
-                bean.rtspUsername=monitor.rtspUsername
-                bean.rtspPassword=monitor.rtspPassword
-                bean.rtspPath=monitor.path
+                bean.rtspUsername = monitor.rtspUsername;
+                bean.rtspPassword = monitor.rtspPassword;
+                bean.rtspPath = monitor.path;
 
                 // ping advanced options
                 bean.ping_numeric = monitor.ping_numeric;
diff --git a/server/uptime-kuma-server.js b/server/uptime-kuma-server.js
index 7bd7f6196..bad37f7f4 100644
--- a/server/uptime-kuma-server.js
+++ b/server/uptime-kuma-server.js
@@ -561,5 +561,5 @@ const { SNMPMonitorType } = require("./monitor-types/snmp");
 const { MongodbMonitorType } = require("./monitor-types/mongodb");
 const { RabbitMqMonitorType } = require("./monitor-types/rabbitmq");
 const { ManualMonitorType } = require("./monitor-types/manual");
-const {RtspMonitorType}= require("./monitor-types/rtsp")
+const { RtspMonitorType } = require("./monitor-types/rtsp");
 const Monitor = require("./model/monitor");

From 9d6c5014bfed2e2df055a738a2a2c53d4710eda9 Mon Sep 17 00:00:00 2001
From: Hemanth <rachapalli.hemanth5544@gmail.com>
Date: Sat, 28 Jun 2025 14:42:27 +0530
Subject: [PATCH 07/14] extends monitor-type heartbeat msg update

---
 server/monitor-types/rtsp.js | 43 +++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/server/monitor-types/rtsp.js b/server/monitor-types/rtsp.js
index e6a8571c3..b13879909 100644
--- a/server/monitor-types/rtsp.js
+++ b/server/monitor-types/rtsp.js
@@ -1,29 +1,25 @@
+const { MonitorType } = require("./monitor-type");
 const RTSPClient = require("rtsp-client");
 const { log, UP, DOWN } = require("../../src/util");
 
-class RtspMonitorType {
+class RtspMonitorType extends MonitorType {
     name = "rtsp";
 
     /**
-     * Check the availability of an RTSP stream.
-     * @param {object} monitor - Monitor config: hostname, port, username, password, path.
-     * @param {object} heartbeat - Heartbeat object to update with status and message.
+     * @inheritdoc
      */
-    async check(monitor, heartbeat) {
+    async check(monitor, heartbeat, _server) {
         const { rtspUsername, rtspPassword, hostname, port, rtspPath } = monitor;
 
         // Construct RTSP URL
         let url = `rtsp://${hostname}:${port}${rtspPath}`;
         if (rtspUsername && rtspPassword !== undefined) {
-            url = url.replace(/^rtsp:\/\//, `rtsp://${rtspUsername}:${rtspPassword}@`);
+            url = `rtsp://${rtspUsername}:${rtspPassword}@${hostname}:${port}${rtspPath}`;
         }
 
-        // Default heartbeat status
-        heartbeat.status = DOWN;
-        heartbeat.msg = "Starting RTSP stream check...";
-
         // Validate URL
         if (!url || !url.startsWith("rtsp://")) {
+            heartbeat.status = DOWN;
             heartbeat.msg = "Invalid RTSP URL";
             return;
         }
@@ -31,13 +27,30 @@ class RtspMonitorType {
         const client = new RTSPClient();
 
         try {
+            log.debug("monitor", `Connecting to RTSP URL: ${url}`);
             await client.connect(url);
-            await client.describe();
-            heartbeat.status = UP;
-            heartbeat.msg = "RTSP stream is accessible";
+
+            const res = await client.describe();
+            log.debug("monitor", `RTSP DESCRIBE response: ${JSON.stringify(res)}`);
+            
+            const statusCode = res?.statusCode;
+            const statusMessage = res?.statusMessage || "Unknown";
+
+            if (statusCode === 200) {
+                heartbeat.status = UP;
+                heartbeat.msg = "RTSP stream is accessible";
+            } else if (statusCode === 503) {
+                heartbeat.status = DOWN;
+                heartbeat.msg = res.body?.reason || "Service Unavailable";
+            } else {
+                heartbeat.status = DOWN;
+                heartbeat.msg = `${statusCode} - ${statusMessage}`;
+            }
+
         } catch (error) {
-            heartbeat.msg = `Error: ${error.message}`;
-            log.debug("monitor", `[${monitor.name}] RTSP check failed: ${error.message}`);
+            heartbeat.status = DOWN;
+            heartbeat.msg = `RTSP check failed: ${error.message}`;
+            log.debug("monitor", `[${monitor.name}] RTSP check failed: ${JSON.stringify(error.message)}`);
         } finally {
             try {
                 await client.close();

From 09008a678a798acaa3a635e4ca6985dc1f66a78c Mon Sep 17 00:00:00 2001
From: Hemanth <rachapalli.hemanth5544@gmail.com>
Date: Sat, 28 Jun 2025 14:46:23 +0530
Subject: [PATCH 08/14] spaces

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

diff --git a/server/monitor-types/rtsp.js b/server/monitor-types/rtsp.js
index b13879909..ab880bff4 100644
--- a/server/monitor-types/rtsp.js
+++ b/server/monitor-types/rtsp.js
@@ -32,7 +32,7 @@ class RtspMonitorType extends MonitorType {
 
             const res = await client.describe();
             log.debug("monitor", `RTSP DESCRIBE response: ${JSON.stringify(res)}`);
-            
+
             const statusCode = res?.statusCode;
             const statusMessage = res?.statusMessage || "Unknown";
 

From 7253718860d9e4bf0699dfe67b8f3d34799c151b Mon Sep 17 00:00:00 2001
From: Hemanth <rachapalli.hemanth5544@gmail.com>
Date: Sat, 28 Jun 2025 16:10:43 +0530
Subject: [PATCH 09/14] lint issue fixed

---
 src/pages/EditMonitor.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 0c2174a60..3006519cf 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -97,7 +97,7 @@
                                         <option v-if="!$root.info.isContainer" value="tailscale-ping">
                                             Tailscale Ping
                                         </option>
-                                        <option value="rtsp"> 
+                                        <option value="rtsp">
                                             RTSP
                                         </option>
                                     </optgroup>
@@ -518,8 +518,7 @@
                                 </div>
                             </template>
 
-
-                              <template v-if="monitor.type === 'rtsp'">
+                            <template v-if="monitor.type === 'rtsp'">
                                 <div class="my-3">
                                     <label for="rtspUsername" class="form-label">RTSP {{ $t("Username") }}</label>
                                     <input id="rtspUsername" v-model="monitor.rtspUsername" type="text" class="form-control">
@@ -1215,9 +1214,9 @@ const monitorDefaults = {
     rabbitmqUsername: "",
     rabbitmqPassword: "",
     conditions: [],
-    rtspUsername:"",
-    rtspPassword:"",
-    rtspPath:""
+    rtspUsername: "",
+    rtspPassword: "",
+    rtspPath: ""
 
 };
 

From 279ca266d93bf8cee8cf0fcab5b1f82664ea95ab Mon Sep 17 00:00:00 2001
From: Hemanth <rachapalli.hemanth5544@gmail.com>
Date: Sat, 28 Jun 2025 18:29:35 +0530
Subject: [PATCH 10/14] add client listner

---
 server/monitor-types/rtsp.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/monitor-types/rtsp.js b/server/monitor-types/rtsp.js
index ab880bff4..92f21501e 100644
--- a/server/monitor-types/rtsp.js
+++ b/server/monitor-types/rtsp.js
@@ -25,6 +25,9 @@ class RtspMonitorType extends MonitorType {
         }
 
         const client = new RTSPClient();
+        client.on("error", (err) => {
+            log.debug("monitor", `RTSP client emitted error: ${err.message}`);
+        });
 
         try {
             log.debug("monitor", `Connecting to RTSP URL: ${url}`);
@@ -46,11 +49,10 @@ class RtspMonitorType extends MonitorType {
                 heartbeat.status = DOWN;
                 heartbeat.msg = `${statusCode} - ${statusMessage}`;
             }
-
         } catch (error) {
+            log.debug("monitor", `[${monitor.name}] RTSP check failed: ${error.message}`);
             heartbeat.status = DOWN;
             heartbeat.msg = `RTSP check failed: ${error.message}`;
-            log.debug("monitor", `[${monitor.name}] RTSP check failed: ${JSON.stringify(error.message)}`);
         } finally {
             try {
                 await client.close();

From 6020cb9e8d7bb74a37eab60c3261175f5817bd80 Mon Sep 17 00:00:00 2001
From: Hemanth <rachapalli.hemanth5544@gmail.com>
Date: Sat, 28 Jun 2025 19:26:13 +0530
Subject: [PATCH 11/14] moved to auth side aand fix of path

---
 server/server.js               |  2 +-
 src/pages/EditMonitor.vue      | 36 +++++++------
 test/backend-test/test-rtsp.js | 93 ++++++++++++++++++++++++++++++++++
 3 files changed, 114 insertions(+), 17 deletions(-)
 create mode 100644 test/backend-test/test-rtsp.js

diff --git a/server/server.js b/server/server.js
index e7d480f64..c578c1a84 100644
--- a/server/server.js
+++ b/server/server.js
@@ -879,7 +879,7 @@ let needSetup = false;
                 bean.manual_status = monitor.manual_status;
                 bean.rtspUsername = monitor.rtspUsername;
                 bean.rtspPassword = monitor.rtspPassword;
-                bean.rtspPath = monitor.path;
+                bean.rtspPath = monitor.rtspPath;
 
                 // ping advanced options
                 bean.ping_numeric = monitor.ping_numeric;
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 3006519cf..f764202ea 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -518,22 +518,6 @@
                                 </div>
                             </template>
 
-                            <template v-if="monitor.type === 'rtsp'">
-                                <div class="my-3">
-                                    <label for="rtspUsername" class="form-label">RTSP {{ $t("Username") }}</label>
-                                    <input id="rtspUsername" v-model="monitor.rtspUsername" type="text" class="form-control">
-                                </div>
-
-                                <div class="my-3">
-                                    <label for="rtspPassword" class="form-label">RTSP {{ $t("Password") }}</label>
-                                    <input id="rtspPassword" v-model="monitor.rtspPassword" type="password" class="form-control">
-                                </div>
-                                <div class="my-3">
-                                    <label for="rtspPath" class="form-label">RTSP {{ $t("path") }}</label>
-                                    <input id="rtspPath" v-model="monitor.rtspPath" type="text" class="form-control">
-                                </div>
-                            </template>
-
                             <template v-if="monitor.type === 'radius'">
                                 <div class="my-3">
                                     <label for="radius_username" class="form-label">Radius {{ $t("Username") }}</label>
@@ -1071,6 +1055,26 @@
                                 </template>
                             </template>
 
+                            <template v-if="monitor.type === 'rtsp'">
+                                <h4 class="mt-5 mb-2">{{ $t("Authentication") }}</h4>
+
+                                <div class="my-3">
+                                    <label for="rtspUsername" class="form-label">RTSP {{ $t("Username") }}</label>
+                                    <input
+                                        id="rtspUsername" v-model="monitor.rtspUsername" :placeholder="$t('Username')" type="text" class="form-control"
+                                    >
+                                </div>
+
+                                <div class="my-3">
+                                    <label for="rtspPassword" class="form-label">RTSP {{ $t("Password") }}</label>
+                                    <input id="rtspPassword" v-model="monitor.rtspPassword" :placeholder="$t('Password')" type="password" class="form-control">
+                                </div>
+                                <div class="my-3">
+                                    <label for="rtspPath" class="form-label">RTSP {{ $t("path") }}</label>
+                                    <input id="rtspPath" v-model="monitor.rtspPath" :placeholder="$t('Path')" type="text" class="form-control">
+                                </div>
+                            </template>
+
                             <!-- gRPC Options -->
                             <template v-if="monitor.type === 'grpc-keyword' ">
                                 <!-- Proto service enable TLS -->
diff --git a/test/backend-test/test-rtsp.js b/test/backend-test/test-rtsp.js
new file mode 100644
index 000000000..2e75ad7f3
--- /dev/null
+++ b/test/backend-test/test-rtsp.js
@@ -0,0 +1,93 @@
+const { describe, test } = require("node:test");
+const assert = require("node:assert");
+const { RtspMonitorType } = require("../../server/monitor-types/rtsp");
+const { UP, DOWN, PENDING } = require("../../src/util");
+const RTSPClient = require("rtsp-client");
+
+describe("RTSP Monitor", {
+    skip: !!process.env.CI && (process.platform !== "linux" || process.arch !== "x64"),
+}, () => {
+    test("RTSP stream is accessible", async () => {
+        const rtspMonitor = new RtspMonitorType();
+        const monitor = {
+            hostname: "localhost",
+            port: 8554,
+            rtspPath: "/teststream",
+            rtspUsername: "user",
+            rtspPassword: "pass",
+            name: "RTSP Test Monitor",
+        };
+
+        const heartbeat = {
+            msg: "",
+            status: PENDING,
+        };
+
+        RTSPClient.prototype.connect = async () => {};
+        RTSPClient.prototype.describe = async () => ({
+            statusCode: 200,
+            statusMessage: "OK",
+        });
+        RTSPClient.prototype.close = async () => {};
+
+        await rtspMonitor.check(monitor, heartbeat, {});
+        assert.strictEqual(heartbeat.status, UP);
+        assert.strictEqual(heartbeat.msg, "RTSP stream is accessible");
+    });
+
+    test("RTSP stream is not accessible", async () => {
+        const rtspMonitor = new RtspMonitorType();
+        const monitor = {
+            hostname: "localhost",
+            port: 9999,
+            rtspPath: "/teststream",
+            rtspUsername: "user",
+            rtspPassword: "pass",
+            name: "RTSP Test Monitor",
+        };
+
+        const heartbeat = {
+            msg: "",
+            status: PENDING,
+        };
+
+        RTSPClient.prototype.connect = async () => {
+            throw new Error("Connection refused");
+        };
+        RTSPClient.prototype.close = async () => {};
+
+        await rtspMonitor.check(monitor, heartbeat, {});
+        assert.strictEqual(heartbeat.status, DOWN);
+        assert.match(heartbeat.msg, /RTSP check failed: Connection refused/);
+    });
+
+    test("RTSP stream returns 503 error", async () => {
+        const rtspMonitor = new RtspMonitorType();
+        const monitor = {
+            hostname: "localhost",
+            port: 8554,
+            rtspPath: "/teststream",
+            rtspUsername: "user",
+            rtspPassword: "pass",
+            name: "RTSP Test Monitor",
+        };
+
+        const heartbeat = {
+            msg: "",
+            status: PENDING,
+        };
+
+        RTSPClient.prototype.connect = async () => {};
+        RTSPClient.prototype.describe = async () => ({
+            statusCode: 503,
+            statusMessage: "Service Unavailable",
+            body: { reason: "Server overloaded" },
+        });
+        RTSPClient.prototype.close = async () => {};
+
+        await rtspMonitor.check(monitor, heartbeat, {});
+        assert.strictEqual(heartbeat.status, DOWN);
+        assert.strictEqual(heartbeat.msg, "Server overloaded");
+    });
+});
+

From c9ec3e449c41bfc6a63c0a151f43bd37282bf86c Mon Sep 17 00:00:00 2001
From: Hemanth <rachapalli.hemanth5544@gmail.com>
Date: Sat, 28 Jun 2025 19:31:35 +0530
Subject: [PATCH 12/14] added package lock

---
 package-lock.json | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ccb72dee3..03e832d7e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "uptime-kuma",
-    "version": "2.0.0-beta.2",
+    "version": "2.0.0-beta.3",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "uptime-kuma",
-            "version": "2.0.0-beta.2",
+            "version": "2.0.0-beta.3",
             "license": "MIT",
             "dependencies": {
                 "@grpc/grpc-js": "~1.8.22",
@@ -75,6 +75,7 @@
                 "qs": "~6.10.4",
                 "redbean-node": "~0.3.0",
                 "redis": "~4.5.1",
+                "rtsp-client": "^1.4.5",
                 "semver": "~7.5.4",
                 "socket.io": "~4.8.0",
                 "socket.io-client": "~4.8.0",
@@ -14850,6 +14851,16 @@
                 "rtlcss": "bin/rtlcss.js"
             }
         },
+        "node_modules/rtsp-client": {
+            "version": "1.4.5",
+            "resolved": "https://registry.npmjs.org/rtsp-client/-/rtsp-client-1.4.5.tgz",
+            "integrity": "sha512-21ZjCoGZdCPOTZOME1BzZ+OCXJIU6SQoGEAKwlbuVPU/jhAX9S8wTr+ZkBMR074xK28UfFx1KQvTV1/wECU3MA==",
+            "license": "MIT",
+            "dependencies": {
+                "lodash": "^4.17.15",
+                "www-authenticate": "^0.6.2"
+            }
+        },
         "node_modules/run-applescript": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.0.0.tgz",
@@ -17852,6 +17863,14 @@
                 }
             }
         },
+        "node_modules/www-authenticate": {
+            "version": "0.6.3",
+            "resolved": "https://registry.npmjs.org/www-authenticate/-/www-authenticate-0.6.3.tgz",
+            "integrity": "sha512-8VkdLBJiBh5aXlJvcVaPykwSI//OA+Sxw7g84vIyCqoqlXtLupGNhyXxbgVuZ7g5ZS+lCJ4bTtcw/gJciqEuAg==",
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
         "node_modules/xml-js": {
             "version": "1.6.11",
             "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",

From 9cdf7042ba9c5a37c8b8b526b2932201cfcea911 Mon Sep 17 00:00:00 2001
From: Hemanth <rachapalli.hemanth5544@gmail.com>
Date: Sun, 29 Jun 2025 11:17:40 +0530
Subject: [PATCH 13/14] moved path to left

---
 src/pages/EditMonitor.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index f764202ea..9f6d51368 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -518,6 +518,13 @@
                                 </div>
                             </template>
 
+                            <template v-if="monitor.type === 'rtsp'">
+                                <div class="my-3">
+                                    <label for="rtspPath" class="form-label">RTSP {{ $t("path") }}</label>
+                                    <input id="rtspPath" v-model="monitor.rtspPath" :placeholder="$t('Path')" type="text" class="form-control">
+                                </div>
+                            </template>
+
                             <template v-if="monitor.type === 'radius'">
                                 <div class="my-3">
                                     <label for="radius_username" class="form-label">Radius {{ $t("Username") }}</label>
@@ -1069,10 +1076,6 @@
                                     <label for="rtspPassword" class="form-label">RTSP {{ $t("Password") }}</label>
                                     <input id="rtspPassword" v-model="monitor.rtspPassword" :placeholder="$t('Password')" type="password" class="form-control">
                                 </div>
-                                <div class="my-3">
-                                    <label for="rtspPath" class="form-label">RTSP {{ $t("path") }}</label>
-                                    <input id="rtspPath" v-model="monitor.rtspPath" :placeholder="$t('Path')" type="text" class="form-control">
-                                </div>
                             </template>
 
                             <!-- gRPC Options -->

From 9a1d0e919012e4ffa518647aa19ff0a84a049164 Mon Sep 17 00:00:00 2001
From: Hemanth <rachapalli.hemanth5544@gmail.com>
Date: Sun, 29 Jun 2025 21:09:34 +0530
Subject: [PATCH 14/14] used translation

---
 src/lang/en.json          | 6 +++++-
 src/pages/EditMonitor.vue | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/lang/en.json b/src/lang/en.json
index a979edcc2..5664b40be 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -1123,5 +1123,9 @@
     "Staged Tags for Batch Add": "Staged Tags for Batch Add",
     "Clear Form": "Clear Form",
     "pause": "Pause",
-    "Manual": "Manual"
+    "Manual": "Manual",
+    "RTSP Username": "RTSP Username",
+    "RTSP Password": "RTSP Password",
+    "RTSP Path": "RTSP Path",
+    "Path": "Path"
 }
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 9f6d51368..b57cf7ca3 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -520,7 +520,7 @@
 
                             <template v-if="monitor.type === 'rtsp'">
                                 <div class="my-3">
-                                    <label for="rtspPath" class="form-label">RTSP {{ $t("path") }}</label>
+                                    <label for="rtspPath" class="form-label"> {{ $t("RTSP Path") }}</label>
                                     <input id="rtspPath" v-model="monitor.rtspPath" :placeholder="$t('Path')" type="text" class="form-control">
                                 </div>
                             </template>
@@ -1066,14 +1066,14 @@
                                 <h4 class="mt-5 mb-2">{{ $t("Authentication") }}</h4>
 
                                 <div class="my-3">
-                                    <label for="rtspUsername" class="form-label">RTSP {{ $t("Username") }}</label>
+                                    <label for="rtspUsername" class="form-label">{{ $t("RTSP Username") }}</label>
                                     <input
                                         id="rtspUsername" v-model="monitor.rtspUsername" :placeholder="$t('Username')" type="text" class="form-control"
                                     >
                                 </div>
 
                                 <div class="my-3">
-                                    <label for="rtspPassword" class="form-label">RTSP {{ $t("Password") }}</label>
+                                    <label for="rtspPassword" class="form-label">{{ $t("RTSP Password") }}</label>
                                     <input id="rtspPassword" v-model="monitor.rtspPassword" :placeholder="$t('Password')" type="password" class="form-control">
                                 </div>
                             </template>