Compare commits

...

13 Commits

Author SHA1 Message Date
WJQSERVER
112bf9a52c Update CHANGELOG.md
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
2025-09-14 10:09:58 +08:00
wjqserver
3d05902824 update nest: use dispatcher to get lower allocs(4.3.5-rc.0) 2025-09-14 10:05:25 +08:00
wjqserver
3adc110298 update json/v2 2025-09-14 07:45:47 +08:00
wjqserver
ba33d5743f 4.3.4 2025-09-14 07:44:46 +08:00
wjqserver
bd9f590b0a 4.3.4 2025-09-14 07:31:41 +08:00
wjqserver
e3f84f4c17 fix retrun, change to false 2025-09-10 03:36:15 +08:00
wjqserver
4a7ad2ec75 4.3.3 2025-09-10 03:21:14 +08:00
wjqserver
a285777217 4.3.2 2025-08-20 15:53:09 +08:00
wjqserver
44cc5d5677 fix if cfg.Pages.StaticDir is "" issue 2025-08-20 15:48:00 +08:00
wjqserver
74a22be16c 4.3.1 2025-08-13 20:54:33 +08:00
wjqserver
972a37b497 4.3.0 2025-08-11 18:39:24 +08:00
wjqserver
5fc6f7ab6f remove dev log 2025-08-11 18:35:36 +08:00
wjqserver
d389a61f09 4.3.0 2025-08-11 18:28:03 +08:00
18 changed files with 651 additions and 294 deletions

View File

@@ -46,7 +46,7 @@ jobs:
goarch: [amd64, arm64]
env:
OUTPUT_BINARY: ghproxy
GO_VERSION: 1.24
GO_VERSION: 1.25
steps:
- uses: actions/checkout@v4

View File

@@ -47,7 +47,7 @@ jobs:
goarch: [amd64, arm64]
env:
OUTPUT_BINARY: ghproxy
GO_VERSION: 1.24
GO_VERSION: 1.25
steps:
- uses: actions/checkout@v3

1
.gitignore vendored
View File

@@ -1,5 +1,6 @@
demo
demo.toml
demo.wanf
*.log
*.bak
list.json

View File

