From 0a75dd7e3c687bb0b985afb5c905122247c35252 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Mon, 17 Nov 2025 12:26:14 +0100
Subject: [PATCH] new action resetMQTT, called from MQTT Settings page

---
 interface/src/app/settings/MqttSettings.tsx | 47 ++++++++++++++++-----
 mock-api/restServer.ts                      |  4 ++
 src/core/mqtt.cpp                           |  6 ++-
 src/web/WebStatusService.cpp                |  3 ++
 4 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/interface/src/app/settings/MqttSettings.tsx b/interface/src/app/settings/MqttSettings.tsx
index eca71a19c..f03d906a0 100644
--- a/interface/src/app/settings/MqttSettings.tsx
+++ b/interface/src/app/settings/MqttSettings.tsx
@@ -1,8 +1,11 @@
 import { useCallback, useMemo, useState } from 'react';
+import { toast } from 'react-toastify';
 
 import CancelIcon from '@mui/icons-material/Cancel';
+import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore';
 import WarningIcon from '@mui/icons-material/Warning';
 import {
+  Box,
   Button,
   Checkbox,
   Grid,
@@ -30,6 +33,8 @@ import type { MqttSettingsType } from 'types';
 import { numberValue, updateValueDirty, useRest } from 'utils';
 import { createMqttSettingsValidator, validate } from 'validators';
 
+import { callAction } from '../../api/app';
+
 const MqttSettings = () => {
   const {
     loadData,
@@ -52,6 +57,16 @@ const MqttSettings = () => {
 
   const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
 
+  const sendResetMQTT = useCallback(() => {
+    void callAction({ action: 'resetMQTT' })
+      .then(() => {
+        toast.success('MQTT ' + LL.REFRESH() + ' successful');
+      })
+      .catch((error) => {
+        toast.error(String(error.error?.message || 'An error occurred'));
+      });
+  }, []);
+
   const updateFormValue = useMemo(
     () =>
       updateValueDirty(
@@ -114,16 +129,28 @@ const MqttSettings = () => {
     <SectionContent>
       {blocker ? <BlockNavigation blocker={blocker} /> : null}
       <>
-        <BlockFormControlLabel
-          control={
-            <Checkbox
-              name="enabled"
-              checked={data.enabled}
-              onChange={updateFormValue}
-            />
-          }
-          label={LL.ENABLE_MQTT()}
-        />
+        <Box display="flex" gap={2} mb={1}>
+          <BlockFormControlLabel
+            control={
+              <Checkbox
+                name="enabled"
+                checked={data.enabled}
+                onChange={updateFormValue}
+              />
+            }
+            label={LL.ENABLE_MQTT()}
+          />
+          {data.enabled && (
+            <Button
+              startIcon={<SettingsBackupRestoreIcon />}
+              color="secondary"
+              variant="outlined"
+              onClick={sendResetMQTT}
+            >
+              {LL.REFRESH() + ' MQTT'}
+            </Button>
+          )}
+        </Box>
         <Grid container spacing={2} rowSpacing={0}>
           <Grid>
             <ValidatedTextField
diff --git a/mock-api/restServer.ts b/mock-api/restServer.ts
index 360e36275..1268aeb1f 100644
--- a/mock-api/restServer.ts
+++ b/mock-api/restServer.ts
@@ -5106,6 +5106,10 @@ router
         // upload URL
         console.log('upload File from URL', content.param);
         return status(200);
+      } else if (action === 'resetMQTT') {
+        // reset MQTT
+        console.log('resetting MQTT...');
+        return status(200);
       }
     }
     return status(404); // cmd not found
diff --git a/src/core/mqtt.cpp b/src/core/mqtt.cpp
index b3afc6a5d..5efe52e2d 100644
--- a/src/core/mqtt.cpp
+++ b/src/core/mqtt.cpp
@@ -321,8 +321,12 @@ void Mqtt::on_publish(uint16_t packetId) const {
     LOG_DEBUG("Packet %d sent successful", packetId);
 }
 
-// called when MQTT settings have changed via the Web forms
+// called when MQTT settings have changed via the MQTT Settings or Application Settings Web pages
 void Mqtt::reset_mqtt() {
+    if (!enabled()) {
+        return;
+    }
+
     if (!mqttClient_) {
         return;
     }
diff --git a/src/web/WebStatusService.cpp b/src/web/WebStatusService.cpp
index a13d99303..16efe4609 100644
--- a/src/web/WebStatusService.cpp
+++ b/src/web/WebStatusService.cpp
@@ -195,6 +195,9 @@ void WebStatusService::action(AsyncWebServerRequest * request, JsonVariant json)
         ok = uploadURL(param.c_str());
     } else if (action == "systemStatus" && is_admin) {
         ok = setSystemStatus(param.c_str());
+    } else if (action == "resetMQTT" && is_admin) {
+        emsesp::EMSESP::mqtt_.reset_mqtt();
+        ok = true;
     }
 
 #if defined(EMSESP_STANDALONE) && !defined(EMSESP_UNITY)