From 7ac97016feff2333959369a62c694c727859e3f9 Mon Sep 17 00:00:00 2001
From: xjasonlyu <xjasonlyu@gmail.com>
Date: Sat, 26 Mar 2022 15:32:58 +0800
Subject: [PATCH] Chore: move all to version

---
 internal/debug/debug.go                 | 8 --------
 internal/version/debug.go               | 7 +++++++
 internal/{debug => version}/debug_on.go | 2 +-
 internal/{module => version}/module.go  | 2 +-
 internal/version/version.go             | 4 +---
 stats/server.go                         | 6 ++----
 6 files changed, 12 insertions(+), 17 deletions(-)
 delete mode 100644 internal/debug/debug.go
 create mode 100644 internal/version/debug.go
 rename internal/{debug => version}/debug_on.go (75%)
 rename internal/{module => version}/module.go (91%)

diff --git a/internal/debug/debug.go b/internal/debug/debug.go
deleted file mode 100644
index 1095e3a..0000000
--- a/internal/debug/debug.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Package debug indicates if the debug tag is enabled at build time.
-package debug
-
-var _debug = false
-
-func Debug() bool {
-	return _debug
-}
diff --git a/internal/version/debug.go b/internal/version/debug.go
new file mode 100644
index 0000000..708057b
--- /dev/null
+++ b/internal/version/debug.go
@@ -0,0 +1,7 @@
+package version
+
+var _debug = false
+
+func Debug() bool {
+	return _debug
+}
diff --git a/internal/debug/debug_on.go b/internal/version/debug_on.go
similarity index 75%
rename from internal/debug/debug_on.go
rename to internal/version/debug_on.go
index b08fb94..a2c3afa 100644
--- a/internal/debug/debug_on.go
+++ b/internal/version/debug_on.go
@@ -1,6 +1,6 @@
 //go:build debug
 
-package debug
+package version
 
 func init() {
 	_debug = true
diff --git a/internal/module/module.go b/internal/version/module.go
similarity index 91%
rename from internal/module/module.go
rename to internal/version/module.go
index c85ba42..0ab1e44 100644
--- a/internal/module/module.go
+++ b/internal/version/module.go
@@ -1,4 +1,4 @@
-package module
+package version
 
 import (
 	"runtime/debug"
diff --git a/internal/version/version.go b/internal/version/version.go
index 788c46b..443fae0 100644
--- a/internal/version/version.go
+++ b/internal/version/version.go
@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"runtime"
 	"strings"
-
-	"github.com/xjasonlyu/tun2socks/v2/internal/debug"
 )
 
 const Name = "tun2socks"
@@ -25,7 +23,7 @@ func versionize(s string) string {
 }
 
 func String() string {
-	if !debug.Debug() {
+	if !Debug() {
 		return fmt.Sprintf("%s-%s", Name, versionize(Version))
 	}
 	return fmt.Sprintf("%s-%s (debug)", Name, versionize(Version))
diff --git a/stats/server.go b/stats/server.go
index 9a1b955..29ea39a 100644
--- a/stats/server.go
+++ b/stats/server.go
@@ -8,8 +8,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/xjasonlyu/tun2socks/v2/internal/debug"
-	"github.com/xjasonlyu/tun2socks/v2/internal/module"
 	V "github.com/xjasonlyu/tun2socks/v2/internal/version"
 	"github.com/xjasonlyu/tun2socks/v2/log"
 	"github.com/xjasonlyu/tun2socks/v2/tunnel/statistic"
@@ -217,7 +215,7 @@ func version(w http.ResponseWriter, r *http.Request) {
 	render.JSON(w, r, render.M{
 		"version": V.Version,
 		"commit":  V.GitCommit,
-		"debug":   debug.Debug(),
-		"modules": module.Info(),
+		"debug":   V.Debug(),
+		"modules": V.Info(),
 	})
 }