修改版本号0.3.8

go.mod

@@ -11,25 +11,27 @@ require (
 	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-yaml/yaml v2.1.0+incompatible
+	github.com/golang/protobuf v1.5.2
 	github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24
 	github.com/iwind/gofcgi v0.0.0-20210528023741-a92711d45f11
 	github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3
 	github.com/iwind/gowebp v0.0.0-20211029040624-7331ecc78ed8
 	github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-sqlite3 v1.14.9
 	github.com/miekg/dns v1.1.43
 	github.com/mssola/user_agent v0.5.3
 	github.com/pires/go-proxyproto v0.6.1
 	github.com/shirou/gopsutil v3.21.11+incompatible
 	github.com/tklauser/go-sysconf v0.3.6 // indirect
+	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	golang.org/x/image v0.0.0-20211028202545-6944b10bf410
 	golang.org/x/net v0.0.0-20211215060638-4ddde0e984e9
 	golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d
 	golang.org/x/text v0.3.7
-	golang.org/x/tools v0.1.3 // indirect
 	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
 	google.golang.org/grpc v1.43.0
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
 )

go.sum

@@ -6,8 +6,6 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
 github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60=
 github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
-github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/andybalholm/brotli v1.0.3 h1:fpcw+r1N1h0Poc1F/pHbW40cUm/lMEQslZtCkBQ0UnM=
 github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
@@ -36,16 +34,10 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f h1:q/DpyjJjZs94bziQ7YkBmIlpqbVP7yw179rnzoNVX1M=
 github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f/go.mod h1:QGrK8vMWWHQYQ3QU9bw9Y9OPNfxccGzfb41qjvVeXtY=
 github.com/dgryski/go-rendezvous v0.0.0-20200624174652-8d2f3be8b2d9/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
-github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 h1:Izz0+t1Z5nI16/II7vuEo/nHjodOg0p7+OiDpjX5t1E=
-github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
-github.com/dop251/goja v0.0.0-20210804101310-32956a348b49 h1:CtSi0QlA2Hy+nOh8JAZoiEBLW5pliAiKJ3l1Iq1472I=
-github.com/dop251/goja v0.0.0-20210804101310-32956a348b49/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk=
-github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
@@ -53,11 +45,9 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
-github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
+github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-redis/redis/v8 v8.0.0-beta.7/go.mod h1:FGJAWDWFht1sQ4qxyJHZZbVyvnVcKQN0E3u5/5lRz+g=
-github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
-github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-yaml/yaml v2.1.0+incompatible h1:RYi2hDdss1u4YE7GwixGzWwVo47T8UQwnTLB6vQiq+o=
@@ -89,7 +79,6 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/iwind/TeaGo v0.0.0-20210628135026-38575a4ab060 h1:qdLtK4PDXxk2vMKkTWl5Fl9xqYuRCukzWAgJbLHdfOo=
 github.com/iwind/TeaGo v0.0.0-20210628135026-38575a4ab060/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
 github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24 h1:1cGulkD2SNJJRok5OKwyhP/Ddm+PgSWKOupn0cR36/A=
 github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
@@ -100,8 +89,6 @@ github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3/go.mod h1:H5Q7SXwbx3a
 github.com/iwind/gowebp v0.0.0-20211029040624-7331ecc78ed8 h1:AojsHz9Es9B3He2MQQxeRq3TyD//o9huxUo7r1wh44g=
 github.com/iwind/gowebp v0.0.0-20211029040624-7331ecc78ed8/go.mod h1:QJBY2txYhLMzwLO29iB5ujDJ3s3V7DsZ582nw4Ss+tM=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e h1:LvL4XsI70QxOGHed6yhQtAU34Kx3Qq2wwBzGFKY8zKk=
 github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -111,22 +98,12 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lionsoul2014/ip2region v2.2.0-release+incompatible h1:1qp9iks+69h7IGLazAplzS9Ca14HAxuD5c0rbFdPGy4=
-github.com/lionsoul2014/ip2region v2.2.0-release+incompatible/go.mod h1:+ZBN7PBoh5gG6/y0ZQ85vJDBe21WnfbRrQQwTfliJJI=
 github.com/mattn/go-sqlite3 v1.14.9 h1:10HX2Td0ocZpYEjhilsuo6WWtUqttj2Kb0KtD86/KYA=
 github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
-github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg=
 github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/mssola/user_agent v0.5.2 h1:CZkTUahjL1+OcZ5zv3kZr8QiJ8jy2H08vZIEkBeRbxo=
-github.com/mssola/user_agent v0.5.2/go.mod h1:TTPno8LPY3wAIEKRpAtkdMT0f8SE24pLRGPahjCH4uw=
 github.com/mssola/user_agent v0.5.3 h1:lBRPML9mdFuIZgI2cmlQ+atbpJdLdeVl2IDodjBR578=
 github.com/mssola/user_agent v0.5.3/go.mod h1:TTPno8LPY3wAIEKRpAtkdMT0f8SE24pLRGPahjCH4uw=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
@@ -145,8 +122,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/shirou/gopsutil v3.21.5+incompatible h1:OloQyEerMi7JUrXiNzy8wQ5XN+baemxSl12QgIzt0jc=
-github.com/shirou/gopsutil v3.21.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
@@ -154,14 +129,15 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/tklauser/go-sysconf v0.3.6 h1:oc1sJWvKkmvIxhDHeKWvZS4f6AW+YcoguSfRF2/Hmo4=
 github.com/tklauser/go-sysconf v0.3.6/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI=
 github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA=
 github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
+github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.opentelemetry.io/otel v0.7.0/go.mod h1:aZMyHG5TqDOXEgH2tyLiXSUKly1jT3yqE9PmrzIeCdo=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -171,18 +147,15 @@ 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/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ=
 golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -196,8 +169,6 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
-golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211215060638-4ddde0e984e9 h1:kmreh1vGI63l2FxOAYS3Yv6ATsi7lSTuwNSVbGfJV9I=
 golang.org/x/net v0.0.0-20211215060638-4ddde0e984e9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -214,6 +185,7 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -226,8 +198,6 @@ golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio=
-golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d h1:1oIt9o40TWWI9FUaveVpUvBe13FNqBNVXy3ue2fcfkw=
 golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -235,7 +205,6 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -244,11 +213,7 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
@@ -260,8 +225,6 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
 google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced h1:c5geK1iMU3cDKtFrCVQIcjR3W+JOZMuhIyICMCTbtus=
-google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
 google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo7ya8kMnvprhcWM045PmkBdMO9zN0=
 google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
@@ -272,8 +235,6 @@ google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
 google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0=
-google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
 google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM=
 google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
@@ -287,7 +248,6 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
@@ -311,3 +271,5 @@ gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclp
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+rogchap.com/v8go v0.7.0 h1:kgjbiO4zE5itA962ze6Hqmbs4HgZbGzmueCXsZtremg=
+rogchap.com/v8go v0.7.0/go.mod h1:MxgP3pL2MW4dpme/72QRs8sgNMmM0pRc8DPhcuLWPAs=

internal/caches/reader.go

