Set Cache-Control headers for both the static files and dynamically g…

…enerated JS files

.env.dev

@@ -3,3 +3,4 @@ CLIENT_SECRET=efde5874713abf2a8ec9d8af8488fae7c7e0a933dba08208f644fa93b5622dab
 SHOW_STACK_TRACES=true
 LOG_LINT=true
 LOG_LEVEL=debug
+SET_CACHE=false

server/src/caching.js

@@ -0,0 +1,17 @@
+const config = require("./config").getProperties();
+
+exports.cacheTime = 60 * 60 * 24 * 1; // 1 day
+
+if (! config.setCache) {
+  exports.cacheTime = 0;
+}
+
+exports.setCache = function (res, options) {
+  if (config.setCache) {
+    options = options || {};
+    let pub = options.private ? "private" : "public";
+    res.set("Cache-Control", `${pub}, max-age=${exports.cacheTime}`);
+  } else {
+    res.set("Cache-Control", "no-cache");
+  }
+};

server/src/config.js

@@ -247,6 +247,13 @@ var conf = convict({
     default: "",
     env: "STATSD_PREFIX",
     arg: "statsd-prefix"
+  },
+  setCache: {
+    doc: "Set Cache-Control headers",
+    format: Boolean,
+    default: true,
+    env: "SET_CACHE",
+    arg: "set-cache"
   }
 });
 

server/src/server.js

@@ -80,6 +80,7 @@ const validUrl = require("valid-url");
 const { createProxyUrl } = require("./proxy-url");
 const statsd = require("./statsd");
 const { notFound } = require("./pages/not-found/server");
+const { cacheTime, setCache } = require("./caching");
 
 const PROXY_HEADER_WHITELIST = {
   "content-type": true,
@@ -196,7 +197,8 @@ app.use(bodyParser.urlencoded({extended: false}));
 app.use(bodyParser.json({limit: '100mb'}));
 
 app.use("/static", express.static(path.join(__dirname, "static"), {
-  index: false
+  index: false,
+  maxAge: cacheTime
 }));
 
 let xpidir = path.join(__dirname, "..", "xpi");
@@ -245,6 +247,7 @@ app.get("/ga-activation-hashed.js", function (req, res) {
 
 function sendGaActivation(req, res, hashPage) {
   let promise;
+  setCache(res, {private: true});
   if (req.deviceId) {
     promise = hashUserId(req.deviceId).then((uuid) => {
       return uuid.toString();
@@ -261,12 +264,14 @@ function sendGaActivation(req, res, hashPage) {
 }
 
 app.get("/set-content-hosting-origin.js", function (req, res) {
+  setCache(res);
   let postMessageOrigin = `${req.protocol}://${req.config.contentOrigin}`;
   let script = `var CONTENT_HOSTING_ORIGIN = "${postMessageOrigin}";`
   jsResponse(res, script);
 });
 
 app.get("/configure-raven.js", function (req, res) {
+  setCache(res);
   if (! req.config.sentryPublicDSN) {
     jsResponse(res, "");
     return;