pre-FastBoot and post-FastBoot middleware hooks

Author: Arjan Singh

src/express-http-server.js

@@ -3,6 +3,8 @@
 const express = require('express');
 const basicAuth = require('./basic-auth');
 
+function noop() {}
+
 class ExpressHTTPServer {
   constructor(options) {
     options = options || {};
@@ -13,8 +15,8 @@ class ExpressHTTPServer {
     this.password = options.password;
     this.cache = options.cache;
     this.gzip = options.gzip || false;
-    this.preFastbootMiddlewares = options.preFastbootMiddlewares || [];
-    this.postFastbootMiddlewares = options.postFastbootMiddlewares || [];
+    this.preFastbootMiddlewares = options.preFastbootMiddlewares || noop;
+    this.postFastbootMiddlewares = options.postFastbootMiddlewares || noop;
 
     this.app = express();
   }
@@ -24,7 +26,7 @@ class ExpressHTTPServer {
     let username = this.username;
     let password = this.password;
 
-    this.preFastbootMiddlewares.forEach(args => app.use(...args));
+    this.preFastbootMiddlewares(app);
 
     if (this.gzip) {
       this.app.use(require('compression')());
@@ -49,7 +51,7 @@ class ExpressHTTPServer {
 
     app.get('/*', fastbootMiddleware);
 
-    this.postFastbootMiddlewares.forEach(args => app.use(...args));
+    this.postFastbootMiddlewares(app);
 
     return new Promise(resolve => {
       let listener = app.listen(process.env.PORT || 3000, () => {

src/fastboot-app-server.js

@@ -33,7 +33,9 @@ class FastBootAppServer {
         distPath: this.distPath || process.env.FASTBOOT_DIST_PATH,
         cache: this.cache,
         gzip: this.gzip,
-        httpServer: this.httpServer
+        httpServer: this.httpServer,
+        preFastbootMiddlewares: this.preFastbootMiddlewares,
+        postFastbootMiddlewares: this.postFastbootMiddlewares
       });
 
       this.worker.start();

src/worker.js

@@ -19,7 +19,9 @@ class Worker {
         ui: this.ui,
         distPath: this.distPath,
         cache: this.cache,
-        gzip: this.gzip
+        gzip: this.gzip,
+        preFastbootMiddlewares: this.preFastbootMiddlewares,
+        postFastbootMiddlewares: this.postFastbootMiddlewares,
       });
     }
 
@@ -60,7 +62,6 @@ class Worker {
   buildMiddleware() {
     this.fastboot = new FastBoot({
       distPath: this.distPath,
-      resilient: true
     });
 
     return fastbootMiddleware({

test/app-server-test.js

@@ -70,6 +70,25 @@ describe("FastBootAppServer", function() {
       });
   });
 
+  it("executes preFastbootMiddlewares", function() {
+    return runServer('prefastboot-middleware-server')
+      .then(() => request('http://localhost:3000'))
+      .then(response => {
+        expect(response.statusCode).to.equal(418);
+        expect(response.headers['x-test-header']).to.equal('testing');
+        expect(response.body).to.equal(JSON.stringify({ send: 'json back'}));
+      });
+  });
+
+  it("executes postFastbootMiddlewares when there is an error", function() {
+    return runServer('postfastboot-middleware-server')
+      .then(() => request('http://localhost:3000'))
+      .then(response => {
+        expect(response.body).to.not.match(/error/);
+        expect(response.headers['x-test-header']).to.equal('testing');
+      })
+  });
+
 });
 
 function runServer(name) {