Skip to content

Commit 2b9dff0

Browse files
committed
Version 0.38-alpha.
1 parent 35d189d commit 2b9dff0

File tree

12 files changed

+132
-12
lines changed

12 files changed

+132
-12
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
4848
- MongoDB as the real-time core database, persistence layer, config store, SOE historian.
4949
- Event-based realtime async data processing with MongoDB Change Streams.
5050
- Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
51-
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.37-alpha).
51+
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.38-alpha).
5252
- Unlimited tags, servers, and users.
5353
- Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
5454
- 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.
@@ -89,7 +89,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
8989
## Documentation
9090

9191
- [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)
92-
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.37-alpha)
92+
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.38-alpha)
9393
- [RedHat/Rocky Linux Installer](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#rhel94-and-compatible-systems-automated-installation)
9494
- [Docker Demo](https://github.com/riclolsen/json-scada/blob/master/demo-docker/README.md)
9595
- [Schema Documentation](https://github.com/riclolsen/json-scada/blob/master/docs/schema.md)

index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
4848
- MongoDB as the real-time core database, persistence layer, config store, SOE historian.
4949
- Event-based realtime async data processing with MongoDB Change Streams.
5050
- Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
51-
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.37-alpha).
51+
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.38-alpha).
5252
- Unlimited tags, servers, and users.
5353
- Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
5454
- 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.
@@ -89,7 +89,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
8989
## Documentation
9090

9191
- [Generic Install Guide](docs/install.md)
92-
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.37-alpha)
92+
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.38-alpha)
9393
- [RedHat/Rocky Linux Installer](docs/install.md#rhel94-and-compatible-systems-automated-installation)
9494
- [Install Guide](docs/install.md)
9595
- [Docker Demo](demo-docker/README.md)

platform-windows/create_services.bat

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,18 @@ nssm set JSON_SCADA_iec101server AppRotateOnline 1
169169
nssm set JSON_SCADA_iec101server AppRotateBytes 10000000
170170
nssm set JSON_SCADA_iec101server Start SERVICE_DEMAND_START
171171

172+
rem nssm install JSON_SCADA_iccpclient "C:\json-scada\bin\iccpclient.exe" 1 1
173+
rem nssm set JSON_SCADA_iccpclient AppStdout C:\json-scada\log\iccpclient.log
174+
rem nssm set JSON_SCADA_iccpclient AppRotateOnline 1
175+
rem nssm set JSON_SCADA_iccpclient AppRotateBytes 10000000
176+
rem nssm set JSON_SCADA_iccpclient Start SERVICE_DEMAND_START
177+
178+
rem nssm install JSON_SCADA_iccpserver "C:\json-scada\bin\iccpserver.exe" 1 1
179+
rem nssm set JSON_SCADA_iccpserver AppStdout C:\json-scada\log\iccpserver.log
180+
rem nssm set JSON_SCADA_iccpserver AppRotateOnline 1
181+
rem nssm set JSON_SCADA_iccpserver AppRotateBytes 10000000
182+
rem nssm set JSON_SCADA_iccpserver Start SERVICE_DEMAND_START
183+
172184
nssm install JSON_SCADA_dnp3client "C:\json-scada\bin\Dnp3Client.exe" 1 2
173185
nssm set JSON_SCADA_dnp3client AppStdout C:\json-scada\log\dnp3client.log
174186
nssm set JSON_SCADA_dnp3client AppRotateOnline 1

platform-windows/json-scada.nsi

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ RequestExecutionLevel admin
1717

1818
;--------------------------------
1919

20-
!define VERSION "v.0.37"
21-
!define VERSION_ "0.37.0.0"
20+
!define VERSION "v.0.38"
21+
!define VERSION_ "0.38.0.0"
2222

2323
Function .onInit
2424
System::Call 'keexrnel32::CreateMutexA(i 0, i 0, t "MutexJsonScadaInstall") i .r1 ?e'
@@ -127,6 +127,8 @@ SetRegView 64
127127
nsExec::Exec 'net stop JSON_SCADA_iec101server'
128128
nsExec::Exec 'net stop JSON_SCADA_iec104client'
129129
nsExec::Exec 'net stop JSON_SCADA_iec104server'
130+
nsExec::Exec 'net stop JSON_SCADA_iccpclient'
131+
nsExec::Exec 'net stop JSON_SCADA_iccpserver'
130132
nsExec::Exec 'net stop JSON_SCADA_iec61850client'
131133
nsExec::Exec 'net stop JSON_SCADA_plctags'
132134
nsExec::Exec 'net stop JSON_SCADA_dnp3client'
@@ -245,7 +247,7 @@ SetRegView 64
245247
File /a "..\platform-windows\nssm.exe"
246248
File /a "..\platform-windows\sounder.exe"
247249
File /a "..\platform-windows\vc_redist.x64.exe"
248-
File /a "..\platform-windows\dotnet-runtime-8.0.7-win-x64.exe"
250+
File /a "..\platform-windows\dotnet-runtime-8.0.8-win-x64.exe"
249251
File /a "..\platform-windows\OPC Core Components Redistributable (x64) 3.00.108.msi"
250252
;File /a "..\platform-windows\gbda_aut.dll"
251253
;File /a "..\platform-windows\gbhda_aw.dll"
@@ -264,7 +266,7 @@ SetRegView 64
264266
Sleep 1000
265267
ExecWait '"$INSTDIR\platform-windows\vc_redist.x64.exe" /install /passive /quiet'
266268
Sleep 1000
267-
ExecWait '"$INSTDIR\platform-windows\dotnet-runtime-8.0.7-win-x64.exe" /install /passive /quiet'
269+
ExecWait '"$INSTDIR\platform-windows\dotnet-runtime-8.0.8-win-x64.exe" /install /passive /quiet'
268270
Sleep 1000
269271
ExecWait 'msiexec /i "$INSTDIR\platform-windows\OPC Core Components Redistributable (x64) 3.00.108.msi" /qn'
270272
Sleep 1000
@@ -623,6 +625,11 @@ Section "Uninstall"
623625
ExecWait `"${SC}" delete "JSON_SCADA_iec104client"`
624626
ClearErrors
625627

628+
ExecWait `"${SC}" stop "JSON_SCADA_iccpclient"`
629+
Sleep 50
630+
ExecWait `"${SC}" delete "JSON_SCADA_iccpclient"`
631+
ClearErrors
632+
626633
ExecWait `"${SC}" stop "JSON_SCADA_iec61850client"`
627634
Sleep 50
628635
ExecWait `"${SC}" delete "JSON_SCADA_iec61850client"`
@@ -673,6 +680,11 @@ Section "Uninstall"
673680
ExecWait `"${SC}" delete "JSON_SCADA_iec104server"`
674681
ClearErrors
675682

683+
ExecWait `"${SC}" stop "JSON_SCADA_iccpserver"`
684+
Sleep 50
685+
ExecWait `"${SC}" delete "JSON_SCADA_iccpserver"`
686+
ClearErrors
687+
676688
ExecWait `"${SC}" stop "JSON_SCADA_opcuaserver"`
677689
Sleep 50
678690
ExecWait `"${SC}" delete "JSON_SCADA_opcuaserver"`

platform-windows/release_notes.txt

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,39 @@ Inkscape+SAGE:
134134

135135
-------------------------------------------------------------------
136136

137+
Notes for version 0.38:
138+
139+
* Default login credentials: username=admin password=jsonscada.
140+
* Metabase credentials: [email protected] password=jsonscada123.
141+
* Various enhancements related to user/role rights (RBAC).
142+
* DNP3 Client: added passive connection modes.
143+
* Fixed problem with timezone on Display Viewer/Replay.
144+
* Enhancements on Admin UI for protocol connections.
145+
* Fixed problem with dbname on mongoose connection options in server_realtime_auth.
146+
* IEC104 Client/Server: allow for multiple TLS certificates for peers.
147+
* Fixed invalidate data from inactive connections on cs_data_processor.
148+
* NPM packages updated.
149+
* MongoDB Community Server updated to 7.0.14.
150+
* MongoDB Compass updated to 1.44.3.
151+
* Grafana updated to 11.2.0.
152+
* Nodejs runtime updated to 20.17.0.
153+
* Dotnet runtime updated to 8.0.8.
154+
* Telegraf runtime updated to 1.31.3.
155+
* Chromium updated to 128.0.6613.120.
156+
* Nginx updated to 1.26.2.
157+
158+
Requirements and recommendations:
159+
160+
* Windows 10/11 64 bits or Server >=2019, Windows PowerShell. At least 20GB of free space in the "C:" drive.
161+
* Administrative rights. corporate Windows policies may cause problems with the creation of services and the opening of TCP ports.
162+
* Free TCP ports 6688, 6689, 27017, 5432, 80, 8080, 3000, 3001, 9000. Other ports may be required for optional services and protocols.
163+
* If the server already has MongoDB, PostgreSQL, Grafana, Metabase, Nginx or another webserver, please uninstall, disable or watch out for possible conflicts.
164+
* Do not update previously installed JSON-SCADA. Please uninstall previous JSON-SCADA versions before installing a new version.
165+
* If using VirtualBox configure "paravirtualization interface"=KVM, otherwise Nodejs errors may occur.
166+
* MongoDB requires AVX instructions on x86 CPU.
167+
168+
-------------------------------------------------------------------
169+
137170
Notes for version 0.37:
138171

139172
* Default login credentials: username=admin password=jsonscada.

platform-windows/start_services.bat

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,15 @@ REM nssm start JSON_SCADA_mongowr
3131

3232
REM SELECT PROTOCOLS TO START
3333
nssm start JSON_SCADA_iec104client
34+
rem nssm start JSON_SCADA_iec101client
35+
rem nssm start JSON_SCADA_iccpclient
3436
nssm start JSON_SCADA_mqttsparkplugclient
3537
rem nssm start JSON_SCADA_plc4xclient
3638
nssm start JSON_SCADA_telegraf_listener
3739
net start JSON_SCADA_telegraf_runtime
3840
REM nssm start JSON_SCADA_iec104server
3941
REM nssm start JSON_SCADA_iec101server
42+
REM nssm start JSON_SCADA_iccpserver
4043
REM nssm start JSON_SCADA_iec101client
4144
REM nssm start JSON_SCADA_dnp3client
4245
nssm start JSON_SCADA_opcuaclient

platform-windows/stop_services.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ nssm stop JSON_SCADA_opcdaclient
3131
nssm stop JSON_SCADA_iec61850client
3232
nssm stop JSON_SCADA_i104m
3333
nssm stop JSON_SCADA_plctags
34+
nssm stop JSON_SCADA_iccpclient
3435
net stop JSON_SCADA_telegraf_runtime
3536
nssm stop JSON_SCADA_telegraf_listener
3637
nssm stop JSON_SCADA_mqttsparkplugclient
@@ -41,6 +42,7 @@ REM STOP PROTOCOL SERVERS
4142
nssm stop JSON_SCADA_iec104server
4243
nssm stop JSON_SCADA_iec101server
4344
nssm stop JSON_SCADA_opcuaserver
45+
nssm stop JSON_SCADA_iccpserver
4446
ping -n 2
4547

4648
REM STOP OTHER PROCESSES

src/htdocs/i18n/messages_i18n-en_us.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
var Msg =
55
{
66
NomeProduto: '{json:scada}',
7-
VersaoProduto: '0.37',
7+
VersaoProduto: '0.38',
88

99
NomeVisorTelas: 'Display Viewer',
1010
NomeVisorEventos: 'Events Viewer',

src/htdocs/i18n/messages_i18n-pt_br.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
var Msg =
55
{
66
NomeProduto: '{json:scada}',
7-
VersaoProduto: '0.37',
7+
VersaoProduto: '0.38',
88

99
NomeVisorTelas: 'Visor de Telas',
1010
NomeVisorEventos: 'Visor de Eventos',

src/htdocs/i18n/messages_i18n-uk_ua.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
var Msg =
55
{
66
NomeProduto: '{json:scada}',
7-
VersaoProduto: '0.37',
7+
VersaoProduto: '0.38',
88

99
NomeVisorTelas: 'Перегляд ',
1010
NomeVisorEventos: 'Події',

0 commit comments

Comments
 (0)