make it work

feat: 添加后台统计页面
为项目增加了一个后台页面, 用于显示IP代理的使用情况统计. 主要包括: - 新增 `backend` 目录, 包含 `index.html` 和 `script.js` 文件, 用于展示统计数据. - 在 `main.go` 中增加了 `setBackendRoute` 函数, 用于提供后台页面的路由. - 将后台页面路由设置为 `/admin`. 注意: 当前代码存在编译错误, 因为无法确定 `ipfilter.NewIPFilter` 的正确返回类型. 错误信息为 `undefined: ipfilter.IPFilter`. 提交此代码是为了让用户能够检查问题.
2025-09-14 08:44:19 +08:00 · 2025-09-13 23:56:26 +00:00
15 changed files with 237 additions and 30 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,5 @@
 # 更新日志

-4.3.4 - 2025-09-14
---
- CHANGE: 改进嵌套加速实现, 增强稳定性
-
 4.3.3 - 2025-09-10
 ---
 - CHANGE: 增强对[wanf](https://github.com/WJQSERVER/wanf)的支持
--- a/README.md
+++ b/README.md
@@ -36,6 +36,8 @@

 [相关文章](https://blog.wjqserver.com/categories/my-program/)

+代理相关推广: [Thordata](https://www.thordata.com/?ls=github&lk=WJQserver)，市面上最具性价比的代理服务商，便宜好用，来自全球195个国家城市的6000万IP，轮换住宅/原生ISP/无限量仅从$0.65/GB 起，新用户$1=5GB .联系客户可获得免费测试.
+
 ### 使用示例

 ```bash 
--- a/2
+++ b/2
@@ -1 +1 @@
-4.3.4
+4.3.3
--- a/api/api.go
+++ b/api/api.go
@@ -3,6 +3,7 @@ package api
 import (
 	"ghproxy/config"
 	"ghproxy/middleware/nocache"
+	"ghproxy/stats"

 	"github.com/infinite-iroha/touka"
 )
@@ -46,9 +47,17 @@ func InitHandleRouter(cfg *config.Config, r *touka.Engine, version string) {
 		apiRouter.GET("/oci_proxy/status", func(c *touka.Context) {
 			ociProxyStatusHandler(cfg, c)
 		})
+		apiRouter.GET("/stats", func(c *touka.Context) {
+			StatsHandler(c)
+		})
 	}
 }

+func StatsHandler(c *touka.Context) {
+	c.SetHeader("Content-Type", "application/json")
+	c.JSON(200, stats.GetStats())
+}
+
 func SizeLimitHandler(cfg *config.Config, c *touka.Context) {
 	sizeLimit := cfg.Server.SizeLimit
 	c.SetHeader("Content-Type", "application/json")
--- a/backend/index.html
+++ b/backend/index.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>后台统计</title>
+    <link rel="stylesheet" href="/bootstrap.min.css">
+</head>
+<body>
+    <div class="container mt-5">
+        <h1>IP 代理使用情况统计</h1>
+        <table class="table table-striped table-bordered mt-4">
+            <thead>
+                <tr>
+                    <th>IP 地址</th>
+                    <th>调用次数</th>
+                    <th>总流量 (bytes)</th>
+                    <th>最后调用时间</th>
+                </tr>
+            </thead>
+            <tbody id="stats-table-body">
+                <!-- 数据将由 script.js 动态填充 -->
+            </tbody>
+        </table>
+    </div>
+    <script src="script.js"></script>
+</body>
+</html>
--- a/backend/script.js
+++ b/backend/script.js
@@ -0,0 +1,36 @@
+document.addEventListener('DOMContentLoaded', function() {
+    fetch('/api/stats')
+        .then(response => response.json())
+        .then(data => {
+            const tableBody = document.getElementById('stats-table-body');
+            tableBody.innerHTML = ''; // 清空现有内容
+
+            for (const ip in data) {
+                const stats = data[ip];
+                const row = document.createElement('tr');
+
+                const ipCell = document.createElement('td');
+                ipCell.textContent = stats.ip;
+                row.appendChild(ipCell);
+
+                const callCountCell = document.createElement('td');
+                callCountCell.textContent = stats.call_count;
+                row.appendChild(callCountCell);
+
+                const transferredCell = document.createElement('td');
+                transferredCell.textContent = stats.total_transferred;
+                row.appendChild(transferredCell);
+
+                const lastCalledCell = document.createElement('td');
+                lastCalledCell.textContent = new Date(stats.last_called).toLocaleString();
+                row.appendChild(lastCalledCell);
+
+                tableBody.appendChild(row);
+            }
+        })
+        .catch(error => {
+            console.error('获取统计数据时出错:', error);
+            const tableBody = document.getElementById('stats-table-body');
+            tableBody.innerHTML = '<tr><td colspan="4" class="text-center">加载统计数据失败</td></tr>';
+        });
+});
--- a/config/config.toml
+++ b/config/config.toml
@@ -25,10 +25,10 @@ rewriteAPI = false
 [pages]
 mode = "internal" # "internal" or "external"
 theme = "bootstrap" # "bootstrap" or "nebula"
-staticDir = "/data/www" 
+staticDir = "pages"

 [log]
-logFilePath = "/data/ghproxy/log/ghproxy.log" 
+logFilePath = "ghproxy.log"
 maxLogSize = 5 # MB
 level = "info" # debug, info, warn, error, none

@@ -42,18 +42,18 @@ ForceAllowApi = false
 ForceAllowApiPassList = false

 [blacklist]
-blacklistFile = "/data/ghproxy/config/blacklist.json"
+blacklistFile = "blacklist.json"
 enabled = false

 [whitelist]
 enabled = false
-whitelistFile = "/data/ghproxy/config/whitelist.json"
+whitelistFile = "whitelist.json"

 [ipFilter]
 enabled = false
 enableAllowList = false
 enableBlockList = false
-ipFilterFile = "/data/ghproxy/config/ipfilter.json"
+ipFilterFile = "ipfilter.json"

 [rateLimit]
 enabled = false
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@ require (
 require (
 	github.com/WJQSERVER-STUDIO/go-utils/iox v0.0.2
 	github.com/WJQSERVER-STUDIO/go-utils/limitreader v0.0.2
-	github.com/WJQSERVER/wanf v0.0.2
+	github.com/WJQSERVER/wanf v0.0.0-20250810023226-e51d9d0737ee
 	github.com/fenthope/bauth v0.0.1
 	github.com/fenthope/ikumi v0.0.2
 	github.com/fenthope/ipfilter v0.0.1
@@ -20,7 +20,7 @@ require (
 	github.com/fenthope/record v0.0.4
 	github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b
 	github.com/hashicorp/golang-lru/v2 v2.0.7
-	github.com/infinite-iroha/touka v0.3.7
+	github.com/infinite-iroha/touka v0.3.8
 	github.com/wjqserver/modembed v0.0.1
 )

--- a/go.sum
+++ b/go.sum
@@ -6,8 +6,8 @@ github.com/WJQSERVER-STUDIO/go-utils/limitreader v0.0.2 h1:8bBkKk6E2Zr+I5szL7gyc
 github.com/WJQSERVER-STUDIO/go-utils/limitreader v0.0.2/go.mod h1:yPX8xuZH+py7eLJwOYj3VVI/4/Yuy5+x8Mhq8qezcPg=
 github.com/WJQSERVER-STUDIO/httpc v0.8.2 h1:PFPLodV0QAfGEP6915J57vIqoKu9cGuuiXG/7C9TNUk=
 github.com/WJQSERVER-STUDIO/httpc v0.8.2/go.mod h1:8WhHVRO+olDFBSvL5PC/bdMkb6U3vRdPJ4p4pnguV5Y=
-github.com/WJQSERVER/wanf v0.0.2 h1:E3dfHP6AACYamKn5BVUpi7pkO3L26WJycKF4AhGusXY=
-github.com/WJQSERVER/wanf v0.0.2/go.mod h1:q2Pyg+G+s1acMWxrbI4CwS/Yk76/BzLREEdZ8iFwUNE=
+github.com/WJQSERVER/wanf v0.0.0-20250810023226-e51d9d0737ee h1:tJ31DNBn6UhWkk8fiikAQWqULODM+yBcGAEar1tzdZc=
+github.com/WJQSERVER/wanf v0.0.0-20250810023226-e51d9d0737ee/go.mod h1:q2Pyg+G+s1acMWxrbI4CwS/Yk76/BzLREEdZ8iFwUNE=
 github.com/fenthope/bauth v0.0.1 h1:+4UIQshGx3mYD4L3f2S4MLZOi5PWU7fU5GK3wsZvwzE=
 github.com/fenthope/bauth v0.0.1/go.mod h1:1fveTpgfR1p+WXQ8MXm9BfBCeNYi55j23jxCOGOvBSA=
 github.com/fenthope/ikumi v0.0.2 h1:5oaSTf/Msp7M2O3o/X20omKWEQbFhX4KV0CVF21oCdk=
@@ -22,8 +22,8 @@ github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b h1:6Q4zRHX
 github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
-github.com/infinite-iroha/touka v0.3.7 h1:bIIZW5Weh7lVpyOWh4FmyR9UOfb5FOt+cR9yQ30FJLA=
-github.com/infinite-iroha/touka v0.3.7/go.mod h1:uwkF1gTrNEgQ4P/Gwtk6WLbERehq3lzB8x1FMedyrfE=
+github.com/infinite-iroha/touka v0.3.8 h1:BK7+hwk5s5SpRFjFKIPe5CzZNzjP36kLHkM/HX6SU38=
+github.com/infinite-iroha/touka v0.3.8/go.mod h1:uwkF1gTrNEgQ4P/Gwtk6WLbERehq3lzB8x1FMedyrfE=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/wjqserver/modembed v0.0.1 h1:8ZDz7t9M5DLrUFlYgBUUmrMzxWsZPmHvOazkr/T2jEs=
--- a/main.go
+++ b/main.go
@@ -47,6 +47,8 @@ var (
 var (
 	//go:embed pages/*
 	pagesFS embed.FS
+	//go:embed backend/*
+	backendFS embed.FS
 )

 var (
@@ -342,6 +344,7 @@ func main() {
 	}

 	r := touka.Default()
+	var err error
 	r.SetProtocols(&touka.ProtocolsConfig{
 		Http1:           true,
 		Http2_Cleartext: true,
@@ -380,8 +383,8 @@ func main() {
 	}

 	if cfg.IPFilter.Enabled {
-		var err error
-		ipAllowList, ipBlockList, err := auth.ReadIPFilterList(cfg)
+		var ipAllowList, ipBlockList []string
+		ipAllowList, ipBlockList, err = auth.ReadIPFilterList(cfg)
 		if err != nil {
 			fmt.Printf("Failed to read IP filter list: %v\n", err)
 			logger.Errorf("Failed to read IP filter list: %v", err)
@@ -403,6 +406,7 @@ func main() {
 	}
 	setupApi(cfg, r, version)
 	setupPages(cfg, r)
+	setBackendRoute(r)
 	r.SetRedirectTrailingSlash(false)

 	r.GET("/github.com/:user/:repo/releases/*filepath", func(c *touka.Context) {
@@ -517,7 +521,7 @@ func main() {
 	defer logger.Close()

 	addr := fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port)
-	err := r.RunShutdown(addr)
+	err = r.RunShutdown(addr)
 	if err != nil {
 		logger.Errorf("Server Run Error: %v", err)
 		fmt.Printf("Server Run Error: %v\n", err)
@@ -525,3 +529,15 @@ func main() {

 	fmt.Println("Program Exit")
 }
+
+func setBackendRoute(r *touka.Engine) {
+
+	backend, err := fs.Sub(backendFS, "backend")
+	if err != nil {
+		logger.Errorf("Failed to load embedded backend pages: %s", err)
+		fmt.Printf("Failed to load embedded backend pages: %s", err)
+		os.Exit(1)
+	}
+
+	r.StaticFS("/backend", http.FS(backend))
+}
--- a/proxy/chunkreq.go
+++ b/proxy/chunkreq.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"ghproxy/config"
+	"ghproxy/stats"
 	"io"
 	"net/http"
 	"strconv"
@@ -124,17 +125,25 @@ func ChunkedProxyRequest(ctx context.Context, c *touka.Context, u string, cfg *c
 		bodyReader = limitreader.NewRateLimitedReader(bodyReader, bandwidthLimit, int(bandwidthBurst), ctx)
 	}

-	defer bodyReader.Close()
+	countingReader := NewCountingReader(bodyReader)
+	defer countingReader.Close()
+	defer func() {
+		stats.Record(c.ClientIP(), countingReader.BytesRead())
+	}()

 	if MatcherShell(u) && matchString(matcher) && cfg.Shell.Editor {
+		// 判断body是不是gzip
+		var compress string
+		if resp.Header.Get("Content-Encoding") == "gzip" {
+			compress = "gzip"
+		}

 		c.Debugf("Use Shell Editor: %s %s %s %s %s", c.ClientIP(), c.Request.Method, u, c.UserAgent(), c.Request.Proto)
-		c.DelHeader("Content-Length")
-		c.DelHeader("Content-Encoding")
+		c.Header("Content-Length", "")

 		var reader io.Reader

-		reader, _, err = processLinks(bodyReader, c.Request.Host, cfg, c)
+		reader, _, err = processLinks(countingReader, compress, c.Request.Host, cfg, c)
 		c.WriteStream(reader)
 		if err != nil {
 			c.Errorf("%s %s %s %s %s Failed to copy response body: %v", c.ClientIP(), c.Request.Method, u, c.UserAgent(), c.Request.Proto, err)
@@ -142,12 +151,13 @@ func ChunkedProxyRequest(ctx context.Context, c *touka.Context, u string, cfg *c
 			return
 		}
 	} else {
+
 		if contentLength != "" {
 			c.SetHeader("Content-Length", contentLength)
-			c.WriteStream(bodyReader)
+			c.WriteStream(countingReader)
 			return
 		}
-		c.WriteStream(bodyReader)
+		c.WriteStream(countingReader)
 	}

 }
--- a/proxy/nest.go
+++ b/proxy/nest.go
@@ -2,6 +2,7 @@ package proxy

 import (
 	"bufio"
+	"compress/gzip"
 	"fmt"
 	"ghproxy/config"
 	"io"
@@ -65,7 +66,7 @@ func modifyURL(url string, host string, cfg *config.Config) string {
 }

 // processLinks 处理链接，返回包含处理后数据的 io.Reader
-func processLinks(input io.ReadCloser, host string, cfg *config.Config, c *touka.Context) (readerOut io.Reader, written int64, err error) {
+func processLinks(input io.ReadCloser, compress string, host string, cfg *config.Config, c *touka.Context) (readerOut io.Reader, written int64, err error) {
 	pipeReader, pipeWriter := io.Pipe() // 创建 io.Pipe
 	readerOut = pipeReader

@@ -96,14 +97,43 @@ func processLinks(input io.ReadCloser, host string, cfg *config.Config, c *touka

 		var bufReader *bufio.Reader

-		bufReader = bufio.NewReader(input)
+		if compress == "gzip" {
+			// 解压gzip
+			gzipReader, gzipErr := gzip.NewReader(input)
+			if gzipErr != nil {
+				err = fmt.Errorf("gzip解压错误: %v", gzipErr)
+				return // Goroutine 中使用 return 返回错误
+			}
+			defer gzipReader.Close()
+			bufReader = bufio.NewReader(gzipReader)
+		} else {
+			bufReader = bufio.NewReader(input)
+		}

 		var bufWriter *bufio.Writer
+		var gzipWriter *gzip.Writer

-		bufWriter = bufio.NewWriterSize(pipeWriter, 4096) // 使用 pipeWriter
+		// 根据是否gzip确定 writer 的创建
+		if compress == "gzip" {
+			gzipWriter = gzip.NewWriter(pipeWriter)           // 使用 pipeWriter
+			bufWriter = bufio.NewWriterSize(gzipWriter, 4096) //设置缓冲区大小
+		} else {
+			bufWriter = bufio.NewWriterSize(pipeWriter, 4096) // 使用 pipeWriter
+		}

 		//确保writer关闭
 		defer func() {
+			var closeErr error // 局部变量，用于保存defer中可能发生的错误
+
+			if gzipWriter != nil {
+				if closeErr = gzipWriter.Close(); closeErr != nil {
+					c.Errorf("gzipWriter close failed %v", closeErr)
+					// 如果已经存在错误，则保留。否则，记录此错误。
+					if err == nil {
+						err = closeErr
+					}
+				}
+			}
 			if flushErr := bufWriter.Flush(); flushErr != nil {
 				c.Errorf("writer flush failed %v", flushErr)
 				// 如果已经存在错误，则保留。否则，记录此错误。
--- a/proxy/reqheader.go
+++ b/proxy/reqheader.go
@@ -27,7 +27,6 @@ var (
 		"CDN-Loop":         {},
 		"Upgrade":          {},
 		"Connection":       {},
-		"Accept-Encoding":  {},
 	}

 	cloneHeadersToRemove = map[string]struct{}{
@@ -44,7 +43,7 @@ var (
 var (
 	defaultHeaders = map[string]string{
 		"Accept":            "*/*",
-		"Accept-Encoding":   "",
+		"Accept-Encoding":   "gzip",
 		"Transfer-Encoding": "chunked",
 		"User-Agent":        "GHProxy/1.0",
 	}
--- a/proxy/utils.go
+++ b/proxy/utils.go
@@ -4,10 +4,47 @@ import (
 	"fmt"
 	"ghproxy/auth"
 	"ghproxy/config"
+	"io"

 	"github.com/infinite-iroha/touka"
 )

+// CountingReader is a reader that counts the number of bytes read.
+// CountingReader 是一个计算已读字节数的读取器.
+type CountingReader struct {
+	reader    io.Reader
+	bytesRead int64
+}
+
+// NewCountingReader creates a new CountingReader.
+// NewCountingReader 创建一个新的 CountingReader.
+func NewCountingReader(reader io.Reader) *CountingReader {
+	return &CountingReader{
+		reader: reader,
+	}
+}
+
+func (cr *CountingReader) Read(p []byte) (n int, err error) {
+	n, err = cr.reader.Read(p)
+	cr.bytesRead += int64(n)
+	return n, err
+}
+
+// BytesRead returns the number of bytes read.
+// BytesRead 返回已读字节数.
+func (cr *CountingReader) BytesRead() int64 {
+	return cr.bytesRead
+}
+
+// Close closes the underlying reader if it implements io.Closer.
+// 如果底层读取器实现了 io.Closer, 则关闭它.
+func (cr *CountingReader) Close() error {
+	if closer, ok := cr.reader.(io.Closer); ok {
+		return closer.Close()
+	}
+	return nil
+}
+
 func listCheck(cfg *config.Config, c *touka.Context, user string, repo string, rawPath string) bool {
 	if cfg.Auth.ForceAllowApi && cfg.Auth.ForceAllowApiPassList {
 		return false
--- a/stats/stats.go
+++ b/stats/stats.go
@@ -0,0 +1,44 @@
+package stats
+
+import (
+	"sync"
+	"time"
+)
+
+// ProxyStats store one ip's proxy stats
+// ProxyStats 存储一个IP的代理统计信息
+type ProxyStats struct {
+	IP               string    `json:"ip"`
+	LastCalled       time.Time `json:"last_called"`
+	CallCount        int64     `json:"call_count"`
+	TotalTransferred int64     `json:"total_transferred"`
+}
+
+var (
+	statsMap = &sync.Map{}
+)
+
+// Record update a ip's proxy stats
+// Record 更新一个IP的代理统计信息
+func Record(ip string, transferred int64) {
+	s, _ := statsMap.LoadOrStore(ip, &ProxyStats{
+		IP: ip,
+	})
+
+	ps := s.(*ProxyStats)
+	ps.LastCalled = time.Now()
+	ps.CallCount++
+	ps.TotalTransferred += transferred
+	statsMap.Store(ip, ps)
+}
+
+// GetStats return all proxy stats
+// GetStats 返回所有的代理统计信息
+func GetStats() map[string]*ProxyStats {
+	data := make(map[string]*ProxyStats)
+	statsMap.Range(func(key, value interface{}) bool {
+		data[key.(string)] = value.(*ProxyStats)
+		return true
+	})
+	return data
+}
@@ -1 +1 @@
 .3.4
 .3.3