@frangoteam/fuxa-min 1.2.0 → 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,9 +21,9 @@ 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
 ```
 
@@ -34,6 +34,7 @@ Open up a browser (better Chrome) and navigate to http://localhost:1881
 - 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;
     }
 }

package/dist/assets/i18n/de.json

@@ -105,7 +105,7 @@
     "dlg.linkproperty-title": "Hyperlink erstellen",
     "dlg.linkproperty-url": "Hyperlink-URL",
 
-    "dlg.login-title": "ANmelden...",
+    "dlg.login-title": "Anmelden...",
     "dlg.logout-btn": "Abmelden",
 
     "dlg.ok": "OK",
@@ -126,7 +126,7 @@
     "general.search": "Suchen...",
     "general.search-notfound": "Keine Optionen gefunden",
     "general.username": "Benutzername",
-	"general.fullname": "Vollname",
+	"general.fullname": "Vollständiger Name",
     "general.password": "Kennwort",
     "general.clientId": "Kunden-ID",
     "general.authority": "Berechtigung",

package/dist/assets/i18n/en.json

@@ -65,6 +65,7 @@
     "dlg.layout-lbl-margin-left": "Margin left",
     "dlg.layout-lbl-margin-right": "Margin right",
     "dlg.layout-lbl-login-info": "Login info",
+    "dlg.layout-lbl-custom-styles": "Custom styles",
 
     "dlg.menuitem-title": "Menu Item",
     "dlg.menuitem-image": "[My Image...]",
@@ -379,6 +380,7 @@
     "graph.rangetype-last1d": "Last day",
     "graph.rangetype-last3d": "Last 3 days",
     "graph.rangetype-last1w": "Last week",
+    "graph.rangetype-last1m": "Last month",
 
     "graph.grouptype-hours": "Hours",
     "graph.grouptype-days": "Days",
@@ -423,6 +425,8 @@
     "table.property-gridline": "Show grid",
     "table.property-type-data": "Data table",
     "table.property-type-history": "History table",
+    "table.property-type-alarms": "Alarms table",
+    "table.property-type-alarms-history": "Alarms History table",
     "table.property-grid-color": "Grid color",
     "table.property-cols": "Columns",
     "table.property-rows": "Rows",
@@ -461,6 +465,13 @@
     "table.rangetype-last1d": "Last day",
     "table.rangetype-last3d": "Last 3 days",
 
+    "table.alarms-title": "Table Alarms",
+    "table.alarms-history-title": "Table Alarms History",
+    "table.alarm-column": "Alarms Column",
+    "table.alarm-filter": "Alarms Filter",
+    "table.alarm-priority": "Priority",
+    "table.alarm-tags": "Tags",
+
     "editor.view-svg": "Canvas/SVG",
     "editor.view-cards": "Multi views container",
     "editor.views": "Views",
@@ -539,6 +550,8 @@
     "editor.cmenu-layer-delete": "Delete Layer",
     "editor.cmenu-layer-marge-down": "Merge Down",
     "editor.cmenu-layer-marge-all": "Merge All",
+    "editor.cmenu-unlock": "Unlock",
+    "editor.cmenu-lock": "Lock",
 
     "editor.transform": "Transform",
     "editor.transform-x": "x",
@@ -681,6 +694,8 @@
     "shapes.event-click": "Click",
     "shapes.event-mouseup": "MouseUp",
     "shapes.event-mousedown": "MouseDown",
+    "shapes.event-mouseover": "MouseOver",
+    "shapes.event-mouseout": "MouseOut",
     "shapes.event-enter": "Enter",
     "shapes.event-select": "Select",
     "shapes.event-onpage": "Open Page",
@@ -699,6 +714,8 @@
     "shapes.event-onmonitor": "Monitor",
     "shapes.event-onViewToPanel": "Set View to Panel",
     "shapes.event-onLoad": "OnLoad",
+    "shapes.event-relativefrom-window": "Window",
+    "shapes.event-relativefrom-mouse": "Mouse",
 
     "pipe.property-props": "Property",
     "pipe.property-border-width": "Border width",
@@ -851,6 +868,7 @@
     "device.property-dsn": "Data Source Name (DSN=Database name)",
     "device.property-odbc-result": "Result of tables found",
     "device.not-odbc-result": "Database tables result",
+    "device.property-socket-reuse": "Socket Reuse",
 
     "device.browsetopics-property-title": "Broker Topics to subscribe and publish",
     "device.browsetopics-property-sub": "Subscribe",
@@ -912,6 +930,7 @@
     "device.tag-daq-restored": "To restore",
 
     "device.tag-format": "Format digits (2 = #.##)",
+    "device.tag-deadband": "Deadband",
     "device.tag-scale": "Scale Mode / Convertion",
     "device.tag-scale-mode-undefined": "No Scaling",
     "device.tag-scale-mode-undefined-tooltip": "Tag Value",
@@ -969,6 +988,7 @@
     "gauges.property-event-type": "Type",
     "gauges.property-event-action": "Action",
     "gauges.property-event-destination": "Destination",
+    "gauges.property-event-destination-relative-from": "Relative from",
     "gauges.property-event-destination-panel": "Panel",
     "gauges.property-event-destination-hide-close": "Hide Close",
     "gauges.property-event-single-card": "Single Card",
@@ -1016,6 +1036,7 @@
 
     "gauges.property-update-enabled": "Enable update",
     "gauges.property-update-esc": "ESC update",
+    "gauges.property-select-content-on-click": "Select content on click",
     "gauges.property-numeric-enabled": "Only number",
     "gauges.property-format-digits": "Format digits",
     "gauges.property-actions": "Actions",
@@ -1105,6 +1126,7 @@
     "alarms.view-offtime": "OFF Date/Time",
     "alarms.view-acktime": "ACK Date/Time",
     "alarms.view-userack": "ACK User",
+    "alarms.view-ack": "ACK",
     "alarms.view-ack-all-alarms": "ACK All Alarms",
     "alarm.status-active": "Active",
     "alarm.status-passive": "Passive",
@@ -1197,6 +1219,8 @@
     "script.delay": "Delay (seconds)",
     "script.sys-fnc-setview-text": "$setView (View name)",
     "script.sys-fnc-setview-tooltip": "System function to set View on client: $setView (View name as string)",
+    "script.sys-fnc-opencard-text": "$openCard (View name)",
+    "script.sys-fnc-opencard-tooltip": "System function to open Card on client: $openCard (View name as string, Options as dict {left, top})",
     "script.sys-fnc-enableDevice-text": "$enableDevice (Device name, enable True/False)",
     "script.sys-fnc-enableDevice-tooltip": "System function to enable Device connection: $enableDevice (Device name as string, enable as boolean)",
     "script.sys-fnc-enableDevice-params": "'Device name', true",
@@ -1322,6 +1346,7 @@
     "card.style-zoom": "Zoom",
 
     "resources.lib-images": "Images",
+    "resources.lib-widgets": "Widgets",
 
     "texts.list-title": "Texts settings",
     "texts.list-filter": "Filter",

package/dist/assets/i18n/pt.json

@@ -340,7 +340,9 @@
     "shapes.action-clockwise": "Mudar sentido do Relógio",
     "shapes.action-anticlockwise": "Mudar Contra-relógio",
     "shapes.action-downup": "Cima e abaixo",
-
+    "shapes.event-relativefrom-window": "Janela",
+    "shapes.event-relativefrom-mouse": "Cursor",
+    
     "pipe.property-props": "Propriedade",
     "pipe.property-border-width": "Largura da fronteira",
     "pipe.property-border-color": "Cor da fronteira",
@@ -509,6 +511,7 @@
     "gauges.property-tooltip-add-event": "Adicionar evento",
     "gauges.property-interval-msec": "Intervalo (msec.)",
 
+
     "bag.property-ticks": "Ticks",
     "bag.property-divisions": "Divisões",
     "bag.property-subdivisions": "Subdivisões",

package/dist/assets/i18n/zh-cn.json

@@ -467,7 +467,7 @@
     "editor.transform-y2-title": "改变线条的起始Y坐标",
     "editor.transform-rect-width-title": "改变矩形宽度",
     "editor.transform-width": "宽度",
-    "editor.transform-rect-height-title": "改变矩形高度", 
+    "editor.transform-rect-height-title": "改变矩形高度",
     "editor.transform-height": "高度",
     "editor.transform-rect-radius-title": "改变矩形角半径",
     "editor.transform-radiuscorner": "半径角",
@@ -736,6 +736,8 @@
     "device.webapi-property-gettags": "URL GET标签",
     "device.webapi-property-posttags": "URL POST标签",
     "device.webapi-property-loadtags": "加载标签",
+    "device.property-socket-reuse": "Socket复用",
+    "device.property-socket-serial": "Socket串行",
 
     "device.browsetopics-property-title": "要订阅和发布的经纪人主题",
     "device.browsetopics-property-sub": "订阅",