Merge branch 'dev' into groups

packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js

@@ -18,6 +18,7 @@ var clone = require("clone");
 var redUtil = require("@node-red/util").util;
 var flowUtil = require("./util");
 var events = require("../../events");
+const context = require('../context');
 
 var Subflow;
 var Log;
@@ -54,6 +55,8 @@ class Flow {
         this.catchNodes = [];
         this.statusNodes = [];
         this.path = this.id;
+        // Ensure a context exists for this flow
+        this.context = context.getFlowContext(this.id,this.parent.id);
     }
 
     /**

packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js

@@ -16,7 +16,7 @@
 
 const clone = require("clone");
 const Flow = require('./Flow').Flow;
-
+const context = require('../context');
 const util = require("util");
 
 const redUtil = require("@node-red/util").util;
@@ -246,6 +246,10 @@ class Subflow extends Flow {
         this.node.on("input", function(msg) { this.send(msg);});
         this.node.on("close", function() { this.status({}); })
         this.node.status = status => this.parent.handleStatus(this.node,status);
+        // Create a context instance
+        // console.log("Node.context",this.type,"id:",this._alias||this.id,"z:",this.z)
+        this._context = context.get(this._alias||this.id,this.z);
+
 
         this.node._updateWires = this.node.updateWires;
 
@@ -483,7 +487,7 @@ function createNodeInSubflow(subflowInstanceId, def) {
  * properties in the nodes object to reference the new node ids.
  * This handles:
  *  - node.wires,
- *  - node.scope of Catch and Status nodes,
+ *  - node.scope of Complete, Catch and Status nodes,
  *  - node.XYZ for any property where XYZ is recognised as an old property
  * @param  {[type]} nodes   [description]
  * @param  {[type]} nodeMap [description]
@@ -506,7 +510,7 @@ function remapSubflowNodes(nodes,nodeMap) {
                     }
                 }
             }
-            if ((node.type === 'catch' || node.type === 'status') && node.scope) {
+            if ((node.type === 'complete' || node.type === 'catch' || node.type === 'status') && node.scope) {
                 node.scope = node.scope.map(function(id) {
                     return nodeMap[id]?nodeMap[id].id:""
                 })

packages/node_modules/@node-red/runtime/lib/nodes/flows/index.js

@@ -106,15 +106,20 @@ function load(forceStart) {
         // This is a force reload from the API - disable safeMode
         delete settings.safeMode;
     }
-    return setFlows(null,"load",false,forceStart);
+    return setFlows(null,null,"load",false,forceStart);
 }
 
 /*
  * _config - new node array configuration
+ * _credentials - new credentials configuration (optional)
  * type - full/nodes/flows/load (default full)
  * muteLog - don't emit the standard log messages (used for individual flow api)
  */
-function setFlows(_config,type,muteLog,forceStart) {
+function setFlows(_config,_credentials,type,muteLog,forceStart) {
+    if (typeof _credentials === "string") {
+        type = _credentials;
+        _credentials = null;
+    }
     type = type||"full";
     if (settings.safeMode) {
         if (type !== "load") {
@@ -155,16 +160,27 @@ function setFlows(_config,type,muteLog,forceStart) {
                 delete newFlowConfig.allNodes[id].credentials;
             }
         }
+        var credsDirty;
 
-        // Allow the credential store to remove anything no longer needed
-        credentials.clean(config);
+        if (_credentials) {
+            // A full set of credentials have been provided. Use those instead
+            configSavePromise = credentials.load(_credentials);
+            credsDirty = true;
+        } else {
+            // Allow the credential store to remove anything no longer needed
+            credentials.clean(config);
 
-        // Remember whether credentials need saving or not
-        var credsDirty = credentials.dirty();
+            // Remember whether credentials need saving or not
+            var credsDirty = credentials.dirty();
+
+            configSavePromise = Promise.resolve();
+        }
 
         // Get the latest credentials and ask storage to save them (if needed)
         // as well as the new flow configuration.
-        configSavePromise = credentials.export().then(function(creds) {
+        configSavePromise = configSavePromise.then(function() {
+            return credentials.export()
+        }).then(function(creds) {
             var saveConfig = {
                 flows: config,
                 credentialsDirty:credsDirty,
@@ -515,7 +531,7 @@ function addFlow(flow) {
     var newConfig = clone(activeConfig.flows);
     newConfig = newConfig.concat(nodes);
 
-    return setFlows(newConfig,'flows',true).then(function() {
+    return setFlows(newConfig,null,'flows',true).then(function() {
         log.info(log._("nodes.flows.added-flow",{label:(flow.label?flow.label+" ":"")+"["+flow.id+"]"}));
         return flow.id;
     });
@@ -646,7 +662,7 @@ function updateFlow(id,newFlow) {
     }
 
     newConfig = newConfig.concat(nodes);
-    return setFlows(newConfig,'flows',true).then(function() {
+    return setFlows(newConfig,null,'flows',true).then(function() {
         log.info(log._("nodes.flows.updated-flow",{label:(label?label+" ":"")+"["+id+"]"}));
     })
 }
@@ -668,7 +684,7 @@ function removeFlow(id) {
         return node.z !== id && node.id !== id;
     });
 
-    return setFlows(newConfig,'flows',true).then(function() {
+    return setFlows(newConfig,null,'flows',true).then(function() {
         log.info(log._("nodes.flows.removed-flow",{label:(flow.label?flow.label+" ":"")+"["+flow.id+"]"}));
     });
 }