@ejfdelgado/ejflab-common 1.7.3 → 1.8.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ejfdelgado/ejflab-common",
   "type": "commonjs",
-  "version": "1.7.3",
+  "version": "1.8.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ejfdelgado/ejflab-common.git"

package/src/flowchart/FlowChartExec.js

@@ -392,7 +392,7 @@ class FlowChartExec {
             let instance = this.createInstance(commandName, id, txt, args);
             index++;
             const response1 = `${commandName}${JSON.stringify(args)}`;
-            const { canContinue, abort } = await instance.executeAsNode(args);
+            const { canContinue, abort } = await instance.executeAsNode(args, argsTxt);
             if (abort) {
                 // Panic and halt all
                 this.mustEnd = true;
@@ -429,7 +429,7 @@ class FlowChartExec {
             }
             index++;
             const response1 = `${commandName}${JSON.stringify(args)}`;
-            const { canContinue, abort } = await instance.executeAsArrow(args);
+            const { canContinue, abort } = await instance.executeAsArrow(args, argsTxt);
             if (abort) {
                 // Panic and halt all
                 this.mustEnd = true;

package/src/flowchart/steps/CommandPostgres.js

@@ -13,8 +13,13 @@ class CommandPostgres extends CommandBasic {
         if (action == "execute") {
             //console.log("Starting execute...");
             const dbIdData = SimpleObj.getValue(this.context.data, dbIdPath, null);
-            let bodyData = SimpleObj.getValue(this.context.data, bodyPath, null);
-            bodyData = JSON.parse(JSON.stringify(bodyData));
+            let bodyData = {};
+            if (typeof bodyPath == "string") {
+                bodyData = SimpleObj.getValue(this.context.data, bodyPath, {});
+                bodyData = JSON.parse(JSON.stringify(bodyData));
+            } else if (typeof bodyPath == "object" && bodyPath !== null) {
+                bodyData = bodyPath;
+            }
             if (!(bodyData instanceof Array)) {
                 bodyData = [bodyData]
             }

package/src/flowchart/steps/StepBasic.js

@@ -15,7 +15,11 @@ class StepBasic {
     nextTry = null;
     commandName;
     argsTxt;
+    argsTxtIndividual;
     fireTime;
+    startTime = null;
+    endTime = null;
+    duration = null;
     constructor(context, id, commandName, argsTxt) {
         this.context = context;
         this.id = id;
@@ -28,7 +32,39 @@ class StepBasic {
     setMaxTries(value) {
         this.maxErrorCount = value;
     }
-    async executeAsNode(args) {
+    tic() {
+        this.startTime = new Date().getTime();
+    }
+    toc() {
+        const MAX_TIME_DATA = 10;
+        this.endTime = new Date().getTime();
+        this.duration = this.endTime - this.startTime;
+        // Read the performance object
+        let performance = SimpleObj.getValue(this.context.data, "performance", {});
+        if (performance.track !== true) {
+            return;
+        }
+        // Notify
+        const idTxt = `${this.commandName}«${this.argsTxtIndividual}»`;
+        const id = "d" + Buffer.from(idTxt).toString('base64');
+        if (!(id in performance)) {
+            const val = {
+                txt: idTxt,
+                time: [this.duration],
+            }
+            SimpleObj.recreate(this.context.data, `performance.${id}`, val);
+        } else {
+            const val = performance[id];
+            val.time.push(this.duration);
+            const overflow = val.time.length - MAX_TIME_DATA;
+            if (overflow > 0) {
+                val.time.splice(0, overflow);
+            }
+            SimpleObj.recreate(this.context.data, `performance.${id}.time`, val.time);
+        }
+    }
+    async executeAsNode(args, argsTxtIndividual) {
+        this.argsTxtIndividual = argsTxtIndividual;
         const answer = {
             canContinue: false,
             abort: false,
@@ -48,8 +84,10 @@ class StepBasic {
         }
         try {
             this.args = args;
+            this.tic();
             await this.execFirst();
             await this.execLast({ isCommand: true });
+            this.toc();
             answer.canContinue = true;
             this.resetErrorState();
             return answer;
@@ -59,7 +97,8 @@ class StepBasic {
             return answer;
         }
     }
-    async executeAsArrow(args) {
+    async executeAsArrow(args, argsTxtIndividual) {
+        this.argsTxtIndividual = argsTxtIndividual;
         const answer = {
             canContinue: false,
             abort: false,
@@ -86,6 +125,7 @@ class StepBasic {
                 }
             }
             if (this.firstTime) {
+                this.tic();
                 const done = await this.execFirst();
                 if (done === false) {
                     return answer;
@@ -96,6 +136,7 @@ class StepBasic {
             answer.canContinue = await this.canContinue();
             if (answer.canContinue) {
                 await this.execLast();
+                this.toc();
                 this.fired = true;
                 this.resetErrorState();
             } else {

package/src/flowchart/steps/StepSleep.js

@@ -2,18 +2,25 @@ const { StepBasic } = require("./StepBasic");
 
 class StepSleep extends StepBasic {
     startTime = null;
+    duration = null;
     constructor(context, id, commandName, argsTxt) {
         super(context, id, commandName, argsTxt);
         super.alwaysEvaluateCanContinue = false;
     }
     async execFirst() {
         this.startTime = new Date().getTime();
+        const minTime = this.args[0];
+        const maxTime = this.args[1];
+        if (typeof maxTime == "number") {
+            this.duration = minTime + Math.floor(Math.random() * (maxTime - minTime));
+        } else {
+            this.duration = minTime;
+        }
     }
 
     async canContinue() {
-        const minTime = this.args[0];
         const diff = new Date().getTime() - this.startTime;
-        return diff >= minTime;
+        return diff >= this.duration;
     }
 }