Merge pull request #240 from json-scada/master

Version 0.56-alpha

Author: riclolsen

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.55-alpha).
+- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.56-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.55-alpha)
+- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.56-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)

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.55-alpha).
+- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.56-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.55-alpha)
+- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.56-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)

platform-windows/json-scada.nsi

@@ -21,8 +21,8 @@ RequestExecutionLevel admin
 
 ;--------------------------------
 
-!define VERSION "v.0.55"
-!define VERSION_ "0.55.0.0"
+!define VERSION "v.0.56"
+!define VERSION_ "0.56.0.0"
 
 Function .onInit
  System::Call 'keexrnel32::CreateMutexA(p0, i1, t "MutexJsonScadaInstall")?e'
@@ -277,8 +277,8 @@ SetRegView 64
   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'
+  ; WMIC was previously installed for postgresql injection batch files but WMIC is deprecated.
+  ; We use PowerShell helpers (shipped with the installer) instead of WMIC. No DISM install attempted.
   Sleep 1000
 
   SetOutPath $INSTDIR\platform-windows\nodejs-runtime
@@ -799,20 +799,10 @@ Section "Uninstall"
   ExecWait '"$0" /C "$INSTDIR\platform-windows\postgresql-stop.bat"'
   ExecWait '"$0" /C "$INSTDIR\platform-windows\stop_services.bat"'
   Sleep 5000
-  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\\jdk-runtime\\bin\\%'" CALL TERMINATE`
-  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\\sql\\%'" CALL TERMINATE`
+  ; Replaced WMIC calls with a PowerShell helper script that uses Get-CimInstance/Invoke-CimMethod
+  ; The installer will call remove_services.bat which in turn invokes
+  ; kill_processes_by_pattern.ps1 to find and terminate processes by commandline pattern.
+  ; This avoids using the deprecated WMIC tool.
   Sleep 5000
   ExecWait '"$0" /C "$INSTDIR\platform-windows\remove_services.bat"'
   Sleep 5000

platform-windows/kill_processes_by_pattern.ps1

@@ -0,0 +1,31 @@
+param(
+    [Parameter(Mandatory=$true)]
+    [string[]]$Patterns
+)
+
+# For each pattern, find processes where CommandLine contains the pattern, then terminate them.
+# Uses CIM (Get-CimInstance) instead of WMIC. Works on PowerShell 5.1 and later.
+
+$errors = @()
+foreach ($p in $Patterns) {
+    try {
+        # Escape single quotes in pattern for WQL-like contains by using simple substring match in PowerShell
+        $pat = $p
+        $matches = Get-CimInstance Win32_Process | Where-Object { $_.CommandLine -and ($_.CommandLine -like "*$pat*") }
+        foreach ($proc in $matches) {
+            try {
+                Write-Host "Terminating pid=$($proc.ProcessId) cmdline='$($proc.CommandLine)'"
+                $rc = $proc | Invoke-CimMethod -MethodName Terminate
+                if ($rc.ReturnValue -ne 0) { Write-Warning "Terminate returned $($rc.ReturnValue) for pid $($proc.ProcessId)" }
+            } catch {
+                Write-Warning "Failed to terminate pid $($proc.ProcessId): $_"
+                $errors += $_
+            }
+        }
+    } catch {
+        Write-Warning "Error querying processes for pattern '$p': $_"
+        $errors += $_
+    }
+}
+
+if ($errors.Count -gt 0) { exit 2 } else { exit 0 }

platform-windows/release_notes.txt

@@ -135,6 +135,33 @@ Inkscape+SAGE:
 
 -------------------------------------------------------------------
 
+Notes for version 0.56:
+
+* Removed Windows WMIC command dependencies.
+* MongoDB Community Server updated to 8.2.1.
+* MongoDB Compass updated to 1.47.1.
+* Grafana updated to 12.2.0.
+* NPM packages updated.
+
+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: [email protected] password=jsonscada123.
+
+Requirements and recommendations:
+
+* Windows 10/11 64 bits or Server >=2019, Windows PowerShell. At least 12GB RAM and 30GB of free space in the "C:" drive.
+* MongoDB requires AVX instructions on x86 CPU. Use a modern x86 CPU with 6 cores or more.
+* 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, 443, 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.
+
+-------------------------------------------------------------------
+
 Notes for version 0.55:
 
 * NPM and Go packages updated.

platform-windows/remove_services.bat

