add observer

limiter/traffic/plugin/grpc.go

@@ -0,0 +1,102 @@
+package traffic
+
+import (
+	"context"
+	"io"
+
+	"github.com/go-gost/core/limiter/traffic"
+	"github.com/go-gost/core/logger"
+	"github.com/go-gost/plugin/limiter/traffic/proto"
+	"github.com/go-gost/x/internal/plugin"
+	xtraffic "github.com/go-gost/x/limiter/traffic"
+	"google.golang.org/grpc"
+)
+
+type grpcPlugin struct {
+	conn   grpc.ClientConnInterface
+	client proto.LimiterClient
+	log    logger.Logger
+}
+
+// NewGRPCPlugin creates a traffic limiter plugin based on gRPC.
+func NewGRPCPlugin(name string, addr string, opts ...plugin.Option) traffic.TrafficLimiter {
+	var options plugin.Options
+	for _, opt := range opts {
+		opt(&options)
+	}
+
+	log := logger.Default().WithFields(map[string]any{
+		"kind":    "limiter",
+		"limiter": name,
+	})
+	conn, err := plugin.NewGRPCConn(addr, &options)
+	if err != nil {
+		log.Error(err)
+	}
+
+	p := &grpcPlugin{
+		conn: conn,
+		log:  log,
+	}
+	if conn != nil {
+		p.client = proto.NewLimiterClient(conn)
+	}
+	return p
+}
+
+func (p *grpcPlugin) In(ctx context.Context, key string, opts ...traffic.Option) traffic.Limiter {
+	if p.client == nil {
+		return nil
+	}
+
+	var options traffic.Options
+	for _, opt := range opts {
+		opt(&options)
+	}
+
+	r, err := p.client.Limit(ctx,
+		&proto.LimitRequest{
+			Network: options.Network,
+			Addr:    options.Addr,
+			Client:  options.Client,
+			Src:     options.Src,
+		})
+	if err != nil {
+		p.log.Error(err)
+		return nil
+	}
+
+	return xtraffic.NewLimiter(int(r.In))
+}
+
+func (p *grpcPlugin) Out(ctx context.Context, key string, opts ...traffic.Option) traffic.Limiter {
+	if p.client == nil {
+		return nil
+	}
+
+	var options traffic.Options
+	for _, opt := range opts {
+		opt(&options)
+	}
+
+	r, err := p.client.Limit(ctx,
+		&proto.LimitRequest{
+			Network: options.Network,
+			Addr:    options.Addr,
+			Client:  options.Client,
+			Src:     options.Src,
+		})
+	if err != nil {
+		p.log.Error(err)
+		return nil
+	}
+
+	return xtraffic.NewLimiter(int(r.Out))
+}
+
+func (p *grpcPlugin) Close() error {
+	if closer, ok := p.conn.(io.Closer); ok {
+		return closer.Close()
+	}
+	return nil
+}

limiter/traffic/plugin/http.go

@@ -4,105 +4,14 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"io"
 	"net/http"
 
 	"github.com/go-gost/core/limiter/traffic"
 	"github.com/go-gost/core/logger"
-	"github.com/go-gost/plugin/limiter/traffic/proto"
 	"github.com/go-gost/x/internal/plugin"
-	"google.golang.org/grpc"
+	xtraffic "github.com/go-gost/x/limiter/traffic"
 )
 
-type grpcPlugin struct {
-	conn   grpc.ClientConnInterface
-	client proto.LimiterClient
-	log    logger.Logger
-}
-
-// NewGRPCPlugin creates a traffic limiter plugin based on gRPC.
-func NewGRPCPlugin(name string, addr string, opts ...plugin.Option) traffic.TrafficLimiter {
-	var options plugin.Options
-	for _, opt := range opts {
-		opt(&options)
-	}
-
-	log := logger.Default().WithFields(map[string]any{
-		"kind":    "limiter",
-		"limiter": name,
-	})
-	conn, err := plugin.NewGRPCConn(addr, &options)
-	if err != nil {
-		log.Error(err)
-	}
-
-	p := &grpcPlugin{
-		conn: conn,
-		log:  log,
-	}
-	if conn != nil {
-		p.client = proto.NewLimiterClient(conn)
-	}
-	return p
-}
-
-func (p *grpcPlugin) In(ctx context.Context, key string, opts ...traffic.Option) traffic.Limiter {
-	if p.client == nil {
-		return nil
-	}
-
-	var options traffic.Options
-	for _, opt := range opts {
-		opt(&options)
-	}
-
-	r, err := p.client.Limit(ctx,
-		&proto.LimitRequest{
-			Network: options.Network,
-			Addr:    options.Addr,
-			Client:  options.Client,
-			Src:     options.Src,
-		})
-	if err != nil {
-		p.log.Error(err)
-		return nil
-	}
-
-	return NewLimiter(int(r.In))
-}
-
-func (p *grpcPlugin) Out(ctx context.Context, key string, opts ...traffic.Option) traffic.Limiter {
-	if p.client == nil {
-		return nil
-	}
-
-	var options traffic.Options
-	for _, opt := range opts {
-		opt(&options)
-	}
-
-	r, err := p.client.Limit(ctx,
-		&proto.LimitRequest{
-			Network: options.Network,
-			Addr:    options.Addr,
-			Client:  options.Client,
-			Src:     options.Src,
-		})
-	if err != nil {
-		p.log.Error(err)
-		return nil
-	}
-
-	return NewLimiter(int(r.Out))
-}
-
-func (p *grpcPlugin) Close() error {
-	if closer, ok := p.conn.(io.Closer); ok {
-		return closer.Close()
-	}
-	return nil
-}
-
 type httpPluginRequest struct {
 	Network string `json:"network"`
 	Addr    string `json:"addr"`
@@ -184,7 +93,7 @@ func (p *httpPlugin) In(ctx context.Context, key string, opts ...traffic.Option)
 	if err := json.NewDecoder(resp.Body).Decode(&res); err != nil {
 		return nil
 	}
-	return NewLimiter(int(res.In))
+	return xtraffic.NewLimiter(int(res.In))
 }
 
 func (p *httpPlugin) Out(ctx context.Context, key string, opts ...traffic.Option) traffic.Limiter {
@@ -231,5 +140,5 @@ func (p *httpPlugin) Out(ctx context.Context, key string, opts ...traffic.Option
 	if err := json.NewDecoder(resp.Body).Decode(&res); err != nil {
 		return nil
 	}
-	return NewLimiter(int(res.Out))
+	return xtraffic.NewLimiter(int(res.Out))
 }

limiter/traffic/wrapper/io.go

@@ -22,7 +22,7 @@ type readWriter struct {
 	key        string
 }
 
-func WrapReadWriter(limiter limiter.TrafficLimiter, rw io.ReadWriter, key string, opts ...limiter.Option) io.ReadWriter {
+func WrapReadWriter(limiter limiter.TrafficLimiter, rw io.ReadWriter, opts ...limiter.Option) io.ReadWriter {
 	if limiter == nil {
 		return rw
 	}