缓存数据库升级时从老的数据库转移数据

但要注意：在单个机器上安装API节点和边缘节点，通过局域网IP访问时就无法测试WAF规则，因为会被自动加入到白名单

.gitignore

@@ -0,0 +1,2 @@
+*_plus.go
+*-plus.sh

build/build-all.sh

@@ -6,3 +6,4 @@
 ./build.sh linux mips64
 ./build.sh linux mips64le
 ./build.sh darwin amd64
+./build.sh darwin arm64

build/build.sh

@@ -5,8 +5,10 @@ function build() {
 	NAME="edge-node"
 	VERSION=$(lookup-version $ROOT/../internal/const/const.go)
 	DIST=$ROOT/"../dist/${NAME}"
+	MUSL_DIR="/usr/local/opt/musl-cross/bin"
 	OS=${1}
 	ARCH=${2}
+	TAG=${3}
 
 	if [ -z $OS ]; then
 		echo "usage: build.sh OS ARCH"
@@ -16,6 +18,9 @@ function build() {
 		echo "usage: build.sh OS ARCH"
 		exit
 	fi
+	if [ -z $TAG ]; then
+		TAG="community"
+	fi
 
 	echo "checking ..."
 	ZIP_PATH=$(which zip)
@@ -24,8 +29,8 @@ function build() {
 		exit
 	fi
 
-	echo "building v${VERSION}/${OS}/${ARCH} ..."
-	ZIP="${NAME}-${OS}-${ARCH}-v${VERSION}.zip"
+	echo "building v${VERSION}/${OS}/${ARCH}/${TAG} ..."
+	ZIP="${NAME}-${OS}-${ARCH}-${TAG}-v${VERSION}.zip"
 
 	echo "copying ..."
 	if [ ! -d $DIST ]; then
@@ -33,6 +38,7 @@ function build() {
 		mkdir $DIST/bin
 		mkdir $DIST/configs
 		mkdir $DIST/logs
+		mkdir $DIST/data
 	fi
 
 	cp $ROOT/configs/api.template.yaml $DIST/configs
@@ -47,7 +53,41 @@ function build() {
 	fi
 
 	echo "building ..."
-	env GOOS=${OS} GOARCH=${ARCH} go build -o $DIST/bin/${NAME} -ldflags="-s -w" $ROOT/../cmd/edge-node/main.go
+
+	CC_PATH=""
+	CXX_PATH=""
+	if [[ `uname -a` == *"Darwin"* && "${OS}" == "linux" ]]; then
+		# /usr/local/opt/musl-cross/bin/
+		if [ "${ARCH}" == "amd64" ]; then
+			CC_PATH="x86_64-linux-musl-gcc"
+			CXX_PATH="x86_64-linux-musl-g++"
+		fi
+		if [ "${ARCH}" == "386" ]; then
+			CC_PATH="i486-linux-musl-gcc"
+			CXX_PATH="i486-linux-musl-g++"
+		fi
+		if [ "${ARCH}" == "arm64" ]; then
+			CC_PATH="aarch64-linux-musl-gcc"
+			CXX_PATH="aarch64-linux-musl-g++"
+		fi
+		if [ "${ARCH}" == "arm" ]; then
+			CC_PATH="arm-linux-musleabi-gcc"
+			CXX_PATH="arm-linux-musleabi-g++"
+		fi
+		if [ "${ARCH}" == "mips64" ]; then
+			CC_PATH="mips64-linux-musl-gcc"
+			CXX_PATH="mips64-linux-musl-g++"
+		fi
+		if [ "${ARCH}" == "mips64le" ]; then
+			CC_PATH="mips64el-linux-musl-gcc"
+			CXX_PATH="mips64el-linux-musl-g++"
+		fi
+	fi
+	if [ ! -z $CC_PATH ]; then
+		env CC=$MUSL_DIR/$CC_PATH CXX=$MUSL_DIR/$CXX_PATH GOOS=${OS} GOARCH=${ARCH} CGO_ENABLED=1 go build -tags $TAG -o $DIST/bin/${NAME} -ldflags "-linkmode external -extldflags -static -s -w" $ROOT/../cmd/edge-node/main.go
+	else
+		env GOOS=${OS} GOARCH=${ARCH} CGO_ENABLED=1 go build -tags $TAG -o $DIST/bin/${NAME} -ldflags="-s -w" $ROOT/../cmd/edge-node/main.go
+	fi
 
 	# delete hidden files
 	find $DIST -name ".DS_Store" -delete
@@ -78,4 +118,4 @@ function lookup-version() {
 	fi
 }
 
-build $1 $2
+build $1 $2 $3

build/configs/api.template.yaml

@@ -1,4 +1,4 @@
 rpc:
-  endpoints: [ ${endpoints} ]
-nodeId: "${nodeId}"
-secret: "${nodeSecret}"
+  endpoints: [ "" ]
+nodeId: ""
+secret: ""

build/data/.gitignore

@@ -0,0 +1 @@
+*

build/edge-toa/.gitignore

@@ -1 +0,0 @@
-edge-toa

build/pages/403.html

@@ -9,7 +9,7 @@
 <h3>403 Forbidden</h3>
 <p>Sorry, your access to the page has been denied. Please try again later.</p>
 
-<footer>Powered by TeaEdge.</footer>
+<footer>Powered by GoEdge.</footer>
 
 </body>
 </html>

build/pages/404.html

@@ -9,7 +9,7 @@
 <h3>404 Not Found</h3>
 <p>Sorry, the page you are looking for is not found. Please try again later.</p>
 
-<footer>Powered by TeaEdge.</footer>
+<footer>Powered by GoEdge.</footer>
 
 </body>
 </html>

build/pages/50x.html

@@ -9,7 +9,7 @@
 <h3>An error occurred.</h3>
 <p>Sorry, the page you are looking for is currently unavailable. Please try again later.</p>
 
-<footer>Powered by TeaEdge.</footer>
+<footer>Powered by GoEdge.</footer>
 
 </body>
 </html>

build/pages/shutdown_en.html

@@ -9,7 +9,7 @@
 <h3>The website is shutdown.</h3>
 <p>Sorry, the page you are looking for is currently unavailable. Please try again later.</p>
 
-<footer>Powered by TeaEdge.</footer>
+<footer>Powered by GoEdge.</footer>
 
 </body>
 </html>

build/pages/shutdown_upgrade_zh.html

@@ -9,7 +9,7 @@
 <h3>网站升级中</h3>
 <p>为了给您提供更好的服务，我们正在升级网站，请稍后重新访问。</p>
 
-<footer>Powered by TeaEdge.</footer>
+<footer>Powered by GoEdge.</footer>
 
 </body>
 </html>

build/pages/shutdown_zh.html

@@ -9,7 +9,7 @@
 <h3>网站暂时关闭</h3>
 <p>网站已被暂时关闭，请耐心等待我们的重新开通通知。</p>
 
-<footer>Powered by TeaEdge.</footer>
+<footer>Powered by GoEdge.</footer>
 
 </body>
 </html>

cmd/edge-node/main.go

@@ -1,23 +1,25 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
 	"github.com/TeaOSLab/EdgeNode/internal/apps"
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
 	"github.com/TeaOSLab/EdgeNode/internal/nodes"
-	"github.com/iwind/TeaGo/Tea"
 	_ "github.com/iwind/TeaGo/bootstrap"
-	"github.com/iwind/TeaGo/types"
-	"io/ioutil"
+	"github.com/iwind/TeaGo/logs"
+	"github.com/iwind/gosock/pkg/gosock"
+	"net/http"
+	_ "net/http/pprof"
 	"os"
-	"syscall"
+	"sort"
 )
 
 func main() {
 	app := apps.NewAppCmd().
 		Version(teaconst.Version).
 		Product(teaconst.ProductName).
-		Usage(teaconst.ProcessName + " [-v|start|stop|restart|quit|test|service|daemon]")
+		Usage(teaconst.ProcessName + " [-v|start|stop|restart|status|quit|test|service|daemon|pprof]")
 
 	app.On("test", func() {
 		err := nodes.NewNode().Test()
@@ -37,24 +39,82 @@ func main() {
 		fmt.Println("done")
 	})
 	app.On("quit", func() {
-		pidFile := Tea.Root + "/bin/pid"
-		data, err := ioutil.ReadFile(pidFile)
+		var sock = gosock.NewTmpSock(teaconst.ProcessName)
+		_, err := sock.Send(&gosock.Command{Code: "quit"})
 		if err != nil {
 			fmt.Println("[ERROR]quit failed: " + err.Error())
 			return
 		}
-		pid := types.Int(string(data))
-		if pid == 0 {
-			fmt.Println("[ERROR]quit failed: pid=0")
-			return
-		}
+		fmt.Println("done")
+	})
+	app.On("pprof", func() {
+		// TODO 自己指定端口
+		addr := "127.0.0.1:6060"
+		logs.Println("starting with pprof '" + addr + "'...")
 
-		process, err := os.FindProcess(pid)
+		go func() {
+			err := http.ListenAndServe(addr, nil)
+			if err != nil {
+				logs.Println("[error]" + err.Error())
+			}
+		}()
+
+		node := nodes.NewNode()
+		node.Start()
+	})
+	app.On("trackers", func() {
+		var sock = gosock.NewTmpSock(teaconst.ProcessName)
+		reply, err := sock.Send(&gosock.Command{Code: "trackers"})
 		if err != nil {
-			return
+			fmt.Println("[ERROR]" + err.Error())
+		} else {
+			labelsMap, ok := reply.Params["labels"]
+			if ok {
+				labels, ok := labelsMap.(map[string]interface{})
+				if ok {
+					if len(labels) == 0 {
+						fmt.Println("no labels yet")
+					} else {
+						var labelNames = []string{}
+						for label := range labels {
+							labelNames = append(labelNames, label)
+						}
+						sort.Strings(labelNames)
+
+						for _, labelName := range labelNames {
+							fmt.Println(labelName + ": " + fmt.Sprintf("%.6f", labels[labelName]))
+						}
+					}
+				}
+			}
 		}
-		if process != nil {
-			_ = process.Signal(syscall.SIGQUIT)
+	})
+	app.On("goman", func() {
+		var sock = gosock.NewTmpSock(teaconst.ProcessName)
+		reply, err := sock.Send(&gosock.Command{Code: "goman"})
+		if err != nil {
+			fmt.Println("[ERROR]" + err.Error())
+		} else {
+			instancesJSON, err := json.MarshalIndent(reply.Params, "", "  ")
+			if err != nil {
+				fmt.Println("[ERROR]" + err.Error())
+			} else {
+				fmt.Println(string(instancesJSON))
+			}
+		}
+	})
+	app.On("conns", func() {
+		var sock = gosock.NewTmpSock(teaconst.ProcessName)
+		reply, err := sock.Send(&gosock.Command{Code: "conns"})
+		if err != nil {
+			fmt.Println("[ERROR]" + err.Error())
+		} else {
+			resultJSON, err := json.MarshalIndent(reply.Params, "", "  ")
+			if err != nil {
+				fmt.Println("[ERROR]" + err.Error())
+			} else {
+				fmt.Println(string(resultJSON))
+			}
 		}
 	})
 	app.Run(func() {

go.mod

@@ -5,19 +5,31 @@ go 1.15
 replace github.com/TeaOSLab/EdgeCommon => ../EdgeCommon
 
 require (
-	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
 	github.com/TeaOSLab/EdgeCommon v0.0.0-00010101000000-000000000000
+	github.com/andybalholm/brotli v1.0.3
+	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/go-ole/go-ole v1.2.4 // indirect
+	github.com/dop251/goja v0.0.0-20210804101310-32956a348b49
 	github.com/go-yaml/yaml v2.1.0+incompatible
-	github.com/golang/protobuf v1.4.2
-	github.com/iwind/TeaGo v0.0.0-20201020081413-7cf62d6f420f
-	github.com/lionsoul2014/ip2region v2.2.0-release+incompatible
-	github.com/mssola/user_agent v0.5.2
-	github.com/shirou/gopsutil v2.20.9+incompatible
-	golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7
-	golang.org/x/sys v0.0.0-20200519105757-fe76b779f299
-	google.golang.org/grpc v1.32.0
+	github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24
+	github.com/iwind/gofcgi v0.0.0-20210528023741-a92711d45f11
+	github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3
+	github.com/iwind/gowebp v0.0.0-20211029040624-7331ecc78ed8
+	github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e // indirect
+	github.com/mattn/go-sqlite3 v1.14.9
+	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/tklauser/go-sysconf v0.3.6 // indirect
+	golang.org/x/image v0.0.0-20211028202545-6944b10bf410
+	golang.org/x/net v0.0.0-20211215060638-4ddde0e984e9
+	golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d
+	golang.org/x/text v0.3.7
+	golang.org/x/tools v0.1.3 // indirect
+	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
+	google.golang.org/grpc v1.43.0
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
 )

go.sum

@@ -1,4 +1,5 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+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/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
@@ -7,29 +8,56 @@ github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
 github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
+github.com/andybalholm/brotli v1.0.3 h1:fpcw+r1N1h0Poc1F/pHbW40cUm/lMEQslZtCkBQ0UnM=
+github.com/andybalholm/brotli v1.0.3/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=
+github.com/biessek/golang-ico v0.0.0-20180326222316-d348d9ea4670/go.mod h1:iRWAFbKXMMkVQyxZ1PfGlkBr1TjATx1zy2MRprV7A3Q=
 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/chai2010/webp v1.1.0 h1:4Ei0/BRroMF9FaXDG2e4OxwFcuW2vcXd+A6tyqTJUQQ=
+github.com/chai2010/webp v1.1.0/go.mod h1:LP12PG5IFmLGHUU26tBiCBKnghxx3toZFwDjOYvd3Ow=
 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=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/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/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 h1:Izz0+t1Z5nI16/II7vuEo/nHjodOg0p7+OiDpjX5t1E=
+github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
+github.com/dop251/goja v0.0.0-20210804101310-32956a348b49 h1:CtSi0QlA2Hy+nOh8JAZoiEBLW5pliAiKJ3l1Iq1472I=
+github.com/dop251/goja v0.0.0-20210804101310-32956a348b49/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk=
+github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
 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.20210217033140-668b12f5399d/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/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/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
 github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
 github.com/go-redis/redis/v8 v8.0.0-beta.7/go.mod h1:FGJAWDWFht1sQ4qxyJHZZbVyvnVcKQN0E3u5/5lRz+g=
+github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
+github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 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=
@@ -45,33 +73,62 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 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 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
 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.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+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-20200923021120-f5d76441fe9e/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
-github.com/iwind/TeaGo v0.0.0-20201020081413-7cf62d6f420f h1:6Ws2H+eorfVUoMO2jta6A9nIdh8oi5/5LXo/LkAxR+E=
-github.com/iwind/TeaGo v0.0.0-20201020081413-7cf62d6f420f/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
+github.com/iwind/TeaGo v0.0.0-20210628135026-38575a4ab060 h1:qdLtK4PDXxk2vMKkTWl5Fl9xqYuRCukzWAgJbLHdfOo=
+github.com/iwind/TeaGo v0.0.0-20210628135026-38575a4ab060/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
+github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24 h1:1cGulkD2SNJJRok5OKwyhP/Ddm+PgSWKOupn0cR36/A=
+github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
+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/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/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e h1:LvL4XsI70QxOGHed6yhQtAU34Kx3Qq2wwBzGFKY8zKk=
+github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 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/lionsoul2014/ip2region v2.2.0-release+incompatible h1:1qp9iks+69h7IGLazAplzS9Ca14HAxuD5c0rbFdPGy4=
 github.com/lionsoul2014/ip2region v2.2.0-release+incompatible/go.mod h1:+ZBN7PBoh5gG6/y0ZQ85vJDBe21WnfbRrQQwTfliJJI=
+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/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
+github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+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=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mssola/user_agent v0.5.2 h1:CZkTUahjL1+OcZ5zv3kZr8QiJ8jy2H08vZIEkBeRbxo=
 github.com/mssola/user_agent v0.5.2/go.mod h1:TTPno8LPY3wAIEKRpAtkdMT0f8SE24pLRGPahjCH4uw=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/mssola/user_agent v0.5.3 h1:lBRPML9mdFuIZgI2cmlQ+atbpJdLdeVl2IDodjBR578=
+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/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -82,45 +139,75 @@ github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
 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/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/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/shirou/gopsutil v2.20.9+incompatible h1:msXs2frUV+O/JLva9EDLpuJ84PrFsdCTCQex8PUdtkQ=
-github.com/shirou/gopsutil v2.20.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
+github.com/shirou/gopsutil v3.21.5+incompatible h1:OloQyEerMi7JUrXiNzy8wQ5XN+baemxSl12QgIzt0jc=
+github.com/shirou/gopsutil v3.21.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
+github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 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=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+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.6/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI=
+github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA=
+github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.opentelemetry.io/otel v0.7.0/go.mod h1:aZMyHG5TqDOXEgH2tyLiXSUKly1jT3yqE9PmrzIeCdo=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ=
+golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 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.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 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=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 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-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 h1:AeiKBIuRw3UomYXSbLy0Mc2dDLfdtbT/IVn4keq83P0=
 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-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-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
+golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211215060638-4ddde0e984e9 h1:kmreh1vGI63l2FxOAYS3Yv6ATsi7lSTuwNSVbGfJV9I=
+golang.org/x/net v0.0.0-20211215060638-4ddde0e984e9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 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-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=
@@ -132,34 +219,64 @@ golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7w
 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-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4=
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-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-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d h1:1oIt9o40TWWI9FUaveVpUvBe13FNqBNVXy3ue2fcfkw=
+golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 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=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 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-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+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 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 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=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
+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-20210617175327-b9e0b3197ced h1:c5geK1iMU3cDKtFrCVQIcjR3W+JOZMuhIyICMCTbtus=
+google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
+google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo7ya8kMnvprhcWM045PmkBdMO9zN0=
+google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 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 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0=
 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.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0=
+google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM=
+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=
@@ -168,19 +285,27 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 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=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 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-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/apps/app_cmd.go

@@ -2,16 +2,20 @@ package apps
 
 import (
 	"fmt"
-	"github.com/iwind/TeaGo/Tea"
+	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
 	"github.com/iwind/TeaGo/logs"
+	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
+	"github.com/iwind/gosock/pkg/gosock"
 	"os"
 	"os/exec"
 	"runtime"
 	"strconv"
+	"syscall"
 	"time"
 )
 
-// App命令帮助
+// AppCmd App命令帮助
 type AppCmd struct {
 	product       string
 	version       string
@@ -20,10 +24,14 @@ type AppCmd struct {
 	appendStrings []string
 
 	directives []*Directive
+
+	sock *gosock.Sock
 }
 
 func NewAppCmd() *AppCmd {
-	return &AppCmd{}
+	return &AppCmd{
+		sock: gosock.NewTmpSock(teaconst.ProcessName),
+	}
 }
 
 type CommandHelpOption struct {
@@ -31,25 +39,25 @@ type CommandHelpOption struct {
 	Description string
 }
 
-// 产品
+// Product 产品
 func (this *AppCmd) Product(product string) *AppCmd {
 	this.product = product
 	return this
 }
 
-// 版本
+// Version 版本
 func (this *AppCmd) Version(version string) *AppCmd {
 	this.version = version
 	return this
 }
 
-// 使用方法
+// Usage 使用方法
 func (this *AppCmd) Usage(usage string) *AppCmd {
 	this.usage = usage
 	return this
 }
 
-// 选项
+// Option 选项
 func (this *AppCmd) Option(code string, description string) *AppCmd {
 	this.options = append(this.options, &CommandHelpOption{
 		Code:        code,
@@ -58,13 +66,13 @@ func (this *AppCmd) Option(code string, description string) *AppCmd {
 	return this
 }
 
-// 附加内容
+// Append 附加内容
 func (this *AppCmd) Append(appendString string) *AppCmd {
 	this.appendStrings = append(this.appendStrings, appendString)
 	return this
 }
 
-// 打印
+// Print 打印
 func (this *AppCmd) Print() {
 	fmt.Println(this.product + " v" + this.version)
 
@@ -103,7 +111,7 @@ func (this *AppCmd) Print() {
 	}
 }
 
-// 添加指令
+// On 添加指令
 func (this *AppCmd) On(arg string, callback func()) {
 	this.directives = append(this.directives, &Directive{
 		Arg:      arg,
@@ -111,7 +119,7 @@ func (this *AppCmd) On(arg string, callback func()) {
 	})
 }
 
-// 运行
+// Run 运行
 func (this *AppCmd) Run(main func()) {
 	// 获取参数
 	args := os.Args[1:]
@@ -161,7 +169,7 @@ func (this *AppCmd) Run(main func()) {
 
 // 版本号
 func (this *AppCmd) runVersion() {
-	fmt.Println(this.product+" v"+this.version, "(build: "+runtime.Version(), runtime.GOOS, runtime.GOARCH+")")
+	fmt.Println(this.product+" v"+this.version, "(build: "+runtime.Version(), runtime.GOOS, runtime.GOARCH, teaconst.Tag+")")
 }
 
 // 帮助
@@ -171,13 +179,20 @@ func (this *AppCmd) runHelp() {
 
 // 启动
 func (this *AppCmd) runStart() {
-	proc := this.checkPid()
-	if proc != nil {
-		fmt.Println(this.product+" already started, pid:", proc.Pid)
+	var pid = this.getPID()
+	if pid > 0 {
+		fmt.Println(this.product+" already started, pid:", pid)
 		return
 	}
 
+	_ = os.Setenv("EdgeBackground", "on")
+
 	cmd := exec.Command(os.Args[0])
+	cmd.SysProcAttr = &syscall.SysProcAttr{
+		Foreground: false,
+		Setsid:     true,
+	}
+
 	err := cmd.Start()
 	if err != nil {
 		fmt.Println(this.product+"  start failed:", err.Error())
@@ -189,18 +204,15 @@ func (this *AppCmd) runStart() {
 
 // 停止
 func (this *AppCmd) runStop() {
-	proc := this.checkPid()
-	if proc == nil {
+	var pid = this.getPID()
+	if pid == 0 {
 		fmt.Println(this.product + " not started yet")
 		return
 	}
 
-	// 停止进程
-	_ = proc.Kill()
+	_, _ = this.sock.Send(&gosock.Command{Code: "stop"})
 
-	// 在Windows上经常不能及时释放资源
-	_ = DeletePid(Tea.Root + "/bin/pid")
-	fmt.Println(this.product+" stopped ok, pid:", proc.Pid)
+	fmt.Println(this.product+" stopped ok, pid:", types.String(pid))
 }
 
 // 重启
@@ -212,15 +224,24 @@ func (this *AppCmd) runRestart() {
 
 // 状态
 func (this *AppCmd) runStatus() {
-	proc := this.checkPid()
-	if proc == nil {
+	var pid = this.getPID()
+	if pid == 0 {
 		fmt.Println(this.product + " not started yet")
-	} else {
-		fmt.Println(this.product + " is running, pid: " + fmt.Sprintf("%d", proc.Pid))
+		return
 	}
+
+	fmt.Println(this.product + " is running, pid: " + types.String(pid))
 }
 
-// 检查PID
-func (this *AppCmd) checkPid() *os.Process {
-	return CheckPid(Tea.Root + "/bin/pid")
+// 获取当前的PID
+func (this *AppCmd) getPID() int {
+	if !this.sock.IsListening() {
+		return 0
+	}
+
+	reply, err := this.sock.Send(&gosock.Command{Code: "pid"})
+	if err != nil {
+		return 0
+	}
+	return maps.NewMap(reply.Params).GetInt("pid")
 }

internal/apps/file_others.go

@@ -1,17 +0,0 @@
-// +build !windows
-
-package apps
-
-import (
-	"os"
-	"syscall"
-)
-
-// lock file
-func LockFile(fp *os.File) error {
-	return syscall.Flock(int(fp.Fd()), syscall.LOCK_EX|syscall.LOCK_NB)
-}
-
-func UnlockFile(fp *os.File) error {
-	return syscall.Flock(int(fp.Fd()), syscall.LOCK_UN)
-}

internal/apps/file_windows.go

@@ -1,17 +0,0 @@
-// +build windows
-
-package apps
-
-import (
-	"errors"
-	"os"
-)
-
-// lock file
-func LockFile(fp *os.File) error {
-	return errors.New("not implemented on windows")
-}
-
-func UnlockFile(fp *os.File) error {
-	return errors.New("not implemented on windows")
-}

internal/apps/log_writer.go

@@ -6,6 +6,10 @@ import (
 	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/utils/time"
 	"log"
+	"os"
+	"runtime"
+	"strconv"
+	"strings"
 )
 
 type LogWriter struct {
@@ -34,7 +38,26 @@ func (this *LogWriter) Init() {
 }
 
 func (this *LogWriter) Write(message string) {
-	log.Println(message)
+	backgroundEnv, _ := os.LookupEnv("EdgeBackground")
+	if backgroundEnv != "on" {
+		// 文件和行号
+		var file string
+		var line int
+		if Tea.IsTesting() {
+			var callDepth = 3
+			var ok bool
+			_, file, line, ok = runtime.Caller(callDepth)
+			if ok {
+				file = this.packagePath(file)
+			}
+		}
+
+		if len(file) > 0 {
+			log.Println(message + " (" + file + ":" + strconv.Itoa(line) + ")")
+		} else {
+			log.Println(message)
+		}
+	}
 
 	if this.fileAppender != nil {
 		_, err := this.fileAppender.AppendString(timeutil.Format("Y/m/d H:i:s ") + message + "\n")
@@ -49,3 +72,11 @@ func (this *LogWriter) Close() {
 		_ = this.fileAppender.Close()
 	}
 }
+
+func (this *LogWriter) packagePath(path string) string {
+	var pieces = strings.Split(path, "/")
+	if len(pieces) >= 2 {
+		return strings.Join(pieces[len(pieces)-2:], "/")
+	}
+	return path
+}

internal/apps/pid.go

@@ -1,119 +0,0 @@
-package apps
-
-import (
-	"fmt"
-	"github.com/TeaOSLab/EdgeNode/internal/events"
-	"github.com/iwind/TeaGo/Tea"
-	"github.com/iwind/TeaGo/types"
-	"io/ioutil"
-	"os"
-	"runtime"
-)
-
-var pidFileList = []*os.File{}
-
-// 检查Pid
-func CheckPid(path string) *os.Process {
-	// windows上打开的文件是不能删除的
-	if runtime.GOOS == "windows" {
-		if os.Remove(path) == nil {
-			return nil
-		}
-	}
-
-	file, err := os.Open(path)
-	if err != nil {
-		return nil
-	}
-
-	defer func() {
-		_ = file.Close()
-	}()
-
-	// 是否能取得Lock
-	err = LockFile(file)
-	if err == nil {
-		_ = UnlockFile(file)
-		return nil
-	}
-
-	pidBytes, err := ioutil.ReadAll(file)
-	if err != nil {
-		return nil
-	}
-	pid := types.Int(string(pidBytes))
-
-	if pid <= 0 {
-		return nil
-	}
-
-	proc, _ := os.FindProcess(pid)
-	return proc
-}
-
-// 写入Pid
-func WritePid() error {
-	path := Tea.Root + "/bin/pid"
-	fp, err := os.OpenFile(path, os.O_CREATE|os.O_TRUNC|os.O_WRONLY|os.O_RDONLY, 0666)
-	if err != nil {
-		return err
-	}
-	events.On(events.EventQuit, func() {
-		_ = fp.Close()
-	})
-
-	if runtime.GOOS != "windows" {
-		err = LockFile(fp)
-		if err != nil {
-			return err
-		}
-	}
-	pidFileList = append(pidFileList, fp) // hold the file pointers
-
-	_, err = fp.WriteString(fmt.Sprintf("%d", os.Getpid()))
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// 写入Ppid
-func WritePpid(path string) error {
-	fp, err := os.OpenFile(path, os.O_CREATE|os.O_TRUNC|os.O_WRONLY|os.O_RDONLY, 0666)
-	if err != nil {
-		return err
-	}
-
-	if runtime.GOOS != "windows" {
-		err = LockFile(fp)
-		if err != nil {
-			return err
-		}
-	}
-	pidFileList = append(pidFileList, fp) // hold the file pointers
-
-	_, err = fp.WriteString(fmt.Sprintf("%d", os.Getppid()))
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// 删除Pid
-func DeletePid(path string) error {
-	_, err := os.Stat(path)
-	if err != nil {
-		if !os.IsNotExist(err) {
-			return nil
-		}
-		return err
-	}
-
-	for _, fp := range pidFileList {
-		_ = UnlockFile(fp)
-		_ = fp.Close()
-	}
-	return os.Remove(path)
-}

internal/caches/errors.go

@@ -0,0 +1,41 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package caches
+
+import "errors"
+
+// 常用的几个错误
+var (
+	ErrNotFound      = errors.New("cache not found")
+	ErrFileIsWriting = errors.New("the file is writing")
+	ErrInvalidRange  = errors.New("invalid range")
+)
+
+// CapacityError 容量错误
+// 独立出来是为了可以在有些场合下可以忽略，防止产生没必要的错误提示数量太多
+type CapacityError struct {
+	err string
+}
+
+func NewCapacityError(err string) error {
+	return &CapacityError{err: err}
+}
+
+func (this *CapacityError) Error() string {
+	return this.err
+}
+
+// CanIgnoreErr 检查错误是否可以忽略
+func CanIgnoreErr(err error) bool {
+	if err == nil {
+		return true
+	}
+	if err == ErrFileIsWriting {
+		return true
+	}
+	_, ok := err.(*CapacityError)
+	if ok {
+		return true
+	}
+	return false
+}

internal/caches/errros_test.go

@@ -0,0 +1,16 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package caches
+
+import (
+	"github.com/iwind/TeaGo/assert"
+	"testing"
+)
+
+func TestCanIgnoreErr(t *testing.T) {
+	a := assert.NewAssertion(t)
+
+	a.IsTrue(CanIgnoreErr(ErrFileIsWriting))
+	a.IsTrue(CanIgnoreErr(NewCapacityError("over capcity")))
+	a.IsFalse(CanIgnoreErr(ErrNotFound))
+}

internal/caches/hot_item.go

@@ -0,0 +1,10 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package caches
+
+type HotItem struct {
+	Key       string
+	ExpiresAt int64
+	Hits      uint32
+	Status int
+}

internal/caches/item.go

@@ -1,6 +1,9 @@
 package caches
 
-import "time"
+import (
+	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"time"
+)
 
 type ItemType = int
 
@@ -9,23 +12,50 @@ const (
 	ItemTypeMemory ItemType = 2
 )
 
+// 计算当前周
+// 不要用YW，因为需要计算两周是否临近
+func currentWeek() int32 {
+	return int32(time.Now().Unix() / 86400)
+}
+
 type Item struct {
-	Type       ItemType
-	Key        string
-	ExpiredAt  int64
-	HeaderSize int64
-	BodySize   int64
-	MetaSize   int64
+	Type       ItemType `json:"type"`
+	Key        string   `json:"key"`
+	ExpiredAt  int64    `json:"expiredAt"`
+	StaleAt    int64    `json:"staleAt"`
+	HeaderSize int64    `json:"headerSize"`
+	BodySize   int64    `json:"bodySize"`
+	MetaSize   int64    `json:"metaSize"`
+	Host       string   `json:"host"`     // 主机名
+	ServerId   int64    `json:"serverId"` // 服务ID
+
+	Week1Hits int64 `json:"week1Hits"`
+	Week2Hits int64 `json:"week2Hits"`
+	Week      int32 `json:"week"`
 }
 
 func (this *Item) IsExpired() bool {
-	return this.ExpiredAt < time.Now().Unix()
+	return this.ExpiredAt < utils.UnixTime()
 }
 
 func (this *Item) TotalSize() int64 {
-	return this.Size() + this.MetaSize + int64(len(this.Key))
+	return this.Size() + this.MetaSize + int64(len(this.Key)) + int64(len(this.Host))
 }
 
 func (this *Item) Size() int64 {
 	return this.HeaderSize + this.BodySize
 }
+
+func (this *Item) IncreaseHit(week int32) {
+	if this.Week == week {
+		this.Week2Hits++
+	} else {
+		if week-this.Week == 1 {
+			this.Week1Hits = this.Week2Hits
+		} else {
+			this.Week1Hits = 0
+		}
+		this.Week2Hits = 1
+		this.Week = week
+	}
+}

internal/caches/item_test.go

@@ -0,0 +1,83 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package caches
+
+import (
+	"github.com/TeaOSLab/EdgeNode/internal/zero"
+	"github.com/iwind/TeaGo/rands"
+	"github.com/iwind/TeaGo/types"
+	"runtime"
+	"testing"
+	"time"
+)
+
+func TestItem_IncreaseHit(t *testing.T) {
+	var week = currentWeek()
+
+	var item = &Item{}
+	//item.Week = 2704
+	item.Week2Hits = 100
+	item.IncreaseHit(week)
+	t.Log("week:", item.Week, "week1:", item.Week1Hits, "week2:", item.Week2Hits)
+
+	item.IncreaseHit(week)
+	t.Log("week:", item.Week, "week1:", item.Week1Hits, "week2:", item.Week2Hits)
+}
+
+func TestItems_Memory(t *testing.T) {
+	var stat = &runtime.MemStats{}
+	runtime.ReadMemStats(stat)
+	var memory1 = stat.HeapInuse
+
+	var items = []*Item{}
+	for i := 0; i < 10_000_000; i++ {
+		items = append(items, &Item{
+			Key: types.String(i),
+		})
+	}
+
+	runtime.ReadMemStats(stat)
+	var memory2 = stat.HeapInuse
+
+	t.Log(memory1, memory2, (memory2-memory1)/1024/1024, "M")
+
+	var weekItems = make(map[string]*Item, 10_000_000)
+
+	for _, item := range items {
+		weekItems[item.Key] = item
+	}
+
+	runtime.ReadMemStats(stat)
+	var memory3 = stat.HeapInuse
+	t.Log(memory2, memory3, (memory3-memory2)/1024/1024, "M")
+
+	time.Sleep(1 * time.Second)
+	t.Log(len(items), len(weekItems))
+}
+
+func TestItems_Memory2(t *testing.T) {
+	var stat = &runtime.MemStats{}
+	runtime.ReadMemStats(stat)
+	var memory1 = stat.HeapInuse
+
+	var items = map[int32]map[string]zero.Zero{}
+	for i := 0; i < 10_000_000; i++ {
+		var week = int32((time.Now().Unix() - int64(86400*rands.Int(0, 300))) / (86400 * 7))
+		m, ok := items[week]
+		if !ok {
+			m = map[string]zero.Zero{}
+			items[week] = m
+		}
+		m[types.String(int64(i)*1_000_000)] = zero.New()
+	}
+
+	runtime.ReadMemStats(stat)
+	var memory2 = stat.HeapInuse
+
+	t.Log(memory1, memory2, (memory2-memory1)/1024/1024, "M")
+
+	time.Sleep(1 * time.Second)
+	for w, i := range items {
+		t.Log(w, len(i))
+	}
+}

internal/caches/list.go

@@ -1,145 +0,0 @@
-package caches
-
-import (
-	"strings"
-	"sync"
-)
-
-// 缓存列表管理
-type List struct {
-	m        map[string]*Item // hash => item
-	locker   sync.RWMutex
-	onAdd    func(item *Item)
-	onRemove func(item *Item)
-}
-
-func NewList() *List {
-	return &List{
-		m: map[string]*Item{},
-	}
-}
-
-func (this *List) Reset() {
-	this.locker.Lock()
-	this.m = map[string]*Item{}
-	this.locker.Unlock()
-}
-
-func (this *List) Add(hash string, item *Item) {
-	this.locker.Lock()
-	if this.onAdd != nil {
-		this.onAdd(item)
-	}
-	this.m[hash] = item
-	this.locker.Unlock()
-}
-
-func (this *List) Exist(hash string) bool {
-	this.locker.RLock()
-	defer this.locker.RUnlock()
-
-	item, ok := this.m[hash]
-	if !ok {
-		return false
-	}
-
-	return !item.IsExpired()
-}
-
-// 根据前缀进行查找
-func (this *List) FindKeysWithPrefix(prefix string) (keys []string) {
-	this.locker.RLock()
-	defer this.locker.RUnlock()
-
-	// TODO 需要优化性能，支持千万级数据低于1s的处理速度
-	for _, item := range this.m {
-		if strings.HasPrefix(item.Key, prefix) {
-			keys = append(keys, item.Key)
-		}
-	}
-	return
-}
-
-func (this *List) Remove(hash string) {
-	this.locker.Lock()
-
-	item, ok := this.m[hash]
-	if ok {
-		if this.onRemove != nil {
-			this.onRemove(item)
-		}
-		delete(this.m, hash)
-	}
-
-	this.locker.Unlock()
-}
-
-// 清理过期的缓存
-// count 每次遍历的最大数量，控制此数字可以保证每次清理的时候不用花太多时间
-// callback 每次发现过期key的调用
-func (this *List) Purge(count int, callback func(hash string)) {
-	this.locker.Lock()
-	deletedHashList := []string{}
-	for hash, item := range this.m {
-		if count <= 0 {
-			break
-		}
-
-		if item.IsExpired() {
-			if this.onRemove != nil {
-				this.onRemove(item)
-			}
-			delete(this.m, hash)
-			deletedHashList = append(deletedHashList, hash)
-		}
-
-		count--
-	}
-	this.locker.Unlock()
-
-	// 执行外部操作
-	for _, hash := range deletedHashList {
-		if callback != nil {
-			callback(hash)
-		}
-	}
-}
-
-func (this *List) Stat(check func(hash string) bool) *Stat {
-	this.locker.RLock()
-	defer this.locker.RUnlock()
-
-	result := &Stat{
-		Count: 0,
-		Size:  0,
-	}
-	for hash, item := range this.m {
-		if !item.IsExpired() {
-			// 检查文件是否存在、内容是否正确等
-			if check != nil && check(hash) {
-				result.Count++
-				result.ValueSize += item.Size()
-				result.Size += item.TotalSize()
-			}
-		}
-	}
-	return result
-}
-
-// 总数量
-func (this *List) Count() int64 {
-	this.locker.RLock()
-	count := int64(len(this.m))
-	this.locker.RUnlock()
-	return count
-}
-
-// 添加事件
-func (this *List) OnAdd(f func(item *Item)) {
-	this.onAdd = f
-}
-
-// 删除事件
-func (this *List) OnRemove(f func(item *Item)) {
-	this.onRemove = f
-}

internal/caches/list_file.go

@@ -0,0 +1,626 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+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/iwind/TeaGo/lists"
+	"github.com/iwind/TeaGo/types"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+	_ "github.com/mattn/go-sqlite3"
+	"os"
+	"sync/atomic"
+	"time"
+)
+
+// FileList 文件缓存列表管理
+type FileList struct {
+	dir   string
+	db    *sql.DB
+	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
+}
+
+func NewFileList(dir string) ListInterface {
+	return &FileList{
+		dir:         dir,
+		memoryCache: ttlcache.NewCache(),
+	}
+}
+
+func (this *FileList) Init() error {
+	// 检查目录是否存在
+	_, err := os.Stat(this.dir)
+	if err != nil {
+		err = os.MkdirAll(this.dir, 0777)
+		if err != nil {
+			return err
+		}
+		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)
+
+	this.db = db
+
+	// TODO 耗时过长，暂时不整理数据库
+	/**_, 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 + `"`)
+	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.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 {
+		return err
+	}
+
+	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
+}
+
+func (this *FileList) Reset() error {
+	// 不做任何事情
+	return nil
+}
+
+func (this *FileList) Add(hash string, item *Item) error {
+	if !this.isReady {
+		return nil
+	}
+
+	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
+	}
+
+	_, err = this.insertHitStmt.Exec(hash, timeutil.Format("YW"))
+	if err != nil {
+		return err
+	}
+
+	atomic.AddInt64(&this.total, 1)
+
+	if this.onAdd != nil {
+		this.onAdd(item)
+	}
+	return nil
+}
+
+func (this *FileList) Exist(hash string) (bool, error) {
+	if !this.isReady {
+		return false, nil
+	}
+
+	item := this.memoryCache.Read(hash)
+	if item != nil {
+		return true, nil
+	}
+
+	rows, err := this.existsByHashStmt.Query(hash, time.Now().Unix())
+	if err != nil {
+		return false, err
+	}
+	defer func() {
+		_ = rows.Close()
+	}()
+	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
+	}
+
+	defer func() {
+		this.memoryCache.Clean()
+	}()
+
+	var count = int64(10000)
+	var staleLife = 600 // TODO 需要可以设置
+	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)+`)`, utils.UnixTime()+int64(staleLife), utils.UnixTime(), prefix)
+		if err != nil {
+			return err
+		}
+		affectedRows, err := result.RowsAffected()
+		if err != nil {
+			return err
+		}
+		if affectedRows < count {
+			return nil
+		}
+	}
+}
+
+func (this *FileList) Remove(hash string) error {
+	if !this.isReady {
+		return nil
+	}
+
+	// 从缓存中删除
+	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 {
+		return 0, nil
+	}
+
+	if count <= 0 {
+		count = 1000
+	}
+
+	rows, err := this.purgeStmt.Query(time.Now().Unix(), count)
+	if err != nil {
+		return 0, err
+	}
+
+	hashStrings := []string{}
+	var countFound = 0
+	for rows.Next() {
+		var hash string
+		err = rows.Scan(&hash)
+		if err != nil {
+			_ = rows.Close()
+			return 0, err
+		}
+		hashStrings = append(hashStrings, hash)
+		countFound++
+	}
+	_ = rows.Close() // 不能使用defer，防止读写冲突
+
+	// 不在 rows.Next() 循环中操作是为了避免死锁
+	for _, hash := range hashStrings {
+		err = this.Remove(hash)
+		if err != nil {
+			return 0, err
+		}
+
+		err = callback(hash)
+		if err != nil {
+			return 0, err
+		}
+	}
+
+	return countFound, nil
+}
+
+func (this *FileList) PurgeLFU(count int, callback func(hash string) error) error {
+	if !this.isReady {
+		return nil
+	}
+
+	if count <= 0 {
+		return nil
+	}
+
+	rows, err := this.lfuHitsStmt.Query(count)
+	if err != nil {
+		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)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (this *FileList) CleanAll() error {
+	if !this.isReady {
+		return nil
+	}
+
+	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 {
+		return &Stat{}, nil
+	}
+
+	// 这里不设置过期时间、不使用 check 函数，目的是让查询更快速一些
+	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 总数量
+// 常用的方法，所以避免直接查询数据库
+func (this *FileList) Count() (int64, error) {
+	return atomic.LoadInt64(&this.total), nil
+}
+
+// IncreaseHit 增加点击量
+func (this *FileList) IncreaseHit(hash string) error {
+	var week = timeutil.Format("YW")
+	_, err := this.increaseHitStmt.Exec(hash, week, week, week, week)
+	return err
+}
+
+// OnAdd 添加事件
+func (this *FileList) OnAdd(f func(item *Item)) {
+	this.onAdd = f
+}
+
+// OnRemove 删除事件
+func (this *FileList) OnRemove(f func(item *Item)) {
+	this.onRemove = f
+}
+
+func (this *FileList) Close() error {
+	this.isClosed = true
+	this.isReady = false
+
+	this.memoryCache.Destroy()
+
+	if this.db != nil {
+		_ = this.existsByHashStmt.Close()
+		_ = this.insertStmt.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) initTables(db *sql.DB, times int) error {
+	// 检查是否存在
+	_, err := db.Exec(`SELECT id FROM "` + this.itemsTableName + `" LIMIT 1`)
+	var notFound = false
+	if err != nil {
+		notFound = true
+	}
+
+	{
+		// 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
+		}
+	}
+
+	// 如果数据为空，从老数据中加载数据
+	if notFound {
+		// v2 => v3
+		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 {
+			remotelogs.Println("CACHE", "transfer old data from v2 to v3 failed: "+err.Error())
+		} else {
+			count, _ := result.RowsAffected()
+			remotelogs.Println("CACHE", "transfer old data from v2 to v3 finished, "+types.String(count)+" rows transferred")
+		}
+	}
+
+	{
+		_, 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"
+ON "` + this.hitsTableName + `" (
+  "hash" ASC
+);
+`)
+		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
+}
+
+// 删除过期不用的表格
+func (this *FileList) removeOldTables() error {
+	rows, err := this.db.Query(`SELECT "name" FROM sqlite_master WHERE "type"='table'`)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		_ = rows.Close()
+	}()
+	for rows.Next() {
+		var name string
+		err = rows.Scan(&name)
+		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")
+			})
+		}
+
+	}
+	return nil
+}

internal/caches/list_file_test.go

@@ -0,0 +1,315 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package caches
+
+import (
+	"github.com/TeaOSLab/EdgeNode/internal/goman"
+	"github.com/iwind/TeaGo/Tea"
+	"github.com/iwind/TeaGo/rands"
+	"github.com/iwind/TeaGo/types"
+	stringutil "github.com/iwind/TeaGo/utils/string"
+	"strconv"
+	"sync"
+	"testing"
+	"time"
+)
+
+func TestFileList_Init(t *testing.T) {
+	list := NewFileList(Tea.Root + "/data")
+	err := list.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}
+
+func TestFileList_Add(t *testing.T) {
+	list := NewFileList(Tea.Root + "/data")
+	err := list.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = list.Add(stringutil.Md5("123456"), &Item{
+		Key:        "123456",
+		ExpiredAt:  time.Now().Unix(),
+		HeaderSize: 1,
+		MetaSize:   2,
+		BodySize:   3,
+		Host:       "teaos.cn",
+		ServerId:   1,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}
+
+func TestFileList_Add_Many(t *testing.T) {
+	list := NewFileList(Tea.Root + "/data")
+	err := list.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+	before := time.Now()
+	for i := 0; i < 2000_0000; i++ {
+		u := "https://edge.teaos.cn/123456" + strconv.Itoa(i)
+		_ = list.Add(stringutil.Md5(u), &Item{
+			Key:        u,
+			ExpiredAt:  time.Now().Unix() + 3600,
+			HeaderSize: 1,
+			MetaSize:   2,
+			BodySize:   3,
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+		if i > 0 && i%10_000 == 0 {
+			t.Log(i, int(10000/time.Since(before).Seconds()), "qps")
+			before = time.Now()
+		}
+	}
+	t.Log("ok")
+}
+
+func TestFileList_Exist(t *testing.T) {
+	list := NewFileList(Tea.Root + "/data")
+	err := list.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+	before := time.Now()
+	defer func() {
+		t.Log(time.Since(before).Seconds()*1000, "ms")
+	}()
+	{
+		exists, err := list.Exist(stringutil.Md5("123456"))
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Log("exists:", exists)
+	}
+	{
+		exists, err := list.Exist(stringutil.Md5("http://edge.teaos.cn/1234561"))
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Log("exists:", exists)
+	}
+}
+
+func TestFileList_Exist_Many_DB(t *testing.T) {
+	// 测试在多个数据库下的性能
+	var listSlice = []ListInterface{}
+	for i := 1; i <= 10; i++ {
+		list := NewFileList(Tea.Root + "/data/data" + strconv.Itoa(i))
+		err := list.Init()
+		if err != nil {
+			t.Fatal(err)
+		}
+		listSlice = append(listSlice, list)
+	}
+
+	var wg = sync.WaitGroup{}
+	var threads = 8
+	wg.Add(threads)
+
+	var count = 200_000
+	var countLocker sync.Mutex
+	var tasks = make(chan int, count)
+	for i := 0; i < count; i++ {
+		tasks <- i
+	}
+
+	var hash = stringutil.Md5("http://edge.teaos.cn/1234561")
+
+	before := time.Now()
+	defer func() {
+		t.Log(time.Since(before).Seconds()*1000, "ms")
+	}()
+
+	for i := 0; i < threads; i++ {
+		goman.New(func() {
+			defer wg.Done()
+
+			for {
+				select {
+				case <-tasks:
+					countLocker.Lock()
+					count--
+					countLocker.Unlock()
+
+					var list = listSlice[rands.Int(0, len(listSlice)-1)]
+					_, _ = list.Exist(hash)
+				default:
+					return
+				}
+			}
+		})
+	}
+	wg.Wait()
+	t.Log("left:", count)
+}
+
+func TestFileList_CleanPrefix(t *testing.T) {
+	list := NewFileList(Tea.Root + "/data")
+	err := list.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+	before := time.Now()
+	err = list.CleanPrefix("1234")
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(time.Since(before).Seconds()*1000, "ms")
+}
+
+func TestFileList_Remove(t *testing.T) {
+	list := NewFileList(Tea.Root + "/data")
+	err := list.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+	list.OnRemove(func(item *Item) {
+		t.Logf("remove %#v", item)
+	})
+	err = list.Remove(stringutil.Md5("123456"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}
+
+func TestFileList_Purge(t *testing.T) {
+	list := NewFileList(Tea.Root + "/data")
+	err := list.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = list.Purge(2, func(hash string) error {
+		t.Log(hash)
+		return nil
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}
+
+func TestFileList_Stat(t *testing.T) {
+	list := NewFileList(Tea.Root + "/data")
+	err := list.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+	stat, err := list.Stat(nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("count:", stat.Count, "size:", stat.Size, "valueSize:", stat.ValueSize)
+}
+
+func TestFileList_Count(t *testing.T) {
+	list := NewFileList(Tea.Root + "/data")
+	err := list.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+	before := time.Now()
+	count, err := list.Count()
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("count:", count)
+	t.Log(time.Since(before).Seconds()*1000, "ms")
+}
+
+func TestFileList_CleanAll(t *testing.T) {
+	list := NewFileList(Tea.Root + "/data")
+	err := list.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = list.CleanAll()
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+	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")
+	err := list.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+	var before = time.Now()
+	defer func() {
+		t.Log(time.Since(before).Seconds()*1000, "ms")
+	}()
+	for i := 0; i < 1000_000; i++ {
+		err = list.IncreaseHit(stringutil.Md5("abc" + types.String(i)))
+	}
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}
+
+func BenchmarkFileList_Exist(b *testing.B) {
+	list := NewFileList(Tea.Root + "/data")
+	err := list.Init()
+	if err != nil {
+		b.Fatal(err)
+	}
+	for i := 0; i < b.N; i++ {
+		_, _ = list.Exist("f0eb5b87e0b0041f3917002c0707475f")
+	}
+}

internal/caches/list_interface.go

@@ -0,0 +1,50 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package caches
+
+type ListInterface interface {
+	// Init 初始化
+	Init() error
+
+	// Reset 重置数据
+	Reset() error
+
+	// Add 添加内容
+	Add(hash string, item *Item) error
+
+	// Exist 检查内容是否存在
+	Exist(hash string) (bool, error)
+
+	// CleanPrefix 清除某个前缀的缓存
+	CleanPrefix(prefix string) error
+
+	// Remove 删除内容
+	Remove(hash string) error
+
+	// Purge 清理过期数据
+	Purge(count int, callback func(hash string) error) (int, error)
+
+	// PurgeLFU 清理LFU数据
+	PurgeLFU(count int, callback func(hash string) error) error
+
+	// CleanAll 清除所有缓存
+	CleanAll() error
+
+	// Stat 统计
+	Stat(check func(hash string) bool) (*Stat, error)
+
+	// Count 总数量
+	Count() (int64, error)
+
+	// OnAdd 添加事件
+	OnAdd(f func(item *Item))
+
+	// OnRemove 删除事件
+	OnRemove(f func(item *Item))
+
+	// Close 关闭
+	Close() error
+
+	// IncreaseHit 增加点击量
+	IncreaseHit(hash string) error
+}

internal/caches/list_memory.go

@@ -0,0 +1,420 @@
+package caches
+
+import (
+	"github.com/TeaOSLab/EdgeNode/internal/zero"
+	"github.com/iwind/TeaGo/logs"
+	"strconv"
+	"strings"
+	"sync"
+	"sync/atomic"
+	"testing"
+)
+
+// MemoryList 内存缓存列表管理
+type MemoryList struct {
+	count int64
+
+	itemMaps map[string]map[string]*Item // prefix => { hash => item }
+
+	weekItemMaps map[int32]map[string]zero.Zero // week => { hash => Zero }
+	minWeek      int32
+
+	prefixes []string
+	locker   sync.RWMutex
+	onAdd    func(item *Item)
+	onRemove func(item *Item)
+
+	purgeIndex int
+}
+
+func NewMemoryList() ListInterface {
+	return &MemoryList{
+		itemMaps:     map[string]map[string]*Item{},
+		weekItemMaps: map[int32]map[string]zero.Zero{},
+		minWeek:      currentWeek(),
+	}
+}
+
+func (this *MemoryList) Init() error {
+	this.prefixes = []string{"000"}
+	for i := 100; i <= 999; i++ {
+		this.prefixes = append(this.prefixes, strconv.Itoa(i))
+	}
+
+	for _, prefix := range this.prefixes {
+		this.itemMaps[prefix] = map[string]*Item{}
+	}
+
+	return nil
+}
+
+func (this *MemoryList) Reset() error {
+	this.locker.Lock()
+	for key := range this.itemMaps {
+		this.itemMaps[key] = map[string]*Item{}
+	}
+	this.weekItemMaps = map[int32]map[string]zero.Zero{}
+	this.locker.Unlock()
+
+	atomic.StoreInt64(&this.count, 0)
+
+	return nil
+}
+
+func (this *MemoryList) Add(hash string, item *Item) error {
+	if item.Week == 0 {
+		item.Week = currentWeek()
+	}
+
+	this.locker.Lock()
+
+	prefix := this.prefix(hash)
+	itemMap, ok := this.itemMaps[prefix]
+	if !ok {
+		itemMap = map[string]*Item{}
+		this.itemMaps[prefix] = itemMap
+	}
+
+	// 先删除，为了可以正确触发统计
+	oldItem, ok := itemMap[hash]
+	if ok {
+		// 从week map中删除
+		if oldItem.Week > 0 {
+			wm, ok := this.weekItemMaps[oldItem.Week]
+			if ok {
+				delete(wm, hash)
+			}
+		}
+
+		// 回调
+		if this.onRemove != nil {
+			this.onRemove(oldItem)
+		}
+	} else {
+		atomic.AddInt64(&this.count, 1)
+	}
+
+	// 添加
+	if this.onAdd != nil {
+		this.onAdd(item)
+	}
+
+	itemMap[hash] = item
+
+	// week map
+	wm, ok := this.weekItemMaps[item.Week]
+	if ok {
+		wm[hash] = zero.New()
+	} else {
+		this.weekItemMaps[item.Week] = map[string]zero.Zero{hash: zero.New()}
+	}
+
+	this.locker.Unlock()
+	return nil
+}
+
+func (this *MemoryList) Exist(hash string) (bool, error) {
+	this.locker.RLock()
+	defer this.locker.RUnlock()
+
+	prefix := this.prefix(hash)
+	itemMap, ok := this.itemMaps[prefix]
+	if !ok {
+		return false, nil
+	}
+	item, ok := itemMap[hash]
+	if !ok {
+		return false, nil
+	}
+
+	return !item.IsExpired(), nil
+}
+
+// CleanPrefix 根据前缀进行清除
+func (this *MemoryList) CleanPrefix(prefix string) error {
+	this.locker.RLock()
+	defer this.locker.RUnlock()
+
+	// TODO 需要优化性能，支持千万级数据低于1s的处理速度
+	for _, itemMap := range this.itemMaps {
+		for _, item := range itemMap {
+			if strings.HasPrefix(item.Key, prefix) {
+				item.ExpiredAt = 0
+			}
+		}
+	}
+	return nil
+}
+
+func (this *MemoryList) Remove(hash string) error {
+	this.locker.Lock()
+
+	itemMap, ok := this.itemMaps[this.prefix(hash)]
+	if !ok {
+		this.locker.Unlock()
+		return nil
+	}
+
+	item, ok := itemMap[hash]
+	if ok {
+		if this.onRemove != nil {
+			this.onRemove(item)
+		}
+
+		atomic.AddInt64(&this.count, -1)
+		delete(itemMap, hash)
+
+		// week map
+		if item.Week > 0 {
+			wm, ok := this.weekItemMaps[item.Week]
+			if ok {
+				delete(wm, hash)
+			}
+		}
+	}
+
+	this.locker.Unlock()
+	return nil
+}
+
+// Purge 清理过期的缓存
+// count 每次遍历的最大数量，控制此数字可以保证每次清理的时候不用花太多时间
+// callback 每次发现过期key的调用
+func (this *MemoryList) Purge(count int, callback func(hash string) error) (int, error) {
+	this.locker.Lock()
+	deletedHashList := []string{}
+
+	if this.purgeIndex >= len(this.prefixes) {
+		this.purgeIndex = 0
+	}
+	prefix := this.prefixes[this.purgeIndex]
+
+	this.purgeIndex++
+
+	itemMap, ok := this.itemMaps[prefix]
+	if !ok {
+		this.locker.Unlock()
+		return 0, nil
+	}
+	var countFound = 0
+	for hash, item := range itemMap {
+		if count <= 0 {
+			break
+		}
+
+		if item.IsExpired() {
+			if this.onRemove != nil {
+				this.onRemove(item)
+			}
+
+			atomic.AddInt64(&this.count, -1)
+			delete(itemMap, hash)
+			deletedHashList = append(deletedHashList, hash)
+
+			// week map
+			if item.Week > 0 {
+				wm, ok := this.weekItemMaps[item.Week]
+				if ok {
+					delete(wm, hash)
+				}
+			}
+
+			countFound++
+		}
+
+		count--
+	}
+	this.locker.Unlock()
+
+	// 执行外部操作
+	for _, hash := range deletedHashList {
+		if callback != nil {
+			err := callback(hash)
+			if err != nil {
+				return 0, err
+			}
+		}
+	}
+	return countFound, nil
+}
+
+func (this *MemoryList) PurgeLFU(count int, callback func(hash string) error) error {
+	if count <= 0 {
+		return nil
+	}
+
+	var week = currentWeek()
+	if this.minWeek > week {
+		this.minWeek = week
+	}
+
+	var deletedHashList = []string{}
+
+Loop:
+	for w := this.minWeek; w <= week; w++ {
+		this.minWeek = w
+
+		this.locker.Lock()
+		wm, ok := this.weekItemMaps[w]
+		if ok {
+			var wc = len(wm)
+			if wc == 0 {
+				delete(this.weekItemMaps, w)
+			} else {
+				if wc <= count {
+					delete(this.weekItemMaps, w)
+				}
+
+				// TODO 未来支持按照点击量排序
+				for hash := range wm {
+					count--
+
+					if count < 0 {
+						this.locker.Unlock()
+						break Loop
+					}
+
+					delete(wm, hash)
+
+					itemMap, ok := this.itemMaps[this.prefix(hash)]
+					if !ok {
+						continue
+					}
+					item, ok := itemMap[hash]
+					if !ok {
+						continue
+					}
+
+					if this.onRemove != nil {
+						this.onRemove(item)
+					}
+
+					atomic.AddInt64(&this.count, -1)
+					delete(itemMap, hash)
+					deletedHashList = append(deletedHashList, hash)
+				}
+			}
+		} else {
+			delete(this.weekItemMaps, w)
+		}
+		this.locker.Unlock()
+	}
+
+	// 执行外部操作
+	for _, hash := range deletedHashList {
+		if callback != nil {
+			err := callback(hash)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+func (this *MemoryList) CleanAll() error {
+	return this.Reset()
+}
+
+func (this *MemoryList) Stat(check func(hash string) bool) (*Stat, error) {
+	this.locker.RLock()
+	defer this.locker.RUnlock()
+
+	result := &Stat{
+		Count: 0,
+		Size:  0,
+	}
+	for _, itemMap := range this.itemMaps {
+		for hash, item := range itemMap {
+			if !item.IsExpired() {
+				// 检查文件是否存在、内容是否正确等
+				if check != nil && check(hash) {
+					result.Count++
+					result.ValueSize += item.Size()
+					result.Size += item.TotalSize()
+				}
+			}
+		}
+	}
+	return result, nil
+}
+
+// Count 总数量
+func (this *MemoryList) Count() (int64, error) {
+	var count = atomic.LoadInt64(&this.count)
+	return count, nil
+}
+
+// OnAdd 添加事件
+func (this *MemoryList) OnAdd(f func(item *Item)) {
+	this.onAdd = f
+}
+
+// OnRemove 删除事件
+func (this *MemoryList) OnRemove(f func(item *Item)) {
+	this.onRemove = f
+}
+
+func (this *MemoryList) Close() error {
+	return nil
+}
+
+// IncreaseHit 增加点击量
+func (this *MemoryList) IncreaseHit(hash string) error {
+	this.locker.Lock()
+
+	itemMap, ok := this.itemMaps[this.prefix(hash)]
+	if !ok {
+		this.locker.Unlock()
+		return nil
+	}
+
+	item, ok := itemMap[hash]
+	if ok {
+		var week = currentWeek()
+
+		// 交换位置
+		if item.Week > 0 && item.Week != week {
+			wm, ok := this.weekItemMaps[item.Week]
+			if ok {
+				delete(wm, hash)
+			}
+			wm, ok = this.weekItemMaps[week]
+			if ok {
+				wm[hash] = zero.New()
+			} else {
+				this.weekItemMaps[week] = map[string]zero.Zero{hash: zero.New()}
+			}
+		}
+
+		item.IncreaseHit(week)
+	}
+
+	this.locker.Unlock()
+	return nil
+}
+
+func (this *MemoryList) print(t *testing.T) {
+	this.locker.Lock()
+	for _, itemMap := range this.itemMaps {
+		if len(itemMap) > 0 {
+			logs.PrintAsJSON(itemMap, t)
+		}
+	}
+	this.locker.Unlock()
+}
+
+func (this *MemoryList) prefix(hash string) string {
+	var prefix string
+	if len(hash) > 3 {
+		prefix = hash[:3]
+	} else {
+		prefix = hash
+	}
+	_, ok := this.itemMaps[prefix]
+	if !ok {
+		prefix = "000"
+	}
+	return prefix
+}

internal/caches/list_memory_test.go

@@ -0,0 +1,263 @@
+package caches
+
+import (
+	"fmt"
+	"github.com/cespare/xxhash"
+	"github.com/iwind/TeaGo/logs"
+	"github.com/iwind/TeaGo/rands"
+	"math/rand"
+	"strconv"
+	"testing"
+	"time"
+)
+
+func TestMemoryList_Add(t *testing.T) {
+	list := NewMemoryList().(*MemoryList)
+	_ = list.Init()
+	_ = list.Add("a", &Item{
+		Key:        "a1",
+		ExpiredAt:  time.Now().Unix() + 3600,
+		HeaderSize: 1024,
+	})
+	_ = list.Add("b", &Item{
+		Key:        "b1",
+		ExpiredAt:  time.Now().Unix() + 3600,
+		HeaderSize: 1024,
+	})
+	_ = list.Add("123456", &Item{
+		Key:        "c1",
+		ExpiredAt:  time.Now().Unix() + 3600,
+		HeaderSize: 1024,
+	})
+	t.Log(list.prefixes)
+	logs.PrintAsJSON(list.itemMaps, t)
+	logs.PrintAsJSON(list.weekItemMaps, t)
+	t.Log(list.Count())
+}
+
+func TestMemoryList_Remove(t *testing.T) {
+	list := NewMemoryList().(*MemoryList)
+	_ = list.Init()
+	_ = list.Add("a", &Item{
+		Key:        "a1",
+		ExpiredAt:  time.Now().Unix() + 3600,
+		HeaderSize: 1024,
+	})
+	_ = list.Add("b", &Item{
+		Key:        "b1",
+		ExpiredAt:  time.Now().Unix() + 3600,
+		HeaderSize: 1024,
+	})
+	_ = list.Remove("b")
+	list.print(t)
+	logs.PrintAsJSON(list.weekItemMaps, t)
+	t.Log(list.Count())
+}
+
+func TestMemoryList_Purge(t *testing.T) {
+	list := NewMemoryList().(*MemoryList)
+	_ = list.Init()
+	_ = list.Add("a", &Item{
+		Key:        "a1",
+		ExpiredAt:  time.Now().Unix() + 3600,
+		HeaderSize: 1024,
+	})
+	_ = list.Add("b", &Item{
+		Key:        "b1",
+		ExpiredAt:  time.Now().Unix() + 3600,
+		HeaderSize: 1024,
+	})
+	_ = list.Add("c", &Item{
+		Key:        "c1",
+		ExpiredAt:  time.Now().Unix() - 3600,
+		HeaderSize: 1024,
+	})
+	_ = list.Add("d", &Item{
+		Key:        "d1",
+		ExpiredAt:  time.Now().Unix() - 2,
+		HeaderSize: 1024,
+	})
+	_, _ = list.Purge(100, func(hash string) error {
+		t.Log("delete:", hash)
+		return nil
+	})
+	list.print(t)
+	logs.PrintAsJSON(list.weekItemMaps, t)
+
+	for i := 0; i < 1000; i++ {
+		_, _ = list.Purge(100, func(hash string) error {
+			t.Log("delete:", hash)
+			return nil
+		})
+		t.Log(list.purgeIndex)
+	}
+
+	t.Log(list.Count())
+}
+
+func TestMemoryList_Purge_Large_List(t *testing.T) {
+	list := NewMemoryList().(*MemoryList)
+	_ = list.Init()
+
+	for i := 0; i < 1_000_000; i++ {
+		_ = list.Add("a"+strconv.Itoa(i), &Item{
+			Key:        "a" + strconv.Itoa(i),
+			ExpiredAt:  time.Now().Unix() + int64(rands.Int(0, 24*3600)),
+			HeaderSize: 1024,
+		})
+	}
+
+	time.Sleep(1 * time.Hour)
+}
+
+func TestMemoryList_Stat(t *testing.T) {
+	list := NewMemoryList()
+	_ = list.Init()
+	_ = list.Add("a", &Item{
+		Key:        "a1",
+		ExpiredAt:  time.Now().Unix() + 3600,
+		HeaderSize: 1024,
+	})
+	_ = list.Add("b", &Item{
+		Key:        "b1",
+		ExpiredAt:  time.Now().Unix() + 3600,
+		HeaderSize: 1024,
+	})
+	_ = list.Add("c", &Item{
+		Key:        "c1",
+		ExpiredAt:  time.Now().Unix(),
+		HeaderSize: 1024,
+	})
+	_ = list.Add("d", &Item{
+		Key:        "d1",
+		ExpiredAt:  time.Now().Unix() - 2,
+		HeaderSize: 1024,
+	})
+	result, _ := list.Stat(func(hash string) bool {
+		// 随机测试
+		rand.Seed(time.Now().UnixNano())
+		return rand.Int()%2 == 0
+	})
+	t.Log(result)
+}
+
+func TestMemoryList_CleanPrefix(t *testing.T) {
+	list := NewMemoryList()
+	_ = list.Init()
+	before := time.Now()
+	for i := 0; i < 1_000_000; i++ {
+		key := "https://www.teaos.cn/hello/" + strconv.Itoa(i/10000) + "/" + strconv.Itoa(i) + ".html"
+		_ = list.Add(fmt.Sprintf("%d", xxhash.Sum64String(key)), &Item{
+			Key:        key,
+			ExpiredAt:  time.Now().Unix() + 3600,
+			BodySize:   0,
+			HeaderSize: 0,
+		})
+	}
+	t.Log(time.Since(before).Seconds()*1000, "ms")
+
+	before = time.Now()
+	err := list.CleanPrefix("https://www.teaos.cn/hello/10")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	logs.Println(list.Stat(func(hash string) bool {
+		return true
+	}))
+
+	t.Log(time.Since(before).Seconds()*1000, "ms")
+}
+
+func TestMemoryList_PurgeLFU(t *testing.T) {
+	var list = NewMemoryList().(*MemoryList)
+	list.minWeek = 2704
+
+	var before = time.Now()
+	defer func() {
+		t.Log(time.Since(before).Seconds()*1000, "ms")
+	}()
+
+	t.Log("current week:", currentWeek())
+
+	_ = list.Add("1", &Item{})
+	_ = list.Add("2", &Item{})
+	_ = list.Add("3", &Item{})
+	_ = list.Add("4", &Item{})
+	_ = list.Add("5", &Item{})
+	_ = list.Add("6", &Item{Week: 2704})
+	_ = list.Add("7", &Item{Week: 2704})
+	_ = list.Add("8", &Item{Week: 2705})
+
+	err := list.PurgeLFU(2, func(hash string) error {
+		t.Log("purge lfu:", hash)
+		return nil
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+
+	logs.PrintAsJSON(list.weekItemMaps, t)
+	t.Log(list.Count())
+}
+
+func TestMemoryList_IncreaseHit(t *testing.T) {
+	var list = NewMemoryList().(*MemoryList)
+	var item = &Item{}
+	item.Week = 2705
+	item.Week2Hits = 100
+
+	_ = list.Add("a", &Item{})
+	_ = list.Add("a", item)
+	t.Log("hits1:", item.Week1Hits, "hits2:", item.Week2Hits, "week:", item.Week)
+	logs.PrintAsJSON(list.weekItemMaps, t)
+
+	_ = list.IncreaseHit("a")
+	t.Log("hits1:", item.Week1Hits, "hits2:", item.Week2Hits, "week:", item.Week)
+	logs.PrintAsJSON(list.weekItemMaps, t)
+
+	_ = list.IncreaseHit("a")
+	t.Log("hits1:", item.Week1Hits, "hits2:", item.Week2Hits, "week:", item.Week)
+	logs.PrintAsJSON(list.weekItemMaps, t)
+}
+
+func TestMemoryList_CleanAll(t *testing.T) {
+	var list = NewMemoryList().(*MemoryList)
+	var item = &Item{}
+	item.Week = 2705
+	item.Week2Hits = 100
+
+	_ = list.Add("a", &Item{})
+	_ = list.CleanAll()
+	logs.PrintAsJSON(list.itemMaps, t)
+	logs.PrintAsJSON(list.weekItemMaps, t)
+	t.Log(list.Count())
+}
+
+func TestMemoryList_GC(t *testing.T) {
+	list := NewMemoryList().(*MemoryList)
+	_ = list.Init()
+	for i := 0; i < 1_000_000; i++ {
+		key := "https://www.teaos.cn/hello" + strconv.Itoa(i/100000) + "/" + strconv.Itoa(i) + ".html"
+		_ = list.Add(fmt.Sprintf("%d", xxhash.Sum64String(key)), &Item{
+			Key:        key,
+			ExpiredAt:  0,
+			BodySize:   0,
+			HeaderSize: 0,
+		})
+	}
+	time.Sleep(10 * time.Second)
+	t.Log("clean...", len(list.itemMaps))
+	_ = list.CleanAll()
+	t.Log("cleanAll...", len(list.itemMaps))
+	before := time.Now()
+	//runtime.GC()
+	t.Log("gc cost:", time.Since(before).Seconds()*1000, "ms")
+
+	timeout := time.NewTimer(2 * time.Minute)
+	<-timeout.C
+	t.Log("2 minutes passed")
+
+	time.Sleep(30 * time.Minute)
+}

internal/caches/list_test.go

@@ -1,119 +0,0 @@
-package caches
-
-import (
-	"fmt"
-	"github.com/cespare/xxhash"
-	"math/rand"
-	"strconv"
-	"testing"
-	"time"
-)
-
-func TestList_Add(t *testing.T) {
-	list := NewList()
-	list.Add("a", &Item{
-		Key:        "a1",
-		ExpiredAt:  time.Now().Unix() + 3600,
-		HeaderSize: 1024,
-	})
-	list.Add("b", &Item{
-		Key:        "b1",
-		ExpiredAt:  time.Now().Unix() + 3600,
-		HeaderSize: 1024,
-	})
-	t.Log(list.m)
-}
-
-func TestList_Remove(t *testing.T) {
-	list := NewList()
-	list.Add("a", &Item{
-		Key:        "a1",
-		ExpiredAt:  time.Now().Unix() + 3600,
-		HeaderSize: 1024,
-	})
-	list.Add("b", &Item{
-		Key:        "b1",
-		ExpiredAt:  time.Now().Unix() + 3600,
-		HeaderSize: 1024,
-	})
-	list.Remove("b")
-	t.Log(list.m)
-}
-
-func TestList_Purge(t *testing.T) {
-	list := NewList()
-	list.Add("a", &Item{
-		Key:        "a1",
-		ExpiredAt:  time.Now().Unix() + 3600,
-		HeaderSize: 1024,
-	})
-	list.Add("b", &Item{
-		Key:        "b1",
-		ExpiredAt:  time.Now().Unix() + 3600,
-		HeaderSize: 1024,
-	})
-	list.Add("c", &Item{
-		Key:        "c1",
-		ExpiredAt:  time.Now().Unix() - 3600,
-		HeaderSize: 1024,
-	})
-	list.Add("d", &Item{
-		Key:        "d1",
-		ExpiredAt:  time.Now().Unix() - 2,
-		HeaderSize: 1024,
-	})
-	list.Purge(100, func(hash string) {
-		t.Log("delete:", hash)
-	})
-	t.Log(list.m)
-}
-
-func TestList_Stat(t *testing.T) {
-	list := NewList()
-	list.Add("a", &Item{
-		Key:        "a1",
-		ExpiredAt:  time.Now().Unix() + 3600,
-		HeaderSize: 1024,
-	})
-	list.Add("b", &Item{
-		Key:        "b1",
-		ExpiredAt:  time.Now().Unix() + 3600,
-		HeaderSize: 1024,
-	})
-	list.Add("c", &Item{
-		Key:        "c1",
-		ExpiredAt:  time.Now().Unix(),
-		HeaderSize: 1024,
-	})
-	list.Add("d", &Item{
-		Key:        "d1",
-		ExpiredAt:  time.Now().Unix() - 2,
-		HeaderSize: 1024,
-	})
-	result := list.Stat(func(hash string) bool {
-		// 随机测试
-		rand.Seed(time.Now().UnixNano())
-		return rand.Int()%2 == 0
-	})
-	t.Log(result)
-}
-
-func TestList_FindKeysWithPrefix(t *testing.T) {
-	list := NewList()
-	before := time.Now()
-	for i := 0; i < 1_000_000; i++ {
-		key := "http://www.teaos.cn/hello" + strconv.Itoa(i/100000) + "/" + strconv.Itoa(i) + ".html"
-		list.Add(fmt.Sprintf("%d", xxhash.Sum64String(key)), &Item{
-			Key:        key,
-			ExpiredAt:  0,
-			BodySize:   0,
-			HeaderSize: 0,
-		})
-	}
-	t.Log(time.Since(before).Seconds()*1000, "ms")
-
-	before = time.Now()
-	keys := list.FindKeysWithPrefix("http://www.teaos.cn/hello/5000")
-	t.Log(len(keys))
-	t.Log(time.Since(before).Seconds()*1000, "ms")
-}

internal/caches/manager.go

@@ -2,28 +2,47 @@ package caches
 
 import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
+	"github.com/TeaOSLab/EdgeNode/internal/events"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/iwind/TeaGo/lists"
+	"github.com/iwind/TeaGo/logs"
+	"github.com/iwind/TeaGo/types"
 	"strconv"
 	"sync"
 )
 
 var SharedManager = NewManager()
 
+func init() {
+	events.On(events.EventQuit, func() {
+		logs.Println("CACHE", "quiting cache manager")
+		SharedManager.UpdatePolicies([]*serverconfigs.HTTPCachePolicy{})
+	})
+}
+
+// Manager 缓存策略管理器
 type Manager struct {
+	// 全局配置
+	MaxDiskCapacity   *shared.SizeCapacity
+	MaxMemoryCapacity *shared.SizeCapacity
+
 	policyMap  map[int64]*serverconfigs.HTTPCachePolicy // policyId => []*Policy
 	storageMap map[int64]StorageInterface               // policyId => *Storage
 	locker     sync.RWMutex
 }
 
+// NewManager 获取管理器对象
 func NewManager() *Manager {
-	return &Manager{
+	var m = &Manager{
 		policyMap:  map[int64]*serverconfigs.HTTPCachePolicy{},
 		storageMap: map[int64]StorageInterface{},
 	}
+
+	return m
 }
 
-// 重新设置策略
+// UpdatePolicies 重新设置策略
 func (this *Manager) UpdatePolicies(newPolicies []*serverconfigs.HTTPCachePolicy) {
 	this.locker.Lock()
 	defer this.locker.Unlock()
@@ -103,7 +122,7 @@ func (this *Manager) UpdatePolicies(newPolicies []*serverconfigs.HTTPCachePolicy
 	}
 }
 
-// 获取Policy信息
+// FindPolicy 获取Policy信息
 func (this *Manager) FindPolicy(policyId int64) *serverconfigs.HTTPCachePolicy {
 	this.locker.RLock()
 	defer this.locker.RUnlock()
@@ -112,7 +131,7 @@ func (this *Manager) FindPolicy(policyId int64) *serverconfigs.HTTPCachePolicy {
 	return p
 }
 
-// 根据策略ID查找存储
+// FindStorageWithPolicy 根据策略ID查找存储
 func (this *Manager) FindStorageWithPolicy(policyId int64) StorageInterface {
 	this.locker.RLock()
 	defer this.locker.RUnlock()
@@ -121,13 +140,59 @@ func (this *Manager) FindStorageWithPolicy(policyId int64) StorageInterface {
 	return storage
 }
 
-// 根据策略获取存储对象
+// NewStorageWithPolicy 根据策略获取存储对象
 func (this *Manager) NewStorageWithPolicy(policy *serverconfigs.HTTPCachePolicy) StorageInterface {
 	switch policy.Type {
 	case serverconfigs.CachePolicyStorageFile:
 		return NewFileStorage(policy)
 	case serverconfigs.CachePolicyStorageMemory:
-		return NewMemoryStorage(policy)
+		return NewMemoryStorage(policy, nil)
 	}
 	return nil
 }
+
+// TotalDiskSize 消耗的磁盘尺寸
+func (this *Manager) TotalDiskSize() int64 {
+	this.locker.RLock()
+	defer this.locker.RUnlock()
+
+	total := int64(0)
+	for _, storage := range this.storageMap {
+		total += storage.TotalDiskSize()
+	}
+	return total
+}
+
+// TotalMemorySize 消耗的内存尺寸
+func (this *Manager) TotalMemorySize() int64 {
+	this.locker.RLock()
+	defer this.locker.RUnlock()
+
+	total := int64(0)
+	for _, storage := range this.storageMap {
+		total += storage.TotalMemorySize()
+	}
+	return total
+}
+
+// FindAllCachePaths 所有缓存路径
+func (this *Manager) FindAllCachePaths() []string {
+	this.locker.Lock()
+	defer this.locker.Unlock()
+
+	var result = []string{}
+	for _, policy := range this.policyMap {
+		if policy.Type == serverconfigs.CachePolicyStorageFile {
+			if policy.Options != nil {
+				dir, ok := policy.Options["dir"]
+				if ok {
+					var dirString = types.String(dir)
+					if len(dirString) > 0 {
+						result = append(result, dirString)
+					}
+				}
+			}
+		}
+	}
+	return result
+}

internal/caches/reader.go

@@ -3,27 +3,36 @@ package caches
 type ReaderFunc func(n int) (goNext bool, err error)
 
 type Reader interface {
-	// 初始化
+	// Init 初始化
 	Init() error
 
-	// 状态码
+	// TypeName 类型名称
+	TypeName() string
+
+	// ExpiresAt 过期时间
+	ExpiresAt() int64
+
+	// Status 状态码
 	Status() int
 
-	// 读取Header
+	// LastModified 最后修改时间
+	LastModified() int64
+
+	// ReadHeader 读取Header
 	ReadHeader(buf []byte, callback ReaderFunc) error
 
-	// 读取Body
+	// ReadBody 读取Body
 	ReadBody(buf []byte, callback ReaderFunc) error
 
-	// 读取某个范围内的Body
+	// ReadBodyRange 读取某个范围内的Body
 	ReadBodyRange(buf []byte, start int64, end int64, callback ReaderFunc) error
 
-	// Header Size
+	// HeaderSize Header Size
 	HeaderSize() int64
 
-	// Body Size
+	// BodySize Body Size
 	BodySize() int64
 
-	// 关闭
+	// Close 关闭
 	Close() error
 }

internal/caches/reader_file.go

@@ -11,6 +11,7 @@ import (
 type FileReader struct {
 	fp *os.File
 
+	expiresAt    int64
 	status       int
 	headerOffset int64
 	headerSize   int
@@ -34,13 +35,7 @@ func (this *FileReader) Init() error {
 		}
 	}()
 
-	// 读取状态
-	_, err := this.fp.Seek(SizeExpiresAt, io.SeekStart)
-	if err != nil {
-		_ = this.discard()
-		return err
-	}
-	buf := make([]byte, 3)
+	var buf = make([]byte, SizeMeta)
 	ok, err := this.readToBuff(this.fp, buf)
 	if err != nil {
 		return err
@@ -48,37 +43,20 @@ func (this *FileReader) Init() error {
 	if !ok {
 		return ErrNotFound
 	}
-	status := types.Int(string(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
-	_, err = this.fp.Seek(SizeExpiresAt+SizeStatus, io.SeekStart)
-	if err != nil {
-		return err
-	}
-
-	bytes4 := make([]byte, 4)
-	ok, err = this.readToBuff(this.fp, bytes4)
-	if err != nil {
-		return err
-	}
-	if !ok {
-		return ErrNotFound
-	}
-	urlLength := binary.BigEndian.Uint32(bytes4)
+	urlLength := binary.BigEndian.Uint32(buf[SizeExpiresAt+SizeStatus : SizeExpiresAt+SizeStatus+SizeURLLength])
 
 	// header
-	ok, err = this.readToBuff(this.fp, bytes4)
-	if err != nil {
-		return err
-	}
-	if !ok {
-		return ErrNotFound
-	}
-	headerSize := int(binary.BigEndian.Uint32(bytes4))
+	headerSize := int(binary.BigEndian.Uint32(buf[SizeExpiresAt+SizeStatus+SizeURLLength : SizeExpiresAt+SizeStatus+SizeURLLength+SizeHeaderLength]))
 	if headerSize == 0 {
 		return nil
 	}
@@ -86,16 +64,9 @@ func (this *FileReader) Init() error {
 	this.headerOffset = int64(SizeMeta) + int64(urlLength)
 
 	// body
-	bytes8 := make([]byte, 8)
-	ok, err = this.readToBuff(this.fp, bytes8)
-	if err != nil {
-		return err
-	}
-	if !ok {
-		return ErrNotFound
-	}
-	bodySize := int(binary.BigEndian.Uint64(bytes8))
+	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)
@@ -106,10 +77,26 @@ func (this *FileReader) Init() error {
 	return nil
 }
 
+func (this *FileReader) TypeName() string {
+	return "disk"
+}
+
+func (this *FileReader) ExpiresAt() int64 {
+	return this.expiresAt
+}
+
 func (this *FileReader) Status() int {
 	return this.status
 }
 
+func (this *FileReader) LastModified() int64 {
+	stat, err := this.fp.Stat()
+	if err != nil {
+		return 0
+	}
+	return stat.ModTime().Unix()
+}
+
 func (this *FileReader) HeaderSize() int64 {
 	return int64(this.headerSize)
 }

internal/caches/reader_file_test.go

@@ -49,6 +49,9 @@ func TestFileReader(t *testing.T) {
 		t.Log("body:", string(buf[:n]))
 		return true, nil
 	})
+	if err != nil {
+		t.Fatal(err)
+	}
 }
 
 func TestFileReader_Range(t *testing.T) {

internal/caches/reader_memory.go

@@ -16,10 +16,22 @@ func (this *MemoryReader) Init() error {
 	return nil
 }
 
+func (this *MemoryReader) TypeName() string {
+	return "memory"
+}
+
+func (this *MemoryReader) ExpiresAt() int64 {
+	return this.item.ExpiredAt
+}
+
 func (this *MemoryReader) Status() int {
 	return this.item.Status
 }
 
+func (this *MemoryReader) LastModified() int64 {
+	return this.item.ModifiedAt
+}
+
 func (this *MemoryReader) HeaderSize() int64 {
 	return int64(len(this.item.HeaderValue))
 }

internal/caches/storage_file.go

@@ -8,14 +8,23 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/TeaOSLab/EdgeNode/internal/events"
+	"github.com/TeaOSLab/EdgeNode/internal/goman"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
+	"github.com/TeaOSLab/EdgeNode/internal/trackers"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"github.com/TeaOSLab/EdgeNode/internal/zero"
 	"github.com/iwind/TeaGo/Tea"
+	"github.com/iwind/TeaGo/rands"
+	"github.com/iwind/TeaGo/types"
 	stringutil "github.com/iwind/TeaGo/utils/string"
+	"golang.org/x/text/language"
+	"golang.org/x/text/message"
 	"io"
+	"math"
 	"os"
 	"path/filepath"
 	"regexp"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -34,13 +43,11 @@ const (
 	SizeMeta = SizeExpiresAt + SizeStatus + SizeURLLength + SizeHeaderLength + SizeBodyLength
 )
 
-var (
-	ErrNotFound      = errors.New("cache not found")
-	ErrFileIsWriting = errors.New("the file is writing")
-	ErrInvalidRange  = errors.New("invalid range")
+const (
+	HotItemSize = 1024
 )
 
-// 文件缓存
+// FileStorage 文件缓存
 //   文件结构：
 //    [expires time] | [ status ] | [url length] | [header length] | [body length] | [url] [header data] [body data]
 type FileStorage struct {
@@ -49,60 +56,37 @@ type FileStorage struct {
 	memoryStorage *MemoryStorage                      // 一级缓存
 	totalSize     int64
 
-	list   *List
-	locker sync.RWMutex
-	ticker *utils.Ticker
+	list          ListInterface
+	writingKeyMap map[string]zero.Zero // key => bool
+	locker        sync.RWMutex
+	purgeTicker   *utils.Ticker
+
+	hotMap       map[string]*HotItem // key => count
+	hotMapLocker sync.Mutex
+	lastHotSize  int
+	hotTicker    *utils.Ticker
 }
 
 func NewFileStorage(policy *serverconfigs.HTTPCachePolicy) *FileStorage {
 	return &FileStorage{
-		policy: policy,
-		list:   NewList(),
+		policy:        policy,
+		writingKeyMap: map[string]zero.Zero{},
+		hotMap:        map[string]*HotItem{},
+		lastHotSize:   -1,
 	}
 }
 
-// 获取当前的Policy
+// Policy 获取当前的Policy
 func (this *FileStorage) Policy() *serverconfigs.HTTPCachePolicy {
 	return this.policy
 }
 
-// 初始化
+// Init 初始化
 func (this *FileStorage) Init() error {
-	this.list.OnAdd(func(item *Item) {
-		atomic.AddInt64(&this.totalSize, item.TotalSize())
-	})
-	this.list.OnRemove(func(item *Item) {
-		atomic.AddInt64(&this.totalSize, -item.TotalSize())
-	})
-
 	this.locker.Lock()
 	defer this.locker.Unlock()
 
 	before := time.Now()
-	cacheDir := ""
-	defer func() {
-		// 统计
-		count := 0
-		size := int64(0)
-		if this.list != nil {
-			stat := this.list.Stat(func(hash string) bool {
-				return true
-			})
-			count = stat.Count
-			size = stat.Size
-		}
-
-		cost := time.Since(before).Seconds() * 1000
-		sizeMB := strconv.FormatInt(size, 10) + " Bytes"
-		if size > 1024*1024*1024 {
-			sizeMB = fmt.Sprintf("%.3f G", float64(size)/1024/1024/1024)
-		} else if size > 1024*1024 {
-			sizeMB = fmt.Sprintf("%.3f M", float64(size)/1024/1024)
-		} else if size > 1024 {
-			sizeMB = fmt.Sprintf("%.3f K", float64(size)/1024)
-		}
-		remotelogs.Println("CACHE", "init policy "+strconv.FormatInt(this.policy.Id, 10)+" from '"+cacheDir+"', cost: "+fmt.Sprintf("%.2f", cost)+" ms, count: "+strconv.Itoa(count)+", size: "+sizeMB)
-	}()
 
 	// 配置
 	cacheConfig := &serverconfigs.HTTPFileCacheStorage{}
@@ -115,7 +99,7 @@ func (this *FileStorage) Init() error {
 		return err
 	}
 	this.cacheConfig = cacheConfig
-	cacheDir = cacheConfig.Dir
+	cacheDir := cacheConfig.Dir
 
 	if !filepath.IsAbs(this.cacheConfig.Dir) {
 		this.cacheConfig.Dir = Tea.Root + Tea.DS + this.cacheConfig.Dir
@@ -127,6 +111,26 @@ func (this *FileStorage) Init() error {
 		return errors.New("[CACHE]cache storage dir can not be empty")
 	}
 
+	list := NewFileList(dir + "/p" + strconv.FormatInt(this.policy.Id, 10))
+	err = list.Init()
+	if err != nil {
+		return err
+	}
+	this.list = list
+	stat, err := list.Stat(func(hash string) bool {
+		return true
+	})
+	if err != nil {
+		return err
+	}
+	this.totalSize = stat.Size
+	this.list.OnAdd(func(item *Item) {
+		atomic.AddInt64(&this.totalSize, item.TotalSize())
+	})
+	this.list.OnRemove(func(item *Item) {
+		atomic.AddInt64(&this.totalSize, -item.TotalSize())
+	})
+
 	// 检查目录是否存在
 	_, err = os.Stat(dir)
 	if err != nil {
@@ -140,6 +144,23 @@ func (this *FileStorage) Init() error {
 		}
 	}
 
+	defer func() {
+		// 统计
+		count := stat.Count
+		size := stat.Size
+
+		cost := time.Since(before).Seconds() * 1000
+		sizeMB := strconv.FormatInt(size, 10) + " Bytes"
+		if size > 1024*1024*1024 {
+			sizeMB = fmt.Sprintf("%.3f G", float64(size)/1024/1024/1024)
+		} else if size > 1024*1024 {
+			sizeMB = fmt.Sprintf("%.3f M", float64(size)/1024/1024)
+		} else if size > 1024 {
+			sizeMB = fmt.Sprintf("%.3f K", float64(size)/1024)
+		}
+		remotelogs.Println("CACHE", "init policy "+strconv.FormatInt(this.policy.Id, 10)+" from '"+cacheDir+"', cost: "+fmt.Sprintf("%.2f", cost)+" ms, count: "+message.NewPrinter(language.English).Sprintf("%d", count)+", size: "+sizeMB)
+	}()
+
 	// 初始化list
 	err = this.initList()
 	if err != nil {
@@ -148,14 +169,13 @@ func (this *FileStorage) Init() error {
 
 	// 加载内存缓存
 	if this.cacheConfig.MemoryPolicy != nil {
-		memoryCapacity := this.cacheConfig.MemoryPolicy.Capacity
-		if memoryCapacity != nil && memoryCapacity.Count > 0 {
+		if this.cacheConfig.MemoryPolicy.Capacity != nil && this.cacheConfig.MemoryPolicy.Capacity.Count > 0 {
 			memoryPolicy := &serverconfigs.HTTPCachePolicy{
 				Id:          this.policy.Id,
 				IsOn:        this.policy.IsOn,
 				Name:        this.policy.Name,
 				Description: this.policy.Description,
-				Capacity:    memoryCapacity,
+				Capacity:    this.cacheConfig.MemoryPolicy.Capacity,
 				MaxKeys:     this.policy.MaxKeys,
 				MaxSize:     &shared.SizeCapacity{Count: 128, Unit: shared.SizeCapacityUnitMB}, // TODO 将来可以修改
 				Type:        serverconfigs.CachePolicyStorageMemory,
@@ -163,12 +183,16 @@ func (this *FileStorage) Init() error {
 				Life:        this.policy.Life,
 				MinLife:     this.policy.MinLife,
 				MaxLife:     this.policy.MaxLife,
+
+				MemoryAutoPurgeCount:    this.policy.MemoryAutoPurgeCount,
+				MemoryAutoPurgeInterval: this.policy.MemoryAutoPurgeInterval,
+				MemoryLFUFreePercent:    this.policy.MemoryLFUFreePercent,
 			}
 			err = memoryPolicy.Init()
 			if err != nil {
 				return err
 			}
-			memoryStorage := NewMemoryStorage(memoryPolicy)
+			memoryStorage := NewMemoryStorage(memoryPolicy, this)
 			err = memoryStorage.Init()
 			if err != nil {
 				return err
@@ -180,21 +204,39 @@ func (this *FileStorage) Init() error {
 	return nil
 }
 
-func (this *FileStorage) OpenReader(key string) (Reader, error) {
+func (this *FileStorage) OpenReader(key string, useStale bool) (Reader, error) {
+	return this.openReader(key, true, useStale)
+}
+
+func (this *FileStorage) openReader(key string, allowMemory bool, useStale bool) (Reader, error) {
+	// 使用陈旧缓存的时候，我们认为是短暂的，只需要从文件里检查即可
+	if useStale {
+		allowMemory = false
+	}
+
 	// 先尝试内存缓存
-	if this.memoryStorage != nil {
-		reader, err := this.memoryStorage.OpenReader(key)
+	if allowMemory && this.memoryStorage != nil {
+		reader, err := this.memoryStorage.OpenReader(key, useStale)
 		if err == nil {
 			return reader, err
 		}
 	}
 
 	hash, path := this.keyPath(key)
-	if !this.list.Exist(hash) {
-		return nil, ErrNotFound
+
+	// 检查文件记录是否已过期
+	if !useStale {
+		exists, err := this.list.Exist(hash)
+		if err != nil {
+			return nil, err
+		}
+		if !exists {
+			return nil, ErrNotFound
+		}
 	}
 
 	// TODO 尝试使用mmap加快读取速度
+	var isOk = false
 	fp, err := os.OpenFile(path, os.O_RDONLY, 0444)
 	if err != nil {
 		if !os.IsNotExist(err) {
@@ -202,6 +244,12 @@ func (this *FileStorage) OpenReader(key string) (Reader, error) {
 		}
 		return nil, ErrNotFound
 	}
+	defer func() {
+		if !isOk {
+			_ = fp.Close()
+			_ = os.Remove(path)
+		}
+	}()
 
 	reader := NewFileReader(fp)
 	if err != nil {
@@ -211,10 +259,51 @@ func (this *FileStorage) OpenReader(key string) (Reader, error) {
 	if err != nil {
 		return nil, err
 	}
+
+	// 增加点击量
+	// 1/1000采样
+	if allowMemory {
+		var rate = this.policy.PersistenceHitSampleRate
+		if rate <= 0 {
+			rate = 1000
+		}
+		if this.lastHotSize == 0 {
+			// 自动降低采样率来增加热点数据的缓存几率
+			rate = rate / 10
+		}
+		if rands.Int(0, rate) == 0 {
+			var hitErr = this.list.IncreaseHit(hash)
+			if hitErr != nil {
+				// 此错误可以忽略
+				remotelogs.Error("CACHE", "increase hit failed: "+hitErr.Error())
+			}
+
+			// 增加到热点
+			// 这里不收录缓存尺寸过大的文件
+			if this.memoryStorage != nil && reader.BodySize() > 0 && reader.BodySize() < 128*1024*1024 {
+				this.hotMapLocker.Lock()
+				hotItem, ok := this.hotMap[key]
+				if ok {
+					hotItem.Hits++
+					hotItem.ExpiresAt = reader.expiresAt
+				} else if len(this.hotMap) < HotItemSize { // 控制数量
+					this.hotMap[key] = &HotItem{
+						Key:       key,
+						ExpiresAt: reader.ExpiresAt(),
+						Status:    reader.Status(),
+						Hits:      1,
+					}
+				}
+				this.hotMapLocker.Unlock()
+			}
+		}
+	}
+
+	isOk = true
 	return reader, nil
 }
 
-// 打开缓存文件等待写入
+// OpenWriter 打开缓存文件等待写入
 func (this *FileStorage) OpenWriter(key string, expiredAt int64, status int) (Writer, error) {
 	// 先尝试内存缓存
 	if this.memoryStorage != nil {
@@ -224,17 +313,41 @@ func (this *FileStorage) OpenWriter(key string, expiredAt int64, status int) (Wr
 		}
 	}
 
-	// 检查是否超出最大值
-	if this.policy.MaxKeys > 0 && this.list.Count() > this.policy.MaxKeys {
-		return nil, errors.New("write file cache failed: too many keys in cache storage")
+	// 是否正在写入
+	var isWriting = false
+	this.locker.Lock()
+	_, ok := this.writingKeyMap[key]
+	this.locker.Unlock()
+	if ok {
+		return nil, ErrFileIsWriting
 	}
-	if this.policy.CapacityBytes() > 0 && this.policy.CapacityBytes() <= this.totalSize {
-		return nil, errors.New("write file cache failed: over disk size, real size: " + strconv.FormatInt(this.totalSize, 10) + " bytes")
+	this.locker.Lock()
+	this.writingKeyMap[key] = zero.New()
+	this.locker.Unlock()
+	defer func() {
+		if !isWriting {
+			this.locker.Lock()
+			delete(this.writingKeyMap, key)
+			this.locker.Unlock()
+		}
+	}()
+
+	// 检查是否超出最大值
+	count, err := this.list.Count()
+	if err != nil {
+		return nil, err
+	}
+	if this.policy.MaxKeys > 0 && count > this.policy.MaxKeys {
+		return nil, NewCapacityError("write file cache failed: too many keys in cache storage")
+	}
+	capacityBytes := this.diskCapacityBytes()
+	if capacityBytes > 0 && capacityBytes <= this.totalSize {
+		return nil, NewCapacityError("write file cache failed: over disk size, current total size: " + strconv.FormatInt(this.totalSize, 10) + " bytes, capacity: " + strconv.FormatInt(capacityBytes, 10))
 	}
 
 	hash := stringutil.Md5(key)
 	dir := this.cacheConfig.Dir + "/p" + strconv.FormatInt(this.policy.Id, 10) + "/" + hash[:2] + "/" + hash[2:4]
-	_, err := os.Stat(dir)
+	_, err = os.Stat(dir)
 	if err != nil {
 		if !os.IsNotExist(err) {
 			return nil, err
@@ -246,13 +359,17 @@ func (this *FileStorage) OpenWriter(key string, expiredAt int64, status int) (Wr
 	}
 
 	// 先删除
-	this.list.Remove(hash)
+	err = this.list.Remove(hash)
+	if err != nil {
+		return nil, err
+	}
 
 	path := dir + "/" + hash + ".cache.tmp"
 	writer, err := os.OpenFile(path, os.O_CREATE|os.O_SYNC|os.O_WRONLY, 0666)
 	if err != nil {
 		return nil, err
 	}
+	isWriting = true
 
 	isOk := false
 	removeOnFailure := true
@@ -337,10 +454,14 @@ func (this *FileStorage) OpenWriter(key string, expiredAt int64, status int) (Wr
 
 	isOk = true
 
-	return NewFileWriter(writer, key, expiredAt), nil
+	return NewFileWriter(writer, key, expiredAt, func() {
+		this.locker.Lock()
+		delete(this.writingKeyMap, key)
+		this.locker.Unlock()
+	}), nil
 }
 
-// 添加到List
+// AddToList 添加到List
 func (this *FileStorage) AddToList(item *Item) {
 	if this.memoryStorage != nil {
 		if item.Type == ItemTypeMemory {
@@ -349,12 +470,15 @@ func (this *FileStorage) AddToList(item *Item) {
 		}
 	}
 
-	item.MetaSize = SizeMeta
+	item.MetaSize = SizeMeta + 128
 	hash := stringutil.Md5(item.Key)
-	this.list.Add(hash, item)
+	err := this.list.Add(hash, item)
+	if err != nil && !strings.Contains(err.Error(), "UNIQUE constraint failed") {
+		remotelogs.Error("CACHE", "add to list failed: "+err.Error())
+	}
 }
 
-// 删除某个键值对应的缓存
+// Delete 删除某个键值对应的缓存
 func (this *FileStorage) Delete(key string) error {
 	this.locker.Lock()
 	defer this.locker.Unlock()
@@ -365,25 +489,28 @@ func (this *FileStorage) Delete(key string) error {
 	}
 
 	hash, path := this.keyPath(key)
-	this.list.Remove(hash)
-	err := os.Remove(path)
+	err := this.list.Remove(hash)
+	if err != nil {
+		return err
+	}
+	err = os.Remove(path)
 	if err == nil || os.IsNotExist(err) {
 		return nil
 	}
 	return err
 }
 
-// 统计
+// Stat 统计
 func (this *FileStorage) Stat() (*Stat, error) {
 	this.locker.RLock()
 	defer this.locker.RUnlock()
 
 	return this.list.Stat(func(hash string) bool {
 		return true
-	}), nil
+	})
 }
 
-// 清除所有的缓存
+// CleanAll 清除所有的缓存
 func (this *FileStorage) CleanAll() error {
 	this.locker.Lock()
 	defer this.locker.Unlock()
@@ -393,7 +520,10 @@ func (this *FileStorage) CleanAll() error {
 		_ = this.memoryStorage.CleanAll()
 	}
 
-	this.list.Reset()
+	err := this.list.CleanAll()
+	if err != nil {
+		return err
+	}
 
 	// 删除缓存和目录
 	// 不能直接删除子目录，比较危险
@@ -415,6 +545,7 @@ func (this *FileStorage) CleanAll() error {
 		return nil
 	}
 
+	// 改成待删除
 	subDirs, err := fp.Readdir(-1)
 	if err != nil {
 		return err
@@ -431,17 +562,26 @@ func (this *FileStorage) CleanAll() error {
 			continue
 		}
 
-		// 删除目录
-		err = os.RemoveAll(dir + "/" + subDir)
+		// 修改目录名
+		tmpDir := dir + "/" + subDir + "-deleted"
+		err = os.Rename(dir+"/"+subDir, tmpDir)
 		if err != nil {
 			return err
 		}
 	}
 
+	// 重新遍历待删除
+	goman.New(func() {
+		err = this.cleanDeletedDirs(dir)
+		if err != nil {
+			remotelogs.Warn("CACHE", "delete '*-deleted' dirs failed: "+err.Error())
+		}
+	})
+
 	return nil
 }
 
-// 清理过期的缓存
+// Purge 清理过期的缓存
 func (this *FileStorage) Purge(keys []string, urlType string) error {
 	this.locker.Lock()
 	defer this.locker.Unlock()
@@ -453,34 +593,30 @@ func (this *FileStorage) Purge(keys []string, urlType string) error {
 
 	// 目录
 	if urlType == "dir" {
-		resultKeys := []string{}
 		for _, key := range keys {
-			resultKeys = append(resultKeys, this.list.FindKeysWithPrefix(key)...)
+			err := this.list.CleanPrefix(key)
+			if err != nil {
+				return err
+			}
 		}
-		keys = resultKeys
 	}
 
 	// 文件
 	for _, key := range keys {
 		hash, path := this.keyPath(key)
-		if !this.list.Exist(hash) {
-			err := os.Remove(path)
-			if err != nil && !os.IsNotExist(err) {
-				return err
-			}
-			continue
-		}
-
 		err := os.Remove(path)
 		if err != nil && !os.IsNotExist(err) {
 			return err
 		}
-		this.list.Remove(hash)
+		err = this.list.Remove(hash)
+		if err != nil {
+			return err
+		}
 	}
 	return nil
 }
 
-// 停止
+// Stop 停止
 func (this *FileStorage) Stop() {
 	this.locker.Lock()
 	defer this.locker.Unlock()
@@ -490,10 +626,28 @@ func (this *FileStorage) Stop() {
 		this.memoryStorage.Stop()
 	}
 
-	this.list.Reset()
-	if this.ticker != nil {
-		this.ticker.Stop()
+	_ = this.list.Reset()
+	if this.purgeTicker != nil {
+		this.purgeTicker.Stop()
 	}
+	if this.hotTicker != nil {
+		this.hotTicker.Stop()
+	}
+
+	_ = this.list.Close()
+}
+
+// TotalDiskSize 消耗的磁盘尺寸
+func (this *FileStorage) TotalDiskSize() int64 {
+	return atomic.LoadInt64(&this.totalSize)
+}
+
+// TotalMemorySize 内存尺寸
+func (this *FileStorage) TotalMemorySize() int64 {
+	if this.memoryStorage == nil {
+		return 0
+	}
+	return this.memoryStorage.TotalMemorySize()
 }
 
 // 绝对路径
@@ -521,60 +675,55 @@ func (this *FileStorage) hashPath(hash string) (path string) {
 
 // 初始化List
 func (this *FileStorage) initList() error {
-	this.list.Reset()
-
-	dir := this.dir()
-
-	// 清除tmp
-	files, err := filepath.Glob(dir + "/*/*/*.cache.tmp")
+	err := this.list.Reset()
 	if err != nil {
 		return err
 	}
-	for _, path := range files {
-		_ = os.Remove(path)
-	}
 
-	// 加载缓存
-	files, err = filepath.Glob(dir + "/*/*/*.cache")
-	if err != nil {
-		return err
-	}
-	for _, path := range files {
-		basename := filepath.Base(path)
-		index := strings.LastIndex(basename, ".")
-		if index < 0 {
-			continue
-		}
-		hash := basename[:index]
+	// 使用异步防止阻塞主线程
+	/**goman.New(func() {
+		dir := this.dir()
 
-		// 解析文件信息
-		item, err := this.decodeFile(path)
-		if err != nil {
-			if err != ErrNotFound {
-				remotelogs.Error("CACHE", "decode path '"+path+"': "+err.Error())
-			}
-			continue
-		}
-		if item == nil {
-			continue
-		}
-		this.list.Add(hash, item)
-	}
+		// 清除tmp
+		// TODO 需要一个更加高效的实现
+	})**/
 
 	// 启动定时清理任务
-	this.ticker = utils.NewTicker(30 * time.Second)
+	var autoPurgeInterval = this.policy.PersistenceAutoPurgeInterval
+	if autoPurgeInterval <= 0 {
+		autoPurgeInterval = 30
+		if Tea.IsTesting() {
+			autoPurgeInterval = 10
+		}
+	}
+	this.purgeTicker = utils.NewTicker(time.Duration(autoPurgeInterval) * time.Second)
 	events.On(events.EventQuit, func() {
 		remotelogs.Println("CACHE", "quit clean timer")
-		var ticker = this.ticker
+		var ticker = this.purgeTicker
 		if ticker != nil {
 			ticker.Stop()
 		}
 	})
-	go func() {
-		for this.ticker.Next() {
-			this.purgeLoop()
+	goman.New(func() {
+		for this.purgeTicker.Next() {
+			trackers.Run("FILE_CACHE_STORAGE_PURGE_LOOP", func() {
+				this.purgeLoop()
+			})
 		}
-	}()
+	})
+
+	// 热点处理任务
+	this.hotTicker = utils.NewTicker(1 * time.Minute)
+	if Tea.IsTesting() {
+		this.hotTicker = utils.NewTicker(10 * time.Second)
+	}
+	goman.New(func() {
+		for this.hotTicker.Next() {
+			trackers.Run("FILE_CACHE_STORAGE_HOT_LOOP", func() {
+				this.hotLoop()
+			})
+		}
+	})
 
 	return nil
 }
@@ -654,9 +803,9 @@ func (this *FileStorage) decodeFile(path string) (*Item, error) {
 
 	// URL
 	if urlSize > 0 {
-		data := utils.BytePool1024.Get()
+		data := utils.BytePool1k.Get()
 		result, ok, err := this.readN(fp, data, int(urlSize))
-		utils.BytePool1024.Put(data)
+		utils.BytePool1k.Put(data)
 		if err != nil {
 			return nil, err
 		}
@@ -673,13 +822,185 @@ func (this *FileStorage) decodeFile(path string) (*Item, error) {
 
 // 清理任务
 func (this *FileStorage) purgeLoop() {
-	this.list.Purge(1000, func(hash string) {
-		path := this.hashPath(hash)
-		err := os.Remove(path)
-		if err != nil && !os.IsNotExist(err) {
-			remotelogs.Error("CACHE", "purge '"+path+"' error: "+err.Error())
+	// 计算是否应该开启LFU清理
+	var capacityBytes = this.policy.CapacityBytes()
+	var startLFU = false
+	var usedPercent = float32(this.TotalDiskSize()*100) / float32(capacityBytes)
+	var lfuFreePercent = this.policy.PersistenceLFUFreePercent
+	if lfuFreePercent <= 0 {
+		lfuFreePercent = 5
+	}
+	if capacityBytes > 0 {
+		if lfuFreePercent < 100 {
+			if usedPercent >= 100-lfuFreePercent {
+				startLFU = true
+			}
 		}
-	})
+	}
+
+	// 清理过期
+	{
+		var times = 1
+
+		// 空闲时间多清理
+		if utils.SharedFreeHoursManager.IsFreeHour() {
+			times = 5
+		}
+
+		// 处于LFU阈值时，多清理
+		if startLFU {
+			times = 5
+		}
+
+		var purgeCount = this.policy.PersistenceAutoPurgeCount
+		if purgeCount <= 0 {
+			purgeCount = 1000
+		}
+		for i := 0; i < times; i++ {
+			countFound, err := this.list.Purge(purgeCount, func(hash string) error {
+				path := this.hashPath(hash)
+				err := os.Remove(path)
+				if err != nil && !os.IsNotExist(err) {
+					remotelogs.Error("CACHE", "purge '"+path+"' error: "+err.Error())
+				}
+				return nil
+			})
+			if err != nil {
+				remotelogs.Warn("CACHE", "purge file storage failed: "+err.Error())
+				continue
+			}
+
+			if countFound < purgeCount {
+				break
+			}
+
+			time.Sleep(1 * time.Second)
+		}
+	}
+
+	// 磁盘空间不足时，清除老旧的缓存
+	if startLFU {
+		var total, _ = this.list.Count()
+		if total > 0 {
+			var count = types.Int(math.Ceil(float64(total) * float64(lfuFreePercent*2) / 100))
+			if count > 0 {
+				// 限制单次清理的条数，防止占用太多系统资源
+				if count > 2000 {
+					count = 2000
+				}
+
+				remotelogs.Println("CACHE", "LFU purge policy '"+this.policy.Name+"' id: "+types.String(this.policy.Id)+", count: "+types.String(count))
+				err := this.list.PurgeLFU(count, func(hash string) error {
+					path := this.hashPath(hash)
+					err := os.Remove(path)
+					if err != nil && !os.IsNotExist(err) {
+						remotelogs.Error("CACHE", "purge '"+path+"' error: "+err.Error())
+					}
+					return nil
+				})
+				if err != nil {
+					remotelogs.Warn("CACHE", "purge file storage in LFU failed: "+err.Error())
+				}
+			}
+		}
+	}
+}
+
+// 热点数据任务
+func (this *FileStorage) hotLoop() {
+	var memoryStorage = this.memoryStorage
+	if memoryStorage == nil {
+		return
+	}
+
+	this.hotMapLocker.Lock()
+	if len(this.hotMap) == 0 {
+		this.hotMapLocker.Unlock()
+		this.lastHotSize = 0
+		return
+	}
+
+	this.lastHotSize = len(this.hotMap)
+
+	var result = []*HotItem{} // [ {key: ..., hits: ...}, ... ]
+	for _, v := range this.hotMap {
+		result = append(result, v)
+	}
+
+	this.hotMap = map[string]*HotItem{}
+	this.hotMapLocker.Unlock()
+
+	// 取Top10写入内存
+	if len(result) > 0 {
+		sort.Slice(result, func(i, j int) bool {
+			return result[i].Hits > result[j].Hits
+		})
+		var size = 1
+		if len(result) < 10 {
+			size = 1
+		} else {
+			size = len(result) / 10
+		}
+
+		var buf = utils.BytePool16k.Get()
+		defer utils.BytePool16k.Put(buf)
+		for _, item := range result[:size] {
+			reader, err := this.openReader(item.Key, false, false)
+			if err != nil {
+				continue
+			}
+			if reader == nil {
+				continue
+			}
+			if reader.ExpiresAt() <= time.Now().Unix() {
+				continue
+			}
+
+			writer, err := this.memoryStorage.openWriter(item.Key, item.ExpiresAt, item.Status, false)
+			if err != nil {
+				if !CanIgnoreErr(err) {
+					remotelogs.Error("CACHE", "transfer hot item failed: "+err.Error())
+				}
+				_ = reader.Close()
+				continue
+			}
+			if writer == nil {
+				_ = reader.Close()
+				continue
+			}
+
+			err = reader.ReadHeader(buf, func(n int) (goNext bool, err error) {
+				_, err = writer.WriteHeader(buf[:n])
+				return
+			})
+			if err != nil {
+				_ = reader.Close()
+				_ = writer.Discard()
+				continue
+			}
+
+			err = reader.ReadBody(buf, func(n int) (goNext bool, err error) {
+				_, err = writer.Write(buf[:n])
+				return
+			})
+			if err != nil {
+				_ = reader.Close()
+				_ = writer.Discard()
+				continue
+			}
+
+			this.memoryStorage.AddToList(&Item{
+				Type:       writer.ItemType(),
+				Key:        item.Key,
+				ExpiredAt:  item.ExpiresAt,
+				HeaderSize: writer.HeaderSize(),
+				BodySize:   writer.BodySize(),
+			})
+
+			_ = reader.Close()
+			_ = writer.Close()
+		}
+	}
 }
 
 func (this *FileStorage) readToBuff(fp *os.File, buf []byte) (ok bool, err error) {
@@ -709,3 +1030,45 @@ func (this *FileStorage) readN(fp *os.File, buf []byte, total int) (result []byt
 		}
 	}
 }
+
+func (this *FileStorage) diskCapacityBytes() int64 {
+	c1 := this.policy.CapacityBytes()
+	if SharedManager.MaxDiskCapacity != nil {
+		c2 := SharedManager.MaxDiskCapacity.Bytes()
+		if c2 > 0 {
+			return c2
+		}
+	}
+	return c1
+}
+
+// 清理 *-deleted 目录
+// 由于在很多硬盘上耗时非常久，所以应该放在后台运行
+func (this *FileStorage) cleanDeletedDirs(dir string) error {
+	fp, err := os.Open(dir)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		_ = fp.Close()
+	}()
+	subDirs, err := fp.Readdir(-1)
+	if err != nil {
+		return err
+	}
+	for _, info := range subDirs {
+		subDir := info.Name()
+		if !strings.HasSuffix(subDir, "-deleted") {
+			continue
+		}
+
+		// 删除
+		err = os.RemoveAll(dir + "/" + subDir)
+		if err != nil {
+			if !os.IsNotExist(err) {
+				return err
+			}
+		}
+	}
+	return nil
+}

internal/caches/storage_file_test.go

@@ -40,7 +40,7 @@ func TestFileStorage_Init(t *testing.T) {
 
 	time.Sleep(2 * time.Second)
 	storage.purgeLoop()
-	t.Log(len(storage.list.m), "entries left")
+	t.Log(storage.list.(*FileList).total, "entries left")
 }
 
 func TestFileStorage_OpenWriter(t *testing.T) {
@@ -441,14 +441,16 @@ func TestFileStorage_CleanAll(t *testing.T) {
 		t.Log(time.Since(before).Seconds()*1000, "ms")
 	}()
 
-	t.Log("before:", storage.list.m)
+	c, _ := storage.list.Count()
+	t.Log("before:", c)
 
 	err = storage.CleanAll()
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	t.Log("after:", storage.list.m)
+	c, _ = storage.list.Count()
+	t.Log("after:", c)
 	t.Log("ok")
 }
 
@@ -515,3 +517,16 @@ func BenchmarkFileStorage_Read(b *testing.B) {
 		_ = reader.Close()
 	}
 }
+
+func BenchmarkFileStorage_KeyPath(b *testing.B) {
+	runtime.GOMAXPROCS(1)
+
+	var storage = &FileStorage{
+		cacheConfig: &serverconfigs.HTTPFileCacheStorage{},
+		policy:      &serverconfigs.HTTPCachePolicy{Id: 1},
+	}
+
+	for i := 0; i < b.N; i++ {
+		_, _ = storage.keyPath(strconv.Itoa(i))
+	}
+}

internal/caches/storage_interface.go

@@ -4,35 +4,41 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 )
 
-// 缓存存储接口
+// StorageInterface 缓存存储接口
 type StorageInterface interface {
-	// 初始化
+	// Init 初始化
 	Init() error
 
-	// 读取缓存
-	OpenReader(key string) (Reader, error)
+	// OpenReader 读取缓存
+	OpenReader(key string, useStale bool) (reader Reader, err error)
 
-	// 打开缓存写入器等待写入
+	// OpenWriter 打开缓存写入器等待写入
 	OpenWriter(key string, expiredAt int64, status int) (Writer, error)
 
-	// 删除某个键值对应的缓存
+	// Delete 删除某个键值对应的缓存
 	Delete(key string) error
 
-	// 统计缓存
+	// Stat 统计缓存
 	Stat() (*Stat, error)
 
-	// 清除所有缓存
+	// TotalDiskSize 消耗的磁盘尺寸
+	TotalDiskSize() int64
+
+	// TotalMemorySize 内存尺寸
+	TotalMemorySize() int64
+
+	// CleanAll 清除所有缓存
 	CleanAll() error
 
-	// 批量删除缓存
+	// Purge 批量删除缓存
 	Purge(keys []string, urlType string) error
 
-	// 停止缓存策略
+	// Stop 停止缓存策略
 	Stop()
 
-	// 获取当前存储的Policy
+	// Policy 获取当前存储的Policy
 	Policy() *serverconfigs.HTTPCachePolicy
 
-	// 将缓存添加到列表
+	// AddToList 将缓存添加到列表
 	AddToList(item *Item)
 }

internal/caches/storage_memory.go

@@ -3,9 +3,16 @@ package caches
 import (
 	"fmt"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
-	"github.com/TeaOSLab/EdgeNode/internal/errors"
+	"github.com/TeaOSLab/EdgeNode/internal/goman"
+	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
+	"github.com/TeaOSLab/EdgeNode/internal/trackers"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"github.com/TeaOSLab/EdgeNode/internal/zero"
 	"github.com/cespare/xxhash"
+	"github.com/iwind/TeaGo/rands"
+	"github.com/iwind/TeaGo/types"
+	"math"
+	"runtime"
 	"strconv"
 	"sync"
 	"sync/atomic"
@@ -18,135 +25,221 @@ type MemoryItem struct {
 	BodyValue   []byte
 	Status      int
 	IsDone      bool
+	ModifiedAt  int64
+}
+
+func (this *MemoryItem) IsExpired() bool {
+	return this.ExpiredAt < utils.UnixTime()
 }
 
 type MemoryStorage struct {
-	policy        *serverconfigs.HTTPCachePolicy
-	list          *List
-	locker        *sync.RWMutex
-	valuesMap     map[uint64]*MemoryItem
-	ticker        *utils.Ticker
-	purgeDuration time.Duration
+	parentStorage StorageInterface
+
+	policy *serverconfigs.HTTPCachePolicy
+	list   ListInterface
+	locker *sync.RWMutex
+
+	valuesMap map[uint64]*MemoryItem // hash => item
+	dirtyChan chan string            // hash chan
+
+	purgeTicker *utils.Ticker
+
 	totalSize     int64
+	writingKeyMap map[string]zero.Zero // key => bool
 }
 
-func NewMemoryStorage(policy *serverconfigs.HTTPCachePolicy) *MemoryStorage {
+func NewMemoryStorage(policy *serverconfigs.HTTPCachePolicy, parentStorage StorageInterface) *MemoryStorage {
+	var dirtyChan chan string
+	if parentStorage != nil {
+		var queueSize = policy.MemoryAutoFlushQueueSize
+		if queueSize <= 0 {
+			queueSize = 2048
+		}
+		dirtyChan = make(chan string, queueSize)
+	}
 	return &MemoryStorage{
-		policy:    policy,
-		list:      NewList(),
-		locker:    &sync.RWMutex{},
-		valuesMap: map[uint64]*MemoryItem{},
+		parentStorage: parentStorage,
+		policy:        policy,
+		list:          NewMemoryList(),
+		locker:        &sync.RWMutex{},
+		valuesMap:     map[uint64]*MemoryItem{},
+		dirtyChan:     dirtyChan,
+		writingKeyMap: map[string]zero.Zero{},
 	}
 }
 
-// 初始化
+// Init 初始化
 func (this *MemoryStorage) Init() error {
+	_ = this.list.Init()
+
 	this.list.OnAdd(func(item *Item) {
-		atomic.AddInt64(&this.totalSize, item.Size())
+		atomic.AddInt64(&this.totalSize, item.TotalSize())
 	})
 	this.list.OnRemove(func(item *Item) {
-		atomic.AddInt64(&this.totalSize, -item.Size())
+		atomic.AddInt64(&this.totalSize, -item.TotalSize())
 	})
 
-	if this.purgeDuration <= 0 {
-		this.purgeDuration = 30 * time.Second
+	var autoPurgeInterval = this.policy.MemoryAutoPurgeInterval
+	if autoPurgeInterval <= 0 {
+		autoPurgeInterval = 5
 	}
 
 	// 启动定时清理任务
-	this.ticker = utils.NewTicker(this.purgeDuration)
-	go func() {
-		for this.ticker.Next() {
+	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() {
+		for hash := range this.dirtyChan {
+			this.flushItem(hash)
+		}
+	})
 
 	return nil
 }
 
-// 读取缓存
-func (this *MemoryStorage) OpenReader(key string) (Reader, error) {
+// OpenReader 读取缓存
+func (this *MemoryStorage) OpenReader(key string, useStale bool) (Reader, error) {
 	hash := this.hash(key)
 
 	this.locker.RLock()
-	defer this.locker.RUnlock()
-
 	item := this.valuesMap[hash]
 	if item == nil || !item.IsDone {
+		this.locker.RUnlock()
 		return nil, ErrNotFound
 	}
 
-	if item.ExpiredAt > utils.UnixTime() {
+	if useStale || (item.ExpiredAt > utils.UnixTime()) {
 		reader := NewMemoryReader(item)
 		err := reader.Init()
 		if err != nil {
+			this.locker.RUnlock()
 			return nil, err
 		}
+		this.locker.RUnlock()
+
+		// 增加点击量
+		// 1/1000采样
+		// TODO 考虑是否在缓存策略里设置
+		if rands.Int(0, 1000) == 0 {
+			var hitErr = this.list.IncreaseHit(types.String(hash))
+			if hitErr != nil {
+				// 此错误可以忽略
+				remotelogs.Error("CACHE", "increase hit failed: "+hitErr.Error())
+			}
+		}
+
 		return reader, nil
 	}
+	this.locker.RUnlock()
 
 	_ = this.Delete(key)
 
 	return nil, ErrNotFound
 }
 
-// 打开缓存写入器等待写入
+// OpenWriter 打开缓存写入器等待写入
 func (this *MemoryStorage) OpenWriter(key string, expiredAt int64, status int) (Writer, error) {
-	// 检查是否超出最大值
-	if this.policy.MaxKeys > 0 && this.list.Count() > this.policy.MaxKeys {
-		return nil, errors.New("write memory cache failed: too many keys in cache storage")
+	return this.openWriter(key, expiredAt, status, true)
+}
+
+func (this *MemoryStorage) openWriter(key string, expiredAt int64, status int, isDirty bool) (Writer, error) {
+	this.locker.Lock()
+	defer this.locker.Unlock()
+
+	// 是否正在写入
+	var isWriting = false
+	_, ok := this.writingKeyMap[key]
+	if ok {
+		return nil, ErrFileIsWriting
 	}
-	if this.policy.CapacityBytes() > 0 && this.policy.CapacityBytes() <= this.totalSize {
-		return nil, errors.New("write memory cache failed: over memory size, real size: " + strconv.FormatInt(this.totalSize, 10) + " bytes")
+	this.writingKeyMap[key] = zero.New()
+	defer func() {
+		if !isWriting {
+			delete(this.writingKeyMap, key)
+		}
+	}()
+
+	// 检查是否过期
+	hash := this.hash(key)
+	item, ok := this.valuesMap[hash]
+	if ok && !item.IsExpired() {
+		return nil, ErrFileIsWriting
+	}
+
+	// 检查是否超出最大值
+	totalKeys, err := this.list.Count()
+	if err != nil {
+		return nil, err
+	}
+	if this.policy.MaxKeys > 0 && totalKeys > this.policy.MaxKeys {
+		return nil, NewCapacityError("write memory cache failed: too many keys in cache storage")
+	}
+	capacityBytes := this.memoryCapacityBytes()
+	if capacityBytes > 0 && capacityBytes <= this.totalSize {
+		return nil, NewCapacityError("write memory cache failed: over memory size: " + strconv.FormatInt(capacityBytes, 10) + ", current size: " + strconv.FormatInt(this.totalSize, 10) + " bytes")
 	}
 
 	// 先删除
-	err := this.Delete(key)
+	err = this.deleteWithoutLocker(key)
 	if err != nil {
 		return nil, err
 	}
 
-	return NewMemoryWriter(this.valuesMap, key, expiredAt, status, this.locker), nil
+	isWriting = true
+	return NewMemoryWriter(this, key, expiredAt, status, isDirty, func() {
+		this.locker.Lock()
+		delete(this.writingKeyMap, key)
+		this.locker.Unlock()
+	}), nil
 }
 
-// 删除某个键值对应的缓存
+// Delete 删除某个键值对应的缓存
 func (this *MemoryStorage) Delete(key string) error {
 	hash := this.hash(key)
 	this.locker.Lock()
 	delete(this.valuesMap, hash)
-	this.list.Remove(fmt.Sprintf("%d", hash))
+	_ = this.list.Remove(fmt.Sprintf("%d", hash))
 	this.locker.Unlock()
 	return nil
 }
 
-// 统计缓存
+// Stat 统计缓存
 func (this *MemoryStorage) Stat() (*Stat, error) {
 	this.locker.RLock()
 	defer this.locker.RUnlock()
 
 	return this.list.Stat(func(hash string) bool {
 		return true
-	}), nil
+	})
 }
 
-// 清除所有缓存
+// CleanAll 清除所有缓存
 func (this *MemoryStorage) CleanAll() error {
 	this.locker.Lock()
 	this.valuesMap = map[uint64]*MemoryItem{}
-	this.list.Reset()
+	_ = this.list.Reset()
 	atomic.StoreInt64(&this.totalSize, 0)
 	this.locker.Unlock()
 	return nil
 }
 
-// 批量删除缓存
+// Purge 批量删除缓存
 func (this *MemoryStorage) Purge(keys []string, urlType string) error {
 	// 目录
 	if urlType == "dir" {
-		resultKeys := []string{}
 		for _, key := range keys {
-			resultKeys = append(resultKeys, this.list.FindKeysWithPrefix(key)...)
+			err := this.list.CleanPrefix(key)
+			if err != nil {
+				return err
+			}
 		}
-		keys = resultKeys
 	}
 
 	for _, key := range keys {
@@ -158,28 +251,51 @@ func (this *MemoryStorage) Purge(keys []string, urlType string) error {
 	return nil
 }
 
-// 停止缓存策略
+// Stop 停止缓存策略
 func (this *MemoryStorage) Stop() {
 	this.locker.Lock()
-	defer this.locker.Unlock()
 
 	this.valuesMap = map[uint64]*MemoryItem{}
-	this.list.Reset()
-	if this.ticker != nil {
-		this.ticker.Stop()
+	this.writingKeyMap = map[string]zero.Zero{}
+	_ = this.list.Reset()
+	if this.purgeTicker != nil {
+		this.purgeTicker.Stop()
 	}
+
+	if this.parentStorage != nil && this.dirtyChan != nil {
+		close(this.dirtyChan)
+	}
+
+	_ = this.list.Close()
+
+	this.locker.Unlock()
+
+	// 回收内存
+	runtime.GC()
+
+	remotelogs.Println("CACHE", "close memory storage '"+strconv.FormatInt(this.policy.Id, 10)+"'")
 }
 
-// 获取当前存储的Policy
+// Policy 获取当前存储的Policy
 func (this *MemoryStorage) Policy() *serverconfigs.HTTPCachePolicy {
 	return this.policy
 }
 
-// 将缓存添加到列表
+// AddToList 将缓存添加到列表
 func (this *MemoryStorage) AddToList(item *Item) {
-	item.MetaSize = int64(len(item.Key)) + 32 /** 32是我们评估的数据结构的长度 **/
+	item.MetaSize = int64(len(item.Key)) + 128 /** 128是我们评估的数据结构的长度 **/
 	hash := fmt.Sprintf("%d", this.hash(item.Key))
-	this.list.Add(hash, item)
+	_ = this.list.Add(hash, item)
+}
+
+// TotalDiskSize 消耗的磁盘尺寸
+func (this *MemoryStorage) TotalDiskSize() int64 {
+	return 0
+}
+
+// TotalMemorySize 内存尺寸
+func (this *MemoryStorage) TotalMemorySize() int64 {
+	return atomic.LoadInt64(&this.totalSize)
 }
 
 // 计算Key Hash
@@ -189,12 +305,144 @@ func (this *MemoryStorage) hash(key string) uint64 {
 
 // 清理任务
 func (this *MemoryStorage) purgeLoop() {
-	this.list.Purge(2048, func(hash string) {
+	// 计算是否应该开启LFU清理
+	var capacityBytes = this.policy.CapacityBytes()
+	var startLFU = false
+	var usedPercent = float32(this.TotalMemorySize()*100) / float32(capacityBytes)
+	var lfuFreePercent = this.policy.MemoryLFUFreePercent
+	if lfuFreePercent <= 0 {
+		lfuFreePercent = 5
+	}
+	if capacityBytes > 0 {
+		if lfuFreePercent < 100 {
+			if usedPercent >= 100-lfuFreePercent {
+				startLFU = true
+			}
+		}
+	}
+
+	// 清理过期
+	var purgeCount = this.policy.MemoryAutoPurgeCount
+	if purgeCount <= 0 {
+		purgeCount = 2000
+	}
+	_, _ = this.list.Purge(purgeCount, func(hash string) error {
 		uintHash, err := strconv.ParseUint(hash, 10, 64)
 		if err == nil {
 			this.locker.Lock()
 			delete(this.valuesMap, uintHash)
 			this.locker.Unlock()
 		}
+		return nil
 	})
+
+	// LFU
+	if startLFU {
+		var total, _ = this.list.Count()
+		if total > 0 {
+			var count = types.Int(math.Ceil(float64(total) * float64(lfuFreePercent*2) / 100))
+			if count > 0 {
+				// 限制单次清理的条数，防止占用太多系统资源
+				if count > 2000 {
+					count = 2000
+				}
+
+				// 这里不提示LFU，因为此事件将会非常频繁
+
+				err := this.list.PurgeLFU(count, func(hash string) error {
+					uintHash, err := strconv.ParseUint(hash, 10, 64)
+					if err == nil {
+						this.locker.Lock()
+						delete(this.valuesMap, uintHash)
+						this.locker.Unlock()
+					}
+					return nil
+				})
+				if err != nil {
+					remotelogs.Warn("CACHE", "purge memory storage in LFU failed: "+err.Error())
+				}
+			}
+		}
+	}
+}
+
+// Flush任务
+func (this *MemoryStorage) flushItem(key string) {
+	if this.parentStorage == nil {
+		return
+	}
+	var hash = this.hash(key)
+
+	this.locker.RLock()
+	item, ok := this.valuesMap[hash]
+	this.locker.RUnlock()
+
+	if !ok {
+		return
+	}
+	if !item.IsDone || item.IsExpired() {
+		return
+	}
+
+	writer, err := this.parentStorage.OpenWriter(key, item.ExpiredAt, item.Status)
+	if err != nil {
+		if !CanIgnoreErr(err) {
+			remotelogs.Error("CACHE", "flush items failed: open writer failed: "+err.Error())
+		}
+		return
+	}
+
+	_, err = writer.WriteHeader(item.HeaderValue)
+	if err != nil {
+		_ = writer.Discard()
+		remotelogs.Error("CACHE", "flush items failed: write header failed: "+err.Error())
+		return
+	}
+
+	_, err = writer.Write(item.BodyValue)
+	if err != nil {
+		_ = writer.Discard()
+		remotelogs.Error("CACHE", "flush items failed: writer body failed: "+err.Error())
+		return
+	}
+
+	err = writer.Close()
+	if err != nil {
+		_ = writer.Discard()
+		remotelogs.Error("CACHE", "flush items failed: close writer failed: "+err.Error())
+	}
+
+	this.parentStorage.AddToList(&Item{
+		Type:       writer.ItemType(),
+		Key:        key,
+		ExpiredAt:  item.ExpiredAt,
+		HeaderSize: writer.HeaderSize(),
+		BodySize:   writer.BodySize(),
+	})
+
+	return
+}
+
+func (this *MemoryStorage) memoryCapacityBytes() int64 {
+	if this.policy == nil {
+		return 0
+	}
+	c1 := int64(0)
+	if this.policy.Capacity != nil {
+		c1 = this.policy.Capacity.Bytes()
+	}
+	if SharedManager.MaxMemoryCapacity != nil {
+		c2 := SharedManager.MaxMemoryCapacity.Bytes()
+		if c2 > 0 {
+			return c2
+		}
+	}
+	return c1
+}
+
+func (this *MemoryStorage) deleteWithoutLocker(key string) error {
+	hash := this.hash(key)
+	delete(this.valuesMap, hash)
+	_ = this.list.Remove(fmt.Sprintf("%d", hash))
+	return nil
 }

internal/caches/storage_memory_test.go

@@ -1,16 +1,19 @@
 package caches
 
 import (
+	"bytes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/rands"
+	"runtime"
+	"runtime/debug"
 	"strconv"
 	"testing"
 	"time"
 )
 
 func TestMemoryStorage_OpenWriter(t *testing.T) {
-	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{})
+	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{}, nil)
 
 	writer, err := storage.OpenWriter("abc", time.Now().Unix()+60, 200)
 	if err != nil {
@@ -84,8 +87,21 @@ func TestMemoryStorage_OpenWriter(t *testing.T) {
 	}
 }
 
+func TestMemoryStorage_OpenReaderLock(t *testing.T) {
+	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{}, nil)
+	_ = storage.Init()
+
+	var h = storage.hash("test")
+	storage.valuesMap = map[uint64]*MemoryItem{
+		h: {
+			IsDone: true,
+		},
+	}
+	_, _ = storage.OpenReader("test")
+}
+
 func TestMemoryStorage_Delete(t *testing.T) {
-	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{})
+	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{}, nil)
 	{
 		writer, err := storage.OpenWriter("abc", time.Now().Unix()+60, 200)
 		if err != nil {
@@ -107,7 +123,7 @@ func TestMemoryStorage_Delete(t *testing.T) {
 }
 
 func TestMemoryStorage_Stat(t *testing.T) {
-	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{})
+	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{}, nil)
 	expiredAt := time.Now().Unix() + 60
 	{
 		writer, err := storage.OpenWriter("abc", expiredAt, 200)
@@ -144,7 +160,7 @@ func TestMemoryStorage_Stat(t *testing.T) {
 }
 
 func TestMemoryStorage_CleanAll(t *testing.T) {
-	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{})
+	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{}, nil)
 	expiredAt := time.Now().Unix() + 60
 	{
 		writer, err := storage.OpenWriter("abc", expiredAt, 200)
@@ -174,11 +190,12 @@ func TestMemoryStorage_CleanAll(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	t.Log(storage.list.Count(), len(storage.valuesMap))
+	total, _ := storage.list.Count()
+	t.Log(total, len(storage.valuesMap))
 }
 
 func TestMemoryStorage_Purge(t *testing.T) {
-	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{})
+	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{}, nil)
 	expiredAt := time.Now().Unix() + 60
 	{
 		writer, err := storage.OpenWriter("abc", expiredAt, 200)
@@ -208,12 +225,14 @@ func TestMemoryStorage_Purge(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	t.Log(storage.list.Count(), len(storage.valuesMap))
+	total, _ := storage.list.Count()
+	t.Log(total, len(storage.valuesMap))
 }
 
 func TestMemoryStorage_Expire(t *testing.T) {
-	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{})
-	storage.purgeDuration = 5 * time.Second
+	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{
+		MemoryAutoPurgeInterval: 5,
+	}, nil)
 	err := storage.Init()
 	if err != nil {
 		t.Fatal(err)
@@ -235,3 +254,53 @@ func TestMemoryStorage_Expire(t *testing.T) {
 	}
 	time.Sleep(70 * time.Second)
 }
+
+func TestMemoryStorage_Locker(t *testing.T) {
+	storage := NewMemoryStorage(&serverconfigs.HTTPCachePolicy{}, nil)
+	err := storage.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+	storage.locker.Lock()
+	err = storage.deleteWithoutLocker("a")
+	storage.locker.Unlock()
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}
+
+func TestMemoryStorage_Stop(t *testing.T) {
+	var stat1 = &runtime.MemStats{}
+	runtime.ReadMemStats(stat1)
+
+	var m = map[uint64]*MemoryItem{}
+	for i := 0; i < 1_000_000; i++ {
+		m[uint64(i)] = &MemoryItem{
+			HeaderValue: []byte("Hello, World"),
+			BodyValue:   bytes.Repeat([]byte("Hello"), 1024),
+		}
+	}
+
+	m = map[uint64]*MemoryItem{}
+
+	var before = time.Now()
+	//runtime.GC()
+	debug.FreeOSMemory()
+	/**go func() {
+		time.Sleep(10 * time.Second)
+		runtime.GC()
+	}()**/
+	t.Log(time.Since(before).Seconds()*1000, "ms")
+
+	var stat2 = &runtime.MemStats{}
+	runtime.ReadMemStats(stat2)
+
+	if stat2.HeapInuse > stat1.HeapInuse {
+		t.Log(stat2.HeapInuse, stat1.HeapInuse, (stat2.HeapInuse-stat1.HeapInuse)/1024/1024, "MB")
+	} else {
+		t.Log("0 MB")
+	}
+
+	t.Log(len(m))
+}

internal/caches/writer.go

@@ -1,31 +1,31 @@
 package caches
 
-// 缓存内容写入接口
+// Writer 缓存内容写入接口
 type Writer interface {
-	// 写入Header数据
+	// WriteHeader 写入Header数据
 	WriteHeader(data []byte) (n int, err error)
 
-	// 写入Body数据
+	// Write 写入Body数据
 	Write(data []byte) (n int, err error)
 
-	// 写入的Header数据大小
+	// HeaderSize 写入的Header数据大小
 	HeaderSize() int64
 
-	// 写入的Body数据大小
+	// BodySize 写入的Body数据大小
 	BodySize() int64
 
-	// 关闭
+	// Close 关闭
 	Close() error
 
-	// 丢弃
+	// Discard 丢弃
 	Discard() error
 
-	// Key
+	// Key Key
 	Key() string
 
-	// 过期时间
+	// ExpiredAt 过期时间
 	ExpiredAt() int64
 
-	// 内容类型
+	// ItemType 内容类型
 	ItemType() ItemType
 }

internal/caches/writer_compression.go

@@ -0,0 +1,76 @@
+package caches
+
+import (
+	"github.com/TeaOSLab/EdgeNode/internal/compressions"
+)
+
+type compressionWriter struct {
+	rawWriter Writer
+	writer    compressions.Writer
+	key       string
+	expiredAt int64
+}
+
+func NewCompressionWriter(gw Writer, cpWriter compressions.Writer, key string, expiredAt int64) Writer {
+	return &compressionWriter{
+		rawWriter: gw,
+		writer:    cpWriter,
+		key:       key,
+		expiredAt: expiredAt,
+	}
+}
+
+func (this *compressionWriter) WriteHeader(data []byte) (n int, err error) {
+	return this.writer.Write(data)
+}
+
+// WriteHeaderLength 写入Header长度数据
+func (this *compressionWriter) WriteHeaderLength(headerLength int) error {
+	return nil
+}
+
+// WriteBodyLength 写入Body长度数据
+func (this *compressionWriter) WriteBodyLength(bodyLength int64) error {
+	return nil
+}
+
+func (this *compressionWriter) Write(data []byte) (n int, err error) {
+	return this.writer.Write(data)
+}
+
+func (this *compressionWriter) Close() error {
+	err := this.writer.Close()
+	if err != nil {
+		return err
+	}
+	return this.rawWriter.Close()
+}
+
+func (this *compressionWriter) Discard() error {
+	err := this.writer.Close()
+	if err != nil {
+		return err
+	}
+	return this.rawWriter.Discard()
+}
+
+func (this *compressionWriter) Key() string {
+	return this.key
+}
+
+func (this *compressionWriter) ExpiredAt() int64 {
+	return this.expiredAt
+}
+
+func (this *compressionWriter) HeaderSize() int64 {
+	return this.rawWriter.HeaderSize()
+}
+
+func (this *compressionWriter) BodySize() int64 {
+	return this.rawWriter.BodySize()
+}
+
+// ItemType 内容类型
+func (this *compressionWriter) ItemType() ItemType {
+	return this.rawWriter.ItemType()
+}

internal/caches/writer_file.go

@@ -14,17 +14,19 @@ type FileWriter struct {
 	headerSize int64
 	bodySize   int64
 	expiredAt  int64
+	endFunc    func()
 }
 
-func NewFileWriter(rawWriter *os.File, key string, expiredAt int64) *FileWriter {
+func NewFileWriter(rawWriter *os.File, key string, expiredAt int64, endFunc func()) *FileWriter {
 	return &FileWriter{
 		key:       key,
 		rawWriter: rawWriter,
 		expiredAt: expiredAt,
+		endFunc:   endFunc,
 	}
 }
 
-// 写入数据
+// WriteHeader 写入数据
 func (this *FileWriter) WriteHeader(data []byte) (n int, err error) {
 	n, err = this.rawWriter.Write(data)
 	this.headerSize += int64(n)
@@ -34,7 +36,7 @@ func (this *FileWriter) WriteHeader(data []byte) (n int, err error) {
 	return
 }
 
-// 写入Header长度数据
+// WriteHeaderLength 写入Header长度数据
 func (this *FileWriter) WriteHeaderLength(headerLength int) error {
 	bytes4 := make([]byte, 4)
 	binary.BigEndian.PutUint32(bytes4, uint32(headerLength))
@@ -51,7 +53,7 @@ func (this *FileWriter) WriteHeaderLength(headerLength int) error {
 	return nil
 }
 
-// 写入数据
+// Write 写入数据
 func (this *FileWriter) Write(data []byte) (n int, err error) {
 	n, err = this.rawWriter.Write(data)
 	this.bodySize += int64(n)
@@ -61,7 +63,7 @@ func (this *FileWriter) Write(data []byte) (n int, err error) {
 	return
 }
 
-// 写入Body长度数据
+// WriteBodyLength 写入Body长度数据
 func (this *FileWriter) WriteBodyLength(bodyLength int64) error {
 	bytes8 := make([]byte, 8)
 	binary.BigEndian.PutUint64(bytes8, uint64(bodyLength))
@@ -78,8 +80,10 @@ func (this *FileWriter) WriteBodyLength(bodyLength int64) error {
 	return nil
 }
 
-// 关闭
+// Close 关闭
 func (this *FileWriter) Close() error {
+	defer this.endFunc()
+
 	err := this.WriteHeaderLength(types.Int(this.headerSize))
 	if err != nil {
 		return err
@@ -103,8 +107,10 @@ func (this *FileWriter) Close() error {
 	return err
 }
 
-// 丢弃
+// Discard 丢弃
 func (this *FileWriter) Discard() error {
+	defer this.endFunc()
+
 	_ = this.rawWriter.Close()
 
 	err := os.Remove(this.rawWriter.Name())
@@ -127,7 +133,7 @@ func (this *FileWriter) Key() string {
 	return this.key
 }
 
-// 内容类型
+// ItemType 获取内容类型
 func (this *FileWriter) ItemType() ItemType {
 	return ItemTypeFile
 }

internal/caches/writer_gzip.go

@@ -1,74 +0,0 @@
-package caches
-
-import "compress/gzip"
-
-type gzipWriter struct {
-	rawWriter Writer
-	writer    *gzip.Writer
-	key       string
-	expiredAt int64
-}
-
-func NewGzipWriter(gw Writer, key string, expiredAt int64) Writer {
-	return &gzipWriter{
-		rawWriter: gw,
-		writer:    gzip.NewWriter(gw),
-		key:       key,
-		expiredAt: expiredAt,
-	}
-}
-
-func (this *gzipWriter) WriteHeader(data []byte) (n int, err error) {
-	return this.writer.Write(data)
-}
-
-// 写入Header长度数据
-func (this *gzipWriter) WriteHeaderLength(headerLength int) error {
-	return nil
-}
-
-// 写入Body长度数据
-func (this *gzipWriter) WriteBodyLength(bodyLength int64) error {
-	return nil
-}
-
-func (this *gzipWriter) Write(data []byte) (n int, err error) {
-	return this.writer.Write(data)
-}
-
-func (this *gzipWriter) Close() error {
-	err := this.writer.Close()
-	if err != nil {
-		return err
-	}
-	return this.rawWriter.Close()
-}
-
-func (this *gzipWriter) Discard() error {
-	err := this.writer.Close()
-	if err != nil {
-		return err
-	}
-	return this.rawWriter.Discard()
-}
-
-func (this *gzipWriter) Key() string {
-	return this.key
-}
-
-func (this *gzipWriter) ExpiredAt() int64 {
-	return this.expiredAt
-}
-
-func (this *gzipWriter) HeaderSize() int64 {
-	return this.rawWriter.HeaderSize()
-}
-
-func (this *gzipWriter) BodySize() int64 {
-	return this.rawWriter.BodySize()
-}
-
-// 内容类型
-func (this *gzipWriter) ItemType() ItemType {
-	return this.rawWriter.ItemType()
-}

internal/caches/writer_memory.go

@@ -2,95 +2,115 @@ package caches
 
 import (
 	"github.com/cespare/xxhash"
-	"sync"
+	"time"
 )
 
 type MemoryWriter struct {
+	storage *MemoryStorage
+
 	key        string
 	expiredAt  int64
-	m          map[uint64]*MemoryItem
-	locker     *sync.RWMutex
 	headerSize int64
 	bodySize   int64
 	status     int
+	isDirty    bool
 
-	hash uint64
-	item *MemoryItem
+	hash    uint64
+	item    *MemoryItem
+	endFunc func()
 }
 
-func NewMemoryWriter(m map[uint64]*MemoryItem, key string, expiredAt int64, status int, locker *sync.RWMutex) *MemoryWriter {
+func NewMemoryWriter(memoryStorage *MemoryStorage, key string, expiredAt int64, status int, isDirty bool, endFunc func()) *MemoryWriter {
 	w := &MemoryWriter{
-		m:         m,
+		storage:   memoryStorage,
 		key:       key,
 		expiredAt: expiredAt,
-		locker:    locker,
 		item: &MemoryItem{
-			ExpiredAt: expiredAt,
-			Status:    status,
+			ExpiredAt:  expiredAt,
+			ModifiedAt: time.Now().Unix(),
+			Status:     status,
 		},
-		status: status,
+		status:  status,
+		isDirty: isDirty,
+		endFunc: endFunc,
 	}
 	w.hash = w.calculateHash(key)
 
 	return w
 }
 
-// 写入数据
+// WriteHeader 写入数据
 func (this *MemoryWriter) WriteHeader(data []byte) (n int, err error) {
 	this.headerSize += int64(len(data))
 	this.item.HeaderValue = append(this.item.HeaderValue, data...)
 	return len(data), nil
 }
 
-// 写入数据
+// Write 写入数据
 func (this *MemoryWriter) Write(data []byte) (n int, err error) {
 	this.bodySize += int64(len(data))
 	this.item.BodyValue = append(this.item.BodyValue, data...)
 	return len(data), nil
 }
 
-// 数据尺寸
+// HeaderSize 数据尺寸
 func (this *MemoryWriter) HeaderSize() int64 {
 	return this.headerSize
 }
 
+// BodySize 主体内容尺寸
 func (this *MemoryWriter) BodySize() int64 {
 	return this.bodySize
 }
 
-// 关闭
+// Close 关闭
 func (this *MemoryWriter) Close() error {
+	// 需要在Locker之外
+	defer this.endFunc()
+
 	if this.item == nil {
 		return nil
 	}
 
-	this.locker.Lock()
+	this.storage.locker.Lock()
 	this.item.IsDone = true
-	this.m[this.hash] = this.item
-	this.locker.Unlock()
+	this.storage.valuesMap[this.hash] = this.item
+	if this.isDirty {
+		if this.storage.parentStorage != nil {
+			select {
+			case this.storage.dirtyChan <- this.key:
+			default:
+
+			}
+		}
+	}
+	this.storage.locker.Unlock()
 
 	return nil
 }
 
-// 丢弃
+// Discard 丢弃
 func (this *MemoryWriter) Discard() error {
-	this.locker.Lock()
-	delete(this.m, this.hash)
-	this.locker.Unlock()
+	// 需要在Locker之外
+	defer this.endFunc()
+
+	this.storage.locker.Lock()
+	delete(this.storage.valuesMap, this.hash)
+	this.storage.locker.Unlock()
 	return nil
 }
 
-// Key
+// Key 获取Key
 func (this *MemoryWriter) Key() string {
 	return this.key
 }
 
-// 过期时间
+// ExpiredAt 过期时间
 func (this *MemoryWriter) ExpiredAt() int64 {
 	return this.expiredAt
 }
 
-// 内容类型
+// ItemType 内容类型
 func (this *MemoryWriter) ItemType() ItemType {
 	return ItemTypeMemory
 }

internal/compressions/reader.go

@@ -0,0 +1,8 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+type Reader interface {
+	Read(p []byte) (n int, err error)
+	Close() error
+}

internal/compressions/reader_brotli.go

@@ -0,0 +1,24 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+import (
+	"github.com/andybalholm/brotli"
+	"io"
+)
+
+type BrotliReader struct {
+	reader *brotli.Reader
+}
+
+func NewBrotliReader(reader io.Reader) (Reader, error) {
+	return &BrotliReader{reader: brotli.NewReader(reader)}, nil
+}
+
+func (this *BrotliReader) Read(p []byte) (n int, err error) {
+	return this.reader.Read(p)
+}
+
+func (this *BrotliReader) Close() error {
+	return nil
+}

internal/compressions/reader_deflate.go

@@ -0,0 +1,24 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+import (
+	"compress/flate"
+	"io"
+)
+
+type DeflateReader struct {
+	reader io.ReadCloser
+}
+
+func NewDeflateReader(reader io.Reader) (Reader, error) {
+	return &DeflateReader{reader: flate.NewReader(reader)}, nil
+}
+
+func (this *DeflateReader) Read(p []byte) (n int, err error) {
+	return this.reader.Read(p)
+}
+
+func (this *DeflateReader) Close() error {
+	return this.reader.Close()
+}

internal/compressions/reader_gzip.go

@@ -0,0 +1,30 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+import (
+	"compress/gzip"
+	"io"
+)
+
+type GzipReader struct {
+	reader *gzip.Reader
+}
+
+func NewGzipReader(reader io.Reader) (Reader, error) {
+	r, err := gzip.NewReader(reader)
+	if err != nil {
+		return nil, err
+	}
+	return &GzipReader{
+		reader: r,
+	}, nil
+}
+
+func (this *GzipReader) Read(p []byte) (n int, err error) {
+	return this.reader.Read(p)
+}
+
+func (this *GzipReader) Close() error {
+	return this.reader.Close()
+}

internal/compressions/utils.go

@@ -0,0 +1,46 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+import (
+	"errors"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"io"
+)
+
+type ContentEncoding = string
+
+const (
+	ContentEncodingBr      ContentEncoding = "br"
+	ContentEncodingGzip    ContentEncoding = "gzip"
+	ContentEncodingDeflate ContentEncoding = "deflate"
+)
+
+var ErrNotSupportedContentEncoding = errors.New("not supported content encoding")
+
+// NewReader 获取Reader
+func NewReader(reader io.Reader, contentEncoding ContentEncoding) (Reader, error) {
+	switch contentEncoding {
+	case ContentEncodingBr:
+		return NewBrotliReader(reader)
+	case ContentEncodingGzip:
+		return NewGzipReader(reader)
+	case ContentEncodingDeflate:
+		return NewDeflateReader(reader)
+	}
+	return nil, ErrNotSupportedContentEncoding
+}
+
+// NewWriter 获取Writer
+// TODO 考虑重用Writer
+func NewWriter(writer io.Writer, compressType serverconfigs.HTTPCompressionType, level int) (Writer, error) {
+	switch compressType {
+	case serverconfigs.HTTPCompressionTypeGzip:
+		return NewGzipWriter(writer, level)
+	case serverconfigs.HTTPCompressionTypeDeflate:
+		return NewDeflateWriter(writer, level)
+	case serverconfigs.HTTPCompressionTypeBrotli:
+		return NewBrotliWriter(writer, level)
+	}
+	return nil, errors.New("invalid compression type '" + compressType + "'")
+}

internal/compressions/writer.go

@@ -0,0 +1,10 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+type Writer interface {
+	Write(p []byte) (int, error)
+	Flush() error
+	Close() error
+	Level() int
+}

internal/compressions/writer_brotli.go

@@ -0,0 +1,41 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+import (
+	"github.com/andybalholm/brotli"
+	"io"
+)
+
+type BrotliWriter struct {
+	writer *brotli.Writer
+	level  int
+}
+
+func NewBrotliWriter(writer io.Writer, level int) (Writer, error) {
+	if level <= 0 {
+		level = brotli.BestSpeed
+	} else if level > brotli.BestCompression {
+		level = brotli.BestCompression
+	}
+	return &BrotliWriter{
+		writer: brotli.NewWriterLevel(writer, level),
+		level:  level,
+	}, nil
+}
+
+func (this *BrotliWriter) Write(p []byte) (int, error) {
+	return this.writer.Write(p)
+}
+
+func (this *BrotliWriter) Flush() error {
+	return this.writer.Flush()
+}
+
+func (this *BrotliWriter) Close() error {
+	return this.writer.Close()
+}
+
+func (this *BrotliWriter) Level() int {
+	return this.level
+}

internal/compressions/writer_deflate.go

@@ -0,0 +1,47 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+import (
+	"compress/flate"
+	"io"
+)
+
+type DeflateWriter struct {
+	writer *flate.Writer
+	level  int
+}
+
+func NewDeflateWriter(writer io.Writer, level int) (Writer, error) {
+	if level <= 0 {
+		level = flate.BestSpeed
+	} else if level > flate.BestCompression {
+		level = flate.BestCompression
+	}
+
+	flateWriter, err := flate.NewWriter(writer, level)
+	if err != nil {
+		return nil, err
+	}
+
+	return &DeflateWriter{
+		writer: flateWriter,
+		level:  level,
+	}, nil
+}
+
+func (this *DeflateWriter) Write(p []byte) (int, error) {
+	return this.writer.Write(p)
+}
+
+func (this *DeflateWriter) Flush() error {
+	return this.writer.Flush()
+}
+
+func (this *DeflateWriter) Close() error {
+	return this.writer.Close()
+}
+
+func (this *DeflateWriter) Level() int {
+	return this.level
+}

internal/compressions/writer_encoding.go

@@ -0,0 +1,51 @@
+// 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

@@ -0,0 +1,47 @@
+// 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

@@ -0,0 +1,47 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package compressions
+
+import (
+	"compress/gzip"
+	"io"
+)
+
+type GzipWriter struct {
+	writer *gzip.Writer
+	level  int
+}
+
+func NewGzipWriter(writer io.Writer, level int) (Writer, error) {
+	if level <= 0 {
+		level = gzip.BestSpeed
+	} else if level > gzip.BestCompression {
+		level = gzip.BestCompression
+	}
+
+	gzipWriter, err := gzip.NewWriterLevel(writer, level)
+	if err != nil {
+		return nil, err
+	}
+
+	return &GzipWriter{
+		writer: gzipWriter,
+		level:  level,
+	}, nil
+}
+
+func (this *GzipWriter) Write(p []byte) (int, error) {
+	return this.writer.Write(p)
+}
+
+func (this *GzipWriter) Flush() error {
+	return this.writer.Flush()
+}
+
+func (this *GzipWriter) Close() error {
+	return this.writer.Close()
+}
+
+func (this *GzipWriter) Level() int {
+	return this.level
+}

internal/const/build.go

@@ -0,0 +1,8 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+// +build community
+
+package teaconst
+
+const BuildCommunity = true
+const BuildPlus = false
+const Tag = "community"

internal/const/build_plus.go

@@ -0,0 +1,8 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+// +build plus
+
+package teaconst
+
+const BuildCommunity = false
+const BuildPlus = true
+const Tag = "plus"

internal/const/const.go

@@ -1,7 +1,7 @@
 package teaconst
 
 const (
-	Version = "0.0.13"
+	Version = "0.3.7"
 
 	ProductName = "Edge Node"
 	ProcessName = "edge-node"
@@ -11,6 +11,6 @@ const (
 	EncryptKey    = "8f983f4d69b83aaa0d74b21a212f6967"
 	EncryptMethod = "aes-256-cfb"
 
-	// systemd
+	// SystemdServiceName systemd
 	SystemdServiceName = "edge-node"
 )

internal/const/vars.go

@@ -0,0 +1,13 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package teaconst
+
+var (
+	// 流量统计
+
+	InTrafficBytes  = uint64(0)
+	OutTrafficBytes = uint64(0)
+
+	NodeId       int64 = 0
+	NodeIdString       = ""
+)

internal/goman/instance.go

@@ -0,0 +1,12 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package goman
+
+import "time"
+
+type Instance struct {
+	Id          uint64
+	CreatedTime time.Time
+	File        string
+	Line        int
+}

internal/goman/lib.go

@@ -0,0 +1,81 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package goman
+
+import (
+	"runtime"
+	"sync"
+	"time"
+)
+
+var locker = &sync.Mutex{}
+var instanceMap = map[uint64]*Instance{} // id => *Instance
+var instanceId = uint64(0)
+
+// New 新创建goroutine
+func New(f func()) {
+	_, file, line, _ := runtime.Caller(1)
+
+	go func() {
+		locker.Lock()
+		instanceId++
+
+		var instance = &Instance{
+			Id:          instanceId,
+			CreatedTime: time.Now(),
+		}
+
+		instance.File = file
+		instance.Line = line
+
+		instanceMap[instanceId] = instance
+		locker.Unlock()
+
+		// run function
+		f()
+
+		locker.Lock()
+		delete(instanceMap, instanceId)
+		locker.Unlock()
+	}()
+}
+
+// NewWithArgs 创建带有参数的goroutine
+func NewWithArgs(f func(args ...interface{}), args ...interface{}) {
+	_, file, line, _ := runtime.Caller(1)
+
+	go func() {
+		locker.Lock()
+		instanceId++
+
+		var instance = &Instance{
+			Id:          instanceId,
+			CreatedTime: time.Now(),
+		}
+
+		instance.File = file
+		instance.Line = line
+
+		instanceMap[instanceId] = instance
+		locker.Unlock()
+
+		// run function
+		f(args...)
+
+		locker.Lock()
+		delete(instanceMap, instanceId)
+		locker.Unlock()
+	}()
+}
+
+// List 列出所有正在运行goroutine
+func List() []*Instance {
+	locker.Lock()
+	defer locker.Unlock()
+
+	var result = []*Instance{}
+	for _, instance := range instanceMap {
+		result = append(result, instance)
+	}
+	return result
+}

internal/goman/lib_test.go

@@ -0,0 +1,28 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package goman
+
+import (
+	"testing"
+	"time"
+)
+
+func TestNew(t *testing.T) {
+	New(func() {
+		t.Log("Hello")
+
+		t.Log(List())
+	})
+
+	time.Sleep(1 * time.Second)
+	t.Log(List())
+
+	time.Sleep(1 * time.Second)
+}
+
+func TestNewWithArgs(t *testing.T) {
+	NewWithArgs(func(args ...interface{}) {
+		t.Log(args[0], args[1])
+	}, 1, 2)
+	time.Sleep(1 * time.Second)
+}

internal/iplibrary/README.md

@@ -0,0 +1,5 @@
+# IPList
+List Check Order:
+~~~
+Global List --> Node List--> Server List --> WAF List --> Bind List
+~~~

internal/iplibrary/action_base.go

@@ -13,7 +13,7 @@ func (this *BaseAction) Close() error {
 	return nil
 }
 
-// 处理HTTP请求
+// DoHTTP 处理HTTP请求
 func (this *BaseAction) DoHTTP(req *http.Request, resp http.ResponseWriter) (goNext bool, err error) {
 	return true, nil
 }

internal/iplibrary/action_errors.go

@@ -1,6 +1,6 @@
 package iplibrary
 
-// 是否是致命错误
+// FataError 是否是致命错误
 type FataError struct {
 	err string
 }

internal/iplibrary/action_firewalld.go

@@ -11,7 +11,7 @@ import (
 	"time"
 )
 
-// Firewalld动作管理
+// FirewalldAction Firewalld动作管理
 // 常用命令：
 //  - 查询列表： firewall-cmd --list-all
 //  - 添加IP：firewall-cmd --add-rich-rule="rule family='ipv4' source address='192.168.2.32' reject" --timeout=30s
@@ -20,6 +20,8 @@ type FirewalldAction struct {
 	BaseAction
 
 	config *firewallconfigs.FirewallActionFirewalldConfig
+
+	firewalldNotFound bool
 }
 
 func NewFirewalldAction() *FirewalldAction {
@@ -82,6 +84,10 @@ func (this *FirewalldAction) runActionSingleIP(action string, listType IPListTyp
 	if len(path) == 0 {
 		path, err = exec.LookPath("firewall-cmd")
 		if err != nil {
+			if this.firewalldNotFound {
+				return nil
+			}
+			this.firewalldNotFound = true
 			return err
 		}
 	}
@@ -126,10 +132,12 @@ func (this *FirewalldAction) runActionSingleIP(action string, listType IPListTyp
 	}
 
 	args := []string{opt}
-	if item.ExpiredAt > timestamp {
-		args = append(args, "--timeout="+fmt.Sprintf("%d", item.ExpiredAt-timestamp)+"s")
-	} else {
-		// TODO 思考是否需要permanent，不然--reload之后会丢失
+	if action == "addItem" {
+		if item.ExpiredAt > timestamp {
+			args = append(args, "--timeout="+fmt.Sprintf("%d", item.ExpiredAt-timestamp)+"s")
+		} else {
+			// TODO 思考是否需要permanent，不然--reload之后会丢失
+		}
 	}
 
 	if runtime.GOOS == "darwin" {

internal/iplibrary/action_html.go

@@ -6,19 +6,19 @@ import (
 	"net/http"
 )
 
-// HTML动作
+// HTMLAction HTML动作
 type HTMLAction struct {
 	BaseAction
 
 	config *firewallconfigs.FirewallActionHTMLConfig
 }
 
-// 获取新对象
+// NewHTMLAction 获取新对象
 func NewHTMLAction() *HTMLAction {
 	return &HTMLAction{}
 }
 
-// 初始化
+// Init 初始化
 func (this *HTMLAction) Init(config *firewallconfigs.FirewallActionConfig) error {
 	this.config = &firewallconfigs.FirewallActionHTMLConfig{}
 	err := this.convertParams(config.Params, this.config)
@@ -28,22 +28,22 @@ func (this *HTMLAction) Init(config *firewallconfigs.FirewallActionConfig) error
 	return nil
 }
 
-// 添加
+// AddItem 添加
 func (this *HTMLAction) AddItem(listType IPListType, item *pb.IPItem) error {
 	return nil
 }
 
-// 删除
+// DeleteItem 删除
 func (this *HTMLAction) DeleteItem(listType IPListType, item *pb.IPItem) error {
 	return nil
 }
 
-// 关闭
+// Close 关闭
 func (this *HTMLAction) Close() error {
 	return nil
 }
 
-// 处理HTTP请求
+// DoHTTP 处理HTTP请求
 func (this *HTMLAction) DoHTTP(req *http.Request, resp http.ResponseWriter) (goNext bool, err error) {
 	if this.config == nil {
 		goNext = true

internal/iplibrary/action_interface.go

@@ -7,18 +7,18 @@ import (
 )
 
 type ActionInterface interface {
-	// 初始化
+	// Init 初始化
 	Init(config *firewallconfigs.FirewallActionConfig) error
 
-	// 添加
+	// AddItem 添加
 	AddItem(listType IPListType, item *pb.IPItem) error
 
-	// 删除
+	// DeleteItem 删除
 	DeleteItem(listType IPListType, item *pb.IPItem) error
 
-	// 关闭
+	// Close 关闭
 	Close() error
 
-	// 处理HTTP请求
+	// DoHTTP 处理HTTP请求
 	DoHTTP(req *http.Request, resp http.ResponseWriter) (goNext bool, err error)
 }

internal/iplibrary/action_ipset.go

@@ -5,13 +5,15 @@ import (
 	"errors"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
+	"github.com/iwind/TeaGo/types"
 	"os/exec"
 	"runtime"
 	"strconv"
+	"strings"
 	"time"
 )
 
-// IPSet动作
+// IPSetAction IPSet动作
 // 相关命令：
 //   - 利用Firewalld管理set：
 //       - 添加：firewall-cmd --permanent --new-ipset=edge_ip_list --type=hash:ip --option="timeout=0"
@@ -23,14 +25,21 @@ import (
 //   - 添加Item：ipset add edge_ip_list 192.168.2.32 timeout 30
 //   - 删除Item: ipset del edge_ip_list 192.168.2.32
 //   - 创建set：ipset create edge_ip_list hash:ip timeout 0
+//   - 查看统计：ipset -t list edge_black_list
+//   - 删除set：ipset destroy edge_black_list
 type IPSetAction struct {
 	BaseAction
 
-	config *firewallconfigs.FirewallActionIPSetConfig
+	config   *firewallconfigs.FirewallActionIPSetConfig
+	errorBuf *bytes.Buffer
+
+	ipsetNotfound bool
 }
 
 func NewIPSetAction() *IPSetAction {
-	return &IPSetAction{}
+	return &IPSetAction{
+		errorBuf: &bytes.Buffer{},
+	}
 }
 
 func (this *IPSetAction) Init(config *firewallconfigs.FirewallActionConfig) error {
@@ -54,7 +63,7 @@ func (this *IPSetAction) Init(config *firewallconfigs.FirewallActionConfig) erro
 			return err
 		}
 		{
-			cmd := exec.Command(path, "create", this.config.WhiteName, "hash:ip", "timeout", "0")
+			cmd := exec.Command(path, "create", this.config.WhiteName, "hash:ip", "timeout", "0", "maxelem", "1000000")
 			stderr := bytes.NewBuffer([]byte{})
 			cmd.Stderr = stderr
 			err := cmd.Run()
@@ -68,7 +77,7 @@ func (this *IPSetAction) Init(config *firewallconfigs.FirewallActionConfig) erro
 			}
 		}
 		{
-			cmd := exec.Command(path, "create", this.config.BlackName, "hash:ip", "timeout", "0")
+			cmd := exec.Command(path, "create", this.config.BlackName, "hash:ip", "timeout", "0", "maxelem", "1000000")
 			stderr := bytes.NewBuffer([]byte{})
 			cmd.Stderr = stderr
 			err := cmd.Run()
@@ -163,24 +172,39 @@ func (this *IPSetAction) Init(config *firewallconfigs.FirewallActionConfig) erro
 		}
 
 		{
-			cmd := exec.Command(path, "-A", "INPUT", "-m", "set", "--match-set", this.config.WhiteName, "src", "-j", "ACCEPT")
-			stderr := bytes.NewBuffer([]byte{})
-			cmd.Stderr = stderr
+			// 检查规则是否存在
+			var cmd = exec.Command(path, "-C", "INPUT", "-m", "set", "--match-set", this.config.WhiteName, "src", "-j", "ACCEPT")
 			err := cmd.Run()
-			if err != nil {
-				output := stderr.Bytes()
-				return errors.New("iptables add rule: " + err.Error() + ", output: " + string(output))
+			var exists = err == nil
+
+			// 添加规则
+			if !exists {
+				var cmd = exec.Command(path, "-A", "INPUT", "-m", "set", "--match-set", this.config.WhiteName, "src", "-j", "ACCEPT")
+				stderr := bytes.NewBuffer([]byte{})
+				cmd.Stderr = stderr
+				err := cmd.Run()
+				if err != nil {
+					output := stderr.Bytes()
+					return errors.New("iptables add rule: " + err.Error() + ", output: " + string(output))
+				}
 			}
 		}
 
 		{
-			cmd := exec.Command(path, "-A", "INPUT", "-m", "set", "--match-set", this.config.BlackName, "src", "-j", "REJECT")
-			stderr := bytes.NewBuffer([]byte{})
-			cmd.Stderr = stderr
+			// 检查规则是否存在
+			var cmd = exec.Command(path, "-C", "INPUT", "-m", "set", "--match-set", this.config.BlackName, "src", "-j", "REJECT")
 			err := cmd.Run()
-			if err != nil {
-				output := stderr.Bytes()
-				return errors.New("iptables add rule: " + err.Error() + ", output: " + string(output))
+			var exists = err == nil
+
+			if !exists {
+				var cmd = exec.Command(path, "-A", "INPUT", "-m", "set", "--match-set", this.config.BlackName, "src", "-j", "REJECT")
+				stderr := bytes.NewBuffer([]byte{})
+				cmd.Stderr = stderr
+				err := cmd.Run()
+				if err != nil {
+					output := stderr.Bytes()
+					return errors.New("iptables add rule: " + err.Error() + ", output: " + string(output))
+				}
 			}
 		}
 	}
@@ -212,6 +236,16 @@ func (this *IPSetAction) runAction(action string, listType IPListType, item *pb.
 		return nil
 	}
 	for _, cidr := range cidrList {
+		index := strings.Index(cidr, "/")
+		if index <= 0 {
+			continue
+		}
+
+		// 只支持/24以下的
+		if types.Int(cidr[index+1:]) < 24 {
+			continue
+		}
+
 		item.IpFrom = cidr
 		item.IpTo = ""
 		err := this.runActionSingleIP(action, listType, item)
@@ -246,6 +280,11 @@ func (this *IPSetAction) runActionSingleIP(action string, listType IPListType, i
 	if len(path) == 0 {
 		path, err = exec.LookPath("ipset")
 		if err != nil {
+			// 找不到ipset命令错误只提示一次
+			if this.ipsetNotfound {
+				return nil
+			}
+			this.ipsetNotfound = true
 			return err
 		}
 	}
@@ -258,19 +297,30 @@ func (this *IPSetAction) runActionSingleIP(action string, listType IPListType, i
 	case "deleteItem":
 		args = append(args, "del")
 	}
-	args = append(args, listName, item.IpFrom)
-	timestamp := time.Now().Unix()
-	if item.ExpiredAt > timestamp {
-		args = append(args, "timeout", strconv.FormatInt(item.ExpiredAt-timestamp, 10))
-	}
 
-	//logs.Println(args)
+	args = append(args, listName, item.IpFrom)
+	if action == "addItem" {
+		timestamp := time.Now().Unix()
+		if item.ExpiredAt > timestamp {
+			args = append(args, "timeout", strconv.FormatInt(item.ExpiredAt-timestamp, 10))
+		}
+	}
 
 	if runtime.GOOS == "darwin" {
 		// MAC OS直接返回
 		return nil
 	}
 
+	this.errorBuf.Reset()
 	cmd := exec.Command(path, args...)
-	return cmd.Run()
+	cmd.Stderr = this.errorBuf
+	err = cmd.Run()
+	if err != nil {
+		var errString = this.errorBuf.String()
+		if action == "deleteItem" && strings.Contains(errString, "not added") {
+			return nil
+		}
+		return errors.New(strings.TrimSpace(errString))
+	}
+	return nil
 }

internal/iplibrary/action_iptables.go

@@ -9,15 +9,18 @@ import (
 	"runtime"
 )
 
-// IPTables动作
+// IPTablesAction IPTables动作
 // 相关命令：
 //   iptables -A INPUT -s "192.168.2.32" -j ACCEPT
 //   iptables -A INPUT -s "192.168.2.32" -j REJECT
-//   iptables -D ...
+//   iptables -D INPUT ...
+//   iptables -F INPUT
 type IPTablesAction struct {
 	BaseAction
 
 	config *firewallconfigs.FirewallActionIPTablesConfig
+
+	iptablesNotFound bool
 }
 
 func NewIPTablesAction() *IPTablesAction {
@@ -76,6 +79,10 @@ func (this *IPTablesAction) runActionSingleIP(action string, listType IPListType
 	if len(path) == 0 {
 		path, err = exec.LookPath("iptables")
 		if err != nil {
+			if this.iptablesNotFound {
+				return nil
+			}
+			this.iptablesNotFound = true
 			return err
 		}
 	}

internal/iplibrary/action_manager.go

@@ -14,7 +14,7 @@ import (
 
 var SharedActionManager = NewActionManager()
 
-// 动作管理器定义
+// ActionManager 动作管理器定义
 type ActionManager struct {
 	locker sync.Mutex
 
@@ -23,7 +23,7 @@ type ActionManager struct {
 	instanceMap map[int64]ActionInterface                       // id => instance
 }
 
-// 获取动作管理对象
+// NewActionManager 获取动作管理对象
 func NewActionManager() *ActionManager {
 	return &ActionManager{
 		configMap:   map[int64]*firewallconfigs.FirewallActionConfig{},
@@ -31,7 +31,7 @@ func NewActionManager() *ActionManager {
 	}
 }
 
-// 更新配置
+// UpdateActions 更新配置
 func (this *ActionManager) UpdateActions(actions []*firewallconfigs.FirewallActionConfig) {
 	this.locker.Lock()
 	defer this.locker.Unlock()
@@ -108,14 +108,14 @@ func (this *ActionManager) UpdateActions(actions []*firewallconfigs.FirewallActi
 	}
 }
 
-// 查找事件对应的动作
+// FindEventActions 查找事件对应的动作
 func (this *ActionManager) FindEventActions(eventLevel string) []ActionInterface {
 	this.locker.Lock()
 	defer this.locker.Unlock()
 	return this.eventMap[eventLevel]
 }
 
-// 执行添加IP动作
+// AddItem 执行添加IP动作
 func (this *ActionManager) AddItem(listType IPListType, item *pb.IPItem) {
 	instances, ok := this.eventMap[item.EventLevel]
 	if ok {
@@ -128,7 +128,7 @@ func (this *ActionManager) AddItem(listType IPListType, item *pb.IPItem) {
 	}
 }
 
-// 执行删除IP动作
+// DeleteItem 执行删除IP动作
 func (this *ActionManager) DeleteItem(listType IPListType, item *pb.IPItem) {
 	instances, ok := this.eventMap[item.EventLevel]
 	if ok {

internal/iplibrary/action_script.go

@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 )
 
-// 脚本命令动作
+// ScriptAction 脚本命令动作
 type ScriptAction struct {
 	BaseAction
 

internal/iplibrary/ip2Region.go

@@ -0,0 +1,130 @@
+// 源码改自：https://github.com/lionsoul2014/ip2region/blob/master/binding/golang/ip2region/ip2Region.go
+
+package iplibrary
+
+import (
+	"errors"
+	"io/ioutil"
+	"strconv"
+	"strings"
+)
+
+const (
+	IndexBlockLength = 12
+)
+
+var err error
+
+type IP2Region struct {
+	headerSip []int64
+	headerPtr []int64
+	headerLen int64
+
+	// super block index info
+	firstIndexPtr int64
+	lastIndexPtr  int64
+	totalBlocks   int64
+
+	dbData []byte
+}
+
+type IpInfo struct {
+	CityId   int64
+	Country  string
+	Region   string
+	Province string
+	City     string
+	ISP      string
+}
+
+func (ip IpInfo) String() string {
+	return strconv.FormatInt(ip.CityId, 10) + "|" + ip.Country + "|" + ip.Region + "|" + ip.Province + "|" + ip.City + "|" + ip.ISP
+}
+
+func getIpInfo(cityId int64, line []byte) *IpInfo {
+	lineSlice := strings.Split(string(line), "|")
+	ipInfo := &IpInfo{}
+	length := len(lineSlice)
+	ipInfo.CityId = cityId
+	if length < 5 {
+		for i := 0; i <= 5-length; i++ {
+			lineSlice = append(lineSlice, "")
+		}
+	}
+
+	ipInfo.Country = lineSlice[0]
+	ipInfo.Region = lineSlice[1]
+	ipInfo.Province = lineSlice[2]
+	ipInfo.City = lineSlice[3]
+	ipInfo.ISP = lineSlice[4]
+	return ipInfo
+}
+
+func NewIP2Region(path string) (*IP2Region, error) {
+	var region = &IP2Region{}
+	region.dbData, err = ioutil.ReadFile(path)
+
+	if err != nil {
+		return nil, err
+	}
+
+	region.firstIndexPtr = region.ipLongAtOffset(0)
+	region.lastIndexPtr = region.ipLongAtOffset(4)
+	region.totalBlocks = (region.lastIndexPtr-region.firstIndexPtr)/IndexBlockLength + 1
+	return region, nil
+}
+
+func (this *IP2Region) MemorySearch(ipStr string) (ipInfo *IpInfo, err error) {
+	ip, err := ip2long(ipStr)
+	if err != nil {
+		return nil, err
+	}
+
+	h := this.totalBlocks
+	var dataPtr, l int64
+	for l <= h {
+		m := (l + h) >> 1
+		p := this.firstIndexPtr + m*IndexBlockLength
+		sip := this.ipLongAtOffset(p)
+		if ip < sip {
+			h = m - 1
+		} else {
+			eip := this.ipLongAtOffset(p + 4)
+			if ip > eip {
+				l = m + 1
+			} else {
+				dataPtr = this.ipLongAtOffset(p + 8)
+				break
+			}
+		}
+	}
+	if dataPtr == 0 {
+		return nil, errors.New("not found")
+	}
+
+	dataLen := (dataPtr >> 24) & 0xFF
+	dataPtr = dataPtr & 0x00FFFFFF
+	return getIpInfo(this.ipLongAtOffset(dataPtr), this.dbData[(dataPtr)+4:dataPtr+dataLen]), nil
+}
+
+func (this *IP2Region) ipLongAtOffset(offset int64) int64 {
+	return int64(this.dbData[offset]) |
+		int64(this.dbData[offset+1])<<8 |
+		int64(this.dbData[offset+2])<<16 |
+		int64(this.dbData[offset+3])<<24
+}
+
+func ip2long(IpStr string) (int64, error) {
+	bits := strings.Split(IpStr, ".")
+	if len(bits) != 4 {
+		return 0, errors.New("ip format error")
+	}
+
+	var sum int64
+	for i, n := range bits {
+		bit, _ := strconv.ParseInt(n, 10, 64)
+		sum += bit << uint(24-8*i)
+	}
+
+	return sum, nil
+}

internal/iplibrary/ip_item.go

@@ -10,7 +10,7 @@ const (
 	IPItemTypeAll  IPItemType = "all"  // 所有IP
 )
 
-// IP条目
+// IPItem IP条目
 type IPItem struct {
 	Type       string `json:"type"`
 	Id         int64  `json:"id"`
@@ -20,7 +20,7 @@ type IPItem struct {
 	EventLevel string `json:"eventLevel"`
 }
 
-// 检查是否包含某个IP
+// Contains 检查是否包含某个IP
 func (this *IPItem) Contains(ip uint64) bool {
 	switch this.Type {
 	case IPItemTypeIPv4:
@@ -28,7 +28,7 @@ func (this *IPItem) Contains(ip uint64) bool {
 	case IPItemTypeIPv6:
 		return this.containsIPv6(ip)
 	case IPItemTypeAll:
-		return this.containsAll(ip)
+		return this.containsAll()
 	default:
 		return this.containsIPv4(ip)
 	}
@@ -63,7 +63,7 @@ func (this *IPItem) containsIPv6(ip uint64) bool {
 }
 
 // 检查是否包所有IP
-func (this *IPItem) containsAll(ip uint64) bool {
+func (this *IPItem) containsAll() bool {
 	if this.ExpiredAt > 0 && this.ExpiredAt < utils.UnixTime() {
 		return false
 	}

internal/iplibrary/ip_item_test.go

@@ -3,6 +3,7 @@ package iplibrary
 import (
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/iwind/TeaGo/assert"
+	"runtime"
 	"testing"
 	"time"
 )
@@ -72,3 +73,36 @@ func TestIPItem_Contains(t *testing.T) {
 		a.IsTrue(item.Contains(utils.IP2Long("192.168.1.1")))
 	}
 }
+
+func TestIPItem_Memory(t *testing.T) {
+	var list = NewIPList()
+	for i := 0; i < 2_000_000; i ++ {
+		list.Add(&IPItem{
+			Type:       "ip",
+			Id:         int64(i),
+			IPFrom:     utils.IP2Long("192.168.1.1"),
+			IPTo:       0,
+			ExpiredAt:  time.Now().Unix(),
+			EventLevel: "",
+		})
+	}
+	t.Log("waiting")
+	time.Sleep(10 * time.Second)
+}
+
+func BenchmarkIPItem_Contains(b *testing.B) {
+	runtime.GOMAXPROCS(1)
+
+	item := &IPItem{
+		IPFrom:    utils.IP2Long("192.168.1.1"),
+		IPTo:      utils.IP2Long("192.168.1.101"),
+		ExpiredAt: 0,
+	}
+	ip := utils.IP2Long("192.168.1.1")
+	for i := 0; i < b.N; i++ {
+		for j := 0; j < 10_000; j++ {
+			item.Contains(ip)
+		}
+	}
+}
+

internal/iplibrary/ip_list.go

@@ -3,45 +3,128 @@ package iplibrary
 import (
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/TeaOSLab/EdgeNode/internal/utils/expires"
+	"sort"
 	"sync"
 )
 
-// IP名单
-type IPList struct {
-	itemsMap   map[int64]*IPItem  // id => item
-	ipMap      map[uint64][]int64 // ip => itemIds
-	expireList *expires.List
+var GlobalBlackIPList = NewIPList()
+var GlobalWhiteIPList = NewIPList()
 
-	isAll bool
+// IPList IP名单
+// TODO IP名单可以分片关闭，这样让每一片的数据量减少，查询更快
+type IPList struct {
+	itemsMap    map[int64]*IPItem // id => item
+	sortedItems []*IPItem
+	allItemsMap map[int64]*IPItem // id => item
+
+	expireList *expires.List
 
 	locker sync.RWMutex
 }
 
 func NewIPList() *IPList {
 	list := &IPList{
-		itemsMap: map[int64]*IPItem{},
-		ipMap:    map[uint64][]int64{},
+		itemsMap:    map[int64]*IPItem{},
+		allItemsMap: map[int64]*IPItem{},
 	}
 
 	expireList := expires.NewList()
-	go func() {
-		expireList.StartGC(func(itemId int64) {
-			list.Delete(itemId)
-		})
-	}()
+	expireList.OnGC(func(itemId int64) {
+		list.Delete(itemId)
+	})
 	list.expireList = expireList
 	return list
 }
 
 func (this *IPList) Add(item *IPItem) {
+	this.addItem(item, true)
+}
+
+// AddDelay 延迟添加，需要手工调用Sort()函数
+func (this *IPList) AddDelay(item *IPItem) {
+	this.addItem(item, false)
+}
+
+func (this *IPList) Sort() {
+	this.locker.Lock()
+	this.sortItems()
+	this.locker.Unlock()
+}
+
+func (this *IPList) Delete(itemId int64) {
+	this.locker.Lock()
+	this.deleteItem(itemId)
+	this.locker.Unlock()
+}
+
+// Contains 判断是否包含某个IP
+func (this *IPList) Contains(ip uint64) bool {
+	this.locker.RLock()
+	if len(this.allItemsMap) > 0 {
+		this.locker.RUnlock()
+		return true
+	}
+
+	var item = this.lookupIP(ip)
+
+	this.locker.RUnlock()
+
+	return item != nil
+}
+
+// ContainsIPStrings 是否包含一组IP中的任意一个，并返回匹配的第一个Item
+func (this *IPList) ContainsIPStrings(ipStrings []string) (item *IPItem, found bool) {
+	if len(ipStrings) == 0 {
+		return
+	}
+	this.locker.RLock()
+	if len(this.allItemsMap) > 0 {
+		for _, allItem := range this.allItemsMap {
+			item = allItem
+			break
+		}
+
+		if item != nil {
+			this.locker.RUnlock()
+			found = true
+			return
+		}
+	}
+	for _, ipString := range ipStrings {
+		if len(ipString) == 0 {
+			continue
+		}
+		item = this.lookupIP(utils.IP2Long(ipString))
+		if item != nil {
+			this.locker.RUnlock()
+			found = true
+			return
+		}
+	}
+	this.locker.RUnlock()
+	return
+}
+
+func (this *IPList) addItem(item *IPItem, sortable bool) {
 	if item == nil {
 		return
 	}
 
+	if item.ExpiredAt > 0 && item.ExpiredAt < utils.UnixTime() {
+		return
+	}
+
 	if item.IPFrom == 0 && item.IPTo == 0 {
-		if item.Type != "all" {
+		if item.Type != IPItemTypeAll {
 			return
 		}
+	} else if item.IPTo > 0 {
+		if item.IPFrom > item.IPTo {
+			item.IPFrom, item.IPTo = item.IPTo, item.IPFrom
+		} else if item.IPFrom == 0 {
+			item.IPFrom = item.IPTo
+			item.IPTo = 0
+		}
 	}
 
 	this.locker.Lock()
@@ -56,157 +139,86 @@ func (this *IPList) Add(item *IPItem) {
 
 	// 展开
 	if item.IPFrom > 0 {
-		if item.IPTo == 0 {
-			this.addIP(item.IPFrom, item.Id)
-		} else {
-			if item.IPFrom > item.IPTo {
-				item.IPTo, item.IPFrom = item.IPFrom, item.IPTo
-			}
-
-			for i := item.IPFrom; i <= item.IPTo; i++ {
-				// 最多不能超过65535，防止整个系统内存爆掉
-				if i >= item.IPFrom+65535 {
-					break
-				}
-				this.addIP(i, item.Id)
-			}
-		}
-	} else if item.IPTo > 0 {
-		this.addIP(item.IPTo, item.Id)
+		this.sortedItems = append(this.sortedItems, item)
 	} else {
-		this.addIP(0, item.Id)
-
-		// 更新isAll
-		this.isAll = true
+		this.allItemsMap[item.Id] = item
 	}
 
 	if item.ExpiredAt > 0 {
 		this.expireList.Add(item.Id, item.ExpiredAt)
 	}
 
+	if sortable {
+		this.sortItems()
+	}
+
 	this.locker.Unlock()
 }
 
-func (this *IPList) Delete(itemId int64) {
-	this.locker.Lock()
-	defer this.locker.Unlock()
-	this.deleteItem(itemId)
-
-	// 更新isAll
-	this.isAll = len(this.ipMap[0]) > 0
+//  对列表进行排序
+func (this *IPList) sortItems() {
+	sort.Slice(this.sortedItems, func(i, j int) bool {
+		var item1 = this.sortedItems[i]
+		var item2 = this.sortedItems[j]
+		if item1.IPFrom == item2.IPFrom {
+			return item1.IPTo < item2.IPTo
+		}
+		return item1.IPFrom < item2.IPFrom
+	})
 }
 
-// 判断是否包含某个IP
-func (this *IPList) Contains(ip uint64) bool {
-	this.locker.RLock()
-	if this.isAll {
-		this.locker.RUnlock()
-		return true
-	}
-	_, ok := this.ipMap[ip]
-	this.locker.RUnlock()
-
-	return ok
-}
-
-// 是否包含一组IP
-func (this *IPList) ContainsIPStrings(ipStrings []string) (found bool, item *IPItem) {
-	if len(ipStrings) == 0 {
-		return
-	}
-	this.locker.RLock()
-	if this.isAll {
-		itemIds := this.ipMap[0]
-		if len(itemIds) > 0 {
-			itemId := itemIds[0]
-			item = this.itemsMap[itemId]
-		}
-
-		this.locker.RUnlock()
-		found = true
-		return
-	}
-	for _, ipString := range ipStrings {
-		if len(ipString) == 0 {
-			continue
-		}
-		itemIds, ok := this.ipMap[utils.IP2Long(ipString)]
-		if ok {
-			if len(itemIds) > 0 {
-				itemId := itemIds[0]
-				item = this.itemsMap[itemId]
+// 不加锁的情况下查找Item
+func (this *IPList) lookupIP(ip uint64) *IPItem {
+	var count = len(this.sortedItems)
+	var resultIndex = -1
+	sort.Search(count, func(i int) bool {
+		var item = this.sortedItems[i]
+		if item.IPFrom < ip {
+			if item.IPTo >= ip {
+				resultIndex = i
 			}
-
-			this.locker.RUnlock()
-			found = true
-			return
+			return false
+		} else if item.IPFrom == ip {
+			resultIndex = i
+			return false
 		}
+		return true
+	})
+
+	if resultIndex < 0 || resultIndex >= count {
+		return nil
 	}
-	this.locker.RUnlock()
-	return
+
+	return this.sortedItems[resultIndex]
 }
 
 // 在不加锁的情况下删除某个Item
 // 将会被别的方法引用，切记不能加锁
 func (this *IPList) deleteItem(itemId int64) {
-	item, ok := this.itemsMap[itemId]
+	_, ok := this.itemsMap[itemId]
 	if !ok {
 		return
 	}
 
 	delete(this.itemsMap, itemId)
 
-	// 展开
-	if item.IPFrom > 0 {
-		if item.IPTo == 0 {
-			this.deleteIP(item.IPFrom, item.Id)
-		} else {
-			if item.IPFrom > item.IPTo {
-				item.IPTo, item.IPFrom = item.IPFrom, item.IPTo
-			}
-
-			for i := item.IPFrom; i <= item.IPTo; i++ {
-				// 最多不能超过65535，防止整个系统内存爆掉
-				if i >= item.IPFrom+65535 {
-					break
-				}
-				this.deleteIP(i, item.Id)
-			}
-		}
-	} else if item.IPTo > 0 {
-		this.deleteIP(item.IPTo, item.Id)
-	} else {
-		this.deleteIP(0, item.Id)
-	}
-}
-
-// 添加单个IP
-func (this *IPList) addIP(ip uint64, itemId int64) {
-	itemIds, ok := this.ipMap[ip]
+	// 是否为All Item
+	_, ok = this.allItemsMap[itemId]
 	if ok {
-		itemIds = append(itemIds, itemId)
-	} else {
-		itemIds = []int64{itemId}
-	}
-	this.ipMap[ip] = itemIds
-}
-
-// 删除单个IP
-func (this *IPList) deleteIP(ip uint64, itemId int64) {
-	itemIds, ok := this.ipMap[ip]
-	if !ok {
+		delete(this.allItemsMap, itemId)
 		return
 	}
-	newItemIds := []int64{}
-	for _, oldItemId := range itemIds {
-		if oldItemId == itemId {
-			continue
+
+	// 删除排序中的Item
+	var index = -1
+	for itemIndex, item := range this.sortedItems {
+		if item.Id == itemId {
+			index = itemIndex
+			break
 		}
-		newItemIds = append(newItemIds, oldItemId)
 	}
-	if len(newItemIds) > 0 {
-		this.ipMap[ip] = newItemIds
-	} else {
-		delete(this.ipMap, ip)
+	if index >= 0 {
+		copy(this.sortedItems[index:], this.sortedItems[index+1:])
+		this.sortedItems = this.sortedItems[:len(this.sortedItems)-1]
 	}
 }

internal/iplibrary/ip_list_db.go

@@ -0,0 +1,145 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package iplibrary
+
+import (
+	"database/sql"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
+	"github.com/iwind/TeaGo/Tea"
+	_ "github.com/mattn/go-sqlite3"
+	"os"
+	"path/filepath"
+)
+
+type IPListDB struct {
+	db *sql.DB
+
+	itemTableName   string
+	deleteItemStmt  *sql.Stmt
+	insertItemStmt  *sql.Stmt
+	selectItemsStmt *sql.Stmt
+
+	dir string
+}
+
+func NewIPListDB() (*IPListDB, error) {
+	var db = &IPListDB{
+		itemTableName: "ipItems",
+		dir:           filepath.Clean(Tea.Root + "/data"),
+	}
+	err := db.init()
+	return db, err
+}
+
+func (this *IPListDB) init() error {
+	// 检查目录是否存在
+	_, err := os.Stat(this.dir)
+	if err != nil {
+		err = os.MkdirAll(this.dir, 0777)
+		if err != nil {
+			return err
+		}
+		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")
+	if err != nil {
+		return err
+	}
+	db.SetMaxOpenConns(1)
+	this.db = db
+
+	// 初始化数据库
+	_, err = db.Exec(`CREATE TABLE IF NOT EXISTS "` + this.itemTableName + `" (
+  "id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
+  "listId" integer DEFAULT 0,
+  "listType" varchar(32),
+  "isGlobal" integer(1) DEFAULT 0,
+  "type" varchar(16),
+  "itemId" integer DEFAULT 0,
+  "ipFrom" varchar(64) DEFAULT 0,
+  "ipTo" varchar(64) DEFAULT 0,
+  "expiredAt" integer DEFAULT 0,
+  "eventLevel" varchar(32),
+  "isDeleted" integer(1) DEFAULT 0,
+  "version" integer DEFAULT 0,
+  "nodeId" integer DEFAULT 0,
+  "serverId" integer DEFAULT 0
+);
+
+CREATE INDEX IF NOT EXISTS "ip_list_itemId"
+ON "` + this.itemTableName + `" (
+  "itemId" ASC
+);
+
+CREATE INDEX IF NOT EXISTS "ip_list_expiredAt"
+ON "` + this.itemTableName + `" (
+  "expiredAt" ASC
+);
+`)
+	if err != nil {
+		return err
+	}
+
+	// 初始化SQL语句
+	this.deleteItemStmt, err = this.db.Prepare(`DELETE FROM "` + this.itemTableName + `" WHERE "itemId"=?`)
+	if err != nil {
+		return err
+	}
+
+	this.insertItemStmt, err = this.db.Prepare(`INSERT INTO "` + this.itemTableName + `" ("listId", "listType", "isGlobal", "type", "itemId", "ipFrom", "ipTo", "expiredAt", "eventLevel", "isDeleted", "version", "nodeId", "serverId") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
+	if err != nil {
+		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 ?, ?`)
+	if err != nil {
+		return err
+	}
+
+	this.db = db
+
+	return nil
+}
+
+func (this *IPListDB) AddItem(item *pb.IPItem) error {
+	_, err := this.deleteItemStmt.Exec(item.Id)
+	if err != nil {
+		return err
+	}
+	_, err = this.insertItemStmt.Exec(item.ListId, item.ListType, item.IsGlobal, item.Type, item.Id, item.IpFrom, item.IpTo, item.ExpiredAt, item.EventLevel, item.IsDeleted, item.Version, item.NodeId, item.ServerId)
+	return err
+}
+
+func (this *IPListDB) ReadItems(offset int64, size int64) (items []*pb.IPItem, err error) {
+	rows, err := this.selectItemsStmt.Query(offset, size)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		_ = rows.Close()
+	}()
+
+	for rows.Next() {
+		//  "listId", "listType", "isGlobal", "type", "itemId", "ipFrom", "ipTo", "expiredAt", "eventLevel", "isDeleted", "version", "nodeId", "serverId"
+		var pbItem = &pb.IPItem{}
+		err = rows.Scan(&pbItem.ListId, &pbItem.ListType, &pbItem.IsGlobal, &pbItem.Type, &pbItem.Id, &pbItem.IpFrom, &pbItem.IpTo, &pbItem.ExpiredAt, &pbItem.EventLevel, &pbItem.IsDeleted, &pbItem.Version, &pbItem.NodeId, &pbItem.ServerId)
+		if err != nil {
+			return nil, err
+		}
+		items = append(items, pbItem)
+	}
+	return
+}
+
+func (this *IPListDB) Close() error {
+	if this.db != nil {
+		_ = this.deleteItemStmt.Close()
+		_ = this.insertItemStmt.Close()
+		_ = this.selectItemsStmt.Close()
+
+		return this.db.Close()
+	}
+	return nil
+}

internal/iplibrary/ip_list_db_test.go

@@ -0,0 +1,60 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package iplibrary
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	_ "github.com/iwind/TeaGo/bootstrap"
+	"github.com/iwind/TeaGo/logs"
+	"testing"
+	"time"
+)
+
+func TestIPListDB_AddItem(t *testing.T) {
+	db, err := NewIPListDB()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = db.AddItem(&pb.IPItem{
+		Id:                            1,
+		IpFrom:                        "192.168.1.101",
+		IpTo:                          "",
+		Version:                       1024,
+		ExpiredAt:                     time.Now().Unix(),
+		Reason:                        "",
+		ListId:                        2,
+		IsDeleted:                     true,
+		Type:                          "ipv4",
+		EventLevel:                    "error",
+		ListType:                      "black",
+		IsGlobal:                      true,
+		CreatedAt:                     0,
+		NodeId:                        11,
+		ServerId:                      22,
+		SourceNodeId:                  0,
+		SourceServerId:                0,
+		SourceHTTPFirewallPolicyId:    0,
+		SourceHTTPFirewallRuleGroupId: 0,
+		SourceHTTPFirewallRuleSetId:   0,
+		SourceServer:                  nil,
+		SourceHTTPFirewallPolicy:      nil,
+		SourceHTTPFirewallRuleGroup:   nil,
+		SourceHTTPFirewallRuleSet:     nil,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}
+
+func TestIPListDB_ReadItems(t *testing.T) {
+	db, err := NewIPListDB()
+	if err != nil {
+		t.Fatal(err)
+	}
+	items, err := db.ReadItems(0, 2)
+	if err != nil {
+		t.Fatal(err)
+	}
+	logs.PrintAsJSON(items, t)
+}

internal/iplibrary/ip_list_test.go

@@ -4,8 +4,11 @@ import (
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/iwind/TeaGo/assert"
 	"github.com/iwind/TeaGo/logs"
+	"github.com/iwind/TeaGo/rands"
 	"runtime"
+	"runtime/debug"
 	"strconv"
+	"sync"
 	"testing"
 	"time"
 )
@@ -16,7 +19,7 @@ func TestIPList_Add_Empty(t *testing.T) {
 		Id: 1,
 	})
 	logs.PrintAsJSON(ipList.itemsMap, t)
-	logs.PrintAsJSON(ipList.ipMap, t)
+	logs.PrintAsJSON(ipList.allItemsMap, t)
 }
 
 func TestIPList_Add_One(t *testing.T) {
@@ -31,15 +34,30 @@ func TestIPList_Add_One(t *testing.T) {
 	})
 	ipList.Add(&IPItem{
 		Id:     3,
-		IPFrom: utils.IP2Long("2001:db8:0:1::101"),
+		IPFrom: utils.IP2Long("192.168.0.2"),
 	})
 	ipList.Add(&IPItem{
 		Id:     4,
+		IPFrom: utils.IP2Long("192.168.0.2"),
+		IPTo:   utils.IP2Long("192.168.0.1"),
+	})
+	ipList.Add(&IPItem{
+		Id:     5,
+		IPFrom: utils.IP2Long("2001:db8:0:1::101"),
+	})
+	ipList.Add(&IPItem{
+		Id:     6,
 		IPFrom: 0,
 		Type:   "all",
 	})
+	t.Log("===items===")
 	logs.PrintAsJSON(ipList.itemsMap, t)
-	logs.PrintAsJSON(ipList.ipMap, t) // ip => items
+
+	t.Log("===sorted items===")
+	logs.PrintAsJSON(ipList.sortedItems, t)
+
+	t.Log("===all items===")
+	logs.PrintAsJSON(ipList.allItemsMap, t) // ip => items
 }
 
 func TestIPList_Update(t *testing.T) {
@@ -50,14 +68,31 @@ func TestIPList_Update(t *testing.T) {
 	})
 	/**ipList.Add(&IPItem{
 		Id:     2,
-		IPFrom: IP2Long("192.168.1.1"),
+		IPFrom: utils.IP2Long("192.168.1.1"),
 	})**/
 	ipList.Add(&IPItem{
 		Id:   1,
 		IPTo: utils.IP2Long("192.168.1.2"),
 	})
 	logs.PrintAsJSON(ipList.itemsMap, t)
-	logs.PrintAsJSON(ipList.ipMap, t)
+	logs.PrintAsJSON(ipList.sortedItems, t)
+}
+
+func TestIPList_Update_AllItems(t *testing.T) {
+	ipList := NewIPList()
+	ipList.Add(&IPItem{
+		Id:     1,
+		Type:   IPItemTypeAll,
+		IPFrom: 0,
+	})
+	ipList.Add(&IPItem{
+		Id:   1,
+		IPTo: 0,
+	})
+	t.Log("===items map===")
+	logs.PrintAsJSON(ipList.itemsMap, t)
+	t.Log("===all items map===")
+	logs.PrintAsJSON(ipList.allItemsMap, t)
 }
 
 func TestIPList_Add_Range(t *testing.T) {
@@ -71,9 +106,9 @@ func TestIPList_Add_Range(t *testing.T) {
 		Id:   2,
 		IPTo: utils.IP2Long("192.168.1.2"),
 	})
-	t.Log(len(ipList.ipMap), "ips")
+	t.Log(len(ipList.itemsMap), "ips")
 	logs.PrintAsJSON(ipList.itemsMap, t)
-	logs.PrintAsJSON(ipList.ipMap, t)
+	logs.PrintAsJSON(ipList.allItemsMap, t)
 }
 
 func TestIPList_Add_Overflow(t *testing.T) {
@@ -85,8 +120,8 @@ func TestIPList_Add_Overflow(t *testing.T) {
 		IPFrom: utils.IP2Long("192.168.1.1"),
 		IPTo:   utils.IP2Long("192.169.255.1"),
 	})
-	t.Log(len(ipList.ipMap), "ips")
-	a.IsTrue(len(ipList.ipMap) <= 65535)
+	t.Log(len(ipList.itemsMap), "ips")
+	a.IsTrue(len(ipList.itemsMap) <= 65535)
 }
 
 func TestNewIPList_Memory(t *testing.T) {
@@ -104,20 +139,50 @@ func TestNewIPList_Memory(t *testing.T) {
 }
 
 func TestIPList_Contains(t *testing.T) {
+	var a = assert.NewAssertion(t)
+
 	list := NewIPList()
 	for i := 0; i < 255; i++ {
-		list.Add(&IPItem{
+		list.AddDelay(&IPItem{
 			Id:        int64(i),
 			IPFrom:    utils.IP2Long(strconv.Itoa(i) + ".168.0.1"),
 			IPTo:      utils.IP2Long(strconv.Itoa(i) + ".168.255.1"),
 			ExpiredAt: 0,
 		})
 	}
-	t.Log(len(list.ipMap), "ip")
+	for i := 0; i < 255; i++ {
+		list.AddDelay(&IPItem{
+			Id:     int64(1000 + i),
+			IPFrom: utils.IP2Long("192.167.2." + strconv.Itoa(i)),
+		})
+	}
+	list.Sort()
+	t.Log(len(list.itemsMap), "ip")
 
 	before := time.Now()
-	t.Log(list.Contains(utils.IP2Long("192.168.1.100")))
-	t.Log(list.Contains(utils.IP2Long("192.168.2.100")))
+	a.IsTrue(list.Contains(utils.IP2Long("192.168.1.100")))
+	a.IsTrue(list.Contains(utils.IP2Long("192.168.2.100")))
+	a.IsFalse(list.Contains(utils.IP2Long("192.169.3.100")))
+	a.IsFalse(list.Contains(utils.IP2Long("192.167.3.100")))
+	a.IsTrue(list.Contains(utils.IP2Long("192.167.2.100")))
+	t.Log(time.Since(before).Seconds()*1000, "ms")
+}
+
+func TestIPList_Contains_Many(t *testing.T) {
+	list := NewIPList()
+	for i := 0; i < 1_000_000; i++ {
+		list.AddDelay(&IPItem{
+			Id:        int64(i),
+			IPFrom:    utils.IP2Long(strconv.Itoa(rands.Int(0, 255)) + "." + strconv.Itoa(rands.Int(0, 255)) + "." + strconv.Itoa(rands.Int(0, 255)) + "." + strconv.Itoa(rands.Int(0, 255))),
+			IPTo:      utils.IP2Long(strconv.Itoa(rands.Int(0, 255)) + "." + strconv.Itoa(rands.Int(0, 255)) + "." + strconv.Itoa(rands.Int(0, 255)) + "." + strconv.Itoa(rands.Int(0, 255))),
+			ExpiredAt: 0,
+		})
+	}
+	list.Sort()
+	t.Log(len(list.itemsMap), "ip")
+
+	before := time.Now()
+	_ = list.Contains(utils.IP2Long("192.168.1.100"))
 	t.Log(time.Since(before).Seconds()*1000, "ms")
 }
 
@@ -146,6 +211,32 @@ func TestIPList_ContainsAll(t *testing.T) {
 
 }
 
+func TestIPList_ContainsIPStrings(t *testing.T) {
+	var a = assert.NewAssertion(t)
+
+	list := NewIPList()
+	for i := 0; i < 255; i++ {
+		list.Add(&IPItem{
+			Id:        int64(i),
+			IPFrom:    utils.IP2Long(strconv.Itoa(i) + ".168.0.1"),
+			IPTo:      utils.IP2Long(strconv.Itoa(i) + ".168.255.1"),
+			ExpiredAt: 0,
+		})
+	}
+	t.Log(len(list.itemsMap), "ip")
+
+	{
+		item, ok := list.ContainsIPStrings([]string{"192.168.1.100"})
+		t.Log("item:", item)
+		a.IsTrue(ok)
+	}
+	{
+		item, ok := list.ContainsIPStrings([]string{"192.167.1.100"})
+		t.Log("item:", item)
+		a.IsFalse(ok)
+	}
+}
+
 func TestIPList_Delete(t *testing.T) {
 	list := NewIPList()
 	list.Add(&IPItem{
@@ -160,13 +251,13 @@ func TestIPList_Delete(t *testing.T) {
 	})
 	t.Log("===BEFORE===")
 	logs.PrintAsJSON(list.itemsMap, t)
-	logs.PrintAsJSON(list.ipMap, t)
+	logs.PrintAsJSON(list.allItemsMap, t)
 
 	list.Delete(1)
 
 	t.Log("===AFTER===")
 	logs.PrintAsJSON(list.itemsMap, t)
-	logs.PrintAsJSON(list.ipMap, t)
+	logs.PrintAsJSON(list.allItemsMap, t)
 }
 
 func TestGC(t *testing.T) {
@@ -184,27 +275,43 @@ func TestGC(t *testing.T) {
 		ExpiredAt: 0,
 	})
 	logs.PrintAsJSON(list.itemsMap, t)
-	logs.PrintAsJSON(list.ipMap, t)
+	logs.PrintAsJSON(list.allItemsMap, t)
 
 	time.Sleep(2 * time.Second)
 	t.Log("===AFTER GC===")
 	logs.PrintAsJSON(list.itemsMap, t)
-	logs.PrintAsJSON(list.ipMap, t)
+	logs.PrintAsJSON(list.sortedItems, t)
+}
+
+func TestTooManyLists(t *testing.T) {
+	debug.SetMaxThreads(20)
+
+	var lists = []*IPList{}
+	var locker = &sync.Mutex{}
+	for i := 0; i < 1000; i++ {
+		locker.Lock()
+		lists = append(lists, NewIPList())
+		locker.Unlock()
+	}
+
+	time.Sleep(1 * time.Second)
+	t.Log(runtime.NumGoroutine())
+	t.Log(len(lists), "lists")
 }
 
 func BenchmarkIPList_Contains(b *testing.B) {
 	runtime.GOMAXPROCS(1)
 
 	list := NewIPList()
-	for i := 192; i < 194; i++ {
+	for i := 1; i < 194; i++ {
 		list.Add(&IPItem{
-			Id:        int64(1),
-			IPFrom:    utils.IP2Long(strconv.Itoa(i) + ".1.0.1"),
-			IPTo:      utils.IP2Long(strconv.Itoa(i) + ".2.0.1"),
+			Id:        int64(i),
+			IPFrom:    utils.IP2Long(strconv.Itoa(i%255) + "." + strconv.Itoa(i%255) + ".0.1"),
+			IPTo:      utils.IP2Long(strconv.Itoa(i%255) + "." + strconv.Itoa(i%255) + ".0.1"),
 			ExpiredAt: time.Now().Unix() + 60,
 		})
 	}
-	b.Log(len(list.ipMap), "ip")
+	b.Log(len(list.itemsMap), "ip")
 	for i := 0; i < b.N; i++ {
 		_ = list.Contains(utils.IP2Long("192.168.1.100"))
 	}

internal/iplibrary/library_interface.go

@@ -1,12 +1,13 @@
 package iplibrary
 
 type LibraryInterface interface {
-	// 加载数据库文件
+	// Load 加载数据库文件
 	Load(dbPath string) error
 
-	// 查询IP
+	// Lookup 查询IP
+	// 返回结果有可能为空
 	Lookup(ip string) (*Result, error)
 
-	// 关闭数据库文件
+	// Close 关闭数据库文件
 	Close()
 }

internal/iplibrary/library_ip2region.go

@@ -4,16 +4,16 @@ import (
 	"fmt"
 	"github.com/TeaOSLab/EdgeNode/internal/errors"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
-	"github.com/lionsoul2014/ip2region/binding/golang/ip2region"
+	"net"
 	"strings"
 )
 
 type IP2RegionLibrary struct {
-	db *ip2region.Ip2Region
+	db *IP2Region
 }
 
 func (this *IP2RegionLibrary) Load(dbPath string) error {
-	db, err := ip2region.New(dbPath)
+	db, err := NewIP2Region(dbPath)
 	if err != nil {
 		return err
 	}
@@ -27,6 +27,9 @@ func (this *IP2RegionLibrary) Lookup(ip string) (*Result, error) {
 	if strings.Contains(ip, ":") {
 		return nil, nil
 	}
+	if net.ParseIP(ip) == nil {
+		return nil, nil
+	}
 
 	if this.db == nil {
 		return nil, errors.New("library has not been loaded")
@@ -45,6 +48,10 @@ func (this *IP2RegionLibrary) Lookup(ip string) (*Result, error) {
 		return nil, err
 	}
 
+	if info == nil {
+		return nil, nil
+	}
+
 	if info.Country == "0" {
 		info.Country = ""
 	}
@@ -72,7 +79,5 @@ func (this *IP2RegionLibrary) Lookup(ip string) (*Result, error) {
 }
 
 func (this *IP2RegionLibrary) Close() {
-	if this.db != nil {
-		this.db.Close()
-	}
+
 }

internal/iplibrary/library_ip2region_test.go

@@ -3,25 +3,83 @@ package iplibrary
 import (
 	"github.com/iwind/TeaGo/Tea"
 	_ "github.com/iwind/TeaGo/bootstrap"
-	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/rands"
 	"runtime"
 	"strconv"
+	"sync"
 	"testing"
 	"time"
 )
 
+func TestIP2RegionLibrary_Lookup_MemoryUsage(t *testing.T) {
+	var mem = &runtime.MemStats{}
+	runtime.ReadMemStats(mem)
+
+	library := &IP2RegionLibrary{}
+	err := library.Load(Tea.Root + "/resources/ipdata/ip2region/ip2region.db")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var mem2 = &runtime.MemStats{}
+	runtime.ReadMemStats(mem2)
+	t.Log((mem2.HeapInuse-mem.HeapInuse)/1024/1024, "MB")
+}
+
+func TestIP2RegionLibrary_Lookup_Single(t *testing.T) {
+	library := &IP2RegionLibrary{}
+	err := library.Load(Tea.Root + "/resources/ipdata/ip2region/ip2region.db")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	for _, ip := range []string{"8.8.9.9"} {
+		result, err := library.Lookup(ip)
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Log("IP:", ip, "result:", result)
+	}
+}
+
 func TestIP2RegionLibrary_Lookup(t *testing.T) {
 	library := &IP2RegionLibrary{}
 	err := library.Load(Tea.Root + "/resources/ipdata/ip2region/ip2region.db")
 	if err != nil {
 		t.Fatal(err)
 	}
-	result, err := library.Lookup("114.240.223.47")
+
+	for _, ip := range []string{"", "a", "1.1.1", "192.168.1.100", "114.240.223.47", "8.8.9.9", "::1"} {
+		result, err := library.Lookup(ip)
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Log("IP:", ip, "result:", result)
+	}
+}
+
+func TestIP2RegionLibrary_Lookup_Concurrent(t *testing.T) {
+	library := &IP2RegionLibrary{}
+	err := library.Load(Tea.Root + "/resources/ipdata/ip2region/ip2region.db")
 	if err != nil {
 		t.Fatal(err)
 	}
-	logs.PrintAsJSON(result, t)
+
+	var count = 4000
+	var wg = sync.WaitGroup{}
+	wg.Add(count)
+	for i := 0; i < count; i++ {
+		go func() {
+			defer wg.Done()
+
+			for i := 0; i < 100; i++ {
+				_, _ = library.Lookup(strconv.Itoa(rands.Int(0, 254)) + "." + strconv.Itoa(rands.Int(0, 254)) + "." + strconv.Itoa(rands.Int(0, 254)) + "." + strconv.Itoa(rands.Int(0, 254)))
+			}
+		}()
+	}
+
+	wg.Done()
+	t.Log("ok")
 }
 
 func TestIP2RegionLibrary_Memory(t *testing.T) {
@@ -43,13 +101,13 @@ func TestIP2RegionLibrary_Memory(t *testing.T) {
 func BenchmarkIP2RegionLibrary_Lookup(b *testing.B) {
 	runtime.GOMAXPROCS(1)
 
-	library := &IP2RegionLibrary{}
+	var library = &IP2RegionLibrary{}
 	err := library.Load(Tea.Root + "/resources/ipdata/ip2region/ip2region.db")
 	if err != nil {
 		b.Fatal(err)
 	}
 
 	for i := 0; i < b.N; i++ {
-		_, _ = library.Lookup(strconv.Itoa(rands.Int(0, 254)) + "." + strconv.Itoa(rands.Int(0, 254)) + "." + strconv.Itoa(rands.Int(0, 254)) + "." + strconv.Itoa(rands.Int(0, 254)))
+		_, _ = library.Lookup("8.8.8.8")
 	}
 }

internal/iplibrary/list_utils.go

@@ -0,0 +1,55 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package iplibrary
+
+import (
+	"github.com/TeaOSLab/EdgeNode/internal/utils"
+)
+
+// AllowIP 检查IP是否被允许访问
+func AllowIP(ip string, serverId int64) bool {
+	var ipLong = utils.IP2Long(ip)
+	if ipLong == 0 {
+		return false
+	}
+
+	// check white lists
+	if GlobalWhiteIPList.Contains(ipLong) {
+		return true
+	}
+
+	if serverId > 0 {
+		var list = SharedServerListManager.FindWhiteList(serverId, false)
+		if list != nil && list.Contains(ipLong) {
+			return true
+		}
+	}
+
+	// check black lists
+	if GlobalBlackIPList.Contains(ipLong) {
+		return false
+	}
+
+	if serverId > 0 {
+		var list = SharedServerListManager.FindBlackList(serverId, false)
+		if list != nil && list.Contains(ipLong) {
+			return false
+		}
+	}
+
+	return true
+}
+
+// AllowIPStrings 检查一组IP是否被允许访问
+func AllowIPStrings(ipStrings []string, serverId int64) bool {
+	if len(ipStrings) == 0 {
+		return true
+	}
+	for _, ip := range ipStrings {
+		isAllowed := AllowIP(ip, serverId)
+		if !isAllowed {
+			return false
+		}
+	}
+	return true
+}

internal/iplibrary/list_utils_test.go

@@ -0,0 +1,20 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package iplibrary
+
+import (
+	"testing"
+	"time"
+)
+
+func TestIPIsAllowed(t *testing.T) {
+	manager := NewIPListManager()
+	manager.init()
+
+	var before = time.Now()
+	defer func() {
+		t.Log(time.Since(before).Seconds()*1000, "ms")
+	}()
+	t.Log(AllowIP("127.0.0.1", 0))
+	t.Log(AllowIP("127.0.0.1", 23))
+}

internal/iplibrary/manager.go

@@ -5,9 +5,9 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/TeaOSLab/EdgeNode/internal/errors"
 	"github.com/TeaOSLab/EdgeNode/internal/events"
+	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/files"
-	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/types"
 	"regexp"
 	"strings"
@@ -21,7 +21,7 @@ func init() {
 		// 初始化
 		library, err := SharedManager.Load()
 		if err != nil {
-			logs.Println("[IP_LIBRARY]" + err.Error())
+			remotelogs.ErrorObject("IP_LIBRARY", err)
 			return
 		}
 		SharedLibrary = library

internal/iplibrary/manager_country.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"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/TeaOSLab/EdgeNode/internal/rpc"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
@@ -20,12 +21,14 @@ import (
 var SharedCountryManager = NewCountryManager()
 
 func init() {
-	events.On(events.EventStart, func() {
-		go SharedCountryManager.Start()
+	events.On(events.EventLoaded, func() {
+		goman.New(func() {
+			SharedCountryManager.Start()
+		})
 	})
 }
 
-// 国家信息管理
+// CountryManager 国家/地区信息管理
 type CountryManager struct {
 	cacheFile string
 
@@ -46,13 +49,13 @@ func (this *CountryManager) Start() {
 	// 从缓存中读取
 	err := this.load()
 	if err != nil {
-		remotelogs.Error("COUNTRY_MANAGER", err.Error())
+		remotelogs.ErrorObject("COUNTRY_MANAGER", err)
 	}
 
 	// 第一次更新
 	err = this.loop()
 	if err != nil {
-		remotelogs.Error("COUNTRY_MANAGER", err.Error())
+		remotelogs.ErrorObject("COUNTRY_MANAGER", err)
 	}
 
 	// 定时更新
@@ -60,10 +63,10 @@ func (this *CountryManager) Start() {
 	events.On(events.EventQuit, func() {
 		ticker.Stop()
 	})
-	for range ticker.C {
+	for ticker.Next() {
 		err := this.loop()
 		if err != nil {
-			remotelogs.Error("COUNTRY_MANAGER", err.Error())
+			remotelogs.ErrorObject("COUNTRY_MANAGER", err)
 		}
 	}
 }

internal/iplibrary/manager_ip_list.go

@@ -3,9 +3,12 @@ package iplibrary
 import (
 	"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/TeaOSLab/EdgeNode/internal/rpc"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"github.com/TeaOSLab/EdgeNode/internal/waf"
+	"github.com/TeaOSLab/EdgeNode/internal/zero"
 	"github.com/iwind/TeaGo/Tea"
 	"sync"
 	"time"
@@ -15,16 +18,16 @@ var SharedIPListManager = NewIPListManager()
 var IPListUpdateNotify = make(chan bool, 1)
 
 func init() {
-	events.On(events.EventStart, func() {
-		go SharedIPListManager.Start()
+	events.On(events.EventLoaded, func() {
+		goman.New(func() {
+			SharedIPListManager.Start()
+		})
 	})
 }
 
-// IP名单管理
+// IPListManager IP名单管理
 type IPListManager struct {
-	// 缓存文件
-	// 每行一个数据：id|from|to|expiredAt
-	cacheFile string
+	db *IPListDB
 
 	version  int64
 	pageSize int64
@@ -35,22 +38,24 @@ type IPListManager struct {
 
 func NewIPListManager() *IPListManager {
 	return &IPListManager{
-		cacheFile: Tea.Root + "/configs/ip_list.cache",
-		pageSize:  1000,
-		listMap:   map[int64]*IPList{},
+		pageSize: 500,
+		listMap:  map[int64]*IPList{},
 	}
 }
 
 func (this *IPListManager) Start() {
-	// TODO 从缓存当中读取数据
+	this.init()
 
 	// 第一次读取
 	err := this.loop()
 	if err != nil {
-		remotelogs.Println("IP_LIST_MANAGER", err.Error())
+		remotelogs.ErrorObject("IP_LIST_MANAGER", err)
 	}
 
 	ticker := time.NewTicker(60 * time.Second)
+	if Tea.IsTesting() {
+		ticker = time.NewTicker(10 * time.Second)
+	}
 	events.On(events.EventQuit, func() {
 		ticker.Stop()
 	})
@@ -64,7 +69,7 @@ func (this *IPListManager) Start() {
 		if err != nil {
 			countErrors++
 
-			remotelogs.Println("IP_LIST_MANAGER", err.Error())
+			remotelogs.ErrorObject("IP_LIST_MANAGER", err)
 
 			// 连续错误小于3次的我们立即重试
 			if countErrors <= 3 {
@@ -79,6 +84,31 @@ func (this *IPListManager) Start() {
 	}
 }
 
+func (this *IPListManager) init() {
+	// 从数据库中当中读取数据
+	db, err := NewIPListDB()
+	if err != nil {
+		remotelogs.Error("IP_LIST_MANAGER", "create ip list local database failed: "+err.Error())
+	} else {
+		this.db = db
+
+		var offset int64 = 0
+		var size int64 = 1000
+		for {
+			items, err := db.ReadItems(offset, size)
+			if err != nil {
+				remotelogs.Error("IP_LIST_MANAGER", "read ip list from local database failed: "+err.Error())
+			} else {
+				if len(items) == 0 {
+					break
+				}
+				this.processItems(items, false)
+			}
+			offset += int64(len(items))
+		}
+	}
+}
+
 func (this *IPListManager) loop() error {
 	for {
 		hasNext, err := this.fetch()
@@ -88,10 +118,9 @@ func (this *IPListManager) loop() error {
 		if !hasNext {
 			break
 		}
+		time.Sleep(1 * time.Second)
 	}
 
-	// TODO 写入到缓存当中
-
 	return nil
 }
 
@@ -111,37 +140,18 @@ func (this *IPListManager) fetch() (hasNext bool, err error) {
 	if len(items) == 0 {
 		return false, nil
 	}
-	this.locker.Lock()
-	for _, item := range items {
-		list, ok := this.listMap[item.ListId]
-		if !ok {
-			list = NewIPList()
-			this.listMap[item.ListId] = list
+
+	// 保存到本地数据库
+	if this.db != nil {
+		for _, item := range items {
+			err = this.db.AddItem(item)
+			if err != nil {
+				remotelogs.Error("IP_LIST_MANAGER", "insert item to local database failed: "+err.Error())
+			}
 		}
-		if item.IsDeleted {
-			list.Delete(item.Id)
-
-			// 操作事件
-			SharedActionManager.DeleteItem(item.ListType, item)
-
-			continue
-		}
-
-		list.Add(&IPItem{
-			Id:         item.Id,
-			Type:       item.Type,
-			IPFrom:     utils.IP2Long(item.IpFrom),
-			IPTo:       utils.IP2Long(item.IpTo),
-			ExpiredAt:  item.ExpiredAt,
-			EventLevel: item.EventLevel,
-		})
-
-		// 事件操作
-		SharedActionManager.DeleteItem(item.ListType, item)
-		SharedActionManager.AddItem(item.ListType, item)
 	}
-	this.locker.Unlock()
-	this.version = items[len(items)-1].Version
+
+	this.processItems(items, true)
 
 	return true, nil
 }
@@ -152,3 +162,71 @@ func (this *IPListManager) FindList(listId int64) *IPList {
 	this.locker.Unlock()
 	return list
 }
+
+func (this *IPListManager) processItems(items []*pb.IPItem, shouldExecute bool) {
+	this.locker.Lock()
+	var changedLists = map[*IPList]zero.Zero{}
+	for _, item := range items {
+		var list *IPList
+		// TODO 实现节点专有List
+		if item.ServerId > 0 { // 服务专有List
+			switch item.ListType {
+			case "black":
+				list = SharedServerListManager.FindBlackList(item.ServerId, true)
+			case "white":
+				list = SharedServerListManager.FindWhiteList(item.ServerId, true)
+			}
+		} else if item.IsGlobal { // 全局List
+			switch item.ListType {
+			case "black":
+				list = GlobalBlackIPList
+			case "white":
+				list = GlobalWhiteIPList
+			}
+		} else { // 其他List
+			list = this.listMap[item.ListId]
+		}
+		if list == nil {
+			list = NewIPList()
+			this.listMap[item.ListId] = list
+		}
+
+		changedLists[list] = zero.New()
+
+		if item.IsDeleted {
+			list.Delete(item.Id)
+
+			// 从WAF名单中删除
+			waf.SharedIPBlackList.RemoveIP(item.IpFrom, item.ServerId)
+
+			// 操作事件
+			if shouldExecute {
+				SharedActionManager.DeleteItem(item.ListType, item)
+			}
+
+			continue
+		}
+
+		list.AddDelay(&IPItem{
+			Id:         item.Id,
+			Type:       item.Type,
+			IPFrom:     utils.IP2Long(item.IpFrom),
+			IPTo:       utils.IP2Long(item.IpTo),
+			ExpiredAt:  item.ExpiredAt,
+			EventLevel: item.EventLevel,
+		})
+
+		// 事件操作
+		if shouldExecute {
+			SharedActionManager.DeleteItem(item.ListType, item)
+			SharedActionManager.AddItem(item.ListType, item)
+		}
+	}
+
+	for changedList := range changedLists {
+		changedList.Sort()
+	}
+
+	this.locker.Unlock()
+	this.version = items[len(items)-1].Version
+}

internal/iplibrary/manager_ip_list_test.go

@@ -1,10 +1,36 @@
 package iplibrary
 
-import "testing"
+import (
+	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"github.com/iwind/TeaGo/logs"
+	"testing"
+	"time"
+)
+
+func TestIPListManager_init(t *testing.T) {
+	manager := NewIPListManager()
+	manager.init()
+	t.Log(manager.listMap)
+	t.Log(SharedServerListManager.blackMap)
+	logs.PrintAsJSON(GlobalBlackIPList.sortedItems, t)
+}
+
+func TestIPListManager_check(t *testing.T) {
+	manager := NewIPListManager()
+	manager.init()
+
+	var before = time.Now()
+	defer func() {
+		t.Log(time.Since(before).Seconds()*1000, "ms")
+	}()
+	t.Log(SharedServerListManager.FindBlackList(23, true).Contains(utils.IP2Long("127.0.0.2")))
+	t.Log(GlobalBlackIPList.Contains(utils.IP2Long("127.0.0.6")))
+}
 
 func TestIPListManager_loop(t *testing.T) {
 	manager := NewIPListManager()
-	manager.pageSize = 2
+	manager.Start()
+	manager.pageSize = 10
 	err := manager.loop()
 	if err != nil {
 		t.Fatal(err)

internal/iplibrary/manager_province.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"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/TeaOSLab/EdgeNode/internal/rpc"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
@@ -24,12 +25,14 @@ const (
 var SharedProvinceManager = NewProvinceManager()
 
 func init() {
-	events.On(events.EventStart, func() {
-		go SharedProvinceManager.Start()
+	events.On(events.EventLoaded, func() {
+		goman.New(func() {
+			SharedProvinceManager.Start()
+		})
 	})
 }
 
-// 国家信息管理
+// ProvinceManager 中国省份信息管理
 type ProvinceManager struct {
 	cacheFile string
 
@@ -50,13 +53,13 @@ func (this *ProvinceManager) Start() {
 	// 从缓存中读取
 	err := this.load()
 	if err != nil {
-		remotelogs.Error("PROVINCE_MANAGER", err.Error())
+		remotelogs.ErrorObject("PROVINCE_MANAGER", err)
 	}
 
 	// 第一次更新
 	err = this.loop()
 	if err != nil {
-		remotelogs.Error("PROVINCE_MANAGER", err.Error())
+		remotelogs.ErrorObject("PROVINCE_MANAGER", err)
 	}
 
 	// 定时更新
@@ -64,10 +67,10 @@ func (this *ProvinceManager) Start() {
 	events.On(events.EventQuit, func() {
 		ticker.Stop()
 	})
-	for range ticker.C {
+	for ticker.Next() {
 		err := this.loop()
 		if err != nil {
-			remotelogs.Error("PROVINCE_MANAGER", err.Error())
+			remotelogs.ErrorObject("PROVINCE_MANAGER", err)
 		}
 	}
 }

internal/iplibrary/server_list_manager.go

@@ -0,0 +1,61 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package iplibrary
+
+import "sync"
+
+var SharedServerListManager = NewServerListManager()
+
+// ServerListManager 服务相关名单
+type ServerListManager struct {
+	whiteMap map[int64]*IPList // serverId => *List
+	blackMap map[int64]*IPList // serverId => *List
+
+	locker sync.RWMutex
+}
+
+func NewServerListManager() *ServerListManager {
+	return &ServerListManager{
+		whiteMap: map[int64]*IPList{},
+		blackMap: map[int64]*IPList{},
+	}
+}
+
+func (this *ServerListManager) FindWhiteList(serverId int64, autoCreate bool) *IPList {
+	this.locker.RLock()
+	list, ok := this.whiteMap[serverId]
+	this.locker.RUnlock()
+	if ok {
+		return list
+	}
+
+	if autoCreate {
+		list = NewIPList()
+		this.locker.Lock()
+		this.whiteMap[serverId] = list
+		this.locker.Unlock()
+
+		return list
+	}
+	return nil
+}
+
+func (this *ServerListManager) FindBlackList(serverId int64, autoCreate bool) *IPList {
+	this.locker.RLock()
+	list, ok := this.blackMap[serverId]
+	this.locker.RUnlock()
+	if ok {
+		return list
+	}
+
+	if autoCreate {
+		list = NewIPList()
+		this.locker.Lock()
+		this.blackMap[serverId] = list
+		this.locker.Unlock()
+
+		return list
+	}
+
+	return nil
+}

internal/iplibrary/updater.go

@@ -7,9 +7,10 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/TeaOSLab/EdgeNode/internal/errors"
 	"github.com/TeaOSLab/EdgeNode/internal/events"
+	"github.com/TeaOSLab/EdgeNode/internal/goman"
+	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/TeaOSLab/EdgeNode/internal/rpc"
 	"github.com/iwind/TeaGo/Tea"
-	"github.com/iwind/TeaGo/logs"
 	"os"
 	"time"
 )
@@ -21,27 +22,27 @@ func init() {
 	})
 }
 
-// IP库更新程序
+// Updater IP库更新程序
 type Updater struct {
 }
 
-// 获取新对象
+// NewUpdater 获取新对象
 func NewUpdater() *Updater {
 	return &Updater{}
 }
 
-// 开始更新
+// Start 开始更新
 func (this *Updater) Start() {
 	// 这里不需要太频繁检查更新，因为通常不需要更新IP库
 	ticker := time.NewTicker(1 * time.Hour)
-	go func() {
+	goman.New(func() {
 		for range ticker.C {
 			err := this.loop()
 			if err != nil {
-				logs.Println("[IP_LIBRARY]" + err.Error())
+				remotelogs.ErrorObject("IP_LIBRARY", err)
 			}
 		}
-	}()
+	})
 }
 
 // 单次任务

internal/js/console.go

@@ -0,0 +1,50 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package js
+
+import (
+	"encoding/json"
+	"github.com/iwind/TeaGo/logs"
+	"reflect"
+)
+
+type Console struct {
+}
+
+func (this *Console) Log(args ...interface{}) {
+	for index, arg := range args {
+		if arg != nil {
+			switch arg.(type) {
+			case bool, int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64, string:
+			default:
+				var argType = reflect.TypeOf(arg)
+
+				// 是否有String()方法，如果有直接调用
+				method, ok := argType.MethodByName("String")
+				if ok && method.Type.NumIn() == 1 && method.Type.NumOut() == 1 && method.Type.Out(0).Kind() == reflect.String {
+					args[index] = method.Func.Call([]reflect.Value{reflect.ValueOf(arg)})[0].String()
+					continue
+				}
+
+				// 转为JSON
+				argJSON, err := this.toJSON(arg)
+				if err != nil {
+					if argType.Kind() == reflect.Func {
+						args[index] = "[function]"
+					} else {
+						args[index] = "[object]"
+					}
+				} else {
+					args[index] = string(argJSON)
+				}
+			}
+		} else {
+			args[index] = "null"
+		}
+	}
+	logs.Println(append([]interface{}{"[js][console]"}, args...)...)
+}
+
+func (this *Console) toJSON(o interface{}) ([]byte, error) {
+	return json.Marshal(o)
+}

internal/js/console_test.go

@@ -0,0 +1,38 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package js
+
+import (
+	"testing"
+)
+
+func TestConsole_Log(t *testing.T) {
+	{
+		vm := NewVM()
+		_, err := vm.RunString("console.log('Hello', 'world')")
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+	{
+		vm := NewVM()
+		_, err := vm.RunString("console.log(null, true, false, 10, 10.123)")
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+	{
+		vm := NewVM()
+		_, err := vm.RunString("console.log({ a:1, b:2 })")
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+	{
+		vm := NewVM()
+		_, err := vm.RunString("console.log(console.log)")
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+}

internal/js/http.go

@@ -0,0 +1,36 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package js
+
+type HTTP struct {
+	r RequestInterface
+
+	req  *Request
+	resp *Response
+
+	onRequest func(req *Request, resp *Response)
+}
+
+func NewHTTP(r RequestInterface) *HTTP {
+	return &HTTP{
+		req:  NewRequest(r),
+		resp: NewResponse(r),
+	}
+}
+
+func (this *HTTP) OnRequest(callback func(req *Request, resp *Response)) {
+	// TODO 考虑是否支持多个callback
+	this.onRequest = callback
+}
+
+func (this *HTTP) OnData(callback func(req *Request, resp *Response)) {
+	// TODO
+}
+
+func (this *HTTP) OnResponse(callback func(req *Request, resp *Response)) {
+	// TODO
+}
+
+func (this *HTTP) TriggerRequest() {
+	this.onRequest(this.req, this.resp)
+}

internal/js/request.go

@@ -0,0 +1,82 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package js
+
+import (
+	"bytes"
+	"io/ioutil"
+	"net"
+)
+
+type Request struct {
+	r RequestInterface
+}
+
+func NewRequest(r RequestInterface) *Request {
+	return &Request{
+		r: r,
+	}
+}
+
+func (this *Request) Proto() string {
+	return this.r.JSRequest().Proto
+}
+
+func (this *Request) Method() string {
+	return this.r.JSRequest().Method
+}
+
+func (this *Request) Header() map[string][]string {
+	return this.r.JSRequest().Header
+}
+
+func (this *Request) AddHeader(name string, value string) {
+	this.r.JSRequest().Header[name] = append(this.r.JSRequest().Header[name], value)
+}
+
+func (this *Request) SetHeader(name string, value string) {
+	this.r.JSRequest().Header[name] = []string{value}
+}
+
+func (this *Request) RemoteAddr() string {
+	var remoteAddr = this.r.JSRequest().RemoteAddr
+	host, _, err := net.SplitHostPort(remoteAddr)
+	if err == nil {
+		return host
+	}
+	return remoteAddr
+}
+
+func (this *Request) Url() *URL {
+	return NewURL(this.r.JSRequest().URL)
+}
+
+func (this *Request) ContentLength() int64 {
+	return this.r.JSRequest().ContentLength
+}
+
+func (this *Request) Body() []byte {
+	var bodyReader = this.r.JSRequest().Body
+	if bodyReader == nil {
+		return []byte{}
+	}
+	data, err := ioutil.ReadAll(bodyReader)
+	if err != nil {
+		this.r.JSLog("read body failed: " + err.Error())
+	}
+	return data
+}
+
+func (this *Request) CopyBody() []byte {
+	var bodyReader = this.r.JSRequest().Body
+	if bodyReader == nil {
+		return []byte{}
+	}
+
+	data, err := ioutil.ReadAll(bodyReader)
+	if err != nil {
+		this.r.JSLog("read body failed: " + err.Error())
+	}
+	this.r.JSRequest().Body = ioutil.NopCloser(bytes.NewReader(data))
+	return data
+}

internal/js/request_interface.go

@@ -0,0 +1,19 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package js
+
+import "net/http"
+
+type RequestInterface interface {
+	// JSRequest 请求
+	JSRequest() *http.Request
+
+	// JSWriter 响应
+	JSWriter() http.ResponseWriter
+
+	// JSStop 中止请求
+	JSStop()
+
+	// JSLog 打印日志
+	JSLog(msg ...interface{})
+}