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

go.mod

@@ -7,7 +7,10 @@ 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
@@ -16,11 +19,16 @@ require (
 	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 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,12 +7,18 @@ 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=
@@ -76,7 +82,11 @@ github.com/iwind/gofcgi v0.0.0-20210528023741-a92711d45f11 h1:DaQjoWZhLNxjhIXedV
 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=
@@ -88,6 +98,8 @@ github.com/lionsoul2014/ip2region v2.2.0-release+incompatible h1:1qp9iks+69h7IGL
 github.com/lionsoul2014/ip2region v2.2.0-release+incompatible/go.mod h1:+ZBN7PBoh5gG6/y0ZQ85vJDBe21WnfbRrQQwTfliJJI=
 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=
@@ -102,6 +114,8 @@ 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=
@@ -126,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=
@@ -152,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=

internal/apps/app_cmd.go

@@ -184,6 +184,8 @@ func (this *AppCmd) runStart() {
 		return
 	}
 
+	_ = os.Setenv("EdgeBackground", "on")
+
 	cmd := exec.Command(os.Args[0])
 	err := cmd.Start()
 	if err != nil {

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/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

@@ -188,7 +188,7 @@ func (this *FileList) Exist(hash string) (bool, error) {
 		var expiredAt int64
 		err = rows.Scan(&expiredAt)
 		if err != nil {
-			return true, nil
+			return false, nil
 		}
 		this.memoryCache.Write(hash, 1, expiredAt)
 		return true, nil

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

@@ -1,7 +1,7 @@
 package teaconst
 
 const (
-	Version = "0.3.1"
+	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"
 )
 
 // 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
+	})
 }
 
-// Contains 判断是否包含某个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
-}
-
-// ContainsIPStrings 是否包含一组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/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_ip_list.go

@@ -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/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/metrics/task.go

@@ -212,6 +212,12 @@ func (this *Task) Add(obj MetricInterface) {
 	var keys = []string{}
 	for _, key := range this.item.Keys {
 		k := obj.MetricKey(key)
+
+		// 忽略499状态
+		if key == "${status}" && k == "499" {
+			return
+		}
+
 		keys = append(keys, k)
 	}
 

internal/nodes/api_stream.go

@@ -145,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
 }
 
@@ -332,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())

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_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

@@ -126,6 +126,24 @@ func (this *HTTPRequest) Do() {
 		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
+	}
+
 	// WAF
 	if this.web.FirewallRef != nil && this.web.FirewallRef.IsOn {
 		if this.doWAFRequest() {
@@ -150,9 +168,9 @@ func (this *HTTPRequest) Do() {
 		}
 	}
 
-	// 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)
 	}
 
 	// 开始调用
@@ -167,12 +185,10 @@ func (this *HTTPRequest) Do() {
 
 // 开始调用
 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()
+	// 处理健康检查
+	var healthCheckKey = this.RawReq.Header.Get(serverconfigs.HealthCheckHeaderName)
+	if len(healthCheckKey) > 0 {
+		if this.doHealthCheck(healthCheckKey) {
 			return
 		}
 	}
@@ -322,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
@@ -333,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
@@ -501,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)
@@ -757,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]
+			}
 		}
 	}
 
@@ -780,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]
+			}
 		}
 	}
 

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,9 +3,12 @@ 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"
@@ -23,7 +26,7 @@ func (this *HTTPRequest) doCacheRead() (shouldStop bool) {
 	}
 
 	// 判断是否在预热
-	if strings.HasPrefix(this.RawReq.RemoteAddr, "127.") && this.RawReq.Header.Get("X-Cache-Action") == "preheat" {
+	if (strings.HasPrefix(this.RawReq.RemoteAddr, "127.") || strings.HasPrefix(this.RawReq.RemoteAddr, "[::1]")) && this.RawReq.Header.Get("X-Cache-Action") == "preheat" {
 		return
 	}
 
@@ -98,6 +101,7 @@ func (this *HTTPRequest) doCacheRead() (shouldStop bool) {
 		this.cacheRef = nil
 		return
 	}
+
 	this.cacheKey = key
 
 	// 读取缓存
@@ -107,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()
@@ -165,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
@@ -193,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
 	}
 
@@ -203,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
 	}
 
@@ -348,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) {
@@ -368,5 +412,8 @@ func (this *HTTPRequest) doCacheRead() (shouldStop bool) {
 
 	this.isCached = true
 	this.cacheRef = nil
+
+	this.writer.SetOk()
+
 	return true
 }

internal/nodes/http_request_fastcgi.go

@@ -41,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)

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(),

internal/nodes/http_request_page.go

@@ -1,6 +1,7 @@
 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"
@@ -20,38 +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, 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 + "'"
+			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 = utils.CopyWithFilter(this.writer, fp, buf, func(p []byte) []byte {
-					return []byte(this.Format(string(p)))
-				})
-				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())
@@ -59,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_reverse_proxy.go

@@ -145,7 +145,7 @@ 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.write50x(err, http.StatusBadGateway)
@@ -249,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_shutdown.go

@@ -1,6 +1,7 @@
 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"
