2.0.4 (#39 )

- RELEASE: v2.0.4正式版发布; - CHANGE: 优化GitReq的`HTTP Client`参数, 使其更符合本项目使用场景 - CHANGE: 优化Matches - REMOVE: 移除Caddyfile残留 - REMOVE: 由于v2改进后稳定性增强, 故移除健康检测
2.0.3 (#37 )
2025-01-26 16:24:37 +08:00 · 2025-01-24 19:15:52 +08:00
16 changed files with 106 additions and 353 deletions
@@ -1,5 +1,41 @@
 # 更新日志
 2.0.4
 ---
 - RELEASE: v2.0.4正式版发布;
 - CHANGE: 优化GitReq的`HTTP Client`参数, 使其更符合本项目使用场景
 - CHANGE: 优化Matches
 - REMOVE: 移除Caddyfile残留
 - REMOVE: 由于v2改进后稳定性增强, 故移除健康检测
 25w08b
 ---
 - PRE-RELEASE: 此版本是v2.0.4的预发布版本,请勿在生产环境中使用;
 - REMOVE: 由于v2改进后稳定性增强, 故移除健康检测
 25w08a
 ---
 - PRE-RELEASE: 此版本是v2.0.4的预发布版本,请勿在生产环境中使用;
 - CHANGE: 优化GitReq的`HTTP Client`参数, 使其更符合本项目使用场景
 - CHANGE: 优化Matches
 - REMOVE: 移除Caddyfile残留
 2.0.3
 ---
 - RELEASE: v2.0.3正式版发布;
 - CHANGE: 优化`HTTP Client`参数, 使其更符合本项目使用场景
 25w07b
 ---
 - PRE-RELEASE: 此版本是v2.0.3的预发布版本,请勿在生产环境中使用;
 - CHANGE: 改进`HTTP Client`参数
 25w07a
 ---
 - PRE-RELEASE: 此版本是v2.0.3的预发布版本,请勿在生产环境中使用;
 - CHANGE: 为`HTTP Client`增加复用, 对性能有所优化
 - CHANGE: 优化`HTTP Client`参数, 使其更符合本项目使用场景
 2.0.2
 ---
 - RELEASE: v2.0.2正式版发布; 此版本是v2.0.1改进
@@ -1 +1 @@
-25w06b
+25w08b
@@ -1,6 +1,7 @@
 # GHProxy
 ![pull](https://img.shields.io/docker/pulls/wjqserver/ghproxy.svg)
 ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/wjqserver/ghproxy/latest)
 [![Go Report Card](https://goreportcard.com/badge/github.com/WJQSERVER-STUDIO/ghproxy)](https://goreportcard.com/report/github.com/WJQSERVER-STUDIO/ghproxy)
 使用Go实现的GHProxy,用于加速部分地区Github仓库的拉取,支持速率限制,用户鉴权,支持Docker部署
@@ -111,7 +112,7 @@ whitelistFile = "/data/ghproxy/config/whitelist.json"  # 白名单文件路径
 [rateLimit]
 enabled = false  # 是否开启速率限制
-rateMrthod = "total" # "ip" or "total" 速率限制方式
+rateMethod = "total" # "ip" or "total" 速率限制方式
 ratePerMinute = 180  # 每分钟限制请求数量
 burst = 5  # 突发请求数量
 ```
@@ -1 +1 @@
-2.0.2
+2.0.4
@@ -1,102 +0,0 @@
 {
    debug
    http_port 80
    https_port 443
    order cache before rewrite
    cache {
        cache_name GHProxyCache
    }
    log {
        level INFO
        output file /data/caddy/log/caddy.log {
            roll_size 5MB
            roll_keep 10
        }            
    }
    servers :80 {
        protocols h1 h2c
    }
 }
 (log) {
    log {
        format transform `{request>headers>X-Forwarded-For>[0]:request>remote_ip} - {user_id} [{ts}] "{request>method} {request>uri} {request>proto}" {status} {size} "{request>headers>Referer>[0]}" "{request>headers>User-Agent>[0]}"` {
            time_format "02/Jan/2006:15:04:05 -0700"
        }
 	    output file /data/caddy/log/{args[0]}/access.log {
 	        roll_size 5MB
 	        roll_keep 10
 	        roll_keep_for 24h
 	    }
    }
 }
 (error_page) {
    handle_errors {
 	    rewrite * /{err.status_code}.html
 	    root * /data/caddy/pages/errors
        file_server
    }
 }
 (encode) {
    encode {
        zstd best
        br 5 v2
        gzip 5
        minimum_length 512
    }
 }
 (cache) {
    cache {
         allowed_http_verbs GET
         stale {args[0]}
         ttl {args[1]}
    }    
 }
 (header_realip) {
    header_up X-Real-IP {remote_host}	    
 	header_up X-Real-IP {http.request.header.CF-Connecting-IP}
 	header_up X-Forwarded-For {http.request.header.CF-Connecting-IP}
 	header_up X-Forwarded-Proto {http.request.header.CF-Visitor}
 }
 (rate_limit) {
    route /* {
        rate_limit {remote.ip} {args[0]}r/m 10000 429
    }    
 }
 :80 {
    reverse_proxy {
        to 127.0.0.1:8080
        import header_realip
        transport http {
            versions 1.1 h2c
        }
    }
    import log ghproxy
    import cache 0s 300s
    import error_page  
    import encode
    import rate_limit 60 
    route / {
        root /data/www
        file_server
        import cache 0s 24h
    }
    route /favicon.ico {
        root /data/www
        file_server
        import cache 0s 24h
    }
    route /api* {
        rate_limit {remote.ip} 15r/m 10000 429
        import cache 0s 6h
    }   
 }
 import /data/caddy/config.d/*
@@ -1,99 +0,0 @@
 {
    debug
    http_port 80
    https_port 443
    order cache before rewrite
    cache {
        cache_name GHProxyCache
    }
    log {
        level INFO
        output file /data/caddy/log/caddy.log {
            roll_size 5MB
            roll_keep 10
        }            
    }
    servers :80 {
        protocols h1 h2c
    }
 }
 (log) {
    log {
        format transform `{request>headers>X-Forwarded-For>[0]:request>remote_ip} - {user_id} [{ts}] "{request>method} {request>uri} {request>proto}" {status} {size} "{request>headers>Referer>[0]}" "{request>headers>User-Agent>[0]}"` {
            time_format "02/Jan/2006:15:04:05 -0700"
        }
 	    output file /data/caddy/log/{args[0]}/access.log {
 	        roll_size 5MB
 	        roll_keep 10
 	        roll_keep_for 24h
 	    }
    }
 }
 (error_page) {
    handle_errors {
 	    rewrite * /{err.status_code}.html
 	    root * /data/caddy/pages/errors
        file_server
    }
 }
 (encode) {
    encode {
        zstd best
        br 5 v2
        gzip 5
        minimum_length 256
    }
 }
 (cache) {
    cache {
         allowed_http_verbs GET
         stale {args[0]}
         ttl {args[1]}
    }    
 }
 (header_realip) {
    header_up X-Real-IP {remote_host}	    
 	header_up X-Real-IP {http.request.header.CF-Connecting-IP}
 	header_up X-Forwarded-For {http.request.header.CF-Connecting-IP}
 	header_up X-Forwarded-Proto {http.request.header.CF-Visitor}
 }
 (rate_limit) {
    route /* {
        rate_limit {remote.ip} {args[0]}r/m 10000 429
    }    
 }
 :80 {
    reverse_proxy {
        to h2c://127.0.0.1:8080
        import header_realip
    }
    import log ghproxy
    import error_page  
    import encode
    import rate_limit 60  
    route / {
        root /data/www
        file_server
 		import cache 300s
    }
    route /favicon.ico {
        root /data/www
        file_server
 		import cache 300s
    }
    route /api* {
        rate_limit {remote.ip} 15r/m 10000 429
 		import cache 300s
    }
 }
 import /data/caddy/config.d/*
@@ -1,103 +0,0 @@
 {
    debug
    http_port 80
    https_port 443
    order cache before rewrite
    cache {
        cache_name GHProxyCache
    }
    log {
        level INFO
        output file /data/caddy/log/caddy.log {
            roll_size 5MB
            roll_keep 10
        }
    }
    servers :80 {
        protocols h1 h2c
    }    
 }
 (log) {
    log {
        format transform `{request>headers>X-Forwarded-For>[0]:request>remote_ip} - {user_id} [{ts}] "{request>method} {request>uri} {request>proto}" {status} {size} "{request>headers>Referer>[0]}" "{request>headers>User-Agent>[0]}"` {
            time_format "02/Jan/2006:15:04:05 -0700"
        }
 	    output file /data/caddy/log/{args[0]}/access.log {
 	        roll_size 5MB
 	        roll_keep 10
 	        roll_keep_for 24h
 	    }
    }
 }
 (error_page) {
    handle_errors {
 	    rewrite * /{err.status_code}.html
 	    root * /data/caddy/pages/errors
        file_server
    }
 }
 (encode) {
    encode {
        zstd best
        br 5 v2
        gzip 5
        minimum_length 512
    }
 }
 (cache) {
    cache {
         allowed_http_verbs GET
         stale {args[0]}
         ttl {args[1]}
    }    
 }
 (header_realip) {
    header_up X-Real-IP {remote_host}	    
 	header_up X-Real-IP {http.request.header.CF-Connecting-IP}
 	header_up X-Forwarded-For {http.request.header.CF-Connecting-IP}
 	header_up X-Forwarded-Proto {http.request.header.CF-Visitor}
 }
 (rate_limit) {
    route /* {
        rate_limit {remote.ip} {args[0]}r/m 10000 429
    }    
 }
 :80 {
    reverse_proxy {
        to 127.0.0.1:8080
        import header_realip
        transport http {
            versions 1.1 h2c
        }
    }
    import log ghproxy
    import cache 0s 300s
    import error_page  
    import encode
    import rate_limit 60  
    route / {
        root /data/www
        file_server
        import cache 0s 24h
    }
    route /favicon.ico {
        root /data/www
        file_server
        import cache 0s 24h
    }
    route /api* {
        rate_limit {remote.ip} 15r/m 10000 429
        import cache 0s 6h
    }
 }
 import /data/caddy/config.d/*
@@ -14,12 +14,4 @@ if [ ! -f /data/${APPLICATION}/config/config.toml ]; then
    cp /data/${APPLICATION}/config.toml /data/${APPLICATION}/config/config.toml
 fi
-/data/${APPLICATION}/${APPLICATION} -cfg /data/${APPLICATION}/config/config.toml > /data/${APPLICATION}/log/run.log 2>&1 &
+/data/${APPLICATION}/${APPLICATION} -cfg /data/${APPLICATION}/config/config.toml > /data/${APPLICATION}/log/run.log 2>&1 
 sleep 30
 while [[ true ]]; do
    # Failure Circuit Breaker
    curl -f --max-time 5 -retry 3 http://127.0.0.1:8080/api/healthcheck || exit 1
    sleep 120
 done    
@@ -14,12 +14,4 @@ if [ ! -f /data/${APPLICATION}/config/config.toml ]; then
    cp /data/${APPLICATION}/config.toml /data/${APPLICATION}/config/config.toml
 fi
-/data/${APPLICATION}/${APPLICATION} -cfg /data/${APPLICATION}/config/config.toml > /data/${APPLICATION}/log/run.log 2>&1 &
+/data/${APPLICATION}/${APPLICATION} -cfg /data/${APPLICATION}/config/config.toml > /data/${APPLICATION}/log/run.log 2>&1 
 sleep 30
 while [[ true ]]; do
    # Failure Circuit Breaker
    curl -f --max-time 5 -retry 3 http://127.0.0.1:8080/api/healthcheck || exit 1
    sleep 120
 done
@@ -4,7 +4,7 @@ go 1.23.5
 require (
 	github.com/BurntSushi/toml v1.4.0
-	github.com/WJQSERVER-STUDIO/go-utils/logger v1.1.0
+	github.com/WJQSERVER-STUDIO/go-utils/logger v1.1.1
 	github.com/gin-gonic/gin v1.10.0
 	golang.org/x/time v0.9.0
 )
@@ -1,7 +1,7 @@
 github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
-github.com/WJQSERVER-STUDIO/go-utils/logger v1.1.0 h1:OUrAOWb8xK0kxpWextJYUasmol+5KKqG2az52X2ae64=
+github.com/WJQSERVER-STUDIO/go-utils/logger v1.1.1 h1:YS3q54SroxQpEM7c12ZKjLNAaSq++bNpxTujs9cTZ9c=
-github.com/WJQSERVER-STUDIO/go-utils/logger v1.1.0/go.mod h1:sAqHVYSucoUnycyHMAZc1fMH5dS2bQwgwo8NUiAIcyk=
+github.com/WJQSERVER-STUDIO/go-utils/logger v1.1.1/go.mod h1:oW884JCCPDU6c906LI0uKXndWLiRvjb9LkGYC2cqRO8=
 github.com/bytedance/sonic v1.12.7 h1:CQU8pxOy9HToxhndH0Kx/S1qU/CuS9GnKYrGioDcU1Q=
 github.com/bytedance/sonic v1.12.7/go.mod h1:tnbal4mxOMju17EGfknm2XyYcpyCnIROYOEYuemj13I=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
@@ -14,12 +14,5 @@ if [ ! -f /data/${APPLICATON}/config/config.yaml ]; then
    cp /data/${APPLICATON}/config.yaml /data/${APPLICATON}/config/config.yaml
 fi
-/data/${APPLICATON}/${APPLICATON} > /data/${APPLICATON}/log/run.log 2>&1 &
+/data/${APPLICATON}/${APPLICATON} > /data/${APPLICATON}/log/run.log 2>&1 
 sleep 30
 while [[ true ]]; do
    curl -f http://localhost:8080/api/healthcheck || exit 1
    sleep 120
 done    
@@ -91,8 +91,8 @@ func setupRateLimit(cfg *config.Config) {
 	}
 }
-func initBufferSize() {
+func InitReq() {
-	proxy.InitChunkedBufferSize(cfg.Server.BufferSize)
+	proxy.InitReq(cfg.Server.BufferSize)
 }
 func init() {
@@ -100,7 +100,7 @@ func init() {
 	flag.Parse()
 	loadConfig()
 	setupLogger(cfg)
-	initBufferSize()
+	InitReq()
 	loadlist(cfg)
 	setupRateLimit(cfg)
@@ -6,13 +6,25 @@ import (
 	"ghproxy/config"
 	"io"
 	"net/http"
 	"time"
 	"github.com/gin-gonic/gin"
 )
 var chunkedBufferSize int
-func InitChunkedBufferSize(cfgBufferSize int) {
+var (
 	cclient *http.Client
 	ctr     *http.Transport
 )
 func InitReq(cfgBufferSize int) {
 	initChunkedBufferSize(cfgBufferSize)
 	initChunkedHTTPClient()
 	initGitHTTPClient()
 }
 func initChunkedBufferSize(cfgBufferSize int) {
 	if cfgBufferSize == 0 {
 		chunkedBufferSize = 4096 // 默认缓冲区大小
 	} else {
@@ -20,12 +32,23 @@ func InitChunkedBufferSize(cfgBufferSize int) {
 	}
 }
 func initChunkedHTTPClient() {
 	ctr = &http.Transport{
 		MaxIdleConns:    100,
 		MaxConnsPerHost: 60,
 		IdleConnTimeout: 20 * time.Second,
 	}
 	cclient = &http.Client{
 		Transport: ctr,
 	}
 }
 func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, mode string, runMode string) {
 	method := c.Request.Method
 	logInfo("%s %s %s %s %s", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto)
 	// 创建HTTP客户端
-	client := &http.Client{}
+	//client := &http.Client{}
 	// 发送HEAD请求, 预获取Content-Length
 	headReq, err := http.NewRequest("HEAD", u, nil)
@@ -37,7 +60,7 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, mode stri
 	removeWSHeader(headReq) // 删除Conection Upgrade头, 避免与HTTP/2冲突(检查是否存在Upgrade头)
 	AuthPassThrough(c, cfg, headReq)
-	headResp, err := client.Do(headReq)
+	headResp, err := cclient.Do(headReq)
 	if err != nil {
 		HandleError(c, fmt.Sprintf("Failed to send request: %v", err))
 		return
@@ -69,7 +92,7 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, mode stri
 	removeWSHeader(req) // 删除Conection Upgrade头, 避免与HTTP/2冲突(检查是否存在Upgrade头)
 	AuthPassThrough(c, cfg, req)
-	resp, err := client.Do(req)
+	resp, err := cclient.Do(req)
 	if err != nil {
 		HandleError(c, fmt.Sprintf("发送请求失败: %v", err))
 		return
@@ -84,6 +107,7 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, mode stri
 	CopyResponseHeaders(resp, c, cfg)
 	c.Status(resp.StatusCode)
 	if err := chunkedCopyResponseBody(c, resp.Body); err != nil {
 		logError("%s %s %s %s %s 响应复制错误: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err)
 	}
@@ -6,16 +6,33 @@ import (
 	"ghproxy/config"
 	"io"
 	"net/http"
 	"time"
 	"github.com/gin-gonic/gin"
 )
 var (
 	gclient *http.Client
 	gtr     *http.Transport
 )
 func initGitHTTPClient() {
 	gtr = &http.Transport{
 		MaxIdleConns:    30,
 		MaxConnsPerHost: 30,
 		IdleConnTimeout: 30 * time.Second,
 	}
 	gclient = &http.Client{
 		Transport: gtr,
 	}
 }
 func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode string) {
 	method := c.Request.Method
 	logInfo("%s %s %s %s %s", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto)
 	// 创建HTTP客户端
-	client := &http.Client{}
+	//client := &http.Client{}
 	// 发送HEAD请求, 预获取Content-Length
 	headReq, err := http.NewRequest("HEAD", u, nil)
@@ -26,7 +43,7 @@ func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode s
 	setRequestHeaders(c, headReq)
 	AuthPassThrough(c, cfg, headReq)
-	headResp, err := client.Do(headReq)
+	headResp, err := gclient.Do(headReq)
 	if err != nil {
 		HandleError(c, fmt.Sprintf("Failed to send request: %v", err))
 		return
@@ -55,7 +72,7 @@ func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode s
 	setRequestHeaders(c, req)
 	AuthPassThrough(c, cfg, req)
-	resp, err := client.Do(req)
+	resp, err := gclient.Do(req)
 	if err != nil {
 		HandleError(c, fmt.Sprintf("Failed to send request: %v", err))
 		return
@@ -9,17 +9,19 @@ import (
 	"github.com/gin-gonic/gin"
 )
 // 预定义regex
 var (
 	pathRegex = regexp.MustCompile(`^([^/]+)/([^/]+)/([^/]+)/.*`)                                         // 匹配路径
 	gistRegex = regexp.MustCompile(`^(?:https?://)?gist\.github(?:usercontent|)\.com/([^/]+)/([^/]+)/.*`) // 匹配gist路径
 )
 // 提取用户名和仓库名
 func MatchUserRepo(rawPath string, cfg *config.Config, c *gin.Context, matches []string) (string, string) {
-	var gistregex = regexp.MustCompile(`^(?:https?://)?gist\.github(?:usercontent|)\.com/([^/]+)/([^/]+)/.*`)
+	if gistMatches := gistRegex.FindStringSubmatch(rawPath); len(gistMatches) == 3 {
-	var gistmatches []string
+		logInfo("%s %s %s %s %s Matched-Username: %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, gistMatches[1])
-	if gistregex.MatchString(rawPath) {
+		return gistMatches[1], ""
 		gistmatches = gistregex.FindStringSubmatch(rawPath)
 		logInfo("%s %s %s %s %s Matched-Username: %s", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto, gistmatches[1])
 		return gistmatches[1], ""
 	}
 	// 定义路径
 	pathRegex := regexp.MustCompile(`^([^/]+)/([^/]+)/([^/]+)/.*`)
 	if pathMatches := pathRegex.FindStringSubmatch(matches[2]); len(pathMatches) >= 4 {
 		return pathMatches[2], pathMatches[3]
 	}