zefie/minisrv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: properly handle proxy dns error

Browse Source
This commit is contained in:
zefie
2021-07-17 10:29:45 -04:00
parent bffc7b7945
commit 56ced69897
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
hacktv_updsrv/app.js
View File

@@ -77,22 +77,21 @@ function getFileExt(path) {
} }
function doErrorPage(code, data = null) { function doErrorPage(code, data = null) {
var headers, data = null; var headers = null;
switch (code) { switch (code) {
case 404: case 404:
if (data === null) data = "The service could not find the requested page."; if (data === null) data = "The service could not find the requested page.";
headers = "404 "+data+"\r\n"; headers = "404 " + data + "\r\n";
headers += "Content-Type: text/html\r\n"; headers += "Content-Type: text/html\r\n";
break; break;
case 400: case 400:
if (data === null) data = "An internal server error has occured."; if (data === null) data = "HackTV ran into a technical problem.";
headers = "400 HackTV ran into a technical problem.\r\n"; headers = "400 " + data + "\r\n";
headers += "Content-Type: text/html\r\n"; headers += "Content-Type: text/html\r\n";
break; break;
default: default:
// what we send when we did not detect a wtv-url. // what we send when we did not detect a wtv-url.
// e.g. when a pc browser connects // e.g. when a pc browser connects
if (data === null) data = "Hello, stranger!";
headers = "HTTP/1.1 200 OK\r\n"; headers = "HTTP/1.1 200 OK\r\n";
headers += "Content-Type: text/html\r\n"; headers += "Content-Type: text/html\r\n";
break; break;
@@ -349,7 +348,18 @@ async function doHTTPProxy(socket, request_headers) {
if (data.substring(0, 2) == "\n\n") data = data.substring(2); if (data.substring(0, 2) == "\n\n") data = data.substring(2);
sendToClient(socket, headers, data); sendToClient(socket, headers, data);
}); });
}); }).on('error', function (err) {
var errpage, headers, data = null;
if (err.code == "ENOTFOUND") {
errpage = doErrorPage(400,`The publisher ${err.hostname} is unknown.`);
} else {
console.log(" * Unhandled Proxy Request Error:", err);
errpage = doErrorPage(400);
}
headers = errpage[0];
data = errpage[1];
sendToClient(socket, headers, data);
});;
if (request_headers['post_data']) { if (request_headers['post_data']) {
req.write(Buffer.from(request_headers['post_data'].toString(CryptoJS.enc.Hex), 'hex'), function () { req.write(Buffer.from(request_headers['post_data'].toString(CryptoJS.enc.Hex), 'hex'), function () {
req.end(); req.end();