create express app in function with explicit dependencies

src/server/app.ts

@@ -17,13 +17,12 @@
 
 import * as bodyParser from "body-parser";
 import compress from "compression";
-import express from "express";
+import express, { Express } from "express";
 import { Handler, Request, Response, Router } from "express";
 import { hsts } from "helmet";
 import { join } from "path";
-import { LOGGER } from "../common/logger/logger";
-import { SERVER_SETTINGS, SETTINGS_MANAGER, VERSION } from "./config";
 import { PluginSettings } from "./models/plugin-settings/plugin-settings";
+import { ServerSettings } from "./models/server-settings/server-settings";
 import { livenessRouter } from "./routes/liveness/liveness";
 import { mkurlRouter } from "./routes/mkurl/mkurl";
 import { plyqlRouter } from "./routes/plyql/plyql";
@@ -33,6 +32,7 @@ import { shortenRouter } from "./routes/shorten/shorten";
 import { sourcesRouter } from "./routes/sources/sources";
 import { turniloRouter } from "./routes/turnilo/turnilo";
 import { loadPlugin } from "./utils/plugin-loader/load-plugin";
+import { SettingsManager } from "./utils/settings-manager/settings-manager";
 import { errorLayout } from "./views";
 
 declare module "express" {
@@ -41,128 +41,131 @@ declare module "express" {
   }
 }
 
-let app = express();
-app.disable("x-powered-by");
+export default function createApp(serverSettings: ServerSettings, settingsManager: SettingsManager, version: string): Express {
 
-const isDev = app.get("env") === "development";
-const isTrustedProxy = SERVER_SETTINGS.trustProxy === "always";
+  let app = express();
+  app.disable("x-powered-by");
 
-if (isTrustedProxy) {
-  app.set("trust proxy", true); // trust X-Forwarded-*, use left-most entry as the client
-}
-
-const timeout = SERVER_SETTINGS.serverTimeout;
-app.use((req, res, next) => {
-  res.setTimeout(timeout);
-  next();
-});
+  const isDev = app.get("env") === "development";
+  const isTrustedProxy = serverSettings.trustProxy === "always";
 
-function getRoutePath(route: string): string {
-  const serverRoot = SERVER_SETTINGS.serverRoot;
-  const prefix = serverRoot.length > 0 ? `/${serverRoot}` : "";
-  return `${prefix}${route}`;
-}
+  if (isTrustedProxy) {
+    app.set("trust proxy", true); // trust X-Forwarded-*, use left-most entry as the client
+  }
 
-function attachRouter(route: string, router: Router | Handler): void {
-  app.use(getRoutePath(route), router);
-}
+  const timeout = serverSettings.serverTimeout;
+  app.use((req, res, next) => {
+    res.setTimeout(timeout);
+    next();
+  });
 
-// Add compression
-app.use(compress());
+  function getRoutePath(route: string): string {
+    const serverRoot = serverSettings.serverRoot;
+    const prefix = serverRoot.length > 0 ? `/${serverRoot}` : "";
+    return `${prefix}${route}`;
+  }
 
-// Add Strict Transport Security
-if (SERVER_SETTINGS.strictTransportSecurity === "always") {
-  app.use(hsts({
-    maxAge: 10886400000,     // Must be at least 18 weeks to be approved by Google
-    includeSubdomains: true, // Must be enabled to be approved by Google
-    preload: true
-  }));
-}
+  function attachRouter(route: string, router: Router | Handler): void {
+    app.use(getRoutePath(route), router);
+  }
 
-app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({ extended: true }));
+  // Add compression
+  app.use(compress());
 
