FIX: Fix bug version parse

frontend/bindings/firefly-launcher/internal/app-service/appservice.js

@@ -4,21 +4,19 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "@wailsio/runtime";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "@wailsio/runtime";
 
 /**
  * @param {number} timeout
- * @returns {Promise<[boolean, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string]>}
  */
 export function CloseAppAfterTimeout(timeout) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1705931481, timeout));
+    return $Call.ByID(1705931481, timeout);
-    return $resultPromise;
 }
 
 /**
- * @returns {Promise<[boolean, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string]>}
  */
 export function GetCurrentLauncherVersion() {
-    let $resultPromise = /** @type {any} */($Call.ByID(3575133982));
+    return $Call.ByID(3575133982);
-    return $resultPromise;
 }

frontend/bindings/firefly-launcher/internal/diff-service/diffservice.js

@@ -4,70 +4,62 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "@wailsio/runtime";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "@wailsio/runtime";
 
 /**
  * @param {string} patchPath
- * @returns {Promise<[boolean, string, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string, string]>}
  */
 export function CheckTypeHDiff(patchPath) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3717449114, patchPath));
+    return $Call.ByID(3717449114, patchPath);
-    return $resultPromise;
 }
 
 /**
  * @param {string} gamePath
- * @returns {Promise<[boolean, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string]>}
  */
 export function CutData(gamePath) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2019290107, gamePath));
+    return $Call.ByID(2019290107, gamePath);
-    return $resultPromise;
 }
 
 /**
  * @param {string} gamePath
  * @param {string} patchPath
- * @param {boolean} isSkipVerify
+ * @returns {$CancellablePromise<[boolean, string]>}
- * @returns {Promise<[boolean, string]> & { cancel(): void }}
  */
-export function DataExtract(gamePath, patchPath, isSkipVerify) {
+export function DataExtract(gamePath, patchPath) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2161622254, gamePath, patchPath, isSkipVerify));
+    return $Call.ByID(2161622254, gamePath, patchPath);
-    return $resultPromise;
 }
 
 /**
  * @param {string} gamePath
- * @returns {Promise<[boolean, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string]>}
  */
 export function DeleteFiles(gamePath) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1103091613, gamePath));
+    return $Call.ByID(1103091613, gamePath);
-    return $resultPromise;
 }
 
 /**
  * @param {string} gamePath
- * @returns {Promise<[boolean, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string]>}
  */
 export function HDiffPatchData(gamePath) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3944051994, gamePath));
+    return $Call.ByID(3944051994, gamePath);
-    return $resultPromise;
 }
 
 /**
  * @param {string} gamePath
- * @returns {Promise<[boolean, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string]>}
  */
 export function LDiffPatchData(gamePath) {
-    let $resultPromise = /** @type {any} */($Call.ByID(360123238, gamePath));
+    return $Call.ByID(360123238, gamePath);
-    return $resultPromise;
 }
 
 /**
  * @param {string} gamePath
  * @param {string} patchPath
- * @returns {Promise<[boolean, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string]>}
  */
 export function VersionValidate(gamePath, patchPath) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2105077257, gamePath, patchPath));
+    return $Call.ByID(2105077257, gamePath, patchPath);
-    return $resultPromise;
 }

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

@@ -4,76 +4,68 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "@wailsio/runtime";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "@wailsio/runtime";
 
 /**
  * @param {string} path
- * @returns {Promise<boolean> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean>}
  */
 export function DirExists(path) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1772289644, path));
+    return $Call.ByID(1772289644, path);
-    return $resultPromise;
 }
 
 /**
  * @param {string} path
- * @returns {Promise<boolean> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean>}
  */
 export function FileExists(path) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1782610747, path));
+    return $Call.ByID(1782610747, path);
-    return $resultPromise;
 }
 
 /**
  * @param {string} archivePath
  * @param {string} fileInside
- * @returns {Promise<[boolean, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string]>}
  */
 export function FileExistsInZip(archivePath, fileInside) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2509699047, archivePath, fileInside));
