feat: lowercase model ids, add glm-5, socks5 proxy pool, remove arm build

.github/workflows/docker-image.yml

@@ -52,4 +52,4 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64

.gitignore

@@ -4,3 +4,5 @@
 PROJECT_STRUCTURE.md
 hello.txt
 psychoanalysis.txt
+proxies.txt
+zai-proxy

Dockerfile

@@ -14,6 +14,9 @@ WORKDIR /app
 
 COPY --from=builder /app/zai-proxy .
 
+# proxies.txt 可通过 docker run -v ./proxies.txt:/app/proxies.txt 挂载
+VOLUME ["/app/proxies.txt"]
+
 EXPOSE 8000
 
 CMD ["./zai-proxy"]

README.md

@@ -53,7 +53,16 @@ docker run -d --name zai-proxy \
   ghcr.io/yurika0211/zai-proxy:latest
 ```
 
-> 镜像支持 `linux/amd64` 和 `linux/arm64` 双平台。
+> 镜像仅支持 `linux/amd64` 平台。
+
+#### 挂载代理文件（可选）
+
+```bash
+docker run -d --name zai-proxy \
+  -p 8000:8000 \
+  -v ./proxies.txt:/app/proxies.txt \
+  ghcr.io/yurika0211/zai-proxy:latest
+```
 
 #### 可用镜像标签
 
@@ -96,6 +105,17 @@ docker compose up -d
 
 支持 `.env` 文件自动加载。
 
+## 代理池（可选）
+
+在项目根目录放置 `proxies.txt` 文件，每行一个 SOCKS5 代理，格式：
+
+```
+ip:port:username:password
+ip:port
+```
+
+启动时自动加载，每次请求随机选择一个代理。不存在该文件则直连。
+
 ## 获取 z.ai Token
 
 ### 方式一：使用匿名 Token（免登录）
@@ -106,7 +126,7 @@ docker compose up -d
 curl http://localhost:8000/v1/chat/completions \
   -H "Authorization: Bearer free" \
   -H "Content-Type: application/json" \
-  -d '{"model": "GLM-4.7", "messages": [{"role": "user", "content": "hello"}]}'
+  -d '{"model": "glm-4.7", "messages": [{"role": "user", "content": "hello"}]}'
 ```
 
 ### 方式二：使用个人 Token
@@ -134,7 +154,7 @@ curl http://localhost:8000/v1/chat/completions \
   -H "Authorization: Bearer YOUR_ZAI_TOKEN" \
   -H "Content-Type: application/json" \
   -d '{
-    "model": "GLM-4.7",
+    "model": "glm-4.7",
     "messages": [{"role": "user", "content": "hello"}],
     "stream": true
   }'
@@ -171,12 +191,13 @@ curl http://localhost:8000/v1/messages \
 
 | 模型名称 | 上游模型 | 说明 |
 |----------|----------|------|
-| `GLM-4.5` | 0727-360B-API | |
-| `GLM-4.6` | GLM-4-6-API-V1 | |
-| `GLM-4.7` | glm-4.7 | 最新 |
-| `GLM-4.5-V` | glm-4.5v | 视觉 |
-| `GLM-4.6-V` | glm-4.6v | 视觉（最新） |
-| `GLM-4.5-Air` | 0727-106B-API | 轻量 |
+| `glm-4.5` | 0727-360B-API | |
+| `glm-4.6` | GLM-4-6-API-V1 | |
+| `glm-4.7` | glm-4.7 | |
+| `glm-5` | glm-5 | 最新 |
+| `glm-4.5-v` | glm-4.5v | 视觉 |
+| `glm-4.6-v` | glm-4.6v | 视觉（最新） |
+| `glm-4.5-air` | 0727-106B-API | 轻量 |
 
 ### Claude 模型名映射
 
@@ -184,16 +205,16 @@ curl http://localhost:8000/v1/messages \
 
 | Claude 模型 | 映射到 | 备注 |
 |-------------|--------|------|
