From c7557b8e483c823f5298ef98d91cf7c29005c6c6 Mon Sep 17 00:00:00 2001
From: H1JK <hell0jack@protonmail.com>
Date: Sun, 14 May 2023 12:34:47 +0800
Subject: [PATCH] feat: Updater detect and download AMD64v3 artifact

Co-authored-by: Larvan2 <78135608+larvan2@users.noreply.github.com>
---
 hub/updater/updater.go | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/hub/updater/updater.go b/hub/updater/updater.go
index 3d80707a..9762f3f3 100644
--- a/hub/updater/updater.go
+++ b/hub/updater/updater.go
@@ -17,15 +17,16 @@ import (
 	clashHttp "github.com/Dreamacro/clash/component/http"
 	"github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/log"
+
+	"github.com/klauspost/cpuid/v2"
 )
 
 // modify from https://github.com/AdguardTeam/AdGuardHome/blob/595484e0b3fb4c457f9bb727a6b94faa78a66c5f/internal/updater/updater.go
 // Updater is the Clash.Meta updater.
 var (
-	goarch string
-	goos   string
-	goarm  string
-	gomips string
+	goarm           string
+	gomips          string
+	amd64Compatible string
 
 	workDir string
 
@@ -45,6 +46,12 @@ var (
 	latestVersion string
 )
 
+func init() {
+	if runtime.GOARCH == "amd64" && cpuid.CPU.X64Level() < 3 {
+		amd64Compatible = "-compatible"
+	}
+}
+
 type updateError struct {
 	Message string
 }
@@ -59,8 +66,6 @@ func Update(execPath string) (err error) {
 	mu.Lock()
 	defer mu.Unlock()
 
-	goos = runtime.GOOS
-	goarch = runtime.GOARCH
 	latestVersion, err = getLatestVersion()
 	if err != nil {
 		return err
@@ -128,12 +133,10 @@ func prepare(exePath string) (err error) {
 	//log.Infoln(packageName)
 	backupDir = filepath.Join(workDir, "meta-backup")
 
-	if goos == "windows" && goarch == "amd64" {
-		updateExeName = "clash.meta" + "-" + goos + "-" + goarch + "-compatible.exe"
-	} else if goos == "linux" && goarch == "amd64" {
-		updateExeName = "clash.meta" + "-" + goos + "-" + goarch + "-compatible"
+	if runtime.GOOS == "windows" {
+		updateExeName = "clash.meta" + "-" + runtime.GOOS + "-" + runtime.GOARCH + amd64Compatible + ".exe"
 	} else {
-		updateExeName = "clash.meta" + "-" + goos + "-" + goarch
+		updateExeName = "clash.meta" + "-" + runtime.GOOS + "-" + runtime.GOARCH + amd64Compatible
 	}
 
 	log.Infoln("updateExeName: %s ", updateExeName)
@@ -198,7 +201,7 @@ func replace() error {
 	var err error
 
 	log.Infoln("replacing: %s to %s", updateExeName, currentExeName)
-	if goos == "windows" {
+	if runtime.GOOS == "windows" {
 		// rename fails with "File in use" error
 		err = copyFile(updateExeName, currentExeName)
 	} else {
@@ -430,17 +433,15 @@ func getLatestVersion() (version string, err error) {
 func updateDownloadURL() {
 	var middle string
 
-	if goarch == "arm" && goarm != "" {
-		middle = fmt.Sprintf("-%s-%sv%s-%s", goos, goarch, goarm, latestVersion)
-	} else if isMIPS(goarch) && gomips != "" {
-		middle = fmt.Sprintf("-%s-%s-%s-%s", goos, goarch, gomips, latestVersion)
-	} else if goarch == "amd64" && (goos == "windows" || goos == "linux") {
-		middle = fmt.Sprintf("-%s-%s-compatible-%s", goos, goarch, latestVersion)
+	if runtime.GOARCH == "arm" && goarm != "" {
+		middle = fmt.Sprintf("-%s-%sv%s-%s", runtime.GOOS, runtime.GOARCH, goarm, latestVersion)
+	} else if isMIPS(runtime.GOARCH) && gomips != "" {
+		middle = fmt.Sprintf("-%s-%s-%s-%s", runtime.GOOS, runtime.GOARCH, gomips, latestVersion)
 	} else {
-		middle = fmt.Sprintf("-%s-%s-%s", goos, goarch, latestVersion)
+		middle = fmt.Sprintf("-%s-%s%s-%s", runtime.GOOS, runtime.GOARCH, amd64Compatible, latestVersion)
 	}
 
-	if goos == "windows" {
+	if runtime.GOOS == "windows" {
 		middle += ".zip"
 	} else {
 		middle += ".gz"