@inteli.city/node-red-contrib-exec-collection 2.0.3 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name" : "@inteli.city/node-red-contrib-exec-collection",
-	"version": "2.0.3",
+	"version": "2.1.0",
 	"dependencies": {
 		"fs": "*",
         "tmp-promise": "*",
@@ -10,9 +10,8 @@
 		"queue": "^6.0.2",
         "nunjucks": "^3.2.4",
 		"os": "*",
-		"terminate": "*",
-        "pg-promise": "*"
-	},
+		"terminate": "*"
+    },
 	"keywords": [ "node-red" ],
 	"license": "Apache-2.0",
     "node-red" : {
@@ -22,8 +21,7 @@
             "exec service":  "exec.service.js",
             "python queue":  "python.queue.js",
             "python config": "python.config.js",
-            "node queue":    "node.queue.js",
-            "async pg":      "async.pg.js"
+            "node queue":    "node.queue.js"
         }
     }
 }

package/async.pg.html

@@ -1,216 +0,0 @@
-<script type="text/x-red" data-template-name="postgresDB">
-  <div class="form-row">
-    <label for="node-config-input-name"><i class="fa fa-tag"></i> <span>Name</span></label>
-    <input type="text" id="node-config-input-name" placeholder="name">
-  </div>
-  <div class="form-row">
-    <ul style="background: #fff; min-width: 600px; margin-bottom: 20px;" id="async-pg-config-tabs"></ul>
-  </div>
-  <div id="async-pg-config-tabs-content" style="min-height: 170px;">
-    <div id="async-pg-config-tab-connection" style="display: none;">
-      <div class="form-row">
-        <label for="node-config-input-host"><i class="fa fa-server"></i> <span>Host</span></label>
-        <input class="input-append-left" type="text" id="node-config-input-host" placeholder="localhost" style="width: 40%;">
-        <label for="node-config-input-port" style="margin-left: 10px; width: 30px; "> <span>Port</span></label>
-        <input type="text" id="node-config-input-port" placeholder="5432" style="width:135px">
-      </div>
-      <div class="form-row">
-        <label for="node-config-input-database"><i class="fa fa-database"></i> <span>Database</span></label>
-        <input type="text" id="node-config-input-database" placeholder="postgres">
-      </div>
-      <div class="form-row">
-        <input type="checkbox" id="node-config-input-ssl" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-config-input-ssl" style="width: auto;"> <span>SSL</span></label>
-      </div>
-    </div>
-    <div id="async-pg-config-tab-security" style="display: none;">
-      <div class="form-row">
-        <label for="node-config-input-user"><i class="fa fa-user"></i> <span>User</span></label>
-        <input type="text" id="node-config-input-user" placeholder="postgres">
-      </div>
-      <div class="form-row">
-        <label for="node-config-input-password"><i class="fa fa-lock"></i> <span>Password</span></label>
-        <input type="password" id="node-config-input-password" placeholder="postgres">
-      </div>
-    </div>
-    <div id="async-pg-config-tab-pool" style="display: none;">
-      <div class="form-row">
-        <label title="Maximum number of physical database connections that this connection pool can contain." for="node-config-input-max" style="width: 150px;"><i class="fa fa-thermometer-full"></i> <span>Maximum size</span></label>
-        <input type="text" id="node-config-input-max" placeholder="10">
-      </div>
-      <div class="form-row">
-        <label title="Minimum number of physical database connections that this connection pool can contain." for="node-config-input-min" style="width: 150px;"><i class="fa fa-thermometer-empty"></i> <span>Minimum size</span></label>
-        <input type="text" id="node-config-input-lin" placeholder="1">
-      </div>
-      <div class="form-row">
-        <label for="node-config-input-idle" style="width: 150px;"><i class="fa fa-hourglass-half"></i> <span>Idle Timeout</span></label>
-        <input type="text" id="node-config-input-idle" placeholder="1000 (Milliseconds)">
-      </div>
-    </div>
-  </div>
-</script>
-<script type="text/javascript">
-RED.nodes.registerType('postgresDB', {
-  category: "config",
-  color: "#699ECA",
-  defaults: {
-    name: {
-      value: ""
-    },
-    host: {
-      value: "127.0.0.1",
-      required: true
-    },
-    port: {
-      value: 5432,
-      required: true
-    },
-    database: {
-      value: "postgres",
-      required: true
-    },
-    ssl: {
-      value: false
-    },
-    max: {
-      value: 10
-    },
-    min: {
-      value: 1
-    },
-    idle: {
-      value: 1000
-    }
-  },
-  icon: "leveldb.png",
-  credentials: {
-    user: {
-      type: "text"
-    },
-    password: {
-      type: "password"
-    }
-  },
-  label: function() {
-    if(!this.name) {
-      this.name = this.credentials.user + "@" + this.host + ":" + this.port + "/" + this.database;
-    }
-    return this.name;
-  },
-  labelStyle: function() {
-    return this.name ? "node_label_italic" : "";
-  },
-  oneditprepare: function() {
-    const tabs = RED.tabs.create({
-      id: "async-pg-config-tabs",
-      onchange: function(tab) {
-        $("#async-pg-config-tabs-content").children().hide();
-        $("#" + tab.id).show();
-      }
-    });
-    tabs.addTab({
-      id: "async-pg-config-tab-connection",
-      label: "Connection"
-    });
-    tabs.addTab({
-      id: "async-pg-config-tab-security",
-      label: "Security"
-    });
-    tabs.addTab({
-      id: "async-pg-config-tab-pool",
-      label: "Pool"
-    });
-  }
-});
-</script>
-<script type="text/x-red" data-template-name="async.pg">
-  <div class="form-row">
-    <label for="node-input-name"><i class="icon-tag"></i> <span>Name</span></label>
-    <input type="text" id="node-input-name" placeholder="name"> </div>
-  <div class="form-row">
-    <label for="node-input-postgresDB"><i class="fa fa-server"></i> <span>Server</span></label>
-    <input type="text" id="node-input-postgresDB">
-  </div>
-  <div class="form-row" style="display: flex; align-items: center;">
-    <label for="node-input-query" style="margin-right: 10px;"><i class="fa fa-file-code-o"></i> <span>Query</span></label>
-    <input type="hidden" id="node-input-query" autofocus="autofocus">
-    <input type="checkbox" id="node-input-output" style="display: inline-block; width: auto;margin-left: 5px; vertical-align: top;">
-    <label for="node-input-output" style="width: auto; margin-left: 10px;margin-top: 10px;font-size:11px;"> <span>Receive output</span></label>
-  </div>
-  <div class="form-row node-text-editor-row">
-    <div style="height: calc(75vh); min-height: 150px;" class="node-text-editor" id="node-input-editor"></div>
-  </div>
-</script>
-<script type="text/javascript">
-RED.nodes.registerType("async.pg", {
-  category: "function",
-  color: '#699ECA',
-  defaults: {
-    name: {
-      value: ""
-    },
-    query: {
-      value: "SELECT 1;"
-    },
-    postgresDB: {
-      type: "postgresDB",
-      required: true
-    },
-    output: {
-      value: true
-    },
-    outputs: {
-      value: 1
-    }
-  },
-  inputs: 1,
-  icon: "redis.png",
-  align: "left",
-  label: function() {
-    return this.name || "async.pg";
-  },
-  labelStyle: function() {
-    return this.name ? "node_label_italic" : "";
-  },
-  oneditprepare: function() {
-    $("#node-input-output").prop("checked", this.output);
-    this.editor = RED.editor.createEditor({
-      id: 'node-input-editor',
-      mode: 'ace/mode/sql',
-      value: $("#node-input-query").val()
-    });
-    this.editor.focus();
-  },
-  oneditsave: function() {
-    $("#node-input-query").val(this.editor.getValue());
-    delete this.editor;
-  }
-});
-</script>
-<script type="text/x-red" data-help-name="async.pg">
-  <p>async.pg 👾 is a Node-RED node allowing basic access to PostgreSQL 🐘 database.</p>
-  <p>async.pg sets up a console to execute queries against the configured database.
-  </p>
-  <p><code>msg.payload</code> will contain the result object of the query. It has the following properties:
-  </p>
-  <ul>
-    <li><i>command</i>: The SQL command that was executed (e.g., "SELECT", "UPDATE", etc.)</li>
-    <li><i>rowCount</i>: The number of rows affected by the SQL statement</li>
-    <li><i>oid</i>: The OID returned</li>
-    <li><i>rows</i>: An array of rows</li>
-  </ul>
-  <p>async.pg implements a template engine using Nunjucks for parameterized queries:</p>
-  <pre>
-  {% raw %}{% block body %}
-  /* INTEGER id COLUMN */
-  SELECT *
-  FROM table
-  WHERE id = {{ msg.id }}
-  /* VARCHAR id COLUMN */
-  SELECT *
-  FROM table
-  WHERE id = '{{ msg.id }}'
-  {% endblock %}{% endraw %}
-  </pre>
-  <p>If <code>msg.payload</code> is not provided or is not an object, an empty object will be used by default.</p>
-</script>

