From 4656afd84f3485969cb298612dfc18dced37f9aa Mon Sep 17 00:00:00 2001
From: deffcolony <61471128+deffcolony@users.noreply.github.com>
Date: Tue, 6 Aug 2024 16:11:45 +0200
Subject: [PATCH] launcher upgrades

+added powershell version checker
+added verification if user really want to exit launcher
---
 Launcher.bat                                  |  8 ++++++--
 bin/functions/Home/exit_stl.bat               | 20 +++++++++++--------
 .../Troubleshooting/fetch_st_version.js       |  7 +++++++
 3 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 bin/functions/Toolbox/Troubleshooting/fetch_st_version.js

diff --git a/Launcher.bat b/Launcher.bat
index abb5bab..85eec36 100644
--- a/Launcher.bat
+++ b/Launcher.bat
@@ -3969,12 +3969,16 @@ del "%log_dir%\port_8000_status.txt"
 REM Get the current Git branch
 for /f %%i in ('git branch --show-current') do set current_branch=%%i
 
+REM Get the current PowerShell version
+for /f "tokens=*" %%i in ('powershell -command "[string]::Join('.', $PSVersionTable.PSVersion.Major, $PSVersionTable.PSVersion.Minor, $PSVersionTable.PSVersion.Build, $PSVersionTable.PSVersion.Revision)"') do set ps_version=%%i
+
 echo %yellow_fg_strong% ______________________________________________________________%reset%
 echo %yellow_fg_strong%^| Version ^& Compatibility Status:                              ^|%reset%
-echo    SillyTavern - Branch: %cyan_fg_strong%!current_branch! %reset%^| Status: %cyan_fg_strong%!update_status_st!%reset%
-echo    STL Version: %cyan_fg_strong%!stl_version!%reset%
+echo    SillyTavern Branch: %cyan_fg_strong%!current_branch! %reset%^| Status: %cyan_fg_strong%!update_status_st!%reset%
+echo    STL: %cyan_fg_strong%!stl_version!%reset%
 echo    !gpuInfo!
 echo    Node.js: %cyan_fg_strong%!node_version!%reset%
+echo    PowerShell: %cyan_fg_strong%!ps_version!%reset%
 echo    !vpnStatus!
 echo    !portStatus!
 
diff --git a/bin/functions/Home/exit_stl.bat b/bin/functions/Home/exit_stl.bat
index 3146ffa..693db27 100644
--- a/bin/functions/Home/exit_stl.bat
+++ b/bin/functions/Home/exit_stl.bat
@@ -1,10 +1,14 @@
 @echo off
 
-:exit
-echo %red_bg%[%time%]%reset% %red_fg_strong%Terminating all started processes...%reset%
-for /f %%a in ('type "%log_dir%\pids.txt"') do (
-    taskkill /F /PID %%a
-)
-del "%log_dir%\pids.txt"
-exit
-
+set /p "exit_choice=Are you sure you wanna exit SillyTavern-Launcher? [Y/N]: "
+if /i "%exit_choice%"=="" set exit_choice=Y
+if /i "%exit_choice%"=="Y" (
+    echo %red_bg%[%time%]%reset% %red_fg_strong%Terminating all PID processes...%reset%
+    for /f %%a in ('type "%log_dir%\pids.txt"') do (
+        taskkill /F /PID %%a
+    )
+    del "%log_dir%\pids.txt"
+    exit
+) else (
+    goto :home
+)
\ No newline at end of file
diff --git a/bin/functions/Toolbox/Troubleshooting/fetch_st_version.js b/bin/functions/Toolbox/Troubleshooting/fetch_st_version.js
new file mode 100644
index 0000000..69e6501
--- /dev/null
+++ b/bin/functions/Toolbox/Troubleshooting/fetch_st_version.js
@@ -0,0 +1,7 @@
+const { getVersion } = require('./util.js');
+
+getVersion().then(version => {
+    console.log(JSON.stringify(version));
+}).catch(err => {
+    console.error('Error getting version:', err);
+});