Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure errors in preDeliver callback are handled #3911

Merged
merged 3 commits into from
Feb 21, 2023
Merged

Ensure errors in preDeliver callback are handled #3911

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4d7b71
Ensure errors in preDeliver callback are handled
knolleary Oct 4, 2022
79db4f8
Update packages/node_modules/@node-red/runtime/lib/flows/Flow.js
knolleary Nov 30, 2022
742f05f
Update packages/node_modules/@node-red/runtime/lib/flows/Flow.js
knolleary Nov 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 13 additions & 7 deletions packages/node_modules/@node-red/runtime/lib/flows/Flow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,6 +818,17 @@ function handlePreRoute(flow, sendEvent, reportError) {
})
}

function deliverMessageToDestination(sendEvent) {
if (sendEvent?.destination?.node) {
try {
sendEvent.destination.node.receive(sendEvent.msg);
} catch(err) {
const info = `${sendEvent.destination.node?.id}`
knolleary marked this conversation as resolved.
Show resolved Hide resolved
knolleary marked this conversation as resolved.
Show resolved Hide resolved
Log.error(`Error delivering message to node:${sendEvent.destination.node._path} [${sendEvent.destination.node.type}]`)
Log.error(err.stack)
}
}
}
function handlePreDeliver(flow,sendEvent, reportError) {
// preDeliver - the local router has identified the node it is going to send to. At this point, the message has been cloned if needed.
hooks.trigger("preDeliver",sendEvent,(err) => {
Expand All @@ -827,15 +838,10 @@ function handlePreDeliver(flow,sendEvent, reportError) {
} else if (err !== false) {
if (asyncMessageDelivery) {
setImmediate(function() {
if (sendEvent.destination.node) {
sendEvent.destination.node.receive(sendEvent.msg);
}
deliverMessageToDestination(sendEvent)
})
} else {
if (sendEvent.destination.node) {
sendEvent.destination.node.receive(sendEvent.msg);

}
deliverMessageToDestination(sendEvent)
}
// postDeliver - the message has been dispatched to be delivered asynchronously (unless the sync delivery flag is set, in which case it would be continue as synchronous delivery)
hooks.trigger("postDeliver", sendEvent, function(err) {
Expand Down