tcjlj/OpenFlare
1
0
Fork 0
mirror of https://github.com/Rain-kl/OpenFlare.git synced 2026-10-05 07:26:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(pkg): merge pkg/utils into pkg/util

Browse Source 
Consolidate pure helper packages under pkg/util and update imports.
This commit is contained in:
ryan
2026-07-24 15:45:10 +08:00
parent 33a1c32cf8
commit d99c5b7c43
14 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/apps/agent/config/config.go
+2 -2
View File
@@ -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)
internal/apps/agent/nginx/manager.go
+2 -2
View File
@@ -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")
internal/apps/edge/updater/service.go
+2 -2
View File
@@ -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)
}
internal/apps/openflare/node/helpers.go
+2 -2
View File
@@ -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) {