Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reenable script cache from Server to Client #1069

Merged
merged 1 commit into from
Apr 4, 2017
Merged

Reenable script cache from Server to Client #1069

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions controllers/scriptStorage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ var isDbg = require('../libs/debug').isDbg;

//--- Dependency inclusions
var fs = require('fs');
var util = require('util');
var _ = require('underscore');
var URL = require('url');
var crypto = require('crypto');
Expand All @@ -19,6 +20,7 @@ var rfc2047 = require('rfc2047');
var mediaType = require('media-type');
var mediaDB = require('mime-db');
var async = require('async');
var moment = require('moment');

//--- Model inclusions
var Script = require('../models/script').Script;
Expand Down Expand Up @@ -113,6 +115,15 @@ if (isPro) {
});
}

//
// Get UglifyJS2 installation datestamp once
//
// When the harmony branch is incorporated into master the cache date of the file
// would be more accurate and the eTag could be that hash as well
//
var stats = fs.statSync("./node_modules/uglify-js-harmony/package.json");
var mtimeUglifyJS2 = new Date(util.inspect(stats.mtime));

function getInstallNameBase(aReq, aOptions) {
//
var base = null;
Expand Down Expand Up @@ -401,6 +412,11 @@ exports.sendScript = function (aReq, aRes, aNext) {
let rAnyLocalHost = new RegExp('^(?:openuserjs\.org|oujs\.org' +
(isDev ? '|localhost:' + (process.env.PORT || 8080) : '') + ')');

var lastModified = null;
var eTag = null;
var maxAge = 1 * 60 * 60 * 24; // nth day(s) in seconds
var now = null;

if (!aScript) {
aNext();
return;
Expand Down Expand Up @@ -455,10 +471,38 @@ exports.sendScript = function (aReq, aRes, aNext) {
}
}

// Set up server to client caching
lastModified = moment(
(!/\.min(\.user)?\.js$/.test(aReq._parsedUrl.pathname)
? aScript.updated
: mtimeUglifyJS2 > aScript.updated ? mtimeUglifyJS2 : aScript.updated)
).utc().format('ddd, DD MMM YYYY HH:mm:ss') + ' GMT';

// Create a base 36 representation of the hex sha512sum
eTag = '"' + parseInt('0x' + aScript.hash, 16).toString(36) + '"';

// NOTE: HTTP/1.1 Caching
aRes.set('Cache-Control', 'public, max-age=' + maxAge +
', no-cache, no-transform, must-revalidate');

// NOTE: HTTP/1.0 Caching
aRes.set('Last-Modified', lastModified);

// If already client-side... NOTE: HTTP/1.0 and/or HTTP/1.1 Caching
if (aReq.get('if-modified-since') === lastModified || aReq.get('if-none-match') === eTag) {
aRes.status(304).send({ status: 304, message: 'Not Modified' });
return;
}

// NOTE: HTTP/1.0 Caching
aRes.set('Expires', moment(moment() + maxAge * 1000).utc()
.format('ddd, DD MMM YYYY HH:mm:ss') + ' GMT');

// Send the script
aRes.set('Content-Type', 'text/javascript; charset=UTF-8');
aStream.setEncoding('utf8');


// Only minify for response that doesn't contain `.min.` extension
if (!/\.min(\.user)?\.js$/.test(aReq._parsedUrl.pathname) ||
process.env.DISABLE_SCRIPT_MINIFICATION === 'true') {
Expand All @@ -470,6 +514,9 @@ exports.sendScript = function (aReq, aRes, aNext) {
aStream.on('end', function () {
let source = chunks.join(''); // NOTE: Watchpoint

// NOTE: HTTP/1.1 Caching
aRes.set('Etag', eTag);

aRes.write(source);
aRes.end();

Expand Down Expand Up @@ -502,6 +549,10 @@ exports.sendScript = function (aReq, aRes, aNext) {
}
}).code;

// Create a base 36 representation of the hex sha512sum
eTag = '"' + parseInt('0x' + crypto.createHash('sha512').update(source).digest('hex'), 16)
.toString(36) + '"';

} catch (aE) { // On any failure default to unminified
console.warn([
'MINIFICATION WARNING (harmony):',
Expand All @@ -523,6 +574,9 @@ exports.sendScript = function (aReq, aRes, aNext) {
aRes.set('Warning', msg);
}

// NOTE: HTTP/1.1 Caching
aRes.set('Etag', eTag);

aRes.write(source);
aRes.end();

Expand Down