@ejfdelgado/ejflab-back 1.16.8 → 1.17.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ejfdelgado/ejflab-back",
-  "version": "1.16.8",
+  "version": "1.17.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ejfdelgado/ejflab-back.git"
@@ -18,7 +18,7 @@
   "license": "ISC",
   "private": false,
   "dependencies": {
-    "@ejfdelgado/ejflab-common": "1.10.6",
+    "@ejfdelgado/ejflab-common": "1.11.1",
     "@google-cloud/compute": "^4.7.0",
     "@google-cloud/firestore": "^7.9.0",
     "@google-cloud/storage": "^7.11.3",

package/srv/callprocessors/LoadFlowChartProcessor.mjs

@@ -2,6 +2,7 @@ import { FlowChartExec } from "@ejfdelgado/ejflab-common/src/flowchart/FlowChart
 import { GenericProcessor } from "./GenericProcessor.mjs";
 import fs from "fs";
 import { SimpleObj } from "@ejfdelgado/ejflab-common/src/SimpleObj.js";
+import { MyTuples } from "@ejfdelgado/ejflab-common/src/MyTuples.js";
 import { Buffer } from 'buffer';
 
 const WORKSPACE = process.env.WORKSPACE;
@@ -24,6 +25,24 @@ export class LoadFlowChartProcessor extends GenericProcessor {
         }
     }
 
+    overwriteProcessorEnvVariables(dataObject) {
+        //console.log(JSON.stringify(dataObject, null, 4));
+        const tuples = MyTuples.getTuples(dataObject);
+        //console.log(JSON.stringify(tuples, null, 4));
+        const keys = Object.keys(tuples);
+        for (let i = 0; i < keys.length; i++) {
+            const key = keys[i];
+            const currentValue = tuples[key];
+            if (typeof currentValue == "string") {
+                const envKey = key.replace(".", "_").toUpperCase();
+                if (envKey in process.env) {
+                    SimpleObj.recreate(dataObject, key, process.env[envKey]);
+                }
+                console.log(`${envKey}=${SimpleObj.getValue(dataObject, key)}`);
+            }
+        }
+    }
+
     async execute(args) {
         let {
             names,
@@ -59,7 +78,12 @@ export class LoadFlowChartProcessor extends GenericProcessor {
             const keysData = Object.keys(dataPath);
             for (let i = 0; i < keysData.length; i++) {
                 const keyData = keysData[i];
-                const dataObject = JSON.parse(fs.readFileSync(dataPath[keyData], 'utf8'));
+                const fileName = dataPath[keyData];
+                const dataObject = JSON.parse(fs.readFileSync(fileName, 'utf8'));
+                // Here we can intercept the data model and overwrite given env variables
+                if (fileName.endsWith("processors.json")) {
+                    this.overwriteProcessorEnvVariables(dataObject);
+                }
                 if (keyData.length == 0) {
                     Object.assign(data, dataObject);
                 } else {

package/srv/callprocessors/ProcessResponseProcessor.mjs

@@ -79,13 +79,15 @@ export class ProcessResponseProcessor extends GenericProcessor {
         if (!!outputConnectionsConf) {
             outputConnectionsConf.forEach((outputConnectionsConfOne) => {
                 const { key, val } = outputConnectionsConfOne;
-                const output = val;
-                const dataLocal = data[key];
+                const outputPath = val;
+                let dataLocal = data[key];
+                //console.log(`Assigning ${outputPath}`);
+                //console.log(JSON.stringify(dataLocal, null, 4));
                 if (dataLocal != undefined) {
                     // Sends dataResponse to val
-                    const outputParts = /^(b\.([^.]+)\.([^.]+)|d\.(.+))$/i.exec(output);
+                    const outputParts = /^(b\.([^.]+)\.([^.]+)|d\.(.+))$/i.exec(outputPath);
                     if (!outputParts) {
-                        console.log(`${output} does not match ^(b\.([^.]+)\.([^.]+)|d\.(.+))$`);
+                        console.log(`${outputPath} does not match ^(b\.([^.]+)\.([^.]+)|d\.(.+))$`);
                         return;
                     }
                     if (!outputParts[4]) {
@@ -98,7 +100,7 @@ export class ProcessResponseProcessor extends GenericProcessor {
                         }
                         instance.saveBufferData(processorIdLocal, sourcePathIndexed, dataLocal);
                         // Publish to others the not indexed?
-                        const destiny = `${room}.${output}`;
+                        const destiny = `${room}.${outputPath}`;
                         //console.log(`Publishing to ${destiny} ok?`);
                         this.io.to(destiny).emit("processResponse", {
                             processorId,
@@ -107,6 +109,7 @@ export class ProcessResponseProcessor extends GenericProcessor {
                         });
                     } else {
                         // Json case
+                        dataLocal = JSON.parse(JSON.stringify(dataLocal));
                         // Affect the model in the given point
                         const path = outputParts[4];
                         let pathIndexed = path;
@@ -125,7 +128,7 @@ export class ProcessResponseProcessor extends GenericProcessor {
                         });
                     }
                 } else {
-                    console.log(`Skip output connection ${val} with no value`);
+                    console.log(`Skip output connection ${outputPath} with no value`);
                 }
             });
         }