@@ -24,6 +24,9 @@ type Reader interface {
 	// ReadBody 读取Body
 	ReadBody(buf []byte, callback ReaderFunc) error
 
+	// Read 实现io.Reader接口
+	Read(buf []byte) (int, error)
+
 	// ReadBodyRange 读取某个范围内的Body
 	ReadBodyRange(buf []byte, start int64, end int64, callback ReaderFunc) error
 

internal/caches/reader_file.go

@@ -222,6 +222,37 @@ func (this *FileReader) ReadBody(buf []byte, callback ReaderFunc) error {
 	return nil
 }
 
+func (this *FileReader) Read(buf []byte) (n int, err error) {
+	var isOk = false
+
+	defer func() {
+		if !isOk {
+			_ = this.discard()
+		}
+	}()
+
+	// 直接返回从Header中剩余的
+	if this.bodyBufLen > 0 && len(buf) >= this.bodyBufLen {
+		copy(buf, this.bodyBuf)
+		isOk = true
+		n = this.bodyBufLen
+
+		if this.bodySize <= int64(this.bodyBufLen) {
+			err = io.EOF
+			return
+		}
+
+		this.bodyBufLen = 0
+		return
+	}
+
+	n, err = this.fp.Read(buf)
+	if err == nil || err == io.EOF {
+		isOk = true
+	}
+	return
+}
+
 func (this *FileReader) ReadBodyRange(buf []byte, start int64, end int64, callback ReaderFunc) error {
 	isOk := false
 

internal/caches/reader_memory.go

@@ -2,10 +2,13 @@ package caches
 
 import (
 	"errors"
+	"io"
 )
 
 type MemoryReader struct {
 	item *MemoryItem
+
+	offset int
 }
 
 func NewMemoryReader(item *MemoryItem) *MemoryReader {
@@ -111,6 +114,33 @@ func (this *MemoryReader) ReadBody(buf []byte, callback ReaderFunc) error {
 	return nil
 }
 
+func (this *MemoryReader) Read(buf []byte) (n int, err error) {
+	bufLen := len(buf)
+	if bufLen == 0 {
+		return 0, errors.New("using empty buffer")
+	}
+
+	bodySize := len(this.item.BodyValue)
+	left := bodySize - this.offset
+	if bufLen <= left {
+		copy(buf, this.item.BodyValue[this.offset:this.offset+bufLen])
+		n = bufLen
+
+		this.offset += bufLen
+		if this.offset >= bodySize {
+			err = io.EOF
+			return
+		}
+
+		return
+	} else {
+		copy(buf, this.item.BodyValue[this.offset:])
+		n = left
+		err = io.EOF
+		return
+	}
+}
+
 func (this *MemoryReader) ReadBodyRange(buf []byte, start int64, end int64, callback ReaderFunc) error {
 	offset := start
 	bodySize := int64(len(this.item.BodyValue))

internal/compressions/reader_brotli.go

@@ -5,6 +5,7 @@ package compressions
 import (
 	"github.com/andybalholm/brotli"
 	"io"
+	"strings"
 )
 
 type BrotliReader struct {
@@ -16,7 +17,11 @@ func NewBrotliReader(reader io.Reader) (Reader, error) {
 }
 
 func (this *BrotliReader) Read(p []byte) (n int, err error) {
-	return this.reader.Read(p)
+	n, err = this.reader.Read(p)
+	if err != nil && strings.Contains(err.Error(), "excessive") {
+		err = io.EOF
+	}
+	return
 }
 
 func (this *BrotliReader) Close() error {

internal/const/build.go

@@ -1,4 +1,5 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+//go:build community
 // +build community
 
 package teaconst

internal/const/build_plus.go

@@ -1,4 +1,5 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+//go:build plus
 // +build plus
 
 package teaconst

internal/const/const.go

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

internal/js/.gitignore

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

internal/js/console.go

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

internal/js/console_test.go

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

internal/js/http.go

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

internal/js/request.go

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

internal/js/request_interface.go

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

internal/js/request_test.go

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

internal/js/response.go

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

internal/js/response_test.go

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

internal/js/url.go

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

internal/js/url_test.go

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

internal/js/vm.go

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

internal/js/vm_test.go

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

internal/nodes/client_conn.go

@@ -39,7 +39,7 @@ func NewClientConn(conn net.Conn, isTLS bool, quickClose bool, globalLimiter *ra
 func (this *ClientConn) Read(b []byte) (n int, err error) {
 	if this.isTLS {
 		if !this.hasRead {
-			_ = this.rawConn.SetReadDeadline(time.Now().Add(5 * time.Second)) // TODO 握手超时时间可以设置
+			_ = this.rawConn.SetReadDeadline(time.Now().Add(time.Duration(nodeconfigs.DefaultTLSHandshakeTimeout) * time.Second)) // TODO 握手超时时间可以设置
 			this.hasRead = true
 			defer func() {
 				_ = this.rawConn.SetReadDeadline(time.Time{})
@@ -48,7 +48,6 @@ func (this *ClientConn) Read(b []byte) (n int, err error) {
 	}
 
 	n, err = this.rawConn.Read(b)
-
 	if n > 0 {
 		atomic.AddUint64(&teaconst.InTrafficBytes, uint64(n))
 	}
@@ -66,6 +65,8 @@ func (this *ClientConn) Write(b []byte) (n int, err error) {
 func (this *ClientConn) Close() error {
 	this.isClosed = true
 
+	err := this.rawConn.Close()
+
 	// 全局并发数限制
 	this.once.Do(func() {
 		if this.globalLimiter != nil {
@@ -76,7 +77,7 @@ func (this *ClientConn) Close() error {
 	// 单个服务并发数限制
 	sharedClientConnLimiter.Remove(this.rawConn.RemoteAddr().String())
 
-	return this.rawConn.Close()
+	return err
 }
 
 func (this *ClientConn) LocalAddr() net.Addr {

internal/nodes/client_listener.go

@@ -20,7 +20,7 @@ type ClientListener struct {
 	quickClose  bool
 }
 
-func NewClientListener1(listener net.Listener, quickClose bool) *ClientListener {
+func NewClientListener(listener net.Listener, quickClose bool) *ClientListener {
 	return &ClientListener{
 		rawListener: listener,
 		quickClose:  quickClose,

internal/nodes/http_request.go

@@ -39,7 +39,7 @@ type HTTPRequest struct {
 	RawReq     *http.Request
 	RawWriter  http.ResponseWriter
 	Server     *serverconfigs.ServerConfig
-	Host       string // 请求的Host
+	host       string // 请求的Host
 	ServerName string // 实际匹配到的Host
 	ServerAddr string // 实际启动的服务器监听地址
 	IsHTTP     bool
@@ -83,6 +83,9 @@ type HTTPRequest struct {
 	logAttrs map[string]string
 
 	disableLog bool // 此请求中关闭Log
+
+	// script相关操作
+	isDone bool
 }
 
 // 初始化
@@ -139,6 +142,13 @@ func (this *HTTPRequest) Do() {
 		return
 	}
 
+	// 回调事件
+	this.onInit()
+	if this.writer.isFinished {
+		this.doEnd()
+		return
+	}
+
 	// 特殊URL处理
 	if len(this.rawURI) > 1 && this.rawURI[1] == '.' {
 		// ACME
@@ -302,12 +312,12 @@ func (this *HTTPRequest) doEnd() {
 	// TODO 增加Header统计，考虑从Conn中读取
 	if this.Server != nil {
 		if this.isCached {
-			stats.SharedTrafficStatManager.Add(this.Server.Id, this.Host, this.writer.sentBodyBytes, this.writer.sentBodyBytes, 1, 1, 0, 0, this.Server.ShouldCheckTrafficLimit(), this.Server.PlanId())
+			stats.SharedTrafficStatManager.Add(this.Server.Id, this.host, this.writer.sentBodyBytes, this.writer.sentBodyBytes, 1, 1, 0, 0, this.Server.ShouldCheckTrafficLimit(), this.Server.PlanId())
 		} else {
 			if this.isAttack {
-				stats.SharedTrafficStatManager.Add(this.Server.Id, this.Host, this.writer.sentBodyBytes, 0, 1, 0, 1, this.writer.sentBodyBytes, this.Server.ShouldCheckTrafficLimit(), this.Server.PlanId())
+				stats.SharedTrafficStatManager.Add(this.Server.Id, this.host, this.writer.sentBodyBytes, 0, 1, 0, 1, this.writer.sentBodyBytes, this.Server.ShouldCheckTrafficLimit(), this.Server.PlanId())
 			} else {
-				stats.SharedTrafficStatManager.Add(this.Server.Id, this.Host, this.writer.sentBodyBytes, 0, 1, 0, 0, 0, this.Server.ShouldCheckTrafficLimit(), this.Server.PlanId())
+				stats.SharedTrafficStatManager.Add(this.Server.Id, this.host, this.writer.sentBodyBytes, 0, 1, 0, 0, 0, this.Server.ShouldCheckTrafficLimit(), this.Server.PlanId())
 			}
 		}
 	}
@@ -452,6 +462,20 @@ func (this *HTTPRequest) configureWeb(web *serverconfigs.HTTPWebConfig, isTop bo
 		this.web.RequestLimit = web.RequestLimit
 	}
 
+	// request scripts
+	if web.RequestScripts != nil {
+		if this.web.RequestScripts == nil {
+			this.web.RequestScripts = web.RequestScripts
+		} else {
+			if web.RequestScripts.OnInitScript != nil && (web.RequestScripts.OnInitScript.IsPrior || isTop) {
+				this.web.RequestScripts.OnInitScript = web.RequestScripts.OnInitScript
+			}
+			if web.RequestScripts.OnRequestScript != nil && (web.RequestScripts.OnRequestScript.IsPrior || isTop) {
+				this.web.RequestScripts.OnRequestScript = web.RequestScripts.OnRequestScript
+			}
+		}
+	}
+
 	// 重写规则
 	if len(web.RewriteRefs) > 0 {
 		for index, ref := range web.RewriteRefs {
@@ -521,7 +545,7 @@ func (this *HTTPRequest) configureWeb(web *serverconfigs.HTTPWebConfig, isTop bo
 			}
 			if varMapping, isMatched := location.Match(rawPath, this.Format); isMatched {
 				// 检查专属域名
-				if len(location.Domains) > 0 && !configutils.MatchDomains(location.Domains, this.Host) {
+				if len(location.Domains) > 0 && !configutils.MatchDomains(location.Domains, this.host) {
 					continue
 				}
 
@@ -603,11 +627,11 @@ func (this *HTTPRequest) Format(source string) string {
 			if this.IsHTTPS {
 				scheme = "https"
 			}
-			return scheme + "://" + this.Host + this.rawURI
+			return scheme + "://" + this.host + this.rawURI
 		case "requestPath":
-			return this.requestPath()
+			return this.Path()
 		case "requestPathExtension":
-			return filepath.Ext(this.requestPath())
+			return filepath.Ext(this.Path())
 		case "requestLength":
 			return strconv.FormatInt(this.requestLength(), 10)
 		case "requestTime":
@@ -621,7 +645,7 @@ func (this *HTTPRequest) Format(source string) string {
 			}
 
 			if this.web.Root != nil && this.web.Root.IsOn {
-				return filepath.Clean(this.web.Root.Dir + this.requestPath())
+				return filepath.Clean(this.web.Root.Dir + this.Path())
 			}
 
 			return ""
@@ -650,7 +674,7 @@ func (this *HTTPRequest) Format(source string) string {
 		case "timestamp":
 			return strconv.FormatInt(this.requestFromTime.Unix(), 10)
 		case "host":
-			return this.Host
+			return this.host
 		case "referer":
 			return this.RawReq.Referer()
 		case "referer.host":
@@ -768,7 +792,7 @@ func (this *HTTPRequest) Format(source string) string {
 
 		// host
 		if prefix == "host" {
-			pieces := strings.Split(this.Host, ".")
+			pieces := strings.Split(this.host, ".")
 			switch suffix {
 			case "first":
 				if len(pieces) > 0 {
@@ -950,8 +974,8 @@ func (this *HTTPRequest) requestRemoteUser() string {
 	return username
 }
 
-// 请求的URL中路径部分
-func (this *HTTPRequest) requestPath() string {
+// Path 请求的URL中路径部分
+func (this *HTTPRequest) Path() string {
 	uri, err := url.ParseRequestURI(this.rawURI)
 	if err != nil {
 		return ""
@@ -1061,9 +1085,105 @@ func (this *HTTPRequest) requestServerPort() int {
 	return 0
 }
 
-// 获取完整的URL
-func (this *HTTPRequest) requestFullURL() string {
-	return this.requestScheme() + "://" + this.Host + this.uri
+func (this *HTTPRequest) Id() string {
+	return this.requestId
+}
+
+// URL 获取完整的URL
+func (this *HTTPRequest) URL() string {
+	return this.requestScheme() + "://" + this.host + this.uri
+}
+
+// Host 获取Host
+func (this *HTTPRequest) Host() string {
+	return this.host
+}
+
+func (this *HTTPRequest) Proto() string {
+	return this.RawReq.Proto
+}
+
+func (this *HTTPRequest) ProtoMajor() int {
+	return this.RawReq.ProtoMajor
+}
+
+func (this *HTTPRequest) ProtoMinor() int {
+	return this.RawReq.ProtoMinor
+}
+
+func (this *HTTPRequest) RemoteAddr() string {
+	return this.requestRemoteAddr(true)
+}
+
+func (this *HTTPRequest) RawRemoteAddr() string {
+	addr := this.RawReq.RemoteAddr
+	host, _, err := net.SplitHostPort(addr)
+	if err == nil {
+		addr = host
+	}
+	return addr
+}
+
+func (this *HTTPRequest) RemotePort() int {
+	addr := this.RawReq.RemoteAddr
+	_, port, err := net.SplitHostPort(addr)
+	if err != nil {
+		return 0
+	}
+	return types.Int(port)
+}
+
+func (this *HTTPRequest) SetAttr(name string, value string) {
+	this.logAttrs[name] = value
+}
+
+func (this *HTTPRequest) SetVar(name string, value string) {
+	this.varMapping[name] = value
+}
+
+// ContentLength 请求内容长度
+func (this *HTTPRequest) ContentLength() int64 {
+	return this.RawReq.ContentLength
+}
+
+// Method 请求方法
+func (this *HTTPRequest) Method() string {
+	return this.RawReq.Method
+}
+
+func (this *HTTPRequest) TransferEncoding() string {
+	if len(this.RawReq.TransferEncoding) > 0 {
+		return this.RawReq.TransferEncoding[0]
+	}
+	return ""
+}
+
+// DeleteHeader 删除Header
+func (this *HTTPRequest) DeleteHeader(name string) {
+	this.RawReq.Header.Del(name)
+}
+
+// SetHeader 设置Header
+func (this *HTTPRequest) SetHeader(name string, values []string) {
+	this.RawReq.Header[name] = values
+}
+
+// Header 读取Header
+func (this *HTTPRequest) Header() http.Header {
+	return this.RawReq.Header
+}
+
+func (this *HTTPRequest) URI() string {
+	return this.uri
+}
+
+func (this *HTTPRequest) SetURI(uri string) {
+	this.uri = uri
+}
+
+// Done 设置已完成
+func (this *HTTPRequest) Done() {
+	this.isDone = true
 }
 
 // 设置代理相关头部信息
@@ -1119,7 +1239,7 @@ func (this *HTTPRequest) setForwardHeaders(header http.Header) {
 
 	if this.reverseProxy != nil && this.reverseProxy.ShouldAddXForwardedHostHeader() {
 		if _, ok := header["X-Forwarded-Host"]; !ok {
-			this.RawReq.Header.Set("X-Forwarded-Host", this.Host)
+			this.RawReq.Header.Set("X-Forwarded-Host", this.host)
 		}
 	}
 
@@ -1159,7 +1279,7 @@ func (this *HTTPRequest) processRequestHeaders(reqHeader http.Header) {
 			}
 
 			// 域名
-			if len(header.Domains) > 0 && !configutils.MatchDomains(header.Domains, this.Host) {
+			if len(header.Domains) > 0 && !configutils.MatchDomains(header.Domains, this.host) {
 				continue
 			}
 
@@ -1243,7 +1363,7 @@ func (this *HTTPRequest) processResponseHeaders(statusCode int) {
 			}
 
 			// 域名
-			if len(header.Domains) > 0 && !configutils.MatchDomains(header.Domains, this.Host) {
+			if len(header.Domains) > 0 && !configutils.MatchDomains(header.Domains, this.host) {
 				continue
 			}
 
@@ -1282,7 +1402,7 @@ func (this *HTTPRequest) processResponseHeaders(statusCode int) {
 		this.Server.HTTPS.SSLPolicy.IsOn &&
 		this.Server.HTTPS.SSLPolicy.HSTS != nil &&
 		this.Server.HTTPS.SSLPolicy.HSTS.IsOn &&
-		this.Server.HTTPS.SSLPolicy.HSTS.Match(this.Host) {
+		this.Server.HTTPS.SSLPolicy.HSTS.Match(this.host) {
 		responseHeader.Set(this.Server.HTTPS.SSLPolicy.HSTS.HeaderKey(), this.Server.HTTPS.SSLPolicy.HSTS.HeaderValue())
 	}
 }

internal/nodes/http_request_auth.go

@@ -27,7 +27,7 @@ func (this *HTTPRequest) doAuth() (shouldStop bool) {
 			subReq.ProtoMinor = this.RawReq.ProtoMinor
 			subReq.ProtoMajor = this.RawReq.ProtoMajor
 			subReq.Body = ioutil.NopCloser(bytes.NewReader([]byte{}))
-			subReq.Header.Set("Referer", this.requestFullURL())
+			subReq.Header.Set("Referer", this.URL())
 			var writer = NewEmptyResponseWriter(this.writer)
 			this.doSubRequest(writer, subReq)
 			return writer.StatusCode(), nil
@@ -45,7 +45,7 @@ func (this *HTTPRequest) doAuth() (shouldStop bool) {
 				if len(method.Realm) > 0 {
 					headerValue += method.Realm
 				} else {
-					headerValue += this.Host
+					headerValue += this.host
 				}
 				headerValue += "\""
 				if len(method.Charset) > 0 {

internal/nodes/http_request_cache.go

@@ -5,10 +5,12 @@ import (
 	"errors"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeNode/internal/caches"
+	"github.com/TeaOSLab/EdgeNode/internal/compressions"
 	"github.com/TeaOSLab/EdgeNode/internal/goman"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/TeaOSLab/EdgeNode/internal/rpc"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	"io"
 	"net/http"
 	"path/filepath"
 	"strconv"
@@ -136,7 +138,7 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 			if err == nil {
 				for _, rpcServerService := range rpcClient.ServerRPCList() {
 					_, err = rpcServerService.PurgeServerCache(rpcClient.Context(), &pb.PurgeServerCacheRequest{
-						Domains:  []string{this.Host},
+						Domains:  []string{this.host},
 						Keys:     []string{key},
 						Prefixes: nil,
 					})
@@ -150,13 +152,19 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 		return true
 	}
 
+	// 调用回调
+	this.onRequest()
+	if this.writer.isFinished {
+		return
+	}
+
 	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.MatchRequest(filepath.Ext(this.Path()), this.Format) &&
 		this.web.WebP.MatchAccept(this.requestHeader("Accept")) {
 		reader, _ = storage.OpenReader(key+webpSuffix, useStale)
 	}
@@ -431,16 +439,28 @@ func (this *HTTPRequest) doCacheRead(useStale bool) (shouldStop bool) {
 				return true
 			}
 		} else { // 没有Range
+			var body io.Reader = reader
+			var contentEncoding = this.writer.Header().Get("Content-Encoding")
+			if len(contentEncoding) > 0 && !httpAcceptEncoding(this.RawReq.Header.Get("Accept-Encoding"), contentEncoding) {
+				decompressReader, err := compressions.NewReader(body, contentEncoding)
+				if err == nil {
+					body = decompressReader
+					defer func() {
+						_ = decompressReader.Close()
+					}()
+
+					this.writer.Header().Del("Content-Encoding")
+					this.writer.Header().Del("Content-Length")
+				}
+			}
+
 			this.writer.PrepareCompression(reader.BodySize())
 			this.writer.WriteHeader(reader.Status())
 
-			err = reader.ReadBody(buf, func(n int) (goNext bool, err error) {
-				_, err = this.writer.Write(buf[:n])
-				if err != nil {
-					return false, errWritingToClient
-				}
-				return true, nil
-			})
+			_, err = io.CopyBuffer(this.writer, body, buf)
+			if err == io.EOF {
+				err = nil
+			}
 			if err != nil {
 				this.varMapping["cache.status"] = "MISS"
 

internal/nodes/http_request_error.go

@@ -13,7 +13,7 @@ func (this *HTTPRequest) write404() {
 
 	this.processResponseHeaders(http.StatusNotFound)
 	this.writer.WriteHeader(http.StatusNotFound)
-	_, _ = this.writer.Write([]byte("404 page not found: '" + this.requestFullURL() + "'" + " (Request Id: " + this.requestId + ")"))
+	_, _ = this.writer.Write([]byte("404 page not found: '" + this.URL() + "'" + " (Request Id: " + this.requestId + ")"))
 }
 
 func (this *HTTPRequest) writeCode(code int) {
@@ -23,7 +23,7 @@ func (this *HTTPRequest) writeCode(code int) {
 
 	this.processResponseHeaders(code)
 	this.writer.WriteHeader(code)
-	_, _ = this.writer.Write([]byte(types.String(code) + " " + http.StatusText(code) + ": '" + this.requestFullURL() + "'" + " (Request Id: " + this.requestId + ")"))
+	_, _ = this.writer.Write([]byte(types.String(code) + " " + http.StatusText(code) + ": '" + this.URL() + "'" + " (Request Id: " + this.requestId + ")"))
 }
 
 func (this *HTTPRequest) write50x(err error, statusCode int, canTryStale bool) {

internal/nodes/http_request_events.go

@@ -0,0 +1,11 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+//go:build !script
+// +build !script
+
+package nodes
+
+func (this *HTTPRequest) onInit() {
+}
+
+func (this *HTTPRequest) onRequest() {
+}

internal/nodes/http_request_fastcgi.go

@@ -52,13 +52,13 @@ func (this *HTTPRequest) doFastcgi() (shouldStop bool) {
 		}
 	}
 	if !env.Has("SERVER_NAME") {
-		env["SERVER_NAME"] = this.Host
+		env["SERVER_NAME"] = this.host
 	}
 	if !env.Has("REQUEST_URI") {
 		env["REQUEST_URI"] = this.uri
 	}
 	if !env.Has("HOST") {
-		env["HOST"] = this.Host
+		env["HOST"] = this.host
 	}
 
 	if len(this.ServerAddr) > 0 {
@@ -149,7 +149,7 @@ func (this *HTTPRequest) doFastcgi() (shouldStop bool) {
 
 	host, found := params["HTTP_HOST"]
 	if !found || len(host) == 0 {
-		params["HTTP_HOST"] = this.Host
+		params["HTTP_HOST"] = this.host
 	}
 
 	fcgiReq := fcgi.NewRequest()

internal/nodes/http_request_host_redirect.go

@@ -13,7 +13,7 @@ func (this *HTTPRequest) doHostRedirect() (blocked bool) {
 	if this.web.MergeSlashes {
 		urlPath = utils.CleanPath(urlPath)
 	}
-	fullURL := this.requestScheme() + "://" + this.Host + urlPath
+	fullURL := this.requestScheme() + "://" + this.host + urlPath
 	for _, u := range this.web.HostRedirects {
 		if !u.IsOn {
 			continue

internal/nodes/http_request_log.go

@@ -99,7 +99,7 @@ func (this *HTTPRequest) log() {
 		RemotePort:      int32(this.requestRemotePort()),
 		RemoteUser:      this.requestRemoteUser(),
 		RequestURI:      this.rawURI,
-		RequestPath:     this.requestPath(),
+		RequestPath:     this.Path(),
 		RequestLength:   this.requestLength(),
 		RequestTime:     this.requestCost,
 		RequestMethod:   this.RawReq.Method,
@@ -114,7 +114,7 @@ func (this *HTTPRequest) log() {
 		TimeLocal:       this.requestFromTime.Format("2/Jan/2006:15:04:05 -0700"),
 		Msec:            float64(this.requestFromTime.Unix()) + float64(this.requestFromTime.Nanosecond())/1000000000,
 		Timestamp:       this.requestFromTime.Unix(),
-		Host:            this.Host,
+		Host:            this.host,
 		Referer:         referer,
 		UserAgent:       userAgent,
 		Request:         this.requestString(),

internal/nodes/http_request_reverse_proxy.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
+	"github.com/TeaOSLab/EdgeNode/internal/compressions"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"io"
@@ -35,11 +36,11 @@ func (this *HTTPRequest) doReverseProxy() {
 	requestCall := shared.NewRequestCall()
 	requestCall.Request = this.RawReq
 	requestCall.Formatter = this.Format
-	requestCall.Domain = this.Host
+	requestCall.Domain = this.host
 	origin := this.reverseProxy.NextOrigin(requestCall)
 	requestCall.CallResponseCallbacks(this.writer)
 	if origin == nil {
-		err := errors.New(this.requestFullURL() + ": no available origin sites for reverse proxy")
+		err := errors.New(this.URL() + ": no available origin sites for reverse proxy")
 		remotelogs.ServerError(this.Server.Id, "HTTP_REQUEST_REVERSE_PROXY", err.Error(), "", nil)
 		this.write50x(err, http.StatusBadGateway, true)
 		return
@@ -59,7 +60,7 @@ func (this *HTTPRequest) doReverseProxy() {
 
 	// 处理Scheme
 	if origin.Addr == nil {
-		err := errors.New(this.requestFullURL() + ": origin '" + strconv.FormatInt(origin.Id, 10) + "' does not has a address")
+		err := errors.New(this.URL() + ": origin '" + strconv.FormatInt(origin.Id, 10) + "' does not has a address")
 		remotelogs.Error("HTTP_REQUEST_REVERSE_PROXY", err.Error())
 		this.write50x(err, http.StatusBadGateway, true)
 		return
@@ -128,7 +129,7 @@ func (this *HTTPRequest) doReverseProxy() {
 		this.RawReq.Host = hostname
 		this.RawReq.URL.Host = this.RawReq.Host
 	} else {
-		this.RawReq.URL.Host = this.Host
+		this.RawReq.URL.Host = this.host
 	}
 
 	// 重组请求URL
@@ -146,6 +147,12 @@ func (this *HTTPRequest) doReverseProxy() {
 	this.setForwardHeaders(this.RawReq.Header)
 	this.processRequestHeaders(this.RawReq.Header)
 
+	// 调用回调
+	this.onRequest()
+	if this.writer.isFinished {
+		return
+	}
+
 	// 判断是否为Websocket请求
 	if this.RawReq.Header.Get("Upgrade") == "websocket" {
 		this.doWebsocket()
@@ -253,6 +260,24 @@ func (this *HTTPRequest) doReverseProxy() {
 		}
 	}
 
+	// 解压
+	if !resp.Uncompressed {
+		var contentEncoding = resp.Header.Get("Content-Encoding")
+		if len(contentEncoding) > 0 && !httpAcceptEncoding(this.RawReq.Header.Get("Accept-Encoding"), contentEncoding) {
+			reader, err := compressions.NewReader(resp.Body, contentEncoding)
+			if err == nil {
+				var body = resp.Body
+				defer func() {
+					_ = body.Close()
+				}()
+
+				resp.Body = reader
+				resp.Header.Del("Content-Encoding")
+				resp.Header.Del("Content-Length")
+			}
+		}
+	}
+
 	// 响应Header
 	this.writer.AddHeaders(resp.Header)
 	this.processResponseHeaders(resp.StatusCode)

internal/nodes/http_request_rewrite.go

@@ -15,7 +15,7 @@ func (this *HTTPRequest) doRewrite() (shouldShop bool) {
 	if this.rewriteRule.Mode == serverconfigs.HTTPRewriteModeProxy {
 		// 外部URL
 		if this.rewriteIsExternalURL {
-			host := this.Host
+			host := this.host
 			if len(this.rewriteRule.ProxyHost) > 0 {
 				host = this.rewriteRule.ProxyHost
 			}

internal/nodes/http_request_root.go

@@ -200,6 +200,12 @@ func (this *HTTPRequest) doRoot() (isBreak bool) {
 		respHeader.Set("ETag", eTag)
 	}
 
+	// 调用回调
+	this.onRequest()
+	if this.writer.isFinished {
+		return
+	}
+
 	// 支持 If-None-Match
 	if this.requestHeader("If-None-Match") == eTag {
 		// 自定义Header

internal/nodes/http_request_sub.go

@@ -11,7 +11,7 @@ func (this *HTTPRequest) doSubRequest(writer http.ResponseWriter, rawReq *http.R
 		RawReq:     rawReq,
 		RawWriter:  writer,
 		Server:     this.Server,
-		Host:       this.Host,
+		host:       this.host,
 		ServerName: this.ServerName,
 		ServerAddr: this.ServerAddr,
 		IsHTTP:     this.IsHTTP,

internal/nodes/http_request_utils.go

@@ -153,3 +153,19 @@ func httpRequestNextId() string {
 	// timestamp + requestId + nodeId
 	return strconv.FormatInt(unixTime, 10) + teaconst.NodeIdString + strconv.Itoa(int(atomic.AddInt32(&httpRequestId, 1)))
 }
+
+// 检查是否可以接受某个编码
+func httpAcceptEncoding(acceptEncodings string, encoding string) bool {
+	var pieces = strings.Split(acceptEncodings, ",")
+	for _, piece := range pieces {
+		var qualityIndex = strings.Index(piece, ";")
+		if qualityIndex >= 0 {
+			piece = piece[:qualityIndex]
+		}
+
+		if strings.TrimSpace(piece) == encoding {
+			return true
+		}
+	}
+	return false
+}

internal/nodes/http_writer.go

@@ -67,7 +67,8 @@ type HTTPWriter struct {
 	cacheWriter  caches.Writer // 缓存写入
 	cacheStorage caches.StorageInterface
 
-	isOk bool // 是否完全成功
+	isOk       bool // 是否完全成功
+	isFinished bool // 是否已完成
 }
 
 // NewHTTPWriter 包装对象
@@ -128,6 +129,16 @@ func (this *HTTPWriter) Header() http.Header {
 	return this.writer.Header()
 }
 
+// DeleteHeader 删除Header
+func (this *HTTPWriter) DeleteHeader(name string) {
+	this.writer.Header().Del(name)
+}
+
+// SetHeader 设置Header
+func (this *HTTPWriter) SetHeader(name string, values []string) {
+	this.writer.Header()[name] = values
+}
+
 // AddHeaders 添加一组Header
 func (this *HTTPWriter) AddHeaders(header http.Header) {
 	if this.writer == nil {
@@ -206,6 +217,13 @@ func (this *HTTPWriter) WriteHeader(statusCode int) {
 	this.statusCode = statusCode
 }
 
+// Send 发送响应
+func (this *HTTPWriter) Send(status int, body string) {
+	this.WriteHeader(status)
+	_, _ = this.WriteString(body)
+	this.isFinished = true
+}
+
 // StatusCode 读取状态码
 func (this *HTTPWriter) StatusCode() int {
 	if this.statusCode == 0 {
@@ -423,7 +441,7 @@ func (this *HTTPWriter) Close() {
 						StaleAt:    expiredAt + int64(this.calculateStaleLife()),
 						HeaderSize: this.cacheWriter.HeaderSize(),
 						BodySize:   this.cacheWriter.BodySize(),
-						Host:       this.req.Host,
+						Host:       this.req.host,
 						ServerId:   this.req.Server.Id,
 					})
 				}
@@ -456,7 +474,7 @@ 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.MatchResponse(this.Header().Get("Content-Type"), size, filepath.Ext(this.req.Path()), this.req.Format) &&
 		this.req.web.WebP.MatchAccept(this.req.requestHeader("Accept")) &&
 		atomic.LoadInt64(&webpTotalBufferSize) < webpMaxBufferSize {
 
@@ -493,7 +511,7 @@ func (this *HTTPWriter) PrepareCompression(size int64) {
 	}
 
 	// 尺寸和类型
-	if !this.compressionConfig.MatchResponse(this.Header().Get("Content-Type"), size, filepath.Ext(this.req.requestPath()), this.req.Format) {
+	if !this.compressionConfig.MatchResponse(this.Header().Get("Content-Type"), size, filepath.Ext(this.req.Path()), this.req.Format) {
 		return
 	}
 

internal/nodes/listener.go

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

internal/nodes/listener_http.go

@@ -209,7 +209,7 @@ func (this *HTTPListener) ServeHTTP(rawWriter http.ResponseWriter, rawReq *http.
 		RawReq:     rawReq,
 		RawWriter:  rawWriter,
 		Server:     server,
-		Host:       reqHost,
+		host:       reqHost,
 		ServerName: serverName,
 		ServerAddr: this.addr,
 		IsHTTP:     this.isHTTP,

internal/stats/http_request_stat_manager_test.go

@@ -14,9 +14,9 @@ func TestHTTPRequestStatManager_Loop_Region(t *testing.T) {
 	iplibrary.SharedLibrary = library
 
 	manager := NewHTTPRequestStatManager()
-	manager.AddRemoteAddr(11, "202.196.0.20")
-	manager.AddRemoteAddr(11, "202.196.0.20") // 重复添加一个测试相加
-	manager.AddRemoteAddr(11, "8.8.8.8")
+	manager.AddRemoteAddr(11, "202.196.0.20", 0, false)
+	manager.AddRemoteAddr(11, "202.196.0.20", 0, false) // 重复添加一个测试相加
+	manager.AddRemoteAddr(11, "8.8.8.8", 0, false)
 
 	/**for i := 0; i < 100; i++ {
 		manager.AddRemoteAddr(11, strconv.Itoa(rands.Int(10, 250))+"."+strconv.Itoa(rands.Int(10, 250))+"."+strconv.Itoa(rands.Int(10, 250))+".8")

internal/stats/traffic_stat_manager_test.go

@@ -8,7 +8,7 @@ import (
 func TestTrafficStatManager_Add(t *testing.T) {
 	manager := NewTrafficStatManager()
 	for i := 0; i < 100; i++ {
-		manager.Add(1, "goedge.cn", 1, 0, 0, 0, 0, 0)
+		manager.Add(1, "goedge.cn", 1, 0, 0, 0, 0, 0, false, 0)
 	}
 	t.Log(manager.itemMap)
 }
@@ -16,7 +16,7 @@ func TestTrafficStatManager_Add(t *testing.T) {
 func TestTrafficStatManager_Upload(t *testing.T) {
 	manager := NewTrafficStatManager()
 	for i := 0; i < 100; i++ {
-		manager.Add(1, "goedge.cn", 1, 0, 0, 0, 0, 0)
+		manager.Add(1, "goedge.cn", 1, 0, 0, 0, 0, 0, false, 0)
 	}
 	err := manager.Upload()
 	if err != nil {
@@ -30,6 +30,6 @@ func BenchmarkTrafficStatManager_Add(b *testing.B) {
 
 	manager := NewTrafficStatManager()
 	for i := 0; i < b.N; i++ {
-		manager.Add(1, "goedge.cn", 1024, 1, 0, 0, 0, 0)
+		manager.Add(1, "goedge.cn", 1024, 1, 0, 0, 0, 0, false, 0)
 	}
 }

internal/ttlcache/cache.go

@@ -1,6 +1,7 @@
 package ttlcache
 
 import (
+	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"time"
 )
 
@@ -21,12 +22,18 @@ type Cache struct {
 }
 
 func NewCache(opt ...OptionInterface) *Cache {
-	countPieces := 128
-	maxItems := 2_000_000
+	var countPieces = 128
+	var maxItems = 2_000_000
 
-	var delta = systemMemoryGB() / 8
-	if delta > 0 {
-		maxItems *= delta
+	var totalMemory = utils.SystemMemoryGB()
+	if totalMemory < 2 {
+		// 我们限制内存过小的服务能够使用的数量
+		maxItems = 1_000_000
+	} else {
+		var delta = totalMemory / 8
+		if delta > 0 {
+			maxItems *= delta
+		}
 	}
 
 	for _, option := range opt {

internal/ttlcache/cache_test.go

@@ -29,12 +29,19 @@ func TestNewCache(t *testing.T) {
 }
 
 func TestCache_Memory(t *testing.T) {
+	var stat1 = &runtime.MemStats{}
+	runtime.ReadMemStats(stat1)
+
 	cache := NewCache()
-	for i := 0; i < 20_000_000; i++ {
+	for i := 0; i < 10_000_000; i++ {
 		cache.Write("a"+strconv.Itoa(i), 1, time.Now().Unix()+3600)
 	}
 	t.Log("waiting ...")
-	time.Sleep(10 * time.Second)
+
+	var stat2 = &runtime.MemStats{}
+	runtime.ReadMemStats(stat2)
+
+	t.Log((stat2.HeapInuse-stat1.HeapInuse)/1024/1024, "MB")
 }
 
 func BenchmarkCache_Add(b *testing.B) {

internal/ttlcache/piece.go

@@ -20,8 +20,14 @@ func NewPiece(maxItems int) *Piece {
 func (this *Piece) Add(key uint64, item *Item) (ok bool) {
 	this.locker.Lock()
 	if len(this.m) >= this.maxItems {
-		this.locker.Unlock()
-		return
+		// 尝试先删除过期的
+		this.gcWithoutLocker()
+
+		// 仍然是满的就跳过
+		if len(this.m) >= this.maxItems {
+			this.locker.Unlock()
+			return
+		}
 	}
 	this.m[key] = item
 	this.locker.Unlock()
@@ -74,12 +80,7 @@ func (this *Piece) Count() (count int) {
 
 func (this *Piece) GC() {
 	this.locker.Lock()
-	timestamp := time.Now().Unix()
-	for k, item := range this.m {
-		if item.expiredAt <= timestamp {
-			delete(this.m, k)
-		}
-	}
+	this.gcWithoutLocker()
 	this.locker.Unlock()
 }
 
@@ -94,3 +95,13 @@ func (this *Piece) Destroy() {
 	this.m = nil
 	this.locker.Unlock()
 }
+
+// 不加锁的gc
+func (this *Piece) gcWithoutLocker() {
+	timestamp := time.Now().Unix()
+	for k, item := range this.m {
+		if item.expiredAt <= timestamp {
+			delete(this.m, k)
+		}
+	}
+}

internal/utils/system.go

@@ -1,6 +1,6 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 
-package ttlcache
+package utils
 
 import (
 	"github.com/shirou/gopsutil/mem"
@@ -8,7 +8,11 @@ import (
 
 var systemTotalMemory = -1
 
-func systemMemoryGB() int {
+func init() {
+	_ = SystemMemoryGB()
+}
+
+func SystemMemoryGB() int {
 	if systemTotalMemory > 0 {
 		return systemTotalMemory
 	}

internal/utils/system_test.go

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