add observer

router/plugin/grpc.go

@@ -0,0 +1,70 @@
+package router
+
+import (
+	"context"
+	"io"
+	"net"
+
+	"github.com/go-gost/core/logger"
+	"github.com/go-gost/core/router"
+	"github.com/go-gost/plugin/router/proto"
+	"github.com/go-gost/x/internal/plugin"
+	xrouter "github.com/go-gost/x/router"
+	"google.golang.org/grpc"
+)
+
+type grpcPlugin struct {
+	conn   grpc.ClientConnInterface
+	client proto.RouterClient
+	log    logger.Logger
+}
+
+// NewGRPCPlugin creates an Router plugin based on gRPC.
+func NewGRPCPlugin(name string, addr string, opts ...plugin.Option) router.Router {
+	var options plugin.Options
+	for _, opt := range opts {
+		opt(&options)
+	}
+
+	log := logger.Default().WithFields(map[string]any{
+		"kind":   "router",
+		"router": 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.NewRouterClient(conn)
+	}
+	return p
+}
+
+func (p *grpcPlugin) GetRoute(ctx context.Context, dst net.IP, opts ...router.Option) *router.Route {
+	if p.client == nil {
+		return nil
+	}
+
+	r, err := p.client.GetRoute(ctx,
+		&proto.GetRouteRequest{
+			Dst: dst.String(),
+		})
+	if err != nil {
+		p.log.Error(err)
+		return nil
+	}
+
+	return xrouter.ParseRoute(r.Net, r.Gateway)
+}
+
+func (p *grpcPlugin) Close() error {
+	if closer, ok := p.conn.(io.Closer); ok {
+		return closer.Close()
+	}
+	return nil
+}

router/plugin/http.go

@@ -3,73 +3,15 @@ package router
 import (
 	"context"
 	"encoding/json"
-	"io"
 	"net"
 	"net/http"
 
 	"github.com/go-gost/core/logger"
 	"github.com/go-gost/core/router"
-	"github.com/go-gost/plugin/router/proto"
 	"github.com/go-gost/x/internal/plugin"
-	"google.golang.org/grpc"
+	xrouter "github.com/go-gost/x/router"
 )
 
-type grpcPlugin struct {
-	conn   grpc.ClientConnInterface
-	client proto.RouterClient
-	log    logger.Logger
-}
-
-// NewGRPCPlugin creates an Router plugin based on gRPC.
-func NewGRPCPlugin(name string, addr string, opts ...plugin.Option) router.Router {
-	var options plugin.Options
-	for _, opt := range opts {
-		opt(&options)
-	}
-
-	log := logger.Default().WithFields(map[string]any{
-		"kind":   "router",
-		"router": 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.NewRouterClient(conn)
-	}
-	return p
-}
-
-func (p *grpcPlugin) GetRoute(ctx context.Context, dst net.IP, opts ...router.Option) *router.Route {
-	if p.client == nil {
-		return nil
-	}
-
-	r, err := p.client.GetRoute(ctx,
-		&proto.GetRouteRequest{
-			Dst: dst.String(),
-		})
-	if err != nil {
-		p.log.Error(err)
-		return nil
-	}
-
-	return ParseRoute(r.Net, r.Gateway)
-}
-
-func (p *grpcPlugin) Close() error {
-	if closer, ok := p.conn.(io.Closer); ok {
-		return closer.Close()
-	}
-	return nil
-}
-
 type httpPluginGetRouteRequest struct {
 	Dst string `json:"dst"`
 }
@@ -137,5 +79,5 @@ func (p *httpPlugin) GetRoute(ctx context.Context, dst net.IP, opts ...router.Op
 		return nil
 	}
 
-	return ParseRoute(res.Net, res.Gateway)
+	return xrouter.ParseRoute(res.Net, res.Gateway)
 }