From 50929c958d3b914fdcead1f1c5fa5dc7a49a62e9 Mon Sep 17 00:00:00 2001 From: Dorian Niemiec Date: Sun, 12 Nov 2023 20:18:18 +0100 Subject: [PATCH] Update to SVR.JS 3.4.38 --- index.html | 8 +++-- licenses/index.html | 8 ++--- svr.js | 71 ++++++++++++++++++++++++++++++++++++--------- tests.html | 4 +-- 4 files changed, 69 insertions(+), 22 deletions(-) diff --git a/index.html b/index.html index 8549130..79c5866 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ - SVR.JS 3.4.37 + SVR.JS 3.4.38 -

Welcome to SVR.JS 3.4.37

+

Welcome to SVR.JS 3.4.38



@@ -119,7 +119,9 @@

Changes:


Tests
diff --git a/licenses/index.html b/licenses/index.html index 9df26a1..3ee74d0 100644 --- a/licenses/index.html +++ b/licenses/index.html @@ -1,7 +1,7 @@ - SVR.JS 3.4.37 Licenses + SVR.JS 3.4.38 Licenses -

SVR.JS 3.4.37 Licenses

-

SVR.JS 3.4.37

+

SVR.JS 3.4.38 Licenses

+

SVR.JS 3.4.38

MIT License

@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-

Packages used by SVR.JS 3.4.37 and utilities

+

Packages used by SVR.JS 3.4.38 and utilities

License: MIT
diff --git a/svr.js b/svr.js index c7a510f..55d69a8 100644 --- a/svr.js +++ b/svr.js @@ -71,7 +71,7 @@ function deleteFolderRecursive(path) { } var os = require("os"); -var version = "3.4.37"; +var version = "3.4.38"; var singlethreaded = false; if (process.versions) process.versions.svrjs = version; //Inject SVR.JS into process.versions @@ -340,7 +340,7 @@ function SVRJSFork() { } } newWorker.on("error", function (err) { - if(!reallyExiting) serverconsole.locwarnmessage("There was a problem when handling SVR.JS worker! (from master process side) Reason: " + err.message); + serverconsole.locwarnmessage("There was a problem when handling SVR.JS worker! (from master process side) Reason: " + err.message); }); newWorker.on("exit", function () { if (!exiting && Object.keys(cluster.workers).length == 0) { @@ -2815,7 +2815,11 @@ if (!cluster.isPrimary) { delete table["connection"]; delete table["keep-alive"]; delete table["upgrade"]; - return response.writeHeadNodeApi(a, table); + if(res.stream && res.stream.destroyed) { + return false; + } else { + return res.writeHeadNodeApi(a, table); + } }; response.setHeader = function (a, b) { @@ -4263,6 +4267,8 @@ function bruteForceListenerWrapper(worker) { }; } +var isWorkerHungUpBuff2 = true; + function msgListener(msg) { for (var i = 0; i < Object.keys(cluster.workers).length; i++) { if (msg == "\x12END") { @@ -4279,6 +4285,8 @@ function msgListener(msg) { serverconsole.locmessage("Configuration saved."); } else if (msg.indexOf("\x12SAVEERR") == 0) { serverconsole.locwarnmessage("There was a problem, while saving configuration file. Reason: " + msg.substr(8)); + } else if (msg == "\x12PINGOK") { + if(typeof isWorkerHungUpBuff2 != "undefined") isWorkerHungUpBuff2 = false; } else if (msg == "\x12OPEN") { closedMaster = false; } else if (msg == "\x12END") { @@ -4504,21 +4512,55 @@ function start(init) { } else if (cluster.isPrimary) { setInterval(function () { var allClusters = Object.keys(cluster.workers); - for (var i = 0; i < allClusters.length; i++) { + var goodWorkers = []; + function checkWorker(callback, _id) { + if(typeof _id === "undefined") _id = 0; + if(_id >= allClusters.length) { + callback(); + return; + } try { - if (cluster.workers[allClusters[i]]) { - cluster.workers[allClusters[i]].on("message", msgListener); - cluster.workers[allClusters[i]].send("\x14SAVECONF"); + if (cluster.workers[allClusters[_id]]) { + isWorkerHungUpBuff2 = true; + cluster.workers[allClusters[_id]].on("message", msgListener); + cluster.workers[allClusters[_id]].send("\x14PINGPING"); + setTimeout(function () { + if (isWorkerHungUpBuff2) { + checkWorker(callback, _id+1); + } else { + goodWorkers.push(allClusters[_id]); + checkWorker(callback, _id+1); + } + }, 250); + } else { + checkWorker(callback, _id+1); } - } catch (ex) { - if (cluster.workers[allClusters[i]]) { - cluster.workers[allClusters[i]].removeAllListeners("message"); - cluster.workers[allClusters[i]].on("message", bruteForceListenerWrapper(cluster.workers[allClusters[i]])); - cluster.workers[allClusters[i]].on("message", listenConnListener); + } catch (err) { + if (cluster.workers[allClusters[_id]]) { + cluster.workers[allClusters[_id]].removeAllListeners("message"); + cluster.workers[allClusters[_id]].on("message", bruteForceListenerWrapper(cluster.workers[allClusters[_id]])); + cluster.workers[allClusters[_id]].on("message", listenConnListener); } - serverconsole.locwarnmessage("There was a problem, while saving configuration file. Reason: " + ex.message); + checkWorker(callback, _id+1); } } + checkWorker(function () { + var wN = Math.floor(Math.random() * goodWorkers.length); //Send a configuration saving message to a random worker. + try { + if (cluster.workers[goodWorkers[wN]]) { + isWorkerHungUpBuff2 = true; + cluster.workers[goodWorkers[wN]].on("message", msgListener); + cluster.workers[goodWorkers[wN]].send("\x14SAVECONF"); + } + } catch (err) { + if (cluster.workers[goodWorkers[wN]]) { + cluster.workers[goodWorkers[wN]].removeAllListeners("message"); + cluster.workers[goodWorkers[wN]].on("message", bruteForceListenerWrapper(cluster.workers[goodWorkers[wN]])); + cluster.workers[goodWorkers[wN]].on("message", listenConnListener); + } + serverconsole.locwarnmessage("There was a problem while saving configuration file. Reason: " + err.message); + } + }); }, 300000); } if (!cluster.isPrimary && cluster.isPrimary !== undefined) { @@ -4536,6 +4578,9 @@ function start(init) { process.send("\x12SAVEERR" + ex.message); } process.send("\x12END"); + } else if (line == "\x14PINGPING") { + process.send("\x12PINGOK"); + process.send("\x12END"); } else if (commands[line.split(" ")[0]] !== undefined && commands[line.split(" ")[0]] !== null) { var argss = line.split(" "); var command = argss.shift(); diff --git a/tests.html b/tests.html index b90b71d..dc8f91a 100644 --- a/tests.html +++ b/tests.html @@ -1,7 +1,7 @@ - SVR.JS 3.4.37 Tests + SVR.JS 3.4.38 Tests -

SVR.JS 3.4.37 Tests

+

SVR.JS 3.4.38 Tests

Directory

Directory (with query)