修复连接快速关闭时数据可能无法完整传输的问题

.gitignore

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

build/build.sh

@@ -7,6 +7,7 @@ function build() {
 	DIST=$ROOT/"../dist/${NAME}"
 	OS=${1}
 	ARCH=${2}
+	TAG=${3}
 
 	if [ -z $OS ]; then
 		echo "usage: build.sh OS ARCH"
@@ -16,6 +17,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 +28,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
@@ -66,6 +70,10 @@ function build() {
 			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++"
@@ -76,9 +84,9 @@ function build() {
 		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 -o $DIST/bin/${NAME} -ldflags "-linkmode external -extldflags -static -s -w" $ROOT/../cmd/edge-node/main.go
+		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 -o $DIST/bin/${NAME} -ldflags="-s -w" $ROOT/../cmd/edge-node/main.go
+		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
@@ -110,4 +118,4 @@ function lookup-version() {
 	fi
 }
 
-build $1 $2
+build $1 $2 $3

build/data/.gitignore

@@ -1 +1 @@
-index.*
+*

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

@@ -5,15 +5,12 @@ import (
 	"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/logs"
-	"github.com/iwind/TeaGo/types"
-	"io/ioutil"
+	"github.com/iwind/gosock/pkg/gosock"
 	"net/http"
 	_ "net/http/pprof"
 	"os"
-	"syscall"
 )
 
 func main() {
@@ -40,25 +37,13 @@ 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
-		}
-
-		process, err := os.FindProcess(pid)
-		if err != nil {
-			return
-		}
-		if process != nil {
-			_ = process.Signal(syscall.SIGQUIT)
-		}
+		fmt.Println("done")
 	})
 	app.On("pprof", func() {
 		// TODO 自己指定端口

go.mod

@@ -7,18 +7,28 @@ 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/dop251/goja v0.0.0-20210804101310-32956a348b49
 	github.com/go-ole/go-ole v1.2.4 // indirect
 	github.com/go-yaml/yaml v2.1.0+incompatible
 	github.com/golang/protobuf v1.5.2
-	github.com/iwind/TeaGo v0.0.0-20210411134150-ddf57e240c2f
+	github.com/iwind/TeaGo v0.0.0-20210628135026-38575a4ab060
 	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/lionsoul2014/ip2region v2.2.0-release+incompatible
-	github.com/mattn/go-sqlite3 v1.14.7
+	github.com/mattn/go-sqlite3 v2.0.3+incompatible
+	github.com/miekg/dns v1.1.43
 	github.com/mssola/user_agent v0.5.2
+	github.com/pires/go-proxyproto v0.6.1
 	github.com/shirou/gopsutil v3.21.5+incompatible
 	github.com/tklauser/go-sysconf v0.3.6 // indirect
+	golang.org/x/image v0.0.0-20190802002840-cff245a6509b
 	golang.org/x/net v0.0.0-20210614182718-04defd469f4e
 	golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
 	golang.org/x/text v0.3.6

go.sum

@@ -7,21 +7,33 @@ 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/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/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=
@@ -33,6 +45,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2
 github.com/go-ole/go-ole v1.2.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=
@@ -48,7 +62,6 @@ 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.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
@@ -57,30 +70,40 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
 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/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/iwind/TeaGo v0.0.0-20210411134150-ddf57e240c2f h1:r2O8PONj/KiuZjJHVHn7KlCePUIjNtgAmvLfgRafQ8o=
-github.com/iwind/TeaGo v0.0.0-20210411134150-ddf57e240c2f/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/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/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.7 h1:fxWBnXkxfM6sRiuH3bqJ4CfzZojMOLVc0UTsTglEghA=
-github.com/mattn/go-sqlite3 v1.14.7/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/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 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/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=
@@ -91,11 +114,11 @@ 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/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/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
@@ -117,6 +140,7 @@ golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL
 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/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=
@@ -134,8 +158,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 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-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=
@@ -143,6 +167,7 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG
 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-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=
@@ -155,10 +180,9 @@ 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-20210316164454-77fc1eacc6aa h1:ZYxPR6aca/uhfRJyaOAtflSHjJYiktO7QnJC5ut7iY4=
+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=
@@ -167,7 +191,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7s
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/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=
@@ -184,15 +207,14 @@ golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapK
 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-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=
@@ -201,7 +223,6 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
 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.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0=
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
@@ -213,15 +234,15 @@ 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=
 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=

internal/apps/app_cmd.go

@@ -2,8 +2,11 @@ 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"
@@ -11,7 +14,7 @@ import (
 	"time"
 )
 
-// App命令帮助
+// AppCmd App命令帮助
 type AppCmd struct {
 	product       string
 	version       string
@@ -20,10 +23,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 +38,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 +65,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 +110,7 @@ func (this *AppCmd) Print() {
 	}
 }
 
-// 添加指令
+// On 添加指令
 func (this *AppCmd) On(arg string, callback func()) {
 	this.directives = append(this.directives, &Directive{
 		Arg:      arg,
@@ -111,7 +118,7 @@ func (this *AppCmd) On(arg string, callback func()) {
 	})
 }
 
-// 运行
+// Run 运行
 func (this *AppCmd) Run(main func()) {
 	// 获取参数
 	args := os.Args[1:]
@@ -161,7 +168,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,12 +178,14 @@ 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])
 	err := cmd.Start()
 	if err != nil {
@@ -189,18 +198,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 +218,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"
+	"path/filepath"
+	"runtime"
+	"strconv"
 )
 
 type LogWriter struct {
@@ -34,7 +38,24 @@ func (this *LogWriter) Init() {
 }
 
 func (this *LogWriter) Write(message string) {
-	log.Println(message)
+	// 文件和行号
+	var callDepth = 2
+	var file string
+	var line int
+	var ok bool
+	_, file, line, ok = runtime.Caller(callDepth)
+	if ok {
+		file = filepath.Base(file)
+	}
+
+	backgroundEnv, _ := os.LookupEnv("EdgeBackground")
+	if backgroundEnv != "on" {
+		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")

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/item.go

@@ -27,7 +27,7 @@ func (this *Item) IsExpired() bool {
 }
 
 func (this *Item) TotalSize() int64 {
-	return this.Size() + this.MetaSize + int64(len(this.Key)) + 64
+	return this.Size() + this.MetaSize + int64(len(this.Key)) + int64(len(this.Host)) + 64
 }
 
 func (this *Item) Size() int64 {

internal/caches/list_file.go

@@ -5,6 +5,7 @@ package caches
 import (
 	"database/sql"
 	"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/mattn/go-sqlite3"
@@ -35,10 +36,15 @@ type FileList struct {
 	itemsTableName string
 
 	isClosed bool
+
+	memoryCache *ttlcache.Cache
 }
 
 func NewFileList(dir string) ListInterface {
-	return &FileList{dir: dir}
+	return &FileList{
+		dir:         dir,
+		memoryCache: ttlcache.NewCache(),
+	}
 }
 
 func (this *FileList) Init() error {
@@ -54,7 +60,12 @@ func (this *FileList) Init() error {
 
 	this.itemsTableName = "cacheItems_v2"
 
-	db, err := sql.Open("sqlite3", "file:"+this.dir+"/index.db?cache=shared&mode=rwc&_journal_mode=WAL")
+	var dir = this.dir
+	if dir == "/" {
+		// 防止sqlite提示authority错误
+		dir = ""
+	}
+	db, err := sql.Open("sqlite3", "file:"+dir+"/index.db?cache=shared&mode=rwc&_journal_mode=WAL")
 	if err != nil {
 		return err
 	}
@@ -95,7 +106,7 @@ func (this *FileList) Init() error {
 	this.total = total
 
 	// 常用语句
-	this.existsByHashStmt, err = this.db.Prepare(`SELECT "bodySize" FROM "` + this.itemsTableName + `" WHERE "hash"=? AND expiredAt>? LIMIT 1`)
+	this.existsByHashStmt, err = this.db.Prepare(`SELECT "expiredAt" FROM "` + this.itemsTableName + `" WHERE "hash"=? AND expiredAt>? LIMIT 1`)
 	if err != nil {
 		return err
 	}
@@ -115,7 +126,7 @@ func (this *FileList) Init() error {
 		return err
 	}
 
-	this.statStmt, err = this.db.Prepare(`SELECT COUNT(*), IFNULL(SUM(headerSize+bodySize+metaSize), 0), IFNULL(SUM(headerSize+bodySize), 0) FROM "` + this.itemsTableName + `" WHERE expiredAt>?`)
+	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
 	}
@@ -161,6 +172,11 @@ func (this *FileList) Exist(hash string) (bool, error) {
 		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
@@ -169,6 +185,12 @@ func (this *FileList) Exist(hash string) (bool, error) {
 		_ = 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
@@ -184,6 +206,10 @@ func (this *FileList) CleanPrefix(prefix string) error {
 		return nil
 	}
 
+	defer func() {
+		this.memoryCache.Clean()
+	}()
+
 	var count = int64(10000)
 	for {
 		result, err := this.db.Exec(`UPDATE "`+this.itemsTableName+`" SET expiredAt=0 WHERE id IN (SELECT id FROM "`+this.itemsTableName+`" WHERE expiredAt>0 AND createdAt<=? AND INSTR("key", ?)=1 LIMIT `+strconv.FormatInt(count, 10)+`)`, utils.UnixTime(), prefix)
@@ -205,6 +231,9 @@ func (this *FileList) Remove(hash string) error {
 		return nil
 	}
 
+	// 从缓存中删除
+	this.memoryCache.Delete(hash)
+
 	row := this.selectByHashStmt.QueryRow(hash)
 	if row.Err() != nil {
 		return row.Err()
@@ -283,6 +312,8 @@ func (this *FileList) CleanAll() error {
 		return nil
 	}
 
+	this.memoryCache.Clean()
+
 	_, err := this.deleteAllStmt.Exec()
 	if err != nil {
 		return err
@@ -297,7 +328,7 @@ func (this *FileList) Stat(check func(hash string) bool) (*Stat, error) {
 	}
 
 	// 这里不设置过期时间、不使用 check 函数，目的是让查询更快速一些
-	row := this.statStmt.QueryRow(time.Now().Unix())
+	row := this.statStmt.QueryRow()
 	if row.Err() != nil {
 		return nil, row.Err()
 	}
@@ -329,6 +360,8 @@ func (this *FileList) OnRemove(f func(item *Item)) {
 func (this *FileList) Close() error {
 	this.isClosed = true
 
+	this.memoryCache.Destroy()
+
 	if this.db != nil {
 		_ = this.existsByHashStmt.Close()
 		_ = this.insertStmt.Close()

internal/caches/list_file_test.go

@@ -50,7 +50,7 @@ func TestFileList_Add_Many(t *testing.T) {
 	}
 	before := time.Now()
 	for i := 0; i < 2000_0000; i++ {
-		u := "http://edge.teaos.cn/123456" + strconv.Itoa(i)
+		u := "https://edge.teaos.cn/123456" + strconv.Itoa(i)
 		_ = list.Add(stringutil.Md5(u), &Item{
 			Key:        u,
 			ExpiredAt:  time.Now().Unix() + 3600,

internal/caches/manager.go

@@ -5,6 +5,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/iwind/TeaGo/lists"
+	"github.com/iwind/TeaGo/types"
 	"strconv"
 	"sync"
 )
@@ -162,3 +163,25 @@ func (this *Manager) TotalMemorySize() int64 {
 	}
 	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_file.go

@@ -34,13 +34,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 +42,18 @@ func (this *FileReader) Init() error {
 	if !ok {
 		return ErrNotFound
 	}
-	status := types.Int(string(buf))
+
+	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 +61,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)

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/storage_memory_test.go

@@ -1,9 +1,12 @@
 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"
@@ -265,3 +268,38 @@ func TestMemoryStorage_Locker(t *testing.T) {
 	}
 	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_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_gzip.go

@@ -1,76 +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/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.2.3"
+	Version = "0.3.3"
 
 	ProductName = "Edge Node"
 	ProcessName = "edge-node"

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:

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,24 +3,26 @@ package iplibrary
 import (
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/TeaOSLab/EdgeNode/internal/utils/expires"
+	"sort"
 	"sync"
 )
 
-// IP名单
+// IPList IP名单
+// TODO IP名单可以分片关闭，这样让每一片的数据量减少，查询更快
 type IPList struct {
-	itemsMap   map[int64]*IPItem  // id => item
-	ipMap      map[uint64][]int64 // ip => itemIds
-	expireList *expires.List
+	itemsMap    map[int64]*IPItem // id => item
+	sortedItems []*IPItem
+	allItemsMap map[int64]*IPItem // id => item
 
-	isAll bool
+	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()
@@ -34,14 +36,94 @@ func NewIPList() *IPList {
 }
 
 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 +138,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_test.go

@@ -4,6 +4,7 @@ import (
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/iwind/TeaGo/assert"
 	"github.com/iwind/TeaGo/logs"
+	"github.com/iwind/TeaGo/rands"
 	"runtime"
 	"strconv"
 	"testing"
@@ -16,7 +17,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 +32,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 +66,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 +104,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 +118,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 +137,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 +209,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 +249,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 +273,27 @@ 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 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

@@ -5,6 +5,7 @@ import (
 	"github.com/TeaOSLab/EdgeNode/internal/errors"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/lionsoul2014/ip2region/binding/golang/ip2region"
+	"net"
 	"strings"
 )
 
@@ -27,6 +28,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")

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.Error("IP_LIBRARY", err.Error())
 			return
 		}
 		SharedLibrary = library

internal/iplibrary/manager_country.go

@@ -20,12 +20,12 @@ import (
 var SharedCountryManager = NewCountryManager()
 
 func init() {
-	events.On(events.EventStart, func() {
+	events.On(events.EventLoaded, func() {
 		go SharedCountryManager.Start()
 	})
 }
 
-// 国家信息管理
+// CountryManager 国家/地区信息管理
 type CountryManager struct {
 	cacheFile string
 

internal/iplibrary/manager_ip_list.go

@@ -15,12 +15,12 @@ var SharedIPListManager = NewIPListManager()
 var IPListUpdateNotify = make(chan bool, 1)
 
 func init() {
-	events.On(events.EventStart, func() {
+	events.On(events.EventLoaded, func() {
 		go SharedIPListManager.Start()
 	})
 }
 
-// IP名单管理
+// IPListManager IP名单管理
 type IPListManager struct {
 	// 缓存文件
 	// 每行一个数据：id|from|to|expiredAt
@@ -112,12 +112,16 @@ func (this *IPListManager) fetch() (hasNext bool, err error) {
 		return false, nil
 	}
 	this.locker.Lock()
+	var changedLists = map[*IPList]bool{}
 	for _, item := range items {
 		list, ok := this.listMap[item.ListId]
 		if !ok {
 			list = NewIPList()
 			this.listMap[item.ListId] = list
 		}
+
+		changedLists[list] = true
+
 		if item.IsDeleted {
 			list.Delete(item.Id)
 
@@ -127,7 +131,7 @@ func (this *IPListManager) fetch() (hasNext bool, err error) {
 			continue
 		}
 
-		list.Add(&IPItem{
+		list.AddDelay(&IPItem{
 			Id:         item.Id,
 			Type:       item.Type,
 			IPFrom:     utils.IP2Long(item.IpFrom),
@@ -140,6 +144,11 @@ func (this *IPListManager) fetch() (hasNext bool, err error) {
 		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_province.go

@@ -24,12 +24,12 @@ const (
 var SharedProvinceManager = NewProvinceManager()
 
 func init() {
-	events.On(events.EventStart, func() {
+	events.On(events.EventLoaded, func() {
 		go SharedProvinceManager.Start()
 	})
 }
 
-// 国家信息管理
+// ProvinceManager 中国省份信息管理
 type ProvinceManager struct {
 	cacheFile string
 

internal/iplibrary/updater.go

@@ -7,9 +7,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/TeaOSLab/EdgeNode/internal/rpc"
 	"github.com/iwind/TeaGo/Tea"
-	"github.com/iwind/TeaGo/logs"
 	"os"
 	"time"
 )
@@ -21,16 +21,16 @@ 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)
@@ -38,7 +38,7 @@ func (this *Updater) Start() {
 		for range ticker.C {
 			err := this.loop()
 			if err != nil {
-				logs.Println("[IP_LIBRARY]" + err.Error())
+				remotelogs.Error("IP_LIBRARY", err.Error())
 			}
 		}
 	}()

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{})
+}

internal/js/request_test.go

@@ -0,0 +1,124 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package js_test
+
+import (
+	"bytes"
+	"github.com/TeaOSLab/EdgeNode/internal/js"
+	"github.com/iwind/TeaGo/logs"
+	"io/ioutil"
+	"net/http"
+	"testing"
+)
+
+type testRequest struct {
+	rawRequest  *http.Request
+	rawResponse *testResponse
+}
+
+func (this *testRequest) JSRequest() *http.Request {
+	if this.rawRequest != nil {
+		return this.rawRequest
+	}
+	req, _ := http.NewRequest(http.MethodGet, "https://iwind:123456@goedge.cn/docs?name=Libai&age=20", nil)
+	req.Header.Set("Server", "edgejs/1.0")
+	req.Header.Set("Content-Type", "application/json")
+	req.Body = ioutil.NopCloser(bytes.NewReader([]byte("123456")))
+	this.rawRequest = req
+	return req
+}
+
+func (this *testRequest) JSWriter() http.ResponseWriter {
+	if this.rawResponse != nil {
+		return this.rawResponse
+	}
+	this.rawResponse = &testResponse{}
+	return this.rawResponse
+}
+
+func (this *testRequest) JSStop() {
+
+}
+
+func (this *testRequest) JSLog(msg ...interface{}) {
+	logs.Println(msg...)
+}
+
+type testResponse struct {
+	statusCode int
+	header     http.Header
+}
+
+func (this *testResponse) Header() http.Header {
+	if this.header == nil {
+		this.header = http.Header{}
+	}
+	return this.header
+}
+
+func (this *testResponse) Write(p []byte) (int, error) {
+	return len(p), nil
+}
+
+func (this *testResponse) WriteHeader(statusCode int) {
+	this.statusCode = statusCode
+}
+
+func TestRequest(t *testing.T) {
+	vm := js.NewVM()
+	vm.SetRequest(&testRequest{})
+
+	// 事件监听
+	_, err := vm.RunString(`
+	http.onRequest(function (req, resp) {
+		console.log(req.proto())
+
+		let url = req.url()
+		console.log(url, "port:", url.port(), "args:", url.args())
+		console.log("username:", url.username(), "password:", url.password())
+		console.log("uri:", url.uri(), "path:", url.path())
+
+		req.addHeader("Server", "1.0")
+
+		
+		resp.write("this is response")
+		console.log(resp)
+
+		console.log(req.body()) 
+	})
+`)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// 触发事件
+	_, err = vm.RunString(`http.triggerRequest()`)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestRequest_Header(t *testing.T) {
+	var req = js.NewRequest(&testRequest{})
+	logs.PrintAsJSON(req.Header(), t)
+
+	req.AddHeader("Content-Length", "10")
+	req.AddHeader("Vary", "1.0")
+	req.AddHeader("Vary", "2.0")
+	logs.PrintAsJSON(req.Header(), t)
+
+	req.SetHeader("Vary", "3.0")
+	logs.PrintAsJSON(req.Header(), t)
+}
+
+func TestRequest_Body(t *testing.T) {
+	var req = js.NewRequest(&testRequest{})
+	t.Log(string(req.Body()))
+	t.Log(string(req.Body()))
+}
+
+func TestRequest_CopyBody(t *testing.T) {
+	var req = js.NewRequest(&testRequest{})
+	t.Log(string(req.CopyBody()))
+	t.Log(string(req.CopyBody()))
+}

internal/js/response.go

@@ -0,0 +1,39 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package js
+
+type Response struct {
+	r RequestInterface
+}
+
+func NewResponse(r RequestInterface) *Response {
+	return &Response{
+		r: r,
+	}
+}
+
+func (this *Response) Write(s string) error {
+	_, err := this.r.JSWriter().Write([]byte(s))
+	return err
+}
+
+func (this *Response) Reply(status int) {
+	this.SetStatus(status)
+	this.r.JSStop()
+}
+
+func (this *Response) Header() map[string][]string {
+	return this.r.JSWriter().Header()
+}
+
+func (this *Response) AddHeader(name string, value string) {
+	this.r.JSWriter().Header()[name] = append(this.r.JSWriter().Header()[name], value)
+}
+
+func (this *Response) SetHeader(name string, value string) {
+	this.r.JSWriter().Header()[name] = []string{value}
+}
+
+func (this *Response) SetStatus(statusCode int) {
+	this.r.JSWriter().WriteHeader(statusCode)
+}

internal/js/response_test.go

@@ -0,0 +1,16 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package js_test
+
+import (
+	"github.com/TeaOSLab/EdgeNode/internal/js"
+	"testing"
+)
+
+func TestNewResponse(t *testing.T) {
+	var resp = js.NewResponse(&testRequest{})
+	resp.AddHeader("Vary", "1.0")
+	resp.AddHeader("Vary", "2.0")
+	resp.SetHeader("Server", "edgejs/1.0")
+	t.Logf("%#v", resp.Header())
+}

internal/js/url.go

@@ -0,0 +1,90 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package js
+
+import (
+	"github.com/dop251/goja"
+	"github.com/iwind/TeaGo/types"
+	"net/url"
+)
+
+type URL struct {
+	u *url.URL
+}
+
+func NewURL(u *url.URL) *URL {
+	return &URL{
+		u: u,
+	}
+}
+
+func (this *URL) JSNew(args []goja.Value) *URL {
+	var urlString = ""
+	if len(args) == 1 {
+		urlString = args[0].String()
+	}
+	u, _ := url.Parse(urlString)
+	if u == nil {
+		u = &url.URL{}
+	}
+	return NewURL(u)
+}
+
+func (this *URL) Port() int {
+	return types.Int(this.u.Port())
+}
+
+func (this *URL) Args() map[string][]string {
+	return this.u.Query()
+}
+
+func (this *URL) Arg(name string) string {
+	return this.u.Query().Get(name)
+}
+
+func (this *URL) Username() string {
+	if this.u.User != nil {
+		return this.u.User.Username()
+	}
+	return ""
+}
+
+func (this *URL) Password() string {
+	if this.u.User != nil {
+		password, _ := this.u.User.Password()
+		return password
+	}
+	return ""
+}
+
+func (this *URL) Uri() string {
+	return this.u.RequestURI()
+}
+
+func (this *URL) Path() string {
+	return this.u.Path
+}
+
+func (this *URL) Host() string {
+	return this.u.Host
+}
+
+func (this *URL) Fragment() string {
+	return this.u.Fragment
+}
+
+func (this *URL) Hash() string {
+	if len(this.u.Fragment) > 0 {
+		return "#" + this.u.Fragment
+	} else {
+		return ""
+	}
+}
+
+func (this *URL) Scheme() string {
+	return this.u.Scheme
+}
+
+func (this *URL) String() string {
+	return this.u.String()
+}

internal/js/url_test.go

@@ -0,0 +1,18 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package js
+
+import (
+	"net/url"
+	"testing"
+)
+
+func TestURL(t *testing.T) {
+	raw, err := url.Parse("https://iwind:123456@goedge.cn/docs?name=Libai&age=20#a=b")
+	if err != nil {
+		t.Fatal(err)
+	}
+	var u = NewURL(raw)
+	t.Log("host:", u.Host())
+	t.Log("hash:", u.Hash())
+}

internal/js/vm.go

@@ -0,0 +1,153 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package js
+
+import (
+	"errors"
+	"github.com/dop251/goja"
+	"github.com/iwind/TeaGo/logs"
+	"reflect"
+	"strings"
+)
+
+var sharedPrograms []*goja.Program
+var sharedConsole = &Console{}
+
+func init() {
+	// compile programs
+}
+
+type VM struct {
+	vm *goja.Runtime
+}
+
+func NewVM() *VM {
+	vm := goja.New()
+	vm.SetFieldNameMapper(goja.TagFieldNameMapper("json", true))
+
+	// programs
+	for _, program := range sharedPrograms {
+		_, _ = vm.RunProgram(program)
+	}
+
+	v := &VM{vm: vm}
+	v.initVM()
+	return v
+}
+
+func (this *VM) Set(name string, obj interface{}) error {
+	return this.vm.Set(name, obj)
+}
+
+func (this *VM) AddConstructor(name string, instance interface{}) error {
+	objType := reflect.TypeOf(instance)
+
+	if objType.Kind() != reflect.Ptr {
+		return errors.New("instance should be pointer")
+	}
+
+	// construct
+	newMethod, ok := objType.MethodByName("JSNew")
+	if !ok {
+		return errors.New("can not find 'JSNew()' method in '" + objType.Elem().Name() + "'")
+	}
+
+	var err = this.Set(name, func(call goja.ConstructorCall) *goja.Object {
+		if newMethod.Type.NumIn() != 2 {
+			this.throw(errors.New(objType.Elem().Name() + ".JSNew() should accept a '[]goja.Value' argument"))
+			return nil
+		}
+		if newMethod.Type.In(1).String() != "[]goja.Value" {
+			this.throw(errors.New(objType.Elem().Name() + ".JSNew() should accept a '[]goja.Value' argument"))
+			return nil
+		}
+
+		// new
+		var results = newMethod.Func.Call([]reflect.Value{reflect.ValueOf(instance), reflect.ValueOf(call.Arguments)})
+		if len(results) == 0 {
+			this.throw(errors.New(objType.Elem().Name() + ".JSNew() should return a valid instance"))
+			return nil
+		}
+		var result = results[0]
+		if result.Type() != objType {
+			this.throw(errors.New(objType.Elem().Name() + ".JSNew() should return a same instance"))
+			return nil
+		}
+
+		// methods
+		var resultType = result.Type()
+		var numMethod = result.NumMethod()
+		for i := 0; i < numMethod; i++ {
+			var method = resultType.Method(i)
+			var methodName = strings.ToLower(method.Name[:1]) + method.Name[1:]
+			err := call.This.Set(methodName, result.MethodByName(method.Name).Interface())
+			if err != nil {
+				this.throw(err)
+				continue
+			}
+		}
+
+		//  支持属性
+		var numField = result.Elem().Type().NumField()
+		for i := 0; i < numField; i++ {
+			var field = result.Elem().Field(i)
+			if !field.CanInterface() {
+				continue
+			}
+			var fieldType = objType.Elem().Field(i)
+			tag, ok := fieldType.Tag.Lookup("json")
+			if !ok {
+				tag = fieldType.Name
+				tag = strings.ToLower(tag[:1]) + tag[1:]
+			} else {
+				// TODO 校验tag是否符合变量语法
+			}
+			err := call.This.Set(tag, field.Interface())
+			if err != nil {
+				this.throw(err)
+				continue
+			}
+		}
+
+		return nil
+	})
+	return err
+}
+
+func (this *VM) RunString(str string) (goja.Value, error) {
+	defer func() {
+		e := recover()
+		if e != nil {
+			// TODO 需要打印trace
+			logs.Println("panic:", e)
+		}
+	}()
+	return this.vm.RunString(str)
+}
+
+func (this *VM) SetRequest(req RequestInterface) {
+	{
+		err := this.vm.Set("http", NewHTTP(req))
+		if err != nil {
+			this.throw(err)
+		}
+	}
+}
+
+func (this *VM) initVM() {
+	{
+		err := this.vm.Set("console", sharedConsole)
+		if err != nil {
+			this.throw(err)
+		}
+	}
+}
+
+func (this *VM) throw(err error) {
+	if err == nil {
+		return
+	}
+
+	// TODO
+	logs.Println("js:VM:error: " + err.Error())
+}

internal/js/vm_test.go

@@ -0,0 +1,158 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package js
+
+import (
+	"github.com/dop251/goja"
+	"testing"
+	"time"
+)
+
+func TestNewVM(t *testing.T) {
+	before := time.Now()
+	defer func() {
+		t.Log(time.Since(before).Seconds()*1000, "ms")
+	}()
+
+	vm := NewVM()
+	{
+		v, err := vm.RunString("JSON.stringify({\"a\":\"b\"})")
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Log("JSON.stringify():", v)
+	}
+	{
+		v, err := vm.RunString(`JSON.parse('{\"a\":\"b\"}')`)
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Log("JSON.parse():", v)
+	}
+	{
+		err := vm.AddConstructor("Url", &URL{})
+		if err != nil {
+			t.Fatal("add constructor error:", err)
+		}
+		_, err = vm.RunString(`
+{
+	let u = new Url("https://goedge.cn/docs?v=1")
+	console.log("host:", u.host(), u.uri())
+}
+{
+	let u = new Url("https://teaos.cn/downloads?v=1")
+	console.log("host:", u.host(), u.uri())
+}
+
+{
+	let u = new Url()
+	console.log("host:", u.host(), u.uri())
+}
+
+{
+	let u = new Url("a", "b", "c")
+	console.log("host:", u.host(), u.uri())
+}
+`)
+		if err != nil {
+			t.Fatal("add constructor error:" + err.Error())
+		}
+	}
+}
+
+func TestVM_Program(t *testing.T) {
+	var s = `
+{
+	let u = new Url("https://goedge.cn/docs?v=1")
+	//console.log("host:", u.host(), u.uri())
+}
+{
+	let u = new Url("https://teaos.cn/downloads?v=1")
+	//console.log("host:", u.host(), u.uri())
+}
+
+{
+	let u = new Url()
+	//console.log("host:", u.host(), u.uri())
+}
+
+{
+	let u = new Url("a", "b", "c")
+	//console.log("host:", u.host(), u.uri())
+}
+`
+	program := goja.MustCompile("s", s, true)
+
+	before := time.Now()
+	defer func() {
+		t.Log(time.Since(before).Seconds()*1000, "ms")
+	}()
+
+	vm := NewVM()
+	err := vm.AddConstructor("Url", &URL{})
+	if err != nil {
+		t.Fatal("add constructor error:", err)
+	}
+	//_, err = vm.RunString(s)
+	_, err = vm.vm.RunProgram(program)
+	if err != nil {
+		t.Fatal("add constructor error:" + err.Error())
+	}
+}
+
+func Benchmark_Program(b *testing.B) {
+	var s = `
+{
+	let u = new Url("https://goedge.cn/docs?v=1")
+	//console.log("host:", u.host(), u.uri())
+}
+{
+	let u = new Url("https://teaos.cn/downloads?v=1")
+	//console.log("host:", u.host(), u.uri())
+}
+
+{
+	let u = new Url()
+	//console.log("host:", u.host(), u.uri())
+}
+
+{
+	let u = new Url("a", "b", "c")
+	//console.log("host:", u.host(), u.uri())
+}
+{
+	let u = new Url("https://goedge.cn/docs?v=1")
+	//console.log("host:", u.host(), u.uri())
+}
+{
+	let u = new Url("https://teaos.cn/downloads?v=1")
+	//console.log("host:", u.host(), u.uri())
+}
+
+{
+	let u = new Url()
+	//console.log("host:", u.host(), u.uri())
+}
+
+{
+	let u = new Url("a", "b", "c")
+	//console.log("host:", u.host(), u.uri())
+}
+`
+	program := goja.MustCompile("s", s, true)
+
+	vm := NewVM()
+
+	err := vm.AddConstructor("Url", &URL{})
+	if err != nil {
+		b.Fatal("add constructor error:", err)
+	}
+
+	for i := 0; i < b.N; i++ {
+		//_, err = vm.RunString(s)
+		_, err = vm.vm.RunProgram(program)
+		if err != nil {
+			b.Fatal("add constructor error:" + err.Error())
+		}
+	}
+}

internal/metrics/manager.go

@@ -0,0 +1,121 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package metrics
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
+	"strconv"
+	"sync"
+)
+
+var SharedManager = NewManager()
+
+type Manager struct {
+	tasks         map[int64]*Task    // itemId => *Task
+	categoryTasks map[string][]*Task // category => []*Task
+	locker        sync.RWMutex
+
+	hasHTTPMetrics bool
+	hasTCPMetrics  bool
+	hasUDPMetrics  bool
+}
+
+func NewManager() *Manager {
+	return &Manager{
+		tasks:         map[int64]*Task{},
+		categoryTasks: map[string][]*Task{},
+	}
+}
+
+func (this *Manager) Update(items []*serverconfigs.MetricItemConfig) {
+	this.locker.Lock()
+	defer this.locker.Unlock()
+
+	var newMap = map[int64]*serverconfigs.MetricItemConfig{}
+	for _, item := range items {
+		newMap[item.Id] = item
+	}
+
+	// 停用以前的 或 修改现在的
+	for itemId, task := range this.tasks {
+		newItem, ok := newMap[itemId]
+		if !ok || !newItem.IsOn { // 停用以前的
+			remotelogs.Println("METRIC_MANAGER", "stop task '"+strconv.FormatInt(itemId, 10)+"'")
+			err := task.Stop()
+			if err != nil {
+				remotelogs.Error("METRIC_MANAGER", "stop task '"+strconv.FormatInt(itemId, 10)+"' failed: "+err.Error())
+			}
+			delete(this.tasks, itemId)
+		} else { // 更新已存在的
+			if newItem.Version != task.item.Version {
+				remotelogs.Println("METRIC_MANAGER", "update task '"+strconv.FormatInt(itemId, 10)+"'")
+				task.item = newItem
+			}
+		}
+	}
+
+	// 启动新的
+	for _, newItem := range items {
+		if !newItem.IsOn {
+			continue
+		}
+		_, ok := this.tasks[newItem.Id]
+		if !ok {
+			remotelogs.Println("METRIC_MANAGER", "start task '"+strconv.FormatInt(newItem.Id, 10)+"'")
+			task := NewTask(newItem)
+			err := task.Init()
+			if err != nil {
+				remotelogs.Error("METRIC_MANAGER", "initialized task failed: "+err.Error())
+				continue
+			}
+			err = task.Start()
+			if err != nil {
+				remotelogs.Error("METRIC_MANAGER", "start task failed: "+err.Error())
+				continue
+			}
+			this.tasks[newItem.Id] = task
+		}
+	}
+
+	// 按分类存放
+	this.hasHTTPMetrics = false
+	this.hasTCPMetrics = false
+	this.hasUDPMetrics = false
+	this.categoryTasks = map[string][]*Task{}
+	for _, task := range this.tasks {
+		tasks := this.categoryTasks[task.item.Category]
+		tasks = append(tasks, task)
+		this.categoryTasks[task.item.Category] = tasks
+
+		switch task.item.Category {
+		case serverconfigs.MetricItemCategoryHTTP:
+			this.hasHTTPMetrics = true
+		case serverconfigs.MetricItemCategoryTCP:
+			this.hasTCPMetrics = true
+		case serverconfigs.MetricItemCategoryUDP:
+			this.hasUDPMetrics = true
+		}
+	}
+}
+
+// Add 添加数据
+func (this *Manager) Add(obj MetricInterface) {
+	this.locker.RLock()
+	for _, task := range this.categoryTasks[obj.MetricCategory()] {
+		task.Add(obj)
+	}
+	this.locker.RUnlock()
+}
+
+func (this *Manager) HasHTTPMetrics() bool {
+	return this.hasHTTPMetrics
+}
+
+func (this *Manager) HasTCPMetrics() bool {
+	return this.hasTCPMetrics
+}
+
+func (this *Manager) HasUDPMetrics() bool {
+	return this.hasUDPMetrics
+}

internal/metrics/manager_test.go

@@ -0,0 +1,63 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package metrics
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"testing"
+)
+
+func TestNewManager(t *testing.T) {
+	var manager = NewManager()
+	{
+		manager.Update([]*serverconfigs.MetricItemConfig{})
+		for _, task := range manager.tasks {
+			t.Log(task.item.Id)
+		}
+	}
+	{
+		t.Log("====")
+		manager.Update([]*serverconfigs.MetricItemConfig{
+			{
+				Id: 1,
+			},
+			{
+				Id: 2,
+			},
+			{
+				Id: 3,
+			},
+		})
+		for _, task := range manager.tasks {
+			t.Log("task:", task.item.Id)
+		}
+	}
+
+	{
+		t.Log("====")
+		manager.Update([]*serverconfigs.MetricItemConfig{
+			{
+				Id: 1,
+			},
+			{
+				Id: 2,
+			},
+		})
+		for _, task := range manager.tasks {
+			t.Log("task:", task.item.Id)
+		}
+	}
+
+	{
+		t.Log("====")
+		manager.Update([]*serverconfigs.MetricItemConfig{
+			{
+				Id:      1,
+				Version: 1,
+			},
+		})
+		for _, task := range manager.tasks {
+			t.Log("task:", task.item.Id)
+		}
+	}
+}

internal/metrics/metric_interface.go

@@ -0,0 +1,17 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package metrics
+
+type MetricInterface interface {
+	// MetricKey 指标对象
+	MetricKey(key string) string
+
+	// MetricValue 指标值
+	MetricValue(value string) (result int64, ok bool)
+
+	// MetricServerId 服务ID
+	MetricServerId() int64
+
+	// MetricCategory 指标分类
+	MetricCategory() string
+}

internal/metrics/stat.go

@@ -0,0 +1,22 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package metrics
+
+import (
+	"encoding/json"
+	"github.com/cespare/xxhash"
+	"strconv"
+)
+
+type Stat struct {
+	ServerId int64
+	Keys     []string
+	Hash     string
+	Value    int64
+	Time     string
+}
+
+func SumStat(serverId int64, keys []string, time string, version int32, itemId int64) string {
+	keysData, _ := json.Marshal(keys)
+	return strconv.FormatUint(xxhash.Sum64String(strconv.FormatInt(serverId, 10)+"@"+string(keysData)+"@"+time+"@"+strconv.Itoa(int(version))+"@"+strconv.FormatInt(itemId, 10)), 10)
+}

internal/metrics/task.go

@@ -0,0 +1,509 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package metrics
+
+import (
+	"database/sql"
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
+	"github.com/TeaOSLab/EdgeNode/internal/rpc"
+	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"github.com/iwind/TeaGo/Tea"
+	_ "github.com/mattn/go-sqlite3"
+	"os"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+)
+
+const MaxQueueSize = 10240
+
+// Task 单个指标任务
+// 数据库存储：
+//  data/
+//     metric.$ID.db
+//        stats
+//           id, keys, value, time, serverId, hash
+//  原理：
+//     添加或者有变更时 isUploaded = false
+//     上传时检查 isUploaded 状态
+//     只上传每个服务中排序最前面的 N 个数据
+type Task struct {
+	item     *serverconfigs.MetricItemConfig
+	isLoaded bool
+
+	db            *sql.DB
+	statTableName string
+	isStopped     bool
+
+	cleanTicker  *utils.Ticker
+	uploadTicker *utils.Ticker
+
+	cleanVersion int32
+
+	insertStatStmt          *sql.Stmt
+	deleteByVersionStmt     *sql.Stmt
+	deleteByExpiresTimeStmt *sql.Stmt
+	selectTopStmt           *sql.Stmt
+	sumStmt                 *sql.Stmt
+
+	serverIdMap       map[int64]bool  // 所有的服务Ids
+	timeMap           map[string]bool // time => bool
+	serverIdMapLocker sync.Mutex
+
+	statsMap    map[string]*Stat
+	statsLocker sync.Mutex
+	statsTicker *utils.Ticker
+}
+
+// NewTask 获取新任务
+func NewTask(item *serverconfigs.MetricItemConfig) *Task {
+	return &Task{
+		item:        item,
+		serverIdMap: map[int64]bool{},
+		timeMap:     map[string]bool{},
+		statsMap:    map[string]*Stat{},
+	}
+}
+
+// Init 初始化
+func (this *Task) Init() error {
+	this.statTableName = "stats"
+
+	// 检查目录是否存在
+	var dir = Tea.Root + "/data"
+	_, err := os.Stat(dir)
+	if err != nil {
+		err = os.MkdirAll(dir, 0777)
+		if err != nil {
+			return err
+		}
+		remotelogs.Println("METRIC", "create data dir '"+dir+"'")
+	}
+
+	db, err := sql.Open("sqlite3", "file:"+dir+"/metric."+strconv.FormatInt(this.item.Id, 10)+".db?cache=shared&mode=rwc&_journal_mode=WAL")
+	if err != nil {
+		return err
+	}
+	db.SetMaxOpenConns(1)
+	this.db = db
+
+	//创建统计表
+	_, err = db.Exec(`CREATE TABLE IF NOT EXISTS "` + this.statTableName + `" (
+  "id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
+  "hash" varchar(32),
+  "keys" varchar(1024),
+  "value" real DEFAULT 0,
+  "time" varchar(32),
+  "serverId" integer DEFAULT 0,
+  "version" integer DEFAULT 0,
+  "isUploaded" integer DEFAULT 0
+);
+
+CREATE INDEX IF NOT EXISTS "serverId"
+ON "` + this.statTableName + `" (
+  "serverId" ASC,
+  "version" ASC
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS "hash"
+ON "` + this.statTableName + `" (
+  "hash" ASC
+);`)
+	if err != nil {
+		return err
+	}
+
+	// insert stat stmt
+	this.insertStatStmt, err = db.Prepare(`INSERT INTO "stats" ("serverId", "hash", "keys", "value", "time", "version", "isUploaded") VALUES (?, ?, ?, ?, ?, ?, 0) ON CONFLICT("hash") DO UPDATE SET "value"="value"+?, "isUploaded"=0`)
+	if err != nil {
+		return err
+	}
+
+	// delete by version
+	this.deleteByVersionStmt, err = db.Prepare(`DELETE FROM "` + this.statTableName + `" WHERE "version"<?`)
+	if err != nil {
+		return err
+	}
+
+	// delete by expires time
+	this.deleteByExpiresTimeStmt, err = db.Prepare(`DELETE FROM "` + this.statTableName + `" WHERE "time"<?`)
+	if err != nil {
+		return err
+	}
+
+	// select topN stmt
+	this.selectTopStmt, err = db.Prepare(`SELECT "id", "hash", "keys", "value", "isUploaded" FROM "` + this.statTableName + `" WHERE "serverId"=? AND "version"=? AND time=? ORDER BY "value" DESC LIMIT 20`)
+	if err != nil {
+		return err
+	}
+
+	// sum stmt
+	this.sumStmt, err = db.Prepare(`SELECT COUNT(*), IFNULL(SUM(value), 0) FROM "` + this.statTableName + `" WHERE "serverId"=? AND "version"=? AND time=?`)
+	if err != nil {
+		return err
+	}
+
+	// 所有的服务IDs
+	err = this.loadServerIdMap()
+	if err != nil {
+		return err
+	}
+
+	this.isLoaded = true
+
+	return nil
+}
+
+// Start 启动任务
+func (this *Task) Start() error {
+	// 读取数据
+	this.statsTicker = utils.NewTicker(1 * time.Minute)
+	go func() {
+		for this.statsTicker.Next() {
+			this.statsLocker.Lock()
+			var statsMap = this.statsMap
+			this.statsMap = map[string]*Stat{}
+			this.statsLocker.Unlock()
+
+			for _, stat := range statsMap {
+				err := this.InsertStat(stat)
+				if err != nil {
+					remotelogs.Error("METRIC", "insert stat failed: "+err.Error())
+				}
+			}
+		}
+	}()
+
+	// 清理
+	this.cleanTicker = utils.NewTicker(24 * time.Hour)
+	go func() {
+		for this.cleanTicker.Next() {
+			err := this.CleanExpired()
+			if err != nil {
+				remotelogs.Error("METRIC", "clean expired stats failed: "+err.Error())
+			}
+		}
+	}()
+
+	// 上传
+	this.uploadTicker = utils.NewTicker(this.item.UploadDuration())
+	go func() {
+		for this.uploadTicker.Next() {
+			err := this.Upload(1 * time.Second)
+			if err != nil {
+				remotelogs.Error("METRIC", "upload stats failed: "+err.Error())
+			}
+		}
+	}()
+
+	return nil
+}
+
+// Add 添加数据
+func (this *Task) Add(obj MetricInterface) {
+	if this.isStopped || !this.isLoaded {
+		return
+	}
+
+	var keys = []string{}
+	for _, key := range this.item.Keys {
+		k := obj.MetricKey(key)
+
+		// 忽略499状态
+		if key == "${status}" && k == "499" {
+			return
+		}
+
+		keys = append(keys, k)
+	}
+
+	v, ok := obj.MetricValue(this.item.Value)
+	if !ok {
+		return
+	}
+
+	var hash = SumStat(obj.MetricServerId(), keys, this.item.CurrentTime(), this.item.Version, this.item.Id)
+	this.statsLocker.Lock()
+	oldStat, ok := this.statsMap[hash]
+	if ok {
+		oldStat.Value += v
+		oldStat.Hash = hash
+	} else {
+		// 防止过载
+		if len(this.statsMap) < MaxQueueSize {
+			this.statsMap[hash] = &Stat{
+				ServerId: obj.MetricServerId(),
+				Keys:     keys,
+				Value:    v,
+				Time:     this.item.CurrentTime(),
+				Hash:     hash,
+			}
+		}
+	}
+	this.statsLocker.Unlock()
+}
+
+// Stop 停止任务
+func (this *Task) Stop() error {
+	this.isStopped = true
+
+	if this.cleanTicker != nil {
+		this.cleanTicker.Stop()
+	}
+	if this.uploadTicker != nil {
+		this.uploadTicker.Stop()
+	}
+	if this.statsTicker != nil {
+		this.statsTicker.Stop()
+	}
+
+	_ = this.insertStatStmt.Close()
+	_ = this.deleteByVersionStmt.Close()
+	_ = this.deleteByExpiresTimeStmt.Close()
+	_ = this.selectTopStmt.Close()
+	_ = this.sumStmt.Close()
+
+	if this.db != nil {
+		_ = this.db.Close()
+	}
+
+	return nil
+}
+
+// InsertStat 写入数据
+func (this *Task) InsertStat(stat *Stat) error {
+	if this.isStopped {
+		return nil
+	}
+	if stat == nil {
+		return nil
+	}
+
+	this.serverIdMapLocker.Lock()
+	this.serverIdMap[stat.ServerId] = true
+	this.timeMap[stat.Time] = true
+	this.serverIdMapLocker.Unlock()
+
+	keyData, err := json.Marshal(stat.Keys)
+	if err != nil {
+		return err
+	}
+
+	_, err = this.insertStatStmt.Exec(stat.ServerId, stat.Hash, keyData, stat.Value, stat.Time, this.item.Version, stat.Value)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// CleanExpired 清理数据
+func (this *Task) CleanExpired() error {
+	if this.isStopped {
+		return nil
+	}
+
+	// 清除低版本数据
+	if this.cleanVersion < this.item.Version {
+		_, err := this.deleteByVersionStmt.Exec(this.item.Version)
+		if err != nil {
+			return err
+		}
+		this.cleanVersion = this.item.Version
+	}
+
+	// 清除过期的数据
+	_, err := this.deleteByExpiresTimeStmt.Exec(this.item.LocalExpiresTime())
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// Upload 上传数据
+func (this *Task) Upload(pauseDuration time.Duration) error {
+	if this.isStopped {
+		return nil
+	}
+
+	this.serverIdMapLocker.Lock()
+
+	// 服务IDs
+	var serverIds []int64
+	for serverId := range this.serverIdMap {
+		serverIds = append(serverIds, serverId)
+	}
+	this.serverIdMap = map[int64]bool{} // 清空数据
+
+	// 时间
+	var times = []string{}
+	for t := range this.timeMap {
+		times = append(times, t)
+	}
+	this.timeMap = map[string]bool{} // 清空数据
+
+	this.serverIdMapLocker.Unlock()
+
+	rpcClient, err := rpc.SharedRPC()
+	if err != nil {
+		return err
+	}
+
+	for _, serverId := range serverIds {
+		for _, currentTime := range times {
+			idStrings, err := func(serverId int64, currentTime string) (ids []string, err error) {
+				rows, err := this.selectTopStmt.Query(serverId, this.item.Version, currentTime)
+				if err != nil {
+					return nil, err
+				}
+				var isClosed bool
+				defer func() {
+					if isClosed {
+						return
+					}
+					_ = rows.Close()
+				}()
+
+				var pbStats []*pb.UploadingMetricStat
+				for rows.Next() {
+					var pbStat = &pb.UploadingMetricStat{}
+					// "id", "hash", "keys", "value", "isUploaded"
+					var isUploaded int
+					var keysData []byte
+					err = rows.Scan(&pbStat.Id, &pbStat.Hash, &keysData, &pbStat.Value, &isUploaded)
+					if err != nil {
+						return nil, err
+					}
+
+					// TODO 先不判断是否已经上传，需要改造API进行配合
+					/**if isUploaded == 1 {
+						continue
+					}**/
+					if len(keysData) > 0 {
+						err = json.Unmarshal(keysData, &pbStat.Keys)
+						if err != nil {
+							return nil, err
+						}
+					}
+					pbStats = append(pbStats, pbStat)
+					ids = append(ids, strconv.FormatInt(pbStat.Id, 10))
+				}
+
+				// 提前关闭
+				_ = rows.Close()
+				isClosed = true
+
+				// 上传
+				if len(pbStats) > 0 {
+					// 计算总和
+					count, total, err := this.sum(serverId, currentTime)
+					if err != nil {
+						return nil, err
+					}
+
+					_, err = rpcClient.MetricStatRPC().UploadMetricStats(rpcClient.Context(), &pb.UploadMetricStatsRequest{
+						MetricStats: pbStats,
+						Time:        currentTime,
+						ServerId:    serverId,
+						ItemId:      this.item.Id,
+						Version:     this.item.Version,
+						Count:       count,
+						Total:       float32(total),
+					})
+					if err != nil {
+						return nil, err
+					}
+				}
+
+				return
+			}(serverId, currentTime)
+			if err != nil {
+				return err
+			}
+
+			if len(idStrings) > 0 {
+				// 设置为已上传
+				_, err = this.db.Exec(`UPDATE "` + this.statTableName + `" SET isUploaded=1 WHERE id IN (` + strings.Join(idStrings, ",") + `)`)
+				if err != nil {
+					return err
+				}
+			}
+		}
+
+		// 休息一下，防止短时间内上传数据过多
+		if pauseDuration > 0 {
+			time.Sleep(pauseDuration)
+		}
+	}
+
+	return nil
+}
+
+// 加载服务ID
+func (this *Task) loadServerIdMap() error {
+	{
+		rows, err := this.db.Query(`SELECT DISTINCT "serverId" FROM `+this.statTableName+" WHERE version=?", this.item.Version)
+		if err != nil {
+			return err
+		}
+		defer func() {
+			_ = rows.Close()
+		}()
+
+		var serverId int64
+		for rows.Next() {
+			err = rows.Scan(&serverId)
+			if err != nil {
+				return err
+			}
+			this.serverIdMapLocker.Lock()
+			this.serverIdMap[serverId] = true
+			this.serverIdMapLocker.Unlock()
+		}
+	}
+
+	{
+		rows, err := this.db.Query(`SELECT DISTINCT "time" FROM `+this.statTableName+" WHERE version=?", this.item.Version)
+		if err != nil {
+			return err
+		}
+		defer func() {
+			_ = rows.Close()
+		}()
+
+		var timeString string
+		for rows.Next() {
+			err = rows.Scan(&timeString)
+			if err != nil {
+				return err
+			}
+			this.serverIdMapLocker.Lock()
+			this.timeMap[timeString] = true
+			this.serverIdMapLocker.Unlock()
+		}
+	}
+
+	return nil
+}
+
+// 计算数量和综合
+func (this *Task) sum(serverId int64, time string) (count int64, total float64, err error) {
+	rows, err := this.sumStmt.Query(serverId, this.item.Version, time)
+	if err != nil {
+		return 0, 0, err
+	}
+	defer func() {
+		_ = rows.Close()
+	}()
+	if rows.Next() {
+		err = rows.Scan(&count, &total)
+		if err != nil {
+			return 0, 0, err
+		}
+	}
+	return
+}

internal/metrics/task_test.go

@@ -0,0 +1,210 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package metrics_test
+
+import (
+	"fmt"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeNode/internal/metrics"
+	_ "github.com/iwind/TeaGo/bootstrap"
+	"github.com/iwind/TeaGo/rands"
+	"testing"
+	"time"
+)
+
+type testObj struct {
+	ip string
+}
+
+func (this *testObj) MetricKey(key string) string {
+	return this.ip
+}
+
+func (this *testObj) MetricValue(value string) (int64, bool) {
+	return 1, true
+}
+
+func (this *testObj) MetricServerId() int64 {
+	return int64(rands.Int(1, 100))
+}
+
+func (this *testObj) MetricCategory() string {
+	return "http"
+}
+
+func TestTask_Init(t *testing.T) {
+	var task = metrics.NewTask(&serverconfigs.MetricItemConfig{
+		Id:         1,
+		IsOn:       false,
+		Category:   "",
+		Period:     0,
+		PeriodUnit: "",
+		Keys:       nil,
+		Value:      "",
+	})
+	err := task.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer func() {
+		_ = task.Stop()
+	}()
+	t.Log("ok")
+}
+
+func TestTask_Add(t *testing.T) {
+	var task = metrics.NewTask(&serverconfigs.MetricItemConfig{
+		Id:         1,
+		IsOn:       false,
+		Category:   "",
+		Period:     1,
+		PeriodUnit: serverconfigs.MetricItemPeriodUnitDay,
+		Keys:       []string{"${remoteAddr}"},
+		Value:      "${countRequest}",
+	})
+	err := task.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = task.Start()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer func() {
+		_ = task.Stop()
+	}()
+
+	task.Add(&testObj{ip: "127.0.0.2"})
+	time.Sleep(1 * time.Second) // waiting for inserting
+}
+
+func TestTask_Add_Many(t *testing.T) {
+	var task = metrics.NewTask(&serverconfigs.MetricItemConfig{
+		Id:         1,
+		IsOn:       false,
+		Category:   "",
+		Period:     1,
+		PeriodUnit: serverconfigs.MetricItemPeriodUnitDay,
+		Keys:       []string{"${remoteAddr}"},
+		Value:      "${countRequest}",
+		Version:    1,
+	})
+	err := task.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = task.Start()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer func() {
+		_ = task.Stop()
+	}()
+
+	for i := 0; i < 4_000_000; i++ {
+		task.Add(&testObj{
+			ip: fmt.Sprintf("%d.%d.%d.%d", rands.Int(0, 255), rands.Int(0, 255), rands.Int(0, 255), rands.Int(0, 255)),
+		})
+		if i%10000 == 0 {
+			time.Sleep(1 * time.Second)
+		}
+	}
+}
+
+func TestTask_InsertStat(t *testing.T) {
+	var item = &serverconfigs.MetricItemConfig{
+		Id:         1,
+		IsOn:       false,
+		Category:   "",
+		Period:     1,
+		PeriodUnit: serverconfigs.MetricItemPeriodUnitDay,
+		Keys:       []string{"${remoteAddr}"},
+		Value:      "${countRequest}",
+		Version:    1,
+	}
+	var task = metrics.NewTask(item)
+	err := task.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = task.Start()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer func() {
+		_ = task.Stop()
+	}()
+
+	err = task.InsertStat(&metrics.Stat{
+		ServerId: 1,
+		Keys:     []string{"127.0.0.1"},
+		Hash:     "",
+		Value:    1,
+		Time:     item.CurrentTime(),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}
+
+func TestTask_CleanExpired(t *testing.T) {
+	var task = metrics.NewTask(&serverconfigs.MetricItemConfig{
+		Id:         1,
+		IsOn:       false,
+		Category:   "",
+		Period:     1,
+		PeriodUnit: serverconfigs.MetricItemPeriodUnitDay,
+		Keys:       []string{"${remoteAddr}"},
+		Value:      "${countRequest}",
+		Version:    1,
+	})
+	err := task.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = task.Start()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer func() {
+		_ = task.Stop()
+	}()
+
+	err = task.CleanExpired()
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}
+
+func TestTask_Upload(t *testing.T) {
+	var task = metrics.NewTask(&serverconfigs.MetricItemConfig{
+		Id:         1,
+		IsOn:       false,
+		Category:   "",
+		Period:     1,
+		PeriodUnit: serverconfigs.MetricItemPeriodUnitDay,
+		Keys:       []string{"${remoteAddr}"},
+		Value:      "${countRequest}",
+		Version:    1,
+	})
+	err := task.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = task.Start()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer func() {
+		_ = task.Stop()
+	}()
+
+	err = task.Upload(0)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}

internal/monitor/value_queue.go

@@ -15,7 +15,7 @@ import (
 var SharedValueQueue = NewValueQueue()
 
 func init() {
-	events.On(events.EventStart, func() {
+	events.On(events.EventLoaded, func() {
 		go SharedValueQueue.Start()
 	})
 }
@@ -72,7 +72,8 @@ func (this *ValueQueue) Loop() error {
 			CreatedAt: value.CreatedAt,
 		})
 		if err != nil {
-			return err
+			remotelogs.Error("MONITOR", err.Error())
+			continue
 		}
 	}
 	return nil

internal/nodes/api_stream.go

@@ -2,6 +2,7 @@ package nodes
 
 import (
 	"context"
+	"crypto/tls"
 	"encoding/json"
 	"fmt"
 	"github.com/TeaOSLab/EdgeCommon/pkg/messageconfigs"
@@ -16,6 +17,7 @@ import (
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/iwind/TeaGo/logs"
 	"io"
+	"net"
 	"net/http"
 	"os/exec"
 	"strconv"
@@ -143,6 +145,16 @@ func (this *APIStream) handleConnectedAPINode(message *pb.NodeStreamMessage) err
 		return errors.Wrap(err)
 	}
 	remotelogs.Println("API_STREAM", "connected to api node '"+strconv.FormatInt(msg.APINodeId, 10)+"'")
+
+	// 重新读取配置
+	if nodeConfigUpdatedAt == 0 {
+		select {
+		case nodeConfigChangedNotify <- true:
+		default:
+
+		}
+	}
+
 	return nil
 }
 
@@ -330,6 +342,15 @@ func (this *APIStream) handlePurgeCache(message *pb.NodeStreamMessage) error {
 		}()
 	}
 
+	// WEBP缓存
+	if msg.Type == "file" {
+		var keys = msg.Keys
+		for _, key := range keys {
+			keys = append(keys, key+webpSuffix)
+		}
+		msg.Keys = keys
+	}
+
 	err = storage.Purge(msg.Keys, msg.Type)
 	if err != nil {
 		this.replyFail(message.RequestId, "purge keys failed: "+err.Error())
@@ -367,7 +388,28 @@ func (this *APIStream) handlePreheatCache(message *pb.NodeStreamMessage) error {
 
 	wg := sync.WaitGroup{}
 	wg.Add(len(msg.Keys))
-	client := http.Client{} // TODO 可以设置请求超时事件
+	client := &http.Client{
+		Timeout: 30 * time.Second, // TODO 可以设置请求超时时间
+		Transport: &http.Transport{
+			DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
+				_, port, err := net.SplitHostPort(addr)
+				if err != nil {
+					return nil, err
+				}
+				return net.Dial(network, "127.0.0.1:"+port)
+			},
+			MaxIdleConns:          4096,
+			MaxIdleConnsPerHost:   32,
+			MaxConnsPerHost:       32,
+			IdleConnTimeout:       2 * time.Minute,
+			ExpectContinueTimeout: 1 * time.Second,
+			TLSHandshakeTimeout:   0,
+			TLSClientConfig: &tls.Config{
+				InsecureSkipVerify: true,
+			},
+		},
+	}
+	defer client.CloseIdleConnections()
 	errorMessages := []string{}
 	locker := sync.Mutex{}
 	for _, key := range msg.Keys {
@@ -381,7 +423,9 @@ func (this *APIStream) handlePreheatCache(message *pb.NodeStreamMessage) error {
 				locker.Unlock()
 				return
 			}
+
 			// TODO 可以在管理界面自定义Header
+			req.Header.Set("X-Cache-Action", "preheat")
 			req.Header.Set("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.121 Safari/537.36")
 			req.Header.Set("Accept-Encoding", "gzip, deflate, br") // TODO 这里需要记录下缓存是否为gzip的
 			resp, err := client.Do(req)

internal/nodes/client_conn.go

@@ -42,16 +42,25 @@ func init() {
 	})
 }
 
-// TrafficConn 用于统计流量的连接
-type TrafficConn struct {
-	rawConn net.Conn
+// ClientConn 客户端连接
+type ClientConn struct {
+	rawConn  net.Conn
+	isClosed bool
 }
 
-func NewTrafficConn(conn net.Conn) net.Conn {
-	return &TrafficConn{rawConn: conn}
+func NewClientConn(conn net.Conn, quickClose bool) net.Conn {
+	if quickClose {
+		tcpConn, ok := conn.(*net.TCPConn)
+		if ok {
+			// TODO 可以设置此值
+			_ = tcpConn.SetLinger(3)
+		}
+	}
+
+	return &ClientConn{rawConn: conn}
 }
 
-func (this *TrafficConn) Read(b []byte) (n int, err error) {
+func (this *ClientConn) Read(b []byte) (n int, err error) {
 	n, err = this.rawConn.Read(b)
 	if n > 0 {
 		atomic.AddUint64(&inTrafficBytes, uint64(n))
@@ -59,7 +68,7 @@ func (this *TrafficConn) Read(b []byte) (n int, err error) {
 	return
 }
 
-func (this *TrafficConn) Write(b []byte) (n int, err error) {
+func (this *ClientConn) Write(b []byte) (n int, err error) {
 	n, err = this.rawConn.Write(b)
 	if n > 0 {
 		atomic.AddUint64(&outTrafficBytes, uint64(n))
@@ -67,26 +76,31 @@ func (this *TrafficConn) Write(b []byte) (n int, err error) {
 	return
 }
 
-func (this *TrafficConn) Close() error {
+func (this *ClientConn) Close() error {
+	this.isClosed = true
 	return this.rawConn.Close()
 }
 
-func (this *TrafficConn) LocalAddr() net.Addr {
+func (this *ClientConn) LocalAddr() net.Addr {
 	return this.rawConn.LocalAddr()
 }
 
-func (this *TrafficConn) RemoteAddr() net.Addr {
+func (this *ClientConn) RemoteAddr() net.Addr {
 	return this.rawConn.RemoteAddr()
 }
 
-func (this *TrafficConn) SetDeadline(t time.Time) error {
+func (this *ClientConn) SetDeadline(t time.Time) error {
 	return this.rawConn.SetDeadline(t)
 }
 
-func (this *TrafficConn) SetReadDeadline(t time.Time) error {
+func (this *ClientConn) SetReadDeadline(t time.Time) error {
 	return this.rawConn.SetReadDeadline(t)
 }
 
-func (this *TrafficConn) SetWriteDeadline(t time.Time) error {
+func (this *ClientConn) SetWriteDeadline(t time.Time) error {
 	return this.rawConn.SetWriteDeadline(t)
 }
+
+func (this *ClientConn) IsClosed() bool {
+	return this.isClosed
+}

internal/nodes/client_conn_utils.go

@@ -0,0 +1,22 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package nodes
+
+import (
+	"net"
+)
+
+// 判断客户端连接是否已关闭
+func isClientConnClosed(conn net.Conn) bool {
+	if conn == nil {
+		return true
+	}
+	clientConn, ok := conn.(*ClientConn)
+	if ok {
+		return clientConn.IsClosed()
+	}
+
+	// TODO 解决tls.Conn无法获取底层连接对象的问题
+
+	return false
+}

internal/nodes/client_listener.go

@@ -0,0 +1,54 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package nodes
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
+	"github.com/TeaOSLab/EdgeNode/internal/waf"
+	"net"
+)
+
+// ClientListener 客户端网络监听
+type ClientListener struct {
+	rawListener net.Listener
+	quickClose  bool
+}
+
+func NewClientListener(listener net.Listener, quickClose bool) net.Listener {
+	return &ClientListener{
+		rawListener: listener,
+		quickClose:  quickClose,
+	}
+}
+
+func (this *ClientListener) Accept() (net.Conn, error) {
+	conn, err := this.rawListener.Accept()
+	if err != nil {
+		return nil, err
+	}
+	// 是否在WAF名单中
+	ip, _, err := net.SplitHostPort(conn.RemoteAddr().String())
+	if err == nil {
+		if !waf.SharedIPWhiteList.Contains(waf.IPTypeAll, firewallconfigs.FirewallScopeGlobal, 0, ip) &&
+			waf.SharedIPBlackList.Contains(waf.IPTypeAll, firewallconfigs.FirewallScopeGlobal, 0, ip) {
+
+			tcpConn, ok := conn.(*net.TCPConn)
+			if ok {
+				_ = tcpConn.SetLinger(0)
+			}
+
+			_ = conn.Close()
+			return this.Accept()
+		}
+	}
+
+	return NewClientConn(conn, this.quickClose), nil
+}
+
+func (this *ClientListener) Close() error {
+	return this.rawListener.Close()
+}
+
+func (this *ClientListener) Addr() net.Addr {
+	return this.rawListener.Addr()
+}

internal/nodes/http_access_log_queue.go

@@ -9,14 +9,14 @@ import (
 
 var sharedHTTPAccessLogQueue = NewHTTPAccessLogQueue()
 
-// HTTP访问日志队列
+// HTTPAccessLogQueue HTTP访问日志队列
 type HTTPAccessLogQueue struct {
 	queue chan *pb.HTTPAccessLog
 }
 
-// 获取新对象
+// NewHTTPAccessLogQueue 获取新对象
 func NewHTTPAccessLogQueue() *HTTPAccessLogQueue {
-	// 队列中最大的值，超出此数量的访问日志会被抛弃
+	// 队列中最大的值，超出此数量的访问日志会被丢弃
 	// TODO 需要可以在界面中设置
 	maxSize := 10000
 	queue := &HTTPAccessLogQueue{
@@ -27,7 +27,7 @@ func NewHTTPAccessLogQueue() *HTTPAccessLogQueue {
 	return queue
 }
 
-// 开始处理访问日志
+// Start 开始处理访问日志
 func (this *HTTPAccessLogQueue) Start() {
 	ticker := time.NewTicker(1 * time.Second)
 	for range ticker.C {
@@ -38,7 +38,7 @@ func (this *HTTPAccessLogQueue) Start() {
 	}
 }
 
-// 加入新访问日志
+// Push 加入新访问日志
 func (this *HTTPAccessLogQueue) Push(accessLog *pb.HTTPAccessLog) {
 	select {
 	case this.queue <- accessLog:

internal/nodes/http_client_pool.go

@@ -6,10 +6,12 @@ import (
 	"errors"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
+	"github.com/pires/go-proxyproto"
 	"net"
 	"net/http"
 	"runtime"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
 )
@@ -37,7 +39,7 @@ func NewHTTPClientPool() *HTTPClientPool {
 }
 
 // Client 根据地址获取客户端
-func (this *HTTPClientPool) Client(req *http.Request, origin *serverconfigs.OriginConfig, originAddr string) (rawClient *http.Client, err error) {
+func (this *HTTPClientPool) Client(req *HTTPRequest, origin *serverconfigs.OriginConfig, originAddr string, proxyProtocol *serverconfigs.ProxyProtocolConfig) (rawClient *http.Client, err error) {
 	if origin.Addr == nil {
 		return nil, errors.New("origin addr should not be empty (originId:" + strconv.FormatInt(origin.Id, 10) + ")")
 	}
@@ -73,11 +75,11 @@ func (this *HTTPClientPool) Client(req *http.Request, origin *serverconfigs.Orig
 		numberCPU = 8
 	}
 	if maxConnections <= 0 {
-		maxConnections = numberCPU * 8
+		maxConnections = numberCPU * 32
 	}
 
 	if idleConns <= 0 {
-		idleConns = numberCPU * 4
+		idleConns = numberCPU * 8
 	}
 	//logs.Println("[ORIGIN]max connections:", maxConnections)
 
@@ -105,7 +107,7 @@ func (this *HTTPClientPool) Client(req *http.Request, origin *serverconfigs.Orig
 				for i := 1; i <= retries; i++ {
 					port := int(toaConfig.RandLocalPort())
 					// TODO 思考是否支持X-Real-IP/X-Forwarded-IP
-					err := sharedTOAManager.SendMsg("add:" + strconv.Itoa(port) + ":" + req.RemoteAddr)
+					err := sharedTOAManager.SendMsg("add:" + strconv.Itoa(port) + ":" + req.requestRemoteAddr(true))
 					if err != nil {
 						remotelogs.Error("TOA", "add failed: "+err.Error())
 					} else {
@@ -126,10 +128,43 @@ func (this *HTTPClientPool) Client(req *http.Request, origin *serverconfigs.Orig
 			}
 
 			// 普通的连接
-			return (&net.Dialer{
+			conn, err := (&net.Dialer{
 				Timeout:   connectionTimeout,
 				KeepAlive: 1 * time.Minute,
 			}).DialContext(ctx, network, originAddr)
+			if err != nil {
+				return nil, err
+			}
+
+			if proxyProtocol != nil && proxyProtocol.IsOn && (proxyProtocol.Version == serverconfigs.ProxyProtocolVersion1 || proxyProtocol.Version == serverconfigs.ProxyProtocolVersion2) {
+				var remoteAddr = req.requestRemoteAddr(true)
+				var transportProtocol = proxyproto.TCPv4
+				if strings.Contains(remoteAddr, ":") {
+					transportProtocol = proxyproto.TCPv6
+				}
+				var destAddr = conn.RemoteAddr()
+				var reqConn = req.RawReq.Context().Value(HTTPConnContextKey)
+				if reqConn != nil {
+					destAddr = reqConn.(net.Conn).LocalAddr()
+				}
+				header := proxyproto.Header{
+					Version:           byte(proxyProtocol.Version),
+					Command:           proxyproto.PROXY,
+					TransportProtocol: transportProtocol,
+					SourceAddr: &net.TCPAddr{
+						IP:   net.ParseIP(remoteAddr),
+						Port: req.requestRemotePort(),
+					},
+					DestinationAddr: destAddr,
+				}
+				_, err = header.WriteTo(conn)
+				if err != nil {
+					_ = conn.Close()
+					return nil, err
+				}
+			}
+
+			return conn, nil
 		},
 		MaxIdleConns:          0,
 		MaxIdleConnsPerHost:   idleConns,

internal/nodes/http_client_pool_test.go

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

internal/nodes/http_request.go

@@ -7,6 +7,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
+	"github.com/TeaOSLab/EdgeNode/internal/metrics"
 	"github.com/TeaOSLab/EdgeNode/internal/stats"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/iwind/TeaGo/types"
@@ -66,12 +67,16 @@ type HTTPRequest struct {
 	cacheRef             *serverconfigs.HTTPCacheRef       // 缓存设置
 	cacheKey             string                            // 缓存使用的Key
 	isCached             bool                              // 是否已经被缓存
+	isAttack             bool                              // 是否是攻击请求
+	bodyData             []byte                            // 读取的Body内容
 
 	// WAF相关
 	firewallPolicyId    int64
 	firewallRuleGroupId int64
 	firewallRuleSetId   int64
 	firewallRuleId      int64
+	firewallActions     []string
+	tags                []string
 
 	logAttrs map[string]string
 
@@ -116,7 +121,25 @@ func (this *HTTPRequest) Do() {
 	// Web配置
 	err := this.configureWeb(this.Server.Web, true, 0)
 	if err != nil {
-		this.write500(err)
+		this.write50x(err, http.StatusInternalServerError)
+		this.doEnd()
+		return
+	}
+
+	// 特殊URL处理
+	if len(this.rawURI) > 1 && this.rawURI[1] == '.' {
+		// ACME
+		// TODO 需要配置是否启用ACME检测
+		if strings.HasPrefix(this.rawURI, "/.well-known/acme-challenge/") {
+			this.doACME()
+			this.doEnd()
+			return
+		}
+	}
+
+	// 带宽限制
+	if this.Server.BandwidthLimit != nil && this.Server.BandwidthLimit.IsOn && !this.Server.BandwidthLimit.IsEmpty() && this.Server.BandwidthLimitStatus != nil && this.Server.BandwidthLimitStatus.IsValid() {
+		this.doBandwidthLimit()
 		this.doEnd()
 		return
 	}
@@ -139,14 +162,15 @@ func (this *HTTPRequest) Do() {
 
 	// 自动跳转到HTTPS
 	if this.IsHTTP && this.web.RedirectToHttps != nil && this.web.RedirectToHttps.IsOn {
-		this.doRedirectToHTTPS(this.web.RedirectToHttps)
-		this.doEnd()
-		return
+		if this.doRedirectToHTTPS(this.web.RedirectToHttps) {
+			this.doEnd()
+			return
+		}
 	}
 
-	// Gzip
-	if this.web.GzipRef != nil && this.web.GzipRef.IsOn && this.web.Gzip != nil && this.web.Gzip.IsOn && this.web.Gzip.Level > 0 {
-		this.writer.Gzip(this.web.Gzip)
+	// Compression
+	if this.web.Compression != nil && this.web.Compression.IsOn && this.web.Compression.Level > 0 {
+		this.writer.SetCompression(this.web.Compression)
 	}
 
 	// 开始调用
@@ -161,6 +185,14 @@ func (this *HTTPRequest) Do() {
 
 // 开始调用
 func (this *HTTPRequest) doBegin() {
+	// 处理健康检查
+	var healthCheckKey = this.RawReq.Header.Get(serverconfigs.HealthCheckHeaderName)
+	if len(healthCheckKey) > 0 {
+		if this.doHealthCheck(healthCheckKey) {
+			return
+		}
+	}
+
 	// 统计
 	if this.web.StatRef != nil && this.web.StatRef.IsOn {
 		this.doStat()
@@ -173,16 +205,6 @@ func (this *HTTPRequest) doBegin() {
 		}
 	}
 
-	// 特殊URL处理
-	if len(this.rawURI) > 1 && this.rawURI[1] == '.' {
-		// ACME
-		// TODO 需要配置是否启用ACME检测
-		if strings.HasPrefix(this.rawURI, "/.well-known/acme-challenge/") {
-			this.doACME()
-			return
-		}
-	}
-
 	// 临时关闭页面
 	if this.web.Shutdown != nil && this.web.Shutdown.IsOn {
 		this.doShutdown()
@@ -242,11 +264,20 @@ func (this *HTTPRequest) doEnd() {
 	// TODO 增加是否开启开关
 	if this.Server != nil {
 		if this.isCached {
-			stats.SharedTrafficStatManager.Add(this.Server.Id, this.writer.sentBodyBytes, this.writer.sentBodyBytes, 1, 1)
+			stats.SharedTrafficStatManager.Add(this.Server.Id, this.Host, this.writer.sentBodyBytes, this.writer.sentBodyBytes, 1, 1, 0, 0)
 		} else {
-			stats.SharedTrafficStatManager.Add(this.Server.Id, this.writer.sentBodyBytes, 0, 1, 0)
+			if this.isAttack {
+				stats.SharedTrafficStatManager.Add(this.Server.Id, this.Host, this.writer.sentBodyBytes, 0, 1, 0, 1, this.writer.sentBodyBytes)
+			} else {
+				stats.SharedTrafficStatManager.Add(this.Server.Id, this.Host, this.writer.sentBodyBytes, 0, 1, 0, 0, 0)
+			}
 		}
 	}
+
+	// 指标
+	if metrics.SharedManager.HasHTTPMetrics() {
+		this.doMetricsResponse()
+	}
 }
 
 // RawURI 原始的请求URI
@@ -307,6 +338,11 @@ func (this *HTTPRequest) configureWeb(web *serverconfigs.HTTPWebConfig, isTop bo
 		this.web.Root = web.Root
 	}
 
+	// remote addr
+	if web.RemoteAddr != nil && (web.RemoteAddr.IsPrior || isTop) && web.RemoteAddr.IsOn {
+		this.web.RemoteAddr = web.RemoteAddr
+	}
+
 	// charset
 	if web.Charset != nil && (web.Charset.IsPrior || isTop) {
 		this.web.Charset = web.Charset
@@ -318,10 +354,14 @@ func (this *HTTPRequest) configureWeb(web *serverconfigs.HTTPWebConfig, isTop bo
 		this.web.Websocket = web.Websocket
 	}
 
-	// gzip
-	if web.GzipRef != nil && (web.GzipRef.IsPrior || isTop) {
-		this.web.GzipRef = web.GzipRef
-		this.web.Gzip = web.Gzip
+	// compression
+	if web.Compression != nil && (web.Compression.IsPrior || isTop) {
+		this.web.Compression = web.Compression
+	}
+
+	// webp
+	if web.WebP != nil && (web.WebP.IsPrior || isTop) {
+		this.web.WebP = web.WebP
 	}
 
 	// cache
@@ -486,7 +526,9 @@ func (this *HTTPRequest) Format(source string) string {
 		case "edgeVersion":
 			return teaconst.Version
 		case "remoteAddr":
-			return this.requestRemoteAddr()
+			return this.requestRemoteAddr(true)
+		case "remoteAddrValue":
+			return this.requestRemoteAddr(false)
 		case "rawRemoteAddr":
 			addr := this.RawReq.RemoteAddr
 			host, _, err := net.SplitHostPort(addr)
@@ -500,6 +542,12 @@ func (this *HTTPRequest) Format(source string) string {
 			return this.requestRemoteUser()
 		case "requestURI", "requestUri":
 			return this.rawURI
+		case "requestURL":
+			var scheme = "http"
+			if this.IsHTTPS {
+				scheme = "https"
+			}
+			return scheme + "://" + this.Host + this.rawURI
 		case "requestPath":
 			return this.requestPath()
 		case "requestPathExtension":
@@ -549,6 +597,12 @@ func (this *HTTPRequest) Format(source string) string {
 			return this.Host
 		case "referer":
 			return this.RawReq.Referer()
+		case "referer.host":
+			u, err := url.Parse(this.RawReq.Referer())
+			if err == nil {
+				return u.Host
+			}
+			return ""
 		case "userAgent":
 			return this.RawReq.UserAgent()
 		case "contentType":
@@ -730,22 +784,36 @@ func (this *HTTPRequest) addVarMapping(varMapping map[string]string) {
 }
 
 // 获取请求的客户端地址
-func (this *HTTPRequest) requestRemoteAddr() string {
+func (this *HTTPRequest) requestRemoteAddr(supportVar bool) string {
+	if supportVar &&
+		this.web.RemoteAddr != nil &&
+		this.web.RemoteAddr.IsOn &&
+		!this.web.RemoteAddr.IsEmpty() {
+		var remoteAddr = this.Format(this.web.RemoteAddr.Value)
+		if net.ParseIP(remoteAddr) != nil {
+			return remoteAddr
+		}
+	}
+
 	// X-Forwarded-For
 	forwardedFor := this.RawReq.Header.Get("X-Forwarded-For")
 	if len(forwardedFor) > 0 {
 		commaIndex := strings.Index(forwardedFor, ",")
 		if commaIndex > 0 {
-			return forwardedFor[:commaIndex]
+			forwardedFor = forwardedFor[:commaIndex]
+		}
+		if net.ParseIP(forwardedFor) != nil {
+			return forwardedFor
 		}
-		return forwardedFor
 	}
 
 	// Real-IP
 	{
 		realIP, ok := this.RawReq.Header["X-Real-IP"]
 		if ok && len(realIP) > 0 {
-			return realIP[0]
+			if net.ParseIP(realIP[0]) != nil {
+				return realIP[0]
+			}
 		}
 	}
 
@@ -753,7 +821,9 @@ func (this *HTTPRequest) requestRemoteAddr() string {
 	{
 		realIP, ok := this.RawReq.Header["X-Real-Ip"]
 		if ok && len(realIP) > 0 {
-			return realIP[0]
+			if net.ParseIP(realIP[0]) != nil {
+				return realIP[0]
+			}
 		}
 	}
 
@@ -1186,5 +1256,10 @@ func (this *HTTPRequest) canIgnore(err error) bool {
 		return true
 	}
 
+	// HTTP内部错误
+	if strings.HasPrefix(err.Error(), "http:") || strings.HasPrefix(err.Error(), "http2:") {
+		return true
+	}
+
 	return false
 }

internal/nodes/http_request_acme.go

@@ -12,6 +12,10 @@ func (this *HTTPRequest) doACME() {
 	// TODO 对请求进行校验，防止恶意攻击
 
 	token := filepath.Base(this.RawReq.URL.Path)
+	if token == "acme-challenge" || len(token) <= 32 {
+		this.writer.WriteHeader(http.StatusNotFound)
+		return
+	}
 
 	rpcClient, err := rpc.SharedRPC()
 	if err != nil {

internal/nodes/http_request_auth.go

@@ -33,7 +33,7 @@ func (this *HTTPRequest) doAuth() (shouldStop bool) {
 			return writer.StatusCode(), nil
 		}, this.Format)
 		if err != nil {
-			this.write502(err)
+			this.write50x(err, http.StatusInternalServerError)
 			return
 		}
 		if b {

internal/nodes/http_request_bandwidth_limit.go

@@ -0,0 +1,24 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package nodes
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+)
+
+// 带宽限制
+func (this *HTTPRequest) doBandwidthLimit() {
+	var config = this.Server.BandwidthLimit
+
+	this.tags = append(this.tags, "bandwidth")
+
+	var statusCode = 509
+	this.processResponseHeaders(statusCode)
+
+	this.writer.WriteHeader(statusCode)
+	if len(config.NoticePageBody) != 0 {
+		_, _ = this.writer.WriteString(config.NoticePageBody)
+	} else {
+		_, _ = this.writer.WriteString(serverconfigs.DefaultBandwidthLimitNoticePageBody)
+	}
+}

internal/nodes/http_request_cache.go

@@ -3,16 +3,20 @@ package nodes
 import (
 	"bytes"
 	"errors"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeNode/internal/caches"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
+	"github.com/TeaOSLab/EdgeNode/internal/rpc"
 	"net/http"
+	"path/filepath"
 	"strconv"
+	"strings"
 	"time"
 )
 
 // 读取缓存
 func (this *HTTPRequest) doCacheRead() (shouldStop bool) {
-	cachePolicy := sharedNodeConfig.HTTPCachePolicy
+	cachePolicy := this.Server.HTTPCachePolicy
 	if cachePolicy == nil || !cachePolicy.IsOn {
 		return
 	}
@@ -20,6 +24,12 @@ func (this *HTTPRequest) doCacheRead() (shouldStop bool) {
 	if this.web.Cache == nil || !this.web.Cache.IsOn || (len(cachePolicy.CacheRefs) == 0 && len(this.web.Cache.CacheRefs) == 0) {
 		return
 	}
+
+	// 判断是否在预热
+	if (strings.HasPrefix(this.RawReq.RemoteAddr, "127.") || strings.HasPrefix(this.RawReq.RemoteAddr, "[::1]")) && this.RawReq.Header.Get("X-Cache-Action") == "preheat" {
+		return
+	}
+
 	var addStatusHeader = this.web.Cache.AddStatusHeader
 	if addStatusHeader {
 		defer func() {
@@ -91,6 +101,7 @@ func (this *HTTPRequest) doCacheRead() (shouldStop bool) {
 		this.cacheRef = nil
 		return
 	}
+
 	this.cacheKey = key
 
 	// 读取缓存
@@ -100,23 +111,63 @@ func (this *HTTPRequest) doCacheRead() (shouldStop bool) {
 		return
 	}
 
+	// 判断是否在Purge
+	if this.web.Cache.PurgeIsOn && strings.ToUpper(this.RawReq.Method) == "PURGE" && this.RawReq.Header.Get("X-Edge-Purge-Key") == this.web.Cache.PurgeKey {
+		err := storage.Delete(key)
+		if err != nil {
+			remotelogs.Error("HTTP_REQUEST_CACHE", "purge failed: "+err.Error())
+		}
+
+		go func() {
+			rpcClient, err := rpc.SharedRPC()
+			if err == nil {
+				for _, rpcServerService := range rpcClient.ServerRPCList() {
+					_, err = rpcServerService.PurgeServerCache(rpcClient.Context(), &pb.PurgeServerCacheRequest{
+						Domains:  []string{this.Host},
+						Keys:     []string{key},
+						Prefixes: nil,
+					})
+					if err != nil {
+						remotelogs.Error("HTTP_REQUEST_CACHE", "purge failed: "+err.Error())
+					}
+				}
+			}
+		}()
+
+		return true
+	}
+
 	buf := bytePool32k.Get()
 	defer func() {
 		bytePool32k.Put(buf)
 	}()
 
-	reader, err := storage.OpenReader(key)
-	if err != nil {
-		if err == caches.ErrNotFound {
-			// cache相关变量
-			this.varMapping["cache.status"] = "MISS"
+	var reader caches.Reader
+	var err error
+
+	// 是否优先检查WebP
+	if this.web.WebP != nil &&
+		this.web.WebP.IsOn &&
+		this.web.WebP.MatchRequest(filepath.Ext(this.requestPath()), this.Format) &&
+		this.web.WebP.MatchAccept(this.requestHeader("Accept")) {
+		reader, _ = storage.OpenReader(key + webpSuffix)
+	}
+
+	// 检查正常的文件
+	if reader == nil {
+		reader, err = storage.OpenReader(key)
+		if err != nil {
+			if err == caches.ErrNotFound {
+				// cache相关变量
+				this.varMapping["cache.status"] = "MISS"
+				return
+			}
+
+			if !this.canIgnore(err) {
+				remotelogs.Warn("HTTP_REQUEST_CACHE", "read from cache failed: "+err.Error())
+			}
 			return
 		}
-
-		if !this.canIgnore(err) {
-			remotelogs.Warn("HTTP_REQUEST_CACHE", "read from cache failed: "+err.Error())
-		}
-		return
 	}
 	defer func() {
 		_ = reader.Close()
@@ -158,25 +209,22 @@ func (this *HTTPRequest) doCacheRead() (shouldStop bool) {
 	}
 
 	// ETag
+	// 这里强制设置ETag，如果先前源站设置了ETag，将会被覆盖，避免因为源站的ETag导致源站返回304 Not Modified
 	var respHeader = this.writer.Header()
-	var eTag = respHeader.Get("ETag")
+	var eTag = ""
 	var lastModifiedAt = reader.LastModified()
-	if len(eTag) == 0 {
-		if lastModifiedAt > 0 {
-			eTag = "\"" + strconv.FormatInt(lastModifiedAt, 10) + "\""
-			respHeader["ETag"] = []string{eTag}
-		}
+	if lastModifiedAt > 0 {
+		eTag = "\"" + strconv.FormatInt(lastModifiedAt, 10) + "\""
+		respHeader.Del("Etag")
+		respHeader["ETag"] = []string{eTag}
 	}
 
 	// 支持 Last-Modified
-	var modifiedTime = respHeader.Get("Last-Modified")
-	if len(modifiedTime) == 0 {
-		if lastModifiedAt > 0 {
-			modifiedTime = time.Unix(lastModifiedAt, 0).Format("Mon, 02 Jan 2006 15:04:05 GMT")
-			if len(respHeader.Get("Last-Modified")) == 0 {
-				respHeader.Set("Last-Modified", modifiedTime)
-			}
-		}
+	// 这里强制设置Last-Modified，如果先前源站设置了Last-Modified，将会被覆盖，避免因为源站的Last-Modified导致源站返回304 Not Modified
+	var modifiedTime = ""
+	if lastModifiedAt > 0 {
+		modifiedTime = time.Unix(lastModifiedAt, 0).Format("Mon, 02 Jan 2006 15:04:05 GMT")
+		respHeader.Set("Last-Modified", modifiedTime)
 	}
 
 	// 支持 If-None-Match
@@ -186,6 +234,7 @@ func (this *HTTPRequest) doCacheRead() (shouldStop bool) {
 		this.writer.WriteHeader(http.StatusNotModified)
 		this.isCached = true
 		this.cacheRef = nil
+		this.writer.SetOk()
 		return true
 	}
 
@@ -196,6 +245,7 @@ func (this *HTTPRequest) doCacheRead() (shouldStop bool) {
 		this.writer.WriteHeader(http.StatusNotModified)
 		this.isCached = true
 		this.cacheRef = nil
+		this.writer.SetOk()
 		return true
 	}
 
@@ -341,6 +391,7 @@ func (this *HTTPRequest) doCacheRead() (shouldStop bool) {
 				return true
 			}
 		} else { // 没有Range
+			this.writer.PrepareCompression(reader.BodySize())
 			this.writer.WriteHeader(reader.Status())
 
 			err = reader.ReadBody(buf, func(n int) (goNext bool, err error) {
@@ -361,5 +412,8 @@ func (this *HTTPRequest) doCacheRead() (shouldStop bool) {
 
 	this.isCached = true
 	this.cacheRef = nil
+
+	this.writer.SetOk()
+
 	return true
 }

internal/nodes/http_request_error.go

@@ -1,6 +1,7 @@
 package nodes
 
 import (
+	"github.com/iwind/TeaGo/types"
 	"net/http"
 )
 
@@ -17,30 +18,15 @@ func (this *HTTPRequest) write404() {
 	_, _ = this.writer.Write([]byte(msg))
 }
 
-func (this *HTTPRequest) write500(err error) {
+func (this *HTTPRequest) write50x(err error, statusCode int) {
 	if err != nil {
 		this.addError(err)
 	}
 
-	statusCode := http.StatusInternalServerError
 	if this.doPage(statusCode) {
 		return
 	}
 	this.processResponseHeaders(statusCode)
 	this.writer.WriteHeader(statusCode)
-	_, _ = this.writer.Write([]byte(http.StatusText(statusCode)))
-}
-
-func (this *HTTPRequest) write502(err error) {
-	if err != nil {
-		this.addError(err)
-	}
-
-	statusCode := http.StatusBadGateway
-	if this.doPage(statusCode) {
-		return
-	}
-	this.processResponseHeaders(statusCode)
-	this.writer.WriteHeader(statusCode)
-	_, _ = this.writer.Write([]byte("502 Bad Gateway"))
+	_, _ = this.writer.Write([]byte(types.String(statusCode) + " " + http.StatusText(statusCode)))
 }

internal/nodes/http_request_fastcgi.go

@@ -15,6 +15,7 @@ import (
 	"github.com/iwind/gofcgi/pkg/fcgi"
 	"io"
 	"net"
+	"net/http"
 	"net/url"
 	"path/filepath"
 	"strings"
@@ -40,7 +41,7 @@ func (this *HTTPRequest) doFastcgi() (shouldStop bool) {
 	}
 
 	if !env.Has("REMOTE_ADDR") {
-		env["REMOTE_ADDR"] = this.requestRemoteAddr()
+		env["REMOTE_ADDR"] = this.requestRemoteAddr(true)
 	}
 	if !env.Has("QUERY_STRING") {
 		u, err := url.ParseRequestURI(this.uri)
@@ -80,7 +81,7 @@ func (this *HTTPRequest) doFastcgi() (shouldStop bool) {
 
 	client, err := fcgi.SharedPool(fastcgi.Network(), fastcgi.RealAddress(), uint(poolSize)).Client()
 	if err != nil {
-		this.write500(err)
+		this.write50x(err, http.StatusInternalServerError)
 		return
 	}
 
@@ -158,13 +159,13 @@ func (this *HTTPRequest) doFastcgi() (shouldStop bool) {
 
 	resp, stderr, err := client.Call(fcgiReq)
 	if err != nil {
-		this.write500(err)
+		this.write50x(err, http.StatusInternalServerError)
 		return
 	}
 
 	if len(stderr) > 0 {
 		err := errors.New("Fastcgi Error: " + strings.TrimSpace(string(stderr)) + " script: " + maps.NewMap(params).GetString("SCRIPT_FILENAME"))
-		this.write500(err)
+		this.write50x(err, http.StatusInternalServerError)
 		return
 	}
 

internal/nodes/http_request_health_check.go

@@ -0,0 +1,27 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package nodes
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
+)
+
+// 健康检查
+func (this *HTTPRequest) doHealthCheck(key string) (stop bool) {
+	this.tags = append(this.tags, "healthCheck")
+
+	this.RawReq.Header.Del(serverconfigs.HealthCheckHeaderName)
+
+	data, err := nodeutils.DecryptData(sharedNodeConfig.NodeId, sharedNodeConfig.Secret, key)
+	if err != nil {
+		remotelogs.Error("HTTP_REQUEST_HEALTH_CHECK", "decode key failed: "+err.Error())
+		return
+	}
+
+	if data.GetBool("onlyBasicRequest") {
+		return true
+	}
+	return
+}

internal/nodes/http_request_log.go

@@ -88,7 +88,7 @@ func (this *HTTPRequest) log() {
 		RequestId:       strconv.FormatInt(this.requestFromTime.UnixNano(), 10) + strconv.FormatInt(atomic.AddInt64(&requestId, 1), 10) + sharedNodeConfig.PaddedId(),
 		NodeId:          sharedNodeConfig.Id,
 		ServerId:        this.Server.Id,
-		RemoteAddr:      this.requestRemoteAddr(),
+		RemoteAddr:      this.requestRemoteAddr(true),
 		RawRemoteAddr:   addr,
 		RemotePort:      int32(this.requestRemotePort()),
 		RemoteUser:      this.requestRemoteUser(),
@@ -128,6 +128,8 @@ func (this *HTTPRequest) log() {
 		FirewallRuleGroupId: this.firewallRuleGroupId,
 		FirewallRuleSetId:   this.firewallRuleSetId,
 		FirewallRuleId:      this.firewallRuleId,
+		FirewallActions:     this.firewallActions,
+		Tags:                this.tags,
 
 		Attrs: this.logAttrs,
 	}

internal/nodes/http_request_metrics.go

@@ -0,0 +1,58 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package nodes
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeNode/internal/metrics"
+)
+
+// 指标统计 - 响应
+// 只需要在结束时调用指标进行统计
+func (this *HTTPRequest) doMetricsResponse() {
+	metrics.SharedManager.Add(this)
+}
+
+func (this *HTTPRequest) MetricKey(key string) string {
+	return this.Format(key)
+}
+
+func (this *HTTPRequest) MetricValue(value string) (result int64, ok bool) {
+	// TODO 需要忽略健康检查的请求，但是同时也要防止攻击者模拟健康检查
+	switch value {
+	case "${countRequest}":
+		return 1, true
+	case "${countTrafficOut}":
+		// 这里不包括Header长度
+		return this.writer.SentBodyBytes(), true
+	case "${countTrafficIn}":
+		var hl int64 = 0 // header length
+		for k, values := range this.RawReq.Header {
+			for _, v := range values {
+				hl += int64(len(k) + len(v) + 2 /** k: v  **/)
+			}
+		}
+		return this.RawReq.ContentLength + hl, true
+	case "${countConnection}":
+		metricNewConnMapLocker.Lock()
+		_, ok := metricNewConnMap[this.RawReq.RemoteAddr]
+		if ok {
+			delete(metricNewConnMap, this.RawReq.RemoteAddr)
+		}
+		metricNewConnMapLocker.Unlock()
+		if ok {
+			return 1, true
+		} else {
+			return 0, false
+		}
+	}
+	return 0, false
+}
+
+func (this *HTTPRequest) MetricServerId() int64 {
+	return this.Server.Id
+}
+
+func (this *HTTPRequest) MetricCategory() string {
+	return serverconfigs.MetricItemCategoryHTTP
+}

internal/nodes/http_request_page.go

@@ -1,10 +1,11 @@
 package nodes
 
 import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
+	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/logs"
-	"io"
 	"net/http"
 	"os"
 	"regexp"
@@ -20,36 +21,84 @@ func (this *HTTPRequest) doPage(status int) (shouldStop bool) {
 
 	for _, page := range this.web.Pages {
 		if page.Match(status) {
-			if urlPrefixRegexp.MatchString(page.URL) {
-				this.doURL(http.MethodGet, page.URL, "", page.NewStatus)
-				return true
-			} else {
-				file := Tea.Root + Tea.DS + page.URL
-				fp, err := os.Open(file)
-				if err != nil {
-					logs.Error(err)
-					msg := "404 page not found: '" + page.URL + "'"
+			if len(page.BodyType) == 0 || page.BodyType == shared.BodyTypeURL {
+				if urlPrefixRegexp.MatchString(page.URL) {
+					this.doURL(http.MethodGet, page.URL, "", page.NewStatus, true)
+					return true
+				} else {
+					file := Tea.Root + Tea.DS + page.URL
+					fp, err := os.Open(file)
+					if err != nil {
+						logs.Error(err)
+						msg := "404 page not found: '" + page.URL + "'"
 
-					this.writer.WriteHeader(http.StatusNotFound)
-					_, err := this.writer.Write([]byte(msg))
+						this.writer.WriteHeader(http.StatusNotFound)
+						_, err := this.writer.Write([]byte(msg))
+						if err != nil {
+							logs.Error(err)
+						}
+						return true
+					}
+
+					stat, err := fp.Stat()
+					if err != nil {
+						logs.Error(err)
+						msg := "404 could not read page content: '" + page.URL + "'"
+
+						this.writer.WriteHeader(http.StatusNotFound)
+						_, err := this.writer.Write([]byte(msg))
+						if err != nil {
+							logs.Error(err)
+						}
+						return true
+					}
+
+					// 修改状态码
+					if page.NewStatus > 0 {
+						// 自定义响应Headers
+						this.processResponseHeaders(page.NewStatus)
+						this.writer.Prepare(stat.Size(), page.NewStatus)
+						this.writer.WriteHeader(page.NewStatus)
+					} else {
+						this.processResponseHeaders(status)
+						this.writer.Prepare(stat.Size(), status)
+						this.writer.WriteHeader(status)
+					}
+					buf := bytePool1k.Get()
+					_, err = utils.CopyWithFilter(this.writer, fp, buf, func(p []byte) []byte {
+						return []byte(this.Format(string(p)))
+					})
+					bytePool1k.Put(buf)
+					if err != nil {
+						if !this.canIgnore(err) {
+							remotelogs.Warn("HTTP_REQUEST_PAGE", "write to client failed: "+err.Error())
+						}
+					} else {
+						this.writer.SetOk()
+					}
+					err = fp.Close()
 					if err != nil {
 						logs.Error(err)
 					}
-					return true
 				}
 
+				return true
+			} else if page.BodyType == shared.BodyTypeHTML {
+				var content = this.Format(page.Body)
+
 				// 修改状态码
 				if page.NewStatus > 0 {
 					// 自定义响应Headers
 					this.processResponseHeaders(page.NewStatus)
+					this.writer.Prepare(int64(len(content)), page.NewStatus)
 					this.writer.WriteHeader(page.NewStatus)
 				} else {
 					this.processResponseHeaders(status)
+					this.writer.Prepare(int64(len(content)), status)
 					this.writer.WriteHeader(status)
 				}
-				buf := bytePool1k.Get()
-				_, err = io.CopyBuffer(this.writer, fp, buf)
-				bytePool1k.Put(buf)
+
+				_, err := this.writer.WriteString(content)
 				if err != nil {
 					if !this.canIgnore(err) {
 						remotelogs.Warn("HTTP_REQUEST_PAGE", "write to client failed: "+err.Error())
@@ -57,13 +106,8 @@ func (this *HTTPRequest) doPage(status int) (shouldStop bool) {
 				} else {
 					this.writer.SetOk()
 				}
-				err = fp.Close()
-				if err != nil {
-					logs.Error(err)
-				}
+				return true
 			}
-
-			return true
 		}
 	}
 	return false

internal/nodes/http_request_redirect_https.go

@@ -7,9 +7,14 @@ import (
 	"strings"
 )
 
-func (this *HTTPRequest) doRedirectToHTTPS(redirectToHTTPSConfig *serverconfigs.HTTPRedirectToHTTPSConfig) {
+func (this *HTTPRequest) doRedirectToHTTPS(redirectToHTTPSConfig *serverconfigs.HTTPRedirectToHTTPSConfig) (shouldBreak bool) {
 	host := this.RawReq.Host
 
+	// 检查域名是否匹配
+	if !redirectToHTTPSConfig.MatchDomain(host) {
+		return false
+	}
+
 	if len(redirectToHTTPSConfig.Host) > 0 {
 		if redirectToHTTPSConfig.Port > 0 && redirectToHTTPSConfig.Port != 443 {
 			host = redirectToHTTPSConfig.Host + ":" + strconv.Itoa(redirectToHTTPSConfig.Port)
@@ -38,4 +43,6 @@ func (this *HTTPRequest) doRedirectToHTTPS(redirectToHTTPSConfig *serverconfigs.
 
 	newURL := "https://" + host + this.RawReq.RequestURI
 	http.Redirect(this.writer, this.RawReq, newURL, statusCode)
+
+	return true
 }

internal/nodes/http_request_reverse_proxy.go

@@ -8,6 +8,7 @@ import (
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"io"
+	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
@@ -32,11 +33,15 @@ func (this *HTTPRequest) doReverseProxy() {
 
 	// 源站
 	requestCall := shared.NewRequestCall()
+	requestCall.Request = this.RawReq
+	requestCall.Formatter = this.Format
+	requestCall.Domain = this.Host
 	origin := this.reverseProxy.NextOrigin(requestCall)
+	requestCall.CallResponseCallbacks(this.writer)
 	if origin == nil {
 		err := errors.New(this.requestPath() + ": no available backends for reverse proxy")
 		remotelogs.Error("HTTP_REQUEST_REVERSE_PROXY", err.Error())
-		this.write502(err)
+		this.write50x(err, http.StatusBadGateway)
 		return
 	}
 	this.origin = origin // 设置全局变量是为了日志等处理
@@ -56,7 +61,7 @@ func (this *HTTPRequest) doReverseProxy() {
 	if origin.Addr == nil {
 		err := errors.New(this.requestPath() + ": origin '" + strconv.FormatInt(origin.Id, 10) + "' does not has a address")
 		remotelogs.Error("HTTP_REQUEST_REVERSE_PROXY", err.Error())
-		this.write502(err)
+		this.write50x(err, http.StatusBadGateway)
 		return
 	}
 	this.RawReq.URL.Scheme = origin.Addr.Protocol.Primary().Scheme()
@@ -140,10 +145,10 @@ func (this *HTTPRequest) doReverseProxy() {
 	}
 
 	// 获取请求客户端
-	client, err := SharedHTTPClientPool.Client(this.RawReq, origin, originAddr)
+	client, err := SharedHTTPClientPool.Client(this, origin, originAddr, this.reverseProxy.ProxyProtocol)
 	if err != nil {
 		remotelogs.Error("HTTP_REQUEST_REVERSE_PROXY", err.Error())
-		this.write502(err)
+		this.write50x(err, http.StatusBadGateway)
 		return
 	}
 
@@ -158,10 +163,23 @@ func (this *HTTPRequest) doReverseProxy() {
 	if err != nil {
 		// 客户端取消请求，则不提示
 		httpErr, ok := err.(*url.Error)
-		if !ok || httpErr.Err != context.Canceled {
-			// TODO 如果超过最大失败次数，则下线
-
-			this.write502(err)
+		if !ok {
+			SharedOriginStateManager.Fail(origin, this.reverseProxy, func() {
+				this.reverseProxy.ResetScheduling()
+			})
+			this.write50x(err, http.StatusBadGateway)
+			remotelogs.Warn("HTTP_REQUEST_REVERSE_PROXY", this.RawReq.URL.String()+"': "+err.Error())
+		} else if httpErr.Err != context.Canceled {
+			SharedOriginStateManager.Fail(origin, this.reverseProxy, func() {
+				this.reverseProxy.ResetScheduling()
+			})
+			if httpErr.Timeout() {
+				this.write50x(err, http.StatusGatewayTimeout)
+			} else if httpErr.Temporary() {
+				this.write50x(err, http.StatusServiceUnavailable)
+			} else {
+				this.write50x(err, http.StatusBadGateway)
+			}
 			remotelogs.Warn("HTTP_REQUEST_REVERSE_PROXY", this.RawReq.URL.String()+"': "+err.Error())
 		} else {
 			// 是否为客户端方面的错误
@@ -175,7 +193,7 @@ func (this *HTTPRequest) doReverseProxy() {
 			}
 
 			if !isClientError {
-				this.write502(err)
+				this.write50x(err, http.StatusBadGateway)
 			}
 		}
 		if resp != nil && resp.Body != nil {
@@ -183,6 +201,11 @@ func (this *HTTPRequest) doReverseProxy() {
 		}
 		return
 	}
+	if !origin.IsOk {
+		SharedOriginStateManager.Success(origin, func() {
+			this.reverseProxy.ResetScheduling()
+		})
+	}
 
 	// WAF对出站进行检查
 	if this.web.FirewallRef != nil && this.web.FirewallRef.IsOn {
@@ -226,10 +249,12 @@ func (this *HTTPRequest) doReverseProxy() {
 	shouldAutoFlush := this.reverseProxy.AutoFlush || this.RawReq.Header.Get("Accept") == "text/event-stream"
 
 	// 准备
-	this.writer.Prepare(resp.ContentLength, resp.StatusCode)
+	delayHeaders := this.writer.Prepare(resp.ContentLength, resp.StatusCode)
 
 	// 设置响应代码
-	this.writer.WriteHeader(resp.StatusCode)
+	if !delayHeaders {
+		this.writer.WriteHeader(resp.StatusCode)
+	}
 
 	// 输出到客户端
 	pool := this.bytePool(resp.ContentLength)

internal/nodes/http_request_rewrite.go

@@ -19,7 +19,7 @@ func (this *HTTPRequest) doRewrite() (shouldShop bool) {
 			if len(this.rewriteRule.ProxyHost) > 0 {
 				host = this.rewriteRule.ProxyHost
 			}
-			this.doURL(this.RawReq.Method, this.rewriteReplace, host, 0)
+			this.doURL(this.RawReq.Method, this.rewriteReplace, host, 0, false)
 			return true
 		}
 

internal/nodes/http_request_root.go

@@ -109,7 +109,7 @@ func (this *HTTPRequest) doRoot() (isBreak bool) {
 			}
 			return
 		} else {
-			this.write500(err)
+			this.write50x(err, http.StatusInternalServerError)
 			logs.Error(err)
 			return true
 		}
@@ -138,7 +138,7 @@ func (this *HTTPRequest) doRoot() (isBreak bool) {
 					}
 					return
 				} else {
-					this.write500(err)
+					this.write50x(err, http.StatusInternalServerError)
 					logs.Error(err)
 					return true
 				}
@@ -283,8 +283,7 @@ func (this *HTTPRequest) doRoot() (isBreak bool) {
 
 	reader, err := os.OpenFile(filePath, os.O_RDONLY, 0444)
 	if err != nil {
-		this.write500(err)
-		logs.Error(err)
+		this.write50x(err, http.StatusInternalServerError)
 		return true
 	}
 

internal/nodes/http_request_shutdown.go

@@ -1,10 +1,11 @@
 package nodes
 
 import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
+	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/logs"
-	"io"
 	"net/http"
 	"os"
 )
@@ -17,12 +18,44 @@ func (this *HTTPRequest) doShutdown() {
 	}
 
 	if urlPrefixRegexp.MatchString(shutdown.URL) { // URL
-		this.doURL(http.MethodGet, shutdown.URL, "", shutdown.Status)
+		this.doURL(http.MethodGet, shutdown.URL, "", shutdown.Status, true)
 		return
 	}
 
-	// URL为空，则显示文本 TODO 未来可以自定义文本
-	if len(shutdown.URL) == 0 {
+	if len(shutdown.BodyType) == 0 || shutdown.BodyType == shared.BodyTypeURL {
+		// URL为空，则显示文本
+		if len(shutdown.URL) == 0 {
+			// 自定义响应Headers
+			if shutdown.Status > 0 {
+				this.processResponseHeaders(shutdown.Status)
+				this.writer.WriteHeader(shutdown.Status)
+			} else {
+				this.processResponseHeaders(http.StatusOK)
+				this.writer.WriteHeader(http.StatusOK)
+			}
+			_, err := this.writer.WriteString("The site have been shutdown.")
+			if err != nil {
+				logs.Error(err)
+			}
+
+			return
+		}
+
+		// 从本地文件中读取
+		file := Tea.Root + Tea.DS + shutdown.URL
+		fp, err := os.Open(file)
+		if err != nil {
+			logs.Error(err)
+			msg := "404 page not found: '" + shutdown.URL + "'"
+
+			this.writer.WriteHeader(http.StatusNotFound)
+			_, err = this.writer.Write([]byte(msg))
+			if err != nil {
+				logs.Error(err)
+			}
+			return
+		}
+
 		// 自定义响应Headers
 		if shutdown.Status > 0 {
 			this.processResponseHeaders(shutdown.Status)
@@ -31,51 +64,40 @@ func (this *HTTPRequest) doShutdown() {
 			this.processResponseHeaders(http.StatusOK)
 			this.writer.WriteHeader(http.StatusOK)
 		}
-		_, err := this.writer.WriteString("The site have been shutdown.")
+		buf := bytePool1k.Get()
+		_, err = utils.CopyWithFilter(this.writer, fp, buf, func(p []byte) []byte {
+			return []byte(this.Format(string(p)))
+		})
+		bytePool1k.Put(buf)
 		if err != nil {
-			logs.Error(err)
+			if !this.canIgnore(err) {
+				remotelogs.Warn("HTTP_REQUEST_SHUTDOWN", "write to client failed: "+err.Error())
+			}
+		} else {
+			this.writer.SetOk()
 		}
 
-		return
-	}
-
-	// 从本地文件中读取
-	// TODO 支持从数据库中读取文件
-	file := Tea.Root + Tea.DS + shutdown.URL
-	fp, err := os.Open(file)
-	if err != nil {
-		logs.Error(err)
-		msg := "404 page not found: '" + shutdown.URL + "'"
-
-		this.writer.WriteHeader(http.StatusNotFound)
-		_, err = this.writer.Write([]byte(msg))
+		err = fp.Close()
 		if err != nil {
-			logs.Error(err)
+			remotelogs.Warn("HTTP_REQUEST_SHUTDOWN", "close file failed: "+err.Error())
 		}
-		return
-	}
-
-	// 自定义响应Headers
-	if shutdown.Status > 0 {
-		this.processResponseHeaders(shutdown.Status)
-		this.writer.WriteHeader(shutdown.Status)
-	} else {
-		this.processResponseHeaders(http.StatusOK)
-		this.writer.WriteHeader(http.StatusOK)
-	}
-	buf := bytePool1k.Get()
-	_, err = io.CopyBuffer(this.writer, fp, buf)
-	bytePool1k.Put(buf)
-	if err != nil {
-		if !this.canIgnore(err) {
-			remotelogs.Warn("HTTP_REQUEST_SHUTDOWN", "write to client failed: "+err.Error())
+	} else if shutdown.BodyType == shared.BodyTypeHTML {
+		// 自定义响应Headers
+		if shutdown.Status > 0 {
+			this.processResponseHeaders(shutdown.Status)
+			this.writer.WriteHeader(shutdown.Status)
+		} else {
+			this.processResponseHeaders(http.StatusOK)
+			this.writer.WriteHeader(http.StatusOK)
 		}
-	} else {
-		this.writer.SetOk()
-	}
 
-	err = fp.Close()
-	if err != nil {
-		remotelogs.Warn("HTTP_REQUEST_SHUTDOWN", "close file failed: "+err.Error())
+		_, err := this.writer.WriteString(this.Format(shutdown.Body))
+		if err != nil {
+			if !this.canIgnore(err) {
+				remotelogs.Warn("HTTP_REQUEST_SHUTDOWN", "write to client failed: "+err.Error())
+			}
+		} else {
+			this.writer.SetOk()
+		}
 	}
 }

internal/nodes/http_request_stat.go

@@ -7,6 +7,8 @@ func (this *HTTPRequest) doStat() {
 	if this.Server == nil {
 		return
 	}
-	stats.SharedHTTPRequestStatManager.AddRemoteAddr(this.Server.Id, this.requestRemoteAddr())
+
+	// 内置的统计
+	stats.SharedHTTPRequestStatManager.AddRemoteAddr(this.Server.Id, this.requestRemoteAddr(true))
 	stats.SharedHTTPRequestStatManager.AddUserAgent(this.Server.Id, this.requestHeader("User-Agent"))
 }

internal/nodes/http_request_url.go

@@ -1,7 +1,6 @@
 package nodes
 
 import (
-	"errors"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/iwind/TeaGo/logs"
@@ -11,7 +10,7 @@ import (
 )
 
 // 请求某个URL
-func (this *HTTPRequest) doURL(method string, url string, host string, statusCode int) {
+func (this *HTTPRequest) doURL(method string, url string, host string, statusCode int, supportVariables bool) {
 	req, err := http.NewRequest(method, url, this.RawReq.Body)
 	if err != nil {
 		logs.Error(err)
@@ -35,8 +34,8 @@ func (this *HTTPRequest) doURL(method string, url string, host string, statusCod
 	var client = utils.SharedHttpClient(60 * time.Second)
 	resp, err := client.Do(req)
 	if err != nil {
-		logs.Error(errors.New(req.URL.String() + ": " + err.Error()))
-		this.write500(err)
+		remotelogs.Error("HTTP_REQUEST_URL", req.URL.String()+": "+err.Error())
+		this.write50x(err, http.StatusInternalServerError)
 		return
 	}
 	defer func() {
@@ -50,6 +49,9 @@ func (this *HTTPRequest) doURL(method string, url string, host string, statusCod
 		this.processResponseHeaders(statusCode)
 	}
 
+	if supportVariables {
+		resp.Header.Del("Content-Length")
+	}
 	this.writer.AddHeaders(resp.Header)
 	if statusCode <= 0 {
 		this.writer.Prepare(resp.ContentLength, resp.StatusCode)
@@ -67,7 +69,13 @@ func (this *HTTPRequest) doURL(method string, url string, host string, statusCod
 	// 输出内容
 	pool := this.bytePool(resp.ContentLength)
 	buf := pool.Get()
-	_, err = io.CopyBuffer(this.writer, resp.Body, buf)
+	if supportVariables {
+		_, err = utils.CopyWithFilter(this.writer, resp.Body, buf, func(p []byte) []byte {
+			return []byte(this.Format(string(p)))
+		})
+	} else {
+		_, err = io.CopyBuffer(this.writer, resp.Body, buf)
+	}
 	pool.Put(buf)
 
 	if err != nil {

internal/nodes/http_request_waf.go

@@ -1,6 +1,7 @@
 package nodes
 
 import (
+	"bytes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/TeaOSLab/EdgeNode/internal/iplibrary"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
@@ -8,11 +9,34 @@ import (
 	"github.com/TeaOSLab/EdgeNode/internal/waf"
 	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/types"
+	"io"
+	"io/ioutil"
+	"net"
 	"net/http"
 )
 
 // 调用WAF
 func (this *HTTPRequest) doWAFRequest() (blocked bool) {
+	// 当前连接是否已关闭
+	var conn = this.RawReq.Context().Value(HTTPConnContextKey)
+	if conn != nil {
+		if isClientConnClosed(conn.(net.Conn)) {
+			this.disableLog = true
+			return true
+		}
+	}
+
+	// 检查是否在临时黑名单中
+	var remoteAddr = this.WAFRemoteIP()
+	if waf.SharedIPBlackList.Contains(waf.IPTypeAll, firewallconfigs.FirewallScopeService, this.Server.Id, remoteAddr) || waf.SharedIPBlackList.Contains(waf.IPTypeAll, firewallconfigs.FirewallScopeGlobal, 0, remoteAddr) {
+		this.disableLog = true
+		if conn != nil {
+			_ = conn.(net.Conn).Close()
+		}
+
+		return true
+	}
+
 	// 当前服务的独立设置
 	if this.web.FirewallPolicy != nil && this.web.FirewallPolicy.IsOn {
 		blocked, breakChecking := this.checkWAFRequest(this.web.FirewallPolicy)
@@ -25,8 +49,8 @@ func (this *HTTPRequest) doWAFRequest() (blocked bool) {
 	}
 
 	// 公用的防火墙设置
-	if sharedNodeConfig.HTTPFirewallPolicy != nil {
-		blocked, breakChecking := this.checkWAFRequest(sharedNodeConfig.HTTPFirewallPolicy)
+	if this.Server.HTTPFirewallPolicy != nil && this.Server.HTTPFirewallPolicy.IsOn {
+		blocked, breakChecking := this.checkWAFRequest(this.Server.HTTPFirewallPolicy)
 		if blocked {
 			return true
 		}
@@ -40,98 +64,109 @@ func (this *HTTPRequest) doWAFRequest() (blocked bool) {
 
 func (this *HTTPRequest) checkWAFRequest(firewallPolicy *firewallconfigs.HTTPFirewallPolicy) (blocked bool, breakChecking bool) {
 	// 检查配置是否为空
-	if firewallPolicy == nil || !firewallPolicy.IsOn || firewallPolicy.Inbound == nil || !firewallPolicy.Inbound.IsOn {
+	if firewallPolicy == nil || !firewallPolicy.IsOn || firewallPolicy.Inbound == nil || !firewallPolicy.Inbound.IsOn || firewallPolicy.Mode == firewallconfigs.FirewallModeBypass {
 		return
 	}
 
 	// 检查IP白名单
 	remoteAddrs := this.requestRemoteAddrs()
 	inbound := firewallPolicy.Inbound
-	if inbound.AllowListRef != nil && inbound.AllowListRef.IsOn && inbound.AllowListRef.ListId > 0 {
-		list := iplibrary.SharedIPListManager.FindList(inbound.AllowListRef.ListId)
-		if list != nil {
-			found, _ := list.ContainsIPStrings(remoteAddrs)
-			if found {
-				breakChecking = true
-				return
+	if inbound == nil {
+		return
+	}
+	for _, ref := range inbound.AllAllowListRefs() {
+		if ref.IsOn && ref.ListId > 0 {
+			list := iplibrary.SharedIPListManager.FindList(ref.ListId)
+			if list != nil {
+				_, found := list.ContainsIPStrings(remoteAddrs)
+				if found {
+					breakChecking = true
+					return
+				}
 			}
 		}
 	}
 
 	// 检查IP黑名单
-	if inbound.DenyListRef != nil && inbound.DenyListRef.IsOn && inbound.DenyListRef.ListId > 0 {
-		list := iplibrary.SharedIPListManager.FindList(inbound.DenyListRef.ListId)
-		if list != nil {
-			found, item := list.ContainsIPStrings(remoteAddrs)
-			if found {
-				// 触发事件
-				if item != nil && len(item.EventLevel) > 0 {
-					actions := iplibrary.SharedActionManager.FindEventActions(item.EventLevel)
-					for _, action := range actions {
-						goNext, err := action.DoHTTP(this.RawReq, this.RawWriter)
-						if err != nil {
-							remotelogs.Error("HTTP_REQUEST_WAF", "do action '"+err.Error()+"' failed: "+err.Error())
-							return true, false
-						}
-						if !goNext {
-							this.disableLog = true
-							return true, false
+	if firewallPolicy.Mode == firewallconfigs.FirewallModeDefend {
+		for _, ref := range inbound.AllDenyListRefs() {
+			if ref.IsOn && ref.ListId > 0 {
+				list := iplibrary.SharedIPListManager.FindList(ref.ListId)
+				if list != nil {
+					item, found := list.ContainsIPStrings(remoteAddrs)
+					if found {
+						// 触发事件
+						if item != nil && len(item.EventLevel) > 0 {
+							actions := iplibrary.SharedActionManager.FindEventActions(item.EventLevel)
+							for _, action := range actions {
+								goNext, err := action.DoHTTP(this.RawReq, this.RawWriter)
+								if err != nil {
+									remotelogs.Error("HTTP_REQUEST_WAF", "do action '"+err.Error()+"' failed: "+err.Error())
+									return true, false
+								}
+								if !goNext {
+									this.disableLog = true
+									return true, false
+								}
+							}
 						}
+
+						// TODO 需要记录日志信息
+
+						this.writer.WriteHeader(http.StatusForbidden)
+						this.writer.Close()
+
+						// 停止日志
+						this.disableLog = true
+
+						return true, false
 					}
 				}
-
-				// TODO 需要记录日志信息
-
-				this.writer.WriteHeader(http.StatusForbidden)
-				this.writer.Close()
-
-				// 停止日志
-				this.disableLog = true
-
-				return true, false
 			}
 		}
 	}
 
 	// 检查地区封禁
-	if iplibrary.SharedLibrary != nil {
-		if firewallPolicy.Inbound.Region != nil && firewallPolicy.Inbound.Region.IsOn {
-			regionConfig := firewallPolicy.Inbound.Region
-			if regionConfig.IsNotEmpty() {
-				for _, remoteAddr := range remoteAddrs {
-					result, err := iplibrary.SharedLibrary.Lookup(remoteAddr)
-					if err != nil {
-						remotelogs.Error("HTTP_REQUEST_WAF", "iplibrary lookup failed: "+err.Error())
-					} else if result != nil {
-						// 检查国家级别封禁
-						if len(regionConfig.DenyCountryIds) > 0 && len(result.Country) > 0 {
-							countryId := iplibrary.SharedCountryManager.Lookup(result.Country)
-							if countryId > 0 && lists.ContainsInt64(regionConfig.DenyCountryIds, countryId) {
-								// TODO 可以配置对封禁的处理方式等
-								// TODO 需要记录日志信息
-								this.writer.WriteHeader(http.StatusForbidden)
-								this.writer.Close()
+	if firewallPolicy.Mode == firewallconfigs.FirewallModeDefend {
+		if iplibrary.SharedLibrary != nil {
+			if firewallPolicy.Inbound.Region != nil && firewallPolicy.Inbound.Region.IsOn {
+				regionConfig := firewallPolicy.Inbound.Region
+				if regionConfig.IsNotEmpty() {
+					for _, remoteAddr := range remoteAddrs {
+						result, err := iplibrary.SharedLibrary.Lookup(remoteAddr)
+						if err != nil {
+							remotelogs.Error("HTTP_REQUEST_WAF", "iplibrary lookup failed: "+err.Error())
+						} else if result != nil {
+							// 检查国家级别封禁
+							if len(regionConfig.DenyCountryIds) > 0 && len(result.Country) > 0 {
+								countryId := iplibrary.SharedCountryManager.Lookup(result.Country)
+								if countryId > 0 && lists.ContainsInt64(regionConfig.DenyCountryIds, countryId) {
+									// TODO 可以配置对封禁的处理方式等
+									// TODO 需要记录日志信息
+									this.writer.WriteHeader(http.StatusForbidden)
+									this.writer.Close()
 
-								// 停止日志
-								this.disableLog = true
+									// 停止日志
+									this.disableLog = true
 
-								return true, false
+									return true, false
+								}
 							}
-						}
 
-						// 检查省份封禁
-						if len(regionConfig.DenyProvinceIds) > 0 && len(result.Province) > 0 {
-							provinceId := iplibrary.SharedProvinceManager.Lookup(result.Province)
-							if provinceId > 0 && lists.ContainsInt64(regionConfig.DenyProvinceIds, provinceId) {
-								// TODO 可以配置对封禁的处理方式等
-								// TODO 需要记录日志信息
-								this.writer.WriteHeader(http.StatusForbidden)
-								this.writer.Close()
+							// 检查省份封禁
+							if len(regionConfig.DenyProvinceIds) > 0 && len(result.Province) > 0 {
+								provinceId := iplibrary.SharedProvinceManager.Lookup(result.Province)
+								if provinceId > 0 && lists.ContainsInt64(regionConfig.DenyProvinceIds, provinceId) {
+									// TODO 可以配置对封禁的处理方式等
+									// TODO 需要记录日志信息
+									this.writer.WriteHeader(http.StatusForbidden)
+									this.writer.Close()
 
-								// 停止日志
-								this.disableLog = true
+									// 停止日志
+									this.disableLog = true
 
-								return true, false
+									return true, false
+								}
 							}
 						}
 					}
@@ -145,23 +180,36 @@ func (this *HTTPRequest) checkWAFRequest(firewallPolicy *firewallconfigs.HTTPFir
 	if w == nil {
 		return
 	}
-	goNext, ruleGroup, ruleSet, err := w.MatchRequest(this.RawReq, this.writer)
+
+	w.OnAction(func(action waf.ActionInterface) (goNext bool) {
+		switch action.Code() {
+		case waf.ActionTag:
+			this.tags = action.(*waf.TagAction).Tags
+		}
+		return true
+	})
+
+	goNext, ruleGroup, ruleSet, err := w.MatchRequest(this, this.writer)
 	if err != nil {
 		remotelogs.Error("HTTP_REQUEST_WAF", this.rawURI+": "+err.Error())
 		return
 	}
 
 	if ruleSet != nil {
-		if ruleSet.Action != waf.ActionAllow {
+		if ruleSet.HasSpecialActions() {
 			this.firewallPolicyId = firewallPolicy.Id
 			this.firewallRuleGroupId = types.Int64(ruleGroup.Id)
 			this.firewallRuleSetId = types.Int64(ruleSet.Id)
 
+			if ruleSet.HasAttackActions() {
+				this.isAttack = true
+			}
+
 			// 添加统计
-			stats.SharedHTTPRequestStatManager.AddFirewallRuleGroupId(this.Server.Id, this.firewallRuleGroupId, ruleSet.Action)
+			stats.SharedHTTPRequestStatManager.AddFirewallRuleGroupId(this.Server.Id, this.firewallRuleGroupId, ruleSet.Actions)
 		}
 
-		this.logAttrs["waf.action"] = ruleSet.Action
+		this.firewallActions = append(ruleSet.ActionCodes(), firewallPolicy.Mode)
 	}
 
 	return !goNext, false
@@ -169,8 +217,26 @@ func (this *HTTPRequest) checkWAFRequest(firewallPolicy *firewallconfigs.HTTPFir
 
 // call response waf
 func (this *HTTPRequest) doWAFResponse(resp *http.Response) (blocked bool) {
-	firewallPolicy := sharedNodeConfig.HTTPFirewallPolicy
-	if firewallPolicy == nil || !firewallPolicy.IsOn || !firewallPolicy.Outbound.IsOn {
+	// 当前服务的独立设置
+	if this.web.FirewallPolicy != nil && this.web.FirewallPolicy.IsOn {
+		blocked := this.checkWAFResponse(this.web.FirewallPolicy, resp)
+		if blocked {
+			return true
+		}
+	}
+
+	// 公用的防火墙设置
+	if this.Server.HTTPFirewallPolicy != nil && this.Server.HTTPFirewallPolicy.IsOn {
+		blocked := this.checkWAFResponse(this.Server.HTTPFirewallPolicy, resp)
+		if blocked {
+			return true
+		}
+	}
+	return
+}
+
+func (this *HTTPRequest) checkWAFResponse(firewallPolicy *firewallconfigs.HTTPFirewallPolicy, resp *http.Response) (blocked bool) {
+	if firewallPolicy == nil || !firewallPolicy.IsOn || !firewallPolicy.Outbound.IsOn || firewallPolicy.Mode == firewallconfigs.FirewallModeBypass {
 		return
 	}
 
@@ -179,24 +245,93 @@ func (this *HTTPRequest) doWAFResponse(resp *http.Response) (blocked bool) {
 		return
 	}
 
-	goNext, ruleGroup, ruleSet, err := w.MatchResponse(this.RawReq, resp, this.writer)
+	w.OnAction(func(action waf.ActionInterface) (goNext bool) {
+		switch action.Code() {
+		case waf.ActionTag:
+			this.tags = action.(*waf.TagAction).Tags
+		}
+		return true
+	})
+
+	goNext, ruleGroup, ruleSet, err := w.MatchResponse(this, resp, this.writer)
 	if err != nil {
 		remotelogs.Error("HTTP_REQUEST_WAF", this.rawURI+": "+err.Error())
 		return
 	}
 
 	if ruleSet != nil {
-		if ruleSet.Action != waf.ActionAllow {
+		if ruleSet.HasSpecialActions() {
 			this.firewallPolicyId = firewallPolicy.Id
 			this.firewallRuleGroupId = types.Int64(ruleGroup.Id)
 			this.firewallRuleSetId = types.Int64(ruleSet.Id)
 
+			if ruleSet.HasAttackActions() {
+				this.isAttack = true
+			}
+
 			// 添加统计
-			stats.SharedHTTPRequestStatManager.AddFirewallRuleGroupId(this.Server.Id, this.firewallRuleGroupId, ruleSet.Action)
+			stats.SharedHTTPRequestStatManager.AddFirewallRuleGroupId(this.Server.Id, this.firewallRuleGroupId, ruleSet.Actions)
 		}
 
-		this.logAttrs["waf.action"] = ruleSet.Action
+		this.firewallActions = append(ruleSet.ActionCodes(), firewallPolicy.Mode)
 	}
 
 	return !goNext
 }
+
+// WAFRaw 原始请求
+func (this *HTTPRequest) WAFRaw() *http.Request {
+	return this.RawReq
+}
+
+// WAFRemoteIP 客户端IP
+func (this *HTTPRequest) WAFRemoteIP() string {
+	return this.requestRemoteAddr(true)
+}
+
+// WAFGetCacheBody 获取缓存中的Body
+func (this *HTTPRequest) WAFGetCacheBody() []byte {
+	return this.bodyData
+}
+
+// WAFSetCacheBody 设置Body
+func (this *HTTPRequest) WAFSetCacheBody(body []byte) {
+	this.bodyData = body
+}
+
+// WAFReadBody 读取Body
+func (this *HTTPRequest) WAFReadBody(max int64) (data []byte, err error) {
+	if this.RawReq.ContentLength > 0 {
+		data, err = ioutil.ReadAll(io.LimitReader(this.RawReq.Body, max))
+	}
+	return
+}
+
+// WAFRestoreBody 恢复Body
+func (this *HTTPRequest) WAFRestoreBody(data []byte) {
+	if len(data) > 0 {
+		rawReader := bytes.NewBuffer(data)
+		buf := make([]byte, 1024)
+		_, _ = io.CopyBuffer(rawReader, this.RawReq.Body, buf)
+		this.RawReq.Body = ioutil.NopCloser(rawReader)
+	}
+}
+
+// WAFServerId 服务ID
+func (this *HTTPRequest) WAFServerId() int64 {
+	return this.Server.Id
+}
+
+// WAFClose 关闭连接
+func (this *HTTPRequest) WAFClose() {
+	requestConn := this.RawReq.Context().Value(HTTPConnContextKey)
+	if requestConn == nil {
+		return
+	}
+	conn, ok := requestConn.(net.Conn)
+	if ok {
+		_ = conn.Close()
+		return
+	}
+	return
+}

internal/nodes/http_request_websocket.go

@@ -2,7 +2,6 @@ package nodes
 
 import (
 	"errors"
-	"github.com/iwind/TeaGo/logs"
 	"io"
 	"net/http"
 	"net/url"
@@ -43,8 +42,7 @@ func (this *HTTPRequest) doWebsocket() {
 	// TODO 增加N次错误重试，重试的时候需要尝试不同的源站
 	originConn, err := OriginConnect(this.origin, this.RawReq.RemoteAddr)
 	if err != nil {
-		logs.Error(err)
-		this.write500(err)
+		this.write50x(err, http.StatusBadGateway)
 		return
 	}
 	defer func() {
@@ -53,15 +51,13 @@ func (this *HTTPRequest) doWebsocket() {
 
 	err = this.RawReq.Write(originConn)
 	if err != nil {
-		logs.Error(err)
-		this.write500(err)
+		this.write50x(err, http.StatusBadGateway)
 		return
 	}
 
 	clientConn, _, err := this.writer.Hijack()
-	if err != nil {
-		logs.Error(err)
-		this.write500(err)
+	if err != nil || clientConn == nil {
+		this.write50x(err, http.StatusInternalServerError)
 		return
 	}
 	defer func() {

internal/nodes/http_writer.go

@@ -3,32 +3,64 @@ package nodes
 import (
 	"bufio"
 	"bytes"
+	"compress/flate"
 	"compress/gzip"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/TeaOSLab/EdgeNode/internal/caches"
+	"github.com/TeaOSLab/EdgeNode/internal/compressions"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"github.com/andybalholm/brotli"
+	_ "github.com/biessek/golang-ico"
 	"github.com/iwind/TeaGo/lists"
+	"github.com/iwind/TeaGo/types"
+	"github.com/iwind/gowebp"
+	_ "golang.org/x/image/bmp"
+	_ "golang.org/x/image/webp"
+	"image"
+	"image/gif"
+	_ "image/gif"
+	_ "image/jpeg"
+	_ "image/png"
+	"io"
 	"net"
 	"net/http"
+	"path/filepath"
 	"strings"
+	"sync/atomic"
 )
 
+// 限制WebP能够同时使用的Buffer内存使用量
+const webpMaxBufferSize int64 = 1_000_000_000
+const webpSuffix = "@GOEDGE_WEBP"
+
+var webpTotalBufferSize int64 = 0
+var webpBufferPool = utils.NewBufferPool(1024)
+
 // HTTPWriter 响应Writer
 type HTTPWriter struct {
 	req    *HTTPRequest
 	writer http.ResponseWriter
 
-	gzipConfig *serverconfigs.HTTPGzipConfig
-	gzipWriter *gzip.Writer
+	size int64
+
+	webpIsEncoding        bool
+	webpBuffer            *bytes.Buffer
+	webpIsWriting         bool
+	webpOriginContentType string
+	webpOriginEncoding    string // gzip
+
+	compressionConfig *serverconfigs.HTTPCompressionConfig
+	compressionWriter compressions.Writer
+	compressionType   serverconfigs.HTTPCompressionType
 
 	statusCode    int
 	sentBodyBytes int64
 
-	bodyCopying    bool
-	body           []byte
-	gzipBodyBuffer *bytes.Buffer // 当使用gzip压缩时使用
-	gzipBodyWriter *gzip.Writer  // 当使用gzip压缩时使用
+	bodyCopying           bool
+	body                  []byte
+	compressionBodyBuffer *bytes.Buffer       // 当使用压缩时使用
+	compressionBodyWriter compressions.Writer // 当使用压缩时使用
 
 	cacheWriter  caches.Writer // 缓存写入
 	cacheStorage caches.StorageInterface
@@ -48,29 +80,45 @@ func NewHTTPWriter(req *HTTPRequest, httpResponseWriter http.ResponseWriter) *HT
 func (this *HTTPWriter) Reset(httpResponseWriter http.ResponseWriter) {
 	this.writer = httpResponseWriter
 
-	this.gzipConfig = nil
-	this.gzipWriter = nil
+	this.compressionConfig = nil
+	this.compressionWriter = nil
 
 	this.statusCode = 0
 	this.sentBodyBytes = 0
 
 	this.bodyCopying = false
 	this.body = nil
-	this.gzipBodyBuffer = nil
-	this.gzipBodyWriter = nil
+	this.compressionBodyBuffer = nil
+	this.compressionBodyWriter = nil
 }
 
-// Gzip 设置Gzip
-func (this *HTTPWriter) Gzip(config *serverconfigs.HTTPGzipConfig) {
-	this.gzipConfig = config
+// SetCompression 设置内容压缩配置
+func (this *HTTPWriter) SetCompression(config *serverconfigs.HTTPCompressionConfig) {
+	this.compressionConfig = config
 }
 
 // Prepare 准备输出
-func (this *HTTPWriter) Prepare(size int64, status int) {
+// 缓存不调用此函数
+func (this *HTTPWriter) Prepare(size int64, status int) (delayHeaders bool) {
+	this.size = size
 	this.statusCode = status
 
-	this.prepareGzip(size)
+	if status == http.StatusOK {
+		this.prepareWebP(size)
+
+		if this.webpIsEncoding {
+			delayHeaders = true
+		}
+	}
+
 	this.prepareCache(size)
+
+	// 在WebP模式下，压缩暂不可用
+	if !this.webpIsEncoding {
+		this.PrepareCompression(size)
+	}
+
+	return
 }
 
 // Raw 包装前的原始的Writer
@@ -103,40 +151,46 @@ func (this *HTTPWriter) AddHeaders(header http.Header) {
 
 // Write 写入数据
 func (this *HTTPWriter) Write(data []byte) (n int, err error) {
-	if this.writer != nil {
-		if this.gzipWriter != nil {
-			n, err = this.gzipWriter.Write(data)
-		} else {
-			n, err = this.writer.Write(data)
-		}
-		if n > 0 {
-			this.sentBodyBytes += int64(n)
-		}
+	n = len(data)
 
-		// 写入缓存
-		if this.cacheWriter != nil {
-			_, err = this.cacheWriter.Write(data)
-			if err != nil {
-				_ = this.cacheWriter.Discard()
-				this.cacheWriter = nil
-				remotelogs.Error("HTTP_WRITER", "write cache failed: "+err.Error())
-			}
-		}
-	} else {
-		if n == 0 {
-			n = len(data) // 防止出现short write错误
-		}
-	}
-	if this.bodyCopying {
-		if this.gzipBodyWriter != nil {
-			_, err := this.gzipBodyWriter.Write(data)
-			if err != nil {
-				remotelogs.Error("HTTP_WRITER", err.Error())
-			}
+	if this.writer != nil {
+		if this.webpIsEncoding && !this.webpIsWriting {
+			this.webpBuffer.Write(data)
 		} else {
-			this.body = append(this.body, data...)
+			// 写入压缩
+			var n1 int
+			if this.compressionWriter != nil {
+				n1, err = this.compressionWriter.Write(data)
+			} else {
+				n1, err = this.writer.Write(data)
+			}
+			if n1 > 0 {
+				this.sentBodyBytes += int64(n1)
+			}
+
+			// 写入缓存
+			if this.cacheWriter != nil {
+				_, err = this.cacheWriter.Write(data)
+				if err != nil {
+					_ = this.cacheWriter.Discard()
+					this.cacheWriter = nil
+					remotelogs.Error("HTTP_WRITER", "write cache failed: "+err.Error())
+				}
+			}
+
+			if this.bodyCopying {
+				if this.compressionBodyWriter != nil {
+					_, err := this.compressionBodyWriter.Write(data)
+					if err != nil {
+						remotelogs.Error("HTTP_WRITER", err.Error())
+					}
+				} else {
+					this.body = append(this.body, data...)
+				}
+			}
 		}
 	}
+
 	return
 }
 
@@ -210,30 +264,173 @@ func (this *HTTPWriter) SetOk() {
 
 // Close 关闭
 func (this *HTTPWriter) Close() {
-	// gzip writer
-	if this.gzipWriter != nil {
-		if this.bodyCopying && this.gzipBodyWriter != nil {
-			_ = this.gzipBodyWriter.Close()
-			this.body = this.gzipBodyBuffer.Bytes()
+	if this.webpIsEncoding {
+		defer func() {
+			atomic.AddInt64(&webpTotalBufferSize, -this.size*32)
+			webpBufferPool.Put(this.webpBuffer)
+		}()
+	}
+
+	// webp writer
+	if this.isOk && this.webpIsEncoding {
+		var bufferLen = int64(this.webpBuffer.Len())
+		atomic.AddInt64(&webpTotalBufferSize, bufferLen*4)
+
+		// 需要把字节读取出来做备份，防止在image.Decode()过程中丢失
+		var imageBytes = this.webpBuffer.Bytes()
+		var imageData image.Image
+		var gifImage *gif.GIF
+		var isGif = strings.Contains(this.webpOriginContentType, "image/gif")
+
+		var err error
+		if this.webpOriginEncoding == "gzip" {
+			this.Header().Del("Content-Encoding")
+			var reader *gzip.Reader
+			reader, err = gzip.NewReader(this.webpBuffer)
+			if err == nil {
+				defer func() {
+					_ = reader.Close()
+				}()
+				if isGif {
+					gifImage, err = gif.DecodeAll(reader)
+				} else {
+					imageData, _, err = image.Decode(reader)
+				}
+			}
+		} else if this.webpOriginEncoding == "deflate" {
+			this.Header().Del("Content-Encoding")
+			var reader io.ReadCloser
+			reader = flate.NewReader(this.webpBuffer)
+			defer func() {
+				_ = reader.Close()
+			}()
+			if isGif {
+				gifImage, err = gif.DecodeAll(reader)
+			} else {
+				imageData, _, err = image.Decode(reader)
+			}
+		} else if this.webpOriginEncoding == "br" {
+			this.Header().Del("Content-Encoding")
+			var reader *brotli.Reader
+			reader = brotli.NewReader(this.webpBuffer)
+			if isGif {
+				gifImage, err = gif.DecodeAll(reader)
+			} else {
+				imageData, _, err = image.Decode(reader)
+			}
+		} else {
+			if isGif {
+				gifImage, err = gif.DecodeAll(this.webpBuffer)
+			} else {
+				imageData, _, err = image.Decode(this.webpBuffer)
+			}
 		}
-		_ = this.gzipWriter.Close()
-		this.gzipWriter = nil
+		if err != nil {
+			this.Header().Set("Content-Type", this.webpOriginContentType)
+			this.WriteHeader(http.StatusOK)
+			_, _ = this.writer.Write(imageBytes)
+
+			// 处理缓存
+			if this.cacheWriter != nil {
+				_ = this.cacheWriter.Discard()
+			}
+			this.cacheWriter = nil
+		} else {
+			var f = types.Float32(this.req.web.WebP.Quality)
+			if f > 100 {
+				f = 100
+			}
+			this.webpIsWriting = true
+
+			if imageData != nil {
+				err = gowebp.Encode(this, imageData, &gowebp.Options{
+					Lossless: false,
+					Quality:  f,
+					Exact:    true,
+				})
+			} else if gifImage != nil {
+				anim := gowebp.NewWebpAnimation(gifImage.Config.Width, gifImage.Config.Height, gifImage.LoopCount)
+				anim.WebPAnimEncoderOptions.SetKmin(9)
+				anim.WebPAnimEncoderOptions.SetKmax(17)
+				defer anim.ReleaseMemory()
+				webpConfig := gowebp.NewWebpConfig()
+				//webpConfig.SetLossless(1)
+				webpConfig.SetQuality(f)
+
+				timeline := 0
+
+				for i, img := range gifImage.Image {
+					err = anim.AddFrame(img, timeline, webpConfig)
+					if err != nil {
+						break
+					}
+					timeline += gifImage.Delay[i] * 10
+				}
+				if err == nil {
+					err = anim.AddFrame(nil, timeline, webpConfig)
+
+					if err == nil {
+						err = anim.Encode(this)
+					}
+				}
+			}
+			if err != nil {
+				if !this.req.canIgnore(err) {
+					remotelogs.Error("HTTP_WRITER", "encode webp failed: "+err.Error())
+				}
+
+				this.Header().Set("Content-Type", this.webpOriginContentType)
+				this.WriteHeader(http.StatusOK)
+				_, _ = this.writer.Write(imageBytes)
+
+				// 处理缓存
+				if this.cacheWriter != nil {
+					_ = this.cacheWriter.Discard()
+				}
+				this.cacheWriter = nil
+			}
+		}
+
+		atomic.AddInt64(&webpTotalBufferSize, -bufferLen*4)
+		this.webpBuffer.Reset()
+	}
+
+	// compression writer
+	if this.compressionWriter != nil {
+		if this.bodyCopying && this.compressionBodyWriter != nil {
+			_ = this.compressionBodyWriter.Close()
+			this.body = this.compressionBodyBuffer.Bytes()
+		}
+		_ = this.compressionWriter.Close()
+		this.compressionWriter = nil
 	}
 
 	// cache writer
 	if this.cacheWriter != nil {
 		if this.isOk {
-			err := this.cacheWriter.Close()
-			if err == nil {
-				this.cacheStorage.AddToList(&caches.Item{
-					Type:       this.cacheWriter.ItemType(),
-					Key:        this.cacheWriter.Key(),
-					ExpiredAt:  this.cacheWriter.ExpiredAt(),
-					HeaderSize: this.cacheWriter.HeaderSize(),
-					BodySize:   this.cacheWriter.BodySize(),
-					Host:       this.req.Host,
-					ServerId:   this.req.Server.Id,
-				})
+			// 对比Content-Length
+			contentLengthString := this.Header().Get("Content-Length")
+			if len(contentLengthString) > 0 {
+				contentLength := types.Int64(contentLengthString)
+				if contentLength != this.cacheWriter.BodySize() {
+					this.isOk = false
+					_ = this.cacheWriter.Discard()
+				}
+			}
+
+			if this.isOk {
+				err := this.cacheWriter.Close()
+				if err == nil {
+					this.cacheStorage.AddToList(&caches.Item{
+						Type:       this.cacheWriter.ItemType(),
+						Key:        this.cacheWriter.Key(),
+						ExpiredAt:  this.cacheWriter.ExpiredAt(),
+						HeaderSize: this.cacheWriter.HeaderSize(),
+						BodySize:   this.cacheWriter.BodySize(),
+						Host:       this.req.Host,
+						ServerId:   this.req.Server.Id,
+					})
+				}
 			}
 		} else {
 			_ = this.cacheWriter.Discard()
@@ -258,62 +455,93 @@ func (this *HTTPWriter) Flush() {
 	}
 }
 
-// 准备Gzip
-func (this *HTTPWriter) prepareGzip(size int64) {
-	if this.gzipConfig == nil || this.gzipConfig.Level <= 0 {
+// 准备Webp
+func (this *HTTPWriter) prepareWebP(size int64) {
+	if this.req.web != nil &&
+		this.req.web.WebP != nil &&
+		this.req.web.WebP.IsOn &&
+		this.req.web.WebP.MatchResponse(this.Header().Get("Content-Type"), size, filepath.Ext(this.req.requestPath()), this.req.Format) &&
+		this.req.web.WebP.MatchAccept(this.req.requestHeader("Accept")) &&
+		atomic.LoadInt64(&webpTotalBufferSize) < webpMaxBufferSize {
+
+		var contentEncoding = this.writer.Header().Get("Content-Encoding")
+		switch contentEncoding {
+		case "gzip", "deflate", "br":
+			this.webpOriginEncoding = contentEncoding
+		case "": // 空
+		default:
+			return
+		}
+
+		this.webpIsEncoding = true
+		this.webpOriginContentType = this.Header().Get("Content-Type")
+		this.webpBuffer = webpBufferPool.Get()
+
+		this.Header().Del("Content-Length")
+		this.Header().Set("Content-Type", "image/webp")
+
+		atomic.AddInt64(&webpTotalBufferSize, size*32)
+	}
+}
+
+// PrepareCompression 准备压缩
+func (this *HTTPWriter) PrepareCompression(size int64) {
+	if this.compressionConfig == nil || !this.compressionConfig.IsOn || this.compressionConfig.Level <= 0 {
 		return
 	}
 
-	// 判断Accept是否支持gzip
-	if !strings.Contains(this.req.requestHeader("Accept-Encoding"), "gzip") {
+	// 如果已经有编码则不处理
+	var contentEncoding = this.writer.Header().Get("Content-Encoding")
+	if len(contentEncoding) > 0 && (!this.compressionConfig.DecompressData || !lists.ContainsString([]string{"gzip", "deflate", "br"}, contentEncoding)) {
 		return
 	}
 
 	// 尺寸和类型
-	if size < this.gzipConfig.MinBytes() || (this.gzipConfig.MaxBytes() > 0 && size > this.gzipConfig.MaxBytes()) {
+	if !this.compressionConfig.MatchResponse(this.Header().Get("Content-Type"), size, filepath.Ext(this.req.requestPath()), this.req.Format) {
 		return
 	}
 
-	// 校验其他条件
-	if this.gzipConfig.Conds != nil {
-		if len(this.gzipConfig.Conds.Groups) > 0 {
-			if !this.gzipConfig.Conds.MatchRequest(this.req.Format) || !this.gzipConfig.Conds.MatchResponse(this.req.Format) {
-				return
-			}
-		} else {
-			// 默认校验文档类型
-			contentType := this.writer.Header().Get("Content-Type")
-			if len(contentType) > 0 && (!strings.HasPrefix(contentType, "text/") && !strings.HasPrefix(contentType, "application/")) {
-				return
-			}
-		}
-	}
-
-	// 如果已经有编码则不处理
-	if len(this.writer.Header().Get("Content-Encoding")) > 0 {
+	// 判断Accept是否支持压缩
+	compressionType, compressionEncoding, ok := this.compressionConfig.MatchAcceptEncoding(this.req.RawReq.Header.Get("Accept-Encoding"))
+	if !ok {
 		return
 	}
 
-	// gzip writer
+	// 压缩前后如果编码一致，则不处理
+	if compressionEncoding == contentEncoding {
+		return
+	}
+
+	this.compressionType = compressionType
+
+	// compression writer
 	var err error = nil
-	this.gzipWriter, err = gzip.NewWriterLevel(this.writer, int(this.gzipConfig.Level))
+	this.compressionWriter, err = compressions.NewWriter(this.writer, compressionType, int(this.compressionConfig.Level))
 	if err != nil {
 		remotelogs.Error("HTTP_WRITER", err.Error())
 		return
 	}
 
+	// convert between encodings
+	if len(contentEncoding) > 0 {
+		this.compressionWriter, err = compressions.NewEncodingWriter(contentEncoding, this.compressionWriter)
+		if err != nil {
+			remotelogs.Error("HTTP_WRITER", err.Error())
+			return
+		}
+	}
+
 	// body copy
 	if this.bodyCopying {
-		this.gzipBodyBuffer = bytes.NewBuffer([]byte{})
-		this.gzipBodyWriter, err = gzip.NewWriterLevel(this.gzipBodyBuffer, int(this.gzipConfig.Level))
+		this.compressionBodyBuffer = bytes.NewBuffer([]byte{})
+		this.compressionBodyWriter, err = compressions.NewWriter(this.compressionBodyBuffer, compressionType, int(this.compressionConfig.Level))
 		if err != nil {
 			remotelogs.Error("HTTP_WRITER", err.Error())
 		}
 	}
 
 	header := this.writer.Header()
-	header.Set("Content-Encoding", "gzip")
-	header.Set("Transfer-Encoding", "chunked")
+	header.Set("Content-Encoding", compressionEncoding)
 	header.Set("Vary", "Accept-Encoding")
 	header.Del("Content-Length")
 }
@@ -329,7 +557,7 @@ func (this *HTTPWriter) prepareCache(size int64) {
 		return
 	}
 
-	cachePolicy := sharedNodeConfig.HTTPCachePolicy
+	cachePolicy := this.req.Server.HTTPCachePolicy
 	if cachePolicy == nil || !cachePolicy.IsOn {
 		return
 	}
@@ -344,7 +572,7 @@ func (this *HTTPWriter) prepareCache(size int64) {
 		return
 	}
 	if size >= 0 && ((cacheRef.MaxSizeBytes() > 0 && size > cacheRef.MaxSizeBytes()) ||
-		(cachePolicy.MaxSizeBytes() > 0 && size > cachePolicy.MaxSizeBytes())) {
+		(cachePolicy.MaxSizeBytes() > 0 && size > cachePolicy.MaxSizeBytes()) || (cacheRef.MinSizeBytes() > size)) {
 		return
 	}
 
@@ -387,7 +615,11 @@ func (this *HTTPWriter) prepareCache(size int64) {
 		life = 60
 	}
 	expiredAt := utils.UnixTime() + life
-	cacheWriter, err := storage.OpenWriter(this.req.cacheKey, expiredAt, this.StatusCode())
+	var cacheKey = this.req.cacheKey
+	if this.webpIsEncoding {
+		cacheKey += webpSuffix
+	}
+	cacheWriter, err := storage.OpenWriter(cacheKey, expiredAt, this.StatusCode())
 	if err != nil {
 		if !caches.CanIgnoreErr(err) {
 			remotelogs.Error("HTTP_WRITER", "write cache failed: "+err.Error())
@@ -395,9 +627,6 @@ func (this *HTTPWriter) prepareCache(size int64) {
 		return
 	}
 	this.cacheWriter = cacheWriter
-	if this.gzipWriter != nil {
-		this.cacheWriter = caches.NewGzipWriter(this.cacheWriter, this.req.cacheKey, expiredAt)
-	}
 
 	// 写入Header
 	for k, v := range this.Header() {