@frangoteam/fuxa-min 1.3.0 → 1.3.1

package/docs/openapi.yaml

@@ -652,6 +652,9 @@ paths:
       tags: [Scripts]
       summary: Run script
       security: [{ AccessToken: [] }, { ApiKey: [] }]
+      description: >
+        Runs a stored server-side script. Requests that set `params.script.test=true`
+        are limited to authenticated administrators.
       requestBody:
         required: true
         content:

package/integrations/node-red/index.js

@@ -152,12 +152,11 @@ async function mountNodeRedIfInstalled({ app, server, settings, runtime, logger,
         });
     };
 
-    // Allow public dashboard UI and socket.io; require JWT or API key for admin/editor/flows when security is enabled
+    // Allow only dashboard routes as public; require JWT or API key for admin/editor/flows when security is enabled
     const allowDashboard = (req, res, next) => {
-        const url = req.originalUrl || req.url || req.path;
-
-        // Public dashboard UI and its HTTP APIs (served from httpNodeRoot/ui.path)
-        if (url.includes('/dashboard') || url.includes('/socket.io')) return next();
+        // Public dashboard UI and its HTTP APIs (served from httpNodeRoot/ui.path).
+        // baseUrl comes from Express mount point and is not affected by query/path tricks.
+        if (req.baseUrl === '/dashboard') return next();
 
         if (!settings.secureEnabled || settings.nodeRedAuthMode === 'legacy-open') {
             return next();

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

@@ -1,34 +1,32 @@
 <script type="text/javascript">
-    RED.nodes.registerType('get-tag',{
+    RED.nodes.registerType('get-tag', {
         category: 'FUXA',
         color: '#a6bbcf',
         defaults: {
-            name: {value:""},
-            tag: {value:""},           // Keep: tag name for display and backward compatibility
-            tagId: {value:""}          // New: unique identifier (optional, for backward compatibility)
+            name: {value: ""},
+            tag: {value: ""},
+            tagId: {value: ""}
         },
-        inputs:1,
-        outputs:1,
+        inputs: 1,
+        outputs: 1,
         icon: "white-globe.png",
         label: function() {
             if (this.name) {
                 return this.name;
             }
-            // Display tag name or tagId
             return this.tag || this.tagId || "get tag";
         },
         oneditprepare: function() {
             var node = this;
-            var tagMap = {}; // Use tag.id as key to avoid tag.name duplication issues
-            
+            var tagMap = {};
+
             $.getJSON('/nodered/fuxa/devices', function(data) {
                 var datalist = $('#fuxa-tags');
                 datalist.empty();
-                
-                data.forEach(function(device) {
-                    device.tags.forEach(function(tag) {
+
+                (data || []).forEach(function(device) {
+                    (device.tags || []).forEach(function(tag) {
                         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] = {
@@ -38,39 +36,34 @@
                         };
                     });
                 });
-                
-                // 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);
+                        $('#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('');
                     }
                 });
-                
-                // 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);
+                    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>
@@ -82,14 +75,25 @@
     </div>
     <div class="form-row">
         <label for="node-input-tagSelected"><i class="fa fa-tag"></i> Tag</label>
-        <input type="text" id="node-input-tagSelected" list="fuxa-tags" placeholder="Select Tag">
+        <input type="text" id="node-input-tagSelected" list="fuxa-tags" placeholder="Optional - leave empty to use msg.topic">
         <datalist id="fuxa-tags"></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>.
+        </div>
+    </div>
 </script>
 
 <script type="text/x-red" data-help-name="get-tag">
-    <p>Get the value of a FUXA tag.</p>
-    <p>The tag value is set to <code>msg.payload</code>.</p>
-</script>
+    <p>Gets the value of a FUXA tag.</p>
+    <ul>
+        <li>If <b>Tag</b> is set in the node, that tag is used.</li>
+        <li>If <b>Tag</b> is empty, <code>msg.topic</code> is used.</li>
+    </ul>
+    <p>The tag value is returned in <code>msg.payload</code>.</p>
+    <p>The resolved tag name is always set on <code>msg.topic</code>.</p>
+    <pre>msg.topic = "V2";</pre>
+</script>

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

@@ -1,31 +1,57 @@
 module.exports = function(RED) {
     function FuxaGetTagNode(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", function(msg, send, done) {
+            send = send || node.send.bind(node);
 
-        this.on('input', function(msg) {
             try {
-                // Prefer config.tagId, fallback to config.tag for backward compatibility
-                var tagId = config.tagId;
-                if (!tagId && config.tag) {
-                    // Backward compatibility: old nodes use tag.name, need to convert to tagId
-                    tagId = fuxa.getTagId(config.tag, null);
+                if (!fuxa) {
+                    node.error("FUXA not available in functionGlobalContext", msg);
+                    return done && done();
                 }
-                
-                if (tagId) {
-                    var value = fuxa.getTag(tagId);
-                    msg.payload = value;
-                    msg.topic = config.tag;  // Set topic to tag name for join operations
-                    node.send(msg);
-                } else {
-                    node.error('Tag not found: ' + (config.tag || config.tagId), msg);
+
+                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) {
+                    node.error("Tag not found: " + tagRef, msg);
+                    return done && done();
+                }
+
+                const value = fuxa.getTag(tagId);
+
+                msg.payload = value;
+                if (tagRef) {
+                    msg.topic = tagRef;
+                } else if (typeof config.tag === "string" && config.tag.trim()) {
+                    msg.topic = config.tag.trim();
+                }
+
+                send(msg);
+                return done && done();
             } catch (err) {
                 node.error(err, msg);
+                return done && done(err);
             }
         });
     }
+
     RED.nodes.registerType("get-tag", FuxaGetTagNode);
-}
+};

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

@@ -1,34 +1,32 @@
 <script type="text/javascript">
-    RED.nodes.registerType('set-tag',{
+    RED.nodes.registerType('set-tag', {
         category: 'FUXA',
         color: '#a6bbcf',
         defaults: {
-            name: {value:""},
-            tag: {value:""},           // Keep: tag name for display and backward compatibility
-            tagId: {value:""}          // New: unique identifier (optional, for backward compatibility)
+            name: {value: ""},
+            tag: {value: ""},
+            tagId: {value: ""}
         },
-        inputs:1,
-        outputs:1,
+        inputs: 1,
+        outputs: 1,
         icon: "white-globe.png",
         label: function() {
             if (this.name) {
                 return this.name;
             }
-            // Display tag name or tagId
             return this.tag || this.tagId || "set tag";
         },
         oneditprepare: function() {
             var node = this;
-            var tagMap = {}; // Use tag.id as key to avoid tag.name duplication issues
-            
+            var tagMap = {};
+
             $.getJSON('/nodered/fuxa/devices', function(data) {
                 var datalist = $('#fuxa-tags-set');
                 datalist.empty();
-                
-                data.forEach(function(device) {
-                    device.tags.forEach(function(tag) {
+
+                (data || []).forEach(function(device) {
+                    (device.tags || []).forEach(function(tag) {
                         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] = {
@@ -38,39 +36,34 @@
                         };
                     });
                 });
-                
-                // 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);
+                        $('#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('');
                     }
                 });
-                
-                // 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);
+                    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>
@@ -80,15 +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-tagSelected"><i class="fa fa-tag"></i> Tag</label>
-        <input type="text" id="node-input-tagSelected" list="fuxa-tags-set" placeholder="Select Tag">
+        <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,29 +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 {
-                // Prefer config.tagId, fallback to config.tag for backward compatibility
-                var tagId = config.tagId;
-                if (!tagId && config.tag) {
-                    // Backward compatibility: old nodes use tag.name, need to convert to tagId
-                    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 || config.tagId), 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;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frangoteam/fuxa-min",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Web-based Process Visualization (SCADA/HMI/Dashboard) software",
   "main": "main.js",
   "scripts": {

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();
         });
     });
 }

package/runtime/apikeys/apiKeysStorage.js

@@ -13,6 +13,18 @@ var settings        // Application settings
 var logger;         // Application logger
 var db_apikeys;     // Database of apikeys
 
+function _run(sql, params = []) {
+    return new Promise((resolve, reject) => {
+        db_apikeys.run(sql, params, function (err) {
+            if (err) {
+                reject(err);
+            } else {
+                resolve(this);
+            }
+        });
+    });
+}
+
 /**
  * Init and bind the database resource
  * @param {*} _settings
@@ -73,18 +85,18 @@ function getApiKeys() {
  */
 function setApiKeys(apiKeys) {
     return new Promise(async function (resolve, reject) {
-        for (var i = 0; i < apiKeys.length; i++) {
-            const apiKey = apiKeys[i];
-            var value = JSON.stringify(apiKey).replace(/\'/g,"''");
-            var sql = "INSERT OR REPLACE INTO apikeys (name, value) VALUES('" + apiKey.id + "','"+ value + "');";
-            await db_apikeys.exec(sql, function (err) {
-                if (err) {
-                    logger.error(`apiKeysStorage.set apikeys failed! ${err}`);
-                    reject();
-                }
-            });
+        try {
+            const sql = "INSERT OR REPLACE INTO apikeys (name, value) VALUES(?, ?)";
+            for (var i = 0; i < apiKeys.length; i++) {
+                const apiKey = apiKeys[i];
+                var value = JSON.stringify(apiKey);
+                await _run(sql, [apiKey.id, value]);
+            }
+            resolve();
+        } catch (err) {
+            logger.error(`apiKeysStorage.set apikeys failed! ${err}`);
+            reject();
         }
-        resolve();
     });
 }
 
@@ -93,17 +105,17 @@ function setApiKeys(apiKeys) {
  */
 function removeApiKeys(apiKeys) {
     return new Promise(async function (resolve, reject) {
-        for (var i = 0; i < apiKeys.length; i++) {
-            const apiKey = apiKeys[i];
-            var sql = "DELETE FROM apikeys WHERE name = '" + apiKey.id + "'";
-            await db_apikeys.exec(sql, function (err) {
-                if (err) {
-                    logger.error(`apiKeysStorage.remove apikeys failed! ${err}`);
-                    reject();
-                }
-            });
+        try {
+            const sql = "DELETE FROM apikeys WHERE name = ?";
+            for (var i = 0; i < apiKeys.length; i++) {
+                const apiKey = apiKeys[i];
+                await _run(sql, [apiKey.id]);
+            }
+            resolve();
+        } catch (err) {
+            logger.error(`apiKeysStorage.remove apikeys failed! ${err}`);
+            reject();
         }
-        resolve();
     });
 }
 
@@ -122,4 +134,4 @@ module.exports = {
     getApiKeys: getApiKeys,
     setApiKeys: setApiKeys,
     removeApiKeys: removeApiKeys
-};
+};