Windows installer updated.

Author: riclolsen

demo-docker/mongo_seed/files/demo_data.json

@@ -28,17 +28,24 @@ REM See log rotation options https://nssm.cc/usage#io
 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"
 nssm set JSON_SCADA_cs_data_processor AppDirectory  "C:\json-scada\src\cs_data_processor"
 nssm set JSON_SCADA_cd_data_processor Start SERVICE_AUTO_START
+
 nssm install JSON_SCADA_server_realtime  "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\server_realtime\index.js" NOAUTH
 nssm set JSON_SCADA_server_realtime AppDirectory "C:\json-scada\src\server_realtime"
 nssm set JSON_SCADA_server_realtime Start SERVICE_AUTO_START
 
+
+nssm install JSON_SCADA_demo_simul  "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\demo_simul\index.js" 
+nssm set JSON_SCADA_demo_simul AppDirectory "C:\json-scada\src\demo_simul"
+nssm set JSON_SCADA_demo_simul SERVICE_DEMAND_START
+
 nssm install JSON_SCADA_alarm_beep  "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\alarm_beep\alarm_beep.js" 
 nssm set JSON_SCADA_alarm_beep AppDirectory "C:\json-scada\src\alarm_beep"
 nssm set JSON_SCADA_alarm_beep Start SERVICE_AUTO_START
 
 nssm install JSON_SCADA_process_rtdata "C:\json-scada\sql\process_pg_rtdata.bat"
 nssm set JSON_SCADA_process_rtdata AppDirectory "C:\json-scada\sql"
 nssm set JSON_SCADA_process_rtdata Start SERVICE_AUTO_START
+
 nssm install JSON_SCADA_process_hist "C:\json-scada\sql\process_pg_hist.bat"
 nssm set JSON_SCADA_process_hist AppDirectory "C:\json-scada\sql"
 nssm set JSON_SCADA_process_hist Start SERVICE_AUTO_START

platform-windows/create_services.bat

@@ -4,6 +4,7 @@ if not "%1"=="am_admin" (powershell start -verb runas '%0' am_admin & exit /b)
 cd \json-scada\platform-windows\
 
 call postgresql-initdb.bat
+ping -n 15 127.0.0.1
 copy /Y ..\conf-templates\pg_hba.conf postgresql-data\
 copy /Y ..\conf-templates\postgresql.conf postgresql-data\
 call postgresql-create_service.bat

platform-windows/initial_setup.bat

@@ -14,8 +14,8 @@ RequestExecutionLevel admin
 
 ;--------------------------------
 
-!define VERSION "v.0.1"
-!define VERSION_ "0.1.0.0"
+!define VERSION "v.0.2"
+!define VERSION_ "0.2.0.0"
 
 Function .onInit
  System::Call 'keexrnel32::CreateMutexA(i 0, i 0, t "MutexJsonScadaInstall") i .r1 ?e'
@@ -113,9 +113,16 @@ SetRegView 64
   nsExec::Exec 'net stop JSON_SCADA_server_realtime'
   nsExec::Exec 'net stop JSON_SCADA_process_rtdata'
   nsExec::Exec 'net stop JSON_SCADA_process_hist'
-  nsExec::Exec 'net stop JSON_SCADA_iec104'
-  nsExec::Exec 'net stop JSON_SCADA_iec104_server'
-  nsExec::Exec 'net stop JSON_SCADA_dnp3'
+  nsExec::Exec 'net stop JSON_SCADA_iec101client'
+  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_plctags'
+  nsExec::Exec 'net stop JSON_SCADA_dnp3client' 
+  nsExec::Exec 'net stop JSON_SCADA_process_hist'
+  nsExec::Exec 'net stop JSON_SCADA_process_rtdata'
+  nsExec::Exec 'net stop JSON_SCADA_process_nginx'
+  nsExec::Exec 'net stop JSON_SCADA_process_php'
   nsExec::Exec 'c:\json-scada\platform-windows\stop_services.bat'
   nsExec::Exec '"c:\json-scada\platform-windows\postgresql-runtime\bin\pg_ctl" stop -D c:\json-scada\platform-windows\postgresql-runtime'
   nsExec::Exec 'c:\json-scada\platform-windows\stop_services.bat'
@@ -180,7 +187,7 @@ SetRegView 64
   CreateDirectory "$INSTDIR\mongo_seed"
 ; CreateDirectory "$INSTDIR\sql"
   CreateDirectory "$INSTDIR\src"
-  CreateDirectory "$INSTDIR\PowerBI"
+; CreateDirectory "$INSTDIR\PowerBI"
 ; CreateDirectory "$INSTDIR\Opc.Ua.CertificateGenerator"
   CreateDirectory "$INSTDIR\platform-windows"
   CreateDirectory "$INSTDIR\platform-windows\grafana-runtime"
