@sera4/essentia 1.1.60 → 1.1.63

package/health/index.js

@@ -105,12 +105,12 @@ class HealthCheck {
           const result = await hc.healthFunction();
           if (typeof(result) === "boolean") {
             if (result === false) {
-              Object.assign(res, {"result": "fail" })
+              res = {"result": "fail", ...res }
             } else {
-              Object.assign(res, {"result": "success" })
+              res = {"result": "success", ...res }
             }
           } else {
-            Object.assign(res, {"result": "success" })
+            res = {"result": "success", ...res }
           }
           return res;
         } catch(e) {

package/index.js

@@ -14,3 +14,4 @@ export { default as serializer } from "./serializer/index.js";
 export * from "./utils/index.js";
 export * from "./safe_proxy/index.js";
 export * from "./helpers/index.js";
+export * from "./prompts/index.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sera4/essentia",
-  "version": "1.1.60",
+  "version": "1.1.63",
   "description": "A library of utilities for Teleporte Web Services",
   "main": "index.js",
   "type": "module",
@@ -28,6 +28,7 @@
   },
   "dependencies": {
     "amqplib": "^0.8.0",
+    "argparse": "^2.0.1",
     "async": "^3.2.2",
     "axios": "^1.7.7",
     "deep-diff": "^1.0.2",
@@ -36,6 +37,7 @@
     "git-rev": "^0.2.1",
     "lodash": "^4.17.21",
     "morgan": "^1.10.0",
+    "prompt": "^1.3.0",
     "url-parse": "^1.5.10",
     "uuid": "^9.0.0",
     "winston": "^3.3.3",

package/paper-trail/index.js

@@ -105,8 +105,8 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 			const destroyOperation = operation === 'destroy';
 			const restoreOperation = operation === 'restore';
 
-			let previousVersion = {};
-			let currentVersion = {};
+			let previousVersion = _.cloneDeep(instance._previousDataValues);
+			let currentVersion = _.cloneDeep(instance.dataValues);
 			if (!destroyOperation && options.enableCompression) {
 				_.forEach(opt.fields, a => {
 					previousVersion[a] = instance._previousDataValues[a];

package/prompts/index.js

@@ -0,0 +1,78 @@
+/* Essentia Common Prompt Functions */
+// This file contains common prompt functions that are used in CLI scripts
+//  that are run in the each project.  These functions are used to
+//  prompt the user for input and to wait for the user to press enter
+//  before continuing.  This is useful for scripts that are run in the
+//  command line and need to wait for the user to do something before
+//  continuing.
+
+import logger from "../logger/s4-logger.js";
+import { ArgumentParser } from 'argparse'
+import prompt from "prompt";
+
+// New common argument parser which makes parsing and setting up commandline options easier
+const setupCLIParser = (description) => {
+  logger.info(description)
+  return new ArgumentParser({ description });
+}
+
+// a common init function which waits for the command prompt to be delivered
+// a common use is for the awaiting of the queues to initialize before running
+const commonCLIInit = async(options) => {
+  //add in defaults to options if they have not been specified or object is {}
+  options = { asyncFcns: [], extraFcns: [], sleepTime: 1000, ...options };
+
+  // Sleep for 1 second to allow the prompt to be displayed
+  // at the end of bootstrap logs
+  await cliSleep(options.sleepTime);
+
+  options.extraFcns.forEach(fcn => {
+    fcn();
+  });
+
+  for (const fcn of options.asyncFcns) {
+    await fcn();
+  }
+}
+
+const promptCLIAsync = async (options) => {
+  return new Promise((resolve, reject) => {
+    prompt.start();
+    prompt.get(options, (err, res) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(res);
+      }
+    })
+  });
+}
+
+// A predefined waitPrompt for use at the end of the scripts that use
+//  message queues.  Message Queues often take a bit to fire
+const waitCLIPrompt = {
+  "Push <enter> when done" : {
+    type: "boolean"
+  }
+};
+
+const continueCLIPrompt = {
+  "Push <enter> to continue" : {
+    type: "boolean"
+  }
+};
+
+const cliSleep = async(ms) => {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+}
+
+export {
+  commonCLIInit,
+  continueCLIPrompt,
+  promptCLIAsync,
+  setupCLIParser,
+  cliSleep,
+  waitCLIPrompt
+};