-| `claude-opus-4-6` | GLM-4.7 | 自动启用 thinking |
-| `claude-opus-4-5-20250514` | GLM-4.7 | 自动启用 thinking |
-| `claude-sonnet-4-6` | GLM-4.7 | |
-| `claude-sonnet-4-5-20241022` | GLM-4.7 | |
-| `claude-haiku-4-5` | GLM-4.5-Air | |
-| `claude-haiku-4-5-20251001` | GLM-4.5-Air | |
-| `claude-3-5-sonnet-20241022` | GLM-4.7 | |
-| `claude-3-5-haiku-20241022` | GLM-4.5-Air | |
+| `claude-opus-4-6` | glm-4.7 | 自动启用 thinking |
+| `claude-opus-4-5-20250514` | glm-4.7 | 自动启用 thinking |
+| `claude-sonnet-4-6` | glm-4.7 | |
+| `claude-sonnet-4-5-20241022` | glm-4.7 | |
+| `claude-haiku-4-5` | glm-4.5-air | |
+| `claude-haiku-4-5-20251001` | glm-4.5-air | |
+| `claude-3-5-sonnet-20241022` | glm-4.7 | |
+| `claude-3-5-haiku-20241022` | glm-4.5-air | |
 
-> Opus 系列模型始终自动启用 thinking 模式。未识别的模型名会回退到 GLM-4.7。
+> Opus 系列模型始终自动启用 thinking 模式。未识别的模型名会回退到 glm-4.7。
 
 ### 模型标签
 
@@ -206,11 +227,13 @@ curl http://localhost:8000/v1/messages \
 | `-tools` | 自动注入内置工具定义，模型可进行函数调用 |
 
 组合示例：
-- `GLM-4.7-thinking`
-- `GLM-4.7-search`
-- `GLM-4.7-thinking-search`
-- `GLM-4.7-tools`
-- `GLM-4.7-tools-thinking`
+- `glm-4.7-thinking`
+- `glm-4.7-search`
+- `glm-4.7-thinking-search`
+- `glm-4.7-tools`
+- `glm-4.7-tools-thinking`
+- `glm-5-thinking`
+- `glm-5-tools`
 
 ## 使用示例
 