@@ -196,6 +203,13 @@ SetRegView 64
   CreateDirectory "$INSTDIR\platform-windows\postgresql-runtime"
   CreateDirectory "$INSTDIR\platform-windows\nginx_php-runtime"
 
+  ; This is to try to avoid this Postgresql error:
+  ; https://edwin.baculsoft.com/2014/05/fixing-postgresql-error-initdb-could-not-change-permissions-of-directory-permission-denied/
+  ; (S-1-5-32-545)=Users (S-1-1-0)=Everyone
+  ; https://docs.microsoft.com/pt-br/troubleshoot/windows-server/identity/security-identifiers-in-windows
+  AccessControl::GrantOnFile "$INSTDIR\platform-windows\postgresql-data" "(S-1-5-32-545)" "FullAccess"
+  AccessControl::GrantOnFile "$INSTDIR\platform-windows\postgresql-data" "(S-1-1-0)" "FullAccess"
+
   SetOutPath $INSTDIR
 
   File /a ".\release_notes.txt"
@@ -207,6 +221,7 @@ SetRegView 64
 
   SetOutPath $INSTDIR\platform-windows
   File /a "..\platform-windows\*.bat"
+  File /a "..\platform-windows\*.ps1"
   File /a "..\platform-windows\nssm.exe"
   File /a "..\platform-windows\vc_redist.x64.exe"
 
@@ -258,6 +273,9 @@ SetRegView 64
   SetOutPath $INSTDIR\src\htdocs-login
   File /a /r "..\src\htdocs-login\*.*"
 
+  SetOutPath $INSTDIR\src\demo_simul
+  File /a /r "..\src\demo_simul\*.*"
+
   SetOutPath $INSTDIR\src\alarm_beep
   File /a /r "..\src\alarm_beep\*.*"
 
@@ -519,20 +537,128 @@ Section "Uninstall"
 
 ; Fecha processos
 
+  !define SC  `$SYSDIR\sc.exe`
+
+  ExecWait `"${SC}" stop "JSON_SCADA_process_demo_simul"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_process_demo_simul"`
+  ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_process_rtdata"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_process_rtdata"`
+  ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_process_alarm_beep"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_process_alarm_beep"`
+  ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_process_php"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_process_php"`
+  ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_process_nginx"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_process_nginx"`
+  ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_i104m"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_i104m"`
+  ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_plctags"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_plctags"`
+  ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_iec101client"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_iec101client"`
+  ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_iec104client"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_iec104client"`
+  ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_dnp3client"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_dnp3client"`
+  ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_iec101server"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_iec101server"`
+  ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_iec104server"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_iec104server"`
+  ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_cs_data_processor"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_cs_data_processor"`
+  ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_calculations"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_calculations"`
+  ClearErrors
+  
+  ExecWait `"${SC}" stop "JSON_SCADA_mongodb"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_mongodb"`
+  ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_postgresql"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_postgresql"`
+  ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_postgresql"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_postgresql"`
+  ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_process_hist"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_process_hist"`
+  ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_process_rtdata"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_process_rtdata"`
+  ClearErrors
+
+  ExecWait `"${SC}" stop "JSON_SCADA_postgresql"`
+  Sleep 50
+  ExecWait `"${SC}" delete "JSON_SCADA_postgresql"`
+  ClearErrors
+
   ExecWait '"$0" /C "$INSTDIR\platform-windows\mongodb-stop.bat"'
   ExecWait '"$0" /C "$INSTDIR\platform-windows\postgresql-stop.bat"'
   ExecWait '"$0" /C "$INSTDIR\platform-windows\stop_services.bat"'
   Sleep 5000
-  ExecWait '"$0" /C "$INSTDIR\platform-windows\remove_services.bat"'
-  Sleep 1000
-  nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\sql\\%'" CALL TERMINATE`
-  Sleep 1000
-  nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\browser-runtime\\%'" CALL TERMINATE`
-  nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\mongodb-runtime\\%'" CALL TERMINATE`
-  nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\inkscape-runtime\\%'" CALL TERMINATE`
-  nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\%'" CALL TERMINATE`
-  nsExec::Exec `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\bin\\%'" CALL TERMINATE`
+  ExecWait `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\sql\\%'" CALL TERMINATE`
   Sleep 1000
+  ExecWait `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\grafana-runtime\\bin\\%'" CALL TERMINATE`
+  ExecWait `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\nginx_php-runtime\\php\\%'" CALL TERMINATE`
+  ExecWait `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\nginx_php-runtime\\%'" CALL TERMINATE`
+  ExecWait `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\nodejs-runtime\\%'" CALL TERMINATE`
+  ExecWait `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\browser-runtime\\%'" CALL TERMINATE`
+  ExecWait `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\mongodb-runtime\\%'" CALL TERMINATE`
+  ExecWait `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\inkscape-runtime\\%'" CALL TERMINATE`
+  ExecWait `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\%'" CALL TERMINATE`
+  ExecWait `wmic PROCESS WHERE "COMMANDLINE LIKE '%\\platform-windows\\%'" CALL TERMINATE`
+  ExecWait `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\bin\\%'" CALL TERMINATE`
+  ExecWait `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\%'" CALL TERMINATE`
+  Sleep 5000
+  ExecWait '"$0" /C "$INSTDIR\platform-windows\remove_services.bat"'
+  Sleep 5000
 
   RMDir /r "$INSTDIR\bin" 
   RMDir /r "$INSTDIR\platform-windows" 

