Feature/vistwo

.github/workflows/docker_release.yml

@@ -2,7 +2,7 @@ name: Build and Publish DHI release
 
 env:
   app: fuxa
-  version: 1.2.5
+  version: 1.2.7
   # for available platforms see output of a previous run -
   # ie the "Setup Docker BuildX" / "Inspect Builder" section
   # has eg "node_platforms": "linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6"

.github/workflows/docker_snap7.yml

@@ -2,7 +2,7 @@ name: Build and Publish DHI snap7
 
 env:
   app: fuxa
-  version: snap7-1.2.5
+  version: snap7-1.2.7
   # for available platforms see output of a previous run -
   # ie the "Setup Docker BuildX" / "Inspect Builder" section
   # has eg "node_platforms": "linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6"

.github/workflows/electron_latest.yml

@@ -25,6 +25,9 @@ jobs:
       with:
         node-version: '18'
 
+    - name: Clear npm cache
+      run: npm cache clean --force
+
     - name: Install server dependencies
       run: npm install
       working-directory: ./server
@@ -39,32 +42,30 @@ jobs:
 
     - name: Install app dependencies
       run: npm install
-      working-directory: ./app
+      working-directory: ./app/electron
 
-    - name: Copy server and client build to app
+    - name: Copy server and client build to app/electron
       run: |
-        mkdir -p app/server
-        mkdir -p app/client/dist
-        cp -r server/. app/server/
-        cp -r client/dist/. app/client/dist
-      #ls -R app/server
-      #ls -R app/client/dist
+        mkdir -p app/electron/server
+        mkdir -p app/electron/client/dist
+        cp -r server/. app/electron/server/
+        cp -r client/dist/. app/electron/client/dist
       shell: bash
 
     - name: Package for Windows
       if: matrix.os == 'windows-latest' && matrix.arch == 'x64'
       run: npx electron-builder --win nsis --x64
-      working-directory: ./app
+      working-directory: ./app/electron
 
     - name: Package for Linux
       if: matrix.os == 'ubuntu-latest'
       run: npx electron-builder --linux appimage --${{ matrix.arch }}
-      working-directory: ./app
+      working-directory: ./app/electron
 
     - name: Package for macOS
       if: matrix.os == 'macos-latest'
       run: npx electron-builder --mac dmg --${{ matrix.arch }}
-      working-directory: ./app
+      working-directory: ./app/electron
 
     - name: Prepare artifacts
       run: |
@@ -80,11 +81,11 @@ jobs:
         elif [ "${{ matrix.os }}" = "macos-latest" ]; then
           mv dist/*.dmg artifacts/FUXA-macos-arm64.dmg
         fi
-      working-directory: ./app
+      working-directory: ./app/electron
       shell: bash
 
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
         name: FUXA-${{ matrix.os }}-${{ matrix.arch }}
-        path: app/artifacts/*
+        path: app/electron/artifacts/*

Dockerfile

@@ -27,7 +27,28 @@ RUN cp FUXA/odbc/odbcinst.ini /etc/odbcinst.ini
 
 # Install Fuxa server
 WORKDIR /usr/src/app/FUXA/server
-RUN npm install
+
+# More tolerant npm config
+ENV NODE_OPTIONS=--dns-result-order=ipv4first
+RUN npm config set registry https://registry.npmjs.org/ \
+ && npm config set fetch-retries 8 \
+ && npm config set fetch-retry-factor 2 \
+ && npm config set fetch-retry-mintimeout 30000 \
+ && npm config set fetch-retry-maxtimeout 300000 \
+ && npm config set audit false \
+ && npm config set fund false
+
+# Retry loop con backoff + timeout alto
+RUN bash -lc '\
+  for i in 1 2 3 4 5 6 7 8; do \
+    echo "npm install - attempt $i/8"; \
+    npm install --no-audit --no-fund --prefer-offline --network-timeout=600000 && exit 0; \
+    echo "Failed, wait $((10*i))s and try again..."; \
+    sleep $((10*i)); \
+  done; \
+  echo "npm install failed after 8 attempts"; \
+  exit 1'
+
 
 # Install options snap7
 RUN if [ "$NODE_SNAP" = "true" ]; then \

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, Siemens S7 Protocol, OPC-UA, BACnet IP, MQTT, Ethernet/IP (Allen Bradley)
+- Devices connectivity with Modbus RTU/TCP, Siemens S7 Protocol, OPC-UA, BACnet IP, MQTT, Ethernet/IP (Allen Bradley), ADSclient, Gpio (Raspberry), WebCam, MELSEC
 - 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)
 
@@ -25,6 +25,15 @@ See the Wiki for more details about installing and getting started
 
 [Wiki Installing/Building](https://github.com/frangoteam/FUXA/wiki/Installing-and-Running)
 
+### Install using prebuilt Electron Packages
+
+You will need to be logged into github to access the download button for Electron Action Builds,
+click on the workflow and scroll down to Artifacts and click the download icon for you system
+
+[Electron Action Builds](https://github.com/frangoteam/FUXA/actions/workflows/electron_latest.yml)
+
+<img width="2082" height="531" alt="image" src="https://github.com/user-attachments/assets/40f01e1d-cf39-4145-99a0-e8fedf791edf" />
+
 
 ### Running from docker
 ```
@@ -98,6 +107,15 @@ After following these steps, you will have a standalone Electron application for
 - Look video from [frangoteam](https://www.youtube.com/@umbertonocelli5301)
 - Look video from [Fusion Automate - Urvish Nakum](https://youtube.com/playlist?list=PLxrSjjYyzaaK8uY3kVaFzfGnwhVXiCEAO&si=aU1OxgkUvLQ3bXHq)
 
+## Community SVG Widgets
+
+Looking for ready-made, reusable SVG widgets?
+Check out the companion repository **FUXA-SVG-Widgets**:
+
+- Repository: https://github.com/frangoteam/FUXA-SVG-Widgets
+- Authoring guide & examples: see the repo README and the Wiki page:
+  https://github.com/frangoteam/FUXA/wiki/HowTo-Widgets
+
 ## To Debug (Full Stack)
 Install and start to serve the frontend
 ```

app/electron/loading.html

@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>FUXA - Loading...</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            margin: 0;
+            padding: 0;
+            background-color: #424242;
+            color: #FFFFFF;
+            height: 100vh;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            overflow: hidden;
+        }
+        .loading-container {
+            text-align: center;
+        }
+        .spinner {
+            width: 60px;
+            height: 60px;
+            border: 4px solid rgba(255, 255, 255, 0.3);
+            border-top: 4px solid #448AFF;
+            border-radius: 50%;
+            animation: spin 1s linear infinite;
+            margin: 0 auto 20px;
+        }
+        @keyframes spin {
+            0% { transform: rotate(0deg); }
+            100% { transform: rotate(360deg); }
+        }
+        h1 {
+            color: #FFFFFF;
+            margin-bottom: 10px;
+            font-size: 24px;
+        }
+        p {
+            color: rgba(255, 255, 255, 0.8);
+            font-size: 16px;
+            margin: 0;
+        }
+    </style>
+</head>
+<body>
+    <div class="loading-container">
+        <div class="spinner"></div>
+        <h1>FUXA</h1>
+        <p id="loadingText">Loading...</p>
+    </div>
+</body>
+</html>