@sera4/essentia 1.0.42 → 1.1.4

package/formatter/index.js

@@ -77,4 +77,5 @@ class S4Formatter {
   }
 }
 
-module.exports = new S4Formatter();
+const formatter = new S4Formatter(); 
+export default formatter;

package/hal/README.md

@@ -7,7 +7,7 @@ A module to add HAL decoration to JSON responses in Sequelize ORM based projects
 In your model definition, set decoration on your model
 
 ```
-const decorator = require("@sera4/essentia").halDecorator;
+import { halDecorator as decorator } from "@sera4/essentia"
 ...
 
 module.exports = (sequelize, DataTypes) => {
@@ -51,4 +51,4 @@ The above configuration (which is optional) should produce the following JSON fo
     }
 }
 ```
-The links use a similar pattern for parameters interpolation like the express route. For example `/posts/:id/by_user/:user_id` becomes `/posts/20/by_user/123`. If no matching attribute is found on the record, the variable is not replaced.
+The links use a similar pattern for parameters interpolation like the express route. For example `/posts/:id/by_user/:user_id` becomes `/posts/20/by_user/123`. If no matching attribute is found on the record, the variable is not replaced.

package/hal/index.js

@@ -70,4 +70,6 @@ class HalDecorator {
   }
 }
 
-module.exports = new HalDecorator()
+
+const halDecorator = new HalDecorator();
+export default halDecorator;

package/health/index.js

@@ -1,7 +1,6 @@
 "use strict"
 