@@ -218,7 +241,7 @@ curl http://localhost:8000/v1/messages \
 
 ```json
 {
-  "model": "GLM-4.6-V",
+  "model": "glm-4.6-v",
   "messages": [
     {
       "role": "user",
@@ -292,7 +315,7 @@ curl http://localhost:8000/v1/chat/completions \
   -H "Authorization: Bearer YOUR_ZAI_TOKEN" \
   -H "Content-Type: application/json" \
   -d '{
-    "model": "GLM-4.7-tools",
+    "model": "glm-4.7-tools",
     "messages": [{"role": "user", "content": "现在几点了？"}],
     "stream": true
   }'
@@ -312,7 +335,7 @@ curl http://localhost:8000/v1/chat/completions \
   -H "Authorization: Bearer YOUR_ZAI_TOKEN" \
   -H "Content-Type: application/json" \
   -d '{
-    "model": "GLM-4.7-tools",
+    "model": "glm-4.7-tools",
     "messages": [
       {"role": "user", "content": "现在几点了？"},
       {"role": "assistant", "content": "", "tool_calls": [
@@ -330,7 +353,7 @@ curl http://localhost:8000/v1/chat/completions \
 
 ```json
 {
-  "model": "GLM-4.7",
+  "model": "glm-4.7",
   "messages": [{"role": "user", "content": "北京天气怎么样？"}],
   "tools": [{
     "type": "function",
@@ -418,6 +441,8 @@ zai-proxy/
 │   │   ├── types.go            # OpenAI 兼容类型
 │   │   ├── anthropic.go        # Anthropic API 类型
 │   │   └── mapping.go          # 模型名映射与解析
+│   ├── proxy/                  # SOCKS5 代理池
+│   │   └── pool.go             # 代理加载与随机选择
 │   ├── tools/                  # 内置工具定义
 │   │   ├── builtin.go          # 6 个内置工具
 │   │   └── prompt.go           # 工具系统提示词构建

go.mod

@@ -1,10 +1,10 @@
 module zai-proxy
 
-go 1.21
+go 1.25.0
 
 require (
+	github.com/corpix/uarand v0.2.0
 	github.com/google/uuid v1.6.0
 	github.com/joho/godotenv v1.5.1
+	golang.org/x/net v0.52.0
 )
-
-require github.com/corpix/uarand v0.2.0 // indirect

go.sum

@@ -1,6 +1,16 @@
 github.com/corpix/uarand v0.2.0 h1:U98xXwud/AVuCpkpgfPF7J5TQgr7R5tqT8VZP5KWbzE=
 github.com/corpix/uarand v0.2.0/go.mod h1:/3Z1QIqWkDIhf6XWn/08/uMHoQ8JUoTIKc2iPchBOmM=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
+golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/auth/anonymous.go

@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+
+	"zai-proxy/internal/proxy"
 )
 
 type AnonymousAuthResponse struct {
@@ -12,7 +14,7 @@ type AnonymousAuthResponse struct {
 
 // GetAnonymousToken 从 z.ai 获取匿名 token
 func GetAnonymousToken() (string, error) {
-	resp, err := http.Get("https://chat.z.ai/api/v1/auths/")
+	resp, err := proxy.GetHTTPClient().Get("https://chat.z.ai/api/v1/auths/")
 	if err != nil {
 		return "", err
 	}

internal/model/mapping.go

@@ -2,41 +2,39 @@ package model
 
 import "strings"
 
-// 基础模型映射（不包含标签后缀）
+// 基础模型映射（key 全部小写，不包含标签后缀）
 var BaseModelMapping = map[string]string{
-	"GLM-4.5":      "0727-360B-API",
-	"GLM-4.6":      "GLM-4-6-API-V1",
-	"GLM-4.7":      "glm-4.7",
-	"GLM-4.5-V":    "glm-4.5v",
-	"GLM-4.6-V":    "glm-4.6v",
-	"GLM-4.5-Air":  "0727-106B-API",
-	"0808-360B-DR": "0808-360B-DR",
+	"glm-4.5":      "0727-360B-API",
+	"glm-4.6":      "GLM-4-6-API-V1",
+	"glm-4.7":      "glm-4.7",
+	"glm-5":        "glm-5",
+	"glm-4.5-v":    "glm-4.5v",
+	"glm-4.6-v":    "glm-4.6v",
+	"glm-4.5-air":  "0727-106B-API",
+	"0808-360b-dr": "0808-360B-DR",
 }
 
 // Claude 模型名到 GLM 基础模型名的映射
 var ClaudeModelMapping = map[string]string{
-	"claude-opus-4-6":           "GLM-4.7",
-	"claude-opus-4-5-20250514":  "GLM-4.7",
-	"claude-sonnet-4-6":         "GLM-4.7",
-	"claude-sonnet-4-5-20241022": "GLM-4.7",
-	"claude-haiku-4-5":          "GLM-4.5-Air",
-	"claude-haiku-4-5-20251001": "GLM-4.5-Air",
-	"claude-3-5-sonnet-20241022": "GLM-4.7",
-	"claude-3-5-haiku-20241022":  "GLM-4.5-Air",
+	"claude-opus-4-6":            "glm-4.7",
+	"claude-opus-4-5-20250514":   "glm-4.7",
+	"claude-sonnet-4-6":          "glm-4.7",
+	"claude-sonnet-4-5-20241022": "glm-4.7",
+	"claude-haiku-4-5":           "glm-4.5-air",
+	"claude-haiku-4-5-20251001":  "glm-4.5-air",
+	"claude-3-5-sonnet-20241022": "glm-4.7",
+	"claude-3-5-haiku-20241022":  "glm-4.5-air",
 }
 
 // ResolveClaudeModel maps a Claude model name to a GLM model name with appropriate tags.
-// Returns the resolved model name and whether thinking should be enabled.
 func ResolveClaudeModel(model string, thinkingEnabled bool) (resolvedModel string, enableThinking bool) {
-	base, ok := ClaudeModelMapping[model]
+	base, ok := ClaudeModelMapping[strings.ToLower(model)]
 	if !ok {
-		// Unknown model: fallback to GLM-4.7
-		base = "GLM-4.7"
+		base = "glm-4.7"
 	}
 
 	enableThinking = thinkingEnabled
-	// Opus models always enable thinking
-	if strings.Contains(model, "opus") {
+	if strings.Contains(strings.ToLower(model), "opus") {
 		enableThinking = true
 	}
 
@@ -44,36 +42,38 @@ func ResolveClaudeModel(model string, thinkingEnabled bool) (resolvedModel strin
 	if enableThinking {
 		resolvedModel += "-thinking"
 	}
-	// Always enable tools for Claude requests (handled via prompt injection)
 	resolvedModel += "-tools"
 	return resolvedModel, enableThinking
 }
 
-// v1/models 返回的模型列表（不包含所有标签组合）
+// v1/models 返回的模型列表（全部小写）
 var ModelList = []string{
-	"GLM-4.5",
-	"GLM-4.6",
-	"GLM-4.7",
-	"GLM-4.7-thinking",
-	"GLM-4.7-thinking-search",
-	"GLM-4.7-tools",
-	"GLM-4.7-tools-thinking",
-	"GLM-4.5-V",
-	"GLM-4.6-V",
-	"GLM-4.6-V-thinking",
-	"GLM-4.5-Air",
-	// "0808-360B-DR",
+	"glm-4.5",
+	"glm-4.6",
+	"glm-4.7",
+	"glm-4.7-thinking",
+	"glm-4.7-thinking-search",
+	"glm-4.7-tools",
+	"glm-4.7-tools-thinking",
+	"glm-5",
+	"glm-5-thinking",
+	"glm-5-thinking-search",
+	"glm-5-tools",
+	"glm-5-tools-thinking",
+	"glm-4.5-v",
+	"glm-4.6-v",
+	"glm-4.6-v-thinking",
+	"glm-4.5-air",
 }
 
 // 解析模型名称，提取基础模型名和标签
-// 支持 -thinking、-search 和 -tools 标签的任意排列组合
+// 输入大小写不敏感，输出的 baseModel 为小写
 func ParseModelName(model string) (baseModel string, enableThinking bool, enableSearch bool, enableTools bool) {
 	enableThinking = false
 	enableSearch = false
 	enableTools = false
-	baseModel = model
+	baseModel = strings.ToLower(model)
 
-	// 检查并移除 -thinking、-search 和 -tools 标签（任意顺序）
 	for {
 		if strings.HasSuffix(baseModel, "-thinking") {
 			enableThinking = true
@@ -112,6 +112,5 @@ func GetTargetModel(model string) string {
 	if target, ok := BaseModelMapping[baseModel]; ok {
 		return target
 	}
-	// Fallback: unknown models default to glm-4.7
 	return "glm-4.7"
 }

internal/model/mapping_test.go

@@ -6,17 +6,27 @@ import "testing"
 
 func TestParseModelName_Plain(t *testing.T) {
 	base, thinking, search, tools := ParseModelName("GLM-4.7")
-	if base != "GLM-4.7" {
-		t.Errorf("base = %q, want %q", base, "GLM-4.7")
+	if base != "glm-4.7" {
+		t.Errorf("base = %q, want %q", base, "glm-4.7")
 	}
 	if thinking || search || tools {
 		t.Errorf("flags = (%v, %v, %v), want all false", thinking, search, tools)
 	}
 }
 
+func TestParseModelName_Lowercase(t *testing.T) {
+	base, thinking, _, _ := ParseModelName("glm-4.7-thinking")
+	if base != "glm-4.7" {
+		t.Errorf("base = %q, want %q", base, "glm-4.7")
+	}
+	if !thinking {
+		t.Error("thinking should be true")
+	}
+}
+
 func TestParseModelName_Thinking(t *testing.T) {
 	base, thinking, search, tools := ParseModelName("GLM-4.7-thinking")
-	if base != "GLM-4.7" {
+	if base != "glm-4.7" {
 		t.Errorf("base = %q", base)
 	}
 	if !thinking {
@@ -29,7 +39,7 @@ func TestParseModelName_Thinking(t *testing.T) {
 
 func TestParseModelName_Search(t *testing.T) {
 	base, thinking, search, tools := ParseModelName("GLM-4.7-search")
-	if base != "GLM-4.7" {
+	if base != "glm-4.7" {
 		t.Errorf("base = %q", base)
 	}
 	if !search {
@@ -42,7 +52,7 @@ func TestParseModelName_Search(t *testing.T) {
 
 func TestParseModelName_Tools(t *testing.T) {
 	base, thinking, search, tools := ParseModelName("GLM-4.7-tools")
-	if base != "GLM-4.7" {
+	if base != "glm-4.7" {
 		t.Errorf("base = %q", base)
 	}
 	if !tools {
@@ -55,7 +65,7 @@ func TestParseModelName_Tools(t *testing.T) {
 
 func TestParseModelName_ThinkingSearch(t *testing.T) {
 	base, thinking, search, tools := ParseModelName("GLM-4.7-thinking-search")
-	if base != "GLM-4.7" {
+	if base != "glm-4.7" {
 		t.Errorf("base = %q", base)
 	}
 	if !thinking || !search {
@@ -68,7 +78,7 @@ func TestParseModelName_ThinkingSearch(t *testing.T) {
 
 func TestParseModelName_ToolsThinking(t *testing.T) {
 	base, thinking, search, tools := ParseModelName("GLM-4.7-tools-thinking")
-	if base != "GLM-4.7" {
+	if base != "glm-4.7" {
 		t.Errorf("base = %q", base)
 	}
 	if !tools || !thinking {
@@ -81,7 +91,7 @@ func TestParseModelName_ToolsThinking(t *testing.T) {
 
 func TestParseModelName_ToolsSearch(t *testing.T) {
 	base, thinking, search, tools := ParseModelName("GLM-4.7-tools-search")
-	if base != "GLM-4.7" {
+	if base != "glm-4.7" {
 		t.Errorf("base = %q", base)
 	}
 	if !tools || !search {
@@ -94,7 +104,7 @@ func TestParseModelName_ToolsSearch(t *testing.T) {
 
 func TestParseModelName_AllTags(t *testing.T) {
 	base, thinking, search, tools := ParseModelName("GLM-4.7-tools-thinking-search")
-	if base != "GLM-4.7" {
+	if base != "glm-4.7" {
 		t.Errorf("base = %q", base)
 	}
 	if !thinking || !search || !tools {
@@ -104,7 +114,7 @@ func TestParseModelName_AllTags(t *testing.T) {
 
 func TestParseModelName_ReverseOrder(t *testing.T) {
 	base, thinking, search, tools := ParseModelName("GLM-4.7-search-thinking-tools")
-	if base != "GLM-4.7" {
+	if base != "glm-4.7" {
 		t.Errorf("base = %q", base)
 	}
 	if !thinking || !search || !tools {
@@ -112,15 +122,42 @@ func TestParseModelName_ReverseOrder(t *testing.T) {
 	}
 }
 
+// ===== GLM-5 =====
+
+func TestParseModelName_GLM5(t *testing.T) {
+	base, thinking, _, _ := ParseModelName("glm-5")
+	if base != "glm-5" {
+		t.Errorf("base = %q, want %q", base, "glm-5")
+	}
+	if thinking {
+		t.Error("thinking should be false")
+	}
+}
+
+func TestGetTargetModel_GLM5(t *testing.T) {
+	target := GetTargetModel("glm-5")
+	if target != "glm-5" {
+		t.Errorf("GetTargetModel(glm-5) = %q, want %q", target, "glm-5")
+	}
+}
+
+func TestGetTargetModel_GLM5Thinking(t *testing.T) {
+	target := GetTargetModel("glm-5-thinking")
+	if target != "glm-5" {
+		t.Errorf("GetTargetModel(glm-5-thinking) = %q, want %q", target, "glm-5")
+	}
+}
+
 // ===== IsToolsModel =====
 
 func TestIsToolsModel_True(t *testing.T) {
 	tests := []string{
-		"GLM-4.7-tools",
+		"glm-4.7-tools",
 		"GLM-4.7-tools-thinking",
-		"GLM-4.7-tools-search",
+		"glm-4.7-tools-search",
 		"GLM-4.7-thinking-tools",
-		"GLM-4.5-tools",
+		"glm-4.5-tools",
+		"glm-5-tools",
 	}
 	for _, m := range tests {
 		if !IsToolsModel(m) {
@@ -131,9 +168,9 @@ func TestIsToolsModel_True(t *testing.T) {
 
 func TestIsToolsModel_False(t *testing.T) {
 	tests := []string{
-		"GLM-4.7",
+		"glm-4.7",
 		"GLM-4.7-thinking",
-		"GLM-4.7-search",
+		"glm-4.7-search",
 		"GLM-4.7-thinking-search",
 	}
 	for _, m := range tests {
@@ -143,32 +180,32 @@ func TestIsToolsModel_False(t *testing.T) {
 	}
 }
 
-// ===== IsThinkingModel / IsSearchModel 不受 -tools 影响 =====
+// ===== IsThinkingModel / IsSearchModel =====
 
 func TestIsThinkingModel_WithTools(t *testing.T) {
-	if !IsThinkingModel("GLM-4.7-tools-thinking") {
-		t.Error("IsThinkingModel should be true for GLM-4.7-tools-thinking")
+	if !IsThinkingModel("glm-4.7-tools-thinking") {
+		t.Error("IsThinkingModel should be true for glm-4.7-tools-thinking")
 	}
-	if IsThinkingModel("GLM-4.7-tools") {
-		t.Error("IsThinkingModel should be false for GLM-4.7-tools")
+	if IsThinkingModel("glm-4.7-tools") {
+		t.Error("IsThinkingModel should be false for glm-4.7-tools")
 	}
 }
 
 func TestIsSearchModel_WithTools(t *testing.T) {
-	if !IsSearchModel("GLM-4.7-tools-search") {
-		t.Error("IsSearchModel should be true for GLM-4.7-tools-search")
+	if !IsSearchModel("glm-4.7-tools-search") {
+		t.Error("IsSearchModel should be true for glm-4.7-tools-search")
 	}
-	if IsSearchModel("GLM-4.7-tools") {
-		t.Error("IsSearchModel should be false for GLM-4.7-tools")
+	if IsSearchModel("glm-4.7-tools") {
+		t.Error("IsSearchModel should be false for glm-4.7-tools")
 	}
 }
 
-// ===== GetTargetModel with -tools =====
+// ===== GetTargetModel =====
 
 func TestGetTargetModel_WithTools(t *testing.T) {
-	target := GetTargetModel("GLM-4.7-tools")
+	target := GetTargetModel("glm-4.7-tools")
 	if target != "glm-4.7" {
-		t.Errorf("GetTargetModel(GLM-4.7-tools) = %q, want %q", target, "glm-4.7")
+		t.Errorf("GetTargetModel(glm-4.7-tools) = %q, want %q", target, "glm-4.7")
 	}
 }
 
@@ -179,12 +216,14 @@ func TestGetTargetModel_WithToolsThinking(t *testing.T) {
 	}
 }
 
-// ===== ModelList 包含 -tools 变体 =====
+// ===== ModelList =====
 
 func TestModelList_ContainsToolsVariants(t *testing.T) {
 	expected := map[string]bool{
-		"GLM-4.7-tools":          false,
-		"GLM-4.7-tools-thinking": false,
+		"glm-4.7-tools":          false,
+		"glm-4.7-tools-thinking": false,
+		"glm-5":                  false,
+		"glm-5-tools":            false,
 	}
 
 	for _, m := range ModelList {

internal/proxy/pool.go

@@ -0,0 +1,120 @@
+package proxy
+
+import (
+	"bufio"
+	"context"
+	"fmt"
+	"math/rand"
+	"net"
+	"net/http"
+	"os"
+	"strings"
+	"sync"
+
+	"golang.org/x/net/proxy"
+
+	"zai-proxy/internal/logger"
+)
+
+var (
+	proxies []string
+	mu      sync.RWMutex
+)
+
+// LoadProxies 从 proxies.txt 文件加载代理列表
+// 格式: ip:port:username:password 或 ip:port
+func LoadProxies(path string) {
+	file, err := os.Open(path)
+	if err != nil {
+		logger.LogInfo("No proxies.txt found, running without proxy")
+		return
+	}
+	defer file.Close()
+
+	var loaded []string
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := strings.TrimSpace(scanner.Text())
+		if line == "" || strings.HasPrefix(line, "#") {
+			continue
+		}
+		loaded = append(loaded, line)
+	}
+
+	mu.Lock()
+	proxies = loaded
+	mu.Unlock()
+
+	logger.LogInfo("Loaded %d proxies from %s", len(loaded), path)
+}
+
+type proxyInfo struct {
+	addr     string
+	username string
+	password string
+}
+
+// getRandomProxyInfo 随机返回一个代理信息
+func getRandomProxyInfo() *proxyInfo {
+	mu.RLock()
+	defer mu.RUnlock()
+
+	if len(proxies) == 0 {
+		return nil
+	}
+
+	line := proxies[rand.Intn(len(proxies))]
+	parts := strings.Split(line, ":")
+
+	switch len(parts) {
+	case 2:
+		return &proxyInfo{addr: fmt.Sprintf("%s:%s", parts[0], parts[1])}
+	case 4:
+		return &proxyInfo{
+			addr:     fmt.Sprintf("%s:%s", parts[0], parts[1]),
+			username: parts[2],
+			password: parts[3],
+		}
+	default:
+		logger.LogWarn("Invalid proxy format: %s", line)
+		return nil
+	}
+}
+
+// GetHTTPClient 返回一个配置了随机 SOCKS5 代理的 http.Client
+func GetHTTPClient() *http.Client {
+	info := getRandomProxyInfo()
+	if info == nil {
+		return &http.Client{}
+	}
+
+	logger.LogDebug("Using SOCKS5 proxy: %s", info.addr)
+
+	var auth *proxy.Auth
+	if info.username != "" {
+		auth = &proxy.Auth{
+			User:     info.username,
+			Password: info.password,
+		}
+	}
+
+	dialer, err := proxy.SOCKS5("tcp", info.addr, auth, proxy.Direct)
+	if err != nil {
+		logger.LogWarn("Failed to create SOCKS5 dialer: %v", err)
+		return &http.Client{}
+	}
+
+	contextDialer, ok := dialer.(proxy.ContextDialer)
+	if !ok {
+		logger.LogWarn("SOCKS5 dialer does not support ContextDialer")
+		return &http.Client{}
+	}
+
+	return &http.Client{
+		Transport: &http.Transport{
+			DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
+				return contextDialer.DialContext(ctx, network, addr)
+			},
+		},
+	}
+}

internal/upstream/client.go

@@ -14,6 +14,7 @@ import (
 	"zai-proxy/internal/auth"
 	"zai-proxy/internal/logger"
 	"zai-proxy/internal/model"
+	"zai-proxy/internal/proxy"
 	builtintools "zai-proxy/internal/tools"
 	"zai-proxy/internal/version"
 )
@@ -243,7 +244,7 @@ func MakeUpstreamRequest(token string, messages []model.Message, modelName strin
 	req.Header.Set("Referer", fmt.Sprintf("https://chat.z.ai/c/%s", uuid.New().String()))
 	req.Header.Set("User-Agent", uarand.GetRandom())
 
-	client := &http.Client{}
+	client := proxy.GetHTTPClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		return nil, "", err

internal/upstream/upload.go

@@ -14,6 +14,7 @@ import (
 	"github.com/google/uuid"
 
 	"zai-proxy/internal/logger"
+	"zai-proxy/internal/proxy"
 )
 
 // FileUploadResponse z.ai 文件上传响应
@@ -87,7 +88,7 @@ func UploadImageFromURL(token string, imageURL string) (*UpstreamFile, error) {
 		filename = uuid.New().String()[:12] + ext
 	} else {
 		// 从 URL 下载图片
-		resp, err := http.Get(imageURL)
+		resp, err := proxy.GetHTTPClient().Get(imageURL)
 		if err != nil {
 			return nil, fmt.Errorf("failed to download image: %v", err)
 		}
@@ -144,7 +145,7 @@ func UploadImageFromURL(token string, imageURL string) (*UpstreamFile, error) {
 	req.Header.Set("Origin", "https://chat.z.ai")
 	req.Header.Set("Referer", "https://chat.z.ai/")
 
-	client := &http.Client{}
+	client := proxy.GetHTTPClient()
 	resp, err := client.Do(req)
 	if err != nil {
 		return nil, fmt.Errorf("failed to upload image: %v", err)

internal/version/version.go

@@ -2,12 +2,12 @@ package version
 
 import (
 	"io"
-	"net/http"
 	"regexp"
 	"sync"
 	"time"
 
 	"zai-proxy/internal/logger"
+	"zai-proxy/internal/proxy"
 )
 
 var (
@@ -22,7 +22,7 @@ func GetFeVersion() string {
 }
 
 func fetchFeVersion() {
-	resp, err := http.Get("https://chat.z.ai/")
+	resp, err := proxy.GetHTTPClient().Get("https://chat.z.ai/")
 	if err != nil {
 		logger.LogError("Failed to fetch fe version: %v", err)
 		return
@@ -46,10 +46,9 @@ func fetchFeVersion() {
 }
 
 func StartVersionUpdater() {
-	fetchFeVersion()
-
-	ticker := time.NewTicker(1 * time.Hour)
 	go func() {
+		fetchFeVersion()
+		ticker := time.NewTicker(1 * time.Hour)
 		for range ticker.C {
 			fetchFeVersion()
 		}

main.go

@@ -6,12 +6,14 @@ import (
 	"zai-proxy/internal/config"
 	"zai-proxy/internal/handler"
 	"zai-proxy/internal/logger"
+	"zai-proxy/internal/proxy"
 	"zai-proxy/internal/version"
 )
 
 func main() {
 	config.LoadConfig()
 	logger.InitLogger()
+	proxy.LoadProxies("proxies.txt")
 	version.StartVersionUpdater()
 
 	http.HandleFunc("/v1/models", handler.HandleModels)