frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3909 from node-red/warn-invalid-msg

Browse Source 
Add check that node sends object rather than primitive type
This commit is contained in:
Nick O'Leary 2022-11-30 22:28:09 +00:00 committed by GitHub
commit 14e74afb07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
packages/node_modules/@node-red/runtime/lib/nodes/Node.js vendored
View File

@ -373,6 +373,11 @@ Node.prototype.send = function(msg) {
if (msg === null || typeof msg === "undefined") { if (msg === null || typeof msg === "undefined") {
return; return;
} else if (!util.isArray(msg)) { } 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) { if (this._wire) {
// A single message and a single wire on output 0 // A single message and a single wire on output 0
// TODO: pre-load flows.get calls - cannot do in constructor // 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++) { for (k = 0; k < msgs.length; k++) {
var m = msgs[k]; var m = msgs[k];
if (m !== null && m !== undefined) { if (m !== null && m !== undefined) {
if (!m._msgid) { if (typeof m !== 'object') {
hasMissingIds = true; 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;
} }
} }
} }

3
packages/node_modules/@node-red/runtime/locales/en-US/runtime.json vendored
View File

@ -135,7 +135,8 @@
"flow": { "flow": {
"unknown-type": "Unknown type: __type__", "unknown-type": "Unknown type: __type__",
"missing-types": "missing types", "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": { "index": {
"unrecognised-id": "Unrecognised id: __id__", "unrecognised-id": "Unrecognised id: __id__",