Merge pull request #79 from WJQSERVER-STUDIO/dev

2.6.2 - 2025-03-29
---
- BACKPORT: 反向移植前端资源加载改进

.github/workflows/build-dev.yml

@@ -59,6 +59,13 @@ jobs:
           else
             echo "DEV-VERSION file not found!" && exit 1
           fi
+
+      - name: 拉取前端
+        run: |
+          sudo git clone https://github.com/WJQSERVER-STUDIO/GHPrxoy-Frontend.git pages
+          sudo rm -rf pages/.git/
+  
+
       - name: 安装 Go
         uses: actions/setup-go@v3
         with:

.github/workflows/build.yml

@@ -56,6 +56,12 @@ jobs:
           else
             echo "VERSION file not found!" && exit 1
           fi
+
+      - name: 拉取前端
+        run: |
+          sudo git clone https://github.com/WJQSERVER-STUDIO/GHPrxoy-Frontend.git pages
+          sudo rm -rf pages/.git/
+
       - name: 安装 Go
         uses: actions/setup-go@v3
         with:

.gitignore

@@ -3,4 +3,5 @@ demo.toml
 *.log
 *.bak
 list.json
-repos
+repos
+pages

CHANGELOG.md

@@ -1,5 +1,132 @@
 # 更新日志
 
