Skip to content

Commit b0c0bb9

Browse files
committed
Version 0.33-alpha
1 parent ea8605c commit b0c0bb9

13 files changed

+98
-21
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.32-alpha).
51+
* Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.33-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.
@@ -83,7 +83,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
8383
## Documentation
8484

8585
* [Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)
86-
* [Windows installer](https://github.com/riclolsen/json-scada/releases/tag/V0.32-alpha)
86+
* [Windows installer](https://github.com/riclolsen/json-scada/releases/tag/V0.33-alpha)
8787
* [Docker Demo](https://github.com/riclolsen/json-scada/blob/master/demo-docker/README.md)
8888
* [Schema Documentation](https://github.com/riclolsen/json-scada/blob/master/docs/schema.md)
8989
* [Config File](https://github.com/riclolsen/json-scada/blob/master/conf/README.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.32-alpha).
51+
* Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.33-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.
@@ -83,7 +83,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
8383
## Documentation
8484

8585
* [Install Guide](docs/install.md)
86-
* [Windows installer](https://github.com/riclolsen/json-scada/releases/tag/V0.32-alpha)
86+
* [Windows installer](https://github.com/riclolsen/json-scada/releases/tag/V0.33-alpha)
8787
* [Docker Demo](demo-docker/README.md)
8888
* [Schema Documentation](docs/schema.md)
8989
* [Config File](conf/README.md)

platform-windows/create_services.bat

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ rem nssm set JSON_SCADA_metabase AppEnvironmentExtra MB_JWT_ENABLED="true"
2929
nssm set JSON_SCADA_metabase Start SERVICE_DELAYED_AUTO_START
3030

3131
rem MONGODB
32-
nssm install JSON_SCADA_mongodb "C:\json-scada\platform-windows\mongodb-runtime\bin\mongod.exe" --config "c:\json-scada\platform-windows\mongodb-conf\mongod.cfg"
32+
nssm install JSON_SCADA_mongodb "C:\json-scada\platform-windows\mongodb-runtime\bin\mongod.exe" --config "c:\json-scada\platform-windows\mongodb-conf\mongod.cfg"
3333
nssm set JSON_SCADA_mongodb Start SERVICE_AUTO_START
3434

3535
nssm install JSON_SCADA_calculations "C:\json-scada\bin\calculations.exe" 1 1 2.0 "c:\json-scada\conf\json-scada.json"
@@ -41,14 +41,14 @@ nssm set JSON_SCADA_calculations Start SERVICE_AUTO_START
4141
REM See log rotation options https://nssm.cc/usage#io
4242

4343
nssm install JSON_SCADA_cs_data_processor "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\cs_data_processor\cs_data_processor.js" 1 1 "c:\json-scada\conf\json-scada.json"
44-
nssm set JSON_SCADA_cs_data_processor AppDirectory "C:\json-scada\src\cs_data_processor"
44+
nssm set JSON_SCADA_cs_data_processor AppDirectory "C:\json-scada\src\cs_data_processor"
4545
nssm set JSON_SCADA_cs_data_processor AppStdout C:\json-scada\log\cs_data_processor.log
4646
nssm set JSON_SCADA_cs_data_processor AppRotateOnline 1
4747
nssm set JSON_SCADA_cs_data_processor AppRotateBytes 10000000
4848
nssm set JSON_SCADA_cs_data_processor Start SERVICE_AUTO_START
4949

5050
nssm install JSON_SCADA_cs_custom_processor "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\cs_custom_processor\cs_custom_processor.js" 1 1 "c:\json-scada\conf\json-scada.json"
51-
nssm set JSON_SCADA_cs_custom_processor AppDirectory "C:\json-scada\src\cs_custom_processor"
51+
nssm set JSON_SCADA_cs_custom_processor AppDirectory "C:\json-scada\src\cs_custom_processor"
5252
nssm set JSON_SCADA_cs_custom_processor AppStdout C:\json-scada\log\cs_custom_processor.log
5353
nssm set JSON_SCADA_cs_custom_processor AppRotateOnline 1
5454
nssm set JSON_SCADA_cs_custom_processor AppRotateBytes 10000000
@@ -57,7 +57,7 @@ nssm set JSON_SCADA_cs_custom_processor Start SERVICE_AUTO_START
5757

5858
REM CHOOSE ONE: server_realtime (no user control) or server_realtime_auth (token based auth and RBAC)
5959

60-
REM nssm install JSON_SCADA_server_realtime "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\server_realtime\index.js" NOAUTH
60+
REM nssm install JSON_SCADA_server_realtime "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\server_realtime\index.js" NOAUTH
6161
REM nssm set JSON_SCADA_server_realtime AppDirectory "C:\json-scada\src\server_realtime"
6262
REM nssm set JSON_SCADA_server_realtime Start SERVICE_AUTO_START
6363
rem Use environment variables to connect (for reading) to PostgreSQL historian (https://www.postgresql.org/docs/current/libpq-envars.html)
@@ -74,7 +74,7 @@ set /a rand=%Random%%%62
7474
set buffer=!buffer!!char:~%rand%,1!
7575
if !count! leq !length! goto Loop
7676

77-
nssm install JSON_SCADA_server_realtime_auth "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\server_realtime_auth\index.js"
77+
nssm install JSON_SCADA_server_realtime_auth "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\server_realtime_auth\index.js"
7878
nssm set JSON_SCADA_server_realtime_auth AppDirectory "C:\json-scada\src\server_realtime_auth"
7979
nssm set JSON_SCADA_server_realtime_auth Start SERVICE_AUTO_START
8080
nssm set JSON_SCADA_server_realtime_auth AppEnvironmentExtra JS_JWT_SECRET=%buffer%
@@ -85,26 +85,36 @@ nssm set JSON_SCADA_server_realtime_auth AppRotateBytes 10000000
8585
rem Use environment variables to connect (for reading) to PostgreSQL historian (https://www.postgresql.org/docs/current/libpq-envars.html)
8686
rem nssm set JSON_SCADA_server_realtime_auth AppEnvironmentExtra PGHOSTADDR=127.0.0.1 PGPORT=5432 PGDATABASE=json_scada PGUSER=json_scada PGPASSWORD=json_scada
8787

88-
nssm install JSON_SCADA_demo_simul "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\demo_simul\index.js"
88+
nssm install JSON_SCADA_demo_simul "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\demo_simul\index.js"
8989
nssm set JSON_SCADA_demo_simul AppDirectory "C:\json-scada\src\demo_simul"
9090
nssm set JSON_SCADA_demo_simul Start SERVICE_DEMAND_START
9191

92-
nssm install JSON_SCADA_alarm_beep "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\alarm_beep\alarm_beep.js"
92+
rem Service to send protocol data updates on mongodb to another JSON-SCADA instance (one-way via UDP)
93+
nssm install JSON_SCADA_mongofw "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\mongofw\index.js"
94+
nssm set JSON_SCADA_mongofw AppDirectory "C:\json-scada\src\mongofw"
95+
nssm set JSON_SCADA_mongofw Start SERVICE_DEMAND_START
96+
97+
rem Service to receive protocol data updates from another JSON-SCADA instance (one-way via UDP)
98+
nssm install JSON_SCADA_mongowr "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\mongowr\index.js"
99+
nssm set JSON_SCADA_mongowr AppDirectory "C:\json-scada\src\mongowr"
100+
nssm set JSON_SCADA_mongowr Start SERVICE_DEMAND_START
101+
102+
nssm install JSON_SCADA_alarm_beep "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\alarm_beep\alarm_beep.js"
93103
nssm set JSON_SCADA_alarm_beep AppDirectory "C:\json-scada\src\alarm_beep"
94104
nssm set JSON_SCADA_alarm_beep_auth AppStdout C:\json-scada\log\alarm_beep.log
95105
nssm set JSON_SCADA_alarm_beep AppRotateOnline 1
96106
nssm set JSON_SCADA_alarm_beep AppRotateBytes 10000000
97107
nssm set JSON_SCADA_alarm_beep Start SERVICE_AUTO_START
98108

99109
rem WARNING! This service has no security access control, use with care.
100-
nssm install JSON_SCADA_config_server_excel "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\config_server_for_excel\index.js"
110+
nssm install JSON_SCADA_config_server_excel "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\config_server_for_excel\index.js"
101111
nssm set JSON_SCADA_config_server_excel AppDirectory "C:\json-scada\src\config_server_for_excel"
102112
nssm set JSON_SCADA_config_server_excel Start SERVICE_DEMAND_START
103113
nssm set JSON_SCADA_config_server_excel AppEnvironmentExtra JS_CSEXCEL_IP_BIND=0.0.0.0 JS_CSEXCEL_HTTP_PORT=10001
104114
rem JS_CSEXCEL_IP_BIND=127.0.0.1 to enable just local access
105115

106116
rem For use with OSHMI HMI Shell
107-
rem nssm install JSON_SCADA_shell_api "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\shell-api\shell-api.js"
117+
rem nssm install JSON_SCADA_shell_api "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\shell-api\shell-api.js"
108118
rem nssm set JSON_SCADA_shell_api AppDirectory "C:\json-scada\src\shell-api"
109119
rem nssm set JSON_SCADA_shell_api Start SERVICE_AUTO_START
110120

@@ -190,7 +200,7 @@ nssm set JSON_SCADA_plctags AppRotateBytes 10000000
190200
nssm set JSON_SCADA_plctags Start SERVICE_DEMAND_START
191201

192202
REM service for OPC-UA Server
193-
nssm install JSON_SCADA_opcuaserver "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\OPC-UA-Server\index.js" 1 1 "c:\json-scada\conf\json-scada.json"
203+
nssm install JSON_SCADA_opcuaserver "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\OPC-UA-Server\index.js" 1 1 "c:\json-scada\conf\json-scada.json"
194204
nssm set JSON_SCADA_opcuaserver AppDirectory "C:\json-scada\src\OPC-UA-Server"
195205
nssm set JSON_SCADA_opcuaserver AppStdout C:\json-scada\log\opcuaserver.log
196206
nssm set JSON_SCADA_opcuaserver AppRotateOnline 1

platform-windows/json-scada.nsi

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

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

20-
!define VERSION "v.0.32"
21-
!define VERSION_ "0.32.0.0"
20+
!define VERSION "v.0.33"
21+
!define VERSION_ "0.33.0.0"
2222

2323
Function .onInit
2424
System::Call 'keexrnel32::CreateMutexA(i 0, i 0, t "MutexJsonScadaInstall") i .r1 ?e'
@@ -117,6 +117,9 @@ SetRegView 64
117117
nsExec::Exec 'net stop JSON_SCADA_server_realtime'
118118
nsExec::Exec 'net stop JSON_SCADA_server_realtime_auth'
119119
nsExec::Exec 'net stop JSON_SCADA_config_server_excel'
120+
nsExec::Exec 'net stop JSON_SCADA_demo_simul'
121+
nsExec::Exec 'net stop JSON_SCADA_mongofw'
122+
nsExec::Exec 'net stop JSON_SCADA_mongowr'
120123
nsExec::Exec 'net stop JSON_SCADA_alarm_beeep'
121124
nsExec::Exec 'net stop JSON_SCADA_shell_api'
122125
nsExec::Exec 'net stop JSON_SCADA_process_rtdata'
@@ -343,6 +346,12 @@ SetRegView 64
343346
SetOutPath $INSTDIR\src\demo_simul
344347
File /a /r "..\src\demo_simul\*.*"
345348

349+
SetOutPath $INSTDIR\src\mongofw
350+
File /a /r "..\src\mongofw\*.*"
351+
352+
SetOutPath $INSTDIR\src\mongowr
353+
File /a /r "..\src\mongowr\*.*"
354+
346355
SetOutPath $INSTDIR\src\grafana_alert2event
347356
File /a /r "..\src\grafana_alert2event\*.*"
348357

@@ -554,6 +563,16 @@ Section "Uninstall"
554563
ExecWait `"${SC}" delete "JSON_SCADA_demo_simul"`
555564
ClearErrors
556565

566+
ExecWait `"${SC}" stop "JSON_SCADA_mongofw"`
567+
Sleep 50
568+
ExecWait `"${SC}" delete "JSON_SCADA_mongofw"`
569+
ClearErrors
570+
571+
ExecWait `"${SC}" stop "JSON_SCADA_mongowr"`
572+
Sleep 50
573+
ExecWait `"${SC}" delete "JSON_SCADA_mongowr"`
574+
ClearErrors
575+
557576
ExecWait `"${SC}" stop "JSON_SCADA_alarm_beep"`
558577
Sleep 50
559578
ExecWait `"${SC}" delete "JSON_SCADA_alarm_beep"`

platform-windows/release_notes.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,23 @@ Inkscape+SAGE:
132132

133133
-------------------------------------------------------------------
134134

135+
Notes for version 0.33:
136+
137+
* Default login credentials: username=admin password=jsonscada.
138+
* Metabase credentials: [email protected] password=jsonscada123.
139+
* Added Mongofw and Mongowr processes for data replication over instances.
140+
141+
Requirements and recommendations:
142+
143+
* Windows 10/11 64 bits or Server >=2016, Windows PowerShell. At least 15GB of free space in the "C:" drive.
144+
* Administrative rights. corporate Windows policies may cause problems with the creation of services and the opening of TCP ports.
145+
* Free TCP ports 6688, 6689, 27017, 5432, 80, 8080, 3000, 9000. Other ports may be required for optional services and protocols.
146+
* If the server already has MongoDB, PostgreSQL, Grafana, Nginx or another webserver, please uninstall, disable or watch out for possible conflicts.
147+
* Do not update previously installed JSON-SCADA. Please uninstall previous JSON-SCADA versions before installing a new version.
148+
* If using VirtualBox configure "paravirtualization interface"=KVM, otherwise Nodejs errors may occur.
149+
150+
-------------------------------------------------------------------
151+
135152
Notes for version 0.32:
136153

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

platform-windows/remove_services.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ nssm remove JSON_SCADA_process_hist confirm
3737
nssm remove JSON_SCADA_alarm_beep confirm
3838
nssm remove JSON_SCADA_shell_api confirm
3939
nssm remove JSON_SCADA_demo_simul confirm
40+
nssm remove JSON_SCADA_mongofw confirm
41+
nssm remove JSON_SCADA_mongowr confirm
4042
nssm remove JSON_SCADA_config_server_excel confirm
4143

4244
nssm remove JSON_SCADA_nginx confirm

platform-windows/start_services.bat

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ nssm start JSON_SCADA_process_hist
2525
REM nssm start JSON_SCADA_config_server_excel
2626
REM nssm start JSON_SCADA_alarm_beep
2727
REM nssm start JSON_SCADA_shell_api
28+
REM nssm start JSON_SCADA_demo_simul
29+
REM nssm start JSON_SCADA_mongofw
30+
REM nssm start JSON_SCADA_mongowr
2831

2932
REM SELECT PROTOCOLS TO START
3033
nssm start JSON_SCADA_iec104client

platform-windows/stop_services.bat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ nssm stop JSON_SCADA_server_realtime_auth
1616
nssm stop JSON_SCADA_alarm_beep
1717
nssm stop JSON_SCADA_shell_api
1818
nssm stop JSON_SCADA_config_server_excel
19+
nssm stop JSON_SCADA_demo_simul
20+
nssm stop JSON_SCADA_mongofw
21+
nssm stop JSON_SCADA_mongowr
22+
1923
ping -n 2
2024

2125
REM STOP PROTOCOL CLIENTS

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.32',
7+
VersaoProduto: '0.33',
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.32',
7+
VersaoProduto: '0.33',
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.32',
7+
VersaoProduto: '0.33',
88

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

src/htdocs/i18n/messages_i18n.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.32',
7+
VersaoProduto: '0.33',
88

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

src/mongowr/package-lock.json

Lines changed: 23 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)