package/async.pg.js

@@ -1,117 +0,0 @@
-module.exports = function(RED) {
-    "use strict";
-    const nunjucks = require("nunjucks");
-    const pgp = require('pg-promise')();
-
-    function PostgresDBNode(n) {
-        const node = this;
-        RED.nodes.createNode(this, n);
-        node.name = n.name;
-        node.host = n.host;
-        node.port = n.port;
-        node.database = n.database;
-        node.ssl = n.ssl;
-        node.max = n.max;
-        node.min = n.min;
-        node.idle = n.idle;
-
-        if (node.credentials) {
-            node.user = node.credentials.user;
-            node.password = node.credentials.password;
-        }
-
-        node.dbConfig = {
-            host: node.host,
-            port: node.port,
-            database: node.database,
-            user: node.user,
-            password: node.password,
-            ssl: node.ssl,
-            max: node.max,
-            min: node.min,
-            idleTimeoutMillis: node.idle,
-        };
-
-        // node.warn("DB Config: " + JSON.stringify(node.dbConfig));
-
-        try {
-            node.pgDatabase = pgp(node.dbConfig); // Instantiate pg-promise database
-            node.warn("Database instance created successfully.");
-            node.status({ fill: "green", shape: "dot", text: "connected" });
-        } catch (error) {
-            node.error('Failed to create database instance: ' + error.message);
-            node.status({ fill: "red", shape: "ring", text: "disconnected" });
-        }
-
-        node.on('close', function(done) {
-            if (node.pgDatabase) {
-                pgp.end(); // Close the pg-promise connection pool
-                // node.warn("Database connection closed successfully.");
-                node.pgDatabase = null;
-            }
-            node.status({});
-            done();
-        });
-    }
-
-    RED.nodes.registerType('postgresDB', PostgresDBNode, {
-        credentials: {
-            user: { type: 'text' },
-            password: { type: 'password' }
-        }
-    });
-
-    function PostgrestorNode(config) {
-        const node = this;
-        RED.nodes.createNode(node, config);
-        node.topic = config.topic;
-        node.config = RED.nodes.getNode(config.postgresDB);
-
-        if (!node.config || !node.config.pgDatabase) {
-            node.error('Database configuration is missing');
-            node.status({ fill: "red", shape: "ring", text: "config missing" });
-            return;
-        }
-
-        // node.warn("PostgrestorNode initialized with config: " + JSON.stringify(config));
-        // node.warn("Database instance: " + (node.config.pgDatabase ? "exists" : "does not exist"));
-
-        node.on('input', async function(msg) {
-            try {
-                // If msg.payload is not an object, initialize it as an empty object
-                if (typeof msg.payload !== 'object' || msg.payload === null) {
-                    msg.payload = {};
-                }
-
-                // Simplify the context to check the structure
-                const templateContext = {
-                    payload: msg.payload
-                };
-
-                // Render the Nunjucks template using the simplified context
-                const query = nunjucks.renderString(config.query, templateContext);
-                // node.warn(query)
-
-                // Check if query has been properly substituted
-                if (query.includes('{{') || query.includes('}}')) {
-                    node.error('Nunjucks substitution failed');
-                    node.status({ fill: "red", shape: "ring", text: "template error" });
-                    return;
-                }
-
-                node.status({ fill: "blue", shape: "dot", text: "executing" });
-
-                // Execute the query
-                const result = await node.config.pgDatabase.any(query);
-                msg.payload = result;
-                node.send(msg);
-                node.status({ fill: "green", shape: "dot", text: "completed" });
-            } catch (error) {
-                node.error('Error executing query: ' + error.message);
-                node.status({ fill: "red", shape: "ring", text: "error" });
-            }
-        });
-    }
-
-    RED.nodes.registerType('async.pg', PostgrestorNode);
-};