DorianNiemiecSVRJS/svrjs
Archived
1
0
Fork 0
forked from svrjs/svrjs
Code Pull requests Activity

Add warning about worker count limited to one when using Bun 1.0 and newer with shimmed (not native) clustering module.

Browse source
This commit is contained in:
Dorian Niemiec 2023-09-10 19:30:29 +02:00
parent 7973dafa60
commit e828bb9173
2 changed files with 36 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.json
View file

@ -3,7 +3,7 @@
"port": 80, "port": 80,
"pubport": 80, "pubport": 80,
"page404": "404.html", "page404": "404.html",
"timestamp": 1694365365939, "timestamp": 1694366855651,
"blacklist": [], "blacklist": [],
"nonStandardCodes": [], "nonStandardCodes": [],
"enableCompression": true, "enableCompression": true,

22
svr.js
View file

@ -151,6 +151,7 @@ if (!singlethreaded) {
cluster.isMaster = !process.env.NODE_UNIQUE_ID; cluster.isMaster = !process.env.NODE_UNIQUE_ID;
cluster.isPrimary = cluster.isMaster; cluster.isPrimary = cluster.isMaster;
cluster.isWorker = !cluster.isMaster; cluster.isWorker = !cluster.isMaster;
cluster.__shimmed__ = true;
if (cluster.isWorker) { if (cluster.isWorker) {
// Shim the cluster.worker object for worker processes // Shim the cluster.worker object for worker processes
@ -329,6 +330,7 @@ var SVRJSInitialized = false;
var exiting = false; var exiting = false;
var reallyExiting = false; var reallyExiting = false;
var crashed = false; var crashed = false;
var threadLimitWarned = false;
function SVRJSFork() { function SVRJSFork() {
// Log // Log
@ -336,16 +338,35 @@ function SVRJSFork() {
// Fork new worker // Fork new worker
var newWorker = {}; var newWorker = {};
try { try {
if (cluster.__shimmed__ && process.isBun && process.versions.bun && process.versions.bun[0] != "0" && !threadLimitWarned) {
threadLimitWarned = true;
serverconsole.locwarnmessage("SVR.JS limited the number of workers to one, because of startup problems in Bun 1.0 and newer with shimmed (not native) clustering module. Reliability may suffer.");
}
if (!(cluster.__shimmed__ && process.isBun && process.versions.bun && process.versions.bun[0] != "0" && Object.keys(cluster.workers) > 0)) {
newWorker = cluster.fork(); newWorker = cluster.fork();
} else {
if (SVRJSInitialized) serverconsole.locwarnmessage("SVR.JS limited the number of workers to one, because of startup problems in Bun 1.0 and newer with shimmed (not native) clustering module. Reliability may suffer.");
}
} catch (err) { } catch (err) {
if(err.name == "NotImplementedError") { if(err.name == "NotImplementedError") {
// If cluster.fork throws a NotImplementedError, shim cluster module // If cluster.fork throws a NotImplementedError, shim cluster module
cluster.bunShim(); cluster.bunShim();
if (cluster.__shimmed__ && process.isBun && process.versions.bun && process.versions.bun[0] != "0" && !threadLimitWarned) {
threadLimitWarned = true;
serverconsole.locwarnmessage("SVR.JS limited the number of workers to one, because of startup problems in Bun 1.0 and newer with shimmed (not native) clustering module. Reliability may suffer.");
}
if (!(cluster.__shimmed__ && process.isBun && process.versions.bun && process.versions.bun[0] != "0" && Object.keys(cluster.workers) > 0)) {
newWorker = cluster.fork(); newWorker = cluster.fork();
} else {
if (SVRJSInitialized) serverconsole.locwarnmessage("SVR.JS limited the number of workers to one, because of startup problems in Bun 1.0 and newer with shimmed (not native) clustering module. Reliability may suffer.");
}
} else { } else {
throw err; throw err;
} }
} }
// Add event listeners
if(newWorker.on) {
newWorker.on("error", function (err) { 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); if(!reallyExiting) serverconsole.locwarnmessage("There was a problem when handling SVR.JS worker! (from master process side) Reason: " + err.message);
}); });
@ -358,6 +379,7 @@ function SVRJSFork() {
newWorker.on("message", bruteForceListenerWrapper(newWorker)); newWorker.on("message", bruteForceListenerWrapper(newWorker));
newWorker.on("message", listenConnListener); newWorker.on("message", listenConnListener);
} }
}
var http = require("http"); var http = require("http");
http.STATUS_CODES[497] = "HTTP Request Sent to HTTPS Port"; http.STATUS_CODES[497] = "HTTP Request Sent to HTTPS Port";