+2.6.2 - 2025-03-29
+---
+- BACKPORT: 反向移植前端资源加载改进
+
+e3.0.6 - 2025-03-28
+---
+- ATTENTION: 此版本是实验性的, 请确保了解这一点
+- FIX: 修正状态码相关问题(开发遗留所致)
+
+e3.0.5 - 2025-03-28
+---
+- ATTENTION: 此版本是实验性的, 请确保了解这一点
+- CHANGE: 增加默认配置生成
+- CHANGE: 优化前端资源加载
+
+2.6.1 - 2025-03-27
+---
+- CHANGE: 改进`matcher`组件
+- CHANGE: 加入优雅关闭
+
+e3.0.3 - 2025-03.27
+---
+- ATTENTION: 此版本是实验性的, 请确保了解这一点
+- E-RELEASE: 修正过往问题, 还请各位多多测试反馈
+- PORT: 从v2移植`matcher`相关改进
+- CHANGE&FIX: 使用`c.SetBodyStream`方式, 修正此前`chunked`传输中存在的诸多问题, 参看[HertZ Issues #1309](https://github.com/cloudwego/hertz/issues/1309)
+
+25w24a - 2025-03-27
+---
+- PRE-RELEASE: 此版本是v2.6.1的预发布版本,请勿在生产环境中使用;
+- CHANGE: 改进`matcher`组件
+- CHANGE: 加入优雅关闭
+
+e3.0.3rc2 - 2025-03-27
+---
+- ATTENTION: 此版本是实验性的, 请确保了解这一点
+- PRE-RELEASE: 此版本是v3.0.3的候选版本,请勿在生产环境中使用;
+- PORT: 从v2移植`matcher`相关改进
+
+e3.0.3rc1 - 2025-03-26
+---
+- ATTENTION: 此版本是实验性的, 请确保了解这一点
+- PRE-RELEASE: 此版本是v3.0.3的候选版本,请勿在生产环境中使用;
+- CHANGE&FIX: 使用`c.SetBodyStream`方式, 修正此前`chunked`传输中存在的诸多问题, 参看[HertZ Issues #1309](https://github.com/cloudwego/hertz/issues/1309)
+
+2.6.0 - 2025-03-22
+---
+- BACKPORT: 将v3的功能性改进反向移植
+
+25w23a - 2025-03-22
+---
+- PRE-RELEASE: 此版本是v2.6.0的预发布版本,请勿在生产环境中使用;
+- BACKPORT: 将v3的功能性改进反向移植
+
+e3.0.2 - 2025-03-21
+---
+- ATTENTION: 此版本是实验性的, 请确保了解这一点
+- RELEASE: 在此表达对各位的歉意, v3迁移到HertZ带来了许多问题; 此版本完善v3的同时, 修正已知问题;
+- FIX: 使用等效`c.Writer()`, 回归v2.5.0 func以修正问题
+- CHANGE: 更新相关依赖
+
+25w22a - 2025-03-21
+---
+- PRE-RELEASE: 此版本是v3.0.1的预发布版本,请勿在生产环境中使用;
+- FIX: 使用等效`c.Writer()`, 回归v2.5.0 func以修正问题
+
+e3.0.1 - 2025-03-21
+---
+- ATTENTION: 此版本是实验性的, 请确保了解这一点
+- RELEASE: Next Step; 下一步; 完善v3的同时, 修正已知问题;
+- CHANGE: 改进cli
+- CHANGE: 重写`ProcessLinksAndWriteChunked`(脚本嵌套加速处理器), 修正已知问题的同时提高性能与效率
+- CHANGE: 完善`gitreq`部分
+- FIX: 修正日志输出格式问题
+- FIX: 使用更新的`hwriter`以修正相关问题
+
+25w21e - 2025-03-21
+---
+- PRE-RELEASE: 此版本是v3.0.1的预发布版本,请勿在生产环境中使用;
+- CHANGE: 重写`ProcessLinksAndWriteChunked`(脚本嵌套加速处理器), 修正已知问题的同时提高性能与效率
+
+25w21d - 2025-03-21
+---
+- PRE-RELEASE: 此版本是v3.0.1的预发布版本,请勿在生产环境中使用;
+- FIX: 使用更新的`hwriter`以修正相关问题
+
+25w21c - 2025-03-20
+---
+- PRE-RELEASE: 此版本是v3.0.1的预发布版本,请勿在生产环境中使用;
+- TEST: 测试新的`hwriter`
+
+25w21b - 2025-03-20
+---
+- PRE-RELEASE: 此版本是v3.0.1的预发布版本,请勿在生产环境中使用;
+- FIX: 修正日志输出格式问题
+
+25w21a - 2025-03-20
+---
+- PRE-RELEASE: 此版本是v3.0.1的预发布版本,请勿在生产环境中使用;
+- CHANGE: 改进cli
+- CHANGE: 完善`gitreq`部分
+
+e3.0.0 - 2025-03-19
+---
+- ATTENTION: 此版本是实验性的, 请确保了解这一点
+- RELEASE: Next Gen; 下一个起点; v3会与v2.4.0及以上版本保证兼容关系, 可平顺升级;
+- CHANGE: 使用HertZ框架重构, 提升性能
+- CHANGE: 前端在构建时加入, 新增`Design`,`Metro`,`Classic`主题
+- CHANGE: 加入`Mino`主题对接选项
+- FIX: 修正部分日志输出问题
+- CHANGE: 移除gin残留
+- CHANGE: 移除无用传入参数, 调整代码结构
+
+25w20b - 2025-03-19
+---
+- PRE-RELEASE: 此版本是v3.0.0的预发布版本,请勿在生产环境中使用; v3.0.0会与v2.4.0及以上保证兼容关系, 可平顺升级;
+- CHANGE: 加入`Mino`主题对接选项
+- FIX: 修正部分日志输出问题
+- CHANGE: 移除gin残留
+- CHANGE: 移除无用传入参数, 调整代码结构
+
+25w20a - 2025-03-18
+---
+- PRE-RELEASE: 此版本是v3.0.0的预发布版本,请勿在生产环境中使用; v3.0.0会与v2.4.0及以上保证兼容关系, 可平顺升级;
+- CHANGE: 使用HertZ重构
+- CHANGE: 前端在构建时加入, 新增`Design`,`Metro`,`Classic`主题
+
 2.5.0 - 2025-03-17
 ---
 - ADD: 加入脚本嵌套加速功能
@@ -1091,4 +1218,4 @@ v0.1.0
 - ADD: 实现符合[RFC 7234](https://httpwg.org/specs/rfc7234.html)的HTTP缓存机制
 - ADD: 实现action编译
 - ADD: 实现Docker部署
-- INFO: 使用Caddy作为Web服务器，通过Caddy实现了缓存与速率限制
+- INFO: 使用Caddy作为Web服务器，通过Caddy实现了缓存与速率限制

DEV-VERSION

@@ -1 +1 @@
-25w19a
+25w24a

README.md

@@ -20,11 +20,13 @@
 - 使用[Gin](https://github.com/gin-gonic/gin)作为Web框架
 - 使用[Touka-HTTPC](https://github.com/satomitouka/touka-httpc)作为HTTP客户端
 - 支持Git clone,raw,realeases等文件拉取
+- 支持多个前端主题
+- 支持自定义黑名单/白名单
 - 支持Git Clone缓存(配合组件)
 - 支持Docker部署
 - 支持速率限制
 - 支持用户鉴权
-- 支持自定义黑名单/白名单
+- 支持shell脚本嵌套加速
 - 基于[WJQSERVER-STUDIO/golang-temp](https://github.com/WJQSERVER-STUDIO/golang-temp)模板构建,具有标准化的日志记录与构建流程
 
 ### 项目开发过程
@@ -201,4 +203,6 @@ USDT(TRC20): `TNfSYG6F2vkiibd6J6mhhHNWDgWgNdF5hN`
 
 ### 捐赠列表
 
-虚位以待...
+| 赞助人    |金额|
+|--------|------|
+| starry | 8 USDT (TRC20)   |

SECURITY.MD

@@ -6,7 +6,8 @@
 
 | 版本 | 是否支持 |
 | --- | --- |
-| v2.x.x | :white_check_mark: 当前最新版本序列, 受支持 |
+| v3.x.x | :white_check_mark: 接受issue, 实验性 |
+| v2.x.x | :white_check_mark: 受支持, 正在维护 |
 | v1.x.x | :x: 这些版本已结束生命周期,不再受支持 |
 | 25w*a/b/c... | :warning: 此为PRE-RELEASE版本,用于开发与测试,可能存在未知的问题 |
 | 24w*a/b/c... | :warning: 此为PRE-RELEASE版本,用于开发与测试,可能存在未知的问题 生命周期已完全结束 |

VERSION

@@ -1 +1 @@
-2.5.0
+2.6.2

api/api.go

@@ -15,7 +15,7 @@ var (
 
 var (
 	logw       = logger.Logw
-	LogDump    = logger.LogDump
+	logDump    = logger.LogDump
 	logDebug   = logger.LogDebug
 	logInfo    = logger.LogInfo
 	logWarning = logger.LogWarning
@@ -59,6 +59,9 @@ func InitHandleRouter(cfg *config.Config, router *gin.Engine, version string) {
 		apiRouter.GET("/rate_limit/limit", func(c *gin.Context) {
 			RateLimitLimitHandler(c, cfg)
 		})
+		apiRouter.GET("/smartgit/status", func(c *gin.Context) {
+			SmartGitStatusHandler(c, cfg)
+		})
 	}
 	logInfo("API router Init success")
 }
@@ -127,3 +130,11 @@ func RateLimitLimitHandler(c *gin.Context, cfg *config.Config) {
 		"RatePerMinute": cfg.RateLimit.RatePerMinute,
 	})
 }
+
+func SmartGitStatusHandler(c *gin.Context, cfg *config.Config) {
+	logInfo("%s %s %s %s %s", c.ClientIP(), c.Request.Method, c.Request.URL.Path, c.Request.UserAgent(), c.Request.Proto)
+	c.Writer.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(c.Writer).Encode(map[string]interface{}{
+		"enabled": cfg.GitClone.Mode == "cache",
+	})
+}

auth/auth.go

@@ -10,7 +10,7 @@ import (
 
 var (
 	logw       = logger.Logw
-	LogDump    = logger.LogDump
+	logDump    = logger.LogDump
 	logDebug   = logger.LogDebug
 	logInfo    = logger.LogInfo
 	logWarning = logger.LogWarning

config/config.go

@@ -24,7 +24,6 @@ host = "0.0.0.0"  # 监听地址
 port = 8080  # 监听端口
 sizeLimit = 125 # 125MB
 H2C = true # 是否开启H2C传输
-enableH2C = "on"  # 是否开启H2C传输(latest和dev版本请开启) on/off (2.4.0弃用)
 */
 
 type ServerConfig struct {
@@ -33,7 +32,6 @@ type ServerConfig struct {
 	SizeLimit int    `toml:"sizeLimit"`
 	H2C       bool   `toml:"H2C"`
 	Cors      string `toml:"cors"`
-	EnableH2C string `toml:"enableH2C"`
 	Debug     bool   `toml:"debug"`
 }
 
@@ -54,7 +52,7 @@ type HttpcConfig struct {
 /*
 [gitclone]
 mode = "bypass" # bypass / cache
-smartGitAddr = ":8080"
+smartGitAddr = "http://127.0.0.1:8080"
 ForceH2C = true
 */
 type GitCloneConfig struct {
@@ -66,21 +64,21 @@ type GitCloneConfig struct {
 /*
 [shell]
 editor = true
+rewriteAPI = false
 */
 type ShellConfig struct {
-	Editor bool `toml:"editor"`
+	Editor     bool `toml:"editor"`
+	RewriteAPI bool `toml:"rewriteAPI"`
 }
 
 /*
 [pages]
 mode = "internal" # "internal" or "external"
-enabled = false
 theme = "bootstrap" # "bootstrap" or "nebula"
 staticDir = "/data/www"
 */
 type PagesConfig struct {
 	Mode      string `toml:"mode"`
-	Enabled   bool   `toml:"enabled"`
 	Theme     string `toml:"theme"`
 	StaticDir string `toml:"staticDir"`
 }

config/config.toml

@@ -19,6 +19,7 @@ ForceH2C = false
 
 [shell]
 editor = false
+rewriteAPI = false
 
 [pages]
 mode = "internal" # "internal" or "external"

gitclone/git-client.go

@@ -1,120 +0,0 @@
-package gitclone
-
-import (
-	"archive/tar"
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-
-	"github.com/go-git/go-git/v5"
-	"github.com/pierrec/lz4"
-)
-
-func CloneRepo(dir string, repoName string, repoUrl string) error {
-	repoPath := dir
-	_, err := git.PlainClone(repoPath, true, &git.CloneOptions{
-		URL:      repoUrl,
-		Progress: os.Stdout,
-		Mirror:   true,
-	})
-	if err != nil && !errors.Is(err, git.ErrRepositoryAlreadyExists) {
-		fmt.Printf("Fail to clone: %v\n", err)
-	} else if err != nil && errors.Is(err, git.ErrRepositoryAlreadyExists) {
-		// 移除文件夹
-		fmt.Printf("Repository already exists\n")
-		err = os.RemoveAll(repoPath)
-		if err != nil {
-			fmt.Printf("Fail to remove: %v\n", err)
-			return err
-		}
-		_, err = git.PlainClone(repoPath, true, &git.CloneOptions{
-			URL:      repoUrl,
-			Progress: os.Stdout,
-			Mirror:   true,
-		})
-		if err != nil {
-			fmt.Printf("Fail to clone: %v\n", err)
-			return err
-		}
-	}
-
-	// 压缩
-	err = CompressRepo(repoPath)
-	if err != nil {
-		fmt.Printf("Fail to compress: %v\n", err)
-		return err
-	}
-	return nil
-}
-
-// CompressRepo 将指定的仓库压缩成 LZ4 格式的压缩包
-func CompressRepo(repoPath string) error {
-	lz4File, err := os.Create(repoPath + ".lz4")
-	if err != nil {
-		return fmt.Errorf("failed to create LZ4 file: %w", err)
-	}
-	defer lz4File.Close()
-
-	// 创建 LZ4 编码器
-	lz4Writer := lz4.NewWriter(lz4File)
-	defer lz4Writer.Close()
-
-	// 创建 tar.Writer
-	tarBuffer := new(bytes.Buffer)
-	tarWriter := tar.NewWriter(tarBuffer)
-
-	// 遍历仓库目录并打包
-	err = filepath.Walk(repoPath, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		// 创建 tar 文件头
-		header, err := tar.FileInfoHeader(info, "")
-		if err != nil {
-			return err
-		}
-		header.Name, err = filepath.Rel(repoPath, path)
-		if err != nil {
-			return err
-		}
-
-		// 写入 tar 文件头
-		if err := tarWriter.WriteHeader(header); err != nil {
-			return err
-		}
-
-		// 如果是文件，写入文件内容
-		if !info.IsDir() {
-			file, err := os.Open(path)
-			if err != nil {
-				return err
-			}
-			defer file.Close()
-
-			_, err = io.Copy(tarWriter, file)
-			if err != nil {
-				return err
-			}
-		}
-		return nil
-	})
-	if err != nil {
-		return fmt.Errorf("failed to walk through repo directory: %w", err)
-	}
-
-	// 关闭 tar.Writer
-	if err := tarWriter.Close(); err != nil {
-		return fmt.Errorf("failed to close tar writer: %w", err)
-	}
-
-	// 将 tar 数据写入 LZ4 压缩包
-	if _, err := lz4Writer.Write(tarBuffer.Bytes()); err != nil {
-		return fmt.Errorf("failed to write to LZ4 file: %w", err)
-	}
-
-	return nil
-}

gitclone/gitclone.go

@@ -1,14 +0,0 @@
-package gitclone
-
-import (
-	"github.com/WJQSERVER-STUDIO/go-utils/logger"
-)
-
-var (
-	logw       = logger.Logw
-	logDump    = logger.LogDump
-	logDebug   = logger.LogDebug
-	logInfo    = logger.LogInfo
-	logWarning = logger.LogWarning
-	logError   = logger.LogError
-)

gitclone/smart-http.go

@@ -1,164 +0,0 @@
-package gitclone
-
-/*
-package gitclone
-
-import (
-	"compress/gzip"
-	"ghproxy/config"
-	"io"
-	"log"
-	"net/http"
-	"os"
-
-	"github.com/gin-gonic/gin"
-	"github.com/go-git/go-billy/v5/osfs"
-	"github.com/go-git/go-git/v5/plumbing/format/pktline"
-	"github.com/go-git/go-git/v5/plumbing/protocol/packp"
-	"github.com/go-git/go-git/v5/plumbing/transport"
-	"github.com/go-git/go-git/v5/plumbing/transport/server"
-)
-
-// MIT https://github.com/erred/gitreposerver
-
-// httpInfoRefs 函数处理 /info/refs 请求，用于 Git 客户端获取仓库的引用信息。
-// 返回一个 gin.HandlerFunc 类型的处理函数。
-func HttpInfoRefs(cfg *config.Config) gin.HandlerFunc {
-	return func(c *gin.Context) {
-
-		repo := c.Param("repo") // 从 Gin 上下文中获取路由参数 "repo"，即仓库名
-		username := c.Param("username")
-		repoName := repo
-		dir := cfg.GitClone.Dir + "/" + username + "/" + repo
-		url := "https://github.com/" + username + "/" + repo
-
-		// 输出 repo user dir url
-		logInfo("Repo: %s, User: %s, Dir: %s, Url: %s\n", repoName, username, dir, url)
-
-		_, err := os.Stat(dir) // 检查目录是否存在
-		if os.IsNotExist(err) {
-			CloneRepo(dir, repoName, url)
-		}
-
-		// 检查请求参数 "service" 是否为 "git-upload-pack"。
-		// 这是为了确保只处理 smart git 的 upload-pack 服务请求。
-		if c.Query("service") != "git-upload-pack" {
-			c.String(http.StatusForbidden, "only smart git")                                                       // 如果 service 参数不正确，返回 403 Forbidden 状态码和错误信息
-			log.Printf("Request to /info/refs with invalid service: %s, repo: %s\n", c.Query("service"), repoName) // 记录无效 service 参数的日志
-			return                                                                                                 // 结束处理
-		}
-
-		c.Header("content-type", "application/x-git-upload-pack-advertisement") // 设置 HTTP 响应头的 Content-Type 为 advertisement 类型。
-		// 这种类型用于告知客户端服务器支持的 Git 服务。
-
-		ep, err := transport.NewEndpoint("/") // 创建一个新的传输端点 (Endpoint)。这里使用根路径 "/" 作为端点，表示本地文件系统。
-		if err != nil {                       // 检查创建端点是否出错
-			log.Printf("Error creating endpoint: %v, repo: %s\n", err, repoName) // 记录创建端点错误日志
-			c.String(http.StatusInternalServerError, err.Error())                // 返回 500 Internal Server Error 状态码和错误信息
-			return                                                               // 结束处理
-		}
-
-		bfs := osfs.New(dir)                           // 创建一个基于本地文件系统的 billy Filesystem (bfs)。dir 变量指定了仓库的根目录。
-		ld := server.NewFilesystemLoader(bfs)          // 创建一个基于文件系统的仓库加载器 (Loader)。Loader 负责从文件系统中加载仓库。
-		svr := server.NewServer(ld)                    // 创建一个新的 Git 服务器 (Server)。Server 负责处理 Git 服务请求。
-		sess, err := svr.NewUploadPackSession(ep, nil) // 创建一个新的 upload-pack 会话 (Session)。Session 用于处理客户端的 upload-pack 请求。
-		if err != nil {                                // 检查创建会话是否出错
-			log.Printf("Error creating upload pack session: %v, repo: %s\n", err, repoName) // 记录创建会话错误日志
-			c.String(http.StatusInternalServerError, err.Error())                           // 返回 500 Internal Server Error 状态码和错误信息
-			return                                                                          // 结束处理
-		}
-
-		ar, err := sess.AdvertisedReferencesContext(c.Request.Context()) // 获取已通告的引用 (Advertised References)。Advertised References 包含了仓库的分支、标签等信息。
-		if err != nil {                                                  // 检查获取 Advertised References 是否出错
-			c.String(http.StatusInternalServerError, err.Error())                            // 返回 500 Internal Server Error 状态码和错误信息
-			log.Printf("Error getting advertised references: %v, repo: %s\n", err, repoName) // 记录获取 Advertised References 错误日志
-			return                                                                           // 结束处理
-		}
-
-		// 设置 Advertised References 的前缀 (Prefix)。
-		// Prefix 通常包含 # service=git-upload-pack 和 pktline.Flush。
-		// # service=git-upload-pack 用于告知客户端服务器提供的是 upload-pack 服务。
-		// pktline.Flush 用于在 pkt-line 格式中发送 flush-pkt。
-		ar.Prefix = [][]byte{
-			[]byte("# service=git-upload-pack"), // 服务类型声明
-			pktline.Flush,                       // pkt-line flush 信号
-		}
-		err = ar.Encode(c.Writer) // 将 Advertised References 编码并写入 HTTP 响应。使用 pkt-line 格式进行编码。
-		if err != nil {           // 检查编码和写入是否出错
-			log.Printf("Error encoding advertised references: %v, repo: %s\n", err, repoName) // 记录编码错误日志
-			c.String(http.StatusInternalServerError, err.Error())                             // 返回 500 Internal Server Error 状态码和错误信息
-			return                                                                            // 结束处理
-		}
-	}
-}
-
-// httpGitUploadPack 函数处理 /git-upload-pack 请求，用于处理 Git 客户端的推送 (push) 操作。
-// 返回一个 gin.HandlerFunc 类型的处理函数。
-func HttpGitUploadPack(cfg *config.Config) gin.HandlerFunc {
-	return func(c *gin.Context) {
-
-		repo := c.Param("repo") // 从 Gin 上下文中获取路由参数 "repo"，即仓库名
-		username := c.Param("username")
-		repoName := repo
-		dir := cfg.GitClone.Dir + "/" + username + "/" + repo
-
-		c.Header("content-type", "application/x-git-upload-pack-result") // 设置 HTTP 响应头的 Content-Type 为 result 类型。
-		// 这种类型用于返回 upload-pack 操作的结果。
-
-		var bodyReader io.Reader = c.Request.Body // 初始化 bodyReader 为 HTTP 请求的 body。用于读取客户端发送的数据。
-		// 检查请求头 "Content-Encoding" 是否为 "gzip"。
-		// 如果是 gzip，则需要使用 gzip 解压缩请求 body。
-		if c.GetHeader("Content-Encoding") == "gzip" {
-			gzipReader, err := gzip.NewReader(c.Request.Body) // 创建一个新的 gzip Reader，用于解压缩请求 body。
-			if err != nil {                                   // 检查创建 gzip Reader 是否出错
-				log.Printf("Error creating gzip reader: %v, repo: %s\n", err, repoName) // 记录创建 gzip Reader 错误日志
-				c.String(http.StatusInternalServerError, err.Error())                   // 返回 500 Internal Server Error 状态码和错误信息
-				return                                                                  // 结束处理
-			}
-			defer gzipReader.Close() // 延迟关闭 gzip Reader，确保资源释放
-			bodyReader = gzipReader  // 将 bodyReader 替换为 gzip Reader，后续从 gzip Reader 中读取数据
-		}
-
-		upr := packp.NewUploadPackRequest() // 创建一个新的 UploadPackRequest 对象。UploadPackRequest 用于解码客户端发送的 upload-pack 请求数据。
-		err := upr.Decode(bodyReader)       // 解码请求 body 中的数据到 UploadPackRequest 对象中。使用 packp 协议格式进行解码。
-		if err != nil {                     // 检查解码是否出错
-			log.Printf("Error decoding upload pack request: %v, repo: %s\n", err, repoName) // 记录解码错误日志
-			c.String(http.StatusInternalServerError, err.Error())                           // 返回 500 Internal Server Error 状态码和错误信息
-			return                                                                          // 结束处理
-		}
-
-		ep, err := transport.NewEndpoint("/") // 创建一个新的传输端点 (Endpoint)。这里使用根路径 "/" 作为端点，表示本地文件系统。
-		if err != nil {                       // 检查创建端点是否出错
-			log.Printf("Error creating endpoint: %v, repo: %s\n", err, repoName) // 记录创建端点错误日志
-			c.String(http.StatusInternalServerError, err.Error())                // 返回 500 Internal Server Error 状态码和错误信息
-			return                                                               // 结束处理
-		}
-
-		bfs := osfs.New(dir)                           // 创建一个基于本地文件系统的 billy Filesystem (bfs)。dir 变量指定了仓库的根目录。
-		ld := server.NewFilesystemLoader(bfs)          // 创建一个基于文件系统的仓库加载器 (Loader)。Loader 负责从文件系统中加载仓库。
-		svr := server.NewServer(ld)                    // 创建一个新的 Git 服务器 (Server)。Server 负责处理 Git 服务请求。
-		sess, err := svr.NewUploadPackSession(ep, nil) // 创建一个新的 upload-pack 会话 (Session)。Session 用于处理客户端的 upload-pack 请求。
-		if err != nil {                                // 检查创建会话是否出错
-			log.Printf("Error creating upload pack session: %v, repo: %s\n", err, repoName) // 记录创建会话错误日志
-			c.String(http.StatusInternalServerError, err.Error())                           // 返回 500 Internal Server Error 状态码和错误信息
-			return                                                                          // 结束处理
-		}
-
-		res, err := sess.UploadPack(c.Request.Context(), upr) // 处理 upload-pack 请求，执行实际的仓库推送操作。
-		// sess.UploadPack 函数接收 context 和 UploadPackRequest 对象作为参数，返回 UploadPackResult 和 error。
-		if err != nil { // 检查 UploadPack 操作是否出错
-			c.String(http.StatusInternalServerError, err.Error())                 // 返回 500 Internal Server Error 状态码和错误信息
-			log.Printf("Error during upload pack: %v, repo: %s\n", err, repoName) // 记录 UploadPack 操作错误日志
-			return                                                                // 结束处理
-		}
-
-		err = res.Encode(c.Writer) // 将 UploadPackResult 编码并写入 HTTP 响应。使用 pkt-line 格式进行编码。
-		if err != nil {            // 检查编码和写入是否出错
-			log.Printf("Error encoding upload pack result: %v, repo: %s\n", err, repoName) // 记录编码错误日志
-			c.String(http.StatusInternalServerError, err.Error())                          // 返回 500 Internal Server Error 状态码和错误信息
-			return                                                                         // 结束处理
-		}
-	}
-}
-
-*/

go.mod

@@ -3,59 +3,44 @@ module ghproxy
 go 1.24.1
 
 require (
-	github.com/BurntSushi/toml v1.4.0
+	github.com/BurntSushi/toml v1.5.0
 	github.com/WJQSERVER-STUDIO/go-utils/copyb v0.0.4
 	github.com/WJQSERVER-STUDIO/go-utils/logger v1.5.0
 	github.com/gin-gonic/gin v1.10.0
-	github.com/go-git/go-git/v5 v5.14.0
-	github.com/pierrec/lz4 v2.6.1+incompatible
 	github.com/satomitouka/touka-httpc v0.3.3
-	golang.org/x/net v0.37.0
+	golang.org/x/net v0.38.0
 	golang.org/x/time v0.11.0
 )
 
 require (
-	dario.cat/mergo v1.0.1 // indirect
-	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/ProtonMail/go-crypto v1.1.6 // indirect
 	github.com/WJQSERVER-STUDIO/go-utils/log v0.0.1 // indirect
-	github.com/bytedance/sonic v1.13.1 // indirect
+	github.com/bytedance/sonic v1.13.2 // indirect
 	github.com/bytedance/sonic/loader v0.2.4 // indirect
-	github.com/cloudflare/circl v1.6.0 // indirect
 	github.com/cloudwego/base64x v0.1.5 // indirect
-	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
-	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/frankban/quicktest v1.14.6 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
 	github.com/gin-contrib/sse v1.0.0 // indirect
-	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
-	github.com/go-git/go-billy/v5 v5.6.2 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.25.0 // indirect
+	github.com/go-playground/validator/v10 v10.26.0 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
-	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
-	github.com/pjbgf/sha1cd v0.3.2 // indirect
+	github.com/rogpeppe/go-internal v1.14.1 // indirect
-	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
-	github.com/skeema/knownhosts v1.3.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	golang.org/x/arch v0.15.0 // indirect
 	golang.org/x/crypto v0.36.0 // indirect
 	golang.org/x/sys v0.31.0 // indirect
 	golang.org/x/text v0.23.0 // indirect
-	google.golang.org/protobuf v1.36.5 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
-	gopkg.in/warnings.v0 v0.1.2 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,87 +1,49 @@
-dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
+github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
-dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
-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/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
-github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
-github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
-github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
 github.com/WJQSERVER-STUDIO/go-utils/copyb v0.0.4 h1:JLtFd00AdFg/TP+dtvIzLkdHwKUGPOAijN1sMtEYoFg=
 github.com/WJQSERVER-STUDIO/go-utils/copyb v0.0.4/go.mod h1:FZ6XE+4TKy4MOfX1xWKe6Rwsg0ucYFCdNh1KLvyKTfc=
 github.com/WJQSERVER-STUDIO/go-utils/log v0.0.1 h1:gJEQspQPB527Vp2FPcdOrynQEj3YYtrg1ixVSB/JvZM=
 github.com/WJQSERVER-STUDIO/go-utils/log v0.0.1/go.mod h1:j9Q+xnwpOfve7/uJnZ2izRQw6NNoXjvJHz7vUQAaLZE=
 github.com/WJQSERVER-STUDIO/go-utils/logger v1.5.0 h1:Uk4N7Sh4OPth3am3xVv17JlAm7tsna97ZLQRpQj7r5c=
 github.com/WJQSERVER-STUDIO/go-utils/logger v1.5.0/go.mod h1:mtxlnDdwsHcqDDpAQLa94nxbPFwNHSAHbBbIXQAA3po=
-github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
+github.com/bytedance/sonic v1.13.2 h1:8/H1FempDZqC4VqjptGo14QQlJx8VdZJegxs6wwfqpQ=
-github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
+github.com/bytedance/sonic v1.13.2/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
-github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
-github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
-github.com/bytedance/sonic v1.13.1 h1:Jyd5CIvdFnkOWuKXr+wm4Nyk2h0yAFsr8ucJgEasO3g=
-github.com/bytedance/sonic v1.13.1/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
 github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY=
 github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
-github.com/cloudflare/circl v1.6.0 h1:cr5JKic4HI+LkINy2lg3W2jF8sHCVTBncJr5gIIq7qk=
-github.com/cloudflare/circl v1.6.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4=
 github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
 github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
-github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o=
-github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
-github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
-github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
-github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
-github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
 github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
 github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E=
 github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0=
 github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
 github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
-github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
-github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
-github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
-github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
-github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UNbRM=
-github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU=
-github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
-github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
-github.com/go-git/go-git/v5 v5.14.0 h1:/MD3lCrGjCen5WfEAzKg00MJJffKhC8gzS80ycmCi60=
-github.com/go-git/go-git/v5 v5.14.0/go.mod h1:Z5Xhoia5PcWA3NF8vRLURn9E5FRhSl7dGj9ItW3Wk5k=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.25.0 h1:5Dh7cjvzR7BRZadnsVOzPhWsrwUr0nmsZJxEAnFLNO8=
+github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k=
-github.com/go-playground/validator/v10 v10.25.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus=
+github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
 github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
 github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
-github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
-github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
-github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
 github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -97,17 +59,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
-github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
 github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
 github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
-github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM=
-github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=
-github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 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/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
@@ -115,18 +69,11 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/satomitouka/touka-httpc v0.3.3 h1:Th0uJ5do3oqqZgdUDtqD1SH11x8TcJmrwHMJQlEIKCg=
 github.com/satomitouka/touka-httpc v0.3.3/go.mod h1:sNXyW5XBufkwB9ZJ+PIlgN/6xiJ7aZV1fWGrXR0u3bA=
-github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
-github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8=
-github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
@@ -140,46 +87,24 @@ github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65E
 github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 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/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
-github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
 golang.org/x/arch v0.15.0 h1:QtOrQd0bTUnhNVNndMpLHNWrDmYzZ2KDqSrEymqInZw=
 golang.org/x/arch v0.15.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
 golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
-golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
+golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
-golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
+golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
-golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
 golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
-golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
 golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
 golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
 golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
-google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
-google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
-gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -1,12 +1,16 @@
 package main
 
 import (
+	"context"
 	"embed"
 	"flag"
 	"fmt"
 	"io"
 	"io/fs"
 	"net/http"
+	"os"
+	"os/signal"
+	"syscall"
 	"time"
 
 	"ghproxy/api"
@@ -23,22 +27,22 @@ import (
 )
 
 var (
-	cfg        *config.Config
+	cfg         *config.Config
-	router     *gin.Engine
+	router      *gin.Engine
-	configfile = "/data/ghproxy/config/config.toml"
+	configfile  = "/data/ghproxy/config/config.toml"
-	cfgfile    string
+	cfgfile     string
-	version    string
+	version     string
-	dev        string
+	dev         string
-	runMode    string
+	runMode     string
-	limiter    *rate.RateLimiter
+	limiter     *rate.RateLimiter
-	iplimiter  *rate.IPRateLimiter
+	iplimiter   *rate.IPRateLimiter
+	showVersion bool
+	showHelp    bool
 )
 
 var (
-	//go:embed pages/bootstrap/*
+	//go:embed pages/*
 	pagesFS embed.FS
-	//go:embed pages/nebula/*
-	NebulaPagesFS embed.FS
 )
 
 var (
@@ -52,6 +56,38 @@ var (
 
 func readFlag() {
 	flag.StringVar(&cfgfile, "cfg", configfile, "config file path")
+	flag.BoolVar(&showVersion, "v", false, "show version and exit")   // 添加-v标志
+	flag.BoolVar(&showHelp, "h", false, "show help message and exit") // 添加-h标志
+
+	// 捕获未定义的 flag
+	flag.Usage = func() {
+		fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
+		flag.PrintDefaults()
+		fmt.Fprintln(os.Stderr, "\nInvalid flags:")
+
+		// 检查未定义的flags
+		invalidFlags := []string{}
+		for _, arg := range os.Args[1:] {
+			if arg[0] == '-' && arg != "-h" && arg != "-v" { // 检查是否是flag, 排除 -h 和 -v
+				defined := false
+				flag.VisitAll(func(f *flag.Flag) {
+					if "-"+f.Name == arg {
+						defined = true
+					}
+				})
+				if !defined {
+					invalidFlags = append(invalidFlags, arg)
+				}
+			}
+		}
+		for _, flag := range invalidFlags {
+			fmt.Fprintf(os.Stderr, "  %s\n", flag)
+		}
+		if len(invalidFlags) > 0 {
+			os.Exit(2) // 使用非零状态码退出，表示有错误
+		}
+
+	}
 }
 
 func loadConfig() {
@@ -59,8 +95,11 @@ func loadConfig() {
 	cfg, err = config.LoadConfig(cfgfile)
 	if err != nil {
 		fmt.Printf("Failed to load config: %v\n", err)
+		// 如果配置文件加载失败，也显示帮助信息并退出
+		flag.Usage()
+		os.Exit(1)
 	}
-	if cfg.Server.Debug {
+	if cfg != nil && cfg.Server.Debug { // 确保 cfg 不为 nil
 		fmt.Println("Config File Path: ", cfgfile)
 		fmt.Printf("Loaded config: %v\n", cfg)
 	}
@@ -107,24 +146,37 @@ func InitReq(cfg *config.Config) {
 }
 
 // loadEmbeddedPages 加载嵌入式页面资源
-func loadEmbeddedPages(cfg *config.Config) (fs.FS, error) {
+func loadEmbeddedPages(cfg *config.Config) (fs.FS, fs.FS, error) {
 	var pages fs.FS
 	var err error
-
 	switch cfg.Pages.Theme {
 	case "bootstrap":
 		pages, err = fs.Sub(pagesFS, "pages/bootstrap")
 	case "nebula":
-		pages, err = fs.Sub(NebulaPagesFS, "pages/nebula")
+		pages, err = fs.Sub(pagesFS, "pages/nebula")
+	case "design":
+		pages, err = fs.Sub(pagesFS, "pages/design")
+	case "metro":
+		pages, err = fs.Sub(pagesFS, "pages/metro")
+	case "classic":
+		pages, err = fs.Sub(pagesFS, "pages/classic")
+	case "mino":
+		pages, err = fs.Sub(pagesFS, "pages/mino")
 	default:
 		pages, err = fs.Sub(pagesFS, "pages/bootstrap") // 默认主题
 		logWarning("Invalid Pages Theme: %s, using default theme 'bootstrap'", cfg.Pages.Theme)
 	}
 
 	if err != nil {
-		return nil, fmt.Errorf("failed to load embedded pages: %w", err)
+		return nil, nil, fmt.Errorf("failed to load embedded pages: %w", err)
 	}
-	return pages, nil
+
+	var assets fs.FS
+	assets, err = fs.Sub(pagesFS, "pages/assets")
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to load embedded assets: %w", err)
+	}
+	return pages, assets, nil
 }
 
 // setupPages 设置页面路由
@@ -132,7 +184,7 @@ func setupPages(cfg *config.Config, router *gin.Engine) {
 	switch cfg.Pages.Mode {
 	case "internal":
 		// 加载嵌入式资源
-		pages, err := loadEmbeddedPages(cfg)
+		pages, assets, err := loadEmbeddedPages(cfg)
 		if err != nil {
 			logError("Failed when processing internal pages: %s", err)
 			return
@@ -143,7 +195,8 @@ func setupPages(cfg *config.Config, router *gin.Engine) {
 		router.GET("/favicon.ico", gin.WrapH(http.FileServer(http.FS(pages))))
 		router.GET("/script.js", gin.WrapH(http.FileServer(http.FS(pages))))
 		router.GET("/style.css", gin.WrapH(http.FileServer(http.FS(pages))))
-		//router.GET("/bootstrap.min.css", gin.WrapH(http.FileServer(http.FS(pages))))
+		router.GET("/bootstrap.min.css", gin.WrapH(http.FileServer(http.FS(assets))))
+		router.GET("/bootstrap.bundle.min.js", gin.WrapH(http.FileServer(http.FS(assets))))
 
 	case "external":
 		// 设置外部资源路径
@@ -151,7 +204,8 @@ func setupPages(cfg *config.Config, router *gin.Engine) {
 		faviconPath := fmt.Sprintf("%s/favicon.ico", cfg.Pages.StaticDir)
 		javascriptsPath := fmt.Sprintf("%s/script.js", cfg.Pages.StaticDir)
 		stylesheetsPath := fmt.Sprintf("%s/style.css", cfg.Pages.StaticDir)
-		//bootstrapPath := fmt.Sprintf("%s/bootstrap.min.css", cfg.Pages.StaticDir)
+		bootstrapPath := fmt.Sprintf("%s/bootstrap.min.css", cfg.Pages.StaticDir)
+		bootstrapBundlePath := fmt.Sprintf("%s/bootstrap.bundle.min.js", cfg.Pages.StaticDir)
 
 		// 设置外部资源路由
 		router.GET("/", func(c *gin.Context) {
@@ -161,6 +215,9 @@ func setupPages(cfg *config.Config, router *gin.Engine) {
 		router.StaticFile("/favicon.ico", faviconPath)
 		router.StaticFile("/script.js", javascriptsPath)
 		router.StaticFile("/style.css", stylesheetsPath)
+		router.StaticFile("/bootstrap.min.css", bootstrapPath)
+		router.StaticFile("/bootstrap.bundle.min.js", bootstrapBundlePath)
+
 		//router.StaticFile("/bootstrap.min.css", bootstrapPath)
 
 	default:
@@ -168,7 +225,7 @@ func setupPages(cfg *config.Config, router *gin.Engine) {
 		logWarning("Invalid Pages Mode: %s, using default embedded theme", cfg.Pages.Mode)
 
 		// 加载嵌入式资源
-		pages, err := loadEmbeddedPages(cfg)
+		pages, assets, err := loadEmbeddedPages(cfg)
 		if err != nil {
 			logError("Failed when processing pages: %s", err)
 			return
@@ -178,12 +235,27 @@ func setupPages(cfg *config.Config, router *gin.Engine) {
 		router.GET("/favicon.ico", gin.WrapH(http.FileServer(http.FS(pages))))
 		router.GET("/script.js", gin.WrapH(http.FileServer(http.FS(pages))))
 		router.GET("/style.css", gin.WrapH(http.FileServer(http.FS(pages))))
+		router.GET("/bootstrap.min.css", gin.WrapH(http.FileServer(http.FS(assets))))
+		router.GET("/bootstrap.bundle.min.js", gin.WrapH(http.FileServer(http.FS(assets))))
 	}
 }
 
 func init() {
 	readFlag()
 	flag.Parse()
+
+	// 如果设置了 -h，则显示帮助信息并退出
+	if showHelp {
+		flag.Usage()
+		os.Exit(0)
+	}
+
+	// 如果设置了 -v，则显示版本号并退出
+	if showVersion {
+		fmt.Printf("GHProxy Version: %s \n", version)
+		os.Exit(0)
+	}
+
 	loadConfig()
 	setupLogger(cfg)
 	InitReq(cfg)
@@ -275,10 +347,40 @@ func init() {
 }
 
 func main() {
-	err := router.Run(fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port))
+	if showVersion || showHelp {
-	if err != nil {
+		return
-		logError("Failed to start server: %v\n", err)
 	}
-	defer logger.Close()
+
+	server := &http.Server{
+		Addr:    fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port),
+		Handler: router,
+	}
+
+	quit := make(chan os.Signal, 1)
+	signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
+
+	/*
+		go func() {
+			err := router.Run(fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port))
+			if err != nil {
+				logError("Failed to start server: %v\n", err)
+			}
+		}()
+	*/
+
+	go func() {
+		if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+			logError("Failed to start server: %v\n", err)
+			os.Exit(1)
+		}
+	}()
+
+	<-quit
+	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	if err := server.Shutdown(ctx); err != nil {
+		logError("Server forced to shutdown: %v\n", err)
+	}
+	defer cancel()
+	logger.Close()
 	fmt.Println("Program Exit")
 }

pages/bootstrap/index.html

@@ -1,104 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Github文件加速</title>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"
-        onerror="this.onerror=null; this.href='https://static.wjqserver.com/bootstrap.min.css';">
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="style.css" rel="stylesheet">
-</head>
-
-<body>
-    <div class="container py-4 py-md-5">
-        <main>
-            <div class="card mb-4">
-                <div class="card-body">
-                    <h1 class="text-center mb-4">Github文件加速</h1>
-                    <p class="lead text-center mb-4">为访问Github文件进行加速</p>
-                    <form id="github-form">
-                        <div class="mb-3">
-                            <input type="text" class="form-control form-control-lg" id="githubLinkInput"
-                                placeholder="请键入需要代理的 Github 链接">
-                        </div>
-                        <button type="submit" class="btn btn-primary btn-lg w-100">获取文件链接</button>
-                    </form>
-                    <div id="output" class="mt-3 bg-light p-3 rounded position-relative" style="display: none;">
-                        <pre id="formattedLinkOutput" class="mb-0"></pre>
-                        <button id="copyButton"
-                            class="btn btn-outline-secondary btn-sm position-absolute top-0 end-0 m-2" title="复制链接">
-                            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
-                                class="bi bi-clipboard" viewBox="0 0 16 16">
-                                <path
-                                    d="M4 1.5H3a2 2 0 0 0-2 2V14a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3.5a2 2 0 0 0-2-2h-1v1h1a1 1 0 0 1 1 1V14a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V3.5a1 1 0 0 1 1-1h1v-1z" />
-                                <path
-                                    d="M9.5 1a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-.5.5h-3a.5.5 0 0 1-.5-.5v-1a.5.5 0 0 1 .5-.5h3zm-3-1A1.5 1.5 0 0 0 5 1.5v1A1.5 1.5 0 0 0 6.5 4h3A1.5 1.5 0 0 0 11 2.5v-1A1.5 1.5 0 0 0 9.5 0h-3z" />
-                            </svg>
-                        </button>
-                        <button id="openButton"
-                            class="btn btn-outline-secondary btn-sm position-absolute top-0 end-0 m-2 me-5"
-                            title="在新标签页中打开">
-                            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
-                                class="bi bi-box-arrow-up-right" viewBox="0 0 16 16">
-                                <path fill-rule="evenodd"
-                                    d="M8.636 3.5a.5.5 0 0 0-.5-.5H1.5A1.5 1.5 0 0 0 0 4.5v10A1.5 1.5 0 0 0 1.5 16h10a1.5 1.5 0 0 0 1.5-1.5V7.864a.5.5 0 0 0-1 0V14.5a.5.5 0 0 1-.5.5h-10a.5.5 0 0 1-.5-.5v-10a.5.5 0 0 1 .5-.5h6.636a.5.5 0 0 0 .5-.5z" />
-                                <path fill-rule="evenodd"
-                                    d="M16 .5a.5.5 0 0 0-.5-.5h-5a.5.5 0 0 0 0 1h3.793L6.146 9.146a.5.5 0 1 0 .708.708L15 1.707V5.5a.5.5 0 0 0 1 0v-5z" />
-                            </svg>
-                        </button>
-                    </div>
-                    <p class="text-muted small mt-3 mb-0">GitHub 链接带不带协议头均可，支持 release、archive 以及文件，转换后链接均可使用。</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-md-4 mb-3">
-                    <div class="card h-100">
-                        <div class="card-body">
-                            <h5 class="card-title">文件大小限制</h5>
-                            <p class="card-text" id="sizeLimitDisplay">...</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-4 mb-3">
-                    <div class="card h-100">
-                        <div class="card-body">
-                            <h5 class="card-title">白名单状态</h5>
-                            <p class="card-text" id="whiteListStatus">...</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-4 mb-3">
-                    <div class="card h-100">
-                        <div class="card-body">
-                            <h5 class="card-title">黑名单状态</h5>
-                            <p class="card-text" id="blackListStatus">...</p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </main>
-        <footer class="text-center mt-4">
-            <p class="text-muted">
-                Copyright &copy; 2024-2025 WJQSERVER-STUDIO<br>
-                <a href="https://github.com/WJQSERVER-STUDIO/ghproxy" class="text-decoration-none">GitHub 仓库</a> |
-                <a href="https://t.me/ghproxy_go" class="text-decoration-none">Telegram 交流群</a>
-            </p>
-        </footer>
-    </div>
-
-    <div class="toast-container position-fixed top-0 end-0 p-3">
-        <div id="toast" class="toast" role="alert" aria-live="assertive" aria-atomic="true">
-            <div class="toast-body"></div>
-        </div>
-    </div>
-
-    <div id="versionBadge" class="version-badge"></div>
-
-    <script src="https://static.wjqserver.com/bootstrap.bundle.min.js"></script>
-    <script src="script.js"></script>
-</body>
-
-</html>

pages/bootstrap/script.js

@@ -1,84 +0,0 @@
-const githubForm = document.getElementById('github-form');
-const githubLinkInput = document.getElementById('githubLinkInput');
-const formattedLinkOutput = document.getElementById('formattedLinkOutput');
-const output = document.getElementById('output');
-const copyButton = document.getElementById('copyButton');
-const openButton = document.getElementById('openButton');
-const toast = new bootstrap.Toast(document.getElementById('toast'));
-
-function showToast(message) {
-    const toastBody = document.querySelector('.toast-body');
-    toastBody.textContent = message;
-    toast.show();
-}
-
-function formatGithubLink(githubLink) {
-    const currentHost = window.location.host;
-    let formattedLink = "";
-
-    if (githubLink.startsWith("https://github.com/") || githubLink.startsWith("http://github.com/")) {
-        formattedLink = window.location.protocol + "//" + currentHost + "/github.com" + githubLink.substring(githubLink.indexOf("/", 8));
-    } else if (githubLink.startsWith("github.com/")) {
-        formattedLink = window.location.protocol + "//" + currentHost + "/" + githubLink;
-    } else if (githubLink.startsWith("https://raw.githubusercontent.com/") || githubLink.startsWith("http://raw.githubusercontent.com/")) {
-        formattedLink = window.location.protocol + "//" + currentHost + githubLink.substring(githubLink.indexOf("/", 7));
-    } else if (githubLink.startsWith("raw.githubusercontent.com/")) {
-        formattedLink = window.location.protocol + "//" + currentHost + "/" + githubLink;
-    } else if (githubLink.startsWith("https://gist.githubusercontent.com/") || githubLink.startsWith("http://gist.githubusercontent.com/")) {
-        formattedLink = window.location.protocol + "//" + currentHost + "/gist.github.com" + githubLink.substring(githubLink.indexOf("/", 18));
-    } else if (githubLink.startsWith("gist.githubusercontent.com/")) {
-        formattedLink = window.location.protocol + "//" + currentHost + "/" + githubLink;
-    } else {
-        showToast('请输入有效的GitHub链接');
-        return null;
-    }
-
-    return formattedLink;
-}
-
-githubForm.addEventListener('submit', function (e) {
-    e.preventDefault();
-    const formattedLink = formatGithubLink(githubLinkInput.value);
-    if (formattedLink) {
-        formattedLinkOutput.textContent = formattedLink;
-        output.style.display = 'block';
-    }
-});
-
-copyButton.addEventListener('click', function () {
-    navigator.clipboard.writeText(formattedLinkOutput.textContent).then(() => {
-        showToast('链接已复制到剪贴板');
-    });
-});
-
-openButton.addEventListener('click', function () {
-    window.open(formattedLinkOutput.textContent, '_blank');
-});
-
-function fetchAPI() {
-    fetch('/api/size_limit')
-        .then(response => response.json())
-        .then(data => {
-            document.getElementById('sizeLimitDisplay').textContent = `${data.MaxResponseBodySize} MB`;
-        });
-
-    fetch('/api/whitelist/status')
-        .then(response => response.json())
-        .then(data => {
-            document.getElementById('whiteListStatus').textContent = data.Whitelist ? '已开启' : '已关闭';
-        });
-
-    fetch('/api/blacklist/status')
-        .then(response => response.json())
-        .then(data => {
-            document.getElementById('blackListStatus').textContent = data.Blacklist ? '已开启' : '已关闭';
-        });
-
-    fetch('/api/version')
-        .then(response => response.json())
-        .then(data => {
-            document.getElementById('versionBadge').textContent = data.Version;
-        });
-}
-
-document.addEventListener('DOMContentLoaded', fetchAPI);

pages/bootstrap/style.css

@@ -1,259 +0,0 @@
-        /* 通用样式 */
-        :root {
-            --primary-color: #007aff;
-            /* 主要按钮颜色 */
-            --secondary-color: #34c759;
-            /* 次要按钮颜色 */
-            --background-color: #f9f9f9;
-            /* 亮色模式背景 */
-            --card-background: #ffffff;
-            /* 卡片背景 */
-            --text-color: #333333;
-            /* 亮色模式文本颜色 */
-            --border-color: #e0e0e0;
-            /* 边框颜色 */
-            --input-background: #ffffff;
-            /* 输入框背景 */
-            --input-border: #d1d1d6;
-            /* 输入框边框 */
-            --pre-background: #f1f3f4;
-            /* 代码块背景 */
-            --pre-text-color: #333333;
-            /* 代码块文本颜色 */
-            --version-badge-hover: #39c5bb;
-            /* 说明文字颜色 */
-            --muted-text-color: #6c757d;
-        }
-
-        body {
-            background-color: var(--background-color);
-            color: var(--text-color);
-            font-family: sans-serif;
-            line-height: 1.8;
-            font-size: 15px;
-            margin: 0;
-            padding: 0;
-        }
-
-        h1,
-        h2,
-        h3,
-        h4,
-        h5,
-        h6 {
-            color: var(--text-color);
-            font-weight: 800;
-            letter-spacing: 0.5px;
-            margin: 1rem 0;
-        }
-
-        p,
-        span,
-        a,
-        li {
-            color: var(--text-color);
-            margin-bottom: 1rem;
-        }
-
-        a {
-            text-decoration: none;
-            color: var(--primary-color);
-        }
-
-        a:hover {
-            color: #0056b3;
-        }
-
-        .card {
-            background-color: var(--card-background);
-            border: 1px solid var(--border-color);
-            border-radius: 8px;
-            padding: 16px;
-            margin: 16px 0;
-            box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-            transition: transform 0.2s, box-shadow 0.2s;
-        }
-
-        .card:hover {
-            box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
-            transform: translateY(-4px);
-        }
-
-        .btn-outline-secondary {
-            border-radius: 50%;
-            padding: 6px;
-            transition: #e9e9e9 0.3s ease-in-out, color 0.3s ease-in-out;
-        }
-
-        .btn-outline-secondary:hover {
-            background-color: var(--primary-color);
-            color: white;
-        }
-
-        .form-control {
-            background-color: var(--input-background);
-            border: 1px solid var(--input-border);
-            color: var(--text-color);
-            padding: 10px;
-            border-radius: 4px;
-            font-size: 14px;
-            outline: none;
-            transition: border-color 0.2s, box-shadow 0.2s;
-        }
-
-        .form-control:focus {
-            border-color: var(--primary-color);
-            box-shadow: 0 0 0 3px rgba(10, 132, 255, 0.3);
-        }
-
-        .text-muted {
-            color: var(--muted-text-color) !important;
-        }
-
-        .bg-light {
-            background-color: var(--card-background) !important;
-        }
-
-        pre {
-            background-color: var(--pre-background);
-            color: var(--pre-text-color);
-            padding: 16px;
-            border-radius: 8px;
-            overflow-x: auto;
-            font-size: 14px;
-            line-height: 1.6;
-        }
-
-        .version-badge {
-            position: fixed;
-            bottom: 20px;
-            right: 20px;
-            background-color: var(--secondary-color);
-            color: white;
-            padding: 6px 12px;
-            border-radius: 20px;
-            font-size: 0.8rem;
-            box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
-            transition: background-color 0.3s ease-in-out;
-        }
-
-        .version-badge:hover {
-            background-color: var(--version-badge-hover);
-        }
-
-        footer {
-            padding: 16px;
-            text-align: center;
-            color: var(--text-color);
-            font-size: 0.9rem;
-            background-color: var(--card-background);
-        }
-
-        footer a {
-            color: var(--primary-color);
-        }
-
-        footer a:hover {
-            color: #0056b3;
-        }
-
-        /* 暗色模式 */
-        @media (prefers-color-scheme: dark) {
-            :root {
-                --background-color: #121212;
-                /* 深灰色背景 */
-                --card-background: #1e1e1e;
-                /* 卡片背景稍浅 */
-                --text-color: #ffffff;
-                /* 纯白文本 */
-                --primary-color: #0a84ff;
-                /* 按钮蓝色 */
-                --secondary-color: #30d158;
-                /* 次要按钮绿色 */
-                --border-color: #3a3a3a;
-                /* 边框颜色 */
-                --input-background: #2c2c2c;
-                /* 输入框背景 */
-                --input-border: #4a4a4a;
-                /* 输入框边框 */
-                --pre-background: #3b3636;
-                /* 代码块背景 */
-                --pre-text-color: #ffffff;
-                /* 代码块文本颜色 */
-                --version-badge-hover: #39c5bc9a;
-                /* 说明文字颜色 */
-                --muted-text-color: #a0a0a0;
-            }
-
-            body {
-                background-color: var(--background-color);
-                color: var(--text-color);
-            }
-
-            h1,
-            h2,
-            h3,
-            h4,
-            h5,
-            h6,
-            p,
-            span,
-            a,
-            li {
-                color: var(--text-color);
-            }
-
-            .card {
-                background-color: var(--card-background);
-                color: var(--text-color);
-                border: 1px solid var(--border-color);
-            }
-
-            .btn-outline-secondary {
-                border-radius: 50%;
-                padding: 6px;
-                transition: background-color 0.3s ease-in-out, color 0.3s ease-in-out;
-            }
-
-            .btn-outline-secondary:hover {
-                background-color: var(--primary-color);
-                color: white;
-            }
-
-            .toast {
-                background-color: var(--card-background);
-                color: var(--text-color);
-                border: 1px solid var(--border-color);
-                border-radius: 8px;
-                box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-            }
-
-            .toast-body {
-                padding: 12px;
-            }
-
-
-            .form-control {
-                background-color: var(--input-background);
-                border: 1px solid var(--input-border);
-                color: var(--text-color);
-            }
-
-            .bg-light {
-                background-color: var(--card-background) !important;
-            }
-
-            pre {
-                background-color: var(--pre-background);
-                color: var(--pre-text-color);
-            }
-
-            footer {
-                background-color: var(--card-background);
-                color: var(--text-color);
-            }
-
-            footer a {
-                color: var(--primary-color);
-            }
-        }

pages/nebula/index.html

@@ -1,169 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" data-bs-theme="auto">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>GitHub加速服务</title>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"
-        onerror="this.onerror=null; this.href='https://static.wjqserver.com/bootstrap.min.css';">
-    <link href="style.css" rel="stylesheet">
-</head>
-
-<body>
-    <div class="container py-4 py-lg-5">
-        <header class="text-center mb-5">
-            <h1 class="display-5 fw-bold mb-3">GitHub加速服务</h1>
-            <p class="lead text-muted">高速稳定的 GitHub 资源访问解决方案</p>
-        </header>
-        <div class="main-card p-4 mb-4">
-            <form id="mainForm" class="mb-4">
-                <div class="mb-3">
-                    <label for="inputUrl" class="form-label fw-semibold">GitHub 链接</label>
-                    <input type="url" class="form-control form-control-lg" id="inputUrl" placeholder="输入 GitHub 文件/仓库链接"
-                        required>
-                </div>
-                <button type="submit" class="btn btn-primary btn-lg w-100 py-2">
-                    🚀 生成加速链接
-                </button>
-            </form>
-
-            <!-- 结果输出 -->
-            <div id="output" class="mt-4" hidden>
-                <div class="code-block">
-                    <code id="outputLink" class="d-block text-break"></code>
-                </div>
-                <div class="d-flex gap-2 mt-3">
-                    <button id="copyBtn" class="btn btn-outline-secondary">
-                        ⎘ 复制链接
-                    </button>
-                    <button id="openBtn" class="btn btn-primary">
-                        ↗ 立即打开
-                    </button>
-                </div>
-            </div>
-        </div>
-        <div class="row g-3 mb-4">
-            <div class="col-md-4">
-                <div class="main-card p-3">
-                    <div class="d-flex justify-content-between align-items-center">
-                        <div>
-                            <h6 class="mb-0">文件大小限制</h6>
-                            <small class="text-muted">最大支持文件尺寸</small>
-                        </div>
-                        <span id="sizeLimit" class="status-badge bg-primary">...</span>
-                    </div>
-                </div>
-            </div>
-            <div class="col-md-4">
-                <div class="main-card p-3">
-                    <div class="d-flex justify-content-between align-items-center">
-                        <div>
-                            <h6 class="mb-0">白名单状态</h6>
-                            <small class="text-muted">访问控制列表</small>
-                        </div>
-                        <span id="whitelistStatus" class="status-badge bg-success">...</span>
-                    </div>
-                </div>
-            </div>
-            <div class="col-md-4">
-                <div class="main-card p-3">
-                    <div class="d-flex justify-content-between align-items-center">
-                        <div>
-                            <h6 class="mb-0">黑名单状态</h6>
-                            <small class="text-muted">屏蔽列表状态</small>
-                        </div>
-                        <span id="blacklistStatus" class="status-badge bg-danger">...</span>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="main-card p-4">
-            <h2 class="h4 fw-bold mb-4">📚 详细使用指南</h2>
-
-            <div class="guide-section">
-                <h3 class="h5 fw-semibold mb-3">支持的工具</h3>
-                <ul class="list-unstyled">
-                    <li class="mb-2">✅ 支持域名：github.com</li>
-                    <li class="mb-2">✅ 支持域名：raw.githubusercontent.com</li>
-                    <li class="mb-2">✅ 支持域名：gist.githubusercontent.com</li>
-                    <li class="mb-2">✅ 支持HTTPS Git Clone</li>
-                    <li class="text-muted">❌ 不支持 SSH Git Clone</li>
-                </ul>
-            </div>
-            <div class="guide-section">
-                <h3 class="h5 fw-semibold mb-3">基础用法示例</h3>
-                <div class="command-example">
-                    <h4 class="h6 fw-medium mb-2">Git 克隆</h4>
-                    <code
-                        class="d-block mb-3">git clone <span class="protocol">https</span>://<span class="host">example.com</span>/https://github.com/user/project.git</code>
-                    <h4 class="h6 fw-medium mb-2">私有仓库克隆</h4>
-                    <code
-                        class="d-block">git clone <span class="protocol">https</span>://user:your_token@<span class="host">example.com</span>/https://github.com/user/project.git</code>
-                </div>
-                <div class="command-example">
-                    <h4 class="h6 fw-medium mb-2">文件下载</h4>
-                    <code
-                        class="d-block mb-3">wget <span class="protocol">https</span>://<span class="host">example.com</span>/https://raw.githubusercontent.com/user/project/main/README.md</code>
-                    <h4 class="h6 fw-medium mb-2">版本发布</h4>
-                    <code
-                        class="d-block">curl -LO <span class="protocol">https</span>://<span class="host">example.com</span>/https://github.com/user/project/releases/download/v1.0.0/project_1.0.0.amd64.tar.gz</code>
-                </div>
-            </div>
-            <div class="guide-section">
-                <h3 class="h5 fw-semibold mb-3">支持的文件类型</h3>
-                <div class="row g-3">
-                    <div class="col-md-6">
-                        <div class="main-card p-3">
-                            <h4 class="h6 fw-medium mb-2">原始文件</h4>
-                            <code
-                                class="d-block text-muted fs-sm">https://raw.githubusercontent.com/user/repo/main/file.txt</code>
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <div class="main-card p-3">
-                            <h4 class="h6 fw-medium mb-2">分支源码</h4>
-                            <code class="d-block text-muted fs-sm">https://github.com/user/repo/archive/main.zip</code>
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <div class="main-card p-3">
-                            <h4 class="h6 fw-medium mb-2">版本发布</h4>
-                            <code
-                                class="d-block text-muted fs-sm">https://github.com/user/repo/releases/download/v1.0.0/app.zip</code>
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <div class="main-card p-3">
-                            <h4 class="h6 fw-medium mb-2">Gist 文件</h4>
-                            <code
-                                class="d-block text-muted fs-sm">https://gist.githubusercontent.com/user/gist_id/raw/file.txt</code>
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <div class="main-card p-3">
-                            <h4 class="h6 fw-medium mb-2">HTTPS Git Clone</h4>
-                            <code class="d-block text-muted fs-sm">git clone https://github.com/user/repo.git</code>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <footer class="text-center mt-5 text-muted">
-            <p class="mb-0 small" id="version">v </p>
-            <p class="mb-0 small">Copyright © 2024 - <span id="currentYear"></span> WJQSERVER-STUDIO<br>
-                <a href="https://github.com/WJQSERVER-STUDIO/ghproxy" class="text-decoration-none">GitHub 仓库</a> |
-                <a href="https://t.me/ghproxy_go" class="text-decoration-none">Telegram 交流群</a>
-            </p>
-        </footer>
-    </div>
-    <div class="toast-container position-fixed bottom-0 end-0 p-3">
-        <div id="liveToast" class="toast" role="alert" aria-live="assertive" aria-atomic="true">
-            <div class="toast-body"></div>
-        </div>
-    </div>
-    <script src="https://static.wjqserver.com/bootstrap.bundle.min.js"></script>
-    
-</body>
-
-</html>

pages/nebula/script.js

@@ -1,131 +0,0 @@
-(() => {
-    'use strict';
-
-    // 初始化基础配置
-    const currentYear = new Date().getFullYear();
-    document.getElementById('currentYear').textContent = currentYear;
-    const toast = new bootstrap.Toast('#liveToast');
-
-    // DOM 元素
-    const form = document.getElementById('mainForm');
-    const input = document.getElementById('inputUrl');
-    const output = document.getElementById('output');
-    const outputLink = document.getElementById('outputLink');
-
-    // 获取当前域名
-    const CURRENT_PROTOCOL = window.location.protocol.replace(':', '');
-    const CURRENT_HOST = window.location.host;
-    // 替换协议部分
-    document.querySelectorAll('code .protocol').forEach(span => {
-        span.textContent = CURRENT_PROTOCOL;
-    });
-    // 替换域名部分
-    document.querySelectorAll('code .host').forEach(span => {
-        span.textContent = CURRENT_HOST;
-    });
-
-    // URL 转换规则
-    const URL_RULES = [
-        {
-            regex: /^(?:https?:\/\/)?(?:www\.)?(github\.com\/.*)/i,
-            build: path => `${location.protocol}//${location.host}/${path}`
-        },
-        {
-            regex: /^(?:https?:\/\/)?(raw\.githubusercontent\.com\/.*)/i,
-            build: path => `${location.protocol}//${location.host}/${path}`
-        },
-        {
-            regex: /^(?:https?:\/\/)?(gist\.(?:githubusercontent|github)\.com\/.*)/i,
-            build: path => `${location.protocol}//${location.host}/${path}`
-        }
-    ];
-
-    // 核心功能：链接转换
-    function transformGitHubURL(url) {
-        const cleanURL = url.trim().replace(/^https?:\/\//i, '');
-        for (const rule of URL_RULES) {
-            const match = cleanURL.match(rule.regex);
-            if (match) return rule.build(match[1]);
-        }
-        return null;
-    }
-
-    // 事件处理
-    form.addEventListener('submit', e => {
-        e.preventDefault();
-
-        if (!input.checkValidity()) {
-            input.classList.add('is-invalid');
-            showToast('⚠️ 请输入有效的 GitHub 链接');
-            return;
-        }
-
-        const result = transformGitHubURL(input.value);
-        if (!result) {
-            showToast('❌ 不支持的链接格式');
-            return;
-        }
-
-        outputLink.textContent = result;
-        output.hidden = false;
-        window.scrollTo({ top: output.offsetTop - 100, behavior: 'smooth' });
-    });
-
-    document.getElementById('copyBtn').addEventListener('click', async () => {
-        try {
-            await navigator.clipboard.writeText(outputLink.textContent);
-            showToast('✅ 链接已复制');
-        } catch {
-            showToast('❌ 复制失败');
-        }
-    });
-
-    document.getElementById('openBtn').addEventListener('click', () => {
-        window.open(outputLink.textContent, '_blank', 'noopener,noreferrer');
-    });
-
-    // 服务状态监控
-    async function loadServiceStatus() {
-        try {
-            const [size, whitelist, blacklist, version] = await Promise.all([
-                fetchJSON('/api/size_limit'),
-                fetchJSON('/api/whitelist/status'),
-                fetchJSON('/api/blacklist/status'),
-                fetchJSON('/api/version')
-            ]);
-
-            updateStatus('sizeLimit', `${size.MaxResponseBodySize}MB`);
-            updateStatus('whitelistStatus', whitelist.Whitelist ? '已开启' : '已关闭');
-            updateStatus('blacklistStatus', blacklist.Blacklist ? '已开启' : '已关闭');
-            updateStatus('version', `Version ${version.Version}`);
-        } catch {
-            showToast('⚠️ 服务状态获取失败');
-        }
-    }
-
-    async function fetchJSON(url) {
-        const response = await fetch(url);
-        if (!response.ok) throw new Error('API Error');
-        return response.json();
-    }
-
-    function updateStatus(elementId, text) {
-        const element = document.getElementById(elementId);
-        if (element) element.textContent = text;
-    }
-
-    // 工具函数
-    function showToast(message) {
-        const toastBody = document.querySelector('.toast-body');
-        toastBody.textContent = message;
-        toast.show();
-    }
-
-    // 初始化
-    input.addEventListener('input', () => {
-        input.classList.remove('is-invalid');
-        if (output.hidden === false) output.hidden = true;
-    });
-
-    loadServiceStatus();
-})();

pages/nebula/style.css

@@ -1,157 +0,0 @@
-:root {
-    --primary: #007aff;
-    --secondary: #007aff;
-    --background: #f9f9f9;
-    --card-bg: #ffffff;
-    --text: #333333;
-    --border: #d1d1d6;
-    --muted: #64748b;
-    --success: #00a83ed2;
-    --danger: #ce0000dd;
-}
-
-@media (prefers-color-scheme: dark) {
-    :root {
-        --background: #121212;
-        --card-bg: #1e1e1e;
-        --text: #ffffff;
-        --border: #334155;
-        --muted: #94a3b8;
-    }
-
-    .form-control::placeholder {
-        color: var(--muted);
-    }
-
-    .text-muted {
-        color: var(--muted) !important;
-    }
-
-    .btn-outline-secondary {
-        color: var(--muted);
-        border-color: var(--border);
-    }
-
-    .status-badge {
-        color: var(--text) !important;
-    }
-
-    .code-block {
-        background: rgba(255, 255, 255, 0.05);
-    }
-
-    .command-example {
-        background: rgba(255, 255, 255, 0.03);
-    }
-
-    .btn-primary {
-        --bs-btn-bg: var(--primary);
-        --bs-btn-border-color: var(--primary);
-        --bs-btn-hover-bg: var(--secondary);
-        --bs-btn-hover-border-color: var(--secondary);
-    }
-
-    .form-control {
-        background-color: rgba(255, 255, 255, 0.05);
-        border-color: var(--border);
-        color: var(--text);
-    }
-
-    a {
-        color: var(--secondary);
-    }
-}
-
-body {
-    background: var(--background);
-    color: var(--text);
-    font-family: 'Inter', system-ui, sans-serif;
-    line-height: 1.6;
-}
-
-.main-card {
-    background: var(--card-bg);
-    border: 1px solid var(--border);
-    border-radius: 12px;
-    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
-    transition: transform 0.2s, box-shadow 0.2s;
-}
-
-.main-card:hover {
-    transform: translateY(-2px);
-    box-shadow: 0 10px 15px rgba(0, 0, 0, 0.1);
-}
-
-.code-block {
-    background: rgba(37, 99, 235, 0.05);
-    border-left: 3px solid var(--primary);
-    border-radius: 6px;
-    padding: 1rem;
-    position: relative;
-    overflow-x: auto;
-}
-
-.status-badge {
-    padding: 6px 12px;
-    border-radius: 20px;
-    font-size: 0.9rem;
-    font-weight: 500;
-}
-
-.guide-section {
-    border-left: 3px solid var(--primary);
-    padding-left: 1rem;
-    margin: 2rem 0;
-}
-
-.command-example {
-    position: relative;
-    padding: 1.25rem;
-    background: rgba(37, 99, 235, 0.03);
-    border-radius: 8px;
-    margin: 1rem 0;
-}
-
-.command-example::before {
-    content: "➜";
-    position: absolute;
-    left: -1.5rem;
-    color: var(--muted);
-}
-
-.toast {
-    position: fixed;
-    top: 1%;
-    right: 1%;
-    background-color: var(--card-background);
-    color: var(--text-color);
-    border: 1px solid var(--border-color);
-    border-radius: 8px;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-}
-
-.toast-body {
-    padding: 12px;
-}
-
-#version {
-    text-align: center;
-    font-size: 13px;
-    line-height: 26px;
-    color: #747474;
-}
-
-.bg-primary {
-    --bs-bg-opacity: 1;
-    background-color: #2c82de !important;
-}
-
-.bg-success {
-    --bs-bg-opacity: 1;
-    background-color: #2c82de !important;
-}
-
-.bg-danger {
-    --bs-bg-opacity: 1;
-    background-color: #2c82de !important;
-}

proxy/chunkreq.go

@@ -108,17 +108,6 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, matcher s
 		resp.Header.Del(header)
 	}
 
-	//c.Header("Accept-Encoding", "gzip")
-	//c.Header("Content-Encoding", "gzip")
-
-	/*
-		if cfg.CORS.Enabled {
-			c.Header("Access-Control-Allow-Origin", "*")
-		} else {
-			c.Header("Access-Control-Allow-Origin", "")
-		}
-	*/
-
 	switch cfg.Server.Cors {
 	case "*":
 		c.Header("Access-Control-Allow-Origin", "*")
@@ -150,7 +139,7 @@ func ChunkedProxyRequest(c *gin.Context, u string, cfg *config.Config, matcher s
 		}
 	} else {
 		//_, err = io.CopyBuffer(c.Writer, resp.Body, nil)
-		_, err = copyb.CopyBuffer(c.Writer, resp.Body, nil)
+		_, err = copyb.Copy(c.Writer, resp.Body)
 		if err != nil {
 			logError("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err)
 			return

proxy/gitreq.go

@@ -6,9 +6,7 @@ import (
 	"ghproxy/config"
 	"io"
 	"net/http"
-	"net/url"
 	"strconv"
-	"strings"
 
 	"github.com/WJQSERVER-STUDIO/go-utils/copyb"
 	"github.com/gin-gonic/gin"
@@ -51,6 +49,8 @@ func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode s
 			return
 		}
 		setRequestHeaders(c, req)
+		removeWSHeader(req)
+		reWriteEncodeHeader(req)
 		AuthPassThrough(c, cfg, req)
 
 		resp, err = gitclient.Do(req)
@@ -65,6 +65,8 @@ func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode s
 			return
 		}
 		setRequestHeaders(c, req)
+		removeWSHeader(req)
+		reWriteEncodeHeader(req)
 		AuthPassThrough(c, cfg, req)
 
 		resp, err = client.Do(req)
@@ -120,21 +122,7 @@ func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode s
 	}
 
 	c.Status(resp.StatusCode)
-	/*
+	_, err = copyb.Copy(c.Writer, resp.Body)
-		// 使用固定32KB缓冲池
-		buffer := BufferPool.Get().([]byte)
-		defer BufferPool.Put(buffer)
-
-		_, err = io.CopyBuffer(c.Writer, resp.Body, buffer)
-		if err != nil {
-			logError("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err)
-			return
-		} else {
-			c.Writer.Flush() // 确保刷入
-		}
-	*/
-
-	_, err = copyb.CopyBuffer(c.Writer, resp.Body, nil)
 
 	if err != nil {
 		logError("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err)
@@ -145,35 +133,3 @@ func GitReq(c *gin.Context, u string, cfg *config.Config, mode string, runMode s
 	}
 
 }
-
-// extractParts 从给定的 URL 中提取所需的部分
-func extractParts(rawURL string) (string, string, string, url.Values, error) {
-	// 解析 URL
-	parsedURL, err := url.Parse(rawURL)
-	if err != nil {
-		return "", "", "", nil, err
-	}
-
-	// 获取路径部分并分割
-	pathParts := strings.Split(parsedURL.Path, "/")
-
-	// 提取所需的部分
-	if len(pathParts) < 3 {
-		return "", "", "", nil, fmt.Errorf("URL path is too short")
-	}
-
-	// 提取 /WJQSERVER-STUDIO 和 /go-utils.git
-	repoOwner := "/" + pathParts[1]
-	repoName := "/" + pathParts[2]
-
-	// 剩余部分
-	remainingPath := strings.Join(pathParts[3:], "/")
-	if remainingPath != "" {
-		remainingPath = "/" + remainingPath
-	}
-
-	// 查询参数
-	queryParams := parsedURL.Query()
-
-	return repoOwner, repoName, remainingPath, queryParams, nil
-}

proxy/handler.go

@@ -14,16 +14,6 @@ import (
 )
 
 var re = regexp.MustCompile(`^(http:|https:)?/?/?(.*)`) // 匹配http://或https://开头的路径
-/*
-var exps = []*regexp.Regexp{
-	regexp.MustCompile(`^(?:https?://)?github\.com/([^/]+)/([^/]+)/(?:releases|archive)/.*`),     // 匹配 GitHub Releases 或 Archive 链接
-	regexp.MustCompile(`^(?:https?://)?github\.com/([^/]+)/([^/]+)/(?:blob|raw)/.*`),             // 匹配 GitHub Blob 或 Raw 链接
-	regexp.MustCompile(`^(?:https?://)?github\.com/([^/]+)/([^/]+)/(?:info|git-).*`),             // 匹配 GitHub Info 或 Git 相关链接 (例如 .gitattributes, .gitignore)
-	regexp.MustCompile(`^(?:https?://)?raw\.github(?:usercontent|)\.com/([^/]+)/([^/]+)/.+?/.+`), // 匹配 raw.githubusercontent.com 链接
-	regexp.MustCompile(`^(?:https?://)?gist\.github(?:usercontent|)\.com/([^/]+)/.+?/.+`),        // 匹配 gist.githubusercontent.com 链接
-	regexp.MustCompile(`^(?:https?://)?api\.github\.com/repos/([^/]+)/([^/]+)/.*`),               // 匹配 api.github.com/repos 链接 (GitHub API)
-}
-*/
 
 func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *rate.IPRateLimiter, runMode string) gin.HandlerFunc {
 	return func(c *gin.Context) {
@@ -110,15 +100,6 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra
 			}
 		}
 
-		/*
-			matches = CheckURL(rawPath, c)
-			if matches == nil {
-				c.AbortWithStatus(http.StatusNotFound)
-				logWarning("%s %s %s %s %s 404-NOMATCH", c.ClientIP(), c.Request.Method, rawPath, c.Request.Header.Get("User-Agent"), c.Request.Proto)
-				return
-			}
-		*/
-
 		// 若匹配api.github.com/repos/用户名/仓库名/路径, 则检查是否开启HeaderAuth
 
 		// 处理blob/raw路径
@@ -151,16 +132,3 @@ func NoRouteHandler(cfg *config.Config, limiter *rate.RateLimiter, iplimiter *ra
 		}
 	}
 }
-
-/*
-func CheckURL(u string, c *gin.Context) []string {
-	for _, exp := range exps {
-		if matches := exp.FindStringSubmatch(u); matches != nil {
-			return matches[1:]
-		}
-	}
-	errMsg := fmt.Sprintf("%s %s %s %s %s Invalid URL", c.ClientIP(), c.Request.Method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto)
-	logError(errMsg)
-	return nil
-}
-*/

proxy/match.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"ghproxy/config"
 	"io"
+	"net/url"
 	"regexp"
 	"strings"
 )
@@ -45,6 +46,19 @@ func Matcher(rawPath string, cfg *config.Config) (string, string, string, error)
 		repo    string
 		matcher string
 	)
+	// 匹配 "https://raw"开头的链接
+	if strings.HasPrefix(rawPath, "https://raw") {
+		remainingPath := strings.TrimPrefix(rawPath, "https://")
+		parts := strings.Split(remainingPath, "/")
+		if len(parts) <= 3 {
+			return "", "", "", ErrInvalidURL
+		}
+		user = parts[1]
+		repo = parts[2]
+		matcher = "raw"
+
+		return user, repo, matcher, nil
+	}
 	// 匹配 "https://github.com"开头的链接
 	if strings.HasPrefix(rawPath, "https://github.com") {
 		remainingPath := strings.TrimPrefix(rawPath, "https://github.com")
@@ -74,19 +88,6 @@ func Matcher(rawPath string, cfg *config.Config) (string, string, string, error)
 		}
 		return user, repo, matcher, nil
 	}
-	// 匹配 "https://raw"开头的链接
-	if strings.HasPrefix(rawPath, "https://raw") {
-		remainingPath := strings.TrimPrefix(rawPath, "https://")
-		parts := strings.Split(remainingPath, "/")
-		if len(parts) <= 3 {
-			return "", "", "", ErrInvalidURL
-		}
-		user = parts[1]
-		repo = parts[2]
-		matcher = "raw"
-
-		return user, repo, matcher, nil
-	}
 	// 匹配 "https://gist"开头的链接
 	if strings.HasPrefix(rawPath, "https://gist") {
 		remainingPath := strings.TrimPrefix(rawPath, "https://")
@@ -128,10 +129,12 @@ func EditorMatcher(rawPath string, cfg *config.Config) (bool, string, error) {
 	)
 	// 匹配 "https://github.com"开头的链接
 	if strings.HasPrefix(rawPath, "https://github.com") {
-		remainingPath := strings.TrimPrefix(rawPath, "https://github.com")
+		/*
-		if strings.HasPrefix(remainingPath, "/") {
+			remainingPath := strings.TrimPrefix(rawPath, "https://github.com")
-			remainingPath = strings.TrimPrefix(remainingPath, "/")
+			if strings.HasPrefix(remainingPath, "/") {
-		}
+				remainingPath = strings.TrimPrefix(remainingPath, "/")
+			}
+		*/
 		return true, "", nil
 	}
 	// 匹配 "https://raw.githubusercontent.com"开头的链接
@@ -151,19 +154,24 @@ func EditorMatcher(rawPath string, cfg *config.Config) (bool, string, error) {
 		return true, matcher, nil
 	}
 	// 匹配 "https://api.github.com/"开头的链接
-	if strings.HasPrefix(rawPath, "https://api.github.com") {
+	if cfg.Shell.RewriteAPI {
-		matcher = "api"
+		if strings.HasPrefix(rawPath, "https://api.github.com") {
-		return true, matcher, nil
+			matcher = "api"
+			return true, matcher, nil
+		}
 	}
 	return false, "", ErrInvalidURL
 }
 
 // 匹配文件扩展名是sh的rawPath
 func MatcherShell(rawPath string) bool {
-	if strings.HasSuffix(rawPath, ".sh") {
+	/*
-		return true
+		if strings.HasSuffix(rawPath, ".sh") {
-	}
+			return true
-	return false
+		}
+		return false
+	*/
+	return strings.HasSuffix(rawPath, ".sh")
 }
 
 // LinkProcessor 是一个函数类型，用于处理提取到的链接。
@@ -178,9 +186,9 @@ func modifyURL(url string, host string, cfg *config.Config) string {
 		return url
 	}
 	if matched {
-
+		var u = url
-		u := strings.TrimPrefix(url, "https://")
+		u = strings.TrimPrefix(u, "https://")
-		u = strings.TrimPrefix(url, "http://")
+		u = strings.TrimPrefix(u, "http://")
 		logDump("Modified URL: %s", "https://"+host+"/"+u)
 		return "https://" + host + "/" + u
 	}
@@ -284,3 +292,35 @@ func processLinks(input io.Reader, output io.Writer, compress string, host strin
 
 	return written, nil
 }
+
+// extractParts 从给定的 URL 中提取所需的部分
+func extractParts(rawURL string) (string, string, string, url.Values, error) {
+	// 解析 URL
+	parsedURL, err := url.Parse(rawURL)
+	if err != nil {
+		return "", "", "", nil, err
+	}
+
+	// 获取路径部分并分割
+	pathParts := strings.Split(parsedURL.Path, "/")
+
+	// 提取所需的部分
+	if len(pathParts) < 3 {
+		return "", "", "", nil, fmt.Errorf("URL path is too short")
+	}
+
+	// 提取 /WJQSERVER-STUDIO 和 /go-utils.git
+	repoOwner := "/" + pathParts[1]
+	repoName := "/" + pathParts[2]
+
+	// 剩余部分
+	remainingPath := strings.Join(pathParts[3:], "/")
+	if remainingPath != "" {
+		remainingPath = "/" + remainingPath
+	}
+
+	// 查询参数
+	queryParams := parsedURL.Query()
+
+	return repoOwner, repoName, remainingPath, queryParams, nil
+}

proxy/proxyreq.go

@@ -1,79 +0,0 @@
-package proxy
-
-/*
-func ProxyRequest(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)
-
-	client := createHTTPClient(mode)
-	if runMode == "dev" {
-		client.DevMode()
-	}
-
-	// 发送HEAD请求, 预获取Content-Length
-	headReq := client.R()
-	setRequestHeaders(c, headReq)
-	AuthPassThrough(c, cfg, headReq)
-
-	headResp, err := headReq.Head(u)
-	if err != nil {
-		HandleError(c, fmt.Sprintf("Failed to send request: %v", err))
-		return
-	}
-	defer headResp.Body.Close()
-
-	if err := HandleResponseSize(headResp, cfg, c); err != nil {
-		logWarning("%s %s %s %s %s Response-Size-Error: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err)
-		return
-	}
-
-	body, err := readRequestBody(c)
-	if err != nil {
-		HandleError(c, err.Error())
-		return
-	}
-
-	req := client.R().SetBody(body)
-	setRequestHeaders(c, req)
-	AuthPassThrough(c, cfg, req)
-
-	resp, err := SendRequest(c, req, method, u)
-	if err != nil {
-		HandleError(c, fmt.Sprintf("Failed to send request: %v", err))
-		return
-	}
-	defer resp.Body.Close()
-
-	if err := HandleResponseSize(resp, cfg, c); err != nil {
-		logWarning("%s %s %s %s %s Response-Size-Error: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err)
-		return
-	}
-
-	CopyResponseHeaders(resp, c, cfg)
-	c.Status(resp.StatusCode)
-	if err := copyResponseBody(c, resp.Body); err != nil {
-		logError("%s %s %s %s %s Response-Copy-Error: %v", c.ClientIP(), method, u, c.Request.Header.Get("User-Agent"), c.Request.Proto, err)
-	}
-}
-
-// 复制响应体
-func copyResponseBody(c *gin.Context, respBody io.Reader) error {
-	_, err := io.Copy(c.Writer, respBody)
-	return err
-}
-
-// 判断并选择TLS指纹
-func createHTTPClient(mode string) *req.Client {
-	client := req.C()
-	switch mode {
-	case "chrome":
-		client.SetUserAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36").
-			SetTLSFingerprintChrome().
-			ImpersonateChrome()
-	case "git":
-		client.SetUserAgent("git/2.33.1")
-	}
-	return client
-}
-
-*/