Make serve-analysis.js capable of handling e.g. /analysis2.pl.

[remoteglot] / www / serve-analysis.js

diff --git a/www/serve-analysis.js b/www/serve-analysis.js
index 171ce82ac6b56d7ead0d6405ec07b41e580a4c64..9bb33cfd28340d29dc7ae7e871db8b99bd148782 100644 (file)
--- a/www/serve-analysis.js
+++ b/www/serve-analysis.js
@@ -11,8 +11,26 @@ var zlib = require('zlib');
 var delta = require('./js/json_delta.js');
 
 // Constants.
-var JSON_FILENAME = '/srv/analysis.sesse.net/www/analysis.json';
 var HISTORY_TO_KEEP = 5;
+var MINIMUM_VERSION = null;
+
+// Filename to serve.
+var json_filename = '/srv/analysis.sesse.net/www/analysis.json';
+if (process.argv.length >= 3) {
+       json_filename = process.argv[2];
+}
+
+// Expected destination filename.
+var serve_url = '/analysis.pl';
+if (process.argv.length >= 4) {
+       serve_url = process.argv[3];
+}
+
+// TCP port to listen on.
+var port = 5000;
+if (process.argv.length >= 5) {
+       port = parseInt(process.argv[4]);
+}
 
 // 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.
@@ -93,8 +111,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,
                };
@@ -103,7 +121,7 @@ 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) {
@@ -117,8 +135,8 @@ var reread_file = function(event, filename) {
        }
        json_lock = 1;
 
-       console.log("Rereading " + JSON_FILENAME);
-       fs.open(JSON_FILENAME, 'r+', function(err, fd) {
+       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;
@@ -139,7 +157,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() {
@@ -180,20 +198,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();
 }
@@ -233,8 +256,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) {
@@ -242,12 +265,12 @@ 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;
        }
-       if (u.pathname !== '/analysis.pl') {
+       if (u.pathname !== serve_url) {
                // This is not the request you are looking for.
                send_404(response);
                return;
@@ -291,4 +314,5 @@ server.on('connection', function(socket) {
                }
        });
 });
-server.listen(5000);
+
+server.listen(port);