From d99c5b7c4316c3f400b900c5ae2d03ba28147a7f Mon Sep 17 00:00:00 2001
From: ryan <ryan@arctel.net>
Date: Fri, 24 Jul 2026 15:45:10 +0800
Subject: [PATCH] refactor(pkg): merge pkg/utils into pkg/util

Consolidate pure helper packages under pkg/util and update imports.
---
 AGENTS.md                               | 2 +-
 internal/apps/agent/config/config.go    | 4 ++--
 internal/apps/agent/nginx/manager.go    | 4 ++--
 internal/apps/edge/updater/service.go   | 4 ++--
 internal/apps/openflare/node/helpers.go | 4 ++--
 pkg/{utils => util}/format.go           | 4 ++--
 pkg/{utils => util}/format_test.go      | 2 +-
 pkg/{utils => util}/network.go          | 2 +-
 pkg/{utils => util}/network_test.go     | 2 +-
 pkg/{utils => util}/slice.go            | 2 +-
 pkg/{utils => util}/string.go           | 2 +-
 pkg/{utils => util}/value.go            | 2 +-
 pkg/{utils => util}/version.go          | 2 +-
 pkg/{utils => util}/version_compare.go  | 2 +-
 14 files changed, 19 insertions(+), 19 deletions(-)
 rename pkg/{utils => util}/format.go (94%)
 rename pkg/{utils => util}/format_test.go (98%)
 rename pkg/{utils => util}/network.go (98%)
 rename pkg/{utils => util}/network_test.go (98%)
 rename pkg/{utils => util}/slice.go (99%)
 rename pkg/{utils => util}/string.go (94%)
 rename pkg/{utils => util}/value.go (95%)
 rename pkg/{utils => util}/version.go (99%)
 rename pkg/{utils => util}/version_compare.go (99%)

diff --git a/AGENTS.md b/AGENTS.md
index 7a6c5b63..a4e13aae 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -135,7 +135,7 @@
 - `pkg/push/`：推送渠道客户端集成（Lark/Telegram/Email）。
 - `pkg/mail/`：邮件发送客户端。
 - `pkg/trace/`：OpenTelemetry 链路追踪配置。
-- `pkg/util/`：纯底层无副作用的系统工具（Crypto/Password/UUID）。
+- `pkg/util/`：纯底层无副作用的系统工具（Crypto/Password/UUID、格式化、网络、版本比较等）。
 
 前端目录：
 
