FIX: Fix some bug

frontend/bindings/firefly-launcher/internal/fs-service/fsservice.js

@@ -80,7 +80,7 @@ export function RemoveFile(path) {
 
 /**
  * @param {string} path
- * @returns {$CancellablePromise<boolean>}
+ * @returns {$CancellablePromise<[boolean, string]>}
  */
 export function StartApp(path) {
     return $Call.ByID(1267568402, path);
@@ -88,7 +88,7 @@ export function StartApp(path) {
 
 /**
  * @param {string} path
- * @returns {$CancellablePromise<boolean>}
+ * @returns {$CancellablePromise<[boolean, string]>}
  */
 export function StartWithConsole(path) {
     return $Call.ByID(3249271428, path);

frontend/bindings/firefly-launcher/internal/git-service/gitservice.js

@@ -43,13 +43,6 @@ export function GetLatestServerVersion() {
     return $Call.ByID(2918980975);
 }
 
-/**
- * @returns {$CancellablePromise<void>}
- */
-export function UnzipProxy() {
-    return $Call.ByID(2563246729);
-}
-
 /**
  * @returns {$CancellablePromise<void>}
  */

frontend/bindings/github.com/wailsapp/wails/v3/internal/eventcreate.js

@@ -0,0 +1,9 @@
+//@ts-check
+// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
+// This file is automatically generated. DO NOT EDIT
+
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore: Unused imports
+import { Create as $Create } from "@wailsio/runtime";
+
+Object.freeze($Create.Events);

frontend/bindings/github.com/wailsapp/wails/v3/internal/eventdata.d.ts

@@ -0,0 +1,2 @@
+// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
+// This file is automatically generated. DO NOT EDIT

frontend/src/helper/proxy.ts

@@ -23,11 +23,9 @@ export async function UpdateProxy(proxyVersion: string) : Promise<void> {
     setDownloadType("Downloading proxy...")
     const [ok, error] = await GitService.DownloadProxyProgress(proxyVersion)
     if (ok) {
-        setDownloadType("Unzipping proxy...")
-        GitService.UnzipProxy()
         setDownloadType("Download proxy successfully")
         setProxyVersion(proxyVersion)
-        setProxyPath("./proxy/FireflyProxy.exe")
+        setProxyPath("./proxy/firefly-go-proxy.exe")
     } else {
         toast.error(error)
         setDownloadType("Download proxy failed")

frontend/src/pages/launcher/index.tsx

@@ -178,8 +178,6 @@ export default function LauncherPage() {
         }
     }
 
-
-
     const handleStartGame = async () => {
         if (!gamePath) {
             return
@@ -190,18 +188,18 @@ export default function LauncherPage() {
         try {
             setIsLoading(true)
             if (!proxyRunning && !gamePath.endsWith("launcher.exe")) {
-                const resultProxy = await FSService.StartWithConsole(proxyPath)
+                const [resultProxy, error] = await FSService.StartWithConsole(proxyPath)
                 if (!resultProxy) {
-                    toast.error('Failed to start proxy')
+                    toast.error('Failed to start proxy: ' + error)
                     return
                 }
                 setProxyRunning(true)
             }
             await sleep(500)
             if (!serverRunning) {
-                const resultServer = await FSService.StartWithConsole(serverPath)
+                const [resultServer, error] = await FSService.StartWithConsole(serverPath)
                 if (!resultServer) {
-                    toast.error('Failed to start server')
+                    toast.error('Failed to start server: ' + error)
                     return
                 }
                 setServerRunning(true)
@@ -209,23 +207,27 @@ export default function LauncherPage() {
             await sleep(1000)
             const gameFolder = await FSService.GetDir(gamePath)
             const fileNeedRemove = await FSService.Join(gameFolder, "StarRail_Data", "Plugins", "x86_64", "AccountPlatNative.dll")
+            const fileExists = await FSService.FileExists(fileNeedRemove)
+            if (fileExists) {
                 await FSService.RemoveFile(fileNeedRemove)
+            }
             if (gamePath.endsWith("launcher.exe")) {
-                const resultGame = await FSService.StartWithConsole(gamePath)
+                const [resultGame, error] = await FSService.StartWithConsole(gamePath)
                 if (!resultGame) {
-                    toast.error('Failed to start game')
+                    toast.error('Failed to start game: ' + error)
                     return
                 }
             } else {
-                const resultGame = await FSService.StartApp(gamePath)
+                const [resultGame, error] = await FSService.StartApp(gamePath)
                 if (!resultGame) {
-                    toast.error('Failed to start game')
+                    toast.error('Failed to start game: ' + error)
                     return
                 }
             }
             setGameRunning(true)
 
         } catch (err: any) {
+            console.log(err)
             toast.error('StartGame error:', err)
         } finally {
             setIsLoading(false)

go.mod

@@ -1,6 +1,6 @@
 module firefly-launcher
 
-go 1.25
+go 1.25.5
 
 require (
 	github.com/klauspost/compress v1.18.0

internal/fs-service/fs.go

@@ -2,12 +2,12 @@ package fsService
 
 import (
 	"firefly-launcher/pkg/sevenzip"
-	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strings"
+
 	"github.com/wailsapp/wails/v3/pkg/application"
 	"golang.org/x/sys/windows"
 )
@@ -75,13 +75,13 @@ func (f *FSService) RemoveFile(path string) error {
 	return os.Remove(path)
 }
 
-
-func (f *FSService) StartApp(path string) (bool, error) {
+func (f *FSService) StartApp(path string) (bool, string) {
 	cmd := exec.Command(path)
 	err := cmd.Start()
 	if err != nil {
-		return false, err
+		return false, err.Error()
 	}
+
 	if strings.HasSuffix(path, "StarRail.exe") {
 		go func() {
 			_ = cmd.Wait()
@@ -89,17 +89,17 @@ func (f *FSService) StartApp(path string) (bool, error) {
 		}()
 	}
 
-	return true, nil
+	return true, ""
 }
 
-func (f *FSService) StartWithConsole(path string) (bool, error) {
+func (f *FSService) StartWithConsole(path string) (bool, string) {
 	absPath, err := filepath.Abs(path)
 	if err != nil {
-		return false, err
+		return false, err.Error()
 	}
 
 	if _, err := os.Stat(absPath); os.IsNotExist(err) {
-		return false, fmt.Errorf("file not found: %s", absPath)
+		return false, "file not found: " + absPath
 	}
 	cmd := exec.Command(absPath)
 	cmd.Dir = filepath.Dir(absPath)
@@ -116,7 +116,7 @@ func (f *FSService) StartWithConsole(path string) (bool, error) {
 	err = cmd.Start()
 
 	if err != nil {
-		return false, err
+		return false, err.Error()
 	}
 
 	go func() {
@@ -125,11 +125,11 @@ func (f *FSService) StartWithConsole(path string) (bool, error) {
 			application.Get().Event.Emit("game:exit")
 		} else if strings.HasSuffix(path, "firefly-go_win.exe") {
 			application.Get().Event.Emit("server:exit")
-		} else if strings.HasSuffix(path, "FireflyProxy.exe") {
+		} else if strings.HasSuffix(path, "firefly-go-proxy.exe") {
 			application.Get().Event.Emit("proxy:exit")
 		}
 	}()
-	return true, nil
+	return true, ""
 }
 
 func (f *FSService) OpenFolder(path string) (bool, string) {
@@ -155,4 +155,3 @@ func (f *FSService) FileExistsInZip(archivePath, fileInside string) (bool, strin
 	}
 	return exists, ""
 }
-

internal/git-service/proxy.go

@@ -37,7 +37,7 @@ func (g *GitService) GetLatestProxyVersion() (bool, string, string) {
 }
 
 func (g *GitService) DownloadProxyProgress(version string) (bool, string) {
-	asset, ok := g.getReleaseAsset(version, constant.ProxyGitUrl, constant.ProxyZipFile)
+	asset, ok := g.getReleaseAsset(version, constant.ProxyGitUrl, constant.ProxyFile)
 	if !ok {
 		return false, "no release found"
 	}
@@ -65,7 +65,3 @@ func (g *GitService) DownloadProxyProgress(version string) (bool, string) {
 	return false, "failed to rename tmp file after retries"
 }
 
-func (g *GitService) UnzipProxy() {
-	g.unzipParallel(filepath.Join(constant.ProxyStorageUrl, constant.ProxyZipFile), constant.ProxyStorageUrl)
-	os.Remove(filepath.Join(constant.ProxyStorageUrl, constant.ProxyZipFile))
-}

main.go

@@ -117,8 +117,6 @@ func main() {
 
 	systemTray.SetMenu(menu)
 	
-
-
 	window.RegisterHook(events.Common.WindowClosing, func(e *application.WindowEvent) {
 		app.Event.Emit("window:close")
 		e.Cancel()

pkg/constant/constant.go

@@ -1,16 +1,16 @@
 package constant
 
-const ProxyGitUrl = "https://git.kain.io.vn/api/v1/repos/Firefly-Shelter/Firefly_Proxy/releases"
+const ProxyGitUrl = "https://git.kain.io.vn/api/v1/repos/Firefly-Shelter/FireflyGo_Proxy/releases"
 const ServerGitUrl = "https://git.kain.io.vn/api/v1/repos/Firefly-Shelter/FireflyGo_Local_Archive/releases"
 const LauncherGitUrl = "https://git.kain.io.vn/api/v1/repos/Firefly-Shelter/Firefly_Launcher/releases"
 const ServerStorageUrl = "./server"
 const ProxyStorageUrl = "./proxy"
 const ServerZipFile = "prebuild_win_x86.zip"
-const ProxyZipFile = "64bit.zip"
+const ProxyFile = "firefly-go-proxy.exe"
 const LauncherFile = "firefly-launcher.exe"
 const TempUrl = "./temp"
 
-const CurrentLauncherVersion = "2.3.0"
+const CurrentLauncherVersion = "2.3.3"
 
 type ToolFile string