From 4e5cd2d053687b35aabd03bc35e01a3546cd24f0 Mon Sep 17 00:00:00 2001
From: tsosunchia <59512455+tsosunchia@users.noreply.github.com>
Date: Tue, 30 May 2023 14:55:47 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug:=E9=87=8D=E6=9E=84=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E4=BD=8D=E7=BD=AE=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E5=8C=85=E5=BC=95=E7=94=A8=E7=8E=AF=E8=B7=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .cross_compile.sh           | 12 ++++++------
 .github/workflows/build.yml |  6 +++---
 config/basic.go             |  5 +++++
 printer/basic.go            | 11 ++++-------
 wshandle/client.go          |  8 ++++----
 5 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 config/basic.go

diff --git a/.cross_compile.sh b/.cross_compile.sh
index bb55a74..43f3591 100644
--- a/.cross_compile.sh
+++ b/.cross_compile.sh
@@ -26,15 +26,15 @@ for pl in ${PLATFORMS}; do
     echo "build => ${TARGET}"
     if [ "${DEBUG_MODE}" == "debug" ]; then
         go build -trimpath -gcflags "all=-N -l" -o ${TARGET} \
-            -ldflags    "-X 'github.com/xgadget-lab/nexttrace/printer.version=${BUILD_VERSION}' \
-                        -X 'github.com/xgadget-lab/nexttrace/printer.buildDate=${BUILD_DATE}' \
-                        -X 'github.com/xgadget-lab/nexttrace/printer.commitID=${COMMIT_SHA1}'\
+            -ldflags    "-X 'github.com/xgadget-lab/nexttrace/config.Version=${BUILD_VERSION}' \
+                        -X 'github.com/xgadget-lab/nexttrace/config.BuildDate=${BUILD_DATE}' \
+                        -X 'github.com/xgadget-lab/nexttrace/config.CommitID=${COMMIT_SHA1}'\
                         -w -s"
     else
         go build -trimpath -o ${TARGET} \
-            -ldflags    "-X 'github.com/xgadget-lab/nexttrace/printer.version=${BUILD_VERSION}' \
-                        -X 'github.com/xgadget-lab/nexttrace/printer.buildDate=${BUILD_DATE}' \
-                        -X 'github.com/xgadget-lab/nexttrace/printer.commitID=${COMMIT_SHA1}'\
+            -ldflags    "-X 'github.com/xgadget-lab/nexttrace/config.Version=${BUILD_VERSION}' \
+                        -X 'github.com/xgadget-lab/nexttrace/config.BuildDate=${BUILD_DATE}' \
+                        -X 'github.com/xgadget-lab/nexttrace/config.CommitID=${COMMIT_SHA1}'\
                         -w -s"
     fi
 done
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f5a2788..d9fc338 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -131,9 +131,9 @@ jobs:
       - name: Build
         run: |
           go build -trimpath -o dist/${ASSET_NAME} \
-            -ldflags "-X 'github.com/xgadget-lab/nexttrace/printer.version=${BUILD_VERSION}' \
-                      -X 'github.com/xgadget-lab/nexttrace/printer.buildDate=${BUILD_DATE}' \
-                      -X 'github.com/xgadget-lab/nexttrace/printer.commitID=${COMMIT_SHA1}'\
+            -ldflags "-X 'github.com/xgadget-lab/nexttrace/config.Version=${BUILD_VERSION}' \
+                      -X 'github.com/xgadget-lab/nexttrace/config.BuildDate=${BUILD_DATE}' \
+                      -X 'github.com/xgadget-lab/nexttrace/config.CommitID=${COMMIT_SHA1}'\
                       -w -s"
       - name: Upload files to Artifacts
         uses: actions/upload-artifact@v3
diff --git a/config/basic.go b/config/basic.go
new file mode 100644
index 0000000..94c5fd1
--- /dev/null
+++ b/config/basic.go
@@ -0,0 +1,5 @@
+package config
+
+var Version = "v0.0.0.alpha"
+var BuildDate = ""
+var CommitID = ""
diff --git a/printer/basic.go b/printer/basic.go
index dc835a2..60a8586 100644
--- a/printer/basic.go
+++ b/printer/basic.go
@@ -2,19 +2,16 @@ package printer
 
 import (
 	"fmt"
+	"github.com/xgadget-lab/nexttrace/config"
 	"github.com/xgadget-lab/nexttrace/trace"
 	"net"
 
 	"github.com/fatih/color"
 )
 
-var version = "v0.0.0.alpha"
-var buildDate = ""
-var commitID = ""
-
-func GetVersion() string {
-	return version
-}
+var version = config.Version
+var buildDate = config.BuildDate
+var commitID = config.CommitID
 
 func Version() {
 	fmt.Fprintf(color.Output, "%s %s %s %s\n",
diff --git a/wshandle/client.go b/wshandle/client.go
index 95b9faf..0c4aca8 100644
--- a/wshandle/client.go
+++ b/wshandle/client.go
@@ -3,7 +3,8 @@ package wshandle
 import (
 	"crypto/tls"
 	"fmt"
-	"github.com/xgadget-lab/nexttrace/printer"
+	"github.com/xgadget-lab/nexttrace/config"
+	"github.com/xgadget-lab/nexttrace/util"
 	"log"
 	"net"
 	"net/http"
@@ -16,7 +17,6 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
-	"github.com/xgadget-lab/nexttrace/util"
 )
 
 type WsConn struct {
@@ -123,7 +123,7 @@ func (c *WsConn) recreateWsConn() {
 	// log.Printf("connecting to %s", u.String())
 	requestHeader := http.Header{
 		"Host":       []string{host},
-		"User-Agent": []string{fmt.Sprintf("NextTrace %s/%s/%s", printer.GetVersion(), runtime.GOOS, runtime.GOARCH)},
+		"User-Agent": []string{fmt.Sprintf("NextTrace %s/%s/%s", config.Version, runtime.GOOS, runtime.GOARCH)},
 	}
 	dialer := websocket.DefaultDialer
 	dialer.TLSClientConfig = &tls.Config{
@@ -182,7 +182,7 @@ func createWsConn() *WsConn {
 	// 判断是否是一个 IP
 	requestHeader := http.Header{
 		"Host":       []string{host},
-		"User-Agent": []string{fmt.Sprintf("NextTrace %s/%s/%s", printer.GetVersion(), runtime.GOOS, runtime.GOARCH)},
+		"User-Agent": []string{fmt.Sprintf("NextTrace %s/%s/%s", config.Version, runtime.GOOS, runtime.GOARCH)},
 	}
 	dialer := websocket.DefaultDialer
 	dialer.TLSClientConfig = &tls.Config{