From abceb1185bc81e869c11918bed3fb17e0bc83dd5 Mon Sep 17 00:00:00 2001 From: meeki007 <5952964+meeki007@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:15:23 -0500 Subject: [PATCH 1/9] Update 10-mqtt.js to meet mqtt specification of 23 length clientid MQTT clientid: If automatically generating a clientid for user it should be =< 23 Right now it generates length of 24. See mqtt specifications --> http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc385349242 "The Server MUST allow ClientIds which are between 1 and 23 UTF-8 encoded bytes in length,..." As 23 is the minimum we should shoot for this specification. I noticed this when connecting to a mqtt server that was set to minimum spec. it would not connect! Sure I can generate my own ID or fill it in with less than 23 but it did confuse me for 15min. --- packages/node_modules/@node-red/nodes/core/network/10-mqtt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 afa0066f4..451035a74 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 @@ -675,7 +675,7 @@ module.exports = function(RED) { node.options.password = node.password; node.options.keepalive = node.keepalive; node.options.clean = node.cleansession; - node.options.clientId = node.clientid || 'nodered_' + RED.util.generateId(); + node.options.clientId = node.clientid || 'nodered' + RED.util.generateId(); node.options.reconnectPeriod = RED.settings.mqttReconnectTime||5000; delete node.options.protocolId; //V4+ default delete node.options.protocolVersion; //V4 default From 0a847a7a672cb0f4c42efe6484279771c07b2b4b Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Mon, 21 Apr 2025 12:47:07 +0100 Subject: [PATCH 2/9] Fix complete node to not feedback immendiately connected nodes --- .../@node-red/nodes/core/common/24-complete.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/node_modules/@node-red/nodes/core/common/24-complete.js b/packages/node_modules/@node-red/nodes/core/common/24-complete.js index ea665a265..4e361fa5b 100644 --- a/packages/node_modules/@node-red/nodes/core/common/24-complete.js +++ b/packages/node_modules/@node-red/nodes/core/common/24-complete.js @@ -21,6 +21,15 @@ module.exports = function(RED) { RED.nodes.createNode(this,n); var node = this; this.scope = n.scope; + + // auto-filter out any directly connected nodes to avoid simple loopback + const w = node.wires.flat().toString(); + for (let i=0; i < this.scope.length; i++) { + if (w.includes(this.scope[i])) { + this.scope.splice(i, 1); + } + } + this.on("input",function(msg, send, done) { send(msg); done(); From 316eb7c9ef84e6f3fe61f38b1d7b5de39fc1f95a Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Mon, 21 Apr 2025 14:42:34 +0100 Subject: [PATCH 3/9] Also apply same fix to status node --- .../@node-red/nodes/core/common/25-status.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/node_modules/@node-red/nodes/core/common/25-status.js b/packages/node_modules/@node-red/nodes/core/common/25-status.js index fc6ccbe29..1fe0f9fe5 100644 --- a/packages/node_modules/@node-red/nodes/core/common/25-status.js +++ b/packages/node_modules/@node-red/nodes/core/common/25-status.js @@ -21,6 +21,15 @@ module.exports = function(RED) { RED.nodes.createNode(this,n); var node = this; this.scope = n.scope; + + // auto-filter out any directly connected nodes to avoid simple loopback + const w = node.wires.flat().toString(); + for (let i=0; i < this.scope.length; i++) { + if (w.includes(this.scope[i])) { + this.scope.splice(i, 1); + } + } + this.on("input", function(msg, send, done) { send(msg); done(); From c771b175b1accece719e8642d289172dd245172b Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Mon, 21 Apr 2025 14:58:25 +0100 Subject: [PATCH 4/9] Add complete test, and fix tests --- .../nodes/core/common/24-complete.js | 2 +- .../@node-red/nodes/core/common/25-status.js | 2 +- test/nodes/core/common/24-complete_spec.js | 54 +++++++++++++++++++ test/nodes/core/common/25-status_spec.js | 2 +- 4 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 test/nodes/core/common/24-complete_spec.js diff --git a/packages/node_modules/@node-red/nodes/core/common/24-complete.js b/packages/node_modules/@node-red/nodes/core/common/24-complete.js index 4e361fa5b..0eefa6692 100644 --- a/packages/node_modules/@node-red/nodes/core/common/24-complete.js +++ b/packages/node_modules/@node-red/nodes/core/common/24-complete.js @@ -23,7 +23,7 @@ module.exports = function(RED) { this.scope = n.scope; // auto-filter out any directly connected nodes to avoid simple loopback - const w = node.wires.flat().toString(); + const w = this.wires.flat().toString(); for (let i=0; i < this.scope.length; i++) { if (w.includes(this.scope[i])) { this.scope.splice(i, 1); diff --git a/packages/node_modules/@node-red/nodes/core/common/25-status.js b/packages/node_modules/@node-red/nodes/core/common/25-status.js index 1fe0f9fe5..14eb3955d 100644 --- a/packages/node_modules/@node-red/nodes/core/common/25-status.js +++ b/packages/node_modules/@node-red/nodes/core/common/25-status.js @@ -23,7 +23,7 @@ module.exports = function(RED) { this.scope = n.scope; // auto-filter out any directly connected nodes to avoid simple loopback - const w = node.wires.flat().toString(); + const w = this.wires.flat().toString(); for (let i=0; i < this.scope.length; i++) { if (w.includes(this.scope[i])) { this.scope.splice(i, 1); diff --git a/test/nodes/core/common/24-complete_spec.js b/test/nodes/core/common/24-complete_spec.js new file mode 100644 index 000000000..8927db3bd --- /dev/null +++ b/test/nodes/core/common/24-complete_spec.js @@ -0,0 +1,54 @@ +/** + * Copyright JS Foundation and other contributors, http://js.foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + **/ + +var should = require("should"); +var catchNode = require("nr-test-utils").require("@node-red/nodes/core/common/24-complete.js"); +var helper = require("node-red-node-test-helper"); + +describe('complete Node', function() { + + afterEach(function() { + helper.unload(); + }); + + it('should output a message when called', function(done) { + var flow = [ { id:"n1", type:"complete", name:"status", wires:[["n2"]], scope:[] }, + {id:"n2", type:"helper"} ]; + helper.load(catchNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + n1.should.have.property('name', 'status'); + n2.on("input", function(msg) { + msg.text.should.equal("Oh dear"); + msg.should.have.property('source'); + msg.source.should.have.property('id',"12345"); + msg.source.should.have.property('type',"testnode"); + msg.source.should.have.property('name',"fred"); + done(); + }); + var mst = { + text: "Oh dear", + source: { + id: "12345", + type: "testnode", + name: "fred" + } + } + n1.emit("input", mst); + }); + }); + +}); diff --git a/test/nodes/core/common/25-status_spec.js b/test/nodes/core/common/25-status_spec.js index 41b0a79c8..9457d4372 100644 --- a/test/nodes/core/common/25-status_spec.js +++ b/test/nodes/core/common/25-status_spec.js @@ -25,7 +25,7 @@ describe('status Node', function() { }); it('should output a message when called', function(done) { - var flow = [ { id:"n1", type:"status", name:"status", wires:[["n2"]] }, + var flow = [ { id:"n1", type:"status", name:"status", wires:[["n2"]], scope:[] }, {id:"n2", type:"helper"} ]; helper.load(catchNode, flow, function() { var n1 = helper.getNode("n1"); From 26e58a53b720f741ca950e577dfbaf3cbe0d39a5 Mon Sep 17 00:00:00 2001 From: GogoVega <92022724+GogoVega@users.noreply.github.com> Date: Mon, 2 Jun 2025 14:26:41 +0200 Subject: [PATCH 5/9] Exclude internal properties from node definition --- .../@node-red/editor-client/src/js/nodes.js | 51 ++++++++++++++++++- 1 file changed, 50 insertions(+), 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 cab3547c2..41ae4c242 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 @@ -44,6 +44,51 @@ RED.nodes = (function() { var dirty = false; + const internalProperties = [ + "changed", + "dirty", + "id", + "inputLabels", + "moved", + "outputLabels", + "selected", + "type", + "users", + "valid", + "validationErrors", + "wires", + "a", + "b", + "c", + "d", + "e", + "f", + "g", + "h", + "i", + "j", + "k", + "l", + "m", + "n", + "o", + "p", + "q", + "r", + "s", + "t", + "u", + "v", + "w", + "x", + "y", + "z", + "_", + "_config", + "_def", + "_orig" + ]; + function setDirty(d) { dirty = d; if (!d) { @@ -231,7 +276,6 @@ RED.nodes = (function() { def.type = nt; nodeDefinitions[nt] = def; - if (def.defaults) { for (var d in def.defaults) { if (def.defaults.hasOwnProperty(d)) { @@ -242,6 +286,11 @@ RED.nodes = (function() { console.warn(err); } } + + if (internalProperties.includes(d)) { + console.warn(`registerType: ${nt}: the property "${d}" is internal and cannot be used.`); + delete def.defaults[d]; + } } } } From aaa4e60d58b5bc4a5100ed298993794e32ffc1fc Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 6 Jun 2025 10:58:30 +0100 Subject: [PATCH 6/9] Apply suggestions from code review --- .../@node-red/nodes/core/common/24-complete.js | 2 +- .../@node-red/nodes/core/common/25-status.js | 2 +- test/nodes/core/common/24-complete_spec.js | 15 --------------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/packages/node_modules/@node-red/nodes/core/common/24-complete.js b/packages/node_modules/@node-red/nodes/core/common/24-complete.js index 0eefa6692..c54e03e7e 100644 --- a/packages/node_modules/@node-red/nodes/core/common/24-complete.js +++ b/packages/node_modules/@node-red/nodes/core/common/24-complete.js @@ -23,7 +23,7 @@ module.exports = function(RED) { this.scope = n.scope; // auto-filter out any directly connected nodes to avoid simple loopback - const w = this.wires.flat().toString(); + const w = this.wires.flat(); for (let i=0; i < this.scope.length; i++) { if (w.includes(this.scope[i])) { this.scope.splice(i, 1); diff --git a/packages/node_modules/@node-red/nodes/core/common/25-status.js b/packages/node_modules/@node-red/nodes/core/common/25-status.js index 14eb3955d..b3d5e8fa3 100644 --- a/packages/node_modules/@node-red/nodes/core/common/25-status.js +++ b/packages/node_modules/@node-red/nodes/core/common/25-status.js @@ -23,7 +23,7 @@ module.exports = function(RED) { this.scope = n.scope; // auto-filter out any directly connected nodes to avoid simple loopback - const w = this.wires.flat().toString(); + const w = this.wires.flat(); for (let i=0; i < this.scope.length; i++) { if (w.includes(this.scope[i])) { this.scope.splice(i, 1); diff --git a/test/nodes/core/common/24-complete_spec.js b/test/nodes/core/common/24-complete_spec.js index 8927db3bd..15f27b43b 100644 --- a/test/nodes/core/common/24-complete_spec.js +++ b/test/nodes/core/common/24-complete_spec.js @@ -1,18 +1,3 @@ -/** - * Copyright JS Foundation and other contributors, http://js.foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - **/ var should = require("should"); var catchNode = require("nr-test-utils").require("@node-red/nodes/core/common/24-complete.js"); From 3f3450ce3e608d4e5e0de1ff8881884614554757 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 6 Jun 2025 11:00:13 +0100 Subject: [PATCH 7/9] Apply suggestions from code review --- .../node_modules/@node-red/nodes/core/common/24-complete.js | 2 +- packages/node_modules/@node-red/nodes/core/common/25-status.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/node_modules/@node-red/nodes/core/common/24-complete.js b/packages/node_modules/@node-red/nodes/core/common/24-complete.js index c54e03e7e..1ba43a423 100644 --- a/packages/node_modules/@node-red/nodes/core/common/24-complete.js +++ b/packages/node_modules/@node-red/nodes/core/common/24-complete.js @@ -20,7 +20,7 @@ module.exports = function(RED) { function CompleteNode(n) { RED.nodes.createNode(this,n); var node = this; - this.scope = n.scope; + this.scope = n.scope || []; // auto-filter out any directly connected nodes to avoid simple loopback const w = this.wires.flat(); diff --git a/packages/node_modules/@node-red/nodes/core/common/25-status.js b/packages/node_modules/@node-red/nodes/core/common/25-status.js index b3d5e8fa3..8c56e2030 100644 --- a/packages/node_modules/@node-red/nodes/core/common/25-status.js +++ b/packages/node_modules/@node-red/nodes/core/common/25-status.js @@ -20,7 +20,7 @@ module.exports = function(RED) { function StatusNode(n) { RED.nodes.createNode(this,n); var node = this; - this.scope = n.scope; + this.scope = n.scope || []; // auto-filter out any directly connected nodes to avoid simple loopback const w = this.wires.flat(); From f43d4e946523a797e7489deb46fed9ca78b70c6d Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 6 Jun 2025 11:45:17 +0100 Subject: [PATCH 8/9] Update test for generated client id --- test/nodes/core/network/21-mqtt_spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/nodes/core/network/21-mqtt_spec.js b/test/nodes/core/network/21-mqtt_spec.js index 16c38d2e5..0075831c9 100644 --- a/test/nodes/core/network/21-mqtt_spec.js +++ b/test/nodes/core/network/21-mqtt_spec.js @@ -58,7 +58,7 @@ describe('MQTT Nodes', function () { mqttBroker.should.have.property('options'); mqttBroker.options.should.have.property('clean', true); mqttBroker.options.should.have.property('clientId'); - mqttBroker.options.clientId.should.containEql('nodered_'); + mqttBroker.options.clientId.should.containEql('nodered'); mqttBroker.options.should.have.property('keepalive').type("number"); mqttBroker.options.should.have.property('reconnectPeriod').type("number"); //as this is not a v5 connection, ensure v5 properties are not present @@ -894,4 +894,4 @@ function nextTopic(topic) { return (base_topic + topic + String(topicNo)); } -//#endregion HELPERS \ No newline at end of file +//#endregion HELPERS From be4de3b404c5bfad4cfeeb338d95ad48f819a450 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 6 Jun 2025 16:30:07 +0100 Subject: [PATCH 9/9] Fix typo is de/httprequest.html --- .../@node-red/nodes/locales/de/network/21-httprequest.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index bb02eede0..72718d33f 100644 --- 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 @@ -81,7 +81,7 @@

Wenn msg.payload ein Objekt ist, setzt der Node automatisch den Inhaltstyp der Anforderung auf application/json und kodiert den Hauptteil als solchen.

Um die Anforderung als Formulardaten zu kodieren, sollte msg.headers["content-type"] auf - application/x-wwww-form-urlencoded gesetzt werden.

+ application/x-www-form-urlencoded gesetzt werden.

Datei-Upload

Um einen Datei-Upload umzusetzen, sollte msg.headers["content-type"] auf multipart/form-data gesetzt werden und das an den Node zu sendende msg.payload muss ein Objekt mit folgender Struktur sein: