@node-red/runtime 4.0.0-beta.4 → 4.0.1

package/lib/flows/Group.js

@@ -1,5 +1,6 @@
 const flowUtil = require("./util");
 const credentials = require("../nodes/credentials");
+const clone = require("clone");
 
 /**
  * This class represents a group within the runtime.

package/lib/flows/index.js

@@ -462,9 +462,8 @@ function stop(type,diff,muteLog,isDeploy) {
     if (type === 'nodes') {
         stopList = diff.changed.concat(diff.removed);
     } else if (type === 'flows') {
-        stopList = diff.changed.concat(diff.removed).concat(diff.linked);
+        stopList = diff.changed.concat(diff.removed).concat(diff.linked).concat(diff.rewired);
     }
-
     events.emit("flows:stopping",{config: activeConfig, type: type, diff: diff})
 
     // Stop the global flow object last
@@ -646,16 +645,27 @@ function getFlow(id) {
     if (id !== 'global') {
         result.nodes = [];
     }
+
+    if (flow.groups) {
+        var nodeIds = Object.keys(flow.groups);
+        if (nodeIds.length > 0) {
+            nodeIds.forEach(function(nodeId) {
+                var node = jsonClone(flow.groups[nodeId]);
+                delete node.credentials;
+                result.nodes.push(node)
+            })
+        }
+    }
     if (flow.nodes) {
         var nodeIds = Object.keys(flow.nodes);
         if (nodeIds.length > 0) {
-            result.nodes = nodeIds.map(function(nodeId) {
+            nodeIds.forEach(function(nodeId) {
                 var node = jsonClone(flow.nodes[nodeId]);
                 if (node.type === 'link out') {
                     delete node.wires;
                 }
                 delete node.credentials;
-                return node;
+                result.nodes.push(node)
             })
         }
     }
@@ -681,6 +691,17 @@ function getFlow(id) {
                 delete node.credentials
                 return node
             });
+            if (subflow.groups) {
+                var nodeIds = Object.keys(subflow.groups);
+                if (nodeIds.length > 0) {
+                    nodeIds.forEach(function(nodeId) {
+                        var node = jsonClone(subflow.groups[nodeId]);
+                        delete node.credentials;
+                        subflow.nodes.push(node)
+                    })
+                }
+                delete subflow.groups
+            }
             if (subflow.configs) {
                 var configIds = Object.keys(subflow.configs);
                 subflow.configs = configIds.map(function(id) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "4.0.0-beta.4",
+    "version": "4.0.1",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "4.0.0-beta.4",
-        "@node-red/util": "4.0.0-beta.4",
+        "@node-red/registry": "4.0.1",
+        "@node-red/util": "4.0.1",
         "async-mutex": "0.5.0",
         "clone": "2.1.2",
         "express": "4.19.2",