-const pathHelper = require("path");
-const logger = require("./health-logger");
+import pathHelper from "path";
 
 class HealthCheckError extends Error {
   constructor(m) {
@@ -12,20 +11,16 @@ class HealthCheckError extends Error {
 /* Health Checking router + controller for use in all of our modules
  * Example use: Place the following code in your routes file
  *
- *    const hc = require("@sera4/essentia").healthCheck;
+ *    import { healthCheck } from "@sera4/essentia";
  *    const router = require('express').Router();
  *
  *      ....
- *
- *    const checkRedis = async () => { await cache.ping(); }
- *    hc.setupCheck({ name: "redis", checkResult: false, critical: true, healthFunction: checkRedis });
  *    app.use(hc.defaultPath(serverConfigs.api_prefix), hc.routes(router));
  *
  */
-class HealthCheck {
-  constructor(appendData = {}, enableLogging = true) {
-    logger.setEnabled(enableLogging);
 
+class HealthCheck {
+  constructor(appendData = {}) {
     this.defaultResponse = {
       ...
       appendData,
@@ -34,13 +29,11 @@ class HealthCheck {
     };
 
     this.defaultPathRoute = `health_check\(.*\)?`
-    this.suppressLogs = false;
     this.lastCallId = 0; // default start point/integer
     this.healthChecks = [];
   }
 
-  /* Deprecated and replaced by setupCheck
-   *   call this with an async function, must support wait capability
+  /* call this with an async function, must support wait capability
    *
    *   const dbCheck = async () => {
    *     return { name: "db", "result": "success", critical: false };
@@ -67,40 +60,15 @@ class HealthCheck {
     return router
   }
 
-  // v2 version of health check, replaced addCheck
-  // example:
-  //  const checkRedisFcn = async () => { await cache.ping().then(() => true) }
-  //  setupCheck({ name: "redis", checkResult: false, critical: false, healthFunction: checkRedisFcn });
-  setupCheck(config) {
-    this.healthChecks.push(config);
-  }
-
-  /* performs health checks and returns 200 if true and 500 if not */ 
+  /* performs health checks and returns 200 if true and 500 if not */
   async checkHealth(req, res) {
     const checkFormat = pathHelper.extname(req.baseUrl);
 
-    const result = await Promise.all(this.healthChecks.map(async hc => {
-      if (typeof(hc) === "function") {
-        try {
-          return await hc();
-          return { "result": "success", critical: false };
-        } catch(e) {
-          return  { name: "unknown", result: 'fail', status: e.status }
-        }
-      } else {
-        let res = { name: hc.name, critical: hc.critical }
-        try {
-          await hc.healthFunction();
-          return { ...res, "result": "success" };
-        } catch(e) {
-          const appendStatus = e.status ? ` (${e.status})` : ""
-          logger.warn(`${hc.name} service failed${appendStatus}` )
-          return { ...res, "result": "fail", status: e.status } 
-        }
-      }
-    }));
-
     try {
+      const result = await Promise.all(this.healthChecks.map(async healthCallback => {
+        return await healthCallback();
+      }));
+
       let callId = ++this.lastCallId;
 
       // start the counter over
@@ -110,18 +78,10 @@ class HealthCheck {
 
       let status = this.defaultResponse.status;
 
-      let nonCriticalFail = false;
-      let criticalFail = false;
-
       result.some(e => {
         if (e.result.match(/fail/)) {
-          if (e.critical == false) {
-            nonCriticalFail = true;
-          } else {
-            criticalFail = true;
-            status = 500;
-            return true; // break
-          }
+          status = 500;
+          return true; // break
         }
       })
 
@@ -129,39 +89,37 @@ class HealthCheck {
       res.setHeader('check', callId)
 
       if (checkFormat === ".json") {
-        const payload = { "check": callId, healthy: "true", message: "success" }
+        const payload = { "check": callId }
 
-        if (criticalFail) {
+        if (status === 200) {
           res.status(status).json({
             ... payload,
-            "healthy": false,
-            "message": "fail",
-            "services": result
+            "healthy":true,
+            "message":"success"
           });
-        } else if (nonCriticalFail) {
+        } else {
           res.status(status).json({
             ... payload,
+            "healthy": false,
             "message": "fail",
-            "services": result
+            "services": [result]
           });
-        } else if (status === 200) {
-          res.status(status).json(payload);
         }
       } else {
         let status_message;
-        if (criticalFail) {
-          status_message = "fail"
-        } else if ((status === 200) || nonCriticalFail) {
+        if (status === 200) {
           status_message = "success"
-        } 
+        } else {
+          status_message = "fail"
+        }
 
         res.status(status).send(status_message);
       }
     } catch(error) {
-      console.debug("error: ", error)
       res.status(500).send();
     }
   }
 }
 
-module.exports = HealthCheck;
+
+export { HealthCheck };

package/index.js

@@ -1,15 +1,23 @@
 'use strict';
 
-module.exports = {
-  paginator : require("./paginator/s4-pagination"),
-  paginator : require("./paginator/s4-pagination"),
-  sqlPaginator : require("./paginator/sql-pagination"),
-  logger : require("./logger/s4-logger"),
-  lastCommit : require("./last_commit"),
-  halDecorator : require("./hal"),
-  formatter : require("./formatter"),
-  healthCheck : require("./health"),
-  queue : require("./queue"),
-  utils : require("./utils"),
-  safeProxy : require("./safe_proxy")
-}
+export { default as paginator } from "./paginator/s4-pagination.js";
+export { default as sqlPaginator } from "./paginator/sql-pagination.js";
+export { default as logger } from "./logger/s4-logger.js";
+export { default as lastCommit } from "./last_commit/index.js";
+export { default as halDecorator } from "./hal/index.js";
+export { default as formatter } from "./formatter/index.js";
+export { HealthCheck as healthCheck } from "./health/index.js";
+export { default as queue } from "./queue/index.js";
+export { default as utils } from "./utils/index.js";
+
+//export default {
+//  paginator : require("./paginator/s4-pagination"),
+//  sqlPaginator : require("./paginator/sql-pagination"),
+//  logger : require("./logger/s4-logger"),
+//  lastCommit : require("./last_commit"),
+//  halDecorator : require("./hal"),
+//  formatter : require("./formatter"),
+//  healthCheck : require("./health"),
+//  queue : require("./queue"),
+//  utils : require("./utils")
+//}

package/last-commit.js

@@ -1,5 +1,6 @@
 "use strict";
-const lastCommit = require("./last_commit");
+import lastCommit from "./last_commit/index.js"
+
 lastCommit.writeLastCommit()
 .then(c => {
   console.debug("Last commit written");

package/last_commit/index.js

@@ -1,13 +1,15 @@
 "use strict";
 
-const git = require('git-rev');
-const fs = require('fs');
-const async = require('async');
-const path = require('path');
-const appDir = path.dirname(require.main.filename);
+import git from "git-rev";
+import fs from "fs";
+import async from "async";
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const appDir = dirname(fileURLToPath(import.meta.url));
 const commitFile = `${appDir}/last-commit.json`;
 
-module.exports = {
+const lastCommit = {
   parseLastCommit() {
     return new Promise((resolve, reject) => {
       async.waterfall([
@@ -75,4 +77,6 @@ module.exports = {
       })
     });
   }
-}
+}
+
+export default lastCommit;

package/logger/s4-logger.js

@@ -1,25 +1,8 @@
-const winston = require('winston');
-const util = require('util');
-const jsonStringify = require('fast-safe-stringify');
+import winston from "winston";
+import util from "util";
+import jsonStringify from "fast-safe-stringify";
 const colorizer = winston.format.colorize();
-
-require('winston-logstash');
-
-// IETF RFC5424:
-// Severity of all levels is assumed to be numerically ascending from most important to least important.
-const levels = {
-  error: 0,
-  warn: 1,
-  info: 2,
-  debug: 3,
-  trace: 4,
-}
-
-// These colors are not used, however if colors are not defined for custom levels
-// then winston will throw an exception.
-winston.addColors({
-  trace: 'white'
-})
+import "winston-logstash";
 
 const devFormat = {
   transform(info) {
@@ -33,12 +16,10 @@ const devFormat = {
 };
 
 const defaultTransport = new winston.transports.Console({
-  format: devFormat,
-  level: 'trace'
+  format: devFormat
 });
 
 const logger = winston.createLogger({
-  levels: levels,
   level: 'debug',
   defaultMeta: { },
   transports: [defaultTransport]
@@ -50,7 +31,9 @@ class S4Logger {
       return;
     }
 
-    this.setLevel(options.level)
+    if (options.level && ["debug", "info", "error", "warn"].indexOf(options.level.toLowerCase())) {
+      logger.level = options.level;
+    }
 
     logger.defaultMeta.service = options.service;
     switch(options.format.toLowerCase()) {
@@ -67,7 +50,7 @@ class S4Logger {
   }
 
   setLevel(level) {
-    if (level && ["trace", "debug", "info", "error", "warn"].indexOf(level.toLowerCase())) {
+    if (level && ["debug", "info", "error", "warn"].indexOf(level.toLowerCase())) {
       logger.level = level;
     }
   }
@@ -84,10 +67,6 @@ class S4Logger {
     });
   }
 
-  trace(...args) {
-    logger.trace(util.format(...args));
-  }
-
   debug(...args) {
     logger.debug(util.format(...args));
   }
@@ -117,4 +96,5 @@ class S4Logger {
   }
 }
 
-module.exports = new S4Logger();
+const s4logger = new S4Logger();
+export default s4logger;

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@sera4/essentia",
-  "version": "1.0.42",
+  "version": "1.1.4",
   "description": "A library of utilities for Teleporte Web Services",
   "main": "index.js",
+  "type": "module",
   "scripts": {
     "test": "NODE_ENV=test ./node_modules/.bin/mocha --forbid-only --reporter mocha-junit-reporter --reporter-options mochaFile=./test-results/result.xml --exit",
     "test:dev": "NODE_ENV=test ./node_modules/.bin/mocha --watch --forbid-only",
@@ -17,25 +18,23 @@
   },
   "license": "UNLICENSED",
   "devDependencies": {
-    "chai": "^4.1.2",
-    "express": "^4.16.4",
-    "mocha": "^5.1.1",
-    "mocha-junit-reporter": "^1.17.0",
-    "node-mocks-http": "^1.5.8",
-    "nodemon": "^1.17.3",
-    "should": "^13.2.1",
-    "sinon": "^5.0.1"
+    "chai": "^4.3.4",
+    "express": "^4.17.1",
+    "mocha": "^8.3.2",
+    "mocha-junit-reporter": "^1.23.3",
+    "node-mocks-http": "^1.10.1",
+    "nodemon": "^2.0.7",
+    "should": "^13.2.3",
+    "sinon": "^5.1.1"
   },
   "dependencies": {
-    "amqplib": "^0.8.0",
-    "async": "^2.6.1",
-    "axios": "^0.21.1",
-    "fast-safe-stringify": "^2.0.6",
+    "amqplib": "^0.5.6",
+    "async": "^2.6.3",
+    "fast-safe-stringify": "^2.0.7",
     "git-rev": "^0.2.1",
-    "lodash": "^4.17.21",
     "url-parse": "^1.5.1",
-    "uuid": "^3.3.3",
-    "winston": "^3.2.1",
+    "uuid": "^3.4.0",
+    "winston": "^3.3.3",
     "winston-logstash": "^0.4.0"
   }
 }

package/paginator/README.md

@@ -7,7 +7,7 @@ This is a module to add pagination to Sequelize ORM based projects.
 In your model definition, set pagination on your model
 
 ```
-const paginator = require("@sera4/essentia").sqlPaginator;
+import { paginator } from "@sera4/essentia";
 ...
 
 module.exports = (sequelize, DataTypes) => {
@@ -155,7 +155,7 @@ You may notice that the links in the pagination only have query parameters. If y
 
 For example:
 ```
-const paginator = require("@sera4/essentia).sqlPaginator;
+import { paginator } from "@sera4/essentia"
 ...
 
 module.exports = (sequelize, DataTypes) => {

package/paginator/s4-pagination.js

@@ -47,4 +47,5 @@ class S4Pagination {
   }
 }
 
-module.exports = new S4Pagination();
+const paginator = new S4Pagination();
+export default paginator;

package/paginator/sql-pagination.js

@@ -166,4 +166,5 @@ class SequelizePaginator {
   }
 }
 
-module.exports = new SequelizePaginator();
+const sqlPaginator = new SequelizePaginator();
+export default sqlPaginator;

package/queue/index.js

@@ -1,9 +1,9 @@
 "use strict";
-const amqp = require("amqplib/callback_api");
-const logger = require("./queue-logger");
-const urlParse = require("url-parse");
-const { Publisher } = require("./publisher");
-const { Subscriber } = require("./subscriber");
+import amqp from "amqplib/callback_api.js";
+import logger from "./queue-logger.js";
+import urlParse from "url-parse";
+import { Publisher } from "./publisher.js";
+import { Subscriber } from "./subscriber.js";
 
 /**
  * An interface to AMQP service
@@ -29,7 +29,6 @@ class S4Queue {
    */
   async testConnection() {
     if (!this.isConnected()) {
-      this.connectionTestChannel = null;
       throw("queue service not connected")
     }
 
@@ -73,16 +72,12 @@ class S4Queue {
       amqp.connect(options.connectionUrl, socketOptions, (err, conn) => {
 
         if (err) {
-          logger.error("Error while connecting", err)
-          logger.error("Attempting again in", this.retry, "seconds");
-          return setTimeout(() => this.openConnection(options), this.retry * 1000);
+          return reject(err);
         }
 
         this.connection = conn;
         if (!this.connection) {
           return reject(new Error("Failed to obtain connection"));
-        } else {
-          this.updatePubsAndSubsConnectionRef(conn);
         }
 
         this.connection.on("error", (err) => {
@@ -96,8 +91,8 @@ class S4Queue {
           logger.error("connection closed");
           this.connection = null;
           if (err) {
-            logger.error("connection closed due to error:", err);
-            logger.error("Reconnecting in", this.retry, "seconds");
+            logger.debug("connection closed due to error:", err);
+            logger.debug("Reconnecting in", this.retry, "seconds");
             setTimeout(() => this.openConnection(options), this.retry * 1000);
           } else {
             // If there was no error, it is us who closed
@@ -176,22 +171,6 @@ class S4Queue {
     this.pubs[name] = p;
   }
 
-  /**
-   * Registers a new fanout publisher on the given exchange.
-   * If exchange doesn't exist, one will be created.
-   * @param {String} exchange the name of the exchange on AMQP service.
-   */
-  async registerFanoutPublisher(exchange) {
-    const name = exchange;
-    if (Object.keys(this.pubs).includes(name)) {
-      throw new Error(`Publisher ${name} already registered`);
-    }
-
-    const p = new Publisher(exchange, 'fanout', true, name);
-    await p.init(this.connection);
-    this.pubs[name] = p;
-  }
-
   /**
    * Registers a new direct subscriber on a given exchange and queue.
    * If exchange and queue don't exists, they'll be created
@@ -294,28 +273,6 @@ class S4Queue {
     return await p.publish({key: topic, content});
   }
 
-  /**
-   * Binds an exchange to a queue
-   * @param {String} exchange the name of the exchange.
-   * @param {String} queue the name of the queue.
-   * @param {pattern} (optional) pattern for routing key
-  */
-  async bindQueueToExchange(exchange, queue, pattern) {
-    const p = this.pubs[exchange];
-
-    if (!p) {
-      throw(new Error(`No PUB for ${exchange} found`));
-    }
-
-    if (!queue) {
-      throw(new Error(`Binding a queue requires a queue name`));
-    }
-
-    return await p.bindQueue(queue, pattern)
-  }
-
-
-
   /**
    * Adds a listener for a specific key.
    * If a subscriber that was regitered was found
@@ -332,29 +289,7 @@ class S4Queue {
       }
     });
   }
-
-  /**
-   * Updates the connection reference to all the previously
-   * registered publishers and subscribers.
-   * After we successfully establish a connection and register pubs/subs,
-   * it's possible for the connection to break. This object will try
-   * to re-establish a new connection every 3 seconds (or whatever configuration is set)
-   * and if a new connection is established, we need to pass that connection to
-   * all our pubs/subs, otherwise they'll be operating with old/stale references
-   * @param {Object} connRef a new connection reference to the AMQP service
-   */
-  updatePubsAndSubsConnectionRef(connRef) {
-    Object.keys(this.pubs).forEach(k => {
-      logger.debug(`Updating publisher ${k} with a new connection object`);
-      const p = this.pubs[k];
-      p.init(connRef);
-    });
-    Object.keys(this.subs).forEach(k => {
-      logger.debug(`Updating subscriber ${k} with a new connection object`);
-      const s = this.subs[k];
-      s.init(connRef);
-    });
-  }
 }
 
-module.exports = new S4Queue();
+const queue = new S4Queue();
+export default queue;

package/queue/publisher.js

@@ -1,10 +1,10 @@
-const logger = require("./queue-logger");
-const uuidv4 = require("uuid/v4");
+import logger from "./queue-logger.js";
+import uuidv4 from "uuid/v4.js";
 
 /**
  * A publisher for AMQP service
  */
-class Publisher {
+export class Publisher {
 
   /**
    *
@@ -80,12 +80,4 @@ class Publisher {
 
     return parcel.tracking_id;
   }
-
-  async bindQueue(queue, pattern, args) {
-    await this.channel.bindQueue(queue, this.exchange, pattern, args)
-  }
-}
-
-module.exports = {
-  Publisher
 }

package/queue/queue-logger.js

@@ -1,7 +1,7 @@
-const logger = require("../logger/s4-logger");
+import logger from "../logger/s4-logger.js";
 let enabled = false;
 
-module.exports = {
+const helpers = {
   debug(...args) {
     if (enabled) {
       logger.debug(":: AMQP ::", args);
@@ -35,4 +35,6 @@ module.exports = {
   setEnabled(e) {
     enabled = e;
   }
-}
+}
+
+export default helpers;

package/queue/subscriber.js

@@ -1,9 +1,9 @@
-const logger = require("./queue-logger");
+import logger from "./queue-logger.js";
 
 /**
  * A subscriber for AMQP service
  */
-class Subscriber {
+export class Subscriber {
 
   /**
    * Builds a subscriber
@@ -89,7 +89,3 @@ class Subscriber {
     this.callbacks.push(cb);
   }
 }
-
-module.exports = {
-  Subscriber
-}

package/utils/index.js

@@ -1,8 +1,6 @@
 "use strict";
 
-const { TWS_ROUTE_TYPES } = require("../constants");
-
-module.exports = {
+const utils = {
   isValidUuidV4 : (input) => {
     if (!input) {
       return false
@@ -12,8 +10,8 @@ module.exports = {
   },
   // convert a regular string or Array to array (ie, "[1,2,3]", "1,2,3")
   // useful for controller inputs
-  convertToIntegerArray: (input) => {
-    return module.exports.convertToArray(input)
+  convertToIntegerArray(input) {
+    return this.convertToArray(input)
         .filter((el) => /^[0-9]+/.test(el))
         .map((el) => parseInt(el));
   },
@@ -36,34 +34,7 @@ module.exports = {
         return []
       }
     }
-  },
-  isBlank: (str) => {
-    return ((str === null) || (str === undefined) || /^\s*$/.test(str));
-  },
-  getRouteType: (domain) => {
-    if (!domain)
-      return -1;
-
-    let routeType;
-
-    switch (true) {
-      case /^(tws-web|local-gateway)/i.test(domain):
-        routeType = TWS_ROUTE_TYPES['web'];
-        break;
-      case /^tws-mob/i.test(domain):
-        routeType = TWS_ROUTE_TYPES['mobile'];
-        break;
-      case /^(tws-api-)/i.test(domain):
-        routeType = TWS_ROUTE_TYPES['api'];
-        break;
-      default:
-        routeType = TWS_ROUTE_TYPES['other'];
-    }
-
-    return routeType;
-  },
-  isWebRoute: (sessionType) => (sessionType === TWS_ROUTE_TYPES['web']),
-  isApiRoute: (sessionType) => (sessionType === TWS_ROUTE_TYPES['api']),
-  isMobileRoute: (sessionType) => (sessionType === TWS_ROUTE_TYPES['mobile']),
-  isOtherRoute: (sessionType) => (sessionType === TWS_ROUTE_TYPES['other'])
+  }
 }
+
+export default utils;

package/cache/index.js

@@ -1,188 +0,0 @@
-"use strict"
-
-import { promisify } from "util";
-
-const isEmpty = obj => [Object, Array].includes((obj || {}).constructor) && !Object.entries((obj || {})).length;
-
-class CacheConfigError extends Error {
-  constructor(m) {
-    super(m);
-  }
-}
-
-/* Redis cache helper
- * Example use: Place the following code in your project to setup redis use
- *
- *    import { cache } from "@sera4/essentia";
- *    const cacheHelper = cache({ password: .., database: .., host: .., port: .. }, "service:"));
- *
- */
-
-const convertRedisKeyValueToJson = (v) => {
-  return (v && v.length > 0 && v[0] !== null) ? JSON.parse(v) : null;
-}
-
-const convertRedisHashToJson = (v) => {
-  if (v) {
-    var result = {};
-    for(var k in v) {
-      if (v.hasOwnProperty(k)) {
-        result[k] = JSON.parse(v[k]);
-      }
-    }
-    return result;
-  } else {
-    return null;
-  }
-}
-
-function convertJsonToRedisValue(j) {
-  var result = {};
-  for (var key in j) {
-    if (j.hasOwnProperty(key)) {
-      result[key] = JSON.stringify(j[key]);
-    }
-  }
-  return result;
-}
-
-class Cache {
-  constructor(config, servicePrefix) {
-    if ((config == undefined) || isEmpty(config)) {
-      throw new CacheConfigError("Invalid cache configuration");
-    }
-
-    if (servicePrefix == null) {
-      throw new CacheConfigError("Invalid service prefix");
-    }
-
-    if (config.fake) {
-      // used in testing
-      this.redisClient = require("fakeredis").createClient("fake backend")
-    } else {
-      this.redisClient = require("redis").createClient(config);
-    }
-
-    this.redisClient.on("error", (err) => {
-      logger.error("Cache/Redis error: ", err);
-    });
-
-    this.servicePrefix = servicePrefix;
-  }
-
-  ping() {
-    return this.redisClient.ping();
-  }
-
-  properKey(key, path) {
-    let p = this.servicePrefix + key
-    if (path)
-      p += path
-    return p
-  }
-
-  writeHash(path, key, value) {
-    return this.redisClient.hsetAsync(properKey(key), key, value);
-  }
-
-  writeHashBlocking(path, key, value) {
-    return this.redisClient.hset(properKey(key), key, value);
-  }
-
-  // write multiple hash keys and stringify every value
-  writeMultiHash(path, j) {
-    return this.redisClient.hmsetAsync(properKey(key), convertJsonToRedisValue(j));
-  }
-
-  readHashKey(obj, key, autoConvert=true) {
-    var k = autoConvert;
-
-    return new Promise((resolve, reject) => {
-      this.redisClient.hget(properKey(key, obj), key, (e, r) => {
-        if (e) {
-          logger.error("Redis hmget error:", e);
-          reject(e);
-        } else {
-          resolve(k ? convertRedisKeyValueToJson(r) : r);
-        }
-      });
-    });
-  }
-
-  readHash(path) {
-    return new Promise((resolve, reject) => {
-      this.redisClient.hgetall(properKey(key, path), (e, r) => {
-        if (e) {
-          console.log("Redis hget error:", e);
-          reject(e);
-        } else {
-          resolve(convertRedisHashToJson(r));
-        }
-      });
-    });
-  }
-
-  deleteHashKey(hash, key) {
-    return new Promise((resolve, reject) => {
-      this.redisClient.hdel(properKey(key, hash), key, (err) => {
-        if (err) {
-          logger.error("Redis hdel error:", err);
-          reject(err);
-        } else {
-          resolve();
-        }
-      });
-    });
-  }
-
-  get(key) {
-    return this.redisClient.getAsync(properKey(key));
-  }
-
-  getAsync(key) {
-    return promisify(this.redisClient.get(key)).bind(this.redisClient)
-  }
-
-
-  /* a single key write with optional expiry */
-  // returns bluebird promise
-  writeKey(key, value, expiry) {
-    key = this.servicePrefix + key;
-    if (expiry) {
-      return this.redisClient.setAsync(key, value, "EX", expiry);
-    } else {
-      return this.redisClient.setAsync(key, value);
-    }
-  }
-
-  deleteKey(key) {
-    return redisClient.delAsync(properKey(key));
-  }
-
-  expire(path, expiry) {
-    return this.redisClient.expire(path, expiry);
-  }
-
-  exists(path) {
-    return this.redisClient.exists(path);
-  }
-
-  deleteAllKeys() {
-    return new Promise((resolve, reject) => {
-      if(process.env.NODE_ENV === "production") {
-        throw new Error("Clearing system cache is not permitted in production");
-      }
-      this.redisClient.flushdb((err, res) => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve(res);
-        }
-      });
-    });
-  }
-}
-
-export default function(config, servicePrefix) {
-  return new Cache(config, servicePrefix)
-}

package/constants/index.js

@@ -1,13 +0,0 @@
-"use strict";
-
-// indicate what target URL was used for a request
-const TWS_ROUTE_TYPES = Object.freeze({
-  'web': 1,
-  'mobile': 2,
-  'api': 3,
-  'other': 4
-});
-
-module.exports = {
-  TWS_ROUTE_TYPES
-};

package/health/health-logger.js

@@ -1,38 +0,0 @@
-const logger = require("../logger/s4-logger");
-let enabled = false;
-
-module.exports = {
-  debug(...args) {
-    if (enabled) {
-      logger.debug(":: HealthCheck ::", args);
-    }
-  },
-
-  log(...args) {
-    if (enabled) {
-      logger.debug(":: HealthCheck ::", args);
-    }
-  },
-
-  warn(...args) {
-    if (enabled) {
-      logger.warn(":: HealthCheck ::", args);
-    }
-  },
-
-  info(...args) {
-    if (enabled) {
-      logger.info(":: HealthCheck ::", args);
-    }
-  },
-
-  error(...args) {
-    if (enabled) {
-      logger.error(":: HealthCheck ::", args);
-    }
-  },
-
-  setEnabled(e) {
-    enabled = e;
-  }
-}

package/safe_proxy/index.js

@@ -1,59 +0,0 @@
-"use strict";
-
-const axios = require("axios"); // required only until migration is complete
-const { omitBy, isNil } = require("lodash");
-
-/* A class which safely wraps an axios connection in order to pass the current user through to
- * the next service.  Useful when one of our microservices requires auth as either an admin (sera4tal)
- * or as the end user (example: DELETE /auth/sessions/:id
- *
- * each method requires a res.locals from a pre-authd session
- */
-class SafeProxy {
-  constructor() {
-  }
-
-  // a safe post request
-  // locals = res.locals - your authentication details
-  post(locals, url, options = { headers: {}, data: {}}) {
-    let { account, tenant, membership } = locals;
-    return this._proxyRequest({ account, tenant, membership }, url, "post", options);
-  }
-  delete(locals, url, options = { headers: {}, data: {}}) {
-    let { account, tenant, membership } = locals;
-    return this._proxyRequest({ account, tenant, membership }, url, "delete", options);
-  }
-
-  /* private methods */
-  // supports get, delete, post
-  // options includes { headers, data } for post / delete payloads
-  async _proxyRequest(locals, url, method = "get", options) {
-    let request;
-    let membership = locals.membership ? JSON.stringify(locals.membership) : null;
-    let headers = omitBy({ ...options.headers,
-      "tws-account-id": locals.account?.id,
-      "tws-tenant-id": locals.tenant?.id,
-      "tws-membership-id": locals.membership?.id,
-      "tws-membership": membership
-    }, isNil);
-
-    switch(method) {
-      case "post":
-        request = axios.post(url, { ...options.data }, { headers })
-        break;
-      case "delete":
-        request = axios.delete(url, { ...options.data, headers } )
-        break;
-      case "get":
-        request = axios.get(url, { headers, data } )
-        break;
-      default:
-        throw new Error("uknown type called in proxyRequest");
-    }
-
-    return request;
-  }
-
-}
-
-module.exports = new SafeProxy();