节点状态中增加本地防火墙名称

build/build.sh

@@ -42,6 +42,11 @@ function build() {
 		mkdir $DIST/configs
 		mkdir $DIST/logs
 		mkdir $DIST/data
+
+		if [ "$TAG" = "plus" ]; then
+			mkdir $DIST/scripts
+			mkdir $DIST/scripts/js
+		fi
 	fi
 
 	cp $ROOT/configs/api.template.yaml $DIST/configs

cmd/edge-node/main.go

@@ -22,7 +22,9 @@ func main() {
 	app := apps.NewAppCmd().
 		Version(teaconst.Version).
 		Product(teaconst.ProductName).
-		Usage(teaconst.ProcessName + " [-v|start|stop|restart|status|quit|test|service|daemon|pprof]")
+		Usage(teaconst.ProcessName + " [-v|start|stop|restart|status|quit|test|reload|service|daemon|pprof]").
+		Usage(teaconst.ProcessName + " [trackers|goman|conns|gc]").
+		Usage(teaconst.ProcessName + " [ip.drop|ip.reject|ip.remove] IP")
 
 	app.On("test", func() {
 		err := nodes.NewNode().Test()
@@ -30,6 +32,20 @@ func main() {
 			_, _ = os.Stderr.WriteString(err.Error())
 		}
 	})
+	app.On("reload", func() {
+		var sock = gosock.NewTmpSock(teaconst.ProcessName)
+		reply, err := sock.Send(&gosock.Command{Code: "reload"})
+		if err != nil {
+			fmt.Println("[ERROR]" + err.Error())
+		} else {
+			var params = maps.NewMap(reply.Params)
+			if params.Has("error") {
+				fmt.Println("[ERROR]" + params.GetString("error"))
+			} else {
+				fmt.Println("ok")
+			}
+		}
+	})
 	app.On("daemon", func() {
 		nodes.NewNode().Daemon()
 	})
@@ -65,6 +81,12 @@ func main() {
 		node := nodes.NewNode()
 		node.Start()
 	})
+	app.On("dbstat", func() {
+		teaconst.EnableDBStat = true
+
+		node := nodes.NewNode()
+		node.Start()
+	})
 	app.On("trackers", func() {
 		var sock = gosock.NewTmpSock(teaconst.ProcessName)
 		reply, err := sock.Send(&gosock.Command{Code: "trackers"})

go.mod

@@ -2,23 +2,22 @@ module github.com/TeaOSLab/EdgeNode
 
 go 1.15
 
-replace (
+replace github.com/TeaOSLab/EdgeCommon => ../EdgeCommon
-	github.com/TeaOSLab/EdgeCommon => ../EdgeCommon
-)
 
 require (
 	github.com/TeaOSLab/EdgeCommon v0.0.0-00010101000000-000000000000
-	github.com/andybalholm/brotli v1.0.3
+	github.com/andybalholm/brotli v1.0.4
 	github.com/biessek/golang-ico v0.0.0-20180326222316-d348d9ea4670
 	github.com/cespare/xxhash v1.1.0
 	github.com/chai2010/webp v1.1.0 // indirect
 	github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/fsnotify/fsnotify v1.5.1
-	github.com/go-yaml/yaml v2.1.0+incompatible
+	github.com/go-redis/redis/v8 v8.11.5
 	github.com/golang/protobuf v1.5.2
-	github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24
+	github.com/google/nftables v0.0.0-20220407195405-950e408d48c6
+	github.com/iwind/TeaGo v0.0.0-20220304043459-0dd944a5b475
 	github.com/iwind/gofcgi v0.0.0-20210528023741-a92711d45f11
-	github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3
+	github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4
 	github.com/iwind/gowebp v0.0.0-20211029040624-7331ecc78ed8
 	github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e // indirect
 	github.com/kr/text v0.2.0 // indirect
@@ -26,15 +25,12 @@ require (
 	github.com/miekg/dns v1.1.43
 	github.com/mssola/user_agent v0.5.3
 	github.com/pires/go-proxyproto v0.6.1
-	github.com/shirou/gopsutil v3.21.11+incompatible
+	github.com/shirou/gopsutil/v3 v3.22.2
-	github.com/tklauser/go-sysconf v0.3.6 // indirect
-	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	golang.org/x/image v0.0.0-20211028202545-6944b10bf410
-	golang.org/x/net v0.0.0-20211215060638-4ddde0e984e9
+	golang.org/x/net v0.0.0-20220225172249-27dd8689420f
-	golang.org/x/sys v0.0.0-20220111092808-5a964db01320
+	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
 	golang.org/x/text v0.3.7
-	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
+	google.golang.org/grpc v1.45.0
-	google.golang.org/grpc v1.43.0
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
-	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )

go.sum

@@ -2,12 +2,14 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw=
+github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60=
 github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/andybalholm/brotli v1.0.3 h1:fpcw+r1N1h0Poc1F/pHbW40cUm/lMEQslZtCkBQ0UnM=
+github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
-github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
 github.com/biessek/golang-ico v0.0.0-20180326222316-d348d9ea4670 h1:FQPKKjDhzG0T4ew6dm6MGrXb4PRAi8ZmTuYuxcF62BM=
@@ -15,15 +17,21 @@ github.com/biessek/golang-ico v0.0.0-20180326222316-d348d9ea4670/go.mod h1:iRWAF
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chai2010/webp v1.1.0 h1:4Ei0/BRroMF9FaXDG2e4OxwFcuW2vcXd+A6tyqTJUQQ=
 github.com/chai2010/webp v1.1.0/go.mod h1:LP12PG5IFmLGHUU26tBiCBKnghxx3toZFwDjOYvd3Ow=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/cilium/ebpf v0.5.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
+github.com/cilium/ebpf v0.7.0 h1:1k/q3ATgxSXRdrmPfH8d7YK0GfqVsEKZAX9dQZvs56k=
+github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
@@ -34,13 +42,16 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f h1:q/DpyjJjZs94bziQ7YkBmIlpqbVP7yw179rnzoNVX1M=
 github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f/go.mod h1:QGrK8vMWWHQYQ3QU9bw9Y9OPNfxccGzfb41qjvVeXtY=
 github.com/dgryski/go-rendezvous v0.0.0-20200624174652-8d2f3be8b2d9/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY=
+github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
@@ -50,10 +61,11 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-redis/redis/v8 v8.0.0-beta.7/go.mod h1:FGJAWDWFht1sQ4qxyJHZZbVyvnVcKQN0E3u5/5lRz+g=
+github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
+github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-yaml/yaml v2.1.0+incompatible h1:RYi2hDdss1u4YE7GwixGzWwVo47T8UQwnTLB6vQiq+o=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -75,21 +87,42 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/nftables v0.0.0-20220407195405-950e408d48c6 h1:btadZscaRmsi/+fOhkyUguRpSnrf6dykNEWxDeUCj9I=
+github.com/google/nftables v0.0.0-20220407195405-950e408d48c6/go.mod h1:0F8on3JWMkm+xahTHItkiu/E1SPqMd0TOxNweQv8ptE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/iwind/TeaGo v0.0.0-20210628135026-38575a4ab060/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24 h1:1cGulkD2SNJJRok5OKwyhP/Ddm+PgSWKOupn0cR36/A=
+github.com/iwind/TeaGo v0.0.0-20220304043459-0dd944a5b475 h1:EseyfFaQOjWanGiby9KMw7PjDBMg/95tLDgIw/ns0Cw=
-github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
+github.com/iwind/TeaGo v0.0.0-20220304043459-0dd944a5b475/go.mod h1:HRHK0zoC/og3c9/hKosD9yYVMTnnzm3PgXUdhRYHaLc=
 github.com/iwind/gofcgi v0.0.0-20210528023741-a92711d45f11 h1:DaQjoWZhLNxjhIXedVg4/vFEtHkZhK4IjIwsWdyzBLg=
 github.com/iwind/gofcgi v0.0.0-20210528023741-a92711d45f11/go.mod h1:JtbX20untAjUVjZs1ZBtq80f5rJWvwtQNRL6EnuYRnY=
 github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3 h1:aBSonas7vFcgTj9u96/bWGILGv1ZbUSTLiOzcI1ZT6c=
 github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3/go.mod h1:H5Q7SXwbx3a97ecJkaS2sD77gspzE7HFUafBO0peEyA=
+github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4 h1:VWGsCqTzObdlbf7UUE3oceIpcEKi4C/YBUszQXk118A=
+github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4/go.mod h1:H5Q7SXwbx3a97ecJkaS2sD77gspzE7HFUafBO0peEyA=
 github.com/iwind/gowebp v0.0.0-20211029040624-7331ecc78ed8 h1:AojsHz9Es9B3He2MQQxeRq3TyD//o9huxUo7r1wh44g=
 github.com/iwind/gowebp v0.0.0-20211029040624-7331ecc78ed8/go.mod h1:QJBY2txYhLMzwLO29iB5ujDJ3s3V7DsZ582nw4Ss+tM=
+github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 h1:uhL5Gw7BINiiPAo24A2sxkcDI0Jt/sqp1v5xQCniEFA=
+github.com/josharian/native v0.0.0-20200817173448-b6b71def0850/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
+github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
+github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ=
+github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok=
+github.com/jsimonetti/rtnetlink v0.0.0-20201216134343-bde56ed16391/go.mod h1:cR77jAZG3Y3bsb8hF6fHJbFoyFukLFOkQ98S0pQz3xw=
+github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943/go.mod h1:z4c53zj6Eex712ROyh8WI0ihysb5j2ROyV42iNogmAs=
+github.com/jsimonetti/rtnetlink v0.0.0-20210122163228-8d122574c736/go.mod h1:ZXpIyOK59ZnN7J0BV99cZUPmsqDRZ3eq5X+st7u/oSA=
+github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b/go.mod h1:8w9Rh8m+aHZIG69YPGGem1i5VzoyRC8nw2kA8B+ik5U=
+github.com/jsimonetti/rtnetlink v0.0.0-20210525051524-4cc836578190/go.mod h1:NmKSdU4VGSiv1bMsdqNALI4RSvvjtz65tTMCnD05qLo=
+github.com/jsimonetti/rtnetlink v0.0.0-20211022192332-93da33804786 h1:N527AHMa793TP5z5GNAn/VLPzlc0ewzWdeP/25gDfgQ=
+github.com/jsimonetti/rtnetlink v0.0.0-20211022192332-93da33804786/go.mod h1:v4hqbTdfQngbVSZJVWUhGE/lbTFf9jb+ygmNUDQMuOs=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e h1:LvL4XsI70QxOGHed6yhQtAU34Kx3Qq2wwBzGFKY8zKk=
 github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw=
@@ -100,8 +133,31 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/mattn/go-sqlite3 v1.14.9 h1:10HX2Td0ocZpYEjhilsuo6WWtUqttj2Kb0KtD86/KYA=
 github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod h1:+t7E0lkKfbBsebllff1xdTmyJt8lH37niI6kwFk9OTo=
+github.com/mdlayher/ethtool v0.0.0-20211028163843-288d040e9d60 h1:tHdB+hQRHU10CfcK0furo6rSNgZ38JT8uPh70c/pFD8=
+github.com/mdlayher/ethtool v0.0.0-20211028163843-288d040e9d60/go.mod h1:aYbhishWc4Ai3I2U4Gaa2n3kHWSwzme6EsG/46HRQbE=
+github.com/mdlayher/genetlink v1.0.0 h1:OoHN1OdyEIkScEmRgxLEe2M9U8ClMytqA5niynLtfj0=
+github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc=
+github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
+github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M=
+github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY=
+github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
+github.com/mdlayher/netlink v1.2.0/go.mod h1:kwVW1io0AZy9A1E2YYgaD4Cj+C+GPkU6klXCMzIJ9p8=
+github.com/mdlayher/netlink v1.2.1/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU=
+github.com/mdlayher/netlink v1.2.2-0.20210123213345-5cc92139ae3e/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU=
+github.com/mdlayher/netlink v1.3.0/go.mod h1:xK/BssKuwcRXHrtN04UBkwQ6dY9VviGGuriDdoPSWys=
+github.com/mdlayher/netlink v1.4.0/go.mod h1:dRJi5IABcZpBD2A3D0Mv/AiX8I9uDEu5oGkAVrekmf8=
+github.com/mdlayher/netlink v1.4.1/go.mod h1:e4/KuJ+s8UhfUpO9z00/fDZZmhSrs+oxyqAS9cNgn6Q=
+github.com/mdlayher/netlink v1.4.2 h1:3sbnJWe/LETovA7yRZIX3f9McVOWV3OySH6iIBxiFfI=
+github.com/mdlayher/netlink v1.4.2/go.mod h1:13VaingaArGUTUxFLf/iEovKxXji32JAtF858jZYEug=
+github.com/mdlayher/socket v0.0.0-20210307095302-262dc9984e00/go.mod h1:GAFlyu4/XV68LkQKYzKhIo/WW7j3Zi0YRAz/BOoanUc=
+github.com/mdlayher/socket v0.0.0-20211007213009-516dcbdf0267/go.mod h1:nFZ1EtZYK8Gi/k6QNu7z7CgO20i/4ExeQswwWuPmG/g=
+github.com/mdlayher/socket v0.0.0-20211102153432-57e3fa563ecb h1:2dC7L10LmTqlyMVzFJ00qM25lqESg9Z4u3GuEXN5iHY=
+github.com/mdlayher/socket v0.0.0-20211102153432-57e3fa563ecb/go.mod h1:nFZ1EtZYK8Gi/k6QNu7z7CgO20i/4ExeQswwWuPmG/g=
 github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg=
 github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -110,22 +166,34 @@ github.com/mssola/user_agent v0.5.3 h1:lBRPML9mdFuIZgI2cmlQ+atbpJdLdeVl2IDodjBR5
 github.com/mssola/user_agent v0.5.3/go.mod h1:TTPno8LPY3wAIEKRpAtkdMT0f8SE24pLRGPahjCH4uw=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/ginkgo/v2 v2.0.0 h1:CcuG/HvWNkkaqCUpJifQY8z7qEMBJya6aLPx6ftGyjQ=
+github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
+github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
+github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
 github.com/opentracing/opentracing-go v1.1.1-0.20190913142402-a7454ce5950e/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/pires/go-proxyproto v0.6.1 h1:EBupykFmo22SDjv4fQVQd2J9NOoLPmyZA/15ldOGkPw=
 github.com/pires/go-proxyproto v0.6.1/go.mod h1:Odh9VFOZJCf9G8cLW5o435Xf1J95Jw9Gw5rnCjcwzAY=
 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/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
+github.com/shirou/gopsutil/v3 v3.22.2 h1:wCrArWFkHYIdDxx/FSfF5RB4dpJYW6t7rcp3+zL8uks=
-github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/shirou/gopsutil/v3 v3.22.2/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -134,10 +202,15 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/tklauser/go-sysconf v0.3.6 h1:oc1sJWvKkmvIxhDHeKWvZS4f6AW+YcoguSfRF2/Hmo4=
+github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo=
-github.com/tklauser/go-sysconf v0.3.6/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI=
+github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
-github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA=
+github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ=
-github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM=
+github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
+github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc h1:R83G5ikgLMxrBvLh22JhdfI8K6YXEPHx5P03Uu3DRs4=
+github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.opentelemetry.io/otel v0.7.0/go.mod h1:aZMyHG5TqDOXEgH2tyLiXSUKly1jT3yqE9PmrzIeCdo=
@@ -158,6 +231,10 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
+golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -166,46 +243,93 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20211215060638-4ddde0e984e9 h1:kmreh1vGI63l2FxOAYS3Yv6ATsi7lSTuwNSVbGfJV9I=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20211215060638-4ddde0e984e9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201118182958-a01c418693c7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201218084310-7d0127a74742/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d h1:1oIt9o40TWWI9FUaveVpUvBe13FNqBNVXy3ue2fcfkw=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220111092808-5a964db01320 h1:0jf+tOCoZ3LyutmCOWpVni1chK4VfFLhRsDK7MhqGRY=
+golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs=
+golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -218,7 +342,14 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
+golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w=
+golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
@@ -230,19 +361,17 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
 google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo7ya8kMnvprhcWM045PmkBdMO9zN0=
+google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e h1:fNKDNuUyC4WH+inqDMpfXDdfvwfYILbsX+oskGZ8hxg=
-google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M=
-google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM=
+google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
-google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -262,6 +391,7 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8
 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/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -272,7 +402,11 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 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.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY=
+honnef.co/go/tools v0.2.2 h1:MNh1AVMyVX23VUHE2O27jm6lNj3vjO5DexS4A1xvnzk=
+honnef.co/go/tools v0.2.2/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY=
+rogchap.com/v8go v0.7.0/go.mod h1:MxgP3pL2MW4dpme/72QRs8sgNMmM0pRc8DPhcuLWPAs=

internal/apps/app_cmd.go

@@ -20,7 +20,7 @@ import (
 type AppCmd struct {
 	product       string
 	version       string
-	usage         string
+	usages        []string
 	options       []*CommandHelpOption
 	appendStrings []string
 
@@ -54,7 +54,7 @@ func (this *AppCmd) Version(version string) *AppCmd {
 
 // Usage 使用方法
 func (this *AppCmd) Usage(usage string) *AppCmd {
-	this.usage = usage
+	this.usages = append(this.usages, usage)
 	return this
 }
 
@@ -77,8 +77,10 @@ func (this *AppCmd) Append(appendString string) *AppCmd {
 func (this *AppCmd) Print() {
 	fmt.Println(this.product + " v" + this.version)
 
-	usage := this.usage
+	fmt.Println("Usage:")
-	fmt.Println("Usage:", "\n   "+usage)
+	for _, usage := range this.usages {
+		fmt.Println("   " + usage)
+	}
 
 	if len(this.options) > 0 {
 		fmt.Println("")
@@ -211,7 +213,16 @@ func (this *AppCmd) runStop() {
 		return
 	}
 
-	_, _ = this.sock.Send(&gosock.Command{Code: "stop"})
+	// 从systemd中停止
+	if runtime.GOOS == "linux" {
+		systemctl, _ := exec.LookPath("systemctl")
+		if len(systemctl) > 0 {
+			_ = exec.Command(systemctl, "stop", teaconst.SystemdServiceName).Run()
+		}
+	}
+
+	// 如果仍在运行，则发送停止指令
+	_, _ = this.sock.SendTimeout(&gosock.Command{Code: "stop"}, 1*time.Second)
 
 	fmt.Println(this.product+" stopped ok, pid:", types.String(pid))
 }

internal/apps/log_writer.go

@@ -1,10 +1,12 @@
 package apps
 
 import (
+	"github.com/TeaOSLab/EdgeNode/internal/goman"
+	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"github.com/TeaOSLab/EdgeNode/internal/utils/sizes"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/files"
-	"github.com/iwind/TeaGo/logs"
+	timeutil "github.com/iwind/TeaGo/utils/time"
-	"github.com/iwind/TeaGo/utils/time"
 	"log"
 	"os"
 	"runtime"
@@ -13,27 +15,55 @@ import (
 )
 
 type LogWriter struct {
-	fileAppender *files.Appender
+	fp *os.File
+	c  chan string
 }
 
 func (this *LogWriter) Init() {
 	// 创建目录
-	dir := files.NewFile(Tea.LogDir())
+	var dir = files.NewFile(Tea.LogDir())
 	if !dir.Exists() {
 		err := dir.Mkdir()
 		if err != nil {
-			log.Println("[error]" + err.Error())
+			log.Println("[LOG]create log dir failed: " + err.Error())
 		}
 	}
 
-	logFile := files.NewFile(Tea.LogFile("run.log"))
-
 	// 打开要写入的日志文件
-	appender, err := logFile.Appender()
+	var logPath = Tea.LogFile("run.log")
+	fp, err := os.OpenFile(logPath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
 	if err != nil {
-		logs.Error(err)
+		log.Println("[LOG]open log file failed: " + err.Error())
 	} else {
-		this.fileAppender = appender
+		this.fp = fp
+	}
+
+	this.c = make(chan string, 1024)
+
+	// 异步写入文件
+	var maxFileSize = 2 * sizes.G // 文件最大尺寸，超出此尺寸则清空
+	if fp != nil {
+		goman.New(func() {
+			var totalSize int64 = 0
+			stat, err := fp.Stat()
+			if err == nil {
+				totalSize = stat.Size()
+			}
+
+			for message := range this.c {
+				totalSize += int64(len(message))
+				_, err := fp.WriteString(timeutil.Format("Y/m/d H:i:s ") + message + "\n")
+				if err != nil {
+					log.Println("[LOG]write log failed: " + err.Error())
+				} else {
+					// 如果太大则Truncate
+					if totalSize > maxFileSize {
+						_ = fp.Truncate(0)
+						totalSize = 0
+					}
+				}
+			}
+		})
 	}
 }
 
@@ -48,7 +78,7 @@ func (this *LogWriter) Write(message string) {
 			var ok bool
 			_, file, line, ok = runtime.Caller(callDepth)
 			if ok {
-				file = this.packagePath(file)
+				file = utils.RemoveWorkspace(this.packagePath(file))
 			}
 		}
 
@@ -59,18 +89,15 @@ func (this *LogWriter) Write(message string) {
 		}
 	}
 
-	if this.fileAppender != nil {
+	this.c <- message
-		_, err := this.fileAppender.AppendString(timeutil.Format("Y/m/d H:i:s ") + message + "\n")
-		if err != nil {
-			log.Println("[error]" + err.Error())
-		}
-	}
 }
 
 func (this *LogWriter) Close() {
-	if this.fileAppender != nil {
+	if this.fp != nil {
-		_ = this.fileAppender.Close()
+		_ = this.fp.Close()
 	}
+
+	close(this.c)
 }
 
 func (this *LogWriter) packagePath(path string) string {

internal/caches/consts.go

@@ -0,0 +1,10 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package caches
+
+const (
+	SuffixWebP        = "@GOEDGE_WEBP"    // WebP后缀
+	SuffixCompression = "@GOEDGE_"        // 压缩后缀 SuffixCompression + Encoding
+	SuffixMethod      = "@GOEDGE_"        // 请求方法后缀 SuffixMethod + RequestMethod
+	SuffixPartial     = "@GOEDGE_partial" // 分区缓存后缀
+)

internal/caches/errors.go

@@ -6,9 +6,13 @@ import "errors"
 
 // 常用的几个错误
 var (
-	ErrNotFound      = errors.New("cache not found")
+	ErrNotFound           = errors.New("cache not found")
-	ErrFileIsWriting = errors.New("the file is writing")
+	ErrFileIsWriting      = errors.New("the file is writing")
-	ErrInvalidRange  = errors.New("invalid range")
+	ErrInvalidRange       = errors.New("invalid range")
+	ErrEntityTooLarge     = errors.New("entity too large")
+	ErrWritingUnavailable = errors.New("writing unavailable")
+	ErrWritingQueueFull   = errors.New("writing queue full")
+	ErrTooManyOpenFiles   = errors.New("too many open files")
 )
 
 // CapacityError 容量错误
@@ -30,7 +34,11 @@ func CanIgnoreErr(err error) bool {
 	if err == nil {
 		return true
 	}
-	if err == ErrFileIsWriting {
+	if err == ErrFileIsWriting ||
+		err == ErrEntityTooLarge ||
+		err == ErrWritingUnavailable ||
+		err == ErrWritingQueueFull ||
+		err == ErrTooManyOpenFiles {
 		return true
 	}
 	_, ok := err.(*CapacityError)

internal/caches/hot_item.go

@@ -3,8 +3,6 @@
 package caches
 
 type HotItem struct {
-	Key       string
+	Key  string
-	ExpiresAt int64
+	Hits uint32
-	Hits      uint32
-	Status int
 }

internal/caches/list_file.go

@@ -4,52 +4,32 @@ package caches
 
 import (
 	"database/sql"
-	"errors"
 	"github.com/TeaOSLab/EdgeNode/internal/goman"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/TeaOSLab/EdgeNode/internal/ttlcache"
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"github.com/TeaOSLab/EdgeNode/internal/utils/fnv"
-	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/types"
-	timeutil "github.com/iwind/TeaGo/utils/time"
 	_ "github.com/mattn/go-sqlite3"
 	"os"
 	"sync/atomic"
 	"time"
 )
 
+const CountFileDB = 20
+
 // FileList 文件缓存列表管理
 type FileList struct {
-	dir   string
+	dir    string
-	db    *sql.DB
+	dbList [CountFileDB]*FileListDB
-	total int64
+	total  int64
 
 	onAdd    func(item *Item)
 	onRemove func(item *Item)
 
-	// cacheItems
-	existsByHashStmt *sql.Stmt // 根据hash检查是否存在
-	insertStmt       *sql.Stmt // 写入数据
-	selectByHashStmt *sql.Stmt // 使用hash查询数据
-	deleteByHashStmt *sql.Stmt // 根据hash删除数据
-	statStmt         *sql.Stmt // 统计
-	purgeStmt        *sql.Stmt // 清理
-	deleteAllStmt    *sql.Stmt // 删除所有数据
-
-	// hits
-	insertHitStmt       *sql.Stmt // 写入数据
-	increaseHitStmt     *sql.Stmt // 增加点击量
-	deleteHitByHashStmt *sql.Stmt // 根据hash删除数据
-	lfuHitsStmt         *sql.Stmt // 读取老的数据
-
-	oldTables      []string
-	itemsTableName string
-	hitsTableName  string
-
-	isClosed bool
-	isReady  bool
-
 	memoryCache *ttlcache.Cache
+
+	// 老数据库地址
+	oldDir string
 }
 
 func NewFileList(dir string) ListInterface {
@@ -59,6 +39,10 @@ func NewFileList(dir string) ListInterface {
 	}
 }
 
+func (this *FileList) SetOldDir(oldDir string) {
+	this.oldDir = oldDir
+}
+
 func (this *FileList) Init() error {
 	// 检查目录是否存在
 	_, err := os.Stat(this.dir)
@@ -70,114 +54,38 @@ func (this *FileList) Init() error {
 		remotelogs.Println("CACHE", "create cache dir '"+this.dir+"'")
 	}
 
-	this.itemsTableName = "cacheItems_v3"
-	this.hitsTableName = "hits"
-
 	var dir = this.dir
 	if dir == "/" {
 		// 防止sqlite提示authority错误
 		dir = ""
 	}
-	var dbPath = dir + "/index.db"
-	remotelogs.Println("CACHE", "loading database '"+dbPath+"'")
-	db, err := sql.Open("sqlite3", "file:"+dbPath+"?cache=shared&mode=rwc&_journal_mode=WAL")
-	if err != nil {
-		return errors.New("open database failed: " + err.Error())
-	}
 
-	db.SetMaxOpenConns(1)
+	remotelogs.Println("CACHE", "loading database from '"+dir+"' ...")
+	for i := 0; i < CountFileDB; i++ {
+		var db = NewFileListDB()
+		err = db.Open(dir + "/db-" + types.String(i) + ".db")
+		if err != nil {
+			return err
+		}
 
-	this.db = db
+		err = db.Init()
+		if err != nil {
+			return err
+		}
 
-	// TODO 耗时过长，暂时不整理数据库
+		this.dbList[i] = db
-	/**_, err = db.Exec("VACUUM")
-	if err != nil {
-		return err
-	}**/
-
-	// 创建
-	err = this.initTables(db, 1)
-	if err != nil {
-		return errors.New("init tables failed: " + err.Error())
-	}
-
-	// 清除旧表
-	// 这个一定要在initTables()之后，因为老的数据需要转移
-	this.oldTables = []string{
-		"cacheItems",
-		"cacheItems_v2",
-	}
-	err = this.removeOldTables()
-	if err != nil {
-		remotelogs.Warn("CACHE", "clean old tables failed: "+err.Error())
 	}
 
 	// 读取总数量
-	row := this.db.QueryRow(`SELECT COUNT(*) FROM "` + this.itemsTableName + `"`)
+	this.total = 0
-	if row.Err() != nil {
+	for _, db := range this.dbList {
-		return row.Err()
+		this.total += db.total
-	}
-	var total int64
-	err = row.Scan(&total)
-	if err != nil {
-		return err
-	}
-	this.total = total
-
-	// 常用语句
-	this.existsByHashStmt, err = this.db.Prepare(`SELECT "expiredAt" FROM "` + this.itemsTableName + `" WHERE "hash"=? AND expiredAt>? LIMIT 1`)
-	if err != nil {
-		return err
 	}
 
-	this.insertStmt, err = this.db.Prepare(`INSERT INTO "` + this.itemsTableName + `" ("hash", "key", "headerSize", "bodySize", "metaSize", "expiredAt", "staleAt", "host", "serverId", "createdAt") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
+	// 升级老版本数据库
-	if err != nil {
+	goman.New(func() {
-		return err
+		this.upgradeOldDB()
-	}
+	})
-
-	this.selectByHashStmt, err = this.db.Prepare(`SELECT "key", "headerSize", "bodySize", "metaSize", "expiredAt" FROM "` + this.itemsTableName + `" WHERE "hash"=? LIMIT 1`)
-	if err != nil {
-		return err
-	}
-
-	this.deleteByHashStmt, err = this.db.Prepare(`DELETE FROM "` + this.itemsTableName + `" WHERE "hash"=?`)
-	if err != nil {
-		return err
-	}
-
-	this.statStmt, err = this.db.Prepare(`SELECT COUNT(*), IFNULL(SUM(headerSize+bodySize+metaSize), 0), IFNULL(SUM(headerSize+bodySize), 0) FROM "` + this.itemsTableName + `"`)
-	if err != nil {
-		return err
-	}
-
-	this.purgeStmt, err = this.db.Prepare(`SELECT "hash" FROM "` + this.itemsTableName + `" WHERE staleAt<=? LIMIT ?`)
-	if err != nil {
-		return err
-	}
-
-	this.deleteAllStmt, err = this.db.Prepare(`DELETE FROM "` + this.itemsTableName + `"`)
-	if err != nil {
-		return err
-	}
-
-	this.insertHitStmt, err = this.db.Prepare(`INSERT INTO "` + this.hitsTableName + `" ("hash", "week2Hits", "week") VALUES (?, 1, ?)`)
-
-	this.increaseHitStmt, err = this.db.Prepare(`INSERT INTO "` + this.hitsTableName + `" ("hash", "week2Hits", "week") VALUES (?, 1, ?) ON CONFLICT("hash") DO UPDATE SET "week1Hits"=IIF("week"=?, "week1Hits", "week2Hits"), "week2Hits"=IIF("week"=?, "week2Hits"+1, 1), "week"=?`)
-	if err != nil {
-		return err
-	}
-
-	this.deleteHitByHashStmt, err = this.db.Prepare(`DELETE FROM "` + this.hitsTableName + `" WHERE "hash"=?`)
-	if err != nil {
-		return err
-	}
-
-	this.lfuHitsStmt, err = this.db.Prepare(`SELECT "hash" FROM "` + this.hitsTableName + `" ORDER BY "week" ASC, "week1Hits"+"week2Hits" ASC LIMIT ?`)
-	if err != nil {
-		return err
-	}
-
-	this.isReady = true
 
 	return nil
 }
@@ -188,26 +96,22 @@ func (this *FileList) Reset() error {
 }
 
 func (this *FileList) Add(hash string, item *Item) error {
-	if !this.isReady {
+	var db = this.getDB(hash)
+
+	if !db.IsReady() {
 		return nil
 	}
 
-	if item.StaleAt == 0 {
+	err := db.Add(hash, item)
-		item.StaleAt = item.ExpiredAt
-	}
-
-	_, err := this.insertStmt.Exec(hash, item.Key, item.HeaderSize, item.BodySize, item.MetaSize, item.ExpiredAt, item.StaleAt, item.Host, item.ServerId, utils.UnixTime())
 	if err != nil {
 		return err
 	}
 
-	_, err = this.insertHitStmt.Exec(hash, timeutil.Format("YW"))
+	atomic.AddInt64(&this.total, 1)
-	if err != nil {
+
-		return err
+	// 这里不增加点击量，以减少对数据库的操作次数
-	}
 
 	this.memoryCache.Write(hash, 1, item.ExpiredAt)
-	atomic.AddInt64(&this.total, 1)
 
 	if this.onAdd != nil {
 		this.onAdd(item)
@@ -216,40 +120,36 @@ func (this *FileList) Add(hash string, item *Item) error {
 }
 
 func (this *FileList) Exist(hash string) (bool, error) {
-	if !this.isReady {
+	var db = this.getDB(hash)
+
+	if !db.IsReady() {
 		return false, nil
 	}
 
-	item := this.memoryCache.Read(hash)
+	var item = this.memoryCache.Read(hash)
 	if item != nil {
 		return true, nil
 	}
 
-	rows, err := this.existsByHashStmt.Query(hash, time.Now().Unix())
+	var row = db.existsByHashStmt.QueryRow(hash, time.Now().Unix())
+	if row.Err() != nil {
+		return false, nil
+	}
+
+	var expiredAt int64
+	err := row.Scan(&expiredAt)
 	if err != nil {
+		if err == sql.ErrNoRows {
+			err = nil
+		}
 		return false, err
 	}
-	defer func() {
+	this.memoryCache.Write(hash, 1, expiredAt)
-		_ = rows.Close()
+	return true, nil
-	}()
-	if rows.Next() {
-		var expiredAt int64
-		err = rows.Scan(&expiredAt)
-		if err != nil {
-			return false, nil
-		}
-		this.memoryCache.Write(hash, 1, expiredAt)
-		return true, nil
-	}
-	return false, nil
 }
 
 // CleanPrefix 清理某个前缀的缓存数据
 func (this *FileList) CleanPrefix(prefix string) error {
-	if !this.isReady {
-		return nil
-	}
-
 	if len(prefix) == 0 {
 		return nil
 	}
@@ -258,106 +158,48 @@ func (this *FileList) CleanPrefix(prefix string) error {
 		this.memoryCache.Clean()
 	}()
 
-	var count = int64(10000)
+	for _, db := range this.dbList {
-	var staleLife = 600             // TODO 需要可以设置
+		err := db.CleanPrefix(prefix)
-	var unixTime = utils.UnixTime() // 只删除当前的，不删除新的
-	for {
-		result, err := this.db.Exec(`UPDATE "`+this.itemsTableName+`" SET expiredAt=0,staleAt=? WHERE id IN (SELECT id FROM "`+this.itemsTableName+`" WHERE expiredAt>0 AND createdAt<=? AND INSTR("key", ?)=1 LIMIT `+types.String(count)+`)`, unixTime+int64(staleLife), unixTime, prefix)
 		if err != nil {
 			return err
 		}
-		affectedRows, err := result.RowsAffected()
-		if err != nil {
-			return err
-		}
-		if affectedRows < count {
-			return nil
-		}
 	}
+	return nil
 }
 
 func (this *FileList) Remove(hash string) error {
-	if !this.isReady {
+	_, err := this.remove(hash)
-		return nil
+	return err
-	}
-
-	// 从缓存中删除
-	this.memoryCache.Delete(hash)
-
-	row := this.selectByHashStmt.QueryRow(hash)
-	if row.Err() != nil {
-		return row.Err()
-	}
-
-	var item = &Item{Type: ItemTypeFile}
-	err := row.Scan(&item.Key, &item.HeaderSize, &item.BodySize, &item.MetaSize, &item.ExpiredAt)
-	if err != nil {
-		if err == sql.ErrNoRows {
-			return nil
-		}
-		return err
-	}
-
-	_, err = this.deleteByHashStmt.Exec(hash)
-	if err != nil {
-		return err
-	}
-
-	_, err = this.deleteHitByHashStmt.Exec(hash)
-	if err != nil {
-		return err
-	}
-
-	atomic.AddInt64(&this.total, -1)
-
-	if this.onRemove != nil {
-		this.onRemove(item)
-	}
-
-	return nil
 }
 
 // Purge 清理过期的缓存
 // count 每次遍历的最大数量，控制此数字可以保证每次清理的时候不用花太多时间
 // callback 每次发现过期key的调用
 func (this *FileList) Purge(count int, callback func(hash string) error) (int, error) {
-	if !this.isReady {
+	count /= CountFileDB
-		return 0, nil
-	}
-
 	if count <= 0 {
-		count = 1000
+		count = 100
 	}
 
-	rows, err := this.purgeStmt.Query(time.Now().Unix(), count)
-	if err != nil {
-		return 0, err
-	}
-
-	hashStrings := []string{}
 	var countFound = 0
-	for rows.Next() {
+	for _, db := range this.dbList {
-		var hash string
+		hashStrings, err := db.ListExpiredItems(count)
-		err = rows.Scan(&hash)
 		if err != nil {
-			_ = rows.Close()
+			return 0, nil
-			return 0, err
 		}
-		hashStrings = append(hashStrings, hash)
+		countFound += len(hashStrings)
-		countFound++
-	}
-	_ = rows.Close() // 不能使用defer，防止读写冲突
 
-	// 不在 rows.Next() 循环中操作是为了避免死锁
+		// 不在 rows.Next() 循环中操作是为了避免死锁
-	for _, hash := range hashStrings {
+		for _, hash := range hashStrings {
-		err = this.Remove(hash)
+			err = this.Remove(hash)
-		if err != nil {
+			if err != nil {
-			return 0, err
+				return 0, err
-		}
+			}
 
-		err = callback(hash)
+			err = callback(hash)
-		if err != nil {
+			if err != nil {
-			return 0, err
+				return 0, err
+			}
 		}
 	}
 
@@ -365,80 +207,80 @@ func (this *FileList) Purge(count int, callback func(hash string) error) (int, e
 }
 
 func (this *FileList) PurgeLFU(count int, callback func(hash string) error) error {
-	if !this.isReady {
+	count /= CountFileDB
-		return nil
-	}
-
 	if count <= 0 {
-		return nil
+		count = 100
 	}
 
-	rows, err := this.lfuHitsStmt.Query(count)
+	for _, db := range this.dbList {
-	if err != nil {
+		hashStrings, err := db.ListLFUItems(count)
-		return err
-	}
-
-	hashStrings := []string{}
-	var countFound = 0
-	for rows.Next() {
-		var hash string
-		err = rows.Scan(&hash)
-		if err != nil {
-			_ = rows.Close()
-			return err
-		}
-		hashStrings = append(hashStrings, hash)
-		countFound++
-	}
-	_ = rows.Close() // 不能使用defer，防止读写冲突
-
-	// 不在 rows.Next() 循环中操作是为了避免死锁
-	for _, hash := range hashStrings {
-		err = this.Remove(hash)
 		if err != nil {
 			return err
 		}
 
-		err = callback(hash)
+		// 不在 rows.Next() 循环中操作是为了避免死锁
-		if err != nil {
+		for _, hash := range hashStrings {
-			return err
+			notFound, err := this.remove(hash)
+			if err != nil {
+				return err
+			}
+			if notFound {
+				_, err = db.deleteHitByHashStmt.Exec(hash)
+				if err != nil {
+					return err
+				}
+			}
+
+			err = callback(hash)
+			if err != nil {
+				return err
+			}
 		}
 	}
 	return nil
 }
 
 func (this *FileList) CleanAll() error {
-	if !this.isReady {
+	defer this.memoryCache.Clean()
-		return nil
+
+	for _, db := range this.dbList {
+		err := db.CleanAll()
+		if err != nil {
+			return err
+		}
 	}
 
-	this.memoryCache.Clean()
-
-	_, err := this.deleteAllStmt.Exec()
-	if err != nil {
-		return err
-	}
 	atomic.StoreInt64(&this.total, 0)
+
 	return nil
 }
 
 func (this *FileList) Stat(check func(hash string) bool) (*Stat, error) {
-	if !this.isReady {
+	var result = &Stat{}
-		return &Stat{}, nil
+
+	for _, db := range this.dbList {
+		if !db.IsReady() {
+			return &Stat{}, nil
+		}
+
+		// 这里不设置过期时间、不使用 check 函数，目的是让查询更快速一些
+		_ = check
+
+		row := db.statStmt.QueryRow()
+		if row.Err() != nil {
+			return nil, row.Err()
+		}
+		var stat = &Stat{}
+		err := row.Scan(&stat.Count, &stat.Size, &stat.ValueSize)
+		if err != nil {
+			return nil, err
+		}
+		result.Count += stat.Count
+		result.Size += stat.Size
+		result.ValueSize += stat.ValueSize
 	}
 
-	// 这里不设置过期时间、不使用 check 函数，目的是让查询更快速一些
+	return result, nil
-	row := this.statStmt.QueryRow()
-	if row.Err() != nil {
-		return nil, row.Err()
-	}
-	stat := &Stat{}
-	err := row.Scan(&stat.Count, &stat.Size, &stat.ValueSize)
-	if err != nil {
-		return nil, err
-	}
-
-	return stat, nil
 }
 
 // Count 总数量
@@ -449,9 +291,13 @@ func (this *FileList) Count() (int64, error) {
 
 // IncreaseHit 增加点击量
 func (this *FileList) IncreaseHit(hash string) error {
-	var week = timeutil.Format("YW")
+	var db = this.getDB(hash)
-	_, err := this.increaseHitStmt.Exec(hash, week, week, week, week)
+
-	return err
+	if !db.IsReady() {
+		return nil
+	}
+
+	return db.IncreaseHit(hash)
 }
 
 // OnAdd 添加事件
@@ -465,162 +311,177 @@ func (this *FileList) OnRemove(f func(item *Item)) {
 }
 
 func (this *FileList) Close() error {
-	this.isClosed = true
-	this.isReady = false
-
 	this.memoryCache.Destroy()
 
-	if this.db != nil {
+	for _, db := range this.dbList {
-		_ = this.existsByHashStmt.Close()
+		if db != nil {
-		_ = this.insertStmt.Close()
+			_ = db.Close()
-		_ = this.selectByHashStmt.Close()
+		}
-		_ = this.deleteByHashStmt.Close()
-		_ = this.statStmt.Close()
-		_ = this.purgeStmt.Close()
-		_ = this.deleteAllStmt.Close()
-
-		_ = this.insertHitStmt.Close()
-		_ = this.increaseHitStmt.Close()
-		_ = this.deleteHitByHashStmt.Close()
-		_ = this.lfuHitsStmt.Close()
-
-		return this.db.Close()
 	}
+
 	return nil
 }
 
-// 初始化
+func (this *FileList) GetDBIndex(hash string) uint64 {
-func (this *FileList) initTables(db *sql.DB, times int) error {
+	return fnv.HashString(hash) % CountFileDB
-	// 检查是否存在
+}
-	_, err := db.Exec(`SELECT id FROM "` + this.itemsTableName + `" LIMIT 1`)
+
-	var notFound = false
+func (this *FileList) getDB(hash string) *FileListDB {
+	return this.dbList[fnv.HashString(hash)%CountFileDB]
+}
+
+func (this *FileList) remove(hash string) (notFound bool, err error) {
+	var db = this.getDB(hash)
+
+	if !db.IsReady() {
+		return false, nil
+	}
+
+	// 从缓存中删除
+	this.memoryCache.Delete(hash)
+
+	var row = db.selectByHashStmt.QueryRow(hash)
+	if row.Err() != nil {
+		if row.Err() == sql.ErrNoRows {
+			return true, nil
+		}
+		return false, row.Err()
+	}
+
+	var item = &Item{Type: ItemTypeFile}
+	err = row.Scan(&item.Key, &item.HeaderSize, &item.BodySize, &item.MetaSize, &item.ExpiredAt)
 	if err != nil {
-		notFound = true
+		if err == sql.ErrNoRows {
-	}
+			return true, nil
-
-	{
-		// expiredAt - 过期时间，用来判断有无过期
-		// staleAt - 陈旧最大时间，用来清理缓存
-		_, err := db.Exec(`CREATE TABLE IF NOT EXISTS "` + this.itemsTableName + `" (
-  "id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
-  "hash" varchar(32),
-  "key" varchar(1024),
-  "headerSize" integer DEFAULT 0,
-  "bodySize" integer DEFAULT 0,
-  "metaSize" integer DEFAULT 0,
-  "expiredAt" integer DEFAULT 0,
-  "staleAt" integer DEFAULT 0,
-  "createdAt" integer DEFAULT 0,
-  "host" varchar(128),
-  "serverId" integer
-);
-
-CREATE INDEX IF NOT EXISTS "createdAt"
-ON "` + this.itemsTableName + `" (
-  "createdAt" ASC
-);
-
-CREATE INDEX IF NOT EXISTS "expiredAt"
-ON "` + this.itemsTableName + `" (
-  "expiredAt" ASC
-);
-
-CREATE INDEX IF NOT EXISTS "staleAt"
-ON "` + this.itemsTableName + `" (
-  "staleAt" ASC
-);
-
-CREATE UNIQUE INDEX IF NOT EXISTS "hash"
-ON "` + this.itemsTableName + `" (
-  "hash" ASC
-);
-
-CREATE INDEX IF NOT EXISTS "serverId"
-ON "` + this.itemsTableName + `" (
-  "serverId" ASC
-);
-`)
-
-		if err != nil {
-			// 尝试删除重建
-			if times < 3 {
-				_, dropErr := db.Exec(`DROP TABLE "` + this.itemsTableName + `"`)
-				if dropErr == nil {
-					return this.initTables(db, times+1)
-				}
-				return err
-			}
-
-			return err
 		}
+		return false, err
 	}
 
-	// 如果数据为空，从老数据中加载数据
+	_, err = db.deleteByHashStmt.Exec(hash)
-	if notFound {
+	if err != nil {
-		// v2 => v3
+		return false, err
-		remotelogs.Println("CACHE", "transferring old data from v2 to v3 ...")
-		result, err := db.Exec(`INSERT INTO "` + this.itemsTableName + `" ("id", "hash", "key", "headerSize", "bodySize", "metaSize", "expiredAt", "createdAt", "host", "serverId", "staleAt") SELECT "id", "hash", "key", "headerSize", "bodySize", "metaSize", "expiredAt", "createdAt", "host", "serverId", "expiredAt"+600 FROM cacheItems_v2`)
-		if err == nil {
-			count, _ := result.RowsAffected()
-			remotelogs.Println("CACHE", "transfer old data from v2 to v3 finished, "+types.String(count)+" rows transferred")
-		}
 	}
 
-	{
+	atomic.AddInt64(&this.total, -1)
-		_, err := db.Exec(`CREATE TABLE IF NOT EXISTS "` + this.hitsTableName + `" (
-  "id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
-  "hash" varchar(32),
-  "week1Hits" integer DEFAULT 0,
-  "week2Hits" integer DEFAULT 0,
-  "week" varchar(6)
-);
 
-CREATE UNIQUE INDEX IF NOT EXISTS "hits_hash"
+	_, err = db.deleteHitByHashStmt.Exec(hash)
-ON "` + this.hitsTableName + `" (
+	if err != nil {
-  "hash" ASC
+		return false, err
-);
-`)
-		if err != nil {
-			// 尝试删除重建
-			if times < 3 {
-				_, dropErr := db.Exec(`DROP TABLE "` + this.hitsTableName + `"`)
-				if dropErr == nil {
-					return this.initTables(db, times+1)
-				}
-				return err
-			}
-
-			return err
-		}
 	}
 
-	return nil
+	if this.onRemove != nil {
+		this.onRemove(item)
+	}
+
+	return false, nil
 }
 
-// 删除过期不用的表格
+// 升级老版本数据库
-func (this *FileList) removeOldTables() error {
+func (this *FileList) upgradeOldDB() {
-	rows, err := this.db.Query(`SELECT "name" FROM sqlite_master WHERE "type"='table'`)
+	if len(this.oldDir) == 0 {
+		return
+	}
+	_ = this.UpgradeV3(this.oldDir, false)
+}
+
+func (this *FileList) UpgradeV3(oldDir string, brokenOnError bool) error {
+	// index.db
+	var indexDBPath = oldDir + "/index.db"
+	_, err := os.Stat(indexDBPath)
+	if err != nil {
+		return nil
+	}
+	remotelogs.Println("CACHE", "upgrading local database from '"+oldDir+"' ...")
+
+	defer func() {
+		_ = os.Remove(indexDBPath)
+		remotelogs.Println("CACHE", "upgrading local database finished")
+	}()
+
+	db, err := sql.Open("sqlite3", "file:"+indexDBPath+"?cache=shared&mode=rwc&_journal_mode=WAL&_sync=OFF")
 	if err != nil {
 		return err
 	}
+
 	defer func() {
-		_ = rows.Close()
+		_ = db.Close()
 	}()
-	for rows.Next() {
+
-		var name string
+	var isFinished = false
-		err = rows.Scan(&name)
+	var offset = 0
+	var count = 10000
+
+	for {
+		if isFinished {
+			break
+		}
+
+		err = func() error {
+			defer func() {
+				offset += count
+			}()
+
+			rows, err := db.Query(`SELECT "hash", "key", "headerSize", "bodySize", "metaSize", "expiredAt", "staleAt", "createdAt", "host", "serverId" FROM "cacheItems_v3" ORDER BY "id" ASC LIMIT ?, ?`, offset, count)
+			if err != nil {
+				return err
+			}
+			defer func() {
+				_ = rows.Close()
+			}()
+
+			var hash = ""
+			var key = ""
+			var headerSize int64
+			var bodySize int64
+			var metaSize int64
+			var expiredAt int64
+			var staleAt int64
+			var createdAt int64
+			var host string
+			var serverId int64
+
+			isFinished = true
+
+			for rows.Next() {
+				isFinished = false
+
+				err = rows.Scan(&hash, &key, &headerSize, &bodySize, &metaSize, &expiredAt, &staleAt, &createdAt, &host, &serverId)
+				if err != nil {
+					if brokenOnError {
+						return err
+					}
+					return nil
+				}
+
+				err = this.Add(hash, &Item{
+					Type:       ItemTypeFile,
+					Key:        key,
+					ExpiredAt:  expiredAt,
+					StaleAt:    staleAt,
+					HeaderSize: headerSize,
+					BodySize:   bodySize,
+					MetaSize:   metaSize,
+					Host:       host,
+					ServerId:   serverId,
+					Week1Hits:  0,
+					Week2Hits:  0,
+					Week:       0,
+				})
+				if err != nil {
+					if brokenOnError {
+						return err
+					}
+				}
+			}
+
+			return nil
+		}()
 		if err != nil {
 			return err
 		}
-		if lists.ContainsString(this.oldTables, name) {
-			// 异步执行
-			goman.New(func() {
-				remotelogs.Println("CACHE", "remove old table '"+name+"' ...")
-				_, _ = this.db.Exec(`DROP TABLE "` + name + `"`)
-				remotelogs.Println("CACHE", "remove old table '"+name+"' done")
-			})
-		}
 
+		time.Sleep(1 * time.Second)
 	}
+
 	return nil
 }

internal/caches/list_file_db.go

@@ -0,0 +1,474 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package caches
+
+import (
+	"database/sql"
+	"errors"
+	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
+	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"github.com/TeaOSLab/EdgeNode/internal/utils/dbs"
+	"github.com/iwind/TeaGo/types"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+	"runtime"
+	"strings"
+	"time"
+)
+
+type FileListDB struct {
+	readDB  *dbs.DB
+	writeDB *dbs.DB
+
+	itemsTableName string
+	hitsTableName  string
+
+	total int64
+
+	isClosed bool
+	isReady  bool
+
+	// cacheItems
+	existsByHashStmt   *dbs.Stmt // 根据hash检查是否存在
+	insertStmt         *dbs.Stmt // 写入数据
+	selectByHashStmt   *dbs.Stmt // 使用hash查询数据
+	deleteByHashStmt   *dbs.Stmt // 根据hash删除数据
+	statStmt           *dbs.Stmt // 统计
+	purgeStmt          *dbs.Stmt // 清理
+	deleteAllStmt      *dbs.Stmt // 删除所有数据
+	listOlderItemsStmt *dbs.Stmt // 读取较早存储的缓存
+
+	// hits
+	insertHitStmt       *dbs.Stmt // 写入数据
+	increaseHitStmt     *dbs.Stmt // 增加点击量
+	deleteHitByHashStmt *dbs.Stmt // 根据hash删除数据
+	lfuHitsStmt         *dbs.Stmt // 读取老的数据
+}
+
+func NewFileListDB() *FileListDB {
+	return &FileListDB{}
+}
+
+func (this *FileListDB) Open(dbPath string) error {
+	// write db
+	writeDB, err := sql.Open("sqlite3", "file:"+dbPath+"?cache=private&mode=rwc&_journal_mode=WAL&_sync=OFF&_cache_size=32000&_secure_delete=FAST")
+	if err != nil {
+		return errors.New("open write database failed: " + err.Error())
+	}
+
+	writeDB.SetMaxOpenConns(1)
+
+	// TODO 耗时过长，暂时不整理数据库
+	// TODO 需要根据行数来判断是否VACUUM
+	/**_, err = db.Exec("VACUUM")
+	if err != nil {
+		return err
+	}**/
+
+	this.writeDB = dbs.NewDB(writeDB)
+
+	if teaconst.EnableDBStat {
+		this.writeDB.EnableStat(true)
+	}
+
+	// read db
+	readDB, err := sql.Open("sqlite3", "file:"+dbPath+"?cache=private&mode=ro&_journal_mode=WAL&_sync=OFF&_cache_size=32000")
+	if err != nil {
+		return errors.New("open read database failed: " + err.Error())
+	}
+
+	readDB.SetMaxOpenConns(runtime.NumCPU())
+
+	this.readDB = dbs.NewDB(readDB)
+
+	if teaconst.EnableDBStat {
+		this.readDB.EnableStat(true)
+	}
+
+	return nil
+}
+
+func (this *FileListDB) Init() error {
+	this.itemsTableName = "cacheItems"
+	this.hitsTableName = "hits"
+
+	// 创建
+	var err = this.initTables(1)
+	if err != nil {
+		return errors.New("init tables failed: " + err.Error())
+	}
+
+	// 读取总数量
+	row := this.readDB.QueryRow(`SELECT COUNT(*) FROM "` + this.itemsTableName + `"`)
+	if row.Err() != nil {
+		return row.Err()
+	}
+	var total int64
+	err = row.Scan(&total)
+	if err != nil {
+		return err
+	}
+	this.total = total
+
+	// 常用语句
+	this.existsByHashStmt, err = this.readDB.Prepare(`SELECT "expiredAt" FROM "` + this.itemsTableName + `" INDEXED BY "hash" WHERE "hash"=? AND expiredAt>? LIMIT 1`)
+	if err != nil {
+		return err
+	}
+
+	this.insertStmt, err = this.writeDB.Prepare(`INSERT INTO "` + this.itemsTableName + `" ("hash", "key", "headerSize", "bodySize", "metaSize", "expiredAt", "staleAt", "host", "serverId", "createdAt") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
+	if err != nil {
+		return err
+	}
+
+	this.selectByHashStmt, err = this.readDB.Prepare(`SELECT "key", "headerSize", "bodySize", "metaSize", "expiredAt" FROM "` + this.itemsTableName + `" WHERE "hash"=? LIMIT 1`)
+	if err != nil {
+		return err
+	}
+
+	this.deleteByHashStmt, err = this.writeDB.Prepare(`DELETE FROM "` + this.itemsTableName + `" WHERE "hash"=?`)
+	if err != nil {
+		return err
+	}
+
+	this.statStmt, err = this.readDB.Prepare(`SELECT COUNT(*), IFNULL(SUM(headerSize+bodySize+metaSize), 0), IFNULL(SUM(headerSize+bodySize), 0) FROM "` + this.itemsTableName + `"`)
+	if err != nil {
+		return err
+	}
+
+	this.purgeStmt, err = this.readDB.Prepare(`SELECT "hash" FROM "` + this.itemsTableName + `" WHERE staleAt<=? LIMIT ?`)
+	if err != nil {
+		return err
+	}
+
+	this.deleteAllStmt, err = this.writeDB.Prepare(`DELETE FROM "` + this.itemsTableName + `"`)
+	if err != nil {
+		return err
+	}
+
+	this.listOlderItemsStmt, err = this.readDB.Prepare(`SELECT "hash" FROM "` + this.itemsTableName + `" ORDER BY "id" ASC LIMIT ?`)
+
+	this.insertHitStmt, err = this.writeDB.Prepare(`INSERT INTO "` + this.hitsTableName + `" ("hash", "week2Hits", "week") VALUES (?, 1, ?)`)
+
+	this.increaseHitStmt, err = this.writeDB.Prepare(`INSERT INTO "` + this.hitsTableName + `" ("hash", "week2Hits", "week") VALUES (?, 1, ?) ON CONFLICT("hash") DO UPDATE SET "week1Hits"=IIF("week"=?, "week1Hits", "week2Hits"), "week2Hits"=IIF("week"=?, "week2Hits"+1, 1), "week"=?`)
+	if err != nil {
+		return err
+	}
+
+	this.deleteHitByHashStmt, err = this.writeDB.Prepare(`DELETE FROM "` + this.hitsTableName + `" WHERE "hash"=?`)
+	if err != nil {
+		return err
+	}
+
+	this.lfuHitsStmt, err = this.readDB.Prepare(`SELECT "hash" FROM "` + this.hitsTableName + `" ORDER BY "week" ASC, "week1Hits"+"week2Hits" ASC LIMIT ?`)
+	if err != nil {
+		return err
+	}
+
+	this.isReady = true
+
+	return nil
+}
+
+func (this *FileListDB) IsReady() bool {
+	return this.isReady
+}
+
+func (this *FileListDB) Total() int64 {
+	return this.total
+}
+
+func (this *FileListDB) Add(hash string, item *Item) error {
+	if item.StaleAt == 0 {
+		item.StaleAt = item.ExpiredAt
+	}
+
+	// 放入队列
+	_, err := this.insertStmt.Exec(hash, item.Key, item.HeaderSize, item.BodySize, item.MetaSize, item.ExpiredAt, item.StaleAt, item.Host, item.ServerId, utils.UnixTime())
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (this *FileListDB) ListExpiredItems(count int) (hashList []string, err error) {
+	if !this.isReady {
+		return nil, nil
+	}
+
+	if count <= 0 {
+		count = 100
+	}
+
+	rows, err := this.purgeStmt.Query(time.Now().Unix(), count)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		_ = rows.Close()
+	}()
+
+	for rows.Next() {
+		var hash string
+		err = rows.Scan(&hash)
+		if err != nil {
+			return nil, err
+		}
+		hashList = append(hashList, hash)
+	}
+	return hashList, nil
+}
+
+func (this *FileListDB) ListLFUItems(count int) (hashList []string, err error) {
+	if !this.isReady {
+		return nil, nil
+	}
+
+	if count <= 0 {
+		count = 100
+	}
+
+	hashList, err = this.listLFUItems(count)
+	if err != nil {
+		return
+	}
+
+	if len(hashList) > count/2 {
+		return
+	}
+
+	// 不足补齐
+	olderHashList, err := this.listOlderItems(count - len(hashList))
+	if err != nil {
+		return nil, err
+	}
+	hashList = append(hashList, olderHashList...)
+	return
+}
+
+func (this *FileListDB) IncreaseHit(hash string) error {
+	var week = timeutil.Format("YW")
+	_, err := this.increaseHitStmt.Exec(hash, week, week, week, week)
+	return err
+}
+
+func (this *FileListDB) CleanPrefix(prefix string) error {
+	if !this.isReady {
+		return nil
+	}
+	var count = int64(10000)
+	var staleLife = 600             // TODO 需要可以设置
+	var unixTime = utils.UnixTime() // 只删除当前的，不删除新的
+	for {
+		result, err := this.writeDB.Exec(`UPDATE "`+this.itemsTableName+`" SET expiredAt=0,staleAt=? WHERE id IN (SELECT id FROM "`+this.itemsTableName+`" WHERE expiredAt>0 AND createdAt<=? AND INSTR("key", ?)=1 LIMIT `+types.String(count)+`)`, unixTime+int64(staleLife), unixTime, prefix)
+		if err != nil {
+			return err
+		}
+		affectedRows, err := result.RowsAffected()
+		if err != nil {
+			return err
+		}
+		if affectedRows < count {
+			return nil
+		}
+	}
+}
+
+func (this *FileListDB) CleanAll() error {
+	if !this.isReady {
+		return nil
+	}
+
+	_, err := this.deleteAllStmt.Exec()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (this *FileListDB) Close() error {
+	this.isClosed = true
+	this.isReady = false
+
+	if this.existsByHashStmt != nil {
+		_ = this.existsByHashStmt.Close()
+	}
+	if this.insertStmt != nil {
+		_ = this.insertStmt.Close()
+	}
+	if this.selectByHashStmt != nil {
+		_ = this.selectByHashStmt.Close()
+	}
+	if this.deleteByHashStmt != nil {
+		_ = this.deleteByHashStmt.Close()
+	}
+	if this.statStmt != nil {
+		_ = this.statStmt.Close()
+	}
+	if this.purgeStmt != nil {
+		_ = this.purgeStmt.Close()
+	}
+	if this.deleteAllStmt != nil {
+		_ = this.deleteAllStmt.Close()
+	}
+	if this.listOlderItemsStmt != nil {
+		_ = this.listOlderItemsStmt.Close()
+	}
+
+	if this.insertHitStmt != nil {
+		_ = this.insertHitStmt.Close()
+	}
+	if this.increaseHitStmt != nil {
+		_ = this.increaseHitStmt.Close()
+	}
+	if this.deleteHitByHashStmt != nil {
+		_ = this.deleteHitByHashStmt.Close()
+	}
+	if this.lfuHitsStmt != nil {
+		_ = this.lfuHitsStmt.Close()
+	}
+
+	var errStrings []string
+
+	if this.readDB != nil {
+		err := this.readDB.Close()
+		if err != nil {
+			errStrings = append(errStrings, err.Error())
+		}
+	}
+
+	if this.writeDB != nil {
+		err := this.writeDB.Close()
+		if err != nil {
+			errStrings = append(errStrings, err.Error())
+		}
+	}
+
+	if len(errStrings) == 0 {
+		return nil
+	}
+	return errors.New("close database failed: " + strings.Join(errStrings, ", "))
+}
+
+// 初始化
+func (this *FileListDB) initTables(times int) error {
+	{
+		// expiredAt - 过期时间，用来判断有无过期
+		// staleAt - 过时缓存最大时间，用来清理缓存
+		_, err := this.writeDB.Exec(`CREATE TABLE IF NOT EXISTS "` + this.itemsTableName + `" (
+  "id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
+  "hash" varchar(32),
+  "key" varchar(1024),
+  "tag" varchar(64),
+  "headerSize" integer DEFAULT 0,
+  "bodySize" integer DEFAULT 0,
+  "metaSize" integer DEFAULT 0,
+  "expiredAt" integer DEFAULT 0,
+  "staleAt" integer DEFAULT 0,
+  "createdAt" integer DEFAULT 0,
+  "host" varchar(128),
+  "serverId" integer
+);
+
+DROP INDEX IF EXISTS "createdAt";
+DROP INDEX IF EXISTS "expiredAt";
+DROP INDEX IF EXISTS "serverId";
+
+CREATE INDEX IF NOT EXISTS "staleAt"
+ON "` + this.itemsTableName + `" (
+  "staleAt" ASC
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS "hash"
+ON "` + this.itemsTableName + `" (
+  "hash" ASC
+);
+`)
+
+		if err != nil {
+			// 尝试删除重建
+			if times < 3 {
+				_, dropErr := this.writeDB.Exec(`DROP TABLE "` + this.itemsTableName + `"`)
+				if dropErr == nil {
+					return this.initTables(times + 1)
+				}
+				return err
+			}
+
+			return err
+		}
+	}
+
+	{
+		_, err := this.writeDB.Exec(`CREATE TABLE IF NOT EXISTS "` + this.hitsTableName + `" (
+  "id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
+  "hash" varchar(32),
+  "week1Hits" integer DEFAULT 0,
+  "week2Hits" integer DEFAULT 0,
+  "week" varchar(6)
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS "hits_hash"
+ON "` + this.hitsTableName + `" (
+  "hash" ASC
+);
+`)
+		if err != nil {
+			// 尝试删除重建
+			if times < 3 {
+				_, dropErr := this.writeDB.Exec(`DROP TABLE "` + this.hitsTableName + `"`)
+				if dropErr == nil {
+					return this.initTables(times + 1)
+				}
+				return err
+			}
+
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (this *FileListDB) listLFUItems(count int) (hashList []string, err error) {
+	rows, err := this.lfuHitsStmt.Query(count)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		_ = rows.Close()
+	}()
+
+	for rows.Next() {
+		var hash string
+		err = rows.Scan(&hash)
+		if err != nil {
+			return nil, err
+		}
+		hashList = append(hashList, hash)
+	}
+
+	return hashList, nil
+}
+
+func (this *FileListDB) listOlderItems(count int) (hashList []string, err error) {
+	rows, err := this.listOlderItemsStmt.Query(count)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		_ = rows.Close()
+	}()
+
+	for rows.Next() {
+		var hash string
+		err = rows.Scan(&hash)
+		if err != nil {
+			return nil, err
+		}
+		hashList = append(hashList, hash)
+	}
+
+	return hashList, nil
+}

internal/caches/list_file_test.go

@@ -1,8 +1,9 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 
-package caches
+package caches_test
 
 import (
+	"github.com/TeaOSLab/EdgeNode/internal/caches"
 	"github.com/TeaOSLab/EdgeNode/internal/goman"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/rands"
@@ -15,23 +16,33 @@ import (
 )
 
 func TestFileList_Init(t *testing.T) {
-	list := NewFileList(Tea.Root + "/data")
+	var list = caches.NewFileList(Tea.Root + "/data/cache-index/p1")
 	err := list.Init()
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer func() {
+		_ = list.Close()
+	}()
 	t.Log("ok")
 }
 
 func TestFileList_Add(t *testing.T) {
-	list := NewFileList(Tea.Root + "/data")
+	var list = caches.NewFileList(Tea.Root + "/data/cache-index/p1").(*caches.FileList)
 	err := list.Init()
 	if err != nil {
 		t.Fatal(err)
 	}
-	err = list.Add(stringutil.Md5("123456"), &Item{
+
+	defer func() {
+		_ = list.Close()
+	}()
+
+	var hash = stringutil.Md5("123456")
+	t.Log("db index:", list.GetDBIndex(hash))
+	err = list.Add(hash, &caches.Item{
 		Key:        "123456",
-		ExpiredAt:  time.Now().Unix(),
+		ExpiredAt:  time.Now().Unix() + 1,
 		HeaderSize: 1,
 		MetaSize:   2,
 		BodySize:   3,
@@ -41,19 +52,27 @@ func TestFileList_Add(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+
+	t.Log(list.Exist(hash))
+
 	t.Log("ok")
 }
 
 func TestFileList_Add_Many(t *testing.T) {
-	list := NewFileList(Tea.Root + "/data")
+	var list = caches.NewFileList(Tea.Root + "/data/cache-index/p1")
 	err := list.Init()
 	if err != nil {
 		t.Fatal(err)
 	}
+
+	defer func() {
+		_ = list.Close()
+	}()
+
 	before := time.Now()
-	for i := 0; i < 2000_0000; i++ {
+	for i := 0; i < 100_000; i++ {
 		u := "https://edge.teaos.cn/123456" + strconv.Itoa(i)
-		_ = list.Add(stringutil.Md5(u), &Item{
+		_ = list.Add(stringutil.Md5(u), &caches.Item{
 			Key:        u,
 			ExpiredAt:  time.Now().Unix() + 3600,
 			HeaderSize: 1,
@@ -72,36 +91,46 @@ func TestFileList_Add_Many(t *testing.T) {
 }
 
 func TestFileList_Exist(t *testing.T) {
-	list := NewFileList(Tea.Root + "/data")
+	var list = caches.NewFileList(Tea.Root + "/data/cache-index/p1").(*caches.FileList)
 	err := list.Init()
 	if err != nil {
 		t.Fatal(err)
 	}
-	before := time.Now()
+
+	defer func() {
+		_ = list.Close()
+	}()
+
+	total, _ := list.Count()
+	t.Log("total:", total)
+
+	var before = time.Now()
 	defer func() {
 		t.Log(time.Since(before).Seconds()*1000, "ms")
 	}()
 	{
-		exists, err := list.Exist(stringutil.Md5("123456"))
+		var hash = stringutil.Md5("123456")
+		exists, err := list.Exist(hash)
 		if err != nil {
 			t.Fatal(err)
 		}
-		t.Log("exists:", exists)
+		t.Log(hash, "exists:", exists)
 	}
 	{
-		exists, err := list.Exist(stringutil.Md5("http://edge.teaos.cn/1234561"))
+		var hash = stringutil.Md5("http://edge.teaos.cn/1234561")
+		exists, err := list.Exist(hash)
 		if err != nil {
 			t.Fatal(err)
 		}
-		t.Log("exists:", exists)
+		t.Log(hash, "exists:", exists)
 	}
 }
 
 func TestFileList_Exist_Many_DB(t *testing.T) {
 	// 测试在多个数据库下的性能
-	var listSlice = []ListInterface{}
+	var listSlice = []caches.ListInterface{}
 	for i := 1; i <= 10; i++ {
-		list := NewFileList(Tea.Root + "/data/data" + strconv.Itoa(i))
+		list := caches.NewFileList(Tea.Root + "/data/data" + strconv.Itoa(i))
 		err := list.Init()
 		if err != nil {
 			t.Fatal(err)
@@ -151,13 +180,18 @@ func TestFileList_Exist_Many_DB(t *testing.T) {
 }
 
 func TestFileList_CleanPrefix(t *testing.T) {
-	list := NewFileList(Tea.Root + "/data")
+	var list = caches.NewFileList(Tea.Root + "/data/cache-index/p1")
 	err := list.Init()
 	if err != nil {
 		t.Fatal(err)
 	}
+
+	defer func() {
+		_ = list.Close()
+	}()
+
 	before := time.Now()
-	err = list.CleanPrefix("1234")
+	err = list.CleanPrefix("123")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -165,12 +199,17 @@ func TestFileList_CleanPrefix(t *testing.T) {
 }
 
 func TestFileList_Remove(t *testing.T) {
-	list := NewFileList(Tea.Root + "/data")
+	var list = caches.NewFileList(Tea.Root + "/data/cache-index/p1").(*caches.FileList)
 	err := list.Init()
 	if err != nil {
 		t.Fatal(err)
 	}
-	list.OnRemove(func(item *Item) {
+
+	defer func() {
+		_ = list.Close()
+	}()
+
+	list.OnRemove(func(item *caches.Item) {
 		t.Logf("remove %#v", item)
 	})
 	err = list.Remove(stringutil.Md5("123456"))
@@ -178,30 +217,71 @@ func TestFileList_Remove(t *testing.T) {
 		t.Fatal(err)
 	}
 	t.Log("ok")
+
+	t.Log("===count===")
+	t.Log(list.Count())
 }
 
 func TestFileList_Purge(t *testing.T) {
-	list := NewFileList(Tea.Root + "/data")
+	var list = caches.NewFileList(Tea.Root + "/data/cache-index/p1")
 	err := list.Init()
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, err = list.Purge(2, func(hash string) error {
+	defer func() {
+		_ = list.Close()
+	}()
+
+	var count = 0
+	_, err = list.Purge(caches.CountFileDB*2, func(hash string) error {
 		t.Log(hash)
+		count++
 		return nil
 	})
 	if err != nil {
 		t.Fatal(err)
 	}
-	t.Log("ok")
+	t.Log("ok, purged", count, "items")
 }
 
-func TestFileList_Stat(t *testing.T) {
+func TestFileList_PurgeLFU(t *testing.T) {
-	list := NewFileList(Tea.Root + "/data")
+	var list = caches.NewFileList(Tea.Root + "/data/cache-index/p1")
 	err := list.Init()
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer func() {
+		_ = list.Close()
+	}()
+
+	err = list.IncreaseHit(stringutil.Md5("123456"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var count = 0
+	err = list.PurgeLFU(caches.CountFileDB*2, func(hash string) error {
+		t.Log(hash)
+		count++
+		return nil
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok, purged", count, "items")
+}
+
+func TestFileList_Stat(t *testing.T) {
+	var list = caches.NewFileList(Tea.Root + "/data/cache-index/p1")
+	err := list.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	defer func() {
+		_ = list.Close()
+	}()
+
 	stat, err := list.Stat(nil)
 	if err != nil {
 		t.Fatal(err)
@@ -210,7 +290,7 @@ func TestFileList_Stat(t *testing.T) {
 }
 
 func TestFileList_Count(t *testing.T) {
-	list := NewFileList(Tea.Root + "/data")
+	list := caches.NewFileList(Tea.Root + "/data")
 	err := list.Init()
 	if err != nil {
 		t.Fatal(err)
@@ -225,7 +305,7 @@ func TestFileList_Count(t *testing.T) {
 }
 
 func TestFileList_CleanAll(t *testing.T) {
-	list := NewFileList(Tea.Root + "/data")
+	list := caches.NewFileList(Tea.Root + "/data")
 	err := list.Init()
 	if err != nil {
 		t.Fatal(err)
@@ -238,58 +318,17 @@ func TestFileList_CleanAll(t *testing.T) {
 	t.Log(list.Count())
 }
 
-func TestFileList_Conflict(t *testing.T) {
-	list := NewFileList(Tea.Root + "/data").(*FileList)
-	err := list.Init()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	rows, err := list.purgeStmt.Query(time.Now().Unix(), 1000)
-	if err != nil {
-		t.Fatal(err)
-	}
-	go func() {
-		time.Sleep(5 * time.Second)
-		_ = rows.Close()
-	}()
-
-	t.Log("before exists")
-	t.Log(list.Exist("123456"))
-	t.Log("after exists")
-}
-
-func TestFileList_IIF(t *testing.T) {
-	list := NewFileList(Tea.Root + "/data").(*FileList)
-	err := list.Init()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	rows, err := list.db.Query("SELECT IIF(0, 2, 3)")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		_ = rows.Close()
-	}()
-
-	if rows.Next() {
-		var result int
-		err = rows.Scan(&result)
-		if err != nil {
-			t.Fatal(err)
-		}
-		t.Log("result:", result)
-	}
-}
-
 func TestFileList_IncreaseHit(t *testing.T) {
-	list := NewFileList(Tea.Root + "/data")
+	var list = caches.NewFileList(Tea.Root + "/data/cache-index/p1")
 	err := list.Init()
 	if err != nil {
 		t.Fatal(err)
 	}
+
+	defer func() {
+		_ = list.Close()
+	}()
+
 	var before = time.Now()
 	defer func() {
 		t.Log(time.Since(before).Seconds()*1000, "ms")
@@ -303,13 +342,32 @@ func TestFileList_IncreaseHit(t *testing.T) {
 	t.Log("ok")
 }
 
+func TestFileList_UpgradeV3(t *testing.T) {
+	var list = caches.NewFileList(Tea.Root + "/data/cache-index/p43").(*caches.FileList)
+	err := list.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	defer func() {
+		_ = list.Close()
+	}()
+
+	err = list.UpgradeV3("/Users/WorkSpace/EdgeProject/EdgeCache/p43", false)
+	if err != nil {
+		t.Log(err)
+		return
+	}
+	t.Log("ok")
+}
+
 func BenchmarkFileList_Exist(b *testing.B) {
-	list := NewFileList(Tea.Root + "/data")
+	var list = caches.NewFileList(Tea.Root + "/data/cache-index/p1")
 	err := list.Init()
 	if err != nil {
 		b.Fatal(err)
 	}
 	for i := 0; i < b.N; i++ {
-		_, _ = list.Exist("f0eb5b87e0b0041f3917002c0707475f")
+		_, _ = list.Exist("f0eb5b87e0b0041f3917002c0707475f" + types.String(i))
 	}
 }

internal/caches/manager.go

@@ -25,6 +25,7 @@ func init() {
 type Manager struct {
 	// 全局配置
 	MaxDiskCapacity   *shared.SizeCapacity
+	DiskDir           string
 	MaxMemoryCapacity *shared.SizeCapacity
 
 	policyMap  map[int64]*serverconfigs.HTTPCachePolicy // policyId => []*Policy
@@ -49,13 +50,18 @@ func (this *Manager) UpdatePolicies(newPolicies []*serverconfigs.HTTPCachePolicy
 
 	newPolicyIds := []int64{}
 	for _, policy := range newPolicies {
+		// 使用节点单独的缓存目录
+		if len(this.DiskDir) > 0 {
+			policy.UpdateDiskDir(this.DiskDir)
+		}
+
 		newPolicyIds = append(newPolicyIds, policy.Id)
 	}
 
 	// 停止旧有的
 	for _, oldPolicy := range this.policyMap {
 		if !lists.ContainsInt64(newPolicyIds, oldPolicy.Id) {
-			remotelogs.Error("CACHE", "remove policy "+strconv.FormatInt(oldPolicy.Id, 10))
+			remotelogs.Println("CACHE", "remove policy "+strconv.FormatInt(oldPolicy.Id, 10))
 			delete(this.policyMap, oldPolicy.Id)
 			storage, ok := this.storageMap[oldPolicy.Id]
 			if ok {
@@ -99,7 +105,19 @@ func (this *Manager) UpdatePolicies(newPolicies []*serverconfigs.HTTPCachePolicy
 		} else {
 			// 检查policy是否有变化
 			if !storage.Policy().IsSame(policy) {
-				remotelogs.Println("CACHE", "policy "+strconv.FormatInt(policy.Id, 10)+" changed")
+				// 检查是否可以直接修改
+				if storage.CanUpdatePolicy(policy) {
+					err := policy.Init()
+					if err != nil {
+						remotelogs.Error("CACHE", "reload policy '"+types.String(policy.Id)+"' failed: init policy failed: "+err.Error())
+						continue
+					}
+					remotelogs.Println("CACHE", "reload policy '"+types.String(policy.Id)+"'")
+					storage.UpdatePolicy(policy)
+					continue
+				}
+
+				remotelogs.Println("CACHE", "restart policy '"+types.String(policy.Id)+"'")
 
 				// 停止老的
 				storage.Stop()

internal/caches/manager_test.go

@@ -2,19 +2,20 @@ package caches
 
 import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/iwind/TeaGo/Tea"
 	"testing"
 )
 
 func TestManager_UpdatePolicies(t *testing.T) {
 	{
-		policies := []*serverconfigs.HTTPCachePolicy{}
+		var policies = []*serverconfigs.HTTPCachePolicy{}
 		SharedManager.UpdatePolicies(policies)
 		printManager(t)
 	}
 
 	{
-		policies := []*serverconfigs.HTTPCachePolicy{
+		var policies = []*serverconfigs.HTTPCachePolicy{
 			{
 				Id:   1,
 				Type: serverconfigs.CachePolicyStorageFile,
@@ -42,7 +43,7 @@ func TestManager_UpdatePolicies(t *testing.T) {
 	}
 
 	{
-		policies := []*serverconfigs.HTTPCachePolicy{
+		var policies = []*serverconfigs.HTTPCachePolicy{
 			{
 				Id:   1,
 				Type: serverconfigs.CachePolicyStorageFile,
@@ -71,6 +72,50 @@ func TestManager_UpdatePolicies(t *testing.T) {
 	}
 }
 
+func TestManager_ChangePolicy_Memory(t *testing.T) {
+	var policies = []*serverconfigs.HTTPCachePolicy{
+		{
+			Id:       1,
+			Type:     serverconfigs.CachePolicyStorageMemory,
+			Options:  map[string]interface{}{},
+			Capacity: &shared.SizeCapacity{Count: 1, Unit: shared.SizeCapacityUnitGB},
+		},
+	}
+	SharedManager.UpdatePolicies(policies)
+	SharedManager.UpdatePolicies([]*serverconfigs.HTTPCachePolicy{
+		{
+			Id:       1,
+			Type:     serverconfigs.CachePolicyStorageMemory,
+			Options:  map[string]interface{}{},
+			Capacity: &shared.SizeCapacity{Count: 2, Unit: shared.SizeCapacityUnitGB},
+		},
+	})
+}
+
+func TestManager_ChangePolicy_File(t *testing.T) {
+	var policies = []*serverconfigs.HTTPCachePolicy{
+		{
+			Id:       1,
+			Type:     serverconfigs.CachePolicyStorageFile,
+			Options:  map[string]interface{}{
+				"dir": Tea.Root + "/data/cache-index/p1",
+			},
+			Capacity: &shared.SizeCapacity{Count: 1, Unit: shared.SizeCapacityUnitGB},
+		},
+	}
+	SharedManager.UpdatePolicies(policies)
+	SharedManager.UpdatePolicies([]*serverconfigs.HTTPCachePolicy{
+		{
+			Id:       1,
+			Type:     serverconfigs.CachePolicyStorageFile,
+			Options:  map[string]interface{}{
+				"dir": Tea.Root + "/data/cache-index/p1",
+			},
+			Capacity: &shared.SizeCapacity{Count: 2, Unit: shared.SizeCapacityUnitGB},
+		},
+	})
+}
+
 func printManager(t *testing.T) {
 	t.Log("===manager==")
 	t.Log("storage:")

internal/caches/max_open_files.go

@@ -0,0 +1,98 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package caches
+
+import (
+	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
+	"github.com/TeaOSLab/EdgeNode/internal/goman"
+	"sync/atomic"
+	"time"
+)
+
+const (
+	minOpenFilesValue int32 = 2
+	maxOpenFilesValue int32 = 65535
+
+	modeSlow int32 = 1
+	modeFast int32 = 2
+)
+
+// MaxOpenFiles max open files manager
+type MaxOpenFiles struct {
+	step         int32
+	maxOpenFiles int32
+	ptr          *int32
+	ticker       *time.Ticker
+	mode         int32
+
+	lastOpens    int32
+	currentOpens int32
+}
+
+func NewMaxOpenFiles(step int32) *MaxOpenFiles {
+	if step <= 0 {
+		step = 2
+	}
+	var f = &MaxOpenFiles{
+		step:         step,
+		maxOpenFiles: 2,
+	}
+	if teaconst.DiskIsFast {
+		f.maxOpenFiles = 32
+	}
+	f.ptr = &f.maxOpenFiles
+	f.ticker = time.NewTicker(1 * time.Second)
+	f.init()
+	return f
+}
+
+func (this *MaxOpenFiles) init() {
+	goman.New(func() {
+		for range this.ticker.C {
+			var mod = atomic.LoadInt32(&this.mode)
+			switch mod {
+			case modeSlow:
+				// we decrease more quickly, with more steps
+				if atomic.AddInt32(this.ptr, -this.step*2) <= 0 {
+					atomic.StoreInt32(this.ptr, minOpenFilesValue)
+				}
+			case modeFast:
+				// we increase only when file opens increases
+				var currentOpens = atomic.LoadInt32(&this.currentOpens)
+				if currentOpens > this.lastOpens {
+					if atomic.AddInt32(this.ptr, this.step) >= maxOpenFilesValue {
+						atomic.StoreInt32(this.ptr, maxOpenFilesValue)
+					}
+				}
+				this.lastOpens = currentOpens
+				atomic.StoreInt32(&this.currentOpens, 0)
+			}
+
+			// reset mod
+			atomic.StoreInt32(&this.mode, 0)
+		}
+	})
+}
+
+func (this *MaxOpenFiles) Fast() {
+	if atomic.LoadInt32(&this.mode) == 0 {
+		this.mode = modeFast
+	}
+	atomic.AddInt32(&this.currentOpens, 1)
+}
+
+func (this *MaxOpenFiles) Slow() {
+	atomic.StoreInt32(&this.mode, modeSlow)
+}
+
+func (this *MaxOpenFiles) Max() int32 {
+	if atomic.LoadInt32(&this.mode) == modeSlow {
+		return 0
+	}
+
+	var v = atomic.LoadInt32(this.ptr)
+	if v <= minOpenFilesValue {
+		return minOpenFilesValue
+	}
+	return v
+}

internal/caches/max_open_files_test.go

@@ -0,0 +1,28 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package caches_test
+
+import (
+	"github.com/TeaOSLab/EdgeNode/internal/caches"
+	"testing"
+	"time"
+)
+
+func TestNewMaxOpenFiles(t *testing.T) {
+	var maxOpenFiles = caches.NewMaxOpenFiles(2)
+	maxOpenFiles.Fast()
+	t.Log(maxOpenFiles.Max())
+
+	maxOpenFiles.Fast()
+	time.Sleep(1 * time.Second)
+	t.Log(maxOpenFiles.Max())
+
+	maxOpenFiles.Slow()
+	t.Log(maxOpenFiles.Max())
+
+	maxOpenFiles.Slow()
+	t.Log(maxOpenFiles.Max())
+
+	maxOpenFiles.Slow()
+	t.Log(maxOpenFiles.Max())
+}

internal/caches/open_file.go

@@ -14,11 +14,12 @@ type OpenFile struct {
 	version int64
 }
 
-func NewOpenFile(fp *os.File, meta []byte, header []byte) *OpenFile {
+func NewOpenFile(fp *os.File, meta []byte, header []byte, version int64) *OpenFile {
 	return &OpenFile{
-		fp:     fp,
+		fp:      fp,
-		meta:   meta,
+		meta:    meta,
-		header: header,
+		header:  header,
+		version: version,
 	}
 }
 

internal/caches/open_file_cache.go

@@ -9,6 +9,7 @@ import (
 	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/types"
 	"path/filepath"
+	"runtime"
 	"sync"
 	"time"
 )
@@ -43,7 +44,7 @@ func NewOpenFileCache(maxSize int) (*OpenFileCache, error) {
 
 	goman.New(func() {
 		for event := range watcher.Events {
-			if event.Op&fsnotify.Chmod != fsnotify.Chmod {
+			if runtime.GOOS == "linux" || event.Op&fsnotify.Chmod != fsnotify.Chmod {
 				cache.Close(event.Name)
 			}
 		}
@@ -77,6 +78,7 @@ func (this *OpenFileCache) Put(filename string, file *OpenFile) {
 	} else {
 		_ = this.watcher.Add(filename)
 		pool = NewOpenFilePool(filename)
+		pool.version = file.version
 		this.poolMap[filename] = pool
 		success = pool.Put(file)
 	}

internal/caches/open_file_pool.go

@@ -45,7 +45,7 @@ func (this *OpenFilePool) Get() (*OpenFile, bool) {
 }
 
 func (this *OpenFilePool) Put(file *OpenFile) bool {
-	if file.version > 0 && file.version != this.version {
+	if this.version > 0 && file.version > 0 && file.version != this.version {
 		_ = file.Close()
 		return false
 	}

internal/caches/open_file_pool_test.go

@@ -11,7 +11,7 @@ func TestOpenFilePool_Get(t *testing.T) {
 	var pool = caches.NewOpenFilePool("a")
 	t.Log(pool.Filename())
 	t.Log(pool.Get())
-	t.Log(pool.Put(caches.NewOpenFile(nil, nil, []byte{})))
+	t.Log(pool.Put(caches.NewOpenFile(nil, nil, nil, 0)))
 	t.Log(pool.Get())
 	t.Log(pool.Get())
 }

internal/caches/partial_ranges.go

@@ -4,28 +4,37 @@ package caches
 
 import (
 	"encoding/json"
+	"errors"
+	"io/ioutil"
 )
 
 // PartialRanges 内容分区范围定义
 type PartialRanges struct {
-	ranges [][2]int64
+	Ranges [][2]int64 `json:"ranges"`
 }
 
 // NewPartialRanges 获取新对象
 func NewPartialRanges() *PartialRanges {
-	return &PartialRanges{ranges: [][2]int64{}}
+	return &PartialRanges{Ranges: [][2]int64{}}
 }
 
 // NewPartialRangesFromJSON 从JSON中解析范围
 func NewPartialRangesFromJSON(data []byte) (*PartialRanges, error) {
-	var rs = [][2]int64{}
+	var rs = NewPartialRanges()
 	err := json.Unmarshal(data, &rs)
 	if err != nil {
 		return nil, err
 	}
-	var r = NewPartialRanges()
+
-	r.ranges = rs
+	return rs, nil
-	return r, nil
+}
+
+func NewPartialRangesFromFile(path string) (*PartialRanges, error) {
+	data, err := ioutil.ReadFile(path)
+	if err != nil {
+		return nil, err
+	}
+	return NewPartialRangesFromJSON(data)
 }
 
 // Add 添加新范围
@@ -36,46 +45,41 @@ func (this *PartialRanges) Add(begin int64, end int64) {
 
 	var nr = [2]int64{begin, end}
 
-	var count = len(this.ranges)
+	var count = len(this.Ranges)
 	if count == 0 {
-		this.ranges = [][2]int64{nr}
+		this.Ranges = [][2]int64{nr}
 		return
 	}
 
 	// insert
 	// TODO 将来使用二分法改进
 	var index = -1
-	for i, r := range this.ranges {
+	for i, r := range this.Ranges {
 		if r[0] > begin || (r[0] == begin && r[1] >= end) {
 			index = i
-			this.ranges = append(this.ranges, [2]int64{})
+			this.Ranges = append(this.Ranges, [2]int64{})
-			copy(this.ranges[index+1:], this.ranges[index:])
+			copy(this.Ranges[index+1:], this.Ranges[index:])
-			this.ranges[index] = nr
+			this.Ranges[index] = nr
 			break
 		}
 	}
 
 	if index == -1 {
 		index = count
-		this.ranges = append(this.ranges, nr)
+		this.Ranges = append(this.Ranges, nr)
 	}
 
 	this.merge(index)
 }
 
-// Ranges 获取所有范围
-func (this *PartialRanges) Ranges() [][2]int64 {
-	return this.ranges
-}
-
 // Contains 检查是否包含某个范围
 func (this *PartialRanges) Contains(begin int64, end int64) bool {
-	if len(this.ranges) == 0 {
+	if len(this.Ranges) == 0 {
-		return true
+		return false
 	}
 
 	// TODO 使用二分法查找改进性能
-	for _, r2 := range this.ranges {
+	for _, r2 := range this.Ranges {
 		if r2[0] <= begin && r2[1] >= end {
 			return true
 		}
@@ -84,23 +88,65 @@ func (this *PartialRanges) Contains(begin int64, end int64) bool {
 	return false
 }
 
+// Nearest 查找最近的某个范围
+func (this *PartialRanges) Nearest(begin int64, end int64) (r [2]int64, ok bool) {
+	if len(this.Ranges) == 0 {
+		return
+	}
+
+	// TODO 使用二分法查找改进性能
+	for _, r2 := range this.Ranges {
+		if r2[0] <= begin && r2[1] > begin {
+			r = [2]int64{begin, this.min(end, r2[1])}
+			ok = true
+			return
+		}
+	}
+	return
+}
+
 // AsJSON 转换为JSON
 func (this *PartialRanges) AsJSON() ([]byte, error) {
-	return json.Marshal(this.ranges)
+	return json.Marshal(this)
+}
+
+// WriteToFile 写入到文件中
+func (this *PartialRanges) WriteToFile(path string) error {
+	data, err := this.AsJSON()
+	if err != nil {
+		return errors.New("convert to json failed: " + err.Error())
+	}
+	return ioutil.WriteFile(path, data, 0666)
+}
+
+// ReadFromFile 从文件中读取
+func (this *PartialRanges) ReadFromFile(path string) (*PartialRanges, error) {
+	data, err := ioutil.ReadFile(path)
+	if err != nil {
+		return nil, err
+	}
+	return NewPartialRangesFromJSON(data)
+}
+
+func (this *PartialRanges) Max() int64 {
+	if len(this.Ranges) > 0 {
+		return this.Ranges[len(this.Ranges)-1][1]
+	}
+	return 0
 }
 
 func (this *PartialRanges) merge(index int) {
 	// forward
 	var lastIndex = index
 	for i := index; i >= 1; i-- {
-		var curr = this.ranges[i]
+		var curr = this.Ranges[i]
-		var prev = this.ranges[i-1]
+		var prev = this.Ranges[i-1]
 		var w1 = this.w(curr)
 		var w2 = this.w(prev)
 		if w1+w2 >= this.max(curr[1], prev[1])-this.min(curr[0], prev[0])-1 {
 			prev = [2]int64{this.min(curr[0], prev[0]), this.max(curr[1], prev[1])}
-			this.ranges[i-1] = prev
+			this.Ranges[i-1] = prev
-			this.ranges = append(this.ranges[:i], this.ranges[i+1:]...)
+			this.Ranges = append(this.Ranges[:i], this.Ranges[i+1:]...)
 			lastIndex = i - 1
 		} else {
 			break
@@ -109,15 +155,15 @@ func (this *PartialRanges) merge(index int) {
 
 	// backward
 	index = lastIndex
-	for index < len(this.ranges)-1 {
+	for index < len(this.Ranges)-1 {
-		var curr = this.ranges[index]
+		var curr = this.Ranges[index]
-		var next = this.ranges[index+1]
+		var next = this.Ranges[index+1]
 		var w1 = this.w(curr)
 		var w2 = this.w(next)
 		if w1+w2 >= this.max(curr[1], next[1])-this.min(curr[0], next[0])-1 {
 			curr = [2]int64{this.min(curr[0], next[0]), this.max(curr[1], next[1])}
-			this.ranges = append(this.ranges[:index], this.ranges[index+1:]...)
+			this.Ranges = append(this.Ranges[:index], this.Ranges[index+1:]...)
-			this.ranges[index] = curr
+			this.Ranges[index] = curr
 		} else {
 			break
 		}

internal/caches/partial_ranges_test.go

@@ -21,7 +21,8 @@ func TestNewPartialRanges(t *testing.T) {
 	r.Add(200, 1000)
 	r.Add(200, 10040)
 
-	logs.PrintAsJSON(r.Ranges())
+	logs.PrintAsJSON(r.Ranges, t)
+	t.Log("max:", r.Max())
 }
 
 func TestNewPartialRanges1(t *testing.T) {
@@ -35,7 +36,7 @@ func TestNewPartialRanges1(t *testing.T) {
 	r.Add(200, 300)
 	r.Add(1, 1000)
 
-	var rs = r.Ranges()
+	var rs = r.Ranges
 	logs.PrintAsJSON(rs, t)
 	a.IsTrue(len(rs) == 1)
 	if len(rs) == 1 {
@@ -56,7 +57,7 @@ func TestNewPartialRanges2(t *testing.T) {
 	r.Add(303, 304)
 	r.Add(250, 400)
 
-	var rs = r.Ranges()
+	var rs = r.Ranges
 	logs.PrintAsJSON(rs, t)
 }
 
@@ -68,7 +69,7 @@ func TestNewPartialRanges3(t *testing.T) {
 	r.Add(200, 300)
 	r.Add(250, 400)
 
-	var rs = r.Ranges()
+	var rs = r.Ranges
 	logs.PrintAsJSON(rs, t)
 }
 
@@ -83,7 +84,7 @@ func TestNewPartialRanges4(t *testing.T) {
 	r.Add(410, 415)
 	r.Add(400, 409)
 
-	var rs = r.Ranges()
+	var rs = r.Ranges
 	logs.PrintAsJSON(rs, t)
 	t.Log(r.Contains(400, 416))
 }
@@ -93,7 +94,57 @@ func TestNewPartialRanges5(t *testing.T) {
 	for j := 0; j < 1000; j++ {
 		r.Add(int64(j), int64(j+100))
 	}
-	logs.PrintAsJSON(r.Ranges(), t)
+	logs.PrintAsJSON(r.Ranges, t)
+}
+
+func TestNewPartialRanges_Nearest(t *testing.T) {
+	{
+		// nearby
+		var r = caches.NewPartialRanges()
+		r.Add(301, 400)
+		r.Add(401, 500)
+		r.Add(501, 600)
+
+		t.Log(r.Nearest(100, 200))
+		t.Log(r.Nearest(300, 350))
+		t.Log(r.Nearest(302, 350))
+	}
+
+	{
+		// nearby
+		var r = caches.NewPartialRanges()
+		r.Add(301, 400)
+		r.Add(450, 500)
+		r.Add(550, 600)
+
+		t.Log(r.Nearest(100, 200))
+		t.Log(r.Nearest(300, 350))
+		t.Log(r.Nearest(302, 350))
+		t.Log(r.Nearest(302, 440))
+		t.Log(r.Nearest(302, 1000))
+	}
+}
+
+func TestNewPartialRanges_Large_Range(t *testing.T) {
+	var a = assert.NewAssertion(t)
+
+	var largeSize int64 = 10000000000000
+	t.Log(largeSize/1024/1024/1024, "G")
+
+	var r = caches.NewPartialRanges()
+	r.Add(1, largeSize)
+	jsonData, err := r.AsJSON()
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(string(jsonData))
+
+	r2, err := caches.NewPartialRangesFromJSON(jsonData)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	a.IsTrue(largeSize == r2.Ranges[0][1])
 }
 
 func TestNewPartialRanges_AsJSON(t *testing.T) {
@@ -111,7 +162,7 @@ func TestNewPartialRanges_AsJSON(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	t.Log(r2.Ranges())
+	t.Log(r2.Ranges)
 }
 
 func BenchmarkNewPartialRanges(b *testing.B) {

internal/caches/reader.go

@@ -1,5 +1,7 @@
 package caches
 
+import "github.com/TeaOSLab/EdgeNode/internal/utils/ranges"
+
 type ReaderFunc func(n int) (goNext bool, err error)
 
 type Reader interface {
@@ -36,6 +38,9 @@ type Reader interface {
 	// BodySize Body Size
 	BodySize() int64
 
+	// ContainsRange 是否包含某个区间内容
+	ContainsRange(r rangeutils.Range) (r2 rangeutils.Range, ok bool)
+
 	// Close 关闭
 	Close() error
 }

internal/caches/reader_file.go

@@ -3,6 +3,7 @@ package caches
 import (
 	"encoding/binary"
 	"errors"
+	rangeutils "github.com/TeaOSLab/EdgeNode/internal/utils/ranges"
 	"github.com/iwind/TeaGo/types"
 	"io"
 	"os"
@@ -66,17 +67,17 @@ func (this *FileReader) InitAutoDiscard(autoDiscard bool) error {
 
 	this.expiresAt = int64(binary.BigEndian.Uint32(buf[:SizeExpiresAt]))
 
-	status := types.Int(string(buf[SizeExpiresAt : SizeExpiresAt+SizeStatus]))
+	status := types.Int(string(buf[OffsetStatus : OffsetStatus+SizeStatus]))
 	if status < 100 || status > 999 {
 		return errors.New("invalid status")
 	}
 	this.status = status
 
 	// URL
-	urlLength := binary.BigEndian.Uint32(buf[SizeExpiresAt+SizeStatus : SizeExpiresAt+SizeStatus+SizeURLLength])
+	urlLength := binary.BigEndian.Uint32(buf[OffsetURLLength : OffsetURLLength+SizeURLLength])
 
 	// header
-	headerSize := int(binary.BigEndian.Uint32(buf[SizeExpiresAt+SizeStatus+SizeURLLength : SizeExpiresAt+SizeStatus+SizeURLLength+SizeHeaderLength]))
+	headerSize := int(binary.BigEndian.Uint32(buf[OffsetHeaderLength : OffsetHeaderLength+SizeHeaderLength]))
 	if headerSize == 0 {
 		return nil
 	}
@@ -85,7 +86,7 @@ func (this *FileReader) InitAutoDiscard(autoDiscard bool) error {
 
 	// body
 	this.bodyOffset = this.headerOffset + int64(headerSize)
-	bodySize := int(binary.BigEndian.Uint64(buf[SizeExpiresAt+SizeStatus+SizeURLLength+SizeHeaderLength : SizeExpiresAt+SizeStatus+SizeURLLength+SizeHeaderLength+SizeBodyLength]))
+	bodySize := int(binary.BigEndian.Uint64(buf[OffsetBodyLength : OffsetBodyLength+SizeBodyLength]))
 	if bodySize == 0 {
 		isOk = true
 		return nil
@@ -332,6 +333,16 @@ func (this *FileReader) ReadBodyRange(buf []byte, start int64, end int64, callba
 	return nil
 }
 
+// ContainsRange 是否包含某些区间内容
+func (this *FileReader) ContainsRange(r rangeutils.Range) (r2 rangeutils.Range, ok bool) {
+	return r, true
+}
+
+// FP 原始的文件句柄
+func (this *FileReader) FP() *os.File {
+	return this.fp
+}
+
 func (this *FileReader) Close() error {
 	if this.openFileCache != nil {
 		if this.isClosed {
@@ -342,7 +353,9 @@ func (this *FileReader) Close() error {
 		if this.openFile != nil {
 			this.openFileCache.Put(this.fp.Name(), this.openFile)
 		} else {
-			this.openFileCache.Put(this.fp.Name(), NewOpenFile(this.fp, this.meta, this.header))
+			var cacheMeta = make([]byte, len(this.meta))
+			copy(cacheMeta, this.meta)
+			this.openFileCache.Put(this.fp.Name(), NewOpenFile(this.fp, cacheMeta, this.header, this.LastModified()))
 		}
 		return nil
 	}
@@ -361,5 +374,12 @@ func (this *FileReader) readToBuff(fp *os.File, buf []byte) (ok bool, err error)
 func (this *FileReader) discard() error {
 	_ = this.fp.Close()
 	this.isClosed = true
+
+	// close open file cache
+	if this.openFileCache != nil {
+		this.openFileCache.Close(this.fp.Name())
+	}
+
+	// remove file
 	return os.Remove(this.fp.Name())
 }

internal/caches/reader_memory.go

@@ -2,6 +2,7 @@ package caches
 
 import (
 	"errors"
+	rangeutils "github.com/TeaOSLab/EdgeNode/internal/utils/ranges"
 	"io"
 )
 
@@ -24,7 +25,7 @@ func (this *MemoryReader) TypeName() string {
 }
 
 func (this *MemoryReader) ExpiresAt() int64 {
-	return this.item.ExpiredAt
+	return this.item.ExpiresAt
 }
 
 func (this *MemoryReader) Status() int {
@@ -197,6 +198,11 @@ func (this *MemoryReader) ReadBodyRange(buf []byte, start int64, end int64, call
 	return nil
 }
 
+// ContainsRange 是否包含某些区间内容
+func (this *MemoryReader) ContainsRange(r rangeutils.Range) (r2 rangeutils.Range, ok bool) {
+	return r, true
+}
+
 func (this *MemoryReader) Close() error {
 	return nil
 }

internal/caches/reader_memory_test.go

@@ -4,7 +4,7 @@ import "testing"
 
 func TestMemoryReader_Header(t *testing.T) {
 	item := &MemoryItem{
-		ExpiredAt:   0,
+		ExpiresAt:   0,
 		HeaderValue: []byte("0123456789"),
 		BodyValue:   nil,
 		Status:      2000,
@@ -22,7 +22,7 @@ func TestMemoryReader_Header(t *testing.T) {
 
 func TestMemoryReader_Body(t *testing.T) {
 	item := &MemoryItem{
-		ExpiredAt:   0,
+		ExpiresAt:   0,
 		HeaderValue: nil,
 		BodyValue:   []byte("0123456789"),
 		Status:      2000,
@@ -40,7 +40,7 @@ func TestMemoryReader_Body(t *testing.T) {
 
 func TestMemoryReader_Body_Range(t *testing.T) {
 	item := &MemoryItem{
-		ExpiredAt:   0,
+		ExpiresAt:   0,
 		HeaderValue: nil,
 		BodyValue:   []byte("0123456789"),
 		Status:      2000,

internal/caches/reader_partial_file.go

@@ -0,0 +1,144 @@
+package caches
+
+import (
+	"encoding/binary"
+	"errors"
+	rangeutils "github.com/TeaOSLab/EdgeNode/internal/utils/ranges"
+	"github.com/iwind/TeaGo/types"
+	"io"
+	"os"
+)
+
+type PartialFileReader struct {
+	*FileReader
+
+	ranges    *PartialRanges
+	rangePath string
+}
+
+func NewPartialFileReader(fp *os.File) *PartialFileReader {
+	return &PartialFileReader{
+		FileReader: NewFileReader(fp),
+		rangePath:  partialRangesFilePath(fp.Name()),
+	}
+}
+
+func (this *PartialFileReader) Init() error {
+	return this.InitAutoDiscard(true)
+}
+
+func (this *PartialFileReader) InitAutoDiscard(autoDiscard bool) error {
+	if this.openFile != nil {
+		this.meta = this.openFile.meta
+		this.header = this.openFile.header
+	}
+
+	isOk := false
+
+	if autoDiscard {
+		defer func() {
+			if !isOk {
+				_ = this.discard()
+			}
+		}()
+	}
+
+	// 读取Range
+	ranges, err := NewPartialRangesFromFile(this.rangePath)
+	if err != nil {
+		return errors.New("read ranges failed: " + err.Error())
+	}
+	this.ranges = ranges
+
+	var buf = this.meta
+	if len(buf) == 0 {
+		buf = make([]byte, SizeMeta)
+		ok, err := this.readToBuff(this.fp, buf)
+		if err != nil {
+			return err
+		}
+		if !ok {
+			return ErrNotFound
+		}
+		this.meta = buf
+	}
+
+	this.expiresAt = int64(binary.BigEndian.Uint32(buf[:SizeExpiresAt]))
+
+	status := types.Int(string(buf[SizeExpiresAt : SizeExpiresAt+SizeStatus]))
+	if status < 100 || status > 999 {
+		return errors.New("invalid status")
+	}
+	this.status = status
+
+	// URL
+	urlLength := binary.BigEndian.Uint32(buf[SizeExpiresAt+SizeStatus : SizeExpiresAt+SizeStatus+SizeURLLength])
+
+	// header
+	headerSize := int(binary.BigEndian.Uint32(buf[SizeExpiresAt+SizeStatus+SizeURLLength : SizeExpiresAt+SizeStatus+SizeURLLength+SizeHeaderLength]))
+	if headerSize == 0 {
+		return nil
+	}
+	this.headerSize = headerSize
+	this.headerOffset = int64(SizeMeta) + int64(urlLength)
+
+	// body
+	this.bodyOffset = this.headerOffset + int64(headerSize)
+	bodySize := int(binary.BigEndian.Uint64(buf[SizeExpiresAt+SizeStatus+SizeURLLength+SizeHeaderLength : SizeExpiresAt+SizeStatus+SizeURLLength+SizeHeaderLength+SizeBodyLength]))
+	if bodySize == 0 {
+		isOk = true
+		return nil
+	}
+	this.bodySize = int64(bodySize)
+
+	// read header
+	if this.openFileCache != nil && len(this.header) == 0 {
+		if headerSize > 0 && headerSize <= 512 {
+			this.header = make([]byte, headerSize)
+			_, err := this.fp.Seek(this.headerOffset, io.SeekStart)
+			if err != nil {
+				return err
+			}
+			_, err = this.readToBuff(this.fp, this.header)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	isOk = true
+
+	return nil
+}
+
+// ContainsRange 是否包含某些区间内容
+// 这里的 r 是已经经过格式化的
+func (this *PartialFileReader) ContainsRange(r rangeutils.Range) (r2 rangeutils.Range, ok bool) {
+	r2, ok = this.ranges.Nearest(r.Start(), r.End())
+	if ok && this.bodySize > 0 {
+		// 考虑可配置
+		var span int64 = 512 * 1024
+		if this.bodySize > 1<<30 {
+			span = 1 << 20
+		}
+
+		// 这里限制返回的最小缓存，防止因为返回的内容过小而导致请求过多
+		if r2.Length() < r.Length() && r2.Length() < span {
+			ok = false
+		}
+	}
+	return
+}
+
+// MaxLength 获取区间最大长度
+func (this *PartialFileReader) MaxLength() int64 {
+	if this.bodySize > 0 {
+		return this.bodySize
+	}
+	return this.ranges.Max() + 1
+}
+
+func (this *PartialFileReader) discard() error {
+	_ = os.Remove(this.rangePath)
+	return this.FileReader.discard()
+}

internal/caches/storage_file_test.go

@@ -62,7 +62,7 @@ func TestFileStorage_OpenWriter(t *testing.T) {
 
 	header := []byte("Header")
 	body := []byte("This is Body")
-	writer, err := storage.OpenWriter("my-key", time.Now().Unix()+86400, 200, -1, false)
+	writer, err := storage.OpenWriter("my-key", time.Now().Unix()+86400, 200, -1, -1, false)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -100,7 +100,7 @@ func TestFileStorage_OpenWriter_Partial(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	writer, err := storage.OpenWriter("my-key", time.Now().Unix()+86400, 200, -1, true)
+	writer, err := storage.OpenWriter("my-key", time.Now().Unix()+86400, 200, -1, -1, true)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -110,7 +110,7 @@ func TestFileStorage_OpenWriter_Partial(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	err = writer.WriteAt([]byte("Hello, World"), 0)
+	err = writer.WriteAt(0, []byte("Hello, World"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -139,7 +139,7 @@ func TestFileStorage_OpenWriter_HTTP(t *testing.T) {
 		t.Log(time.Since(now).Seconds()*1000, "ms")
 	}()
 
-	writer, err := storage.OpenWriter("my-http-response", time.Now().Unix()+86400, 200, -1, false)
+	writer, err := storage.OpenWriter("my-http-response", time.Now().Unix()+86400, 200, -1, -1, false)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -212,7 +212,7 @@ func TestFileStorage_Concurrent_Open_DifferentFile(t *testing.T) {
 		go func(i int) {
 			defer wg.Done()
 
-			writer, err := storage.OpenWriter("abc"+strconv.Itoa(i), time.Now().Unix()+3600, 200, -1, false)
+			writer, err := storage.OpenWriter("abc"+strconv.Itoa(i), time.Now().Unix()+3600, 200, -1, -1, false)
 			if err != nil {
 				if err != ErrFileIsWriting {
 					t.Error(err)
@@ -267,7 +267,7 @@ func TestFileStorage_Concurrent_Open_SameFile(t *testing.T) {
 		go func(i int) {
 			defer wg.Done()
 
-			writer, err := storage.OpenWriter("abc"+strconv.Itoa(0), time.Now().Unix()+3600, 200, -1, false)
+			writer, err := storage.OpenWriter("abc"+strconv.Itoa(0), time.Now().Unix()+3600, 200, -1, -1, false)
 			if err != nil {
 				if err != ErrFileIsWriting {
 					t.Error(err)
@@ -311,7 +311,7 @@ func TestFileStorage_Read(t *testing.T) {
 		t.Fatal(err)
 	}
 	now := time.Now()
-	reader, err := storage.OpenReader("my-key", false)
+	reader, err := storage.OpenReader("my-key", false, false)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -347,7 +347,7 @@ func TestFileStorage_Read_HTTP_Response(t *testing.T) {
 		t.Fatal(err)
 	}
 	now := time.Now()
-	reader, err := storage.OpenReader("my-http-response", false)
+	reader, err := storage.OpenReader("my-http-response", false, false)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -401,7 +401,7 @@ func TestFileStorage_Read_NotFound(t *testing.T) {
 	}
 	now := time.Now()
 	buf := make([]byte, 6)
-	reader, err := storage.OpenReader("my-key-10000", false)
+	reader, err := storage.OpenReader("my-key-10000", false, false)
 	if err != nil {
 		if err == ErrNotFound {
 			t.Log("cache not fund")
@@ -511,7 +511,7 @@ func TestFileStorage_Stop(t *testing.T) {
 }
 
 func TestFileStorage_DecodeFile(t *testing.T) {
-	storage := NewFileStorage(&serverconfigs.HTTPCachePolicy{
+	var storage = NewFileStorage(&serverconfigs.HTTPCachePolicy{
 		Id:   1,
 		IsOn: true,
 		Options: map[string]interface{}{
@@ -526,6 +526,11 @@ func TestFileStorage_DecodeFile(t *testing.T) {
 	t.Log(path)
 }
 
+func TestFileStorage_RemoveCacheFile(t *testing.T) {
+	var storage = NewFileStorage(nil)
+	t.Log(storage.removeCacheFile("/Users/WorkSpace/EdgeProject/EdgeCache/p43/15/7e/157eba0dfc6dfb6fbbf20b1f9e584674.cache"))
+}
+
 func BenchmarkFileStorage_Read(b *testing.B) {
 	runtime.GOMAXPROCS(1)
 
@@ -543,7 +548,7 @@ func BenchmarkFileStorage_Read(b *testing.B) {
 		b.Fatal(err)
 	}
 	for i := 0; i < b.N; i++ {
-		reader, err := storage.OpenReader("my-key", false)
+		reader, err := storage.OpenReader("my-key", false, false)
 		if err != nil {
 			b.Fatal(err)
 		}
@@ -559,8 +564,8 @@ func BenchmarkFileStorage_KeyPath(b *testing.B) {
 	runtime.GOMAXPROCS(1)
 
 	var storage = &FileStorage{
-		cacheConfig: &serverconfigs.HTTPFileCacheStorage{},
+		options: &serverconfigs.HTTPFileCacheStorage{},
-		policy:      &serverconfigs.HTTPCachePolicy{Id: 1},
+		policy:  &serverconfigs.HTTPCachePolicy{Id: 1},
 	}
 
 	for i := 0; i < b.N; i++ {

internal/caches/storage_interface.go

@@ -10,10 +10,14 @@ type StorageInterface interface {
 	Init() error
 
 	// OpenReader 读取缓存
-	OpenReader(key string, useStale bool) (reader Reader, err error)
+	OpenReader(key string, useStale bool, isPartial bool) (reader Reader, err error)
 
 	// OpenWriter 打开缓存写入器等待写入
-	OpenWriter(key string, expiredAt int64, status int, size int64, isPartial bool) (Writer, error)
+	// size 和 maxSize 可能为-1
+	OpenWriter(key string, expiresAt int64, status int, size int64, maxSize int64, isPartial bool) (Writer, error)
+
+	// OpenFlushWriter 打开从其他媒介直接刷入的写入器
+	OpenFlushWriter(key string, expiresAt int64, status int) (Writer, error)
 
 	// Delete 删除某个键值对应的缓存
 	Delete(key string) error
@@ -39,6 +43,18 @@ type StorageInterface interface {
 	// Policy 获取当前存储的Policy
 	Policy() *serverconfigs.HTTPCachePolicy
 
+	// UpdatePolicy 修改策略
+	UpdatePolicy(newPolicy *serverconfigs.HTTPCachePolicy)
+
+	// CanUpdatePolicy 检查策略是否可以更新
+	CanUpdatePolicy(newPolicy *serverconfigs.HTTPCachePolicy) bool
+
 	// AddToList 将缓存添加到列表
 	AddToList(item *Item)
+
+	// IgnoreKey 忽略某个Key，即不缓存某个Key
+	IgnoreKey(key string)
+
+	// CanSendfile 是否支持Sendfile
+	CanSendfile() bool
 }

internal/caches/storage_memory.go

@@ -7,10 +7,13 @@ import (
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/TeaOSLab/EdgeNode/internal/trackers"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	setutils "github.com/TeaOSLab/EdgeNode/internal/utils/sets"
+	"github.com/TeaOSLab/EdgeNode/internal/utils/sizes"
 	"github.com/TeaOSLab/EdgeNode/internal/zero"
 	"github.com/cespare/xxhash"
 	"github.com/iwind/TeaGo/rands"
 	"github.com/iwind/TeaGo/types"
+	"github.com/shirou/gopsutil/v3/load"
 	"math"
 	"runtime"
 	"strconv"
@@ -20,7 +23,7 @@ import (
 )
 
 type MemoryItem struct {
-	ExpiredAt   int64
+	ExpiresAt   int64
 	HeaderValue []byte
 	BodyValue   []byte
 	Status      int
@@ -29,7 +32,7 @@ type MemoryItem struct {
 }
 
 func (this *MemoryItem) IsExpired() bool {
-	return this.ExpiredAt < utils.UnixTime()
+	return this.ExpiresAt < utils.UnixTime()
 }
 
 type MemoryStorage struct {
@@ -40,31 +43,39 @@ type MemoryStorage struct {
 	locker *sync.RWMutex
 
 	valuesMap map[uint64]*MemoryItem // hash => item
-	dirtyChan chan string            // hash chan
+
+	dirtyChan      chan string // hash chan
+	dirtyQueueSize int
 
 	purgeTicker *utils.Ticker
 
 	totalSize     int64
 	writingKeyMap map[string]zero.Zero // key => bool
+
+	ignoreKeys *setutils.FixedSet
 }
 
 func NewMemoryStorage(policy *serverconfigs.HTTPCachePolicy, parentStorage StorageInterface) *MemoryStorage {
 	var dirtyChan chan string
+	var queueSize = policy.MemoryAutoFlushQueueSize
+
 	if parentStorage != nil {
-		var queueSize = policy.MemoryAutoFlushQueueSize
 		if queueSize <= 0 {
-			queueSize = 2048
+			queueSize = 2048 + int(policy.CapacityBytes()/sizes.G)*2048
 		}
+
 		dirtyChan = make(chan string, queueSize)
 	}
 	return &MemoryStorage{
-		parentStorage: parentStorage,
+		parentStorage:  parentStorage,
-		policy:        policy,
+		policy:         policy,
-		list:          NewMemoryList(),
+		list:           NewMemoryList(),
-		locker:        &sync.RWMutex{},
+		locker:         &sync.RWMutex{},
-		valuesMap:     map[uint64]*MemoryItem{},
+		valuesMap:      map[uint64]*MemoryItem{},
-		dirtyChan:     dirtyChan,
+		dirtyChan:      dirtyChan,
-		writingKeyMap: map[string]zero.Zero{},
+		dirtyQueueSize: queueSize,
+		writingKeyMap:  map[string]zero.Zero{},
+		ignoreKeys:     setutils.NewFixedSet(32768),
 	}
 }
 
@@ -79,33 +90,25 @@ func (this *MemoryStorage) Init() error {
 		atomic.AddInt64(&this.totalSize, -item.TotalSize())
 	})
 
-	var autoPurgeInterval = this.policy.MemoryAutoPurgeInterval
+	this.initPurgeTicker()
-	if autoPurgeInterval <= 0 {
-		autoPurgeInterval = 5
-	}
-
-	// 启动定时清理任务
-	this.purgeTicker = utils.NewTicker(time.Duration(autoPurgeInterval) * time.Second)
-	goman.New(func() {
-		for this.purgeTicker.Next() {
-			var tr = trackers.Begin("MEMORY_CACHE_STORAGE_PURGE_LOOP")
-			this.purgeLoop()
-			tr.End()
-		}
-	})
 
 	// 启动定时Flush memory to disk任务
-	goman.New(func() {
+	if this.parentStorage != nil {
-		for hash := range this.dirtyChan {
+		// TODO 应该根据磁盘性能决定线程数
-			this.flushItem(hash)
+		var threads = 1
+
+		for i := 0; i < threads; i++ {
+			goman.New(func() {
+				this.startFlush()
+			})
 		}
-	})
+	}
 
 	return nil
 }
 
 // OpenReader 读取缓存
-func (this *MemoryStorage) OpenReader(key string, useStale bool) (Reader, error) {
+func (this *MemoryStorage) OpenReader(key string, useStale bool, isPartial bool) (Reader, error) {
 	hash := this.hash(key)
 
 	this.locker.RLock()
@@ -115,7 +118,7 @@ func (this *MemoryStorage) OpenReader(key string, useStale bool) (Reader, error)
 		return nil, ErrNotFound
 	}
 
-	if useStale || (item.ExpiredAt > utils.UnixTime()) {
+	if useStale || (item.ExpiresAt > utils.UnixTime()) {
 		reader := NewMemoryReader(item)
 		err := reader.Init()
 		if err != nil {
@@ -145,15 +148,32 @@ func (this *MemoryStorage) OpenReader(key string, useStale bool) (Reader, error)
 }
 
 // OpenWriter 打开缓存写入器等待写入
-func (this *MemoryStorage) OpenWriter(key string, expiredAt int64, status int, size int64, isPartial bool) (Writer, error) {
+func (this *MemoryStorage) OpenWriter(key string, expiredAt int64, status int, size int64, maxSize int64, isPartial bool) (Writer, error) {
+	if this.ignoreKeys.Has(key) {
+		return nil, ErrEntityTooLarge
+	}
+
 	// TODO 内存缓存暂时不支持分块内容存储
 	if isPartial {
 		return nil, ErrFileIsWriting
 	}
-	return this.openWriter(key, expiredAt, status, size, true)
+	return this.openWriter(key, expiredAt, status, size, maxSize, true)
 }
 
-func (this *MemoryStorage) openWriter(key string, expiredAt int64, status int, size int64, isDirty bool) (Writer, error) {
+// OpenFlushWriter 打开从其他媒介直接刷入的写入器
+func (this *MemoryStorage) OpenFlushWriter(key string, expiresAt int64, status int) (Writer, error) {
+	return this.openWriter(key, expiresAt, status, -1, -1, true)
+}
+
+func (this *MemoryStorage) openWriter(key string, expiresAt int64, status int, size int64, maxSize int64, isDirty bool) (Writer, error) {
+	// 待写入队列是否已满
+	if isDirty &&
+		this.parentStorage != nil &&
+		this.dirtyQueueSize > 0 &&
+		len(this.dirtyChan) == this.dirtyQueueSize { // 缓存时间过长
+		return nil, ErrWritingQueueFull
+	}
+
 	this.locker.Lock()
 	defer this.locker.Unlock()
 
@@ -200,7 +220,7 @@ func (this *MemoryStorage) openWriter(key string, expiredAt int64, status int, s
 	}
 
 	isWriting = true
-	return NewMemoryWriter(this, key, expiredAt, status, isDirty, func() {
+	return NewMemoryWriter(this, key, expiresAt, status, isDirty, maxSize, func() {
 		this.locker.Lock()
 		delete(this.writingKeyMap, key)
 		this.locker.Unlock()
@@ -269,7 +289,7 @@ func (this *MemoryStorage) Stop() {
 		this.purgeTicker.Stop()
 	}
 
-	if this.parentStorage != nil && this.dirtyChan != nil {
+	if this.dirtyChan != nil {
 		close(this.dirtyChan)
 	}
 
@@ -277,6 +297,8 @@ func (this *MemoryStorage) Stop() {
 
 	this.locker.Unlock()
 
+	this.ignoreKeys.Reset()
+
 	// 回收内存
 	runtime.GC()
 
@@ -288,6 +310,26 @@ func (this *MemoryStorage) Policy() *serverconfigs.HTTPCachePolicy {
 	return this.policy
 }
 
+// UpdatePolicy 修改策略
+func (this *MemoryStorage) UpdatePolicy(newPolicy *serverconfigs.HTTPCachePolicy) {
+	var oldPolicy = this.policy
+	this.policy = newPolicy
+
+	if oldPolicy.MemoryAutoPurgeInterval != newPolicy.MemoryAutoPurgeInterval {
+		this.initPurgeTicker()
+	}
+
+	// 如果是空的，则清空
+	if newPolicy.CapacityBytes() == 0 {
+		_ = this.CleanAll()
+	}
+}
+
+// CanUpdatePolicy 检查策略是否可以更新
+func (this *MemoryStorage) CanUpdatePolicy(newPolicy *serverconfigs.HTTPCachePolicy) bool {
+	return true
+}
+
 // AddToList 将缓存添加到列表
 func (this *MemoryStorage) AddToList(item *Item) {
 	item.MetaSize = int64(len(item.Key)) + 128 /** 128是我们评估的数据结构的长度 **/
@@ -305,6 +347,16 @@ func (this *MemoryStorage) TotalMemorySize() int64 {
 	return atomic.LoadInt64(&this.totalSize)
 }
 
+// IgnoreKey 忽略某个Key，即不缓存某个Key
+func (this *MemoryStorage) IgnoreKey(key string) {
+	this.ignoreKeys.Push(key)
+}
+
+// CanSendfile 是否支持Sendfile
+func (this *MemoryStorage) CanSendfile() bool {
+	return false
+}
+
 // 计算Key Hash
 func (this *MemoryStorage) hash(key string) uint64 {
 	return xxhash.Sum64String(key)
@@ -373,7 +425,40 @@ func (this *MemoryStorage) purgeLoop() {
 	}
 }
 
-// Flush任务
+// 开始Flush任务
+func (this *MemoryStorage) startFlush() {
+	var statCount = 0
+	var writeDelayMS float64 = 0
+
+	for hash := range this.dirtyChan {
+		statCount++
+
+		if statCount == 100 {
+			statCount = 0
+
+			loadStat, err := load.Avg()
+			if err == nil && loadStat != nil {
+				if loadStat.Load1 > 10 {
+					writeDelayMS = 100
+				} else if loadStat.Load1 > 3 {
+					writeDelayMS = 50
+				} else if loadStat.Load1 > 2 {
+					writeDelayMS = 10
+				} else {
+					writeDelayMS = 0
+				}
+			}
+		}
+
+		this.flushItem(hash)
+
+		if writeDelayMS > 0 {
+			time.Sleep(time.Duration(writeDelayMS) * time.Millisecond)
+		}
+	}
+}
+
+// 单次Flush任务
 func (this *MemoryStorage) flushItem(key string) {
 	if this.parentStorage == nil {
 		return
@@ -391,7 +476,7 @@ func (this *MemoryStorage) flushItem(key string) {
 		return
 	}
 
-	writer, err := this.parentStorage.OpenWriter(key, item.ExpiredAt, item.Status, -1, false)
+	writer, err := this.parentStorage.OpenFlushWriter(key, item.ExpiresAt, item.Status)
 	if err != nil {
 		if !CanIgnoreErr(err) {
 			remotelogs.Error("CACHE", "flush items failed: open writer failed: "+err.Error())
@@ -417,16 +502,20 @@ func (this *MemoryStorage) flushItem(key string) {
 	if err != nil {
 		_ = writer.Discard()
 		remotelogs.Error("CACHE", "flush items failed: close writer failed: "+err.Error())
+		return
 	}
 
 	this.parentStorage.AddToList(&Item{
 		Type:       writer.ItemType(),
 		Key:        key,
-		ExpiredAt:  item.ExpiredAt,
+		ExpiredAt:  item.ExpiresAt,
 		HeaderSize: writer.HeaderSize(),
 		BodySize:   writer.BodySize(),
 	})
 
+	// 从内存中移除
+	_ = this.Delete(key)
+
 	return
 }
 
@@ -453,3 +542,25 @@ func (this *MemoryStorage) deleteWithoutLocker(key string) error {
 	_ = this.list.Remove(fmt.Sprintf("%d", hash))
 	return nil
 }
+
+func (this *MemoryStorage) initPurgeTicker() {
+	var autoPurgeInterval = this.policy.MemoryAutoPurgeInterval
+	if autoPurgeInterval <= 0 {
+		autoPurgeInterval = 5
+	}
+
+	// 启动定时清理任务
+
+	if this.purgeTicker != nil {
+		this.purgeTicker.Stop()
+	}
+
+	this.purgeTicker = utils.NewTicker(time.Duration(autoPurgeInterval) * time.Second)
+	goman.New(func() {
+		for this.purgeTicker.Next() {
+			var tr = trackers.Begin("MEMORY_CACHE_STORAGE_PURGE_LOOP")
+			this.purgeLoop()
+			tr.End()
+		}
+	})
+}

internal/caches/storage_memory_test.go

@@ -15,7 +15,7 @@ import (
 func TestMemoryStorage_OpenWriter(t *testing.T) {
 	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{}, nil)
 
-	writer, err := storage.OpenWriter("abc", time.Now().Unix()+60, 200, -1, false)
+	writer, err := storage.OpenWriter("abc", time.Now().Unix()+60, 200, -1, -1, false)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -25,7 +25,7 @@ func TestMemoryStorage_OpenWriter(t *testing.T) {
 	t.Log(storage.valuesMap)
 
 	{
-		reader, err := storage.OpenReader("abc", false)
+		reader, err := storage.OpenReader("abc", false, false)
 		if err != nil {
 			if err == ErrNotFound {
 				t.Log("not found: abc")
@@ -52,7 +52,7 @@ func TestMemoryStorage_OpenWriter(t *testing.T) {
 	}
 
 	{
-		_, err := storage.OpenReader("abc 2", false)
+		_, err := storage.OpenReader("abc 2", false, false)
 		if err != nil {
 			if err == ErrNotFound {
 				t.Log("not found: abc2")
@@ -62,13 +62,13 @@ func TestMemoryStorage_OpenWriter(t *testing.T) {
 		}
 	}
 
-	writer, err = storage.OpenWriter("abc", time.Now().Unix()+60, 200, -1, false)
+	writer, err = storage.OpenWriter("abc", time.Now().Unix()+60, 200, -1, -1, false)
 	if err != nil {
 		t.Fatal(err)
 	}
 	_, _ = writer.Write([]byte("Hello123"))
 	{
-		reader, err := storage.OpenReader("abc", false)
+		reader, err := storage.OpenReader("abc", false, false)
 		if err != nil {
 			if err == ErrNotFound {
 				t.Log("not found: abc")
@@ -97,13 +97,13 @@ func TestMemoryStorage_OpenReaderLock(t *testing.T) {
 			IsDone: true,
 		},
 	}
-	_, _ = storage.OpenReader("test", false)
+	_, _ = storage.OpenReader("test", false, false)
 }
 
 func TestMemoryStorage_Delete(t *testing.T) {
 	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{}, nil)
 	{
-		writer, err := storage.OpenWriter("abc", time.Now().Unix()+60, 200, -1, false)
+		writer, err := storage.OpenWriter("abc", time.Now().Unix()+60, 200, -1, -1, false)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -111,7 +111,7 @@ func TestMemoryStorage_Delete(t *testing.T) {
 		t.Log(len(storage.valuesMap))
 	}
 	{
-		writer, err := storage.OpenWriter("abc1", time.Now().Unix()+60, 200, -1, false)
+		writer, err := storage.OpenWriter("abc1", time.Now().Unix()+60, 200, -1, -1, false)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -126,7 +126,7 @@ func TestMemoryStorage_Stat(t *testing.T) {
 	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{}, nil)
 	expiredAt := time.Now().Unix() + 60
 	{
-		writer, err := storage.OpenWriter("abc", expiredAt, 200, -1, false)
+		writer, err := storage.OpenWriter("abc", expiredAt, 200, -1, -1, false)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -139,7 +139,7 @@ func TestMemoryStorage_Stat(t *testing.T) {
 		})
 	}
 	{
-		writer, err := storage.OpenWriter("abc1", expiredAt, 200, -1, false)
+		writer, err := storage.OpenWriter("abc1", expiredAt, 200, -1, -1, false)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -163,7 +163,7 @@ func TestMemoryStorage_CleanAll(t *testing.T) {
 	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{}, nil)
 	expiredAt := time.Now().Unix() + 60
 	{
-		writer, err := storage.OpenWriter("abc", expiredAt, 200, -1, false)
+		writer, err := storage.OpenWriter("abc", expiredAt, 200, -1, -1, false)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -175,7 +175,7 @@ func TestMemoryStorage_CleanAll(t *testing.T) {
 		})
 	}
 	{
-		writer, err := storage.OpenWriter("abc1", expiredAt, 200, -1, false)
+		writer, err := storage.OpenWriter("abc1", expiredAt, 200, -1, -1, false)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -198,7 +198,7 @@ func TestMemoryStorage_Purge(t *testing.T) {
 	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{}, nil)
 	expiredAt := time.Now().Unix() + 60
 	{
-		writer, err := storage.OpenWriter("abc", expiredAt, 200, -1, false)
+		writer, err := storage.OpenWriter("abc", expiredAt, 200, -1, -1, false)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -210,7 +210,7 @@ func TestMemoryStorage_Purge(t *testing.T) {
 		})
 	}
 	{
-		writer, err := storage.OpenWriter("abc1", expiredAt, 200, -1, false)
+		writer, err := storage.OpenWriter("abc1", expiredAt, 200, -1, -1, false)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -241,7 +241,7 @@ func TestMemoryStorage_Expire(t *testing.T) {
 	for i := 0; i < 1000; i++ {
 		expiredAt := time.Now().Unix() + int64(rands.Int(0, 60))
 		key := "abc" + strconv.Itoa(i)
-		writer, err := storage.OpenWriter(key, expiredAt, 200, -1, false)
+		writer, err := storage.OpenWriter(key, expiredAt, 200, -1, -1, false)
 		if err != nil {
 			t.Fatal(err)
 		}

internal/caches/utils_partial.go

@@ -0,0 +1,18 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package caches
+
+import "strings"
+
+// 获取 ranges 文件路径
+func partialRangesFilePath(path string) string {
+	// ranges路径
+	var dotIndex = strings.LastIndex(path, ".")
+	var rangePath = ""
+	if dotIndex < 0 {
+		rangePath = path + "@ranges.cache"
+	} else {
+		rangePath = path[:dotIndex] + "@ranges" + path[dotIndex:]
+	}
+	return rangePath
+}

internal/caches/writer.go

@@ -9,7 +9,7 @@ type Writer interface {
 	Write(data []byte) (n int, err error)
 
 	// WriteAt 在指定位置写入数据
-	WriteAt(data []byte, offset int64) error
+	WriteAt(offset int64, data []byte) error
 
 	// HeaderSize 写入的Header数据大小
 	HeaderSize() int64

internal/caches/writer_file.go

@@ -11,20 +11,24 @@ import (
 )
 
 type FileWriter struct {
+	storage    StorageInterface
 	rawWriter  *os.File
 	key        string
 	headerSize int64
 	bodySize   int64
 	expiredAt  int64
+	maxSize    int64
 	endFunc    func()
 	once       sync.Once
 }
 
-func NewFileWriter(rawWriter *os.File, key string, expiredAt int64, endFunc func()) *FileWriter {
+func NewFileWriter(storage StorageInterface, rawWriter *os.File, key string, expiredAt int64, maxSize int64, endFunc func()) *FileWriter {
 	return &FileWriter{
+		storage:   storage,
 		key:       key,
 		rawWriter: rawWriter,
 		expiredAt: expiredAt,
+		maxSize:   maxSize,
 		endFunc:   endFunc,
 	}
 }
@@ -60,6 +64,15 @@ func (this *FileWriter) WriteHeaderLength(headerLength int) error {
 func (this *FileWriter) Write(data []byte) (n int, err error) {
 	n, err = this.rawWriter.Write(data)
 	this.bodySize += int64(n)
+
+	if this.maxSize > 0 && this.bodySize > this.maxSize {
+		err = ErrEntityTooLarge
+
+		if this.storage != nil {
+			this.storage.IgnoreKey(this.key)
+		}
+	}
+
 	if err != nil {
 		_ = this.Discard()
 	}
@@ -67,7 +80,7 @@ func (this *FileWriter) Write(data []byte) (n int, err error) {
 }
 
 // WriteAt 在指定位置写入数据
-func (this *FileWriter) WriteAt(data []byte, offset int64) error {
+func (this *FileWriter) WriteAt(offset int64, data []byte) error {
 	_ = data
 	_ = offset
 	return errors.New("not supported")
@@ -114,8 +127,8 @@ func (this *FileWriter) Close() error {
 	err = this.rawWriter.Close()
 	if err != nil {
 		_ = os.Remove(path)
-	} else {
+	} else if strings.HasSuffix(path, FileTmpSuffix) {
-		err = os.Rename(path, strings.Replace(path, ".tmp", "", 1))
+		err = os.Rename(path, strings.Replace(path, FileTmpSuffix, "", 1))
 		if err != nil {
 			_ = os.Remove(path)
 		}

internal/caches/writer_memory.go

@@ -16,6 +16,7 @@ type MemoryWriter struct {
 	bodySize   int64
 	status     int
 	isDirty    bool
+	maxSize    int64
 
 	hash    uint64
 	item    *MemoryItem
@@ -23,18 +24,19 @@ type MemoryWriter struct {
 	once    sync.Once
 }
 
-func NewMemoryWriter(memoryStorage *MemoryStorage, key string, expiredAt int64, status int, isDirty bool, endFunc func()) *MemoryWriter {
+func NewMemoryWriter(memoryStorage *MemoryStorage, key string, expiredAt int64, status int, isDirty bool, maxSize int64, endFunc func()) *MemoryWriter {
 	w := &MemoryWriter{
 		storage:   memoryStorage,
 		key:       key,
 		expiredAt: expiredAt,
 		item: &MemoryItem{
-			ExpiredAt:  expiredAt,
+			ExpiresAt:  expiredAt,
 			ModifiedAt: time.Now().Unix(),
 			Status:     status,
 		},
 		status:  status,
 		isDirty: isDirty,
+		maxSize: maxSize,
 		endFunc: endFunc,
 	}
 	w.hash = w.calculateHash(key)
@@ -53,11 +55,19 @@ func (this *MemoryWriter) WriteHeader(data []byte) (n int, err error) {
 func (this *MemoryWriter) Write(data []byte) (n int, err error) {
 	this.bodySize += int64(len(data))
 	this.item.BodyValue = append(this.item.BodyValue, data...)
+
+	// 检查尺寸
+	if this.maxSize > 0 && this.bodySize > this.maxSize {
+		err = ErrEntityTooLarge
+		this.storage.IgnoreKey(this.key)
+		return len(data), err
+	}
+
 	return len(data), nil
 }
 
 // WriteAt 在指定位置写入数据
-func (this *MemoryWriter) WriteAt(b []byte, offset int64) error {
+func (this *MemoryWriter) WriteAt(offset int64, b []byte) error {
 	_ = b
 	_ = offset
 	return errors.New("not supported")

internal/caches/writer_partial_file.go

@@ -7,7 +7,6 @@ import (
 	"github.com/iwind/TeaGo/types"
 	"io"
 	"os"
-	"strings"
 	"sync"
 )
 
@@ -23,9 +22,12 @@ type PartialFileWriter struct {
 	isNew      bool
 	isPartial  bool
 	bodyOffset int64
+
+	ranges    *PartialRanges
+	rangePath string
 }
 
-func NewPartialFileWriter(rawWriter *os.File, key string, expiredAt int64, isNew bool, isPartial bool, bodyOffset int64, endFunc func()) *PartialFileWriter {
+func NewPartialFileWriter(rawWriter *os.File, key string, expiredAt int64, isNew bool, isPartial bool, bodyOffset int64, ranges *PartialRanges, endFunc func()) *PartialFileWriter {
 	return &PartialFileWriter{
 		key:        key,
 		rawWriter:  rawWriter,
@@ -34,6 +36,8 @@ func NewPartialFileWriter(rawWriter *os.File, key string, expiredAt int64, isNew
 		isNew:      isNew,
 		isPartial:  isPartial,
 		bodyOffset: bodyOffset,
+		ranges:     ranges,
+		rangePath:  partialRangesFilePath(rawWriter.Name()),
 	}
 }
 
@@ -50,6 +54,21 @@ func (this *PartialFileWriter) WriteHeader(data []byte) (n int, err error) {
 	return
 }
 
+func (this *PartialFileWriter) AppendHeader(data []byte) error {
+	_, err := this.rawWriter.Write(data)
+	if err != nil {
+		_ = this.Discard()
+	} else {
+		var c = len(data)
+		this.headerSize += int64(c)
+		err = this.WriteHeaderLength(int(this.headerSize))
+		if err != nil {
+			_ = this.Discard()
+		}
+	}
+	return err
+}
+
 // WriteHeaderLength 写入Header长度数据
 func (this *PartialFileWriter) WriteHeaderLength(headerLength int) error {
 	bytes4 := make([]byte, 4)
@@ -78,12 +97,34 @@ func (this *PartialFileWriter) Write(data []byte) (n int, err error) {
 }
 
 // WriteAt 在指定位置写入数据
-func (this *PartialFileWriter) WriteAt(data []byte, offset int64) error {
+func (this *PartialFileWriter) WriteAt(offset int64, data []byte) error {
+	var c = int64(len(data))
+	if c == 0 {
+		return nil
+	}
+	var end = offset + c - 1
+
+	// 是否已包含在内
+	if this.ranges.Contains(offset, end) {
+		return nil
+	}
+
 	if this.bodyOffset == 0 {
 		this.bodyOffset = SizeMeta + int64(len(this.key)) + this.headerSize
 	}
 	_, err := this.rawWriter.WriteAt(data, this.bodyOffset+offset)
-	return err
+	if err != nil {
+		return err
+	}
+
+	this.ranges.Add(offset, end)
+
+	return nil
+}
+
+// SetBodyLength 设置内容总长度
+func (this *PartialFileWriter) SetBodyLength(bodyLength int64) {
+	this.bodySize = bodyLength
 }
 
 // WriteBodyLength 写入Body长度数据
@@ -109,31 +150,30 @@ func (this *PartialFileWriter) Close() error {
 		this.endFunc()
 	})
 
-	var path = this.rawWriter.Name()
+	err := this.ranges.WriteToFile(this.rangePath)
+	if err != nil {
+		return err
+	}
 
+	// 关闭当前writer
 	if this.isNew {
-		err := this.WriteHeaderLength(types.Int(this.headerSize))
+		err = this.WriteHeaderLength(types.Int(this.headerSize))
 		if err != nil {
 			_ = this.rawWriter.Close()
-			_ = os.Remove(path)
+			this.remove()
 			return err
 		}
 		err = this.WriteBodyLength(this.bodySize)
 		if err != nil {
 			_ = this.rawWriter.Close()
-			_ = os.Remove(path)
+			this.remove()
 			return err
 		}
 	}
 
-	err := this.rawWriter.Close()
+	err = this.rawWriter.Close()
 	if err != nil {
-		_ = os.Remove(path)
+		this.remove()
-	} else if !this.isPartial {
-		err = os.Rename(path, strings.Replace(path, ".tmp", "", 1))
-		if err != nil {
-			_ = os.Remove(path)
-		}
 	}
 
 	return err
@@ -147,6 +187,8 @@ func (this *PartialFileWriter) Discard() error {
 
 	_ = this.rawWriter.Close()
 
+	_ = os.Remove(this.rangePath)
+
 	err := os.Remove(this.rawWriter.Name())
 	return err
 }
@@ -171,3 +213,12 @@ func (this *PartialFileWriter) Key() string {
 func (this *PartialFileWriter) ItemType() ItemType {
 	return ItemTypeFile
 }
+
+func (this *PartialFileWriter) IsNew() bool {
+	return this.isNew && len(this.ranges.Ranges) == 0
+}
+
+func (this *PartialFileWriter) remove() {
+	_ = os.Remove(this.rawWriter.Name())
+	_ = os.Remove(this.rangePath)
+}

internal/caches/writer_partial_file_test.go

@@ -11,8 +11,8 @@ import (
 	"time"
 )
 
-func TestPartialFileWriter_SeekOffset(t *testing.T) {
+func TestPartialFileWriter_Write(t *testing.T) {
-	var path = "/tmp/test@partial.cache"
+	var path = "/tmp/test_partial.cache"
 	_ = os.Remove(path)
 
 	var reader = func() {
@@ -27,7 +27,8 @@ func TestPartialFileWriter_SeekOffset(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	var writer = caches.NewPartialFileWriter(fp, "test", time.Now().Unix()+86500, true, true, 0, func() {
+	var ranges = caches.NewPartialRanges()
+	var writer = caches.NewPartialFileWriter(fp, "test", time.Now().Unix()+86500, true, true, 0, ranges, func() {
 		t.Log("end")
 	})
 	_, err = writer.WriteHeader([]byte("header"))
@@ -36,7 +37,7 @@ func TestPartialFileWriter_SeekOffset(t *testing.T) {
 	}
 
 	// 移动位置
-	err = writer.WriteAt([]byte("HELLO"), 100)
+	err = writer.WriteAt(100, []byte("HELLO"))
 	if err != nil {
 		t.Fatal(err)
 	}

internal/compressions/reader.go

@@ -2,7 +2,14 @@
 
 package compressions
 
+import "io"
+
 type Reader interface {
 	Read(p []byte) (n int, err error)
+	Reset(reader io.Reader) error
+	RawClose() error
 	Close() error
+
+	SetPool(pool *ReaderPool)
+	ResetFinish()
 }

internal/compressions/reader_base.go

@@ -0,0 +1,26 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+type BaseReader struct {
+	pool *ReaderPool
+
+	isFinished bool
+}
+
+func (this *BaseReader) SetPool(pool *ReaderPool) {
+	this.pool = pool
+}
+
+func (this *BaseReader) Finish(obj Reader) error {
+	err := obj.RawClose()
+	if err == nil && this.pool != nil && !this.isFinished {
+		this.pool.Put(obj)
+	}
+	this.isFinished = true
+	return err
+}
+
+func (this *BaseReader) ResetFinish() {
+	this.isFinished = false
+}

internal/compressions/reader_brotli.go

@@ -9,10 +9,16 @@ import (
 )
 
 type BrotliReader struct {
+	BaseReader
+
 	reader *brotli.Reader
 }
 
 func NewBrotliReader(reader io.Reader) (Reader, error) {
+	return sharedBrotliReaderPool.Get(reader)
+}
+
+func newBrotliReader(reader io.Reader) (Reader, error) {
 	return &BrotliReader{reader: brotli.NewReader(reader)}, nil
 }
 
@@ -24,6 +30,14 @@ func (this *BrotliReader) Read(p []byte) (n int, err error) {
 	return
 }
 
-func (this *BrotliReader) Close() error {
+func (this *BrotliReader) Reset(reader io.Reader) error {
+	return this.reader.Reset(reader)
+}
+
+func (this *BrotliReader) RawClose() error {
 	return nil
 }
+
+func (this *BrotliReader) Close() error {
+	return this.Finish(this)
+}

internal/compressions/reader_brotli_test.go

@@ -0,0 +1,51 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions_test
+
+import (
+	"bytes"
+	"github.com/TeaOSLab/EdgeNode/internal/compressions"
+	"io"
+	"testing"
+)
+
+func TestBrotliReader(t *testing.T) {
+	for _, testString := range []string{"Hello", "World", "Ni", "Hao"} {
+		t.Log("===", testString, "===")
+		var buf = &bytes.Buffer{}
+		writer, err := compressions.NewBrotliWriter(buf, 5)
+		if err != nil {
+			t.Fatal(err)
+		}
+		_, err = writer.Write([]byte(testString))
+		if err != nil {
+			t.Fatal(err)
+		}
+		err = writer.Close()
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		reader, err := compressions.NewBrotliReader(buf)
+		if err != nil {
+			t.Fatal(err)
+		}
+		var data = make([]byte, 4096)
+		for {
+			n, err := reader.Read(data)
+			if n > 0 {
+				t.Log(string(data[:n]))
+			}
+			if err != nil {
+				if err == io.EOF {
+					break
+				}
+				t.Fatal(err)
+			}
+		}
+		err = reader.Close()
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+}

internal/compressions/reader_deflate.go

@@ -8,10 +8,16 @@ import (
 )
 
 type DeflateReader struct {
+	BaseReader
+
 	reader io.ReadCloser
 }
 
 func NewDeflateReader(reader io.Reader) (Reader, error) {
+	return sharedDeflateReaderPool.Get(reader)
+}
+
+func newDeflateReader(reader io.Reader) (Reader, error) {
 	return &DeflateReader{reader: flate.NewReader(reader)}, nil
 }
 
@@ -19,6 +25,15 @@ func (this *DeflateReader) Read(p []byte) (n int, err error) {
 	return this.reader.Read(p)
 }
 
-func (this *DeflateReader) Close() error {
+func (this *DeflateReader) Reset(reader io.Reader) error {
+	this.reader = flate.NewReader(reader)
+	return nil
+}
+
+func (this *DeflateReader) RawClose() error {
 	return this.reader.Close()
 }
+
+func (this *DeflateReader) Close() error {
+	return this.Finish(this)
+}

internal/compressions/reader_deflate_test.go

@@ -0,0 +1,51 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions_test
+
+import (
+	"bytes"
+	"github.com/TeaOSLab/EdgeNode/internal/compressions"
+	"io"
+	"testing"
+)
+
+func TestDeflateReader(t *testing.T) {
+	for _, testString := range []string{"Hello", "World", "Ni", "Hao"} {
+		t.Log("===", testString, "===")
+		var buf = &bytes.Buffer{}
+		writer, err := compressions.NewDeflateWriter(buf, 5)
+		if err != nil {
+			t.Fatal(err)
+		}
+		_, err = writer.Write([]byte(testString))
+		if err != nil {
+			t.Fatal(err)
+		}
+		err = writer.Close()
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		reader, err := compressions.NewDeflateReader(buf)
+		if err != nil {
+			t.Fatal(err)
+		}
+		var data = make([]byte, 4096)
+		for {
+			n, err := reader.Read(data)
+			if n > 0 {
+				t.Log(string(data[:n]))
+			}
+			if err != nil {
+				if err == io.EOF {
+					break
+				}
+				t.Fatal(err)
+			}
+		}
+		err = reader.Close()
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+}

internal/compressions/reader_gzip.go

@@ -8,10 +8,16 @@ import (
 )
 
 type GzipReader struct {
+	BaseReader
+
 	reader *gzip.Reader
 }
 
 func NewGzipReader(reader io.Reader) (Reader, error) {
+	return sharedGzipReaderPool.Get(reader)
+}
+
+func newGzipReader(reader io.Reader) (Reader, error) {
 	r, err := gzip.NewReader(reader)
 	if err != nil {
 		return nil, err
@@ -25,6 +31,14 @@ func (this *GzipReader) Read(p []byte) (n int, err error) {
 	return this.reader.Read(p)
 }
 
-func (this *GzipReader) Close() error {
+func (this *GzipReader) Reset(reader io.Reader) error {
+	return this.reader.Reset(reader)
+}
+
+func (this *GzipReader) RawClose() error {
 	return this.reader.Close()
 }
+
+func (this *GzipReader) Close() error {
+	return this.Finish(this)
+}

internal/compressions/reader_gzip_test.go

@@ -1,68 +1,106 @@
 // Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 
-package compressions
+package compressions_test
 
 import (
 	"bytes"
-	"errors"
+	"github.com/TeaOSLab/EdgeNode/internal/compressions"
-	"github.com/TeaOSLab/EdgeNode/internal/caches"
+	"github.com/iwind/TeaGo/rands"
+	"github.com/iwind/TeaGo/types"
 	"io"
-	"os"
+	"strings"
 	"testing"
 )
 
 func TestGzipReader(t *testing.T) {
-	fp, err := os.Open("/Users/WorkSpace/EdgeProject/EdgeCache/p43/36/7e/367e02720713fe05b66573a1d69b4f0a.cache")
+	for _, testString := range []string{"Hello", "World", "Ni", "Hao"} {
-	if err != nil {
+		t.Log("===", testString, "===")
-		// not fatal
+		var buf = &bytes.Buffer{}
-		t.Log(err)
+		writer, err := compressions.NewGzipWriter(buf, 5)
-		return
-	}
-	defer func() {
-		_ = fp.Close()
-	}()
-
-	var buf = make([]byte, 32*1024)
-	cacheReader := caches.NewFileReader(fp)
-	err = cacheReader.Init()
-	if err != nil {
-		t.Fatal(err)
-	}
-	var headerBuf = []byte{}
-	err = cacheReader.ReadHeader(buf, func(n int) (goNext bool, err error) {
-		headerBuf = append(headerBuf, buf[:n]...)
-		for {
-			nIndex := bytes.Index(headerBuf, []byte{'\n'})
-			if nIndex >= 0 {
-				row := headerBuf[:nIndex]
-				spaceIndex := bytes.Index(row, []byte{':'})
-				if spaceIndex <= 0 {
-					return false, errors.New("invalid header '" + string(row) + "'")
-				}
-
-				headerBuf = headerBuf[nIndex+1:]
-			} else {
-				break
-			}
-		}
-		return true, nil
-	})
-
-	reader, err := NewGzipReader(cacheReader)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for {
-		n, err := reader.Read(buf)
 		if err != nil {
-			if err != io.EOF {
+			t.Fatal(err)
+		}
+		_, err = writer.Write([]byte(testString))
+		if err != nil {
+			t.Fatal(err)
+		}
+		err = writer.Close()
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		reader, err := compressions.NewGzipReader(buf)
+		if err != nil {
+			t.Fatal(err)
+		}
+		var data = make([]byte, 4096)
+		for {
+			n, err := reader.Read(data)
+			if n > 0 {
+				t.Log(string(data[:n]))
+			}
+			if err != nil {
+				if err == io.EOF {
+					break
+				}
 				t.Fatal(err)
-			} else {
-				break
 			}
 		}
-		t.Log(string(buf[:n]))
+		err = reader.Close()
-		_ = n
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+}
+
+func BenchmarkGzipReader(b *testing.B) {
+	var randomData = func() []byte {
+		var b = strings.Builder{}
+		for i := 0; i < 1024; i++ {
+			b.WriteString(types.String(rands.Int64() % 10))
+		}
+		return []byte(b.String())
+	}
+
+	var buf = &bytes.Buffer{}
+	writer, err := compressions.NewGzipWriter(buf, 5)
+	if err != nil {
+		b.Fatal(err)
+	}
+	_, err = writer.Write(randomData())
+	if err != nil {
+		b.Fatal(err)
+	}
+	err = writer.Close()
+	if err != nil {
+		b.Fatal(err)
+	}
+
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		var newBytes = make([]byte, buf.Len())
+		copy(newBytes, buf.Bytes())
+		reader, err := compressions.NewGzipReader(bytes.NewReader(newBytes))
+		if err != nil {
+			b.Fatal(err)
+		}
+		var data = make([]byte, 4096)
+		for {
+			n, err := reader.Read(data)
+			if n > 0 {
+				_ = data[:n]
+			}
+			if err != nil {
+				if err == io.EOF {
+					break
+				}
+				b.Fatal(err)
+			}
+		}
+		err = reader.Close()
+		if err != nil {
+			b.Fatal(err)
+		}
 	}
 }

internal/compressions/reader_pool.go

@@ -0,0 +1,56 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+import (
+	"io"
+)
+
+type ReaderPool struct {
+	c       chan Reader
+	newFunc func(reader io.Reader) (Reader, error)
+}
+
+func NewReaderPool(maxSize int, newFunc func(reader io.Reader) (Reader, error)) *ReaderPool {
+	if maxSize <= 0 {
+		maxSize = 1024
+	}
+
+	return &ReaderPool{
+		c:       make(chan Reader, maxSize),
+		newFunc: newFunc,
+	}
+}
+
+func (this *ReaderPool) Get(parentReader io.Reader) (Reader, error) {
+	select {
+	case reader := <-this.c:
+		err := reader.Reset(parentReader)
+		if err != nil {
+			// create new
+			reader, err = this.newFunc(parentReader)
+			if err != nil {
+				return nil, err
+			}
+			reader.SetPool(this)
+			return reader, nil
+		}
+		reader.ResetFinish()
+		return reader, nil
+	default:
+		// create new
+		reader, err := this.newFunc(parentReader)
+		if err != nil {
+			return nil, err
+		}
+		reader.SetPool(this)
+		return reader, nil
+	}
+}
+
+func (this *ReaderPool) Put(reader Reader) {
+	select {
+	case this.c <- reader:
+	default:
+	}
+}

internal/compressions/reader_pool_brotli.go

@@ -0,0 +1,20 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+import (
+	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"io"
+)
+
+var sharedBrotliReaderPool *ReaderPool
+
+func init() {
+	var maxSize = utils.SystemMemoryGB() * 256
+	if maxSize == 0 {
+		maxSize = 256
+	}
+	sharedBrotliReaderPool = NewReaderPool(maxSize, func(reader io.Reader) (Reader, error) {
+		return newBrotliReader(reader)
+	})
+}

internal/compressions/reader_pool_deflate.go

@@ -0,0 +1,20 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+import (
+	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"io"
+)
+
+var sharedDeflateReaderPool *ReaderPool
+
+func init() {
+	var maxSize = utils.SystemMemoryGB() * 256
+	if maxSize == 0 {
+		maxSize = 256
+	}
+	sharedDeflateReaderPool = NewReaderPool(maxSize, func(reader io.Reader) (Reader, error) {
+		return newDeflateReader(reader)
+	})
+}

internal/compressions/reader_pool_gzip.go

@@ -0,0 +1,20 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+import (
+	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"io"
+)
+
+var sharedGzipReaderPool *ReaderPool
+
+func init() {
+	var maxSize = utils.SystemMemoryGB() * 256
+	if maxSize == 0 {
+		maxSize = 256
+	}
+	sharedGzipReaderPool = NewReaderPool(maxSize, func(reader io.Reader) (Reader, error) {
+		return newGzipReader(reader)
+	})
+}

internal/compressions/utils.go

@@ -18,6 +18,11 @@ const (
 
 var ErrNotSupportedContentEncoding = errors.New("not supported content encoding")
 
+// AllEncodings 当前支持的所有编码
+func AllEncodings() []ContentEncoding {
+	return []ContentEncoding{ContentEncodingBr, ContentEncodingGzip, ContentEncodingDeflate}
+}
+
 // NewReader 获取Reader
 func NewReader(reader io.Reader, contentEncoding ContentEncoding) (Reader, error) {
 	switch contentEncoding {
@@ -32,7 +37,6 @@ func NewReader(reader io.Reader, contentEncoding ContentEncoding) (Reader, error
 }
 
 // NewWriter 获取Writer
-// TODO 考虑重用Writer
 func NewWriter(writer io.Writer, compressType serverconfigs.HTTPCompressionType, level int) (Writer, error) {
 	switch compressType {
 	case serverconfigs.HTTPCompressionTypeGzip:

internal/compressions/writer.go

@@ -2,9 +2,16 @@
 
 package compressions
 
+import "io"
+
 type Writer interface {
 	Write(p []byte) (int, error)
 	Flush() error
+	Reset(writer io.Writer)
+	RawClose() error
 	Close() error
 	Level() int
+
+	SetPool(pool *WriterPool)
+	ResetFinish()
 }

internal/compressions/writer_base.go

@@ -0,0 +1,26 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+type BaseWriter struct {
+	pool *WriterPool
+
+	isFinished bool
+}
+
+func (this *BaseWriter) SetPool(pool *WriterPool) {
+	this.pool = pool
+}
+
+func (this *BaseWriter) Finish(obj Writer) error {
+	err := obj.RawClose()
+	if err == nil && this.pool != nil && !this.isFinished {
+		this.pool.Put(obj)
+	}
+	this.isFinished = true
+	return err
+}
+
+func (this *BaseWriter) ResetFinish() {
+	this.isFinished = false
+}

internal/compressions/writer_brotli.go

@@ -8,19 +8,28 @@ import (
 )
 
 type BrotliWriter struct {
+	BaseWriter
+
 	writer *brotli.Writer
 	level  int
 }
 
 func NewBrotliWriter(writer io.Writer, level int) (Writer, error) {
+	return sharedBrotliWriterPool.Get(writer, level)
+}
+
+func newBrotliWriter(writer io.Writer, level int) (*BrotliWriter, error) {
 	if level <= 0 {
 		level = brotli.BestSpeed
 	} else if level > brotli.BestCompression {
 		level = brotli.BestCompression
 	}
 	return &BrotliWriter{
-		writer: brotli.NewWriterLevel(writer, level),
+		writer: brotli.NewWriterOptions(writer, brotli.WriterOptions{
-		level:  level,
+			Quality: level,
+			LGWin:   13, // TODO 在全局设置里可以设置此值
+		}),
+		level: level,
 	}, nil
 }
 
@@ -32,10 +41,18 @@ func (this *BrotliWriter) Flush() error {
 	return this.writer.Flush()
 }
 
-func (this *BrotliWriter) Close() error {
+func (this *BrotliWriter) Reset(newWriter io.Writer) {
+	this.writer.Reset(newWriter)
+}
+
+func (this *BrotliWriter) RawClose() error {
 	return this.writer.Close()
 }
 
+func (this *BrotliWriter) Close() error {
+	return this.Finish(this)
+}
+
 func (this *BrotliWriter) Level() int {
 	return this.level
 }

internal/compressions/writer_brotli_test.go

@@ -0,0 +1,116 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions_test
+
+import (
+	"bytes"
+	"github.com/TeaOSLab/EdgeNode/internal/compressions"
+	"strings"
+	"testing"
+)
+
+func BenchmarkBrotliWriter_Write(b *testing.B) {
+	var data = []byte(strings.Repeat("A", 1024))
+
+	for i := 0; i < b.N; i++ {
+		var buf = &bytes.Buffer{}
+		writer, err := compressions.NewBrotliWriter(buf, 5)
+		if err != nil {
+			b.Fatal(err)
+		}
+
+		for j := 0; j < 100; j++ {
+			_, err = writer.Write(data)
+			if err != nil {
+				b.Fatal(err)
+			}
+
+			/**err = writer.Flush()
+			if err != nil {
+				b.Fatal(err)
+			}**/
+		}
+
+		_ = writer.Close()
+	}
+}
+
+func BenchmarkBrotliWriter_Write_Parallel(b *testing.B) {
+	var data = []byte(strings.Repeat("A", 1024))
+
+	b.RunParallel(func(pb *testing.PB) {
+		for pb.Next() {
+			var buf = &bytes.Buffer{}
+			writer, err := compressions.NewBrotliWriter(buf, 5)
+			if err != nil {
+				b.Fatal(err)
+			}
+
+			for j := 0; j < 100; j++ {
+				_, err = writer.Write(data)
+				if err != nil {
+					b.Fatal(err)
+				}
+
+				/**err = writer.Flush()
+				if err != nil {
+					b.Fatal(err)
+				}**/
+			}
+
+			_ = writer.Close()
+		}
+	})
+}
+
+func BenchmarkBrotliWriter_Write_Small(b *testing.B) {
+	var data = []byte(strings.Repeat("A", 16))
+
+	for i := 0; i < b.N; i++ {
+		var buf = &bytes.Buffer{}
+		writer, err := compressions.NewBrotliWriter(buf, 5)
+		if err != nil {
+			b.Fatal(err)
+		}
+
+		for j := 0; j < 100; j++ {
+			_, err = writer.Write(data)
+			if err != nil {
+				b.Fatal(err)
+			}
+
+			/**err = writer.Flush()
+			if err != nil {
+				b.Fatal(err)
+			}**/
+		}
+
+		_ = writer.Close()
+	}
+}
+
+func BenchmarkBrotliWriter_Write_Large(b *testing.B) {
+	var data = []byte(strings.Repeat("A", 4096))
+
+	for i := 0; i < b.N; i++ {
+		var buf = &bytes.Buffer{}
+		writer, err := compressions.NewBrotliWriter(buf, 5)
+		if err != nil {
+			b.Fatal(err)
+		}
+
+		for j := 0; j < 100; j++ {
+			_, err = writer.Write(data)
+			if err != nil {
+				b.Fatal(err)
+			}
+
+			/**err = writer.Flush()
+			if err != nil {
+				b.Fatal(err)
+			}**/
+		}
+
+		_ = writer.Close()
+	}
+}

internal/compressions/writer_deflate.go

@@ -8,11 +8,17 @@ import (
 )
 
 type DeflateWriter struct {
+	BaseWriter
+
 	writer *flate.Writer
 	level  int
 }
 
 func NewDeflateWriter(writer io.Writer, level int) (Writer, error) {
+	return sharedDeflateWriterPool.Get(writer, level)
+}
+
+func newDeflateWriter(writer io.Writer, level int) (Writer, error) {
 	if level <= 0 {
 		level = flate.BestSpeed
 	} else if level > flate.BestCompression {
@@ -38,10 +44,18 @@ func (this *DeflateWriter) Flush() error {
 	return this.writer.Flush()
 }
 
-func (this *DeflateWriter) Close() error {
+func (this *DeflateWriter) Reset(writer io.Writer) {
+	this.writer.Reset(writer)
+}
+
+func (this *DeflateWriter) RawClose() error {
 	return this.writer.Close()
 }
 
+func (this *DeflateWriter) Close() error {
+	return this.Finish(this)
+}
+
 func (this *DeflateWriter) Level() int {
 	return this.level
 }

internal/compressions/writer_deflate_test.go

@@ -0,0 +1,36 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions_test
+
+import (
+	"bytes"
+	"github.com/TeaOSLab/EdgeNode/internal/compressions"
+	"strings"
+	"testing"
+)
+
+func BenchmarkDeflateWriter_Write(b *testing.B) {
+	var data = []byte(strings.Repeat("A", 1024))
+
+	for i := 0; i < b.N; i++ {
+		var buf = &bytes.Buffer{}
+		writer, err := compressions.NewDeflateWriter(buf, 5)
+		if err != nil {
+			b.Fatal(err)
+		}
+
+		for j := 0; j < 100; j++ {
+			_, err = writer.Write(data)
+			if err != nil {
+				b.Fatal(err)
+			}
+
+			/**err = writer.Flush()
+			if err != nil {
+				b.Fatal(err)
+			}**/
+		}
+
+		_ = writer.Close()
+	}
+}

internal/compressions/writer_encoding.go

@@ -1,51 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package compressions
-
-import (
-	"bytes"
-	"io"
-)
-
-type EncodingWriter struct {
-	contentEncoding ContentEncoding
-	writer          Writer
-	buf             *bytes.Buffer
-}
-
-func NewEncodingWriter(contentEncoding ContentEncoding, writer Writer) (Writer, error) {
-	return &EncodingWriter{
-		contentEncoding: contentEncoding,
-		writer:          writer,
-		buf:             &bytes.Buffer{},
-	}, nil
-}
-
-func (this *EncodingWriter) Write(p []byte) (int, error) {
-	return this.buf.Write(p)
-}
-
-func (this *EncodingWriter) Flush() error {
-	return this.writer.Flush()
-}
-
-func (this *EncodingWriter) Close() error {
-	reader, err := NewReader(this.buf, this.contentEncoding)
-	if err != nil {
-		_ = this.writer.Close()
-		return err
-	}
-	_, err = io.Copy(this.writer, reader)
-	if err != nil {
-		_ = reader.Close()
-		_ = this.writer.Close()
-		return err
-	}
-
-	_ = reader.Close()
-	return this.writer.Close()
-}
-
-func (this *EncodingWriter) Level() int {
-	return this.writer.Level()
-}

internal/compressions/writer_encoding_test.go

@@ -1,47 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package compressions
-
-import (
-	"bytes"
-	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
-	"testing"
-)
-
-func TestNewEncodingWriter(t *testing.T) {
-	var buf = &bytes.Buffer{}
-
-	subWriter, err := NewWriter(buf, serverconfigs.HTTPCompressionTypeGzip, 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-	writer, err := NewEncodingWriter(ContentEncodingGzip, subWriter)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	gzipBuf := &bytes.Buffer{}
-	gzipWriter, err := NewGzipWriter(gzipBuf, 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, err = gzipWriter.Write([]byte("Hello"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = gzipWriter.Write([]byte("World"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	_ = gzipWriter.Close()
-
-	_, err = writer.Write(gzipBuf.Bytes())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_ = writer.Close()
-
-	t.Log(buf.String())
-}

internal/compressions/writer_gzip.go

@@ -8,11 +8,17 @@ import (
 )
 
 type GzipWriter struct {
+	BaseWriter
+
 	writer *gzip.Writer
 	level  int
 }
 
 func NewGzipWriter(writer io.Writer, level int) (Writer, error) {
+	return sharedGzipWriterPool.Get(writer, level)
+}
+
+func newGzipWriter(writer io.Writer, level int) (Writer, error) {
 	if level <= 0 {
 		level = gzip.BestSpeed
 	} else if level > gzip.BestCompression {
@@ -38,10 +44,18 @@ func (this *GzipWriter) Flush() error {
 	return this.writer.Flush()
 }
 
-func (this *GzipWriter) Close() error {
+func (this *GzipWriter) Reset(writer io.Writer) {
+	this.writer.Reset(writer)
+}
+
+func (this *GzipWriter) RawClose() error {
 	return this.writer.Close()
 }
 
+func (this *GzipWriter) Close() error {
+	return this.Finish(this)
+}
+
 func (this *GzipWriter) Level() int {
 	return this.level
 }

internal/compressions/writer_gzip_test.go

@@ -0,0 +1,36 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions_test
+
+import (
+	"bytes"
+	"github.com/TeaOSLab/EdgeNode/internal/compressions"
+	"strings"
+	"testing"
+)
+
+func BenchmarkGzipWriter_Write(b *testing.B) {
+	var data = []byte(strings.Repeat("A", 1024))
+
+	for i := 0; i < b.N; i++ {
+		var buf = &bytes.Buffer{}
+		writer, err := compressions.NewGzipWriter(buf, 5)
+		if err != nil {
+			b.Fatal(err)
+		}
+
+		for j := 0; j < 100; j++ {
+			_, err = writer.Write(data)
+			if err != nil {
+				b.Fatal(err)
+			}
+
+			/**err = writer.Flush()
+			if err != nil {
+				b.Fatal(err)
+			}**/
+		}
+
+		_ = writer.Close()
+	}
+}

internal/compressions/writer_pool.go

@@ -0,0 +1,61 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+import (
+	"io"
+)
+
+type WriterPool struct {
+	m       map[int]chan Writer // level => chan Writer
+	newFunc func(writer io.Writer, level int) (Writer, error)
+}
+
+func NewWriterPool(maxSize int, maxLevel int, newFunc func(writer io.Writer, level int) (Writer, error)) *WriterPool {
+	if maxSize <= 0 {
+		maxSize = 1024
+	}
+
+	var m = map[int]chan Writer{}
+	for i := 0; i <= maxLevel; i++ {
+		m[i] = make(chan Writer, maxSize)
+	}
+
+	return &WriterPool{
+		m:       m,
+		newFunc: newFunc,
+	}
+}
+
+func (this *WriterPool) Get(parentWriter io.Writer, level int) (Writer, error) {
+	c, ok := this.m[level]
+	if !ok {
+		c = this.m[0]
+	}
+
+	select {
+	case writer := <-c:
+		writer.Reset(parentWriter)
+		writer.ResetFinish()
+		return writer, nil
+	default:
+		writer, err := this.newFunc(parentWriter, level)
+		if err != nil {
+			return nil, err
+		}
+		writer.SetPool(this)
+		return writer, nil
+	}
+}
+
+func (this *WriterPool) Put(writer Writer) {
+	var level = writer.Level()
+	c, ok := this.m[level]
+	if !ok {
+		c = this.m[0]
+	}
+	select {
+	case c <- writer:
+	default:
+	}
+}

internal/compressions/writer_pool_brotli.go

@@ -0,0 +1,21 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+import (
+	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"github.com/andybalholm/brotli"
+	"io"
+)
+
+var sharedBrotliWriterPool *WriterPool
+
+func init() {
+	var maxSize = utils.SystemMemoryGB() * 256
+	if maxSize == 0 {
+		maxSize = 256
+	}
+	sharedBrotliWriterPool = NewWriterPool(maxSize, brotli.BestCompression, func(writer io.Writer, level int) (Writer, error) {
+		return newBrotliWriter(writer, level)
+	})
+}

internal/compressions/writer_pool_deflate.go

@@ -0,0 +1,21 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+import (
+	"compress/flate"
+	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"io"
+)
+
+var sharedDeflateWriterPool *WriterPool
+
+func init() {
+	var maxSize = utils.SystemMemoryGB() * 256
+	if maxSize == 0 {
+		maxSize = 256
+	}
+	sharedDeflateWriterPool = NewWriterPool(maxSize, flate.BestCompression, func(writer io.Writer, level int) (Writer, error) {
+		return newDeflateWriter(writer, level)
+	})
+}

internal/compressions/writer_pool_gzip.go

@@ -0,0 +1,21 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+import (
+	"compress/gzip"
+	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"io"
+)
+
+var sharedGzipWriterPool *WriterPool
+
+func init() {
+	var maxSize = utils.SystemMemoryGB() * 256
+	if maxSize == 0 {
+		maxSize = 256
+	}
+	sharedGzipWriterPool = NewWriterPool(maxSize, gzip.BestCompression, func(writer io.Writer, level int) (Writer, error) {
+		return newGzipWriter(writer, level)
+	})
+}

internal/configs/api_config.go

@@ -1,12 +1,12 @@
 package configs
 
 import (
-	"github.com/go-yaml/yaml"
 	"github.com/iwind/TeaGo/Tea"
+	"gopkg.in/yaml.v3"
 	"io/ioutil"
 )
 
-// 节点API配置
+// APIConfig 节点API配置
 type APIConfig struct {
 	RPC struct {
 		Endpoints []string `yaml:"endpoints"`

internal/const/const.go

@@ -1,7 +1,7 @@
 package teaconst
 
 const (
-	Version = "0.4.2"
+	Version = "0.4.7"
 
 	ProductName = "Edge Node"
 	ProcessName = "edge-node"

internal/const/vars.go

@@ -14,4 +14,9 @@ var (
 	NodeIdString       = ""
 
 	GlobalProductName = nodeconfigs.DefaultProductName
+
+	IsQuiting    = false // 是否正在退出
+	EnableDBStat = false // 是否开启本地数据库统计
+
+	DiskIsFast = false // 是否为高速硬盘
 )

internal/encrypt/method.go

@@ -1,12 +1,12 @@
 package encrypt
 
 type MethodInterface interface {
-	// 初始化
+	// Init 初始化
 	Init(key []byte, iv []byte) error
 
-	// 加密
+	// Encrypt 加密
 	Encrypt(src []byte) (dst []byte, err error)
 
-	// 解密
+	// Decrypt 解密
 	Decrypt(dst []byte) (src []byte, err error)
 }

internal/errors/error.go

@@ -2,6 +2,7 @@ package errors
 
 import (
 	"errors"
+	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"path/filepath"
 	"runtime"
 	"strconv"
@@ -15,7 +16,7 @@ type errorObj struct {
 }
 
 func (this *errorObj) Error() string {
-	s := this.err.Error() + "\n  " + this.file
+	s := this.err.Error() + "\n  " + utils.RemoveWorkspace(this.file)
 	if len(this.funcName) > 0 {
 		s += ":" + this.funcName + "()"
 	}
@@ -23,7 +24,7 @@ func (this *errorObj) Error() string {
 	return s
 }
 
-// 新错误
+// New 新错误
 func New(errText string) error {
 	ptr, file, line, ok := runtime.Caller(1)
 	funcName := ""
@@ -39,7 +40,7 @@ func New(errText string) error {
 	}
 }
 
-// 包装已有错误
+// Wrap 包装已有错误
 func Wrap(err error) error {
 	if err == nil {
 		return nil

internal/events/events.go

@@ -3,8 +3,9 @@ package events
 type Event = string
 
 const (
-	EventStart  Event = "start"  // start loading
+	EventStart      Event = "start"      // start loading
-	EventLoaded Event = "loaded" // first load
+	EventLoaded     Event = "loaded"     // first load
-	EventQuit   Event = "quit"   // quit node gracefully
+	EventQuit       Event = "quit"       // quit node gracefully
-	EventReload Event = "reload" // reload config
+	EventReload     Event = "reload"     // reload config
+	EventTerminated Event = "terminated" // process terminated
 )

internal/events/utils.go

@@ -1,6 +1,7 @@
 package events
 
 import (
+	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
 	"sync"
 )
 
@@ -59,6 +60,14 @@ func Remove(key interface{}) {
 
 // Notify 通知事件
 func Notify(event Event) {
+	// 特殊事件
+	switch event {
+	case EventQuit:
+		teaconst.IsQuiting = true
+	case EventTerminated:
+		teaconst.IsQuiting = true
+	}
+
 	locker.Lock()
 	m := eventsMap[event]
 	locker.Unlock()

internal/firewalls/.gitignore

@@ -0,0 +1 @@
+firewall_nftables_test.go

internal/firewalls/firewall.go

@@ -1,10 +1,13 @@
 // Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+//go:build !plus
+// +build !plus
 
 package firewalls
 
 import (
 	"github.com/TeaOSLab/EdgeNode/internal/events"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
+	"runtime"
 )
 
 var currentFirewall FirewallInterface
@@ -13,9 +16,7 @@ var currentFirewall FirewallInterface
 func init() {
 	events.On(events.EventLoaded, func() {
 		var firewall = Firewall()
-		if firewall.Name() == "mock" {
+		if firewall.Name() != "mock" {
-			remotelogs.Warn("FIREWALL", "'firewalld' on this system should be enabled to block attackers more effectively")
-		} else {
 			remotelogs.Println("FIREWALL", "found local firewall '"+firewall.Name()+"'")
 		}
 	})
@@ -28,7 +29,7 @@ func Firewall() FirewallInterface {
 	}
 
 	// firewalld
-	{
+	if runtime.GOOS == "linux" {
 		var firewalld = NewFirewalld()
 		if firewalld.IsReady() {
 			currentFirewall = firewalld

internal/firewalls/firewall_firewalld.go

@@ -27,6 +27,8 @@ func NewFirewalld() *Firewalld {
 		err := cmd.Run()
 		if err == nil {
 			firewalld.exe = path
+			// TODO check firewalld status with 'firewall-cmd --state' (running or not running),
+			//      but we should recover the state when firewalld state changes, maybe check it every minutes
 			firewalld.isReady = true
 			firewalld.init()
 		}
@@ -58,6 +60,11 @@ func (this *Firewalld) IsReady() bool {
 	return this.isReady
 }
 
+// IsMock 是否为模拟
+func (this *Firewalld) IsMock() bool {
+	return false
+}
+
 func (this *Firewalld) AllowPort(port int, protocol string) error {
 	if !this.isReady {
 		return nil

internal/firewalls/firewall_interface.go

@@ -10,6 +10,9 @@ type FirewallInterface interface {
 	// IsReady 是否已准备被调用
 	IsReady() bool
 
+	// IsMock 是否为模拟
+	IsMock() bool
+
 	// AllowPort 允许端口
 	AllowPort(port int, protocol string) error
 

internal/firewalls/firewall_mock.go

@@ -20,6 +20,11 @@ func (this *MockFirewall) IsReady() bool {
 	return true
 }
 
+// IsMock 是否为模拟
+func (this *MockFirewall) IsMock() bool {
+	return true
+}
+
 // AllowPort 允许端口
 func (this *MockFirewall) AllowPort(port int, protocol string) error {
 	_ = port

internal/iplibrary/action_ipset.go

@@ -62,29 +62,39 @@ func (this *IPSetAction) Init(config *firewallconfigs.FirewallActionConfig) erro
 		if err != nil {
 			return err
 		}
-		{
+
-			cmd := exec.Command(path, "create", this.config.WhiteName, "hash:ip", "timeout", "0", "maxelem", "1000000")
+		// ipv4
-			stderr := bytes.NewBuffer([]byte{})
+		for _, listName := range []string{this.config.WhiteName, this.config.BlackName} {
+			if len(listName) == 0 {
+				continue
+			}
+			var cmd = exec.Command(path, "create", listName, "hash:ip", "timeout", "0", "maxelem", "1000000")
+			var stderr = bytes.NewBuffer([]byte{})
 			cmd.Stderr = stderr
 			err := cmd.Run()
 			if err != nil {
-				output := stderr.Bytes()
+				var output = stderr.Bytes()
 				if !bytes.Contains(output, []byte("already exists")) {
-					return errors.New("create ipset '" + this.config.WhiteName + "': " + err.Error() + ", output: " + string(output))
+					return errors.New("create ipset '" + listName + "': " + err.Error() + ", output: " + string(output))
 				} else {
 					err = nil
 				}
 			}
 		}
-		{
+
-			cmd := exec.Command(path, "create", this.config.BlackName, "hash:ip", "timeout", "0", "maxelem", "1000000")
+		// ipv6
-			stderr := bytes.NewBuffer([]byte{})
+		for _, listName := range []string{this.config.WhiteNameIPv6, this.config.BlackNameIPv6} {
+			if len(listName) == 0 {
+				continue
+			}
+			var cmd = exec.Command(path, "create", listName, "hash:ip", "family", "inet6", "timeout", "0", "maxelem", "1000000")
+			var stderr = bytes.NewBuffer([]byte{})
 			cmd.Stderr = stderr
 			err := cmd.Run()
 			if err != nil {
-				output := stderr.Bytes()
+				var output = stderr.Bytes()
 				if !bytes.Contains(output, []byte("already exists")) {
-					return errors.New("create ipset '" + this.config.BlackName + "': " + err.Error() + ", output: " + string(output))
+					return errors.New("create ipset '" + listName + "': " + err.Error() + ", output: " + string(output))
 				} else {
 					err = nil
 				}
@@ -99,8 +109,12 @@ func (this *IPSetAction) Init(config *firewallconfigs.FirewallActionConfig) erro
 			return err
 		}
 
-		{
+		// ipv4
-			cmd := exec.Command(path, "--permanent", "--new-ipset="+this.config.WhiteName, "--type=hash:ip", "--option=timeout=0", "--option=maxelem=1000000")
+		for _, listName := range []string{this.config.WhiteName, this.config.BlackName} {
+			if len(listName) == 0 {
+				continue
+			}
+			cmd := exec.Command(path, "--permanent", "--new-ipset="+listName, "--type=hash:ip", "--option=timeout=0", "--option=maxelem=1000000")
 			stderr := bytes.NewBuffer([]byte{})
 			cmd.Stderr = stderr
 			err := cmd.Run()
@@ -109,45 +123,57 @@ func (this *IPSetAction) Init(config *firewallconfigs.FirewallActionConfig) erro
 				if bytes.Contains(output, []byte("NAME_CONFLICT")) {
 					err = nil
 				} else {
-					return errors.New("firewall-cmd add ipset '" + this.config.WhiteName + "': " + err.Error() + ", output: " + string(output))
+					return errors.New("firewall-cmd add ipset '" + listName + "': " + err.Error() + ", output: " + string(output))
 				}
 			}
 		}
 
-		{
+		// ipv6
-			cmd := exec.Command(path, "--permanent", "--add-rich-rule=rule source ipset='"+this.config.WhiteName+"' accept")
+		for _, listName := range []string{this.config.WhiteNameIPv6, this.config.BlackNameIPv6} {
-			stderr := bytes.NewBuffer([]byte{})
+			if len(listName) == 0 {
-			cmd.Stderr = stderr
+				continue
-			err := cmd.Run()
-			if err != nil {
-				output := stderr.Bytes()
-				return errors.New("firewall-cmd add rich rule '" + this.config.WhiteName + "': " + err.Error() + ", output: " + string(output))
 			}
-		}
+			cmd := exec.Command(path, "--permanent", "--new-ipset="+listName, "--type=hash:ip", "--option=family=inet6", "--option=timeout=0", "--option=maxelem=1000000")
-
-		{
-			cmd := exec.Command(path, "--permanent", "--new-ipset="+this.config.BlackName, "--type=hash:ip", "--option=timeout=0", "--option=maxelem=1000000")
 			stderr := bytes.NewBuffer([]byte{})
 			cmd.Stderr = stderr
 			err := cmd.Run()
 			if err != nil {
-				output := stderr.Bytes()
+				var output = stderr.Bytes()
 				if bytes.Contains(output, []byte("NAME_CONFLICT")) {
 					err = nil
 				} else {
-					return errors.New("firewall-cmd add ipset '" + this.config.BlackName + "': " + err.Error() + ", output: " + string(output))
+					return errors.New("firewall-cmd add ipset '" + listName + "': " + err.Error() + ", output: " + string(output))
 				}
 			}
 		}
 
-		{
+		// accept
-			cmd := exec.Command(path, "--permanent", "--add-rich-rule=rule source ipset='"+this.config.BlackName+"' reject")
+		for _, listName := range []string{this.config.WhiteName, this.config.WhiteNameIPv6} {
-			stderr := bytes.NewBuffer([]byte{})
+			if len(listName) == 0 {
+				continue
+			}
+			var cmd = exec.Command(path, "--permanent", "--add-rich-rule=rule source ipset='"+listName+"' accept")
+			var stderr = bytes.NewBuffer([]byte{})
 			cmd.Stderr = stderr
 			err := cmd.Run()
 			if err != nil {
-				output := stderr.Bytes()
+				var output = stderr.Bytes()
-				return errors.New("firewall-cmd add rich rule '" + this.config.WhiteName + "': " + err.Error() + ", output: " + string(output))
+				return errors.New("firewall-cmd add rich rule '" + listName + "': " + err.Error() + ", output: " + string(output))
+			}
+		}
+
+		// reject
+		for _, listName := range []string{this.config.BlackName, this.config.BlackNameIPv6} {
+			if len(listName) == 0 {
+				continue
+			}
+			var cmd = exec.Command(path, "--permanent", "--add-rich-rule=rule source ipset='"+listName+"' reject")
+			var stderr = bytes.NewBuffer([]byte{})
+			cmd.Stderr = stderr
+			err := cmd.Run()
+			if err != nil {
+				var output = stderr.Bytes()
+				return errors.New("firewall-cmd add rich rule '" + listName + "': " + err.Error() + ", output: " + string(output))
 			}
 		}
 
@@ -158,7 +184,7 @@ func (this *IPSetAction) Init(config *firewallconfigs.FirewallActionConfig) erro
 			cmd.Stderr = stderr
 			err := cmd.Run()
 			if err != nil {
-				output := stderr.Bytes()
+				var output = stderr.Bytes()
 				return errors.New("firewall-cmd reload: " + err.Error() + ", output: " + string(output))
 			}
 		}
@@ -171,38 +197,48 @@ func (this *IPSetAction) Init(config *firewallconfigs.FirewallActionConfig) erro
 			return err
 		}
 
-		{
+		// accept
+		for _, listName := range []string{this.config.WhiteName, this.config.WhiteNameIPv6} {
+			if len(listName) == 0 {
+				continue
+			}
+
 			// 检查规则是否存在
-			var cmd = exec.Command(path, "-C", "INPUT", "-m", "set", "--match-set", this.config.WhiteName, "src", "-j", "ACCEPT")
+			var cmd = exec.Command(path, "-C", "INPUT", "-m", "set", "--match-set", listName, "src", "-j", "ACCEPT")
 			err := cmd.Run()
 			var exists = err == nil
 
 			// 添加规则
 			if !exists {
-				var cmd = exec.Command(path, "-A", "INPUT", "-m", "set", "--match-set", this.config.WhiteName, "src", "-j", "ACCEPT")
+				var cmd = exec.Command(path, "-A", "INPUT", "-m", "set", "--match-set", listName, "src", "-j", "ACCEPT")
-				stderr := bytes.NewBuffer([]byte{})
+				var stderr = bytes.NewBuffer([]byte{})
 				cmd.Stderr = stderr
 				err := cmd.Run()
 				if err != nil {
-					output := stderr.Bytes()
+					var output = stderr.Bytes()
 					return errors.New("iptables add rule: " + err.Error() + ", output: " + string(output))
 				}
 			}
 		}
 
-		{
+		// reject
+		for _, listName := range []string{this.config.BlackName, this.config.BlackNameIPv6} {
+			if len(listName) == 0 {
+				continue
+			}
+
 			// 检查规则是否存在
-			var cmd = exec.Command(path, "-C", "INPUT", "-m", "set", "--match-set", this.config.BlackName, "src", "-j", "REJECT")
+			var cmd = exec.Command(path, "-C", "INPUT", "-m", "set", "--match-set", listName, "src", "-j", "REJECT")
 			err := cmd.Run()
 			var exists = err == nil
 
 			if !exists {
-				var cmd = exec.Command(path, "-A", "INPUT", "-m", "set", "--match-set", this.config.BlackName, "src", "-j", "REJECT")
+				var cmd = exec.Command(path, "-A", "INPUT", "-m", "set", "--match-set", listName, "src", "-j", "REJECT")
-				stderr := bytes.NewBuffer([]byte{})
+				var stderr = bytes.NewBuffer([]byte{})
 				cmd.Stderr = stderr
 				err := cmd.Run()
 				if err != nil {
-					output := stderr.Bytes()
+					var output = stderr.Bytes()
 					return errors.New("iptables add rule: " + err.Error() + ", output: " + string(output))
 				}
 			}
@@ -236,7 +272,7 @@ func (this *IPSetAction) runAction(action string, listType IPListType, item *pb.
 		return nil
 	}
 	for _, cidr := range cidrList {
-		index := strings.Index(cidr, "/")
+		var index = strings.Index(cidr, "/")
 		if index <= 0 {
 			continue
 		}
@@ -256,26 +292,40 @@ func (this *IPSetAction) runAction(action string, listType IPListType, item *pb.
 	return nil
 }
 
+func (this *IPSetAction) SetConfig(config *firewallconfigs.FirewallActionIPSetConfig) {
+	this.config = config
+}
+
 func (this *IPSetAction) runActionSingleIP(action string, listType IPListType, item *pb.IPItem) error {
 	if item.Type == "all" {
 		return nil
 	}
 
-	listName := ""
+	var listName = ""
+	var isIPv6 = strings.Contains(item.IpFrom, ":")
+
 	switch listType {
 	case IPListTypeWhite:
-		listName = this.config.WhiteName
+		if isIPv6 {
+			listName = this.config.WhiteNameIPv6
+		} else {
+			listName = this.config.WhiteName
+		}
 	case IPListTypeBlack:
-		listName = this.config.BlackName
+		if isIPv6 {
+			listName = this.config.BlackNameIPv6
+		} else {
+			listName = this.config.BlackName
+		}
 	default:
 		// 不支持的类型
 		return nil
 	}
 	if len(listName) == 0 {
-		return errors.New("empty list name for '" + listType + "'")
+		return nil
 	}
 
-	path := this.config.Path
+	var path = this.config.Path
 	var err error
 	if len(path) == 0 {
 		path, err = exec.LookPath("ipset")
@@ -290,7 +340,7 @@ func (this *IPSetAction) runActionSingleIP(action string, listType IPListType, i
 	}
 
 	// ipset add edge_ip_list 192.168.2.32 timeout 30
-	args := []string{}
+	var args = []string{}
 	switch action {
 	case "addItem":
 		args = append(args, "add")
@@ -300,7 +350,7 @@ func (this *IPSetAction) runActionSingleIP(action string, listType IPListType, i
 
 	args = append(args, listName, item.IpFrom)
 	if action == "addItem" {
-		timestamp := time.Now().Unix()
+		var timestamp = time.Now().Unix()
 		if item.ExpiredAt > timestamp {
 			args = append(args, "timeout", strconv.FormatInt(item.ExpiredAt-timestamp, 10))
 		}
@@ -312,7 +362,7 @@ func (this *IPSetAction) runActionSingleIP(action string, listType IPListType, i
 	}
 
 	this.errorBuf.Reset()
-	cmd := exec.Command(path, args...)
+	var cmd = exec.Command(path, args...)
 	cmd.Stderr = this.errorBuf
 	err = cmd.Run()
 	if err != nil {

internal/iplibrary/action_ipset_test.go

@@ -1,15 +1,16 @@
-package iplibrary
+package iplibrary_test
 
 import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
+	"github.com/TeaOSLab/EdgeNode/internal/iplibrary"
 	"github.com/iwind/TeaGo/maps"
 	"testing"
 	"time"
 )
 
 func TestIPSetAction_Init(t *testing.T) {
-	action := NewIPSetAction()
+	action := iplibrary.NewIPSetAction()
 	err := action.Init(&firewallconfigs.FirewallActionConfig{
 		Params: maps.Map{
 			"path":      "/usr/bin/iptables",
@@ -24,14 +25,16 @@ func TestIPSetAction_Init(t *testing.T) {
 }
 
 func TestIPSetAction_AddItem(t *testing.T) {
-	action := NewIPSetAction()
+	var action = iplibrary.NewIPSetAction()
-	action.config = &firewallconfigs.FirewallActionIPSetConfig{
+	action.SetConfig(&firewallconfigs.FirewallActionIPSetConfig{
-		Path:      "/usr/bin/iptables",
+		Path:          "/usr/bin/iptables",
-		WhiteName: "white-list",
+		WhiteName:     "white-list",
-		BlackName: "black-list",
+		BlackName:     "black-list",
-	}
+		WhiteNameIPv6: "white-list-ipv6",
+		BlackNameIPv6: "black-list-ipv6",
+	})
 	{
-		err := action.AddItem(IPListTypeWhite, &pb.IPItem{
+		err := action.AddItem(iplibrary.IPListTypeWhite, &pb.IPItem{
 			Type:      "ipv4",
 			Id:        1,
 			IpFrom:    "192.168.1.100",
@@ -42,9 +45,20 @@ func TestIPSetAction_AddItem(t *testing.T) {
 		}
 		t.Log("ok")
 	}
-
 	{
-		err := action.AddItem(IPListTypeBlack, &pb.IPItem{
+		err := action.AddItem(iplibrary.IPListTypeWhite, &pb.IPItem{
+			Type:      "ipv4",
+			Id:        1,
+			IpFrom:    "1:2:3:4",
+			ExpiredAt: time.Now().Unix() + 30,
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Log("ok")
+	}
+	{
+		err := action.AddItem(iplibrary.IPListTypeBlack, &pb.IPItem{
 			Type:      "ipv4",
 			Id:        1,
 			IpFrom:    "192.168.1.100",
@@ -55,10 +69,22 @@ func TestIPSetAction_AddItem(t *testing.T) {
 		}
 		t.Log("ok")
 	}
+	{
+		err := action.AddItem(iplibrary.IPListTypeBlack, &pb.IPItem{
+			Type:      "ipv4",
+			Id:        1,
+			IpFrom:    "1:2:3:4",
+			ExpiredAt: time.Now().Unix() + 30,
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Log("ok")
+	}
 }
 
 func TestIPSetAction_DeleteItem(t *testing.T) {
-	action := NewIPSetAction()
+	action := iplibrary.NewIPSetAction()
 	err := action.Init(&firewallconfigs.FirewallActionConfig{
 		Params: maps.Map{
 			"path":      "/usr/bin/firewalld",
@@ -68,7 +94,7 @@ func TestIPSetAction_DeleteItem(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	err = action.DeleteItem(IPListTypeWhite, &pb.IPItem{
+	err = action.DeleteItem(iplibrary.IPListTypeWhite, &pb.IPItem{
 		Type:      "ipv4",
 		Id:        1,
 		IpFrom:    "192.168.1.100",

internal/iplibrary/ip2Region.go

@@ -99,7 +99,7 @@ func (this *IP2Region) MemorySearch(ipStr string) (ipInfo *IpInfo, err error) {
 		}
 	}
 	if dataPtr == 0 {
-		return nil, errors.New("not found")
+		return nil, nil
 	}
 
 	dataLen := (dataPtr >> 24) & 0xFF

internal/iplibrary/ip_item.go

@@ -13,7 +13,7 @@ const (
 // IPItem IP条目
 type IPItem struct {
 	Type       string `json:"type"`
-	Id         int64  `json:"id"`
+	Id         uint64 `json:"id"`
 	IPFrom     uint64 `json:"ipFrom"`
 	IPTo       uint64 `json:"ipTo"`
 	ExpiredAt  int64  `json:"expiredAt"`

internal/iplibrary/ip_list.go

@@ -13,9 +13,9 @@ var GlobalWhiteIPList = NewIPList()
 // IPList IP名单
 // TODO IP名单可以分片关闭，这样让每一片的数据量减少，查询更快
 type IPList struct {
-	itemsMap    map[int64]*IPItem // id => item
+	itemsMap    map[uint64]*IPItem // id => item
 	sortedItems []*IPItem
-	allItemsMap map[int64]*IPItem // id => item
+	allItemsMap map[uint64]*IPItem // id => item
 
 	expireList *expires.List
 
@@ -24,12 +24,12 @@ type IPList struct {
 
 func NewIPList() *IPList {
 	list := &IPList{
-		itemsMap:    map[int64]*IPItem{},
+		itemsMap:    map[uint64]*IPItem{},
-		allItemsMap: map[int64]*IPItem{},
+		allItemsMap: map[uint64]*IPItem{},
 	}
 
 	expireList := expires.NewList()
-	expireList.OnGC(func(itemId int64) {
+	expireList.OnGC(func(itemId uint64) {
 		list.Delete(itemId)
 	})
 	list.expireList = expireList
@@ -51,7 +51,7 @@ func (this *IPList) Sort() {
 	this.locker.Unlock()
 }
 
-func (this *IPList) Delete(itemId int64) {
+func (this *IPList) Delete(itemId uint64) {
 	this.locker.Lock()
 	this.deleteItem(itemId)
 	this.locker.Unlock()
@@ -169,6 +169,10 @@ func (this *IPList) sortItems() {
 
 // 不加锁的情况下查找Item
 func (this *IPList) lookupIP(ip uint64) *IPItem {
+	if len(this.sortedItems) == 0 {
+		return nil
+	}
+
 	var count = len(this.sortedItems)
 	var resultIndex = -1
 	sort.Search(count, func(i int) bool {
@@ -194,7 +198,7 @@ func (this *IPList) lookupIP(ip uint64) *IPItem {
 
 // 在不加锁的情况下删除某个Item
 // 将会被别的方法引用，切记不能加锁
-func (this *IPList) deleteItem(itemId int64) {
+func (this *IPList) deleteItem(itemId uint64) {
 	_, ok := this.itemsMap[itemId]
 	if !ok {
 		return

internal/iplibrary/ip_list_db.go

@@ -5,20 +5,27 @@ package iplibrary
 import (
 	"database/sql"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeNode/internal/events"
+	"github.com/TeaOSLab/EdgeNode/internal/goman"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/iwind/TeaGo/Tea"
 	_ "github.com/mattn/go-sqlite3"
 	"os"
 	"path/filepath"
+	"time"
 )
 
 type IPListDB struct {
 	db *sql.DB
 
-	itemTableName   string
+	itemTableName          string
-	deleteItemStmt  *sql.Stmt
+	deleteExpiredItemsStmt *sql.Stmt
-	insertItemStmt  *sql.Stmt
+	deleteItemStmt         *sql.Stmt
-	selectItemsStmt *sql.Stmt
+	insertItemStmt         *sql.Stmt
+	selectItemsStmt        *sql.Stmt
+	selectMaxVersionStmt   *sql.Stmt
+
+	cleanTicker *time.Ticker
 
 	dir string
 }
@@ -27,6 +34,7 @@ func NewIPListDB() (*IPListDB, error) {
 	var db = &IPListDB{
 		itemTableName: "ipItems",
 		dir:           filepath.Clean(Tea.Root + "/data"),
+		cleanTicker:   time.NewTicker(24 * time.Hour),
 	}
 	err := db.init()
 	return db, err
@@ -43,7 +51,7 @@ func (this *IPListDB) init() error {
 		remotelogs.Println("CACHE", "create cache dir '"+this.dir+"'")
 	}
 
-	db, err := sql.Open("sqlite3", "file:"+this.dir+"/ip_list.db?cache=shared&mode=rwc&_journal_mode=WAL")
+	db, err := sql.Open("sqlite3", "file:"+this.dir+"/ip_list.db?cache=shared&mode=rwc&_journal_mode=WAL&_sync=OFF")
 	if err != nil {
 		return err
 	}
@@ -83,6 +91,11 @@ ON "` + this.itemTableName + `" (
 	}
 
 	// 初始化SQL语句
+	this.deleteExpiredItemsStmt, err = this.db.Prepare(`DELETE FROM "` + this.itemTableName + `" WHERE  "expiredAt">0 AND "expiredAt"<?`)
+	if err != nil {
+		return err
+	}
+
 	this.deleteItemStmt, err = this.db.Prepare(`DELETE FROM "` + this.itemTableName + `" WHERE "itemId"=?`)
 	if err != nil {
 		return err
@@ -93,16 +106,37 @@ ON "` + this.itemTableName + `" (
 		return err
 	}
 
-	this.selectItemsStmt, err = this.db.Prepare(`SELECT "listId", "listType", "isGlobal", "type", "itemId", "ipFrom", "ipTo", "expiredAt", "eventLevel", "isDeleted", "version", "nodeId", "serverId" FROM "` + this.itemTableName + `" ORDER BY "version" ASC, "itemId" ASC LIMIT ?, ?`)
+	this.selectItemsStmt, err = this.db.Prepare(`SELECT "listId", "listType", "isGlobal", "type", "itemId", "ipFrom", "ipTo", "expiredAt", "eventLevel", "isDeleted", "version", "nodeId", "serverId" FROM "` + this.itemTableName + `" WHERE isDeleted=0 ORDER BY "version" ASC, "itemId" ASC LIMIT ?, ?`)
 	if err != nil {
 		return err
 	}
 
+	this.selectMaxVersionStmt, err = this.db.Prepare(`SELECT "version" FROM "` + this.itemTableName + `" ORDER BY "id" DESC LIMIT 1`)
+
 	this.db = db
 
+	goman.New(func() {
+		events.On(events.EventQuit, func() {
+			this.cleanTicker.Stop()
+		})
+
+		for range this.cleanTicker.C {
+			err := this.DeleteExpiredItems()
+			if err != nil {
+				remotelogs.Error("IP_LIST_DB", "clean expired items failed: "+err.Error())
+			}
+		}
+	})
+
 	return nil
 }
 
+// DeleteExpiredItems 删除过期的条目
+func (this *IPListDB) DeleteExpiredItems() error {
+	_, err := this.deleteExpiredItemsStmt.Exec(time.Now().Unix() - 7*86400)
+	return err
+}
+
 func (this *IPListDB) AddItem(item *pb.IPItem) error {
 	_, err := this.deleteItemStmt.Exec(item.Id)
 	if err != nil {
@@ -133,11 +167,27 @@ func (this *IPListDB) ReadItems(offset int64, size int64) (items []*pb.IPItem, e
 	return
 }
 
+// ReadMaxVersion 读取当前最大版本号
+func (this *IPListDB) ReadMaxVersion() int64 {
+	row := this.selectMaxVersionStmt.QueryRow()
+	if row == nil {
+		return 0
+	}
+	var version int64
+	err = row.Scan(&version)
+	if err != nil {
+		return 0
+	}
+	return version
+}
+
 func (this *IPListDB) Close() error {
 	if this.db != nil {
+		_ = this.deleteExpiredItemsStmt.Close()
 		_ = this.deleteItemStmt.Close()
 		_ = this.insertItemStmt.Close()
 		_ = this.selectItemsStmt.Close()
+		_ = this.selectMaxVersionStmt.Close()
 
 		return this.db.Close()
 	}

internal/iplibrary/ip_list_db_test.go

@@ -1,9 +1,10 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 
-package iplibrary
+package iplibrary_test
 
 import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeNode/internal/iplibrary"
 	_ "github.com/iwind/TeaGo/bootstrap"
 	"github.com/iwind/TeaGo/logs"
 	"testing"
@@ -11,7 +12,7 @@ import (
 )
 
 func TestIPListDB_AddItem(t *testing.T) {
-	db, err := NewIPListDB()
+	db, err := iplibrary.NewIPListDB()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -48,7 +49,7 @@ func TestIPListDB_AddItem(t *testing.T) {
 }
 
 func TestIPListDB_ReadItems(t *testing.T) {
-	db, err := NewIPListDB()
+	db, err := iplibrary.NewIPListDB()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -58,3 +59,11 @@ func TestIPListDB_ReadItems(t *testing.T) {
 	}
 	logs.PrintAsJSON(items, t)
 }
+
+func TestIPListDB_ReadMaxVersion(t *testing.T) {
+	db, err := iplibrary.NewIPListDB()
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(db.ReadMaxVersion())
+}

internal/iplibrary/ip_list_test.go

@@ -302,16 +302,20 @@ func TestTooManyLists(t *testing.T) {
 func BenchmarkIPList_Contains(b *testing.B) {
 	runtime.GOMAXPROCS(1)
 
-	list := NewIPList()
+	var list = NewIPList()
-	for i := 1; i < 194; i++ {
+	for i := 1; i < 200_000; i++ {
-		list.Add(&IPItem{
+		list.AddDelay(&IPItem{
 			Id:        int64(i),
-			IPFrom:    utils.IP2Long(strconv.Itoa(i%255) + "." + strconv.Itoa(i%255) + ".0.1"),
+			IPFrom:    utils.IP2Long(strconv.Itoa(rands.Int(0, 255)) + "." + strconv.Itoa(rands.Int(0, 255)) + ".0.1"),
-			IPTo:      utils.IP2Long(strconv.Itoa(i%255) + "." + strconv.Itoa(i%255) + ".0.1"),
+			IPTo:      utils.IP2Long(strconv.Itoa(rands.Int(0, 255)) + "." + strconv.Itoa(rands.Int(0, 255)) + ".0.1"),
 			ExpiredAt: time.Now().Unix() + 60,
 		})
 	}
+	list.Sort()
+
 	b.Log(len(list.itemsMap), "ip")
+
+	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
 		_ = list.Contains(utils.IP2Long("192.168.1.100"))
 	}

internal/iplibrary/list_utils.go

@@ -8,37 +8,37 @@ import (
 
 // AllowIP 检查IP是否被允许访问
 // 如果一个IP不在任何名单中，则允许访问
-func AllowIP(ip string, serverId int64) bool {
+func AllowIP(ip string, serverId int64) (canGoNext bool, inAllowList bool) {
 	var ipLong = utils.IP2Long(ip)
 	if ipLong == 0 {
-		return false
+		return false, false
 	}
 
 	// check white lists
 	if GlobalWhiteIPList.Contains(ipLong) {
-		return true
+		return true, true
 	}
 
 	if serverId > 0 {
 		var list = SharedServerListManager.FindWhiteList(serverId, false)
 		if list != nil && list.Contains(ipLong) {
-			return true
+			return true, true
 		}
 	}
 
 	// check black lists
 	if GlobalBlackIPList.Contains(ipLong) {
-		return false
+		return false, false
 	}
 
 	if serverId > 0 {
 		var list = SharedServerListManager.FindBlackList(serverId, false)
 		if list != nil && list.Contains(ipLong) {
-			return false
+			return false, false
 		}
 	}
 
-	return true
+	return true, false
 }
 
 // IsInWhiteList 检查IP是否在白名单中
@@ -58,7 +58,7 @@ func AllowIPStrings(ipStrings []string, serverId int64) bool {
 		return true
 	}
 	for _, ip := range ipStrings {
-		isAllowed := AllowIP(ip, serverId)
+		isAllowed, _ := AllowIP(ip, serverId)
 		if !isAllowed {
 			return false
 		}

internal/iplibrary/manager_ip_list.go

@@ -61,7 +61,7 @@ func (this *IPListManager) Start() {
 	if Tea.IsTesting() {
 		this.ticker = time.NewTicker(10 * time.Second)
 	}
-	countErrors := 0
+	var countErrors = 0
 	for {
 		select {
 		case <-this.ticker.C:
@@ -100,6 +100,13 @@ func (this *IPListManager) init() {
 	} else {
 		this.db = db
 
+		// 删除本地数据库中过期的条目
+		_ = db.DeleteExpiredItems()
+
+		// 本地数据库中最大版本号
+		this.version = db.ReadMaxVersion()
+
+		// 从本地数据库中加载
 		var offset int64 = 0
 		var size int64 = 1000
 		for {
@@ -142,6 +149,10 @@ func (this *IPListManager) fetch() (hasNext bool, err error) {
 		Size:    this.pageSize,
 	})
 	if err != nil {
+		if rpc.IsConnError(err) {
+			remotelogs.Warn("IP_LIST_MANAGER", "rpc connection error: "+err.Error())
+			return false, nil
+		}
 		return false, err
 	}
 	items := itemsResp.IpItems
@@ -171,7 +182,7 @@ func (this *IPListManager) FindList(listId int64) *IPList {
 	return list
 }
 
-func (this *IPListManager) processItems(items []*pb.IPItem, shouldExecute bool) {
+func (this *IPListManager) processItems(items []*pb.IPItem, fromRemote bool) {
 	this.locker.Lock()
 	var changedLists = map[*IPList]zero.Zero{}
 	for _, item := range items {
@@ -202,13 +213,13 @@ func (this *IPListManager) processItems(items []*pb.IPItem, shouldExecute bool)
 		changedLists[list] = zero.New()
 
 		if item.IsDeleted {
-			list.Delete(item.Id)
+			list.Delete(uint64(item.Id))
 
 			// 从WAF名单中删除
-			waf.SharedIPBlackList.RemoveIP(item.IpFrom, item.ServerId, shouldExecute)
+			waf.SharedIPBlackList.RemoveIP(item.IpFrom, item.ServerId, fromRemote)
 
 			// 操作事件
-			if shouldExecute {
+			if fromRemote {
 				SharedActionManager.DeleteItem(item.ListType, item)
 			}
 
@@ -216,7 +227,7 @@ func (this *IPListManager) processItems(items []*pb.IPItem, shouldExecute bool)
 		}
 
 		list.AddDelay(&IPItem{
-			Id:         item.Id,
+			Id:         uint64(item.Id),
 			Type:       item.Type,
 			IPFrom:     utils.IP2Long(item.IpFrom),
 			IPTo:       utils.IP2Long(item.IpTo),
@@ -225,7 +236,7 @@ func (this *IPListManager) processItems(items []*pb.IPItem, shouldExecute bool)
 		})
 
 		// 事件操作
-		if shouldExecute {
+		if fromRemote {
 			SharedActionManager.DeleteItem(item.ListType, item)
 			SharedActionManager.AddItem(item.ListType, item)
 		}
@@ -236,5 +247,11 @@ func (this *IPListManager) processItems(items []*pb.IPItem, shouldExecute bool)
 	}
 
 	this.locker.Unlock()
-	this.version = items[len(items)-1].Version
+
+	if fromRemote {
+		var latestVersion = items[len(items)-1].Version
+		if latestVersion > this.version {
+			this.version = latestVersion
+		}
+	}
 }

internal/metrics/stat.go

@@ -3,9 +3,9 @@
 package metrics
 
 import (
-	"encoding/json"
+	"github.com/TeaOSLab/EdgeNode/internal/utils/fnv"
-	"github.com/cespare/xxhash"
 	"strconv"
+	"strings"
 )
 
 type Stat struct {
@@ -17,6 +17,6 @@ type Stat struct {
 }
 
 func SumStat(serverId int64, keys []string, time string, version int32, itemId int64) string {
-	keysData, _ := json.Marshal(keys)
+	keysData := strings.Join(keys, "$EDGE$")
-	return strconv.FormatUint(xxhash.Sum64String(strconv.FormatInt(serverId, 10)+"@"+string(keysData)+"@"+time+"@"+strconv.Itoa(int(version))+"@"+strconv.FormatInt(itemId, 10)), 10)
+	return strconv.FormatUint(fnv.HashString(strconv.FormatInt(serverId, 10)+"@"+keysData+"@"+time+"@"+strconv.Itoa(int(version))+"@"+strconv.FormatInt(itemId, 10)), 10)
 }

internal/metrics/task.go

@@ -7,17 +7,18 @@ import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
 	"github.com/TeaOSLab/EdgeNode/internal/goman"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/TeaOSLab/EdgeNode/internal/rpc"
 	"github.com/TeaOSLab/EdgeNode/internal/trackers"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"github.com/TeaOSLab/EdgeNode/internal/utils/dbs"
 	"github.com/TeaOSLab/EdgeNode/internal/zero"
 	"github.com/iwind/TeaGo/Tea"
 	_ "github.com/mattn/go-sqlite3"
 	"os"
 	"strconv"
-	"strings"
 	"sync"
 	"time"
 )
@@ -38,7 +39,7 @@ type Task struct {
 	item     *serverconfigs.MetricItemConfig
 	isLoaded bool
 
-	db            *sql.DB
+	db            *dbs.DB
 	statTableName string
 	isStopped     bool
 
@@ -87,12 +88,16 @@ func (this *Task) Init() error {
 		remotelogs.Println("METRIC", "create data dir '"+dir+"'")
 	}
 
-	db, err := sql.Open("sqlite3", "file:"+dir+"/metric."+strconv.FormatInt(this.item.Id, 10)+".db?cache=shared&mode=rwc&_journal_mode=WAL")
+	db, err := sql.Open("sqlite3", "file:"+dir+"/metric."+strconv.FormatInt(this.item.Id, 10)+".db?cache=shared&mode=rwc&_journal_mode=WAL&_sync=OFF")
 	if err != nil {
 		return err
 	}
 	db.SetMaxOpenConns(1)
-	this.db = db
+	this.db = dbs.NewDB(db)
+
+	if teaconst.EnableDBStat {
+		this.db.EnableStat(true)
+	}
 
 	//创建统计表
 	_, err = db.Exec(`CREATE TABLE IF NOT EXISTS "` + this.statTableName + `" (
@@ -438,10 +443,11 @@ func (this *Task) Upload(pauseDuration time.Duration) error {
 
 			if len(idStrings) > 0 {
 				// 设置为已上传
-				_, err = this.db.Exec(`UPDATE "` + this.statTableName + `" SET isUploaded=1 WHERE id IN (` + strings.Join(idStrings, ",") + `)`)
+				// TODO 先不判断是否已经上传，需要改造API进行配合
+				/**_, err = this.db.Exec(`UPDATE "` + this.statTableName + `" SET isUploaded=1 WHERE id IN (` + strings.Join(idStrings, ",") + `)`)
 				if err != nil {
 					return err
-				}
+				}**/
 			}
 		}
 

internal/nodes/api_stream.go

@@ -9,6 +9,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/TeaOSLab/EdgeNode/internal/caches"
+	"github.com/TeaOSLab/EdgeNode/internal/compressions"
 	"github.com/TeaOSLab/EdgeNode/internal/configs"
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
 	"github.com/TeaOSLab/EdgeNode/internal/errors"
@@ -182,7 +183,7 @@ func (this *APIStream) handleWriteCache(message *pb.NodeStreamMessage) error {
 	}
 
 	expiredAt := time.Now().Unix() + msg.LifeSeconds
-	writer, err := storage.OpenWriter(msg.Key, expiredAt, 200, int64(len(msg.Value)), false)
+	writer, err := storage.OpenWriter(msg.Key, expiredAt, 200, int64(len(msg.Value)), -1, false)
 	if err != nil {
 		this.replyFail(message.RequestId, "prepare writing failed: "+err.Error())
 		return err
@@ -239,7 +240,7 @@ func (this *APIStream) handleReadCache(message *pb.NodeStreamMessage) error {
 		}()
 	}
 
-	reader, err := storage.OpenReader(msg.Key, false)
+	reader, err := storage.OpenReader(msg.Key, false, false)
 	if err != nil {
 		if err == caches.ErrNotFound {
 			this.replyFail(message.RequestId, "key not found")
@@ -350,7 +351,16 @@ func (this *APIStream) handlePurgeCache(message *pb.NodeStreamMessage) error {
 	if msg.Type == "file" {
 		var keys = msg.Keys
 		for _, key := range keys {
-			keys = append(keys, key+webpSuffix)
+			keys = append(keys,
+				key+caches.SuffixMethod+"HEAD",
+				key+caches.SuffixWebP,
+				key+caches.SuffixPartial,
+			)
+			// TODO 根据实际缓存的内容进行组合
+			for _, encoding := range compressions.AllEncodings() {
+				keys = append(keys, key+caches.SuffixCompression+encoding)
+				keys = append(keys, key+caches.SuffixWebP+caches.SuffixCompression+encoding)
+			}
 		}
 		msg.Keys = keys
 	}
@@ -462,7 +472,7 @@ func (this *APIStream) handlePreheatCache(message *pb.NodeStreamMessage) error {
 			}
 
 			expiredAt := time.Now().Unix() + 8600
-			writer, err := storage.OpenWriter(key, expiredAt, 200, resp.ContentLength, false) // TODO 可以设置缓存过期时间
+			writer, err := storage.OpenWriter(key, expiredAt, 200, resp.ContentLength, -1, false) // TODO 可以设置缓存过期时间
 			if err != nil {
 				locker.Lock()
 				errorMessages = append(errorMessages, "open cache writer failed: "+key+": "+err.Error())

internal/nodes/client_conn_traffic.go

@@ -20,20 +20,21 @@ func init() {
 		goman.New(func() {
 			for range ticker.C {
 				// 加入到数据队列中
-				if teaconst.InTrafficBytes > 0 {
+				var inBytes = atomic.LoadUint64(&teaconst.InTrafficBytes)
+				atomic.StoreUint64(&teaconst.InTrafficBytes, 0) // 重置数据
+				if inBytes > 0 {
 					monitor.SharedValueQueue.Add(nodeconfigs.NodeValueItemTrafficIn, maps.Map{
-						"total": teaconst.InTrafficBytes,
+						"total": inBytes,
-					})
-				}
-				if teaconst.OutTrafficBytes > 0 {
-					monitor.SharedValueQueue.Add(nodeconfigs.NodeValueItemTrafficOut, maps.Map{
-						"total": teaconst.OutTrafficBytes,
 					})
 				}
 
-				// 重置数据
+				var outBytes = atomic.LoadUint64(&teaconst.OutTrafficBytes)
-				atomic.StoreUint64(&teaconst.InTrafficBytes, 0)
+				atomic.StoreUint64(&teaconst.OutTrafficBytes, 0) // 重置数据
-				atomic.StoreUint64(&teaconst.OutTrafficBytes, 0)
+				if outBytes > 0 {
+					monitor.SharedValueQueue.Add(nodeconfigs.NodeValueItemTrafficOut, maps.Map{
+						"total": outBytes,
+					})
+				}
 			}
 		})
 	})

internal/nodes/client_listener.go

@@ -49,8 +49,11 @@ func (this *ClientListener) Accept() (net.Conn, error) {
 	// 是否在WAF名单中
 	ip, _, err := net.SplitHostPort(conn.RemoteAddr().String())
 	if err == nil {
-		if !iplibrary.AllowIP(ip, 0) || (!waf.SharedIPWhiteList.Contains(waf.IPTypeAll, firewallconfigs.FirewallScopeGlobal, 0, ip) &&
+		canGoNext, _ := iplibrary.AllowIP(ip, 0)
-			waf.SharedIPBlackList.Contains(waf.IPTypeAll, firewallconfigs.FirewallScopeGlobal, 0, ip)) {
+
+		if !canGoNext ||
+			(!waf.SharedIPWhiteList.Contains(waf.IPTypeAll, firewallconfigs.FirewallScopeGlobal, 0, ip) &&
+				waf.SharedIPBlackList.Contains(waf.IPTypeAll, firewallconfigs.FirewallScopeGlobal, 0, ip)) {
 			tcpConn, ok := conn.(*net.TCPConn)
 			if ok {
 				_ = tcpConn.SetLinger(0)

internal/nodes/http_access_log_queue.go

@@ -94,7 +94,7 @@ Loop:
 		// 是否包含了invalid UTF-8
 		if strings.Contains(err.Error(), "string field contains invalid UTF-8") {
 			for _, accessLog := range accessLogs {
-				this.toValidUTF8(accessLog)
+				this.ToValidUTF8(accessLog)
 			}
 
 			// 重新提交
@@ -108,7 +108,7 @@ Loop:
 	return nil
 }
 
-func (this *HTTPAccessLogQueue) toValidUTF8(accessLog *pb.HTTPAccessLog) {
+func (this *HTTPAccessLogQueue) ToValidUTF8(accessLog *pb.HTTPAccessLog) {
 	accessLog.RemoteUser = utils.ToValidUTF8string(accessLog.RemoteUser)
 	accessLog.RequestURI = utils.ToValidUTF8string(accessLog.RequestURI)
 	accessLog.RequestPath = utils.ToValidUTF8string(accessLog.RequestPath)

internal/nodes/http_access_log_queue_test.go

@@ -1,15 +1,18 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 
-package nodes
+package nodes_test
 
 import (
 	"bytes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeNode/internal/nodes"
 	"github.com/TeaOSLab/EdgeNode/internal/rpc"
+	"github.com/TeaOSLab/EdgeNode/internal/utils/testutils"
 	_ "github.com/iwind/TeaGo/bootstrap"
 	"google.golang.org/grpc/status"
 	"reflect"
 	"runtime"
+	"runtime/debug"
 	"strconv"
 	"strings"
 	"testing"
@@ -47,7 +50,7 @@ func TestHTTPAccessLogQueue_Push(t *testing.T) {
 		},
 	}
 
-	new(HTTPAccessLogQueue).toValidUTF8(accessLog)
+	new(nodes.HTTPAccessLogQueue).ToValidUTF8(accessLog)
 
 	//	logs.PrintAsJSON(accessLog)
 
@@ -105,6 +108,33 @@ func TestHTTPAccessLogQueue_Push2(t *testing.T) {
 	t.Log("ok")
 }
 
+func TestHTTPAccessLogQueue_Memory(t *testing.T) {
+	testutils.StartMemoryStats(t)
+
+	debug.SetGCPercent(10)
+
+	var accessLogs = []*pb.HTTPAccessLog{}
+	for i := 0; i < 20_000; i++ {
+		accessLogs = append(accessLogs, &pb.HTTPAccessLog{
+			RequestPath: "https://goedge.cn/hello/world",
+		})
+	}
+
+	runtime.GC()
+
+	// will not release automatically
+	func() {
+		var accessLogs1 = []*pb.HTTPAccessLog{}
+		for i := 0; i < 2_000_000; i++ {
+			accessLogs1 = append(accessLogs1, &pb.HTTPAccessLog{
+				RequestPath: "https://goedge.cn/hello/world",
+			})
+		}
+	}()
+
+	time.Sleep(5 * time.Second)
+}
+
 func BenchmarkHTTPAccessLogQueue_ToValidUTF8(b *testing.B) {
 	runtime.GOMAXPROCS(1)
 

internal/nodes/http_client_pool.go

@@ -29,7 +29,7 @@ type HTTPClientPool struct {
 
 // NewHTTPClientPool 获取新对象
 func NewHTTPClientPool() *HTTPClientPool {
-	pool := &HTTPClientPool{
+	var pool = &HTTPClientPool{
 		clientExpiredDuration: 3600 * time.Second,
 		clientsMap:            map[string]*HTTPClient{},
 	}
@@ -42,12 +42,16 @@ func NewHTTPClientPool() *HTTPClientPool {
 }
 
 // Client 根据地址获取客户端
-func (this *HTTPClientPool) Client(req *HTTPRequest, origin *serverconfigs.OriginConfig, originAddr string, proxyProtocol *serverconfigs.ProxyProtocolConfig) (rawClient *http.Client, err error) {
+func (this *HTTPClientPool) Client(req *HTTPRequest,
+	origin *serverconfigs.OriginConfig,
+	originAddr string,
+	proxyProtocol *serverconfigs.ProxyProtocolConfig,
+	followRedirects bool) (rawClient *http.Client, err error) {
 	if origin.Addr == nil {
 		return nil, errors.New("origin addr should not be empty (originId:" + strconv.FormatInt(origin.Id, 10) + ")")
 	}
 
-	key := origin.UniqueKey() + "@" + originAddr
+	var key = origin.UniqueKey() + "@" + originAddr
 
 	this.locker.Lock()
 	defer this.locker.Unlock()
@@ -58,11 +62,11 @@ func (this *HTTPClientPool) Client(req *HTTPRequest, origin *serverconfigs.Origi
 		return client.RawClient(), nil
 	}
 
-	maxConnections := origin.MaxConns
+	var maxConnections = origin.MaxConns
-	connectionTimeout := origin.ConnTimeoutDuration()
+	var connectionTimeout = origin.ConnTimeoutDuration()
-	readTimeout := origin.ReadTimeoutDuration()
+	var readTimeout = origin.ReadTimeoutDuration()
-	idleTimeout := origin.IdleTimeoutDuration()
+	var idleTimeout = origin.IdleTimeoutDuration()
-	idleConns := origin.MaxIdleConns
+	var idleConns = origin.MaxIdleConns
 
 	// 超时时间
 	if connectionTimeout <= 0 {
@@ -73,7 +77,7 @@ func (this *HTTPClientPool) Client(req *HTTPRequest, origin *serverconfigs.Origi
 		idleTimeout = 2 * time.Minute
 	}
 
-	numberCPU := runtime.NumCPU()
+	var numberCPU = runtime.NumCPU()
 	if numberCPU < 8 {
 		numberCPU = 8
 	}
@@ -138,7 +142,21 @@ func (this *HTTPClientPool) Client(req *HTTPRequest, origin *serverconfigs.Origi
 	rawClient = &http.Client{
 		Timeout:   readTimeout,
 		Transport: transport,
-		CheckRedirect: func(req *http.Request, via []*http.Request) error {
+		CheckRedirect: func(targetReq *http.Request, via []*http.Request) error {
+			// 是否跟随
+			if followRedirects {
+				var schemeIsSame = true
+				for _, r := range via {
+					if r.URL.Scheme != targetReq.URL.Scheme {
+						schemeIsSame = false
+						break
+					}
+				}
+				if schemeIsSame {
+					return nil
+				}
+			}
+
 			return http.ErrUseLastResponse
 		},
 	}
@@ -150,7 +168,7 @@ func (this *HTTPClientPool) Client(req *HTTPRequest, origin *serverconfigs.Origi
 
 // 清理不使用的Client
 func (this *HTTPClientPool) cleanClients() {
-	ticker := time.NewTicker(this.clientExpiredDuration)
+	var ticker = time.NewTicker(this.clientExpiredDuration)
 	for range ticker.C {
 		currentAt := time.Now().Unix()
 
@@ -168,11 +186,11 @@ func (this *HTTPClientPool) cleanClients() {
 // 支持TOA
 func (this *HTTPClientPool) handleTOA(req *HTTPRequest, ctx context.Context, network string, originAddr string, connectionTimeout time.Duration) (net.Conn, error) {
 	// TODO 每个服务读取自身所属集群的TOA设置
-	toaConfig := sharedTOAManager.Config()
+	var toaConfig = sharedTOAManager.Config()
 	if toaConfig != nil && toaConfig.IsOn {
-		retries := 3
+		var retries = 3
 		for i := 1; i <= retries; i++ {
-			port := int(toaConfig.RandLocalPort())
+			var port = int(toaConfig.RandLocalPort())
 			// TODO 思考是否支持X-Real-IP/X-Forwarded-IP
 			err := sharedTOAManager.SendMsg("add:" + strconv.Itoa(port) + ":" + req.requestRemoteAddr(true))
 			if err != nil {
@@ -210,7 +228,7 @@ func (this *HTTPClientPool) handlePROXYProtocol(conn net.Conn, req *HTTPRequest,
 		if reqConn != nil {
 			destAddr = reqConn.(net.Conn).LocalAddr()
 		}
-		header := proxyproto.Header{
+		var header = proxyproto.Header{
 			Version:           byte(proxyProtocol.Version),
 			Command:           proxyproto.PROXY,
 			TransportProtocol: transportProtocol,

internal/nodes/http_client_pool_test.go

@@ -21,14 +21,14 @@ func TestHTTPClientPool_Client(t *testing.T) {
 			t.Fatal(err)
 		}
 		{
-			client, err := pool.Client(nil, origin, origin.Addr.PickAddress(), nil)
+			client, err := pool.Client(nil, origin, origin.Addr.PickAddress(), nil, false)
 			if err != nil {
 				t.Fatal(err)
 			}
 			t.Log("client:", client)
 		}
 		for i := 0; i < 10; i++ {
-			client, err := pool.Client(nil, origin, origin.Addr.PickAddress(), nil)
+			client, err := pool.Client(nil, origin, origin.Addr.PickAddress(), nil, false)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -53,7 +53,7 @@ func TestHTTPClientPool_cleanClients(t *testing.T) {
 
 	for i := 0; i < 10; i++ {
 		t.Log("get", i)
-		_, _ = pool.Client(nil, origin, origin.Addr.PickAddress(), nil)
+		_, _ = pool.Client(nil, origin, origin.Addr.PickAddress(), nil, false)
 		time.Sleep(1 * time.Second)
 	}
 }
@@ -73,6 +73,6 @@ func BenchmarkHTTPClientPool_Client(b *testing.B) {
 
 	pool := NewHTTPClientPool()
 	for i := 0; i < b.N; i++ {
-		_, _ = pool.Client(nil, origin, origin.Addr.PickAddress(), nil)
+		_, _ = pool.Client(nil, origin, origin.Addr.PickAddress(), nil, false)
 	}
 }

internal/nodes/http_request.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
 	"github.com/TeaOSLab/EdgeNode/internal/iplibrary"
@@ -47,6 +48,13 @@ type HTTPRequest struct {
 	IsHTTP     bool
 	IsHTTPS    bool
 
+	// 共享参数
+	nodeConfig *nodeconfigs.NodeConfig
+
+	// ln request
+	isLnRequest  bool
+	lnRemoteAddr string
+
 	// 内部参数
 	isSubRequest         bool
 	writer               *HTTPWriter
@@ -85,7 +93,8 @@ type HTTPRequest struct {
 
 	logAttrs map[string]string
 
-	disableLog bool // 此请求中关闭Log
+	disableLog bool // 是否在当前请求中关闭Log
+	forceLog   bool // 是否强制记录日志
 
 	// script相关操作
 	isDone bool
@@ -145,6 +154,9 @@ func (this *HTTPRequest) Do() {
 		return
 	}
 
+	// 是否为低级别节点
+	this.isLnRequest = this.checkLnRequest()
+
 	// 回调事件
 	this.onInit()
 	if this.writer.isFinished {
@@ -152,58 +164,60 @@ func (this *HTTPRequest) Do() {
 		return
 	}
 
-	// 特殊URL处理
+	if !this.isLnRequest {
-	if len(this.rawURI) > 1 && this.rawURI[1] == '.' {
+		// 特殊URL处理
-		// ACME
+		if len(this.rawURI) > 1 && this.rawURI[1] == '.' {
-		// TODO 需要配置是否启用ACME检测
+			// ACME
-		if strings.HasPrefix(this.rawURI, "/.well-known/acme-challenge/") {
+			// TODO 需要配置是否启用ACME检测
-			this.doACME()
+			if strings.HasPrefix(this.rawURI, "/.well-known/acme-challenge/") {
+				this.doACME()
+				this.doEnd()
+				return
+			}
+		}
+
+		// 套餐
+		if this.ReqServer.UserPlan != nil && !this.ReqServer.UserPlan.IsAvailable() {
+			this.doPlanExpires()
 			this.doEnd()
 			return
 		}
-	}
 
-	// 套餐
+		// 流量限制
-	if this.ReqServer.UserPlan != nil && !this.ReqServer.UserPlan.IsAvailable() {
+		if this.ReqServer.TrafficLimit != nil && this.ReqServer.TrafficLimit.IsOn && !this.ReqServer.TrafficLimit.IsEmpty() && this.ReqServer.TrafficLimitStatus != nil && this.ReqServer.TrafficLimitStatus.IsValid() {
-		this.doPlanExpires()
+			this.doTrafficLimit()
-		this.doEnd()
-		return
-	}
-
-	// 流量限制
-	if this.ReqServer.TrafficLimit != nil && this.ReqServer.TrafficLimit.IsOn && !this.ReqServer.TrafficLimit.IsEmpty() && this.ReqServer.TrafficLimitStatus != nil && this.ReqServer.TrafficLimitStatus.IsValid() {
-		this.doTrafficLimit()
-		this.doEnd()
-		return
-	}
-
-	// WAF
-	if this.web.FirewallRef != nil && this.web.FirewallRef.IsOn {
-		if this.doWAFRequest() {
 			this.doEnd()
 			return
 		}
-	}
 
-	// 访问控制
+		// WAF
-	if !this.isSubRequest && this.web.Auth != nil && this.web.Auth.IsOn {
+		if this.web.FirewallRef != nil && this.web.FirewallRef.IsOn {
-		if this.doAuth() {
+			if this.doWAFRequest() {
-			this.doEnd()
+				this.doEnd()
-			return
+				return
+			}
 		}
-	}
 
-	// 自动跳转到HTTPS
+		// 访问控制
-	if this.IsHTTP && this.web.RedirectToHttps != nil && this.web.RedirectToHttps.IsOn {
+		if !this.isSubRequest && this.web.Auth != nil && this.web.Auth.IsOn {
-		if this.doRedirectToHTTPS(this.web.RedirectToHttps) {
+			if this.doAuth() {
-			this.doEnd()
+				this.doEnd()
-			return
+				return
+			}
 		}
-	}
 
-	// Compression
+		// 自动跳转到HTTPS
-	if this.web.Compression != nil && this.web.Compression.IsOn && this.web.Compression.Level > 0 {
+		if this.IsHTTP && this.web.RedirectToHttps != nil && this.web.RedirectToHttps.IsOn {
-		this.writer.SetCompression(this.web.Compression)
+			if this.doRedirectToHTTPS(this.web.RedirectToHttps) {
+				this.doEnd()
+				return
+			}
+		}
+
+		// Compression
+		if this.web.Compression != nil && this.web.Compression.IsOn && this.web.Compression.Level > 0 {
+			this.writer.SetCompression(this.web.Compression)
+		}
 	}
 
 	// 开始调用
@@ -218,49 +232,60 @@ func (this *HTTPRequest) Do() {
 
 // 开始调用
 func (this *HTTPRequest) doBegin() {
-	// 处理request limit
+	if !this.isLnRequest {
-	if this.web.RequestLimit != nil &&
+		// 处理request limit
-		this.web.RequestLimit.IsOn {
+		if this.web.RequestLimit != nil &&
-		if this.doRequestLimit() {
+			this.web.RequestLimit.IsOn {
+			if this.doRequestLimit() {
+				return
+			}
+		}
+
+		// 处理requestBody
+		if this.RawReq.ContentLength > 0 &&
+			this.web.AccessLogRef != nil &&
+			this.web.AccessLogRef.IsOn &&
+			this.web.AccessLogRef.ContainsField(serverconfigs.HTTPAccessLogFieldRequestBody) {
+			var err error
+			this.requestBodyData, err = ioutil.ReadAll(io.LimitReader(this.RawReq.Body, AccessLogMaxRequestBodySize))
+			if err != nil {
+				this.write50x(err, http.StatusBadGateway, false)
+				return
+			}
+			this.RawReq.Body = ioutil.NopCloser(io.MultiReader(bytes.NewBuffer(this.requestBodyData), this.RawReq.Body))
+		}
+
+		// 处理健康检查
+		var isHealthCheck = false
+		var healthCheckKey = this.RawReq.Header.Get(serverconfigs.HealthCheckHeaderName)
+		if len(healthCheckKey) > 0 {
+			if this.doHealthCheck(healthCheckKey, &isHealthCheck) {
+				return
+			}
+		}
+
+		// UAM
+		if !isHealthCheck && this.ReqServer.UAM != nil && this.ReqServer.UAM.IsOn {
+			if this.doUAM() {
+				this.doEnd()
+				return
+			}
+		}
+
+		// 跳转
+		if len(this.web.HostRedirects) > 0 {
+			if this.doHostRedirect() {
+				return
+			}
+		}
+
+		// 临时关闭页面
+		if this.web.Shutdown != nil && this.web.Shutdown.IsOn {
+			this.doShutdown()
 			return
 		}
 	}
 
-	// 处理requestBody
-	if this.RawReq.ContentLength > 0 &&
-		this.web.AccessLogRef != nil &&
-		this.web.AccessLogRef.IsOn &&
-		this.web.AccessLogRef.ContainsField(serverconfigs.HTTPAccessLogFieldRequestBody) {
-		var err error
-		this.requestBodyData, err = ioutil.ReadAll(io.LimitReader(this.RawReq.Body, AccessLogMaxRequestBodySize))
-		if err != nil {
-			this.write50x(err, http.StatusBadGateway, false)
-			return
-		}
-		this.RawReq.Body = ioutil.NopCloser(io.MultiReader(bytes.NewBuffer(this.requestBodyData), this.RawReq.Body))
-	}
-
-	// 处理健康检查
-	var healthCheckKey = this.RawReq.Header.Get(serverconfigs.HealthCheckHeaderName)
-	if len(healthCheckKey) > 0 {
-		if this.doHealthCheck(healthCheckKey) {
-			return
-		}
-	}
-
-	// 跳转
-	if len(this.web.HostRedirects) > 0 {
-		if this.doHostRedirect() {
-			return
-		}
-	}
-
-	// 临时关闭页面
-	if this.web.Shutdown != nil && this.web.Shutdown.IsOn {
-		this.doShutdown()
-		return
-	}
-
 	// 缓存
 	if this.web.Cache != nil && this.web.Cache.IsOn {
 		if this.doCacheRead(false) {
@@ -268,30 +293,32 @@ func (this *HTTPRequest) doBegin() {
 		}
 	}
 
-	// 重写规则
+	if !this.isLnRequest {
-	if this.rewriteRule != nil {
+		// 重写规则
-		if this.doRewrite() {
+		if this.rewriteRule != nil {
-			return
+			if this.doRewrite() {
-		}
+				return
-	}
+			}
-
-	// Fastcgi
-	if this.web.FastcgiRef != nil && this.web.FastcgiRef.IsOn && len(this.web.FastcgiList) > 0 {
-		if this.doFastcgi() {
-			return
-		}
-	}
-
-	// root
-	if this.web.Root != nil && this.web.Root.IsOn {
-		// 如果处理成功，则终止请求的处理
-		if this.doRoot() {
-			return
 		}
 
-		// 如果明确设置了终止，则也会自动终止
+		// Fastcgi
-		if this.web.Root.IsBreak {
+		if this.web.FastcgiRef != nil && this.web.FastcgiRef.IsOn && len(this.web.FastcgiList) > 0 {
-			return
+			if this.doFastcgi() {
+				return
+			}
+		}
+
+		// root
+		if this.web.Root != nil && this.web.Root.IsOn {
+			// 如果处理成功，则终止请求的处理
+			if this.doRoot() {
+				return
+			}
+
+			// 如果明确设置了终止，则也会自动终止
+			if this.web.Root.IsBreak {
+				return
+			}
 		}
 	}
 
@@ -312,17 +339,23 @@ func (this *HTTPRequest) doEnd() {
 
 	// 流量统计
 	// TODO 增加是否开启开关
-	// TODO 增加Header统计，考虑从Conn中读取
 	if this.ReqServer != nil {
+		var countCached int64 = 0
+		var cachedBytes int64 = 0
+
+		var countAttacks int64 = 0
+		var attackBytes int64 = 0
+
 		if this.isCached {
-			stats.SharedTrafficStatManager.Add(this.ReqServer.Id, this.ReqHost, this.writer.SentBodyBytes(), this.writer.SentBodyBytes(), 1, 1, 0, 0, this.ReqServer.ShouldCheckTrafficLimit(), this.ReqServer.PlanId())
+			countCached = 1
-		} else {
+			cachedBytes = this.writer.SentBodyBytes() + this.writer.SentHeaderBytes()
-			if this.isAttack {
-				stats.SharedTrafficStatManager.Add(this.ReqServer.Id, this.ReqHost, this.writer.SentBodyBytes(), 0, 1, 0, 1, this.writer.SentBodyBytes(), this.ReqServer.ShouldCheckTrafficLimit(), this.ReqServer.PlanId())
-			} else {
-				stats.SharedTrafficStatManager.Add(this.ReqServer.Id, this.ReqHost, this.writer.SentBodyBytes(), 0, 1, 0, 0, 0, this.ReqServer.ShouldCheckTrafficLimit(), this.ReqServer.PlanId())
-			}
 		}
+		if this.isAttack {
+			countAttacks = 1
+			attackBytes = this.CalculateSize()
+		}
+
+		stats.SharedTrafficStatManager.Add(this.ReqServer.Id, this.ReqHost, this.writer.SentBodyBytes()+this.writer.SentHeaderBytes(), cachedBytes, 1, countCached, countAttacks, attackBytes, this.ReqServer.ShouldCheckTrafficLimit(), this.ReqServer.PlanId())
 	}
 
 	// 指标
@@ -468,7 +501,10 @@ func (this *HTTPRequest) configureWeb(web *serverconfigs.HTTPWebConfig, isTop bo
 	// request scripts
 	if web.RequestScripts != nil {
 		if this.web.RequestScripts == nil {
-			this.web.RequestScripts = web.RequestScripts
+			this.web.RequestScripts = &serverconfigs.HTTPRequestScriptsConfig{
+				InitGroup:    web.RequestScripts.InitGroup,
+				RequestGroup: web.RequestScripts.RequestGroup,
+			} // 不要直接赋值，需要复制，防止在运行时被修改
 		} else {
 			if web.RequestScripts.InitGroup != nil && (web.RequestScripts.InitGroup.IsPrior || isTop) {
 				if this.web.RequestScripts == nil {
@@ -791,9 +827,9 @@ func (this *HTTPRequest) Format(source string) string {
 		if prefix == "node" {
 			switch suffix {
 			case "id":
-				return strconv.FormatInt(sharedNodeConfig.Id, 10)
+				return strconv.FormatInt(this.nodeConfig.Id, 10)
 			case "name":
-				return sharedNodeConfig.Name
+				return this.nodeConfig.Name
 			case "role":
 				return teaconst.Role
 			}
@@ -952,13 +988,13 @@ func (this *HTTPRequest) Format(source string) string {
 		if prefix == "product" {
 			switch suffix {
 			case "name":
-				if sharedNodeConfig.ProductConfig != nil && len(sharedNodeConfig.ProductConfig.Name) > 0 {
+				if this.nodeConfig.ProductConfig != nil && len(this.nodeConfig.ProductConfig.Name) > 0 {
-					return sharedNodeConfig.ProductConfig.Name
+					return this.nodeConfig.ProductConfig.Name
 				}
 				return teaconst.GlobalProductName
 			case "version":
-				if sharedNodeConfig.ProductConfig != nil && len(sharedNodeConfig.ProductConfig.Version) > 0 {
+				if this.nodeConfig.ProductConfig != nil && len(this.nodeConfig.ProductConfig.Version) > 0 {
-					return sharedNodeConfig.ProductConfig.Version
+					return this.nodeConfig.ProductConfig.Version
 				}
 				return teaconst.Version
 			}
@@ -977,6 +1013,10 @@ func (this *HTTPRequest) addVarMapping(varMapping map[string]string) {
 
 // 获取请求的客户端地址
 func (this *HTTPRequest) requestRemoteAddr(supportVar bool) string {
+	if len(this.lnRemoteAddr) > 0 {
+		return this.lnRemoteAddr
+	}
+
 	if supportVar && len(this.remoteAddr) > 0 {
 		return this.remoteAddr
 	}
@@ -1278,6 +1318,28 @@ func (this *HTTPRequest) ContentLength() int64 {
 	return this.RawReq.ContentLength
 }
 
+// CalculateSize 计算当前请求的尺寸（预估）
+func (this *HTTPRequest) CalculateSize() (size int64) {
+	// Get /xxx HTTP/1.1
+	size += int64(len(this.RawReq.Method)) + 1
+	size += int64(len(this.RawReq.URL.String())) + 1
+	size += int64(len(this.RawReq.Proto)) + 1
+	for k, v := range this.RawReq.Header {
+		for _, v1 := range v {
+			size += int64(len(k) + 2 /** : **/ + len(v1) + 1)
+		}
+	}
+
+	size += 1 /** \r\n **/
+
+	if this.RawReq.ContentLength > 0 {
+		size += this.RawReq.ContentLength
+	} else if len(this.requestBodyData) > 0 {
+		size += int64(len(this.requestBodyData))
+	}
+	return size
+}
+
 // Method 请求方法
 func (this *HTTPRequest) Method() string {
 	return this.RawReq.Method
@@ -1496,7 +1558,7 @@ func (this *HTTPRequest) fixRequestHeader(header http.Header) {
 
 // 处理自定义Response Header
 func (this *HTTPRequest) processResponseHeaders(statusCode int) {
-	responseHeader := this.writer.Header()
+	var responseHeader = this.writer.Header()
 
 	// 删除/添加/替换Header
 	// TODO 实现AddTrailers
@@ -1584,6 +1646,9 @@ func (this *HTTPRequest) addError(err error) {
 
 // 计算合适的buffer size
 func (this *HTTPRequest) bytePool(contentLength int64) *utils.BytePool {
+	if contentLength < 0 {
+		return utils.BytePool16k
+	}
 	if contentLength < 8192 { // 8K
 		return utils.BytePool1k
 	}

internal/nodes/http_request_cache.go

@@ -5,10 +5,13 @@ import (
 	"errors"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeNode/internal/caches"
+	"github.com/TeaOSLab/EdgeNode/internal/compressions"
 	"github.com/TeaOSLab/EdgeNode/internal/goman"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/TeaOSLab/EdgeNode/internal/rpc"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	rangeutils "github.com/TeaOSLab/EdgeNode/internal/utils/ranges"
+	"github.com/iwind/TeaGo/types"
 	"io"
 	"net/http"
 	"path/filepath"
@@ -35,6 +38,7 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 		return
 	}
 
+	// 添加 X-Cache Header
 	var addStatusHeader = this.web.Cache.AddStatusHeader
 	if addStatusHeader {
 		defer func() {
@@ -62,7 +66,7 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 			break
 		}
 	}
-	if this.cacheRef == nil {
+	if this.cacheRef == nil && !this.web.Cache.DisablePolicyRefs {
 		// 检查策略默认的缓存条件
 		for _, cacheRef := range cachePolicy.CacheRefs {
 			if !cacheRef.IsOn ||
@@ -79,10 +83,10 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 				break
 			}
 		}
+	}
 
-		if this.cacheRef == nil {
+	if this.cacheRef == nil {
-			return
+		return
-		}
 	}
 
 	// 校验请求
@@ -106,12 +110,20 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 
 	// TODO 支持Vary Header
 
+	// 缓存标签
+	var tags = []string{}
+
 	// 检查是否有缓存
-	key := this.Format(this.cacheRef.Key)
+	var key = this.Format(this.cacheRef.Key)
 	if len(key) == 0 {
 		this.cacheRef = nil
 		return
 	}
+	var method = this.Method()
+	if method != http.MethodGet {
+		key += caches.SuffixMethod + method
+		tags = append(tags, strings.ToLower(method))
+	}
 
 	this.cacheKey = key
 	this.varMapping["cache.key"] = key
@@ -122,16 +134,32 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 		this.cacheRef = nil
 		return
 	}
+	this.writer.cacheStorage = storage
 
 	// 判断是否在Purge
 	if this.web.Cache.PurgeIsOn && strings.ToUpper(this.RawReq.Method) == "PURGE" && this.RawReq.Header.Get("X-Edge-Purge-Key") == this.web.Cache.PurgeKey {
 		this.varMapping["cache.status"] = "PURGE"
 
-		err := storage.Delete(key)
+		var subKeys = []string{
-		if err != nil {
+			key,
-			remotelogs.Error("HTTP_REQUEST_CACHE", "purge failed: "+err.Error())
+			key + caches.SuffixMethod + "HEAD",
+			key + caches.SuffixWebP,
+			key + caches.SuffixPartial,
+		}
+		// TODO 根据实际缓存的内容进行组合
+		for _, encoding := range compressions.AllEncodings() {
+			subKeys = append(subKeys, key+caches.SuffixCompression+encoding)
+			subKeys = append(subKeys, key+caches.SuffixWebP+caches.SuffixCompression+encoding)
+		}
+		for _, subKey := range subKeys {
+			err := storage.Delete(subKey)
+			if err != nil {
+				remotelogs.Error("HTTP_REQUEST_CACHE", "purge failed: "+err.Error())
+			}
 		}
 
+		// 通过API节点清除别节点上的的Key
+		// TODO 改为队列，不需要每个请求都使用goroutine
 		goman.New(func() {
 			rpcClient, err := rpc.SharedRPC()
 			if err == nil {
@@ -160,21 +188,75 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 	var reader caches.Reader
 	var err error
 
-	// 是否优先检查WebP
+	var rangeHeader = this.RawReq.Header.Get("Range")
-	var isWebP = false
+	var isPartialRequest = len(rangeHeader) > 0
-	if this.web.WebP != nil &&
+
+	// 检查是否支持WebP
+	var webPIsEnabled = false
+	var isHeadMethod = method == http.MethodHead
+	if !isPartialRequest &&
+		!isHeadMethod &&
+		this.web.WebP != nil &&
 		this.web.WebP.IsOn &&
 		this.web.WebP.MatchRequest(filepath.Ext(this.Path()), this.Format) &&
-		this.web.WebP.MatchAccept(this.requestHeader("Accept")) {
+		this.web.WebP.MatchAccept(this.RawReq.Header.Get("Accept")) {
-		reader, _ = storage.OpenReader(key+webpSuffix, useStale)
+		webPIsEnabled = true
+	}
+
+	// 检查WebP压缩缓存
+	if webPIsEnabled && !isPartialRequest && !isHeadMethod && reader == nil {
+		if this.web.Compression != nil && this.web.Compression.IsOn {
+			_, encoding, ok := this.web.Compression.MatchAcceptEncoding(this.RawReq.Header.Get("Accept-Encoding"))
+			if ok {
+				reader, _ = storage.OpenReader(key+caches.SuffixWebP+caches.SuffixCompression+encoding, useStale, false)
+				if reader != nil {
+					tags = append(tags, "webp", encoding)
+				}
+			}
+		}
+	}
+
+	// 检查WebP
+	if webPIsEnabled && !isPartialRequest &&
+		!isHeadMethod &&
+		reader == nil {
+		reader, _ = storage.OpenReader(key+caches.SuffixWebP, useStale, false)
 		if reader != nil {
-			isWebP = true
+			this.writer.cacheReaderSuffix = caches.SuffixWebP
+			tags = append(tags, "webp")
+		}
+	}
+
+	// 检查普通压缩缓存
+	if !isPartialRequest && !isHeadMethod && reader == nil {
+		if this.web.Compression != nil && this.web.Compression.IsOn {
+			_, encoding, ok := this.web.Compression.MatchAcceptEncoding(this.RawReq.Header.Get("Accept-Encoding"))
+			if ok {
+				if reader == nil {
+					reader, _ = storage.OpenReader(key+caches.SuffixCompression+encoding, useStale, false)
+					if reader != nil {
+						tags = append(tags, encoding)
+					}
+				}
+			}
 		}
 	}
 
 	// 检查正常的文件
+	var isPartialCache = false
+	var partialRanges []rangeutils.Range
 	if reader == nil {
-		reader, err = storage.OpenReader(key, useStale)
+		reader, err = storage.OpenReader(key, useStale, false)
+		if err != nil && this.cacheRef.AllowPartialContent {
+			pReader, ranges := this.tryPartialReader(storage, key, useStale, rangeHeader)
+			if pReader != nil {
+				isPartialCache = true
+				reader = pReader
+				partialRanges = ranges
+				err = nil
+			}
+		}
+
 		if err != nil {
 			if err == caches.ErrNotFound {
 				// cache相关变量
@@ -208,7 +290,16 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 	}
 
 	// 准备Buffer
-	var pool = this.bytePool(reader.BodySize())
+	var fileSize = reader.BodySize()
+	var totalSizeString = types.String(fileSize)
+	if isPartialCache {
+		fileSize = reader.(*caches.PartialFileReader).MaxLength()
+		if totalSizeString == "0" {
+			totalSizeString = "*"
+		}
+	}
+
+	var pool = this.bytePool(fileSize)
 	var buf = pool.Get()
 	defer func() {
 		pool.Put(buf)
@@ -216,6 +307,7 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 
 	// 读取Header
 	var headerBuf = []byte{}
+	this.writer.SetSentHeaderBytes(reader.HeaderSize())
 	err = reader.ReadHeader(buf, func(n int) (goNext bool, err error) {
 		headerBuf = append(headerBuf, buf[:n]...)
 		for {
@@ -243,7 +335,7 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 	}
 
 	// 设置cache.age变量
-	var age = strconv.FormatInt(reader.ExpiresAt()-utils.UnixTime(), 10)
+	var age = strconv.FormatInt(utils.UnixTime()-reader.LastModified(), 10)
 	this.varMapping["cache.age"] = age
 
 	if addStatusHeader {
@@ -265,13 +357,15 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 	var eTag = ""
 	var lastModifiedAt = reader.LastModified()
 	if lastModifiedAt > 0 {
-		if isWebP {
+		if len(tags) > 0 {
-			eTag = "\"" + strconv.FormatInt(lastModifiedAt, 10) + "_webp" + "\""
+			eTag = "\"" + strconv.FormatInt(lastModifiedAt, 10) + "_" + strings.Join(tags, "_") + "\""
 		} else {
 			eTag = "\"" + strconv.FormatInt(lastModifiedAt, 10) + "\""
 		}
 		respHeader.Del("Etag")
-		respHeader["ETag"] = []string{eTag}
+		if !isPartialCache {
+			respHeader["ETag"] = []string{eTag}
+		}
 	}
 
 	// 支持 Last-Modified
@@ -279,11 +373,13 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 	var modifiedTime = ""
 	if lastModifiedAt > 0 {
 		modifiedTime = time.Unix(utils.GMTUnixTime(lastModifiedAt), 0).Format("Mon, 02 Jan 2006 15:04:05") + " GMT"
-		respHeader.Set("Last-Modified", modifiedTime)
+		if !isPartialCache {
+			respHeader.Set("Last-Modified", modifiedTime)
+		}
 	}
 
 	// 支持 If-None-Match
-	if len(eTag) > 0 && this.requestHeader("If-None-Match") == eTag {
+	if !this.isLnRequest && !isPartialCache && len(eTag) > 0 && this.requestHeader("If-None-Match") == eTag {
 		// 自定义Header
 		this.processResponseHeaders(http.StatusNotModified)
 		this.writer.WriteHeader(http.StatusNotModified)
@@ -294,7 +390,7 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 	}
 
 	// 支持 If-Modified-Since
-	if len(modifiedTime) > 0 && this.requestHeader("If-Modified-Since") == modifiedTime {
+	if !this.isLnRequest && !isPartialCache && len(modifiedTime) > 0 && this.requestHeader("If-Modified-Since") == modifiedTime {
 		// 自定义Header
 		this.processResponseHeaders(http.StatusNotModified)
 		this.writer.WriteHeader(http.StatusNotModified)
@@ -307,74 +403,66 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 	this.processResponseHeaders(reader.Status())
 	this.addExpiresHeader(reader.ExpiresAt())
 
+	// 返回上级节点过期时间
+	if this.isLnRequest {
+		respHeader.Set(LNExpiresHeader, types.String(reader.ExpiresAt()))
+	}
+
 	// 输出Body
 	if this.RawReq.Method == http.MethodHead {
 		this.writer.WriteHeader(reader.Status())
 	} else {
 		ifRangeHeaders, ok := this.RawReq.Header["If-Range"]
-		supportRange := true
+		var supportRange = true
 		if ok {
 			supportRange = false
 			for _, v := range ifRangeHeaders {
 				if v == this.writer.Header().Get("ETag") || v == this.writer.Header().Get("Last-Modified") {
 					supportRange = true
+					break
 				}
 			}
 		}
 
 		// 支持Range
-		rangeSet := [][]int64{}
+		var ranges = partialRanges
 		if supportRange {
-			fileSize := reader.BodySize()
+			if len(rangeHeader) > 0 {
-			contentRange := this.RawReq.Header.Get("Range")
-			if len(contentRange) > 0 {
 				if fileSize == 0 {
 					this.processResponseHeaders(http.StatusRequestedRangeNotSatisfiable)
 					this.writer.WriteHeader(http.StatusRequestedRangeNotSatisfiable)
 					return true
 				}
 
-				set, ok := httpRequestParseContentRange(contentRange)
+				if len(ranges) == 0 {
-				if !ok {
+					ranges, ok = httpRequestParseRangeHeader(rangeHeader)
-					this.processResponseHeaders(http.StatusRequestedRangeNotSatisfiable)
+					if !ok {
-					this.writer.WriteHeader(http.StatusRequestedRangeNotSatisfiable)
+						this.processResponseHeaders(http.StatusRequestedRangeNotSatisfiable)
-					return true
+						this.writer.WriteHeader(http.StatusRequestedRangeNotSatisfiable)
+						return true
+					}
 				}
-				if len(set) > 0 {
+				if len(ranges) > 0 {
-					rangeSet = set
+					for k, r := range ranges {
-					for _, arr := range rangeSet {
+						r2, ok := r.Convert(fileSize)
-						if arr[0] == -1 {
+						if !ok {
-							arr[0] = fileSize + arr[1]
-							arr[1] = fileSize - 1
-
-							if arr[0] < 0 {
-								this.processResponseHeaders(http.StatusRequestedRangeNotSatisfiable)
-								this.writer.WriteHeader(http.StatusRequestedRangeNotSatisfiable)
-								return true
-							}
-						}
-						if arr[1] < 0 {
-							arr[1] = fileSize - 1
-						}
-						if arr[1] >= fileSize {
-							arr[1] = fileSize - 1
-						}
-						if arr[0] > arr[1] {
 							this.processResponseHeaders(http.StatusRequestedRangeNotSatisfiable)
 							this.writer.WriteHeader(http.StatusRequestedRangeNotSatisfiable)
 							return true
 						}
+
+						ranges[k] = r2
 					}
 				}
 			}
 		}
 
-		if len(rangeSet) == 1 {
+		if len(ranges) == 1 {
-			respHeader.Set("Content-Range", "bytes "+strconv.FormatInt(rangeSet[0][0], 10)+"-"+strconv.FormatInt(rangeSet[0][1], 10)+"/"+strconv.FormatInt(reader.BodySize(), 10))
+			respHeader.Set("Content-Range", ranges[0].ComposeContentRangeHeader(totalSizeString))
-			respHeader.Set("Content-Length", strconv.FormatInt(rangeSet[0][1]-rangeSet[0][0]+1, 10))
+			respHeader.Set("Content-Length", strconv.FormatInt(ranges[0].Length(), 10))
 			this.writer.WriteHeader(http.StatusPartialContent)
 
-			err = reader.ReadBodyRange(buf, rangeSet[0][0], rangeSet[0][1], func(n int) (goNext bool, err error) {
+			err = reader.ReadBodyRange(buf, ranges[0].Start(), ranges[0].End(), func(n int) (goNext bool, err error) {
 				_, err = this.writer.Write(buf[:n])
 				if err != nil {
 					return false, errWritingToClient
@@ -394,15 +482,15 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 				}
 				return
 			}
-		} else if len(rangeSet) > 1 {
+		} else if len(ranges) > 1 {
-			boundary := httpRequestGenBoundary()
+			var boundary = httpRequestGenBoundary()
 			respHeader.Set("Content-Type", "multipart/byteranges; boundary="+boundary)
 			respHeader.Del("Content-Length")
 			contentType := respHeader.Get("Content-Type")
 
 			this.writer.WriteHeader(http.StatusPartialContent)
 
-			for index, set := range rangeSet {
+			for index, r := range ranges {
 				if index == 0 {
 					_, err = this.writer.WriteString("--" + boundary + "\r\n")
 				} else {
@@ -413,7 +501,7 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 					return true
 				}
 
-				_, err = this.writer.WriteString("Content-Range: " + "bytes " + strconv.FormatInt(set[0], 10) + "-" + strconv.FormatInt(set[1], 10) + "/" + strconv.FormatInt(reader.BodySize(), 10) + "\r\n")
+				_, err = this.writer.WriteString("Content-Range: " + r.ComposeContentRangeHeader(totalSizeString) + "\r\n")
 				if err != nil {
 					// 不提示写入客户端错误
 					return true
@@ -427,7 +515,7 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 					}
 				}
 
-				err := reader.ReadBodyRange(buf, set[0], set[1], func(n int) (goNext bool, err error) {
+				err := reader.ReadBodyRange(buf, r.Start(), r.End(), func(n int) (goNext bool, err error) {
 					_, err = this.writer.Write(buf[:n])
 					if err != nil {
 						return false, errWritingToClient
@@ -450,11 +538,22 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 				return true
 			}
 		} else { // 没有Range
-			var resp = &http.Response{Body: reader}
+			var resp = &http.Response{
-			this.writer.Prepare(resp, reader.BodySize(), reader.Status(), false)
+				Body:          reader,
+				ContentLength: reader.BodySize(),
+			}
+			this.writer.Prepare(resp, fileSize, reader.Status(), false)
 			this.writer.WriteHeader(reader.Status())
 
-			_, err = io.CopyBuffer(this.writer, resp.Body, buf)
+			if storage.CanSendfile() {
+				if fp, canSendFile := this.writer.canSendfile(); canSendFile {
+					this.writer.sentBodyBytes, err = io.CopyBuffer(this.writer.rawWriter, fp, buf)
+				} else {
+					_, err = io.CopyBuffer(this.writer, resp.Body, buf)
+				}
+			} else {
+				_, err = io.CopyBuffer(this.writer, resp.Body, buf)
+			}
 			if err == io.EOF {
 				err = nil
 			}
@@ -492,3 +591,49 @@ func (this *HTTPRequest) addExpiresHeader(expiresAt int64) {
 		}
 	}
 }
+
+// 尝试读取区间缓存
+func (this *HTTPRequest) tryPartialReader(storage caches.StorageInterface, key string, useStale bool, rangeHeader string) (caches.Reader, []rangeutils.Range) {
+	// 尝试读取Partial cache
+	if len(rangeHeader) == 0 {
+		return nil, nil
+	}
+
+	ranges, ok := httpRequestParseRangeHeader(rangeHeader)
+	if !ok {
+		return nil, nil
+	}
+
+	pReader, pErr := storage.OpenReader(key+caches.SuffixPartial, useStale, true)
+	if pErr != nil {
+		return nil, nil
+	}
+
+	partialReader, ok := pReader.(*caches.PartialFileReader)
+	if !ok {
+		_ = pReader.Close()
+		return nil, nil
+	}
+	var isOk = false
+	defer func() {
+		if !isOk {
+			_ = pReader.Close()
+		}
+	}()
+
+	// 检查范围
+	for index, r := range ranges {
+		r1, ok := r.Convert(partialReader.MaxLength())
+		if !ok {
+			return nil, nil
+		}
+		r2, ok := partialReader.ContainsRange(r1)
+		if !ok {
+			return nil, nil
+		}
+		ranges[index] = r2
+	}
+
+	isOk = true
+	return pReader, ranges
+}

internal/nodes/http_request_health_check.go

@@ -9,7 +9,7 @@ import (
 )
 
 // 健康检查
-func (this *HTTPRequest) doHealthCheck(key string) (stop bool) {
+func (this *HTTPRequest) doHealthCheck(key string, isHealthCheck *bool) (stop bool) {
 	this.tags = append(this.tags, "healthCheck")
 
 	this.RawReq.Header.Del(serverconfigs.HealthCheckHeaderName)
@@ -19,6 +19,7 @@ func (this *HTTPRequest) doHealthCheck(key string) (stop bool) {
 		remotelogs.Error("HTTP_REQUEST_HEALTH_CHECK", "decode key failed: "+err.Error())
 		return
 	}
+	*isHealthCheck = true
 
 	if data.GetBool("onlyBasicRequest") {
 		return true

internal/nodes/http_request_ln.go

@@ -0,0 +1,21 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+//go:build !plus
+// +build !plus
+
+package nodes
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+)
+
+const (
+	LNExpiresHeader = "X-Edge-Ln-Expires"
+)
+
+func (this *HTTPRequest) checkLnRequest() bool {
+	return false
+}
+
+func (this *HTTPRequest) getLnOrigin() *serverconfigs.OriginConfig {
+	return nil
+}