@frangoteam/fuxa-min 1.2.11 → 1.3.1

package/integrations/node-red/node-red-contrib-fuxa/nodes/fuxa-set-tag-daq-settings.html

@@ -4,7 +4,8 @@
         color: '#a6bbcf',
         defaults: {
             name: {value:""},
-            tag: {value:"", required:true},
+            tag: {value:""},           // Keep: tag name for display and backward compatibility
+            tagId: {value:""},         // New: unique identifier (optional, for backward compatibility)
             enabled: {value:true},
             interval: {value:1000},
             deadband: {value:0}
@@ -13,17 +14,65 @@
         outputs:1,
         icon: "white-globe.png",
         label: function() {
-            return this.name||this.tag||"set tag daq settings";
+            if (this.name) {
+                return this.name;
+            }
+            // Display tag name or tagId
+            return this.tag || this.tagId || "set tag daq settings";
         },
         oneditprepare: function() {
+            var node = this;
+            var tagMap = {}; // Use tag.id as key to avoid tag.name duplication issues
+            
             $.getJSON('/nodered/fuxa/devices', function(data) {
                 var datalist = $('#fuxa-tags-set-daq-settings');
                 datalist.empty();
+                
                 data.forEach(function(device) {
                     device.tags.forEach(function(tag) {
-                        datalist.append('<option value="' + tag.name + '">' + device.name + ' - ' + tag.name + '</option>');
+                        var fullName = device.name + ' - ' + tag.name;
+                        // datalist option value format: tag.name(tag.id)
+                        var optionValue = tag.name + '(' + tag.id + ')';
+                        datalist.append('<option value="' + optionValue + '">' + fullName + '</option>');
+                        tagMap[tag.id] = {
+                            name: tag.name,
+                            deviceName: device.name,
+                            fullName: fullName
+                        };
                     });
                 });
+                
+                // Listen for tagSelected input changes
+                $('#node-input-tagSelected').on('change', function() {
+                    var selectedValue = $(this).val();
+                    // Parse format: tag.name(tag.id)
+                    var match = selectedValue.match(/^(.+)\(([^)]+)\)$/);
+                    if (match) {
+                        var tagName = match[1];
+                        var tagId = match[2];
+                        
+                        // Set the actual stored fields
+                        $('#node-input-tag').val(tagName);
+                        $('#node-input-tagId').val(tagId);
+                    }
+                });
+                
+                // Initialize display (when editing existing node)
+                if (node.tagId && tagMap[node.tagId]) {
+                    // Has tagId, construct tagSelected value
+                    var tagName = node.tag || tagMap[node.tagId].name;
+                    $('#node-input-tagSelected').val(tagName + '(' + node.tagId + ')');
+                } else if (node.tag && !node.tagId) {
+                    // Old node: only has tag (tag.name), need to find corresponding tagId
+                    // Note: if there are duplicate names, only the first match will be found
+                    for (var tagId in tagMap) {
+                        if (tagMap[tagId].name === node.tag) {
+                            $('#node-input-tagSelected').val(node.tag + '(' + tagId + ')');
+                            $('#node-input-tagId').val(tagId);
+                            break;
+                        }
+                    }
+                }
             });
         }
     });
@@ -35,10 +84,12 @@
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-row">
-        <label for="node-input-tag"><i class="fa fa-tag"></i> Tag</label>
-        <input type="text" id="node-input-tag" list="fuxa-tags-set-daq-settings" placeholder="Tag Name">
+        <label for="node-input-tagSelected"><i class="fa fa-tag"></i> Tag</label>
+        <input type="text" id="node-input-tagSelected" list="fuxa-tags-set-daq-settings" placeholder="Select Tag">
         <datalist id="fuxa-tags-set-daq-settings"></datalist>
     </div>
