Merge pull request #4632 from node-red/4625-sf-env-err-handling

Add validation and error handling on subflow instance properties

packages/node_modules/@node-red/editor-client/src/js/nodes.js

@@ -1029,7 +1029,22 @@ RED.nodes = (function() {
         RED.nodes.registerType("subflow:"+sf.id, {
             defaults:{
                 name:{value:""},
-                env:{value:[]}
+                env:{value:[], validate: function(value) {
+                    const errors = []
+                    if (value) {
+                        value.forEach(env => {
+                            const r = RED.utils.validateTypedProperty(env.value, env.type)
+                            if (r !== true) {
+                                errors.push(env.name+': '+r)
+                            }
+                        })
+                    }
+                    if (errors.length === 0) {
+                        return true
+                    } else {
+                        return errors
+                    }
+                }}
             },
             icon: function() { return sf.icon||"subflow.svg" },
             category: sf.category || "subflows",

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

@@ -106,15 +106,23 @@ async function evaluateEnvProperties(flow, env, credentials) {
                             result = { value: result, __clone__: true}
                         }
                         evaluatedEnv[name] = result
+                    } else {
+                        evaluatedEnv[name] = undefined
+                        flow.error(`Error evaluating env property '${name}': ${err.toString()}`)
                     }
                     resolve()
                 });
             }))
         } else {
+            try {
                 value = redUtil.evaluateNodeProperty(value, type, {_flow: flow}, null, null);
                 if (typeof value  === 'object') {
                     value = { value: value, __clone__: true}
                 }
+            } catch (err) {
+                value = undefined
+                flow.error(`Error evaluating env property '${name}': ${err.toString()}`)
+            }
         }
         evaluatedEnv[name] = value
     }