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

call done after ws disconnects 

fixes #3527
This commit is contained in:
Steve-Mcl 2022-04-14 22:07:52 +01:00
parent ae76ff0aaf
commit 97678577fb
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/node_modules/@node-red/nodes/core/network/22-websocket.js vendored
View File

@ -210,7 +210,7 @@ module.exports = function(RED) {
startconn(); // start outbound connection startconn(); // start outbound connection
} }
node.on("close", function() { node.on("close", function(done) {
if (node.heartbeatInterval) { if (node.heartbeatInterval) {
clearInterval(node.heartbeatInterval); clearInterval(node.heartbeatInterval);
} }
@ -218,19 +218,27 @@ module.exports = function(RED) {
delete listenerNodes[node.fullPath]; delete listenerNodes[node.fullPath];
node.server.close(); node.server.close();
node._inputNodes = []; node._inputNodes = [];
activeListenerNodes--;
// if (activeListenerNodes === 0 && serverUpgradeAdded) {
// RED.server.removeListener('upgrade', handleServerUpgrade);
// serverUpgradeAdded = false;
// }
} }
else { else {
node.closing = true; node.closing = true;
node.server.close(); node.server.close();
if (node.tout) { //wait 20*50 (1000ms max) for ws to close.
clearTimeout(node.tout); //call done when readyState === ws.CLOSED (or 1000ms, whichever comes fist)
node.tout = null; const closeMonitorInterval = 20;
} let closeMonitorCount = 50;
let si = setInterval(() => {
if(node.server.readyState === ws.CLOSED || closeMonitorCount <= 0) {
if (node.tout) {
clearTimeout(node.tout);
node.tout = null;
}
clearInterval(si);
return done();
}
closeMonitorCount--;
if(closeMonitorCount <= 0) {
}
}, closeMonitorInterval);
} }
}); });
} }