Merge pull request #466 from FlowFuse/462-ui-control

More robust handling of scoped .socket message emissions
FlowFuse · Jan 3, 2024 · 646ac88 · 646ac88
2 parents 9df002c + 24ec2f1
commit 646ac88
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/nodes/config/ui_base.js b/nodes/config/ui_base.js
@@ -285,7 +285,7 @@ module.exports = function (RED) {
          */
         function emit (event, msg, wNode) {
             Object.values(uiShared.connections).forEach(conn => {
-                const nodeAllowsConstraints = n.acceptsClientConfig?.includes(wNode.type)
+                const nodeAllowsConstraints = wNode ? n.acceptsClientConfig?.includes(wNode.type) : true
                 if ((nodeAllowsConstraints && isValidConnection(conn, msg)) || !nodeAllowsConstraints) {
                     conn.emit(event, msg)
                 }
@@ -314,7 +314,7 @@ module.exports = function (RED) {
                 checks.push(msg._client?.socketId === conn.id)
             }
             // if ANY check says this is valid - we send the msg
-            return checks.includes(true)
+            return !checks.length || checks.includes(true)
         }
 
         /**

diff --git a/nodes/widgets/ui_control.js b/nodes/widgets/ui_control.js
@@ -19,7 +19,7 @@ module.exports = function (RED) {
         }
 
         function emit (payload) {
-            ui.emit('ui-control:' + node.id, payload)
+            ui.emit('ui-control:' + node.id, payload, node)
         }
 
         const evts = {