@@ -1,5 +1,42 @@
# 更新日志
4.3.5-rc.0 - 2025-09-14
---
- PRE-RELEASE: v4.3.5-rc.0是v4.3.5的预发布版本,请勿在生产环境中使用;
- CHANGE: 改进`nest`实现, 减少内存分配`10371 B/op -> 1852 B/op` `43 allocs/op -> 14 allocs/op`
- CHANGE: 为`nest`加入`dispatcher`实现, 为不同情况分配适合的处理器以保证性能与兼容性
- CHANGE: 改进路径匹配热点的内存分配
4.3.4 - 2025-09-14
---
- CHANGE: 改进嵌套加速实现, 增强稳定性
4.3.3 - 2025-09-10
---
- CHANGE: 增强对[wanf](https://github.com/WJQSERVER/wanf)的支持
- CHANGE: 更新包括Touka框架在内的各个依赖版本
4.3.2 - 2025-08-20
---
- FIX: 修正`cfg.Pages.StaticDir`为空时的处置
4.3.1 - 2025-08-13
---
- CHANGE: 更新至[Go 1.25](https://tip.golang.org/doc/go1.25)
4.3.0 - 2025-08-11
---
- CHANGE: 为OCI镜像(Docker)代理带来自动library附加功能
- CHANGE(refactor): 改进OCI镜像(Docker)代理路径组成流程
- ADD: 新增[WANF](https://github.com/WJQSERVER/wanf)配置文件格式支持
4.3.0-rc.0 - 2025-08-11
---
- PRE-RELEASE: v4.3.0-rc.0是v4.3.0的预发布版本,请勿在生产环境中使用;
- CHANGE: 为OCI镜像(Docker)代理带来自动library附加功能
- CHANGE(refactor): 改进OCI镜像(Docker)代理路径组成流程
- ADD: 新增[WANF](https://github.com/WJQSERVER/wanf)配置文件格式支持
4.2.7 - 2025-08-04
---
- CHANGE: 在OCI镜像(docker)代理部分增加特殊处理, 保证可用性 参看[#159](https://github.com/WJQSERVER-STUDIO/ghproxy/issues/159)

View File

@@ -1 +1 @@
4.2.4-rc.0
4.3.5-rc.0

View File

@@ -1 +1 @@
4.2.7
4.3.4

View File

@@ -1,25 +1,31 @@
package config
import (
"fmt"
"os"
"path/filepath"
"strings"
"github.com/BurntSushi/toml"
"github.com/WJQSERVER/wanf"
)
// Config 结构体定义了整个应用程序的配置
type Config struct {
Server ServerConfig `toml:"server"`
Httpc HttpcConfig `toml:"httpc"`
GitClone GitCloneConfig `toml:"gitclone"`
Shell ShellConfig `toml:"shell"`
Pages PagesConfig `toml:"pages"`
Log LogConfig `toml:"log"`
Auth AuthConfig `toml:"auth"`
Blacklist BlacklistConfig `toml:"blacklist"`
Whitelist WhitelistConfig `toml:"whitelist"`
IPFilter IPFilterConfig `toml:"ipFilter"`
RateLimit RateLimitConfig `toml:"rateLimit"`
Outbound OutboundConfig `toml:"outbound"`
Docker DockerConfig `toml:"docker"`
Server ServerConfig `toml:"server" wanf:"server"`
Httpc HttpcConfig `toml:"httpc" wanf:"httpc"`
GitClone GitCloneConfig `toml:"gitclone" wanf:"gitclone"`
Shell ShellConfig `toml:"shell" wanf:"shell"`
Pages PagesConfig `toml:"pages" wanf:"pages"`
Log LogConfig `toml:"log" wanf:"log"`
Auth AuthConfig `toml:"auth" wanf:"auth"`
Blacklist BlacklistConfig `toml:"blacklist" wanf:"blacklist"`
Whitelist WhitelistConfig `toml:"whitelist" wanf:"whitelist"`
IPFilter IPFilterConfig `toml:"ipFilter" wanf:"ipFilter"`
RateLimit RateLimitConfig `toml:"rateLimit" wanf:"rateLimit"`
Outbound OutboundConfig `toml:"outbound" wanf:"outbound"`
Docker DockerConfig `toml:"docker" wanf:"docker"`
}
/*
@@ -32,13 +38,14 @@ cors = "*" # "*"/"" -> "*" ; "nil" -> "" ;
debug = false
*/
// ServerConfig 定义服务器相关的配置
type ServerConfig struct {
Port int `toml:"port"`
Host string `toml:"host"`
SizeLimit int `toml:"sizeLimit"`
MemLimit int64 `toml:"memLimit"`
Cors string `toml:"cors"`
Debug bool `toml:"debug"`
Port int `toml:"port" wanf:"port"`
Host string `toml:"host" wanf:"host"`
SizeLimit int `toml:"sizeLimit" wanf:"sizeLimit"`
MemLimit int64 `toml:"memLimit" wanf:"memLimit"`
Cors string `toml:"cors" wanf:"cors"`
Debug bool `toml:"debug" wanf:"debug"`
}
/*
@@ -49,12 +56,13 @@ maxIdleConnsPerHost = 60 # only for advanced mode
maxConnsPerHost = 0 # only for advanced mode
useCustomRawHeaders = false
*/
// HttpcConfig 定义 HTTP 客户端相关的配置
type HttpcConfig struct {
Mode string `toml:"mode"`
MaxIdleConns int `toml:"maxIdleConns"`
MaxIdleConnsPerHost int `toml:"maxIdleConnsPerHost"`
MaxConnsPerHost int `toml:"maxConnsPerHost"`
UseCustomRawHeaders bool `toml:"useCustomRawHeaders"`
Mode string `toml:"mode" wanf:"mode"`
MaxIdleConns int `toml:"maxIdleConns" wanf:"maxIdleConns"`
MaxIdleConnsPerHost int `toml:"maxIdleConnsPerHost" wanf:"maxIdleConnsPerHost"`
MaxConnsPerHost int `toml:"maxConnsPerHost" wanf:"maxConnsPerHost"`
UseCustomRawHeaders bool `toml:"useCustomRawHeaders" wanf:"useCustomRawHeaders"`
}
/*
@@ -64,11 +72,12 @@ smartGitAddr = "http://127.0.0.1:8080"
//cacheTimeout = 10
ForceH2C = true
*/
// GitCloneConfig 定义 Git 克隆相关的配置
type GitCloneConfig struct {
Mode string `toml:"mode"`
SmartGitAddr string `toml:"smartGitAddr"`
Mode string `toml:"mode" wanf:"mode"`
SmartGitAddr string `toml:"smartGitAddr" wanf:"smartGitAddr"`
//CacheTimeout int `toml:"cacheTimeout"`
ForceH2C bool `toml:"ForceH2C"`
ForceH2C bool `toml:"ForceH2C" wanf:"ForceH2C"`
}
/*
@@ -76,9 +85,10 @@ type GitCloneConfig struct {
editor = true
rewriteAPI = false
*/
// ShellConfig 定义 Shell 相关的配置
type ShellConfig struct {
Editor bool `toml:"editor"`
RewriteAPI bool `toml:"rewriteAPI"`
Editor bool `toml:"editor" wanf:"editor"`
RewriteAPI bool `toml:"rewriteAPI" wanf:"rewriteAPI"`
}
/*
@@ -87,16 +97,18 @@ mode = "internal" # "internal" or "external"
theme = "bootstrap" # "bootstrap" or "nebula"
staticDir = "/data/www"
*/
// PagesConfig 定义静态页面相关的配置
type PagesConfig struct {
Mode string `toml:"mode"`
Theme string `toml:"theme"`
StaticDir string `toml:"staticDir"`
Mode string `toml:"mode" wanf:"mode"`
Theme string `toml:"theme" wanf:"theme"`
StaticDir string `toml:"staticDir" wanf:"staticDir"`
}
// LogConfig 定义日志相关的配置
type LogConfig struct {
LogFilePath string `toml:"logFilePath"`
MaxLogSize int64 `toml:"maxLogSize"`
Level string `toml:"level"`
LogFilePath string `toml:"logFilePath" wanf:"logFilePath"`
MaxLogSize int64 `toml:"maxLogSize" wanf:"maxLogSize"`
Level string `toml:"level" wanf:"level"`
}
/*
@@ -109,31 +121,35 @@ passThrough = false
ForceAllowApi = false
ForceAllowApiPassList = false
*/
// AuthConfig 定义认证相关的配置
type AuthConfig struct {
Enabled bool `toml:"enabled"`
Method string `toml:"method"`
Key string `toml:"key"`
Token string `toml:"token"`
PassThrough bool `toml:"passThrough"`
ForceAllowApi bool `toml:"ForceAllowApi"`
ForceAllowApiPassList bool `toml:"ForceAllowApiPassList"`
Enabled bool `toml:"enabled" wanf:"enabled"`
Method string `toml:"method" wanf:"method"`
Key string `toml:"key" wanf:"key"`
Token string `toml:"token" wanf:"token"`
PassThrough bool `toml:"passThrough" wanf:"passThrough"`
ForceAllowApi bool `toml:"ForceAllowApi" wanf:"ForceAllowApi"`
ForceAllowApiPassList bool `toml:"ForceAllowApiPassList" wanf:"ForceAllowApiPassList"`
}
// BlacklistConfig 定义黑名单相关的配置
type BlacklistConfig struct {
Enabled bool `toml:"enabled"`
BlacklistFile string `toml:"blacklistFile"`
Enabled bool `toml:"enabled" wanf:"enabled"`
BlacklistFile string `toml:"blacklistFile" wanf:"blacklistFile"`
}
// WhitelistConfig 定义白名单相关的配置
type WhitelistConfig struct {
Enabled bool `toml:"enabled"`
WhitelistFile string `toml:"whitelistFile"`
Enabled bool `toml:"enabled" wanf:"enabled"`
WhitelistFile string `toml:"whitelistFile" wanf:"whitelistFile"`
}
// IPFilterConfig 定义 IP 过滤相关的配置
type IPFilterConfig struct {
Enabled bool `toml:"enabled"`
EnableAllowList bool `toml:"enableAllowList"`
EnableBlockList bool `toml:"enableBlockList"`
IPFilterFile string `toml:"ipFilterFile"`
Enabled bool `toml:"enabled" wanf:"enabled"`
EnableAllowList bool `toml:"enableAllowList" wanf:"enableAllowList"`
EnableBlockList bool `toml:"enableBlockList" wanf:"enableBlockList"`
IPFilterFile string `toml:"ipFilterFile" wanf:"ipFilterFile"`
}
/*
@@ -150,19 +166,21 @@ burst = 10
singleBurst = "10mbps"
*/
// RateLimitConfig 定义限速相关的配置
type RateLimitConfig struct {
Enabled bool `toml:"enabled"`
RatePerMinute int `toml:"ratePerMinute"`
Burst int `toml:"burst"`
BandwidthLimit BandwidthLimitConfig
Enabled bool `toml:"enabled" wanf:"enabled"`
RatePerMinute int `toml:"ratePerMinute" wanf:"ratePerMinute"`
Burst int `toml:"burst" wanf:"burst"`
BandwidthLimit BandwidthLimitConfig `toml:"bandwidthLimit" wanf:"bandwidthLimit"`
}
// BandwidthLimitConfig 定义带宽限制相关的配置
type BandwidthLimitConfig struct {
Enabled bool `toml:"enabled"`
TotalLimit string `toml:"totalLimit"`
TotalBurst string `toml:"totalBurst"`
SingleLimit string `toml:"singleLimit"`
SingleBurst string `toml:"singleBurst"`
Enabled bool `toml:"enabled" wanf:"enabled"`
TotalLimit string `toml:"totalLimit" wanf:"totalLimit"`
TotalBurst string `toml:"totalBurst" wanf:"totalBurst"`
SingleLimit string `toml:"singleLimit" wanf:"singleLimit"`
SingleBurst string `toml:"singleBurst" wanf:"singleBurst"`
}
/*
@@ -170,9 +188,10 @@ type BandwidthLimitConfig struct {
enabled = false
url = "socks5://127.0.0.1:1080" # "http://127.0.0.1:7890"
*/
// OutboundConfig 定义出站代理相关的配置
type OutboundConfig struct {
Enabled bool `toml:"enabled"`
Url string `toml:"url"`
Enabled bool `toml:"enabled" wanf:"enabled"`
Url string `toml:"url" wanf:"url"`
}
/*
@@ -184,17 +203,19 @@ auth = false
user1 = "testpass"
test = "test123"
*/
// DockerConfig 定义 Docker 相关的配置
type DockerConfig struct {
Enabled bool `toml:"enabled"`
Target string `toml:"target"`
Auth bool `toml:"auth"`
Credentials map[string]string `toml:"credentials"`
AuthPassThrough bool `toml:"authPassThrough"`
Enabled bool `toml:"enabled" wanf:"enabled"`
Target string `toml:"target" wanf:"target"`
Auth bool `toml:"auth" wanf:"auth"`
Credentials map[string]string `toml:"credentials" wanf:"credentials"`
AuthPassThrough bool `toml:"authPassThrough" wanf:"authPassThrough"`
}
// LoadConfig 从 TOML 配置文件加载配置
// LoadConfig 从配置文件加载配置
func LoadConfig(filePath string) (*Config, error) {
if !FileExists(filePath) {
exist, filePath2read := FileExists(filePath)
if !exist {
// 楔入配置文件
err := DefaultConfig().WriteConfig(filePath)
if err != nil {
@@ -202,15 +223,22 @@ func LoadConfig(filePath string) (*Config, error) {
}
return DefaultConfig(), nil
}
var config Config
if _, err := toml.DecodeFile(filePath, &config); err != nil {
ext := filepath.Ext(filePath2read)
if ext == ".wanf" {
if err := wanf.DecodeFile(filePath2read, &config); err != nil {
return nil, err
}
return &config, nil
}
if _, err := toml.DecodeFile(filePath2read, &config); err != nil {
return nil, err
}
return &config, nil
}
// 写入配置文件
// WriteConfig 写入配置文件
func (c *Config) WriteConfig(filePath string) error {
file, err := os.Create(filePath)
if err != nil {
@@ -218,17 +246,54 @@ func (c *Config) WriteConfig(filePath string) error {
}
defer file.Close()
ext := filepath.Ext(filePath)
if ext == ".wanf" {
err := wanf.NewStreamEncoder(file).Encode(c)
if err != nil {
return err
}
return nil
}
encoder := toml.NewEncoder(file)
return encoder.Encode(c)
}
// 检测文件是否存在
func FileExists(filename string) bool {
// FileExists 检测文件是否存在
func FileExists(filename string) (bool, string) {
_, err := os.Stat(filename)
return !os.IsNotExist(err)
if err == nil {
return true, filename
}
if os.IsNotExist(err) {
// 获取文件名(不包含路径)
base := filepath.Base(filename)
dir := filepath.Dir(filename)
// 获取扩展名
fileNameBody := strings.TrimSuffix(base, filepath.Ext(base))
// 重新组合路径, 扩展名改为.wanf, 确认是否存在
wanfFilename := filepath.Join(dir, fileNameBody+".wanf")
_, err = os.Stat(wanfFilename)
if err == nil {
// .wanf 文件存在
fmt.Printf("\n Found .wanf file: %s\n", wanfFilename)
return true, wanfFilename
} else if os.IsNotExist(err) {
// .wanf 文件不存在
return false, ""
} else {
// 其他错误
return false, ""
}
} else {
return false, filename
}
}
// 默认配置结构体
// DefaultConfig 返回默认配置结构体
func DefaultConfig() *Config {
return &Config{
Server: ServerConfig{

11
go.mod
View File

@@ -1,25 +1,26 @@
module ghproxy
go 1.24.5
go 1.25.1
require (
github.com/BurntSushi/toml v1.5.0
github.com/WJQSERVER-STUDIO/httpc v0.8.2
golang.org/x/net v0.42.0
golang.org/x/time v0.12.0
golang.org/x/net v0.44.0
golang.org/x/time v0.13.0
)
require (
github.com/WJQSERVER-STUDIO/go-utils/iox v0.0.2
github.com/WJQSERVER-STUDIO/go-utils/limitreader v0.0.2
github.com/WJQSERVER/wanf v0.0.0-20250810023226-e51d9d0737ee
github.com/fenthope/bauth v0.0.1
github.com/fenthope/ikumi v0.0.2
github.com/fenthope/ipfilter v0.0.1
github.com/fenthope/reco v0.0.4
github.com/fenthope/record v0.0.4
github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2
github.com/go-json-experiment/json v0.0.0-20250910080747-cc2cfa0554c3
github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/infinite-iroha/touka v0.3.6
github.com/infinite-iroha/touka v0.3.7
github.com/wjqserver/modembed v0.0.1
)

20
go.sum
View File

@@ -6,6 +6,8 @@ github.com/WJQSERVER-STUDIO/go-utils/limitreader v0.0.2 h1:8bBkKk6E2Zr+I5szL7gyc
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.8.2/go.mod h1:8WhHVRO+olDFBSvL5PC/bdMkb6U3vRdPJ4p4pnguV5Y=
github.com/WJQSERVER/wanf v0.0.0-20250810023226-e51d9d0737ee h1:tJ31DNBn6UhWkk8fiikAQWqULODM+yBcGAEar1tzdZc=
github.com/WJQSERVER/wanf v0.0.0-20250810023226-e51d9d0737ee/go.mod h1:q2Pyg+G+s1acMWxrbI4CwS/Yk76/BzLREEdZ8iFwUNE=
github.com/fenthope/bauth v0.0.1 h1:+4UIQshGx3mYD4L3f2S4MLZOi5PWU7fU5GK3wsZvwzE=
github.com/fenthope/bauth v0.0.1/go.mod h1:1fveTpgfR1p+WXQ8MXm9BfBCeNYi55j23jxCOGOvBSA=
github.com/fenthope/ikumi v0.0.2 h1:5oaSTf/Msp7M2O3o/X20omKWEQbFhX4KV0CVF21oCdk=
@@ -16,17 +18,19 @@ github.com/fenthope/reco v0.0.4 h1:yo2g3aWwdoMpaZWZX4SdZOW7mCK82RQIU/YI8ZUQThM=
github.com/fenthope/reco v0.0.4/go.mod h1:eMyS8HpdMVdJ/2WJt6Cvt8P1EH9Igzj5lSJrgc+0jeg=
github.com/fenthope/record v0.0.4 h1:/1JHNCxiXGLL/qCh4LEGaAvhj4CcKsb6siTxjLmjdO4=
github.com/fenthope/record v0.0.4/go.mod h1:G0a6KCiCDyX2SsC3nfzSN651fJKxH482AyJvzlnvAJU=
github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2 h1:iizUGZ9pEquQS5jTGkh4AqeeHCMbfbjeb0zMt0aEFzs=
github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b h1:6Q4zRHXS/YLOl9Ng1b1OOOBWMidAQZR3Gel0UKPC/KU=
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-20250910080747-cc2cfa0554c3 h1:02WINGfSX5w0Mn+F28UyRoSt9uvMhKguwWMlOAh6U/0=
github.com/go-json-experiment/json v0.0.0-20250910080747-cc2cfa0554c3/go.mod h1:uNVvRXArCGbZ508SxYYTC5v1JWoz2voff5pm25jU1Ok=
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/infinite-iroha/touka v0.3.6 h1:SkpM/VFGCWOFQP3RRuoWdX/Q4zafPngG1VMwkrLwtkw=
github.com/infinite-iroha/touka v0.3.6/go.mod h1:XW7a3fpLAjJfylSmdNuDQ8wGKkKmLVi9V/89sT1d7uw=
github.com/infinite-iroha/touka v0.3.7 h1:bIIZW5Weh7lVpyOWh4FmyR9UOfb5FOt+cR9yQ30FJLA=
github.com/infinite-iroha/touka v0.3.7/go.mod h1:uwkF1gTrNEgQ4P/Gwtk6WLbERehq3lzB8x1FMedyrfE=
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/wjqserver/modembed v0.0.1 h1:8ZDz7t9M5DLrUFlYgBUUmrMzxWsZPmHvOazkr/T2jEs=
github.com/wjqserver/modembed v0.0.1/go.mod h1:sYbQJMAjSBsdYQrUsuHY380XXE1CuRh8g9yyCztTXOQ=
golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
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/time v0.13.0 h1:eUlYslOIt32DgYD6utsuUeHs4d7AsEYLuIAdg7FlYgI=
golang.org/x/time v0.13.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=

31
main.go
View File

@@ -234,8 +234,18 @@ func setupPages(cfg *config.Config, r *touka.Engine) {
}
case "external":
r.SetUnMatchFS(http.Dir(cfg.Pages.StaticDir))
if cfg.Pages.StaticDir == "" {
logger.Errorf("Pages Mode is 'external' but StaticDir is empty. Using embedded pages instead.")
err := setInternalRoute(cfg, r)
if err != nil {
logger.Errorf("Failed to load embedded pages: %s", err)
fmt.Printf("Failed to load embedded pages: %s", err)
os.Exit(1)
}
} else {
extPageFS := os.DirFS(cfg.Pages.StaticDir)
r.SetUnMatchFS(http.FS(extPageFS))
}
default:
// 处理无效的Pages Mode
logger.Warnf("Invalid Pages Mode: %s, using default embedded theme", cfg.Pages.Mode)
@@ -474,20 +484,11 @@ func main() {
proxy.RoutingHandler(cfg)(c)
})
r.GET("/v2/",
r.ANY("/v2/*path",
r.UseIf(cfg.Docker.Auth, func() touka.HandlerFunc {
return bauth.BasicAuthForStatic(cfg.Docker.Credentials, "GHProxy Docker Proxy")
}),
func(c *touka.Context) {
emptyJSON := "{}"
c.Header("Content-Type", "application/json")
c.Header("Content-Length", fmt.Sprint(len(emptyJSON)))
c.Header("Docker-Distribution-API-Version", "registry/2.0")
c.Status(200)
c.Writer.Write([]byte(emptyJSON))
},
proxy.OciWithImageRouting(cfg),
)
r.GET("/v2", func(c *touka.Context) {
@@ -495,10 +496,6 @@ func main() {
c.Redirect(http.StatusMovedPermanently, "/v2/")
})
r.ANY("/v2/:target/:user/:repo/*filepath", func(c *touka.Context) {
proxy.GhcrWithImageRouting(cfg)(c)
})
r.NoRoute(func(c *touka.Context) {
proxy.NoRouteHandler(cfg)(c)
})

View File

@@ -127,18 +127,14 @@ func ChunkedProxyRequest(ctx context.Context, c *touka.Context, u string, cfg *c
defer bodyReader.Close()
if MatcherShell(u) && matchString(matcher) && cfg.Shell.Editor {
// 判断body是不是gzip
var compress string
if resp.Header.Get("Content-Encoding") == "gzip" {
compress = "gzip"
}
c.Debugf("Use Shell Editor: %s %s %s %s %s", c.ClientIP(), c.Request.Method, u, c.UserAgent(), c.Request.Proto)
c.Header("Content-Length", "")
c.DelHeader("Content-Length")
c.DelHeader("Content-Encoding")
var reader io.Reader
reader, _, err = processLinks(bodyReader, compress, c.Request.Host, cfg, c)
reader, _, err = processLinks(bodyReader, c.Request.Host, cfg, c, bodySize)
c.WriteStream(reader)
if err != nil {
c.Errorf("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), c.Request.Method, u, c.UserAgent(), c.Request.Proto, err)
@@ -146,7 +142,6 @@ func ChunkedProxyRequest(ctx context.Context, c *touka.Context, u string, cfg *c
return
}
} else {
if contentLength != "" {
c.SetHeader("Content-Length", contentLength)
c.WriteStream(bodyReader)

View File

@@ -40,90 +40,167 @@ func InitWeakCache() *weakcache.Cache[string] {
return cache
}
// GhcrWithImageRouting 处理带有镜像路由的请求, 根据目标路由到不同的Docker注册表
func GhcrWithImageRouting(cfg *config.Config) touka.HandlerFunc {
return func(c *touka.Context) {
// 从 main.go 中固定的路由 "/v2/:target/:user/:repo/*filepath" 获取参数
reqTarget := c.Param("target")
reqImageUser := c.Param("user")
reqImageName := c.Param("repo")
reqFilePath := c.Param("filepath")
var upstreamTarget string
var requestPath string
var imageNameForAuth string
// 关键逻辑: 判断 reqTarget 是真实主机名还是镜像名的一部分
// 依据: 真实主机名/IP通常包含'.'或':'
if strings.Contains(reqTarget, ".") || strings.Contains(reqTarget, ":") {
// 情况 A: reqTarget 是一个显式指定的主机名 (例如 "ghcr.io", "my-registry.com", "127.0.0.1:5000")
c.Debugf("Request target '%s' identified as an explicit hostname.", reqTarget)
// https://github.com/WJQSERVER-STUDIO/ghproxy/issues/159
if reqTarget == "docker.io" {
upstreamTarget = dockerhubTarget
} else {
upstreamTarget = reqTarget
var (
authEndpoint = "/"
passTypeMap = map[string]struct{}{
"manifests": {},
"blobs": {},
"tags": {},
"index": {},
}
)
// 处理路径各种情况
func OciWithImageRouting(cfg *config.Config) touka.HandlerFunc {
return func(c *touka.Context) {
if !cfg.Docker.Enabled {
ErrorPage(c, NewErrorWithStatusLookup(403, "Docker proxy is not enabled"))
return
}
var (
p1 string
p2 string
p3 string
p4 string
target string
user string
repo string
extpath string
p1IsTarget bool
ignorep3 bool
imageNameForAuth string
finalreqUrl string
iInfo *imageInfo
)
ociPath := c.Param("path")
if ociPath == authEndpoint {
emptyJSON := "{}"
c.Header("Content-Type", "application/json")
c.Header("Content-Length", fmt.Sprint(len(emptyJSON)))
c.Header("Docker-Distribution-API-Version", "registry/2.0")
c.Status(200)
c.Writer.Write([]byte(emptyJSON))
return
}
// 根据/分割 /:target/:user/:repo/*ext
ociPath = ociPath[1:]
i := strings.IndexByte(ociPath, '/')
if i <= 0 {
ErrorPage(c, NewErrorWithStatusLookup(404, "Not Found"))
return
}
p1 = ociPath[:i]
// 开始判断p1是否为target
if strings.Contains(p1, ".") || strings.Contains(p1, ":") {
p1IsTarget = true
if p1 == "docker.io" {
target = dockerhubTarget
} else {
target = p1
}
// 上游请求的路径是主机名之后的部分
requestPath = fmt.Sprintf("%s/%s%s", reqImageUser, reqImageName, reqFilePath)
// 用于认证的镜像名是 user/repo
imageNameForAuth = fmt.Sprintf("%s/%s", reqImageUser, reqImageName)
} else {
// 情况 B: reqTarget 是镜像名的一部分 (例如 "wjqserver", "library")
c.Debugf("Request target '%s' identified as part of an image name. Using default registry.", reqTarget)
// 使用配置文件中的默认目标
switch cfg.Docker.Target {
case "ghcr":
upstreamTarget = ghcrTarget
target = ghcrTarget
case "dockerhub":
upstreamTarget = dockerhubTarget
target = dockerhubTarget
case "":
ErrorPage(c, NewErrorWithStatusLookup(500, "Default Docker Target is not configured in config file"))
return
default:
upstreamTarget = cfg.Docker.Target
target = cfg.Docker.Target
}
// 必须将路由错误分割的所有部分重新组合成完整的镜像路径
requestPath = fmt.Sprintf("%s/%s/%s%s", reqTarget, reqImageUser, reqImageName, reqFilePath)
// 用于认证的镜像名是 target/user (例如 "wjqserver/ghproxy", "library/ubuntu")
imageNameForAuth = fmt.Sprintf("%s/%s", reqTarget, reqImageUser)
}
// 清理路径, 防止出现 "//"
requestPath = strings.TrimPrefix(requestPath, "/")
ociPath = ociPath[i+1:]
i = strings.IndexByte(ociPath, '/')
if i <= 0 {
ErrorPage(c, NewErrorWithStatusLookup(404, "Not Found"))
return
}
p2 = ociPath[:i]
ociPath = ociPath[i+1:]
// 为认证和缓存准备镜像信息
image := &imageInfo{
// 若p2和passTypeMap匹配
if !p1IsTarget {
if _, ok := passTypeMap[p2]; ok {
ignorep3 = true
switch cfg.Docker.Target {
case "ghcr":
target = ghcrTarget
case "dockerhub":
target = dockerhubTarget
case "":
ErrorPage(c, NewErrorWithStatusLookup(500, "Default Docker Target is not configured in config file"))
return
default:
target = cfg.Docker.Target
}
user = "library"
repo = p1
extpath = "/" + p2 + "/" + ociPath
}
}
if !ignorep3 {
i = strings.IndexByte(ociPath, '/')
if i <= 0 {
ErrorPage(c, NewErrorWithStatusLookup(404, "Not Found"))
return
}
p3 = ociPath[:i]
ociPath = ociPath[i+1:]
p4 = ociPath
if p1IsTarget {
if _, ok := passTypeMap[p3]; ok {
user = "library"
repo = p2
extpath = "/" + p3 + "/" + p4
} else {
user = p2
repo = p3
extpath = "/" + p4
}
} else {
switch cfg.Docker.Target {
case "ghcr":
target = ghcrTarget
case "dockerhub":
target = dockerhubTarget
case "":
ErrorPage(c, NewErrorWithStatusLookup(500, "Default Docker Target is not configured in config file"))
return
default:
target = cfg.Docker.Target
}
user = p1
repo = p2
extpath = "/" + p3 + "/" + p4
}
}
imageNameForAuth = user + "/" + repo
finalreqUrl = "https://" + target + "/v2/" + imageNameForAuth + extpath
if query := c.GetReqQueryString(); query != "" {
finalreqUrl += "?" + query
}
iInfo = &imageInfo{
User: user,
Repo: repo,
Image: imageNameForAuth,
}
// 调用 GhcrToTarget 处理实际的代理请求
GhcrToTarget(c, cfg, upstreamTarget, requestPath, image)
GhcrRequest(c.Request.Context(), c, finalreqUrl, iInfo, cfg, target)
}
}
// GhcrToTarget 根据配置和目标信息将请求代理到上游Docker注册表
func GhcrToTarget(c *touka.Context, cfg *config.Config, target string, path string, image *imageInfo) {
// 检查Docker代理是否启用
if !cfg.Docker.Enabled {
ErrorPage(c, NewErrorWithStatusLookup(403, "Docker is not Allowed"))
return
}
var ctx = c.Request.Context()
// 构造目标URL. 这里的target和path都是由GhcrWithImageRouting正确解析得来的.
destUrl := "https://" + target + "/v2/" + path
if query := c.GetReqQueryString(); query != "" {
destUrl += "?" + query
}
c.Debugf("Proxying to target '%s' with path '%s'. Final URL: %s", target, path, destUrl)
// 执行实际的代理请求
GhcrRequest(ctx, c, destUrl, image, cfg, target)
}
// GhcrRequest 执行对Docker注册表的HTTP请求, 处理认证和重定向
func GhcrRequest(ctx context.Context, c *touka.Context, u string, image *imageInfo, cfg *config.Config, target string) {
var (

View File

@@ -9,6 +9,32 @@ import (
"github.com/infinite-iroha/touka"
)
// buildHandlerPath 使用 strings.Builder 来高效地构建最终的 URL.
// 这避免了使用标准字符串拼接时发生的多次内存分配.
func buildHandlerPath(path, matcher string) string {
var sb strings.Builder
sb.Grow(len(path) + 50)
if matcher == "blob" && strings.HasPrefix(path, "github.com") {
sb.WriteString("https://raw.githubusercontent.com")
if len(path) > 10 { // len("github.com")
pathSegment := path[10:] // skip "github.com"
if i := strings.Index(pathSegment, "/blob/"); i != -1 {
sb.WriteString(pathSegment[:i])
sb.WriteString("/")
sb.WriteString(pathSegment[i+len("/blob/"):])
} else {
sb.WriteString(pathSegment)
}
}
} else {
sb.WriteString("https://")
sb.WriteString(path)
}
return sb.String()
}
var re = regexp.MustCompile(`^(http:|https:)?/?/?(.*)`) // 匹配http://或https://开头的路径
func NoRouteHandler(cfg *config.Config) touka.HandlerFunc {
@@ -32,21 +58,16 @@ func NoRouteHandler(cfg *config.Config) touka.HandlerFunc {
}
// 制作url
rawPath = "https://" + matches[2]
var (
user string
repo string
matcher string
)
path := matches[2]
var matcherErr *GHProxyErrors
user, repo, matcher, matcherErr = Matcher(rawPath, cfg)
user, repo, matcher, matcherErr := Matcher("https://"+path, cfg)
if matcherErr != nil {
ErrorPage(c, matcherErr)
return
}
rawPath = buildHandlerPath(path, matcher)
shoudBreak = listCheck(cfg, c, user, repo, rawPath)
if shoudBreak {
return
@@ -57,11 +78,7 @@ func NoRouteHandler(cfg *config.Config) touka.HandlerFunc {
return
}
// 处理blob/raw路径
if matcher == "blob" {
rawPath = rawPath[18:]
rawPath = "https://raw.githubusercontent.com" + rawPath
rawPath = strings.Replace(rawPath, "/blob/", "/", 1)
matcher = "raw"
}

View File

@@ -23,6 +23,7 @@ const (
gistPrefix = "https://gist.github.com/"
gistContentPrefix = "https://gist.githubusercontent.com/"
apiPrefix = "https://api.github.com/"
ociv2Prefix = "https://v2/"
releasesDownloadSnippet = "releases/download/"
)
@@ -36,9 +37,11 @@ func init() {
// Matcher 从原始URL路径中高效地解析并匹配代理规则.
func Matcher(rawPath string, cfg *config.Config) (string, string, string, *GHProxyErrors) {
/*
if len(rawPath) < 18 {
return "", "", "", NewErrorWithStatusLookup(404, "path too short")
}
*/
// 匹配 "https://github.com/"
if strings.HasPrefix(rawPath, githubPrefix) {

View File

@@ -2,15 +2,78 @@ package proxy
import (
"bufio"
"compress/gzip"
"bytes"
"fmt"
"ghproxy/config"
"io"
"strings"
"sync"
"github.com/infinite-iroha/touka"
)
var (
prefixGithub = []byte("https://github.com")
prefixRawUser = []byte("https://raw.githubusercontent.com")
prefixRaw = []byte("https://raw.github.com")
prefixGistUser = []byte("https://gist.githubusercontent.com")
prefixGist = []byte("https://gist.github.com")
prefixAPI = []byte("https://api.github.com")
prefixHTTP = []byte("http://")
prefixHTTPS = []byte("https://")
)
func EditorMatcherBytes(rawPath []byte, cfg *config.Config) (bool, error) {
if bytes.HasPrefix(rawPath, prefixGithub) {
return true, nil
}
if bytes.HasPrefix(rawPath, prefixRawUser) {
return true, nil
}
if bytes.HasPrefix(rawPath, prefixRaw) {
return true, nil
}
if bytes.HasPrefix(rawPath, prefixGistUser) {
return true, nil
}
if bytes.HasPrefix(rawPath, prefixGist) {
return true, nil
}
if cfg.Shell.RewriteAPI {
if bytes.HasPrefix(rawPath, prefixAPI) {
return true, nil
}
}
return false, nil
}
func modifyURLBytes(url []byte, host []byte, cfg *config.Config) []byte {
matched, err := EditorMatcherBytes(url, cfg)
if err != nil || !matched {
return url
}
var u []byte
if bytes.HasPrefix(url, prefixHTTPS) {
u = url[len(prefixHTTPS):]
} else if bytes.HasPrefix(url, prefixHTTP) {
u = url[len(prefixHTTP):]
} else {
u = url
}
newLen := len(prefixHTTPS) + len(host) + 1 + len(u)
newURL := make([]byte, newLen)
written := 0
written += copy(newURL[written:], prefixHTTPS)
written += copy(newURL[written:], host)
written += copy(newURL[written:], []byte("/"))
copy(newURL[written:], u)
return newURL
}
func EditorMatcher(rawPath string, cfg *config.Config) (bool, error) {
// 匹配 "https://github.com"开头的链接
if strings.HasPrefix(rawPath, "https://github.com") {
@@ -65,116 +128,126 @@ func modifyURL(url string, host string, cfg *config.Config) string {
return url
}
// processLinks 处理链接,返回包含处理后数据的 io.Reader
func processLinks(input io.ReadCloser, compress string, host string, cfg *config.Config, c *touka.Context) (readerOut io.Reader, written int64, err error) {
pipeReader, pipeWriter := io.Pipe() // 创建 io.Pipe
var bufferPool = sync.Pool{
New: func() interface{} {
return new(bytes.Buffer)
},
}
// processLinksStreamingInternal is a link processing function that reads the input line by line.
// It is memory-safe for large files but less performant due to numerous small allocations.
func processLinksStreamingInternal(input io.ReadCloser, host string, cfg *config.Config, c *touka.Context) (readerOut io.Reader, written int64, err error) {
pipeReader, pipeWriter := io.Pipe()
readerOut = pipeReader
go func() { // 在 Goroutine 中执行写入操作
go func() {
defer func() {
if pipeWriter != nil { // 确保 pipeWriter 关闭,即使发生错误
if err != nil {
if closeErr := pipeWriter.CloseWithError(err); closeErr != nil { // 如果有错误,传递错误给 reader
c.Errorf("pipeWriter close with error failed: %v, original error: %v", closeErr, err)
}
pipeWriter.CloseWithError(err)
} else {
if closeErr := pipeWriter.Close(); closeErr != nil { // 没有错误,正常关闭
c.Errorf("pipeWriter close failed: %v", closeErr)
if err == nil { // 如果之前没有错误,记录关闭错误
err = closeErr
}
}
}
pipeWriter.Close()
}
}()
defer input.Close()
defer func() {
if err := input.Close(); err != nil {
c.Errorf("input close failed: %v", err)
}
bufReader := bufio.NewReader(input)
bufWriter := bufio.NewWriterSize(pipeWriter, 4096)
defer bufWriter.Flush()
}()
var bufReader *bufio.Reader
if compress == "gzip" {
// 解压gzip
gzipReader, gzipErr := gzip.NewReader(input)
if gzipErr != nil {
err = fmt.Errorf("gzip解压错误: %v", gzipErr)
return // Goroutine 中使用 return 返回错误
}
defer gzipReader.Close()
bufReader = bufio.NewReader(gzipReader)
} else {
bufReader = bufio.NewReader(input)
}
var bufWriter *bufio.Writer
var gzipWriter *gzip.Writer
// 根据是否gzip确定 writer 的创建
if compress == "gzip" {
gzipWriter = gzip.NewWriter(pipeWriter) // 使用 pipeWriter
bufWriter = bufio.NewWriterSize(gzipWriter, 4096) //设置缓冲区大小
} else {
bufWriter = bufio.NewWriterSize(pipeWriter, 4096) // 使用 pipeWriter
}
//确保writer关闭
defer func() {
var closeErr error // 局部变量用于保存defer中可能发生的错误
if gzipWriter != nil {
if closeErr = gzipWriter.Close(); closeErr != nil {
c.Errorf("gzipWriter close failed %v", closeErr)
// 如果已经存在错误,则保留。否则,记录此错误。
if err == nil {
err = closeErr
}
}
}
if flushErr := bufWriter.Flush(); flushErr != nil {
c.Errorf("writer flush failed %v", flushErr)
// 如果已经存在错误,则保留。否则,记录此错误。
if err == nil {
err = flushErr
}
}
}()
// 使用正则表达式匹配 http 和 https 链接
for {
line, readErr := bufReader.ReadString('\n')
if readErr != nil {
if readErr == io.EOF {
break // 文件结束
}
err = fmt.Errorf("读取行错误: %v", readErr) // 传递错误
return // Goroutine 中使用 return 返回错误
if readErr != nil && readErr != io.EOF {
err = fmt.Errorf("read error: %w", readErr)
return
}
// 替换所有匹配的 URL
modifiedLine := urlPattern.ReplaceAllStringFunc(line, func(originalURL string) string {
return modifyURL(originalURL, host, cfg) // 假设 modifyURL 函数已定义
return modifyURL(originalURL, host, cfg)
})
n, writeErr := bufWriter.WriteString(modifiedLine)
written += int64(n) // 更新写入的字节数
if writeErr != nil {
err = fmt.Errorf("写入文件错误: %v", writeErr) // 传递错误
return // Goroutine 中使用 return 返回错误
}
var n int
n, err = bufWriter.WriteString(modifiedLine)
written += int64(n)
if err != nil {
err = fmt.Errorf("write error: %w", err)
return
}
// 在返回之前,再刷新一次 (虽然 defer 中已经有 flush但这里再加一次确保及时刷新)
if flushErr := bufWriter.Flush(); flushErr != nil {
if err == nil { // 避免覆盖之前的错误
err = flushErr
if readErr == io.EOF {
break
}
return // Goroutine 中使用 return 返回错误
}
}()
return readerOut, written, nil // 返回 reader 和 writtenerror 由 Goroutine 通过 pipeWriter.CloseWithError 传递
return readerOut, written, nil
}
// processLinks acts as a dispatcher, choosing the best processing strategy based on file size.
// It uses a memory-safe streaming approach for large or unknown-size files,
// and a high-performance buffered approach for smaller files.
func processLinks(input io.ReadCloser, host string, cfg *config.Config, c *touka.Context, bodySize int) (readerOut io.Reader, written int64, err error) {
const sizeThreshold = 256 * 1024 // 256KB
// Use streaming for large or unknown size files to prevent OOM
if bodySize == -1 || bodySize > sizeThreshold {
c.Debugf("Using streaming processor for large/unknown size file (%d bytes)", bodySize)
return processLinksStreamingInternal(input, host, cfg, c)
} else {
c.Debugf("Using buffered processor for small file (%d bytes)", bodySize)
return processLinksBufferedInternal(input, host, cfg, c)
}
}
// processLinksBufferedInternal a link processing function that reads the entire content into a buffer.
// It is optimized for performance on smaller files but carries an OOM risk for large files.
func processLinksBufferedInternal(input io.ReadCloser, host string, cfg *config.Config, c *touka.Context) (readerOut io.Reader, written int64, err error) {
pipeReader, pipeWriter := io.Pipe()
readerOut = pipeReader
hostBytes := []byte(host)
go func() {
// 在 goroutine 退出时, 根据 err 是否为 nil, 带错误或正常关闭 pipeWriter
defer func() {
if closeErr := input.Close(); closeErr != nil {
c.Errorf("input close failed: %v", closeErr)
}
}()
defer func() {
if err != nil {
if closeErr := pipeWriter.CloseWithError(err); closeErr != nil {
c.Errorf("pipeWriter close with error failed: %v", closeErr)
}
} else {
if closeErr := pipeWriter.Close(); closeErr != nil {
c.Errorf("pipeWriter close failed: %v", closeErr)
}
}
}()
buf := bufferPool.Get().(*bytes.Buffer)
buf.Reset()
defer bufferPool.Put(buf)
// 将全部输入读入复用的缓冲区
if _, err = buf.ReadFrom(input); err != nil {
err = fmt.Errorf("reading input failed: %w", err)
return
}
// 使用 ReplaceAllFunc 和字节版本辅助函数, 实现准零分配
modifiedBytes := urlPattern.ReplaceAllFunc(buf.Bytes(), func(originalURL []byte) []byte {
return modifyURLBytes(originalURL, hostBytes, cfg)
})
// 将处理后的字节写回管道
var n int
n, err = pipeWriter.Write(modifiedBytes)
if err != nil {
err = fmt.Errorf("writing to pipe failed: %w", err)
return
}
written = int64(n)
}()
return readerOut, written, nil
}

65
proxy/nest_bench_test.go Normal file
View File

@@ -0,0 +1,65 @@
package proxy
import (
"ghproxy/config"
"io"
"strings"
"testing"
)
const benchmarkInput = `
Some text here.
Link to be replaced: http://github.com/user/repo
Another link: https://google.com
And one more: http://example.com/some/path
This should not be replaced: notalink
End of text.
`
func BenchmarkProcessLinksStreaming(b *testing.B) {
cfg := &config.Config{}
host := "my-proxy.com"
b.ReportAllocs()
b.ResetTimer()
for i := 0; i < b.N; i++ {
b.StopTimer()
input := io.NopCloser(strings.NewReader(benchmarkInput))
b.StartTimer()
reader, _, err := processLinksStreamingInternal(input, host, cfg, nil)
if err != nil {
b.Fatalf("processLinksStreamingInternal failed: %v", err)
}
_, err = io.ReadAll(reader)
if err != nil {
b.Fatalf("Failed to read from processed reader: %v", err)
}
}
}
func BenchmarkProcessLinksBuffered(b *testing.B) {
cfg := &config.Config{}
host := "my-proxy.com"
b.ReportAllocs()
b.ResetTimer()
for i := 0; i < b.N; i++ {
b.StopTimer()
input := io.NopCloser(strings.NewReader(benchmarkInput))
b.StartTimer()
reader, _, err := processLinksBufferedInternal(input, host, cfg, nil)
if err != nil {
b.Fatalf("processLinksBufferedInternal failed: %v", err)
}
_, err = io.ReadAll(reader)
if err != nil {
b.Fatalf("Failed to read from processed reader: %v", err)
}
}
}

View File

@@ -27,6 +27,7 @@ var (
"CDN-Loop": {},
"Upgrade": {},
"Connection": {},
"Accept-Encoding": {},
}
cloneHeadersToRemove = map[string]struct{}{
@@ -43,7 +44,7 @@ var (
var (
defaultHeaders = map[string]string{
"Accept": "*/*",
"Accept-Encoding": "gzip",
"Accept-Encoding": "",
"Transfer-Encoding": "chunked",
"User-Agent": "GHProxy/1.0",
}

View File

@@ -7,6 +7,33 @@ import (
"github.com/infinite-iroha/touka"
)
// buildRoutingPath 使用 strings.Builder 来高效地构建最终的 URL.
// 这避免了使用标准字符串拼接时发生的多次内存分配.
func buildRoutingPath(rawPath, matcher string) string {
var sb strings.Builder
// 预分配内存以提高性能
// (This comment is in Chinese as requested by the user)
sb.Grow(len(rawPath) + 30)
sb.WriteString("https://")
if matcher == "blob" {
sb.WriteString("raw.githubusercontent.com")
if len(rawPath) > 10 { // len("github.com")
pathSegment := rawPath[10:]
if i := strings.Index(pathSegment, "/blob/"); i != -1 {
sb.WriteString(pathSegment[:i])
sb.WriteString("/")
sb.WriteString(pathSegment[i+len("/blob/"):])
} else {
sb.WriteString(pathSegment)
}
}
} else {
sb.WriteString(rawPath)
}
return sb.String()
}
func RoutingHandler(cfg *config.Config) touka.HandlerFunc {
return func(c *touka.Context) {
@@ -44,17 +71,11 @@ func RoutingHandler(cfg *config.Config) touka.HandlerFunc {
return
}
// 处理blob/raw路径
rawPath = buildRoutingPath(rawPath, matcher)
if matcher == "blob" {
rawPath = rawPath[10:]
rawPath = "raw.githubusercontent.com" + rawPath
rawPath = strings.Replace(rawPath, "/blob/", "/", 1)
matcher = "raw"
}
// 为rawpath加入https:// 头
rawPath = "https://" + rawPath
switch matcher {
case "releases", "blob", "raw", "gist", "api":
ChunkedProxyRequest(ctx, c, rawPath, cfg, matcher)