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

Added support for Range requests for HTML files

Browse source
This commit is contained in:
Dorian Niemiec 2024-05-13 17:29:18 +02:00
parent f3edbcc3f3
commit 0a3371878c
1 changed files with 41 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
svr.js
View file

@ -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,11 +3678,11 @@ 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;
delete rhd["Content-Type"]; delete rhd["Content-Type"];
@ -3690,9 +3691,18 @@ if (!cluster.isPrimary) {
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") {
@ -3716,9 +3726,30 @@ if (!cluster.isPrimary) {
} }
}).on("open", function () { }).on("open", function () {
try { try {
if (ext == "html") {
function afterWriteCallback() {
readStream.on("end", function () {
if(end > head.length + filelen) {
res.end(foot.substring(0, end - head.length - filelen + 1));
}
});
readStream.pipe(res, {
end: (end > head.length + filelen) ? false : true
});
}
res.writeHead(206, http.STATUS_CODES[206], hdhds);
if (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); res.writeHead(206, http.STATUS_CODES[206], rhd);
readStream.pipe(res); 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);
} }
@ -3793,7 +3824,7 @@ 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"];
var mtype = mime.contentType(ext); var mtype = mime.contentType(ext);
if (mtype && ext != "") hdhds["Content-Type"] = mtype; if (mtype && ext != "") hdhds["Content-Type"] = mtype;