Version 0.37-alpha.

riclolsen · Aug 9, 2024 · be4c37c · be4c37c
1 parent c797e37
commit be4c37c
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 26 deletions.
diff --git 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.36-alpha).
+- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.37-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.
@@ -88,7 +88,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.36-alpha)
+- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.37-alpha)
 - [RedHat/Rocky Linux Installer](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#rhel94-and-compatible-systems-automated-installation)
 - [Docker Demo](https://github.com/riclolsen/json-scada/blob/master/demo-docker/README.md)
 - [Schema Documentation](https://github.com/riclolsen/json-scada/blob/master/docs/schema.md)
@@ -104,6 +104,8 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - [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)
 - [OPC-UA Server Driver](https://github.com/riclolsen/json-scada/blob/master/src/OPC-UA-Server/README.md)
+- [OPC-DA Client Driver](https://github.com/riclolsen/json-scada/blob/master/src/OPC-DA-Client/README.md)
+- [PLC4X-GO Modbus Client Driver](https://github.com/riclolsen/json-scada/blob/master/src/plc4x-client/README.md)
 - [CIP Ethernet/IP PLCTags Client Driver](https://github.com/riclolsen/json-scada/blob/master/src/libplctag/PLCTagsClient/README.md)
 - [I104M Client Driver](https://github.com/riclolsen/json-scada/blob/master/src/i104m/README.md)
 - [Calculations](https://github.com/riclolsen/json-scada/blob/master/src/calculations/README.md)
@@ -126,13 +128,15 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - [x] MQTT/Sparkplug-B Client
 - [x] Modbus Client via PLC4X-GO
 - [x] I104M (adapter for some OSHMI drivers)
-- [x] ICCP Client (via I104M)
+- [ ] ICCP Client
+- [ ] ICCP Server
 - [x] Telegraf Client (OPC-UA, MQTT, MODBUS, SNMP, ...)
 - [x] OPC UA Client
 - [x] OPC UA Server
 - [ ] OPC UA Historical Data Server
-- [ ] OPC DA Client
-- [ ] OPC DA Server
+- [x] OPC DA Client (Windows)
+- [ ] OPC AE Client (Windows)
+- [ ] OPC DA Server (Windows)
 - [x] IEC 61850 MMS Client
 - [ ] IEC 61850 MMS Server
 - [ ] IEC 61850 GOOSE Client
@@ -171,6 +175,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - [ ] Alerta Integration (https://alerta.io/)
 - [x] PLC4X-GO Integration (https://plc4x.apache.org/)
 - [ ] Managed Cloud Service
+- [ ] Supported LTS versions
 
 ## Online Demo (substations simulation)
 

diff --git 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.36-alpha).
+- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.37-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.
@@ -88,7 +88,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.36-alpha)
+- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.37-alpha)
 - [RedHat/Rocky Linux Installer](docs/install.md#rhel94-and-compatible-systems-automated-installation)
 - [Install Guide](docs/install.md)
 - [Docker Demo](demo-docker/README.md)
@@ -105,6 +105,8 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - [MQTT Sparkplug-B Client Driver](src/mqtt-sparkplug/README.md)
 - [OPC-UA Client Driver](src/OPC-UA-Client/README.md)
 - [OPC-UA Server Driver](src/OPC-UA-Server/README.md)
+- [OPC-DA Client Driver](src/OPC-DA-Client/README.md)
+- [PLC4X-GO Modbus Client Driver](src/plc4x-client/README.md)
 - [CIP Ethernet/IP PLCTags Client Driver](src/libplctag/PLCTagsClient/README.md)
 - [I104M Client Driver](src/i104m/README.md)
 - [Calculations](src/calculations/README.md)
@@ -127,14 +129,16 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - [x] MQTT/Sparkplug-B Client
 - [x] Modbus Client via PLC4X-GO
 - [x] I104M (adapter for some OSHMI drivers)
-- [x] ICCP Client (via I104M)
+- [ ] ICCP Client
+- [ ] ICCP Server
 - [x] Telegraf Client (many data sources available such as MQTT, MODBUS, SNMP, ...)
 - [x] OPC UA Client
 - [x] OPC UA Server
 - [ ] OPC UA Historical Data Server
 - [ ] OPC UA Server
-- [ ] OPC DA Client
-- [ ] OPC DA Server
+- [x] OPC DA Client (Windows)
+- [ ] OPC AE Client (Windows)
+- [ ] OPC DA Server (Windows)
 - [x] IEC 61850 MMS Client
 - [ ] IEC 61850 MMS Server
 - [ ] IEC 61850 GOOSE Client
@@ -171,6 +175,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - [ ] Alerta Integration (https://alerta.io/)
 - [x] PLC4X-GO Integration (https://plc4x.apache.org/)
 - [ ] Managed Cloud Service
+- [ ] Supported LTS versions
 
 ## Online Demo (substations simulation)
 

diff --git a/platform-windows/json-scada.nsi b/platform-windows/json-scada.nsi
@@ -17,8 +17,8 @@ RequestExecutionLevel admin
 
 ;--------------------------------
 
-!define VERSION "v.0.36"
-!define VERSION_ "0.36.0.0"
+!define VERSION "v.0.37"
+!define VERSION_ "0.37.0.0"
 
 Function .onInit
  System::Call 'keexrnel32::CreateMutexA(i 0, i 0, t "MutexJsonScadaInstall") i .r1 ?e'
@@ -106,7 +106,6 @@ ${DisableX64FSRedirection}
 
 SetRegView 64
 
-
 ; Closes all processes
   nsExec::Exec 'net stop JSON_SCADA_grafana'
   nsExec::Exec 'net stop JSON_SCADA_metabase'
@@ -132,6 +131,7 @@ SetRegView 64
   nsExec::Exec 'net stop JSON_SCADA_plctags'
   nsExec::Exec 'net stop JSON_SCADA_dnp3client' 
   nsExec::Exec 'net stop JSON_SCADA_opcuaclient' 
+  nsExec::Exec 'net stop JSON_SCADA_opcdaclient' 
   nsExec::Exec 'net stop JSON_SCADA_opcuaserver' 
   nsExec::Exec 'net stop JSON_SCADA_mqttsparkplugclient'  
   nsExec::Exec 'net stop JSON_SCADA_plc4xclient'  
@@ -245,7 +245,8 @@ 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-6.0.32-win-x64.exe"
+  File /a "..\platform-windows\dotnet-runtime-8.0.7-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"
   ;ExecWait `regsvr32 gbda_aut.dll`
@@ -261,10 +262,13 @@ SetRegView 64
   ;  ExecWait '"$INSTDIR\platform-windows\vc_redist.x64.exe" /q'
   ;${EndIf}
   Sleep 1000
-  Exec '"$INSTDIR\platform-windows\vc_redist.x64.exe" /install /passive /quiet'
+  ExecWait '"$INSTDIR\platform-windows\vc_redist.x64.exe" /install /passive /quiet'
   Sleep 1000
-  Exec '"$INSTDIR\platform-windows\dotnet-runtime-6.0.32-win-x64.exe" /install /passive /quiet'
-
+  ExecWait '"$INSTDIR\platform-windows\dotnet-runtime-8.0.7-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
+
   SetOutPath $INSTDIR\platform-windows\nodejs-runtime
   File /a /r "..\platform-windows\nodejs-runtime\*.*"
 
@@ -278,7 +282,7 @@ SetRegView 64
   File /a /r "..\platform-windows\jdk-runtime\*.*"
 
   SetOutPath $INSTDIR\platform-windows\metabase-runtime
-  File /a /r "..\platform-windows\metabase-runtime\metabase.jar"
+  File /a "..\platform-windows\metabase-runtime\metabase.jar"
 
   SetOutPath $INSTDIR\platform-windows\grafana-runtime
   File /a /r "..\platform-windows\grafana-runtime\*.*"
@@ -327,13 +331,14 @@ SetRegView 64
 
   SetOutPath $INSTDIR\src\htdocs
   File /a "..\src\htdocs\*.*"
+  File /a ".\release_notes.txt"
   SetOutPath $INSTDIR\src\htdocs\sounds
-  File /a /r "..\src\htdocs\sounds\critical.wav"
-  File /a /r "..\src\htdocs\sounds\noncritical.wav"
+  File /a "..\src\htdocs\sounds\critical.wav"
+  File /a "..\src\htdocs\sounds\noncritical.wav"
   SetOutPath $INSTDIR\src\htdocs\scripts
   File /a /r "..\src\htdocs\scripts\*.*"
   SetOutPath $INSTDIR\src\htdocs\sage-cepel-displays
-  File /a /r "..\src\htdocs\sage-cepel-displays\README.md"
+  File /a "..\src\htdocs\sage-cepel-displays\README.md"
   SetOutPath $INSTDIR\src\htdocs\images
   File /a /r "..\src\htdocs\images\*.*"
   SetOutPath $INSTDIR\src\htdocs\charts
@@ -633,6 +638,11 @@ Section "Uninstall"
   ExecWait `"${SC}" delete "JSON_SCADA_opcuaclient"`
   ClearErrors
 
+  ExecWait `"${SC}" stop "JSON_SCADA_opcdaclient"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_opcdaclient"`
+  ClearErrors
+
   ExecWait `"${SC}" stop "JSON_SCADA_telegraf_runtime"`
   Sleep 50
   ExecWait `"${SC}" delete "JSON_SCADA_telegraf_runtime"`
@@ -667,6 +677,11 @@ Section "Uninstall"
   Sleep 50
   ExecWait `"${SC}" delete "JSON_SCADA_opcuaserver"`
   ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_opcdaserver"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_opcdaserver"`
+  ClearErrors
 
   ExecWait `"${SC}" stop "JSON_SCADA_cs_data_processor"`
   Sleep 50

diff --git a/platform-windows/release_notes.txt b/platform-windows/release_notes.txt
@@ -134,6 +134,31 @@ Inkscape+SAGE:
 
 -------------------------------------------------------------------
 
+Notes for version 0.37:
+
+* Default login credentials: username=admin password=jsonscada.
+* Metabase credentials: [email protected] password=jsonscada123.
+* New OPC-DA Client driver.
+* OPC-UA Server: create branches from groups1/2/3, handle arrays and date types, fix errors.
+* Fix measurements with alias from EON nodes on MQTT/Sparkplug driver.
+* Fix environment variables on nodejs processes.
+* Dotnet projects targets 8.0 version, updated Mongodb drivers.
+* Grafana updated to 11.1.3.
+* Nodejs runtime updated to 20.16.0.
+* MongoDB Compass updated to 1.43.5.
+
+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. 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.36:
 
 * Default login credentials: username=admin password=jsonscada.

diff --git a/platform-windows/start_services.bat b/platform-windows/start_services.bat
@@ -32,7 +32,7 @@ REM nssm start JSON_SCADA_mongowr
 REM SELECT PROTOCOLS TO START
 nssm start JSON_SCADA_iec104client
 nssm start JSON_SCADA_mqttsparkplugclient
-nssm start JSON_SCADA_plc4xclient
+rem nssm start JSON_SCADA_plc4xclient
 nssm start JSON_SCADA_telegraf_listener
 net start JSON_SCADA_telegraf_runtime
 REM nssm start JSON_SCADA_iec104server

diff --git a/src/htdocs/i18n/messages_i18n-en_us.js b/src/htdocs/i18n/messages_i18n-en_us.js
@@ -4,7 +4,7 @@
 var Msg =
 {
 NomeProduto: '{json:scada}',
-VersaoProduto: '0.36',
+VersaoProduto: '0.37',
 
 NomeVisorTelas:       'Display Viewer',
 NomeVisorEventos:     'Events Viewer',

diff --git a/src/htdocs/i18n/messages_i18n-pt_br.js b/src/htdocs/i18n/messages_i18n-pt_br.js
@@ -4,7 +4,7 @@
 var Msg =
 {
 NomeProduto: '{json:scada}',
-VersaoProduto: '0.36',
+VersaoProduto: '0.37',
 
 NomeVisorTelas:       'Visor de Telas',
 NomeVisorEventos:     'Visor de Eventos',

diff --git a/src/htdocs/i18n/messages_i18n-uk_ua.js b/src/htdocs/i18n/messages_i18n-uk_ua.js
@@ -4,7 +4,7 @@
 var Msg =
 {
 NomeProduto: '{json:scada}',
-VersaoProduto: '0.36',
+VersaoProduto: '0.37',
 
 NomeVisorTelas: 'Перегляд ',
 NomeVisorEventos: 'Події',

diff --git a/src/htdocs/i18n/messages_i18n.js b/src/htdocs/i18n/messages_i18n.js
@@ -4,7 +4,7 @@
 var Msg =
 {
 NomeProduto: '{json:scada}',
-VersaoProduto: '0.36',
+VersaoProduto: '0.37',
 
 NomeVisorTelas:       'Display Viewer',
 NomeVisorEventos:     'Events Viewer',