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

Partially revert previous commit (add blocking calls back due to degraded performance in Bun)

Browse source
This commit is contained in:
Dorian Niemiec 2024-05-05 22:23:25 +02:00
parent 45d45c41af
commit 4453724db7
1 changed files with 12 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
svr.js
View file

@ -2661,62 +2661,10 @@ if (!cluster.isPrimary) {
malformedcounter++; malformedcounter++;
serverconsole.locmessage("Somebody connected to " + (secure && fromMain ? ((typeof sport == "number" ? "port " : "socket ") + sport) : ((typeof port == "number" ? "port " : "socket ") + port)) + "..."); serverconsole.locmessage("Somebody connected to " + (secure && fromMain ? ((typeof sport == "number" ? "port " : "socket ") + sport) : ((typeof port == "number" ? "port " : "socket ") + port)) + "...");
serverconsole.reqmessage("Client " + ((!reqip || reqip == "") ? "[unknown client]" : (reqip + ((reqport && reqport !== 0) && reqport != "" ? ":" + reqport : ""))) + " sent invalid request."); serverconsole.reqmessage("Client " + ((!reqip || reqip == "") ? "[unknown client]" : (reqip + ((reqport && reqport !== 0) && reqport != "" ? ":" + reqport : ""))) + " sent invalid request.");
function getCustomHeader(callback) {
fs.readFile(("./.head").replace(/\/+/g, "/"), function (err, data) {
if (err) {
if (err.code == "ENOENT" || err.code == "EISDIR") {
fs.readFile(("./head.html").replace(/\/+/g, "/"), function (err, data) {
if (err) {
if (err.code == "ENOENT" || err.code == "EISDIR") {
callback();
} else {
callServerError(500, err);
}
} else {
head = data.toString();
callback();
}
});
} else {
callServerError(500, err);
}
} else {
head = data.toString();
callback();
}
});
}
function getCustomFooter(callback) {
fs.readFile(("./.foot").replace(/\/+/g, "/"), function (err, data) {
if (err) {
if (err.code == "ENOENT" || err.code == "EISDIR") {
fs.readFile(("./foot.html").replace(/\/+/g, "/"), function (err, data) {
if (err) {
if (err.code == "ENOENT" || err.code == "EISDIR") {
callback();
} else {
callServerError(500, err);
}
} else {
foot = data.toString();
callback();
}
});
} else {
callServerError(500, err);
}
} else {
foot = data.toString();
callback();
}
});
}
getCustomHeader(function () {
getCustomFooter(function () {
try { try {
head = fs.existsSync("./.head") ? fs.readFileSync("./.head").toString() : (fs.existsSync("./head.html") ? fs.readFileSync("./head.html").toString() : ""); // header
foot = fs.existsSync("./.foot") ? fs.readFileSync("./.foot").toString() : (fs.existsSync("./foot.html") ? fs.readFileSync("./foot.html").toString() : ""); // footer
if ((err.code && (err.code.indexOf("ERR_SSL_") == 0 || err.code.indexOf("ERR_TLS_") == 0)) || (!err.code && err.message.indexOf("SSL routines") != -1)) { if ((err.code && (err.code.indexOf("ERR_SSL_") == 0 || err.code.indexOf("ERR_TLS_") == 0)) || (!err.code && err.message.indexOf("SSL routines") != -1)) {
if (err.code == "ERR_SSL_HTTP_REQUEST" || err.message.indexOf("http request") != -1) { if (err.code == "ERR_SSL_HTTP_REQUEST" || err.message.indexOf("http request") != -1) {
serverconsole.errmessage("Client sent HTTP request to HTTPS port."); serverconsole.errmessage("Client sent HTTP request to HTTPS port.");
@ -2805,8 +2753,6 @@ getCustomHeader(function () {
serverconsole.errmessage("There was an error while determining type of malformed request."); serverconsole.errmessage("There was an error while determining type of malformed request.");
callServerError(400); callServerError(400);
} }
});
});
} }
function connhandler(request, socket, head) { function connhandler(request, socket, head) {
@ -2920,10 +2866,9 @@ getCustomHeader(function () {
} }
function vres() { function vres() {
serverconsole.errmessage("SVR.JS doesn't support proxy without proxy mod."); serverconsole.errmessage("SVR.JS doesn't support proxy without proxy mod.");
if (!socket.destroyed) socket.end("HTTP/1.1 501 Not Implemented\n\n"); if (!socket.destroyed) socket.end("HTTP/1.1 501 Not Implemented\n\n");
} }
modExecute(mods, vres); modExecute(mods, vres);
} }
@ -3368,57 +3313,12 @@ getCustomHeader(function () {
}); });
} }
function getCustomHeader(callback) { try {
fs.readFile(("./.head").replace(/\/+/g, "/"), function (err, data) { head = fs.existsSync("./.head") ? fs.readFileSync("./.head").toString() : (fs.existsSync("./head.html") ? fs.readFileSync("./head.html").toString() : ""); // header
if (err) { foot = fs.existsSync("./.foot") ? fs.readFileSync("./.foot").toString() : (fs.existsSync("./foot.html") ? fs.readFileSync("./foot.html").toString() : ""); // footer
if (err.code == "ENOENT" || err.code == "EISDIR") { } catch (err) {
fs.readFile(("./head.html").replace(/\/+/g, "/"), function (err, data) { callServerError(500, err);
if (err) {
if (err.code == "ENOENT" || err.code == "EISDIR") {
callback();
} else {
callServerError(500, err);
}
} else {
head = data.toString();
callback();
}
});
} else {
callServerError(500, err);
}
} else {
head = data.toString();
callback();
} }
});
}
function getCustomFooter(callback) {
fs.readFile(("./.foot").replace(/\/+/g, "/"), function (err, data) {
if (err) {
if (err.code == "ENOENT" || err.code == "EISDIR") {
fs.readFile(("./foot.html").replace(/\/+/g, "/"), function (err, data) {
if (err) {
if (err.code == "ENOENT" || err.code == "EISDIR") {
callback();
} else {
callServerError(500, err);
}
} else {
foot = data.toString();
callback();
}
});
} else {
callServerError(500, err);
}
} else {
foot = data.toString();
callback();
}
});
}
// Function to perform HTTP redirection to a specified destination URL // Function to perform HTTP redirection to a specified destination URL
@ -3492,8 +3392,6 @@ function getCustomFooter(callback) {
}); });
} }
getCustomHeader( function () {
getCustomFooter( function () {
// Authenticated user variable // Authenticated user variable
var authUser = null; var authUser = null;
@ -3523,7 +3421,6 @@ function getCustomFooter(callback) {
} }
var origHref = href; // Placeholder origHref var origHref = href; // Placeholder origHref
if (req.headers["expect"] && req.headers["expect"] != "100-continue") { if (req.headers["expect"] && req.headers["expect"] != "100-continue") {
// Expectations not met. // Expectations not met.
callServerError(417); callServerError(417);
@ -3554,7 +3451,7 @@ function getCustomFooter(callback) {
var vresCalled = false; var vresCalled = false;
function vres() { function vres() {
if (vresCalled) { if (vresCalled) {
process.emitWarning("elseCallback() invoked multiple times.", { process.emitWarning("elseCallback() invoked multiple times.", {
code: "WARN_SVRJS_MULTIPLE_ELSECALLBACK" code: "WARN_SVRJS_MULTIPLE_ELSECALLBACK"
@ -4958,9 +4855,8 @@ function getCustomFooter(callback) {
} catch (err) { } catch (err) {
callServerError(500, err); callServerError(500, err);
} }
});
});
} }
function serverErrorHandler(err, isRedirect) { function serverErrorHandler(err, isRedirect) {
if(isRedirect) attmtsRedir--; if(isRedirect) attmtsRedir--;
else attmts--; else attmts--;