From d6bb3a558f6da935e05488cb1708562b0b242ebb Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Sat, 3 Sep 2022 21:23:38 +0100
Subject: [PATCH 01/35] fix loading node package in nodesDir on linux fixes
 #3861

---
 .../@node-red/registry/lib/loader.js          | 39 ++++++++++---------
 .../@node-red/registry/lib/localfilesystem.js | 10 +++++
 .../@node-red/registry/lib/registry.js        | 11 +++++-
 3 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/packages/node_modules/@node-red/registry/lib/loader.js b/packages/node_modules/@node-red/registry/lib/loader.js
index 61f28ab86..3f0487750 100644
--- a/packages/node_modules/@node-red/registry/lib/loader.js
+++ b/packages/node_modules/@node-red/registry/lib/loader.js
@@ -43,37 +43,40 @@ function load(disableNodePathScan) {
     return loadModuleFiles(modules);
 }
 
+function splitPath(p) {
+    return path.posix.normalize((p || '').replace(/\\/g, path.sep)).split(path.sep)
+}
 
 function loadModuleTypeFiles(module, type) {
     const things = module[type];
-    var first = true;
-    var promises = [];
-    for (var thingName in things) {
+    let first = true;
+    const promises = [];
+    for (let thingName in things) {
         /* istanbul ignore else */
         if (things.hasOwnProperty(thingName)) {
             if (module.name != "node-red" && first) {
                 // Check the module directory exists
                 first = false;
-                var fn = things[thingName].file;
-                var parts = fn.split("/");
-                var i = parts.length-1;
-                for (;i>=0;i--) {
-                    if (parts[i] == "node_modules") {
-                        break;
-                    }
+                let moduleFn = module.path
+                const fn = things[thingName].file
+                const parts = splitPath(fn)
+                const nmi = parts.indexOf('node_modules')
+                if(nmi > -1) {
+                    moduleFn = parts.slice(0,nmi+2).join(path.sep);
+                }
+                if (!moduleFn) {
+                    // shortcut - skip calling statSync on empty string 
+                    break; // Module not found, don't attempt to load its nodes
                 }
-                var moduleFn = parts.slice(0,i+2).join("/");
-
                 try {
-                    var stat = fs.statSync(moduleFn);
+                    const stat = fs.statSync(moduleFn);
                 } catch(err) {
-                    // Module not found, don't attempt to load its nodes
-                    break;
+                    break; // Module not found, don't attempt to load its nodes
                 }
             }
 
             try {
-                var promise;
+                let promise;
                 if (type === "nodes") {
                     promise = loadNodeConfig(things[thingName]);
                 } else if (type === "plugins") {
@@ -82,8 +85,7 @@ function loadModuleTypeFiles(module, type) {
                 promises.push(
                     promise.then(
                         (function() {
-                            var m = module.name;
-                            var n = thingName;
+                            const n = thingName;
                             return function(nodeSet) {
                                 things[n] = nodeSet;
                                 return nodeSet;
@@ -93,7 +95,6 @@ function loadModuleTypeFiles(module, type) {
                 );
             } catch(err) {
                 console.log(err)
-                //
             }
         }
     }
diff --git a/packages/node_modules/@node-red/registry/lib/localfilesystem.js b/packages/node_modules/@node-red/registry/lib/localfilesystem.js
index da4006ecc..edb805572 100644
--- a/packages/node_modules/@node-red/registry/lib/localfilesystem.js
+++ b/packages/node_modules/@node-red/registry/lib/localfilesystem.js
@@ -156,6 +156,16 @@ function scanDirForNodesModules(dir,moduleName,package) {
                 }
             }
         }
+
+        // if we have found a package.json, this IS a node_module, lets see if it is a node-red node
+        if (!isNodeRedModule && files.indexOf('package.json') > -1) {
+            package = getPackageDetails(dir) // get package details
+            if(package && package.isNodeRedModule) {
+                isNodeRedModule = true
+                files = ['package.json'] // shortcut the file scan
+            }
+        }
+
         for (let i=0;i<files.length;i++) {
             let fn = files[i];
             if (!isNodeRedModule && /^@/.test(fn)) {
diff --git a/packages/node_modules/@node-red/registry/lib/registry.js b/packages/node_modules/@node-red/registry/lib/registry.js
index baee42bf5..6e3ed6d5b 100644
--- a/packages/node_modules/@node-red/registry/lib/registry.js
+++ b/packages/node_modules/@node-red/registry/lib/registry.js
@@ -185,10 +185,19 @@ function loadNodeConfigs() {
 function addModule(module) {
     moduleNodes[module.name] = [];
     moduleConfigs[module.name] = module;
-    // console.log("registry.js.addModule",module.name,"user?",module.user,"usedBy",module.usedBy,"dependencies",module.dependencies)
     for (var setName in module.nodes) {
         if (module.nodes.hasOwnProperty(setName)) {
             var set = module.nodes[setName];
+            if (!set.types) {
+                const err = new Error("Node has no types")
+                err.code = "has_no_types"
+                err.details = {
+                    setName: set.name,
+                    set: { ...set }
+                }
+                console.warn(err)
+                set.err = err
+            }
             moduleNodes[module.name].push(set.name);
             nodeList.push(set.id);
             if (!set.err) {

From 6a19d8246c533f825e73876d9d7b2176322ebffa Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Sat, 3 Sep 2022 21:37:27 +0100
Subject: [PATCH 02/35] add test for specific arrangement of node package

---
 .../registry/lib/localfilesystem_spec.js      | 21 ++++++++++++++-
 .../@lower-case2/lower-case2/lower-case.html  | 26 +++++++++++++++++++
 .../@lower-case2/lower-case2/lower-case.js    | 11 ++++++++
 .../nodesDir2/@lower-case2/package.json       |  9 +++++++
 .../lower-case/lower-case/lower-case.html     | 26 +++++++++++++++++++
 .../lower-case/lower-case/lower-case.js       | 11 ++++++++
 .../nodesDir2/lower-case/package.json         |  9 +++++++
 7 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 test/unit/@node-red/registry/lib/resources/nodesDir2/@lower-case2/lower-case2/lower-case.html
 create mode 100644 test/unit/@node-red/registry/lib/resources/nodesDir2/@lower-case2/lower-case2/lower-case.js
 create mode 100644 test/unit/@node-red/registry/lib/resources/nodesDir2/@lower-case2/package.json
 create mode 100644 test/unit/@node-red/registry/lib/resources/nodesDir2/lower-case/lower-case/lower-case.html
 create mode 100644 test/unit/@node-red/registry/lib/resources/nodesDir2/lower-case/lower-case/lower-case.js
 create mode 100644 test/unit/@node-red/registry/lib/resources/nodesDir2/lower-case/package.json

diff --git a/test/unit/@node-red/registry/lib/localfilesystem_spec.js b/test/unit/@node-red/registry/lib/localfilesystem_spec.js
index 3b1bb63f3..3ce74c158 100644
--- a/test/unit/@node-red/registry/lib/localfilesystem_spec.js
+++ b/test/unit/@node-red/registry/lib/localfilesystem_spec.js
@@ -329,17 +329,36 @@ describe("red/nodes/registry/localfilesystem",function() {
             localfilesystem.init({nodesDir:[nodesDir2]});
             const nodeModule = localfilesystem.getModuleFiles();
             const loaded = Object.keys(nodeModule)
-            loaded.should.have.a.property("length", 3)
             loaded.indexOf('@test/testnode').should.greaterThan(-1, "Should load @test/testnode")
+            loaded.indexOf('lower-case').should.greaterThan(-1, "Should load lower-case")
+            loaded.indexOf('@lowercase/lower-case2').should.greaterThan(-1, "Should load @lowercase/lower-case2")
             loaded.indexOf('testnode2').should.greaterThan(-1, "Should load testnode2")
             loaded.indexOf('test-theme2').should.greaterThan(-1, "Should load test-theme2")
+            loaded.should.have.a.property("length", 5)
 
+            // scoped module with nodes in same dir as package.json
             nodeModule['@test/testnode'].should.have.a.property('name','@test/testnode');
             nodeModule['@test/testnode'].should.have.a.property('version','1.0.0');
             nodeModule['@test/testnode'].should.have.a.property('nodes');
             nodeModule['@test/testnode'].should.have.a.property('path');
             nodeModule['@test/testnode'].should.have.a.property('user', false);
 
+            // node-red module with nodes in sub dir
+            nodeModule['@lowercase/lower-case2'].should.have.a.property('name','@lowercase/lower-case2');
+            nodeModule['@lowercase/lower-case2'].should.have.a.property('version','2.0.0');
+            nodeModule['@lowercase/lower-case2'].should.have.a.property('nodes');
+            nodeModule['@lowercase/lower-case2'].nodes.should.have.a.property('lower-case');
+            nodeModule['@lowercase/lower-case2'].should.have.a.property('path');
+            nodeModule['@lowercase/lower-case2'].should.have.a.property('user', false);
+
+            // scoped module with nodes in sub dir
+            nodeModule['lower-case'].should.have.a.property('name', 'lower-case');
+            nodeModule['lower-case'].should.have.a.property('version','1.0.0');
+            nodeModule['lower-case'].should.have.a.property('nodes');
+            nodeModule['lower-case'].nodes.should.have.a.property('lower-case');
+            nodeModule['lower-case'].should.have.a.property('path');
+            nodeModule['lower-case'].should.have.a.property('user', false);
+
             nodeModule['testnode2'].should.have.a.property('name','testnode2');
             nodeModule['testnode2'].should.have.a.property('version','1.0.0');
             nodeModule['testnode2'].should.have.a.property('nodes');
diff --git a/test/unit/@node-red/registry/lib/resources/nodesDir2/@lower-case2/lower-case2/lower-case.html b/test/unit/@node-red/registry/lib/resources/nodesDir2/@lower-case2/lower-case2/lower-case.html
new file mode 100644
index 000000000..617f48491
--- /dev/null
+++ b/test/unit/@node-red/registry/lib/resources/nodesDir2/@lower-case2/lower-case2/lower-case.html
@@ -0,0 +1,26 @@
+<script type="text/javascript">
+    RED.nodes.registerType('lower-case2',{
+        category: 'function',
+        color: '#a6bbcf',
+        defaults: {
+            name: {value:""}
+        },
+        inputs:1,
+        outputs:1,
+        icon: "file.png",
+        label: function() {
+            return this.name||"lower-case2";
+        }
+    });
+</script>
+
+<script type="text/html" data-template-name="lower-case2">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
+</script>
+
+<script type="text/html" data-help-name="lower-case2">
+    <p>A simple node that converts the message payloads into all lower-case2 characters</p>
+</script>
\ No newline at end of file
diff --git a/test/unit/@node-red/registry/lib/resources/nodesDir2/@lower-case2/lower-case2/lower-case.js b/test/unit/@node-red/registry/lib/resources/nodesDir2/@lower-case2/lower-case2/lower-case.js
new file mode 100644
index 000000000..73579ba04
--- /dev/null
+++ b/test/unit/@node-red/registry/lib/resources/nodesDir2/@lower-case2/lower-case2/lower-case.js
@@ -0,0 +1,11 @@
+module.exports = function(RED) {
+function LowerCaseNode(config) {
+        RED.nodes.createNode(this,config);
+        var node = this;
+        node.on('input', function(msg) {
+            msg.payload = msg.payload.toLowerCase();
+            node.send(msg);
+        });
+    }
+    RED.nodes.registerType("lower-case2",LowerCaseNode);
+}
\ No newline at end of file
diff --git a/test/unit/@node-red/registry/lib/resources/nodesDir2/@lower-case2/package.json b/test/unit/@node-red/registry/lib/resources/nodesDir2/@lower-case2/package.json
new file mode 100644
index 000000000..6b6ce9aa9
--- /dev/null
+++ b/test/unit/@node-red/registry/lib/resources/nodesDir2/@lower-case2/package.json
@@ -0,0 +1,9 @@
+{
+    "name" : "@lowercase/lower-case2",
+    "node-red" : {
+        "nodes": {
+            "lower-case": "lower-case2/lower-case.js"
+        }
+    },
+    "version": "2.0.0"
+}
\ No newline at end of file
diff --git a/test/unit/@node-red/registry/lib/resources/nodesDir2/lower-case/lower-case/lower-case.html b/test/unit/@node-red/registry/lib/resources/nodesDir2/lower-case/lower-case/lower-case.html
new file mode 100644
index 000000000..e57d51131
--- /dev/null
+++ b/test/unit/@node-red/registry/lib/resources/nodesDir2/lower-case/lower-case/lower-case.html
@@ -0,0 +1,26 @@
+<script type="text/javascript">
+    RED.nodes.registerType('lower-case',{
+        category: 'function',
+        color: '#a6bbcf',
+        defaults: {
+            name: {value:""}
+        },
+        inputs:1,
+        outputs:1,
+        icon: "file.png",
+        label: function() {
+            return this.name||"lower-case";
+        }
+    });
+</script>
+
+<script type="text/html" data-template-name="lower-case">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
+</script>
+
+<script type="text/html" data-help-name="lower-case">
+    <p>A simple node that converts the message payloads into all lower-case characters</p>
+</script>
diff --git a/test/unit/@node-red/registry/lib/resources/nodesDir2/lower-case/lower-case/lower-case.js b/test/unit/@node-red/registry/lib/resources/nodesDir2/lower-case/lower-case/lower-case.js
new file mode 100644
index 000000000..006b35eb6
--- /dev/null
+++ b/test/unit/@node-red/registry/lib/resources/nodesDir2/lower-case/lower-case/lower-case.js
@@ -0,0 +1,11 @@
+module.exports = function(RED) {
+    function LowerCaseNode(config) {
+        RED.nodes.createNode(this,config);
+        var node = this;
+        node.on('input', function(msg) {
+            msg.payload = msg.payload.toLowerCase();
+            node.send(msg);
+        });
+    }
+    RED.nodes.registerType("lower-case",LowerCaseNode);
+}
diff --git a/test/unit/@node-red/registry/lib/resources/nodesDir2/lower-case/package.json b/test/unit/@node-red/registry/lib/resources/nodesDir2/lower-case/package.json
new file mode 100644
index 000000000..a632eaddd
--- /dev/null
+++ b/test/unit/@node-red/registry/lib/resources/nodesDir2/lower-case/package.json
@@ -0,0 +1,9 @@
+{
+    "name" : "lower-case",
+    "node-red" : {
+        "nodes": {
+            "lower-case": "lower-case/lower-case.js"
+        }
+    },
+    "version": "1.0.0"
+}

From 7507a7b459fdebf22287dda7b9dc4ac939402a4a Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhitoyokoi@nodered.jp>
Date: Fri, 16 Sep 2022 02:10:14 +0900
Subject: [PATCH 03/35] Limit number of ports in function node

---
 .../@node-red/nodes/core/function/10-function.html             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/10-function.html b/packages/node_modules/@node-red/nodes/core/function/10-function.html
index fc57895a2..a647bed49 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-function.html
@@ -451,7 +451,8 @@
             tabs.activateTab("func-tab-body");
 
             $( "#node-input-outputs" ).spinner({
-                min:0,
+                min: 0,
+                max: 10,
                 change: function(event, ui) {
                     var value = this.value;
                     if (!value.match(/^\d+$/)) { value = 1;  }

From 9fd4989142243d63f914fe523542fc8f03a1abbe Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 15 Sep 2022 21:22:55 +0100
Subject: [PATCH 04/35] Fix autocomplete entry for responseUrl Fixes #3883

---
 .../@node-red/editor-client/src/js/ui/common/typedInput.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
index ef1be05bc..7440b464e 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
@@ -146,7 +146,7 @@
         { value: "reset", source: ["delay","trigger","join","rbe"] },
         { value: "responseCookies", source: ["http request"] },
         { value: "responseTopic", source: ["mqtt"] },
-        { value: "responseURL", source: ["http request"] },
+        { value: "responseUrl", source: ["http request"] },
         { value: "restartTimeout", source: ["join"] },
         { value: "retain", source: ["mqtt"] },
         { value: "schema", source: ["json"] },

From 199caccbc3244fe73ac131bf5bd772c09fe2d112 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhitoyokoi@nodered.jp>
Date: Sat, 17 Sep 2022 00:25:46 +0900
Subject: [PATCH 05/35] Change the maximum number of ports to 500

---
 .../node_modules/@node-red/nodes/core/function/10-function.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/10-function.html b/packages/node_modules/@node-red/nodes/core/function/10-function.html
index a647bed49..345a77aab 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-function.html
@@ -452,7 +452,7 @@
 
             $( "#node-input-outputs" ).spinner({
                 min: 0,
-                max: 10,
+                max: 500,
                 change: function(event, ui) {
                     var value = this.value;
                     if (!value.match(/^\d+$/)) { value = 1;  }

From ce31edc80327d4141d5a46b6f07ef33c5113c1ec Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhitoyokoi@nodered.jp>
Date: Sun, 18 Sep 2022 02:22:52 +0900
Subject: [PATCH 06/35] Fix handling of max and min values in function outputs

---
 .../@node-red/nodes/core/function/10-function.html         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/10-function.html b/packages/node_modules/@node-red/nodes/core/function/10-function.html
index 345a77aab..43f8c7b39 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-function.html
@@ -454,9 +454,10 @@
                 min: 0,
                 max: 500,
                 change: function(event, ui) {
-                    var value = this.value;
-                    if (!value.match(/^\d+$/)) { value = 1;  }
-                    else if (value < this.min) { value = this.min; }
+                    var value = parseInt(this.value);
+                    value = isNaN(value) ? 1 : value;
+                    value = Math.max(value, parseInt($(this).attr("aria-valuemin")));
+                    value = Math.min(value, parseInt($(this).attr("aria-valuemax")));
                     if (value !== this.value) { $(this).spinner("value", value); }
                 }
             });

From efc0f1ab9144f6444544095fe7fbdfcd4732f2f0 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhitoyokoi@nodered.jp>
Date: Sun, 18 Sep 2022 16:24:25 +0900
Subject: [PATCH 07/35] Fix default values for MQTT retain settings

---
 .../node_modules/@node-red/nodes/core/network/10-mqtt.html  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index 03ef4b2e3..cf443f48b 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -499,17 +499,17 @@
             cleansession: {value: true},
             birthTopic: {value:"", validate:validateMQTTPublishTopic},
             birthQos: {value:"0"},
-            birthRetain: {value:false},
+            birthRetain: {value:"false"},
             birthPayload: {value:""},
             birthMsg: { value: {}},
             closeTopic: {value:"", validate:validateMQTTPublishTopic},
             closeQos: {value:"0"},
-            closeRetain: {value:false},
+            closeRetain: {value:"false"},
             closePayload: {value:""},
             closeMsg: { value: {}},
             willTopic: {value:"", validate:validateMQTTPublishTopic},
             willQos: {value:"0"},
-            willRetain: {value:false},
+            willRetain: {value:"false"},
             willPayload: {value:""},
             willMsg: { value: {}},
             userProps: { value: ""},

From a81b1aa0cb769b3cc90a562f14c6eb79cbaa00ff Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhitoyokoi@nodered.jp>
Date: Sun, 18 Sep 2022 17:10:19 +0900
Subject: [PATCH 08/35] Support i18n in MQTT node property

---
 .../@node-red/nodes/core/network/10-mqtt.html             | 8 ++++++--
 .../@node-red/nodes/locales/en-US/messages.json           | 4 +++-
 .../node_modules/@node-red/nodes/locales/ja/messages.json | 4 +++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index cf443f48b..6492060e2 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -421,7 +421,11 @@
 <script type="text/javascript">
 (function() {
 
-    var typedInputNoneOpt = { value: 'none', label: '', hasValue: false };
+    var typedInputNoneOpt = {
+        value: 'none',
+        label: RED._("node-red:mqtt.label.none"),
+        hasValue: false
+    };
     var makeTypedInputOpt = function(value){
         return {
             value: value,
@@ -436,7 +440,7 @@
         makeTypedInputOpt("text/csv"),
         makeTypedInputOpt("text/html"),
         makeTypedInputOpt("text/plain"),
-        {value:"other", label:""}
+        { value: "other", label: RED._("node-red:mqtt.label.other") }
     ];
 
     function getDefaultContentType(value) {
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 282485ca2..7fcd5eadc 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -446,7 +446,9 @@
             "staticTopic": "Subscribe to single topic",
             "dynamicTopic": "Dynamic subscription",
             "auto-connect": "Connect automatically",
-            "auto-mode-depreciated": "This option is depreciated. Please use the new auto-detect mode."
+            "auto-mode-depreciated": "This option is depreciated. Please use the new auto-detect mode.",
+            "none": "none",
+            "other": "other"
         },
         "sections-label": {
             "birth-message": "Message sent on connection (birth message)",
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/messages.json b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
index 76c8f8462..b7fa20b02 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
@@ -446,7 +446,9 @@
             "staticTopic": "1つのトピックを購読",
             "dynamicTopic": "動的な購読",
             "auto-connect": "自動接続",
-            "auto-mode-depreciated": "本オプションは非推奨になりました。新しい自動判定モードを使用してください。"
+            "auto-mode-depreciated": "本オプションは非推奨になりました。新しい自動判定モードを使用してください。",
+            "none": "なし",
+            "other": "その他"
         },
         "sections-label": {
             "birth-message": "接続時の送信メッセージ(Birthメッセージ)",

From f872e2ab8043e339fd0f64583cf9d08a52e80add Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhitoyokoi@nodered.jp>
Date: Sun, 18 Sep 2022 19:11:33 +0900
Subject: [PATCH 09/35] Add icon to typedInput in MQTT node

---
 .../node_modules/@node-red/nodes/core/network/10-mqtt.html  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index 6492060e2..bb76b33bc 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -440,7 +440,11 @@
         makeTypedInputOpt("text/csv"),
         makeTypedInputOpt("text/html"),
         makeTypedInputOpt("text/plain"),
-        { value: "other", label: RED._("node-red:mqtt.label.other") }
+        {
+            value: "other",
+            label: RED._("node-red:mqtt.label.other"),
+            icon: "red/images/typedInput/az.svg"
+        }
     ];
 
     function getDefaultContentType(value) {

From 3e4c45ac6a3cd67d2e8e00343ac5ac097a3b1774 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Thu, 22 Sep 2022 20:22:11 +0100
Subject: [PATCH 10/35] Fix change node overwriting msg with itself

and add test
to close #3891
---
 .../@node-red/nodes/core/function/15-change.js |  2 +-
 test/nodes/core/function/15-change_spec.js     | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/15-change.js b/packages/node_modules/@node-red/nodes/core/function/15-change.js
index 94f47fcbf..ee0e8d9c7 100644
--- a/packages/node_modules/@node-red/nodes/core/function/15-change.js
+++ b/packages/node_modules/@node-red/nodes/core/function/15-change.js
@@ -318,7 +318,7 @@ module.exports = function(RED) {
             }
             var r = node.rules[currentRule];
             if (r.t === "move") {
-                if ((r.tot !== r.pt) || (r.p.indexOf(r.to) !== -1)) {
+                if ((r.tot !== r.pt) || (r.p.indexOf(r.to) !== -1) && (r.p !== r.to)) {
                     applyRule(msg,{t:"set", p:r.to, pt:r.tot, to:r.p, tot:r.pt},(err,msg) => {
                         applyRule(msg,{t:"delete", p:r.p, pt:r.pt}, (err,msg) => {
                             completeApplyingRules(msg,currentRule,done);
diff --git a/test/nodes/core/function/15-change_spec.js b/test/nodes/core/function/15-change_spec.js
index b8d7be03b..66f02d6d1 100644
--- a/test/nodes/core/function/15-change_spec.js
+++ b/test/nodes/core/function/15-change_spec.js
@@ -1717,6 +1717,24 @@ describe('change Node', function() {
                 changeNode1.receive({topic:{foo:{bar:1}}, payload:"String"});
             });
         });
+        it('moves the value of a message property object to itself', function(done) {
+            var flow = [{"id":"changeNode1","type":"change","rules":[{"t":"move","p":"payload","pt":"msg","to":"payload","tot":"msg"}],"name":"changeNode","wires":[["helperNode1"]]},
+                        {id:"helperNode1", type:"helper", wires:[]}];
+            helper.load(changeNode, flow, function() {
+                var changeNode1 = helper.getNode("changeNode1");
+                var helperNode1 = helper.getNode("helperNode1");
+                helperNode1.on("input", function(msg) {
+                    try {
+                        msg.should.have.property('payload');
+                        msg.payload.should.equal("bar");
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
+                changeNode1.receive({payload:"bar"});
+            });
+        });
         it('moves the value of a message property object to a sub-property', function(done) {
             var flow = [{"id":"changeNode1","type":"change","rules":[{"t":"move","p":"payload","pt":"msg","to":"payload.foo","tot":"msg"}],"name":"changeNode","wires":[["helperNode1"]]},
                         {id:"helperNode1", type:"helper", wires:[]}];

From e15ecc00ce2227d4af5a670ecfabeb84e1f5305d Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Thu, 29 Sep 2022 13:11:25 +0100
Subject: [PATCH 11/35] remove old unused code (5y+ not used)

---
 .../@node-red/nodes/core/network/10-mqtt.js            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
index 532d54d8e..d57b23cba 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -459,7 +459,7 @@ module.exports = function(RED) {
             if(!opts || typeof opts !== "object") {
                 return; //nothing to change, simply return
             }
-            const originalBrokerURL = node.brokerurl;
+            // const originalBrokerURL = node.brokerurl;
 
             //apply property changes (only if the property exists in the opts object)
             setIfHasProperty(opts, node, "url", init);
@@ -468,7 +468,7 @@ module.exports = function(RED) {
             setIfHasProperty(opts, node, "clientid", init);
             setIfHasProperty(opts, node, "autoConnect", init);
             setIfHasProperty(opts, node, "usetls", init);
-            setIfHasProperty(opts, node, "usews", init);
+            // setIfHasProperty(opts, node, "usews", init);
             setIfHasProperty(opts, node, "verifyservercert", init);
             setIfHasProperty(opts, node, "compatmode", init);
             setIfHasProperty(opts, node, "protocolVersion", init);
@@ -567,9 +567,9 @@ module.exports = function(RED) {
             if (typeof node.usetls === 'undefined') {
                 node.usetls = false;
             }
-            if (typeof node.usews === 'undefined') {
-                node.usews = false;
-            }
+            // if (typeof node.usews === 'undefined') {
+            //     node.usews = false;
+            // }
             if (typeof node.verifyservercert === 'undefined') {
                 node.verifyservercert = false;
             }

From f11b9c1e18956b8268933b01b8a42379c36c5f36 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Thu, 29 Sep 2022 13:12:15 +0100
Subject: [PATCH 12/35] add test bad birth topic part of #3865

---
 test/nodes/core/network/21-mqtt_spec.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/test/nodes/core/network/21-mqtt_spec.js b/test/nodes/core/network/21-mqtt_spec.js
index 655cc9c73..390e50b91 100644
--- a/test/nodes/core/network/21-mqtt_spec.js
+++ b/test/nodes/core/network/21-mqtt_spec.js
@@ -430,6 +430,25 @@ describe('MQTT Nodes', function () {
         };
         testSendRecv(brokerOptions, { topic: brokerOptions.birthTopic }, {}, options, hooks);
     });
+    itConditional('should fail with bad birth topic', function (done) {
+        if (skipTests) { return this.skip() }
+        this.timeout = 2000;
+        const baseTopic = nextTopic();
+        const brokerOptions = {
+            protocolVersion: 4,
+            birthTopic: baseTopic + "#",
+            birthPayload: "broker connected",
+            birthQos: 2,
+        }
+        const options = {};
+        const hooks = { done: done, beforeLoad: null, afterLoad: null, afterConnect: null };
+        options.expectMsg = {
+            topic: brokerOptions.birthTopic,
+            payload: brokerOptions.birthPayload,
+            qos: brokerOptions.birthQos
+        };
+        testSendRecv(brokerOptions, { topic: brokerOptions.birthTopic }, {}, options, hooks);
+    });
     itConditional('should publish close message', function (done) {
         if (skipTests) { return this.skip() }
         this.timeout = 2000;

From 81b4874a7cb3cf9a105c1210f771154fa483270a Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Thu, 29 Sep 2022 19:05:53 +0100
Subject: [PATCH 13/35] fix new test and fix bug found in previous PR

---
 .../@node-red/nodes/core/network/10-mqtt.js   |  2 +-
 test/nodes/core/network/21-mqtt_spec.js       | 37 ++++++++++++++-----
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
index d57b23cba..73af668ac 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -994,7 +994,7 @@ module.exports = function(RED) {
                     node.client.publish(msg.topic, msg.payload, options, function (err) {
                         if (done) {
                             done(err)
-                        } else {
+                        } else if(err) {
                             node.error(err, msg)
                         }
                     })
diff --git a/test/nodes/core/network/21-mqtt_spec.js b/test/nodes/core/network/21-mqtt_spec.js
index 390e50b91..8c772ca60 100644
--- a/test/nodes/core/network/21-mqtt_spec.js
+++ b/test/nodes/core/network/21-mqtt_spec.js
@@ -430,24 +430,38 @@ describe('MQTT Nodes', function () {
         };
         testSendRecv(brokerOptions, { topic: brokerOptions.birthTopic }, {}, options, hooks);
     });
-    itConditional('should fail with bad birth topic', function (done) {
+    itConditional('should safely discard bad birth topic', function (done) {
         if (skipTests) { return this.skip() }
         this.timeout = 2000;
         const baseTopic = nextTopic();
         const brokerOptions = {
             protocolVersion: 4,
-            birthTopic: baseTopic + "#",
+            birthTopic: baseTopic + "#", // a publish topic should never have a wildcard
             birthPayload: "broker connected",
             birthQos: 2,
         }
         const options = {};
-        const hooks = { done: done, beforeLoad: null, afterLoad: null, afterConnect: null };
-        options.expectMsg = {
-            topic: brokerOptions.birthTopic,
-            payload: brokerOptions.birthPayload,
-            qos: brokerOptions.birthQos
-        };
-        testSendRecv(brokerOptions, { topic: brokerOptions.birthTopic }, {}, options, hooks);
+        const hooks = { done: null, beforeLoad: null, afterLoad: null, afterConnect: null };
+        hooks.afterLoad = (helperNode, mqttBroker, mqttIn, mqttOut) => {
+            helperNode.on("input", function (msg) {
+                try {
+                    msg.should.have.a.property("error").type("object");
+                    msg.error.should.have.a.property("source").type("object");
+                    msg.error.source.should.have.a.property("id", mqttIn.id);
+                    done();
+                } catch (err) {
+                    done(err)
+                }
+            });
+            return true; //handled
+        }
+        options.expectMsg = null;
+        try {
+            testSendRecv(brokerOptions, { topic: brokerOptions.birthTopic }, {}, options, hooks);
+            done()
+        } catch(err) {
+            done(e)
+        }
     });
     itConditional('should publish close message', function (done) {
         if (skipTests) { return this.skip() }
@@ -606,12 +620,13 @@ function testSendRecv(brokerOptions, inNodeOptions, outNodeOptions, options, hoo
             const mqttBroker = helper.getNode(brokerOptions.id);
             const mqttIn = helper.getNode(nodes.mqtt_in.id);
             const mqttOut = helper.getNode(nodes.mqtt_out.id);
-            let afterLoadHandled = false;
+            let afterLoadHandled = false, finished = false;
             if (hooks.afterLoad) {
                 afterLoadHandled = hooks.afterLoad(helperNode, mqttBroker, mqttIn, mqttOut)
             }
             if (!afterLoadHandled) {
                 helperNode.on("input", function (msg) {
+                    finished = true
                     try {
                         compareMsgToExpected(msg, expectMsg);
                         if (hooks.done) { hooks.done(); }
@@ -636,10 +651,12 @@ function testSendRecv(brokerOptions, inNodeOptions, outNodeOptions, options, hoo
                 }
             })
             .catch((e) => {
+                if(finished) { return }
                 if (hooks.done) { hooks.done(e); }
                 else { throw e; }
             });
         } catch (err) {
+            if(finished) { return }
             if (hooks.done) { hooks.done(err); }
             else { throw err; }
         }

From b0abba15a603ca13a1af76c0c9a397522fbe1c0f Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Thu, 29 Sep 2022 19:08:46 +0100
Subject: [PATCH 14/35] remove dud code instead of commenting

---
 .../node_modules/@node-red/nodes/core/network/10-mqtt.js     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
index 73af668ac..aa378c2fe 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -459,7 +459,6 @@ module.exports = function(RED) {
             if(!opts || typeof opts !== "object") {
                 return; //nothing to change, simply return
             }
-            // const originalBrokerURL = node.brokerurl;
 
             //apply property changes (only if the property exists in the opts object)
             setIfHasProperty(opts, node, "url", init);
@@ -468,7 +467,6 @@ module.exports = function(RED) {
             setIfHasProperty(opts, node, "clientid", init);
             setIfHasProperty(opts, node, "autoConnect", init);
             setIfHasProperty(opts, node, "usetls", init);
-            // setIfHasProperty(opts, node, "usews", init);
             setIfHasProperty(opts, node, "verifyservercert", init);
             setIfHasProperty(opts, node, "compatmode", init);
             setIfHasProperty(opts, node, "protocolVersion", init);
@@ -567,9 +565,6 @@ module.exports = function(RED) {
             if (typeof node.usetls === 'undefined') {
                 node.usetls = false;
             }
-            // if (typeof node.usews === 'undefined') {
-            //     node.usews = false;
-            // }
             if (typeof node.verifyservercert === 'undefined') {
                 node.verifyservercert = false;
             }

From e6b379358aa1278d261bc7bee2a1be09f9fc41f0 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Thu, 29 Sep 2022 21:28:13 +0100
Subject: [PATCH 15/35] better logging of set with no types

---
 .../@node-red/registry/lib/registry.js            | 15 ++++++++-------
 .../node_modules/@node-red/runtime/lib/index.js   |  2 ++
 .../@node-red/runtime/locales/en-US/runtime.json  |  1 +
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/node_modules/@node-red/registry/lib/registry.js b/packages/node_modules/@node-red/registry/lib/registry.js
index 6e3ed6d5b..b0ca22717 100644
--- a/packages/node_modules/@node-red/registry/lib/registry.js
+++ b/packages/node_modules/@node-red/registry/lib/registry.js
@@ -185,17 +185,18 @@ function loadNodeConfigs() {
 function addModule(module) {
     moduleNodes[module.name] = [];
     moduleConfigs[module.name] = module;
-    for (var setName in module.nodes) {
+    for (const setName in module.nodes) {
         if (module.nodes.hasOwnProperty(setName)) {
-            var set = module.nodes[setName];
+            const set = module.nodes[setName];
+            if(setName === 'lower-case') {
+                delete set.types
+            }
             if (!set.types) {
-                const err = new Error("Node has no types")
-                err.code = "has_no_types"
+                const err = new Error("Set has no types")
+                err.code = "set_has_no_types"
                 err.details = {
-                    setName: set.name,
-                    set: { ...set }
+                    ...set
                 }
-                console.warn(err)
                 set.err = err
             }
             moduleNodes[module.name].push(set.name);
diff --git a/packages/node_modules/@node-red/runtime/lib/index.js b/packages/node_modules/@node-red/runtime/lib/index.js
index 88b3b8293..a886cd2ca 100644
--- a/packages/node_modules/@node-red/runtime/lib/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/index.js
@@ -161,6 +161,8 @@ function start() {
                     for (i=0;i<nodeErrors.length;i+=1) {
                         if (nodeErrors[i].err.code === "type_already_registered") {
                             log.warn("["+nodeErrors[i].id+"] "+log._("server.type-already-registered",{type:nodeErrors[i].err.details.type,module: nodeErrors[i].err.details.moduleA}));
+                        } else if (nodeErrors[i].err.code === "set_has_no_types") {
+                            log.warn("["+nodeErrors[i].id+"] "+log._("server.set-has-no-types", nodeErrors[i].err.details));
                         } else {
                             log.warn("["+nodeErrors[i].id+"] "+nodeErrors[i].err);
                         }
diff --git a/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json b/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
index ecd010abb..ede92c876 100644
--- a/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
+++ b/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
@@ -20,6 +20,7 @@
         "errors-help": "Run with -v for details",
         "missing-modules": "Missing node modules:",
         "node-version-mismatch": "Node module cannot be loaded on this version. Requires: __version__ ",
+        "set-has-no-types": "Set does not have any types. name: '__name__', module: '__module__', file: '__file__'",
         "type-already-registered": "'__type__' already registered by module __module__",
         "removing-modules": "Removing modules from config",
         "added-types": "Added node types:",

From e724f216bff2c3fd22e0e4ad89d82a8b12e63421 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Fri, 30 Sep 2022 13:48:48 +0100
Subject: [PATCH 16/35] Fix for CSV undefined property

to close #3900 main issue
and add tests
(other fix is commented out but no tests)
---
 .../@node-red/nodes/core/parsers/70-CSV.js         | 14 +++++++++++---
 test/nodes/core/parsers/70-CSV_spec.js             | 12 +++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
index 9c55fa2b6..39d03f05c 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
@@ -110,7 +110,12 @@ module.exports = function(RED) {
                                         if (msg.payload[s].hasOwnProperty(p)) {
                                             /* istanbul ignore else */
                                             if (typeof msg.payload[s][p] !== "object") {
-                                                var q = "" + msg.payload[s][p];
+                                            // Fix to honour include null values flag
+                                            //if (typeof msg.payload[s][p] !== "object" || (node.include_null_values === true && msg.payload[s][p] === null)) {
+                                                var q = "";
+                                                if (msg.payload[s][p] !== undefined) {
+                                                    q += msg.payload[s][p];
+                                                }
                                                 if (q.indexOf(node.quo) !== -1) { // add double quotes if any quotes
                                                     q = q.replace(/"/g, '""');
                                                     ou += node.quo + q + node.quo + node.sep;
@@ -130,9 +135,12 @@ module.exports = function(RED) {
                                             ou += node.sep;
                                         }
                                         else {
-                                            var p = RED.util.ensureString(RED.util.getMessageProperty(msg,"payload["+s+"]['"+template[t]+"']"));
+                                            var p = RED.util.getMessageProperty(msg,"payload["+s+"]['"+template[t]+"']");
                                             /* istanbul ignore else */
-                                            if (p === "undefined") { p = ""; }
+                                            if (p === undefined) { p = ""; }
+                                            // fix to honour include null values flag
+                                            //if (p === null && node.include_null_values !== true) { p = "";}
+                                            p = RED.util.ensureString(p);
                                             if (p.indexOf(node.quo) !== -1) { // add double quotes if any quotes
                                                 p = p.replace(/"/g, '""');
                                                 ou += node.quo + p + node.quo + node.sep;
diff --git a/test/nodes/core/parsers/70-CSV_spec.js b/test/nodes/core/parsers/70-CSV_spec.js
index 93d59a171..d56f05db3 100644
--- a/test/nodes/core/parsers/70-CSV_spec.js
+++ b/test/nodes/core/parsers/70-CSV_spec.js
@@ -693,19 +693,20 @@ describe('CSV node', function() {
     describe('json object to csv', function() {
 
         it('should convert a simple object back to a csv', function(done) {
-            var flow = [ { id:"n1", type:"csv", temp:"a,b,c,,e,f", wires:[["n2"]] },
+            var flow = [ { id:"n1", type:"csv", temp:"a,b,c,,e,f,g,h,i,j,k", wires:[["n2"]] },
                 {id:"n2", type:"helper"} ];
             helper.load(csvNode, flow, function() {
                 var n1 = helper.getNode("n1");
                 var n2 = helper.getNode("n2");
                 n2.on("input", function(msg) {
+                    // console.log("GOT",msg)
                     try {
-                        msg.should.have.property('payload', '4,foo,true,,0,"Hello\nWorld"\n');
+                        msg.should.have.property('payload', '4,foo,true,,0,"Hello\nWorld",,,undefined,null,null\n');
                         done();
                     }
                     catch(e) { done(e); }
                 });
-                var testJson = { e:0, d:1, b:"foo", c:true, a:4, f:"Hello\nWorld" };
+                var testJson = { e:0, d:1, b:"foo", c:true, a:4, f:"Hello\nWorld", h:undefined, i:"undefined",j:null,k:"null" };
                 n1.emit("input", {payload:testJson});
             });
         });
@@ -717,13 +718,14 @@ describe('CSV node', function() {
                 var n1 = helper.getNode("n1");
                 var n2 = helper.getNode("n2");
                 n2.on("input", function(msg) {
+                    // console.log("GOT",msg)
                     try {
-                        msg.should.have.property('payload', '1,foo,"ba""r","di,ng"\n');
+                        msg.should.have.property('payload', '1,foo,"ba""r","di,ng",,undefined,null\n');
                         done();
                     }
                     catch(e) { done(e); }
                 });
-                var testJson = { d:1, b:"foo", c:"ba\"r", a:"di,ng" };
+                var testJson = { d:1, b:"foo", c:"ba\"r", a:"di,ng", e:undefined, f:"undefined", g:null,h:"null" };
                 n1.emit("input", {payload:testJson});
             });
         });

From 87e7f3a61ca387b727df3b4b23701be89b4c217a Mon Sep 17 00:00:00 2001
From: Ashish Kurmi <akurmi@stepsecurity.io>
Date: Sun, 2 Oct 2022 11:16:13 -0700
Subject: [PATCH 17/35] ci: add minimum GitHub token permissions for workflows
 Signed-off-by: Ashish Kurmi <akurmi@stepsecurity.io>

---
 .github/workflows/release.yml | 3 +++
 .github/workflows/tests.yml   | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8f3c8a6ce..85fc1f92a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,6 +5,9 @@ on:
   release:
     types: [published]
 
+permissions:
+  contents: read
+
 jobs:
   generate:
     name: 'Update node-red-docker image'
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0db909da6..b7f54c5f1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,8 +6,14 @@ on:
   pull_request:
     branches: [ master, dev ]
 
+permissions:
+  contents: read
+
 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:

From 7c79ca787850e932a6ab3cca0b0b5a81a3d2d95b Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 4 Oct 2022 11:28:26 +0100
Subject: [PATCH 18/35] Ensure msg.req.headers is enumerable Fixes #3878

---
 .../@node-red/nodes/core/network/21-httpin.js         | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/21-httpin.js b/packages/node_modules/@node-red/nodes/core/network/21-httpin.js
index 604df653f..22e83b411 100644
--- a/packages/node_modules/@node-red/nodes/core/network/21-httpin.js
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httpin.js
@@ -46,7 +46,7 @@ module.exports = function(RED) {
                     isText = true;
                 } else if (parsedType.type !== "application") {
                     isText = false;
-                } else if ((parsedType.subtype !== "octet-stream") 
+                } else if ((parsedType.subtype !== "octet-stream")
                     && (parsedType.subtype !== "cbor")
                     && (parsedType.subtype !== "x-protobuf")) {
                     checkUTF = true;
@@ -200,6 +200,15 @@ module.exports = function(RED) {
             this.callback = function(req,res) {
                 var msgid = RED.util.generateId();
                 res._msgid = msgid;
+                // Since Node 15, req.headers are lazily computed and the property
+                // marked as non-enumerable.
+                // That means it doesn't show up in the Debug sidebar.
+                // This redefines the property causing it to be evaluated *and*
+                // marked as enumerable again.
+                Object.defineProperty(req, 'headers', {
+                    value: req.headers,
+                    enumerable: true
+                })
                 if (node.method.match(/^(post|delete|put|options|patch)$/)) {
                     node.send({_msgid:msgid,req:req,res:createResponseWrapper(node,res),payload:req.body});
                 } else if (node.method == "get") {

From a40e5dbcd440b04da86455e218e87ad993837eeb Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 4 Oct 2022 11:49:49 +0100
Subject: [PATCH 19/35] Add check that node sends object rather than primitive
 type Fixes #3876

---
 .../@node-red/runtime/lib/nodes/Node.js       | 49 +++++++++++--------
 .../runtime/locales/en-US/runtime.json        |  3 +-
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
index f20359b8a..7a7445a92 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
@@ -373,6 +373,11 @@ Node.prototype.send = function(msg) {
     if (msg === null || typeof msg === "undefined") {
         return;
     } else if (!util.isArray(msg)) {
+        // A single message has been passed in
+        if (typeof msg !== 'object') {
+            this.error(Log._("nodes.flow.non-message-returned", { type: typeof msg }));
+            return
+        }
         if (this._wire) {
             // A single message and a single wire on output 0
             // TODO: pre-load flows.get calls - cannot do in constructor
@@ -425,27 +430,31 @@ Node.prototype.send = function(msg) {
                     for (k = 0; k < msgs.length; k++) {
                         var m = msgs[k];
                         if (m !== null && m !== undefined) {
-                            if (!m._msgid) {
-                                hasMissingIds = true;
+                            if (typeof m !== 'object') {
+                                this.error(Log._("nodes.flow.non-message-returned", { type: typeof m }));
+                            } else {
+                                if (!m._msgid) {
+                                    hasMissingIds = true;
+                                }
+                                /* istanbul ignore else */
+                                if (!sentMessageId) {
+                                    sentMessageId = m._msgid;
+                                }
+                                sendEvents.push({
+                                    msg: m,
+                                    source: {
+                                        id: this.id,
+                                        node: this,
+                                        port: i
+                                    },
+                                    destination: {
+                                        id: wires[j],
+                                        node: undefined
+                                    },
+                                    cloneMessage: msgSent
+                                });
+                                msgSent = true;
                             }
-                            /* istanbul ignore else */
-                            if (!sentMessageId) {
-                                sentMessageId = m._msgid;
-                            }
-                            sendEvents.push({
-                                msg: m,
-                                source: {
-                                    id: this.id,
-                                    node: this,
-                                    port: i
-                                },
-                                destination: {
-                                    id: wires[j],
-                                    node: undefined
-                                },
-                                cloneMessage: msgSent
-                            });
-                            msgSent = true;
                         }
                     }
                 }
diff --git a/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json b/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
index ecd010abb..6bd3fc43b 100644
--- a/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
+++ b/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
@@ -134,7 +134,8 @@
         "flow": {
             "unknown-type": "Unknown type: __type__",
             "missing-types": "missing types",
-            "error-loop": "Message exceeded maximum number of catches"
+            "error-loop": "Message exceeded maximum number of catches",
+            "non-message-returned": "Node tried to send a message of type __type__"
         },
         "index": {
             "unrecognised-id": "Unrecognised id: __id__",

From 6d1a12af4ba3c26a221962eb7aa56dbe129375d7 Mon Sep 17 00:00:00 2001
From: Stephen McLaughlin <44235289+Steve-Mcl@users.noreply.github.com>
Date: Tue, 4 Oct 2022 13:36:23 +0100
Subject: [PATCH 20/35] remove debug/test code

---
 packages/node_modules/@node-red/registry/lib/registry.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/node_modules/@node-red/registry/lib/registry.js b/packages/node_modules/@node-red/registry/lib/registry.js
index b0ca22717..389285dbc 100644
--- a/packages/node_modules/@node-red/registry/lib/registry.js
+++ b/packages/node_modules/@node-red/registry/lib/registry.js
@@ -188,9 +188,6 @@ function addModule(module) {
     for (const setName in module.nodes) {
         if (module.nodes.hasOwnProperty(setName)) {
             const set = module.nodes[setName];
-            if(setName === 'lower-case') {
-                delete set.types
-            }
             if (!set.types) {
                 const err = new Error("Set has no types")
                 err.code = "set_has_no_types"

From 24b055b1b826f94c67600818eab261335ad78683 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 4 Oct 2022 15:44:29 +0100
Subject: [PATCH 21/35] Ensure key_path is quoted in GIT_SSH_COMMAND in case of
 spaces in pathname

---
 .../runtime/lib/storage/localfilesystem/projects/git/index.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
index f9d809231..111365307 100644
--- a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
@@ -106,7 +106,7 @@ function runGitCommandWithSSHCommand(args,cwd,auth,emit) {
         commandEnv.GIT_SSH = path.join(__dirname,"node-red-ssh.sh");
         commandEnv.NODE_RED_KEY_FILE=auth.key_path;
         // GIT_SSH_COMMAND - added in git 2.3.0
-        commandEnv.GIT_SSH_COMMAND = "ssh -i " + auth.key_path + " -F /dev/null";
+        commandEnv.GIT_SSH_COMMAND = "ssh -i \"" + auth.key_path + "\" -F /dev/null";
         // console.log('commandEnv:', commandEnv);
         return runGitCommand(args,cwd,commandEnv,emit).then( result => {
             rs.close();

From 75725a38df6aec69936c0bab861e301b5aba4ea5 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhitoyokoi@nodered.jp>
Date: Wed, 12 Oct 2022 23:50:33 +0900
Subject: [PATCH 22/35] Fix file permission

---
 .../node_modules/@node-red/editor-client/locales/de/editor.json   | 0
 .../node_modules/@node-red/editor-client/locales/de/infotips.json | 0
 .../node_modules/@node-red/editor-client/locales/de/jsonata.json  | 0
 .../@node-red/editor-client/locales/en-US/editor.json             | 0
 .../@node-red/editor-client/locales/en-US/infotips.json           | 0
 .../@node-red/editor-client/locales/en-US/jsonata.json            | 0
 .../node_modules/@node-red/editor-client/locales/ko/editor.json   | 0
 .../node_modules/@node-red/editor-client/locales/ko/infotips.json | 0
 .../node_modules/@node-red/editor-client/locales/ko/jsonata.json  | 0
 .../node_modules/@node-red/editor-client/locales/ru/editor.json   | 0
 .../node_modules/@node-red/editor-client/locales/ru/infotips.json | 0
 .../node_modules/@node-red/editor-client/locales/ru/jsonata.json  | 0
 .../node_modules/@node-red/editor-client/src/js/ui/library.js     | 0
 .../node_modules/@node-red/editor-client/src/js/ui/palette.js     | 0
 .../@node-red/editor-client/src/js/ui/projects/projects.js        | 0
 packages/node_modules/@node-red/editor-client/src/js/ui/view.js   | 0
 packages/node_modules/@node-red/nodes/core/storage/10-file.html   | 0
 .../node_modules/@node-red/nodes/locales/de/common/20-inject.html | 0
 .../node_modules/@node-red/nodes/locales/de/common/21-debug.html  | 0
 .../node_modules/@node-red/nodes/locales/de/common/25-catch.html  | 0
 .../node_modules/@node-red/nodes/locales/de/common/25-status.html | 0
 .../node_modules/@node-red/nodes/locales/de/common/60-link.html   | 0
 .../@node-red/nodes/locales/de/common/90-comment.html             | 0
 .../@node-red/nodes/locales/de/common/98-unknown.html             | 0
 .../@node-red/nodes/locales/de/function/10-function.html          | 0
 .../@node-red/nodes/locales/de/function/10-switch.html            | 0
 .../@node-red/nodes/locales/de/function/15-change.html            | 0
 .../@node-red/nodes/locales/de/function/16-range.html             | 0
 .../@node-red/nodes/locales/de/function/80-template.html          | 0
 .../@node-red/nodes/locales/de/function/89-delay.html             | 0
 .../@node-red/nodes/locales/de/function/89-trigger.html           | 0
 .../node_modules/@node-red/nodes/locales/de/function/90-exec.html | 0
 packages/node_modules/@node-red/nodes/locales/de/messages.json    | 0
 .../node_modules/@node-red/nodes/locales/de/network/05-tls.html   | 0
 .../@node-red/nodes/locales/de/network/06-httpproxy.html          | 0
 .../node_modules/@node-red/nodes/locales/de/network/10-mqtt.html  | 0
 .../@node-red/nodes/locales/de/network/21-httpin.html             | 0
 .../@node-red/nodes/locales/de/network/21-httprequest.html        | 0
 .../@node-red/nodes/locales/de/network/22-websocket.html          | 0
 .../node_modules/@node-red/nodes/locales/de/network/31-tcpin.html | 0
 .../node_modules/@node-red/nodes/locales/de/network/32-udp.html   | 0
 .../node_modules/@node-red/nodes/locales/de/parsers/70-CSV.html   | 0
 .../node_modules/@node-red/nodes/locales/de/parsers/70-HTML.html  | 0
 .../node_modules/@node-red/nodes/locales/de/parsers/70-JSON.html  | 0
 .../node_modules/@node-red/nodes/locales/de/parsers/70-XML.html   | 0
 .../node_modules/@node-red/nodes/locales/de/parsers/70-YAML.html  | 0
 .../@node-red/nodes/locales/de/sequence/17-split.html             | 0
 .../node_modules/@node-red/nodes/locales/de/sequence/18-sort.html | 0
 .../@node-red/nodes/locales/de/sequence/19-batch.html             | 0
 .../node_modules/@node-red/nodes/locales/de/storage/10-file.html  | 0
 .../node_modules/@node-red/nodes/locales/de/storage/23-watch.html | 0
 packages/node_modules/@node-red/nodes/locales/ko/messages.json    | 0
 packages/node_modules/@node-red/nodes/locales/ru/messages.json    | 0
 packages/node_modules/@node-red/runtime/locales/de/runtime.json   | 0
 packages/node_modules/@node-red/runtime/locales/ko/runtime.json   | 0
 55 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 packages/node_modules/@node-red/editor-client/locales/de/editor.json
 mode change 100755 => 100644 packages/node_modules/@node-red/editor-client/locales/de/infotips.json
 mode change 100755 => 100644 packages/node_modules/@node-red/editor-client/locales/de/jsonata.json
 mode change 100755 => 100644 packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
 mode change 100755 => 100644 packages/node_modules/@node-red/editor-client/locales/en-US/infotips.json
 mode change 100755 => 100644 packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
 mode change 100755 => 100644 packages/node_modules/@node-red/editor-client/locales/ko/editor.json
 mode change 100755 => 100644 packages/node_modules/@node-red/editor-client/locales/ko/infotips.json
 mode change 100755 => 100644 packages/node_modules/@node-red/editor-client/locales/ko/jsonata.json
 mode change 100755 => 100644 packages/node_modules/@node-red/editor-client/locales/ru/editor.json
 mode change 100755 => 100644 packages/node_modules/@node-red/editor-client/locales/ru/infotips.json
 mode change 100755 => 100644 packages/node_modules/@node-red/editor-client/locales/ru/jsonata.json
 mode change 100755 => 100644 packages/node_modules/@node-red/editor-client/src/js/ui/library.js
 mode change 100755 => 100644 packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
 mode change 100755 => 100644 packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
 mode change 100755 => 100644 packages/node_modules/@node-red/editor-client/src/js/ui/view.js
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/core/storage/10-file.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/common/20-inject.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/common/21-debug.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/common/25-catch.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/common/25-status.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/common/60-link.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/common/90-comment.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/common/98-unknown.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/function/10-function.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/function/10-switch.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/function/15-change.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/function/16-range.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/function/80-template.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/function/89-delay.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/function/89-trigger.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/function/90-exec.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/messages.json
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/network/05-tls.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/network/06-httpproxy.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/network/10-mqtt.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/network/21-httpin.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/network/21-httprequest.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/network/22-websocket.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/network/31-tcpin.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/network/32-udp.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/parsers/70-CSV.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/parsers/70-HTML.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/parsers/70-JSON.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/parsers/70-XML.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/parsers/70-YAML.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/sequence/17-split.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/sequence/18-sort.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/sequence/19-batch.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/storage/10-file.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/de/storage/23-watch.html
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/ko/messages.json
 mode change 100755 => 100644 packages/node_modules/@node-red/nodes/locales/ru/messages.json
 mode change 100755 => 100644 packages/node_modules/@node-red/runtime/locales/de/runtime.json
 mode change 100755 => 100644 packages/node_modules/@node-red/runtime/locales/ko/runtime.json

diff --git a/packages/node_modules/@node-red/editor-client/locales/de/editor.json b/packages/node_modules/@node-red/editor-client/locales/de/editor.json
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/editor-client/locales/de/infotips.json b/packages/node_modules/@node-red/editor-client/locales/de/infotips.json
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/editor-client/locales/de/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/de/jsonata.json
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/infotips.json b/packages/node_modules/@node-red/editor-client/locales/en-US/infotips.json
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/editor-client/locales/ko/editor.json b/packages/node_modules/@node-red/editor-client/locales/ko/editor.json
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/editor-client/locales/ko/infotips.json b/packages/node_modules/@node-red/editor-client/locales/ko/infotips.json
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/editor-client/locales/ko/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/ko/jsonata.json
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/editor-client/locales/ru/editor.json b/packages/node_modules/@node-red/editor-client/locales/ru/editor.json
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/editor-client/locales/ru/infotips.json b/packages/node_modules/@node-red/editor-client/locales/ru/infotips.json
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/editor-client/locales/ru/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/ru/jsonata.json
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/library.js b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/core/storage/10-file.html b/packages/node_modules/@node-red/nodes/core/storage/10-file.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/common/20-inject.html b/packages/node_modules/@node-red/nodes/locales/de/common/20-inject.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/common/21-debug.html b/packages/node_modules/@node-red/nodes/locales/de/common/21-debug.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/common/25-catch.html b/packages/node_modules/@node-red/nodes/locales/de/common/25-catch.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/common/25-status.html b/packages/node_modules/@node-red/nodes/locales/de/common/25-status.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/common/60-link.html b/packages/node_modules/@node-red/nodes/locales/de/common/60-link.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/common/90-comment.html b/packages/node_modules/@node-red/nodes/locales/de/common/90-comment.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/common/98-unknown.html b/packages/node_modules/@node-red/nodes/locales/de/common/98-unknown.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/function/10-function.html b/packages/node_modules/@node-red/nodes/locales/de/function/10-function.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/function/10-switch.html b/packages/node_modules/@node-red/nodes/locales/de/function/10-switch.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/function/15-change.html b/packages/node_modules/@node-red/nodes/locales/de/function/15-change.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/function/16-range.html b/packages/node_modules/@node-red/nodes/locales/de/function/16-range.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/function/80-template.html b/packages/node_modules/@node-red/nodes/locales/de/function/80-template.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/function/89-delay.html b/packages/node_modules/@node-red/nodes/locales/de/function/89-delay.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/function/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/de/function/89-trigger.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/function/90-exec.html b/packages/node_modules/@node-red/nodes/locales/de/function/90-exec.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/messages.json b/packages/node_modules/@node-red/nodes/locales/de/messages.json
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/network/05-tls.html b/packages/node_modules/@node-red/nodes/locales/de/network/05-tls.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/network/06-httpproxy.html b/packages/node_modules/@node-red/nodes/locales/de/network/06-httpproxy.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/locales/de/network/10-mqtt.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/network/21-httpin.html b/packages/node_modules/@node-red/nodes/locales/de/network/21-httpin.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/network/21-httprequest.html b/packages/node_modules/@node-red/nodes/locales/de/network/21-httprequest.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/network/22-websocket.html b/packages/node_modules/@node-red/nodes/locales/de/network/22-websocket.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/network/31-tcpin.html b/packages/node_modules/@node-red/nodes/locales/de/network/31-tcpin.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/network/32-udp.html b/packages/node_modules/@node-red/nodes/locales/de/network/32-udp.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/parsers/70-CSV.html b/packages/node_modules/@node-red/nodes/locales/de/parsers/70-CSV.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/parsers/70-HTML.html b/packages/node_modules/@node-red/nodes/locales/de/parsers/70-HTML.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/parsers/70-JSON.html b/packages/node_modules/@node-red/nodes/locales/de/parsers/70-JSON.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/parsers/70-XML.html b/packages/node_modules/@node-red/nodes/locales/de/parsers/70-XML.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/parsers/70-YAML.html b/packages/node_modules/@node-red/nodes/locales/de/parsers/70-YAML.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/sequence/17-split.html b/packages/node_modules/@node-red/nodes/locales/de/sequence/17-split.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/sequence/18-sort.html b/packages/node_modules/@node-red/nodes/locales/de/sequence/18-sort.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/sequence/19-batch.html b/packages/node_modules/@node-red/nodes/locales/de/sequence/19-batch.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/storage/10-file.html b/packages/node_modules/@node-red/nodes/locales/de/storage/10-file.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/de/storage/23-watch.html b/packages/node_modules/@node-red/nodes/locales/de/storage/23-watch.html
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/messages.json b/packages/node_modules/@node-red/nodes/locales/ko/messages.json
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/messages.json b/packages/node_modules/@node-red/nodes/locales/ru/messages.json
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/runtime/locales/de/runtime.json b/packages/node_modules/@node-red/runtime/locales/de/runtime.json
old mode 100755
new mode 100644
diff --git a/packages/node_modules/@node-red/runtime/locales/ko/runtime.json b/packages/node_modules/@node-red/runtime/locales/ko/runtime.json
old mode 100755
new mode 100644

From 5b27bcd7814350a0ad26a4450fae497451aa730a Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Sun, 16 Oct 2022 18:05:21 +0100
Subject: [PATCH 23/35] CSV node check header properties for ' and "

and add test
to close #3919
---
 .../@node-red/nodes/core/parsers/70-CSV.js    |  5 +++-
 test/nodes/core/parsers/70-CSV_spec.js        | 27 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
index 39d03f05c..ca193c2b9 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
@@ -135,7 +135,10 @@ module.exports = function(RED) {
                                             ou += node.sep;
                                         }
                                         else {
-                                            var p = RED.util.getMessageProperty(msg,"payload["+s+"]['"+template[t]+"']");
+                                            var tt = template[t];
+                                            if (template[t].indexOf('"') >=0 ) { tt = "'"+tt+"'"; }
+                                            else { tt = '"'+tt+'"'; }
+                                            var p = RED.util.getMessageProperty(msg,'payload["'+s+'"]['+tt+']');
                                             /* istanbul ignore else */
                                             if (p === undefined) { p = ""; }
                                             // fix to honour include null values flag
diff --git a/test/nodes/core/parsers/70-CSV_spec.js b/test/nodes/core/parsers/70-CSV_spec.js
index d56f05db3..681711b3b 100644
--- a/test/nodes/core/parsers/70-CSV_spec.js
+++ b/test/nodes/core/parsers/70-CSV_spec.js
@@ -766,6 +766,33 @@ describe('CSV node', function() {
             });
         });
 
+        it('should handle a template with quotes in the property names', function(done) {
+            var flow = [ { id:"n1", type:"csv", temp:"", hdrout:"all", wires:[["n2"]] },
+                {id:"n2", type:"helper"} ];
+            helper.load(csvNode, flow, function() {
+                var n1 = helper.getNode("n1");
+                var n2 = helper.getNode("n2");
+                n2.on("input", function(msg) {
+                    try {
+                        msg.should.have.property('payload', 'a"a,b\'b\nA1,B1\nA2,B2\n');
+                        done();
+                    }
+                    catch(e) { done(e); }
+                });
+                var testJson = [
+                    {
+                        "a\"a": "A1",
+                        "b'b": "B1"
+                    },
+                    {
+                        "a\"a": "A2",
+                        "b'b": "B2"
+                    }
+                ]
+                n1.emit("input", {payload:testJson});
+            });
+        });
+
         it('should convert an array of objects to a multi-line csv', function(done) {
             var flow = [ { id:"n1", type:"csv", temp:"a,d,c,b", wires:[["n2"]] },
                 {id:"n2", type:"helper"} ];

From b40551a8fa939fec70da9191595339437971a1e8 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Sun, 16 Oct 2022 22:38:11 +0100
Subject: [PATCH 24/35] Handle replacing unknown node inside group or subflow

---
 .../@node-red/editor-client/src/js/nodes.js   | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index d387f01b3..4291f8b2e 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -1768,6 +1768,7 @@ RED.nodes = (function() {
                     unknownTypes.push(n.type);
             }
             if (n.z) {
+if (n.id === '42051f44c151e5d7') console.log('importing',n.z)
                 nodeZmap[n.z] = nodeZmap[n.z] || [];
                 nodeZmap[n.z].push(n);
             } else if (isInitialLoad && n.hasOwnProperty('x') && n.hasOwnProperty('y') && !n.z) {
@@ -1965,7 +1966,7 @@ RED.nodes = (function() {
                         }
                     }
                 } else {
-                    const keepNodesCurrentZ = reimport && n.z && RED.workspaces.contains(n.z)
+                    const keepNodesCurrentZ = reimport && n.z && (RED.workspaces.contains(n.z) || RED.nodes.subflow(n.z))
                     if (!keepNodesCurrentZ && n.z && !workspace_map[n.z] && !subflow_map[n.z]) {
                         n.z = activeWorkspace;
                     }
@@ -2067,7 +2068,7 @@ RED.nodes = (function() {
                         node.id = getID();
                     } else {
                         node.id = n.id;
-                        const keepNodesCurrentZ = reimport && node.z && RED.workspaces.contains(node.z)
+                        const keepNodesCurrentZ = reimport && node.z && (RED.workspaces.contains(node.z) || RED.nodes.subflow(node.z))
                         if (!keepNodesCurrentZ && (node.z == null || (!workspace_map[node.z] && !subflow_map[node.z]))) {
                             if (createMissingWorkspace) {
                                 if (missingWorkspace === null) {
@@ -2740,6 +2741,7 @@ RED.nodes = (function() {
                     }
                 });
 
+                var nodeGroupMap = {}
                 var replaceNodeIds = Object.keys(replaceNodes);
                 if (replaceNodeIds.length > 0) {
                     var reimportList = [];
@@ -2750,6 +2752,12 @@ RED.nodes = (function() {
                         } else {
                             allNodes.removeNode(n);
                         }
+                        if (n.g) {
+                            // reimporting a node *without* including its group object
+                            // will cause the g property to be cleared. Cache it
+                            // here so we can restore it
+                            nodeGroupMap[n.id] = n.g
+                        }
                         reimportList.push(convertNode(n));
                         RED.events.emit('nodes:remove',n);
                     });
@@ -2771,6 +2779,18 @@ RED.nodes = (function() {
                     var newNodeMap = {};
                     result.nodes.forEach(function(n) {
                         newNodeMap[n.id] = n;
+                        if (nodeGroupMap[n.id]) {
+                            // This node is in a group - need to substitute the
+                            // node reference inside the group
+                            n.g = nodeGroupMap[n.id]
+                            const group = RED.nodes.group(n.g)
+                            if (group) {
+                                var index = group.nodes.findIndex(gn => gn.id === n.id)
+                                if (index > -1) {
+                                    group.nodes[index] = n
+                                }
+                            }
+                        }
                     });
                     RED.nodes.eachLink(function(l) {
                         if (newNodeMap.hasOwnProperty(l.source.id)) {

From 69a575097d1d7bc6bfdea65d597244cbc3173951 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Sun, 16 Oct 2022 22:47:34 +0100
Subject: [PATCH 25/35] Remove debug

---
 packages/node_modules/@node-red/editor-client/src/js/nodes.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index 4291f8b2e..32651d8d1 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -1768,7 +1768,6 @@ RED.nodes = (function() {
                     unknownTypes.push(n.type);
             }
             if (n.z) {
-if (n.id === '42051f44c151e5d7') console.log('importing',n.z)
                 nodeZmap[n.z] = nodeZmap[n.z] || [];
                 nodeZmap[n.z].push(n);
             } else if (isInitialLoad && n.hasOwnProperty('x') && n.hasOwnProperty('y') && !n.z) {

From c62a101635fd070a08d799b5e26a0e9450f6485e Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Sun, 16 Oct 2022 23:10:57 +0100
Subject: [PATCH 26/35] Fix httprequest tests to be more lenient on error
 message

---
 test/nodes/core/network/21-httprequest_spec.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/nodes/core/network/21-httprequest_spec.js b/test/nodes/core/network/21-httprequest_spec.js
index 0348dcea1..c6c6ac4ac 100644
--- a/test/nodes/core/network/21-httprequest_spec.js
+++ b/test/nodes/core/network/21-httprequest_spec.js
@@ -1529,7 +1529,7 @@ describe('HTTP Request Node', function() {
                         msg.payload.headers.should.have.property('Content-Type').which.startWith('application/json');
                         //msg.dynamicHeaderName should be present in headers with the value of msg.dynamicHeaderValue
                         msg.payload.headers.should.have.property('dyn-header-name').which.startWith('dyn-header-value');
-                        //static (custom) header set in Flow UI should be present 
+                        //static (custom) header set in Flow UI should be present
                         msg.payload.headers.should.have.property('static-header-name').which.startWith('static-header-value');
                         //msg.headers['location'] should be deleted because Flow UI "Location" header has a blank value
                         //ensures headers with matching characters but different case are eliminated
@@ -2281,7 +2281,7 @@ describe('HTTP Request Node', function() {
             let port = testPort++
 
             let server;
-        
+
             before(function() {
                 server = net.createServer(function (socket) {
                     socket.write("HTTP/1.0 200\nContent-Type: text/plain\n\nHelloWorld")
@@ -2291,7 +2291,7 @@ describe('HTTP Request Node', function() {
                 server.listen(port,'127.0.0.1', function(err) {
                 })
             });
-            
+
             after(function() {
                 server.close()
             });
@@ -2322,14 +2322,14 @@ describe('HTTP Request Node', function() {
                     var n2 = helper.getNode("n2");
                     n2.on('input', function(msg) {
                         try{
-                            msg.payload.should.equal(`RequestError: Parse Error: Missing expected CR after header value : http://localhost:${port}/`)
+                            msg.payload.should.match(/RequestError: Parse Error/)
                             done()
                         } catch (err) {
                             done(err)
                         }
                     })
                     n1.receive({payload: 'foo'})
-                    
+
                 });
             });
         }

From cd0474ce7b5b9313efe020c5b05f9a0015bcae2e Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 26 Oct 2022 00:51:41 +0100
Subject: [PATCH 27/35] Update
 packages/node_modules/@node-red/editor-client/src/js/nodes.js

Co-authored-by: Stephen McLaughlin <44235289+Steve-Mcl@users.noreply.github.com>
---
 packages/node_modules/@node-red/editor-client/src/js/nodes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index 32651d8d1..865636b24 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -2740,7 +2740,7 @@ RED.nodes = (function() {
                     }
                 });
 
-                var nodeGroupMap = {}
+                const nodeGroupMap = {}
                 var replaceNodeIds = Object.keys(replaceNodes);
                 if (replaceNodeIds.length > 0) {
                     var reimportList = [];

From d693af9615137655974f3ca51010794180158b0f Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Sun, 16 Oct 2022 18:05:21 +0100
Subject: [PATCH 28/35] CSV node check header properties for ' and "

and add test
to close #3919
---
 .../@node-red/nodes/core/parsers/70-CSV.js    |  5 +++-
 test/nodes/core/parsers/70-CSV_spec.js        | 27 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
index 39d03f05c..ca193c2b9 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
@@ -135,7 +135,10 @@ module.exports = function(RED) {
                                             ou += node.sep;
                                         }
                                         else {
-                                            var p = RED.util.getMessageProperty(msg,"payload["+s+"]['"+template[t]+"']");
+                                            var tt = template[t];
+                                            if (template[t].indexOf('"') >=0 ) { tt = "'"+tt+"'"; }
+                                            else { tt = '"'+tt+'"'; }
+                                            var p = RED.util.getMessageProperty(msg,'payload["'+s+'"]['+tt+']');
                                             /* istanbul ignore else */
                                             if (p === undefined) { p = ""; }
                                             // fix to honour include null values flag
diff --git a/test/nodes/core/parsers/70-CSV_spec.js b/test/nodes/core/parsers/70-CSV_spec.js
index d56f05db3..681711b3b 100644
--- a/test/nodes/core/parsers/70-CSV_spec.js
+++ b/test/nodes/core/parsers/70-CSV_spec.js
@@ -766,6 +766,33 @@ describe('CSV node', function() {
             });
         });
 
+        it('should handle a template with quotes in the property names', function(done) {
+            var flow = [ { id:"n1", type:"csv", temp:"", hdrout:"all", wires:[["n2"]] },
+                {id:"n2", type:"helper"} ];
+            helper.load(csvNode, flow, function() {
+                var n1 = helper.getNode("n1");
+                var n2 = helper.getNode("n2");
+                n2.on("input", function(msg) {
+                    try {
+                        msg.should.have.property('payload', 'a"a,b\'b\nA1,B1\nA2,B2\n');
+                        done();
+                    }
+                    catch(e) { done(e); }
+                });
+                var testJson = [
+                    {
+                        "a\"a": "A1",
+                        "b'b": "B1"
+                    },
+                    {
+                        "a\"a": "A2",
+                        "b'b": "B2"
+                    }
+                ]
+                n1.emit("input", {payload:testJson});
+            });
+        });
+
         it('should convert an array of objects to a multi-line csv', function(done) {
             var flow = [ { id:"n1", type:"csv", temp:"a,d,c,b", wires:[["n2"]] },
                 {id:"n2", type:"helper"} ];

From 1d547500e80439c1564b8399c630b618835407ff Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Sat, 5 Nov 2022 14:30:32 +0900
Subject: [PATCH 29/35] fix watch node test on MacOS/ARM

---
 test/nodes/core/storage/23-watch_spec.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/nodes/core/storage/23-watch_spec.js b/test/nodes/core/storage/23-watch_spec.js
index a9942d5b1..1e10d0e2e 100644
--- a/test/nodes/core/storage/23-watch_spec.js
+++ b/test/nodes/core/storage/23-watch_spec.js
@@ -15,11 +15,14 @@
  **/
 
 var fs = require("fs-extra");
+var os = require("os");
 var path = require("path");
 var should = require("should");
 var helper = require("node-red-node-test-helper");
 var watchNode = require("nr-test-utils").require("@node-red/nodes/core/storage/23-watch.js");
 
+var arch = os.arch();
+var platform = os.platform();
 
 describe('watch Node', function() {
     this.timeout(5000);
@@ -89,7 +92,10 @@ describe('watch Node', function() {
                     msg.should.have.property('payload', result.payload);
                     msg.should.have.property('type', result.type);
                     if('size' in result) {
-                        msg.should.have.property('size', result.size);
+                        if (!((arch != "arm64") && (platform !== "darwin"))) {
+                            // On OSX/ARM, two change events occur and first event do not reflect file size change.  So ignore size field in the case. 
+                            msg.should.have.property('size', result.size);
+                        }
                     }
                     count++;
                     if(count === len) {

From fce43b4e1d093cacd8ef572cf4305e0df0c19b19 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Sat, 5 Nov 2022 14:50:14 +0900
Subject: [PATCH 30/35] fix condition for platform check

---
 test/nodes/core/storage/23-watch_spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/nodes/core/storage/23-watch_spec.js b/test/nodes/core/storage/23-watch_spec.js
index 1e10d0e2e..dd7b94037 100644
--- a/test/nodes/core/storage/23-watch_spec.js
+++ b/test/nodes/core/storage/23-watch_spec.js
@@ -92,7 +92,7 @@ describe('watch Node', function() {
                     msg.should.have.property('payload', result.payload);
                     msg.should.have.property('type', result.type);
                     if('size' in result) {
-                        if (!((arch != "arm64") && (platform !== "darwin"))) {
+                        if (!((arch === "arm64") && (platform === "darwin"))) {
                             // On OSX/ARM, two change events occur and first event do not reflect file size change.  So ignore size field in the case. 
                             msg.should.have.property('size', result.size);
                         }

From 0b663abe5039a1e6a55d732264d23559a51b78cf Mon Sep 17 00:00:00 2001
From: Steveorevo <steve@steveorevo.com>
Date: Wed, 9 Nov 2022 10:33:05 -0800
Subject: [PATCH 31/35] Fix #3939, red border red-ui-typedInput-container

---
 .../node_modules/@node-red/editor-client/src/js/ui/editor.js    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index be114c4a8..da7954625 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -238,6 +238,7 @@ RED.editor = (function() {
             var valid = validateNodeProperty(node, defaults, property,value);
             if (((typeof valid) === "string") || !valid) {
                 input.addClass("input-error");
+                input.next(".red-ui-typedInput-container").addClass("input-error");
                 if ((typeof valid) === "string") {
                     var tooltip = input.data("tooltip");
                     if (tooltip) {
@@ -250,6 +251,7 @@ RED.editor = (function() {
                 }
             } else {
                 input.removeClass("input-error");
+                input.next(".red-ui-typedInput-container").removeClass("input-error");
                 var tooltip = input.data("tooltip");
                 if (tooltip) {
                     input.data("tooltip", null);

From c81cd5450f9d0c450c42b6566c7f88cd9e7b66c7 Mon Sep 17 00:00:00 2001
From: "Stephen J. Carnam" <steve@steveorevo.com>
Date: Wed, 9 Nov 2022 16:45:32 -0800
Subject: [PATCH 32/35] Support for PHP syntax highlight

---
 .../node_modules/@node-red/nodes/core/function/80-template.html  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/node_modules/@node-red/nodes/core/function/80-template.html b/packages/node_modules/@node-red/nodes/core/function/80-template.html
index 40a26bc35..6f970a0cf 100644
--- a/packages/node_modules/@node-red/nodes/core/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/core/function/80-template.html
@@ -21,6 +21,7 @@
                 <option value="javascript">JavaScript</option>
                 <option value="css">CSS</option>
                 <option value="markdown">Markdown</option>
+                <option value="php">PHP</option>
                 <option value="python">Python</option>
                 <option value="sql">SQL</option>
                 <option value="yaml">YAML</option>

From 77f6412d3bbfe567a0c6848b665423d511696137 Mon Sep 17 00:00:00 2001
From: Adam Lau <skyros@gmail.com>
Date: Wed, 30 Nov 2022 17:51:13 +0800
Subject: [PATCH 33/35] fix: fix typo in catch.html

---
 packages/node_modules/@node-red/nodes/core/common/25-catch.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/common/25-catch.html b/packages/node_modules/@node-red/nodes/core/common/25-catch.html
index a2bf07aa4..1a13d1337 100644
--- a/packages/node_modules/@node-red/nodes/core/common/25-catch.html
+++ b/packages/node_modules/@node-red/nodes/core/common/25-catch.html
@@ -4,7 +4,7 @@
         <label style="width: auto" for="node-input-scope" data-i18n="catch.label.source"></label>
         <select id="node-input-scope-select">
             <option value="all" data-i18n="catch.scope.all"></option>
-            <option value="target" data-i18n="catch.scope.selected"></options>
+            <option value="target" data-i18n="catch.scope.selected"></option>
         </select>
     </div>
     <div class="form-row node-input-uncaught-row">

From 5bb66ed7d406f45a50b268a9d0b66e85e1a1b7bd Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Thu, 1 Dec 2022 13:08:48 +0000
Subject: [PATCH 34/35] fix single subscription mqtt node status

---
 .../@node-red/nodes/core/network/10-mqtt.js   | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
index bfed09c23..3e789be7f 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -366,6 +366,16 @@ module.exports = function(RED) {
         }
     }
 
+    function updateStatus(node, allNodes) {
+        let setStatus = setStatusDisconnected
+        if(node.connecting) {
+            setStatus = setStatusConnecting
+        } else if(node.connected) {
+            setStatus = setStatusConnected
+        }
+        setStatus(node, allNodes)
+    }
+
     function setStatusDisconnected(node, allNodes) {
         if(allNodes) {
             for (var id in node.users) {
@@ -697,13 +707,17 @@ module.exports = function(RED) {
             if (Object.keys(node.users).length === 1) {
                 if(node.autoConnect) {
                     node.connect();
+                    //update nodes status
+                    setTimeout(function() {
+                        updateStatus(node, true)
+                    }, 1)
                 }
             }
         };
 
-        node.deregister = function(mqttNode,done) {
+        node.deregister = function(mqttNode, done, autoDisconnect) {
             delete node.users[mqttNode.id];
-            if (!node.closing && node.connected && Object.keys(node.users).length === 0) {
+            if (autoDisconnect && !node.closing && node.connected && Object.keys(node.users).length === 0) {
                 node.disconnect();
             }
             done();
@@ -1220,7 +1234,7 @@ module.exports = function(RED) {
                     } else {
                         node.brokerConn.unsubscribe(node.topic,node.id, removed);
                     }
-                    node.brokerConn.deregister(node, done);
+                    node.brokerConn.deregister(node, done, removed);
                     node.brokerConn = null;
                 } else {
                     done();
@@ -1283,9 +1297,9 @@ module.exports = function(RED) {
                 node.status({fill:"green",shape:"dot",text:"node-red:common.status.connected"});
             }
             node.brokerConn.register(node);
-            node.on('close', function(done) {
+            node.on('close', function(removed, done) {
                 if (node.brokerConn) {
-                    node.brokerConn.deregister(node,done);
+                    node.brokerConn.deregister(node, done, removed)
                     node.brokerConn = null;
                 } else {
                     done();

From e804addf0ae5179b076048af80911b4e26f380bf Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Sat, 3 Dec 2022 23:13:44 +0000
Subject: [PATCH 35/35] Prevent dbl-click opening node edit dialog with text
 selected Fixes #3958

---
 .../node_modules/@node-red/editor-client/src/js/ui/view.js     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 17e1e87e3..03e4d3cd9 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -3369,6 +3369,9 @@ RED.view = (function() {
         }
         if (dblClickPrimed && mousedown_node == d && clickElapsed > 0 && clickElapsed < dblClickInterval) {
             mouse_mode = RED.state.DEFAULT;
+            // Avoid dbl click causing text selection.
+            d3.event.preventDefault()
+            document.getSelection().removeAllRanges()
             if (d.type != "subflow") {
                 if (/^subflow:/.test(d.type) && (d3.event.ctrlKey || d3.event.metaKey)) {
                     RED.workspaces.show(d.type.substring(8));