});
}
var possibly_wakeup_clients = function() {
+ var num_viewers = count_viewers();
for (var i in sleeping_clients) {
clearTimeout(sleeping_clients[i].timer);
- send_json(sleeping_clients[i].response, sleeping_clients[i].accept_gzip);
+ mark_recently_seen(sleeping_clients[i].unique);
+ send_json(sleeping_clients[i].response,
+ sleeping_clients[i].accept_gzip,
+ num_viewers);
}
sleeping_clients = {};
}
response.write('Something went wrong. Sorry.');
response.end();
}
-var send_json = function(response, accept_gzip) {
+var send_json = function(response, accept_gzip, num_viewers) {
var headers = {
'Content-Type': 'text/json',
'X-Remoteglot-Last-Modified': json_last_modified,
- 'X-Remoteglot-Num-Viewers': count_viewers(),
+ 'X-Remoteglot-Num-Viewers': num_viewers,
'Access-Control-Allow-Origin': 'http://analysis.sesse.net',
'Access-Control-Expose-Headers': 'X-Remoteglot-Last-Modified, X-Remoteglot-Num-Viewers',
'Expires': 'Mon, 01 Jan 1970 00:00:00 UTC',
response.end();
}
var timeout_client = function(client) {
- send_json(client.response, client.accept_gzip);
+ mark_recently_seen(client.unique);
+ send_json(client.response, client.accept_gzip, count_viewers());
delete sleeping_clients[client.request_id];
}
+var mark_recently_seen = function(unique) {
+ if (unique) {
+ last_seen_clients[unique] = (new Date).getTime();
+ }
+}
var count_viewers = function() {
var now = (new Date).getTime();
var new_last_seen_clients = {};
var num_viewers = 0;
for (var unique in last_seen_clients) {
- if (now - last_seen_clients[unique] < 60000) {
+ if (now - last_seen_clients[unique] < 5000) {
++num_viewers;
new_last_seen_clients[unique] = last_seen_clients[unique];
}
}
+
+ // Also add sleeping clients that we would otherwise assume timed out.
+ for (var request_id in sleeping_clients) {
+ var unique = sleeping_clients[request_id].unique;
+ if (unique && !(unique in new_last_seen_clients)) {
+ ++num_viewers;
+ }
+ }
+
last_seen_clients = new_last_seen_clients;
return num_viewers;
}
fs.watch(path.dirname(json_filename), reread_file);
reread_file(null, path.basename(json_filename));
-http.createServer(function(request, response) {
+var server = http.createServer();
+server.on('request', function(request, response) {
var u = url.parse(request.url, true);
var ims = (u.query)['ims'];
var unique = (u.query)['unique'];
return;
}
- if (unique) {
- last_seen_clients[unique] = (new Date).getTime();
- }
+ mark_recently_seen(unique);
var accept_encoding = request.headers['accept-encoding'];
var accept_gzip;
// If we already have something newer than what the user has,
// just send it out and be done with it.
if (json_last_modified !== undefined && (!ims || json_last_modified > ims)) {
- send_json(response, accept_gzip);
+ send_json(response, accept_gzip, count_viewers());
return;
}
client.timer = setTimeout(function() { timeout_client(client); }, 30000);
client.request_id = request_id;
client.accept_gzip = accept_gzip;
+ client.unique = unique;
sleeping_clients[request_id++] = client;
-}).listen(5000);
+
+ request.socket.client = client;
+});
+server.on('connection', function(socket) {
+ socket.on('close', function() {
+ var client = socket.client;
+ if (client) {
+ mark_recently_seen(client.unique);
+ delete sleeping_clients[client.request_id];
+ }
+ });
+});
+server.listen(5000);