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

Update to SVR.JS 3.15.1

Browse source
This commit is contained in:
Dorian Niemiec 2024-05-13 18:03:58 +02:00
parent 73b062d306
commit 25280b310c
4 changed files with 66 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
index.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>SVR.JS 3.15.0</title> <title>SVR.JS 3.15.1</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<style> <style>
@ -76,7 +76,7 @@
</style> </style>
</head> </head>
<body> <body>
<h1>Welcome to SVR.JS 3.15.0</h1> <h1>Welcome to SVR.JS 3.15.1</h1>
<br /> <br />
<img src="/logo.png" style="width: 224px; max-width: 100%;" /> <img src="/logo.png" style="width: 224px; max-width: 100%;" />
<br /> <br />
@ -148,11 +148,9 @@
</code> </code>
<p>Changes:</p> <p>Changes:</p>
<ul style="display: inline-block; margin: 0;"> <ul style="display: inline-block; margin: 0;">
<li>Changed URL parser from wrapper over WHATWG URL parser to custom regex-based URL parser.</li> <li>Added Content-Range support for HTML files.</li>
<li>Optimized server code.</li> <li>MIME type lookups are now performed once, not twice.</li>
<li>Redesigned default error pages.</li> <li>Optimized static file serving function.</li>
<li>Removed blocking file system calls from the directory listing function.</li>
<li>Replaced <i>path.extname()</i> function with regex-based function.</li>
</ul> </ul>
<p> <p>
<a href="/tests.html">Tests</a><br /> <a href="/tests.html">Tests</a><br />

8
licenses/index.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>SVR.JS 3.15.0 Licenses</title> <title>SVR.JS 3.15.1 Licenses</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<style> <style>
@ -76,8 +76,8 @@
</style> </style>
</head> </head>
<body> <body>
<h1>SVR.JS 3.15.0 Licenses</h1> <h1>SVR.JS 3.15.1 Licenses</h1>
<h2>SVR.JS 3.15.0</h2> <h2>SVR.JS 3.15.1</h2>
<div style="display: inline-block; text-align: left; border-width: 2px; border-style: solid; border-color: gray; padding: 8px;"> <div style="display: inline-block; text-align: left; border-width: 2px; border-style: solid; border-color: gray; padding: 8px;">
MIT License<br/> MIT License<br/>
<br/> <br/>
@ -101,7 +101,7 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE<br/> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE<br/>
SOFTWARE.<br/> SOFTWARE.<br/>
</div> </div>
<h2>Packages used by SVR.JS 3.15.0</h2> <h2>Packages used by SVR.JS 3.15.1</h2>
<div style="width: 100%; max-width: 1280px; margin: auto"> <div style="width: 100%; max-width: 1280px; margin: auto">
<div style="width: 100%; background-color: #ccc; background-color: rgba(200, 200, 200, 0.3); border: 1px solid green; text-align: left; margin: 10px 0;"> <div style="width: 100%; background-color: #ccc; background-color: rgba(200, 200, 200, 0.3); border: 1px solid green; text-align: left; margin: 10px 0;">
<div style="float: right;">License: MIT</div> <div style="float: right;">License: MIT</div>

72
svr.js
View file

