From cf1391db6bd3b94a6d39426e92507d424c7004de Mon Sep 17 00:00:00 2001
From: mkdev11 <jaysmth689@gmail.com>
Date: Tue, 6 Jan 2026 03:08:10 +0200
Subject: [PATCH] feat: add conditions support for MQTT monitor type

Add rich conditions support to MQTT monitor similar to DNS monitor,
allowing users to define flexible conditions on:
- topic: The MQTT topic that received the message
- message: The raw message content
- json_value: JSONata-extracted value from JSON payloads

This provides a more intuitive and powerful way to validate MQTT
messages compared to the basic keyword/json-query checks.

Maintains backward compatibility with existing keyword and json-query
check types.

Closes #5992
---
 server/monitor-types/mqtt.js | 64 +++++++++++++++++++++++++++++++-----
 src/lang/en.json             |  2 ++
 2 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/server/monitor-types/mqtt.js b/server/monitor-types/mqtt.js
index 18595b3a4..acc76e853 100644
--- a/server/monitor-types/mqtt.js
+++ b/server/monitor-types/mqtt.js
@@ -2,10 +2,22 @@ const { MonitorType } = require("./monitor-type");
 const { log, UP } = require("../../src/util");
 const mqtt = require("mqtt");
 const jsonata = require("jsonata");
+const { ConditionVariable } = require("../monitor-conditions/variables");
+const { defaultStringOperators, defaultNumberOperators } = require("../monitor-conditions/operators");
+const { ConditionExpressionGroup } = require("../monitor-conditions/expression");
+const { evaluateExpressionGroup } = require("../monitor-conditions/evaluator");
 
 class MqttMonitorType extends MonitorType {
     name = "mqtt";
 
+    supportsConditions = true;
+
+    conditionVariables = [
+        new ConditionVariable("topic", defaultStringOperators),
+        new ConditionVariable("message", defaultStringOperators),
+        new ConditionVariable("json_value", defaultStringOperators.concat(defaultNumberOperators)),
+    ];
+
     /**
      * @inheritdoc
      */
@@ -23,7 +35,46 @@ class MqttMonitorType extends MonitorType {
             monitor.mqttCheckType = "keyword";
         }
 
-        if (monitor.mqttCheckType === "keyword") {
+        // Prepare conditions evaluation
+        const conditions = ConditionExpressionGroup.fromMonitor(monitor);
+        const hasConditions = conditions && conditions.children && conditions.children.length > 0;
+
+        // Parse JSON if needed for conditions
+        let parsedMessage = null;
+        let jsonValue = null;
+        if (hasConditions || monitor.mqttCheckType === "json-query") {
+            try {
+                parsedMessage = JSON.parse(receivedMessage);
+                if (monitor.jsonPath) {
+                    let expression = jsonata(monitor.jsonPath);
+                    jsonValue = await expression.evaluate(parsedMessage);
+                }
+            } catch (e) {
+                // Not valid JSON, that's okay for keyword check
+                if (monitor.mqttCheckType === "json-query") {
+                    throw new Error("Invalid JSON in MQTT message: " + e.message);
+                }
+            }
+        }
+
+        // If conditions are defined, use them
+        if (hasConditions) {
+            const conditionData = {
+                topic: messageTopic,
+                message: receivedMessage,
+                json_value: jsonValue?.toString() ?? "",
+            };
+
+            const conditionsResult = evaluateExpressionGroup(conditions, conditionData);
+
+            if (conditionsResult) {
+                heartbeat.msg = `Topic: ${messageTopic}; Message: ${receivedMessage}`;
+                heartbeat.status = UP;
+            } else {
+                throw new Error(`Conditions not met - Topic: ${messageTopic}; Message: ${receivedMessage}`);
+            }
+        } else if (monitor.mqttCheckType === "keyword") {
+            // Legacy keyword check
             if (receivedMessage != null && receivedMessage.includes(monitor.mqttSuccessMessage)) {
                 heartbeat.msg = `Topic: ${messageTopic}; Message: ${receivedMessage}`;
                 heartbeat.status = UP;
@@ -31,17 +82,12 @@ class MqttMonitorType extends MonitorType {
                 throw Error(`Message Mismatch - Topic: ${monitor.mqttTopic}; Message: ${receivedMessage}`);
             }
         } else if (monitor.mqttCheckType === "json-query") {
-            const parsedMessage = JSON.parse(receivedMessage);
-
-            let expression = jsonata(monitor.jsonPath);
-
-            let result = await expression.evaluate(parsedMessage);
-
-            if (result?.toString() === monitor.expectedValue) {
+            // Legacy json-query check
+            if (jsonValue?.toString() === monitor.expectedValue) {
                 heartbeat.msg = "Message received, expected value is found";
                 heartbeat.status = UP;
             } else {
-                throw new Error("Message received but value is not equal to expected value, value was: [" + result + "]");
+                throw new Error("Message received but value is not equal to expected value, value was: [" + jsonValue + "]");
             }
         } else {
             throw Error("Unknown MQTT Check Type");
diff --git a/src/lang/en.json b/src/lang/en.json
index 3f7bde3aa..5a8600218 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -1121,6 +1121,8 @@
     "less than or equal to": "less than or equal to",
     "greater than or equal to": "greater than or equal to",
     "record": "record",
+    "message": "message",
+    "json_value": "JSON value",
     "Notification Channel": "Notification Channel",
     "Sound": "Sound",
     "Alphanumerical string and hyphens only": "Alphanumerical string and hyphens only",