frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Log error when non-msg-object is returned from a Function

Browse Source
This commit is contained in:
Nick O'Leary
2017-05-15 13:54:05 +01:00
parent d4135e80a6
commit 8a7bb1be9f
3 changed files with 65 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
nodes/core/core/80-function.js
View File

@@ -28,18 +28,23 @@ module.exports = function(RED) {
var msgCount = 0;
for (var m=0;m<msgs.length;m++) {
if (msgs[m]) {
if (util.isArray(msgs[m])) {
for (var n=0; n < msgs[m].length; n++) {
if (msgs[m][n] !== null && msgs[m][n] !== undefined) {
msgs[m][n]._msgid = _msgid;
if (!util.isArray(msgs[m])) {
msgs[m] = [msgs[m]];
}
for (var n=0; n < msgs[m].length; n++) {
var msg = msgs[m][n];
if (msg !== null && msg !== undefined) {
if (typeof msg === 'object' && !Buffer.isBuffer(msg) && !util.isArray(msg)) {
msg._msgid = _msgid;
msgCount++;
} else {
var type = typeof msg;
if (type === 'object') {
type = Buffer.isBuffer(msg)?'Buffer':(util.isArray(msg)?'Array':'Date');
}
node.error(RED._("function.error.non-message-returned",{ type: type }))
}
}
} else {
if (msgs[m] !== null && msgs[m] !== undefined) {
msgs[m]._msgid = _msgid;
msgCount++;
}
}
}
}

3
nodes/core/locales/en-US/messages.json
View File

@@ -169,7 +169,8 @@
"outputs": "Outputs"
},
"error": {
"inputListener":"Cannot add listener to 'input' event within Function"
"inputListener":"Cannot add listener to 'input' event within Function",
"non-message-returned":"Function tried to send a message of type __type__"
},
"tip": "See the Info tab for help writing functions."
},