-if (SERVER_SETTINGS.iframe === "deny") {
-  app.use((req: Request, res: Response, next: Function) => {
-    res.setHeader("X-Frame-Options", "DENY");
-    res.setHeader("Content-Security-Policy", "frame-ancestors 'none'");
-    next();
-  });
-}
-
-app.use((req: Request, res: Response, next: Function) => {
-  req.turniloMetadata = {};
-  next();
-});
-
-SERVER_SETTINGS.plugins.forEach(({ path, name, settings }: PluginSettings) => {
-  try {
-    LOGGER.log(`Loading plugin ${name} module`);
-    const module = loadPlugin(path, SETTINGS_MANAGER.anchorPath);
-    LOGGER.log(`Invoking plugin ${name}`);
-    module.plugin(app,
-      settings,
-      SERVER_SETTINGS,
-      SETTINGS_MANAGER.appSettings,
-      SETTINGS_MANAGER.sourcesGetter,
-      LOGGER.addPrefix(name));
-  } catch (e) {
-    LOGGER.warn(`Plugin ${name} threw an error: ${e.message}`);
+  // Add Strict Transport Security
+  if (serverSettings.strictTransportSecurity === "always") {
+    app.use(hsts({
+      maxAge: 10886400000,     // Must be at least 18 weeks to be approved by Google
+      includeSubdomains: true, // Must be enabled to be approved by Google
+      preload: true
+    }));
   }
-});
 
-// development HMR
-if (app.get("env") === "dev-hmr") {
-  // add hot module replacement
+  app.use(bodyParser.json());
+  app.use(bodyParser.urlencoded({ extended: true }));
 
-  const webpack = require("webpack");
-  const webpackConfig = require("../../config/webpack.dev");
-  const webpackDevMiddleware = require("webpack-dev-middleware");
-  const webpackHotMiddleware = require("webpack-hot-middleware");
+  if (serverSettings.iframe === "deny") {
+    app.use((req: Request, res: Response, next: Function) => {
+      res.setHeader("X-Frame-Options", "DENY");
+      res.setHeader("Content-Security-Policy", "frame-ancestors 'none'");
+      next();
+    });
+  }
 
-  if (webpack && webpackDevMiddleware && webpackHotMiddleware) {
-    const webpackCompiler = webpack(webpackConfig);
+  app.use((req: Request, res: Response, next: Function) => {
+    req.turniloMetadata = {};
+    next();
+  });
 
-    app.use(webpackDevMiddleware(webpackCompiler, {
-      hot: true,
-      noInfo: true,
-      publicPath: webpackConfig.output.publicPath
-    }));
+  serverSettings.plugins.forEach(({ path, name, settings }: PluginSettings) => {
+    try {
+      settingsManager.logger.log(`Loading plugin ${name} module`);
+      const module = loadPlugin(path, settingsManager.anchorPath);
+      settingsManager.logger.log(`Invoking plugin ${name}`);
+      module.plugin(app,
+        settings,
+        serverSettings,
+        settingsManager.appSettings,
+        settingsManager.sourcesGetter,
+        settingsManager.logger.addPrefix(name));
+    } catch (e) {
+      settingsManager.logger.warn(`Plugin ${name} threw an error: ${e.message}`);
+    }
+  });
 
-    app.use(webpackHotMiddleware(webpackCompiler, {
-      log: console.log,
-      path: "/__webpack_hmr"
-    }));
+  // development HMR
+  if (app.get("env") === "dev-hmr") {
+    // add hot module replacement
+
+    const webpack = require("webpack");
+    const webpackConfig = require("../../config/webpack.dev");
+    const webpackDevMiddleware = require("webpack-dev-middleware");
+    const webpackHotMiddleware = require("webpack-hot-middleware");
+
+    if (webpack && webpackDevMiddleware && webpackHotMiddleware) {
+      const webpackCompiler = webpack(webpackConfig);
+
+      app.use(webpackDevMiddleware(webpackCompiler, {
+        hot: true,
+        noInfo: true,
+        publicPath: webpackConfig.output.publicPath
+      }));
+
+      app.use(webpackHotMiddleware(webpackCompiler, {
+        log: console.log,
+        path: "/__webpack_hmr"
+      }));
+    }
   }
-}
 
-attachRouter("/", express.static(join(__dirname, "../../build/public")));
-attachRouter("/", express.static(join(__dirname, "../../assets")));
+  attachRouter("/", express.static(join(__dirname, "../../build/public")));
+  attachRouter("/", express.static(join(__dirname, "../../assets")));
 
-attachRouter(SERVER_SETTINGS.readinessEndpoint, readinessRouter(SETTINGS_MANAGER.sourcesGetter));
-attachRouter(SERVER_SETTINGS.livenessEndpoint, livenessRouter);
+  attachRouter(serverSettings.readinessEndpoint, readinessRouter(settingsManager.sourcesGetter));
+  attachRouter(serverSettings.livenessEndpoint, livenessRouter);
 
-// Data routes
-attachRouter("/sources", sourcesRouter(SETTINGS_MANAGER.sourcesGetter));
-attachRouter("/plywood", plywoodRouter(SETTINGS_MANAGER));
-attachRouter("/plyql", plyqlRouter(SETTINGS_MANAGER.sourcesGetter));
-attachRouter("/mkurl", mkurlRouter(SETTINGS_MANAGER.sourcesGetter));
-attachRouter("/shorten", shortenRouter(SETTINGS_MANAGER.appSettings, isTrustedProxy));
+  // Data routes
+  attachRouter("/sources", sourcesRouter(settingsManager.sourcesGetter));
+  attachRouter("/plywood", plywoodRouter(settingsManager));
+  attachRouter("/plyql", plyqlRouter(settingsManager.sourcesGetter));
+  attachRouter("/mkurl", mkurlRouter(settingsManager.sourcesGetter));
+  attachRouter("/shorten", shortenRouter(settingsManager.appSettings, isTrustedProxy));
 
-attachRouter("/", turniloRouter(SETTINGS_MANAGER.appSettings, VERSION));
+  attachRouter("/", turniloRouter(settingsManager.appSettings, settingsManager.getTimekeeper, version));
 
-// Catch 404 and redirect to /
-app.use((req: Request, res: Response) => {
-  res.redirect(getRoutePath("/"));
-});
+  // Catch 404 and redirect to /
+  app.use((req: Request, res: Response) => {
+    res.redirect(getRoutePath("/"));
+  });
 
-app.use((err: any, req: Request, res: Response, next: Function) => {
-  LOGGER.error(`Server Error: ${err.message}`);
-  LOGGER.error(err.stack);
-  res.status(err.status || 500);
-  // no stacktraces leaked to user
-  const error = isDev ? err : null;
-  res.send(errorLayout({ version: VERSION, title: "Error" }, err.message, error));
-});
+  app.use((err: any, req: Request, res: Response, next: Function) => {
+    settingsManager.logger.error(`Server Error: ${err.message}`);
+    settingsManager.logger.error(err.stack);
+    res.status(err.status || 500);
+    // no stacktraces leaked to user
+    const error = isDev ? err : null;
+    res.send(errorLayout({ version, title: "Error" }, err.message, error));
+  });
 
-export default app;
+  return app;
+}