@@ -21,8 +22,40 @@ func (this *HTTPRequest) doShutdown() {
 		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,53 +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 = 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_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

@@ -9,6 +9,6 @@ func (this *HTTPRequest) doStat() {
 	}
 
 	// 内置的统计
-	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_waf.go

@@ -11,11 +11,32 @@ import (
 	"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)
@@ -43,7 +64,7 @@ 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
 	}
 
@@ -57,7 +78,7 @@ func (this *HTTPRequest) checkWAFRequest(firewallPolicy *firewallconfigs.HTTPFir
 		if ref.IsOn && ref.ListId > 0 {
 			list := iplibrary.SharedIPListManager.FindList(ref.ListId)
 			if list != nil {
-				found, _ := list.ContainsIPStrings(remoteAddrs)
+				_, found := list.ContainsIPStrings(remoteAddrs)
 				if found {
 					breakChecking = true
 					return
@@ -67,81 +88,85 @@ func (this *HTTPRequest) checkWAFRequest(firewallPolicy *firewallconfigs.HTTPFir
 	}
 
 	// 检查IP黑名单
-	for _, ref := range inbound.AllDenyListRefs() {
-		if ref.IsOn && ref.ListId > 0 {
-			list := iplibrary.SharedIPListManager.FindList(ref.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
+								}
 							}
 						}
 					}
@@ -184,7 +209,7 @@ func (this *HTTPRequest) checkWAFRequest(firewallPolicy *firewallconfigs.HTTPFir
 			stats.SharedHTTPRequestStatManager.AddFirewallRuleGroupId(this.Server.Id, this.firewallRuleGroupId, ruleSet.Actions)
 		}
 
-		this.firewallActions = ruleSet.ActionCodes()
+		this.firewallActions = append(ruleSet.ActionCodes(), firewallPolicy.Mode)
 	}
 
 	return !goNext, false
@@ -211,7 +236,7 @@ func (this *HTTPRequest) doWAFResponse(resp *http.Response) (blocked bool) {
 }
 
 func (this *HTTPRequest) checkWAFResponse(firewallPolicy *firewallconfigs.HTTPFirewallPolicy, resp *http.Response) (blocked bool) {
-	if firewallPolicy == nil || !firewallPolicy.IsOn || !firewallPolicy.Outbound.IsOn {
+	if firewallPolicy == nil || !firewallPolicy.IsOn || !firewallPolicy.Outbound.IsOn || firewallPolicy.Mode == firewallconfigs.FirewallModeBypass {
 		return
 	}
 
@@ -248,7 +273,7 @@ func (this *HTTPRequest) checkWAFResponse(firewallPolicy *firewallconfigs.HTTPFi
 			stats.SharedHTTPRequestStatManager.AddFirewallRuleGroupId(this.Server.Id, this.firewallRuleGroupId, ruleSet.Actions)
 		}
 
-		this.firewallActions = ruleSet.ActionCodes()
+		this.firewallActions = append(ruleSet.ActionCodes(), firewallPolicy.Mode)
 	}
 
 	return !goNext
@@ -261,7 +286,7 @@ func (this *HTTPRequest) WAFRaw() *http.Request {
 
 // WAFRemoteIP 客户端IP
 func (this *HTTPRequest) WAFRemoteIP() string {
-	return this.requestRemoteAddr()
+	return this.requestRemoteAddr(true)
 }
 
 // WAFGetCacheBody 获取缓存中的Body
@@ -296,3 +321,17 @@ func (this *HTTPRequest) WAFRestoreBody(data []byte) {
 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

@@ -56,7 +56,7 @@ func (this *HTTPRequest) doWebsocket() {
 	}
 
 	clientConn, _, err := this.writer.Hijack()
-	if err != nil {
+	if err != nil || clientConn == nil {
 		this.write50x(err, http.StatusInternalServerError)
 		return
 	}

internal/nodes/http_writer.go

@@ -3,33 +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
@@ -49,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
@@ -104,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
 }
 
@@ -211,14 +264,145 @@ 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
@@ -271,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")
 }
@@ -357,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
 	}
 
@@ -400,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())
@@ -408,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() {

internal/nodes/listener.go

@@ -59,7 +59,7 @@ func (this *Listener) listenTCP() error {
 	if err != nil {
 		return err
 	}
-	netListener = NewTrafficListener(netListener)
+	netListener = NewClientListener(netListener, protocol.IsHTTPFamily() || protocol.IsHTTPSFamily())
 	events.On(events.EventQuit, func() {
 		remotelogs.Println("LISTENER", "quit "+this.group.FullAddr())
 		_ = netListener.Close()

internal/nodes/listener_base.go

@@ -21,19 +21,19 @@ type BaseListener struct {
 	countActiveConnections int64 // 当前活跃的连接数
 }
 
-// 初始化
+// Init 初始化
 func (this *BaseListener) Init() {
 	this.namedServers = map[string]*NamedServer{}
 }
 
-// 清除既有配置
+// Reset 清除既有配置
 func (this *BaseListener) Reset() {
 	this.namedServersLocker.Lock()
 	this.namedServers = map[string]*NamedServer{}
 	this.namedServersLocker.Unlock()
 }
 
-// 获取当前活跃连接数
+// CountActiveListeners 获取当前活跃连接数
 func (this *BaseListener) CountActiveListeners() int {
 	return types.Int(this.countActiveConnections)
 }
@@ -253,3 +253,38 @@ func (this *BaseListener) findNamedServerMatched(name string) (serverConfig *ser
 
 	return nil, name
 }
+
+// 使用CNAME来查找服务
+// TODO 防止单IP随机生成域名攻击
+func (this *BaseListener) findServerWithCname(domain string) *serverconfigs.ServerConfig {
+	if !sharedNodeConfig.SupportCNAME {
+		return nil
+	}
+
+	var realName = sharedCNAMEManager.Lookup(domain)
+	if len(realName) == 0 {
+		return nil
+	}
+
+	this.serversLocker.Lock()
+	defer this.serversLocker.Unlock()
+
+	group := this.Group
+	if group == nil {
+		return nil
+	}
+
+	currentServers := group.Servers
+	countServers := len(currentServers)
+	if countServers == 0 {
+		return nil
+	}
+
+	for _, server := range currentServers {
+		if server.SupportCNAME && lists.ContainsString(server.AliasServerNames, realName) {
+			return server
+		}
+	}
+
+	return nil
+}

internal/nodes/listener_http.go

@@ -1,6 +1,7 @@
 package nodes
 
 import (
+	"context"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"golang.org/x/net/http2"
@@ -18,6 +19,12 @@ var httpErrorLogger = log.New(io.Discard, "", 0)
 var metricNewConnMap = map[string]bool{} // remoteAddr => bool
 var metricNewConnMapLocker = &sync.Mutex{}
 
+type contextKey struct {
+	key string
+}
+
+var HTTPConnContextKey = &contextKey{key: "http-conn"}
+
 type HTTPListener struct {
 	BaseListener
 
@@ -65,6 +72,9 @@ func (this *HTTPListener) Serve() error {
 				metricNewConnMapLocker.Unlock()
 			}
 		},
+		ConnContext: func(ctx context.Context, c net.Conn) context.Context {
+			return context.WithValue(ctx, HTTPConnContextKey, c)
+		},
 	}
 	this.httpServer.SetKeepAlivesEnabled(true)
 
@@ -147,33 +157,38 @@ func (this *HTTPListener) handleHTTP(rawWriter http.ResponseWriter, rawReq *http
 
 	server, serverName := this.findNamedServer(domain)
 	if server == nil {
-		// 严格匹配域名模式下，我们拒绝用户访问
-		if sharedNodeConfig.GlobalConfig != nil && sharedNodeConfig.GlobalConfig.HTTPAll.MatchDomainStrictly {
-			httpAllConfig := sharedNodeConfig.GlobalConfig.HTTPAll
-			mismatchAction := httpAllConfig.DomainMismatchAction
-			if mismatchAction != nil && mismatchAction.Code == "page" {
-				if mismatchAction.Options != nil {
-					rawWriter.Header().Set("Content-Type", "text/html; charset=utf-8")
-					rawWriter.WriteHeader(mismatchAction.Options.GetInt("statusCode"))
-					_, _ = rawWriter.Write([]byte(mismatchAction.Options.GetString("contentHTML")))
+		server = this.findServerWithCname(domain)
+		if server == nil {
+			// 严格匹配域名模式下，我们拒绝用户访问
+			if sharedNodeConfig.GlobalConfig != nil && sharedNodeConfig.GlobalConfig.HTTPAll.MatchDomainStrictly {
+				httpAllConfig := sharedNodeConfig.GlobalConfig.HTTPAll
+				mismatchAction := httpAllConfig.DomainMismatchAction
+				if mismatchAction != nil && mismatchAction.Code == "page" {
+					if mismatchAction.Options != nil {
+						rawWriter.Header().Set("Content-Type", "text/html; charset=utf-8")
+						rawWriter.WriteHeader(mismatchAction.Options.GetInt("statusCode"))
+						_, _ = rawWriter.Write([]byte(mismatchAction.Options.GetString("contentHTML")))
+					} else {
+						http.Error(rawWriter, "404 page not found: '"+rawReq.URL.String()+"'", http.StatusNotFound)
+					}
+					return
 				} else {
-					http.Error(rawWriter, "404 page not found: '"+rawReq.URL.String()+"'", http.StatusNotFound)
-				}
-				return
-			} else {
-				hijacker, ok := rawWriter.(http.Hijacker)
-				if ok {
-					conn, _, _ := hijacker.Hijack()
-					if conn != nil {
-						_ = conn.Close()
-						return
+					hijacker, ok := rawWriter.(http.Hijacker)
+					if ok {
+						conn, _, _ := hijacker.Hijack()
+						if conn != nil {
+							_ = conn.Close()
+							return
+						}
 					}
 				}
 			}
-		}
 
-		http.Error(rawWriter, "404 page not found: '"+rawReq.URL.String()+"'", http.StatusNotFound)
-		return
+			http.Error(rawWriter, "404 page not found: '"+rawReq.URL.String()+"'", http.StatusNotFound)
+			return
+		} else {
+			serverName = domain
+		}
 	}
 
 	// 包装新请求对象

internal/nodes/listener_tcp.go

@@ -6,7 +6,9 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/TeaOSLab/EdgeNode/internal/stats"
+	"github.com/pires/go-proxyproto"
 	"net"
+	"strings"
 	"sync/atomic"
 )
 
@@ -55,6 +57,24 @@ func (this *TCPListener) handleConn(conn net.Conn) error {
 	if firstServer.ReverseProxy == nil {
 		return errors.New("no ReverseProxy configured for the server")
 	}
+
+	// 记录域名排行
+	tlsConn, ok := conn.(*tls.Conn)
+	var recordStat = false
+	if ok {
+		var serverName = tlsConn.ConnectionState().ServerName
+		if len(serverName) > 0 {
+			// 统计
+			stats.SharedTrafficStatManager.Add(firstServer.Id, serverName, 0, 0, 1, 0, 0, 0)
+			recordStat = true
+		}
+	}
+
+	// 统计
+	if !recordStat {
+		stats.SharedTrafficStatManager.Add(firstServer.Id, "", 0, 0, 1, 0, 0, 0)
+	}
+
 	originConn, err := this.connectOrigin(firstServer.ReverseProxy, conn.RemoteAddr().String())
 	if err != nil {
 		return err
@@ -65,6 +85,31 @@ func (this *TCPListener) handleConn(conn net.Conn) error {
 		_ = originConn.Close()
 	}
 
+	// PROXY Protocol
+	if firstServer.ReverseProxy != nil &&
+		firstServer.ReverseProxy.ProxyProtocol != nil &&
+		firstServer.ReverseProxy.ProxyProtocol.IsOn &&
+		(firstServer.ReverseProxy.ProxyProtocol.Version == serverconfigs.ProxyProtocolVersion1 || firstServer.ReverseProxy.ProxyProtocol.Version == serverconfigs.ProxyProtocolVersion2) {
+		var remoteAddr = conn.RemoteAddr()
+		var transportProtocol = proxyproto.TCPv4
+		if strings.Contains(remoteAddr.String(), "[") {
+			transportProtocol = proxyproto.TCPv6
+		}
+		header := proxyproto.Header{
+			Version:           byte(firstServer.ReverseProxy.ProxyProtocol.Version),
+			Command:           proxyproto.PROXY,
+			TransportProtocol: transportProtocol,
+			SourceAddr:        remoteAddr,
+			DestinationAddr:   conn.LocalAddr(),
+		}
+		_, err = header.WriteTo(originConn)
+		if err != nil {
+			closer()
+			return err
+		}
+	}
+
+	// 从源站读取
 	go func() {
 		originBuffer := bytePool32k.Get()
 		defer func() {
@@ -89,6 +134,7 @@ func (this *TCPListener) handleConn(conn net.Conn) error {
 		}
 	}()
 
+	// 从客户端读取
 	clientBuffer := bytePool32k.Get()
 	defer func() {
 		bytePool32k.Put(clientBuffer)

internal/nodes/listener_test.go

@@ -8,7 +8,7 @@ import (
 func TestListener_Listen(t *testing.T) {
 	listener := NewListener()
 
-	group := serverconfigs.NewServerGroup("http://:1234")
+	group := serverconfigs.NewServerAddressGroup("https://:1234")
 
 	listener.Reload(group)
 	err := listener.Listen()

internal/nodes/listener_udp.go

@@ -6,7 +6,9 @@ import (
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/TeaOSLab/EdgeNode/internal/stats"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"github.com/pires/go-proxyproto"
 	"net"
+	"strings"
 	"sync"
 	"time"
 )
@@ -19,6 +21,8 @@ type UDPListener struct {
 	connMap    map[string]*UDPConn
 	connLocker sync.Mutex
 	connTicker *utils.Ticker
+
+	reverseProxy *serverconfigs.ReverseProxyConfig
 }
 
 func (this *UDPListener) Serve() error {
@@ -26,8 +30,9 @@ func (this *UDPListener) Serve() error {
 	if firstServer == nil {
 		return errors.New("no server available")
 	}
-	if firstServer.ReverseProxy == nil {
-		return errors.New("no ReverseProxy configured for the server")
+	this.reverseProxy = firstServer.ReverseProxy
+	if this.reverseProxy == nil {
+		return errors.New("no ReverseProxy configured for the server '" + firstServer.Name + "'")
 	}
 
 	this.connMap = map[string]*UDPConn{}
@@ -50,7 +55,7 @@ func (this *UDPListener) Serve() error {
 				ok = false
 			}
 			if !ok {
-				originConn, err := this.connectOrigin(firstServer.ReverseProxy, "")
+				originConn, err := this.connectOrigin(this.reverseProxy, addr)
 				if err != nil {
 					remotelogs.Error("UDP_LISTENER", "unable to connect to origin server: "+err.Error())
 					continue
@@ -87,9 +92,16 @@ func (this *UDPListener) Close() error {
 func (this *UDPListener) Reload(group *serverconfigs.ServerAddressGroup) {
 	this.Group = group
 	this.Reset()
+
+	// 重置配置
+	firstServer := this.Group.FirstServer()
+	if firstServer == nil {
+		return
+	}
+	this.reverseProxy = firstServer.ReverseProxy
 }
 
-func (this *UDPListener) connectOrigin(reverseProxy *serverconfigs.ReverseProxyConfig, remoteAddr string) (conn net.Conn, err error) {
+func (this *UDPListener) connectOrigin(reverseProxy *serverconfigs.ReverseProxyConfig, remoteAddr net.Addr) (conn net.Conn, err error) {
 	if reverseProxy == nil {
 		return nil, errors.New("no reverse proxy config")
 	}
@@ -100,11 +112,34 @@ func (this *UDPListener) connectOrigin(reverseProxy *serverconfigs.ReverseProxyC
 		if origin == nil {
 			continue
 		}
-		conn, err = OriginConnect(origin, remoteAddr)
+		conn, err = OriginConnect(origin, remoteAddr.String())
 		if err != nil {
 			remotelogs.Error("UDP_LISTENER", "unable to connect origin: "+origin.Addr.Host+":"+origin.Addr.PortRange+": "+err.Error())
 			continue
 		} else {
+			// PROXY Protocol
+			if reverseProxy != nil &&
+				reverseProxy.ProxyProtocol != nil &&
+				reverseProxy.ProxyProtocol.IsOn &&
+				(reverseProxy.ProxyProtocol.Version == serverconfigs.ProxyProtocolVersion1 || reverseProxy.ProxyProtocol.Version == serverconfigs.ProxyProtocolVersion2) {
+				var transportProtocol = proxyproto.UDPv4
+				if strings.Contains(remoteAddr.String(), "[") {
+					transportProtocol = proxyproto.UDPv6
+				}
+				header := proxyproto.Header{
+					Version:           byte(reverseProxy.ProxyProtocol.Version),
+					Command:           proxyproto.PROXY,
+					TransportProtocol: transportProtocol,
+					SourceAddr:        remoteAddr,
+					DestinationAddr:   this.Listener.LocalAddr(),
+				}
+				_, err = header.WriteTo(conn)
+				if err != nil {
+					_ = conn.Close()
+					return nil, err
+				}
+			}
+
 			return
 		}
 	}
@@ -147,6 +182,10 @@ func NewUDPConn(serverId int64, addr net.Addr, proxyConn *net.UDPConn, serverCon
 		activatedAt: time.Now().Unix(),
 		isOk:        true,
 	}
+
+	// 统计
+	stats.SharedTrafficStatManager.Add(serverId, "", 0, 0, 1, 0, 0, 0)
+
 	go func() {
 		buffer := bytePool32k.Get()
 		defer func() {

internal/nodes/node.go

@@ -27,11 +27,14 @@ import (
 	"os"
 	"os/exec"
 	"runtime"
+	"sync"
 	"time"
 )
 
 var sharedNodeConfig *nodeconfigs.NodeConfig
 var nodeTaskNotify = make(chan bool, 8)
+var nodeConfigChangedNotify = make(chan bool, 8)
+var nodeConfigUpdatedAt int64
 var DaemonIsOn = false
 var DaemonPid = 0
 
@@ -39,6 +42,7 @@ var DaemonPid = 0
 type Node struct {
 	isLoaded bool
 	sock     *gosock.Sock
+	locker   sync.Mutex
 }
 
 func NewNode() *Node {
@@ -71,6 +75,9 @@ func (this *Node) Start() {
 		DaemonPid = os.Getppid()
 	}
 
+	// 处理异常
+	this.handlePanic()
+
 	// 启动事件
 	events.Notify(events.EventStart)
 
@@ -174,6 +181,7 @@ func (this *Node) Daemon() {
 
 				// 可以标记当前是从守护进程启动的
 				_ = os.Setenv("EdgeDaemon", "on")
+				_ = os.Setenv("EdgeBackground", "on")
 
 				cmd := exec.Command(exe)
 				err = cmd.Start()
@@ -280,6 +288,9 @@ func (this *Node) loop() error {
 
 // 读取API配置
 func (this *Node) syncConfig() error {
+	this.locker.Lock()
+	defer this.locker.Unlock()
+
 	// 检查api.yaml是否存在
 	apiConfigFile := Tea.ConfigFile("api.yaml")
 	_, err := os.Stat(apiConfigFile)
@@ -315,6 +326,7 @@ func (this *Node) syncConfig() error {
 	if !configResp.IsChanged {
 		return nil
 	}
+	nodeConfigUpdatedAt = time.Now().Unix()
 
 	configJSON := configResp.NodeJSON
 	nodeConfig := &nodeconfigs.NodeConfig{}
@@ -398,6 +410,12 @@ func (this *Node) startSyncTimer() {
 					remotelogs.Error("NODE", "sync config error: "+err.Error())
 					continue
 				}
+			case <-nodeConfigChangedNotify:
+				err := this.syncConfig()
+				if err != nil {
+					remotelogs.Error("NODE", "sync config error: "+err.Error())
+					continue
+				}
 			}
 		}
 	}()

internal/nodes/node_panic.go

@@ -0,0 +1,46 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+//go:build !arm64
+// +build !arm64
+
+package nodes
+
+import (
+	"bytes"
+	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
+	"github.com/iwind/TeaGo/Tea"
+	"github.com/iwind/TeaGo/logs"
+	"io/ioutil"
+	"os"
+	"syscall"
+)
+
+// 处理异常
+func (this *Node) handlePanic() {
+	// 如果是在前台运行就直接返回
+	backgroundEnv, _ := os.LookupEnv("EdgeBackground")
+	if backgroundEnv != "on" {
+		return
+	}
+
+	var panicFile = Tea.Root + "/logs/panic.log"
+
+	// 分析panic
+	data, err := ioutil.ReadFile(panicFile)
+	if err == nil {
+		var index = bytes.Index(data, []byte("panic:"))
+		if index >= 0 {
+			remotelogs.Error("NODE", "系统错误，请上报给开发者: "+string(data[index:]))
+		}
+	}
+
+	fp, err := os.OpenFile(panicFile, os.O_CREATE|os.O_TRUNC|os.O_WRONLY|os.O_APPEND, 0777)
+	if err != nil {
+		logs.Println("NODE", "open 'panic.log' failed: "+err.Error())
+		return
+	}
+	err = syscall.Dup2(int(fp.Fd()), int(os.Stderr.Fd()))
+	if err != nil {
+		logs.Println("NODE", "write to 'panic.log' failed: "+err.Error())
+	}
+}
+

internal/nodes/node_panic_arm64.go

@@ -0,0 +1,10 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+//go:build arm64
+// +build arm64
+
+package nodes
+
+// 处理异常
+func (this *Node) handlePanic() {
+	return
+}

internal/nodes/node_status_executor_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package nodes

internal/nodes/server_cname_manager.go

@@ -0,0 +1,48 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package nodes
+
+import (
+	"github.com/TeaOSLab/EdgeNode/internal/ttlcache"
+	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"github.com/iwind/TeaGo/types"
+	"strings"
+	"sync"
+	"time"
+)
+
+var sharedCNAMEManager = NewServerCNAMEManager()
+
+// ServerCNAMEManager 服务CNAME管理
+// TODO 需要自动更新缓存里的记录
+type ServerCNAMEManager struct {
+	ttlCache *ttlcache.Cache
+
+	locker sync.Mutex
+}
+
+func NewServerCNAMEManager() *ServerCNAMEManager {
+	return &ServerCNAMEManager{
+		ttlCache: ttlcache.NewCache(),
+	}
+}
+
+func (this *ServerCNAMEManager) Lookup(domain string) string {
+	if len(domain) == 0 {
+		return ""
+	}
+
+	var item = this.ttlCache.Read(domain)
+	if item != nil {
+		return types.String(item.Value)
+	}
+
+	cname, _ := utils.LookupCNAME(domain)
+	if len(cname) > 0 {
+		cname = strings.TrimSuffix(cname, ".")
+	}
+
+	this.ttlCache.Write(domain, cname, time.Now().Unix()+600)
+
+	return cname
+}

internal/nodes/server_cname_manager_test.go

@@ -0,0 +1,19 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package nodes
+
+import (
+	"testing"
+	"time"
+)
+
+func TestServerCNameManager_Lookup(t *testing.T) {
+	var cnameManager = NewServerCNAMEManager()
+	t.Log(cnameManager.Lookup("www.yun4s.cn"))
+
+	var before = time.Now()
+	defer func() {
+		t.Log(time.Since(before).Seconds()*1000, "ms")
+	}()
+	t.Log(cnameManager.Lookup("www.yun4s.cn"))
+}

internal/nodes/timezone.go

@@ -0,0 +1,35 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package nodes
+
+import (
+	"github.com/TeaOSLab/EdgeNode/internal/events"
+	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
+	"time"
+)
+
+func init() {
+	// 管理时区
+	var lastTimeZone = ""
+
+	events.On(events.EventReload, func() {
+		if sharedNodeConfig != nil {
+			var timeZone = sharedNodeConfig.TimeZone
+			if len(timeZone) == 0 {
+				timeZone = "Asia/Shanghai"
+			}
+
+			if lastTimeZone != timeZone {
+				location, err := time.LoadLocation(timeZone)
+				if err != nil {
+					remotelogs.Error("TIMEZONE", "change time zone failed: "+err.Error())
+					return
+				}
+
+				remotelogs.Println("TIMEZONE", "change time zone to '"+timeZone+"'")
+				time.Local = location
+				lastTimeZone = timeZone
+			}
+		}
+	})
+}

internal/nodes/traffic_listener.go

@@ -1,44 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package nodes
-
-import (
-	"github.com/TeaOSLab/EdgeNode/internal/waf"
-	"net"
-)
-
-// TrafficListener 用于统计流量的网络监听
-type TrafficListener struct {
-	rawListener net.Listener
-}
-
-func NewTrafficListener(listener net.Listener) net.Listener {
-	return &TrafficListener{rawListener: listener}
-}
-
-func (this *TrafficListener) 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, ip) && waf.SharedIPBlackLIst.Contains(waf.IPTypeAll, ip) {
-			defer func() {
-				_ = conn.Close()
-			}()
-			return conn, nil
-		}
-	}
-
-	return NewTrafficConn(conn), nil
-}
-
-func (this *TrafficListener) Close() error {
-	return this.rawListener.Close()
-}
-
-func (this *TrafficListener) Addr() net.Addr {
-	return this.rawListener.Addr()
-}

internal/nodes/waf_manager.go

@@ -57,10 +57,14 @@ func (this *WAFManager) convertWAF(policy *firewallconfigs.HTTPFirewallPolicy) (
 	if policy == nil {
 		return nil, errors.New("policy should not be nil")
 	}
+	if len(policy.Mode) == 0 {
+		policy.Mode = firewallconfigs.FirewallModeDefend
+	}
 	w := &waf.WAF{
 		Id:   strconv.FormatInt(policy.Id, 10),
 		IsOn: policy.IsOn,
 		Name: policy.Name,
+		Mode: policy.Mode,
 	}
 
 	// inbound

internal/rpc/rpc_client.go

@@ -105,6 +105,18 @@ func (this *RPCClient) ServerRPC() pb.ServerServiceClient {
 	return pb.NewServerServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) ServerRPCList() []pb.ServerServiceClient {
+	this.locker.Lock()
+	defer this.locker.Unlock()
+
+	var clients = []pb.ServerServiceClient{}
+	for _, conn := range this.conns {
+		clients = append(clients, pb.NewServerServiceClient(conn))
+	}
+
+	return clients
+}
+
 func (this *RPCClient) ServerDailyStatRPC() pb.ServerDailyStatServiceClient {
 	return pb.NewServerDailyStatServiceClient(this.pickConn())
 }

internal/stats/traffic_stat_manager.go

@@ -87,7 +87,7 @@ func (this *TrafficStatManager) Start(configFunc func() *nodeconfigs.NodeConfig)
 
 // Add 添加流量
 func (this *TrafficStatManager) Add(serverId int64, domain string, bytes int64, cachedBytes int64, countRequests int64, countCachedRequests int64, countAttacks int64, attackBytes int64) {
-	if bytes == 0 {
+	if bytes == 0 && countRequests == 0 {
 		return
 	}
 

internal/ttlcache/cache.go

@@ -24,7 +24,13 @@ type Cache struct {
 
 func NewCache(opt ...OptionInterface) *Cache {
 	countPieces := 128
-	maxItems := 10_000_000
+	maxItems := 2_000_000
+
+	var delta = systemMemoryGB() / 4
+	if delta > 0 {
+		maxItems *= delta
+	}
+
 	for _, option := range opt {
 		if option == nil {
 			continue
@@ -61,7 +67,7 @@ func NewCache(opt ...OptionInterface) *Cache {
 	return cache
 }
 
-func (this *Cache) Write(key string, value interface{}, expiredAt int64) {
+func (this *Cache) Write(key string, value interface{}, expiredAt int64) (ok bool) {
 	if this.isDestroyed {
 		return
 	}
@@ -77,7 +83,7 @@ func (this *Cache) Write(key string, value interface{}, expiredAt int64) {
 	}
 	uint64Key := HashKey([]byte(key))
 	pieceIndex := uint64Key % this.countPieces
-	this.pieces[pieceIndex].Add(uint64Key, &Item{
+	return this.pieces[pieceIndex].Add(uint64Key, &Item{
 		Value:     value,
 		expiredAt: expiredAt,
 	})

internal/ttlcache/cache_test.go

@@ -25,6 +25,16 @@ func TestNewCache(t *testing.T) {
 	t.Log(cache.Read("a"))
 	time.Sleep(2 * time.Second)
 	t.Log(cache.Read("d"))
+	t.Log(cache.Count(), "items")
+}
+
+func TestCache_Memory(t *testing.T) {
+	cache := NewCache()
+	for i := 0; i < 20_000_000; i++ {
+		cache.Write("a"+strconv.Itoa(i), 1, time.Now().Unix()+3600)
+	}
+	t.Log("waiting ...")
+	time.Sleep(10 * time.Second)
 }
 
 func BenchmarkCache_Add(b *testing.B) {

internal/ttlcache/piece.go

@@ -17,7 +17,7 @@ func NewPiece(maxItems int) *Piece {
 	return &Piece{m: map[uint64]*Item{}, maxItems: maxItems}
 }
 
-func (this *Piece) Add(key uint64, item *Item) {
+func (this *Piece) Add(key uint64, item *Item) (ok bool) {
 	this.locker.Lock()
 	if len(this.m) >= this.maxItems {
 		this.locker.Unlock()
@@ -25,6 +25,7 @@ func (this *Piece) Add(key uint64, item *Item) {
 	}
 	this.m[key] = item
 	this.locker.Unlock()
+	return true
 }
 
 func (this *Piece) IncreaseInt64(key uint64, delta int64, expiredAt int64) (result int64) {

internal/ttlcache/system.go

@@ -0,0 +1,23 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package ttlcache
+
+import (
+	"github.com/shirou/gopsutil/mem"
+)
+
+var systemTotalMemory = -1
+
+func systemMemoryGB() int {
+	if systemTotalMemory > 0 {
+		return systemTotalMemory
+	}
+
+	stat, err := mem.VirtualMemory()
+	if err != nil {
+		return 0
+	}
+
+	systemTotalMemory = int(stat.Total / 1024 / 1024 / 1024)
+	return systemTotalMemory
+}

internal/ttlcache/system_test.go

@@ -0,0 +1,11 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package ttlcache
+
+import "testing"
+
+func TestSystemMemoryGB(t *testing.T) {
+	t.Log(systemMemoryGB())
+	t.Log(systemMemoryGB())
+	t.Log(systemMemoryGB())
+}

internal/utils/buffer_pool.go

@@ -0,0 +1,48 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package utils
+
+import "bytes"
+
+// BufferPool pool for get byte slice
+type BufferPool struct {
+	c chan *bytes.Buffer
+}
+
+// NewBufferPool 创建新对象
+func NewBufferPool(maxSize int) *BufferPool {
+	if maxSize <= 0 {
+		maxSize = 1024
+	}
+	pool := &BufferPool{
+		c: make(chan *bytes.Buffer, maxSize),
+	}
+	return pool
+}
+
+// Get 获取一个新的Buffer
+func (this *BufferPool) Get() (b *bytes.Buffer) {
+	select {
+	case b = <-this.c:
+		b.Reset()
+	default:
+		b = &bytes.Buffer{}
+	}
+	return
+}
+
+// Put 放回一个使用过的byte slice
+func (this *BufferPool) Put(b *bytes.Buffer) {
+	b.Reset()
+
+	select {
+	case this.c <- b:
+	default:
+		// 已达最大容量，则抛弃
+	}
+}
+
+// Size 当前的数量
+func (this *BufferPool) Size() int {
+	return len(this.c)
+}

internal/utils/lookup.go

@@ -0,0 +1,35 @@
+package utils
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
+	"github.com/miekg/dns"
+)
+
+// LookupCNAME 获取CNAME
+func LookupCNAME(host string) (string, error) {
+	config, err := dns.ClientConfigFromFile("/etc/resolv.conf")
+	if err != nil {
+		return "", err
+	}
+
+	c := new(dns.Client)
+	m := new(dns.Msg)
+
+	m.SetQuestion(host+".", dns.TypeCNAME)
+	m.RecursionDesired = true
+
+	var lastErr error
+	for _, serverAddr := range config.Servers {
+		r, _, err := c.Exchange(m, configutils.QuoteIP(serverAddr)+":"+config.Port)
+		if err != nil {
+			lastErr = err
+			continue
+		}
+		if len(r.Answer) == 0 {
+			continue
+		}
+
+		return r.Answer[0].(*dns.CNAME).Target, nil
+	}
+	return "", lastErr
+}

internal/utils/lookup_test.go

@@ -0,0 +1,9 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package utils
+
+import "testing"
+
+func TestLookupCNAME(t *testing.T) {
+	t.Log(LookupCNAME("www.yun4s.cn"))
+}

internal/utils/net.go

@@ -1,3 +1,6 @@
+//go:build !freebsd
+// +build !freebsd
+
 package utils
 
 import (
@@ -7,7 +10,7 @@ import (
 	"syscall"
 )
 
-// 监听可重用的端口
+// ListenReuseAddr 监听可重用的端口
 func ListenReuseAddr(network string, addr string) (net.Listener, error) {
 	config := &net.ListenConfig{
 		Control: func(network, address string, c syscall.RawConn) error {

internal/utils/ticker_test.go

@@ -1,7 +1,6 @@
 package utils
 
 import (
-	"github.com/iwind/TeaGo/logs"
 	"sync"
 	"testing"
 	"time"
@@ -14,7 +13,7 @@ func TestTicker(t *testing.T) {
 		ticker.Stop()
 	}()
 	for ticker.Next() {
-		logs.Println("tick")
+		t.Log("tick")
 	}
 	t.Log("finished")
 }
@@ -26,10 +25,10 @@ func TestTicker2(t *testing.T) {
 		ticker.Stop()
 	}()
 	for {
-		logs.Println("loop")
+		t.Log("loop")
 		select {
 		case <-ticker.C:
-			logs.Println("tick")
+			t.Log("tick")
 		case <-ticker.S:
 			return
 		}
@@ -42,7 +41,7 @@ func TestTickerEvery(t *testing.T) {
 	wg.Add(1)
 	Every(2*time.Second, func(ticker *Ticker) {
 		i++
-		logs.Println("TestTickerEvery i:", i)
+		t.Log("TestTickerEvery i:", i)
 		if i >= 4 {
 			ticker.Stop()
 			wg.Done()

internal/waf/action_base.go

@@ -2,7 +2,9 @@
 
 package waf
 
-import "net/http"
+import (
+	"net/http"
+)
 
 type BaseAction struct {
 }
@@ -13,7 +15,7 @@ func (this *BaseAction) CloseConn(writer http.ResponseWriter) error {
 	hijack, ok := writer.(http.Hijacker)
 	if ok {
 		conn, _, err := hijack.Hijack()
-		if err == nil {
+		if err == nil && conn != nil {
 			return conn.Close()
 		}
 	}

internal/waf/action_block.go

@@ -24,6 +24,7 @@ type BlockAction struct {
 	Body       string `yaml:"body" json:"body"` // supports HTML
 	URL        string `yaml:"url" json:"url"`
 	Timeout    int32  `yaml:"timeout" json:"timeout"`
+	Scope      string `yaml:"scope" json:"scope"`
 }
 
 func (this *BlockAction) Init(waf *WAF) error {
@@ -57,23 +58,16 @@ func (this *BlockAction) WillChange() bool {
 }
 
 func (this *BlockAction) Perform(waf *WAF, group *RuleGroup, set *RuleSet, request requests.Request, writer http.ResponseWriter) (allow bool) {
-	if this.Timeout > 0 {
-		// 加入到黑名单
-		SharedIPBlackLIst.Add(IPTypeAll, request.WAFRemoteIP(), time.Now().Unix()+int64(this.Timeout))
+	// 加入到黑名单
+	var timeout = this.Timeout
+	if timeout <= 0 {
+		timeout = 60 // 默认封锁60秒
 	}
+	SharedIPBlackList.Add(IPTypeAll, this.Scope, request.WAFServerId(), request.WAFRemoteIP(), time.Now().Unix()+int64(timeout))
 
 	if writer != nil {
 		// close the connection
-		defer func() {
-			hijack, ok := writer.(http.Hijacker)
-			if ok {
-				conn, _, _ := hijack.Hijack()
-				if conn != nil {
-					_ = conn.Close()
-					return
-				}
-			}
-		}()
+		defer request.WAFClose()
 
 		// output response
 		if this.StatusCode > 0 {
@@ -126,5 +120,6 @@ func (this *BlockAction) Perform(waf *WAF, group *RuleGroup, set *RuleSet, reque
 			_, _ = writer.Write([]byte("The request is blocked by " + teaconst.ProductName))
 		}
 	}
+
 	return false
 }

internal/waf/action_captcha.go

@@ -23,6 +23,7 @@ type CaptchaAction struct {
 	Life           int32  `yaml:"life" json:"life"`
 	Language       string `yaml:"language" json:"language"`             // 语言，zh-CN, en-US ...
 	AddToWhiteList bool   `yaml:"addToWhiteList" json:"addToWhiteList"` // 是否加入到白名单
+	Scope          string `yaml:"scope" json:"scope"`
 }
 
 func (this *CaptchaAction) Init(waf *WAF) error {
@@ -43,7 +44,7 @@ func (this *CaptchaAction) WillChange() bool {
 
 func (this *CaptchaAction) Perform(waf *WAF, group *RuleGroup, set *RuleSet, request requests.Request, writer http.ResponseWriter) (allow bool) {
 	// 是否在白名单中
-	if SharedIPWhiteList.Contains("set:"+set.Id, request.WAFRemoteIP()) {
+	if SharedIPWhiteList.Contains("set:"+set.Id, this.Scope, request.WAFServerId(), request.WAFRemoteIP()) {
 		return true
 	}
 

internal/waf/action_get_302.go

@@ -20,7 +20,8 @@ const (
 type Get302Action struct {
 	BaseAction
 
-	Life int32 `yaml:"life" json:"life"`
+	Life  int32  `yaml:"life" json:"life"`
+	Scope string `yaml:"scope" json:"scope"`
 }
 
 func (this *Get302Action) Init(waf *WAF) error {
@@ -46,7 +47,7 @@ func (this *Get302Action) Perform(waf *WAF, group *RuleGroup, set *RuleSet, requ
 	}
 
 	// 是否已经在白名单中
-	if SharedIPWhiteList.Contains("set:"+set.Id, request.WAFRemoteIP()) {
+	if SharedIPWhiteList.Contains("set:"+set.Id, this.Scope, request.WAFServerId(), request.WAFRemoteIP()) {
 		return true
 	}
 
@@ -54,6 +55,7 @@ func (this *Get302Action) Perform(waf *WAF, group *RuleGroup, set *RuleSet, requ
 		"url":       request.WAFRaw().URL.String(),
 		"timestamp": time.Now().Unix(),
 		"life":      this.Life,
+		"scope":     this.Scope,
 		"setId":     set.Id,
 	}
 	info, err := utils.SimpleEncryptMap(m)

internal/waf/action_page.go

@@ -0,0 +1,41 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package waf
+
+import (
+	"github.com/TeaOSLab/EdgeNode/internal/waf/requests"
+	"net/http"
+)
+
+type PageAction struct {
+	BaseAction
+
+	Status int    `yaml:"status" json:"status"`
+	Body   string `yaml:"body" json:"body"`
+}
+
+func (this *PageAction) Init(waf *WAF) error {
+	return nil
+}
+
+func (this *PageAction) Code() string {
+	return ActionPage
+}
+
+func (this *PageAction) IsAttack() bool {
+	return false
+}
+
+// WillChange determine if the action will change the request
+func (this *PageAction) WillChange() bool {
+	return true
+}
+
+// Perform the action
+func (this *PageAction) Perform(waf *WAF, group *RuleGroup, set *RuleSet, request requests.Request, writer http.ResponseWriter) (allow bool) {
+	writer.Header().Set("Content-Type", "text/html; charset=utf-8")
+	writer.WriteHeader(this.Status)
+	_, _ = writer.Write([]byte(request.Format(this.Body)))
+
+	return false
+}

internal/waf/action_post_307.go

@@ -10,7 +10,8 @@ import (
 )
 
 type Post307Action struct {
-	Life int32 `yaml:"life" json:"life"`
+	Life  int32  `yaml:"life" json:"life"`
+	Scope string `yaml:"scope" json:"scope"`
 
 	BaseAction
 }
@@ -40,7 +41,7 @@ func (this *Post307Action) Perform(waf *WAF, group *RuleGroup, set *RuleSet, req
 	}
 
 	// 是否已经在白名单中
-	if SharedIPWhiteList.Contains("set:"+set.Id, request.WAFRemoteIP()) {
+	if SharedIPWhiteList.Contains("set:"+set.Id, this.Scope, request.WAFServerId(), request.WAFRemoteIP()) {
 		return true
 	}
 
@@ -54,7 +55,7 @@ func (this *Post307Action) Perform(waf *WAF, group *RuleGroup, set *RuleSet, req
 				life = 600 // 默认10分钟
 			}
 			var setId = m.GetString("setId")
-			SharedIPWhiteList.Add("set:"+setId, request.WAFRemoteIP(), time.Now().Unix()+life)
+			SharedIPWhiteList.Add("set:"+setId, this.Scope, request.WAFServerId(), request.WAFRemoteIP(), time.Now().Unix()+life)
 			return true
 		}
 	}
@@ -62,6 +63,7 @@ func (this *Post307Action) Perform(waf *WAF, group *RuleGroup, set *RuleSet, req
 	var m = maps.Map{
 		"timestamp": time.Now().Unix(),
 		"life":      this.Life,
+		"scope":     this.Scope,
 		"setId":     set.Id,
 		"remoteIP":  request.WAFRemoteIP(),
 	}

internal/waf/action_record_ip.go

@@ -58,6 +58,7 @@ type RecordIPAction struct {
 	IPListId int64  `yaml:"ipListId" json:"ipListId"`
 	Level    string `yaml:"level" json:"level"`
 	Timeout  int32  `yaml:"timeout" json:"timeout"`
+	Scope    string `yaml:"scope" json:"scope"`
 }
 
 func (this *RecordIPAction) Init(waf *WAF) error {
@@ -78,11 +79,10 @@ func (this *RecordIPAction) WillChange() bool {
 
 func (this *RecordIPAction) Perform(waf *WAF, group *RuleGroup, set *RuleSet, request requests.Request, writer http.ResponseWriter) (allow bool) {
 	// 是否在本地白名单中
-	if SharedIPWhiteList.Contains("set:"+set.Id, set.Id) {
+	if SharedIPWhiteList.Contains("set:"+set.Id, this.Scope, request.WAFServerId(), request.WAFRemoteIP()) {
 		return true
 	}
 
-	// 先加入本地的黑名单
 	timeout := this.Timeout
 	if timeout <= 0 {
 		timeout = 86400 // 1天
@@ -90,16 +90,15 @@ func (this *RecordIPAction) Perform(waf *WAF, group *RuleGroup, set *RuleSet, re
 	expiredAt := time.Now().Unix() + int64(timeout)
 
 	if this.Type == "black" {
-		_ = this.CloseConn(writer)
+		writer.WriteHeader(http.StatusForbidden)
 
-		SharedIPBlackLIst.Add(IPTypeAll, request.WAFRemoteIP(), expiredAt)
+		request.WAFClose()
+
+		// 先加入本地的黑名单
+		SharedIPBlackList.Add(IPTypeAll, this.Scope, request.WAFServerId(), request.WAFRemoteIP(), expiredAt)
 	} else {
 		// 加入本地白名单
-		timeout := this.Timeout
-		if timeout <= 0 {
-			timeout = 86400 // 1天
-		}
-		SharedIPWhiteList.Add("set:"+set.Id, request.WAFRemoteIP(), expiredAt)
+		SharedIPWhiteList.Add("set:"+set.Id, this.Scope, request.WAFServerId(), request.WAFRemoteIP(), expiredAt)
 	}
 
 	// 上报

internal/waf/action_types.go

@@ -13,6 +13,7 @@ const (
 	ActionPost307  ActionString = "post_307"  // 针对POST的307重定向认证
 	ActionRecordIP ActionString = "record_ip" // 记录IP
 	ActionTag      ActionString = "tag"       // 标签
+	ActionPage     ActionString = "page"      // 显示网页
 	ActionAllow    ActionString = "allow"     // allow
 	ActionGoGroup  ActionString = "go_group"  // go to next rule group
 	ActionGoSet    ActionString = "go_set"    // go to next rule set
@@ -73,6 +74,12 @@ var AllActions = []*ActionDefinition{
 		Instance: new(TagAction),
 		Type:     reflect.TypeOf(new(TagAction)).Elem(),
 	},
+	{
+		Name:     "显示页面",
+		Code:     ActionPage,
+		Instance: new(PageAction),
+		Type:     reflect.TypeOf(new(PageAction)).Elem(),
+	},
 	{
 		Name:     "跳到下一个规则分组",
 		Code:     ActionGoGroup,

internal/waf/captcha_validator.go

@@ -143,7 +143,7 @@ func (this *CaptchaValidator) validate(actionConfig *CaptchaAction, setId int64,
 			}
 
 			// 加入到白名单
-			SharedIPWhiteList.Add("set:"+strconv.FormatInt(setId, 10), request.WAFRemoteIP(), time.Now().Unix()+int64(life)) // TODO
+			SharedIPWhiteList.Add("set:"+strconv.FormatInt(setId, 10), actionConfig.Scope, request.WAFServerId(), request.WAFRemoteIP(), time.Now().Unix()+int64(life))
 
 			http.Redirect(writer, request.WAFRaw(), originURL, http.StatusSeeOther)
 

internal/waf/checkpoints/request_referer_block.go

@@ -0,0 +1,66 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package checkpoints
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
+	"github.com/TeaOSLab/EdgeNode/internal/waf/requests"
+	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
+	"net/url"
+)
+
+// RequestRefererBlockCheckpoint 防盗链
+type RequestRefererBlockCheckpoint struct {
+	Checkpoint
+}
+
+// RequestValue 计算checkpoint值
+// 选项：allowEmpty, allowSameDomain, allowDomains
+func (this *RequestRefererBlockCheckpoint) RequestValue(req requests.Request, param string, options maps.Map) (value interface{}, sysErr error, userErr error) {
+	var referer = req.WAFRaw().Referer()
+
+	if len(referer) == 0 {
+		if options.GetBool("allowEmpty") {
+			value = 1
+			return
+		}
+		value = 0
+		return
+	}
+
+	u, err := url.Parse(referer)
+	if err != nil {
+		value = 0
+		return
+	}
+	var host = u.Host
+
+	if options.GetBool("allowSameDomain") && host == req.WAFRaw().Host {
+		value = 1
+		return
+	}
+
+	var domains = options.GetSlice("allowDomains")
+	var domainStrings = []string{}
+	for _, domain := range domains {
+		domainStrings = append(domainStrings, types.String(domain))
+	}
+
+	if len(domainStrings) == 0 {
+		value = 0
+		return
+	}
+
+	if configutils.MatchDomains(domainStrings, host) {
+		value = 1
+	} else {
+		value = 0
+	}
+
+	return
+}
+
+func (this *RequestRefererBlockCheckpoint) ResponseValue(req requests.Request, resp *requests.Response, param string, options maps.Map) (value interface{}, sysErr error, userErr error) {
+	return
+}

internal/waf/checkpoints/utils.go

@@ -198,6 +198,13 @@ var AllCheckpoints = []*CheckpointDefinition{
 		HasParams:   true,
 		Instance:    new(CC2Checkpoint),
 	},
+	{
+		Name:        "防盗链",
+		Prefix:      "refererBlock",
+		Description: "阻止一些域名访问引用本站资源",
+		HasParams:   true,
+		Instance:    new(RequestRefererBlockCheckpoint),
+	},
 	{
 		Name:        "通用响应Header长度限制",
 		Prefix:      "responseGeneralHeaderLength",

internal/waf/get302_validator.go

@@ -44,7 +44,7 @@ func (this *Get302Validator) Run(request requests.Request, writer http.ResponseW
 		life = 600 // 默认10分钟
 	}
 	setId := m.GetString("setId")
-	SharedIPWhiteList.Add("set:"+setId, request.WAFRemoteIP(), time.Now().Unix()+life)
+	SharedIPWhiteList.Add("set:"+setId, m.GetString("scope"), request.WAFServerId(), request.WAFRemoteIP(), time.Now().Unix()+life)
 
 	// 返回原始URL
 	var url = m.GetString("url")

internal/waf/ip_list.go

@@ -3,13 +3,15 @@
 package waf
 
 import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/TeaOSLab/EdgeNode/internal/utils/expires"
+	"github.com/iwind/TeaGo/types"
 	"sync"
 	"sync/atomic"
 )
 
 var SharedIPWhiteList = NewIPList()
-var SharedIPBlackLIst = NewIPList()
+var SharedIPBlackList = NewIPList()
 
 const IPTypeAll = "*"
 
@@ -43,8 +45,15 @@ func NewIPList() *IPList {
 }
 
 // Add 添加IP
-func (this *IPList) Add(ipType string, ip string, expiresAt int64) {
-	ip = ip + "@" + ipType
+func (this *IPList) Add(ipType string, scope firewallconfigs.FirewallScope, serverId int64, ip string, expiresAt int64) {
+	switch scope {
+	case firewallconfigs.FirewallScopeGlobal:
+		ip = "*@" + ip + "@" + ipType
+	case firewallconfigs.FirewallScopeService:
+		ip = types.String(serverId) + "@" + ip + "@" + ipType
+	default:
+		ip = "*@" + ip + "@" + ipType
+	}
 
 	var id = this.nextId()
 	this.expireList.Add(id, expiresAt)
@@ -55,8 +64,15 @@ func (this *IPList) Add(ipType string, ip string, expiresAt int64) {
 }
 
 // Contains 判断是否有某个IP
-func (this *IPList) Contains(ipType string, ip string) bool {
-	ip = ip + "@" + ipType
+func (this *IPList) Contains(ipType string, scope firewallconfigs.FirewallScope, serverId int64, ip string) bool {
+	switch scope {
+	case firewallconfigs.FirewallScopeGlobal:
+		ip = "*@" + ip + "@" + ipType
+	case firewallconfigs.FirewallScopeService:
+		ip = types.String(serverId) + "@" + ip + "@" + ipType
+	default:
+		ip = "*@" + ip + "@" + ipType
+	}
 
 	this.locker.RLock()
 	defer this.locker.RUnlock()

internal/waf/ip_list_test.go

@@ -3,6 +3,7 @@
 package waf
 
 import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/iwind/TeaGo/assert"
 	"github.com/iwind/TeaGo/logs"
 	"runtime"
@@ -13,11 +14,11 @@ import (
 
 func TestNewIPList(t *testing.T) {
 	list := NewIPList()
-	list.Add(IPTypeAll, "127.0.0.1", time.Now().Unix())
-	list.Add(IPTypeAll, "127.0.0.2", time.Now().Unix()+1)
-	list.Add(IPTypeAll, "127.0.0.1", time.Now().Unix()+2)
-	list.Add(IPTypeAll, "127.0.0.3", time.Now().Unix()+3)
-	list.Add(IPTypeAll, "127.0.0.10", time.Now().Unix()+10)
+	list.Add(IPTypeAll, firewallconfigs.FirewallScopeGlobal, 1, "127.0.0.1", time.Now().Unix())
+	list.Add(IPTypeAll, firewallconfigs.FirewallScopeGlobal, 1, "127.0.0.2", time.Now().Unix()+1)
+	list.Add(IPTypeAll, firewallconfigs.FirewallScopeGlobal, 1, "127.0.0.1", time.Now().Unix()+2)
+	list.Add(IPTypeAll, firewallconfigs.FirewallScopeGlobal, 1, "127.0.0.3", time.Now().Unix()+3)
+	list.Add(IPTypeAll, firewallconfigs.FirewallScopeGlobal, 1, "127.0.0.10", time.Now().Unix()+10)
 
 	var ticker = time.NewTicker(1 * time.Second)
 	for range ticker.C {
@@ -36,10 +37,10 @@ func TestIPList_Contains(t *testing.T) {
 	list := NewIPList()
 
 	for i := 0; i < 1_0000; i++ {
-		list.Add(IPTypeAll, "192.168.1."+strconv.Itoa(i), time.Now().Unix()+3600)
+		list.Add(IPTypeAll, firewallconfigs.FirewallScopeGlobal, 1, "192.168.1."+strconv.Itoa(i), time.Now().Unix()+3600)
 	}
-	a.IsTrue(list.Contains(IPTypeAll, "192.168.1.100"))
-	a.IsFalse(list.Contains(IPTypeAll, "192.168.2.100"))
+	a.IsTrue(list.Contains(IPTypeAll, firewallconfigs.FirewallScopeGlobal, 1, "192.168.1.100"))
+	a.IsFalse(list.Contains(IPTypeAll, firewallconfigs.FirewallScopeGlobal, 1, "192.168.2.100"))
 }
 
 func BenchmarkIPList_Add(b *testing.B) {
@@ -47,7 +48,7 @@ func BenchmarkIPList_Add(b *testing.B) {
 
 	list := NewIPList()
 	for i := 0; i < b.N; i++ {
-		list.Add(IPTypeAll, "192.168.1."+strconv.Itoa(i), time.Now().Unix()+3600)
+		list.Add(IPTypeAll, firewallconfigs.FirewallScopeGlobal, 1, "192.168.1."+strconv.Itoa(i), time.Now().Unix()+3600)
 	}
 	b.Log(len(list.ipMap))
 }
@@ -58,10 +59,10 @@ func BenchmarkIPList_Has(b *testing.B) {
 	list := NewIPList()
 
 	for i := 0; i < 1_0000; i++ {
-		list.Add(IPTypeAll, "192.168.1."+strconv.Itoa(i), time.Now().Unix()+3600)
+		list.Add(IPTypeAll, firewallconfigs.FirewallScopeGlobal, 1, "192.168.1."+strconv.Itoa(i), time.Now().Unix()+3600)
 	}
 
 	for i := 0; i < b.N; i++ {
-		list.Contains(IPTypeAll, "192.168.1.100")
+		list.Contains(IPTypeAll, firewallconfigs.FirewallScopeGlobal, 1, "192.168.1.100")
 	}
 }

internal/waf/requests/request.go

@@ -26,6 +26,9 @@ type Request interface {
 	// WAFServerId 服务ID
 	WAFServerId() int64
 
+	// WAFClose 关闭当前请求所在的连接
+	WAFClose()
+
 	// Format 格式化变量
 	Format(string) string
 }

internal/waf/requests/test_request.go

@@ -66,6 +66,10 @@ func (this *TestRequest) WAFServerId() int64 {
 	return 0
 }
 
+// WAFClose 关闭当前请求所在的连接
+func (this *TestRequest) WAFClose() {
+}
+
 func (this *TestRequest) Format(s string) string {
 	return s
 }

internal/waf/rule.go

@@ -23,7 +23,7 @@ import (
 
 var singleParamRegexp = regexp.MustCompile("^\\${[\\w.-]+}$")
 
-// rule
+// Rule
 type Rule struct {
 	Description       string                 `yaml:"description" json:"description"`
 	Param             string                 `yaml:"param" json:"param"` // such as ${arg.name} or ${args}, can be composite as ${arg.firstName}${arg.lastName}

internal/waf/rule_set.go

@@ -1,12 +1,14 @@
 package waf
 
 import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/TeaOSLab/EdgeNode/internal/waf/requests"
 	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/utils/string"
 	"net/http"
+	"sort"
 )
 
 type RuleConnector = string
@@ -65,15 +67,30 @@ func (this *RuleSet) Init(waf *WAF) error {
 		instance := FindActionInstance(action.Code, action.Options)
 		if instance == nil {
 			remotelogs.Error("WAF_RULE_SET", "can not find instance for action '"+action.Code+"'")
-		} else {
-			this.actionInstances = append(this.actionInstances, instance)
+			continue
 		}
+
 		err := instance.Init(waf)
 		if err != nil {
 			remotelogs.Error("WAF_RULE_SET", "init action '"+action.Code+"' failed: "+err.Error())
+			continue
 		}
+
+		this.actionInstances = append(this.actionInstances, instance)
 	}
 
+	// sort actions
+	sort.Slice(this.actionInstances, func(i, j int) bool {
+		var instance1 = this.actionInstances[i]
+		if !instance1.WillChange() {
+			return true
+		}
+		if instance1.Code() == ActionRecordIP {
+			return true
+		}
+		return false
+	})
+
 	return nil
 }
 
@@ -117,6 +134,10 @@ func (this *RuleSet) ActionCodes() []string {
 }
 
 func (this *RuleSet) PerformActions(waf *WAF, group *RuleGroup, req requests.Request, writer http.ResponseWriter) bool {
+	if len(waf.Mode) != 0 && waf.Mode != firewallconfigs.FirewallModeDefend {
+		return true
+	}
+
 	// 先执行allow
 	for _, instance := range this.actionInstances {
 		if !instance.WillChange() {

internal/waf/waf.go

@@ -2,6 +2,7 @@ package waf
 
 import (
 	"errors"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
 	"github.com/TeaOSLab/EdgeNode/internal/waf/checkpoints"
 	"github.com/TeaOSLab/EdgeNode/internal/waf/requests"
@@ -15,12 +16,13 @@ import (
 )
 
 type WAF struct {
-	Id             string       `yaml:"id" json:"id"`
-	IsOn           bool         `yaml:"isOn" json:"isOn"`
-	Name           string       `yaml:"name" json:"name"`
-	Inbound        []*RuleGroup `yaml:"inbound" json:"inbound"`
-	Outbound       []*RuleGroup `yaml:"outbound" json:"outbound"`
-	CreatedVersion string       `yaml:"createdVersion" json:"createdVersion"`
+	Id             string                       `yaml:"id" json:"id"`
+	IsOn           bool                         `yaml:"isOn" json:"isOn"`
+	Name           string                       `yaml:"name" json:"name"`
+	Inbound        []*RuleGroup                 `yaml:"inbound" json:"inbound"`
+	Outbound       []*RuleGroup                 `yaml:"outbound" json:"outbound"`
+	CreatedVersion string                       `yaml:"createdVersion" json:"createdVersion"`
+	Mode           firewallconfigs.FirewallMode `yaml:"mode" json:"mode"`
 
 	DefaultBlockAction *BlockAction