refactor(modules): replace github.com/yusing/go-proxy with github.com/yusing/godoxy

This commit is contained in:
yusing
2025-09-22 16:44:59 +08:00
parent 6b3bf84148
commit f9affba9fc
295 changed files with 835 additions and 806 deletions

View File

@@ -4,7 +4,7 @@ import (
"net/http"
"testing"
. "github.com/yusing/go-proxy/internal/utils/testing"
. "github.com/yusing/godoxy/internal/utils/testing"
)
func TestContentTypes(t *testing.T) {

View File

@@ -8,8 +8,8 @@ import (
"net/http"
"syscall"
"github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/go-proxy/internal/net/gphttp/httpheaders"
"github.com/yusing/godoxy/internal/gperr"
"github.com/yusing/godoxy/internal/net/gphttp/httpheaders"
)
// ServerError is for handling server errors.

View File

@@ -6,9 +6,9 @@ import (
"net/http"
"sync"
"github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/go-proxy/internal/net/gphttp/middleware"
"github.com/yusing/go-proxy/internal/types"
"github.com/yusing/godoxy/internal/gperr"
"github.com/yusing/godoxy/internal/net/gphttp/middleware"
"github.com/yusing/godoxy/internal/types"
)
type ipHash struct {

View File

@@ -5,7 +5,7 @@ import (
"sync/atomic"
"github.com/puzpuzpuz/xsync/v4"
"github.com/yusing/go-proxy/internal/types"
"github.com/yusing/godoxy/internal/types"
)
type leastConn struct {

View File

@@ -8,11 +8,11 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/go-proxy/internal/net/gphttp/httpheaders"
"github.com/yusing/go-proxy/internal/task"
"github.com/yusing/go-proxy/internal/types"
"github.com/yusing/go-proxy/internal/utils/pool"
"github.com/yusing/godoxy/internal/gperr"
"github.com/yusing/godoxy/internal/net/gphttp/httpheaders"
"github.com/yusing/godoxy/internal/task"
"github.com/yusing/godoxy/internal/types"
"github.com/yusing/godoxy/internal/utils/pool"
)
// TODO: stats of each server.

View File

@@ -3,8 +3,8 @@ package loadbalancer
import (
"testing"
"github.com/yusing/go-proxy/internal/types"
. "github.com/yusing/go-proxy/internal/utils/testing"
"github.com/yusing/godoxy/internal/types"
. "github.com/yusing/godoxy/internal/utils/testing"
)
func TestRebalance(t *testing.T) {

View File

@@ -4,7 +4,7 @@ import (
"net/http"
"sync/atomic"
"github.com/yusing/go-proxy/internal/types"
"github.com/yusing/godoxy/internal/types"
)
type roundRobin struct {

View File

@@ -3,10 +3,10 @@ package loadbalancer
import (
"net/http"
idlewatcher "github.com/yusing/go-proxy/internal/idlewatcher/types"
nettypes "github.com/yusing/go-proxy/internal/net/types"
"github.com/yusing/go-proxy/internal/types"
U "github.com/yusing/go-proxy/internal/utils"
idlewatcher "github.com/yusing/godoxy/internal/idlewatcher/types"
nettypes "github.com/yusing/godoxy/internal/net/types"
"github.com/yusing/godoxy/internal/types"
U "github.com/yusing/godoxy/internal/utils"
)
type server struct {

View File

@@ -3,7 +3,7 @@ package middleware
import (
"net/http"
"github.com/yusing/go-proxy/internal/route/rules"
"github.com/yusing/godoxy/internal/route/rules"
)
type Bypass []rules.RuleOn

View File

@@ -10,14 +10,14 @@ import (
"strings"
"testing"
"github.com/yusing/go-proxy/internal/entrypoint"
. "github.com/yusing/go-proxy/internal/net/gphttp/middleware"
"github.com/yusing/go-proxy/internal/net/gphttp/reverseproxy"
nettypes "github.com/yusing/go-proxy/internal/net/types"
"github.com/yusing/go-proxy/internal/route"
routeTypes "github.com/yusing/go-proxy/internal/route/types"
"github.com/yusing/go-proxy/internal/task"
expect "github.com/yusing/go-proxy/internal/utils/testing"
"github.com/yusing/godoxy/internal/entrypoint"
. "github.com/yusing/godoxy/internal/net/gphttp/middleware"
"github.com/yusing/godoxy/internal/net/gphttp/reverseproxy"
nettypes "github.com/yusing/godoxy/internal/net/types"
"github.com/yusing/godoxy/internal/route"
routeTypes "github.com/yusing/godoxy/internal/route/types"
"github.com/yusing/godoxy/internal/task"
expect "github.com/yusing/godoxy/internal/utils/testing"
)
func noOpHandler(w http.ResponseWriter, r *http.Request) {}

View File

@@ -3,7 +3,7 @@ package middleware
import (
"net/http"
"github.com/yusing/go-proxy/internal/net/gphttp/middleware/captcha"
"github.com/yusing/godoxy/internal/net/gphttp/middleware/captcha"
)
type hCaptcha struct {

View File

@@ -12,7 +12,7 @@ import (
_ "embed"
"github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/godoxy/internal/gperr"
)
type HcaptchaProvider struct {

View File

@@ -5,8 +5,8 @@ import (
"text/template"
"github.com/rs/zerolog/log"
"github.com/yusing/go-proxy/internal/auth"
"github.com/yusing/go-proxy/internal/net/gphttp"
"github.com/yusing/godoxy/internal/auth"
"github.com/yusing/godoxy/internal/net/gphttp"
_ "embed"
)

View File

@@ -4,7 +4,7 @@ import (
"net/http"
"time"
"github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/godoxy/internal/gperr"
)
type Provider interface {

View File

@@ -7,8 +7,8 @@ import (
_ "embed"
"github.com/yusing/go-proxy/internal/jsonstore"
"github.com/yusing/go-proxy/internal/utils"
"github.com/yusing/godoxy/internal/jsonstore"
"github.com/yusing/godoxy/internal/utils"
)
type CaptchaSession struct {

View File

@@ -6,9 +6,9 @@ import (
"github.com/go-playground/validator/v10"
"github.com/puzpuzpuz/xsync/v4"
gphttp "github.com/yusing/go-proxy/internal/net/gphttp"
nettypes "github.com/yusing/go-proxy/internal/net/types"
"github.com/yusing/go-proxy/internal/serialization"
gphttp "github.com/yusing/godoxy/internal/net/gphttp"
nettypes "github.com/yusing/godoxy/internal/net/types"
"github.com/yusing/godoxy/internal/serialization"
)
type (

View File

@@ -7,9 +7,9 @@ import (
"strings"
"testing"
"github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/go-proxy/internal/serialization"
. "github.com/yusing/go-proxy/internal/utils/testing"
"github.com/yusing/godoxy/internal/gperr"
"github.com/yusing/godoxy/internal/serialization"
. "github.com/yusing/godoxy/internal/utils/testing"
)
//go:embed test_data/cidr_whitelist_test.yml

View File

@@ -12,10 +12,10 @@ import (
"time"
"github.com/rs/zerolog/log"
"github.com/yusing/go-proxy/internal/common"
nettypes "github.com/yusing/go-proxy/internal/net/types"
"github.com/yusing/go-proxy/internal/utils/atomic"
"github.com/yusing/go-proxy/internal/utils/strutils"
"github.com/yusing/godoxy/internal/common"
nettypes "github.com/yusing/godoxy/internal/net/types"
"github.com/yusing/godoxy/internal/utils/atomic"
"github.com/yusing/godoxy/internal/utils/strutils"
)
type cloudflareRealIP struct {

View File

@@ -9,9 +9,9 @@ import (
"strings"
"github.com/rs/zerolog/log"
gphttp "github.com/yusing/go-proxy/internal/net/gphttp"
"github.com/yusing/go-proxy/internal/net/gphttp/httpheaders"
"github.com/yusing/go-proxy/internal/net/gphttp/middleware/errorpage"
gphttp "github.com/yusing/godoxy/internal/net/gphttp"
"github.com/yusing/godoxy/internal/net/gphttp/httpheaders"
"github.com/yusing/godoxy/internal/net/gphttp/middleware/errorpage"
)
type customErrorPage struct{}

View File

@@ -8,12 +8,12 @@ import (
"github.com/puzpuzpuz/xsync/v4"
"github.com/rs/zerolog/log"
"github.com/yusing/go-proxy/internal/common"
"github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/go-proxy/internal/task"
"github.com/yusing/go-proxy/internal/utils"
"github.com/yusing/go-proxy/internal/watcher"
"github.com/yusing/go-proxy/internal/watcher/events"
"github.com/yusing/godoxy/internal/common"
"github.com/yusing/godoxy/internal/gperr"
"github.com/yusing/godoxy/internal/task"
"github.com/yusing/godoxy/internal/utils"
"github.com/yusing/godoxy/internal/watcher"
"github.com/yusing/godoxy/internal/watcher/events"
)
const errPagesBasePath = common.ErrorPagesBasePath

View File

@@ -7,9 +7,9 @@ import (
"net/http"
"time"
"github.com/yusing/go-proxy/internal/net/gphttp/httpheaders"
"github.com/yusing/go-proxy/internal/route/routes"
"github.com/yusing/go-proxy/internal/utils"
"github.com/yusing/godoxy/internal/net/gphttp/httpheaders"
"github.com/yusing/godoxy/internal/route/routes"
"github.com/yusing/godoxy/internal/utils"
)
type (

View File

@@ -10,10 +10,10 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/yusing/go-proxy/internal/gperr"
gphttp "github.com/yusing/go-proxy/internal/net/gphttp"
"github.com/yusing/go-proxy/internal/net/gphttp/reverseproxy"
"github.com/yusing/go-proxy/internal/serialization"
"github.com/yusing/godoxy/internal/gperr"
gphttp "github.com/yusing/godoxy/internal/net/gphttp"
"github.com/yusing/godoxy/internal/net/gphttp/reverseproxy"
"github.com/yusing/godoxy/internal/serialization"
)
type (

View File

@@ -7,7 +7,7 @@ import (
"sort"
"github.com/goccy/go-yaml"
"github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/godoxy/internal/gperr"
)
var ErrMissingMiddlewareUse = gperr.New("missing middleware 'use' field")

View File

@@ -5,8 +5,8 @@ import (
"encoding/json"
"testing"
"github.com/yusing/go-proxy/internal/gperr"
. "github.com/yusing/go-proxy/internal/utils/testing"
"github.com/yusing/godoxy/internal/gperr"
. "github.com/yusing/godoxy/internal/utils/testing"
)
//go:embed test_data/middleware_compose.yml

View File

@@ -3,7 +3,7 @@ package middleware
import (
"net/http"
"github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/godoxy/internal/gperr"
)
type middlewareChain struct {

View File

@@ -6,7 +6,7 @@ import (
"strings"
"testing"
. "github.com/yusing/go-proxy/internal/utils/testing"
. "github.com/yusing/godoxy/internal/utils/testing"
)
type testPriority struct {

View File

@@ -6,10 +6,10 @@ import (
"path"
"github.com/rs/zerolog/log"
"github.com/yusing/go-proxy/internal/common"
"github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/go-proxy/internal/utils"
"github.com/yusing/go-proxy/internal/utils/strutils"
"github.com/yusing/godoxy/internal/common"
"github.com/yusing/godoxy/internal/gperr"
"github.com/yusing/godoxy/internal/utils"
"github.com/yusing/godoxy/internal/utils/strutils"
)
// snakes and cases will be stripped on `Get`

View File

@@ -8,9 +8,9 @@ import (
"github.com/PuerkitoBio/goquery"
"github.com/rs/zerolog/log"
gphttp "github.com/yusing/go-proxy/internal/net/gphttp"
"github.com/yusing/go-proxy/internal/utils"
"github.com/yusing/go-proxy/internal/utils/synk"
gphttp "github.com/yusing/godoxy/internal/net/gphttp"
"github.com/yusing/godoxy/internal/utils"
"github.com/yusing/godoxy/internal/utils/synk"
"golang.org/x/net/html"
)

View File

@@ -6,7 +6,7 @@ import (
"strings"
"testing"
expect "github.com/yusing/go-proxy/internal/utils/testing"
expect "github.com/yusing/godoxy/internal/utils/testing"
)
func TestInjectCSS(t *testing.T) {

View File

@@ -7,8 +7,8 @@ import (
"slices"
"testing"
nettypes "github.com/yusing/go-proxy/internal/net/types"
. "github.com/yusing/go-proxy/internal/utils/testing"
nettypes "github.com/yusing/godoxy/internal/net/types"
. "github.com/yusing/godoxy/internal/utils/testing"
)
func TestModifyRequest(t *testing.T) {

View File

@@ -7,8 +7,8 @@ import (
"slices"
"testing"
nettypes "github.com/yusing/go-proxy/internal/net/types"
. "github.com/yusing/go-proxy/internal/utils/testing"
nettypes "github.com/yusing/godoxy/internal/net/types"
. "github.com/yusing/godoxy/internal/utils/testing"
)
func TestModifyResponse(t *testing.T) {

View File

@@ -7,8 +7,8 @@ import (
"sync"
"sync/atomic"
"github.com/yusing/go-proxy/internal/auth"
"github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/godoxy/internal/auth"
"github.com/yusing/godoxy/internal/gperr"
)
type oidcMiddleware struct {

View File

@@ -3,7 +3,7 @@ package middleware
import (
"testing"
. "github.com/yusing/go-proxy/internal/utils/testing"
. "github.com/yusing/godoxy/internal/utils/testing"
)
func TestOIDCMiddlewarePerRouteConfig(t *testing.T) {

View File

@@ -4,7 +4,7 @@ import (
"net/http"
"testing"
. "github.com/yusing/go-proxy/internal/utils/testing"
. "github.com/yusing/godoxy/internal/utils/testing"
)
func TestRateLimit(t *testing.T) {

View File

@@ -4,8 +4,8 @@ import (
"net"
"net/http"
"github.com/yusing/go-proxy/internal/net/gphttp/httpheaders"
nettypes "github.com/yusing/go-proxy/internal/net/types"
"github.com/yusing/godoxy/internal/net/gphttp/httpheaders"
nettypes "github.com/yusing/godoxy/internal/net/types"
)
// https://nginx.org/en/docs/http/ngx_http_realip_module.html

View File

@@ -6,9 +6,9 @@ import (
"strings"
"testing"
"github.com/yusing/go-proxy/internal/net/gphttp/httpheaders"
nettypes "github.com/yusing/go-proxy/internal/net/types"
. "github.com/yusing/go-proxy/internal/utils/testing"
"github.com/yusing/godoxy/internal/net/gphttp/httpheaders"
nettypes "github.com/yusing/godoxy/internal/net/types"
. "github.com/yusing/godoxy/internal/utils/testing"
)
func TestSetRealIPOpts(t *testing.T) {

View File

@@ -6,7 +6,7 @@ import (
"strconv"
"strings"
"github.com/yusing/go-proxy/internal/common"
"github.com/yusing/godoxy/internal/common"
)
type redirectHTTP struct {

View File

@@ -4,8 +4,8 @@ import (
"net/http"
"testing"
nettypes "github.com/yusing/go-proxy/internal/net/types"
. "github.com/yusing/go-proxy/internal/utils/testing"
nettypes "github.com/yusing/godoxy/internal/net/types"
. "github.com/yusing/godoxy/internal/utils/testing"
)
func TestRedirectToHTTPs(t *testing.T) {

View File

@@ -9,11 +9,11 @@ import (
"net/http"
"net/http/httptest"
"github.com/yusing/go-proxy/internal/common"
"github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/go-proxy/internal/net/gphttp/reverseproxy"
nettypes "github.com/yusing/go-proxy/internal/net/types"
. "github.com/yusing/go-proxy/internal/utils/testing"
"github.com/yusing/godoxy/internal/common"
"github.com/yusing/godoxy/internal/gperr"
"github.com/yusing/godoxy/internal/net/gphttp/reverseproxy"
nettypes "github.com/yusing/godoxy/internal/net/types"
. "github.com/yusing/godoxy/internal/utils/testing"
)
//go:embed test_data/sample_headers.json

View File

@@ -10,7 +10,7 @@ import (
_ "embed"
"github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/godoxy/internal/gperr"
)
type themed struct {

View File

@@ -7,7 +7,7 @@ import (
"strconv"
"strings"
"github.com/yusing/go-proxy/internal/route/routes"
"github.com/yusing/godoxy/internal/route/routes"
)
type (

View File

@@ -5,7 +5,7 @@ import (
"net/http"
"strings"
"github.com/yusing/go-proxy/internal/net/gphttp/httpheaders"
"github.com/yusing/godoxy/internal/net/gphttp/httpheaders"
)
type (

View File

@@ -27,10 +27,10 @@ import (
"github.com/quic-go/quic-go/http3"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/yusing/go-proxy/internal/logging/accesslog"
"github.com/yusing/go-proxy/internal/net/gphttp/httpheaders"
nettypes "github.com/yusing/go-proxy/internal/net/types"
U "github.com/yusing/go-proxy/internal/utils"
"github.com/yusing/godoxy/internal/logging/accesslog"
"github.com/yusing/godoxy/internal/net/gphttp/httpheaders"
nettypes "github.com/yusing/godoxy/internal/net/types"
U "github.com/yusing/godoxy/internal/utils"
"golang.org/x/net/http/httpguts"
"golang.org/x/net/http2"

View File

@@ -7,7 +7,7 @@ import (
"strings"
"testing"
nettypes "github.com/yusing/go-proxy/internal/net/types"
nettypes "github.com/yusing/godoxy/internal/net/types"
)
type noopTransport struct{}

View File

@@ -14,9 +14,9 @@ import (
"github.com/quic-go/quic-go/http3"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/yusing/go-proxy/internal/acl"
"github.com/yusing/go-proxy/internal/common"
"github.com/yusing/go-proxy/internal/task"
"github.com/yusing/godoxy/internal/acl"
"github.com/yusing/godoxy/internal/common"
"github.com/yusing/godoxy/internal/task"
)
type CertProvider interface {

View File

@@ -8,8 +8,8 @@ import (
"github.com/quic-go/quic-go/http3"
"github.com/rs/zerolog"
slogzerolog "github.com/samber/slog-zerolog/v2"
"github.com/yusing/go-proxy/internal/common"
"github.com/yusing/go-proxy/internal/net/gphttp"
"github.com/yusing/godoxy/internal/common"
"github.com/yusing/godoxy/internal/net/gphttp"
)
func advertiseHTTP3(handler http.Handler, h3 *http3.Server) http.Handler {

View File

@@ -17,7 +17,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/gorilla/websocket"
"github.com/rs/zerolog/log"
"github.com/yusing/go-proxy/internal/common"
"github.com/yusing/godoxy/internal/common"
)
// Manager handles WebSocket connection state and ping-pong

View File

@@ -4,7 +4,7 @@ import (
"time"
"github.com/gin-gonic/gin"
apitypes "github.com/yusing/go-proxy/internal/api/types"
apitypes "github.com/yusing/godoxy/internal/api/types"
)
type DeduplicateFunc func(last, current any) bool

View File

@@ -3,7 +3,7 @@ package nettypes
import (
urlPkg "net/url"
"github.com/yusing/go-proxy/internal/utils"
"github.com/yusing/godoxy/internal/utils"
)
type URL struct {