feat: 重构事件处理，添加默认通道和发布逻辑，移除不必要的提供者

2025-09-11 14:51:40 +08:00
parent ced4202dc9
commit c0d8f070e4
14 changed files with 266 additions and 193 deletions
--- a/templates/project/providers/event/channel.go.tpl
+++ b/templates/project/providers/event/channel.go.tpl
@@ -0,0 +1,30 @@
+package event
+
+import "go.ipao.vip/atom/contracts"
+
+const (
+	Go    contracts.Channel = "go"
+	Kafka contracts.Channel = "kafka"
+	Redis contracts.Channel = "redis"
+	Sql   contracts.Channel = "sql"
+)
+
+type DefaultPublishTo struct{}
+
+func (d *DefaultPublishTo) PublishTo() (contracts.Channel, string) {
+	return Go, "event:processed"
+}
+
+type DefaultChannel struct{}
+
+func (d *DefaultChannel) Channel() contracts.Channel { return Go }
+
+// kafka
+type KafkaChannel struct{}
+
+func (k *KafkaChannel) Channel() contracts.Channel { return Kafka }
+
+// kafka
+type RedisChannel struct{}
+
+func (k *RedisChannel) Channel() contracts.Channel { return Redis }
--- a/templates/project/providers/event/config.go.tpl
+++ b/templates/project/providers/event/config.go.tpl
@@ -14,7 +14,7 @@ const DefaultPrefix = "Events"

 func DefaultProvider() container.ProviderContainer {
 	return container.ProviderContainer{
-		Provider: Provide,
+		Provider: ProvideChannel,
 		Options: []opt.Option{
 			opt.Prefix(DefaultPrefix),
 		},
@@ -22,15 +22,30 @@ func DefaultProvider() container.ProviderContainer {
 }

 type Config struct {
-	ConsumerGroup string
+	Sql   *ConfigSql
+	Kafka *ConfigKafka
+	Redis *ConfigRedis
+}

-	Brokers []string
+type ConfigSql struct {
+	ConsumerGroup string
+}
+
+type ConfigRedis struct {
+	ConsumerGroup string
+	Streams       []string
+}
+
+type ConfigKafka struct {
+	ConsumerGroup string
+	Brokers       []string
 }

 type PubSub struct {
-	Publisher  message.Publisher
-	Subscriber message.Subscriber
-	Router     *message.Router
+	Router *message.Router
+
+	publishers  map[contracts.Channel]message.Publisher
+	subscribers map[contracts.Channel]message.Subscriber
 }

 func (ps *PubSub) Serve(ctx context.Context) error {
@@ -40,15 +55,6 @@ func (ps *PubSub) Serve(ctx context.Context) error {
 	return nil
 }

-func (ps *PubSub) Handle(
-	handlerName string,
-	consumerTopic string,
-	publisherTopic string,
-	handler message.HandlerFunc,
-) {
-	ps.Router.AddHandler(handlerName, consumerTopic, ps.Subscriber, publisherTopic, ps.Publisher, handler)
-}
-
 // publish
 func (ps *PubSub) Publish(e contracts.EventPublisher) error {
 	if e == nil {
@@ -61,5 +67,33 @@ func (ps *PubSub) Publish(e contracts.EventPublisher) error {
 	}

 	msg := message.NewMessage(watermill.NewUUID(), payload)
-	return ps.Publisher.Publish(e.Topic(), msg)
+	return ps.getPublisher(e.Channel()).Publish(e.Topic(), msg)
+}
+
+// getPublisher returns the publisher for the specified channel.
+func (ps *PubSub) getPublisher(channel contracts.Channel) message.Publisher {
+	if pub, ok := ps.publishers[channel]; ok {
+		return pub
+	}
+	return ps.publishers[Go]
+}
+
+func (ps *PubSub) getSubscriber(channel contracts.Channel) message.Subscriber {
+	if sub, ok := ps.subscribers[channel]; ok {
+		return sub
+	}
+	return ps.subscribers[Go]
+}
+
+func (ps *PubSub) Handle(handlerName string, sub contracts.EventHandler) {
+	publishToCh, publishToTopic := sub.PublishTo()
+
+	ps.Router.AddHandler(
+		handlerName,
+		sub.Topic(),
+		ps.getSubscriber(sub.Channel()),
+		publishToTopic,
+		ps.getPublisher(publishToCh),
+		sub.Handler,
+	)
 }
--- a/templates/project/providers/event/provider.go.tpl
+++ b/templates/project/providers/event/provider.go.tpl
@@ -1,14 +1,21 @@
 package event

 import (
+	sqlDB "database/sql"
+
 	"go.ipao.vip/atom/container"
+	"go.ipao.vip/atom/contracts"
 	"go.ipao.vip/atom/opt"

+	"github.com/ThreeDotsLabs/watermill-kafka/v3/pkg/kafka"
+	"github.com/ThreeDotsLabs/watermill-redisstream/pkg/redisstream"
+	"github.com/ThreeDotsLabs/watermill-sql/v3/pkg/sql"
 	"github.com/ThreeDotsLabs/watermill/message"
 	"github.com/ThreeDotsLabs/watermill/pubsub/gochannel"
+	"github.com/redis/go-redis/v9"
 )

-func Provide(opts ...opt.Option) error {
+func ProvideChannel(opts ...opt.Option) error {
 	o := opt.New(opts...)
 	var config Config
 	if err := o.UnmarshalConfig(&config); err != nil {
@@ -18,16 +25,85 @@ func Provide(opts ...opt.Option) error {
 	return container.Container.Provide(func() (*PubSub, error) {
 		logger := LogrusAdapter()

+		publishers := make(map[contracts.Channel]message.Publisher)
+		subscribers := make(map[contracts.Channel]message.Subscriber)
+
+		// gochannel
 		client := gochannel.NewGoChannel(gochannel.Config{}, logger)
+		publishers[Go] = client
+		subscribers[Go] = client
+
+		// kafka
+		if config.Kafka != nil {
+			kafkaPublisher, err := kafka.NewPublisher(kafka.PublisherConfig{
+				Brokers:   config.Kafka.Brokers,
+				Marshaler: kafka.DefaultMarshaler{},
+			}, logger)
+			if err != nil {
+				return nil, err
+			}
+			publishers[Kafka] = kafkaPublisher
+
+			kafkaSubscriber, err := kafka.NewSubscriber(kafka.SubscriberConfig{
+				Brokers:       config.Kafka.Brokers,
+				Unmarshaler:   kafka.DefaultMarshaler{},
+				ConsumerGroup: config.Kafka.ConsumerGroup,
+			}, logger)
+			if err != nil {
+				return nil, err
+			}
+			subscribers[Kafka] = kafkaSubscriber
+		}
+
+		// redis
+		if config.Redis != nil {
+			var rdb redis.UniversalClient
+			redisSubscriber, err := redisstream.NewSubscriber(redisstream.SubscriberConfig{
+				Client:        rdb,
+				Unmarshaller:  redisstream.DefaultMarshallerUnmarshaller{},
+				ConsumerGroup: config.Redis.ConsumerGroup,
+			}, logger)
+			if err != nil {
+				return nil, err
+			}
+			subscribers[Redis] = redisSubscriber
+
+			redisPublisher, err := redisstream.NewPublisher(redisstream.PublisherConfig{
+				Client:     rdb,
+				Marshaller: redisstream.DefaultMarshallerUnmarshaller{},
+			}, logger)
+			if err != nil {
+				return nil, err
+			}
+			publishers[Redis] = redisPublisher
+		}
+
+		if config.Sql == nil {
+			var db *sqlDB.DB
+			sqlPublisher, err := sql.NewPublisher(db, sql.PublisherConfig{
+				SchemaAdapter:        sql.DefaultPostgreSQLSchema{},
+				AutoInitializeSchema: false,
+			}, logger)
+			if err != nil {
+				return nil, err
+			}
+			publishers[Sql] = sqlPublisher
+
+			sqlSubscriber, err := sql.NewSubscriber(db, sql.SubscriberConfig{
+				SchemaAdapter: sql.DefaultPostgreSQLSchema{},
+				ConsumerGroup: config.Sql.ConsumerGroup,
+			}, logger)
+			if err != nil {
+				return nil, err
+			}
+			subscribers[Sql] = sqlSubscriber
+		}
+
 		router, err := message.NewRouter(message.RouterConfig{}, logger)
 		if err != nil {
 			return nil, err
 		}

-		return &PubSub{
-			Publisher:  client,
-			Subscriber: client,
-			Router:     router,
-		}, nil
+		return &PubSub{Router: router, publishers: publishers, subscribers: subscribers}, nil
 	}, o.DiOptions()...)
 }
--- a/templates/project/providers/event/provider_kafka.go.tpl
+++ b/templates/project/providers/event/provider_kafka.go.tpl
@@ -1,49 +0,0 @@
-package event
-
-import (
-	"go.ipao.vip/atom/container"
-	"go.ipao.vip/atom/opt"
-
-	"github.com/ThreeDotsLabs/watermill-kafka/v3/pkg/kafka"
-	"github.com/ThreeDotsLabs/watermill/message"
-)
-
-func ProvideKafka(opts ...opt.Option) error {
-	o := opt.New(opts...)
-	var config Config
-	if err := o.UnmarshalConfig(&config); err != nil {
-		return err
-	}
-
-	return container.Container.Provide(func() (*PubSub, error) {
-		logger := LogrusAdapter()
-
-		publisher, err := kafka.NewPublisher(kafka.PublisherConfig{
-			Brokers:   config.Brokers,
-			Marshaler: kafka.DefaultMarshaler{},
-		}, logger)
-		if err != nil {
-			return nil, err
-		}
-
-		subscriber, err := kafka.NewSubscriber(kafka.SubscriberConfig{
-			Brokers:       config.Brokers,
-			Unmarshaler:   kafka.DefaultMarshaler{},
-			ConsumerGroup: config.ConsumerGroup,
-		}, logger)
-		if err != nil {
-			return nil, err
-		}
-
-		router, err := message.NewRouter(message.RouterConfig{}, logger)
-		if err != nil {
-			return nil, err
-		}
-
-		return &PubSub{
-			Publisher:  publisher,
-			Subscriber: subscriber,
-			Router:     router,
-		}, nil
-	}, o.DiOptions()...)
-}
--- a/templates/project/providers/event/provider_redis.go.tpl
+++ b/templates/project/providers/event/provider_redis.go.tpl
@@ -1,50 +0,0 @@
-package event
-
-import (
-	"go.ipao.vip/atom/container"
-	"go.ipao.vip/atom/opt"
-
-	"github.com/ThreeDotsLabs/watermill-redisstream/pkg/redisstream"
-	"github.com/ThreeDotsLabs/watermill/message"
-	"github.com/redis/go-redis/v9"
-)
-
-func ProvideRedis(opts ...opt.Option) error {
-	o := opt.New(opts...)
-	var config Config
-	if err := o.UnmarshalConfig(&config); err != nil {
-		return err
-	}
-
-	return container.Container.Provide(func(rdb redis.UniversalClient) (*PubSub, error) {
-		logger := LogrusAdapter()
-
-		subscriber, err := redisstream.NewSubscriber(redisstream.SubscriberConfig{
-			Client:        rdb,
-			Unmarshaller:  redisstream.DefaultMarshallerUnmarshaller{},
-			ConsumerGroup: config.ConsumerGroup,
-		}, logger)
-		if err != nil {
-			return nil, err
-		}
-
-		publisher, err := redisstream.NewPublisher(redisstream.PublisherConfig{
-			Client:     rdb,
-			Marshaller: redisstream.DefaultMarshallerUnmarshaller{},
-		}, logger)
-		if err != nil {
-			return nil, err
-		}
-
-		router, err := message.NewRouter(message.RouterConfig{}, logger)
-		if err != nil {
-			return nil, err
-		}
-
-		return &PubSub{
-			Publisher:  publisher,
-			Subscriber: subscriber,
-			Router:     router,
-		}, nil
-	}, o.DiOptions()...)
-}
--- a/templates/project/providers/event/provider_sql.go.tpl
+++ b/templates/project/providers/event/provider_sql.go.tpl
@@ -1,50 +0,0 @@
-package event
-
-import (
-	sqlDB "database/sql"
-
-	"go.ipao.vip/atom/container"
-	"go.ipao.vip/atom/opt"
-
-	"github.com/ThreeDotsLabs/watermill-sql/v3/pkg/sql"
-	"github.com/ThreeDotsLabs/watermill/message"
-)
-
-func ProvideSQL(opts ...opt.Option) error {
-	o := opt.New(opts...)
-	var config Config
-	if err := o.UnmarshalConfig(&config); err != nil {
-		return err
-	}
-
-	return container.Container.Provide(func(db *sqlDB.DB) (*PubSub, error) {
-		logger := LogrusAdapter()
-
-		publisher, err := sql.NewPublisher(db, sql.PublisherConfig{
-			SchemaAdapter:        sql.DefaultPostgreSQLSchema{},
-			AutoInitializeSchema: false,
-		}, logger)
-		if err != nil {
-			return nil, err
-		}
-
-		subscriber, err := sql.NewSubscriber(db, sql.SubscriberConfig{
-			SchemaAdapter: sql.DefaultPostgreSQLSchema{},
-			ConsumerGroup: config.ConsumerGroup,
-		}, logger)
-		if err != nil {
-			return nil, err
-		}
-
-		router, err := message.NewRouter(message.RouterConfig{}, logger)
-		if err != nil {
-			return nil, err
-		}
-
-		return &PubSub{
-			Publisher:  publisher,
-			Subscriber: subscriber,
-			Router:     router,
-		}, nil
-	}, o.DiOptions()...)
-}