@frangoteam/fuxa-min 1.2.11 → 1.3.0

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

@@ -4,23 +4,72 @@
         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)
         },
         inputs:1,
         outputs:1,
         icon: "white-globe.png",
         label: function() {
-            return this.name||this.tag||"set tag";
+            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
+            
             $.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>');
+                        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;
+                        }
+                    }
+                }
             });
         }
     });
@@ -32,10 +81,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" 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="Select Tag">
         <datalist id="fuxa-tags-set"></datalist>
     </div>
+    <input type="hidden" id="node-input-tag">
+    <input type="hidden" id="node-input-tagId">
 </script>
 
 <script type="text/x-red" data-help-name="set-tag">

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

@@ -7,12 +7,18 @@ module.exports = function(RED) {
 
         this.on('input', async function(msg) {
             try {
-                var tagId = fuxa.getTagId(config.tag, null);
+                // 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 (tagId) {
                     await fuxa.setTag(tagId, msg.payload);
                     node.send(msg);
                 } else {
-                    node.error('Tag not found: ' + config.tag, msg);
+                    node.error('Tag not found: ' + (config.tag || config.tagId), msg);
                 }
             } catch (err) {
                 node.error(err, msg);

package/main.js

@@ -148,6 +148,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 +195,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 +272,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 +334,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 +364,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.0",
   "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/devices/adsclient/index.js

@@ -26,7 +26,7 @@ function ADSclient(_data, _logger, _events, _runtime) {
      * initialize the device type
      */
     this.init = function (_type) {
-        console.error('Not supported!');
+        console.error('Not supported! (adsclient.init)');
     }
 
     /**

package/runtime/devices/ethernetip/index.js

@@ -28,7 +28,7 @@ function EthernetIPclient(_data, _logger, _events, _runtime) {
      * initialize the device type
      */
     this.init = function (_type) {
-        console.error('Not supported!');
+        console.error('Not supported! (ethernetip.init)');
     }
 
     /**

package/runtime/devices/gpio/index.js

@@ -198,7 +198,7 @@ function GpioClient(_data, _logger, _events, _runtime) {
      */
     this.lastReadTimestamp = () => {
         return lastTimestampValue;
-        console.error('Not supported!');
+        console.error('Not supported! (gpio.lastReadTimestamp)');
     }
 
     /**

package/runtime/devices/odbc/index.js

@@ -24,7 +24,7 @@ function ODBCclient(_data, _logger, _events) {
      * initialize the device type 
      */
     this.init = function (_type) {
-        console.error('Not supported!');
+        console.error('Not supported! (odbc.init)');
     }
 
     /**
@@ -165,14 +165,14 @@ function ODBCclient(_data, _logger, _events) {
      * Return Tags values array { id: <name>, value: <value> }
      */
     this.getValues = function () {
-        console.error('Not supported!');
+        console.error('Not supported! (odbc.getValues)');
     }
 
     /**
      * Return Tag value { id: <name>, value: <value>, ts: <lastTimestampValue> }
      */
     this.getValue = function (tagid) {
-        console.error('Not supported!');
+        console.error(`Not supported! (odbc.getValue) (TagID: ${tagid})`);
     }
 
     /**
@@ -186,14 +186,14 @@ function ODBCclient(_data, _logger, _events) {
      * Return Tag property to show in frontend
      */
     this.getTagProperty = function (tagid) {
-        console.error('Not supported!');
+        console.error(`Not supported! (odbc.getTagProperty) (TagID: ${tagid})`);
     }
 
     /**
      * Set the Tag value to device
      */
     this.setValue = function (tagid, value) {
-        console.error('Not supported!');
+        console.error(`Not supported! (odbc.setValue) (TagID: ${tagid}, Value: ${value})`);
     }
 
     /**

package/runtime/devices/template/index.js

@@ -14,7 +14,7 @@ function DeviceTemplate(_data, _logger, _events) {
      * initialize the device type 
      */
     this.init = function (_type) {
-        console.error('Not supported!');
+        console.error('Not supported! (template.init)');
     }
 
     /**
@@ -22,7 +22,7 @@ function DeviceTemplate(_data, _logger, _events) {
      * Emit connection status to clients, clear all Tags values
      */
     this.connect = function () {
-        console.error('Not supported!');
+        console.error('Not supported! (template.connect)');
         // events.emit('device-status:changed', { id: data.id, status: 'connect-ok' });
         // events.emit('device-status:changed', { id: data.id, status: 'connect-error' });
     }
@@ -33,7 +33,7 @@ function DeviceTemplate(_data, _logger, _events) {
      * Emit connection status to clients, clear all Tags values
      */
     this.disconnect = function () {
-        console.error('Not supported!');
+        console.error('Not supported! (template.disconnect)');
         // events.emit('device-status:changed', { id: data.id, status: 'connect-off' });
     }
 
@@ -42,7 +42,7 @@ function DeviceTemplate(_data, _logger, _events) {
      * Update the tags values list, save in DAQ if value changed or in interval and emit values to clients
      */
     this.polling = async function () {
-        console.error('Not supported!');
+        console.error('Not supported! (template.polling)');
         // events.emit('device-value:changed', { id: data.name, values: values });
     }
 
@@ -50,49 +50,49 @@ function DeviceTemplate(_data, _logger, _events) {
      * Load Tags attribute to read with polling
      */
     this.load = function (_data) {
-        console.error('Not supported!');
+        console.error(`Not supported! (template.load) (Data: ${_data})`);
     }
 
     /**
      * Return Tags values array { id: <name>, value: <value> }
      */
     this.getValues = function () {
-        console.error('Not supported!');
+        console.error('Not supported! (template.getValues)');
     }
 
     /**
      * Return Tag value { id: <name>, value: <value>, ts: <lastTimestampValue> }
      */
     this.getValue = function (tagid) {
-        console.error('Not supported!');
+        console.error(`Not supported! (template.getValue) (TagID: ${tagid})`);
     }
 
     /**
      * Return connection status 'connect-off', 'connect-ok', 'connect-error', 'connect-busy'
      */
     this.getStatus = function () {
-        console.error('Not supported!');
+        console.error('Not supported! (template.getStatus)');
     }
 
     /**
      * Return Tag property to show in frontend
      */
     this.getTagProperty = function (tagid) {
-        console.error('Not supported!');
+        console.error(`Not supported! (template.getTagProperty) (TagID: ${tagid})`);
     }
 
     /**
      * Set the Tag value to device
      */
     this.setValue = function (tagid, value) {
-        console.error('Not supported!');
+        console.error(`Not supported! (template.setValue) (TagID: ${tagid}, Value: ${value})`);
     }
 
     /**
      * Return if device is connected
      */
     this.isConnected = function () {
-        console.error('Not supported!');
+        console.error('Not supported! (template.isConnected)');
     }
 
     /**
@@ -107,7 +107,7 @@ function DeviceTemplate(_data, _logger, _events) {
      * @returns 
      */
     this.lastReadTimestamp = () => {
-        console.error('Not supported!');
+        console.error('Not supported! (template.lastReadTimestamp)');
     }
 
     /**
@@ -115,7 +115,7 @@ function DeviceTemplate(_data, _logger, _events) {
      * @returns 
      */
     this.getTagDaqSettings = (tagId) => {
-        console.error('Not supported!');
+        console.error(`Not supported! (template.getTagDaqSettings) (TagID: ${tagId})`);
     }
 
     /**
@@ -123,7 +123,7 @@ function DeviceTemplate(_data, _logger, _events) {
      * @returns 
      */
     this.setTagDaqSettings = (tagId, settings) => {
-        console.error('Not supported!');
+        console.error(`Not supported! (template.setTagDaqSettings) (TagID: ${tagId}, Settings: ${settings})`);
     }
 }
 

package/runtime/storage/daqstorage.js

@@ -21,6 +21,7 @@ var logger;
 var daqDB = {};                 // list of daqDB node: SQlite one pro device, influxDB only one
 var currentStorateDB;
 var runtime;
+var questDbModule = null;
 
 function init(_settings, _log, _runtime) {
     settings = _settings;
@@ -42,7 +43,7 @@ function reset() {
 function addDaqNode(_id, fncgetprop) {
     var id = _id;
     const dbType = _getDbType();
-    if (dbType === DaqStoreTypeEnum.influxDB || dbType === DaqStoreTypeEnum.influxDB18 || dbType === DaqStoreTypeEnum.TDengine) {
+    if (dbType === DaqStoreTypeEnum.influxDB || dbType === DaqStoreTypeEnum.influxDB18 || dbType === DaqStoreTypeEnum.TDengine || dbType === DaqStoreTypeEnum.questDB) {
         id = dbType;
     }
     if (!daqDB[id]) {
@@ -50,6 +51,14 @@ function addDaqNode(_id, fncgetprop) {
             daqDB[id] = InfluxDB.create(settings, logger, currentStorateDB);
         } else if(id === DaqStoreTypeEnum.TDengine){
             daqDB[id] = TDengine.create(settings, logger, currentStorateDB);
+        } else if(id === DaqStoreTypeEnum.questDB){
+            const QuestDB = _getQuestDbModule();
+            if (QuestDB) {
+                daqDB[id] = QuestDB.create(settings, logger, currentStorateDB);
+            } else {
+                logger.warn('daqstorage: QuestDB storage selected but package dependencies are not installed. Falling back to SQLite.');
+                daqDB[id] = SqliteDB.create(settings, logger, id, currentStorateDB);
+            }
         } else {
             daqDB[id] = SqliteDB.create(settings, logger, id, currentStorateDB);
         }
@@ -160,16 +169,33 @@ function _getDaqNode(tagid) {
 
 function _getDbType() {
     if (settings.daqstore && settings.daqstore.type) {
+        if (settings.daqstore.type === 'QuestDB') {
+            return DaqStoreTypeEnum.questDB;
+        }
         return settings.daqstore.type;
     }
     return DaqStoreTypeEnum.SQlite;
 }
 
+function _getQuestDbModule() {
+    if (questDbModule) {
+        return questDbModule;
+    }
+    try {
+        questDbModule = require("./questdb");
+    } catch (err) {
+        questDbModule = null;
+        logger.warn(`daqstorage: QuestDB module unavailable (${err.message})`);
+    }
+    return questDbModule;
+}
+
 var DaqStoreTypeEnum = {
     SQlite: 'SQlite',
     influxDB: 'influxDB',
     influxDB18: 'influxDB18',
     TDengine: 'TDengine',
+    questDB: 'questDB',
 }
 
 function _getValue(value) {
@@ -187,4 +213,4 @@ module.exports = {
     getNodesValues: getNodesValues,
     checkRetention: checkRetention,
     getCurrentStorageFnc: getCurrentStorageFnc,
-};
+};