@@ -9,17 +9,10 @@ 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\\telegraf-runtime\\%'" CALL TERMINATE
-wmic PROCESS WHERE "COMMANDLINE LIKE '%..\\platform-windows\\%'" CALL TERMINATE
-wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\bin\\%'" CALL TERMINATE
+REM Use PowerShell to terminate processes matching common JSON-SCADA paths.
+REM WMIC is deprecated; using Get-CimInstance + Invoke-CimMethod for termination.
+powershell -NoProfile -ExecutionPolicy Bypass -Command "& '%~dp0kill_processes_by_pattern.ps1' \
+	-Patterns 'c:\\\\json-scada\\\\sql\\\\','c:\\\\json-scada\\\\platform-windows\\\\grafana-runtime\\\\bin\\\\','c:\\\\json-scada\\\\platform-windows\\\\nginx_php-runtime\\\\php\\\\','c:\\\\json-scada\\\\platform-windows\\\\nginx_php-runtime\\\\','c:\\\\json-scada\\\\platform-windows\\\\nodejs-runtime\\\\','c:\\\\json-scada\\\\platform-windows\\\\browser-runtime\\\\','c:\\\\json-scada\\\\platform-windows\\\\mongodb-runtime\\\\','c:\\\\json-scada\\\\platform-windows\\\\inkscape-runtime\\\\','c:\\\\json-scada\\\\platform-windows\\\\telegraf-runtime\\\\','..\\\\platform-windows\\\\','c:\\\\json-scada\\\\bin\\\\'"
 
 rem Remove service without confimation
 

sql/process_pg_hist.bat

@@ -1,9 +1,8 @@
 @ECHO OFF
 
 rem look for process already running, if found get out
-wmic process get commandline |find /I "process_pg_hist.bat"   |find /C /I "cmd" |find /I "2"
-
-if %ERRORLEVEL% EQU 0 GOTO END
+rem Get-Process -Name cmd | Where-Object {$_.CommandLine -like '*process_pg_hist.bat*'} | Measure-Object | Select-Object -ExpandProperty Count
+rem if %ERRORLEVEL% EQU 0 GOTO END
 
 rem cd \json-scada\sql
 

sql/process_pg_rtdata.bat

@@ -1,9 +1,8 @@
 @ECHO OFF
 
 rem look for process already running, if found get out
-wmic process get commandline |find /I "process_pg_rtdata.bat" |find /C /I "cmd" |find /I "2"
-
-if %ERRORLEVEL% EQU 0 GOTO END
+rem Get-Process -Name cmd | Where-Object {$_.CommandLine -like '*process_pg_rtdata.bat*'} | Measure-Object | Select-Object -ExpandProperty Count
+rem if %ERRORLEVEL% EQU 0 GOTO END
 
 rem cd \json-scada\sql
 

sql/terminate_pg_hist.bat

@@ -4,7 +4,7 @@ rem obtain pid from process, then kill it
 
 set _pid=0
 
-FOR /f "tokens=3 delims=," %%G IN (' wmic process get commandline^,processid /FORMAT:csv ^|find /I "process_pg_hist.bat" ^|find /I "cmd" ^|find /V "find" ^|find /V "%~n0"') DO (
+FOR /F "tokens=2 delims= " %%G IN ('tasklist /V /FI "IMAGENAME eq cmd.exe" /NH /FO TABLE ^| findstr /I "process_pg_hist.bat" ^| findstr /V /I "terminate_pg_hist.bat"') DO (
 IF %_pid% EQU 0 ( 
   SET _pid=%%G 
   GOTO BRK 

sql/terminate_pg_rtdata.bat

@@ -4,7 +4,7 @@ rem obtain pid from process, then kill it
 
 set _pid=0
 
-FOR /f "tokens=3 delims=," %%G IN (' wmic process get commandline^,processid /FORMAT:csv ^|find /I "process_pg_rtdata.bat" ^|find /I "cmd" ^|find /V "find" ^|find /V "%~n0"') DO (
+FOR /F "tokens=2 delims= " %%G IN ('tasklist /V /FI "IMAGENAME eq cmd.exe" /NH /FO TABLE ^| findstr /I "process_pg_rtdata.bat" ^| findstr /V /I "terminate_pg_rtdata.bat"') DO (
 IF %_pid% EQU 0 ( 
   SET _pid=%%G 
   GOTO BRK