UPDATE: Add precheck version hdiff, support another hdiff

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,64 @@
 
 // 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 {Promise<[boolean, string]> & { cancel(): void }}
+ * @returns {$CancellablePromise<[boolean, string]>}
  */
 export function DataExtract(gamePath, patchPath, isSkipVerify) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2161622254, gamePath, patchPath, isSkipVerify));
+    return $Call.ByID(2161622254, gamePath, patchPath, isSkipVerify);
-    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 }}
+ * @param {boolean} isNeedHDiff
+ * @returns {$CancellablePromise<[boolean, string]>}
  */
-export function VersionValidate(gamePath, patchPath) {
+export function VersionValidate(gamePath, patchPath, isNeedHDiff) {
-    let $resultPromise = /** @type {any} */($Call.ByID(2105077257, gamePath, patchPath));
+    return $Call.ByID(2105077257, gamePath, patchPath, isNeedHDiff);
-    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/hooks/useGlobalEvents.tsx

@@ -21,7 +21,7 @@ export function useGlobalEvents({
     setProgressUpdate: (v: number) => void;
     setMaxProgressUpdate: (v: number) => void;
     setProgressDownload: (v: number) => void;
-    setDownloadSpeed: (v: number) => void;
+    setDownloadSpeed: (v: string) => void;
     setMessageUpdate: (v: string) => void;
     setStageType: (v: string) => void,
 }) {
@@ -33,7 +33,7 @@ export function useGlobalEvents({
         const onDownload = (event: any) => {
             const { percent, speed } = event.data[0];
             setProgressDownload(Number(percent));
-            setDownloadSpeed(Number(speed));
+            setDownloadSpeed(speed);
         };
 
         const onUpdateProgress = (event: any) => {

frontend/src/pages/diff/index.tsx

@@ -87,19 +87,6 @@ export default function DiffPage() {
                     setDiffDir('')
                     return
                 }
-                const [isOk, validType, errorType] = await DiffService.CheckTypeHDiff(basePath)
-                if (!isOk) {
-                    toast.error(errorType)
-                    setDiffCheckResult('error')
-                    setDiffDir('')
-                    return
-                }
-                if (validType == "") {
-                    toast.error('Not valid file type')
-                    setDiffCheckResult('error')
-                    setDiffDir('')
-                    return
-                }
                 setDiffDir(basePath)
                 setDiffCheckResult('success')
             } else {
@@ -116,91 +103,80 @@ 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 (['hdiffmap.json', 'hdifffiles.txt', 'hdifffiles.json'].includes(validType)) {
-  
-            if (validType === 'hdiffmap.json') {
                 setStageType('Version Validate')
                 setProgressUpdate(0)
                 setMaxProgressUpdate(1)
-                const [validVersion, errorVersion] = await DiffService.VersionValidate(gameDir, diffDir)
+                const isNeedHDiff = validType !== 'hdiffmap.json'
-                if (!validVersion) {
+                const [validVersion, errorVersion] = await DiffService.VersionValidate(gameDir, diffDir, isNeedHDiff)
-                    toast.error(errorVersion)
+                if (!handleResult(validVersion, errorVersion)) return
-                    setIsDiffLoading(false)
-                    return
-                }
                 setProgressUpdate(1)
             }
 
-            const isSkipVerify = validType === 'manifest' || validType === 'hdifffiles.txt'
+            const isSkipVerify = ['manifest', 'hdifffiles.txt', 'hdifffiles.json'].includes(validType)
             setStageType('Data Extract')
             const [validData, errorData] = await DiffService.DataExtract(gameDir, diffDir, isSkipVerify)
-            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)
+            switch (validType) {
-                return
+                case 'hdifffiles.txt':
-            }
+                case 'hdiffmap.json':
-
+                case 'hdifffiles.json': {
-            if ( validType === 'hdifffiles.txt' || validType === 'hdiffmap.json') {
+                    setStageType('Patch Data')
-                setStageType('Patch Data')
+                    const [validPatch, errorPatch] = await DiffService.HDiffPatchData(gameDir)
-                const [validPatch, errorPatch] = await DiffService.HDiffPatchData(gameDir)
+                    if (!handleResult(validPatch, errorPatch)) return
-                if (!validPatch) {
+    
-                    toast.error(errorPatch)
+                    setStageType('Delete old files')
-                    setIsDiffLoading(false)
+                    const [validDelete, errorDelete] = await DiffService.DeleteFiles(gameDir)
-                    return
+                    if (!handleResult(validDelete, errorDelete)) return
+                    break
                 }
-                setStageType('Delete old files')
+                case 'manifest': {
-                const [validDelete, errorDelete] = await DiffService.DeleteFiles(gameDir)
+                    setStageType('Patch Data')
-                if (!validDelete) {
+                    const [validPatch, errorPatch] = await DiffService.LDiffPatchData(gameDir)
-                    toast.error(errorDelete)
+                    if (!handleResult(validPatch, errorPatch)) return
-                    setIsDiffLoading(false)
+                    break
-                    return
-                }
-            } else if (validType === 'manifest') {
-                setStageType('Patch Data')
-                const [validPatch, errorPatch] = await DiffService.LDiffPatchData(gameDir)
-                if (!validPatch) {
-                    toast.error(errorPatch)
-                    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">

frontend/src/pages/launcher/index.tsx

@@ -405,7 +405,7 @@ export default function LauncherPage() {
                         <div className="flex justify-center items-center text-sm text-white/80">
                             <span>{downloadType}</span>
                             <div className="flex items-center gap-4 ml-4">
-                                <span className="text-cyan-400 font-semibold">{downloadSpeed.toFixed(1)} MB/s</span>
+                                <span className="text-cyan-400 font-semibold">{downloadSpeed}</span>
                                 <span className="text-white font-bold">{progressDownload.toFixed(1)}%</span>
                             </div>
                         </div>
@@ -414,7 +414,7 @@ export default function LauncherPage() {
                                 className="h-full bg-gradient-to-r from-cyan-400 to-blue-500 rounded-full"
                                 initial={{ width: 0 }}
                                 animate={{ width: `${progressDownload}%` }}
-                                transition={{ duration: 0.3 }}
+                                transition={{ type: "tween", ease: "linear", duration: 0.03 }}
                             />
                         </div>
                         <div className="text-center text-xs text-white/60">

frontend/src/stores/launcherStore.ts

@@ -11,7 +11,7 @@ interface LauncherState {
     isLoading: boolean;
     gameRunning: boolean;
     progressDownload: number;
-    downloadSpeed: number;
+    downloadSpeed: string;
     launcherVersion: string;
     updateData: Record<'server' | 'proxy' | 'launcher', { isUpdate: boolean, isExists: boolean, version: string }>;
     setDownloadType: (value: string) => void;
@@ -24,7 +24,7 @@ interface LauncherState {
     setGameRunning: (value: boolean) => void;
     setProgressDownload: (value: number) => void;
     setLauncherVersion: (value: string) => void;
-    setDownloadSpeed: (value: number) => void;
+    setDownloadSpeed: (value: string) => void;
     setUpdateData: (value: Record<'server' | 'proxy' | 'launcher', { isUpdate: boolean, isExists: boolean, version: string }>) => void;
 }
 
@@ -38,7 +38,7 @@ const useLauncherStore = create<LauncherState>((set, get) => ({
     proxyRunning: false,
     gameRunning: false,
     progressDownload: 0,
-    downloadSpeed: 0,
+    downloadSpeed: "",
     launcherVersion: "",
     updateData: {
         server: { isUpdate: false, isExists: false, version: "" },
@@ -55,7 +55,7 @@ const useLauncherStore = create<LauncherState>((set, get) => ({
     setGameRunning: (value: boolean) => set({ gameRunning: value }),
     setProgressDownload: (value: number) => set({ progressDownload: value }),
     setLauncherVersion: (value: string) => set({ launcherVersion: value }),
-    setDownloadSpeed: (value: number) => set({ downloadSpeed: value }),
+    setDownloadSpeed: (value: string) => set({ downloadSpeed: value }),
     setUpdateData: (value: Record<'server' | 'proxy' | 'launcher', { isUpdate: boolean, isExists: boolean, version: string }>) => set({ updateData: value }),
 }));
 

go.mod

@@ -10,6 +10,7 @@ require (
 require (
 	aead.dev/minisign v0.3.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	golang.org/x/crypto v0.41.0 // indirect
 	golang.org/x/text v0.28.0 // indirect
 )
 
@@ -49,7 +50,6 @@ require (
 	github.com/wailsapp/go-webview2 v1.0.21 // indirect
 	github.com/wailsapp/mimetype v1.4.1 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	golang.org/x/crypto v0.41.0 // indirect
 	golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b
 	golang.org/x/net v0.43.0 // indirect
 	google.golang.org/protobuf v1.36.8

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"
@@ -18,21 +19,25 @@ import (
 type DiffService struct{}
 
 func (h *DiffService) CheckTypeHDiff(patchPath string) (bool, string, string) {
-	if ok, err := sevenzip.IsFileIn7z(patchPath, "manifest"); err == nil && ok {
-		return true, "manifest", ""
-	}
-
 	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", ""
 	}
+	if ok, err := sevenzip.IsFileIn7z(patchPath, "manifest"); err == nil && ok {
+		return true, "manifest", ""
+	}
+
 	return false, "", "not found hdifffiles.txt or hdiffmap.json"
 }
 
-func (h *DiffService) VersionValidate(gamePath, patchPath string) (bool, string) {
+func (h *DiffService) VersionValidate(gamePath, patchPath string, isNeedHDiff bool) (bool, string) {
-	oldVersionData, err := models.ParseBinaryVersion(filepath.Join(gamePath, "StarRail_Data\\StreamingAssets\\BinaryVersion.bytes"))
+	oldBinPath := filepath.Join(gamePath, "StarRail_Data\\StreamingAssets\\BinaryVersion.bytes")
+	oldVersionData, err := models.ParseBinaryVersion(oldBinPath)
 	if err != nil {
 		return false, err.Error()
 	}
@@ -46,28 +51,104 @@ func (h *DiffService) VersionValidate(gamePath, patchPath string) (bool, string)
 			return false, err.Error()
 		}
 	}
-	if err := sevenzip.ExtractAFileFromZip(patchPath, "StarRail_Data\\StreamingAssets\\BinaryVersion.bytes", constant.TempUrl); err != nil {
+
+	if !isNeedHDiff {
+		if err := sevenzip.ExtractAFileFromZip(patchPath, "StarRail_Data\\StreamingAssets\\BinaryVersion.bytes", constant.TempUrl); err != nil {
+			return false, err.Error()
+		}
+
+		binPath := filepath.Join(constant.TempUrl, "BinaryVersion.bytes")
+		newVersionData, err := models.ParseBinaryVersion(binPath)
+		if err != nil {
+			return false, err.Error()
+		}
+		defer os.Remove(binPath)
+
+		v := newVersionData.Subtract(oldVersionData)
+		if v != 0 && v != 1 {
+			return false, fmt.Sprintf("the diff version %s not valid with game version %s", newVersionData, oldVersionData)
+		}
+
+		return true, "validated"
+	}
+
+	if err := sevenzip.ExtractAFileFromZip(patchPath, "StarRail_Data\\StreamingAssets\\BinaryVersion.bytes.hdiff", constant.TempUrl); err != nil {
 		return false, err.Error()
 	}
 
-	binPath := filepath.Join(constant.TempUrl, "BinaryVersion.bytes")
+	patchBinFile := filepath.Join(constant.TempUrl, "BinaryVersion.bytes.hdiff")
-	newVersionData, err := models.ParseBinaryVersion(binPath)
+	sourceBinFile := filepath.Join(gamePath, "StarRail_Data\\StreamingAssets\\BinaryVersion.bytes")
+	tempBinFile := filepath.Join(constant.TempUrl, "BinaryVersion.bytes")
+	if err := hpatchz.ApplyPatch(sourceBinFile, patchBinFile, tempBinFile); err != nil {
+		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()
 	}
-	defer os.Remove(binPath)
+	os.Remove(tempPkgFile)
 
-	v := newVersionData.Subtract(*oldVersionData)
+	for _, pkgData := range pkgDataList {
-	if v != 0 && v != 1 {
+		if filepath.ToSlash(pkgData.RemoteFile) == "StarRail_Data/StreamingAssets/BinaryVersion.bytes" {
-		return false, fmt.Sprintf("the diff version %s not valid with game version %s", newVersionData, oldVersionData)
+			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
+		}
 	}
 
+	_, 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 +169,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 +188,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 +224,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"
 }
 
@@ -155,9 +246,12 @@ func (h *DiffService) DeleteFiles(gamePath string) (bool, string) {
 	}
 
 	if err := scanner.Err(); err != nil {
+		file.Close()
 		return false, "no delete files exist"
 	}
 
+	file.Close()
+
 	for i, file := range deleteFiles {
 		os.Remove(filepath.Join(gamePath, file))
 		application.Get().Event.Emit("diff:progress", map[string]int{"progress": i, "maxProgress": len(deleteFiles)})

internal/git-service/launcher.go

@@ -38,56 +38,20 @@ func (g *GitService) GetLatestLauncherVersion() (bool, string, string) {
 
 
 func (g *GitService) UpdateLauncherProgress(version string) (bool, string) {
-	resp, err := http.Get(constant.LauncherGitUrl)
+	asset, ok := g.getReleaseAsset(version, constant.LauncherGitUrl, constant.LauncherFile)
-	if err != nil {
+	if !ok {
-		panic(err)
-	}
-	defer resp.Body.Close()
-
-	body, _ := io.ReadAll(resp.Body)
-
-	var releases []*models.ReleaseType
-	err = json.Unmarshal(body, &releases)
-	if err != nil {
-		return false, err.Error()
-	}
-
-	if len(releases) == 0 {
-		return false, "no releases found"
-	}
-
-	var releaseData *models.ReleaseType
-	for _, release := range releases {
-		if release.TagName == version {
-			releaseData = release
-			break
-		}
-	}
-
-	if releaseData == nil || releaseData.TagName == "" {
 		return false, "no release found"
 	}
 
-	var assetWin models.AssetType
+	resp, err := http.Get(asset.BrowserDownloadURL)
-	for _, asset := range releaseData.Assets {
-		if asset.Name == constant.LauncherFile {
-			assetWin = asset
-			break
-		}
-	}
-
-	if assetWin.Name == "" {
-		return false, "no assets found"
-	}
-
-	resp, err = http.Get(assetWin.BrowserDownloadURL)
 	if err != nil {
 		return false, err.Error()
 	}
 	defer resp.Body.Close()
+
 	err = selfupdate.Apply(resp.Body, selfupdate.Options{})
 	if err != nil {
 		return false, err.Error()
 	}
 	return true, ""
-}
+}

internal/git-service/proxy.go

@@ -1,6 +1,7 @@
 package gitService
 
 import (
+	"encoding/json"
 	"firefly-launcher/pkg/constant"
 	"firefly-launcher/pkg/models"
 	"fmt"
@@ -8,7 +9,8 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"encoding/json"
+	"time"
+
 	"github.com/wailsapp/wails/v3/pkg/application"
 )
 
@@ -35,72 +37,35 @@ func (g *GitService) GetLatestProxyVersion() (bool, string, string) {
 }
 
 func (g *GitService) DownloadProxyProgress(version string) (bool, string) {
-	resp, err := http.Get(constant.ProxyGitUrl)
+	asset, ok := g.getReleaseAsset(version, constant.ProxyGitUrl, constant.ProxyZipFile)
-	if err != nil {
+	if !ok {
-		panic(err)
-	}
-	defer resp.Body.Close()
-
-	body, _ := io.ReadAll(resp.Body)
-
-	var releases []*models.ReleaseType
-	err = json.Unmarshal(body, &releases)
-	if err != nil {
-		return false, err.Error()
-	}
-
-	if len(releases) == 0 {
-		return false, "no releases found"
-	}
-
-	var releaseData *models.ReleaseType
-	for _, release := range releases {
-		if release.TagName == version {
-			releaseData = release
-			break
-		}
-	}
-
-	if releaseData == nil || releaseData.TagName == "" {
 		return false, "no release found"
 	}
 
-	var assetWin models.AssetType
+	if err := os.MkdirAll(constant.ProxyStorageUrl, 0755); err != nil {
-	for _, asset := range releaseData.Assets {
+		return false, err.Error()
-		if asset.Name == constant.ProxyZipFile {
-			assetWin = asset
-			break
-		}
 	}
 
-	if assetWin.Name == "" {
+	saveFile := filepath.Join(constant.ProxyStorageUrl, asset.Name)
-		return false, "no assets found"
+	tmpPath, err := g.downloadFileParallel(saveFile, asset.BrowserDownloadURL, 4, func(percent float64, speed string) {
-	}
+		application.Get().Event.Emit("download:proxy", map[string]interface{}{
-
+			"percent": fmt.Sprintf("%.2f", percent),
-	if err := os.Mkdir(constant.ProxyStorageUrl, 0755); err != nil {
+			"speed":   speed,
-		if !os.IsExist(err) {
+		})
-			return false, err.Error()
+	})
-		}
-	}
-	saveFile := filepath.Join(constant.ProxyStorageUrl, assetWin.Name)
-
-	resp, err = http.Get(assetWin.BrowserDownloadURL)
 	if err != nil {
 		return false, err.Error()
 	}
-	defer resp.Body.Close()
+	for i := 0; i < 3; i++ {
-
+		if err := os.Rename(tmpPath, saveFile); err == nil {
-	DownloadFile(saveFile, assetWin.BrowserDownloadURL, func(percent float64, speed float64) {
+			return true, ""
-		application.Get().Event.Emit("download:proxy", map[string]interface{}{
+		}
-			"percent": fmt.Sprintf("%.2f", percent),
+		time.Sleep(300 * time.Millisecond)
-			"speed":   fmt.Sprintf("%.2f", speed),
+	}
-		})
+	return false, "failed to rename tmp file after retries"
-
-	})
-	return true, ""
 }
 
 func (g *GitService) UnzipProxy() {
-	unzipParallel(filepath.Join(constant.ProxyStorageUrl, constant.ProxyZipFile), constant.ProxyStorageUrl)
+	g.unzipParallel(filepath.Join(constant.ProxyStorageUrl, constant.ProxyZipFile), constant.ProxyStorageUrl)
 	os.Remove(filepath.Join(constant.ProxyStorageUrl, constant.ProxyZipFile))
-}
+}

internal/git-service/server.go

@@ -9,6 +9,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"time"
 
 	"github.com/wailsapp/wails/v3/pkg/application"
 )
@@ -36,72 +37,35 @@ func (g *GitService) GetLatestServerVersion() (bool, string, string) {
 }
 
 func (g *GitService) DownloadServerProgress(version string) (bool, string) {
-	resp, err := http.Get(constant.ServerGitUrl)
+	asset, ok := g.getReleaseAsset(version, constant.ServerGitUrl, constant.ServerZipFile)
-	if err != nil {
+	if !ok {
-		panic(err)
-	}
-	defer resp.Body.Close()
-
-	body, _ := io.ReadAll(resp.Body)
-
-	var releases []*models.ReleaseType
-	err = json.Unmarshal(body, &releases)
-	if err != nil {
-		return false, err.Error()
-	}
-
-	if len(releases) == 0 {
-		return false, "no releases found"
-	}
-
-	var releaseData *models.ReleaseType
-	for _, release := range releases {
-		if release.TagName == version {
-			releaseData = release
-			break
-		}
-	}
-
-	if releaseData == nil || releaseData.TagName == "" {
 		return false, "no release found"
 	}
 
-	var assetWin models.AssetType
+	if err := os.MkdirAll(constant.ServerStorageUrl, 0755); err != nil {
-	for _, asset := range releaseData.Assets {
+		return false, err.Error()
-		if asset.Name == constant.ServerZipFile {
-			assetWin = asset
-			break
-		}
 	}
 
-	if assetWin.Name == "" {
+	saveFile := filepath.Join(constant.ServerStorageUrl, asset.Name)
-		return false, "no assets found"
+	tmpPath, err := g.downloadFileParallel(saveFile, asset.BrowserDownloadURL, 4, func(percent float64, speed string) {
-	}
+		application.Get().Event.Emit("download:server", map[string]interface{}{
-
+			"percent": fmt.Sprintf("%.2f", percent),
-	if err := os.Mkdir(constant.ServerStorageUrl, 0755); err != nil {
+			"speed":   speed,
-		if !os.IsExist(err) {
+		})
-			return false, err.Error()
+	})
-		}
-	}
-
-	saveFile := filepath.Join(constant.ServerStorageUrl, assetWin.Name)
-
-	resp, err = http.Get(assetWin.BrowserDownloadURL)
 	if err != nil {
 		return false, err.Error()
 	}
-	defer resp.Body.Close()
+	for i := 0; i < 3; i++ {
-
+		if err := os.Rename(tmpPath, saveFile); err == nil {
-	DownloadFile(saveFile, assetWin.BrowserDownloadURL, func(percent float64, speed float64) {
+			return true, ""
-		application.Get().Event.Emit("download:server", map[string]interface{}{
+		}
-			"percent": fmt.Sprintf("%.2f", percent),
+		time.Sleep(300 * time.Millisecond)
-			"speed":   fmt.Sprintf("%.2f", speed),
+	}
-		})
+	return false, "failed to rename tmp file after retries"
-	})
-	return true, ""
 }
 
 func (g *GitService) UnzipServer() {
-	unzipParallel(filepath.Join(constant.ServerStorageUrl, constant.ServerZipFile), constant.ServerStorageUrl)
+	g.unzipParallel(filepath.Join(constant.ServerStorageUrl, constant.ServerZipFile), constant.ServerStorageUrl)
 	os.Remove(filepath.Join(constant.ServerStorageUrl, constant.ServerZipFile))
 }

internal/git-service/util.go

@@ -2,6 +2,8 @@ package gitService
 
 import (
 	"archive/zip"
+	"encoding/json"
+	"firefly-launcher/pkg/models"
 	"fmt"
 	"io"
 	"math"
@@ -13,39 +15,37 @@ import (
 	"time"
 )
 
-func humanFormat(bytes int64) string {
+func HumanFormat(bytes float64) string {
-	n := float64(bytes)
 	for _, unit := range []string{"", "Ki", "Mi", "Gi"} {
-		if math.Abs(n) < 1024.0 {
+		if math.Abs(bytes) < 1024.0 {
-			return fmt.Sprintf("%3.1f%sB", n, unit)
+			return fmt.Sprintf("%3.1f%sB", bytes, unit)
 		}
-		n /= 1024.0
+		bytes /= 1024.0
 	}
-	return fmt.Sprintf("%.1fTiB", n)
+	return fmt.Sprintf("%.1fTiB", bytes)
 }
 
 type WriteCounter struct {
-	Total             uint64
+	Total     uint64
-	StartTime         time.Time
+	StartTime time.Time
-	OnEmit            func(percent float64, speedMBps float64)
+	OnEmit    func(percent float64, speed string)
-	TotalSize         int64
+	TotalSize int64
-	lastLoggedPercent int
+	mu        sync.Mutex
 }
 
-func NewWriteCounter(total int64, onEmit func(percent float64, speedMBps float64)) *WriteCounter {
+func NewWriteCounter(total int64, onEmit func(percent float64, speed string)) *WriteCounter {
 	return &WriteCounter{
-		StartTime:         time.Now(),
+		StartTime: time.Now(),
-		TotalSize:         total,
+		TotalSize: total,
-		lastLoggedPercent: -1,
+		OnEmit:    onEmit,
-		OnEmit:            onEmit,
 	}
 }
 
-func (wc *WriteCounter) Write(p []byte) (int, error) {
+func (wc *WriteCounter) Add(n int) {
-	n := len(p)
+	wc.mu.Lock()
+	defer wc.mu.Unlock()
 	wc.Total += uint64(n)
 	wc.PrintProgress()
-	return n, nil
 }
 
 func (wc *WriteCounter) PrintProgress() {
@@ -53,63 +53,109 @@ func (wc *WriteCounter) PrintProgress() {
 	if elapsed < 0.001 {
 		elapsed = 0.001
 	}
-
+	speed := float64(wc.Total) / 1024 / 1024 / elapsed
-	speed := float64(wc.Total) / 1024 / 1024 / elapsed // MB/s
 	percent := float64(wc.Total) / float64(wc.TotalSize) * 100
 	if wc.OnEmit != nil {
-		wc.OnEmit(percent, speed)
+		wc.OnEmit(percent, fmt.Sprintf("%s/s", HumanFormat(speed)))
 	}
 }
 
-func DownloadFile(filepath string, url string, onEmit func(percent float64, speed float64)) error {
+// --- DownloadFileParallel ---
-	tmpPath := filepath + ".tmp"
+func (g *GitService) downloadFileParallel(filePath, url string, numParts int, onEmit func(percent float64, speed string)) (tmpPath string, err error) {
-
+	resp, err := http.Head(url)
-	resp, err := http.Get(url)
 	if err != nil {
-		return fmt.Errorf("failed to get file: %w", err)
+		return "", fmt.Errorf("failed to get head: %w", err)
 	}
-	defer resp.Body.Close()
-
 	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("bad status: %s", resp.Status)
+		return "", fmt.Errorf("bad status: %s", resp.Status)
 	}
 
+	size := resp.ContentLength
+	tmpPath = filePath + ".tmp"
+
 	out, err := os.Create(tmpPath)
 	if err != nil {
-		return fmt.Errorf("failed to create tmp file: %w", err)
+		return "", fmt.Errorf("failed to create tmp file: %w", err)
 	}
+	defer out.Close()
 
-	counter := NewWriteCounter(resp.ContentLength, onEmit)
+	counter := NewWriteCounter(size, onEmit)
-	_, err = io.Copy(out, io.TeeReader(resp.Body, counter))
+	partSize := size / int64(numParts)
-	if closeErr := out.Close(); closeErr != nil {
+	var wg sync.WaitGroup
-		return fmt.Errorf("failed to close tmp file: %w", closeErr)
+	var mu sync.Mutex
-	}
-	if err != nil {
-		return fmt.Errorf("failed to download file: %w", err)
-	}
 
-	// Delete destination file if it exists
+	for i := 0; i < numParts; i++ {
-	if _, err := os.Stat(filepath); err == nil {
+		start := int64(i) * partSize
-		if err := os.Remove(filepath); err != nil {
+		end := start + partSize - 1
-			return fmt.Errorf("failed to remove existing file: %w", err)
+		if i == numParts-1 {
+			end = size - 1
 		}
+
+		_ = start
+		_ = end
+
+		wg.Go(func() {
+			req, _ := http.NewRequest("GET", url, nil)
+			req.Header.Set("Range", fmt.Sprintf("bytes=%d-%d", start, end))
+			resp, err := http.DefaultClient.Do(req)
+			if err != nil {
+				return
+			}
+			defer resp.Body.Close()
+
+			buf := make([]byte, 32*1024)
+			var written int64
+			for {
+				n, err := resp.Body.Read(buf)
+				if n > 0 {
+					mu.Lock()
+					out.Seek(start+written, 0)
+					out.Write(buf[:n])
+					mu.Unlock()
+					written += int64(n)
+					counter.Add(n)
+				}
+				if err == io.EOF {
+					break
+				}
+				if err != nil {
+					break
+				}
+			}
+		})
 	}
 
-	for i := 0; i < 3; i++ {
+	wg.Wait()
-		err = os.Rename(tmpPath, filepath)
+	return tmpPath, nil
-		if err == nil {
-			break
-		}
-		time.Sleep(300 * time.Millisecond)
-	}
-	if err != nil {
-		return fmt.Errorf("failed to rename after retries: %w", err)
-	}
-
-	return nil
 }
 
-func unzipParallel(src string, dest string) error {
+// --- Helper getReleaseAsset ---
+func (g *GitService) getReleaseAsset(version, url, fileName string) (models.AssetType, bool) {
+	resp, err := http.Get(url)
+	if err != nil {
+		return models.AssetType{}, false
+	}
+	defer resp.Body.Close()
+
+	body, _ := io.ReadAll(resp.Body)
+	var releases []*models.ReleaseType
+	if err := json.Unmarshal(body, &releases); err != nil || len(releases) == 0 {
+		return models.AssetType{}, false
+	}
+
+	for _, release := range releases {
+		if release.TagName == version {
+			for _, asset := range release.Assets {
+				if asset.Name == fileName {
+					return asset, true
+				}
+			}
+		}
+	}
+	return models.AssetType{}, false
+}
+
+func (g *GitService) unzipParallel(src string, dest string) error {
 	numCPU := runtime.NumCPU()
 
 	reserved := 1
@@ -137,11 +183,11 @@ func unzipParallel(src string, dest string) error {
 	jobs := make(chan job)
 	var wg sync.WaitGroup
 
-	// Worker pool
 	for i := 0; i < maxWorkers; i++ {
+
 		wg.Go(func() {
 			for j := range jobs {
-				err := extractFile(j.f, dest)
+				err := g.extractFile(j.f, dest)
 				if err != nil {
 					fmt.Printf("Error extracting %s: %v\n", j.f.Name, err)
 				}
@@ -149,17 +195,17 @@ func unzipParallel(src string, dest string) error {
 		})
 	}
 
-	// Feed jobs
 	for _, f := range r.File {
 		jobs <- job{f}
 	}
 	close(jobs)
+
 	wg.Wait()
 
 	return nil
 }
 
-func extractFile(f *zip.File, dest string) error {
+func (g *GitService) extractFile(f *zip.File, dest string) error {
 	fp := filepath.Join(dest, f.Name)
 
 	if f.FileInfo().IsDir() {

pkg/constant/constant.go

@@ -10,7 +10,7 @@ const ProxyZipFile = "64bit.zip"
 const LauncherFile = "firefly-launcher.exe"
 const TempUrl = "./temp"
 
-const CurrentLauncherVersion = "1.5.0"
+const CurrentLauncherVersion = "1.7.0"
 
 type ToolFile string
 

pkg/models/binary-version.go

@@ -10,10 +10,11 @@ import (
 )
 
 type BinaryVersion struct {
-	Name string
+	Name  string
 	Major int
 	Minor int
 	Patch int
+	Data  []byte
 }
 
 func ParseBinaryVersion(path string) (*BinaryVersion, error) {
@@ -28,7 +29,7 @@ func ParseBinaryVersion(path string) (*BinaryVersion, error) {
 	if lastDash == -1 {
 		return nil, errors.New("no dash found in version string")
 	}
-	
+
 	secondLastDash := strings.LastIndex(content[:lastDash], "-")
 	if secondLastDash == -1 {
 		return nil, errors.New("only one dash found in version string")
@@ -64,17 +65,18 @@ func ParseBinaryVersion(path string) (*BinaryVersion, error) {
 		}
 	}
 
+	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/sevenzip/sevenzip.go

@@ -21,9 +21,18 @@ func IsFileIn7z(archivePath, fileInside string) (bool, error) {
 
 	lines := strings.Split(out.String(), "\n")
 	for _, line := range lines {
-		if strings.Contains(line, fileInside) {
+		line = strings.TrimSpace(line)
-			return true, nil
+		if line == "" {
+			continue
 		}
+		parts := strings.Fields(line)
+		if len(parts) > 0 {
+			path := parts[len(parts)-1]
+			if path == fileInside {
+				return true, nil
+			}
+		}
+
 	}
 
 	return false, fmt.Errorf("%s not found in %s", fileInside, archivePath)

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