From 369cb2c033d80979558b073c3a18f5f63d738e8e Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Tue, 14 Nov 2023 16:27:55 +0000
Subject: [PATCH 1/4] Add support for communicating with devices in FlowFuse
 1.14+, update node editor labels, update docs

---
 README.md               |  3 +-
 nodes/project-link.html | 10 +++---
 nodes/project-link.js   | 73 ++++++++++++++++++++++++++++-------------
 3 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index fec606d..a7bea14 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ A collection of Node-RED nodes for easy communication between Node-RED instances
 running in the [FlowFuse platform](https://flowfuse.com).
 
 These nodes act in a similar way to the core Node-RED Link nodes - but can be
-used to send and receive messages between different Node-RED instances.
+used to send and receive messages between different Node-RED instances and devices.
 
 Whilst these nodes are published under the Apache-2.0 license, they can only be
 used with an instance of the FlowFuse platform with an active EE license applied.
@@ -15,6 +15,7 @@ This can be safely ignored.
 ### Prerequisites
 
  - FlowFuse 0.8+ running with an active EE license and its integrated MQTT Broker
+ - FlowFuse 1.14+ for communicating with application assigned devices
 
 Alternatively, you can [sign up to FlowFuse Cloud](https://flowfuse.com/product/)
 now to try these nodes out.
diff --git a/nodes/project-link.html b/nodes/project-link.html
index 9cb0d54..add3cc7 100644
--- a/nodes/project-link.html
+++ b/nodes/project-link.html
@@ -73,7 +73,7 @@
         <label><span>&nbsp</span></label>
         <span class="ff-project-link-group-option">
             <input type="radio" id="ff-project-link-radio-input-broadcast" name="ff-project-link-broadcast" value="true" />
-            <label for="ff-project-link-radio-input-broadcast">Broadcast message to all instances</label>
+            <label for="ff-project-link-radio-input-broadcast">Broadcast message</label>
         </span>
     </div>
     <div class="form-row ff-project-link-topic-row">
@@ -219,7 +219,7 @@
                 // broadcast not permitted in link call at this time but has been
                 // considered in the code base - possible future iteration
                 if (nodeType === 'project link in') {
-                    el.append(new Option('all instances', 'all', false, val === 'all'))
+                    el.append(new Option('all instances and devices', 'all', false, val === 'all'))
                 }
                 const projects = (data.count ? data.projects : null) || []
                 for (let index = 0; index < projects.length; index++) {
@@ -366,7 +366,7 @@
 <script type="text/html" data-help-name="project link in">
     <p>Receive messages from other Node-RED instances within your FlowFuse Team</p>
     <h3>Details</h3>
-    <p>This node can either listen for messages broadcast by other instances,
+    <p>This node can either listen for messages broadcast by other instances and devices,
         or listen for messages sent directly to this instance.</p>
     <p>The node is configured with a <code>topic</code> to listen on. This works
        like an MQTT topic - allowing projects to send messages targeting different
@@ -404,12 +404,12 @@ <h3>Details</h3>
         It provides three modes of operation:
         <ul>
             <li>send messages to another instance</li>
-            <li>broadcast messages to any instance listening on the same topic</li>
+            <li>broadcast messages to any instance or device listening on the same topic</li>
             <li>return the message to its sender if it originated from a Project Call node</li>
         </ul>
     </p>
     <p>
-        When configured to send or broadcast messages to other instances, the node
+        When configured to send or broadcast messages, the node
         is configured with a <code>topic</code> to send on. This works
         like an MQTT topic - allowing instances to send messages targeting different
         subscribers.
diff --git a/nodes/project-link.js b/nodes/project-link.js
index b91f937..673f851 100644
--- a/nodes/project-link.js
+++ b/nodes/project-link.js
@@ -2,7 +2,7 @@ module.exports = function (RED) {
     'use strict'
 
     // Do not register nodes in runtime if settings not provided
-    if (!RED.settings.flowforge || !RED.settings.flowforge.projectID || !RED.settings.flowforge.teamID || !RED.settings.flowforge.projectLink) {
+    if (!RED.settings.flowforge || !(RED.settings.flowforge.projectID || RED.settings.flowforge.applicationID) || !RED.settings.flowforge.teamID || !RED.settings.flowforge.projectLink) {
         throw new Error('Project Link nodes cannot be loaded outside of an FlowFuse EE environment')
     }
 
@@ -16,6 +16,8 @@ module.exports = function (RED) {
     const API_VERSION = 'v1'
     const TOPIC_HEADER = 'ff'
     const TOPIC_VERSION = 'v1'
+    const OWNER_TYPE = RED.settings.flowforge.applicationID ? 'application' : 'instance'
+    const OWNER_ID = OWNER_TYPE === 'application' ? RED.settings.flowforge.applicationID : RED.settings.flowforge.projectID
 
     // #region JSDoc
 
@@ -133,11 +135,11 @@ module.exports = function (RED) {
         return result
     }
 
-    function buildLinkTopic (node, project, subTopic, broadcast, responseTopic) {
+    function buildLinkTopic (node, projectOrAppID, subTopic, broadcast, responseTopic) {
         const topicParts = [TOPIC_HEADER, TOPIC_VERSION, RED.settings.flowforge.teamID]
         if (!node || node.type === 'project link call') {
             topicParts.push('p')
-            topicParts.push(project)
+            topicParts.push(projectOrAppID)
             if (responseTopic) {
                 topicParts.push(responseTopic)
             } else {
@@ -145,24 +147,33 @@ module.exports = function (RED) {
             }
         } else if (node.type === 'project link in') {
             topicParts.push('p')
-            if (broadcast && project === 'all') {
+            if (broadcast && projectOrAppID === 'all') { // Listen for broadcast messages from all projects
                 topicParts.push('+')
                 topicParts.push('out')
-            } else if (broadcast) {
-                topicParts.push(project)
+                // e.g. SUB ff/v1/7N152GxG2p/p/+/out/a/b
+            } else if (broadcast) { // Listen for broadcast messages from a specific project
+                topicParts.push(projectOrAppID)
                 topicParts.push('out')
-            } else { // self
-                topicParts.push(RED.settings.flowforge.projectID)
+                // e.g. SUB ff/v1/7N152GxG2p/p/SOURCE-PROJ-ID-aa97-8915e1897326/out/a/b
+            } else { // Receive messages sent to this instance
+                topicParts.push(OWNER_ID)
                 topicParts.push('in')
+                // e.g. SUB ff/v1/7N152GxG2p/p/PROJECT-OWN-ID-aa97-8915e1897326/in/a/b
             }
         } else if (node.type === 'project link out') {
             topicParts.push('p')
             if (broadcast) {
-                topicParts.push(RED.settings.flowforge.projectID)
+                // publish to all (broadcast)
+                topicParts.push(OWNER_ID)
                 topicParts.push('out')
+                // e.g. PUB topic ff/v1/7N152GxG2p/p/PROJECT-OWN-ID-aa97-8915e1897326/out/a/b
+                // e.g. PUB ff/v1/7N152GxG2p/p/DeviceId/out/a/b
             } else {
-                topicParts.push(project)
+                // publish to a specific project
+                topicParts.push(projectOrAppID)
                 topicParts.push('in')
+                // e.g. PUB ff/v1/7N152GxG2p/p/TARGET-PROJ-ID-aa97-8915e1897326/in/a/b
+                // e.g. PUB ff/v1/7N152GxG2p/p/DeviceId/in/a/b
             }
         }
         topicParts.push(subTopic)
@@ -226,8 +237,9 @@ module.exports = function (RED) {
                 msg = JSON.parse(message.toString(), jsonReviver)
                 msg.projectLink = {
                     ...msg.projectLink,
-                    instanceId: packet.properties?.userProperties?._projectID,
-                    projectId: packet.properties?.userProperties?._projectID,
+                    instanceId: packet.properties?.userProperties?._projectID || '',
+                    projectId: packet.properties?.userProperties?._projectID || '',
+                    applicationId: packet.properties?.userProperties?._applicationID || '',
                     topic: topic.split('/').slice(6).join('/')
                 }
                 if (packet.properties?.userProperties?._deviceId) {
@@ -395,7 +407,8 @@ module.exports = function (RED) {
                 subOptions.qos = subOptions.qos == null ? 1 : subOptions.qos
                 subOptions.properties = Object.assign({}, options.properties)
                 subOptions.properties.userProperties = subOptions.properties.userProperties || {}
-                subOptions.properties.userProperties._projectID = RED.settings.flowforge.projectID
+                subOptions.properties.userProperties._projectID = RED.settings.flowforge.projectID || ''
+                subOptions.properties.userProperties._applicationID = RED.settings.flowforge.applicationID || ''
                 subOptions.properties.userProperties._nodeID = node.id
                 subOptions.properties.userProperties._ts = Date.now()
                 if (subID) {
@@ -464,7 +477,8 @@ module.exports = function (RED) {
                 pubOptions.qos = pubOptions.qos == null ? 1 : pubOptions.qos
                 pubOptions.properties = Object.assign({}, options.properties)
                 pubOptions.properties.userProperties = pubOptions.properties.userProperties || {}
-                pubOptions.properties.userProperties._projectID = RED.settings.flowforge.projectID
+                pubOptions.properties.userProperties._projectID = RED.settings.flowforge.projectID || ''
+                pubOptions.properties.userProperties._applicationID = RED.settings.flowforge.applicationID || ''
                 if (process.env.FF_DEVICE_ID) {
                     pubOptions.properties.userProperties._deviceId = process.env.FF_DEVICE_ID
                     pubOptions.properties.userProperties._deviceName = process.env.FF_DEVICE_NAME
@@ -511,7 +525,8 @@ module.exports = function (RED) {
                             requestResponseInformation: true,
                             requestProblemInformation: true,
                             userProperties: {
-                                project: RED.settings.flowforge.projectID || ''
+                                project: RED.settings.flowforge.projectID || '',
+                                application: RED.settings.flowforge.applicationID || ''
                             }
                         }
                     }
@@ -677,15 +692,17 @@ module.exports = function (RED) {
             }
             node.receive(msg)
         }
-        // to my inbox
-        // * this project in        ff/v1/7N152GxG2p/p/ca65f5ed-aea0-4a10-ac9a-2086b6af6700/in/b1/b1
+        // to my inbox (direct to device not supported, only direct to an instance is currently supported)
+        // * this project in           ff/v1/7N152GxG2p/p/ca65f5ed-aea0-4a10-ac9a-2086b6af6700/in/b1/b1     sub proj→prog
         // broadcasts
-        // * specific project out   ff/v1/7N152GxG2p/p/ca65f5ed-aea0-4a10-ac9a-2086b6af6700/out/b1/b1    sub broadcast
-        // * +any project+ out      ff/v1/7N152GxG2p/p/+/out/b1/b1    sub broadcast
+        // * specific project out      ff/v1/7N152GxG2p/p/ca65f5ed-aea0-4a10-ac9a-2086b6af6700/out/b1/b1    sub broadcast
+        // * +any project/device+ out  ff/v1/7N152GxG2p/p/+/out/b1/b1                                       sub broadcast
         let subscribedTopic = node.topic
         if (RED.settings.flowforge.useSharedSubscriptions) {
             subscribedTopic = `$share/${RED.settings.flowforge.projectID}/${node.topic}`
         }
+        // ↓ Useful for debugging ↓
+        // console.log(`🔗 LINK-IN SUB ${subscribedTopic}`)
         mqtt.subscribe(node, subscribedTopic, { qos: 2 }, onSub)
             .then(_result => {})
             .catch(err => {
@@ -729,11 +746,14 @@ module.exports = function (RED) {
                     if (msg.projectLink?.callStack?.length > 0) {
                         /** @type {MessageEvent} */
                         const messageEvent = msg.projectLink.callStack.pop()
-                        if (messageEvent && messageEvent.project && messageEvent.topic && messageEvent.eventId) {
-                            const responseTopic = buildLinkTopic(null, messageEvent.project, messageEvent.topic, node.broadcast, messageEvent.response || 'res')
+                        const targetId = messageEvent.project || messageEvent.application
+                        if (messageEvent && targetId && messageEvent.topic && messageEvent.eventId) {
+                            const responseTopic = buildLinkTopic(null, targetId, messageEvent.topic, node.broadcast, messageEvent.response || 'res')
                             const properties = {
                                 correlationData: messageEvent.eventId
                             }
+                            // ↓ Useful for debugging ↓
+                            // console.log(`🔗 LINK-OUT RETURN PUB ${responseTopic}`)
                             await mqtt.publish(node, responseTopic, msg, { properties })
                         } else {
                             node.warn('Project Link Source not valid')
@@ -744,7 +764,8 @@ module.exports = function (RED) {
                     done()
                 } else if (node.mode === 'link') {
                     const topic = buildLinkTopic(node, node.project, node.subTopic, node.broadcast)
-                    // console.log(`PUB ${topic}`)
+                    // ↓ Useful for debugging ↓
+                    // console.log(`🔗 LINK-OUT PUB ${topic}`)
                     await mqtt.publish(node, topic, msg)
                     done()
                 }
@@ -778,7 +799,8 @@ module.exports = function (RED) {
         } else {
             node.responseTopicPrefix = 'res'
         }
-        node.responseTopic = buildLinkTopic(node, RED.settings.flowforge.projectID, node.subTopic, false, node.responseTopicPrefix)
+        node.responseTopic = buildLinkTopic(node, OWNER_ID, node.subTopic, false, node.responseTopicPrefix)
+        // node.responseTopic = buildLinkTopic(node, RED.settings.flowforge.projectID, node.subTopic, false, node.responseTopicPrefix)
         let timeout = parseFloat(n.timeout || '30') * 1000
         if (isNaN(timeout)) {
             timeout = 30000
@@ -805,6 +827,8 @@ module.exports = function (RED) {
 
         mqtt.connect()
         mqtt.registerStatus(node)
+        // ↓ Useful for debugging ↓
+        // console.log(`🔗 LINK-CALL responseTopic SUB ${node.responseTopic}`)
         mqtt.subscribe(node, node.responseTopic, { qos: 2 }, onSub)
             .then(_result => {})
             .catch(err => {
@@ -820,6 +844,7 @@ module.exports = function (RED) {
                     eventId,
                     node: node.id,
                     project: RED.settings.flowforge.projectID,
+                    application: RED.settings.flowforge.applicationID,
                     topic: node.subTopic,
                     response: node.responseTopicPrefix,
                     ts: Date.now()
@@ -857,6 +882,8 @@ module.exports = function (RED) {
                         correlationData: eventId
                     }
                 }
+                // ↓ Useful for debugging ↓
+                // console.log(`🔗 LINK-CALL PUB ${node.topic}`)
                 await mqtt.publish(node, node.topic, msg, options)
             } catch (error) {
                 done(error)

From 26e28df7c0abcbe8bb536be064c51e1cd2c6be2c Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Tue, 21 Nov 2023 21:59:27 +0000
Subject: [PATCH 2/4] Use 'xx/app:appid/xx' for link app-device topic

---
 nodes/project-link.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/nodes/project-link.js b/nodes/project-link.js
index 673f851..c3f940f 100644
--- a/nodes/project-link.js
+++ b/nodes/project-link.js
@@ -17,7 +17,7 @@ module.exports = function (RED) {
     const TOPIC_HEADER = 'ff'
     const TOPIC_VERSION = 'v1'
     const OWNER_TYPE = RED.settings.flowforge.applicationID ? 'application' : 'instance'
-    const OWNER_ID = OWNER_TYPE === 'application' ? RED.settings.flowforge.applicationID : RED.settings.flowforge.projectID
+    const OWNER_ID = OWNER_TYPE === 'application' ? 'app:' + RED.settings.flowforge.applicationID : RED.settings.flowforge.projectID
 
     // #region JSDoc
 
@@ -167,13 +167,13 @@ module.exports = function (RED) {
                 topicParts.push(OWNER_ID)
                 topicParts.push('out')
                 // e.g. PUB topic ff/v1/7N152GxG2p/p/PROJECT-OWN-ID-aa97-8915e1897326/out/a/b
-                // e.g. PUB ff/v1/7N152GxG2p/p/DeviceId/out/a/b
+                // e.g. PUB ff/v1/7N152GxG2p/p/app:<app-id>/out/a/b
             } else {
                 // publish to a specific project
                 topicParts.push(projectOrAppID)
                 topicParts.push('in')
                 // e.g. PUB ff/v1/7N152GxG2p/p/TARGET-PROJ-ID-aa97-8915e1897326/in/a/b
-                // e.g. PUB ff/v1/7N152GxG2p/p/DeviceId/in/a/b
+                // e.g. PUB ff/v1/7N152GxG2p/p/app:<app-id>/in/a/b
             }
         }
         topicParts.push(subTopic)
@@ -409,6 +409,7 @@ module.exports = function (RED) {
                 subOptions.properties.userProperties = subOptions.properties.userProperties || {}
                 subOptions.properties.userProperties._projectID = RED.settings.flowforge.projectID || ''
                 subOptions.properties.userProperties._applicationID = RED.settings.flowforge.applicationID || ''
+                subOptions.properties.userProperties._deviceID = RED.settings.flowforge.deviceID || ''
                 subOptions.properties.userProperties._nodeID = node.id
                 subOptions.properties.userProperties._ts = Date.now()
                 if (subID) {
@@ -746,7 +747,7 @@ module.exports = function (RED) {
                     if (msg.projectLink?.callStack?.length > 0) {
                         /** @type {MessageEvent} */
                         const messageEvent = msg.projectLink.callStack.pop()
-                        const targetId = messageEvent.project || messageEvent.application
+                        const targetId = messageEvent.project || `app:${messageEvent.application}`
                         if (messageEvent && targetId && messageEvent.topic && messageEvent.eventId) {
                             const responseTopic = buildLinkTopic(null, targetId, messageEvent.topic, node.broadcast, messageEvent.response || 'res')
                             const properties = {
@@ -844,11 +845,15 @@ module.exports = function (RED) {
                     eventId,
                     node: node.id,
                     project: RED.settings.flowforge.projectID,
+                    instance: RED.settings.flowforge.instanceID,
                     application: RED.settings.flowforge.applicationID,
                     topic: node.subTopic,
                     response: node.responseTopicPrefix,
                     ts: Date.now()
                 }
+                if (process.env.FF_DEVICE_ID) {
+                    messageEvent.device = process.env.FF_DEVICE_ID
+                }
                 /** @type {MessageEvents} */
                 messageEvents[eventId] = {
                     ...messageEvent,

From 227848357686ce8e4db405fa510041173fd12e1e Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Wed, 22 Nov 2023 13:54:21 +0000
Subject: [PATCH 3/4] Use `dev:` prefix for app assigned device topic

---
 nodes/project-link.js | 52 +++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/nodes/project-link.js b/nodes/project-link.js
index c3f940f..7a5f956 100644
--- a/nodes/project-link.js
+++ b/nodes/project-link.js
@@ -17,7 +17,6 @@ module.exports = function (RED) {
     const TOPIC_HEADER = 'ff'
     const TOPIC_VERSION = 'v1'
     const OWNER_TYPE = RED.settings.flowforge.applicationID ? 'application' : 'instance'
-    const OWNER_ID = OWNER_TYPE === 'application' ? 'app:' + RED.settings.flowforge.applicationID : RED.settings.flowforge.projectID
 
     // #region JSDoc
 
@@ -135,11 +134,13 @@ module.exports = function (RED) {
         return result
     }
 
-    function buildLinkTopic (node, projectOrAppID, subTopic, broadcast, responseTopic) {
+    function buildLinkTopic (node, projectOrDeviceId, subTopic, broadcast, responseTopic) {
+        // ↓ Useful for debugging ↓
+        console.log(`🔗 buildLinkTopic: for ${OWNER_TYPE} ${node?.ownId || ''} ${projectOrDeviceId} ${subTopic} ${broadcast} ${responseTopic}`)
         const topicParts = [TOPIC_HEADER, TOPIC_VERSION, RED.settings.flowforge.teamID]
         if (!node || node.type === 'project link call') {
             topicParts.push('p')
-            topicParts.push(projectOrAppID)
+            topicParts.push(projectOrDeviceId)
             if (responseTopic) {
                 topicParts.push(responseTopic)
             } else {
@@ -147,16 +148,16 @@ module.exports = function (RED) {
             }
         } else if (node.type === 'project link in') {
             topicParts.push('p')
-            if (broadcast && projectOrAppID === 'all') { // Listen for broadcast messages from all projects
+            if (broadcast && projectOrDeviceId === 'all') { // Listen for broadcast messages from all projects
                 topicParts.push('+')
                 topicParts.push('out')
                 // e.g. SUB ff/v1/7N152GxG2p/p/+/out/a/b
             } else if (broadcast) { // Listen for broadcast messages from a specific project
-                topicParts.push(projectOrAppID)
+                topicParts.push(projectOrDeviceId)
                 topicParts.push('out')
                 // e.g. SUB ff/v1/7N152GxG2p/p/SOURCE-PROJ-ID-aa97-8915e1897326/out/a/b
             } else { // Receive messages sent to this instance
-                topicParts.push(OWNER_ID)
+                topicParts.push(node.ownId)
                 topicParts.push('in')
                 // e.g. SUB ff/v1/7N152GxG2p/p/PROJECT-OWN-ID-aa97-8915e1897326/in/a/b
             }
@@ -164,20 +165,22 @@ module.exports = function (RED) {
             topicParts.push('p')
             if (broadcast) {
                 // publish to all (broadcast)
-                topicParts.push(OWNER_ID)
+                topicParts.push(node.ownId)
                 topicParts.push('out')
                 // e.g. PUB topic ff/v1/7N152GxG2p/p/PROJECT-OWN-ID-aa97-8915e1897326/out/a/b
-                // e.g. PUB ff/v1/7N152GxG2p/p/app:<app-id>/out/a/b
+                // e.g. PUB ff/v1/7N152GxG2p/p/dev:<device-id>/out/a/b
             } else {
                 // publish to a specific project
-                topicParts.push(projectOrAppID)
+                topicParts.push(projectOrDeviceId)
                 topicParts.push('in')
                 // e.g. PUB ff/v1/7N152GxG2p/p/TARGET-PROJ-ID-aa97-8915e1897326/in/a/b
-                // e.g. PUB ff/v1/7N152GxG2p/p/app:<app-id>/in/a/b
+                // e.g. PUB ff/v1/7N152GxG2p/p/dev:<device-id>/in/a/b
             }
         }
         topicParts.push(subTopic)
         const topic = topicParts.join('/')
+        // ↓ Useful for debugging ↓
+        console.log(`🔗 buildLinkTopic created topic: ${topic}`)
         return topic
     }
     // #endregion Helpers
@@ -244,8 +247,8 @@ module.exports = function (RED) {
                 }
                 if (packet.properties?.userProperties?._deviceId) {
                     msg.projectLink.deviceId = packet.properties?.userProperties?._deviceId
-                    msg.projectLink.deviceName = packet.properties?.userProperties?._deviceName
-                    msg.projectLink.deviceType = packet.properties?.userProperties?._deviceType
+                    msg.projectLink.deviceName = packet.properties?.userProperties?._deviceName || ''
+                    msg.projectLink.deviceType = packet.properties?.userProperties?._deviceType || ''
                 }
             } catch (error) {
                 err = error
@@ -409,7 +412,9 @@ module.exports = function (RED) {
                 subOptions.properties.userProperties = subOptions.properties.userProperties || {}
                 subOptions.properties.userProperties._projectID = RED.settings.flowforge.projectID || ''
                 subOptions.properties.userProperties._applicationID = RED.settings.flowforge.applicationID || ''
-                subOptions.properties.userProperties._deviceID = RED.settings.flowforge.deviceID || ''
+                if (OWNER_TYPE === 'application') {
+                    subOptions.properties.userProperties._deviceID = process.env.FF_DEVICE_ID || ''
+                }
                 subOptions.properties.userProperties._nodeID = node.id
                 subOptions.properties.userProperties._ts = Date.now()
                 if (subID) {
@@ -482,8 +487,8 @@ module.exports = function (RED) {
                 pubOptions.properties.userProperties._applicationID = RED.settings.flowforge.applicationID || ''
                 if (process.env.FF_DEVICE_ID) {
                     pubOptions.properties.userProperties._deviceId = process.env.FF_DEVICE_ID
-                    pubOptions.properties.userProperties._deviceName = process.env.FF_DEVICE_NAME
-                    pubOptions.properties.userProperties._deviceType = process.env.FF_DEVICE_TYPE
+                    pubOptions.properties.userProperties._deviceName = process.env.FF_DEVICE_NAME || ''
+                    pubOptions.properties.userProperties._deviceType = process.env.FF_DEVICE_TYPE || ''
                 }
                 pubOptions.properties.userProperties._nodeID = node.id
                 pubOptions.properties.userProperties._publishTime = Date.now()
@@ -670,6 +675,7 @@ module.exports = function (RED) {
     function ProjectLinkInNode (n) {
         RED.nodes.createNode(this, n)
         const node = this
+        node.ownId = OWNER_TYPE === 'application' ? 'dev:' + process.env.FF_DEVICE_ID : RED.settings.flowforge.projectID
         node.project = n.project
         node.subscriptionIdentifier = (n.broadcast && n.project === 'all') ? 2 : 1
         node.subTopic = n.topic
@@ -703,7 +709,7 @@ module.exports = function (RED) {
             subscribedTopic = `$share/${RED.settings.flowforge.projectID}/${node.topic}`
         }
         // ↓ Useful for debugging ↓
-        // console.log(`🔗 LINK-IN SUB ${subscribedTopic}`)
+        console.log(`🔗 LINK-IN SUB ${subscribedTopic}`)
         mqtt.subscribe(node, subscribedTopic, { qos: 2 }, onSub)
             .then(_result => {})
             .catch(err => {
@@ -735,6 +741,7 @@ module.exports = function (RED) {
     function ProjectLinkOutNode (n) {
         RED.nodes.createNode(this, n)
         const node = this
+        node.ownId = OWNER_TYPE === 'application' ? 'dev:' + process.env.FF_DEVICE_ID : RED.settings.flowforge.projectID
         node.project = n.project
         node.subTopic = n.topic
         node.mode = n.mode || 'link'
@@ -747,14 +754,14 @@ module.exports = function (RED) {
                     if (msg.projectLink?.callStack?.length > 0) {
                         /** @type {MessageEvent} */
                         const messageEvent = msg.projectLink.callStack.pop()
-                        const targetId = messageEvent.project || `app:${messageEvent.application}`
+                        const targetId = messageEvent.project || `dev:${messageEvent.device}`
                         if (messageEvent && targetId && messageEvent.topic && messageEvent.eventId) {
                             const responseTopic = buildLinkTopic(null, targetId, messageEvent.topic, node.broadcast, messageEvent.response || 'res')
                             const properties = {
                                 correlationData: messageEvent.eventId
                             }
                             // ↓ Useful for debugging ↓
-                            // console.log(`🔗 LINK-OUT RETURN PUB ${responseTopic}`)
+                            console.log(`🔗 LINK-OUT RETURN PUB ${responseTopic}`)
                             await mqtt.publish(node, responseTopic, msg, { properties })
                         } else {
                             node.warn('Project Link Source not valid')
@@ -766,7 +773,7 @@ module.exports = function (RED) {
                 } else if (node.mode === 'link') {
                     const topic = buildLinkTopic(node, node.project, node.subTopic, node.broadcast)
                     // ↓ Useful for debugging ↓
-                    // console.log(`🔗 LINK-OUT PUB ${topic}`)
+                    console.log(`🔗 LINK-OUT PUB ${topic}`)
                     await mqtt.publish(node, topic, msg)
                     done()
                 }
@@ -792,6 +799,7 @@ module.exports = function (RED) {
     function ProjectLinkCallNode (n) {
         RED.nodes.createNode(this, n)
         const node = this
+        node.ownId = OWNER_TYPE === 'application' ? 'dev:' + process.env.FF_DEVICE_ID : RED.settings.flowforge.projectID
         node.project = n.project
         node.subTopic = n.topic
         node.topic = buildLinkTopic(node, node.project, node.subTopic, false)
@@ -800,7 +808,7 @@ module.exports = function (RED) {
         } else {
             node.responseTopicPrefix = 'res'
         }
-        node.responseTopic = buildLinkTopic(node, OWNER_ID, node.subTopic, false, node.responseTopicPrefix)
+        node.responseTopic = buildLinkTopic(node, node.ownId, node.subTopic, false, node.responseTopicPrefix)
         // node.responseTopic = buildLinkTopic(node, RED.settings.flowforge.projectID, node.subTopic, false, node.responseTopicPrefix)
         let timeout = parseFloat(n.timeout || '30') * 1000
         if (isNaN(timeout)) {
@@ -829,7 +837,7 @@ module.exports = function (RED) {
         mqtt.connect()
         mqtt.registerStatus(node)
         // ↓ Useful for debugging ↓
-        // console.log(`🔗 LINK-CALL responseTopic SUB ${node.responseTopic}`)
+        console.log(`🔗 LINK-CALL responseTopic SUB ${node.responseTopic}`)
         mqtt.subscribe(node, node.responseTopic, { qos: 2 }, onSub)
             .then(_result => {})
             .catch(err => {
@@ -888,7 +896,7 @@ module.exports = function (RED) {
                     }
                 }
                 // ↓ Useful for debugging ↓
-                // console.log(`🔗 LINK-CALL PUB ${node.topic}`)
+                console.log(`🔗 LINK-CALL PUB ${node.topic}`)
                 await mqtt.publish(node, node.topic, msg, options)
             } catch (error) {
                 done(error)

From 0d0fa8501d9ad1c42b686dd9a9e64a357b5bea19 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Wed, 22 Nov 2023 13:55:20 +0000
Subject: [PATCH 4/4] silence debugging logs

---
 nodes/project-link.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nodes/project-link.js b/nodes/project-link.js
index 7a5f956..fe1d2b8 100644
--- a/nodes/project-link.js
+++ b/nodes/project-link.js
@@ -136,7 +136,7 @@ module.exports = function (RED) {
 
     function buildLinkTopic (node, projectOrDeviceId, subTopic, broadcast, responseTopic) {
         // ↓ Useful for debugging ↓
-        console.log(`🔗 buildLinkTopic: for ${OWNER_TYPE} ${node?.ownId || ''} ${projectOrDeviceId} ${subTopic} ${broadcast} ${responseTopic}`)
+        // console.log(`🔗 buildLinkTopic: for ${OWNER_TYPE} ${node?.ownId || ''} ${projectOrDeviceId} ${subTopic} ${broadcast} ${responseTopic}`)
         const topicParts = [TOPIC_HEADER, TOPIC_VERSION, RED.settings.flowforge.teamID]
         if (!node || node.type === 'project link call') {
             topicParts.push('p')
@@ -180,7 +180,7 @@ module.exports = function (RED) {
         topicParts.push(subTopic)
         const topic = topicParts.join('/')
         // ↓ Useful for debugging ↓
-        console.log(`🔗 buildLinkTopic created topic: ${topic}`)
+        // console.log(`🔗 buildLinkTopic created topic: ${topic}`)
         return topic
     }
     // #endregion Helpers
@@ -709,7 +709,7 @@ module.exports = function (RED) {
             subscribedTopic = `$share/${RED.settings.flowforge.projectID}/${node.topic}`
         }
         // ↓ Useful for debugging ↓
-        console.log(`🔗 LINK-IN SUB ${subscribedTopic}`)
+        // console.log(`🔗 LINK-IN SUB ${subscribedTopic}`)
         mqtt.subscribe(node, subscribedTopic, { qos: 2 }, onSub)
             .then(_result => {})
             .catch(err => {
@@ -761,7 +761,7 @@ module.exports = function (RED) {
                                 correlationData: messageEvent.eventId
                             }
                             // ↓ Useful for debugging ↓
-                            console.log(`🔗 LINK-OUT RETURN PUB ${responseTopic}`)
+                            // console.log(`🔗 LINK-OUT RETURN PUB ${responseTopic}`)
                             await mqtt.publish(node, responseTopic, msg, { properties })
                         } else {
                             node.warn('Project Link Source not valid')
@@ -773,7 +773,7 @@ module.exports = function (RED) {
                 } else if (node.mode === 'link') {
                     const topic = buildLinkTopic(node, node.project, node.subTopic, node.broadcast)
                     // ↓ Useful for debugging ↓
-                    console.log(`🔗 LINK-OUT PUB ${topic}`)
+                    // console.log(`🔗 LINK-OUT PUB ${topic}`)
                     await mqtt.publish(node, topic, msg)
                     done()
                 }
@@ -837,7 +837,7 @@ module.exports = function (RED) {
         mqtt.connect()
         mqtt.registerStatus(node)
         // ↓ Useful for debugging ↓
-        console.log(`🔗 LINK-CALL responseTopic SUB ${node.responseTopic}`)
+        // console.log(`🔗 LINK-CALL responseTopic SUB ${node.responseTopic}`)
         mqtt.subscribe(node, node.responseTopic, { qos: 2 }, onSub)
             .then(_result => {})
             .catch(err => {
@@ -896,7 +896,7 @@ module.exports = function (RED) {
                     }
                 }
                 // ↓ Useful for debugging ↓
-                console.log(`🔗 LINK-CALL PUB ${node.topic}`)
+                // console.log(`🔗 LINK-CALL PUB ${node.topic}`)
                 await mqtt.publish(node, node.topic, msg, options)
             } catch (error) {
                 done(error)