Bump minimum version to node 18

Allow RED.view.select to select links

.github/workflows/tests.yml

@@ -12,12 +12,11 @@ permissions:
 jobs:
   build:
     permissions:
-      checks: write  # for coverallsapp/github-action to create new checks
       contents: read  # for actions/checkout to fetch code
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16, 18, 20]
+        node-version: [18, 20]
     steps:
     - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
@@ -29,8 +28,3 @@ jobs:
     - name: Run tests
       run: |
         npm run test
-    # - name: Publish to coveralls.io
-    #   if: ${{ matrix.node-version == 16 }}
-    #   uses: coverallsapp/github-action@v1.1.2
-    #   with:
-    #     github-token: ${{ github.token }}

CHANGELOG.md

@@ -1,35 +1,3 @@
-#### 3.1.8: Maintenance Release
-
- - Add validation and error handling on subflow instance properties (#4632) @knolleary
- - Hide import/export context menu if disabled in theme (#4633) @knolleary
- - Show change indicator on subflow tabs (#4631) @knolleary
- - Bump dependencies (#4630) @knolleary
- - Reset workspace index when clearing nodes (#4619) @knolleary
- - Remove typo in global config (#4613) @kazuhitoyokoi
-
-#### 3.1.7: Maintenance Release
-
- - Add Japanese translation for v3.1.6 (#4603) @kazuhitoyokoi
- - Update jsonata version (#4593) @hardillb
-
-#### 3.1.6: Maintenance Release
-
-Editor
-
- - Do not flag env var in num typedInput as error (#4582) @knolleary
- - Fix example flow name in import dialog (#4578) @kazuhitoyokoi
- - Fix missing node icons in workspace (#4570) @knolleary
-
-Runtime
-
- - Handle undefined env vars (#4581) @knolleary
- - fix: Removed offending MD5 crypto hash and replaced with SHA1 and SHA256 … (#4568) @JaysonHurst
- - chore: remove never use import code (#4580) @giscafer
-
-Nodes
-
- - fix: template node zh-CN translation (#4575) @giscafer
-
 #### 3.1.5: Maintenance Release
 
 Runtime

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "3.1.8",
+    "version": "4.0.0-dev",
     "description": "Low-code programming for event-driven applications",
     "homepage": "https://nodered.org",
     "license": "Apache-2.0",
@@ -41,7 +41,7 @@
         "cors": "2.8.5",
         "cronosjs": "1.7.1",
         "denque": "2.1.0",
-        "express": "4.19.2",
+        "express": "4.18.2",
         "express-session": "1.17.3",
         "form-data": "4.0.0",
         "fs-extra": "11.1.1",
@@ -54,7 +54,7 @@
         "is-utf8": "0.2.1",
         "js-yaml": "4.1.0",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.8.7",
+        "jsonata": "1.8.6",
         "lodash.clonedeep": "^4.5.0",
         "media-typer": "1.1.0",
         "memorystore": "1.6.7",
@@ -64,7 +64,7 @@
         "mqtt": "4.3.7",
         "multer": "1.4.5-lts.1",
         "mustache": "4.2.0",
-        "node-red-admin": "^3.1.3",
+        "node-red-admin": "^3.1.2",
         "node-watch": "0.7.4",
         "nopt": "5.0.0",
         "oauth2orize": "1.11.1",
@@ -112,7 +112,7 @@
         "mermaid": "^10.4.0",
         "minami": "1.2.3",
         "mocha": "9.2.2",
-        "node-red-node-test-helper": "^0.3.3",
+        "node-red-node-test-helper": "^0.3.2",
         "nodemon": "2.0.20",
         "proxy": "^1.0.2",
         "sass": "1.62.1",
@@ -122,6 +122,6 @@
         "supertest": "6.3.3"
     },
     "engines": {
-        "node": ">=14"
+        "node": ">=18"
     }
 }

packages/node_modules/@node-red/editor-api/lib/admin/context.js

@@ -33,6 +33,9 @@ module.exports = {
             store: req.query['store'],
             req: apiUtils.getRequestLogObject(req)
         }
+        if (req.query['keysOnly'] !== undefined) {
+            opts.keysOnly = true
+        }
         runtimeAPI.context.getValue(opts).then(function(result) {
             res.json(result);
         }).catch(function(err) {

packages/node_modules/@node-red/editor-api/lib/admin/settings.js

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+var apiUtils = require("../util");
 var runtimeAPI;
 var settings;
 var theme = require("../editor/theme");

packages/node_modules/@node-red/editor-api/lib/auth/strategies.js

@@ -18,6 +18,7 @@ var BearerStrategy = require('passport-http-bearer').Strategy;
 var ClientPasswordStrategy = require('passport-oauth2-client-password').Strategy;
 
 var passport = require("passport");
+var crypto = require("crypto");
 var util = require("util");
 
 var Tokens = require("./tokens");

packages/node_modules/@node-red/editor-api/lib/editor/index.js

@@ -14,9 +14,11 @@
  * limitations under the License.
  **/
 
+var express = require("express");
 var path = require('path');
 
 var comms = require("./comms");
+var library = require("./library");
 var info = require("./settings");
 
 var auth = require("../auth");

packages/node_modules/@node-red/editor-api/lib/editor/library.js

@@ -15,6 +15,8 @@
  **/
 
 var apiUtils = require("../util");
+var fs = require('fs');
+var fspath = require('path');
 
 var runtimeAPI;
 

packages/node_modules/@node-red/editor-api/lib/editor/locales.js

@@ -13,6 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+var fs = require('fs');
+var path = require('path');
+// var apiUtil = require('../util');
 
 var i18n = require("@node-red/util").i18n; // TODO: separate module
 

packages/node_modules/@node-red/editor-api/lib/editor/sshkeys.js

@@ -15,6 +15,7 @@
  **/
 
 var apiUtils = require("../util");
+var express = require("express");
 var runtimeAPI;
 var settings;
 

packages/node_modules/@node-red/editor-api/lib/editor/theme.js

@@ -14,6 +14,7 @@
  * limitations under the License.
  **/
 
+var express = require("express");
 var util = require("util");
 var path = require("path");
 var fs = require("fs");

packages/node_modules/@node-red/editor-api/lib/editor/ui.js

@@ -99,7 +99,7 @@ module.exports = {
             // settings.instanceId is set asynchronously to the editor-api
             // being initiaised. So we defer calculating the cacheBuster hash
             // until the first load of the editor
-            cacheBuster = crypto.createHash('sha1').update(`${settings.version || 'version'}-${settings.instanceId || 'instanceId'}`).digest("hex").substring(0,12)    
+            cacheBuster = crypto.createHash('md5').update(`${settings.version || 'version'}-${settings.instanceId || 'instanceId'}`).digest("hex").substring(0,12)    
         }
 
         let sessionMessages;

packages/node_modules/@node-red/editor-api/lib/index.js

@@ -24,8 +24,11 @@
   * @namespace @node-red/editor-api
   */
 
+var express = require("express");
 var bodyParser = require("body-parser");
+var util = require('util');
 var passport = require('passport');
+var cors = require('cors');
 
 var auth = require("./auth");
 var apiUtil = require("./util");

packages/node_modules/@node-red/editor-api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "3.1.8",
+    "version": "4.0.0-dev",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,14 +16,14 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "3.1.8",
-        "@node-red/editor-client": "3.1.8",
+        "@node-red/util": "4.0.0-dev",
+        "@node-red/editor-client": "4.0.0-dev",
         "bcryptjs": "2.4.3",
         "body-parser": "1.20.2",
         "clone": "2.1.2",
         "cors": "2.8.5",
         "express-session": "1.17.3",
-        "express": "4.19.2",
+        "express": "4.18.2",
         "memorystore": "1.6.7",
         "mime": "3.0.0",
         "multer": "1.4.5-lts.1",

packages/node_modules/@node-red/editor-client/locales/ja/editor.json

@@ -303,8 +303,7 @@
                 "missingType": "不正なフロー - __index__ 番目の要素に'type'プロパティがありません"
             },
             "conflictNotification1": "読み込もうとしているノードのいくつかは、既にワークスペース内に存在しています。",
-            "conflictNotification2": "読み込むノードを選択し、また既存のノードを置き換えるか、もしくはそれらのコピーを読み込むかも選択してください。",
-            "alreadyExists": "本ノードは既に存在"
+            "conflictNotification2": "読み込むノードを選択し、また既存のノードを置き換えるか、もしくはそれらのコピーを読み込むかも選択してください。"
         },
         "copyMessagePath": "パスをコピーしました",
         "copyMessageValue": "値をコピーしました",

packages/node_modules/@node-red/editor-client/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "3.1.8",
+    "version": "4.0.0-dev",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

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

@@ -547,16 +547,12 @@ RED.nodes = (function() {
              * @param {String} z tab id
              */
             checkTabState: function (z) {
-                const ws = workspaces[z] || subflows[z]
+                const ws = workspaces[z]
                 if (ws) {
                     const contentsChanged = tabDirtyMap[z].size > 0 || tabDeletedNodesMap[z].size > 0
                     if (Boolean(ws.contentsChanged) !== contentsChanged) {
                         ws.contentsChanged = contentsChanged
-                        if (ws.type === 'tab') {
-                            RED.events.emit("flows:change", ws);
-                        } else {
-                            RED.events.emit("subflows:change", ws);
-                        }
+                        RED.events.emit("flows:change", ws);
                     }
                 }
             }
@@ -1029,22 +1025,7 @@ RED.nodes = (function() {
         RED.nodes.registerType("subflow:"+sf.id, {
             defaults:{
                 name:{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
-                    }
-                }}
+                env:{value:[]}
             },
             icon: function() { return sf.icon||"subflow.svg" },
             category: sf.category || "subflows",

packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js

@@ -54,25 +54,26 @@
         return icon;
     }
 
-    var autoComplete = function(options) {
-        function getMatch(value, searchValue) {
-            const idx = value.toLowerCase().indexOf(searchValue.toLowerCase());
-            const len = idx > -1 ? searchValue.length : 0;
-            return {
-                index: idx,
-                found: idx > -1,
-                pre: value.substring(0,idx),
-                match: value.substring(idx,idx+len),
-                post: value.substring(idx+len),
-            }
-        }
-        function generateSpans(match) {
-            const els = [];
-            if(match.pre) { els.push($('<span/>').text(match.pre)); }
-            if(match.match) { els.push($('<span/>',{style:"font-weight: bold; color: var(--red-ui-text-color-link);"}).text(match.match)); }
-            if(match.post) { els.push($('<span/>').text(match.post)); }
-            return els;
+    function getMatch(value, searchValue) {
+        const idx = value.toLowerCase().indexOf(searchValue.toLowerCase());
+        const len = idx > -1 ? searchValue.length : 0;
+        return {
+            index: idx,
+            found: idx > -1,
+            pre: value.substring(0,idx),
+            match: value.substring(idx,idx+len),
+            post: value.substring(idx+len),
         }
+    }
+    function generateSpans(match) {
+        const els = [];
+        if(match.pre) { els.push($('<span/>').text(match.pre)); }
+        if(match.match) { els.push($('<span/>',{style:"font-weight: bold; color: var(--red-ui-text-color-link);"}).text(match.match)); }
+        if(match.post) { els.push($('<span/>').text(match.post)); }
+        return els;
+    }
+    
+    const msgAutoComplete = function(options) {
         return function(val) {
             var matches = [];
             options.forEach(opt => {
@@ -102,6 +103,197 @@
         }
     }
 
+    function getEnvVars (obj, envVars = {}) {
+        contextKnownKeys.env = contextKnownKeys.env || {}
+        if (contextKnownKeys.env[obj.id]) {
+            return contextKnownKeys.env[obj.id]
+        }
+        let parent
+        if (obj.type === 'tab' || obj.type === 'subflow') {
+            RED.nodes.eachConfig(function (conf) {
+                if (conf.type === "global-config") {
+                    parent = conf;
+                }
+            })
+        } else if (obj.g) {
+            parent = RED.nodes.group(obj.g)
+        } else if (obj.z) {
+            parent = RED.nodes.workspace(obj.z) || RED.nodes.subflow(obj.z)
+        }
+        if (parent) {
+            getEnvVars(parent, envVars)
+        }
+        if (obj.env) {
+            obj.env.forEach(env => {
+                envVars[env.name] = obj
+            })
+        }
+        contextKnownKeys.env[obj.id] = envVars
+        return envVars
+    }
+
+    const envAutoComplete = function (val) {
+        const editStack = RED.editor.getEditStack()
+        if (editStack.length === 0) {
+            done([])
+            return
+        }
+        const editingNode = editStack.pop()
+        if (!editingNode) {
+            return []
+        }
+        const envVarsMap = getEnvVars(editingNode)
+        const envVars = Object.keys(envVarsMap)
+        const matches = []
+        const i = val.lastIndexOf('${')
+        let searchKey = val
+        let isSubkey = false
+        if (i > -1) {
+            if (val.lastIndexOf('}') < i) {
+                searchKey = val.substring(i+2)
+                isSubkey = true
+            }
+        }
+        envVars.forEach(v => {
+            let valMatch = getMatch(v, searchKey);
+            if (valMatch.found) {
+                const optSrc = envVarsMap[v]
+                const element = $('<div>',{style: "display: flex"});
+                const valEl = $('<div/>',{style:"font-family: var(--red-ui-monospace-font); white-space:nowrap; overflow: hidden; flex-grow:1"});
+                valEl.append(generateSpans(valMatch))
+                valEl.appendTo(element)
+
+                if (optSrc) {
+                    const optEl = $('<div>').css({ "font-size": "0.8em" });
+                    let label
+                    if (optSrc.type === 'global-config') {
+                        label = RED._('sidebar.context.global')
+                    } else if (optSrc.type === 'group') {
+                        label = RED.utils.getNodeLabel(optSrc) || (RED._('sidebar.info.group') + ': '+optSrc.id)
+                    } else {
+                        label = RED.utils.getNodeLabel(optSrc) || optSrc.id
+                    }
+
+                    optEl.append(generateSpans({ match: label }));
+                    optEl.appendTo(element);
+                }
+                matches.push({
+                    value: isSubkey ? val + v + '}' : v,
+                    label: element,
+                    i: valMatch.index
+                });
+            }
+        })
+        matches.sort(function(A,B){return A.i-B.i})
+        return matches
+    }
+
+    let contextKnownKeys = {}
+    let contextCache = {}
+    if (RED.events) {
+        RED.events.on("editor:close", function () {
+            contextCache = {}
+            contextKnownKeys = {}
+        });
+    }
+
+    const contextAutoComplete = function() {
+        const that = this
+        const getContextKeysFromRuntime = function(scope, store, searchKey, done) {
+            contextKnownKeys[scope] = contextKnownKeys[scope] || {}
+            contextKnownKeys[scope][store] = contextKnownKeys[scope][store] || new Set()
+            if (searchKey.length > 0) {
+                try {
+                    RED.utils.normalisePropertyExpression(searchKey)
+                } catch (err) {
+                    // Not a valid context key, so don't try looking up
+                    done()
+                    return
+                }
+            }
+            const url = `context/${scope}/${encodeURIComponent(searchKey)}?store=${store}&keysOnly`
+            if (contextCache[url]) {
+                // console.log('CACHED', url)
+                done()
+            } else {
+                // console.log('GET', url)
+                $.getJSON(url, function(data) {
+                    // console.log(data)
+                    contextCache[url] = true
+                    const result = data[store] || {}
+                    const keys = result.keys || []
+                    const keyPrefix = searchKey + (searchKey.length > 0 ? '.' : '')
+                    keys.forEach(key => {
+                        if (/^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(key)) {
+                            contextKnownKeys[scope][store].add(keyPrefix + key)
+                        } else {
+                            contextKnownKeys[scope][store].add(searchKey + "[\""+key.replace(/"/,"\\\"")+"\"]")
+                        }                        
+                    })
+                    done()
+                })
+            }
+        }
+        const getContextKeys = function(key, done) {
+            const keyParts = key.split('.')
+            const partialKey = keyParts.pop()
+            let scope = that.propertyType
+            if (scope === 'flow') {
+                // Get the flow id of the node we're editing
+                const editStack = RED.editor.getEditStack()
+                if (editStack.length === 0) {
+                    done([])
+                    return
+                }
+                const editingNode = editStack.pop()
+                if (editingNode.z) {
+                    scope = `${scope}/${editingNode.z}`
+                } else {
+                    done([])
+                    return
+                }
+            }
+            const store = (contextStoreOptions.length === 1) ? contextStoreOptions[0].value : that.optionValue
+            const searchKey = keyParts.join('.')
+           
+            getContextKeysFromRuntime(scope, store, searchKey, function() {
+                if (contextKnownKeys[scope][store].has(key) || key.endsWith(']')) {
+                    getContextKeysFromRuntime(scope, store, key, function() {
+                        done(contextKnownKeys[scope][store])
+                    })
+                }
+                done(contextKnownKeys[scope][store])
+            })
+        }
+
+        return function(val, done) {
+            getContextKeys(val, function (keys) {
+                const matches = []
+                keys.forEach(v => {
+                    let optVal = v
+                    let valMatch = getMatch(optVal, val);
+                    if (!valMatch.found && val.length > 0 && val.endsWith('.')) {
+                        // Search key ends in '.' - but doesn't match. Check again
+                        // with [" at the end instead so we match bracket notation
+                        valMatch = getMatch(optVal, val.substring(0, val.length - 1) + '["')
+                    }
+                    if (valMatch.found) {
+                        const element = $('<div>',{style: "display: flex"});
+                        const valEl = $('<div/>',{style:"font-family: var(--red-ui-monospace-font); white-space:nowrap; overflow: hidden; flex-grow:1"});
+                        valEl.append(generateSpans(valMatch))
+                        valEl.appendTo(element)
+                        matches.push({
+                            value: optVal,
+                            label: element,
+                        });
+                    }
+                })
+                matches.sort(function(a, b) { return a.value.localeCompare(b.value) });
+                done(matches);
+            })
+        }
+    }
+
     // This is a hand-generated list of completions for the core nodes (based on the node help html).
     var msgCompletions = [
         { value: "payload" },
@@ -166,20 +358,22 @@
         { value: "_session", source: ["websocket out","tcp out"] },
     ]
     var allOptions = {
-        msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression, autoComplete: autoComplete(msgCompletions)},
+        msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression, autoComplete: msgAutoComplete(msgCompletions)},
         flow: {value:"flow",label:"flow.",hasValue:true,
             options:[],
             validate:RED.utils.validatePropertyExpression,
             parse: contextParse,
             export: contextExport,
-            valueLabel: contextLabel
+            valueLabel: contextLabel,
+            autoComplete: contextAutoComplete
         },
         global: {value:"global",label:"global.",hasValue:true,
             options:[],
             validate:RED.utils.validatePropertyExpression,
             parse: contextParse,
             export: contextExport,
-            valueLabel: contextLabel
+            valueLabel: contextLabel,
+            autoComplete: contextAutoComplete
         },
         str: {value:"str",label:"string",icon:"red/images/typedInput/az.svg"},
         num: {value:"num",label:"number",icon:"red/images/typedInput/09.svg",validate: function(v) {
@@ -251,7 +445,8 @@
         env: {
             value: "env",
             label: "env variable",
-            icon: "red/images/typedInput/env.svg"
+            icon: "red/images/typedInput/env.svg",
+            autoComplete: envAutoComplete
         },
         node: {
             value: "node",
@@ -427,6 +622,7 @@
     }
 
     var nlsd = false;
+    let contextStoreOptions;
 
     $.widget( "nodered.typedInput", {
         _create: function() {
@@ -438,7 +634,7 @@
                     }
                 }
                 var contextStores = RED.settings.context.stores;
-                var contextOptions = contextStores.map(function(store) {
+                contextStoreOptions = contextStores.map(function(store) {
                     return {value:store,label: store, icon:'<i class="red-ui-typedInput-icon fa fa-database"></i>'}
                 }).sort(function(A,B) {
                     if (A.value === RED.settings.context.default) {
@@ -449,12 +645,12 @@
                         return A.value.localeCompare(B.value);
                     }
                 })
-                if (contextOptions.length < 2) {
+                if (contextStoreOptions.length < 2) {
                     allOptions.flow.options = [];
                     allOptions.global.options = [];
                 } else {
-                    allOptions.flow.options = contextOptions;
-                    allOptions.global.options = contextOptions;
+                    allOptions.flow.options = contextStoreOptions;
+                    allOptions.global.options = contextStoreOptions;
                 }
             }
             nlsd = true;
@@ -544,7 +740,7 @@
                 that.element.trigger('paste',evt);
             });
             this.input.on('keydown', function(evt) {
-                if (that.typeMap[that.propertyType].autoComplete) {
+                if (that.typeMap[that.propertyType].autoComplete || that.input.hasClass('red-ui-autoComplete')) {
                     return
                 }
                 if (evt.keyCode >= 37 && evt.keyCode <= 40) {
@@ -967,6 +1163,9 @@
                     // If previousType is !null, then this is a change of the type, rather than the initialisation
                     var previousType = this.typeMap[this.propertyType];
                     previousValue = this.input.val();
+                    if (this.input.hasClass('red-ui-autoComplete')) {
+                        this.input.autoComplete("destroy");
+                    }
 
                     if (previousType && this.typeChanged) {
                         if (this.options.debug) { console.log(this.identifier,"typeChanged",{previousType,previousValue}) }
@@ -1013,7 +1212,9 @@
                             this.input.val(this.oldValues.hasOwnProperty("_")?this.oldValues["_"]:(opt.default||""))
                         }
                         if (previousType.autoComplete) {
-                            this.input.autoComplete("destroy");
+                            if (this.input.hasClass('red-ui-autoComplete')) {
+                                this.input.autoComplete("destroy");
+                            }
                         }
                     }
                     this.propertyType = type;
@@ -1141,6 +1342,16 @@
                                 } else {
                                     this.optionSelectTrigger.hide();
                                 }
+                                if (opt.autoComplete) {
+                                    let searchFunction = opt.autoComplete
+                                    if (searchFunction.length === 0) {
+                                        searchFunction = opt.autoComplete.call(this)
+                                    }
+                                    this.input.autoComplete({
+                                        search: searchFunction,
+                                        minLength: 0
+                                    })
+                                }
                             }
                             this.optionMenu = this._createMenu(opt.options,opt,function(v){
                                 if (!opt.multiple) {
@@ -1183,8 +1394,12 @@
                             this.valueLabelContainer.hide();
                             this.elementDiv.show();
                             if (opt.autoComplete) {
+                                let searchFunction = opt.autoComplete
+                                if (searchFunction.length === 0) {
+                                    searchFunction = opt.autoComplete.call(this)
+                                }
                                 this.input.autoComplete({
-                                    search: opt.autoComplete,
+                                    search: searchFunction,
                                     minLength: 0
                                 })
                             }

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

@@ -118,16 +118,10 @@ RED.contextMenu = (function () {
                     onselect: 'core:split-wire-with-link-nodes',
                     disabled: !canEdit || !hasLinks
                 },
-                null
+                null,
+                { onselect: 'core:show-import-dialog', label: RED._('common.label.import')},
+                { onselect: 'core:show-examples-import-dialog', label: RED._('menu.label.importExample') }
             )
-            if (RED.settings.theme("menu.menu-item-import-library", true)) {
-                insertOptions.push(
-                    { onselect: 'core:show-import-dialog', label: RED._('common.label.import')},
-                    { onselect: 'core:show-examples-import-dialog', label: RED._('menu.label.importExample') }
-                )
-            }
-
-
             if (hasSelection && canEdit) {
                 const nodeOptions = []
                 if (!hasMultipleSelection && !isGroup) {
@@ -200,14 +194,8 @@ RED.contextMenu = (function () {
                 { onselect: 'core:paste-from-internal-clipboard', label: RED._("keyboard.pasteNode"), disabled: !canEdit || !RED.view.clipboard() },
                 { onselect: 'core:delete-selection', label: RED._('keyboard.deleteSelected'), disabled: !canEdit || !canDelete },
                 { onselect: 'core:delete-selection-and-reconnect', label: RED._('keyboard.deleteReconnect'), disabled: !canEdit || !canDelete },
-            )
-            if (RED.settings.theme("menu.menu-item-export-library", true)) {
-                menuItems.push(
-                    { onselect: 'core:show-export-dialog', label: RED._("menu.label.export") }
-                )
-            }
-            menuItems.push(
-                { onselect: 'core:select-all-nodes', label: RED._("keyboard.selectAll") }
+                { onselect: 'core:show-export-dialog', label: RED._("menu.label.export") },
+                { onselect: 'core:select-all-nodes', label: RED._("keyboard.selectAll") },
             )
         }
 

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

@@ -2087,6 +2087,7 @@ RED.editor = (function() {
             }
         },
         editBuffer: function(options) { showTypeEditor("_buffer", options) },
+        getEditStack: function () { return [...editStack] },
         buildEditForm: buildEditForm,
         validateNode: validateNode,
         updateNodeProperties: updateNodeProperties,

packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js

@@ -158,10 +158,8 @@ RED.sidebar.help = (function() {
 
     function refreshSubflow(sf) {
         var item = treeList.treeList('get',"node-type:subflow:"+sf.id);
-        if (item) {
-            item.subflowLabel = sf._def.label().toLowerCase();
-            item.treeList.replaceElement(getNodeLabel({_def:sf._def,type:sf._def.label()}));
-        }
+        item.subflowLabel = sf._def.label().toLowerCase();
+        item.treeList.replaceElement(getNodeLabel({_def:sf._def,type:sf._def.label()}));
     }
 
     function hideTOC() {

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

@@ -906,10 +906,7 @@ RED.utils = (function() {
      * @returns true if valid, String if invalid
      */
     function validateTypedProperty(propertyValue, propertyType, opt) {
-        if (propertyValue && /^\${[^}]+}$/.test(propertyValue)) {
-            // Allow ${ENV_VAR} value
-            return true
-        }
+
         let error
         if (propertyType === 'json') {
             try {

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

@@ -646,128 +646,120 @@ RED.view = (function() {
                 }
                 d3.event = event;
                 var selected_tool = $(ui.draggable[0]).attr("data-palette-type");
+                var result = createNode(selected_tool);
+                if (!result) {
+                    return;
+                }
+                var historyEvent = result.historyEvent;
+                var nn = RED.nodes.add(result.node);
+
+                var showLabel = RED.utils.getMessageProperty(RED.settings.get('editor'),"view.view-node-show-label");
+                if (showLabel !== undefined &&  (nn._def.hasOwnProperty("showLabel")?nn._def.showLabel:true) && !nn._def.defaults.hasOwnProperty("l")) {
+                    nn.l = showLabel;
+                }
+
+                var helperOffset = d3.touches(ui.helper.get(0))[0]||d3.mouse(ui.helper.get(0));
+                var helperWidth = ui.helper.width();
+                var helperHeight = ui.helper.height();
+                var mousePos = d3.touches(this)[0]||d3.mouse(this);
+
                 try {
-                    var result = createNode(selected_tool);
-                    if (!result) {
-                        return;
-                    }
-                    var historyEvent = result.historyEvent;
-                    var nn = RED.nodes.add(result.node);
+                    var isLink = (nn.type === "link in" || nn.type === "link out")
+                    var hideLabel = nn.hasOwnProperty('l')?!nn.l : isLink;
 
-                    var showLabel = RED.utils.getMessageProperty(RED.settings.get('editor'),"view.view-node-show-label");
-                    if (showLabel !== undefined &&  (nn._def.hasOwnProperty("showLabel")?nn._def.showLabel:true) && !nn._def.defaults.hasOwnProperty("l")) {
-                        nn.l = showLabel;
-                    }
-
-                    var helperOffset = d3.touches(ui.helper.get(0))[0]||d3.mouse(ui.helper.get(0));
-                    var helperWidth = ui.helper.width();
-                    var helperHeight = ui.helper.height();
-                    var mousePos = d3.touches(this)[0]||d3.mouse(this);
-
-                    try {
-                        var isLink = (nn.type === "link in" || nn.type === "link out")
-                        var hideLabel = nn.hasOwnProperty('l')?!nn.l : isLink;
-
-                        var label = RED.utils.getNodeLabel(nn, nn.type);
-                        var labelParts = getLabelParts(label, "red-ui-flow-node-label");
-                        if (hideLabel) {
-                            nn.w = node_height;
-                            nn.h = Math.max(node_height,(nn.outputs || 0) * 15);
-                        } else {
-                            nn.w = Math.max(node_width,20*(Math.ceil((labelParts.width+50+(nn._def.inputs>0?7:0))/20)) );
-                            nn.h = Math.max(6+24*labelParts.lines.length,(nn.outputs || 0) * 15, 30);
-                        }
-                    } catch(err) {
-                    }
-
-                    mousePos[1] += this.scrollTop + ((helperHeight/2)-helperOffset[1]);
-                    mousePos[0] += this.scrollLeft + ((helperWidth/2)-helperOffset[0]);
-                    mousePos[1] /= scaleFactor;
-                    mousePos[0] /= scaleFactor;
-
-                    nn.x = mousePos[0];
-                    nn.y = mousePos[1];
-
-                    var minX = nn.w/2 -5;
-                    if (nn.x < minX) {
-                        nn.x = minX;
-                    }
-                    var minY = nn.h/2 -5;
-                    if (nn.y < minY) {
-                        nn.y = minY;
-                    }
-                    var maxX = space_width -nn.w/2 +5;
-                    if (nn.x > maxX) {
-                        nn.x = maxX;
-                    }
-                    var maxY = space_height -nn.h +5;
-                    if (nn.y > maxY) {
-                        nn.y = maxY;
-                    }
-
-                    if (snapGrid) {
-                        var gridOffset = RED.view.tools.calculateGridSnapOffsets(nn);
-                        nn.x -= gridOffset.x;
-                        nn.y -= gridOffset.y;
-                    }
-
-                    var linkToSplice = $(ui.helper).data("splice");
-                    if (linkToSplice) {
-                        spliceLink(linkToSplice, nn, historyEvent)
-                    }
-
-                    var group = $(ui.helper).data("group");
-                    if (group) {
-                        var oldX = group.x; 
-                        var oldY = group.y; 
-                        RED.group.addToGroup(group, nn);
-                        var moveEvent = null;
-                        if ((group.x !== oldX) ||
-                            (group.y !== oldY)) {
-                            moveEvent = {
-                                t: "move",
-                                nodes: [{n: group,
-                                        ox: oldX, oy: oldY,
-                                        dx: group.x -oldX,
-                                        dy: group.y -oldY}],
-                                dirty: true
-                            };
-                        }
-                        historyEvent = {
-                            t: 'multi',
-                            events: [historyEvent],
-
-                        };
-                        if (moveEvent) {
-                            historyEvent.events.push(moveEvent)
-                        }
-                        historyEvent.events.push({
-                            t: "addToGroup",
-                            group: group,
-                            nodes: nn
-                        })
-                    }
-
-                    RED.history.push(historyEvent);
-                    RED.editor.validateNode(nn);
-                    RED.nodes.dirty(true);
-                    // auto select dropped node - so info shows (if visible)
-                    clearSelection();
-                    nn.selected = true;
-                    movingSet.add(nn);
-                    updateActiveNodes();
-                    updateSelection();
-                    redraw();
-
-                    if (nn._def.autoedit) {
-                        RED.editor.edit(nn);
-                    }
-                } catch (error) {
-                    if (error.code != "NODE_RED") {
-                        RED.notify(RED._("notification.error",{message:error.toString()}),"error");
+                    var label = RED.utils.getNodeLabel(nn, nn.type);
+                    var labelParts = getLabelParts(label, "red-ui-flow-node-label");
+                    if (hideLabel) {
+                        nn.w = node_height;
+                        nn.h = Math.max(node_height,(nn.outputs || 0) * 15);
                     } else {
-                        RED.notify(RED._("notification.error",{message:error.message}),"error");
+                        nn.w = Math.max(node_width,20*(Math.ceil((labelParts.width+50+(nn._def.inputs>0?7:0))/20)) );
+                        nn.h = Math.max(6+24*labelParts.lines.length,(nn.outputs || 0) * 15, 30);
                     }
+                } catch(err) {
+                }
+
+                mousePos[1] += this.scrollTop + ((helperHeight/2)-helperOffset[1]);
+                mousePos[0] += this.scrollLeft + ((helperWidth/2)-helperOffset[0]);
+                mousePos[1] /= scaleFactor;
+                mousePos[0] /= scaleFactor;
+
+                nn.x = mousePos[0];
+                nn.y = mousePos[1];
+
+                var minX = nn.w/2 -5;
+                if (nn.x < minX) {
+                    nn.x = minX;
+                }
+                var minY = nn.h/2 -5;
+                if (nn.y < minY) {
+                    nn.y = minY;
+                }
+                var maxX = space_width -nn.w/2 +5;
+                if (nn.x > maxX) {
+                    nn.x = maxX;
+                }
+                var maxY = space_height -nn.h +5;
+                if (nn.y > maxY) {
+                    nn.y = maxY;
+                }
+
+                if (snapGrid) {
+                    var gridOffset = RED.view.tools.calculateGridSnapOffsets(nn);
+                    nn.x -= gridOffset.x;
+                    nn.y -= gridOffset.y;
+                }
+
+                var linkToSplice = $(ui.helper).data("splice");
+                if (linkToSplice) {
+                    spliceLink(linkToSplice, nn, historyEvent)
+                }
+
+                var group = $(ui.helper).data("group");
+                if (group) {
+                    var oldX = group.x; 
+                    var oldY = group.y; 
+                    RED.group.addToGroup(group, nn);
+                    var moveEvent = null;
+                    if ((group.x !== oldX) ||
+                        (group.y !== oldY)) {
+                        moveEvent = {
+                            t: "move",
+                            nodes: [{n: group,
+                                     ox: oldX, oy: oldY,
+                                     dx: group.x -oldX,
+                                     dy: group.y -oldY}],
+                            dirty: true
+                        };
+                    }
+                    historyEvent = {
+                        t: 'multi',
+                        events: [historyEvent],
+
+                    };
+                    if (moveEvent) {
+                        historyEvent.events.push(moveEvent)
+                    }
+                    historyEvent.events.push({
+                        t: "addToGroup",
+                        group: group,
+                        nodes: nn
+                    })
+                }
+
+                RED.history.push(historyEvent);
+                RED.editor.validateNode(nn);
+                RED.nodes.dirty(true);
+                // auto select dropped node - so info shows (if visible)
+                clearSelection();
+                nn.selected = true;
+                movingSet.add(nn);
+                updateActiveNodes();
+                updateSelection();
+                redraw();
+
+                if (nn._def.autoedit) {
+                    RED.editor.edit(nn);
                 }
             }
         });
@@ -4164,7 +4156,7 @@ RED.view = (function() {
                     }
                     var width = img.width * scaleFactor;
                     if (width > 20) {
-                        scaleFactor *= 20/width;
+                        scalefactor *= 20/width;
                         width = 20;
                     }
                     var height = img.height * scaleFactor;
@@ -6071,19 +6063,14 @@ RED.view = (function() {
      function createNode(type, x, y, z) {
         const wasDirty = RED.nodes.dirty()
         var m = /^subflow:(.+)$/.exec(type);
-        var activeSubflow = (z || RED.workspaces.active()) ? RED.nodes.subflow(z || RED.workspaces.active()) : null;
-
+        var activeSubflow = z ? RED.nodes.subflow(z) : null;
         if (activeSubflow && m) {
             var subflowId = m[1];
-            let err
             if (subflowId === activeSubflow.id) {
-                err = new Error(RED._("notification.errors.cannotAddSubflowToItself"))
-            } else if (RED.nodes.subflowContains(m[1], activeSubflow.id)) {
-                err = new Error(RED._("notification.errors.cannotAddCircularReference"))
+                throw new Error(RED._("notification.error", { message: RED._("notification.errors.cannotAddSubflowToItself") }))
             }
-            if (err) {
-                err.code = 'NODE_RED'
-                throw err
+            if (RED.nodes.subflowContains(m[1], activeSubflow.id)) {
+                throw new Error(RED._("notification.error", { message: RED._("notification.errors.cannotAddCircularReference") }))
             }
         }
 
@@ -6265,6 +6252,10 @@ RED.view = (function() {
                             }
                         })
                     }
+                    if (selection.links) {
+                        selectedLinks.clear();
+                        selection.links.forEach(selectedLinks.add);
+                    }
                 }
             }
             updateSelection();

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

@@ -491,11 +491,6 @@ RED.workspaces = (function() {
         createWorkspaceTabs();
         RED.events.on("sidebar:resize",workspace_tabs.resize);
 
-        RED.events.on("workspace:clear", () => {
-            // Reset the index used to generate new flow names
-            workspaceIndex = 0
-        })
-
         RED.actions.add("core:show-next-tab",function() {
             var oldActive = activeWorkspace;
             workspace_tabs.nextTab();
@@ -662,9 +657,6 @@ RED.workspaces = (function() {
         RED.events.on("flows:change", (ws) => {
             $("#red-ui-tab-"+(ws.id.replace(".","-"))).toggleClass('red-ui-workspace-changed',!!(ws.contentsChanged || ws.changed || ws.added));
         })
-        RED.events.on("subflows:change", (ws) => {
-            $("#red-ui-tab-"+(ws.id.replace(".","-"))).toggleClass('red-ui-workspace-changed',!!(ws.contentsChanged || ws.changed || ws.added));
-        })
 
         hideWorkspace();
     }

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

@@ -16,20 +16,8 @@
 RED.validators = {
     number: function(blankAllowed,mopt){
         return function(v, opt) {
-            if (blankAllowed && (v === '' || v === undefined)) {
-                return true
-            }
-            if (v !== '') {
-                if (/^NaN$|^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$|^[+-]?(0b|0B)[01]+$|^[+-]?(0o|0O)[0-7]+$|^[+-]?(0x|0X)[0-9a-fA-F]+$/.test(v)) {
-                    return true
-                }
-                if (/^\${[^}]+}$/.test(v)) {
-                    // Allow ${ENV_VAR} value
-                    return true
-                }
-            }
-            if (!isNaN(v)) {
-                return true
+            if ((blankAllowed&&(v===''||v===undefined)) || (v!=='' && !isNaN(v))) {
+                return true;
             }
             if (opt && opt.label) {
                 return RED._("validator.errors.invalid-num-prop", {

packages/node_modules/@node-red/nodes/core/common/20-inject.html

@@ -227,42 +227,34 @@
             name: {value:""},
             props:{value:[{p:"payload"},{p:"topic",vt:"str"}], validate:function(v, opt) {
                     if (!v || v.length === 0) { return true }
-                    const errors = []
                     for (var i=0;i<v.length;i++) {
-                        if (/^\${[^}]+}$/.test(v[i].v)) {
-                            // Allow ${ENV_VAR} value
-                            continue
-                        }
                         if (/msg|flow|global/.test(v[i].vt)) {
                             if (!RED.utils.validatePropertyExpression(v[i].v)) {
-                                errors.push(RED._("node-red:inject.errors.invalid-prop", { prop: 'msg.'+v[i].p, error: v[i].v }))
+                                return RED._("node-red:inject.errors.invalid-prop", { prop: 'msg.'+v[i].p, error: v[i].v });
                             }
                         } else if (v[i].vt === "jsonata") {
                             try{ jsonata(v[i].v); }
                             catch(e){
-                                errors.push(RED._("node-red:inject.errors.invalid-jsonata", { prop: 'msg.'+v[i].p, error: e.message }))
+                                return RED._("node-red:inject.errors.invalid-jsonata", { prop: 'msg.'+v[i].p, error: e.message });
                             }
                         } else if (v[i].vt === "json") {
                             try{ JSON.parse(v[i].v); }
                             catch(e){
-                                errors.push(RED._("node-red:inject.errors.invalid-json", { prop: 'msg.'+v[i].p, error: e.message }))
+                                return RED._("node-red:inject.errors.invalid-json", { prop: 'msg.'+v[i].p, error: e.message });
                             }
                         } else if (v[i].vt === "num"){
                             if (!/^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$/.test(v[i].v)) {
-                                errors.push(RED._("node-red:inject.errors.invalid-prop", { prop: 'msg.'+v[i].p, error: v[i].v }))
+                                return RED._("node-red:inject.errors.invalid-prop", { prop: 'msg.'+v[i].p, error: v[i].v });
                             }
                         }
                     }
-                    if (errors.length > 0) {
-                        return errors
-                    }
                     return true;
                 }
             },
             repeat: {
                 value:"", validate: function(v, opt) {
                     if ((v === "") ||
-                        (RED.validators.number()(v) &&
+                        (RED.validators.number(v) &&
                          (v >= 0) && (v <= 2147483))) {
                         return true;
                     }
@@ -271,7 +263,7 @@
             },
             crontab: {value:""},
             once: {value:false},
-            onceDelay: {value:0.1, validate: RED.validators.number(true)},
+            onceDelay: {value:0.1},
             topic: {value:""},
             payload: {value:"", validate: RED.validators.typedInput("payloadType", false) },
             payloadType: {value:"date"},

packages/node_modules/@node-red/nodes/core/common/21-debug.html

@@ -378,7 +378,7 @@
                             return { id: id, label: RED.nodes.workspace(id).label } //flow id + name
                         } else {
                             const instanceNode = RED.nodes.node(id)
-                            const pathLabel = (instanceNode.name || RED.nodes.subflow(instanceNode.type.substring(8))?.name || instanceNode.type)
+                            const pathLabel = (instanceNode.name || RED.nodes.subflow(instanceNode.type.substring(8)).name)
                             return { id: id, label: pathLabel }
                         }
                     })

packages/node_modules/@node-red/nodes/core/common/21-debug.js

@@ -5,6 +5,7 @@ module.exports = function(RED) {
     const fs = require("fs-extra");
     const path = require("path");
     var debuglength = RED.settings.debugMaxLength || 1000;
+    var statuslength = RED.settings.debugStatusLength || 32;
     var useColors = RED.settings.debugUseColors || false;
     util.inspect.styles.boolean = "red";
     const { hasOwnProperty } = Object.prototype;
@@ -164,7 +165,7 @@ module.exports = function(RED) {
                             }
                         }
 
-                        if (st.length > 32) { st = st.substr(0,32) + "..."; }
+                        if (st.length > statuslength) { st = st.substr(0,statuslength) + "..."; }
 
                         var newStatus = {fill:fill, shape:shape, text:st};
                         if (JSON.stringify(newStatus) !== node.oldState) { // only send if we have to

packages/node_modules/@node-red/nodes/core/function/15-change.js

@@ -233,7 +233,9 @@ module.exports = function(RED) {
                                                     // only replace if they match exactly
                                                     RED.util.setMessageProperty(msg,property,value);
                                                 } else {
-                                                    current = current.replace(fromRE,value);
+                                                    // if target is boolean then just replace it
+                                                    if (rule.tot === "bool") { current = value; }
+                                                    else { current = current.replace(fromRE,value); }
                                                     RED.util.setMessageProperty(msg,property,current);
                                                 }
                                             } else if ((typeof current === 'number' || current instanceof Number) && fromType === 'num') {

packages/node_modules/@node-red/nodes/core/network/31-tcpin.js

@@ -411,23 +411,33 @@ module.exports = function(RED) {
                 if (msg._session && msg._session.type == "tcp") {
                     var client = connectionPool[msg._session.id];
                     if (client) {
-                        if (Buffer.isBuffer(msg.payload)) {
-                            client.write(msg.payload);
-                        } else if (typeof msg.payload === "string" && node.base64) {
-                            client.write(Buffer.from(msg.payload,'base64'));
-                        } else {
-                            client.write(Buffer.from(""+msg.payload));
+                        if (msg?.reset === true) {
+                            client.destroy();
+                        }
+                        else {
+                            if (Buffer.isBuffer(msg.payload)) {
+                                client.write(msg.payload);
+                            } else if (typeof msg.payload === "string" && node.base64) {
+                                client.write(Buffer.from(msg.payload,'base64'));
+                            } else {
+                                client.write(Buffer.from(""+msg.payload));
+                            }
                         }
                     }
                 }
                 else {
                     for (var i in connectionPool) {
-                        if (Buffer.isBuffer(msg.payload)) {
-                            connectionPool[i].write(msg.payload);
-                        } else if (typeof msg.payload === "string" && node.base64) {
-                            connectionPool[i].write(Buffer.from(msg.payload,'base64'));
-                        } else {
-                            connectionPool[i].write(Buffer.from(""+msg.payload));
+                        if (msg?.reset === true) {
+                            connectionPool[i].destroy();
+                        }
+                        else {
+                            if (Buffer.isBuffer(msg.payload)) {
+                                connectionPool[i].write(msg.payload);
+                            } else if (typeof msg.payload === "string" && node.base64) {
+                                connectionPool[i].write(Buffer.from(msg.payload,'base64'));
+                            } else {
+                                connectionPool[i].write(Buffer.from(""+msg.payload));
+                            }
                         }
                     }
                 }
@@ -547,13 +557,33 @@ module.exports = function(RED) {
 
         this.on("input", function(msg, nodeSend, nodeDone) {
             var i = 0;
-            if ((!Buffer.isBuffer(msg.payload)) && (typeof msg.payload !== "string")) {
+            if (msg.payload !== undefined && (!Buffer.isBuffer(msg.payload)) && (typeof msg.payload !== "string")) {
                 msg.payload = msg.payload.toString();
             }
 
             var host = node.server || msg.host;
             var port = node.port || msg.port;
 
+            if (node.out === "sit" && msg?.reset) {
+                if (msg.reset === true) { // kill all connections
+                    for (var cl in clients) {
+                        if (clients[cl].hasOwnProperty("client")) {
+                            clients[cl].client.destroy();
+                            delete clients[cl];
+                        }
+                    }
+                }
+                if (typeof(msg.reset) === "string" && msg.reset.includes(":")) {  // just kill connection host:port
+                    if (clients.hasOwnProperty(msg.reset) && clients[msg.reset].hasOwnProperty("client")) {
+                        clients[msg.reset].client.destroy();
+                        delete clients[msg.reset];
+                    }
+                }
+                const cc = Object.keys(clients).length;
+                node.status({fill:"green",shape:cc===0?"ring":"dot",text:RED._("tcpin.status.connections",{count:cc})});
+                if ((host === undefined || port === undefined) && !msg.hasOwnProperty("payload")) { return; }
+            }
+
             // Store client information independently
             // the clients object will have:
             // clients[id].client, clients[id].msg, clients[id].timeout
@@ -621,13 +651,16 @@ module.exports = function(RED) {
                     clients[connection_id].connecting = true;
                     clients[connection_id].client.connect(connOpts, function() {
                         //node.log(RED._("tcpin.errors.client-connected"));
-                        node.status({fill:"green",shape:"dot",text:"common.status.connected"});
+                        // node.status({fill:"green",shape:"dot",text:"common.status.connected"});
+                        node.status({fill:"green",shape:"dot",text:RED._("tcpin.status.connections",{count:Object.keys(clients).length})});
                         if (clients[connection_id] && clients[connection_id].client) {
                             clients[connection_id].connected = true;
                             clients[connection_id].connecting = false;
                             let event;
                             while (event = dequeue(clients[connection_id].msgQueue)) {
-                                clients[connection_id].client.write(event.msg.payload);
+                                if (event.msg.payload !== undefined) {
+                                    clients[connection_id].client.write(event.msg.payload);
+                                }
                                 event.nodeDone();
                             }
                             if (node.out === "time" && node.splitc < 0) {
@@ -823,7 +856,9 @@ module.exports = function(RED) {
             else if (!clients[connection_id].connecting && clients[connection_id].connected) {
                 if (clients[connection_id] && clients[connection_id].client) {
                     let event = dequeue(clients[connection_id].msgQueue)
-                    clients[connection_id].client.write(event.msg.payload);
+                    if (event.msg.payload !== undefined ) {
+                        clients[connection_id].client.write(event.msg.payload);
+                    }
                     event.nodeDone();
                 }
             }

packages/node_modules/@node-red/nodes/locales/en-US/network/31-tcpin.html

@@ -30,6 +30,8 @@
     before being sent.</p>
     <p>If <code>msg._session</code> is not present the payload is
     sent to <b>all</b> connected clients.</p>
+    <p>In Reply-to mode, setting <code>msg.reset = true</code> will reset the connection
+        specified by _session.id, or all connections if no _session.id is specified.</p>
     <p><b>Note: </b>On some systems you may need root or administrator access
     to access ports below 1024.</p>
 </script>
@@ -40,6 +42,8 @@
     returned characters into a fixed buffer, match a specified character before returning,
     wait a fixed timeout from first reply and then return, sit and wait for data, or send then close the connection
     immediately, without waiting for a reply.</p>
+    <p>If in sit and wait mode (remain connected) you can send <code>msg.reset = true</code> or <code>msg.reset = "host:port"</code> to force a break in
+    the connection and an automatic reconnection.</p>
     <p>The response will be output in <code>msg.payload</code> as a buffer, so you may want to .toString() it.</p>
     <p>If you leave tcp host or port blank they must be set by using the <code>msg.host</code> and <code>msg.port</code> properties in every message sent to the node.</p>
 </script>

packages/node_modules/@node-red/nodes/locales/ja/common/91-global-config.html

@@ -1,3 +1,3 @@
 <script type="text/html" data-help-name="global-config">
     <p>大域的なフローの設定を保持するノード。大域的な環境変数の定義を含みます。</p>
-</script>
+</script>p

packages/node_modules/@node-red/nodes/locales/zh-CN/function/80-template.html

@@ -23,7 +23,7 @@
         <dt class="optional">template <span class="property-type">string</span></dt>
         <dd>由<code>msg.payload</code>填充的模板。如果未在编辑面板中配置，则可以将设为msg的属性。</dd>
     </dl>
-    <h3>输出</h3>
+    <h3>Outputs</h3>
     <dl class="message-properties">
         <dt>msg <span class="property-type">object</span></dt>
         <dd>由来自传入msg的属性来填充已配置的模板后输出的带有属性的msg。</dd>
@@ -32,7 +32,7 @@
     <p>默认情况下使用<i><a href="http://mustache.github.io/mustache.5.html" target="_blank">mustache</a></i>格式。如有需要也可以切换其他格式。</p>
     <p>例如:
     <pre>Hello {{payload.name}}. Today is {{date}}</pre>
-    <p>接收一条消息，其中包含:
+    <p>receives a message containing:
     <pre>{
   date: "Monday",
   payload: {

packages/node_modules/@node-red/nodes/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "3.1.8",
+    "version": "4.0.0-dev",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

packages/node_modules/@node-red/registry/lib/externalModules.js

@@ -264,7 +264,7 @@ async function installModule(moduleDetails) {
             "module": moduleDetails.module,
             "version": moduleDetails.version,
             "dir": installDir,
-            "args": ["--production","--engine-strict"]
+            "args": ["--omit=dev","--engine-strict"]
         }
         return hooks.trigger("preInstall", triggerPayload).then((result) => {
             // preInstall passed

packages/node_modules/@node-red/registry/lib/installer.js

@@ -215,7 +215,7 @@ async function installModule(module,version,url) {
             "dir": installDir,
             "isExisting": isExisting,
             "isUpgrade": isUpgrade,
-            "args": ['--no-audit','--no-update-notifier','--no-fund','--save','--save-prefix=~','--production','--engine-strict']
+            "args": ['--no-audit','--no-update-notifier','--no-fund','--save','--save-prefix=~','--omit=dev','--engine-strict']
         }
 
         return hooks.trigger("preInstall", triggerPayload).then((result) => {

packages/node_modules/@node-red/registry/lib/library.js

@@ -36,7 +36,7 @@ async function getFlowsFromPath(path) {
                     promises.push(getFlowsFromPath(fullPath));
                 } else if (/\.json$/.test(file)){
                     validFiles.push(file);
-                    promises.push(Promise.resolve(file.replace(/\.json$/, '')))
+                    promises.push(Promise.resolve(file.split(".")[0]))
                 }
             })
         }

packages/node_modules/@node-red/registry/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "3.1.8",
+    "version": "4.0.0-dev",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,7 +16,7 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "3.1.8",
+        "@node-red/util": "4.0.0-dev",
         "clone": "2.1.2",
         "fs-extra": "11.1.1",
         "semver": "7.5.4",

packages/node_modules/@node-red/runtime/lib/api/context.js

@@ -68,6 +68,7 @@ var api = module.exports = {
     * @param {String} opts.store - the context store
     * @param {String} opts.key - the context key
     * @param {Object} opts.req - the request to log (optional)
+    * @param {Boolean} opts.keysOnly - whether to return keys only
     * @return {Promise} - the node information
     * @memberof @node-red/runtime_context
     */
@@ -102,6 +103,15 @@ var api = module.exports = {
                 if (key) {
                     store = store || availableStores.default;
                     ctx.get(key,store,function(err, v) {
+                        if (opts.keysOnly) {
+                            if (Array.isArray(v)) {
+                                resolve({ [store]: { format: `array[${v.length}]`}})
+                            } else if (typeof v === 'object') {
+                                resolve({ [store]: { keys: Object.keys(v), format: 'Object' } })
+                            } else {
+                                resolve({ [store]: { keys: [] }})
+                            }
+                        }
                         var encoded = util.encodeObject({msg:v});
                         if (store !== availableStores.default) {
                             encoded.store = store;
@@ -118,32 +128,58 @@ var api = module.exports = {
                         stores = [store];
                     }
 
+
                     var result = {};
                     var c = stores.length;
                     var errorReported = false;
                     stores.forEach(function(store) {
-                        exportContextStore(scope,ctx,store,result,function(err) {
-                            if (err) {
-                                // TODO: proper error reporting
-                                if (!errorReported) {
-                                    errorReported = true;
-                                    runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key,error:"unexpected_error"}, opts.req);
-                                    var err = new Error();
-                                    err.code = "unexpected_error";
-                                    err.status = 400;
-                                    return reject(err);
+                        if (opts.keysOnly) {
+                            ctx.keys(store,function(err, keys) {
+                                if (err) {
+                                    // TODO: proper error reporting
+                                    if (!errorReported) {
+                                        errorReported = true;
+                                        runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key,error:"unexpected_error"}, opts.req);
+                                        var err = new Error();
+                                        err.code = "unexpected_error";
+                                        err.status = 400;
+                                        return reject(err);
+                                    }
+                                    return
                                 }
+                                result[store] = { keys }
+                                c--;
+                                if (c === 0) {
+                                    if (!errorReported) {
+                                        runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key},opts.req);
+                                        resolve(result);
+                                    }
+                                }
+                            })
+                        } else {
+                            exportContextStore(scope,ctx,store,result,function(err) {
+                                if (err) {
+                                    // TODO: proper error reporting
+                                    if (!errorReported) {
+                                        errorReported = true;
+                                        runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key,error:"unexpected_error"}, opts.req);
+                                        var err = new Error();
+                                        err.code = "unexpected_error";
+                                        err.status = 400;
+                                        return reject(err);
+                                    }
 
-                                return;
-                            }
-                            c--;
-                            if (c === 0) {
-                                if (!errorReported) {
-                                    runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key},opts.req);
-                                    resolve(result);
+                                    return;
                                 }
-                            }
-                        });
+                                c--;
+                                if (c === 0) {
+                                    if (!errorReported) {
+                                        runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key},opts.req);
+                                        resolve(result);
+                                    }
+                                }
+                            });
+                        }
                     })
                 }
             } else {

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

@@ -485,7 +485,7 @@ class Flow {
         }
         if (!key.startsWith("$parent.")) {
             if (this._env.hasOwnProperty(key)) {
-                return (this._env[key] && Object.hasOwn(this._env[key], 'value') && this._env[key].__clone__) ? clone(this._env[key].value) : this._env[key]
+                return (Object.hasOwn(this._env[key], 'value') && this._env[key].__clone__) ? clone(this._env[key].value) : this._env[key]
             }
         } else {
                 key = key.substring(8);

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

@@ -41,7 +41,7 @@ class Group {
         }
         if (!key.startsWith("$parent.")) {
             if (this._env.hasOwnProperty(key)) {
-                return (this._env[key] && Object.hasOwn(this._env[key], 'value') && this._env[key].__clone__) ? clone(this._env[key].value) : this._env[key]
+                return (Object.hasOwn(this._env[key], 'value') && this._env[key].__clone__) ? clone(this._env[key].value) : this._env[key]
             }
         } else {
             key = key.substring(8);

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

@@ -376,7 +376,7 @@ class Subflow extends Flow {
         }
         if (!key.startsWith("$parent.")) {
             if (this._env.hasOwnProperty(key)) {
-                return (this._env[key] && Object.hasOwn(this._env[key], 'value') && this._env[key].__clone__) ? clone(this._env[key].value) : this._env[key]
+                return (Object.hasOwn(this._env[key], 'value') && this._env[key].__clone__) ? clone(this._env[key].value) : this._env[key]
             }
         } else {
             key = key.substring(8);

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

@@ -106,22 +106,14 @@ 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()}`)
+            value = redUtil.evaluateNodeProperty(value, type, {_flow: flow}, null, null);
+            if (typeof value  === 'object') {
+                value = { value: value, __clone__: true}
             }
         }
         evaluatedEnv[name] = value

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

@@ -154,7 +154,7 @@ function start() {
             log.info(log._("runtime.version",{component:"Node.js ",version:process.version}));
             if (settings.UNSUPPORTED_VERSION) {
                 log.error("*****************************************************************");
-                log.error("* "+log._("runtime.unsupported_version",{component:"Node.js",version:process.version,requires: ">=8.9.0"})+" *");
+                log.error("* "+log._("runtime.unsupported_version",{component:"Node.js",version:process.version,requires: ">=18"})+" *");
                 log.error("*****************************************************************");
                 events.emit("runtime-event",{id:"runtime-unsupported-version",payload:{type:"error",text:"notification.errors.unsupportedVersion"},retain:true});
             }

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

@@ -77,7 +77,7 @@ var storageModuleInterface = {
                         flows: flows,
                         credentials: creds
                     };
-                    result.rev = crypto.createHash('sha256').update(JSON.stringify(result.flows)).digest("hex");
+                    result.rev = crypto.createHash('md5').update(JSON.stringify(result.flows)).digest("hex");
                     return result;
                 })
             });
@@ -95,7 +95,7 @@ var storageModuleInterface = {
 
             return credentialSavePromise.then(function() {
                 return storageModule.saveFlows(flows, user).then(function() {
-                    return crypto.createHash('sha256').update(JSON.stringify(config.flows)).digest("hex");
+                    return crypto.createHash('md5').update(JSON.stringify(config.flows)).digest("hex");
                 })
             });
         },

packages/node_modules/@node-red/runtime/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "3.1.8",
+    "version": "4.0.0-dev",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,11 +16,11 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "3.1.8",
-        "@node-red/util": "3.1.8",
+        "@node-red/registry": "4.0.0-dev",
+        "@node-red/util": "4.0.0-dev",
         "async-mutex": "0.4.0",
         "clone": "2.1.2",
-        "express": "4.19.2",
+        "express": "4.18.2",
         "fs-extra": "11.1.1",
         "json-stringify-safe": "5.0.1"
     }

packages/node_modules/@node-red/util/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "3.1.8",
+    "version": "4.0.0-dev",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -18,7 +18,7 @@
         "fs-extra": "11.1.1",
         "i18next": "21.10.0",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.8.7",
+        "jsonata": "1.8.6",
         "lodash.clonedeep": "^4.5.0",
         "moment": "2.29.4",
         "moment-timezone": "0.5.43"

packages/node_modules/node-red/lib/red.js

@@ -33,8 +33,7 @@ if (NODE_MAJOR_VERSION >= 16) {
 
 function checkVersion(userSettings) {
     var semver = require('semver');
-    if (!semver.satisfies(process.version,">=14.0.0")) {
-        // TODO: in the future, make this a hard error.
+    if (!semver.satisfies(process.version,">=18.0.0")) {
         // var e = new Error("Unsupported version of Node.js");
         // e.code = "unsupported_version";
         // throw e;

packages/node_modules/node-red/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "3.1.8",
+    "version": "4.0.0-dev",
     "description": "Low-code programming for event-driven applications",
     "homepage": "https://nodered.org",
     "license": "Apache-2.0",
@@ -31,15 +31,15 @@
         "flow"
     ],
     "dependencies": {
-        "@node-red/editor-api": "3.1.8",
-        "@node-red/runtime": "3.1.8",
-        "@node-red/util": "3.1.8",
-        "@node-red/nodes": "3.1.8",
+        "@node-red/editor-api": "4.0.0-dev",
+        "@node-red/runtime": "4.0.0-dev",
+        "@node-red/util": "4.0.0-dev",
+        "@node-red/nodes": "4.0.0-dev",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
-        "express": "4.19.2",
+        "express": "4.18.2",
         "fs-extra": "11.1.1",
-        "node-red-admin": "^3.1.3",
+        "node-red-admin": "^3.1.2",
         "nopt": "5.0.0",
         "semver": "7.5.4"
     },
@@ -47,6 +47,6 @@
         "bcrypt": "5.1.0"
     },
     "engines": {
-        "node": ">=14"
+        "node": ">=18"
     }
 }

packages/node_modules/node-red/red.js

@@ -26,6 +26,13 @@ if (process.argv[2] === 'admin') {
     return;
 }
 
+var semver = require('semver');
+if (!semver.satisfies(process.version, ">=18.0.0")) {
+    console.log("Unsupported version of Node.js:", process.version);
+    console.log("Node-RED requires Node.js v18 or later");
+    process.exit(1)
+}
+
 var http = require('http');
 var https = require('https');
 var util = require("util");
@@ -346,7 +353,7 @@ httpsPromise.then(function(startupHttps) {
     } catch(err) {
         if (err.code == "unsupported_version") {
             console.log("Unsupported version of Node.js:",process.version);
-            console.log("Node-RED requires Node.js v8.9.0 or later");
+            console.log("Node-RED requires Node.js v18 or later");
         } else {
             console.log("Failed to start server:");
             if (err.stack) {

packages/node_modules/node-red/settings.js

@@ -449,6 +449,7 @@ module.exports = {
  *  - ui (for use with Node-RED Dashboard)
  *  - debugUseColors
  *  - debugMaxLength
+ *  - debugStatusLength
  *  - execMaxBufferSize
  *  - httpRequestTimeout
  *  - mqttReconnectTime
@@ -504,6 +505,9 @@ module.exports = {
     /** The maximum length, in characters, of any message sent to the debug sidebar tab */
     debugMaxLength: 1000,
 
+    /** The maximum length, in characters, of status messages under the debug node */
+    //debugStatusLength: 32,
+
     /** Maximum buffer size for the exec node. Defaults to 10Mb */
     //execMaxBufferSize: 10000000,
 

test/nodes/core/function/10-function_spec.js

@@ -1718,9 +1718,13 @@ describe('function node', function() {
     describe("init function", function() {
 
         it('should delay handling messages until init completes', function(done) {
+            const timeoutMS = 200;
+            // Since helper.load uses process.nextTick timers might occasionally finish
+            // a couple of milliseconds too early, so give some leeway to the check.
+            const timeoutCheckMargin = 5;
             var flow = [{id:"n1",type:"function",wires:[["n2"]],initialize: `
                 return new Promise((resolve,reject) => {
-                    setTimeout(resolve,200)
+                    setTimeout(resolve, ${timeoutMS});
                 })`,
                 func:"return msg;"
             },
@@ -1733,9 +1737,10 @@ describe('function node', function() {
                     msg.delta = Date.now() - msg.payload;
                     receivedMsgs.push(msg)
                     if (receivedMsgs.length === 5) {
-                        var errors = receivedMsgs.filter(msg => msg.delta < 200)
+                        let deltas = receivedMsgs.map(msg => msg.delta);
+                        var errors = deltas.filter(delta => delta < (timeoutMS - timeoutCheckMargin))
                         if (errors.length > 0) {
-                            done(new Error(`Message received before init completed - was ${msg.delta} expected >300`))
+                            done(new Error(`Message received before init completed - delta values ${JSON.stringify(deltas)} expected to be > ${timeoutMS - timeoutCheckMargin}`))
                         } else {
                             done();
                         }

test/nodes/core/network/21-httprequest_spec.js

@@ -60,7 +60,6 @@ describe('HTTP Request Node', function() {
     function startServer(done) {
         testPort += 1;
         testServer = stoppable(http.createServer(testApp));
-        const promises = []
         testServer.listen(testPort,function(err) {
             testSslPort += 1;
             console.log("ssl port", testSslPort);
@@ -82,17 +81,13 @@ describe('HTTP Request Node', function() {
                 */
             };
             testSslServer = stoppable(https.createServer(sslOptions,testApp));
-            console.log('> start testSslServer')
-            promises.push(new Promise((resolve, reject) => {
-                testSslServer.listen(testSslPort, function(err){
-                    console.log(' done testSslServer')
-                    if (err) {
-                        reject(err)
-                    } else {
-                        resolve()
-                    }
-                });
-            }))
+            testSslServer.listen(testSslPort, function(err){
+                if (err) {
+                    console.log(err);
+                } else {
+                    console.log("started testSslServer");
+                }
+            });
 
             testSslClientPort += 1;
             var sslClientOptions = {
@@ -102,17 +97,10 @@ describe('HTTP Request Node', function() {
                 requestCert: true
             };
             testSslClientServer = stoppable(https.createServer(sslClientOptions, testApp));
-            console.log('> start testSslClientServer')
-            promises.push(new Promise((resolve, reject) => {
-                testSslClientServer.listen(testSslClientPort, function(err){
-                    console.log(' done testSslClientServer')
-                    if (err) {
-                        reject(err)
-                    } else {
-                        resolve()
-                    }
-                });
-            }))
+            testSslClientServer.listen(testSslClientPort, function(err){
+                console.log("ssl-client", err)
+            });
+
             testProxyPort += 1;
             testProxyServer = stoppable(httpProxy(http.createServer()))
 
@@ -121,17 +109,7 @@ describe('HTTP Request Node', function() {
                     res.setHeader("x-testproxy-header", "foobar")
                 }
             })
-            console.log('> testProxyServer')
-            promises.push(new Promise((resolve, reject) => {
-                testProxyServer.listen(testProxyPort, function(err) {
-                    console.log(' done testProxyServer')
-                    if (err) {
-                        reject(err)
-                    } else {
-                        resolve()
-                    }
-                })
-            }))
+            testProxyServer.listen(testProxyPort)
 
             testProxyAuthPort += 1
             testProxyServerAuth = stoppable(httpProxy(http.createServer()))
@@ -153,19 +131,9 @@ describe('HTTP Request Node', function() {
                     res.setHeader("x-testproxy-header", "foobar")
                 }
             })
-            console.log('> testProxyServerAuth')
-            promises.push(new Promise((resolve, reject) => {
-                testProxyServerAuth.listen(testProxyAuthPort, function(err) {
-                    console.log(' done testProxyServerAuth')
-                    if (err) {
-                        reject(err)
-                    } else {
-                        resolve()
-                    }
-                })
-            }))
+            testProxyServerAuth.listen(testProxyAuthPort)
 
-            Promise.all(promises).then(() => { done() }).catch(done)
+            done(err);
         });
     }
 
@@ -461,11 +429,7 @@ describe('HTTP Request Node', function() {
             if (err) {
                 done(err);
             }
-            console.log('> helper.startServer')
-            helper.startServer(function(err) {
-                console.log('> helper started')
-                done(err)
-            });
+            helper.startServer(done);
         });
     });
 

test/unit/@node-red/registry/lib/library_spec.js

@@ -33,15 +33,16 @@ describe("library api", function() {
         should.not.exist(library.getExampleFlowPath('foo','bar'));
     });
 
-    it('returns valid example paths', function(done) {
+    it('returns a valid example path', function(done) {
         library.init();
         library.addExamplesDir("test-module",path.resolve(__dirname+'/resources/examples')).then(function() {
             try {
                 var flows = library.getExampleFlows();
-                flows.should.deepEqual({"test-module":{"f":["1.2.3","one"]}});
+                flows.should.deepEqual({"test-module":{"f":["one"]}});
 
                 var examplePath = library.getExampleFlowPath('test-module','one');
-                examplePath.should.eql(path.resolve(__dirname+'/resources/examples/one.json'));
+                examplePath.should.eql(path.resolve(__dirname+'/resources/examples/one.json'))
+
 
                 library.removeExamplesDir('test-module');
 
@@ -56,5 +57,6 @@ describe("library api", function() {
                 done(err);
             }
         });
-    });
+
+    })
 });