Merge pull request #12 from WJQSERVER-STUDIO/dev

1.0.2

Author: WJQSERVER

CHANGELOG.md

@@ -1,5 +1,14 @@
 # 更新日志
 
+1.0.2 - 2025-04-11
+---
+- ADD: 加入`memLimit`以指示gc
+
+25w05a - 2025-04-07
+---
+- PRE-RELEASE: 此版本是v1.0.2的预发布版本,请勿在生产环境中使用;
+- ADD: 加入`memLimit`以指示gc
+
 1.0.1 - 2025-03-28
 ---
 - CHANGE: 加入`c.SetBodyStream`以流式传输

DEV-VERSION

@@ -1 +1 @@
-25w04c
+25w05a

README.md

@@ -19,6 +19,7 @@ Docker Compose 安装 [docker-compose.yml](https://github.com/WJQSERVER-STUDIO/s
 host = "0.0.0.0" # 监听地址
 port = 8080  # 监听端口
 baseDir = "/data/smart-git/repos" # 缓存文件夹
+memLimit = 0 #MB 内存使用限制
 
 [log]
 logfilepath = "/data/smart-git/log/smart-git.log"  # 日志存储位置

VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

config/config.go

@@ -15,9 +15,10 @@ type Config struct {
 }
 
 type ServerConfig struct {
-	Host    string `toml:"host"`
-	Port    int    `toml:"port"`
-	BaseDir string `toml:"baseDir"`
+	Host     string `toml:"host"`
+	Port     int    `toml:"port"`
+	BaseDir  string `toml:"baseDir"`
+	MemLimit int64  `toml:"memLimit"`
 }
 
 type LogConfig struct {

config/config.toml

@@ -2,6 +2,7 @@
 host = "0.0.0.0" 
 port = 8080 
 baseDir = "/data/smart-git/repos"
+memLimit = 0 #MB
 
 [log]
 logfilepath = "/data/smart-git/log/smart-git.log" 

go.mod

@@ -3,40 +3,41 @@ module smart-git
 go 1.24.1
 
 require (
-	github.com/BurntSushi/toml v1.4.0
-	github.com/cloudwego/hertz v0.9.6
+	github.com/BurntSushi/toml v1.5.0
+	github.com/cloudwego/hertz v0.9.7
 	github.com/go-git/go-billy/v5 v5.6.2
-	github.com/go-git/go-git/v5 v5.14.0
+	github.com/go-git/go-git/v5 v5.15.0
 	github.com/hertz-contrib/gzip v0.0.3
 	github.com/hertz-contrib/http2 v0.1.8
 )
 
 require (
 	github.com/WJQSERVER-STUDIO/go-utils/log v0.0.1 // indirect
-	github.com/bytedance/gopkg v0.1.1 // indirect
-	github.com/bytedance/sonic v1.13.1 // indirect
+	github.com/bytedance/gopkg v0.1.2 // indirect
+	github.com/bytedance/sonic v1.13.2 // indirect
 	github.com/bytedance/sonic/loader v0.2.4 // indirect
 	github.com/cloudwego/base64x v0.1.5 // indirect
-	github.com/cloudwego/netpoll v0.6.5 // indirect
-	github.com/fsnotify/fsnotify v1.8.0 // indirect
+	github.com/cloudwego/gopkg v0.1.4 // indirect
+	github.com/cloudwego/netpoll v0.7.0 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
-	github.com/nyaruka/phonenumbers v1.5.0 // indirect
+	github.com/nyaruka/phonenumbers v1.6.0 // indirect
 	github.com/tidwall/gjson v1.18.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	golang.org/x/arch v0.15.0 // indirect
-	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
-	golang.org/x/text v0.23.0 // indirect
-	google.golang.org/protobuf v1.36.5 // indirect
+	golang.org/x/arch v0.16.0 // indirect
+	golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
+	golang.org/x/text v0.24.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 )
 
 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/ProtonMail/go-crypto v1.2.0 // indirect
 	github.com/WJQSERVER-STUDIO/go-utils/logger v1.5.0
-	github.com/cloudflare/circl v1.6.0 // indirect
+	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
@@ -48,8 +49,8 @@ require (
 	github.com/skeema/knownhosts v1.3.1 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	go.etcd.io/bbolt v1.4.0
-	golang.org/x/crypto v0.36.0 // indirect
-	golang.org/x/net v0.37.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/crypto v0.37.0 // indirect
+	golang.org/x/net v0.39.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )

go.sum

@@ -16,14 +16,15 @@ import (
 
 	"github.com/cloudwego/hertz/pkg/app"
 	"github.com/cloudwego/hertz/pkg/app/server"
+
+	//"github.com/cloudwego/hertz/pkg/network/standard"
 	"github.com/go-git/go-billy/v5/osfs"
 	"github.com/go-git/go-git/v5/plumbing"
 	"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"
 	gitserver "github.com/go-git/go-git/v5/plumbing/transport/server"
 
-	//hresp "github.com/cloudwego/hertz/pkg/protocol/http1/resp"
 	rgzip "github.com/hertz-contrib/gzip"
 	"github.com/hertz-contrib/http2/factory"
 )
@@ -42,6 +43,8 @@ func RunHTTP(addr string, baseRepoDir string) error {
 	r := server.New(
 		server.WithHostPorts(addr),
 		server.WithH2C(true),
+		//server.WithALPN(true),
+		//server.WithTransport(standard.NewTransporter),
 	)
 
 	r.AddProtocol("h2", factory.NewServerFactory())
@@ -174,13 +177,10 @@ func httpInfoRefs(ctx context.Context, c *app.RequestContext, baseRepoDir string
 		return
 	}
 
-	//c.Response.HijackWriter(hresp.NewChunkedBodyWriter(&c.Response, c.GetWriter()))
-
 	ar.Prefix = [][]byte{
 		[]byte("# service=git-upload-pack"),
 		pktline.Flush,
 	}
-	//writer := c.Response.BodyWriter()
 
 	pr, pw := io.Pipe()
 	go func() {
@@ -198,20 +198,6 @@ func httpInfoRefs(ctx context.Context, c *app.RequestContext, baseRepoDir string
 	}()
 
 	c.SetBodyStream(pr, -1)
-
-	/*
-
-		err = ar.Encode(writer)
-		if err != nil {
-			logError("Error encoding advertised references: %v, repo: %s\n", err, repoName)
-			_, errResp := c.WriteString(err.Error())
-			if errResp != nil {
-				logError("WriteString error: %v\n", errResp)
-			}
-			c.Status(http.StatusInternalServerError)
-			return
-		}
-	*/
 }
 
 // httpGitUploadPack 函数处理 /git-upload-pack 请求，允许客户端推送代码到服务器。
@@ -314,10 +300,6 @@ func httpGitUploadPack(ctx context.Context, c *app.RequestContext, baseRepoDir s
 		return
 	}
 
-	//c.Response.HijackWriter(hresp.NewChunkedBodyWriter(&c.Response, c.GetWriter()))
-
-	//writer := c.Response.BodyWriter()
-
 	pr, pw := io.Pipe()
 
 	go func() {
@@ -336,18 +318,4 @@ func httpGitUploadPack(ctx context.Context, c *app.RequestContext, baseRepoDir s
 	}()
 
 	c.SetBodyStream(pr, -1)
-
-	/*
-	   err = res.Encode(writer) // 使用 c.Response.BodyWriter() 作为 io.Writer
-
-	   	if err != nil {
-	   		logError("Error encoding upload pack result: %v, repo: %s\n", err, repoName)
-	   		_, errResp := c.WriteString(err.Error())
-	   		if errResp != nil {
-	   			logError("WriteString error: %v\n", errResp)
-	   		}
-	   		c.Status(http.StatusInternalServerError)
-	   		return
-	   	}
-	*/
 }

http.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"runtime/debug"
 	"smart-git/config"
 	"smart-git/database"
 
@@ -41,10 +42,18 @@ func loadConfig() {
 	fmt.Printf("Loaded config: %v\n", cfg)
 }
 
+func setMemLimit(cfg *config.Config) {
+	if cfg.Server.MemLimit > 0 {
+		debug.SetMemoryLimit((cfg.Server.MemLimit) * 1024 * 1024)
+		logInfo("Set Memory Limit to %d MB", cfg.Server.MemLimit)
+	}
+}
+
 // init
 func init() {
 	ReadFlag()
 	loadConfig()
+	setMemLimit(cfg)
 
 	// 创建根目录 os
 	err := os.MkdirAll(cfg.Server.BaseDir, 0755)