EUI-2976: ExUI strategic solution

.eslintrc.js

@@ -0,0 +1,13 @@
+module.exports = {
+  "extends": "airbnb-base",
+  "env": {
+    "mocha": true,
+    "jasmine": true
+  },
+  "rules": {
+    "comma-dangle": 0,
+    "arrow-body-style": 0,
+    "no-param-reassign": [ 2, { props: false } ],
+    "linebreak-style": [ "error", process.platform === 'win32' ? 'windows' : 'unix' ]
+  }
+}

.yarnrc.yml

@@ -2,6 +2,8 @@ compressionLevel: mixed
 
 enableGlobalCache: false
 
+enableStrictSsl: false
+
 nodeLinker: node-modules
 
 yarnPath: .yarn/releases/yarn-4.9.4.cjs

README.md

@@ -94,3 +94,4 @@ $ yarn start
   ccd-case-activity-api:server Listening on port 3000 +19ms
   ccd-case-activity-api:redis-client connected to Redis +7ms
 ```
+

RELEASE-NOTES.md

@@ -0,0 +1,4 @@
+## RELEASE NOTES
+
+### Version 0.1.0-socket-alpha
+**EUI-2976** Socket-based Activity Tracking.

app.js

@@ -1,7 +1,6 @@
 const healthcheck = require('@hmcts/nodejs-healthcheck');
 const express = require('express');
 const logger = require('morgan');
-const bodyParser = require('body-parser');
 const config = require('config');
 const debug = require('debug')('ccd-case-activity-api:app');
 const enableAppInsights = require('./app/app-insights/app-insights');
@@ -41,17 +40,22 @@ if (config.util.getEnv('NODE_ENV') === 'test') {
 }
 
 debug(`starting application with environment: ${config.util.getEnv('NODE_ENV')}`);
+console.log(`starting application with environment: ${config.util.getEnv('NODE_ENV')}`);
 
 app.use(corsHandler);
-app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({ extended: false }));
-app.use(bodyParser.text());
+app.use(express.json());
+app.use(express.urlencoded({ extended: false }));
+app.use(express.text());
+
+console.log('Applying auth checker user only filter');
 app.use(authCheckerUserOnlyFilter);
 
+console.log('Mounting activity route at /');
 app.use('/', activity);
 
 // catch 404 and forward to error handler
 app.use((req, res, next) => {
+  console.log(`404 Not Found for request: ${req.method} ${req.originalUrl}`);
   const err = new Error('Not Found');
   err.status = 404;
   next(err);
@@ -62,15 +66,17 @@ app.use((req, res, next) => {
 /* eslint-disable no-unused-vars */
 app.use((err, req, res, next) => {
   debug(`Error processing request: ${err}`);
+  console.log(`Error processing request: ${err}`);
 
   // set locals, only providing error in development
   res.locals.message = err.message;
   res.locals.error = req.app.get('env') === 'development' ? err : {};
 
+  console.log(`Returning error response: ${err.status || 500} - ${err.message}`);
+
   res.status(err.status || 500);
   res.json({
     message: err.message,
   });
 });
-
 module.exports = app;

app/health.js

@@ -14,5 +14,4 @@ const activityHealth = healthcheck.configure({
       .catch(() => healthcheck.down())),
   },
 });
-
 module.exports = activityHealth;

app/job/store-cleanup-job.js

@@ -1,17 +1,15 @@
 const cron = require('node-cron');
 const debug = require('debug')('ccd-case-activity-api:store-cleanup-job');
-const moment = require('moment');
 const config = require('config');
 const redis = require('../redis/redis-client');
 
 const { logPipelineFailures } = redis;
-const now = () => moment().valueOf();
 const REDIS_ACTIVITY_KEY_PREFIX = config.get('redis.keyPrefix');
 
-const scanExistingCasesKeys = (f) => {
+const scanExistingCasesKeys = (f, prefix) => {
   const stream = redis.scanStream({
     // only returns keys following the pattern
-    match: `${REDIS_ACTIVITY_KEY_PREFIX}case:*`,
+    match: `${REDIS_ACTIVITY_KEY_PREFIX}${prefix}:*`,
     // returns approximately 100 elements per call
     count: 100,
   });
@@ -28,18 +26,17 @@ const scanExistingCasesKeys = (f) => {
   });
 };
 
-const getCasesWithActivities = (f) => scanExistingCasesKeys(f);
+const getCasesWithActivities = (f, prefix) => scanExistingCasesKeys(f, prefix);
 
-const cleanupActivitiesCommand = (key) => ['zremrangebyscore', key, '-inf', now()];
+const cleanupActivitiesCommand = (key) => ['zremrangebyscore', key, '-inf', Date.now()];
 
 const pipeline = (cases) => {
   const commands = cases.map((caseKey) => cleanupActivitiesCommand(caseKey));
   debug(`created cleanup pipeline: ${commands}`);
   return redis.pipeline(commands);
 };
 
-const storeCleanup = () => {
-  debug('store cleanup starting...');
+const cleanCasesWithPrefix = (prefix) => {
   getCasesWithActivities((cases) => {
     // scan returns the prefixed keys. Remove them since the redis client will add it back
     const casesWithoutPrefix = cases.map((k) => k.replace(REDIS_ACTIVITY_KEY_PREFIX, ''));
@@ -50,7 +47,13 @@ const storeCleanup = () => {
       .catch((err) => {
         debug('Error in getCasesWithActivities', err.message);
       });
-  });
+  }, prefix);
+};
+
+const storeCleanup = () => {
+  debug('store cleanup starting...');
+  cleanCasesWithPrefix('case'); // Cases via RESTful interface.
+  cleanCasesWithPrefix('c'); // Cases via socket interface.
 };
 
 exports.start = (crontab) => {

app/redis/instantiator.js

@@ -0,0 +1,46 @@
+const config = require('config');
+const Redis = require('ioredis');
+
+const ERROR = 0;
+const RESULT = 1;
+const ENV = config.util.getEnv('NODE_ENV');
+
+module.exports = (debug) => {
+  const redis = new Redis({
+    port: config.get('redis.port'),
+    host: config.get('redis.host'),
+    password: config.get('secrets.ccd.activity-redis-password'),
+    tls: config.get('redis.ssl'),
+    keyPrefix: config.get('redis.keyPrefix'),
+    // log unhandled redis errors
+    showFriendlyErrorStack: ENV === 'test' || ENV === 'dev',
+  });
+
+  /* redis pipeline returns a reply of the form [[op1error, op1result], [op2error, op2result], ...].
+    error is null in case of success */
+  redis.logPipelineFailures = (plOutcome, message) => {
+    if (Array.isArray(plOutcome)) {
+      const operationsFailureOutcome = plOutcome.map((operationOutcome) => operationOutcome[ERROR]);
+      const failures = operationsFailureOutcome.filter((element) => element !== null);
+      failures.forEach((f) => debug(`${message}: ${f}`));
+    }
+    return plOutcome;
+  };
+
+  redis.extractPipelineResults = (pipelineOutcome) => {
+    const results = pipelineOutcome.map((operationOutcome) => operationOutcome[RESULT]);
+    debug(`pipeline results: ${results}`);
+    return results;
+  };
+
+  redis
+    .on('error', (err) => {
+      // eslint-disable-next-line no-console
+      debug(`Redis error: ${err.message}`);
+    }).on('connect', () => {
+    // eslint-disable-next-line no-console
+      debug('connected to Redis');
+    });
+
+  return redis;
+};

app/redis/redis-client.js

@@ -1,47 +1,3 @@
-const config = require('config');
 const debug = require('debug')('ccd-case-activity-api:redis-client');
-const Redis = require('ioredis');
 
-const ERROR = 0;
-const RESULT = 1;
-const ENV = config.util.getEnv('NODE_ENV');
-
-const redis = new Redis({
-  port: config.get('redis.port'),
-  host: config.get('redis.host'),
-  password: config.get('secrets.ccd.activity-redis-password'),
-  tls: config.get('redis.ssl'),
-  keyPrefix: config.get('redis.keyPrefix'),
-  // log unhandled redis errors
-  showFriendlyErrorStack: ENV === 'test' || ENV === 'dev',
-});
-
-/* redis pipeline returns a reply of the form [[op1error, op1result], [op2error, op2result], ...].
-   error is null in case of success */
-redis.logPipelineFailures = (plOutcome, message) => {
-  if (Array.isArray(plOutcome)) {
-    const operationsFailureOutcome = plOutcome.map((operationOutcome) => operationOutcome[ERROR]);
-    const failures = operationsFailureOutcome.filter((element) => element !== null);
-    failures.forEach((f) => debug(`${message}: ${f}`));
-  } else {
-    debug(`${plOutcome} is not an Array...`);
-  }
-  return plOutcome;
-};
-
-redis.extractPipelineResults = (pipelineOutcome) => {
-  const results = pipelineOutcome.map((operationOutcome) => operationOutcome[RESULT]);
-  debug(`pipeline results: ${results}`);
-  return results;
-};
-
-redis
-  .on('error', (err) => {
-    // eslint-disable-next-line no-console
-    console.log(`Redis error: ${err.message}`);
-  }).on('connect', () => {
-  // eslint-disable-next-line no-console
-    console.log('connected to Redis');
-  });
-
-module.exports = redis;
+module.exports = require('./instantiator')(debug);

app/routes/activity-route.js

@@ -6,6 +6,8 @@ const validateRequest = require('./validate-request');
 const router = express.Router();
 
 module.exports = (activityService, config) => {
+  console.log(`Initializing activity route at ${new Date().toISOString()}`);
+
   const addActivity = require('./add-activity')(activityService); // eslint-disable-line global-require
   const getActivities = require('./get-activities')(activityService); // eslint-disable-line global-require
 
@@ -15,6 +17,8 @@ module.exports = (activityService, config) => {
 
   router.use(timeout(toMillis(config.get('app.requestTimeoutSec'))));
 
+  console.log(`Setting request timeout to ${config.get('app.requestTimeoutSec')} seconds`);
+
   router.post('/cases/:caseid/activity', (req, res, next) => {
     validateRequest(caseIdSchema, req.params.caseid)(req, res, next);
   },
@@ -25,5 +29,7 @@ module.exports = (activityService, config) => {
   },
   getActivities);
 
+  console.log('Activity route initialized => ready to accept requests ', router);
+
   return router;
 };

app/routes/get-activities.js

@@ -4,9 +4,13 @@ const utils = require('../util/utils');
 const { ifNotTimedOut } = utils;
 
 const getActivities = (activityService) => (req, res, next) => {
+  console.log(`GET_ACTIVITIES request received at ${new Date().toISOString()}`);
+
   const caseIds = req.params.caseids.split(',');
   const { user } = req.authentication;
 
+  console.log(`GET_ACTIVITIES request for caseIds: ${caseIds}`);
+
   debug(`GET_ACTIVITIES request for caseIds: ${caseIds}`);
   activityService.getActivities(caseIds, user)
     .then((result) => ifNotTimedOut(req, () => {

app/routes/validate-request.js

@@ -1,3 +1,5 @@
+const debug = require('debug')('ccd-case-activity-api:validate-request');
+
 const validateRequest = (schema, value) => (req, res, next) => {
   const { error } = schema.validate(value);
   const valid = error == null;
@@ -6,7 +8,7 @@ const validateRequest = (schema, value) => (req, res, next) => {
   } else {
     const { details } = error;
     const message = details.map((i) => i.message).join(',');
-    console.log('error', message);
+    debug(`error ${message}`);
     res.status(400).json({ error: message });
   }
 };

app/security/cors.js

@@ -2,7 +2,8 @@ const config = require('config');
 const sanitize = require('../util/sanitize');
 
 const createWhitelistValidator = (val) => {
-  const whitelist = config.get('security.cors_origin_whitelist').split(',');
+  const configValue = config.get('security.cors_origin_whitelist') || '';
+  const whitelist = configValue.split(',');
   for (let i = 0; i < whitelist.length; i += 1) {
     if (val === whitelist[i]) {
       return true;

app/service/activity-service.js

@@ -1,4 +1,3 @@
-const moment = require('moment');
 const debug = require('debug')('ccd-case-activity-api:activity-service');
 
 module.exports = (config, redis, ttlScoreGenerator) => {
@@ -31,7 +30,7 @@ module.exports = (config, redis, ttlScoreGenerator) => {
     const uniqueUserIds = [];
     let caseViewers = [];
     let caseEditors = [];
-    const now = moment.now();
+    const now = Date.now();
     const getUserDetails = () => redis.pipeline(uniqueUserIds.map((userId) => ['get', `user:${userId}`])).exec();
     const extractUniqueUserIds = (result) => {
       result.forEach((item) => {

app/service/ttl-score-generator.js

@@ -1,10 +1,10 @@
 const config = require('config');
-const moment = require('moment');
 const debug = require('debug')('ccd-case-activity-api:score-generator');
 
 exports.getScore = () => {
-  const now = moment();
-  const score = now.add(config.get('redis.activityTtlSec'), 'seconds').valueOf();
-  debug(`generated score out of current timestamp '${now.valueOf()}' plus ${config.get('redis.activityTtlSec')} sec`);
+  const now = Date.now();
+  const ttl = parseInt(config.get('redis.activityTtlSec'), 10) || 0;
+  const score = now + (ttl * 1000);
+  debug(`generated score out of current timestamp '${now}' plus ${ttl} sec`);
   return score;
 };