Bump version to 2015062104.

[remoteglot] / www / serve-analysis.js

diff --git a/www/serve-analysis.js b/www/serve-analysis.js
index 171ce82ac6b56d7ead0d6405ec07b41e580a4c64..e45e34f3d3e781e07506bc0f861233e0102569f8 100644 (file)
--- a/www/serve-analysis.js
+++ b/www/serve-analysis.js
@@ -13,6 +13,7 @@ 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 = 2015062104;
 
 // 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 +94,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,
                };
@@ -180,20 +181,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();
 }
@@ -242,7 +248,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;