diff --git a/.golangci.yml b/.golangci.yml index 88c050ab..946c8d29 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -108,8 +108,7 @@ linters: - all - -SA1019 dot-import-whitelist: - - github.com/yusing/go-proxy/internal/utils/testing - - github.com/yusing/go-proxy/internal/api/v1/utils + - github.com/yusing/godoxy/internal/utils/testing tagalign: align: false sort: true diff --git a/Makefile b/Makefile index 2e98d15d..d653d5f3 100755 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ export GOOS = linux WEBUI_DIR ?= ../godoxy-frontend DOCS_DIR ?= ../godoxy-wiki -LDFLAGS = -X github.com/yusing/go-proxy/pkg.version=${VERSION} -checklinkname=0 +LDFLAGS = -X github.com/yusing/godoxy/pkg.version=${VERSION} -checklinkname=0 ifeq ($(agent), 1) NAME = godoxy-agent diff --git a/agent/cmd/main.go b/agent/cmd/main.go index c6633577..6b08caa5 100644 --- a/agent/cmd/main.go +++ b/agent/cmd/main.go @@ -5,16 +5,16 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/agent/pkg/env" - "github.com/yusing/go-proxy/agent/pkg/server" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/metrics/systeminfo" - httpServer "github.com/yusing/go-proxy/internal/net/gphttp/server" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/utils/strutils" - "github.com/yusing/go-proxy/pkg" - socketproxy "github.com/yusing/go-proxy/socketproxy/pkg" + "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/agent/pkg/env" + "github.com/yusing/godoxy/agent/pkg/server" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/metrics/systeminfo" + httpServer "github.com/yusing/godoxy/internal/net/gphttp/server" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/utils/strutils" + "github.com/yusing/godoxy/pkg" + socketproxy "github.com/yusing/godoxy/socketproxy/pkg" ) func main() { diff --git a/agent/go.mod b/agent/go.mod index 44eff438..b5c90283 100644 --- a/agent/go.mod +++ b/agent/go.mod @@ -1,12 +1,12 @@ -module github.com/yusing/go-proxy/agent +module github.com/yusing/godoxy/agent go 1.25.1 -replace github.com/yusing/go-proxy => .. +replace github.com/yusing/godoxy => .. -replace github.com/yusing/go-proxy/socketproxy => ../socket-proxy +replace github.com/yusing/godoxy/socketproxy => ../socket-proxy -replace github.com/yusing/go-proxy/internal/utils => ../internal/utils +replace github.com/yusing/godoxy/internal/utils => ../internal/utils replace github.com/shirou/gopsutil/v4 => github.com/godoxy-app/gopsutil/v4 v4.0.0-20250816043325-ee003f88b84d @@ -18,9 +18,9 @@ require ( github.com/puzpuzpuz/xsync/v4 v4.1.0 github.com/rs/zerolog v1.34.0 github.com/stretchr/testify v1.11.1 - github.com/yusing/go-proxy v0.17.6 - github.com/yusing/go-proxy/internal/utils v0.0.0 - github.com/yusing/go-proxy/socketproxy v0.0.0-00010101000000-000000000000 + github.com/yusing/godoxy v0.17.6 + github.com/yusing/godoxy/internal/utils v0.0.0 + github.com/yusing/godoxy/socketproxy v0.0.0-00010101000000-000000000000 ) require ( diff --git a/agent/go.sum b/agent/go.sum index ad82ed39..f79c7ff7 100644 --- a/agent/go.sum +++ b/agent/go.sum @@ -6,12 +6,16 @@ github.com/PuerkitoBio/goquery v1.10.3 h1:pFYcNSqHxBD06Fpj/KsbStFRsgRATgnf3LeXiU github.com/PuerkitoBio/goquery v1.10.3/go.mod h1:tMUX0zDMHXYlAQk6p35XxQMqMweEKB7iK7iLNd4RH4Y= github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM= github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA= +github.com/buger/goterm v1.0.4 h1:Z9YvGmOih81P0FbVtEYTFF6YsSgxSUKEhf/f9bTMXbY= +github.com/buger/goterm v1.0.4/go.mod h1:HiFWV3xnkolgrBV3mY8m0X0Pumt4zg4QhbdOzQtB8tE= github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M= github.com/bytedance/gopkg v0.1.3/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM= github.com/bytedance/sonic v1.14.1 h1:FBMC0zVz5XUmE4z9wF4Jey0An5FueFvOsTKKKtwIl7w= github.com/bytedance/sonic v1.14.1/go.mod h1:gi6uhQLMbTdeP0muCnrjHLeCUPyb70ujhnNlhOylAFc= github.com/bytedance/sonic/loader v0.3.0 h1:dskwH8edlzNMctoruo8FPTJDF3vLtDT0sXZwvZJyqeA= github.com/bytedance/sonic/loader v0.3.0/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= +github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= +github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM= github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M= @@ -22,13 +26,19 @@ github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151X github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= +github.com/coreos/go-oidc/v3 v3.15.0 h1:R6Oz8Z4bqWR7VFQ+sPSvZPQv4x8M+sJkDO5ojgwlyAg= +github.com/coreos/go-oidc/v3 v3.15.0/go.mod h1:HaZ3szPaZ0e4r6ebqvsLWlk2Tn+aejfmrfah6hnSYEU= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/diskfs/go-diskfs v1.7.0 h1:vonWmt5CMowXwUc79jWyGrf2DIMeoOjkLlMnQYGVOs8= +github.com/diskfs/go-diskfs v1.7.0/go.mod h1:LhQyXqOugWFRahYUSw47NyZJPezFzB9UELwhpszLP/k= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/djherbis/times v1.6.0 h1:w2ctJ92J8fBvWPxugmXIv7Nz7Q3iDMKNx9v5ocVH20c= +github.com/djherbis/times v1.6.0/go.mod h1:gOHeRAz2h+VJNZ5Gmc/o7iD9k4wW7NMVqieYCY99oc0= github.com/docker/cli v28.4.0+incompatible h1:RBcf3Kjw2pMtwui5V0DIMdyeab8glEw5QY0UUU4C9kY= github.com/docker/cli v28.4.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v28.4.0+incompatible h1:KVC7bz5zJY/4AZe/78BIvCnPsLaC9T/zh72xnlrTTOk= @@ -41,12 +51,18 @@ github.com/ebitengine/purego v0.8.4 h1:CF7LEKg5FFOsASUj0+QwaXf8Ht6TlFxg09+S9wz0o github.com/ebitengine/purego v0.8.4/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= +github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/gabriel-vasile/mimetype v1.4.10 h1:zyueNbySn/z8mJZHLt6IPw0KoZsiQNszIpU+bX4+ZK0= github.com/gabriel-vasile/mimetype v1.4.10/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w= github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM= github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ= github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= +github.com/go-acme/lego/v4 v4.26.0 h1:521aEQxNstXvPQcFDDPrJiFfixcCQuvAvm35R4GbyYA= +github.com/go-acme/lego/v4 v4.26.0/go.mod h1:BQVAWgcyzW4IT9eIKHY/RxYlVhoyKyOMXOkq7jK1eEQ= +github.com/go-jose/go-jose/v4 v4.1.2 h1:TK/7NqRQZfgAh+Td8AlsrvtPoUyiHh0LqVvokh+1vHI= +github.com/go-jose/go-jose/v4 v4.1.2/go.mod h1:22cg9HWM1pOlnRiY+9cQYJ9XHmya1bYW8OeDM6Ku6Oo= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -63,6 +79,8 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHOvC0/uWoy2Fzwn4= github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo= +github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= +github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw= @@ -70,6 +88,8 @@ github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7Lk github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godoxy-app/gopsutil/v4 v4.0.0-20250816043325-ee003f88b84d h1:bNqtnmyhGDxpBSaFYIo7ferYRIc/QzlaGfIhh/JmMPk= github.com/godoxy-app/gopsutil/v4 v4.0.0-20250816043325-ee003f88b84d/go.mod h1:7iQ/w4jyGYJCZ56dZLNztwM4atNxj5C2HNTBxhLvV8A= +github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo= +github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= @@ -84,6 +104,8 @@ github.com/gotify/server/v2 v2.7.2 h1:YRgYl/kB7Uh4OINd7gK60N3QBTY4YEeKTrBLhd67LC github.com/gotify/server/v2 v2.7.2/go.mod h1:KJH+8yhkAxArygPwaRfp9otHjt6tE0YSzdrsgPX/5EE= github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 h1:8Tjv8EJ+pM1xP8mK6egEbD1OgnVTyacbefKhmbLhIhU= github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2/go.mod h1:pkJQ2tZHJ0aFOVEEot6oZmaVEZcRme73eIFmhiVuRWs= +github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8= +github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= github.com/json-iterator/go v1.1.13-0.20220915233716-71ac16282d12 h1:9Nu54bhS/H/Kgo2/7xNSUuC5G28VR8ljfrLKU2G4IjU= github.com/json-iterator/go v1.1.13-0.20220915233716-71ac16282d12/go.mod h1:TBzl5BIHNXfS9+C35ZyJaklL7mLDbgUkcgXzSLa8Tk0= github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= @@ -98,6 +120,10 @@ github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8 github.com/lithammer/fuzzysearch v1.1.8/go.mod h1:IdqeyBClc3FFqSzYq/MXESsS4S0FsZ5ajtkr5xPLts4= github.com/lufia/plan9stats v0.0.0-20250827001030-24949be3fa54 h1:mFWunSatvkQQDhpdyuFAYwyAan3hzCuma+Pz8sqvOfg= github.com/lufia/plan9stats v0.0.0-20250827001030-24949be3fa54/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg= +github.com/luthermonson/go-proxmox v0.2.3 h1:NAjUJ5Jd1ynIK6UHMGd/VLGgNZWpGXhfL+DBmAVSEaA= +github.com/luthermonson/go-proxmox v0.2.3/go.mod h1:oyFgg2WwTEIF0rP6ppjiixOHa5ebK1p8OaRiFhvICBQ= +github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg= +github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= @@ -105,6 +131,8 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/ github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/miekg/dns v1.1.68 h1:jsSRkNozw7G/mnmXULynzMNIsgY2dHC8LO6U6Ij2JEA= +github.com/miekg/dns v1.1.68/go.mod h1:fujopn7TB3Pu3JM69XaawiU0wqjpL9/8xGop5UrTPps= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw= @@ -234,6 +262,8 @@ golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I= golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= +golang.org/x/oauth2 v0.31.0 h1:8Fq0yVZLh4j4YA47vHKFTa9Ew5XIrCP8LC6UeNZnLxo= +golang.org/x/oauth2 v0.31.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/agent/pkg/agent/agent_pool.go b/agent/pkg/agent/agent_pool.go index 594e1ad0..ed01115f 100644 --- a/agent/pkg/agent/agent_pool.go +++ b/agent/pkg/agent/agent_pool.go @@ -4,7 +4,7 @@ import ( "iter" "github.com/puzpuzpuz/xsync/v4" - "github.com/yusing/go-proxy/internal/common" + "github.com/yusing/godoxy/internal/common" ) var agentPool = xsync.NewMap[string, *AgentConfig](xsync.WithPresize(10)) diff --git a/agent/pkg/agent/config.go b/agent/pkg/agent/config.go index a5b4f047..84caf407 100644 --- a/agent/pkg/agent/config.go +++ b/agent/pkg/agent/config.go @@ -15,8 +15,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/agent/pkg/certs" - "github.com/yusing/go-proxy/pkg" + "github.com/yusing/godoxy/agent/pkg/certs" + "github.com/yusing/godoxy/pkg" ) type AgentConfig struct { diff --git a/agent/pkg/agent/http_requests.go b/agent/pkg/agent/http_requests.go index e2380ba9..74cd63fb 100644 --- a/agent/pkg/agent/http_requests.go +++ b/agent/pkg/agent/http_requests.go @@ -6,8 +6,8 @@ import ( "net/http" "github.com/gorilla/websocket" - "github.com/yusing/go-proxy/internal/net/gphttp/reverseproxy" - nettypes "github.com/yusing/go-proxy/internal/net/types" + "github.com/yusing/godoxy/internal/net/gphttp/reverseproxy" + nettypes "github.com/yusing/godoxy/internal/net/types" ) func (cfg *AgentConfig) Do(ctx context.Context, method, endpoint string, body io.Reader) (*http.Response, error) { diff --git a/agent/pkg/agentproxy/config.go b/agent/pkg/agentproxy/config.go index 8a61f53f..1babd9b6 100644 --- a/agent/pkg/agentproxy/config.go +++ b/agent/pkg/agentproxy/config.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - route "github.com/yusing/go-proxy/internal/route/types" + route "github.com/yusing/godoxy/internal/route/types" ) type Config struct { diff --git a/agent/pkg/certs/zip.go b/agent/pkg/certs/zip.go index c753ec53..4dca3a0c 100644 --- a/agent/pkg/certs/zip.go +++ b/agent/pkg/certs/zip.go @@ -6,7 +6,7 @@ import ( "io" "path/filepath" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/utils/strutils" ) const AgentCertsBasePath = "certs" diff --git a/agent/pkg/certs/zip_test.go b/agent/pkg/certs/zip_test.go index b4860812..e06a53b3 100644 --- a/agent/pkg/certs/zip_test.go +++ b/agent/pkg/certs/zip_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/yusing/go-proxy/agent/pkg/certs" + "github.com/yusing/godoxy/agent/pkg/certs" ) func TestZipCert(t *testing.T) { diff --git a/agent/pkg/env/env.go b/agent/pkg/env/env.go index 74466bd2..017b15df 100644 --- a/agent/pkg/env/env.go +++ b/agent/pkg/env/env.go @@ -3,8 +3,8 @@ package env import ( "os" - "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/internal/common" + "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/internal/common" "github.com/rs/zerolog/log" ) diff --git a/agent/pkg/handler/check_health.go b/agent/pkg/handler/check_health.go index 57916490..ac9d9290 100644 --- a/agent/pkg/handler/check_health.go +++ b/agent/pkg/handler/check_health.go @@ -8,8 +8,8 @@ import ( "os" "strings" - "github.com/yusing/go-proxy/internal/types" - "github.com/yusing/go-proxy/internal/watcher/health/monitor" + "github.com/yusing/godoxy/internal/types" + "github.com/yusing/godoxy/internal/watcher/health/monitor" ) var defaultHealthConfig = types.DefaultHealthConfig() diff --git a/agent/pkg/handler/check_health_test.go b/agent/pkg/handler/check_health_test.go index 07d72871..c49cafb6 100644 --- a/agent/pkg/handler/check_health_test.go +++ b/agent/pkg/handler/check_health_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/agent/pkg/handler" - "github.com/yusing/go-proxy/internal/types" + "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/agent/pkg/handler" + "github.com/yusing/godoxy/internal/types" ) func TestCheckHealthHTTP(t *testing.T) { diff --git a/agent/pkg/handler/handler.go b/agent/pkg/handler/handler.go index f0ec77aa..f330cadf 100644 --- a/agent/pkg/handler/handler.go +++ b/agent/pkg/handler/handler.go @@ -6,11 +6,11 @@ import ( "github.com/gin-gonic/gin" "github.com/gorilla/websocket" - "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/agent/pkg/env" - "github.com/yusing/go-proxy/internal/metrics/systeminfo" - "github.com/yusing/go-proxy/pkg" - socketproxy "github.com/yusing/go-proxy/socketproxy/pkg" + "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/agent/pkg/env" + "github.com/yusing/godoxy/internal/metrics/systeminfo" + "github.com/yusing/godoxy/pkg" + socketproxy "github.com/yusing/godoxy/socketproxy/pkg" ) type ServeMux struct{ *http.ServeMux } diff --git a/agent/pkg/handler/proxy_http.go b/agent/pkg/handler/proxy_http.go index b0641aa0..d840d456 100644 --- a/agent/pkg/handler/proxy_http.go +++ b/agent/pkg/handler/proxy_http.go @@ -6,8 +6,8 @@ import ( "net/http/httputil" "time" - "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/agent/pkg/agentproxy" + "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/agent/pkg/agentproxy" ) func NewTransport() *http.Transport { diff --git a/agent/pkg/server/server.go b/agent/pkg/server/server.go index 3ff04278..c6a23cc5 100644 --- a/agent/pkg/server/server.go +++ b/agent/pkg/server/server.go @@ -7,10 +7,10 @@ import ( "net/http" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/agent/pkg/env" - "github.com/yusing/go-proxy/agent/pkg/handler" - "github.com/yusing/go-proxy/internal/net/gphttp/server" - "github.com/yusing/go-proxy/internal/task" + "github.com/yusing/godoxy/agent/pkg/env" + "github.com/yusing/godoxy/agent/pkg/handler" + "github.com/yusing/godoxy/internal/net/gphttp/server" + "github.com/yusing/godoxy/internal/task" ) type Options struct { diff --git a/cmd/main.go b/cmd/main.go index bd8ecf97..9f066d02 100755 --- a/cmd/main.go +++ b/cmd/main.go @@ -5,19 +5,19 @@ import ( "sync" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/auth" - "github.com/yusing/go-proxy/internal/common" - "github.com/yusing/go-proxy/internal/config" - "github.com/yusing/go-proxy/internal/dnsproviders" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/homepage" - "github.com/yusing/go-proxy/internal/logging" - "github.com/yusing/go-proxy/internal/logging/memlogger" - "github.com/yusing/go-proxy/internal/metrics/systeminfo" - "github.com/yusing/go-proxy/internal/metrics/uptime" - "github.com/yusing/go-proxy/internal/net/gphttp/middleware" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/pkg" + "github.com/yusing/godoxy/internal/auth" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/config" + "github.com/yusing/godoxy/internal/dnsproviders" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/homepage" + "github.com/yusing/godoxy/internal/logging" + "github.com/yusing/godoxy/internal/logging/memlogger" + "github.com/yusing/godoxy/internal/metrics/systeminfo" + "github.com/yusing/godoxy/internal/metrics/uptime" + "github.com/yusing/godoxy/internal/net/gphttp/middleware" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/pkg" ) func parallel(fns ...func()) { diff --git a/cmd/pprof_prof.go b/cmd/pprof_prof.go index 11f7a428..ae03cfea 100644 --- a/cmd/pprof_prof.go +++ b/cmd/pprof_prof.go @@ -10,7 +10,7 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/utils/strutils" ) const mb = 1024 * 1024 diff --git a/go.mod b/go.mod index 52731b1a..0696de85 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,12 @@ -module github.com/yusing/go-proxy +module github.com/yusing/godoxy go 1.25.1 -replace github.com/yusing/go-proxy/agent => ./agent +replace github.com/yusing/godoxy/agent => ./agent -replace github.com/yusing/go-proxy/internal/dnsproviders => ./internal/dnsproviders +replace github.com/yusing/godoxy/internal/dnsproviders => ./internal/dnsproviders -replace github.com/yusing/go-proxy/internal/utils => ./internal/utils +replace github.com/yusing/godoxy/internal/utils => ./internal/utils replace github.com/coreos/go-oidc/v3 => github.com/godoxy-app/go-oidc/v3 v3.0.0-20250816044348-0630187cb14b @@ -44,9 +44,9 @@ require ( github.com/samber/slog-zerolog/v2 v2.7.3 github.com/spf13/afero v1.15.0 github.com/stretchr/testify v1.11.1 - github.com/yusing/go-proxy/agent v0.0.0-20250913143824-493c0afdface - github.com/yusing/go-proxy/internal/dnsproviders v0.0.0-20250913143824-493c0afdface - github.com/yusing/go-proxy/internal/utils v0.0.0 + github.com/yusing/godoxy/agent v0.0.0-20250913143824-493c0afdface + github.com/yusing/godoxy/internal/dnsproviders v0.0.0-20250913143824-493c0afdface + github.com/yusing/godoxy/internal/utils v0.0.0 ) require ( diff --git a/internal/acl/config.go b/internal/acl/config.go index 8d2f3068..33f7320d 100644 --- a/internal/acl/config.go +++ b/internal/acl/config.go @@ -6,12 +6,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/logging/accesslog" - "github.com/yusing/go-proxy/internal/maxmind" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/utils" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/logging/accesslog" + "github.com/yusing/godoxy/internal/maxmind" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/utils" ) type Config struct { diff --git a/internal/acl/matcher.go b/internal/acl/matcher.go index b19daf87..4c9fe59d 100644 --- a/internal/acl/matcher.go +++ b/internal/acl/matcher.go @@ -4,8 +4,8 @@ import ( "net" "strings" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/maxmind" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/maxmind" ) type MatcherFunc func(*maxmind.IPInfo) bool diff --git a/internal/acl/matcher_test.go b/internal/acl/matcher_test.go index 0d015b47..8c638f06 100644 --- a/internal/acl/matcher_test.go +++ b/internal/acl/matcher_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - maxmind "github.com/yusing/go-proxy/internal/maxmind/types" - "github.com/yusing/go-proxy/internal/serialization" + maxmind "github.com/yusing/godoxy/internal/maxmind/types" + "github.com/yusing/godoxy/internal/serialization" ) func TestMatchers(t *testing.T) { diff --git a/internal/api/handler.go b/internal/api/handler.go index a78397e6..8677019b 100644 --- a/internal/api/handler.go +++ b/internal/api/handler.go @@ -8,19 +8,19 @@ import ( "github.com/gin-gonic/gin" "github.com/gorilla/websocket" "github.com/rs/zerolog/log" - apitypes "github.com/yusing/go-proxy/internal/api/types" - apiV1 "github.com/yusing/go-proxy/internal/api/v1" - agentApi "github.com/yusing/go-proxy/internal/api/v1/agent" - authApi "github.com/yusing/go-proxy/internal/api/v1/auth" - certApi "github.com/yusing/go-proxy/internal/api/v1/cert" - dockerApi "github.com/yusing/go-proxy/internal/api/v1/docker" - fileApi "github.com/yusing/go-proxy/internal/api/v1/file" - homepageApi "github.com/yusing/go-proxy/internal/api/v1/homepage" - metricsApi "github.com/yusing/go-proxy/internal/api/v1/metrics" - routeApi "github.com/yusing/go-proxy/internal/api/v1/route" - "github.com/yusing/go-proxy/internal/auth" - "github.com/yusing/go-proxy/internal/common" - "github.com/yusing/go-proxy/internal/gperr" + apitypes "github.com/yusing/godoxy/internal/api/types" + apiV1 "github.com/yusing/godoxy/internal/api/v1" + agentApi "github.com/yusing/godoxy/internal/api/v1/agent" + authApi "github.com/yusing/godoxy/internal/api/v1/auth" + certApi "github.com/yusing/godoxy/internal/api/v1/cert" + dockerApi "github.com/yusing/godoxy/internal/api/v1/docker" + fileApi "github.com/yusing/godoxy/internal/api/v1/file" + homepageApi "github.com/yusing/godoxy/internal/api/v1/homepage" + metricsApi "github.com/yusing/godoxy/internal/api/v1/metrics" + routeApi "github.com/yusing/godoxy/internal/api/v1/route" + "github.com/yusing/godoxy/internal/auth" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/gperr" ) // @title GoDoxy API diff --git a/internal/api/types/error.go b/internal/api/types/error.go index 98b60e5f..0951ee5a 100644 --- a/internal/api/types/error.go +++ b/internal/api/types/error.go @@ -3,7 +3,7 @@ package apitypes import ( "errors" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) type ErrorResponse struct { diff --git a/internal/api/v1/agent/common.go b/internal/api/v1/agent/common.go index ed850076..ac1e0b3b 100644 --- a/internal/api/v1/agent/common.go +++ b/internal/api/v1/agent/common.go @@ -7,7 +7,7 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/agent/pkg/agent" + "github.com/yusing/godoxy/agent/pkg/agent" ) type PEMPairResponse struct { diff --git a/internal/api/v1/agent/create.go b/internal/api/v1/agent/create.go index 929b245b..43545259 100644 --- a/internal/api/v1/agent/create.go +++ b/internal/api/v1/agent/create.go @@ -8,8 +8,8 @@ import ( _ "embed" "github.com/gin-gonic/gin" - "github.com/yusing/go-proxy/agent/pkg/agent" - apitypes "github.com/yusing/go-proxy/internal/api/types" + "github.com/yusing/godoxy/agent/pkg/agent" + apitypes "github.com/yusing/godoxy/internal/api/types" ) type NewAgentRequest struct { diff --git a/internal/api/v1/agent/list.go b/internal/api/v1/agent/list.go index 5d448759..4fa5d742 100644 --- a/internal/api/v1/agent/list.go +++ b/internal/api/v1/agent/list.go @@ -5,9 +5,9 @@ import ( "time" "github.com/gin-gonic/gin" - "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/internal/net/gphttp/httpheaders" - "github.com/yusing/go-proxy/internal/net/gphttp/websocket" + "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/internal/net/gphttp/httpheaders" + "github.com/yusing/godoxy/internal/net/gphttp/websocket" ) // @x-id "list" diff --git a/internal/api/v1/agent/verify.go b/internal/api/v1/agent/verify.go index d455fdc1..fe2158e8 100644 --- a/internal/api/v1/agent/verify.go +++ b/internal/api/v1/agent/verify.go @@ -6,10 +6,10 @@ import ( "os" "github.com/gin-gonic/gin" - "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/agent/pkg/certs" - . "github.com/yusing/go-proxy/internal/api/types" - config "github.com/yusing/go-proxy/internal/config/types" + "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/agent/pkg/certs" + . "github.com/yusing/godoxy/internal/api/types" + config "github.com/yusing/godoxy/internal/config/types" ) type VerifyNewAgentRequest struct { diff --git a/internal/api/v1/auth/callback.go b/internal/api/v1/auth/callback.go index 64bbde07..ebd82786 100644 --- a/internal/api/v1/auth/callback.go +++ b/internal/api/v1/auth/callback.go @@ -3,7 +3,7 @@ package auth import ( "github.com/gin-gonic/gin" - "github.com/yusing/go-proxy/internal/auth" + "github.com/yusing/godoxy/internal/auth" ) // @x-id "callback" diff --git a/internal/api/v1/auth/check.go b/internal/api/v1/auth/check.go index 47a67454..251a3362 100644 --- a/internal/api/v1/auth/check.go +++ b/internal/api/v1/auth/check.go @@ -2,7 +2,7 @@ package auth import ( "github.com/gin-gonic/gin" - "github.com/yusing/go-proxy/internal/auth" + "github.com/yusing/godoxy/internal/auth" ) // @x-id "check" diff --git a/internal/api/v1/auth/login.go b/internal/api/v1/auth/login.go index 8e9c2b1e..9b738c74 100644 --- a/internal/api/v1/auth/login.go +++ b/internal/api/v1/auth/login.go @@ -2,7 +2,7 @@ package auth import ( "github.com/gin-gonic/gin" - "github.com/yusing/go-proxy/internal/auth" + "github.com/yusing/godoxy/internal/auth" ) // @x-id "login" diff --git a/internal/api/v1/auth/logout.go b/internal/api/v1/auth/logout.go index 392a7118..15c835fd 100644 --- a/internal/api/v1/auth/logout.go +++ b/internal/api/v1/auth/logout.go @@ -2,7 +2,7 @@ package auth import ( "github.com/gin-gonic/gin" - "github.com/yusing/go-proxy/internal/auth" + "github.com/yusing/godoxy/internal/auth" ) // @x-id "logout" diff --git a/internal/api/v1/cert/info.go b/internal/api/v1/cert/info.go index 2f5ede63..f0ae8817 100644 --- a/internal/api/v1/cert/info.go +++ b/internal/api/v1/cert/info.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/gin-gonic/gin" - apitypes "github.com/yusing/go-proxy/internal/api/types" - config "github.com/yusing/go-proxy/internal/config/types" + apitypes "github.com/yusing/godoxy/internal/api/types" + config "github.com/yusing/godoxy/internal/config/types" ) type CertInfo struct { diff --git a/internal/api/v1/cert/renew.go b/internal/api/v1/cert/renew.go index 7d1962f5..8d8c6f38 100644 --- a/internal/api/v1/cert/renew.go +++ b/internal/api/v1/cert/renew.go @@ -6,11 +6,11 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - apitypes "github.com/yusing/go-proxy/internal/api/types" - config "github.com/yusing/go-proxy/internal/config/types" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/logging/memlogger" - "github.com/yusing/go-proxy/internal/net/gphttp/websocket" + apitypes "github.com/yusing/godoxy/internal/api/types" + config "github.com/yusing/godoxy/internal/config/types" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/logging/memlogger" + "github.com/yusing/godoxy/internal/net/gphttp/websocket" ) // @x-id "renew" diff --git a/internal/api/v1/docker/container.go b/internal/api/v1/docker/container.go index ffed3177..8f016202 100644 --- a/internal/api/v1/docker/container.go +++ b/internal/api/v1/docker/container.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/gin-gonic/gin" - apitypes "github.com/yusing/go-proxy/internal/api/types" - "github.com/yusing/go-proxy/internal/docker" + apitypes "github.com/yusing/godoxy/internal/api/types" + "github.com/yusing/godoxy/internal/docker" ) // @x-id "container" diff --git a/internal/api/v1/docker/containers.go b/internal/api/v1/docker/containers.go index e533a649..b67850d6 100644 --- a/internal/api/v1/docker/containers.go +++ b/internal/api/v1/docker/containers.go @@ -6,7 +6,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/gin-gonic/gin" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) type ContainerState = container.ContainerState // @name ContainerState diff --git a/internal/api/v1/docker/info.go b/internal/api/v1/docker/info.go index 178d64a8..d1ae16c8 100644 --- a/internal/api/v1/docker/info.go +++ b/internal/api/v1/docker/info.go @@ -6,8 +6,8 @@ import ( dockerSystem "github.com/docker/docker/api/types/system" "github.com/gin-gonic/gin" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/utils/strutils" ) type containerStats struct { diff --git a/internal/api/v1/docker/logs.go b/internal/api/v1/docker/logs.go index e8f4ea4d..5c4c5ac0 100644 --- a/internal/api/v1/docker/logs.go +++ b/internal/api/v1/docker/logs.go @@ -10,10 +10,10 @@ import ( "github.com/docker/docker/pkg/stdcopy" "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - apitypes "github.com/yusing/go-proxy/internal/api/types" - "github.com/yusing/go-proxy/internal/docker" - "github.com/yusing/go-proxy/internal/net/gphttp/websocket" - "github.com/yusing/go-proxy/internal/task" + apitypes "github.com/yusing/godoxy/internal/api/types" + "github.com/yusing/godoxy/internal/docker" + "github.com/yusing/godoxy/internal/net/gphttp/websocket" + "github.com/yusing/godoxy/internal/task" ) type LogsQueryParams struct { diff --git a/internal/api/v1/docker/restart.go b/internal/api/v1/docker/restart.go index 5bed245a..cd6d50a0 100644 --- a/internal/api/v1/docker/restart.go +++ b/internal/api/v1/docker/restart.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/gin-gonic/gin" - apitypes "github.com/yusing/go-proxy/internal/api/types" - "github.com/yusing/go-proxy/internal/docker" + apitypes "github.com/yusing/godoxy/internal/api/types" + "github.com/yusing/godoxy/internal/docker" ) // @x-id "restart" diff --git a/internal/api/v1/docker/start.go b/internal/api/v1/docker/start.go index f1d6349a..fe480dd3 100644 --- a/internal/api/v1/docker/start.go +++ b/internal/api/v1/docker/start.go @@ -5,8 +5,8 @@ import ( "github.com/docker/docker/api/types/container" "github.com/gin-gonic/gin" - apitypes "github.com/yusing/go-proxy/internal/api/types" - "github.com/yusing/go-proxy/internal/docker" + apitypes "github.com/yusing/godoxy/internal/api/types" + "github.com/yusing/godoxy/internal/docker" ) type StartRequest struct { diff --git a/internal/api/v1/docker/stop.go b/internal/api/v1/docker/stop.go index 506f17d0..9ecd5a7a 100644 --- a/internal/api/v1/docker/stop.go +++ b/internal/api/v1/docker/stop.go @@ -5,8 +5,8 @@ import ( "github.com/docker/docker/api/types/container" "github.com/gin-gonic/gin" - apitypes "github.com/yusing/go-proxy/internal/api/types" - "github.com/yusing/go-proxy/internal/docker" + apitypes "github.com/yusing/godoxy/internal/api/types" + "github.com/yusing/godoxy/internal/docker" ) type StopRequest struct { diff --git a/internal/api/v1/docker/utils.go b/internal/api/v1/docker/utils.go index d13df679..7d84596c 100644 --- a/internal/api/v1/docker/utils.go +++ b/internal/api/v1/docker/utils.go @@ -6,13 +6,13 @@ import ( "time" "github.com/gin-gonic/gin" - "github.com/yusing/go-proxy/agent/pkg/agent" - apitypes "github.com/yusing/go-proxy/internal/api/types" - config "github.com/yusing/go-proxy/internal/config/types" - "github.com/yusing/go-proxy/internal/docker" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/net/gphttp/httpheaders" - "github.com/yusing/go-proxy/internal/net/gphttp/websocket" + "github.com/yusing/godoxy/agent/pkg/agent" + apitypes "github.com/yusing/godoxy/internal/api/types" + config "github.com/yusing/godoxy/internal/config/types" + "github.com/yusing/godoxy/internal/docker" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/net/gphttp/httpheaders" + "github.com/yusing/godoxy/internal/net/gphttp/websocket" ) type ( diff --git a/internal/api/v1/favicon.go b/internal/api/v1/favicon.go index 07eeea45..961e7036 100644 --- a/internal/api/v1/favicon.go +++ b/internal/api/v1/favicon.go @@ -5,9 +5,9 @@ import ( "net/http" "github.com/gin-gonic/gin" - apitypes "github.com/yusing/go-proxy/internal/api/types" - "github.com/yusing/go-proxy/internal/homepage" - "github.com/yusing/go-proxy/internal/route/routes" + apitypes "github.com/yusing/godoxy/internal/api/types" + "github.com/yusing/godoxy/internal/homepage" + "github.com/yusing/godoxy/internal/route/routes" ) type GetFavIconRequest struct { diff --git a/internal/api/v1/file/get.go b/internal/api/v1/file/get.go index a14962d8..ab538552 100644 --- a/internal/api/v1/file/get.go +++ b/internal/api/v1/file/get.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/gin-gonic/gin" - apitypes "github.com/yusing/go-proxy/internal/api/types" - "github.com/yusing/go-proxy/internal/common" + apitypes "github.com/yusing/godoxy/internal/api/types" + "github.com/yusing/godoxy/internal/common" ) type FileType string // @name FileType diff --git a/internal/api/v1/file/list.go b/internal/api/v1/file/list.go index c79a2ecf..643ae536 100644 --- a/internal/api/v1/file/list.go +++ b/internal/api/v1/file/list.go @@ -5,9 +5,9 @@ import ( "strings" "github.com/gin-gonic/gin" - apitypes "github.com/yusing/go-proxy/internal/api/types" - "github.com/yusing/go-proxy/internal/common" - "github.com/yusing/go-proxy/internal/utils" + apitypes "github.com/yusing/godoxy/internal/api/types" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/utils" ) type ListFilesResponse struct { diff --git a/internal/api/v1/file/set.go b/internal/api/v1/file/set.go index 8f275b42..cae7676d 100644 --- a/internal/api/v1/file/set.go +++ b/internal/api/v1/file/set.go @@ -5,7 +5,7 @@ import ( "os" "github.com/gin-gonic/gin" - apitypes "github.com/yusing/go-proxy/internal/api/types" + apitypes "github.com/yusing/godoxy/internal/api/types" ) type SetFileContentRequest GetFileContentRequest diff --git a/internal/api/v1/file/validate.go b/internal/api/v1/file/validate.go index b0eade7f..38f13ee8 100644 --- a/internal/api/v1/file/validate.go +++ b/internal/api/v1/file/validate.go @@ -4,11 +4,11 @@ import ( "net/http" "github.com/gin-gonic/gin" - apitypes "github.com/yusing/go-proxy/internal/api/types" - config "github.com/yusing/go-proxy/internal/config/types" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/net/gphttp/middleware" - "github.com/yusing/go-proxy/internal/route/provider" + apitypes "github.com/yusing/godoxy/internal/api/types" + config "github.com/yusing/godoxy/internal/config/types" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/net/gphttp/middleware" + "github.com/yusing/godoxy/internal/route/provider" ) type ValidateFileRequest struct { diff --git a/internal/api/v1/health.go b/internal/api/v1/health.go index 53c3feb6..78f84151 100644 --- a/internal/api/v1/health.go +++ b/internal/api/v1/health.go @@ -5,9 +5,9 @@ import ( "time" "github.com/gin-gonic/gin" - "github.com/yusing/go-proxy/internal/net/gphttp/httpheaders" - "github.com/yusing/go-proxy/internal/net/gphttp/websocket" - "github.com/yusing/go-proxy/internal/route/routes" + "github.com/yusing/godoxy/internal/net/gphttp/httpheaders" + "github.com/yusing/godoxy/internal/net/gphttp/websocket" + "github.com/yusing/godoxy/internal/route/routes" ) type HealthMap = map[string]routes.HealthInfo // @name HealthMap diff --git a/internal/api/v1/homepage/categories.go b/internal/api/v1/homepage/categories.go index b1a676f6..c57414d7 100644 --- a/internal/api/v1/homepage/categories.go +++ b/internal/api/v1/homepage/categories.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/yusing/go-proxy/internal/homepage" - "github.com/yusing/go-proxy/internal/route/routes" + "github.com/yusing/godoxy/internal/homepage" + "github.com/yusing/godoxy/internal/route/routes" ) // @x-id "categories" diff --git a/internal/api/v1/homepage/item_click.go b/internal/api/v1/homepage/item_click.go index 654ddf17..8b4dce47 100644 --- a/internal/api/v1/homepage/item_click.go +++ b/internal/api/v1/homepage/item_click.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/gin-gonic/gin" - apitypes "github.com/yusing/go-proxy/internal/api/types" - "github.com/yusing/go-proxy/internal/homepage" + apitypes "github.com/yusing/godoxy/internal/api/types" + "github.com/yusing/godoxy/internal/homepage" ) type HomepageOverrideItemClickParams struct { diff --git a/internal/api/v1/homepage/items.go b/internal/api/v1/homepage/items.go index 823f3cfc..e3eda5f6 100644 --- a/internal/api/v1/homepage/items.go +++ b/internal/api/v1/homepage/items.go @@ -10,11 +10,11 @@ import ( "github.com/gin-gonic/gin" "github.com/lithammer/fuzzysearch/fuzzy" - apitypes "github.com/yusing/go-proxy/internal/api/types" - "github.com/yusing/go-proxy/internal/homepage" - "github.com/yusing/go-proxy/internal/net/gphttp/httpheaders" - "github.com/yusing/go-proxy/internal/net/gphttp/websocket" - "github.com/yusing/go-proxy/internal/route/routes" + apitypes "github.com/yusing/godoxy/internal/api/types" + "github.com/yusing/godoxy/internal/homepage" + "github.com/yusing/godoxy/internal/net/gphttp/httpheaders" + "github.com/yusing/godoxy/internal/net/gphttp/websocket" + "github.com/yusing/godoxy/internal/route/routes" ) type HomepageItemsRequest struct { diff --git a/internal/api/v1/homepage/overrides.go b/internal/api/v1/homepage/overrides.go index 6a987c9e..5805647a 100644 --- a/internal/api/v1/homepage/overrides.go +++ b/internal/api/v1/homepage/overrides.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/gin-gonic/gin" - apitypes "github.com/yusing/go-proxy/internal/api/types" - "github.com/yusing/go-proxy/internal/homepage" + apitypes "github.com/yusing/godoxy/internal/api/types" + "github.com/yusing/godoxy/internal/homepage" ) type ( diff --git a/internal/api/v1/icons.go b/internal/api/v1/icons.go index 5e26a807..a3d4cb01 100644 --- a/internal/api/v1/icons.go +++ b/internal/api/v1/icons.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/gin-gonic/gin" - apitypes "github.com/yusing/go-proxy/internal/api/types" - "github.com/yusing/go-proxy/internal/homepage" + apitypes "github.com/yusing/godoxy/internal/api/types" + "github.com/yusing/godoxy/internal/homepage" ) type ListIconsRequest struct { diff --git a/internal/api/v1/metrics/all_system_info.go b/internal/api/v1/metrics/all_system_info.go index 24d07563..bc6e679b 100644 --- a/internal/api/v1/metrics/all_system_info.go +++ b/internal/api/v1/metrics/all_system_info.go @@ -12,14 +12,14 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/agent/pkg/agent" - apitypes "github.com/yusing/go-proxy/internal/api/types" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/metrics/period" - "github.com/yusing/go-proxy/internal/metrics/systeminfo" - "github.com/yusing/go-proxy/internal/net/gphttp/httpheaders" - "github.com/yusing/go-proxy/internal/net/gphttp/websocket" - "github.com/yusing/go-proxy/internal/utils/synk" + "github.com/yusing/godoxy/agent/pkg/agent" + apitypes "github.com/yusing/godoxy/internal/api/types" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/metrics/period" + "github.com/yusing/godoxy/internal/metrics/systeminfo" + "github.com/yusing/godoxy/internal/net/gphttp/httpheaders" + "github.com/yusing/godoxy/internal/net/gphttp/websocket" + "github.com/yusing/godoxy/internal/utils/synk" ) var ( diff --git a/internal/api/v1/metrics/system_info.go b/internal/api/v1/metrics/system_info.go index bc8a5067..0817f386 100644 --- a/internal/api/v1/metrics/system_info.go +++ b/internal/api/v1/metrics/system_info.go @@ -6,11 +6,11 @@ import ( "net/http" "github.com/gin-gonic/gin" - agentPkg "github.com/yusing/go-proxy/agent/pkg/agent" - apitypes "github.com/yusing/go-proxy/internal/api/types" - "github.com/yusing/go-proxy/internal/metrics/period" - "github.com/yusing/go-proxy/internal/metrics/systeminfo" - "github.com/yusing/go-proxy/internal/net/gphttp/httpheaders" + agentPkg "github.com/yusing/godoxy/agent/pkg/agent" + apitypes "github.com/yusing/godoxy/internal/api/types" + "github.com/yusing/godoxy/internal/metrics/period" + "github.com/yusing/godoxy/internal/metrics/systeminfo" + "github.com/yusing/godoxy/internal/net/gphttp/httpheaders" ) type SystemInfoRequest struct { diff --git a/internal/api/v1/metrics/upime.go b/internal/api/v1/metrics/upime.go index 1bc44eb1..aba64df4 100644 --- a/internal/api/v1/metrics/upime.go +++ b/internal/api/v1/metrics/upime.go @@ -2,8 +2,8 @@ package metrics import ( "github.com/gin-gonic/gin" - "github.com/yusing/go-proxy/internal/metrics/period" - "github.com/yusing/go-proxy/internal/metrics/uptime" + "github.com/yusing/godoxy/internal/metrics/period" + "github.com/yusing/godoxy/internal/metrics/uptime" ) type UptimeRequest struct { diff --git a/internal/api/v1/reload.go b/internal/api/v1/reload.go index a96a6980..7a37805d 100644 --- a/internal/api/v1/reload.go +++ b/internal/api/v1/reload.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/gin-gonic/gin" - apitypes "github.com/yusing/go-proxy/internal/api/types" - config "github.com/yusing/go-proxy/internal/config/types" + apitypes "github.com/yusing/godoxy/internal/api/types" + config "github.com/yusing/godoxy/internal/config/types" ) // @x-id "reload" diff --git a/internal/api/v1/route/by_provider.go b/internal/api/v1/route/by_provider.go index 2eadf2ed..07996012 100644 --- a/internal/api/v1/route/by_provider.go +++ b/internal/api/v1/route/by_provider.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/yusing/go-proxy/internal/route" - "github.com/yusing/go-proxy/internal/route/routes" + "github.com/yusing/godoxy/internal/route" + "github.com/yusing/godoxy/internal/route/routes" ) type RoutesByProvider map[string][]route.Route diff --git a/internal/api/v1/route/providers.go b/internal/api/v1/route/providers.go index bcb12939..d5265241 100644 --- a/internal/api/v1/route/providers.go +++ b/internal/api/v1/route/providers.go @@ -5,9 +5,9 @@ import ( "time" "github.com/gin-gonic/gin" - config "github.com/yusing/go-proxy/internal/config/types" - "github.com/yusing/go-proxy/internal/net/gphttp/httpheaders" - "github.com/yusing/go-proxy/internal/net/gphttp/websocket" + config "github.com/yusing/godoxy/internal/config/types" + "github.com/yusing/godoxy/internal/net/gphttp/httpheaders" + "github.com/yusing/godoxy/internal/net/gphttp/websocket" ) // @x-id "providers" diff --git a/internal/api/v1/route/route.go b/internal/api/v1/route/route.go index 38d5a0e1..ca80d83f 100644 --- a/internal/api/v1/route/route.go +++ b/internal/api/v1/route/route.go @@ -4,9 +4,9 @@ import ( "net/http" "github.com/gin-gonic/gin" - apitypes "github.com/yusing/go-proxy/internal/api/types" - config "github.com/yusing/go-proxy/internal/config/types" - "github.com/yusing/go-proxy/internal/route/routes" + apitypes "github.com/yusing/godoxy/internal/api/types" + config "github.com/yusing/godoxy/internal/config/types" + "github.com/yusing/godoxy/internal/route/routes" ) type ListRouteRequest struct { diff --git a/internal/api/v1/route/routes.go b/internal/api/v1/route/routes.go index b2a8199d..9a11dedb 100644 --- a/internal/api/v1/route/routes.go +++ b/internal/api/v1/route/routes.go @@ -6,11 +6,11 @@ import ( "time" "github.com/gin-gonic/gin" - "github.com/yusing/go-proxy/internal/net/gphttp/httpheaders" - "github.com/yusing/go-proxy/internal/net/gphttp/websocket" - "github.com/yusing/go-proxy/internal/route" - "github.com/yusing/go-proxy/internal/route/routes" - "github.com/yusing/go-proxy/internal/types" + "github.com/yusing/godoxy/internal/net/gphttp/httpheaders" + "github.com/yusing/godoxy/internal/net/gphttp/websocket" + "github.com/yusing/godoxy/internal/route" + "github.com/yusing/godoxy/internal/route/routes" + "github.com/yusing/godoxy/internal/types" ) type RouteType route.Route // @name Route diff --git a/internal/api/v1/stats.go b/internal/api/v1/stats.go index 78d443af..af320722 100644 --- a/internal/api/v1/stats.go +++ b/internal/api/v1/stats.go @@ -5,10 +5,10 @@ import ( "time" "github.com/gin-gonic/gin" - config "github.com/yusing/go-proxy/internal/config/types" - "github.com/yusing/go-proxy/internal/net/gphttp/httpheaders" - "github.com/yusing/go-proxy/internal/net/gphttp/websocket" - "github.com/yusing/go-proxy/internal/types" + config "github.com/yusing/godoxy/internal/config/types" + "github.com/yusing/godoxy/internal/net/gphttp/httpheaders" + "github.com/yusing/godoxy/internal/net/gphttp/websocket" + "github.com/yusing/godoxy/internal/types" ) type StatsResponse struct { diff --git a/internal/api/v1/version.go b/internal/api/v1/version.go index 67af997d..a18034e3 100644 --- a/internal/api/v1/version.go +++ b/internal/api/v1/version.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/yusing/go-proxy/pkg" + "github.com/yusing/godoxy/pkg" ) // @x-id "version" diff --git a/internal/auth/auth.go b/internal/auth/auth.go index db19d886..7935fcc2 100644 --- a/internal/auth/auth.go +++ b/internal/auth/auth.go @@ -3,7 +3,7 @@ package auth import ( "net/http" - "github.com/yusing/go-proxy/internal/common" + "github.com/yusing/godoxy/internal/common" ) var defaultAuth Provider diff --git a/internal/auth/oauth_refresh.go b/internal/auth/oauth_refresh.go index e4a26dd3..cd1cc161 100644 --- a/internal/auth/oauth_refresh.go +++ b/internal/auth/oauth_refresh.go @@ -12,8 +12,8 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/common" - "github.com/yusing/go-proxy/internal/jsonstore" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/jsonstore" "golang.org/x/oauth2" ) diff --git a/internal/auth/oidc.go b/internal/auth/oidc.go index d31cc92e..7e96e860 100644 --- a/internal/auth/oidc.go +++ b/internal/auth/oidc.go @@ -14,10 +14,10 @@ import ( "github.com/coreos/go-oidc/v3/oidc" "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/net/gphttp" - "github.com/yusing/go-proxy/internal/utils" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/net/gphttp" + "github.com/yusing/godoxy/internal/utils" "golang.org/x/oauth2" "golang.org/x/time/rate" ) diff --git a/internal/auth/oidc_test.go b/internal/auth/oidc_test.go index b30b1c64..9264ba7c 100644 --- a/internal/auth/oidc_test.go +++ b/internal/auth/oidc_test.go @@ -13,10 +13,10 @@ import ( "github.com/coreos/go-oidc/v3/oidc" "github.com/golang-jwt/jwt/v5" - "github.com/yusing/go-proxy/internal/common" + "github.com/yusing/godoxy/internal/common" "golang.org/x/oauth2" - . "github.com/yusing/go-proxy/internal/utils/testing" + . "github.com/yusing/godoxy/internal/utils/testing" ) // setupMockOIDC configures mock OIDC provider for testing. diff --git a/internal/auth/userpass.go b/internal/auth/userpass.go index 8080ffae..00bde533 100644 --- a/internal/auth/userpass.go +++ b/internal/auth/userpass.go @@ -7,10 +7,10 @@ import ( "time" "github.com/golang-jwt/jwt/v5" - "github.com/yusing/go-proxy/internal/common" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/net/gphttp" - "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/net/gphttp" + "github.com/yusing/godoxy/internal/utils/strutils" "golang.org/x/crypto/bcrypt" ) diff --git a/internal/auth/userpass_test.go b/internal/auth/userpass_test.go index 02196be0..e8e1d362 100644 --- a/internal/auth/userpass_test.go +++ b/internal/auth/userpass_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - . "github.com/yusing/go-proxy/internal/utils/testing" + . "github.com/yusing/godoxy/internal/utils/testing" "golang.org/x/crypto/bcrypt" ) diff --git a/internal/auth/utils.go b/internal/auth/utils.go index 52af06e4..2d7bcd32 100644 --- a/internal/auth/utils.go +++ b/internal/auth/utils.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/yusing/go-proxy/internal/common" - "github.com/yusing/go-proxy/internal/gperr" - "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/strutils" ) var ( diff --git a/internal/autocert/config.go b/internal/autocert/config.go index d7e7c5cb..a8bfa792 100644 --- a/internal/autocert/config.go +++ b/internal/autocert/config.go @@ -14,9 +14,9 @@ import ( "github.com/go-acme/lego/v4/challenge/dns01" "github.com/go-acme/lego/v4/lego" "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/godoxy/internal/common" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/utils" ) type Config struct { diff --git a/internal/autocert/config_test.go b/internal/autocert/config_test.go index 61ab836e..58782366 100644 --- a/internal/autocert/config_test.go +++ b/internal/autocert/config_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/yusing/go-proxy/internal/serialization" + "github.com/yusing/godoxy/internal/serialization" ) func TestEABConfigRequired(t *testing.T) { diff --git a/internal/autocert/provider.go b/internal/autocert/provider.go index 1743dac0..b2e03a04 100644 --- a/internal/autocert/provider.go +++ b/internal/autocert/provider.go @@ -17,11 +17,11 @@ import ( "github.com/go-acme/lego/v4/registration" "github.com/rs/zerolog" "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/notif" - "github.com/yusing/go-proxy/internal/task" - "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/notif" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/utils/strutils" ) type ( diff --git a/internal/autocert/provider_test/custom_test.go b/internal/autocert/provider_test/custom_test.go index 3f04762d..d62ad77e 100644 --- a/internal/autocert/provider_test/custom_test.go +++ b/internal/autocert/provider_test/custom_test.go @@ -20,8 +20,8 @@ import ( "time" "github.com/stretchr/testify/require" - "github.com/yusing/go-proxy/internal/autocert" - "github.com/yusing/go-proxy/internal/dnsproviders" + "github.com/yusing/godoxy/internal/autocert" + "github.com/yusing/godoxy/internal/dnsproviders" ) func TestMain(m *testing.M) { diff --git a/internal/autocert/provider_test/ovh_test.go b/internal/autocert/provider_test/ovh_test.go index e268af4b..21a926d8 100644 --- a/internal/autocert/provider_test/ovh_test.go +++ b/internal/autocert/provider_test/ovh_test.go @@ -6,7 +6,7 @@ import ( "github.com/go-acme/lego/v4/providers/dns/ovh" "github.com/goccy/go-yaml" "github.com/stretchr/testify/require" - "github.com/yusing/go-proxy/internal/serialization" + "github.com/yusing/godoxy/internal/serialization" ) // type Config struct { diff --git a/internal/autocert/providers.go b/internal/autocert/providers.go index 5b73e399..26f5f2a7 100644 --- a/internal/autocert/providers.go +++ b/internal/autocert/providers.go @@ -2,8 +2,8 @@ package autocert import ( "github.com/go-acme/lego/v4/challenge" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/serialization" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/serialization" ) type Generator func(map[string]any) (challenge.Provider, gperr.Error) diff --git a/internal/autocert/setup.go b/internal/autocert/setup.go index 62c589e6..6fbdf58b 100644 --- a/internal/autocert/setup.go +++ b/internal/autocert/setup.go @@ -5,7 +5,7 @@ import ( "os" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/utils/strutils" ) func (p *Provider) Setup() (err error) { diff --git a/internal/autocert/types/provider.go b/internal/autocert/types/provider.go index 48ba7821..7b271175 100644 --- a/internal/autocert/types/provider.go +++ b/internal/autocert/types/provider.go @@ -3,7 +3,7 @@ package autocert import ( "crypto/tls" - "github.com/yusing/go-proxy/internal/task" + "github.com/yusing/godoxy/internal/task" ) type Provider interface { diff --git a/internal/common/env.go b/internal/common/env.go index 11a10fb9..4a3f0bce 100644 --- a/internal/common/env.go +++ b/internal/common/env.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/utils/strutils" ) var ( diff --git a/internal/config/agents.go b/internal/config/agents.go index 5c714f40..c7c0074d 100644 --- a/internal/config/agents.go +++ b/internal/config/agents.go @@ -1,9 +1,9 @@ package config import ( - "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/route/provider" + "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/route/provider" ) func (cfg *Config) VerifyNewAgent(host string, ca agent.PEMPair, client agent.PEMPair, containerRuntime agent.ContainerRuntime) (int, gperr.Error) { diff --git a/internal/config/config.go b/internal/config/config.go index b475a6b3..19f5e730 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -12,23 +12,23 @@ import ( "github.com/puzpuzpuz/xsync/v4" "github.com/rs/zerolog" "github.com/rs/zerolog/log" - agentPkg "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/internal/api" - autocert "github.com/yusing/go-proxy/internal/autocert" - "github.com/yusing/go-proxy/internal/common" - config "github.com/yusing/go-proxy/internal/config/types" - "github.com/yusing/go-proxy/internal/entrypoint" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/maxmind" - "github.com/yusing/go-proxy/internal/net/gphttp/server" - "github.com/yusing/go-proxy/internal/notif" - "github.com/yusing/go-proxy/internal/proxmox" - proxy "github.com/yusing/go-proxy/internal/route/provider" - "github.com/yusing/go-proxy/internal/serialization" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/utils/strutils/ansi" - "github.com/yusing/go-proxy/internal/watcher" - "github.com/yusing/go-proxy/internal/watcher/events" + agentPkg "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/internal/api" + autocert "github.com/yusing/godoxy/internal/autocert" + "github.com/yusing/godoxy/internal/common" + config "github.com/yusing/godoxy/internal/config/types" + "github.com/yusing/godoxy/internal/entrypoint" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/maxmind" + "github.com/yusing/godoxy/internal/net/gphttp/server" + "github.com/yusing/godoxy/internal/notif" + "github.com/yusing/godoxy/internal/proxmox" + proxy "github.com/yusing/godoxy/internal/route/provider" + "github.com/yusing/godoxy/internal/serialization" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/utils/strutils/ansi" + "github.com/yusing/godoxy/internal/watcher" + "github.com/yusing/godoxy/internal/watcher/events" ) type Config struct { diff --git a/internal/config/query.go b/internal/config/query.go index 1851304e..0d319dfe 100644 --- a/internal/config/query.go +++ b/internal/config/query.go @@ -1,9 +1,9 @@ package config import ( - config "github.com/yusing/go-proxy/internal/config/types" - "github.com/yusing/go-proxy/internal/route/provider" - "github.com/yusing/go-proxy/internal/types" + config "github.com/yusing/godoxy/internal/config/types" + "github.com/yusing/godoxy/internal/route/provider" + "github.com/yusing/godoxy/internal/types" ) func (cfg *Config) DumpRouteProviders() map[string]*provider.Provider { diff --git a/internal/config/types/config.go b/internal/config/types/config.go index f5f0fbb0..412a033b 100644 --- a/internal/config/types/config.go +++ b/internal/config/types/config.go @@ -6,16 +6,16 @@ import ( "sync" "github.com/go-playground/validator/v10" - "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/internal/acl" - "github.com/yusing/go-proxy/internal/autocert" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/logging/accesslog" - maxmind "github.com/yusing/go-proxy/internal/maxmind/types" - "github.com/yusing/go-proxy/internal/notif" - "github.com/yusing/go-proxy/internal/proxmox" - "github.com/yusing/go-proxy/internal/serialization" - "github.com/yusing/go-proxy/internal/types" + "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/internal/acl" + "github.com/yusing/godoxy/internal/autocert" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/logging/accesslog" + maxmind "github.com/yusing/godoxy/internal/maxmind/types" + "github.com/yusing/godoxy/internal/notif" + "github.com/yusing/godoxy/internal/proxmox" + "github.com/yusing/godoxy/internal/serialization" + "github.com/yusing/godoxy/internal/types" ) type ( diff --git a/internal/dnsproviders/gen.py b/internal/dnsproviders/gen.py index 34a8abfc..6d2d1a5b 100644 --- a/internal/dnsproviders/gen.py +++ b/internal/dnsproviders/gen.py @@ -16,7 +16,7 @@ names: list[str] = [ "Pseudo = \"pseudo\"", ] imports: list[str] = [ - "\"github.com/yusing/go-proxy/internal/autocert\"" + "\"github.com/yusing/godoxy/internal/autocert\"" ] genMap: list[str] = [ "autocert.Providers[Local] = autocert.DNSProvider(NewDummyDefaultConfig, NewDummyDNSProviderConfig)", diff --git a/internal/dnsproviders/go.mod b/internal/dnsproviders/go.mod index 080ff398..811427c9 100644 --- a/internal/dnsproviders/go.mod +++ b/internal/dnsproviders/go.mod @@ -1,14 +1,14 @@ -module github.com/yusing/go-proxy/internal/dnsproviders +module github.com/yusing/godoxy/internal/dnsproviders go 1.25.1 -replace github.com/yusing/go-proxy => ../.. +replace github.com/yusing/godoxy => ../.. -replace github.com/yusing/go-proxy/internal/utils => ../utils +replace github.com/yusing/godoxy/internal/utils => ../utils require ( github.com/go-acme/lego/v4 v4.26.0 - github.com/yusing/go-proxy v0.17.6 + github.com/yusing/godoxy v0.17.6 ) require ( @@ -148,7 +148,7 @@ require ( github.com/volcengine/volc-sdk-golang v1.0.219 // indirect github.com/vultr/govultr/v3 v3.23.0 // indirect github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect - github.com/yusing/go-proxy/internal/utils v0.0.0 // indirect + github.com/yusing/godoxy/internal/utils v0.0.0 // indirect go.opentelemetry.io/auto/sdk v1.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect diff --git a/internal/dnsproviders/providers.go b/internal/dnsproviders/providers.go index 5c19cb82..fadf80e7 100644 --- a/internal/dnsproviders/providers.go +++ b/internal/dnsproviders/providers.go @@ -149,7 +149,7 @@ import ( "github.com/go-acme/lego/v4/providers/dns/zoneedit" "github.com/go-acme/lego/v4/providers/dns/zoneee" "github.com/go-acme/lego/v4/providers/dns/zonomi" - "github.com/yusing/go-proxy/internal/autocert" + "github.com/yusing/godoxy/internal/autocert" ) const ( diff --git a/internal/docker/client.go b/internal/docker/client.go index cc70be92..4ed034d7 100644 --- a/internal/docker/client.go +++ b/internal/docker/client.go @@ -14,9 +14,9 @@ import ( "github.com/docker/cli/cli/connhelper" "github.com/docker/docker/client" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/internal/common" - "github.com/yusing/go-proxy/internal/task" + "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/task" ) // TODO: implement reconnect here. diff --git a/internal/docker/container.go b/internal/docker/container.go index b0a93e07..6f4664cc 100644 --- a/internal/docker/container.go +++ b/internal/docker/container.go @@ -13,11 +13,11 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" - "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/serialization" - "github.com/yusing/go-proxy/internal/types" - "github.com/yusing/go-proxy/internal/utils" + "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/serialization" + "github.com/yusing/godoxy/internal/types" + "github.com/yusing/godoxy/internal/utils" ) var DummyContainer = new(types.Container) diff --git a/internal/docker/container_helper.go b/internal/docker/container_helper.go index 34fe1e49..3f444e78 100644 --- a/internal/docker/container_helper.go +++ b/internal/docker/container_helper.go @@ -5,8 +5,8 @@ import ( "github.com/docker/docker/api/types/container" "github.com/yusing/ds/ordered" - "github.com/yusing/go-proxy/internal/types" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/types" + "github.com/yusing/godoxy/internal/utils/strutils" ) type containerHelper struct { diff --git a/internal/docker/container_test.go b/internal/docker/container_test.go index e8f099e0..3eb68a70 100644 --- a/internal/docker/container_test.go +++ b/internal/docker/container_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/docker/docker/api/types/container" - . "github.com/yusing/go-proxy/internal/utils/testing" + . "github.com/yusing/godoxy/internal/utils/testing" ) func TestContainerExplicit(t *testing.T) { diff --git a/internal/docker/image_blacklist.go b/internal/docker/image_blacklist.go index 8bb2648a..1fb32ed5 100644 --- a/internal/docker/image_blacklist.go +++ b/internal/docker/image_blacklist.go @@ -1,6 +1,6 @@ package docker -import "github.com/yusing/go-proxy/internal/types" +import "github.com/yusing/godoxy/internal/types" var imageBlacklist = map[string]struct{}{ // pure databases without UI diff --git a/internal/docker/label.go b/internal/docker/label.go index 7c8a4cbc..49df702a 100644 --- a/internal/docker/label.go +++ b/internal/docker/label.go @@ -5,9 +5,9 @@ import ( "strings" "github.com/goccy/go-yaml" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/types" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/types" + "github.com/yusing/godoxy/internal/utils/strutils" ) var ErrInvalidLabel = gperr.New("invalid label") diff --git a/internal/docker/label_test.go b/internal/docker/label_test.go index 770d0932..d50ec414 100644 --- a/internal/docker/label_test.go +++ b/internal/docker/label_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/yusing/go-proxy/internal/docker" + "github.com/yusing/godoxy/internal/docker" ) func TestExpandWildcard(t *testing.T) { diff --git a/internal/entrypoint/entrypoint.go b/internal/entrypoint/entrypoint.go index 05a97944..61cd2b76 100644 --- a/internal/entrypoint/entrypoint.go +++ b/internal/entrypoint/entrypoint.go @@ -7,12 +7,12 @@ import ( "strings" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/logging/accesslog" - "github.com/yusing/go-proxy/internal/net/gphttp/middleware" - "github.com/yusing/go-proxy/internal/net/gphttp/middleware/errorpage" - "github.com/yusing/go-proxy/internal/route/routes" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/types" + "github.com/yusing/godoxy/internal/logging/accesslog" + "github.com/yusing/godoxy/internal/net/gphttp/middleware" + "github.com/yusing/godoxy/internal/net/gphttp/middleware/errorpage" + "github.com/yusing/godoxy/internal/route/routes" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/types" ) type Entrypoint struct { diff --git a/internal/entrypoint/entrypoint_benchmark_test.go b/internal/entrypoint/entrypoint_benchmark_test.go index 0c5c4eab..f1c0d555 100644 --- a/internal/entrypoint/entrypoint_benchmark_test.go +++ b/internal/entrypoint/entrypoint_benchmark_test.go @@ -10,10 +10,10 @@ import ( "strings" "testing" - "github.com/yusing/go-proxy/internal/route" - "github.com/yusing/go-proxy/internal/route/routes" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/types" + "github.com/yusing/godoxy/internal/route" + "github.com/yusing/godoxy/internal/route/routes" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/types" ) type noopResponseWriter struct { diff --git a/internal/entrypoint/entrypoint_test.go b/internal/entrypoint/entrypoint_test.go index 75db4f18..666af96b 100644 --- a/internal/entrypoint/entrypoint_test.go +++ b/internal/entrypoint/entrypoint_test.go @@ -3,10 +3,10 @@ package entrypoint import ( "testing" - "github.com/yusing/go-proxy/internal/route" - "github.com/yusing/go-proxy/internal/route/routes" + "github.com/yusing/godoxy/internal/route" + "github.com/yusing/godoxy/internal/route/routes" - expect "github.com/yusing/go-proxy/internal/utils/testing" + expect "github.com/yusing/godoxy/internal/utils/testing" ) var ep = NewEntrypoint() diff --git a/internal/gperr/builder_test.go b/internal/gperr/builder_test.go index ba1c4437..8413dcf6 100644 --- a/internal/gperr/builder_test.go +++ b/internal/gperr/builder_test.go @@ -6,8 +6,8 @@ import ( "io" "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" ) func TestBuilderEmpty(t *testing.T) { diff --git a/internal/gperr/error_test.go b/internal/gperr/error_test.go index 5594bc4f..9b39823e 100644 --- a/internal/gperr/error_test.go +++ b/internal/gperr/error_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/yusing/go-proxy/internal/utils/strutils/ansi" - expect "github.com/yusing/go-proxy/internal/utils/testing" + "github.com/yusing/godoxy/internal/utils/strutils/ansi" + expect "github.com/yusing/godoxy/internal/utils/testing" ) func TestBaseString(t *testing.T) { diff --git a/internal/gperr/hint.go b/internal/gperr/hint.go index f9824603..8fc27356 100644 --- a/internal/gperr/hint.go +++ b/internal/gperr/hint.go @@ -1,6 +1,6 @@ package gperr -import "github.com/yusing/go-proxy/internal/utils/strutils/ansi" +import "github.com/yusing/godoxy/internal/utils/strutils/ansi" type Hint struct { Prefix string diff --git a/internal/gperr/log.go b/internal/gperr/log.go index a13336b1..1ace50ab 100644 --- a/internal/gperr/log.go +++ b/internal/gperr/log.go @@ -5,7 +5,7 @@ import ( "github.com/rs/zerolog" zerologlog "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/common" + "github.com/yusing/godoxy/internal/common" ) func log(msg string, err error, level zerolog.Level, logger ...*zerolog.Logger) { diff --git a/internal/gperr/multiline_test.go b/internal/gperr/multiline_test.go index af87b852..c277a22f 100644 --- a/internal/gperr/multiline_test.go +++ b/internal/gperr/multiline_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - expect "github.com/yusing/go-proxy/internal/utils/testing" + expect "github.com/yusing/godoxy/internal/utils/testing" ) func TestWrapMultiline(t *testing.T) { diff --git a/internal/gperr/subject.go b/internal/gperr/subject.go index 1d36293d..e6c2d6ff 100644 --- a/internal/gperr/subject.go +++ b/internal/gperr/subject.go @@ -6,7 +6,7 @@ import ( "errors" "slices" - "github.com/yusing/go-proxy/internal/utils/strutils/ansi" + "github.com/yusing/godoxy/internal/utils/strutils/ansi" ) //nolint:errname diff --git a/internal/homepage/favicon.go b/internal/homepage/favicon.go index 8c051f72..ae8434c1 100644 --- a/internal/homepage/favicon.go +++ b/internal/homepage/favicon.go @@ -13,8 +13,8 @@ import ( "github.com/PuerkitoBio/goquery" "github.com/vincent-petithory/dataurl" - gphttp "github.com/yusing/go-proxy/internal/net/gphttp" - "github.com/yusing/go-proxy/internal/utils/strutils" + gphttp "github.com/yusing/godoxy/internal/net/gphttp" + "github.com/yusing/godoxy/internal/utils/strutils" ) type FetchResult struct { diff --git a/internal/homepage/homepage.go b/internal/homepage/homepage.go index df459fb2..e4a0c5d2 100644 --- a/internal/homepage/homepage.go +++ b/internal/homepage/homepage.go @@ -5,8 +5,8 @@ import ( "strings" "github.com/yusing/ds/ordered" - "github.com/yusing/go-proxy/internal/homepage/widgets" - "github.com/yusing/go-proxy/internal/serialization" + "github.com/yusing/godoxy/internal/homepage/widgets" + "github.com/yusing/godoxy/internal/serialization" ) type ( diff --git a/internal/homepage/homepage_test.go b/internal/homepage/homepage_test.go index 3602e75d..6bf6c1d2 100644 --- a/internal/homepage/homepage_test.go +++ b/internal/homepage/homepage_test.go @@ -3,8 +3,8 @@ package homepage_test import ( "testing" - . "github.com/yusing/go-proxy/internal/homepage" - . "github.com/yusing/go-proxy/internal/utils/testing" + . "github.com/yusing/godoxy/internal/homepage" + . "github.com/yusing/godoxy/internal/utils/testing" ) func TestOverrideItem(t *testing.T) { diff --git a/internal/homepage/icon_cache.go b/internal/homepage/icon_cache.go index 2a4f5c21..78414e0a 100644 --- a/internal/homepage/icon_cache.go +++ b/internal/homepage/icon_cache.go @@ -7,11 +7,11 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/common" - "github.com/yusing/go-proxy/internal/jsonstore" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/utils" - "github.com/yusing/go-proxy/internal/utils/atomic" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/jsonstore" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/utils" + "github.com/yusing/godoxy/internal/utils/atomic" ) type cacheEntry struct { diff --git a/internal/homepage/icon_url.go b/internal/homepage/icon_url.go index 1a43dff1..c1c23392 100644 --- a/internal/homepage/icon_url.go +++ b/internal/homepage/icon_url.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) type ( diff --git a/internal/homepage/icon_url_test.go b/internal/homepage/icon_url_test.go index 98e4958b..944da27c 100644 --- a/internal/homepage/icon_url_test.go +++ b/internal/homepage/icon_url_test.go @@ -3,8 +3,8 @@ package homepage_test import ( "testing" - . "github.com/yusing/go-proxy/internal/homepage" - expect "github.com/yusing/go-proxy/internal/utils/testing" + . "github.com/yusing/godoxy/internal/homepage" + expect "github.com/yusing/godoxy/internal/utils/testing" ) func strPtr(s string) *string { diff --git a/internal/homepage/integrations/qbittorrent/client.go b/internal/homepage/integrations/qbittorrent/client.go index 2e853225..fd973aa7 100644 --- a/internal/homepage/integrations/qbittorrent/client.go +++ b/internal/homepage/integrations/qbittorrent/client.go @@ -7,8 +7,8 @@ import ( "net/http" "net/url" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/homepage/widgets" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/homepage/widgets" ) type Client struct { diff --git a/internal/homepage/integrations/qbittorrent/transfer_info.go b/internal/homepage/integrations/qbittorrent/transfer_info.go index 899edbab..c31f086d 100644 --- a/internal/homepage/integrations/qbittorrent/transfer_info.go +++ b/internal/homepage/integrations/qbittorrent/transfer_info.go @@ -3,8 +3,8 @@ package qbittorrent import ( "context" - "github.com/yusing/go-proxy/internal/homepage/widgets" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/homepage/widgets" + "github.com/yusing/godoxy/internal/utils/strutils" ) const endpointTransferInfo = "/api/v2/transfer/info" diff --git a/internal/homepage/list_icons.go b/internal/homepage/list_icons.go index 5d7a365d..a38edf74 100644 --- a/internal/homepage/list_icons.go +++ b/internal/homepage/list_icons.go @@ -13,10 +13,10 @@ import ( "github.com/lithammer/fuzzysearch/fuzzy" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/common" - "github.com/yusing/go-proxy/internal/serialization" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/serialization" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/utils/strutils" ) type ( diff --git a/internal/homepage/list_icons_test.go b/internal/homepage/list_icons_test.go index d54cab3d..104eaed1 100644 --- a/internal/homepage/list_icons_test.go +++ b/internal/homepage/list_icons_test.go @@ -3,7 +3,7 @@ package homepage_test import ( "testing" - . "github.com/yusing/go-proxy/internal/homepage" + . "github.com/yusing/godoxy/internal/homepage" ) const walkxcodeIcons = `{ diff --git a/internal/homepage/override_config.go b/internal/homepage/override_config.go index fb1791c2..8b8da94d 100644 --- a/internal/homepage/override_config.go +++ b/internal/homepage/override_config.go @@ -4,8 +4,8 @@ import ( "maps" "sync" - "github.com/yusing/go-proxy/internal/common" - "github.com/yusing/go-proxy/internal/jsonstore" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/jsonstore" ) type OverrideConfig struct { diff --git a/internal/homepage/route.go b/internal/homepage/route.go index 974c8433..b4b4a855 100644 --- a/internal/homepage/route.go +++ b/internal/homepage/route.go @@ -3,8 +3,8 @@ package homepage import ( "net/http" - nettypes "github.com/yusing/go-proxy/internal/net/types" - "github.com/yusing/go-proxy/internal/utils/pool" + nettypes "github.com/yusing/godoxy/internal/net/types" + "github.com/yusing/godoxy/internal/utils/pool" ) type route interface { diff --git a/internal/homepage/widgets/http.go b/internal/homepage/widgets/http.go index 307c3c41..4655eec0 100644 --- a/internal/homepage/widgets/http.go +++ b/internal/homepage/widgets/http.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) var HTTPClient = &http.Client{ diff --git a/internal/homepage/widgets/widgets.go b/internal/homepage/widgets/widgets.go index 6d62eb4c..6ff24268 100644 --- a/internal/homepage/widgets/widgets.go +++ b/internal/homepage/widgets/widgets.go @@ -3,8 +3,8 @@ package widgets import ( "context" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/serialization" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/serialization" ) type ( diff --git a/internal/idlewatcher/debug.go b/internal/idlewatcher/debug.go index 08a26ae0..0ff21b30 100644 --- a/internal/idlewatcher/debug.go +++ b/internal/idlewatcher/debug.go @@ -5,7 +5,7 @@ import ( "iter" "strconv" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/utils/strutils" ) type watcherDebug struct { diff --git a/internal/idlewatcher/handle_http.go b/internal/idlewatcher/handle_http.go index 8ed71f73..393814f1 100644 --- a/internal/idlewatcher/handle_http.go +++ b/internal/idlewatcher/handle_http.go @@ -5,9 +5,9 @@ import ( "net/http" "strconv" - api "github.com/yusing/go-proxy/internal/api/v1" - gphttp "github.com/yusing/go-proxy/internal/net/gphttp" - "github.com/yusing/go-proxy/internal/net/gphttp/httpheaders" + api "github.com/yusing/godoxy/internal/api/v1" + gphttp "github.com/yusing/godoxy/internal/net/gphttp" + "github.com/yusing/godoxy/internal/net/gphttp/httpheaders" ) type ForceCacheControl struct { diff --git a/internal/idlewatcher/handle_stream.go b/internal/idlewatcher/handle_stream.go index 07e8eb47..f24648ba 100644 --- a/internal/idlewatcher/handle_stream.go +++ b/internal/idlewatcher/handle_stream.go @@ -4,7 +4,7 @@ import ( "context" "net" - nettypes "github.com/yusing/go-proxy/internal/net/types" + nettypes "github.com/yusing/godoxy/internal/net/types" ) var _ nettypes.Stream = (*Watcher)(nil) diff --git a/internal/idlewatcher/health.go b/internal/idlewatcher/health.go index 880f71f8..cf0b2844 100644 --- a/internal/idlewatcher/health.go +++ b/internal/idlewatcher/health.go @@ -3,10 +3,10 @@ package idlewatcher import ( "time" - "github.com/yusing/go-proxy/internal/gperr" - idlewatcher "github.com/yusing/go-proxy/internal/idlewatcher/types" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/types" + "github.com/yusing/godoxy/internal/gperr" + idlewatcher "github.com/yusing/godoxy/internal/idlewatcher/types" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/types" ) // Start implements health.HealthMonitor. diff --git a/internal/idlewatcher/loading_page.go b/internal/idlewatcher/loading_page.go index 7ddf6c0c..0d0e22c1 100644 --- a/internal/idlewatcher/loading_page.go +++ b/internal/idlewatcher/loading_page.go @@ -5,7 +5,7 @@ import ( _ "embed" "text/template" - "github.com/yusing/go-proxy/internal/net/gphttp/httpheaders" + "github.com/yusing/godoxy/internal/net/gphttp/httpheaders" ) type templateData struct { diff --git a/internal/idlewatcher/provider/docker.go b/internal/idlewatcher/provider/docker.go index b9f2b95b..8302627f 100644 --- a/internal/idlewatcher/provider/docker.go +++ b/internal/idlewatcher/provider/docker.go @@ -4,11 +4,11 @@ import ( "context" "github.com/docker/docker/api/types/container" - "github.com/yusing/go-proxy/internal/docker" - "github.com/yusing/go-proxy/internal/gperr" - idlewatcher "github.com/yusing/go-proxy/internal/idlewatcher/types" - "github.com/yusing/go-proxy/internal/types" - "github.com/yusing/go-proxy/internal/watcher" + "github.com/yusing/godoxy/internal/docker" + "github.com/yusing/godoxy/internal/gperr" + idlewatcher "github.com/yusing/godoxy/internal/idlewatcher/types" + "github.com/yusing/godoxy/internal/types" + "github.com/yusing/godoxy/internal/watcher" ) type DockerProvider struct { diff --git a/internal/idlewatcher/provider/proxmox.go b/internal/idlewatcher/provider/proxmox.go index 7dc492e7..993fabe2 100644 --- a/internal/idlewatcher/provider/proxmox.go +++ b/internal/idlewatcher/provider/proxmox.go @@ -5,12 +5,12 @@ import ( "strconv" "time" - "github.com/yusing/go-proxy/internal/gperr" - idlewatcher "github.com/yusing/go-proxy/internal/idlewatcher/types" - "github.com/yusing/go-proxy/internal/proxmox" - "github.com/yusing/go-proxy/internal/types" - "github.com/yusing/go-proxy/internal/watcher" - "github.com/yusing/go-proxy/internal/watcher/events" + "github.com/yusing/godoxy/internal/gperr" + idlewatcher "github.com/yusing/godoxy/internal/idlewatcher/types" + "github.com/yusing/godoxy/internal/proxmox" + "github.com/yusing/godoxy/internal/types" + "github.com/yusing/godoxy/internal/watcher" + "github.com/yusing/godoxy/internal/watcher/events" ) type ProxmoxProvider struct { diff --git a/internal/idlewatcher/state.go b/internal/idlewatcher/state.go index eb217084..b77c39c6 100644 --- a/internal/idlewatcher/state.go +++ b/internal/idlewatcher/state.go @@ -4,7 +4,7 @@ import ( "context" "time" - idlewatcher "github.com/yusing/go-proxy/internal/idlewatcher/types" + idlewatcher "github.com/yusing/godoxy/internal/idlewatcher/types" ) func (w *Watcher) running() bool { diff --git a/internal/idlewatcher/types/container_status.go b/internal/idlewatcher/types/container_status.go index 04182558..d392aadf 100644 --- a/internal/idlewatcher/types/container_status.go +++ b/internal/idlewatcher/types/container_status.go @@ -1,6 +1,6 @@ package idlewatcher -import "github.com/yusing/go-proxy/internal/gperr" +import "github.com/yusing/godoxy/internal/gperr" type ContainerStatus string diff --git a/internal/idlewatcher/types/provider.go b/internal/idlewatcher/types/provider.go index 4c291ed3..6ac12a1a 100644 --- a/internal/idlewatcher/types/provider.go +++ b/internal/idlewatcher/types/provider.go @@ -3,9 +3,9 @@ package idlewatcher import ( "context" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/types" - "github.com/yusing/go-proxy/internal/watcher/events" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/types" + "github.com/yusing/godoxy/internal/watcher/events" ) type Provider interface { diff --git a/internal/idlewatcher/types/waker.go b/internal/idlewatcher/types/waker.go index 46c3170e..7cc4e196 100644 --- a/internal/idlewatcher/types/waker.go +++ b/internal/idlewatcher/types/waker.go @@ -3,8 +3,8 @@ package idlewatcher import ( "net/http" - nettypes "github.com/yusing/go-proxy/internal/net/types" - "github.com/yusing/go-proxy/internal/types" + nettypes "github.com/yusing/godoxy/internal/net/types" + "github.com/yusing/godoxy/internal/types" ) type Waker interface { diff --git a/internal/idlewatcher/watcher.go b/internal/idlewatcher/watcher.go index fc9fe653..775399e3 100644 --- a/internal/idlewatcher/watcher.go +++ b/internal/idlewatcher/watcher.go @@ -11,19 +11,19 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/yusing/ds/ordered" - "github.com/yusing/go-proxy/internal/docker" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/idlewatcher/provider" - idlewatcher "github.com/yusing/go-proxy/internal/idlewatcher/types" - "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/routes" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/types" - U "github.com/yusing/go-proxy/internal/utils" - "github.com/yusing/go-proxy/internal/utils/atomic" - "github.com/yusing/go-proxy/internal/watcher/events" - "github.com/yusing/go-proxy/internal/watcher/health/monitor" + "github.com/yusing/godoxy/internal/docker" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/idlewatcher/provider" + idlewatcher "github.com/yusing/godoxy/internal/idlewatcher/types" + "github.com/yusing/godoxy/internal/net/gphttp/reverseproxy" + nettypes "github.com/yusing/godoxy/internal/net/types" + "github.com/yusing/godoxy/internal/route/routes" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/types" + U "github.com/yusing/godoxy/internal/utils" + "github.com/yusing/godoxy/internal/utils/atomic" + "github.com/yusing/godoxy/internal/watcher/events" + "github.com/yusing/godoxy/internal/watcher/health/monitor" "golang.org/x/sync/errgroup" "golang.org/x/sync/singleflight" ) diff --git a/internal/jsonstore/jsonstore.go b/internal/jsonstore/jsonstore.go index fae89519..aaa2e6c7 100644 --- a/internal/jsonstore/jsonstore.go +++ b/internal/jsonstore/jsonstore.go @@ -9,10 +9,10 @@ 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/serialization" - "github.com/yusing/go-proxy/internal/task" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/serialization" + "github.com/yusing/godoxy/internal/task" ) type namespace string diff --git a/internal/logging/accesslog/access_logger.go b/internal/logging/accesslog/access_logger.go index 989f509e..52ae36e4 100644 --- a/internal/logging/accesslog/access_logger.go +++ b/internal/logging/accesslog/access_logger.go @@ -9,12 +9,12 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/gperr" - maxmind "github.com/yusing/go-proxy/internal/maxmind/types" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/utils" - "github.com/yusing/go-proxy/internal/utils/strutils" - "github.com/yusing/go-proxy/internal/utils/synk" + "github.com/yusing/godoxy/internal/gperr" + maxmind "github.com/yusing/godoxy/internal/maxmind/types" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/utils" + "github.com/yusing/godoxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/utils/synk" "golang.org/x/time/rate" ) diff --git a/internal/logging/accesslog/access_logger_test.go b/internal/logging/accesslog/access_logger_test.go index c25c1205..8b5c291c 100644 --- a/internal/logging/accesslog/access_logger_test.go +++ b/internal/logging/accesslog/access_logger_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - . "github.com/yusing/go-proxy/internal/logging/accesslog" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/utils" - expect "github.com/yusing/go-proxy/internal/utils/testing" + . "github.com/yusing/godoxy/internal/logging/accesslog" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/utils" + expect "github.com/yusing/godoxy/internal/utils/testing" ) const ( diff --git a/internal/logging/accesslog/back_scanner_test.go b/internal/logging/accesslog/back_scanner_test.go index 2fb1b94b..ef42ed90 100644 --- a/internal/logging/accesslog/back_scanner_test.go +++ b/internal/logging/accesslog/back_scanner_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/spf13/afero" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/utils/strutils" - expect "github.com/yusing/go-proxy/internal/utils/testing" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/utils/strutils" + expect "github.com/yusing/godoxy/internal/utils/testing" ) func TestBackScanner(t *testing.T) { diff --git a/internal/logging/accesslog/config.go b/internal/logging/accesslog/config.go index b350aaf5..a066aabb 100644 --- a/internal/logging/accesslog/config.go +++ b/internal/logging/accesslog/config.go @@ -3,8 +3,8 @@ package accesslog import ( "time" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/serialization" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/serialization" ) type ( diff --git a/internal/logging/accesslog/config_test.go b/internal/logging/accesslog/config_test.go index 37ccc548..0f5e00d8 100644 --- a/internal/logging/accesslog/config_test.go +++ b/internal/logging/accesslog/config_test.go @@ -3,10 +3,10 @@ package accesslog_test import ( "testing" - "github.com/yusing/go-proxy/internal/docker" - . "github.com/yusing/go-proxy/internal/logging/accesslog" - "github.com/yusing/go-proxy/internal/serialization" - expect "github.com/yusing/go-proxy/internal/utils/testing" + "github.com/yusing/godoxy/internal/docker" + . "github.com/yusing/godoxy/internal/logging/accesslog" + "github.com/yusing/godoxy/internal/serialization" + expect "github.com/yusing/godoxy/internal/utils/testing" ) func TestNewConfig(t *testing.T) { diff --git a/internal/logging/accesslog/fields_test.go b/internal/logging/accesslog/fields_test.go index 662e924b..cef9a7c5 100644 --- a/internal/logging/accesslog/fields_test.go +++ b/internal/logging/accesslog/fields_test.go @@ -3,8 +3,8 @@ package accesslog_test import ( "testing" - . "github.com/yusing/go-proxy/internal/logging/accesslog" - expect "github.com/yusing/go-proxy/internal/utils/testing" + . "github.com/yusing/godoxy/internal/logging/accesslog" + expect "github.com/yusing/godoxy/internal/utils/testing" ) // Cookie header should be removed, diff --git a/internal/logging/accesslog/file_logger.go b/internal/logging/accesslog/file_logger.go index 36e791c9..393193f6 100644 --- a/internal/logging/accesslog/file_logger.go +++ b/internal/logging/accesslog/file_logger.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/utils" + "github.com/yusing/godoxy/internal/utils" ) type File struct { diff --git a/internal/logging/accesslog/file_logger_test.go b/internal/logging/accesslog/file_logger_test.go index 01795970..68c9a5eb 100644 --- a/internal/logging/accesslog/file_logger_test.go +++ b/internal/logging/accesslog/file_logger_test.go @@ -6,9 +6,9 @@ import ( "sync" "testing" - expect "github.com/yusing/go-proxy/internal/utils/testing" + expect "github.com/yusing/godoxy/internal/utils/testing" - "github.com/yusing/go-proxy/internal/task" + "github.com/yusing/godoxy/internal/task" ) func TestConcurrentFileLoggersShareSameAccessLogIO(t *testing.T) { diff --git a/internal/logging/accesslog/filter.go b/internal/logging/accesslog/filter.go index 448cb50e..2d6f1f09 100644 --- a/internal/logging/accesslog/filter.go +++ b/internal/logging/accesslog/filter.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "github.com/yusing/go-proxy/internal/gperr" - nettypes "github.com/yusing/go-proxy/internal/net/types" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/gperr" + nettypes "github.com/yusing/godoxy/internal/net/types" + "github.com/yusing/godoxy/internal/utils/strutils" ) type ( diff --git a/internal/logging/accesslog/filter_test.go b/internal/logging/accesslog/filter_test.go index 1a6ee69e..7c39ecb2 100644 --- a/internal/logging/accesslog/filter_test.go +++ b/internal/logging/accesslog/filter_test.go @@ -5,10 +5,10 @@ import ( "net/http" "testing" - . "github.com/yusing/go-proxy/internal/logging/accesslog" - nettypes "github.com/yusing/go-proxy/internal/net/types" - "github.com/yusing/go-proxy/internal/utils/strutils" - expect "github.com/yusing/go-proxy/internal/utils/testing" + . "github.com/yusing/godoxy/internal/logging/accesslog" + nettypes "github.com/yusing/godoxy/internal/net/types" + "github.com/yusing/godoxy/internal/utils/strutils" + expect "github.com/yusing/godoxy/internal/utils/testing" ) func TestStatusCodeFilter(t *testing.T) { diff --git a/internal/logging/accesslog/formatter.go b/internal/logging/accesslog/formatter.go index 396b50d2..3ca8f7fc 100644 --- a/internal/logging/accesslog/formatter.go +++ b/internal/logging/accesslog/formatter.go @@ -8,8 +8,8 @@ import ( "strconv" "github.com/rs/zerolog" - maxmind "github.com/yusing/go-proxy/internal/maxmind/types" - "github.com/yusing/go-proxy/internal/utils" + maxmind "github.com/yusing/godoxy/internal/maxmind/types" + "github.com/yusing/godoxy/internal/utils" ) type ( diff --git a/internal/logging/accesslog/retention.go b/internal/logging/accesslog/retention.go index 19ceca1c..560f4814 100644 --- a/internal/logging/accesslog/retention.go +++ b/internal/logging/accesslog/retention.go @@ -4,8 +4,8 @@ import ( "fmt" "strconv" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/utils/strutils" ) type Retention struct { diff --git a/internal/logging/accesslog/retention_test.go b/internal/logging/accesslog/retention_test.go index 4feebfbb..cacabad8 100644 --- a/internal/logging/accesslog/retention_test.go +++ b/internal/logging/accesslog/retention_test.go @@ -3,8 +3,8 @@ package accesslog_test import ( "testing" - . "github.com/yusing/go-proxy/internal/logging/accesslog" - expect "github.com/yusing/go-proxy/internal/utils/testing" + . "github.com/yusing/godoxy/internal/logging/accesslog" + expect "github.com/yusing/godoxy/internal/utils/testing" ) func TestParseRetention(t *testing.T) { diff --git a/internal/logging/accesslog/rotate.go b/internal/logging/accesslog/rotate.go index 88be872f..cc60387e 100644 --- a/internal/logging/accesslog/rotate.go +++ b/internal/logging/accesslog/rotate.go @@ -6,10 +6,10 @@ import ( "time" "github.com/rs/zerolog" - "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/go-proxy/internal/utils/synk" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/utils" + "github.com/yusing/godoxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/utils/synk" ) type supportRotate interface { diff --git a/internal/logging/accesslog/rotate_test.go b/internal/logging/accesslog/rotate_test.go index 6da053e5..ce96260e 100644 --- a/internal/logging/accesslog/rotate_test.go +++ b/internal/logging/accesslog/rotate_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - . "github.com/yusing/go-proxy/internal/logging/accesslog" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/utils" - "github.com/yusing/go-proxy/internal/utils/strutils" - expect "github.com/yusing/go-proxy/internal/utils/testing" + . "github.com/yusing/godoxy/internal/logging/accesslog" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/utils" + "github.com/yusing/godoxy/internal/utils/strutils" + expect "github.com/yusing/godoxy/internal/utils/testing" ) var ( diff --git a/internal/logging/accesslog/status_code_range.go b/internal/logging/accesslog/status_code_range.go index 36db4aae..c943e772 100644 --- a/internal/logging/accesslog/status_code_range.go +++ b/internal/logging/accesslog/status_code_range.go @@ -3,8 +3,8 @@ package accesslog import ( "strconv" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/utils/strutils" ) type StatusCodeRange struct { diff --git a/internal/logging/logging.go b/internal/logging/logging.go index eae974e7..bbeb0035 100644 --- a/internal/logging/logging.go +++ b/internal/logging/logging.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/rs/zerolog" - "github.com/yusing/go-proxy/internal/common" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/utils/strutils" zerologlog "github.com/rs/zerolog/log" ) diff --git a/internal/logging/memlogger/mem_logger.go b/internal/logging/memlogger/mem_logger.go index 70f81e27..6798312d 100644 --- a/internal/logging/memlogger/mem_logger.go +++ b/internal/logging/memlogger/mem_logger.go @@ -9,8 +9,8 @@ import ( "github.com/gin-gonic/gin" "github.com/puzpuzpuz/xsync/v4" - apitypes "github.com/yusing/go-proxy/internal/api/types" - "github.com/yusing/go-proxy/internal/net/gphttp/websocket" + apitypes "github.com/yusing/godoxy/internal/api/types" + "github.com/yusing/godoxy/internal/net/gphttp/websocket" ) type logEntryRange struct { diff --git a/internal/maxmind/instance.go b/internal/maxmind/instance.go index 3e30aec2..2848693a 100644 --- a/internal/maxmind/instance.go +++ b/internal/maxmind/instance.go @@ -5,9 +5,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/notif" - "github.com/yusing/go-proxy/internal/task" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/notif" + "github.com/yusing/godoxy/internal/task" ) var instance *MaxMind diff --git a/internal/maxmind/maxmind.go b/internal/maxmind/maxmind.go index c95181e9..63572239 100644 --- a/internal/maxmind/maxmind.go +++ b/internal/maxmind/maxmind.go @@ -14,10 +14,10 @@ import ( "time" "github.com/oschwald/maxminddb-golang" - "github.com/yusing/go-proxy/internal/common" - "github.com/yusing/go-proxy/internal/gperr" - maxmind "github.com/yusing/go-proxy/internal/maxmind/types" - "github.com/yusing/go-proxy/internal/task" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/gperr" + maxmind "github.com/yusing/godoxy/internal/maxmind/types" + "github.com/yusing/godoxy/internal/task" ) /* diff --git a/internal/maxmind/maxmind_test.go b/internal/maxmind/maxmind_test.go index 6836c51e..4d6acfc7 100644 --- a/internal/maxmind/maxmind_test.go +++ b/internal/maxmind/maxmind_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/oschwald/maxminddb-golang" - maxmind "github.com/yusing/go-proxy/internal/maxmind/types" - "github.com/yusing/go-proxy/internal/task" + maxmind "github.com/yusing/godoxy/internal/maxmind/types" + "github.com/yusing/godoxy/internal/task" ) func testCfg() *MaxMind { diff --git a/internal/maxmind/types/config.go b/internal/maxmind/types/config.go index a2bb526f..15f44eac 100644 --- a/internal/maxmind/types/config.go +++ b/internal/maxmind/types/config.go @@ -3,7 +3,7 @@ package maxmind import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) type ( diff --git a/internal/metrics/period/handler.go b/internal/metrics/period/handler.go index 7f4fd972..5dffcab8 100644 --- a/internal/metrics/period/handler.go +++ b/internal/metrics/period/handler.go @@ -6,10 +6,10 @@ import ( "net/url" "github.com/gin-gonic/gin" - apitypes "github.com/yusing/go-proxy/internal/api/types" - metricsutils "github.com/yusing/go-proxy/internal/metrics/utils" - "github.com/yusing/go-proxy/internal/net/gphttp/httpheaders" - "github.com/yusing/go-proxy/internal/net/gphttp/websocket" + apitypes "github.com/yusing/godoxy/internal/api/types" + metricsutils "github.com/yusing/godoxy/internal/metrics/utils" + "github.com/yusing/godoxy/internal/net/gphttp/httpheaders" + "github.com/yusing/godoxy/internal/net/gphttp/websocket" ) type ResponseType[AggregateT any] struct { diff --git a/internal/metrics/period/poller.go b/internal/metrics/period/poller.go index f73c63b1..e9fe4662 100644 --- a/internal/metrics/period/poller.go +++ b/internal/metrics/period/poller.go @@ -11,9 +11,9 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/utils/atomic" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/utils/atomic" ) type ( diff --git a/internal/metrics/systeminfo/system_info.go b/internal/metrics/systeminfo/system_info.go index 14861993..ddc833a1 100644 --- a/internal/metrics/systeminfo/system_info.go +++ b/internal/metrics/systeminfo/system_info.go @@ -1,4 +1,4 @@ -package systeminfo // import github.com/yusing/go-proxy/internal/metrics/systeminfo +package systeminfo // import github.com/yusing/godoxy/internal/metrics/systeminfo import ( "context" @@ -15,9 +15,9 @@ import ( "github.com/shirou/gopsutil/v4/net" "github.com/shirou/gopsutil/v4/sensors" "github.com/shirou/gopsutil/v4/warning" - "github.com/yusing/go-proxy/internal/common" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/metrics/period" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/metrics/period" ) // json tags are left for tests diff --git a/internal/metrics/systeminfo/system_info_test.go b/internal/metrics/systeminfo/system_info_test.go index e54da314..805150d3 100644 --- a/internal/metrics/systeminfo/system_info_test.go +++ b/internal/metrics/systeminfo/system_info_test.go @@ -10,7 +10,7 @@ import ( "github.com/shirou/gopsutil/v4/mem" "github.com/shirou/gopsutil/v4/net" "github.com/shirou/gopsutil/v4/sensors" - . "github.com/yusing/go-proxy/internal/utils/testing" + . "github.com/yusing/godoxy/internal/utils/testing" ) // Create test data diff --git a/internal/metrics/uptime/uptime.go b/internal/metrics/uptime/uptime.go index 8c0efb89..03217b39 100644 --- a/internal/metrics/uptime/uptime.go +++ b/internal/metrics/uptime/uptime.go @@ -9,11 +9,11 @@ import ( "slices" "github.com/lithammer/fuzzysearch/fuzzy" - config "github.com/yusing/go-proxy/internal/config/types" - "github.com/yusing/go-proxy/internal/metrics/period" - metricsutils "github.com/yusing/go-proxy/internal/metrics/utils" - "github.com/yusing/go-proxy/internal/route/routes" - "github.com/yusing/go-proxy/internal/types" + config "github.com/yusing/godoxy/internal/config/types" + "github.com/yusing/godoxy/internal/metrics/period" + metricsutils "github.com/yusing/godoxy/internal/metrics/utils" + "github.com/yusing/godoxy/internal/route/routes" + "github.com/yusing/godoxy/internal/types" ) type ( diff --git a/internal/net/gphttp/content_type_test.go b/internal/net/gphttp/content_type_test.go index f5bba698..827c5d69 100644 --- a/internal/net/gphttp/content_type_test.go +++ b/internal/net/gphttp/content_type_test.go @@ -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) { diff --git a/internal/net/gphttp/error.go b/internal/net/gphttp/error.go index 0e1a440a..47a1acad 100644 --- a/internal/net/gphttp/error.go +++ b/internal/net/gphttp/error.go @@ -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. diff --git a/internal/net/gphttp/loadbalancer/ip_hash.go b/internal/net/gphttp/loadbalancer/ip_hash.go index c57f772b..a71f8e29 100644 --- a/internal/net/gphttp/loadbalancer/ip_hash.go +++ b/internal/net/gphttp/loadbalancer/ip_hash.go @@ -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 { diff --git a/internal/net/gphttp/loadbalancer/least_conn.go b/internal/net/gphttp/loadbalancer/least_conn.go index f6759f54..a810c0d2 100644 --- a/internal/net/gphttp/loadbalancer/least_conn.go +++ b/internal/net/gphttp/loadbalancer/least_conn.go @@ -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 { diff --git a/internal/net/gphttp/loadbalancer/loadbalancer.go b/internal/net/gphttp/loadbalancer/loadbalancer.go index ce7ec968..dd0624a7 100644 --- a/internal/net/gphttp/loadbalancer/loadbalancer.go +++ b/internal/net/gphttp/loadbalancer/loadbalancer.go @@ -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. diff --git a/internal/net/gphttp/loadbalancer/loadbalancer_test.go b/internal/net/gphttp/loadbalancer/loadbalancer_test.go index 5a9d89ee..dda958c6 100644 --- a/internal/net/gphttp/loadbalancer/loadbalancer_test.go +++ b/internal/net/gphttp/loadbalancer/loadbalancer_test.go @@ -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) { diff --git a/internal/net/gphttp/loadbalancer/round_robin.go b/internal/net/gphttp/loadbalancer/round_robin.go index 1721ca91..e0602630 100644 --- a/internal/net/gphttp/loadbalancer/round_robin.go +++ b/internal/net/gphttp/loadbalancer/round_robin.go @@ -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 { diff --git a/internal/net/gphttp/loadbalancer/server.go b/internal/net/gphttp/loadbalancer/server.go index 215c3157..c2da7021 100644 --- a/internal/net/gphttp/loadbalancer/server.go +++ b/internal/net/gphttp/loadbalancer/server.go @@ -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 { diff --git a/internal/net/gphttp/middleware/bypass.go b/internal/net/gphttp/middleware/bypass.go index a5f1b0ae..5858d05b 100644 --- a/internal/net/gphttp/middleware/bypass.go +++ b/internal/net/gphttp/middleware/bypass.go @@ -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 diff --git a/internal/net/gphttp/middleware/bypass_test.go b/internal/net/gphttp/middleware/bypass_test.go index 86a6ab9b..4bb173a5 100644 --- a/internal/net/gphttp/middleware/bypass_test.go +++ b/internal/net/gphttp/middleware/bypass_test.go @@ -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) {} diff --git a/internal/net/gphttp/middleware/captcha.go b/internal/net/gphttp/middleware/captcha.go index 6248ad31..4134920e 100644 --- a/internal/net/gphttp/middleware/captcha.go +++ b/internal/net/gphttp/middleware/captcha.go @@ -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 { diff --git a/internal/net/gphttp/middleware/captcha/hcaptcha.go b/internal/net/gphttp/middleware/captcha/hcaptcha.go index 6f3aa468..1adc18b1 100644 --- a/internal/net/gphttp/middleware/captcha/hcaptcha.go +++ b/internal/net/gphttp/middleware/captcha/hcaptcha.go @@ -12,7 +12,7 @@ import ( _ "embed" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) type HcaptchaProvider struct { diff --git a/internal/net/gphttp/middleware/captcha/middleware.go b/internal/net/gphttp/middleware/captcha/middleware.go index c4769ab3..baa58892 100644 --- a/internal/net/gphttp/middleware/captcha/middleware.go +++ b/internal/net/gphttp/middleware/captcha/middleware.go @@ -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" ) diff --git a/internal/net/gphttp/middleware/captcha/provider.go b/internal/net/gphttp/middleware/captcha/provider.go index 41e4844a..de3f9970 100644 --- a/internal/net/gphttp/middleware/captcha/provider.go +++ b/internal/net/gphttp/middleware/captcha/provider.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) type Provider interface { diff --git a/internal/net/gphttp/middleware/captcha/session.go b/internal/net/gphttp/middleware/captcha/session.go index 7f4567a2..0a61e23b 100644 --- a/internal/net/gphttp/middleware/captcha/session.go +++ b/internal/net/gphttp/middleware/captcha/session.go @@ -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 { diff --git a/internal/net/gphttp/middleware/cidr_whitelist.go b/internal/net/gphttp/middleware/cidr_whitelist.go index 1a963632..dc6e63ba 100644 --- a/internal/net/gphttp/middleware/cidr_whitelist.go +++ b/internal/net/gphttp/middleware/cidr_whitelist.go @@ -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 ( diff --git a/internal/net/gphttp/middleware/cidr_whitelist_test.go b/internal/net/gphttp/middleware/cidr_whitelist_test.go index 0d73f290..8aef7c1f 100644 --- a/internal/net/gphttp/middleware/cidr_whitelist_test.go +++ b/internal/net/gphttp/middleware/cidr_whitelist_test.go @@ -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 diff --git a/internal/net/gphttp/middleware/cloudflare_real_ip.go b/internal/net/gphttp/middleware/cloudflare_real_ip.go index 2214c987..dd52137c 100644 --- a/internal/net/gphttp/middleware/cloudflare_real_ip.go +++ b/internal/net/gphttp/middleware/cloudflare_real_ip.go @@ -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 { diff --git a/internal/net/gphttp/middleware/custom_error_page.go b/internal/net/gphttp/middleware/custom_error_page.go index baef63f7..231617a4 100644 --- a/internal/net/gphttp/middleware/custom_error_page.go +++ b/internal/net/gphttp/middleware/custom_error_page.go @@ -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{} diff --git a/internal/net/gphttp/middleware/errorpage/error_page.go b/internal/net/gphttp/middleware/errorpage/error_page.go index 36371653..c3afc158 100644 --- a/internal/net/gphttp/middleware/errorpage/error_page.go +++ b/internal/net/gphttp/middleware/errorpage/error_page.go @@ -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 diff --git a/internal/net/gphttp/middleware/forwardauth.go b/internal/net/gphttp/middleware/forwardauth.go index 7b16ee00..1f1949ae 100644 --- a/internal/net/gphttp/middleware/forwardauth.go +++ b/internal/net/gphttp/middleware/forwardauth.go @@ -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 ( diff --git a/internal/net/gphttp/middleware/middleware.go b/internal/net/gphttp/middleware/middleware.go index 21d0eb4c..84cb83a3 100644 --- a/internal/net/gphttp/middleware/middleware.go +++ b/internal/net/gphttp/middleware/middleware.go @@ -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 ( diff --git a/internal/net/gphttp/middleware/middleware_builder.go b/internal/net/gphttp/middleware/middleware_builder.go index 7d5fee84..7264e830 100644 --- a/internal/net/gphttp/middleware/middleware_builder.go +++ b/internal/net/gphttp/middleware/middleware_builder.go @@ -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") diff --git a/internal/net/gphttp/middleware/middleware_builder_test.go b/internal/net/gphttp/middleware/middleware_builder_test.go index 08e8402a..fee87995 100644 --- a/internal/net/gphttp/middleware/middleware_builder_test.go +++ b/internal/net/gphttp/middleware/middleware_builder_test.go @@ -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 diff --git a/internal/net/gphttp/middleware/middleware_chain.go b/internal/net/gphttp/middleware/middleware_chain.go index b749f559..360497d1 100644 --- a/internal/net/gphttp/middleware/middleware_chain.go +++ b/internal/net/gphttp/middleware/middleware_chain.go @@ -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 { diff --git a/internal/net/gphttp/middleware/middleware_test.go b/internal/net/gphttp/middleware/middleware_test.go index 5b6e5218..8c003025 100644 --- a/internal/net/gphttp/middleware/middleware_test.go +++ b/internal/net/gphttp/middleware/middleware_test.go @@ -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 { diff --git a/internal/net/gphttp/middleware/middlewares.go b/internal/net/gphttp/middleware/middlewares.go index 0f3517ce..b1e562ae 100644 --- a/internal/net/gphttp/middleware/middlewares.go +++ b/internal/net/gphttp/middleware/middlewares.go @@ -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` diff --git a/internal/net/gphttp/middleware/modify_html.go b/internal/net/gphttp/middleware/modify_html.go index fbe55ea8..57b6a5c7 100644 --- a/internal/net/gphttp/middleware/modify_html.go +++ b/internal/net/gphttp/middleware/modify_html.go @@ -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" ) diff --git a/internal/net/gphttp/middleware/modify_html_test.go b/internal/net/gphttp/middleware/modify_html_test.go index fa36fd74..c17bd970 100644 --- a/internal/net/gphttp/middleware/modify_html_test.go +++ b/internal/net/gphttp/middleware/modify_html_test.go @@ -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) { diff --git a/internal/net/gphttp/middleware/modify_request_test.go b/internal/net/gphttp/middleware/modify_request_test.go index ef15075e..85ceb3d2 100644 --- a/internal/net/gphttp/middleware/modify_request_test.go +++ b/internal/net/gphttp/middleware/modify_request_test.go @@ -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) { diff --git a/internal/net/gphttp/middleware/modify_response_test.go b/internal/net/gphttp/middleware/modify_response_test.go index 26b91af6..ea90a525 100644 --- a/internal/net/gphttp/middleware/modify_response_test.go +++ b/internal/net/gphttp/middleware/modify_response_test.go @@ -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) { diff --git a/internal/net/gphttp/middleware/oidc.go b/internal/net/gphttp/middleware/oidc.go index 5deb4eab..54d8d25c 100644 --- a/internal/net/gphttp/middleware/oidc.go +++ b/internal/net/gphttp/middleware/oidc.go @@ -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 { diff --git a/internal/net/gphttp/middleware/oidc_test.go b/internal/net/gphttp/middleware/oidc_test.go index c3fe0f85..93ab7260 100644 --- a/internal/net/gphttp/middleware/oidc_test.go +++ b/internal/net/gphttp/middleware/oidc_test.go @@ -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) { diff --git a/internal/net/gphttp/middleware/rate_limit_test.go b/internal/net/gphttp/middleware/rate_limit_test.go index 12649978..35af0c53 100644 --- a/internal/net/gphttp/middleware/rate_limit_test.go +++ b/internal/net/gphttp/middleware/rate_limit_test.go @@ -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) { diff --git a/internal/net/gphttp/middleware/real_ip.go b/internal/net/gphttp/middleware/real_ip.go index bb9305da..162b0d2b 100644 --- a/internal/net/gphttp/middleware/real_ip.go +++ b/internal/net/gphttp/middleware/real_ip.go @@ -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 diff --git a/internal/net/gphttp/middleware/real_ip_test.go b/internal/net/gphttp/middleware/real_ip_test.go index 4e4af985..be1769e3 100644 --- a/internal/net/gphttp/middleware/real_ip_test.go +++ b/internal/net/gphttp/middleware/real_ip_test.go @@ -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) { diff --git a/internal/net/gphttp/middleware/redirect_http.go b/internal/net/gphttp/middleware/redirect_http.go index 6825ed86..0addebc3 100644 --- a/internal/net/gphttp/middleware/redirect_http.go +++ b/internal/net/gphttp/middleware/redirect_http.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/yusing/go-proxy/internal/common" + "github.com/yusing/godoxy/internal/common" ) type redirectHTTP struct { diff --git a/internal/net/gphttp/middleware/redirect_http_test.go b/internal/net/gphttp/middleware/redirect_http_test.go index 2bad6c83..d8ccca85 100644 --- a/internal/net/gphttp/middleware/redirect_http_test.go +++ b/internal/net/gphttp/middleware/redirect_http_test.go @@ -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) { diff --git a/internal/net/gphttp/middleware/test_utils.go b/internal/net/gphttp/middleware/test_utils.go index 8e49aae5..24e51342 100644 --- a/internal/net/gphttp/middleware/test_utils.go +++ b/internal/net/gphttp/middleware/test_utils.go @@ -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 diff --git a/internal/net/gphttp/middleware/themed.go b/internal/net/gphttp/middleware/themed.go index b6ea4749..bcc4b6ba 100644 --- a/internal/net/gphttp/middleware/themed.go +++ b/internal/net/gphttp/middleware/themed.go @@ -10,7 +10,7 @@ import ( _ "embed" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) type themed struct { diff --git a/internal/net/gphttp/middleware/vars.go b/internal/net/gphttp/middleware/vars.go index 6c5f7fcc..c49af043 100644 --- a/internal/net/gphttp/middleware/vars.go +++ b/internal/net/gphttp/middleware/vars.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/yusing/go-proxy/internal/route/routes" + "github.com/yusing/godoxy/internal/route/routes" ) type ( diff --git a/internal/net/gphttp/middleware/x_forwarded.go b/internal/net/gphttp/middleware/x_forwarded.go index a2de34be..bf6c4ef7 100644 --- a/internal/net/gphttp/middleware/x_forwarded.go +++ b/internal/net/gphttp/middleware/x_forwarded.go @@ -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 ( diff --git a/internal/net/gphttp/reverseproxy/reverse_proxy.go b/internal/net/gphttp/reverseproxy/reverse_proxy.go index d8b31e03..c1bea568 100644 --- a/internal/net/gphttp/reverseproxy/reverse_proxy.go +++ b/internal/net/gphttp/reverseproxy/reverse_proxy.go @@ -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" diff --git a/internal/net/gphttp/reverseproxy/reverse_proxy_benchmark_test.go b/internal/net/gphttp/reverseproxy/reverse_proxy_benchmark_test.go index 83091ec3..4717fccb 100644 --- a/internal/net/gphttp/reverseproxy/reverse_proxy_benchmark_test.go +++ b/internal/net/gphttp/reverseproxy/reverse_proxy_benchmark_test.go @@ -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{} diff --git a/internal/net/gphttp/server/server.go b/internal/net/gphttp/server/server.go index 1b4224da..020ff153 100644 --- a/internal/net/gphttp/server/server.go +++ b/internal/net/gphttp/server/server.go @@ -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 { diff --git a/internal/net/gphttp/server/utils.go b/internal/net/gphttp/server/utils.go index 968f5842..76e59836 100644 --- a/internal/net/gphttp/server/utils.go +++ b/internal/net/gphttp/server/utils.go @@ -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 { diff --git a/internal/net/gphttp/websocket/manager.go b/internal/net/gphttp/websocket/manager.go index 627259e3..1ed61046 100644 --- a/internal/net/gphttp/websocket/manager.go +++ b/internal/net/gphttp/websocket/manager.go @@ -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 diff --git a/internal/net/gphttp/websocket/utils.go b/internal/net/gphttp/websocket/utils.go index 4f38fc95..63fe32ea 100644 --- a/internal/net/gphttp/websocket/utils.go +++ b/internal/net/gphttp/websocket/utils.go @@ -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 diff --git a/internal/net/types/url.go b/internal/net/types/url.go index 75b9b61e..82a04ded 100644 --- a/internal/net/types/url.go +++ b/internal/net/types/url.go @@ -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 { diff --git a/internal/notif/base.go b/internal/notif/base.go index 12ce7eea..896c0b7f 100644 --- a/internal/notif/base.go +++ b/internal/notif/base.go @@ -6,7 +6,7 @@ import ( "net/url" "strings" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) type ProviderBase struct { diff --git a/internal/notif/body.go b/internal/notif/body.go index 4b797a5a..e47f7afb 100644 --- a/internal/notif/body.go +++ b/internal/notif/body.go @@ -5,7 +5,7 @@ import ( "encoding/json" "strings" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) type ( diff --git a/internal/notif/config.go b/internal/notif/config.go index 7f91c3d3..8b1dde37 100644 --- a/internal/notif/config.go +++ b/internal/notif/config.go @@ -1,8 +1,8 @@ package notif import ( - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/serialization" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/serialization" ) type NotificationConfig struct { diff --git a/internal/notif/config_test.go b/internal/notif/config_test.go index 68d3897f..3093c8f7 100644 --- a/internal/notif/config_test.go +++ b/internal/notif/config_test.go @@ -4,8 +4,8 @@ import ( "net/http" "testing" - "github.com/yusing/go-proxy/internal/serialization" - . "github.com/yusing/go-proxy/internal/utils/testing" + "github.com/yusing/godoxy/internal/serialization" + . "github.com/yusing/godoxy/internal/utils/testing" ) func TestNotificationConfig(t *testing.T) { diff --git a/internal/notif/dispatcher.go b/internal/notif/dispatcher.go index 03287895..503e83f0 100644 --- a/internal/notif/dispatcher.go +++ b/internal/notif/dispatcher.go @@ -8,8 +8,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/task" - F "github.com/yusing/go-proxy/internal/utils/functional" + "github.com/yusing/godoxy/internal/task" + F "github.com/yusing/godoxy/internal/utils/functional" ) type ( diff --git a/internal/notif/ntfy.go b/internal/notif/ntfy.go index 586fdc56..da566b53 100644 --- a/internal/notif/ntfy.go +++ b/internal/notif/ntfy.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/rs/zerolog" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) // See https://docs.ntfy.sh/publish diff --git a/internal/notif/providers.go b/internal/notif/providers.go index 9f52a0b5..894cd134 100644 --- a/internal/notif/providers.go +++ b/internal/notif/providers.go @@ -8,8 +8,8 @@ import ( "net/http" "time" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/serialization" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/serialization" ) type ( diff --git a/internal/notif/webhook.go b/internal/notif/webhook.go index 6a274fe2..40ed7084 100644 --- a/internal/notif/webhook.go +++ b/internal/notif/webhook.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) type Webhook struct { diff --git a/internal/proxmox/client.go b/internal/proxmox/client.go index bccaafd2..5769b6b4 100644 --- a/internal/proxmox/client.go +++ b/internal/proxmox/client.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/luthermonson/go-proxmox" - "github.com/yusing/go-proxy/internal/utils/pool" + "github.com/yusing/godoxy/internal/utils/pool" ) type Client struct { diff --git a/internal/proxmox/config.go b/internal/proxmox/config.go index 40e4a7ad..0d287fb5 100644 --- a/internal/proxmox/config.go +++ b/internal/proxmox/config.go @@ -9,8 +9,8 @@ import ( "time" "github.com/luthermonson/go-proxmox" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/net/gphttp" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/net/gphttp" ) type Config struct { diff --git a/internal/proxmox/node.go b/internal/proxmox/node.go index 6fc45ba2..bd427bda 100644 --- a/internal/proxmox/node.go +++ b/internal/proxmox/node.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/luthermonson/go-proxmox" - "github.com/yusing/go-proxy/internal/utils/pool" + "github.com/yusing/godoxy/internal/utils/pool" ) type Node struct { diff --git a/internal/route/common.go b/internal/route/common.go index 2cc34f4e..4bd12972 100644 --- a/internal/route/common.go +++ b/internal/route/common.go @@ -1,9 +1,9 @@ package route import ( - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/route/routes" - "github.com/yusing/go-proxy/internal/types" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/route/routes" + "github.com/yusing/godoxy/internal/types" ) func checkExists(r types.Route) gperr.Error { diff --git a/internal/route/fileserver.go b/internal/route/fileserver.go index 737c43ae..3126d366 100644 --- a/internal/route/fileserver.go +++ b/internal/route/fileserver.go @@ -5,13 +5,13 @@ import ( "path" "path/filepath" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/logging/accesslog" - gphttp "github.com/yusing/go-proxy/internal/net/gphttp" - "github.com/yusing/go-proxy/internal/net/gphttp/middleware" - "github.com/yusing/go-proxy/internal/route/routes" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/watcher/health/monitor" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/logging/accesslog" + gphttp "github.com/yusing/godoxy/internal/net/gphttp" + "github.com/yusing/godoxy/internal/net/gphttp/middleware" + "github.com/yusing/godoxy/internal/route/routes" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/watcher/health/monitor" ) type ( diff --git a/internal/route/fileserver_test.go b/internal/route/fileserver_test.go index f93e523a..c2bb5732 100644 --- a/internal/route/fileserver_test.go +++ b/internal/route/fileserver_test.go @@ -10,7 +10,7 @@ import ( "path/filepath" "testing" - . "github.com/yusing/go-proxy/internal/utils/testing" + . "github.com/yusing/godoxy/internal/utils/testing" ) func TestPathTraversalAttack(t *testing.T) { diff --git a/internal/route/provider/agent.go b/internal/route/provider/agent.go index dce24b88..f4e4f4d8 100644 --- a/internal/route/provider/agent.go +++ b/internal/route/provider/agent.go @@ -2,10 +2,10 @@ package provider import ( "github.com/rs/zerolog" - "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/route" - "github.com/yusing/go-proxy/internal/watcher" + "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/route" + "github.com/yusing/godoxy/internal/watcher" ) type AgentProvider struct { diff --git a/internal/route/provider/docker.go b/internal/route/provider/docker.go index 25fe921e..65d5915b 100755 --- a/internal/route/provider/docker.go +++ b/internal/route/provider/docker.go @@ -9,13 +9,13 @@ import ( "github.com/goccy/go-yaml" "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/docker" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/route" - "github.com/yusing/go-proxy/internal/serialization" - "github.com/yusing/go-proxy/internal/types" - "github.com/yusing/go-proxy/internal/utils/strutils" - "github.com/yusing/go-proxy/internal/watcher" + "github.com/yusing/godoxy/internal/docker" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/route" + "github.com/yusing/godoxy/internal/serialization" + "github.com/yusing/godoxy/internal/types" + "github.com/yusing/godoxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/watcher" ) type DockerProvider struct { diff --git a/internal/route/provider/docker_labels_test.go b/internal/route/provider/docker_labels_test.go index c9cc890f..f5b27c9f 100644 --- a/internal/route/provider/docker_labels_test.go +++ b/internal/route/provider/docker_labels_test.go @@ -5,8 +5,8 @@ import ( "github.com/docker/docker/api/types/container" "github.com/goccy/go-yaml" - "github.com/yusing/go-proxy/internal/docker" - . "github.com/yusing/go-proxy/internal/utils/testing" + "github.com/yusing/godoxy/internal/docker" + . "github.com/yusing/godoxy/internal/utils/testing" _ "embed" ) diff --git a/internal/route/provider/docker_test.go b/internal/route/provider/docker_test.go index 5223fda7..83dbc416 100644 --- a/internal/route/provider/docker_test.go +++ b/internal/route/provider/docker_test.go @@ -7,10 +7,10 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" "github.com/docker/docker/client" - D "github.com/yusing/go-proxy/internal/docker" - "github.com/yusing/go-proxy/internal/route" - T "github.com/yusing/go-proxy/internal/route/types" - expect "github.com/yusing/go-proxy/internal/utils/testing" + D "github.com/yusing/godoxy/internal/docker" + "github.com/yusing/godoxy/internal/route" + T "github.com/yusing/godoxy/internal/route/types" + expect "github.com/yusing/godoxy/internal/utils/testing" ) var dummyNames = []string{"/a"} diff --git a/internal/route/provider/event_handler.go b/internal/route/provider/event_handler.go index 74536787..0bd29102 100644 --- a/internal/route/provider/event_handler.go +++ b/internal/route/provider/event_handler.go @@ -1,12 +1,12 @@ package provider import ( - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/route" - provider "github.com/yusing/go-proxy/internal/route/provider/types" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/watcher" - eventsPkg "github.com/yusing/go-proxy/internal/watcher/events" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/route" + provider "github.com/yusing/godoxy/internal/route/provider/types" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/watcher" + eventsPkg "github.com/yusing/godoxy/internal/watcher/events" ) type EventHandler struct { diff --git a/internal/route/provider/file.go b/internal/route/provider/file.go index f8941ab1..b373567f 100644 --- a/internal/route/provider/file.go +++ b/internal/route/provider/file.go @@ -7,11 +7,11 @@ import ( "github.com/rs/zerolog" "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/route" - "github.com/yusing/go-proxy/internal/serialization" - W "github.com/yusing/go-proxy/internal/watcher" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/route" + "github.com/yusing/godoxy/internal/serialization" + W "github.com/yusing/godoxy/internal/watcher" ) type FileProvider struct { diff --git a/internal/route/provider/file_test.go b/internal/route/provider/file_test.go index 756095c5..f37d36a7 100644 --- a/internal/route/provider/file_test.go +++ b/internal/route/provider/file_test.go @@ -5,7 +5,7 @@ import ( _ "embed" - . "github.com/yusing/go-proxy/internal/utils/testing" + . "github.com/yusing/godoxy/internal/utils/testing" ) //go:embed all_fields.yaml diff --git a/internal/route/provider/provider.go b/internal/route/provider/provider.go index 7b4fedd5..6a8a32e5 100644 --- a/internal/route/provider/provider.go +++ b/internal/route/provider/provider.go @@ -10,16 +10,16 @@ import ( "github.com/docker/docker/client" "github.com/rs/zerolog" - "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/internal/common" - "github.com/yusing/go-proxy/internal/docker" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/route" - provider "github.com/yusing/go-proxy/internal/route/provider/types" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/types" - W "github.com/yusing/go-proxy/internal/watcher" - "github.com/yusing/go-proxy/internal/watcher/events" + "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/docker" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/route" + provider "github.com/yusing/godoxy/internal/route/provider/types" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/types" + W "github.com/yusing/godoxy/internal/watcher" + "github.com/yusing/godoxy/internal/watcher/events" ) type ( diff --git a/internal/route/provider/stats.go b/internal/route/provider/stats.go index 19fdd80e..07e4338b 100644 --- a/internal/route/provider/stats.go +++ b/internal/route/provider/stats.go @@ -1,8 +1,8 @@ package provider import ( - route "github.com/yusing/go-proxy/internal/route/types" - "github.com/yusing/go-proxy/internal/types" + route "github.com/yusing/godoxy/internal/route/types" + "github.com/yusing/godoxy/internal/types" ) func (p *Provider) Statistics() types.ProviderStats { diff --git a/internal/route/reverse_proxy.go b/internal/route/reverse_proxy.go index c1ec4dbb..deae8078 100755 --- a/internal/route/reverse_proxy.go +++ b/internal/route/reverse_proxy.go @@ -4,22 +4,22 @@ import ( "net/http" "sync" - "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/agent/pkg/agentproxy" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/homepage" - "github.com/yusing/go-proxy/internal/idlewatcher" - "github.com/yusing/go-proxy/internal/logging/accesslog" - gphttp "github.com/yusing/go-proxy/internal/net/gphttp" - "github.com/yusing/go-proxy/internal/net/gphttp/loadbalancer" - "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/routes" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/types" - "github.com/yusing/go-proxy/internal/watcher/health/monitor" - "github.com/yusing/go-proxy/pkg" + "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/agent/pkg/agentproxy" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/homepage" + "github.com/yusing/godoxy/internal/idlewatcher" + "github.com/yusing/godoxy/internal/logging/accesslog" + gphttp "github.com/yusing/godoxy/internal/net/gphttp" + "github.com/yusing/godoxy/internal/net/gphttp/loadbalancer" + "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/routes" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/types" + "github.com/yusing/godoxy/internal/watcher/health/monitor" + "github.com/yusing/godoxy/pkg" ) type ReveseProxyRoute struct { diff --git a/internal/route/route.go b/internal/route/route.go index e6ab0f26..70e14dd8 100644 --- a/internal/route/route.go +++ b/internal/route/route.go @@ -10,23 +10,23 @@ import ( "github.com/docker/docker/api/types/container" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/internal/docker" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/homepage" - netutils "github.com/yusing/go-proxy/internal/net" - nettypes "github.com/yusing/go-proxy/internal/net/types" - "github.com/yusing/go-proxy/internal/proxmox" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/types" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/internal/docker" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/homepage" + netutils "github.com/yusing/godoxy/internal/net" + nettypes "github.com/yusing/godoxy/internal/net/types" + "github.com/yusing/godoxy/internal/proxmox" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/types" + "github.com/yusing/godoxy/internal/utils/strutils" - "github.com/yusing/go-proxy/internal/common" - config "github.com/yusing/go-proxy/internal/config/types" - "github.com/yusing/go-proxy/internal/logging/accesslog" - "github.com/yusing/go-proxy/internal/route/rules" - route "github.com/yusing/go-proxy/internal/route/types" - "github.com/yusing/go-proxy/internal/utils" + "github.com/yusing/godoxy/internal/common" + config "github.com/yusing/godoxy/internal/config/types" + "github.com/yusing/godoxy/internal/logging/accesslog" + "github.com/yusing/godoxy/internal/route/rules" + route "github.com/yusing/godoxy/internal/route/types" + "github.com/yusing/godoxy/internal/utils" ) type ( diff --git a/internal/route/route_test.go b/internal/route/route_test.go index 59fd1973..b19a5ee1 100644 --- a/internal/route/route_test.go +++ b/internal/route/route_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/docker/docker/api/types/container" - "github.com/yusing/go-proxy/internal/common" - route "github.com/yusing/go-proxy/internal/route/types" - "github.com/yusing/go-proxy/internal/types" - expect "github.com/yusing/go-proxy/internal/utils/testing" + "github.com/yusing/godoxy/internal/common" + route "github.com/yusing/godoxy/internal/route/types" + "github.com/yusing/godoxy/internal/types" + expect "github.com/yusing/godoxy/internal/utils/testing" ) func TestRouteValidate(t *testing.T) { diff --git a/internal/route/routes/context.go b/internal/route/routes/context.go index 811a2cbf..9182145e 100644 --- a/internal/route/routes/context.go +++ b/internal/route/routes/context.go @@ -11,7 +11,7 @@ import ( "reflect" "unsafe" - "github.com/yusing/go-proxy/internal/types" + "github.com/yusing/godoxy/internal/types" ) type RouteContextKey struct{} diff --git a/internal/route/routes/query.go b/internal/route/routes/query.go index 923733e2..5b070323 100644 --- a/internal/route/routes/query.go +++ b/internal/route/routes/query.go @@ -6,7 +6,7 @@ import ( "math" "time" - "github.com/yusing/go-proxy/internal/types" + "github.com/yusing/godoxy/internal/types" ) type HealthInfo struct { diff --git a/internal/route/routes/routes.go b/internal/route/routes/routes.go index 1f6c515a..51edd7f6 100644 --- a/internal/route/routes/routes.go +++ b/internal/route/routes/routes.go @@ -1,8 +1,8 @@ package routes import ( - "github.com/yusing/go-proxy/internal/types" - "github.com/yusing/go-proxy/internal/utils/pool" + "github.com/yusing/godoxy/internal/types" + "github.com/yusing/godoxy/internal/utils/pool" ) var ( diff --git a/internal/route/rules/do.go b/internal/route/rules/do.go index 41cce64f..687a18a2 100644 --- a/internal/route/rules/do.go +++ b/internal/route/rules/do.go @@ -6,11 +6,11 @@ import ( "strconv" "strings" - "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" - nettypes "github.com/yusing/go-proxy/internal/net/types" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/gperr" + gphttp "github.com/yusing/godoxy/internal/net/gphttp" + "github.com/yusing/godoxy/internal/net/gphttp/reverseproxy" + nettypes "github.com/yusing/godoxy/internal/net/types" + "github.com/yusing/godoxy/internal/utils/strutils" ) type ( diff --git a/internal/route/rules/do_test.go b/internal/route/rules/do_test.go index 0de802c9..87c19f29 100644 --- a/internal/route/rules/do_test.go +++ b/internal/route/rules/do_test.go @@ -3,7 +3,7 @@ package rules import ( "testing" - . "github.com/yusing/go-proxy/internal/utils/testing" + . "github.com/yusing/godoxy/internal/utils/testing" ) func TestParseCommands(t *testing.T) { diff --git a/internal/route/rules/errors.go b/internal/route/rules/errors.go index ec9e86e1..bae209f1 100644 --- a/internal/route/rules/errors.go +++ b/internal/route/rules/errors.go @@ -1,7 +1,7 @@ package rules import ( - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) var ( diff --git a/internal/route/rules/on.go b/internal/route/rules/on.go index 1ef6928e..e3559f23 100644 --- a/internal/route/rules/on.go +++ b/internal/route/rules/on.go @@ -7,10 +7,10 @@ import ( "slices" "github.com/gobwas/glob" - "github.com/yusing/go-proxy/internal/gperr" - nettypes "github.com/yusing/go-proxy/internal/net/types" - "github.com/yusing/go-proxy/internal/route/routes" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/gperr" + nettypes "github.com/yusing/godoxy/internal/net/types" + "github.com/yusing/godoxy/internal/route/routes" + "github.com/yusing/godoxy/internal/utils/strutils" ) type RuleOn struct { diff --git a/internal/route/rules/on_internal_test.go b/internal/route/rules/on_internal_test.go index 08ad0dc5..9fb349c8 100644 --- a/internal/route/rules/on_internal_test.go +++ b/internal/route/rules/on_internal_test.go @@ -3,8 +3,8 @@ package rules import ( "testing" - "github.com/yusing/go-proxy/internal/gperr" - expect "github.com/yusing/go-proxy/internal/utils/testing" + "github.com/yusing/godoxy/internal/gperr" + expect "github.com/yusing/godoxy/internal/utils/testing" ) func TestSplitAnd(t *testing.T) { diff --git a/internal/route/rules/on_test.go b/internal/route/rules/on_test.go index fdb8180e..32af7b90 100644 --- a/internal/route/rules/on_test.go +++ b/internal/route/rules/on_test.go @@ -7,10 +7,10 @@ import ( "net/url" "testing" - "github.com/yusing/go-proxy/internal/route" - "github.com/yusing/go-proxy/internal/route/routes" - . "github.com/yusing/go-proxy/internal/route/rules" - expect "github.com/yusing/go-proxy/internal/utils/testing" + "github.com/yusing/godoxy/internal/route" + "github.com/yusing/godoxy/internal/route/routes" + . "github.com/yusing/godoxy/internal/route/rules" + expect "github.com/yusing/godoxy/internal/utils/testing" "golang.org/x/crypto/bcrypt" ) diff --git a/internal/route/rules/parser.go b/internal/route/rules/parser.go index dc317b04..c3a48931 100644 --- a/internal/route/rules/parser.go +++ b/internal/route/rules/parser.go @@ -4,7 +4,7 @@ import ( "bytes" "unicode" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) var escapedChars = map[rune]rune{ diff --git a/internal/route/rules/parser_test.go b/internal/route/rules/parser_test.go index b5743aed..b8cb054c 100644 --- a/internal/route/rules/parser_test.go +++ b/internal/route/rules/parser_test.go @@ -4,8 +4,8 @@ import ( "strconv" "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" ) func TestParser(t *testing.T) { diff --git a/internal/route/rules/rules_test.go b/internal/route/rules/rules_test.go index 0601e3a7..c620bc0b 100644 --- a/internal/route/rules/rules_test.go +++ b/internal/route/rules/rules_test.go @@ -3,8 +3,8 @@ package rules import ( "testing" - "github.com/yusing/go-proxy/internal/serialization" - . "github.com/yusing/go-proxy/internal/utils/testing" + "github.com/yusing/godoxy/internal/serialization" + . "github.com/yusing/godoxy/internal/utils/testing" ) func TestParseRule(t *testing.T) { diff --git a/internal/route/rules/validate.go b/internal/route/rules/validate.go index 7729a36c..389c49c4 100644 --- a/internal/route/rules/validate.go +++ b/internal/route/rules/validate.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/gobwas/glob" - "github.com/yusing/go-proxy/internal/gperr" - gphttp "github.com/yusing/go-proxy/internal/net/gphttp" - nettypes "github.com/yusing/go-proxy/internal/net/types" + "github.com/yusing/godoxy/internal/gperr" + gphttp "github.com/yusing/godoxy/internal/net/gphttp" + nettypes "github.com/yusing/godoxy/internal/net/types" ) type ( diff --git a/internal/route/stream.go b/internal/route/stream.go index d42d1ac8..82a69db8 100755 --- a/internal/route/stream.go +++ b/internal/route/stream.go @@ -7,14 +7,14 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/idlewatcher" - nettypes "github.com/yusing/go-proxy/internal/net/types" - "github.com/yusing/go-proxy/internal/route/routes" - "github.com/yusing/go-proxy/internal/route/stream" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/types" - "github.com/yusing/go-proxy/internal/watcher/health/monitor" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/idlewatcher" + nettypes "github.com/yusing/godoxy/internal/net/types" + "github.com/yusing/godoxy/internal/route/routes" + "github.com/yusing/godoxy/internal/route/stream" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/types" + "github.com/yusing/godoxy/internal/watcher/health/monitor" ) // TODO: support stream load balance. diff --git a/internal/route/stream/tcp_tcp.go b/internal/route/stream/tcp_tcp.go index a00a7385..18d4a0ad 100644 --- a/internal/route/stream/tcp_tcp.go +++ b/internal/route/stream/tcp_tcp.go @@ -6,9 +6,9 @@ import ( "github.com/pires/go-proxyproto" "github.com/rs/zerolog" - config "github.com/yusing/go-proxy/internal/config/types" - nettypes "github.com/yusing/go-proxy/internal/net/types" - "github.com/yusing/go-proxy/internal/utils" + config "github.com/yusing/godoxy/internal/config/types" + nettypes "github.com/yusing/godoxy/internal/net/types" + "github.com/yusing/godoxy/internal/utils" "go.uber.org/atomic" ) diff --git a/internal/route/stream/udp_udp.go b/internal/route/stream/udp_udp.go index c10cf3f2..88d4701d 100644 --- a/internal/route/stream/udp_udp.go +++ b/internal/route/stream/udp_udp.go @@ -10,9 +10,9 @@ import ( "time" "github.com/rs/zerolog" - config "github.com/yusing/go-proxy/internal/config/types" - nettypes "github.com/yusing/go-proxy/internal/net/types" - "github.com/yusing/go-proxy/internal/utils/synk" + config "github.com/yusing/godoxy/internal/config/types" + nettypes "github.com/yusing/godoxy/internal/net/types" + "github.com/yusing/godoxy/internal/utils/synk" "go.uber.org/atomic" ) diff --git a/internal/route/types/http_config.go b/internal/route/types/http_config.go index 95bc336a..3a975539 100644 --- a/internal/route/types/http_config.go +++ b/internal/route/types/http_config.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) type HTTPConfig struct { diff --git a/internal/route/types/http_config_test.go b/internal/route/types/http_config_test.go index 8f41760a..310f5243 100644 --- a/internal/route/types/http_config_test.go +++ b/internal/route/types/http_config_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - . "github.com/yusing/go-proxy/internal/route" - route "github.com/yusing/go-proxy/internal/route/types" - "github.com/yusing/go-proxy/internal/serialization" - expect "github.com/yusing/go-proxy/internal/utils/testing" + . "github.com/yusing/godoxy/internal/route" + route "github.com/yusing/godoxy/internal/route/types" + "github.com/yusing/godoxy/internal/serialization" + expect "github.com/yusing/godoxy/internal/utils/testing" ) func TestHTTPConfigDeserialize(t *testing.T) { diff --git a/internal/route/types/port.go b/internal/route/types/port.go index e4839ac5..13836d5e 100644 --- a/internal/route/types/port.go +++ b/internal/route/types/port.go @@ -3,8 +3,8 @@ package route import ( "strconv" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/utils/strutils" ) type Port struct { diff --git a/internal/route/types/scheme.go b/internal/route/types/scheme.go index 59835391..ca59be1a 100644 --- a/internal/route/types/scheme.go +++ b/internal/route/types/scheme.go @@ -1,7 +1,7 @@ package route import ( - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) type Scheme string diff --git a/internal/serialization/serialization.go b/internal/serialization/serialization.go index 2464d014..09d300d3 100644 --- a/internal/serialization/serialization.go +++ b/internal/serialization/serialization.go @@ -13,9 +13,9 @@ import ( "github.com/go-playground/validator/v10" "github.com/goccy/go-yaml" "github.com/puzpuzpuz/xsync/v4" - "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/gperr" + "github.com/yusing/godoxy/internal/utils" + "github.com/yusing/godoxy/internal/utils/strutils" ) type SerializedObject = map[string]any diff --git a/internal/serialization/serialization_test.go b/internal/serialization/serialization_test.go index ff656964..c63d986a 100644 --- a/internal/serialization/serialization_test.go +++ b/internal/serialization/serialization_test.go @@ -8,7 +8,7 @@ import ( "github.com/goccy/go-yaml" "github.com/stretchr/testify/require" - . "github.com/yusing/go-proxy/internal/utils/testing" + . "github.com/yusing/godoxy/internal/utils/testing" ) func TestDeserialize(t *testing.T) { diff --git a/internal/serialization/time_test.go b/internal/serialization/time_test.go index eaebcf19..ce1c4f87 100644 --- a/internal/serialization/time_test.go +++ b/internal/serialization/time_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/stretchr/testify/require" - expect "github.com/yusing/go-proxy/internal/utils/testing" + expect "github.com/yusing/godoxy/internal/utils/testing" ) // NOTE: -ldflags=-checklinkname=0 is required to test this function diff --git a/internal/serialization/validation.go b/internal/serialization/validation.go index 0b222f2a..1ace564e 100644 --- a/internal/serialization/validation.go +++ b/internal/serialization/validation.go @@ -2,7 +2,7 @@ package serialization import ( "github.com/go-playground/validator/v10" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) var validate = validator.New() diff --git a/internal/task/debug.go b/internal/task/debug.go index e1849dd8..d4f0cd0c 100644 --- a/internal/task/debug.go +++ b/internal/task/debug.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) // debug only. diff --git a/internal/task/task.go b/internal/task/task.go index 40e060ab..69e154ea 100644 --- a/internal/task/task.go +++ b/internal/task/task.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) type ( diff --git a/internal/task/task_test.go b/internal/task/task_test.go index 76faa84f..8501c43c 100644 --- a/internal/task/task_test.go +++ b/internal/task/task_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - expect "github.com/yusing/go-proxy/internal/utils/testing" + expect "github.com/yusing/godoxy/internal/utils/testing" ) func testTask() *Task { diff --git a/internal/types/docker.go b/internal/types/docker.go index 8f5930e8..bdd54de7 100644 --- a/internal/types/docker.go +++ b/internal/types/docker.go @@ -5,9 +5,9 @@ import ( "github.com/docker/docker/api/types/container" "github.com/yusing/ds/ordered" - "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/utils" + "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/utils" ) type ( diff --git a/internal/types/health.go b/internal/types/health.go index f6502b67..f7bb9b6c 100644 --- a/internal/types/health.go +++ b/internal/types/health.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/utils/strutils" ) type ( diff --git a/internal/types/healthcheck_config.go b/internal/types/healthcheck_config.go index 6f767863..3301f4c2 100644 --- a/internal/types/healthcheck_config.go +++ b/internal/types/healthcheck_config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/yusing/go-proxy/internal/common" + "github.com/yusing/godoxy/internal/common" ) type HealthCheckConfig struct { diff --git a/internal/types/idlewatcher.go b/internal/types/idlewatcher.go index 1be60d2a..a850dd5d 100644 --- a/internal/types/idlewatcher.go +++ b/internal/types/idlewatcher.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) type ( diff --git a/internal/types/idlewatcher_test.go b/internal/types/idlewatcher_test.go index d8456f8d..aac0af8e 100644 --- a/internal/types/idlewatcher_test.go +++ b/internal/types/idlewatcher_test.go @@ -3,7 +3,7 @@ package types import ( "testing" - expect "github.com/yusing/go-proxy/internal/utils/testing" + expect "github.com/yusing/godoxy/internal/utils/testing" ) func TestValidateStartEndpoint(t *testing.T) { diff --git a/internal/types/loadbalancer.go b/internal/types/loadbalancer.go index 3d21de5b..18d312ff 100644 --- a/internal/types/loadbalancer.go +++ b/internal/types/loadbalancer.go @@ -3,8 +3,8 @@ package types import ( "net/http" - nettypes "github.com/yusing/go-proxy/internal/net/types" - "github.com/yusing/go-proxy/internal/utils/strutils" + nettypes "github.com/yusing/godoxy/internal/net/types" + "github.com/yusing/godoxy/internal/utils/strutils" ) type ( diff --git a/internal/types/routes.go b/internal/types/routes.go index cf62f37a..3d3301f0 100644 --- a/internal/types/routes.go +++ b/internal/types/routes.go @@ -3,12 +3,12 @@ package types import ( "net/http" - "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/internal/homepage" - "github.com/yusing/go-proxy/internal/net/gphttp/reverseproxy" - nettypes "github.com/yusing/go-proxy/internal/net/types" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/utils/pool" + "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/internal/homepage" + "github.com/yusing/godoxy/internal/net/gphttp/reverseproxy" + nettypes "github.com/yusing/godoxy/internal/net/types" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/utils/pool" ) type ( diff --git a/internal/types/stats.go b/internal/types/stats.go index 8b3a0807..9b3fcb13 100644 --- a/internal/types/stats.go +++ b/internal/types/stats.go @@ -1,6 +1,6 @@ package types -import provider "github.com/yusing/go-proxy/internal/route/provider/types" +import provider "github.com/yusing/godoxy/internal/route/provider/types" type ( RouteStats struct { diff --git a/internal/utils/go.mod b/internal/utils/go.mod index fee9a286..7904792b 100644 --- a/internal/utils/go.mod +++ b/internal/utils/go.mod @@ -1,4 +1,4 @@ -module github.com/yusing/go-proxy/internal/utils +module github.com/yusing/godoxy/internal/utils go 1.25.1 diff --git a/internal/utils/io.go b/internal/utils/io.go index cb5db7e4..0778c3e6 100644 --- a/internal/utils/io.go +++ b/internal/utils/io.go @@ -8,7 +8,7 @@ import ( "sync" "syscall" - "github.com/yusing/go-proxy/internal/utils/synk" + "github.com/yusing/godoxy/internal/utils/synk" ) // TODO: move to "utils/io". diff --git a/internal/utils/nearest_field.go b/internal/utils/nearest_field.go index 238b3842..56511921 100644 --- a/internal/utils/nearest_field.go +++ b/internal/utils/nearest_field.go @@ -3,7 +3,7 @@ package utils import ( "reflect" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/utils/strutils" ) func NearestField(input string, s any) string { diff --git a/internal/utils/ref_count_test.go b/internal/utils/ref_count_test.go index 17bb197b..7eae0492 100644 --- a/internal/utils/ref_count_test.go +++ b/internal/utils/ref_count_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - . "github.com/yusing/go-proxy/internal/utils/testing" + . "github.com/yusing/godoxy/internal/utils/testing" ) func TestRefCounterAddSub(t *testing.T) { diff --git a/internal/utils/slices_test.go b/internal/utils/slices_test.go index b37b0bbd..31dd4406 100644 --- a/internal/utils/slices_test.go +++ b/internal/utils/slices_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - . "github.com/yusing/go-proxy/internal/utils/testing" + . "github.com/yusing/godoxy/internal/utils/testing" ) func TestIntersect(t *testing.T) { diff --git a/internal/utils/strutils/format_test.go b/internal/utils/strutils/format_test.go index 43087dfa..1a2fa873 100644 --- a/internal/utils/strutils/format_test.go +++ b/internal/utils/strutils/format_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/stretchr/testify/require" - . "github.com/yusing/go-proxy/internal/utils/strutils" + . "github.com/yusing/godoxy/internal/utils/strutils" ) func mustParseTime(t *testing.T, layout, value string) time.Time { diff --git a/internal/utils/strutils/split_join_test.go b/internal/utils/strutils/split_join_test.go index 50419a48..ef52f61d 100644 --- a/internal/utils/strutils/split_join_test.go +++ b/internal/utils/strutils/split_join_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - . "github.com/yusing/go-proxy/internal/utils/strutils" + . "github.com/yusing/godoxy/internal/utils/strutils" ) var alphaNumeric = func() string { diff --git a/internal/utils/synk/pool_debug.go b/internal/utils/synk/pool_debug.go index 6dfad8cc..4d1a48b0 100644 --- a/internal/utils/synk/pool_debug.go +++ b/internal/utils/synk/pool_debug.go @@ -10,7 +10,7 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/utils/strutils" ) var ( diff --git a/internal/utils/trie/key.go b/internal/utils/trie/key.go index f57885fc..e1c53162 100644 --- a/internal/utils/trie/key.go +++ b/internal/utils/trie/key.go @@ -4,7 +4,7 @@ import ( "slices" "strings" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/utils/strutils" ) type Key struct { diff --git a/internal/utils/trie/walk_test.go b/internal/utils/trie/walk_test.go index 7315d0a9..275524a2 100644 --- a/internal/utils/trie/walk_test.go +++ b/internal/utils/trie/walk_test.go @@ -5,7 +5,7 @@ import ( "slices" "testing" - . "github.com/yusing/go-proxy/internal/utils/trie" + . "github.com/yusing/godoxy/internal/utils/trie" ) // Test data for trie tests diff --git a/internal/watcher/config_file_watcher.go b/internal/watcher/config_file_watcher.go index fc0ccfb2..b31c3ea7 100644 --- a/internal/watcher/config_file_watcher.go +++ b/internal/watcher/config_file_watcher.go @@ -3,8 +3,8 @@ package watcher import ( "sync" - "github.com/yusing/go-proxy/internal/common" - "github.com/yusing/go-proxy/internal/task" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/task" ) var ( diff --git a/internal/watcher/directory_watcher.go b/internal/watcher/directory_watcher.go index fc7cada9..53ab758b 100644 --- a/internal/watcher/directory_watcher.go +++ b/internal/watcher/directory_watcher.go @@ -9,9 +9,9 @@ import ( "github.com/fsnotify/fsnotify" "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/watcher/events" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/watcher/events" ) type DirWatcher struct { diff --git a/internal/watcher/docker_watcher.go b/internal/watcher/docker_watcher.go index bdc154ed..7c5c49eb 100644 --- a/internal/watcher/docker_watcher.go +++ b/internal/watcher/docker_watcher.go @@ -9,9 +9,9 @@ import ( "github.com/docker/docker/api/types/filters" "github.com/docker/docker/client" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/docker" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/watcher/events" + "github.com/yusing/godoxy/internal/docker" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/watcher/events" ) type ( diff --git a/internal/watcher/events/event_queue.go b/internal/watcher/events/event_queue.go index 773d730c..eea1fbca 100644 --- a/internal/watcher/events/event_queue.go +++ b/internal/watcher/events/event_queue.go @@ -4,9 +4,9 @@ import ( "runtime/debug" "time" - "github.com/yusing/go-proxy/internal/common" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/task" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/task" ) type ( diff --git a/internal/watcher/file_watcher.go b/internal/watcher/file_watcher.go index 41989a15..619f5376 100644 --- a/internal/watcher/file_watcher.go +++ b/internal/watcher/file_watcher.go @@ -3,7 +3,7 @@ package watcher import ( "context" - "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/godoxy/internal/gperr" ) type fileWatcher struct { diff --git a/internal/watcher/health/monitor/agent_proxied.go b/internal/watcher/health/monitor/agent_proxied.go index e8eb467b..46612f3c 100644 --- a/internal/watcher/health/monitor/agent_proxied.go +++ b/internal/watcher/health/monitor/agent_proxied.go @@ -7,8 +7,8 @@ import ( "net/url" "time" - agentPkg "github.com/yusing/go-proxy/agent/pkg/agent" - "github.com/yusing/go-proxy/internal/types" + agentPkg "github.com/yusing/godoxy/agent/pkg/agent" + "github.com/yusing/godoxy/internal/types" ) type ( diff --git a/internal/watcher/health/monitor/docker.go b/internal/watcher/health/monitor/docker.go index 3483bbf5..b9d2824b 100644 --- a/internal/watcher/health/monitor/docker.go +++ b/internal/watcher/health/monitor/docker.go @@ -2,8 +2,8 @@ package monitor import ( "github.com/docker/docker/api/types/container" - "github.com/yusing/go-proxy/internal/docker" - "github.com/yusing/go-proxy/internal/types" + "github.com/yusing/godoxy/internal/docker" + "github.com/yusing/godoxy/internal/types" ) type DockerHealthMonitor struct { diff --git a/internal/watcher/health/monitor/fileserver.go b/internal/watcher/health/monitor/fileserver.go index 9f9f7696..12489e88 100644 --- a/internal/watcher/health/monitor/fileserver.go +++ b/internal/watcher/health/monitor/fileserver.go @@ -4,7 +4,7 @@ import ( "os" "time" - "github.com/yusing/go-proxy/internal/types" + "github.com/yusing/godoxy/internal/types" ) type FileServerHealthMonitor struct { diff --git a/internal/watcher/health/monitor/http.go b/internal/watcher/health/monitor/http.go index 0e9517ad..a0627958 100644 --- a/internal/watcher/health/monitor/http.go +++ b/internal/watcher/health/monitor/http.go @@ -7,8 +7,8 @@ import ( "net/url" "time" - "github.com/yusing/go-proxy/internal/types" - "github.com/yusing/go-proxy/pkg" + "github.com/yusing/godoxy/internal/types" + "github.com/yusing/godoxy/pkg" ) type HTTPHealthMonitor struct { diff --git a/internal/watcher/health/monitor/monitor.go b/internal/watcher/health/monitor/monitor.go index 7817d73d..f7e3729a 100644 --- a/internal/watcher/health/monitor/monitor.go +++ b/internal/watcher/health/monitor/monitor.go @@ -9,14 +9,14 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/yusing/go-proxy/internal/common" - "github.com/yusing/go-proxy/internal/docker" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/notif" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/types" - "github.com/yusing/go-proxy/internal/utils/atomic" - "github.com/yusing/go-proxy/internal/utils/strutils" + "github.com/yusing/godoxy/internal/common" + "github.com/yusing/godoxy/internal/docker" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/notif" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/types" + "github.com/yusing/godoxy/internal/utils/atomic" + "github.com/yusing/godoxy/internal/utils/strutils" ) type ( diff --git a/internal/watcher/health/monitor/monitor_test.go b/internal/watcher/health/monitor/monitor_test.go index 60c7ceb9..265f81ce 100644 --- a/internal/watcher/health/monitor/monitor_test.go +++ b/internal/watcher/health/monitor/monitor_test.go @@ -8,9 +8,9 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/require" - "github.com/yusing/go-proxy/internal/notif" - "github.com/yusing/go-proxy/internal/task" - "github.com/yusing/go-proxy/internal/types" + "github.com/yusing/godoxy/internal/notif" + "github.com/yusing/godoxy/internal/task" + "github.com/yusing/godoxy/internal/types" ) // Test notification tracker diff --git a/internal/watcher/health/monitor/raw.go b/internal/watcher/health/monitor/raw.go index 67fd01cd..fd8da308 100644 --- a/internal/watcher/health/monitor/raw.go +++ b/internal/watcher/health/monitor/raw.go @@ -5,7 +5,7 @@ import ( "net/url" "time" - "github.com/yusing/go-proxy/internal/types" + "github.com/yusing/godoxy/internal/types" ) type ( diff --git a/internal/watcher/watcher.go b/internal/watcher/watcher.go index 1c51ec8b..45419e95 100644 --- a/internal/watcher/watcher.go +++ b/internal/watcher/watcher.go @@ -3,8 +3,8 @@ package watcher import ( "context" - "github.com/yusing/go-proxy/internal/gperr" - "github.com/yusing/go-proxy/internal/watcher/events" + "github.com/yusing/godoxy/internal/gperr" + "github.com/yusing/godoxy/internal/watcher/events" ) type Event = events.Event diff --git a/socket-proxy/cmd/main.go b/socket-proxy/cmd/main.go index 67914ac4..a5959f3c 100644 --- a/socket-proxy/cmd/main.go +++ b/socket-proxy/cmd/main.go @@ -4,7 +4,7 @@ import ( "log" "net/http" - socketproxy "github.com/yusing/go-proxy/socketproxy/pkg" + socketproxy "github.com/yusing/godoxy/socketproxy/pkg" ) func main() { diff --git a/socket-proxy/go.mod b/socket-proxy/go.mod index f5cb463a..3a8131ad 100644 --- a/socket-proxy/go.mod +++ b/socket-proxy/go.mod @@ -1,12 +1,12 @@ -module github.com/yusing/go-proxy/socketproxy +module github.com/yusing/godoxy/socketproxy go 1.25.1 -replace github.com/yusing/go-proxy/internal/utils => ../internal/utils +replace github.com/yusing/godoxy/internal/utils => ../internal/utils require ( github.com/gorilla/mux v1.8.1 - github.com/yusing/go-proxy/internal/utils v0.0.0-20250913143824-493c0afdface + github.com/yusing/godoxy/internal/utils v0.0.0-20250913143824-493c0afdface golang.org/x/net v0.44.0 ) diff --git a/socket-proxy/pkg/handler.go b/socket-proxy/pkg/handler.go index 930bc9e0..adff9c14 100644 --- a/socket-proxy/pkg/handler.go +++ b/socket-proxy/pkg/handler.go @@ -8,7 +8,7 @@ import ( "time" "github.com/gorilla/mux" - "github.com/yusing/go-proxy/socketproxy/pkg/reverseproxy" + "github.com/yusing/godoxy/socketproxy/pkg/reverseproxy" ) var dialer = &net.Dialer{KeepAlive: 1 * time.Second} diff --git a/socket-proxy/pkg/handler_test.go b/socket-proxy/pkg/handler_test.go index 4c4cc0a7..eb87bb1c 100644 --- a/socket-proxy/pkg/handler_test.go +++ b/socket-proxy/pkg/handler_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - . "github.com/yusing/go-proxy/socketproxy/pkg" + . "github.com/yusing/godoxy/socketproxy/pkg" ) func mockDockerSocketHandler(_ string) http.HandlerFunc { diff --git a/socket-proxy/pkg/reverseproxy/reverse_proxy.go b/socket-proxy/pkg/reverseproxy/reverse_proxy.go index d8ec5557..ae7bee82 100644 --- a/socket-proxy/pkg/reverseproxy/reverse_proxy.go +++ b/socket-proxy/pkg/reverseproxy/reverse_proxy.go @@ -19,7 +19,7 @@ import ( "strings" "sync" - "github.com/yusing/go-proxy/internal/utils" + "github.com/yusing/godoxy/internal/utils" "golang.org/x/net/http/httpguts" )