6.0.0 alpha.1

.dockerignore

@@ -1,2 +1,5 @@
 node_modules
 lib/*
+packaging
+infrastructure
+test

.env.test

@@ -1,3 +1,3 @@
-NODE_ENV=test
+NODE_ENV=test 
 NODE_TLS_REJECT_UNAUTHORIZED=0 
-NODE_OPTIONS=--tls-cipher-list=\"ECDHE-RSA-AES128-GCM-SHA256\"
+NODE_OPTIONS=--tls-cipher-list=\"ECDHE-RSA-AES128-GCM-SHA256\" 

.eslintignore

@@ -0,0 +1,2 @@
+docs/*
+lib/*

.eslintrc.json

@@ -0,0 +1,15 @@
+{
+  "env": {
+    "es6": true,
+    "node": true
+  },
+  "parserOptions": {
+    "ecmaVersion": 2017,
+    "sourceType": "module"
+  },
+  "plugins": ["prettier"],
+  "extends": ["eslint:recommended", "plugin:prettier/recommended"],
+  "rules": {
+    "require-atomic-updates": "off" // should be defaulted to "off" soon: https://github.com/eslint/eslint/issues/11899
+  }
+}

.prettierrc.yaml

@@ -0,0 +1,5 @@
+semi: false
+singleQuote: true
+bracketSpacing: false
+trailingComma: "none"
+arrowParens: "avoid"

.travis.yml

@@ -1,7 +1,8 @@
+dist: focal
 language: node_js
 node_js:
-  - "lts/dubnium"
   - "lts/erbium"
+  - "lts/fermium"
   - "node"
 matrix:
   fast_finish: true

Dockerfile

@@ -0,0 +1,15 @@
+FROM node:14.17-alpine
+
+RUN apk upgrade --update-cache --available && \
+    apk add openssl && \
+    rm -rf /var/cache/apk/*
+
+WORKDIR /app
+
+COPY . .
+
+RUN npm install
+
+RUN npm run build
+
+CMD ["node", "lib/server.js"]

README.md

@@ -77,11 +77,11 @@ This project uses [mocha](https://mochajs.org/) as a unit testing framework with
 
 **Pro tips:**
 
-- `npm run lint` - ensure the code is lint free, this is also run before an `npm test`
+- `npm run lint` - ensure the code is lint free, this is also run after an `npm test`
 - `npm link` - will symlink you local working directory to the globally installed openhim-core module. Use this so you can use the global openhim-core binary to run your current work in progress. Also, if you build any local changes the server will automatically restart.
-- `npm test -- --grep <regex>` - will only run tests with names matching the regex.
-- `npm test -- --inspect` - enabled the node debugger while running unit tests. Add `debugger` statements and use `node debug localhost:5858` to connect to the debugger instance.
-- `npm test -- --bail` - exit on first test failure.
+- `npm test:<int|unit> -- --grep <regex>` - will only run tests with names matching the regex.
+- `npm test:<int|unit> -- --inspect` - enabled the node debugger while running unit tests. Add `debugger` statements and use `node debug localhost:5858` to connect to the debugger instance.
+- `npm test:<int|unit> -- --bail` - exit on first test failure.
 
 ---
 

bin/openhim-core.js

@@ -16,23 +16,23 @@ if (args.indexOf('-v') >= 0 || args.indexOf('--version') >= 0) {
   process.exit(0)
 }
 
-const child = new (forever.Monitor)('lib/server.js', {
+const child = new forever.Monitor('lib/server.js', {
   sourceDir: root,
   command: 'node',
   args,
   watch: process.env.NODE_ENV !== 'production',
   watchDirectory: 'lib'
 })
 
-child.on('watch:restart', (info) => {
+child.on('watch:restart', info => {
   console.error(`Restarting script because ${info.file} changed`)
 })
 
 child.on('restart', () => {
   console.error(`Forever restarting script for ${child.times} time`)
 })
 
-child.on('exit:code', (code) => {
+child.on('exit:code', code => {
   console.error(`Forever detected script exited with code ${code}`)
 })
 

config/config.md

@@ -48,17 +48,8 @@ The following config option are provided by the OpenHIM. All of these options ha
     // API request are only valid for a particular window once made, this is
     // the size of that window in seconds
     "authWindowSeconds": 10,
-    // Max size allowed for ALL bodies in the transaction together
-    // Use min 1 MB to allow space for all routes on a transaction and max 15 MB leaving 1 MB available for the transaction metadata
-    "maxBodiesSizeMB": 15,
     // Max size of a request payload to the API
-    // Due to the maximum size of a mongo document, the bodies in the request will be truncated if the request is larger than 16MB
     "maxPayloadSizeMB": 50,
-    // Certain API endpoints allow for details to be truncated, e.g. transactions with very large bodies
-    // This setting sets the size to truncate to (number of characters)
-    "truncateSize": 15000,
-    // A message to append to detail strings that have been truncated
-    "truncateAppend": "\n[truncated ...]",
     // The types of authentication to use for the API
     // Supported types are "token" and "basic"
     "authenicationTypes": ["token"]

config/default.json

@@ -17,7 +17,8 @@
   "mongoLogger": {
     "options": {
       "w": 0,
-      "useNewUrlParser": true
+      "useNewUrlParser": true,
+      "useUnifiedTopology": true
     }
   },
   "router": {
@@ -35,10 +36,7 @@
     "protocol": "https",
     "port": 8080,
     "authWindowSeconds": 10,
-    "maxBodiesSizeMB": 15,
     "maxPayloadSizeMB": 50,
-    "truncateSize": 15000,
-    "truncateAppend": "\n[truncated ...]",
     "authenticationTypes": ["token"]
   },
   "rerun": {

config/test.json

@@ -22,10 +22,7 @@
     "protocol": "https",
     "port": 8080,
     "authWindowSeconds": 50,
-    "maxBodiesSizeMB": 15,
     "maxPayloadSizeMB": 50,
-    "truncateSize": 10,
-    "truncateAppend": "\n[truncated ...]",
     "authenticationTypes": ["token", "basic"]
   },
   "caching": {