From 803feb116e397ec5a45b096ddf2b8e0639b4142c Mon Sep 17 00:00:00 2001
From: SpikeHD <spikegdofficial@gmail.com>
Date: Tue, 19 Apr 2022 21:55:25 -0700
Subject: [PATCH] get genshin exe regardless of name

---
 .tmp/auth_info.json       |  1 -
 private_server_launch.cmd |  4 ++--
 resources/js/index.js     | 15 +++++++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)
 delete mode 100644 .tmp/auth_info.json

diff --git a/.tmp/auth_info.json b/.tmp/auth_info.json
deleted file mode 100644
index 00ed18e..0000000
--- a/.tmp/auth_info.json
+++ /dev/null
@@ -1 +0,0 @@
-{"accessToken":"5MwsrKLchb8OnvKTd7b00-wJDz6E-6MQbmre-TC7jiEs6mJs","port":57800}
\ No newline at end of file
diff --git a/private_server_launch.cmd b/private_server_launch.cmd
index 5cbf1a2..ba43032 100644
--- a/private_server_launch.cmd
+++ b/private_server_launch.cmd
@@ -18,10 +18,10 @@ reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Internet Settings" /v Pr
 :: Start proxy server
 start "Proxy Server" ./ext/mitmdump.exe -s "./proxy/proxy.py" --ssl-insecure --set ip=%ip%
 
-echo Opening %gamePath%/Genshin Impact Game/GenshinImpact.exe
+echo Opening %gamePath%
 
 :: Launch game
-"%gamePath%/Genshin Impact Game/GenshinImpact.exe"
+"%gamePath%"
 
 :: On exit clean proxy stuff
 :EXIT
diff --git a/resources/js/index.js b/resources/js/index.js
index e0f2f2e..e3cdef4 100644
--- a/resources/js/index.js
+++ b/resources/js/index.js
@@ -75,10 +75,21 @@ async function setGenshinImpactFolder() {
   setBackgroundImage()
 }
 
+async function getGenshinExecName() {
+  // Scan genshin dir
+  const config = await getCfg()
+  const genshinDir = await Neutralino.filesystem.readDirectory(config.genshinImpactFolder + '/Genshin Impact Game')
+
+  // Find the executable
+  const genshinExec = genshinDir.find(file => file.entry.endsWith('.exe'))
+
+  return genshinExec.entry
+}
+
 async function launchOfficial() {
   const config = await getCfg()
 
-  Neutralino.os.execCommand(config.genshinImpactFolder + '/Genshin Impact Game/GenshinImpact.exe')
+  Neutralino.os.execCommand(config.genshinImpactFolder + '/Genshin Impact Game/' + await getGenshinExecName())
 }
 
 async function launchPrivate() {
@@ -89,5 +100,5 @@ async function launchPrivate() {
   console.log('connecting to ' + ip)
   
   // Pass IP and game folder to the private server launcher
-  Neutralino.os.execCommand(`${NL_CWD}/private_server_launch.cmd ${ip} "${config.genshinImpactFolder}"`).catch(e => console.log(e))
+  Neutralino.os.execCommand(`${NL_CWD}/private_server_launch.cmd ${ip} "${config.genshinImpactFolder}/Genshin Impact Game/${await getGenshinExecName()}"`).catch(e => console.log(e))
 }
\ No newline at end of file