@ -69,7 +69,7 @@ function deleteFolderRecursive(path) {
} }
var os = require("os"); var os = require("os");
var version = "3.15.0"; var version = "3.15.1";
var singlethreaded = false; var singlethreaded = false;
if (process.versions) process.versions.svrjs = version; // Inject SVR.JS into process.versions if (process.versions) process.versions.svrjs = version; // Inject SVR.JS into process.versions
@ -3654,7 +3654,7 @@ if (!cluster.isPrimary) {
} }
// Handle partial content request // Handle partial content request
if (ext != "html" && req.headers["range"]) { if (req.headers["range"]) {
try { try {
var rhd = getCustomHeaders(); var rhd = getCustomHeaders();
rhd["Accept-Ranges"] = "bytes"; rhd["Accept-Ranges"] = "bytes";
@ -3666,8 +3666,9 @@ if (!cluster.isPrimary) {
// Process the partial content request // Process the partial content request
var beginOrig = regexmatch[1]; var beginOrig = regexmatch[1];
var endOrig = regexmatch[2]; var endOrig = regexmatch[2];
var maxEnd = filelen - 1 + (ext == "html" ? head.length + foot.length : 0)
var begin = 0; var begin = 0;
var end = filelen - 1; var end = maxEnd;
if (beginOrig == "" && endOrig == "") { if (beginOrig == "" && endOrig == "") {
callServerError(416, rhd); callServerError(416, rhd);
return; return;
@ -3677,20 +3678,31 @@ if (!cluster.isPrimary) {
begin = parseInt(beginOrig); begin = parseInt(beginOrig);
if (endOrig != "") end = parseInt(endOrig); if (endOrig != "") end = parseInt(endOrig);
} }
if (begin > end || begin < 0 || begin > filelen - 1) { if (begin > end || begin < 0 || begin > maxEnd) {
callServerError(416, rhd); callServerError(416, rhd);
return; return;
} }
if (end > filelen - 1) end = filelen - 1; if (end > maxEnd) end = maxEnd;
rhd["Content-Range"] = "bytes " + begin + "-" + end + "/" + filelen; rhd["Content-Range"] = "bytes " + begin + "-" + end + "/" + filelen;
rhd["Content-Length"] = end - begin + 1; rhd["Content-Length"] = end - begin + 1;
if (!(mime.contentType(ext) == false) && ext != "") rhd["Content-Type"] = mime.contentType(ext); delete rhd["Content-Type"];
var mtype = mime.contentType(ext);
if (mtype && ext != "") rhd["Content-Type"] = mtype;
if (fileETag) rhd["ETag"] = fileETag; if (fileETag) rhd["ETag"] = fileETag;
if (req.method != "HEAD") { if (req.method != "HEAD") {
if (ext == "html" && begin < head.length && (end - begin) < head.length) {
res.writeHead(206, http.STATUS_CODES[206], hdhds);
res.end(head.substring(begin, end + 1));
return;
} else if (ext == "html" && begin >= head.length + filelen){
res.writeHead(206, http.STATUS_CODES[206], hdhds);
res.end(foot.substring(begin - head.length - filelen, end - head.length - filelen + 1));
return;
}
var readStream = fs.createReadStream(readFrom, { var readStream = fs.createReadStream(readFrom, {
start: begin, start: ext == "html" ? Math.max(0, begin - head.length) : begin,
end: end end: ext == "html" ? Math.min(filelen, end - head.length) : end
}); });
readStream.on("error", function (err) { readStream.on("error", function (err) {
if (err.code == "ENOENT") { if (err.code == "ENOENT") {
@ -3714,8 +3726,29 @@ if (!cluster.isPrimary) {
} }
}).on("open", function () { }).on("open", function () {
try { try {
res.writeHead(206, http.STATUS_CODES[206], rhd); if (ext == "html") {
readStream.pipe(res); function afterWriteCallback() {
if(foot.length > 0 && end > head.length + filelen) {
readStream.on("end", function () {
res.end(foot.substring(0, end - head.length - filelen + 1));
});
}
readStream.pipe(res, {
end: !(foot.length > 0 && end > head.length + filelen)
});
}
res.writeHead(206, http.STATUS_CODES[206], hdhds);
if (head.length == 0 || begin > head.length) {
afterWriteCallback();
} else if (!res.write(head.substring(begin, head.length - begin))) {
res.on("drain", afterWriteCallback);
} else {
process.nextTick(afterWriteCallback);
}
} else {
res.writeHead(206, http.STATUS_CODES[206], rhd);
readStream.pipe(res);
}
serverconsole.resmessage("Client successfully received content."); serverconsole.resmessage("Client successfully received content.");
} catch (err) { } catch (err) {
callServerError(500, err); callServerError(500, err);
@ -3791,9 +3824,10 @@ if (!cluster.isPrimary) {
hdhds["Content-Length"] = filelen; hdhds["Content-Length"] = filelen;
} }
} }
if (ext != "html") hdhds["Accept-Ranges"] = "bytes"; hdhds["Accept-Ranges"] = "bytes";
delete hdhds["Content-Type"]; delete hdhds["Content-Type"];
if (!(mime.contentType(ext) == false) && ext != "") hdhds["Content-Type"] = mime.contentType(ext); var mtype = mime.contentType(ext);
if (mtype && ext != "") hdhds["Content-Type"] = mtype;
if (fileETag) hdhds["ETag"] = fileETag; if (fileETag) hdhds["ETag"] = fileETag;
if (req.method != "HEAD") { if (req.method != "HEAD") {
@ -3835,15 +3869,19 @@ if (!cluster.isPrimary) {
} }
if (ext == "html") { if (ext == "html") {
function afterWriteCallback() { function afterWriteCallback() {
readStream.on("end", function () { if (foot.length > 0) {
resStream.end(foot); readStream.on("end", function () {
}); resStream.end(foot);
});
}
readStream.pipe(resStream, { readStream.pipe(resStream, {
end: false end: (foot.length == 0)
}); });
} }
res.writeHead(200, http.STATUS_CODES[200], hdhds); res.writeHead(200, http.STATUS_CODES[200], hdhds);
if (!resStream.write(head)) { if (head.length == 0) {
afterWriteCallback();
} else if (!resStream.write(head)) {
resStream.on("drain", afterWriteCallback); resStream.on("drain", afterWriteCallback);
} else { } else {
process.nextTick(afterWriteCallback); process.nextTick(afterWriteCallback);

4
tests.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>SVR.JS 3.15.0 Tests</title> <title>SVR.JS 3.15.1 Tests</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<style> <style>
@ -76,7 +76,7 @@
</style> </style>
</head> </head>
<body> <body>
<h1>SVR.JS 3.15.0 Tests</h1> <h1>SVR.JS 3.15.1 Tests</h1>
<h2>Directory (without trailing slash)</h2> <h2>Directory (without trailing slash)</h2>
<iframe src="/testdir" width="75%" height="300px"></iframe> <iframe src="/testdir" width="75%" height="300px"></iframe>
<h2>Directory (with query)</h2> <h2>Directory (with query)</h2>