From 58de012af6847dce702bd0885d02f40099f798ce Mon Sep 17 00:00:00 2001
From: Jono Targett <jono.targett@gmail.com>
Date: Tue, 17 Mar 2026 22:12:53 +1030
Subject: [PATCH] Added command responses success/failure to web UI

---
 console/src/App.vue                           |  2 +
 .../components/dashboard/CommandsWidget.vue   | 57 +++++++++++++++++--
 console/src/main.js                           |  4 ++
 console/src/services/mqtt.js                  |  2 +-
 4 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/console/src/App.vue b/console/src/App.vue
index ef2a05b..7c74b4c 100644
--- a/console/src/App.vue
+++ b/console/src/App.vue
@@ -11,6 +11,8 @@ import CommandsWidget from "./components/dashboard/CommandsWidget.vue";
 </script>
 
 <template>
+    <Toast position="bottom-right" />
+
     <div class="layout-container">
         <AppTopbar />
         <div class="layout-grid">
diff --git a/console/src/components/dashboard/CommandsWidget.vue b/console/src/components/dashboard/CommandsWidget.vue
index c8e00af..336bd4a 100644
--- a/console/src/components/dashboard/CommandsWidget.vue
+++ b/console/src/components/dashboard/CommandsWidget.vue
@@ -6,10 +6,15 @@ import Accordion from 'primevue/accordion';
 import AccordionPanel from 'primevue/accordionpanel';
 import AccordionHeader from 'primevue/accordionheader';
 import AccordionContent from 'primevue/accordioncontent';
+import Dialog from 'primevue/dialog'
 
 import { JsonForms } from "@jsonforms/vue";
 import { primeVueRenderers } from 'jsonforms-primevue'
 
+import { useToast } from 'primevue/usetoast'
+
+const toast = useToast()
+
 const renderers = Object.freeze([
   ...primeVueRenderers,
   // here you can add custom renderers
@@ -24,6 +29,7 @@ const mqtt2 = new MQTTService()
 const filters = ref({})
 const commands = ref([])
 const commandMap = reactive({})
+const commandByResponseId = reactive({})
 
 function rebuildList() {
   commands.value = Object.values(commandMap)
@@ -35,7 +41,8 @@ function updateCommand(device, name, field, value) {
         name,
         description: "No description provided.",
         schema: {},
-        input: {}
+        input: {},
+        response: null
         }
   }
 
@@ -44,12 +51,27 @@ function updateCommand(device, name, field, value) {
 }
 
 function sendCommand(cmd) {
+  cmd.responseId = null
+  cmd.response = {}
+
   const topic = `device/${props.deviceId}/command/${cmd.name}`
   var payload = JSON.stringify(cmd.input, null, 2)
-  mqtt2.publish(topic, payload || '{}')
+
+  var responseId = generateId()
+  commandByResponseId[responseId] = cmd
+
+  mqtt2.publish(topic, payload || '{}', {
+    qos: 1,
+    properties: {
+      responseTopic: `client/${mqtt2.clientId}/responses`,
+      correlationData: new TextEncoder().encode(responseId)
+    }
+  })
 }
 
-import Dialog from 'primevue/dialog'
+function generateId() {
+  return Math.random().toString(16).substr(2, 8)
+}
 
 const schemaDialog = reactive({
   visible: false,
@@ -67,7 +89,7 @@ function showSchema(cmd) {
 
 onMounted(() => {
 
-    mqtt2.subscribe('device/+/command/#', (payload, topic) => {
+  mqtt2.subscribe('device/+/command/#', (payload, topic) => {
 
     const parts = topic.split('/')
 
@@ -86,6 +108,26 @@ onMounted(() => {
     }
 
   })
+
+  mqtt2.subscribe(`client/${mqtt2.clientId}/responses`, (payload, topic) => {
+    let response = JSON.parse(payload)
+    
+    const responseId = response.correlation
+    const cmd = commandByResponseId[responseId]
+
+    if (cmd) {
+      cmd.response = response
+      
+      toast.add({
+        severity: response.success ? 'success' : 'error',
+        summary: cmd.name,
+        detail: response.message !== 'None' ? response.message : (response.success ? 'Success' : 'Failed'),
+        life: 4000
+      })
+      
+      delete commandByResponseId[responseId]
+    }
+  })
 })
 
 const jsonFormsConfig = {
@@ -146,6 +188,13 @@ const jsonFormsConfig = {
 
                 <!-- Right: Buttons -->
                 <div class="button-container">
+                <Button
+                  v-if="cmd.response"
+                  :icon="cmd.response.success ? 'pi pi-check' : 'pi pi-times'"
+                  class="p-button-rounded p-button-text"
+                  :class="cmd.response.success ? 'p-button-success' : 'p-button-danger'"
+                  v-tooltip="cmd.response.message !== 'None' ? cmd.response.message : null"
+                />
                 <Button
                     icon="pi pi-question-circle"
                     class="p-mb-2"
diff --git a/console/src/main.js b/console/src/main.js
index af4437a..04a9185 100644
--- a/console/src/main.js
+++ b/console/src/main.js
@@ -5,6 +5,8 @@ import PrimeVue from "primevue/config";
 import App from "./App.vue";
 import Aura from "@primeuix/themes/aura";
 
+import ToastService from 'primevue/toastservice'
+
 const app = createApp(App);
 
 app.use(PrimeVue, {
@@ -16,4 +18,6 @@ app.use(PrimeVue, {
 	},
 });
 
+app.use(ToastService)
+
 app.mount("#app");
diff --git a/console/src/services/mqtt.js b/console/src/services/mqtt.js
index c3d8018..eece07c 100644
--- a/console/src/services/mqtt.js
+++ b/console/src/services/mqtt.js
@@ -3,7 +3,7 @@ import mqtt from 'mqtt'
 export default class MQTTService {
   constructor(brokerUrl = 'ws://127.0.0.1:8083/mqtt', clientId = null) {
     this.clientId = clientId || 'vue-client-' + Math.random().toString(16).substr(2, 8)
-    this.client = mqtt.connect(brokerUrl, { clientId: this.clientId })
+    this.client = mqtt.connect(brokerUrl, { clientId: this.clientId, protocolVersion: 5})
     this.subscriptions = []  // array of {topic, callback}
 
     this.client.on('connect', () => console.log('Connected to MQTT broker'))