Merge pull request #2 from node-red/link-call-support

Handle link call nodes when creating flow model
node-red · Dec 1, 2021 · d018eb5 · d018eb5
2 parents dd9bede + ccf8803
commit d018eb5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/lib/NRFlowSet.js b/lib/NRFlowSet.js
@@ -53,7 +53,7 @@ class NRFlowSet {
                     // config.{id,type} are removed in NRNode constructor
                     const node = new NRNode(config)
                     this.nodes.set(node.id, node);
-                    if (node.type === "link in" || node.type === "link out") {
+                    if (node.type === "link call" || node.type === "link in" || node.type === "link out") {
                         linkNodes.push(node);
                     }
                 }
@@ -88,12 +88,14 @@ class NRFlowSet {
                 if (!createdLinks.has(linkIdentifier)) {
                     createdLinks.add(linkIdentifier);
                     let remoteNode = this.nodes.get(remoteId);
-                    let sourceNode = linkNode.type === "link in"?remoteNode:linkNode;
-                    let destinationNode = linkNode.type === "link in"?linkNode:remoteNode;
-                    let wire = new NRWire(sourceNode, 0, destinationNode, 0, true);
-                    sourceNode.addOutboundWire(wire);
-                    destinationNode.addInboundWire(wire);
-                    this.wires.push(wire);
+                    if (remoteNode) {
+                        let sourceNode = linkNode.type === "link in"?remoteNode:linkNode;
+                        let destinationNode = linkNode.type === "link in"?linkNode:remoteNode;
+                        let wire = new NRWire(sourceNode, 0, destinationNode, 0, true);
+                        sourceNode.addOutboundWire(wire);
+                        destinationNode.addInboundWire(wire);
+                        this.wires.push(wire);
+                    }
                 }
             })
         })

diff --git a/lib/NRNode.js b/lib/NRNode.js
@@ -155,12 +155,12 @@ class NRNode extends NRObject {
      */
     getNextNodes(followVirtual) {
         let result = [];
-         this.outboundWires.forEach(wire => {
-             if (!wire.virtual || followVirtual) {
-                 result.push(wire.destinationNode);
-             }
-         });
-         return result;
+        this.outboundWires.forEach(wire => {
+            if (!wire.virtual || followVirtual) {
+                result.push(wire.destinationNode);
+            }
+        });
+        return result;
     }
 
     /**