+    <input type="hidden" id="node-input-tag">
+    <input type="hidden" id="node-input-tagId">
     <div class="form-row">
         <label for="node-input-enabled">&nbsp;</label>
         <input type="checkbox" id="node-input-enabled" style="display:inline-block; width:15px; vertical-align:baseline;">

package/integrations/node-red/node-red-contrib-fuxa/nodes/fuxa-set-tag-daq-settings.js

@@ -6,29 +6,33 @@ module.exports = function(RED) {
 
         this.on('input', async function(msg) {
             try {
-                var tagName = config.tag || msg.tag;
-                if (tagName) {
-                    var tagId = fuxa.getTagId(tagName, null);
-                    if (tagId) {
-                        var settings = {
-                            enabled: config.enabled,
-                            interval: config.interval,
-                            deadband: config.deadband
-                        };
+                // Prefer config.tagId, fallback to config.tag or msg.tag for backward compatibility
+                var tagId = config.tagId;
+                if (!tagId) {
+                    var tagName = config.tag || msg.tag;
+                    if (tagName) {
+                        // Backward compatibility: old nodes use tag.name, need to convert to tagId
+                        tagId = fuxa.getTagId(tagName, null);
+                    }
+                }
+                
+                if (tagId) {
+                    var settings = {
+                        enabled: config.enabled,
+                        interval: config.interval,
+                        deadband: config.deadband
+                    };
 
-                        // Override with message properties if provided
-                        if (msg.enabled !== undefined) settings.enabled = msg.enabled;
-                        if (msg.interval !== undefined) settings.interval = msg.interval;
-                        if (msg.deadband !== undefined) settings.deadband = msg.deadband;
+                    // Override with message properties if provided
+                    if (msg.enabled !== undefined) settings.enabled = msg.enabled;
+                    if (msg.interval !== undefined) settings.interval = msg.interval;
+                    if (msg.deadband !== undefined) settings.deadband = msg.deadband;
 
-                        var result = await fuxa.setTagDaqSettings(tagId, settings);
-                        msg.payload = result;
-                        node.send(msg);
-                    } else {
-                        node.error('Tag not found: ' + tagName, msg);
-                    }
+                    var result = await fuxa.setTagDaqSettings(tagId, settings);
+                    msg.payload = result;
+                    node.send(msg);
                 } else {
-                    node.error('Tag name not specified', msg);
+                    node.error('Tag not found: ' + (config.tag || msg.tag || config.tagId), msg);
                 }
             } catch (err) {
                 node.error(err, msg);

package/integrations/node-red/node-red-contrib-fuxa/nodes/fuxa-set-tag.html

@@ -1,27 +1,69 @@
 <script type="text/javascript">
-    RED.nodes.registerType('set-tag',{
+    RED.nodes.registerType('set-tag', {
         category: 'FUXA',
         color: '#a6bbcf',
         defaults: {
-            name: {value:""},
-            tag: {value:"", required:true}
+            name: {value: ""},
+            tag: {value: ""},
+            tagId: {value: ""}
         },
-        inputs:1,
-        outputs:1,
+        inputs: 1,
+        outputs: 1,
         icon: "white-globe.png",
         label: function() {
-            return this.name||this.tag||"set tag";
+            if (this.name) {
+                return this.name;
+            }
+            return this.tag || this.tagId || "set tag";
         },
         oneditprepare: function() {
+            var node = this;
+            var tagMap = {};
+
             $.getJSON('/nodered/fuxa/devices', function(data) {
                 var datalist = $('#fuxa-tags-set');
                 datalist.empty();
-                data.forEach(function(device) {
-                    device.tags.forEach(function(tag) {
-                        datalist.append('<option value="' + tag.name + '">' + device.name + ' - ' + tag.name + '</option>');
+
+                (data || []).forEach(function(device) {
+                    (device.tags || []).forEach(function(tag) {
+                        var fullName = device.name + ' - ' + tag.name;
+                        var optionValue = tag.name + '(' + tag.id + ')';
+                        datalist.append('<option value="' + optionValue + '">' + fullName + '</option>');
+                        tagMap[tag.id] = {
+                            name: tag.name,
+                            deviceName: device.name,
+                            fullName: fullName
+                        };
                     });
                 });
+
+                $('#node-input-tagSelected').on('change', function() {
+                    var selectedValue = $(this).val();
+                    var match = selectedValue.match(/^(.+)\(([^)]+)\)$/);
+                    if (match) {
+                        $('#node-input-tag').val(match[1]);
+                        $('#node-input-tagId').val(match[2]);
+                    } else if (!selectedValue || !selectedValue.trim()) {
+                        $('#node-input-tag').val('');
+                        $('#node-input-tagId').val('');
+                    }
+                });
+
+                if (node.tagId && tagMap[node.tagId]) {
+                    var tagName = node.tag || tagMap[node.tagId].name;
+                    $('#node-input-tagSelected').val(tagName + '(' + node.tagId + ')');
+                } else if (node.tag && !node.tagId) {
+                    for (var id in tagMap) {
+                        if (tagMap[id].name === node.tag) {
+                            $('#node-input-tagSelected').val(node.tag + '(' + id + ')');
+                            $('#node-input-tagId').val(id);
+                            break;
+                        }
+                    }
+                }
             });
+
+            $('#node-input-tagSelected').attr('placeholder', 'Optional - leave empty to use msg.topic');
         }
     });
 </script>
@@ -31,13 +73,30 @@
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
+
     <div class="form-row">
-        <label for="node-input-tag"><i class="fa fa-tag"></i> Tag</label>
-        <input type="text" id="node-input-tag" list="fuxa-tags-set" placeholder="Tag Name">
+        <label for="node-input-tagSelected"><i class="fa fa-tag"></i> Tag</label>
+        <input type="text" id="node-input-tagSelected" list="fuxa-tags-set" placeholder="Optional - leave empty to use msg.topic">
         <datalist id="fuxa-tags-set"></datalist>
     </div>
+    <input type="hidden" id="node-input-tag">
+    <input type="hidden" id="node-input-tagId">
+
+    <div class="form-row">
+        <div style="margin-left: 105px; font-size: 12px; color: #666;">
+            If <b>Tag</b> is empty, the node uses <code>msg.topic</code> as the tag name/id.
+        </div>
+    </div>
 </script>
 
 <script type="text/x-red" data-help-name="set-tag">
-    <p>Set the value of a FUXA tag to <code>msg.payload</code>.</p>
-</script>
+    <p>Sets the value of a FUXA tag to <code>msg.payload</code>.</p>
+    <p><b>Tag selection:</b></p>
+    <ul>
+        <li>If the node's <b>Tag</b> field is set, that tag is used.</li>
+        <li>If the node's <b>Tag</b> field is empty, the node uses <code>msg.topic</code> as the tag name/id.</li>
+    </ul>
+    <p><b>Example:</b></p>
+    <pre>msg.topic = "V2";
+msg.payload = true;</pre>
+</script>

package/integrations/node-red/node-red-contrib-fuxa/nodes/fuxa-set-tag.js

@@ -1,23 +1,49 @@
 module.exports = function(RED) {
     function FuxaSetTagNode(config) {
         RED.nodes.createNode(this, config);
-        var node = this;
+        const node = this;
+
         // Access FUXA functions from global context
-        var fuxa = RED.settings.functionGlobalContext.fuxa;
+        const fuxa = RED.settings?.functionGlobalContext?.fuxa;
+
+        node.on("input", async function(msg, send, done) {
+            send = send || node.send.bind(node);
 
-        this.on('input', async function(msg) {
             try {
-                var tagId = fuxa.getTagId(config.tag, null);
+                if (!fuxa) {
+                    node.error("FUXA not available in functionGlobalContext", msg);
+                    return done && done();
+                }
+
+                const uiTag = (typeof config.tag === "string") ? config.tag.trim() : "";
+                const topicTag = (typeof msg.topic === "string") ? msg.topic.trim() : "";
+                const tagRef = uiTag || topicTag;
+                let tagId = config.tagId || null;
+
+                // Keep master behavior (prefer configured tagId), then fallback to UI tag/topic lookup.
+                if (!tagId && !tagRef) {
+                    node.error("No tag provided: set Tag in the node OR provide msg.topic", msg);
+                    return done && done();
+                }
+
+                if (!tagId) {
+                    tagId = fuxa.getTagId(tagRef, null);
+                }
+
                 if (tagId) {
                     await fuxa.setTag(tagId, msg.payload);
-                    node.send(msg);
+                    send(msg);
+                    return done && done();
                 } else {
-                    node.error('Tag not found: ' + config.tag, msg);
+                    node.error("Tag not found: " + tagRef, msg);
+                    return done && done();
                 }
             } catch (err) {
                 node.error(err, msg);
+                return done && done(err);
             }
         });
     }
+
     RED.nodes.registerType("set-tag", FuxaSetTagNode);
-}
+};

package/main.js

@@ -133,6 +133,9 @@ try {
         if (mysettings.language) {
             settings.language = mysettings.language;
         }
+        if (!utils.isNullOrUndefined(mysettings.hideEditorOnboarding)) {
+            settings.hideEditorOnboarding = mysettings.hideEditorOnboarding;
+        }
         if (mysettings.uiPort) {
             settings.uiPort = mysettings.uiPort;
         }
@@ -148,6 +151,12 @@ try {
         if (mysettings.tokenExpiresIn) {
             settings.tokenExpiresIn = mysettings.tokenExpiresIn;
         }
+        if (!utils.isNullOrUndefined(mysettings.enableRefreshCookieAuth)) {
+            settings.enableRefreshCookieAuth = mysettings.enableRefreshCookieAuth;
+        }
+        if (mysettings.refreshTokenExpiresIn) {
+            settings.refreshTokenExpiresIn = mysettings.refreshTokenExpiresIn;
+        }
         if (mysettings.secretCode) {
             settings.secretCode = mysettings.secretCode;
         }
@@ -189,6 +198,12 @@ try {
     logger.error('Error loading user settings file: ' + userSettingsFile)
 }
 
+// Ensure secure mode never runs with an empty/static-known JWT secret.
+if (settings.secureEnabled && !settings.secretCode) {
+    settings.secretCode = utils.generateSecretCode();
+    logger.warn('Generated a random JWT secret in memory because secureEnabled=true and secretCode was missing. Persist it in settings for stable sessions across restarts.');
+}
+
 // Check logger
 if (!settings.logDir) {
     settings.logDir = path.resolve(rootDir, '_logs');
@@ -260,6 +275,7 @@ var www = path.resolve(__dirname, '../client/dist');
 if (!fs.existsSync(www)) {      // compatibility with docker/npm/electron
     www = path.resolve(__dirname, './dist');
 }
+
 settings.httpStatic = settings.httpStatic || www;
 
 if (parsedArgs.port !== undefined) {
@@ -321,10 +337,13 @@ const allowCrossDomain = function (req, res, next) {
 
     if (isOriginAllowed(origin)) {
         res.header('Access-Control-Allow-Origin', origin || '*');
+        if (settings.enableRefreshCookieAuth) {
+            res.header('Access-Control-Allow-Credentials', 'true');
+        }
     }
 
     res.header('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS');
-    res.header('Access-Control-Allow-Headers', 'x-access-token, x-auth-user, Origin, Content-Type, Accept');
+    res.header('Access-Control-Allow-Headers', 'x-access-token, x-auth-user, Origin, Content-Type, Accept, Skip-Auth, Skip-Error');
 
 
     if (req.method === 'OPTIONS') {
@@ -348,22 +367,24 @@ app.use('/_widgets', express.static(settings.widgetsFileDir));
 app.use('/snapshots', express.static(settings.webcamSnapShotsDir))
 
 var accessLogStream = fs.createWriteStream(settings.logDir + '/api.log', { flags: 'a' });
-app.use(morgan('combined', {
-    stream: accessLogStream,
-    skip: function (req, res) { return res.statusCode < 400 }
-}));
-
-app.use(morgan('dev', {
-    skip: function (req, res) {
-        return res.statusCode < 400
-    }, stream: process.stderr
-}));
-
-app.use(morgan('dev', {
-    skip: function (req, res) {
-        return res.statusCode >= 400
-    }, stream: process.stdout
-}));
+if (runtime.settings.logApiLevel !== 'none') {
+    app.use(morgan('combined', {
+        stream: accessLogStream,
+        skip: function (req, res) { return res.statusCode < 400 }
+    }));
+
+    app.use(morgan('dev', {
+        skip: function (req, res) {
+            return res.statusCode < 400
+        }, stream: process.stderr
+    }));
+
+    app.use(morgan('dev', {
+        skip: function (req, res) {
+            return res.statusCode >= 400
+        }, stream: process.stdout
+    }));
+}
 
 function mountSwaggerIfEnabled() {
     const swaggerEnabled = settings.swagger || settings.swaggerEnabled;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frangoteam/fuxa-min",
-  "version": "1.2.11",
+  "version": "1.3.1",
   "description": "Web-based Process Visualization (SCADA/HMI/Dashboard) software",
   "main": "main.js",
   "scripts": {
@@ -36,12 +36,13 @@
   },
   "dependencies": {
     "@influxdata/influxdb-client": "1.25.0",
+    "@questdb/nodejs-client": "3.0.0",
     "@tdengine/rest": "3.0.2",
     "ads-client": "2.1.0",
     "app-root-path": "2.2.1",
     "async": "3.2.3",
     "async-mutex": "0.5.0",
-    "axios": "0.30.2",
+    "axios": "1.13.5",
     "bcryptjs": "2.4.3",
     "bluebird": "3.7.2",
     "body-parser": "1.20.3",
@@ -52,19 +53,20 @@
     "fontkit": "^2.0.2",
     "fs-extra": "7.0.1",
     "influx": "5.9.3",
-    "ip": "2.0.1",
+    "ip": "~2.0.1",
     "jsonwebtoken": "9.0.0",
     "live-plugin-manager": "0.15.1",
     "modbus-serial": "8.0.19",
-    "morgan": "1.10.0",
+    "morgan": "1.10.1",
     "mqtt": "4.3.7",
     "node-bacnet": "0.2.4",
     "node-opcua": "2.149.0",
     "node-red": "^4.1.0",
     "node-schedule": "2.1.1",
-    "nodemailer": "7.0.7",
+    "nodemailer": "7.0.13",
     "nopt": "5.0.0",
     "pdfmake": "0.2.5",
+    "pg": "8.18.0",
     "socket.io": "4.8.1",
     "sqlite3": "5.1.5",
     "swagger-ui-express": "^5.0.1",
@@ -72,6 +74,9 @@
     "ws": "8.18.0",
     "yamljs": "^0.3.0"
   },
+  "overrides": {
+    "tar": "^7.4.3"
+  },
   "devDependencies": {
     "@mapbox/node-pre-gyp": "^1.0.0",
     "@types/express": "5.0.0",

package/runtime/alarms/alarmstorage.js

@@ -13,6 +13,18 @@ var settings        // Application settings
 var logger;         // Application logger
 var db_alarms;      // Database of alarms
 
+function _run(sql, params = []) {
+    return new Promise((resolve, reject) => {
+        db_alarms.run(sql, params, function (err) {
+            if (err) {
+                reject(err);
+            } else {
+                resolve(this);
+            }
+        });
+    });
+}
+
 /**
  * Init and bind the database resource
  * @param {*} _settings 
@@ -135,33 +147,38 @@ function getAlarms() {
  * Set alarm value in database
  */
 function setAlarms(alarms) {
-    return new Promise(function (resolve, reject) {
-        // prepare query
-        if (alarms && alarms.length) {
-            var sql = "";
-            alarms.forEach(alr => {
+    return new Promise(async function (resolve, reject) {
+        if (!alarms || !alarms.length) {
+            resolve();
+            return;
+        }
+        try {
+            await _run('BEGIN TRANSACTION');
+            for (const alr of alarms) {
                 let grp = alr.subproperty.group || '';
                 let status = alr.status || '';
                 let userack = alr.userack || '';
-                //is alarm condition is changed (if it is occured or acknowledged) insert or update record
-                sql += "INSERT OR REPLACE INTO alarms (nametype, type, status, ontime, offtime, acktime) VALUES('" +
-                    alr.getId() + "','" + alr.type + "','" + status + "','" + alr.ontime + "','" + alr.offtime + "','" + alr.acktime + "');" +
-                    "INSERT OR REPLACE INTO chronicle (Sn, nametype, type, status, text, grp, ontime, offtime,  acktime, userack)" +
-                    " VALUES ((SELECT Sn from chronicle WHERE ontime='" + alr.ontime + "' AND nametype='" + alr.getId() + "'),'" +
-                    alr.getId() + "','" + alr.type + "','" + status + "','" + alr.subproperty.text + "','" + grp + "','" + alr.ontime + "','" + alr.offtime + "','" + alr.acktime + "','" + userack + "');";
+                const alarmId = alr.getId();
+                await _run(
+                    "INSERT OR REPLACE INTO alarms (nametype, type, status, ontime, offtime, acktime) VALUES(?, ?, ?, ?, ?, ?)",
+                    [alarmId, alr.type, status, alr.ontime, alr.offtime, alr.acktime]
+                );
+                await _run(
+                    "INSERT OR REPLACE INTO chronicle (Sn, nametype, type, status, text, grp, ontime, offtime, acktime, userack) VALUES ((SELECT Sn from chronicle WHERE ontime = ? AND nametype = ?), ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+                    [alr.ontime, alarmId, alarmId, alr.type, status, alr.subproperty.text, grp, alr.ontime, alr.offtime, alr.acktime, userack]
+                );
                 if (alr.toremove) {
-                    //is alarm to be removed (if it is ok) delete it from db
-                    sql += "DELETE FROM alarms WHERE nametype = '" + alr.getId() + "';";
+                    await _run("DELETE FROM alarms WHERE nametype = ?", [alarmId]);
                 }
-            });
-            db_alarms.exec(sql, function (err) {
-                if (err) {
-                    logger.error('alarmsstorage.failed-to-set: ' + err);
-                    reject();
-                } else {
-                    resolve();
-                }
-            });
+            }
+            await _run('COMMIT');
+            resolve();
+        } catch (err) {
+            try {
+                await _run('ROLLBACK');
+            } catch (_) {}
+            logger.error('alarmsstorage.failed-to-set: ' + err);
+            reject();
         }
     });
 }
@@ -172,14 +189,12 @@ function setAlarms(alarms) {
 function removeAlarm(alarm) {
     return new Promise(function (resolve, reject) {
         // prepare query
-        var sql = "DELETE FROM alarms WHERE nametype = '" + alarm.getId() + "'";
-        db_alarms.exec(sql, function (err) {
-            if (err) {
-                logger.error('alarmsstorage.failed-to-remove: ' + err);
-                reject();
-            } else {
-                resolve();
-            }
+        var sql = "DELETE FROM alarms WHERE nametype = ?";
+        _run(sql, [alarm.getId()]).then(function () {
+            resolve();
+        }).catch(function (err) {
+            logger.error('alarmsstorage.failed-to-remove: ' + err);
+            reject();
         });
     });
 }