重命名包 client 为 edge；重命名包 server 为 gateway

2025-05-16 17:04:03 +08:00
parent 22f3c37478
commit 20ac7dbd91
37 changed files with 65 additions and 75 deletions
--- a/cmd/client/main.go
+++ b/cmd/client/main.go
@@ -1,9 +1,9 @@
 package main

-import "proxy-server/client"
+import "proxy-server/edge"

 func main() {
-	err := client.Start()
+	err := edge.Start()
 	if err != nil {
 		println(err.Error())
 	}
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -1,11 +1,11 @@
 package main

 import (
-	"proxy-server/server"
+	"proxy-server/gateway"
 )

 func main() {
-	var app = server.New()
+	var app = gateway.New()
 	var err = app.Run()
 	if err != nil {
 		println(err.Error())
--- a/client/core/consts.go
+++ b/client/core/consts.go
--- a/client/client.go
+++ b/client/client.go
@@ -1,4 +1,4 @@
-package client
+package edge

 import (
 	"bufio"
@@ -12,10 +12,10 @@ import (
 	_ "net/http/pprof"
 	"os"
 	"os/signal"
-	"proxy-server/client/core"
-	"proxy-server/client/env"
-	"proxy-server/client/geo"
-	"proxy-server/client/report"
+	"proxy-server/edge/core"
+	"proxy-server/edge/env"
+	"proxy-server/edge/geo"
+	"proxy-server/edge/report"
 	"proxy-server/pkg/utils"
 	"time"
 )
--- a/client/env/env.go
+++ b/client/env/env.go
--- a/client/geo/geo.go
+++ b/client/geo/geo.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"net/http"
 	"net/textproto"
-	"proxy-server/client/env"
+	"proxy-server/edge/env"
 	"strings"
 )

--- a/client/report/report.go
+++ b/client/report/report.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"proxy-server/client/core"
-	"proxy-server/client/env"
+	"proxy-server/edge/core"
+	"proxy-server/edge/env"
 	"strings"
 )

--- a/gateway/app/app.go
+++ b/gateway/app/app.go
@@ -1,7 +1,7 @@
 package app

 import (
-	"proxy-server/server/core"
+	"proxy-server/gateway/core"
 )

 var (
--- a/gateway/core/auth.go
+++ b/gateway/core/auth.go
--- a/gateway/core/conn.go
+++ b/gateway/core/conn.go
--- a/gateway/core/consts.go
+++ b/gateway/core/consts.go
--- a/gateway/core/map.go
+++ b/gateway/core/map.go
--- a/gateway/core/security.go
+++ b/gateway/core/security.go
@@ -7,7 +7,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	g "proxy-server/server/globals"
+	g "proxy-server/gateway/globals"
 	"time"
 )

--- a/gateway/debug/debug.go
+++ b/gateway/debug/debug.go
--- a/gateway/env/env.go
+++ b/gateway/env/env.go
--- a/gateway/fwd/analysis.go
+++ b/gateway/fwd/analysis.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"io"
 	"log/slog"
+	"proxy-server/gateway/core"
 	"proxy-server/pkg/utils"
-	"proxy-server/server/core"
 	"strings"

 	"errors"
--- a/gateway/fwd/auth/auth.go
+++ b/gateway/fwd/auth/auth.go
@@ -3,8 +3,8 @@ package auth
 import (
 	"fmt"
 	"net"
-	"proxy-server/server/app"
-	"proxy-server/server/core"
+	"proxy-server/gateway/app"
+	"proxy-server/gateway/core"
 	"strconv"
 	"time"

--- a/gateway/fwd/ctrl.go
+++ b/gateway/fwd/ctrl.go
@@ -9,10 +9,10 @@ import (
 	"io"
 	"log/slog"
 	"net"
+	"proxy-server/gateway/app"
+	"proxy-server/gateway/env"
+	"proxy-server/gateway/report"
 	"proxy-server/pkg/utils"
-	"proxy-server/server/app"
-	"proxy-server/server/env"
-	"proxy-server/server/report"
 	"strconv"
 )

--- a/gateway/fwd/data.go
+++ b/gateway/fwd/data.go
@@ -8,10 +8,10 @@ import (
 	"io"
 	"log/slog"
 	"net"
+	"proxy-server/gateway/debug"
+	"proxy-server/gateway/env"
+	"proxy-server/gateway/fwd/metrics"
 	"proxy-server/pkg/utils"
-	"proxy-server/server/debug"
-	"proxy-server/server/env"
-	"proxy-server/server/fwd/metrics"
 	"strconv"
 	"sync"
 	"time"
--- a/gateway/fwd/dispatcher/dispatch.go
+++ b/gateway/fwd/dispatcher/dispatch.go
@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"log/slog"
 	"net"
+	"proxy-server/gateway/core"
+	"proxy-server/gateway/fwd/http"
+	"proxy-server/gateway/fwd/metrics"
+	"proxy-server/gateway/fwd/socks"
 	"proxy-server/pkg/utils"
-	"proxy-server/server/core"
-	"proxy-server/server/fwd/http"
-	"proxy-server/server/fwd/metrics"
-	"proxy-server/server/fwd/socks"
 	"strconv"
 	"strings"
 	"time"
--- a/gateway/fwd/fwd.go
+++ b/gateway/fwd/fwd.go
@@ -3,8 +3,8 @@ package fwd
 import (
 	"context"
 	"log/slog"
+	"proxy-server/gateway/core"
 	"proxy-server/pkg/utils"
-	"proxy-server/server/core"
 	"sync"
 )

--- a/gateway/fwd/http/http.go
+++ b/gateway/fwd/http/http.go
@@ -10,8 +10,8 @@ import (
 	"net"
 	"net/textproto"
 	"net/url"
-	"proxy-server/server/core"
-	"proxy-server/server/fwd/auth"
+	"proxy-server/gateway/core"
+	"proxy-server/gateway/fwd/auth"
 	"strings"

 	"errors"
--- a/gateway/fwd/metrics/debug.go
+++ b/gateway/fwd/metrics/debug.go
--- a/gateway/fwd/socks/socks.go
+++ b/gateway/fwd/socks/socks.go
@@ -10,9 +10,9 @@ import (
 	"io"
 	"log/slog"
 	"net"
+	"proxy-server/gateway/core"
+	"proxy-server/gateway/fwd/auth"
 	"proxy-server/pkg/utils"
-	"proxy-server/server/core"
-	"proxy-server/server/fwd/auth"
 	"slices"
 )

--- a/gateway/fwd/user.go
+++ b/gateway/fwd/user.go
@@ -6,11 +6,11 @@ import (
 	"errors"
 	"log/slog"
 	"net"
+	"proxy-server/gateway/core"
+	"proxy-server/gateway/env"
+	"proxy-server/gateway/fwd/dispatcher"
+	"proxy-server/gateway/fwd/metrics"
 	"proxy-server/pkg/utils"
-	"proxy-server/server/core"
-	"proxy-server/server/env"
-	"proxy-server/server/fwd/dispatcher"
-	"proxy-server/server/fwd/metrics"
 	"time"
 )

--- a/gateway/gateway.go
+++ b/gateway/gateway.go
@@ -1,4 +1,4 @@
-package server
+package gateway

 import (
 	"context"
@@ -6,16 +6,16 @@ import (
 	"log/slog"
 	"os"
 	"os/signal"
+	"proxy-server/gateway/app"
+	"proxy-server/gateway/core"
+	"proxy-server/gateway/debug"
+	"proxy-server/gateway/env"
+	"proxy-server/gateway/fwd"
+	g "proxy-server/gateway/globals"
+	"proxy-server/gateway/log"
+	"proxy-server/gateway/report"
+	"proxy-server/gateway/web"
 	"proxy-server/pkg/utils"
-	"proxy-server/server/app"
-	"proxy-server/server/core"
-	"proxy-server/server/debug"
-	"proxy-server/server/env"
-	"proxy-server/server/fwd"
-	g "proxy-server/server/globals"
-	"proxy-server/server/log"
-	"proxy-server/server/report"
-	"proxy-server/server/web"
 	"sync"
 	"time"

--- a/gateway/globals/redis.go
+++ b/gateway/globals/redis.go
@@ -4,7 +4,7 @@ import (
 	"github.com/redis/go-redis/v9"
 	"log/slog"
 	"net"
-	"proxy-server/server/env"
+	"proxy-server/gateway/env"
 )

 var Redis *redis.Client
--- a/gateway/log/logs.go
+++ b/gateway/log/logs.go
@@ -3,7 +3,7 @@ package log
 import (
 	"log/slog"
 	"os"
-	"proxy-server/server/env"
+	"proxy-server/gateway/env"
 	"time"

 	"github.com/lmittmann/tint"
--- a/gateway/report/report.go
+++ b/gateway/report/report.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"proxy-server/server/app"
-	"proxy-server/server/core"
-	"proxy-server/server/env"
+	"proxy-server/gateway/app"
+	"proxy-server/gateway/core"
+	"proxy-server/gateway/env"
 	"strings"
 )

--- a/gateway/web/handlers/auth.go
+++ b/gateway/web/handlers/auth.go
@@ -2,8 +2,8 @@ package handlers

 import (
 	"github.com/gofiber/fiber/v2"
-	"proxy-server/server/app"
-	"proxy-server/server/core"
+	"proxy-server/gateway/app"
+	"proxy-server/gateway/core"
 )

 type AuthReq struct {
--- a/gateway/web/handlers/debug.go
+++ b/gateway/web/handlers/debug.go
@@ -3,7 +3,7 @@ package handlers
 import (
 	"fmt"
 	"github.com/gofiber/fiber/v2"
-	"proxy-server/server/debug"
+	"proxy-server/gateway/debug"
 	"slices"
 )

--- a/gateway/web/router.go
+++ b/gateway/web/router.go
@@ -2,7 +2,7 @@ package web

 import (
 	"github.com/gofiber/fiber/v2"
-	"proxy-server/server/web/handlers"
+	"proxy-server/gateway/web/handlers"
 )

 func Router(r *fiber.App) {
--- a/gateway/web/web.go
+++ b/gateway/web/web.go
@@ -1,7 +1,7 @@
 package web

 import (
-	"proxy-server/server/env"
+	"proxy-server/gateway/env"
 	"strconv"

 	"github.com/gofiber/fiber/v2"
--- a/go.mod
+++ b/go.mod
@@ -10,15 +10,12 @@ require (
 	github.com/mattn/go-colorable v0.1.14
 	github.com/redis/go-redis/v9 v9.8.0
 	github.com/soheilhy/cmux v0.1.5
-	gorm.io/gorm v1.25.12
 )

 require (
 	github.com/andybalholm/brotli v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
--- a/go.sum
+++ b/go.sum
@@ -12,10 +12,6 @@ github.com/gofiber/fiber/v2 v2.52.6 h1:Rfp+ILPiYSvvVuIPvxrBns+HJp8qGLDnLJawAu27X
 github.com/gofiber/fiber/v2 v2.52.6/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
-github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
-github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
@@ -57,5 +53,3 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
 golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
-gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
--- a/pkg/utils/chan.go
+++ b/pkg/utils/chan.go
@@ -1,10 +0,0 @@
-package utils
-
-func WgWait[T WaitGroup](wg T) <-chan struct{} {
-	ch := make(chan struct{})
-	go func() {
-		wg.Wait()
-		ch <- struct{}{}
-	}()
-	return ch
-}
--- a/pkg/utils/sync.go
+++ b/pkg/utils/sync.go
@@ -33,3 +33,12 @@ func (c *CountWaitGroup) Wait() {
 func (c *CountWaitGroup) Count() uint64 {
 	return uint64(c.num.Load())
 }
+
+func WgWait[T WaitGroup](wg T) <-chan struct{} {
+	ch := make(chan struct{})
+	go func() {
+		wg.Wait()
+		ch <- struct{}{}
+	}()
+	return ch
+}