chore(deps): update Go dependencies

- Update all dependencies to latest versions

- Upgrade touka to break/v1 branch

- Migrate from RunShutdown to Run with graceful shutdown options

- Use functional options pattern: WithAddr and WithGracefulShutdownDefault
This commit is contained in:
wjqserver 2026-04-11 22:34:32 +08:00
parent 32baca85db
commit 3d01d4cd15
7 changed files with 51 additions and 46 deletions

View file

@ -52,35 +52,35 @@ func InitHandleRouter(cfg *config.Config, r *touka.Engine, version string) {
func SizeLimitHandler(cfg *config.Config, c *touka.Context) { func SizeLimitHandler(cfg *config.Config, c *touka.Context) {
sizeLimit := cfg.Server.SizeLimit sizeLimit := cfg.Server.SizeLimit
c.SetHeader("Content-Type", "application/json") c.SetHeader("Content-Type", "application/json")
c.JSON(200, (map[string]interface{}{ c.JSON(200, (map[string]any{
"MaxResponseBodySize": sizeLimit, "MaxResponseBodySize": sizeLimit,
})) }))
} }
func WhiteListStatusHandler(cfg *config.Config, c *touka.Context) { func WhiteListStatusHandler(cfg *config.Config, c *touka.Context) {
c.SetHeader("Content-Type", "application/json") c.SetHeader("Content-Type", "application/json")
c.JSON(200, (map[string]interface{}{ c.JSON(200, (map[string]any{
"Whitelist": cfg.Whitelist.Enabled, "Whitelist": cfg.Whitelist.Enabled,
})) }))
} }
func BlackListStatusHandler(cfg *config.Config, c *touka.Context) { func BlackListStatusHandler(cfg *config.Config, c *touka.Context) {
c.SetHeader("Content-Type", "application/json") c.SetHeader("Content-Type", "application/json")
c.JSON(200, (map[string]interface{}{ c.JSON(200, (map[string]any{
"Blacklist": cfg.Blacklist.Enabled, "Blacklist": cfg.Blacklist.Enabled,
})) }))
} }
func CorsStatusHandler(cfg *config.Config, c *touka.Context) { func CorsStatusHandler(cfg *config.Config, c *touka.Context) {
c.SetHeader("Content-Type", "application/json") c.SetHeader("Content-Type", "application/json")
c.JSON(200, (map[string]interface{}{ c.JSON(200, (map[string]any{
"Cors": cfg.Server.Cors, "Cors": cfg.Server.Cors,
})) }))
} }
func HealthcheckHandler(c *touka.Context) { func HealthcheckHandler(c *touka.Context) {
c.SetHeader("Content-Type", "application/json") c.SetHeader("Content-Type", "application/json")
c.JSON(200, (map[string]interface{}{ c.JSON(200, (map[string]any{
"Status": "OK", "Status": "OK",
"Repo": "WJQSERVER-STUDIO/GHProxy", "Repo": "WJQSERVER-STUDIO/GHProxy",
"Author": "WJQSERVER-STUDIO", "Author": "WJQSERVER-STUDIO",
@ -89,7 +89,7 @@ func HealthcheckHandler(c *touka.Context) {
func VersionHandler(c *touka.Context, version string) { func VersionHandler(c *touka.Context, version string) {
c.SetHeader("Content-Type", "application/json") c.SetHeader("Content-Type", "application/json")
c.JSON(200, (map[string]interface{}{ c.JSON(200, (map[string]any{
"Version": version, "Version": version,
"Repo": "WJQSERVER-STUDIO/GHProxy", "Repo": "WJQSERVER-STUDIO/GHProxy",
"Author": "WJQSERVER-STUDIO", "Author": "WJQSERVER-STUDIO",
@ -98,35 +98,35 @@ func VersionHandler(c *touka.Context, version string) {
func RateLimitStatusHandler(cfg *config.Config, c *touka.Context) { func RateLimitStatusHandler(cfg *config.Config, c *touka.Context) {
c.SetHeader("Content-Type", "application/json") c.SetHeader("Content-Type", "application/json")
c.JSON(200, (map[string]interface{}{ c.JSON(200, (map[string]any{
"RateLimit": cfg.RateLimit.Enabled, "RateLimit": cfg.RateLimit.Enabled,
})) }))
} }
func RateLimitLimitHandler(cfg *config.Config, c *touka.Context) { func RateLimitLimitHandler(cfg *config.Config, c *touka.Context) {
c.SetHeader("Content-Type", "application/json") c.SetHeader("Content-Type", "application/json")
c.JSON(200, (map[string]interface{}{ c.JSON(200, (map[string]any{
"RatePerMinute": cfg.RateLimit.RatePerMinute, "RatePerMinute": cfg.RateLimit.RatePerMinute,
})) }))
} }
func SmartGitStatusHandler(cfg *config.Config, c *touka.Context) { func SmartGitStatusHandler(cfg *config.Config, c *touka.Context) {
c.SetHeader("Content-Type", "application/json") c.SetHeader("Content-Type", "application/json")
c.JSON(200, (map[string]interface{}{ c.JSON(200, (map[string]any{
"enabled": cfg.GitClone.Mode == "cache", "enabled": cfg.GitClone.Mode == "cache",
})) }))
} }
func shellNestStatusHandler(cfg *config.Config, c *touka.Context) { func shellNestStatusHandler(cfg *config.Config, c *touka.Context) {
c.SetHeader("Content-Type", "application/json") c.SetHeader("Content-Type", "application/json")
c.JSON(200, (map[string]interface{}{ c.JSON(200, (map[string]any{
"enabled": cfg.Shell.Editor, "enabled": cfg.Shell.Editor,
})) }))
} }
func ociProxyStatusHandler(cfg *config.Config, c *touka.Context) { func ociProxyStatusHandler(cfg *config.Config, c *touka.Context) {
c.SetHeader("Content-Type", "application/json") c.SetHeader("Content-Type", "application/json")
c.JSON(200, (map[string]interface{}{ c.JSON(200, (map[string]any{
"enabled": cfg.Docker.Enabled, "enabled": cfg.Docker.Enabled,
"target": cfg.Docker.Target, "target": cfg.Docker.Target,
})) }))

25
go.mod
View file

@ -1,27 +1,30 @@
module ghproxy module ghproxy
go 1.25.1 go 1.26
require ( require (
github.com/BurntSushi/toml v1.5.0 github.com/BurntSushi/toml v1.6.0
github.com/WJQSERVER-STUDIO/httpc v0.8.2 github.com/WJQSERVER-STUDIO/httpc v0.9.0
golang.org/x/net v0.44.0 golang.org/x/net v0.53.0
golang.org/x/time v0.13.0 golang.org/x/time v0.15.0
) )
require ( require (
github.com/WJQSERVER-STUDIO/go-utils/iox v0.0.2 github.com/WJQSERVER-STUDIO/go-utils/iox v0.0.3
github.com/WJQSERVER-STUDIO/go-utils/limitreader v0.0.2 github.com/WJQSERVER-STUDIO/go-utils/limitreader v0.0.2
github.com/WJQSERVER/wanf v0.0.0-20250810023226-e51d9d0737ee github.com/WJQSERVER/wanf v0.0.8
github.com/fenthope/bauth v0.0.1 github.com/fenthope/bauth v0.0.1
github.com/fenthope/ikumi v0.0.2 github.com/fenthope/ikumi v0.0.2
github.com/fenthope/ipfilter v0.0.1 github.com/fenthope/ipfilter v0.0.1
github.com/fenthope/reco v0.0.4 github.com/fenthope/reco v0.0.5
github.com/fenthope/record v0.0.4 github.com/fenthope/record v0.0.4
github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b github.com/go-json-experiment/json v0.0.0-20260214004413-d219187c3433
github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/infinite-iroha/touka v0.3.7 github.com/infinite-iroha/touka v0.5.1-0.20260409232140-271e54eb4d44
github.com/wjqserver/modembed v0.0.1 github.com/wjqserver/modembed v0.0.1
) )
require github.com/valyala/bytebufferpool v1.0.0 // indirect require (
github.com/valyala/bytebufferpool v1.0.0 // indirect
golang.org/x/text v0.36.0 // indirect
)

38
go.sum
View file

@ -1,34 +1,36 @@
github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg= github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
github.com/WJQSERVER-STUDIO/go-utils/iox v0.0.2 h1:AiIHXP21LpK7pFfqUlUstgQEWzjbekZgxOuvVwiMfyM= github.com/WJQSERVER-STUDIO/go-utils/iox v0.0.3 h1:Hc1O6D50U3URkdSzfQ/SgeUU750wUBCYhefdvAbE2Ck=
github.com/WJQSERVER-STUDIO/go-utils/iox v0.0.2/go.mod h1:mCLqYU32bTmEE6dpj37MKKiZgz70Jh/xyK9vVbq6pok= github.com/WJQSERVER-STUDIO/go-utils/iox v0.0.3/go.mod h1:nFQzepAwwdj5Hp5U+X19l4FVvsaOSBTW41BzfI/CkMA=
github.com/WJQSERVER-STUDIO/go-utils/limitreader v0.0.2 h1:8bBkKk6E2Zr+I5szL7gyc5f0DK8N9agIJCpM1Cqw2NE= github.com/WJQSERVER-STUDIO/go-utils/limitreader v0.0.2 h1:8bBkKk6E2Zr+I5szL7gyc5f0DK8N9agIJCpM1Cqw2NE=
github.com/WJQSERVER-STUDIO/go-utils/limitreader v0.0.2/go.mod h1:yPX8xuZH+py7eLJwOYj3VVI/4/Yuy5+x8Mhq8qezcPg= github.com/WJQSERVER-STUDIO/go-utils/limitreader v0.0.2/go.mod h1:yPX8xuZH+py7eLJwOYj3VVI/4/Yuy5+x8Mhq8qezcPg=
github.com/WJQSERVER-STUDIO/httpc v0.8.2 h1:PFPLodV0QAfGEP6915J57vIqoKu9cGuuiXG/7C9TNUk= github.com/WJQSERVER-STUDIO/httpc v0.9.0 h1:MpXcQQqukrSLHH/2tTfnXrhqD6nEDHB/gbzehXaS8o4=
github.com/WJQSERVER-STUDIO/httpc v0.8.2/go.mod h1:8WhHVRO+olDFBSvL5PC/bdMkb6U3vRdPJ4p4pnguV5Y= github.com/WJQSERVER-STUDIO/httpc v0.9.0/go.mod h1:filzryrl4eAtFVyl4oVHcJqx1SpNFbrCn+ddQPLlCSg=
github.com/WJQSERVER/wanf v0.0.0-20250810023226-e51d9d0737ee h1:tJ31DNBn6UhWkk8fiikAQWqULODM+yBcGAEar1tzdZc= github.com/WJQSERVER/wanf v0.0.8 h1:1Ri9d7nKhu22hGxP8O9B9rXnYym6DYGKgi6WRVx3VF8=
github.com/WJQSERVER/wanf v0.0.0-20250810023226-e51d9d0737ee/go.mod h1:q2Pyg+G+s1acMWxrbI4CwS/Yk76/BzLREEdZ8iFwUNE= github.com/WJQSERVER/wanf v0.0.8/go.mod h1:R0Zw/1skEMVlQ9m5atbkmanlW+9h2bkdq7+wbPY+F/8=
github.com/fenthope/bauth v0.0.1 h1:+4UIQshGx3mYD4L3f2S4MLZOi5PWU7fU5GK3wsZvwzE= github.com/fenthope/bauth v0.0.1 h1:+4UIQshGx3mYD4L3f2S4MLZOi5PWU7fU5GK3wsZvwzE=
github.com/fenthope/bauth v0.0.1/go.mod h1:1fveTpgfR1p+WXQ8MXm9BfBCeNYi55j23jxCOGOvBSA= github.com/fenthope/bauth v0.0.1/go.mod h1:1fveTpgfR1p+WXQ8MXm9BfBCeNYi55j23jxCOGOvBSA=
github.com/fenthope/ikumi v0.0.2 h1:5oaSTf/Msp7M2O3o/X20omKWEQbFhX4KV0CVF21oCdk= github.com/fenthope/ikumi v0.0.2 h1:5oaSTf/Msp7M2O3o/X20omKWEQbFhX4KV0CVF21oCdk=
github.com/fenthope/ikumi v0.0.2/go.mod h1:IYbxzOGndZv/yRrbVMyV6dxh06X2wXCbfxrTRM1IruU= github.com/fenthope/ikumi v0.0.2/go.mod h1:IYbxzOGndZv/yRrbVMyV6dxh06X2wXCbfxrTRM1IruU=
github.com/fenthope/ipfilter v0.0.1 h1:HrYAyixCMvsDAz36GRyFfyCNtrgYwzrhMcY0XV7fGcM= github.com/fenthope/ipfilter v0.0.1 h1:HrYAyixCMvsDAz36GRyFfyCNtrgYwzrhMcY0XV7fGcM=
github.com/fenthope/ipfilter v0.0.1/go.mod h1:QfY0GrpG0D82HROgdH4c9eog4js42ghLIfl/iM4MvvY= github.com/fenthope/ipfilter v0.0.1/go.mod h1:QfY0GrpG0D82HROgdH4c9eog4js42ghLIfl/iM4MvvY=
github.com/fenthope/reco v0.0.4 h1:yo2g3aWwdoMpaZWZX4SdZOW7mCK82RQIU/YI8ZUQThM= github.com/fenthope/reco v0.0.5 h1:Z/bOunFf4LSgYP/IxG9fe2pTrIq7bPsDflflbNR5Agw=
github.com/fenthope/reco v0.0.4/go.mod h1:eMyS8HpdMVdJ/2WJt6Cvt8P1EH9Igzj5lSJrgc+0jeg= github.com/fenthope/reco v0.0.5/go.mod h1:nd5gMkuJHN2+2Iwwt3xy+HSqRaROauIjHNkmQWRsHyM=
github.com/fenthope/record v0.0.4 h1:/1JHNCxiXGLL/qCh4LEGaAvhj4CcKsb6siTxjLmjdO4= github.com/fenthope/record v0.0.4 h1:/1JHNCxiXGLL/qCh4LEGaAvhj4CcKsb6siTxjLmjdO4=
github.com/fenthope/record v0.0.4/go.mod h1:G0a6KCiCDyX2SsC3nfzSN651fJKxH482AyJvzlnvAJU= github.com/fenthope/record v0.0.4/go.mod h1:G0a6KCiCDyX2SsC3nfzSN651fJKxH482AyJvzlnvAJU=
github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b h1:6Q4zRHXS/YLOl9Ng1b1OOOBWMidAQZR3Gel0UKPC/KU= github.com/go-json-experiment/json v0.0.0-20260214004413-d219187c3433 h1:vymEbVwYFP/L05h5TKQxvkXoKxNvTpjxYKdF1Nlwuao=
github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M= github.com/go-json-experiment/json v0.0.0-20260214004413-d219187c3433/go.mod h1:tphK2c80bpPhMOI4v6bIc2xWywPfbqi1Z06+RcrMkDg=
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
github.com/infinite-iroha/touka v0.3.7 h1:bIIZW5Weh7lVpyOWh4FmyR9UOfb5FOt+cR9yQ30FJLA= github.com/infinite-iroha/touka v0.5.1-0.20260409232140-271e54eb4d44 h1:VcFNhePZe8qhc9M3Qd0HzV6LjU3QCXxWjQokgFlp3TU=
github.com/infinite-iroha/touka v0.3.7/go.mod h1:uwkF1gTrNEgQ4P/Gwtk6WLbERehq3lzB8x1FMedyrfE= github.com/infinite-iroha/touka v0.5.1-0.20260409232140-271e54eb4d44/go.mod h1:6s1oUso8IQp9MbJ+hDvxx8AodbOF7YMel2DnW/x0qrg=
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
github.com/wjqserver/modembed v0.0.1 h1:8ZDz7t9M5DLrUFlYgBUUmrMzxWsZPmHvOazkr/T2jEs= github.com/wjqserver/modembed v0.0.1 h1:8ZDz7t9M5DLrUFlYgBUUmrMzxWsZPmHvOazkr/T2jEs=
github.com/wjqserver/modembed v0.0.1/go.mod h1:sYbQJMAjSBsdYQrUsuHY380XXE1CuRh8g9yyCztTXOQ= github.com/wjqserver/modembed v0.0.1/go.mod h1:sYbQJMAjSBsdYQrUsuHY380XXE1CuRh8g9yyCztTXOQ=
golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I= golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
golang.org/x/time v0.13.0 h1:eUlYslOIt32DgYD6utsuUeHs4d7AsEYLuIAdg7FlYgI= golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
golang.org/x/time v0.13.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=

View file

@ -517,7 +517,7 @@ func main() {
defer logger.Close() defer logger.Close()
addr := fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port) addr := fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port)
err := r.RunShutdown(addr) err := r.Run(touka.WithAddr(addr), touka.WithGracefulShutdownDefault())
if err != nil { if err != nil {
logger.Errorf("Server Run Error: %v", err) logger.Errorf("Server Run Error: %v", err)
fmt.Printf("Server Run Error: %v\n", err) fmt.Printf("Server Run Error: %v\n", err)

View file

@ -72,7 +72,7 @@ func newProxyDial(proxyUrls string) proxy.Dialer {
var proxyDialer proxy.Dialer = proxy.Direct // 初始为直接连接,不使用代理 var proxyDialer proxy.Dialer = proxy.Direct // 初始为直接连接,不使用代理
// 支持多个代理 URL以逗号分隔 // 支持多个代理 URL以逗号分隔
for _, proxyUrl := range strings.Split(proxyUrls, ",") { for proxyUrl := range strings.SplitSeq(proxyUrls, ",") {
proxyUrl = strings.TrimSpace(proxyUrl) // 去除首尾空格 proxyUrl = strings.TrimSpace(proxyUrl) // 去除首尾空格
if proxyUrl == "" { // 跳过空的代理 URL if proxyUrl == "" { // 跳过空的代理 URL
continue continue

View file

@ -4,6 +4,7 @@ import (
"bytes" "bytes"
"context" "context"
"fmt" "fmt"
"io"
"net/http" "net/http"
"net/url" "net/url"
"strconv" "strconv"
@ -12,7 +13,6 @@ import (
"ghproxy/config" "ghproxy/config"
"ghproxy/weakcache" "ghproxy/weakcache"
"github.com/WJQSERVER-STUDIO/go-utils/iox"
"github.com/WJQSERVER-STUDIO/go-utils/limitreader" "github.com/WJQSERVER-STUDIO/go-utils/limitreader"
"github.com/go-json-experiment/json" "github.com/go-json-experiment/json"
"github.com/infinite-iroha/touka" "github.com/infinite-iroha/touka"
@ -363,7 +363,7 @@ func GhcrRequest(ctx context.Context, c *touka.Context, u string, image *imageIn
// 如果最终响应是 404, 则读取响应体并返回自定义错误页面 // 如果最终响应是 404, 则读取响应体并返回自定义错误页面
if resp.StatusCode == 404 { if resp.StatusCode == 404 {
defer resp.Body.Close() // 使用defer确保在函数返回前关闭响应体 defer resp.Body.Close() // 使用defer确保在函数返回前关闭响应体
bodyBytes, err := iox.ReadAll(resp.Body) bodyBytes, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
c.Warnf("Failed to read upstream 404 response body: %v", err) c.Warnf("Failed to read upstream 404 response body: %v", err)
} else { } else {
@ -481,7 +481,7 @@ func ChallengeReq(target string, image *imageInfo, ctx context.Context, c *touka
defer authResp.Body.Close() // 确保响应体关闭 defer authResp.Body.Close() // 确保响应体关闭
// 读取认证响应体 // 读取认证响应体
bodyBytes, err := iox.ReadAll(authResp.Body) bodyBytes, err := io.ReadAll(authResp.Body)
if err != nil { if err != nil {
c.Errorf("Failed to read auth response body: %v", err) c.Errorf("Failed to read auth response body: %v", err)
return return

View file

@ -289,7 +289,7 @@ func getParsedTemplate() (*template.Template, error) {
} }
// htmlTemplateRender 修改为使用缓存的模板。 // htmlTemplateRender 修改为使用缓存的模板。
func htmlTemplateRender(data interface{}) ([]byte, error) { func htmlTemplateRender(data any) ([]byte, error) {
tmpl, err := getParsedTemplate() tmpl, err := getParsedTemplate()
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get parsed template: %w", err) return nil, fmt.Errorf("failed to get parsed template: %w", err)