diff --git a/internal/apps/agent/config/config.go b/internal/apps/agent/config/config.go
index 9907dd88..767bae01 100644
--- a/internal/apps/agent/config/config.go
+++ b/internal/apps/agent/config/config.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/Rain-kl/Wavelet/internal/apps/edge/nodeip"
-	"github.com/Rain-kl/Wavelet/pkg/utils"
+	"github.com/Rain-kl/Wavelet/pkg/util"
 )
 
 const (
@@ -147,7 +147,7 @@ func Load(path string) (*Config, error) {
 func applyDefaults(cfg *Config, baseDir string) {
 	baseDir = filepath.Clean(baseDir)
 	cfg.Version = Version
-	cfg.OpenrestyResolvers = utils.UniqueAndCleanStringSlice(cfg.OpenrestyResolvers)
+	cfg.OpenrestyResolvers = util.UniqueAndCleanStringSlice(cfg.OpenrestyResolvers)
 	applyAgentIdentityDefaults(cfg)
 	applyAgentPathDefaults(cfg, baseDir)
 	applyAgentTimingDefaults(cfg)
diff --git a/internal/apps/agent/nginx/manager.go b/internal/apps/agent/nginx/manager.go
index 4560b57e..57bc5a34 100644
--- a/internal/apps/agent/nginx/manager.go
+++ b/internal/apps/agent/nginx/manager.go
@@ -25,7 +25,7 @@ import (
 
 	sharedprotocol "github.com/Rain-kl/Wavelet/pkg/protocol"
 	openrestyrender "github.com/Rain-kl/Wavelet/pkg/render/openresty"
-	"github.com/Rain-kl/Wavelet/pkg/utils"
+	"github.com/Rain-kl/Wavelet/pkg/util"
 
 	"github.com/Rain-kl/Wavelet/internal/apps/agent/protocol"
 	"github.com/Rain-kl/Wavelet/internal/apps/agent/runtimeuser"
@@ -1506,7 +1506,7 @@ func ResolverDirective(explicitResolvers []string) string {
 }
 
 func resolverAddresses(explicitResolvers []string) []string {
-	if resolvers := utils.UniqueAndCleanStringSlice(explicitResolvers); len(resolvers) > 0 {
+	if resolvers := util.UniqueAndCleanStringSlice(explicitResolvers); len(resolvers) > 0 {
 		return resolvers
 	}
 	data, err := os.ReadFile("/etc/resolv.conf")
diff --git a/internal/apps/edge/updater/service.go b/internal/apps/edge/updater/service.go
index 8f2f3805..86833883 100644
--- a/internal/apps/edge/updater/service.go
+++ b/internal/apps/edge/updater/service.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Rain-kl/Wavelet/pkg/utils"
+	"github.com/Rain-kl/Wavelet/pkg/util"
 )
 
 const (
@@ -418,5 +418,5 @@ func buildReleaseCheckKey(options UpdateOptions, remoteVersion string) string {
 }
 
 func compareVersions(local string, remote string) int {
-	return utils.CompareVersions(local, remote)
+	return util.CompareVersions(local, remote)
 }
diff --git a/internal/apps/openflare/node/helpers.go b/internal/apps/openflare/node/helpers.go
index b8476412..ef4e3199 100644
--- a/internal/apps/openflare/node/helpers.go
+++ b/internal/apps/openflare/node/helpers.go
@@ -17,7 +17,7 @@ import (
 
 	ofws "github.com/Rain-kl/Wavelet/internal/apps/openflare/websocket"
 	"github.com/Rain-kl/Wavelet/internal/model"
-	"github.com/Rain-kl/Wavelet/pkg/utils"
+	"github.com/Rain-kl/Wavelet/pkg/util"
 )
 
 const (
@@ -301,7 +301,7 @@ func isVersionNewer(current string, latest string) bool {
 }
 
 func compareVersions(local, remote string) int {
-	return utils.CompareVersions(local, remote)
+	return util.CompareVersions(local, remote)
 }
 
 func fetchLatestGitHubRelease(ctx context.Context, repo string, channel releaseChannel) (*githubReleaseResponse, error) {
diff --git a/pkg/utils/format.go b/pkg/util/format.go
similarity index 94%
rename from pkg/utils/format.go
rename to pkg/util/format.go
index 870ef88a..2aa9f5a9 100644
--- a/pkg/utils/format.go
+++ b/pkg/util/format.go
@@ -1,5 +1,5 @@
-// Package utils provides shared formatting and string helper functions.
-package utils
+// Package util provides shared formatting and string helper functions.
+package util
 
 import (
 	"fmt"
diff --git a/pkg/utils/format_test.go b/pkg/util/format_test.go
similarity index 98%
rename from pkg/utils/format_test.go
rename to pkg/util/format_test.go
index dce34809..9c200bad 100644
--- a/pkg/utils/format_test.go
+++ b/pkg/util/format_test.go
@@ -1,4 +1,4 @@
-package utils
+package util
 
 import (
 	"testing"
diff --git a/pkg/utils/network.go b/pkg/util/network.go
similarity index 98%
rename from pkg/utils/network.go
rename to pkg/util/network.go
index 483e20ae..68083a9f 100644
--- a/pkg/utils/network.go
+++ b/pkg/util/network.go
@@ -1,4 +1,4 @@
-package utils
+package util
 
 import (
 	"log/slog"
diff --git a/pkg/utils/network_test.go b/pkg/util/network_test.go
similarity index 98%
rename from pkg/utils/network_test.go
rename to pkg/util/network_test.go
index 879eb610..94c2493f 100644
--- a/pkg/utils/network_test.go
+++ b/pkg/util/network_test.go
@@ -1,4 +1,4 @@
-package utils
+package util
 
 import (
 	"testing"
diff --git a/pkg/utils/slice.go b/pkg/util/slice.go
similarity index 99%
rename from pkg/utils/slice.go
rename to pkg/util/slice.go
index ba836f59..53025013 100644
--- a/pkg/utils/slice.go
+++ b/pkg/util/slice.go
@@ -1,4 +1,4 @@
-package utils
+package util
 
 import (
 	"sort"
diff --git a/pkg/utils/string.go b/pkg/util/string.go
similarity index 94%
rename from pkg/utils/string.go
rename to pkg/util/string.go
index d4dd50fa..d052a239 100644
--- a/pkg/utils/string.go
+++ b/pkg/util/string.go
@@ -1,4 +1,4 @@
-package utils
+package util
 
 import "strings"
 
diff --git a/pkg/utils/value.go b/pkg/util/value.go
similarity index 95%
rename from pkg/utils/value.go
rename to pkg/util/value.go
index 75f71a2a..759a62f2 100644
--- a/pkg/utils/value.go
+++ b/pkg/util/value.go
@@ -1,4 +1,4 @@
-package utils
+package util
 
 import "fmt"
 
diff --git a/pkg/utils/version.go b/pkg/util/version.go
similarity index 99%
rename from pkg/utils/version.go
rename to pkg/util/version.go
index 1eaeea97..dda8fd14 100644
--- a/pkg/utils/version.go
+++ b/pkg/util/version.go
@@ -1,4 +1,4 @@
-package utils
+package util
 
 import (
 	"strconv"
diff --git a/pkg/utils/version_compare.go b/pkg/util/version_compare.go
similarity index 99%
rename from pkg/utils/version_compare.go
rename to pkg/util/version_compare.go
index 1338a189..dc490081 100644
--- a/pkg/utils/version_compare.go
+++ b/pkg/util/version_compare.go
@@ -1,4 +1,4 @@
-package utils
+package util
 
 import "strconv"