Merge pull request #4772 from node-red/rel3111

Bump for 3.1.11 release

CHANGELOG.md

@@ -1,3 +1,31 @@
+#### 3.1.11: Maintenance Release
+
+ - Add/Update German Translations for delay node (#4762) @dceejay
+ - Update ws dependency
+
+#### 3.1.10: Maintenance Release
+
+ - Include rewired nodes when calculating Modified Flows stop list (#4754) @knolleary
+ - Fix clone of group env var properties (#4753) @knolleary
+ - Fix losing links when importing a copy of links into a subflow (#4750) @GogoVega
+ - Ensure all CSS variables are in the output file (#3743) @bonanitech
+ - Fix the Sidebar Config is not refreshed after a deploy (#4734) @GogoVega
+ - Fix checkboxes are not updated when calling `typedInput("value", "")` (#4729) @GogoVega
+ - Fix panning with middle mouse button on windows 10/11 (#4716) @corentin-sodebo-voile
+ - Add Japanese translation for sidebar tooltip (#4727) @kazuhitoyokoi
+ - Translate the number of items selected in the options list (#4730) @GogoVega
+ - Fix a checkbox should return a Boolean value and not the string `on` (#4715) @GogoVega
+ - Deleting a grouped node should update the group (#4714) @GogoVega
+ - Change the Config Node cursor to `pointer` (#4711) @GogoVega
+ - Add missing tooltips to Sidebar (#4713) @GogoVega
+ - Allow nodes to return additional history entries in onEditSave (#4710) @knolleary
+ - Pass full error object in Function node and copy over cause property (#4685) @knolleary
+ - Replacing vm.createScript in favour of vm.Script (#4534) @patlux
+ - Avoid login loops when autoLogin enabled but login fails (#4684) @knolleary
+ - Fix undo of subflow env property edits (#4667) @knolleary
+ - Fix three error typos in monaco.js (#4660) @JoshuaCWebDeveloper
+ - docs: Add closing paragraph tag (#4664) @ZJvandeWeg
+
 #### 3.1.9: Maintenance Release
 
  - Prevent subflow being added to itself (#4654) @knolleary

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "3.1.9",
+    "version": "3.1.11",
     "description": "Low-code programming for event-driven applications",
     "homepage": "https://nodered.org",
     "license": "Apache-2.0",
@@ -78,7 +78,7 @@
         "tough-cookie": "4.1.3",
         "uglify-js": "3.17.4",
         "uuid": "9.0.0",
-        "ws": "7.5.6",
+        "ws": "7.5.10",
         "xml2js": "0.6.2"
     },
     "optionalDependencies": {

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "3.1.9",
+    "version": "3.1.11",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "3.1.9",
-        "@node-red/editor-client": "3.1.9",
+        "@node-red/util": "3.1.11",
+        "@node-red/editor-client": "3.1.11",
         "bcryptjs": "2.4.3",
         "body-parser": "1.20.2",
         "clone": "2.1.2",
@@ -32,7 +32,7 @@
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
         "passport": "0.6.0",
-        "ws": "7.5.6"
+        "ws": "7.5.10"
     },
     "optionalDependencies": {
         "bcrypt": "5.1.0"

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

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

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

@@ -2379,6 +2379,13 @@ RED.nodes = (function() {
             } else {
                 delete n.g
             }
+            // If importing into a subflow, ensure an outbound-link doesn't get added
+            if (activeSubflow && /^link /.test(n.type) && n.links) {
+                n.links = n.links.filter(function(id) {
+                    const otherNode = node_map[id] || RED.nodes.node(id);
+                    return (otherNode && otherNode.z === activeWorkspace);
+                });
+            }
             for (var d3 in n._def.defaults) {
                 if (n._def.defaults.hasOwnProperty(d3)) {
                     if (n._def.defaults[d3].type) {
@@ -2402,14 +2409,6 @@ RED.nodes = (function() {
                     }
                 }
             }
-            // If importing into a subflow, ensure an outbound-link doesn't
-            // get added
-            if (activeSubflow && /^link /.test(n.type) && n.links) {
-                n.links = n.links.filter(function(id) {
-                    const otherNode = node_map[id] || RED.nodes.node(id);
-                    return (otherNode && otherNode.z === activeWorkspace)
-                });
-            }
         }
         for (i=0;i<new_subflows.length;i++) {
             n = new_subflows[i];

packages/node_modules/@node-red/nodes/locales/de/function/89-delay.html

@@ -20,12 +20,26 @@
         <dt class="optional">delay <span class="property-type">number</span></dt>
         <dd>Legt die Verzögerung in Millisekunden fest, die auf die Nachricht angewendet werden soll.
             Zur Nutzung dieser Option muss <i>Verzög. mit msg.delay überschreibbar</i> aktiviert sein.</dd>
+        <dt class="optional">rate <span class="property-type">number</span></dt>
+        <dd>Setzt die Verzögerung in Millisekunden zwischen den Nachrichten. Diese Node überschreibt die
+            bestehende Verzögerung die in der Node konfiguration, wenn die empfangende Nachricht <code>msg.rate</code>
+            in Millisekunden enthält. Dies trifft nur zu, wenn in der Node konfiguriert ist, das empfangene
+            Nachrichten den konfigurierten Wert überschreiben können.</dd>
         <dt class="optional">reset</dt>
         <dd>Wenn bei der empfangenen Nachricht diese Eigenschaft auf einen beliebigen Wert gesetzt ist,
             werden alle im Node gepufferten Nachrichten gelöscht.</dd>
         <dt class="optional">flush</dt>
         <dd>Wenn bei der empfangenen Nachricht diese Eigenschaft auf einen beliebigen Wert gesetzt ist,
             werden alle im Node gepufferten Nachrichten sofort gesendet.</dd>
+        <dt class="optional">flush</dt>
+        <dd>Wenn bei der empfangenen Nachricht diese Eigenschaft auf einen numerischen Wert gesetzt ist,
+            wird diese Anzahl an Nachrichten sofort gesendet. Wenn ein anderer Typ gesetzt ist (z.B. Boolean),
+            werden alle in der Node gepufferten Nachrichten gesendet.</dd>
+        <dt class="optional">toFront</dt>
+        <dd>Wenn diese Eigenschaft im Ratenbegrenzungsmodus für die empfangene Nachricht auf den booleschen Wert
+            <code>true</code> gesetzt ist, Anschließend wird die Nachricht an den Anfang der Warteschlange verschoben
+            und als nächstes freigegeben. Dies kann in Kombination mit <code>msg.flush=1</code> verwendet werden, um sofort erneut zu senden.
+        </dd>
     </dl>
     <h3>Details</h3>
     <p>Wenn Verzögerung als Nachrichtenaktion eingestellt ist, kann die Verzögerungszeit ein fixer Wert,

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "3.1.9",
+    "version": "3.1.11",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -43,7 +43,7 @@
         "raw-body": "2.5.2",
         "tough-cookie": "4.1.3",
         "uuid": "9.0.0",
-        "ws": "7.5.6",
+        "ws": "7.5.10",
         "xml2js": "0.6.2",
         "iconv-lite": "0.6.3"
     }

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

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

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

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

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

@@ -462,9 +462,8 @@ function stop(type,diff,muteLog,isDeploy) {
     if (type === 'nodes') {
         stopList = diff.changed.concat(diff.removed);
     } else if (type === 'flows') {
-        stopList = diff.changed.concat(diff.removed).concat(diff.linked);
+        stopList = diff.changed.concat(diff.removed).concat(diff.linked).concat(diff.rewired);
     }
-
     events.emit("flows:stopping",{config: activeConfig, type: type, diff: diff})
 
     // Stop the global flow object last

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

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

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "3.1.9",
+    "version": "3.1.11",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

packages/node_modules/node-red/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "3.1.9",
+    "version": "3.1.11",
     "description": "Low-code programming for event-driven applications",
     "homepage": "https://nodered.org",
     "license": "Apache-2.0",
@@ -31,10 +31,10 @@
         "flow"
     ],
     "dependencies": {
-        "@node-red/editor-api": "3.1.9",
-        "@node-red/runtime": "3.1.9",
-        "@node-red/util": "3.1.9",
-        "@node-red/nodes": "3.1.9",
+        "@node-red/editor-api": "3.1.11",
+        "@node-red/runtime": "3.1.11",
+        "@node-red/util": "3.1.11",
+        "@node-red/nodes": "3.1.11",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.19.2",

test/unit/@node-red/runtime/lib/flows/Group_spec.js

@@ -16,6 +16,31 @@ describe('Group', function () {
             group.getSetting("NR_GROUP_NAME").should.equal("g1")
             group.getSetting("NR_GROUP_ID").should.equal("group1")
         })
+        it("returns cloned env var property", async function () {
+            const group = new Group({
+                getSetting: v => v+v
+            }, {
+                name: "g1",
+                id: "group1",
+                env: [
+                    {
+                        name: 'jsonEnvVar',
+                        type: 'json',
+                        value: '{"a":1}'
+                    }
+                ]
+            })
+            await group.start()
+            const result = group.getSetting('jsonEnvVar')
+            result.should.have.property('a', 1)
+            result.a = 2
+            result.b = 'hello'
+
+            const result2 = group.getSetting('jsonEnvVar')
+            result2.should.have.property('a', 1)
+            result2.should.not.have.property('b')
+
+        })
         it("delegates to parent if not found", async function () {
             const group = new Group({
                 getSetting: v => v+v