frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Updated to cover the removal of individual event handlers

This commit is contained in:
Phil Day 2022-05-09 15:39:12 +01:00
parent 9bc8adc715
commit 3d3090a8f2
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
packages/node_modules/@node-red/nodes/core/network/10-mqtt.js vendored
View File

@ -755,7 +755,7 @@ module.exports = function(RED) {
} }
setStatusConnected(node, true); setStatusConnected(node, true);
// Remove any existing listeners before resubscribing to avoid duplicates in the event of a re-connection // Remove any existing listeners before resubscribing to avoid duplicates in the event of a re-connection
node._clientRemoveAllListeners('message'); node._clientRemoveListeners('message');
// Re-subscribe to stored topics // Re-subscribe to stored topics
for (var s in node.subscriptions) { for (var s in node.subscriptions) {
@ -823,7 +823,7 @@ module.exports = function(RED) {
if(node.connected || node.connecting) { if(node.connected || node.connecting) {
setStatusDisconnected(node, true); setStatusDisconnected(node, true);
} }
if(node.client) { node._clientRemoveAllListeners(); } if(node.client) { node._clientRemoveListeners(); }
node.connecting = false; node.connecting = false;
node.connected = false; node.connected = false;
callback && typeof callback == "function" && callback(); callback && typeof callback == "function" && callback();
@ -906,7 +906,7 @@ module.exports = function(RED) {
if (sub) { if (sub) {
if (sub[ref]) { if (sub[ref]) {
if(node.client) { if(node.client) {
node.client.removeListener('message',sub[ref].handler); node._clientRemoveListeners('message',sub[ref].handler);
} }
delete sub[ref]; delete sub[ref];
} }
@ -997,7 +997,7 @@ module.exports = function(RED) {
node.on('close', function(done) { node.on('close', function(done) {
node.disconnect(function() { node.disconnect(function() {
if(node.client) { if(node.client) {
node._clientRemoveAllListeners(); node._clientRemoveListeners();
} }
done(); done();
}); });
@ -1006,19 +1006,33 @@ module.exports = function(RED) {
// Helper functions to track the event listners we add to the // Helper functions to track the event listners we add to the
// client. The mqtt client also uses it own set of listeners // client. The mqtt client also uses it own set of listeners
// so we can't use removeAllListeners() wothout breaking it // so we can't use removeAllListeners() wothout breaking it
node._clientOn = function(event, f) {
/**
* Add an event handlers to the MQTT.js client
* @param {string} [event] The name of the event (optional)
* @param {function} [handler] The handler for this event
*/
node._clientOn = function(event, f) {
node.clientListeners.push({event, f}) node.clientListeners.push({event, f})
node.client.on(event, f) node.client.on(event, f)
} }
node._clientRemoveAllListeners = function(event) { /**
* Remove event handlers from the MQTT.js client & only the events
* that we attached in {@link node._clientOn `node._clientOn`}.
* * If `event` is omitted, then all events matching `handler` are removed
* * If `handler` is omitted, then all events named `event` are removed
* * If both parameters are omitted, then all events are removed
* @param {string} [event] The name of the event (optional)
* @param {function} [handler] The handler for this event
*/
node._clientRemoveListeners = function(event, handler) {
node.clientListeners = node.clientListeners.filter((l) => { node.clientListeners = node.clientListeners.filter((l) => {
if (!event || (event == l.e)) { if (event && event !== l.e) { return true; }
node.client.removeListener(l.event, l.f) if (handler && handler !== l.h) { return true; }
return false; node.client.removeListener(l.event, l.f)
} return false; //found and removed, fliter out this one
else
return true;
}) })
} }