X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=www%2Fserve-analysis.js;h=40d4f194f0e1b45f557168e0fdeb9185b55039f8;hp=cc1d2dd4303bdf6e0eb9428ec5072ea81c962c42;hb=bc34229c7767d4c255e6537c7b604ba5bb7a0e28;hpb=70bc196b94f2959ea9726f62019e5f0caa696eab

diff --git a/www/serve-analysis.js b/www/serve-analysis.js
index cc1d2dd..40d4f19 100644
--- a/www/serve-analysis.js
+++ b/www/serve-analysis.js
@@ -11,13 +11,21 @@ var zlib = require('zlib');
 var delta = require('./js/json_delta.js');
 
 // Constants.
-var json_filename = '/srv/analysis.sesse.net/www/analysis.json';
+var JSON_FILENAME = '/srv/analysis.sesse.net/www/analysis.json';
+var HISTORY_TO_KEEP = 5;
+var MINIMUM_VERSION = null;
+
+// TCP port to listen on; can be overridden with flags.
+var port = 5000;
+
+// If set to 1, we are already processing a JSON update and should not
+// start a new one. If set to 2, we are _also_ having one in the queue.
+var json_lock = 0;
 
 // The current contents of the file to hand out, and its last modified time.
 var json = undefined;
 
 // The last five timestamps, and diffs from them to the latest version.
-var history_to_keep = 5;
 var historic_json = [];
 var diff_json = {};
 
@@ -50,7 +58,7 @@ var replace_json = function(new_json_contents, mtime) {
 		}
 		if (!json.invalid_base) {
 			historic_json.push(json);
-			if (historic_json.length > history_to_keep) {
+			if (historic_json.length > HISTORY_TO_KEEP) {
 				historic_json.shift();
 			}
 		}
@@ -69,6 +77,7 @@ var replace_json = function(new_json_contents, mtime) {
 			new_json.gzip = buffer;
 			json = new_json;
 			diff_json = new_diff_json;
+			json_lock = 0;
 
 			// Finally, wake up any sleeping clients.
 			possibly_wakeup_clients();
@@ -88,8 +97,8 @@ var create_json_historic_diff = function(new_json, history_left, new_diff_json,
 	zlib.gzip(diff_text, function(err, buffer) {
 		if (err) throw err;
 		new_diff_json[histobj.last_modified] = {
-			plain: diff,
-			text: diff_text,
+			parsed: diff,
+			plain: diff_text,
 			gzip: buffer,
 			last_modified: new_json.last_modified,
 		};
@@ -98,11 +107,22 @@ var create_json_historic_diff = function(new_json, history_left, new_diff_json,
 }
 
 var reread_file = function(event, filename) {
-	if (filename != path.basename(json_filename)) {
+	if (filename != path.basename(JSON_FILENAME)) {
+		return;
+	}
+	if (json_lock >= 2) {
+		return;
+	}
+	if (json_lock == 1) {
+		// Already processing; wait a bit.
+		json_lock = 2;
+		setTimeout(function() { json_lock = 1; reread_file(event, filename); }, 100);
 		return;
 	}
-	console.log("Rereading " + json_filename);
-	fs.open(json_filename, 'r+', function(err, fd) {
+	json_lock = 1;
+
+	console.log("Rereading " + JSON_FILENAME);
+	fs.open(JSON_FILENAME, 'r+', function(err, fd) {
 		if (err) throw err;
 		fs.fstat(fd, function(err, st) {
 			if (err) throw err;
@@ -123,7 +143,7 @@ var reread_file = function(event, filename) {
 	touch_timer = setTimeout(function() {
 		console.log("Touching analysis.json due to no other activity");
 		var now = Date.now() / 1000;
-		fs.utimes(json_filename, now, now);
+		fs.utimes(JSON_FILENAME, now, now);
 	}, 30000);
 }
 var possibly_wakeup_clients = function() {
@@ -164,20 +184,25 @@ var send_json = function(response, ims, accept_gzip, num_viewers) {
 
 	var headers = {
 		'Content-Type': 'text/json',
-		'X-Remoteglot-Last-Modified': this_json.last_modified,
-		'X-Remoteglot-Num-Viewers': num_viewers,
-		'Access-Control-Expose-Headers': 'X-Remoteglot-Last-Modified, X-Remoteglot-Num-Viewers',
-		'Expires': 'Mon, 01 Jan 1970 00:00:00 UTC',
+		'X-RGLM': this_json.last_modified,
+		'X-RGNV': num_viewers,
+		'Access-Control-Expose-Headers': 'X-RGLM, X-RGNV, X-RGMV',
 		'Vary': 'Accept-Encoding',
 	};
 
+	if (MINIMUM_VERSION) {
+		headers['X-RGMV'] = MINIMUM_VERSION;
+	}
+
 	if (accept_gzip) {
+		headers['Content-Length'] = this_json.gzip.length;
 		headers['Content-Encoding'] = 'gzip';
 		response.writeHead(200, headers);
 		response.write(this_json.gzip);
 	} else {
+		headers['Content-Length'] = this_json.plain.length;
 		response.writeHead(200, headers);
-		response.write(this_json.text);
+		response.write(this_json.plain);
 	}
 	response.end();
 }
@@ -217,8 +242,8 @@ var count_viewers = function() {
 
 // Set up a watcher to catch changes to the file, then do an initial read
 // to make sure we have a copy.
-fs.watch(path.dirname(json_filename), reread_file);
-reread_file(null, path.basename(json_filename));
+fs.watch(path.dirname(JSON_FILENAME), reread_file);
+reread_file(null, path.basename(JSON_FILENAME));
 
 var server = http.createServer();
 server.on('request', function(request, response) {
@@ -226,7 +251,7 @@ server.on('request', function(request, response) {
 	var ims = (u.query)['ims'];
 	var unique = (u.query)['unique'];
 
-	console.log((new Date).getTime()*1e-3 + " " + request.url);
+	console.log(((new Date).getTime()*1e-3).toFixed(3) + " " + request.url);
 	if (u.pathname === '/override-num-viewers') {
 		handle_viewer_override(request, u, response);
 		return;
@@ -275,4 +300,8 @@ server.on('connection', function(socket) {
 		}
 	});
 });
-server.listen(5000);
+
+if (process.argv.length >= 3) {
+	port = parseInt(process.argv[2]);
+}
+server.listen(port);