Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,9 @@ See [example app](/example/) for more details

### Parameters

- **`options`** (`Object`) - An object containing the options for configuring the application. Defaults to `{ middlewareSetupFn: undefined }` if not provided.
- **`options`** (`Object`) - Configuration options for the application:
- **`globalMiddlewareSetupFn`** (`Function`, optional) - Configures the global middleware setup process. Defaults to `undefined`.
- **`middlewareSetupFn`** (`Function`, optional) - Configures the middleware setup process. Defaults to `undefined`.

### Returns

Expand Down
13 changes: 11 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const redisClient = require('./lib/redis-client');
* The setup process can be customized using the provided `options` object. The function will initialize the components based on the options provided, or default to values from the `config` module.
*
* @param {Object} [options={middlewareSetupFn: undefined}] - Configuration options to customize the setup process.
* @param {Object} [options={globalMiddlewareSetupFn: undefined}] - Configuration options to customize the global middleware setup process.
* @param {Object} [options.config] - Optional configuration for the `config.setup()` method. Set to `false` to skip configuration setup.
* @param {Object} [options.logs] - Optional configuration for logging. Merged with the default config fetched by `config.get('logs')`. Set to `false` to skip log setup.
* @param {Object} [options.redis] - Optional configuration for the Redis client. Merged with the default config fetched by `config.get('redis')`. Set to `false` to skip Redis setup.
Expand Down Expand Up @@ -42,7 +43,8 @@ const redisClient = require('./lib/redis-client');
*/

const setup = (options = {
middlewareSetupFn: undefined
middlewareSetupFn: undefined,
globalMiddlewareSetupFn: undefined
}) => {
if (options.config !== false) config.setup(options.config);

Expand All @@ -56,7 +58,14 @@ const setup = (options = {
...options.redis
});

const app = middleware.setup({
let app = express();

if (options.globalMiddlewareSetupFn && typeof options.globalMiddlewareSetupFn === 'function') {
options.globalMiddlewareSetupFn(app);
}

app = middleware.setup({
app,
...config.get(),
...options
});
Expand Down
5 changes: 1 addition & 4 deletions middleware/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const path = require('path');
const express = require('express');
const logger = require('../lib/logger');

const requiredArgument = argName => {
Expand All @@ -8,6 +7,7 @@ const requiredArgument = argName => {

const middleware = {
setup({
app = requiredArgument('app'),
env = process.env.NODE_ENV,
urls = {},
featureFlags,
Expand Down Expand Up @@ -45,9 +45,6 @@ const middleware = {
urls.version = urls.version === undefined ? '/version' : urls.version;
urls.healthcheck = urls.healthcheck === undefined ? '/healthcheck' : urls.healthcheck;

// create new express app
const app = express();

// environment
env = (env || 'development').toLowerCase();
app.set('env', env);
Expand Down
107 changes: 61 additions & 46 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"scripts": {
"pretest": "npm run test:lint",
"test": "npm run test:unit",
"posttest": "npm audit",
"posttest": "npm audit --registry='https://registry.npmjs.org'",
"test:lint": "eslint .",
"test:unit": "nyc _mocha",
"prepare": "husky"
Expand Down
Loading