+    return $Call.ByID(2509699047, archivePath, fileInside);
-    return $resultPromise;
 }
 
 /**
  * @param {string} path
- * @returns {Promise<[boolean, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string]>}
  */
 export function OpenFolder(path) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1635714001, path));
+    return $Call.ByID(1635714001, path);
-    return $resultPromise;
 }
 
 /**
  * @param {string} filter
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function PickFile(filter) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3756474934, filter));
+    return $Call.ByID(3756474934, filter);
-    return $resultPromise;
 }
 
 /**
- * @returns {Promise<string> & { cancel(): void }}
+ * @returns {$CancellablePromise<string>}
  */
 export function PickFolder() {
-    let $resultPromise = /** @type {any} */($Call.ByID(3654471460));
+    return $Call.ByID(3654471460);
-    return $resultPromise;
 }
 
 /**
  * @param {string} path
- * @returns {Promise<boolean> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean>}
  */
 export function StartApp(path) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1267568402, path));
+    return $Call.ByID(1267568402, path);
-    return $resultPromise;
 }
 
 /**
  * @param {string} path
- * @returns {Promise<boolean> & { cancel(): void }}
+ * @returns {$CancellablePromise<boolean>}
  */
 export function StartWithConsole(path) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3249271428, path));
+    return $Call.ByID(3249271428, path);
-    return $resultPromise;
 }

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

@@ -4,71 +4,63 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "@wailsio/runtime";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "@wailsio/runtime";
 
 /**
  * @param {string} version
- * @returns {Promise<[boolean, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string]>}
  */
 export function DownloadProxyProgress(version) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3559275334, version));
+    return $Call.ByID(3559275334, version);
-    return $resultPromise;
 }
 
 /**
  * @param {string} version
- * @returns {Promise<[boolean, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string]>}
  */
 export function DownloadServerProgress(version) {
-    let $resultPromise = /** @type {any} */($Call.ByID(1954767259, version));
+    return $Call.ByID(1954767259, version);
-    return $resultPromise;
 }
 
 /**
- * @returns {Promise<[boolean, string, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string, string]>}
  */
 export function GetLatestLauncherVersion() {
-    let $resultPromise = /** @type {any} */($Call.ByID(262637602));
+    return $Call.ByID(262637602);
-    return $resultPromise;
 }
 
 /**
- * @returns {Promise<[boolean, string, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string, string]>}
  */
 export function GetLatestProxyVersion() {
-    let $resultPromise = /** @type {any} */($Call.ByID(289488362));
+    return $Call.ByID(289488362);
-    return $resultPromise;
 }
 
 /**
- * @returns {Promise<[boolean, string, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string, string]>}
  */
 export function GetLatestServerVersion() {
-    let $resultPromise = /** @type {any} */($Call.ByID(2918980975));
+    return $Call.ByID(2918980975);
-    return $resultPromise;
 }
 
 /**
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function UnzipProxy() {
-    let $resultPromise = /** @type {any} */($Call.ByID(2563246729));
+    return $Call.ByID(2563246729);
-    return $resultPromise;
 }
 
 /**
- * @returns {Promise<void> & { cancel(): void }}
+ * @returns {$CancellablePromise<void>}
  */
 export function UnzipServer() {
-    let $resultPromise = /** @type {any} */($Call.ByID(1126363284));
+    return $Call.ByID(1126363284);
-    return $resultPromise;
 }
 
 /**
  * @param {string} version
- * @returns {Promise<[boolean, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string]>}
  */
 export function UpdateLauncherProgress(version) {
-    let $resultPromise = /** @type {any} */($Call.ByID(97272861, version));
+    return $Call.ByID(97272861, version);
-    return $resultPromise;
 }

frontend/bindings/firefly-launcher/internal/language-service/languageservice.js

@@ -4,24 +4,22 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
-import {Call as $Call, Create as $Create} from "@wailsio/runtime";
+import { Call as $Call, CancellablePromise as $CancellablePromise, Create as $Create } from "@wailsio/runtime";
 
 /**
  * @param {string} path
- * @returns {Promise<[boolean, string, string, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string, string, string]>}
  */
 export function GetLanguage(path) {
-    let $resultPromise = /** @type {any} */($Call.ByID(3574191687, path));
+    return $Call.ByID(3574191687, path);
-    return $resultPromise;
 }
 
 /**
  * @param {string} path
  * @param {string} text
  * @param {string} voice
- * @returns {Promise<[boolean, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string]>}
  */
 export function SetLanguage(path, text, voice) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2768939795, path, text, voice));