platform-windows/json-scada.nsi

@@ -1,3 +1,8 @@
 echo THIS WILL INITIALIZE THE POSTGRESQL DATABASE! 
 
-c:\json-scada\platform-windows\postgresql-runtime\bin\initdb.exe -D c:\json-scada\platform-windows\postgresql-data --username=postgres --auth=trust -E UTF8 --locale=en_US.UTF-8
+if not "%1"=="am_admin" (powershell start -verb runas '%0' am_admin & exit /b)
+
+REM In some cases the data folder should be given rights to group "Everyone"=S-1-1-0
+icacls "C:\json-scada\platform-windows\postgresql-data" /t  /grant *S-1-1-0:F
+
+c:\json-scada\platform-windows\postgresql-runtime\bin\initdb.exe -D c:\json-scada\platform-windows\postgresql-data --username=postgres --auth=trust -E UTF8 --locale=en-US

platform-windows/postgresql-initdb.bat

@@ -120,6 +120,14 @@ Inkscape+SAGE:
 
 -------------------------------------------------------------------
 
+Notes for version 0.2: 
+
+ - Fixed PostgreSQL initdb problems, locale, timing, Windows user rights.
+ - Added demo_simul service for offline simulation and testing (must be manually started).
+ - Fixed uninstall services removal.
+
+-------------------------------------------------------------------
+
 Notes for version 0.1: 
 
  - First Windows binary release.

platform-windows/release_notes.txt

@@ -0,0 +1,2 @@
+Get-service | Where-Object {$_.Name -match "^JSON_SCADA_"} | Select-Object -ExpandProperty Name | foreach { & sc.exe STOP $_  }
+Get-service | Where-Object {$_.Name -match "^JSON_SCADA_"} | Select-Object -ExpandProperty Name | foreach { & sc.exe DELETE $_  }

platform-windows/remove_jsonscada_services.ps1

@@ -8,6 +8,20 @@ rem Stop services
 
 call stop_services.bat
 
+REM FORCE STOP OF ANY ACTIVE SERVICE OR PROCESS!
+wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\sql\\%'" CALL TERMINATE
+wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\grafana-runtime\\bin\\%'" CALL TERMINATE
+wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\nginx_php-runtime\\php\\%'" CALL TERMINATE
+wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\nginx_php-runtime\\%'" CALL TERMINATE
+wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\nodejs-runtime\\%'" CALL TERMINATE
+wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\browser-runtime\\%'" CALL TERMINATE
+wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\mongodb-runtime\\%'" CALL TERMINATE
+wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\inkscape-runtime\\%'" CALL TERMINATE
+wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\%'" CALL TERMINATE
+wmic PROCESS WHERE "COMMANDLINE LIKE '%\\platform-windows\\%'" CALL TERMINATE
+wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\bin\\%'" CALL TERMINATE
+wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\%'" CALL TERMINATE
+
 rem Remove service without confimation
 
 sc delete JSON_SCADA_postgresql 
@@ -19,6 +33,7 @@ nssm remove JSON_SCADA_calculations confirm
 nssm remove JSON_SCADA_process_rtdata confirm
 nssm remove JSON_SCADA_process_hist confirm
 nssm remove JSON_SCADA_alarm_beep confirm
+nssm remove JSON_SCADA_demo_simul confirm
 
 nssm remove JSON_SCADA_nginx confirm
 nssm remove JSON_SCADA_php confirm
@@ -31,3 +46,5 @@ nssm remove JSON_SCADA_dnp3client confirm
 nssm remove JSON_SCADA_i104m confirm
 nssm remove JSON_SCADA_plctags confirm
 
+PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& {Start-Process PowerShell -ArgumentList '-NoProfile -ExecutionPolicy Bypass -File ""remove_jsonscada_services.ps1""' -Verb RunAs}"
+

platform-windows/remove_services.bat

@@ -4,8 +4,8 @@
 CREATE DATABASE "json_scada"
     WITH OWNER "postgres"
     ENCODING 'UTF8'
-    LC_COLLATE = 'en_US.UTF-8'
-    LC_CTYPE = 'en_US.UTF-8'
+    LC_COLLATE = 'en-US'
+    LC_CTYPE = 'en-US'
     TEMPLATE template0;
 
 \c json_scada