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

undefined fix, plus extra cater for error now

Browse Source
This commit is contained in:
Steve Walsh 2023-11-13 10:25:50 +00:00
parent 902fb2db52
commit 04a7c9dbf7
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,7 +233,7 @@ module.exports = function (RED) {
const result = vm2Instance.run(functionText);
const afterVm2 = process.hrtime(beforeVm2);
payloadValidator.verify(result);
sendResults(this, msg._msgid, result);
sendResults(this, msg._msgid, msg);
const logger = clone(msg.logger);
let lambdaRequestId;
let {
@ -252,28 +252,26 @@ module.exports = function (RED) {
} = RED;
if (codefile) {
workerId = workerId.split(":::")[0];
const nodeId = this.id.split(`${organization}-${workerId}-`)[1];
try {
const messageToSend = clone(msg);
delete messageToSend.logger;
const beforeCodefile = process.hrtime();
const {
result: {
Result: { msg: responseMessage },
payload: {
result,
error
},
} = await codefile.run({ srcCode: this.func, context: { msg } });
requestId
} = await codefile.run({ srcCode: this.func, context: { msg } });
const afterCodefile = process.hrtime(beforeCodefile);
responseMessage.logger = logger;
payloadValidator.verify(responseMessage);
// to make function node return result from code file uncomment this line, and comment out the sendResults above
// sendResults(this,msg._msgid, responseMessage);
workerId = workerId.split(":::")[0];
const nodeId = this.id.split(`${organization}-${workerId}-`)[1];
lambdaRequestId = responseMessage.lambdaRequestId;
const metrics = {
lambdaRequestId: requestId,
action:'codefile-success',
organization,
workerId: workerId,
nodeId: nodeId,
@ -287,12 +285,24 @@ module.exports = function (RED) {
) / 100
}ms`,
};
if(result){
// not required right now since we dont go via this path
// const responseMessage = result.msg
// responseMessage.logger = logger;
// payloadValidator.verify(responseMessage);
// sendResults(this,msg._msgid, responseMessage);
}
else{
metrics.error = error;
metrics.action = 'codefile-error';
}
logger.info(JSON.stringify(metrics, null, 2));
} catch (e) {
logger.error(e)
logger.error({
message: "Error running codefile",
error: e,
lambdaRequestId,
action:'codefile-error',
error: e.message,
organization,
workerId: workerId,
nodeId: nodeId,

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "@servisbot/node-red",
"version": "0.18.7-patch-11",
"version": "0.18.7-patch-12",
"lockfileVersion": 1,
"requires": true,
"dependencies": {