refactor: Update NATS subscription logic and configuration

The code changes in `main.go` update the NATS subscription logic and configuration. The `Subscribe` function now uses the `NatsHandler` struct to handle the subscription. The `NewNatsHandler` function is added to create a new instance of the `NatsHandler` with the provided configuration. The configuration values are passed to the `NatsSubscriber` constructor to set up the NATS subscription. This refactor improves the modularity and readability of the NATS subscription code.
This commit is contained in:
windyboy
2024-07-21 23:09:29 +08:00
parent 29fecbbe6c
commit 24c9beeb13
3 changed files with 95 additions and 12 deletions
+3 -6
View File
@@ -2,9 +2,8 @@ package main
import (
"caatsm/internal/config"
"caatsm/internal/nats"
"caatsm/pkg/utils"
"github.com/sirupsen/logrus"
)
func main() {
@@ -19,8 +18,6 @@ func main() {
utils.Logger.Info("Loaded configuration successfully")
// Example usage
utils.Logger.WithFields(logrus.Fields{
"url": cfg.Nats.URL,
}).Info("NATS configuration")
subscribe := nats.NewNatsHandler(cfg)
subscribe.Subscribe()
}
+5 -4
View File
@@ -5,6 +5,7 @@ import (
"os"
"regexp"
"strings"
"time"
"github.com/spf13/viper"
)
@@ -29,10 +30,10 @@ type SubscriptionConfig struct {
}
type TimeoutsConfig struct {
ServerTimeout string `mapstructure:"server_timeout"`
ReconnectWait string `mapstructure:"reconnect_wait"`
CloseTimeout string `mapstructure:"close_timeout"`
AckWaitTimeout string `mapstructure:"ack_wait_timeout"`
ServerTimeout time.Duration `mapstructure:"server_timeout"`
ReconnectWait time.Duration `mapstructure:"reconnect_wait"`
CloseTimeout time.Duration `mapstructure:"close_timeout"`
AckWaitTimeout time.Duration `mapstructure:"ack_wait_timeout"`
}
type BodyConfig struct {
+87 -2
View File
@@ -1,5 +1,90 @@
package nats
func Subscribe() {
// Placeholder for the NATS subscription logic.
import (
"caatsm/internal/config"
"caatsm/internal/parsers"
"caatsm/pkg/utils"
"context"
"errors"
"fmt"
"github.com/ThreeDotsLabs/watermill"
"github.com/ThreeDotsLabs/watermill-nats/v2/pkg/nats"
"github.com/ThreeDotsLabs/watermill/message"
nc "github.com/nats-io/nats.go"
)
type NatsHandler struct {
config *config.Config
}
func NewNatsHandler(config *config.Config) *NatsHandler {
return &NatsHandler{config: config}
}
func (n *NatsHandler) Subscribe() {
marshaler := &PlainTextMarshaler{}
logger := watermill.NewStdLogger(false, false)
options := []nc.Option{
nc.RetryOnFailedConnect(true),
nc.Timeout(n.config.Timeouts.ServerTimeout),
nc.ReconnectWait(n.config.Timeouts.ReconnectWait),
}
jsConfig := nats.JetStreamConfig{Disabled: true}
subscriber, err := nats.NewSubscriber(
nats.SubscriberConfig{
URL: n.config.Nats.URL,
CloseTimeout: n.config.Timeouts.CloseTimeout,
AckWaitTimeout: n.config.Timeouts.AckWaitTimeout,
NatsOptions: options,
Unmarshaler: marshaler,
JetStream: jsConfig,
},
logger,
)
if err != nil {
panic(err)
}
logger.Info("Subscribing to NATS topic", map[string]interface{}{"topic": n.config.Subscription.Topic})
defer subscriber.Close()
messages, err := subscriber.Subscribe(context.Background(), n.config.Subscription.Topic)
if err != nil {
logger.Error("Failed to subscribe to NATS topic", err, map[string]interface{}{"topic": n.config.Subscription.Topic})
return
}
for msg := range messages {
n.handleMessage(msg)
msg.Ack()
}
}
func (n *NatsHandler) handleMessage(msg *message.Message) error {
log := utils.Logger
if msg.Payload == nil {
log.Error("empty message")
return fmt.Errorf("empty message")
}
payload := string(msg.Payload)
if parsed, err := parsers.Parse(payload); err != nil {
log.Error("error parsing message", err, map[string]interface{}{"payload": payload})
return err
} else {
log.Info("message ", map[string]interface{}{"message": parsed})
}
return nil
}
type PlainTextMarshaler struct{}
func (m *PlainTextMarshaler) Marshal(topic string, msg nc.Msg) ([]byte, error) {
return msg.Data, nil
}
func (m *PlainTextMarshaler) Unmarshal(newMsg *nc.Msg) (*message.Message, error) {
if newMsg == nil {
return nil, errors.New("empty message")
}
msg := message.NewMessage(watermill.NewUUID(), newMsg.Data)
return msg, nil
}