Merge pull request riclolsen#210 from json-scada/master

Version 0.51-alpha

Author: riclolsen

Diff for: README.md

@@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - MongoDB as the real-time core database, persistence layer, config store, SOE historian.
 - Event-based realtime async data processing with MongoDB Change Streams.
 - Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
-- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.50-alpha).
+- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.51-alpha).
 - Unlimited tags, servers, and users.
 - Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
 - Modular distributed architecture. Lightweight redundant data acquisition nodes can connect securely over TLS to the database server. E.g. a Raspberry PI can be a data acquisition node.
@@ -90,7 +90,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 ## Documentation
 
 - [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)
-- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.50-alpha)
+- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.51-alpha)
 - [RedHat/Rocky Linux Installer Script](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#rhel94-and-compatible-systems-automated-installation)
 - [Ubuntu Linux Installer Script](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#ubuntu-2404-scripted-installation)
 - [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)

Diff for: compile-docker/docker-compose.yaml

@@ -8,7 +8,7 @@ services:
     container_name: js_dotnet_compile
     command: sh -c "apt-get update && 
                     apt-get -y install build-essential cmake sasl2-bin libsasl2-dev libssl-dev libzstd-dev libsnappy-dev &&
-                    cd /src/lib60870.netcore/lib60870.netcore/ && 
+                    cd /src/lib60870.netcore/lib60870.netcore/lib60870/ && 
                     dotnet build --self-contained -c Release -o /publish_bin/ &&
                     cd /src/lib60870.netcore/iec101client/ &&
                     dotnet publish --self-contained -p:PublishReadyToRun=true -c Release -o /publish_bin/ &&

Diff for: conf-templates/nginx.crt

@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----

Diff for: demo-docker/mongo_seed/files/demo_instances.json

@@ -11,4 +11,4 @@
 {"_id":{"$oid":"66756c287994910acae4f602"},"protocolDriver":"PLC4X","protocolDriverInstanceNumber":1,"enabled":true,"logLevel":1,"nodeNames":[],"activeNodeName":"","activeNodeKeepAliveTimeTag":{"$date":"2020-05-14T20:09:50.557Z"},"keepProtocolRunningWhileInactive":false}
 {"_id":{"$oid":"669d5cec96e9a9fe7abe6ef3"},"protocolDriver":"OPC-DA","protocolDriverInstanceNumber":1,"enabled":true,"logLevel": 1,"nodeNames":[],"activeNodeName":"","keepProtocolRunningWhileInactive":false,"activeNodeKeepAliveTimeTag":{"$date":"2024-08-04T21:43:45.592Z"}}
 {"_id":{"$oid":"679a83658b90fe1713ef7ff3"},"protocolDriver":"DNP3_SERVER","protocolDriverInstanceNumber":1,"enabled":true,"logLevel":1,"nodeNames":[],"activeNodeName":"","activeNodeKeepAliveTimeTag":{"$date":"2020-07-16T13:34:30.869Z"},"keepProtocolRunningWhileInactive":false}
-{"_id":{"$oid":"67d9a4ee9af22523275bef57"},"protocolDriver":"ONVIF","protocolDriverInstanceNumber":1,"enabled": true,"logLevel":1,"nodeNames":["mainNode"],"activeNodeName": "mainNode","activeNodeKeepAliveTimeTag":{"$date":"2025-03-18T16:53:02.268Z" },"keepProtocolRunningWhileInactive":false}
+{"_id":{"$oid":"67d9a4ee9af22523275bef57"},"protocolDriver":"ONVIF","protocolDriverInstanceNumber":1,"enabled": true,"logLevel":1,"nodeNames":[],"activeNodeName": "","activeNodeKeepAliveTimeTag":{"$date":"2025-03-18T16:53:02.268Z" },"keepProtocolRunningWhileInactive":false}

Diff for: index.md

@@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - MongoDB as the real-time core database, persistence layer, config store, SOE historian.
 - Event-based realtime async data processing with MongoDB Change Streams.
 - Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
-- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.50-alpha).
+- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.51-alpha).
 - Unlimited tags, servers, and users.
 - Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
 - Modular distributed architecture. Lightweight redundant data acquisition nodes can connect securely over TLS to the database server. E.g. a Raspberry PI can be a data acquisition node.
@@ -90,7 +90,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 ## Documentation
 
 - [Generic Install Guide](docs/install.md)
-- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.50-alpha)
+- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.51-alpha)
 - [RedHat/Rocky Linux Installer Script](docs/install.md#rhel94-and-compatible-systems-automated-installation)
 - [Ubuntu Linux Installer Script](docs/install.md#ubuntu-2404-scripted-installation)
 - [Generic Install Guide](docs/install.md)

Diff for: platform-windows/build.bat

@@ -43,7 +43,7 @@ dotnet publish --no-self-contained --runtime win-x64 -c Release -o %BINPATH% IEC
 cd %SRCPATH%\iec61850_client
 dotnet publish --no-self-contained --runtime win-x64 -p:PublishReadyToRun=true -p:Platform="Any CPU" -c Release -o %BINPATH%
 
-cd %SRCPATH%\lib60870.netcore\lib60870.netcore\
+cd %SRCPATH%\lib60870.netcore\lib60870.netcore\lib60870\
 dotnet build --no-self-contained --runtime win-x64 -c Release
 dotnet build --no-self-contained --runtime win-x64 -c Release -o %BINPATH%
 cd %SRCPATH%\lib60870.netcore\iec101client\

Diff for: platform-windows/buildupd.bat

@@ -43,7 +43,7 @@ dotnet publish --no-self-contained --runtime win-x64 -c Release -o %BINPATH% IEC
 cd %SRCPATH%\iec61850_client
 dotnet publish --no-self-contained --runtime win-x64 -p:PublishReadyToRun=true -p:Platform="Any CPU" -c Release -o %BINPATH%
 
-cd %SRCPATH%\lib60870.netcore\lib60870.netcore\
+cd %SRCPATH%\lib60870.netcore\lib60870.netcore\lib60870\
 dotnet build --no-self-contained --runtime win-x64 -c Release
 dotnet build --no-self-contained --runtime win-x64 -c Release -o %BINPATH%
 cd %SRCPATH%\lib60870.netcore\iec101client\

Diff for: platform-windows/initial_setup.bat

@@ -19,9 +19,9 @@ postgresql-runtime\bin\psql -U postgres -h localhost -f ..\sql\grafanaappdb.sql
 call create_services.bat
 ping -n 10 127.0.0.1
 call mongodb-start.bat
-ping -n 12 127.0.0.1
+ping -n 15 127.0.0.1
 mongodb-runtime\bin\mongo json_scada < ..\mongo_seed\a_rs-init.js
-ping -n 2 127.0.0.1
+ping -n 5 127.0.0.1
 mongodb-runtime\bin\mongo json_scada < ..\mongo_seed\b_create-db.js
 mongodb-runtime\bin\mongoimport --db json_scada --collection protocolDriverInstances --type json --file ..\mongo_seed_demo\demo_instances.json 
 mongodb-runtime\bin\mongoimport --db json_scada --collection protocolConnections --type json --file ..\mongo_seed_demo\demo_connections.json 

Diff for: platform-windows/json-scada.nsi

@@ -13,15 +13,16 @@ Unicode True
 ; RequestExecutionLevel user
 RequestExecutionLevel admin
 
+;!include "MUI2.nsh"
 !include "TextFunc.nsh"
 !include "WordFunc.nsh"
 !include "x64.nsh"
 !include "LogicLib.nsh"
 
 ;--------------------------------
 
-!define VERSION "v.0.50"
-!define VERSION_ "0.50.0.0"
+!define VERSION "v.0.51"
+!define VERSION_ "0.51.0.0"
 
 Function .onInit
  System::Call 'keexrnel32::CreateMutexA(p0, i1, t "MutexJsonScadaInstall")?e'
@@ -55,7 +56,7 @@ VIProductVersion ${VERSION_}
 VIAddVersionKey ProductName "JSON SCADA"
 VIAddVersionKey Comments "SCADA IIoT Software"
 VIAddVersionKey CompanyName "Ricardo Olsen"
-VIAddVersionKey LegalCopyright "Copyright 2020-2024 Ricardo L. Olsen"
+VIAddVersionKey LegalCopyright "Copyright 2020-2025 Ricardo L. Olsen"
 VIAddVersionKey FileDescription "JSON SCADA Installer"
 VIAddVersionKey FileVersion ${VERSION}
 VIAddVersionKey ProductVersion ${VERSION}
@@ -67,7 +68,8 @@ SetDateSave on
 SetDatablockOptimize on
 CRCCheck on
 SilentInstall normal
-BGGradient 000000 000080 FFFFFF
+;BGGradient 000000 000080 FFFFFF
+BGGradient off
 InstallColors FF8080 000030
 XPStyle on
 
@@ -252,7 +254,7 @@ SetRegView 64
   File /a "..\platform-windows\ffmpeg.exe"
   File /a "..\platform-windows\sounder.exe"
   File /a "..\platform-windows\vc_redist.x64.exe"
-  File /a "..\platform-windows\dotnet-runtime-8.0.12-win-x64.exe"
+  File /a "..\platform-windows\dotnet-runtime-8.0.14-win-x64.exe"
   File /a "..\platform-windows\OPC Core Components Redistributable (x64) 3.00.108.msi"
   ;File /a "..\platform-windows\gbda_aut.dll"
   ;File /a "..\platform-windows\gbhda_aw.dll"
@@ -271,7 +273,7 @@ SetRegView 64
   Sleep 1000
   ExecWait '"$INSTDIR\platform-windows\vc_redist.x64.exe" /install /passive /quiet'
   Sleep 1000
-  ExecWait '"$INSTDIR\platform-windows\dotnet-runtime-8.0.12-win-x64.exe" /install /passive /quiet'
+  ExecWait '"$INSTDIR\platform-windows\dotnet-runtime-8.0.14-win-x64.exe" /install /passive /quiet'
   Sleep 1000
   ExecWait 'msiexec /i "$INSTDIR\platform-windows\OPC Core Components Redistributable (x64) 3.00.108.msi" /qn'
   Sleep 1000
@@ -463,11 +465,11 @@ SetRegView 64
   SetOutPath $INSTDIR\src\custom-developments
   File /a    "..\src\custom-developments\README.md"
   SetOutPath $INSTDIR\src\custom-developments\basic_bargraph
-  File /a /r /x "..\src\custom-developments\basic_bargraph\node_modules" "..\src\custom-developments\basic_bargraph\*.*"
+  File /a /r /x node_modules "..\src\custom-developments\basic_bargraph\*.*"
   SetOutPath $INSTDIR\src\custom-developments\advanced_dashboard
-  File /a /r /x "..\src\custom-developments\advanced_dashboard\node_modules" "..\src\custom-developments\advanced_dashboard\*.*"
+  File /a /r /x node_modules "..\src\custom-developments\advanced_dashboard\*.*"
   SetOutPath $INSTDIR\src\custom-developments\transformer_with_command
-  File /a /r /x "..\src\custom-developments\transformer_with_command\node_modules" "..\src\custom-developments\transformer_with_command\*.*"
+  File /a /r /x node_modules "..\src\custom-developments\transformer_with_command\*.*"
 
   SetOutPath $INSTDIR\platform-windows\browser-runtime
   File /a /r "..\platform-windows\browser-runtime\*.*"

Diff for: platform-windows/release_notes.txt

@@ -135,6 +135,34 @@ Inkscape+SAGE:
 
 -------------------------------------------------------------------
 
+Notes for version 0.51:
+
+* Lib60870.NET updated to version 2.3.0.
+* Updated some files to avoid false positive malware detection.
+* MongoDB Community Server updated to 8.0.6.
+* Grafana updated to 11.6.0.
+* Dotnet runtime updated to 8.0.14.
+* Updated Metabase to version 0.53.8.
+
+To quickly run the system after installed, open the JSON-SCADA desktop folder and:
+
+* On the JSON-SCADA desktop folder: execute "_Start_Services".
+* On the JSON-SCADA desktop folder: execute "_JSON SCADA WEB".
+* Default login credentials: username=admin password=jsonscada.
+* Metabase credentials: username=json@scada.com password=jsonscada123.
+
+Requirements and recommendations:
+
+* Windows 10/11 64 bits or Server >=2019, Windows PowerShell. At least 25GB of free space in the "C:" drive.
+* Administrative rights. Corporate Windows policies may cause problems with the creation of services and the opening of TCP ports.
+* Free TCP ports 6688, 6689, 27017, 5432, 80, 443, 8080, 3000, 3001, 9000, 20000. Other ports may be required for optional services and protocols.
+* If the server already has MongoDB, PostgreSQL, Grafana, Metabase, Nginx or another webserver, please uninstall, disable or watch out for possible conflicts.
+* Do not update previously installed JSON-SCADA. Please uninstall previous JSON-SCADA versions before installing a new version.
+* If using VirtualBox configure "paravirtualization interface"=KVM, otherwise Nodejs errors may occur.
+* MongoDB requires AVX instructions on x86 CPU.
+
+-------------------------------------------------------------------
+
 Notes for version 0.50:
 
 * ONVIF/RTSP Camera support.