Update app server with workerPath

Author: snewcomer

packages/fastboot-app-server/src/fastboot-app-server.js

@@ -21,10 +21,9 @@ class FastBootAppServer {
     this.username = options.username;
     this.password = options.password;
     this.httpServer = options.httpServer;
-    this.beforeMiddleware = options.beforeMiddleware;
-    this.afterMiddleware = options.afterMiddleware;
     this.buildSandboxGlobals = options.buildSandboxGlobals;
     this.chunkedResponse = options.chunkedResponse;
+    this.workerPath = options.workerPath;
 
     if (!this.ui) {
       let UI = require('./ui');
@@ -229,8 +228,6 @@ class FastBootAppServer {
       username: this.username,
       password: this.password,
       httpServer: this.httpServer,
-      beforeMiddleware: this.beforeMiddleware,
-      afterMiddleware: this.afterMiddleware,
       buildSandboxGlobals: this.buildSandboxGlobals,
       chunkedResponse: this.chunkedResponse,
     };

packages/fastboot-app-server/src/worker-start.js

@@ -3,6 +3,7 @@
 // This file is where you can configure
 // - distPath, host, port,
 // - httpServer
+// - Middleware order
 const ClusterWorker = require('./worker');
 const worker = new ClusterWorker();
 

packages/fastboot-app-server/test/fixtures/after-middleware-server.js

@@ -3,16 +3,9 @@
 var path = require('path');
 const FastBootAppServer = require('../../src/fastboot-app-server');
 
-function setXTestHeader(err, req, res, next) {
-  res.set('x-test-header', 'testing')
-  next();
-}
-
 var server = new FastBootAppServer({
   distPath: path.resolve(__dirname, './broken-app'),
-  afterMiddleware: function (app) {
-    app.use(setXTestHeader);
-  },
+  workerPath: path.resolve(__dirname, './cluster-worker-start'),
   resilient: true,
 });
 

packages/fastboot-app-server/test/fixtures/before-middleware-server.js

@@ -3,28 +3,9 @@
 var path = require('path');
 const FastBootAppServer = require('../../src/fastboot-app-server');
 
-function setStatusCode418(req, res, next) {
-  res.status(418);
-  next();
-}
-
-function setXTestHeader(req, res, next) {
-  res.set('X-Test-Header', 'testing')
-  next();
-}
-
-function sendJsonAndTerminate(req, res, next) {
-  res.json({ send: 'json back' });
-  res.send();
-}
-
 var server = new FastBootAppServer({
   distPath: path.resolve(__dirname, './basic-app'),
-  beforeMiddleware: function (app) {
-    app.use(setStatusCode418);
-    app.use(setXTestHeader);
-    app.use(sendJsonAndTerminate);
-  }
+  workerPath: path.resolve(__dirname, './cluster-worker-start'),
 });
 
 server.start();

packages/fastboot-app-server/test/fixtures/cluster-worker-start.js

@@ -0,0 +1,37 @@
+'use strict';
+
+const ClusterWorker = require('../../src/worker');
+
+class CustomClusterWorker extends ClusterWorker {}
+
+function setStatusCode418(req, res, next) {
+  res.status(418);
+  next();
+}
+
+function setXTestHeader(req, res, next) {
+  res.set('X-Test-Header', 'testing')
+  next();
+}
+
+function sendJsonAndTerminate(req, res, next) {
+  res.json({ send: 'json back' });
+  res.send();
+}
+
+function beforeMiddleware(app) {
+  app.use(setStatusCode418);
+  app.use(setXTestHeader);
+  app.use(sendJsonAndTerminate);
+}
+
+function afterMiddleware(app) {
+  app.use(setXTestHeader);
+}
+
+const worker = new CustomClusterWorker({
+  beforeMiddleware,
+  afterMiddleware,
+});
+
+worker.start();