@frangoteam/fuxa-min 1.1.19 → 1.2.1

package/README.md

@@ -9,7 +9,7 @@ FUXA is a web-based Process Visualization (SCADA/HMI/Dashboard) software. With F
 ![fuxa action](/screenshot/feature-action-move.gif)
 
 ## Features
-- Devices connectivity with Modbus RTU/TCP, OPC-UA, BACnet IP, MQTT, WebAPI, Ethernet/IP (Allen Bradley)
+- Devices connectivity with Modbus RTU/TCP, Siemens S7 Protocol, OPC-UA, BACnet IP, MQTT, WebAPI, Ethernet/IP (Allen Bradley), ODBC
 - SCADA/HMI Web-Editor - Engineering and Design completely web-based
 - Cross-Platform Full-Stack - Backend with NodeJs and Frontend with Web technologies (HTML5, CSS, Javascript, Angular, SVG)
 
@@ -21,16 +21,19 @@ FUXA is developed with NodeJS (backend) and Angular (frontend).
 
 **WARNING** You need to have installed [Node](https://nodejs.org/en/about/previous-releases) Version 14 || 16 || 18
 
-Install from [NPM](https://www.npmjs.com/package/@frangoteam/fuxa-sim)
+Install from [NPM](https://www.npmjs.com/package/@frangoteam/fuxa)
 ```
-npm install -g --unsafe-perm @frangoteam/fuxa-sim
+npm install -g --unsafe-perm @frangoteam/fuxa
 fuxa
 ```
 
 Open up a browser (better Chrome) and navigate to http://localhost:1881
 
 ## Usage
-Look the guide in [wiki](https://github.com/frangoteam/FUXA/wiki) pages
+- Look the guide in [wiki](https://github.com/frangoteam/FUXA/wiki) pages
+- Look video from [frangoteam](https://www.youtube.com/@umbertonocelli5301)
+- Look video from [Fusion Automate - Urvish Nakum](https://youtube.com/playlist?list=PLxrSjjYyzaaK8uY3kVaFzfGnwhVXiCEAO&si=aU1OxgkUvLQ3bXHq)
+
 
 ## Let us know!
 We’d be really happy if you send us your own shapes in order to collect a library to share it with others. Just send an email to 4frango@gmail.com and do let us know if you have any questions or suggestions regarding our work.

package/api/alarms/index.js

@@ -34,7 +34,8 @@ module.exports = {
                 runtime.logger.error("api get alarms: Tocken Expired");
             } else {	
                 try {
-                    var result = runtime.alarmsMgr.getAlarmsValues(req.query, groups);
+                    var filter = req.query.filter ? JSON.parse(req.query.filter) : null;
+                    var result = runtime.alarmsMgr.getAlarmsValues(filter, groups);
                     // res.header("Access-Control-Allow-Origin", "*");
                     // res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
                     if (result) {

package/api/command/index.js

@@ -131,8 +131,8 @@ module.exports = {
                 } catch (error) {
                     res.status(400).json({ error: "error", message: error});
                     runtime.logger.error("api get getTagValue: " + error);
-                }                
-            }            
+                }
+            }
         });
 
         /**
@@ -151,21 +151,21 @@ module.exports = {
                         var errors = '';
                         for (const tag of req.body.tags) {
                             try {
-                                if (!runtime.devices.setTagValue(tag.id, tag.value)) {
-                                    errors += `${tag.id}; `
+                                if (!await runtime.devices.setTagValue(tag.id, tag.value)) {
+                                    errors += `${tag.id} not found; `
                                 }
                             } catch (err) {
                                 errors += `${tag.id}: ${err}`;
                             }
                         }
                         if (errors) {
-                            res.status(400).json({ error: "not_found", message: 'tag id not found: ' + errors});
-                            runtime.logger.error("api post setTagValue: " + 'id not found!' + errors);
+                            res.status(400).json({ error: "not_found", message: 'setTagValue Failed: ' + errors});
+                            runtime.logger.error("api post setTagValue Failed:" + errors);
                         } else {
                             res.end();
                         }
                     } else {
-                        res.status(400).json({ error: "not_found", message: 'tag id not found!'});
+                        res.status(400).json({ error: "not_found", message: 'no tags to set!'});
                         runtime.logger.error("api post setTagValue: " + 'id not found!');
                     }
                 } catch (error) {

package/api/index.js

@@ -4,6 +4,7 @@
 
 const fs = require('fs');
 var express = require('express');
+var morgan = require('morgan');
 var bodyParser = require('body-parser');
 const authJwt = require('./jwt-helper');
 const rateLimit = require("express-rate-limit");
@@ -30,7 +31,9 @@ function init(_server, _runtime) {
     return new Promise(function (resolve, reject) {
         if (runtime.settings.disableServer !== false) {
             apiApp = express();
-            
+            apiApp.use(morgan(['combined', 'common', 'dev', 'short', 'tiny'].
+                includes(runtime.settings.logApiLevel) ? runtime.settings.logApiLevel : 'combined'));
+
             var maxApiRequestSize = runtime.settings.apiMaxLength || '35mb';
             apiApp.use(bodyParser.json({limit:maxApiRequestSize}));
             apiApp.use(bodyParser.urlencoded({limit:maxApiRequestSize,extended:true}));
@@ -60,7 +63,7 @@ function init(_server, _runtime) {
                 windowMs: 5 * 60 * 1000, // 5 minutes
                 max: 100 // limit each IP to 100 requests per windowMs
             });
-              
+
             //  apply to all requests
             apiApp.use(limiter);
 
@@ -75,7 +78,7 @@ function init(_server, _runtime) {
                         delete tosend.smtp.password;
                     }
                     // res.header("Access-Control-Allow-Origin", "*");
-                    // res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");                    
+                    // res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
                     res.json(tosend);
                 } else {
                     res.status(404).end();
@@ -121,9 +124,9 @@ function init(_server, _runtime) {
                 } else if (req.body.params) {
                     const token = authJwt.getNewToken(req.headers)
                     if (token) {
-                        res.status(200).json({ 
+                        res.status(200).json({
                             message: 'tokenRefresh',
-                            token: token 
+                            token: token
                         });
                     } else {
                         res.end();

package/api/resources/index.js

@@ -29,7 +29,7 @@ module.exports = {
         });
 
         /**
-         * GET Server logs folder content
+         * GET Server images folder content
          */
         resourcesApp.get('/api/resources/images', secureFnc, function (req, res) {
             var groups = checkGroupsFnc(req);
@@ -100,6 +100,43 @@ module.exports = {
             }
         });
 
+        /**
+         * GET Server widgets folder content
+         */
+        resourcesApp.get('/api/resources/widgets', secureFnc, function (req, res) {
+            var groups = checkGroupsFnc(req);
+            if (res.statusCode === 403) {
+                runtime.logger.error("api get resources/widgets: Tocken Expired");
+            } else if (authJwt.adminGroups.indexOf(groups) === -1) {
+                res.status(401).json({ error: "unauthorized_error", message: "Unauthorized!" });
+                runtime.logger.error("api get resources/widgets: Unauthorized!");
+            } else {
+                try {
+                    var result = {...req.query, ...{ groups: [] }};
+                    var resourcesDirs = getDirectories(runtime.settings.widgetsFileDir);
+                    for (var i = 0; i < resourcesDirs.length; i++) {
+                        var group = { name: resourcesDirs[i], items: [] };
+                        var dirPath = path.resolve(runtime.settings.widgetsFileDir, resourcesDirs[i]);
+                        var wwwSubDir =  path.join('_widgets', resourcesDirs[i]);
+                        var files =  getFiles(dirPath, ['.svg']);
+                        for (var x = 0; x < files.length; x++) {
+                            var filename = files[x].replace(/\.[^\/.]+$/, '');
+                            group.items.push({ path:  path.join(wwwSubDir, files[x]).split(path.sep).join(path.posix.sep), name: filename });
+                        }
+                        result.groups.push(group);
+                    }
+                    res.json(result);
+                } catch (err) {
+                    if (err.code) {
+                        res.status(400).json({ error: err.code, message: err.message });
+                    } else {
+                        res.status(400).json({ error: "unexpected_error", message: err.toString() });
+                    }
+                    runtime.logger.error("api get resources/widgets: " + err.message);
+                }
+            }
+        });
+
         return resourcesApp;
     }
 }