diff --git a/README.md b/README.md index 6a9af54a..d88e6bc6 100644 --- a/README.md +++ b/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.47-alpha). +- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.48-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.47-alpha) +- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.48-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) @@ -104,6 +104,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4. - [IEC60870-5-101 Server Driver](https://github.com/riclolsen/json-scada/blob/master/src/lib60870.netcore/iec101server/README.md) - [IEC60870-5-101 Client Driver](https://github.com/riclolsen/json-scada/blob/master/src/lib60870.netcore/iec101client/README.md) - [DNP3 Client Driver](https://github.com/riclolsen/json-scada/blob/master/src/dnp3/Dnp3Client/README.md) +- [DNP3 Server Driver](https://github.com/riclolsen/json-scada/blob/master/src/dnp3/Dnp3Server/README.md) - [Telegraf Listener Driver](https://github.com/riclolsen/json-scada/blob/master/src/telegraf-listener/README.md) - [MQTT Sparkplug-B Client Driver](https://github.com/riclolsen/json-scada/blob/master/src/mqtt-sparkplug/README.md) - [OPC-UA Client Driver](https://github.com/riclolsen/json-scada/blob/master/src/OPC-UA-Client/README.md) @@ -132,7 +133,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4. - [ ] IEC 61850 MMS Server - [ ] IEC 61850 GOOSE/SV Client - [x] DNP3 Client TCP/UDP/TLS/Serial - Windows x64 only! -- [ ] DNP3 Server TCP/UDP/TLS/Serial +- [x] DNP3 Server TCP/UDP/TLS/Serial - [x] MQTT/Sparkplug-B Pub/Sub TCP/TLS - [x] Modbus Client via PLC4X-GO - [ ] ICCP Client TCP/TLS diff --git a/index.md b/index.md index 901b42ec..9159cd93 100644 --- a/index.md +++ b/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.47-alpha). +- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.48-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.47-alpha) +- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.48-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) @@ -104,6 +104,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4. - [IEC60870-5-101 Server Driver](src/lib60870.netcore/iec101server/README.md) - [IEC60870-5-101 Client Driver](src/lib60870.netcore/iec101client/README.md) - [DNP3 Client Driver](src/dnp3/Dnp3Client/README.md) +- [DNP3 Server Driver](src/dnp3/Dnp3Server/README.md) - [Telegraf Listener Driver](src/telegraf-listener/README.md) - [MQTT Sparkplug-B Client Driver](src/mqtt-sparkplug/README.md) - [OPC-UA Client Driver](src/OPC-UA-Client/README.md) @@ -132,7 +133,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4. - [ ] IEC 61850 MMS Server - [ ] IEC 61850 GOOSE/SV Client - [x] DNP3 Client TCP/UDP/TLS/Serial - Windows x64 only! -- [ ] DNP3 Server TCP/UDP/TLS/Serial +- [x] DNP3 Server TCP/UDP/TLS/Serial - [x] MQTT/Sparkplug-B PUB/SUB TCP/TLS - [x] Modbus Client via PLC4X-GO - [ ] ICCP Client TCP/TLS diff --git a/platform-windows/json-scada.nsi b/platform-windows/json-scada.nsi index 02700854..c6eaff83 100644 --- a/platform-windows/json-scada.nsi +++ b/platform-windows/json-scada.nsi @@ -1,6 +1,6 @@ ; json-scada.nsi ; {json:scada} installer script -; Copyright 2020-2024 - Ricardo L. Olsen +; Copyright 2020-2025 - Ricardo L. Olsen ; NSIS (Nullsoft Scriptable Install System) - http://nsis.sourceforge.net/Main_Page @@ -20,8 +20,8 @@ RequestExecutionLevel admin ;-------------------------------- -!define VERSION "v.0.47" -!define VERSION_ "0.47.0.0" +!define VERSION "v.0.48" +!define VERSION_ "0.48.0.0" Function .onInit System::Call 'keexrnel32::CreateMutexA(p0, i1, t "MutexJsonScadaInstall")?e' @@ -128,6 +128,7 @@ SetRegView 64 nsExec::Exec 'net stop JSON_SCADA_iec101server' nsExec::Exec 'net stop JSON_SCADA_iec104client' nsExec::Exec 'net stop JSON_SCADA_iec104server' + nsExec::Exec 'net stop JSON_SCADA_dnp3server' nsExec::Exec 'net stop JSON_SCADA_iccpclient' nsExec::Exec 'net stop JSON_SCADA_iccpserver' nsExec::Exec 'net stop JSON_SCADA_iec61850client' @@ -248,7 +249,7 @@ SetRegView 64 File /a "..\platform-windows\nssm.exe" File /a "..\platform-windows\sounder.exe" File /a "..\platform-windows\vc_redist.x64.exe" - File /a "..\platform-windows\dotnet-runtime-8.0.11-win-x64.exe" + File /a "..\platform-windows\dotnet-runtime-8.0.12-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" @@ -267,10 +268,13 @@ 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.11-win-x64.exe" /install /passive /quiet' + ExecWait '"$INSTDIR\platform-windows\dotnet-runtime-8.0.12-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 + ; WMIC required for postgresql injection batch files + ExecWait 'DISM /Online /Add-Capability /CapabilityName:WMIC' + Sleep 1000 SetOutPath $INSTDIR\platform-windows\nodejs-runtime File /a /r "..\platform-windows\nodejs-runtime\*.*" @@ -690,6 +694,11 @@ Section "Uninstall" ExecWait `"${SC}" delete "JSON_SCADA_iec104server"` ClearErrors + ExecWait `"${SC}" stop "JSON_SCADA_dnp3server"` + Sleep 50 + ExecWait `"${SC}" delete "JSON_SCADA_dnp3server"` + ClearErrors + ExecWait `"${SC}" stop "JSON_SCADA_iccpserver"` Sleep 50 ExecWait `"${SC}" delete "JSON_SCADA_iccpserver"` diff --git a/platform-windows/release_notes.txt b/platform-windows/release_notes.txt index 2247b123..17815ae0 100644 --- a/platform-windows/release_notes.txt +++ b/platform-windows/release_notes.txt @@ -135,6 +135,35 @@ Inkscape+SAGE: ------------------------------------------------------------------- +Notes for version 0.48: + +* New protocolDestination driver DNP3 Server. +* Added ps-AF locale. +* MongoDB Compass updated to 1.45.2. +* Grafana updated to 11.5.1. +* Chromium updated to 133.0.6943.54. +* Nodejs runtime updated to 22.13.1. +* Dotnet runtime updated to 8.0.12. + +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 20GB 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, 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.47: * cs_data_processor: fixes and improvements. @@ -168,6 +197,7 @@ Notes for version 0.46: * Update Metabase to version 0.52.5. * Chromium updated to version 131.0.6778.265. * Grafana updated to 11.4.0. +* Telegraf runtime updated to 1.33.1. To quickly run the system after installed, open the JSON-SCADA desktop folder and: diff --git a/src/AdminUI/public/release_notes.txt b/src/AdminUI/public/release_notes.txt index 2247b123..17815ae0 100644 --- a/src/AdminUI/public/release_notes.txt +++ b/src/AdminUI/public/release_notes.txt @@ -135,6 +135,35 @@ Inkscape+SAGE: ------------------------------------------------------------------- +Notes for version 0.48: + +* New protocolDestination driver DNP3 Server. +* Added ps-AF locale. +* MongoDB Compass updated to 1.45.2. +* Grafana updated to 11.5.1. +* Chromium updated to 133.0.6943.54. +* Nodejs runtime updated to 22.13.1. +* Dotnet runtime updated to 8.0.12. + +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 20GB 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, 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.47: * cs_data_processor: fixes and improvements. @@ -168,6 +197,7 @@ Notes for version 0.46: * Update Metabase to version 0.52.5. * Chromium updated to version 131.0.6778.265. * Grafana updated to 11.4.0. +* Telegraf runtime updated to 1.33.1. To quickly run the system after installed, open the JSON-SCADA desktop folder and: