tasiaiso/tildefriends
1
0
Fork 0
forked from cory/tildefriends
Code Issues Pull Requests Releases Wiki Activity

Trying harder still to curb stale connections.

Browse Source 
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3900 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
Cory McWilliams
2022-06-17 18:51:24 +00:00
parent 4293e75082
commit b5b6ed8ba5
2 changed files with 61 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
core/httpd.js
View File

@ -5,6 +5,7 @@ var gSocketHandlers = [];
var gBadRequests = {};
const kRequestTimeout = 15000;
const kStallTimeout = 60000;
function logError(error) {
print("ERROR " + error);
@ -388,10 +389,12 @@ function allowRequest(client) {
function handleConnection(client) {
if (!allowRequest(client)) {
print('Rejecting client for too many bad requests: ', client.peerName, gBadRequests[client.peerName].reason);
client.info = 'rejected';
client.close();
return;
}
client.info = 'accepted';
var inputBuffer = new Uint8Array(0);
var request;
var headers = {};
@ -399,17 +402,37 @@ function handleConnection(client) {
var bodyToRead = -1;
var body;
var requestCount = -1;
var readCount = 0;
var isWebsocket = false;
function resetTimeout(requestIndex) {
setTimeout(function() {
if (bodyToRead == -1 && requestCount == requestIndex) {
if (requestCount == 0) {
badRequest(client, 'Timed out waiting for request.');
} else {
client.close();
if (isWebsocket) {
return;
}
if (bodyToRead == -1) {
setTimeout(function() {
if (requestCount == requestIndex) {
client.info = 'timed out';
if (requestCount == 0) {
badRequest(client, 'Timed out waiting for request.');
} else {
client.close();
}
}
}
}, kRequestTimeout);
}, kRequestTimeout);
} else {
var lastReadCount = readCount;
setTimeout(function() {
if (readCount == lastReadCount) {
client.info = 'stalled';
if (requestCount == 0) {
badRequest(client, 'Request stalled.');
} else {
client.close();
}
}
}, kStallTimeout);
}
}
resetTimeout(++requestCount);
@ -421,10 +444,12 @@ function handleConnection(client) {
lineByLine = true;
bodyToRead = -1;
body = undefined;
client.info = 'reset';
resetTimeout(++requestCount);
}
function finish() {
client.info = 'finishing';
var requestObject = new Request(request[0], request[1], request[2], headers, body, client);
var response = new Response(requestObject, client);
try {
@ -468,11 +493,14 @@ function handleConnection(client) {
return false;
}
body = new Uint8Array(bodyToRead);
client.info = 'waiting for body';
return true;
} else if (headers["connection"]
&& headers["connection"].toLowerCase().split(",").map(x => x.trim()).indexOf("upgrade") != -1
&& headers["upgrade"]
&& headers["upgrade"].toLowerCase() == "websocket") {
isWebsocket = true;
client.info = 'websocket';
var requestObject = new Request(request[0], request[1], request[2], headers, body, client);
var response = new Response(requestObject, client);
handleWebSocketRequest(requestObject, response, client);
@ -504,7 +532,11 @@ function handleConnection(client) {
});
client.read(function(data) {
readCount++;
if (data) {
if (bodyToRead != -1 && !isWebsocket) {
resetTimeout(requestCount);
}
const kMaxLineLength = 4096;
var newBuffer = new Uint8Array(inputBuffer.length + data.length);
newBuffer.set(inputBuffer, 0);
@ -537,6 +569,9 @@ function handleConnection(client) {
inputBuffer = new Uint8Array(0);
}
}
} else {
client.info = 'EOF';
client.close();
}
});
}