[optimize] inject publicPath at request time (#14007)

* [optimize] inject publicPath at request time

* [optimize/getFileHash] finish doc block

* [optimize/bundlesRoute] correct return value doc type

* [optimize/bundleRoute] use more descriptive name for file hash cache

* [optimize/dynamicAssetResponse] add more details to doc

* [utils/createReplaceStream] trim the buffer based on the length of toReplace, not replacement

* [utils/createReplaceStream] add inline docs

* [utils/createReplaceStream] write unit tests

* [optimize/bundleRoute] expect supports buffers

* [optimize/bundleRoute/basePublicPath/tests] add happy path

* [optimize/bundlesRoute/tests] verify content-type header

* [optimize/bundlesRoute] use '

(cherry picked from commit 1ea82fa)

package.json

@@ -148,6 +148,7 @@
     "less": "2.7.1",
     "less-loader": "2.2.3",
     "lodash": "3.10.1",
+    "lru-cache": "4.1.1",
     "markdown-it": "8.3.2",
     "minimatch": "2.0.10",
     "mkdirp": "0.5.1",
@@ -190,6 +191,7 @@
     "rimraf": "2.4.3",
     "rison-node": "1.0.0",
     "rjs-repack-loader": "1.0.6",
+    "rxjs": "5.4.3",
     "script-loader": "0.6.1",
     "semver": "5.1.0",
     "style-loader": "0.12.3",

src/optimize/base_optimizer.js

@@ -11,14 +11,15 @@ import { defaults, transform } from 'lodash';
 
 import { fromRoot } from '../utils';
 import pkg from '../../package.json';
+
+import { PUBLIC_PATH_PLACEHOLDER } from './public_path_placeholder';
 import { setLoaderQueryParam, makeLoaderString } from './loaders';
 
 const babelExclude = [/[\/\\](webpackShims|node_modules|bower_components)[\/\\]/];
 
 export default class BaseOptimizer {
   constructor(opts) {
     this.env = opts.env;
-    this.urlBasePath = opts.urlBasePath;
     this.bundles = opts.bundles;
     this.profile = opts.profile || false;
 
@@ -100,7 +101,7 @@ export default class BaseOptimizer {
         path: this.env.workingDir,
         filename: '[name].bundle.js',
         sourceMapFilename: '[file].map',
-        publicPath: `${this.urlBasePath || ''}/bundles/`,
+        publicPath: PUBLIC_PATH_PLACEHOLDER,
         devtoolModuleFilenameTemplate: '[absolute-resource-path]'
       },
 

src/optimize/bundles_route/__tests__/bundles_route.js

@@ -0,0 +1,321 @@
+import { resolve } from 'path';
+import { readFileSync } from 'fs';
+import crypto from 'crypto';
+
+import Chance from 'chance';
+import expect from 'expect.js';
+import Hapi from 'hapi';
+import Inert from 'inert';
+import sinon from 'sinon';
+
+import { createBundlesRoute } from '../bundles_route';
+import { PUBLIC_PATH_PLACEHOLDER } from '../../public_path_placeholder';
+
+const chance = new Chance();
+const outputFixture = resolve(__dirname, './fixtures/output');
+
+function replaceAll(source, replace, replaceWith) {
+  return source.split(replace).join(replaceWith);
+}
+
+describe('optimizer/bundle route', () => {
+  const sandbox = sinon.sandbox.create();
+
+  function createServer(options = {}) {
+    const {
+      bundlesPath = outputFixture,
+      basePublicPath = ''
+    } = options;
+
+    const server = new Hapi.Server();
+    server.connection({ port: 0 });
+    server.register([Inert]);
+
+    server.route(createBundlesRoute({
+      bundlesPath,
+      basePublicPath,
+    }));
+
+    return server;
+  }
+
+  afterEach(() => sandbox.restore());
+
+  describe('validation', () => {
+    it('validates that bundlesPath is an absolute path', () => {
+      expect(() => {
+        createBundlesRoute({
+          bundlesPath: null,
+          basePublicPath: ''
+        });
+      }).to.throwError(/absolute path/);
+      expect(() => {
+        createBundlesRoute({
+          bundlesPath: './relative',
+          basePublicPath: ''
+        });
+      }).to.throwError(/absolute path/);
+      expect(() => {
+        createBundlesRoute({
+          bundlesPath: 1234,
+          basePublicPath: ''
+        });
+      }).to.throwError(/absolute path/);
+      expect(() => {
+        createBundlesRoute({
+          bundlesPath: '/absolute/path',
+          basePublicPath: ''
+        });
+      }).to.not.throwError();
+    });
+    it('validates that basePublicPath is valid', () => {
+      expect(() => {
+        createBundlesRoute({
+          bundlesPath: '/bundles',
+          basePublicPath: 123
+        });
+      }).to.throwError(/string/);
+      expect(() => {
+        createBundlesRoute({
+          bundlesPath: '/bundles',
+          basePublicPath: {}
+        });
+      }).to.throwError(/string/);
+      expect(() => {
+        createBundlesRoute({
+          bundlesPath: '/bundles',
+          basePublicPath: '/a/'
+        });
+      }).to.throwError(/start and not end with a \//);
+      expect(() => {
+        createBundlesRoute({
+          bundlesPath: '/bundles',
+          basePublicPath: 'a/'
+        });
+      }).to.throwError(/start and not end with a \//);
+      expect(() => {
+        createBundlesRoute({
+          bundlesPath: '/bundles',
+          basePublicPath: '/a'
+        });
+      }).to.not.throwError();
+      expect(() => {
+        createBundlesRoute({
+          bundlesPath: '/bundles',
+          basePublicPath: ''
+        });
+      }).to.not.throwError();
+    });
+  });
+
+  describe('image', () => {
+    it('responds with exact file data', async () => {
+      const server = createServer();
+      const response = await server.inject({
+        url: '/bundles/image.png'
+      });
+
+      expect(response.statusCode).to.be(200);
+      const image = readFileSync(resolve(outputFixture, 'image.png'));
+      expect(response.headers).to.have.property('content-length', image.length);
+      expect(response.headers).to.have.property('content-type', 'image/png');
+      expect(image).to.eql(response.rawPayload);
+    });
+  });
+
+  describe('js file without placeholder', () => {
+    it('responds with no content-length and exact file data', async () => {
+      const server = createServer();
+      const response = await server.inject({
+        url: '/bundles/no_placeholder.js'
+      });
+
+      expect(response.statusCode).to.be(200);
+      expect(response.headers).to.not.have.property('content-length');
+      expect(response.headers).to.have.property('content-type', 'application/javascript; charset=utf-8');
+      expect(readFileSync(resolve(outputFixture, 'no_placeholder.js')))
+        .to.eql(response.rawPayload);
+    });
+  });
+
+  describe('js file with placeholder', () => {
+    it('responds with no content-length and modified file data', async () => {
+      const basePublicPath = `/${chance.word()}`;
+      const server = createServer({ basePublicPath });
+
+      const response = await server.inject({
+        url: '/bundles/with_placeholder.js'
+      });
+
+      expect(response.statusCode).to.be(200);
+      const source = readFileSync(resolve(outputFixture, 'with_placeholder.js'), 'utf8');
+      expect(response.headers).to.not.have.property('content-length');
+      expect(response.headers).to.have.property('content-type', 'application/javascript; charset=utf-8');
+      expect(response.result.indexOf(source)).to.be(-1);
+      expect(response.result).to.be(replaceAll(
+        source,
+        PUBLIC_PATH_PLACEHOLDER,
+        `${basePublicPath}/bundles/`
+      ));
+    });
+  });
+
+  describe('css file without placeholder', () => {
+    it('responds with no content-length and exact file data', async () => {
+      const server = createServer();
+      const response = await server.inject({
+        url: '/bundles/no_placeholder.css'
+      });
+
+      expect(response.statusCode).to.be(200);
+      expect(response.headers).to.not.have.property('content-length');
+      expect(response.headers).to.have.property('content-type', 'text/css; charset=utf-8');
+      expect(readFileSync(resolve(outputFixture, 'no_placeholder.css')))
+        .to.eql(response.rawPayload);
+    });
+  });
+
+  describe('css file with placeholder', () => {
+    it('responds with no content-length and modified file data', async () => {
+      const basePublicPath = `/${chance.word()}`;
+      const server = createServer({ basePublicPath });
+
+      const response = await server.inject({
+        url: '/bundles/with_placeholder.css'
+      });
+
+      expect(response.statusCode).to.be(200);
+      const source = readFileSync(resolve(outputFixture, 'with_placeholder.css'), 'utf8');
+      expect(response.headers).to.not.have.property('content-length');
+      expect(response.headers).to.have.property('content-type', 'text/css; charset=utf-8');
+      expect(response.result.indexOf(source)).to.be(-1);
+      expect(response.result).to.be(replaceAll(
+        source,
+        PUBLIC_PATH_PLACEHOLDER,
+        `${basePublicPath}/bundles/`
+      ));
+    });
+  });
+
+  describe('js file outside bundlesPath', () => {
+    it('responds with a 403', async () => {
+      const server = createServer();
+
+      const response = await server.inject({
+        url: '/bundles/../outside_output.js'
+      });
+
+      expect(response.statusCode).to.be(403);
+      expect(response.result).to.eql({
+        error: 'Forbidden',
+        message: 'Forbidden',
+        statusCode: 403
+      });
+    });
+  });
+
+  describe('missing js file', () => {
+    it('responds with 404', async () => {
+      const server = createServer();
+
+      const response = await server.inject({
+        url: '/bundles/non_existant.js'
+      });
+
+      expect(response.statusCode).to.be(404);
+      expect(response.result).to.eql({
+        error: 'Not Found',
+        message: 'Not Found',
+        statusCode: 404
+      });
+    });
+  });
+
+  describe('missing bundlesPath', () => {
+    it('responds with 404', async () => {
+      const server = createServer({
+        bundlesPath: resolve(__dirname, 'fixtures/not_really_output')
+      });
+
+      const response = await server.inject({
+        url: '/bundles/with_placeholder.js'
+      });
+
+      expect(response.statusCode).to.be(404);
+      expect(response.result).to.eql({
+        error: 'Not Found',
+        message: 'Not Found',
+        statusCode: 404
+      });
+    });
+  });
+
+  describe('etag', () => {
+    it('only calculates hash of file on first request', async () => {
+      const createHash = sandbox.spy(crypto, 'createHash');
+
+      const server = createServer();
+
+      sinon.assert.notCalled(createHash);
+      const resp1 = await server.inject({
+        url: '/bundles/no_placeholder.js'
+      });
+
+      sinon.assert.calledOnce(createHash);
+      createHash.reset();
+      expect(resp1.statusCode).to.be(200);
+
+      const resp2 = await server.inject({
+        url: '/bundles/no_placeholder.js'
+      });
+
+      sinon.assert.notCalled(createHash);
+      expect(resp2.statusCode).to.be(200);
+    });
+
+    it('is unique per basePublicPath although content is the same', async () => {
+      const basePublicPath1 = `/${chance.word()}`;
+      const basePublicPath2 = `/${chance.word()}`;
+
+      const [resp1, resp2] = await Promise.all([
+        createServer({ basePublicPath: basePublicPath1 }).inject({
+          url: '/bundles/no_placeholder.js'
+        }),
+        createServer({ basePublicPath: basePublicPath2 }).inject({
+          url: '/bundles/no_placeholder.js'
+        }),
+      ]);
+
+      expect(resp1.statusCode).to.be(200);
+      expect(resp2.statusCode).to.be(200);
+
+      expect(resp1.rawPayload).to.eql(resp2.rawPayload);
+
+      expect(resp1.headers.etag).to.be.a('string');
+      expect(resp2.headers.etag).to.be.a('string');
+      expect(resp1.headers.etag).to.not.eql(resp2.headers.etag);
+    });
+  });
+
+  describe('cache control', () => {
+    it('responds with 304 when etag and last modified are sent back', async () => {
+      const server = createServer();
+      const resp = await server.inject({
+        url: '/bundles/with_placeholder.js'
+      });
+
+      expect(resp.statusCode).to.be(200);
+
+      const resp2 = await server.inject({
+        url: '/bundles/with_placeholder.js',
+        headers: {
+          'if-modified-since': resp.headers['last-modified'],
+          'if-none-match': resp.headers.etag
+        }
+      });
+
+      expect(resp2.statusCode).to.be(304);
+      expect(resp2.result).to.have.length(0);
+    });
+  });
+});

src/optimize/bundles_route/__tests__/fixtures/output/no_placeholder.css

@@ -0,0 +1,3 @@
+body {
+  background-color: goldenrod;
+}

src/optimize/bundles_route/__tests__/fixtures/output/no_placeholder.js

@@ -0,0 +1 @@
+console.log('chunk2');

src/optimize/bundles_route/__tests__/fixtures/output/with_placeholder.css

@@ -0,0 +1,3 @@
+body {
+  background-image: url(__REPLACE_WITH_PUBLIC_PATH__/image.png);
+}

src/optimize/bundles_route/__tests__/fixtures/output/with_placeholder.js

@@ -0,0 +1 @@
+console.log('__REPLACE_WITH_PUBLIC_PATH__');

src/optimize/bundles_route/__tests__/fixtures/outside_output.js

@@ -0,0 +1 @@
+console.log('outside output');