+    return $Call.ByID(2768939795, path, text, voice);
-    return $resultPromise;
 }

frontend/src/pages/diff/index.tsx

@@ -103,90 +103,79 @@ export default function DiffPage() {
     }
 
     const handleUpdateGame = async () => {
+        const handleResult = (ok: boolean, error: string) => {
+            if (!ok) {
+                toast.error(error)
+                return false
+            }
+            return true
+        }
+    
         try {
             setIsDiffLoading(true)
+    
             if (!gameDir || !diffDir) {
                 toast.error('Please select game directory and diff file')
-                setIsDiffLoading(false)
                 return
             }
+    
             setStageType('Check Type HDiff')
             setProgressUpdate(0)
             setMaxProgressUpdate(1)
+    
             const [isOk, validType, errorType] = await DiffService.CheckTypeHDiff(diffDir)
-            if (!isOk) {
+            if (!handleResult(isOk, errorType)) return
-                toast.error(errorType)
-                setIsDiffLoading(false)
-                return
-            }
             setProgressUpdate(1)
     
-            if (validType === 'hdiffmap.json') {
+            if (['hdiffmap.json', 'hdifffiles.txt', 'hdifffiles.json'].includes(validType)) {
                 setStageType('Version Validate')
                 setProgressUpdate(0)
                 setMaxProgressUpdate(1)
                 const [validVersion, errorVersion] = await DiffService.VersionValidate(gameDir, diffDir)
-                if (!validVersion) {
+                if (!handleResult(validVersion, errorVersion)) return
-                    toast.error(errorVersion)
-                    setIsDiffLoading(false)
-                    return
-                }
                 setProgressUpdate(1)
             }
 
-            const isSkipVerify = validType === 'manifest' || validType === 'hdifffiles.txt'
             setStageType('Data Extract')
-            const [validData, errorData] = await DiffService.DataExtract(gameDir, diffDir, isSkipVerify)
+            const [validData, errorData] = await DiffService.DataExtract(gameDir, diffDir)
-            if (!validData) {
+            if (!handleResult(validData, errorData)) return
-                toast.error(errorData)
-                setIsDiffLoading(false)
-                return
-            }
     
             setStageType('Cut Data')
             setMessageUpdate('')
             const [validCut, errorCut] = await DiffService.CutData(gameDir)
-            if (!validCut) {
+            if (!handleResult(validCut, errorCut)) return
-                toast.error(errorCut)
-                setIsDiffLoading(false)
-                return
-            }
     
-            if ( validType === 'hdifffiles.txt' || validType === 'hdiffmap.json') {
+            switch (validType) {
+                case 'hdifffiles.txt':
+                case 'hdiffmap.json':
+                case 'hdifffiles.json': {
                     setStageType('Patch Data')
                     const [validPatch, errorPatch] = await DiffService.HDiffPatchData(gameDir)
-                if (!validPatch) {
+                    if (!handleResult(validPatch, errorPatch)) return
-                    toast.error(errorPatch)
+    
-                    setIsDiffLoading(false)
-                    return
-                }
                     setStageType('Delete old files')
                     const [validDelete, errorDelete] = await DiffService.DeleteFiles(gameDir)
-                if (!validDelete) {
+                    if (!handleResult(validDelete, errorDelete)) return
-                    toast.error(errorDelete)
+                    break
-                    setIsDiffLoading(false)
-                    return
                 }
-            } else if (validType === 'manifest') {
+                case 'manifest': {
                     setStageType('Patch Data')
                     const [validPatch, errorPatch] = await DiffService.LDiffPatchData(gameDir)
-                if (!validPatch) {
+                    if (!handleResult(validPatch, errorPatch)) return
-                    toast.error(errorPatch)
+                    break
-                    setIsDiffLoading(false)
-                    return
                 }
             }
     
             toast.success('Update game completed')
         } catch (err: any) {
             console.error(err)
-            toast.error('PickFile error:', err)
+            toast.error(`PickFile error: ${err}`)
-            setIsDiffLoading(false)
         } finally {
             setIsDiffLoading(false)
         }
     }
     
+
     return (
         <div className="p-2 mx-4">
             <div className="max-w-4xl mx-auto">

internal/diff-service/hdiffz.go

@@ -7,6 +7,7 @@ import (
 	"firefly-launcher/pkg/hpatchz"
 	"firefly-launcher/pkg/models"
 	"firefly-launcher/pkg/sevenzip"
+	"firefly-launcher/pkg/verifier"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -21,6 +22,9 @@ func (h *DiffService) CheckTypeHDiff(patchPath string) (bool, string, string) {
 	if ok, err := sevenzip.IsFileIn7z(patchPath, "hdifffiles.txt"); err == nil && ok {
 		return true, "hdifffiles.txt", ""
 	}
+	if ok, err := sevenzip.IsFileIn7z(patchPath, "hdifffiles.txt"); err == nil && ok {
+		return true, "hdifffiles.json", ""
+	}
 	if ok, err := sevenzip.IsFileIn7z(patchPath, "hdiffmap.json"); err == nil && ok {
 		return true, "hdiffmap.json", ""
 	}
@@ -32,11 +36,10 @@ func (h *DiffService) CheckTypeHDiff(patchPath string) (bool, string, string) {
 }
 
 func (h *DiffService) VersionValidate(gamePath, patchPath string) (bool, string) {
-	oldVersionData, err := models.ParseBinaryVersion(filepath.Join(gamePath, "StarRail_Data\\StreamingAssets\\BinaryVersion.bytes"))
+	oldBinPath := filepath.Join(gamePath, "StarRail_Data\\StreamingAssets\\BinaryVersion.bytes")
-	if err != nil {
+	if _, err := os.Stat(oldBinPath); err != nil {
 		return false, err.Error()
 	}
-
 	if _, err := os.Stat(patchPath); err != nil {
 		return false, err.Error()
 	}
@@ -46,28 +49,104 @@ func (h *DiffService) VersionValidate(gamePath, patchPath string) (bool, string)
 			return false, err.Error()
 		}
 	}
+
+	okFull, errFull := sevenzip.IsFileIn7z(patchPath, "StarRail_Data\\StreamingAssets\\BinaryVersion.bytes")
+	okDiff, errDiff := sevenzip.IsFileIn7z(patchPath, "StarRail_Data\\StreamingAssets\\BinaryVersion.bytes.hdiff")
+
+	if (errFull != nil && errDiff != nil) || (!okFull && !okDiff) {
+		return false, "BinaryVersion file not found in patch"
+	}
+
+	var tempBinFile string
+
+	if okFull {
 		if err := sevenzip.ExtractAFileFromZip(patchPath, "StarRail_Data\\StreamingAssets\\BinaryVersion.bytes", constant.TempUrl); err != nil {
 			return false, err.Error()
 		}
-
+		tempBinFile = filepath.Join(constant.TempUrl, "BinaryVersion.bytes")
-	binPath := filepath.Join(constant.TempUrl, "BinaryVersion.bytes")
+	} else {
-	newVersionData, err := models.ParseBinaryVersion(binPath)
+		if err := sevenzip.ExtractAFileFromZip(patchPath, "StarRail_Data\\StreamingAssets\\BinaryVersion.bytes.hdiff", constant.TempUrl); err != nil {
-	if err != nil {
 			return false, err.Error()
 		}
-	defer os.Remove(binPath)
+		patchBinFile := filepath.Join(constant.TempUrl, "BinaryVersion.bytes.hdiff")
-
+		sourceBinFile := oldBinPath
-	v := newVersionData.Subtract(*oldVersionData)
+		tempBinFile = filepath.Join(constant.TempUrl, "BinaryVersion.bytes")
-	if v != 0 && v != 1 {
+		if err := hpatchz.ApplyPatch(sourceBinFile, patchBinFile, tempBinFile); err != nil {
-		return false, fmt.Sprintf("the diff version %s not valid with game version %s", newVersionData, oldVersionData)
+			os.Remove(patchBinFile)
+			return false, err.Error()
+		}
+		os.Remove(patchBinFile)
 	}
 
+	okFullPkg, err1 := sevenzip.IsFileIn7z(patchPath, "pkg_version")
+	okDiffPkg, err2 := sevenzip.IsFileIn7z(patchPath, "pkg_version.hdiff")
+	if err1 != nil && err2 != nil {
+		return false, err1.Error()
+	}
+	if okFullPkg {
+		if err := sevenzip.ExtractAFileFromZip(patchPath, "pkg_version", constant.TempUrl); err != nil {
+			return false, err.Error()
+		}
+	}
+	if okDiffPkg {
+		if err := sevenzip.ExtractAFileFromZip(patchPath, "pkg_version.hdiff", constant.TempUrl); err != nil {
+			return false, err.Error()
+		}
+		patchPkgFile := filepath.Join(constant.TempUrl, "pkg_version.hdiff")
+		sourcePkgFile := filepath.Join(gamePath, "pkg_version")
+		tempPkgFile := filepath.Join(constant.TempUrl, "pkg_version")
+		if err := hpatchz.ApplyPatch(sourcePkgFile, patchPkgFile, tempPkgFile); err != nil {
+			os.Remove(patchPkgFile)
+			os.Remove(tempPkgFile)
+			return false, err.Error()
+		}
+		os.Remove(patchPkgFile)
+	}
+
+	tempPkgFile := filepath.Join(constant.TempUrl, "pkg_version")
+	pkgDataList, err := models.LoadPkgVersion(tempPkgFile)
+	if err != nil {
+		os.Remove(tempPkgFile)
+		return false, err.Error()
+	}
+	os.Remove(tempPkgFile)
+
+	// MD5 check BinaryVersion
+	flags := false
+	for _, pkgData := range pkgDataList {
+		if filepath.ToSlash(pkgData.RemoteFile) == "StarRail_Data/StreamingAssets/BinaryVersion.bytes" {
+			flags = true
+			md5, err := verifier.FileMD5(tempBinFile)
+			if err != nil {
+				os.Remove(tempBinFile)
+				return false, err.Error()
+			}
+			if md5 != pkgData.MD5 {
+				os.Remove(tempBinFile)
+				return false, fmt.Sprintf("md5 mismatch for %s: expected %s, got %s",
+					tempBinFile, pkgData.MD5, md5)
+			}
+			break
+		}
+	}
+	if !flags {
+		os.Remove(tempBinFile)
+		return false, "BinaryVersion file not found in patch"
+	}
+	_, err = models.ParseBinaryVersion(tempBinFile)
+	if err != nil {
+		os.Remove(tempBinFile)
+		return false, err.Error()
+	}
+
+	os.Remove(tempBinFile)
 	return true, "validated"
 }
 
 func (h *DiffService) HDiffPatchData(gamePath string) (bool, string) {
 	hdiffMapPath := filepath.Join(gamePath, "hdiffmap.json")
 	hdiffFilesPath := filepath.Join(gamePath, "hdifffiles.txt")
+	hdifffilesJsonPath := filepath.Join(gamePath, "hdifffiles.json")
 
 	var jsonData struct {
 		DiffMap []*models.HDiffData `json:"diff_map"`
@@ -88,6 +167,14 @@ func (h *DiffService) HDiffPatchData(gamePath string) (bool, string) {
 		for _, entry := range jsonDataDiffMap.DiffMap {
 			jsonData.DiffMap = append(jsonData.DiffMap, entry.ToHDiffData())
 		}
+	} else if _, err := os.Stat(hdifffilesJsonPath); err == nil {
+		data, err := os.ReadFile(hdifffilesJsonPath)
+		if err != nil {
+			return false, err.Error()
+		}
+		if err := json.Unmarshal(data, &jsonData); err != nil {
+			return false, err.Error()
+		}
 	} else if _, err := os.Stat(hdiffFilesPath); err == nil {
 		files, err := models.LoadHDiffFiles(hdiffFilesPath)
 		if err != nil {
@@ -99,6 +186,7 @@ func (h *DiffService) HDiffPatchData(gamePath string) (bool, string) {
 	} else {
 		return false, "no hdiff entries map exist"
 	}
+
 	application.Get().Event.Emit("diff:stage", map[string]string{"stage": "Patching HDiff"})
 	for i, entry := range jsonData.DiffMap {
 		application.Get().Event.Emit(
@@ -134,6 +222,7 @@ func (h *DiffService) HDiffPatchData(gamePath string) (bool, string) {
 
 	os.Remove(filepath.Join(gamePath, "hdiffmap.json"))
 	os.Remove(filepath.Join(gamePath, "hdifffiles.txt"))
+	os.Remove(filepath.Join(gamePath, "hdifffiles.json"))
 	return true, "patching completed"
 }
 

internal/diff-service/utils.go

@@ -2,15 +2,15 @@ package diffService
 
 import (
 	"firefly-launcher/pkg/constant"
-	"firefly-launcher/pkg/verifier"
 	"firefly-launcher/pkg/sevenzip"
-	"github.com/wailsapp/wails/v3/pkg/application"
+	"io"
 	"os"
 	"path/filepath"
-	"io"
+
+	"github.com/wailsapp/wails/v3/pkg/application"
 )
 
-func (h *DiffService) DataExtract(gamePath, patchPath string, isSkipVerify bool) (bool, string) {
+func (h *DiffService) DataExtract(gamePath, patchPath string) (bool, string) {
 	os.RemoveAll(constant.TempUrl)
 	if _, err := os.Stat(gamePath); err != nil {
 		return false, err.Error()
@@ -30,20 +30,7 @@ func (h *DiffService) DataExtract(gamePath, patchPath string, isSkipVerify bool)
 		os.RemoveAll(constant.TempUrl)
 		return false, err.Error()
 	}
-
+	return true, "extract completed"
-	if !isSkipVerify {
-		validator, err := verifier.NewVerifier(gamePath, constant.TempUrl)
-		if err != nil {
-			os.RemoveAll(constant.TempUrl)
-			return false, err.Error()
-		}
-
-		if err := validator.VerifyAll(); err != nil {
-			os.RemoveAll(constant.TempUrl)
-			return false, err.Error()
-		}
-	}
-	return true, "validated"
 }
 
 func (h *DiffService) CutData(gamePath string) (bool, string) {

main.go

@@ -98,7 +98,6 @@ func main() {
 		DevToolsEnabled:  true,
 	})
 
-
 	err = app.Run()
 	if err != nil {
 		log.Fatal(err)

pkg/constant/constant.go

@@ -10,7 +10,7 @@ const ProxyZipFile = "64bit.zip"
 const LauncherFile = "firefly-launcher.exe"
 const TempUrl = "./temp"
 
-const CurrentLauncherVersion = "1.6.0"
+const CurrentLauncherVersion = "1.8.0"
 
 type ToolFile string
 
@@ -19,15 +19,13 @@ const (
 	Tool7zaDLL     ToolFile = "bin/7za.dll"
 	Tool7zxaDLL    ToolFile = "bin/7zxa.dll"
 	ToolHPatchzExe ToolFile = "bin/hpatchz.exe"
-	ToolHDiffzExe  ToolFile = "bin/hdiffz.exe"
 )
 
 var RequiredFiles = map[ToolFile]string{
-	Tool7zaExe:     "assets/7zip/7za.exe",
+	Tool7zaExe:     "assets/7za.exe",
-	Tool7zaDLL:     "assets/7zip/7za.dll",
+	Tool7zaDLL:     "assets/7za.dll",
-	Tool7zxaDLL:    "assets/7zip/7zxa.dll",
+	Tool7zxaDLL:    "assets/7zxa.dll",
-	ToolHPatchzExe: "assets/HDiffPatch/hpatchz.exe",
+	ToolHPatchzExe: "assets/hpatchz.exe",
-	ToolHDiffzExe:  "assets/HDiffPatch/hdiffz.exe",
 }
 
 func (t ToolFile) GetEmbedPath() string {

pkg/models/binary-version.go

@@ -6,7 +6,6 @@ import (
 	"os"
 	"regexp"
 	"strconv"
-	"strings"
 )
 
 type BinaryVersion struct {
@@ -14,6 +13,7 @@ type BinaryVersion struct {
 	Major int
 	Minor int
 	Patch int
+	Data  []byte
 }
 
 func ParseBinaryVersion(path string) (*BinaryVersion, error) {
@@ -23,58 +23,39 @@ func ParseBinaryVersion(path string) (*BinaryVersion, error) {
 	}
 
 	content := string(data)
+	fmt.Println(content)
 
-	lastDash := strings.LastIndex(content, "-")
+	re := regexp.MustCompile(`([A-Za-z]+)(\d+)(?:\.(\d+))?(?:\.(\d+))?`)
-	if lastDash == -1 {
+	matches := re.FindStringSubmatch(content)
-		return nil, errors.New("no dash found in version string")
+	if len(matches) < 2 {
-	}
-	
-	secondLastDash := strings.LastIndex(content[:lastDash], "-")
-	if secondLastDash == -1 {
-		return nil, errors.New("only one dash found in version string")
-	}
-
-	versionSlice := content[secondLastDash+1 : lastDash]
-	re := regexp.MustCompile(`^([A-Za-z]+)([\d\.]+)$`)
-	matches := re.FindStringSubmatch(versionSlice)
-	if len(matches) < 3 {
 		return nil, errors.New("invalid version format")
 	}
+
 	binaryVersion := BinaryVersion{
 		Name: matches[1],
 	}
-	numbers := strings.Split(matches[2], ".")
+	if matches[2] != "" {
-
+		binaryVersion.Major, _ = strconv.Atoi(matches[2])
-	if len(numbers) > 0 {
-		binaryVersion.Major, err = strconv.Atoi(numbers[0])
-		if err != nil {
-			return nil, err
 	}
+	if len(matches) > 3 && matches[3] != "" {
+		binaryVersion.Minor, _ = strconv.Atoi(matches[3])
 	}
-	if len(numbers) > 1 {
+	if len(matches) > 4 && matches[4] != "" {
-		binaryVersion.Minor, err = strconv.Atoi(numbers[1])
+		binaryVersion.Patch, _ = strconv.Atoi(matches[4])
-		if err != nil {
-			return nil, err
-		}
-	}
-	if len(numbers) > 2 {
-		binaryVersion.Patch, err = strconv.Atoi(numbers[2])
-		if err != nil {
-			return nil, err
-		}
 	}
 
+	binaryVersion.Data = data
 	return &binaryVersion, nil
 }
 
 func (v *BinaryVersion) String() string {
-	return fmt.Sprintf("%d.%d.%d", v.Major, v.Minor, v.Patch)
+	return fmt.Sprintf("%s-%d.%d.%d", v.Name, v.Major, v.Minor, v.Patch)
 }
 
 func (v BinaryVersion) ToInt() int {
 	return v.Major*100 + v.Minor*10 + v.Patch
 }
 
-func (v BinaryVersion) Subtract(other BinaryVersion) int {
+func (v BinaryVersion) Subtract(other *BinaryVersion) int {
 	return v.ToInt() - other.ToInt()
 }

pkg/verifier/verifier.go

@@ -67,7 +67,7 @@ func check(relPath string, expectedSize int64, expectedMD5, base string) error {
 			fullPath, expectedSize, info.Size())
 	}
 
-	md5Hash, err := fileMD5(fullPath)
+	md5Hash, err := FileMD5(fullPath)
 	if err != nil {
 		return fmt.Errorf("error reading %s: %w", fullPath, err)
 	}
@@ -80,7 +80,7 @@ func check(relPath string, expectedSize int64, expectedMD5, base string) error {
 	return nil
 }
 
-func fileMD5(path string) (string, error) {
+func FileMD5(path string) (string, error) {
 	f, err := os.Open(path)
 	if err != nil {
 		return "", err