diff --git a/address.go b/address.go new file mode 100644 index 0000000..dadf5d3 --- /dev/null +++ b/address.go @@ -0,0 +1,34 @@ +package rabbit + +import ( + "errors" + "fmt" + "net/url" +) + +type Address struct { + Username string + Password string + Host string + Port uint16 + Vhost string +} + +func (a *Address) makeAddr() (string, error) { + if a.Host == "" { + return "", errors.New("no host provided") + } + + if a.Vhost == "" { + return "", errors.New("no vhost provided") + } + + //"amqp://username:password@host:port/vhost" + return fmt.Sprintf("amqp://%v:%v@%v:%v/%v", + url.QueryEscape(a.Username), + url.QueryEscape(a.Password), + a.Host, + a.Port, + url.PathEscape(a.Vhost), + ), nil +} diff --git a/consumer.go b/consumer.go index 20c1317..5c68bf6 100644 --- a/consumer.go +++ b/consumer.go @@ -4,19 +4,18 @@ import ( "context" amqp "github.com/rabbitmq/amqp091-go" "golang.org/x/time/rate" - "log" "time" ) type Consumer interface { - Start(ctx context.Context, chanLen uint) chan []byte + Start(ctx context.Context, chanLen uint) <-chan []byte } type consumeHandler struct { client *Client } -func (c *consumeHandler) Start(ctx context.Context, chanLen uint) chan []byte { +func (c *consumeHandler) Start(ctx context.Context, chanLen uint) <-chan []byte { msgCh := make(chan []byte, chanLen) go runConsumer(ctx, c.client, msgCh) @@ -29,78 +28,84 @@ func runConsumer(ctx context.Context, client *Client, msgCh chan []byte) { limiter := rate.NewLimiter(rate.Every(client.opts.consumerRateLimit), client.opts.consumerBurstSize) + reconnectSignal := make(chan struct{}, 1) + reconnectTrigger := func() { + select { + case reconnectSignal <- struct{}{}: + default: + } + } + + // initial consume deliveries, err := client.consume() if err != nil { - log.Printf("Could not start consuming: %s\n", err) + client.logger.Printf("Could not start consuming: %s\n", err) return } chClosedCh := make(chan *amqp.Error, 1) client.Channel.NotifyClose(chClosedCh) - reconnectTimer := time.NewTimer(0) - defer reconnectTimer.Stop() - <-reconnectTimer.C - for { - if !reconnectTimer.Stop() { - select { - case <-reconnectTimer.C: - default: - } - } - select { case <-runCtx.Done(): err = client.Close() if err != nil { - log.Printf("Close failed: %s\n", err) + client.logger.Printf("Close failed: %s\n", err) } return - case amqErr := <-chClosedCh: - log.Printf("AMQP Channel closed due to: %s Reconnecting...\n", amqErr) - reconnectTimer.Reset(time.Second) + case <-reconnectSignal: + select { + case <-runCtx.Done(): + return + case <-time.After(client.opts.reconnectDelay): + } - case <-reconnectTimer.C: deliveries, err = client.consume() if err != nil { - log.Println("Error trying to consume, will try again. Retry in 5 seconds.") - reconnectTimer.Reset(time.Second * 5) + client.logger.Printf("Consume reconnect failed, retry: %s\n", err) + reconnectTrigger() continue } + // re-create closing chan chClosedCh = make(chan *amqp.Error, 1) client.Channel.NotifyClose(chClosedCh) + client.logger.Println("Consume reconnect success") + + case amqErr := <-chClosedCh: + client.logger.Printf("AMQP Channel closed due to: %s Reconnecting...\n", amqErr) + reconnectTrigger() case delivery, ok := <-deliveries: if !ok { - log.Println("Deliveries channel closed unexpectedly") - reconnectTimer.Reset(time.Second) + client.logger.Println("Deliveries channel closed unexpectedly") + reconnectTrigger() continue } if err = limiter.Wait(runCtx); err != nil { - log.Printf("Wait limiter failed: %s\n", err) + client.logger.Printf("Wait limiter failed: %s\n", err) } select { case <-runCtx.Done(): if err = delivery.Nack(false, true); err != nil { - log.Printf("Error nacking message: %s\n", err) + client.logger.Printf("Error nacking message: %s\n", err) } err = client.Close() if err != nil { - log.Printf("Close failed: %s\n", err) + client.logger.Printf("Close failed: %s\n", err) } return case msgCh <- delivery.Body: - log.Printf("Received message: %s\n", delivery.Body) + client.logger.Printf("Received message: %s\n", delivery.Body) if err = delivery.Ack(false); err != nil { - log.Printf("Error acknowledging message: %s\n", err) + client.logger.Printf("Error acknowledging message: %s\n", err) } } } diff --git a/handler.go b/handler.go index 949887f..6a8dd3f 100644 --- a/handler.go +++ b/handler.go @@ -1,7 +1,10 @@ package rabbit import ( + "errors" + "fmt" amqp "github.com/rabbitmq/amqp091-go" + "io" "log" "os" "sync" @@ -10,7 +13,7 @@ import ( type Client struct { mutex *sync.Mutex - queueName string + queueOptions *QueueOpts logger *log.Logger connection *amqp.Connection Channel *amqp.Channel @@ -20,47 +23,71 @@ type Client struct { notifyConfirm chan amqp.Confirmation isReady bool opts options + connected chan struct{} } type options struct { + connectTimeout time.Duration reconnectDelay time.Duration reInitDelay time.Duration resendDelay time.Duration consumerRateLimit time.Duration consumerBurstSize int + logger *log.Logger } -func NewClient(addr, queueName string, opts ...Option) *Client { - if addr == "" { - log.Fatal(errNoAddr) +type QueueOpts struct { + QueueName string + Durable bool + AutoDelete bool + Exclusive bool + NoWait bool + Args amqp.Table +} + +func NewClient(address Address, queueOpts QueueOpts, opts ...Option) (*Client, error) { + l := log.New(os.Stdout, "", log.LstdFlags) + + addr, err := address.makeAddr() + if err != nil { + return nil, errors.Join(errBadAddr, err) } - if queueName == "" { - log.Fatal(errNoQueue) + if queueOpts.QueueName == "" { + l.Fatal(errNoQueue) } client := Client{ - mutex: &sync.Mutex{}, - logger: log.New(os.Stdout, "", log.LstdFlags), - queueName: queueName, - done: make(chan bool), + mutex: &sync.Mutex{}, + queueOptions: &queueOpts, + done: make(chan bool), + connected: make(chan struct{}), + logger: l, } o := options{ - reconnectDelay: 5, - reInitDelay: 2, - resendDelay: 5, + connectTimeout: 15 * time.Second, + reconnectDelay: 5 * time.Second, + reInitDelay: 2 * time.Second, + resendDelay: 5 * time.Second, consumerRateLimit: time.Millisecond * 500, consumerBurstSize: 10, + logger: log.New(io.Discard, "", 0), } for _, opt := range opts { opt(&o) } + client.logger = o.logger + + if err = client.connectAndSignal(addr, o.connectTimeout); err != nil { + return nil, fmt.Errorf("failed to connect: %w", err) + } + go client.handleReconnect(addr) - return &client + return &client, nil } func NewPublisher(client *Client) Publisher { @@ -70,3 +97,34 @@ func NewPublisher(client *Client) Publisher { func NewConsumer(client *Client) Consumer { return &consumeHandler{client: client} } + +func (c *Client) connectAndSignal(addr string, timeout time.Duration) error { + type result struct { + conn *amqp.Connection + err error + } + resCh := make(chan result, 1) + + go func() { + conn, err := amqp.Dial(addr) + resCh <- result{conn, err} + }() + + select { + case <-time.After(timeout): + return fmt.Errorf("connection timeout after %v", timeout) + case res := <-resCh: + if res.err != nil { + return res.err + } + + c.changeConnection(res.conn) + if err := c.init(res.conn); err != nil { + res.conn.Close() + return fmt.Errorf("init failed: %w", err) + } + + close(c.connected) + return nil + } +} diff --git a/messages.go b/messages.go index 0f634d1..fd422ab 100644 --- a/messages.go +++ b/messages.go @@ -3,7 +3,7 @@ package rabbit import "errors" var ( - errNoAddr = errors.New("no address") + errBadAddr = errors.New("bad address") errNoQueue = errors.New("no queue") errNotConnected = errors.New("not connected to a server") errAlreadyClosed = errors.New("already closed: not connected to the server") diff --git a/options.go b/options.go index aaa7828..3e84f95 100644 --- a/options.go +++ b/options.go @@ -1,9 +1,20 @@ package rabbit -import "time" +import ( + "io" + "log" + "os" + "time" +) type Option func(*options) +func WithConnectTimeout(t time.Duration) Option { + return func(op *options) { + op.connectTimeout = t + } +} + func WithReconnectDelay(t time.Duration) Option { return func(op *options) { op.reconnectDelay = t @@ -33,3 +44,17 @@ func WithConsumerBurstSize(t int) Option { op.consumerBurstSize = t } } + +func WithLogger(l *log.Logger) Option { + return func(op *options) { op.logger = l } +} + +func WithLogging(enabled bool) Option { + return func(op *options) { + if enabled { + op.logger = log.New(os.Stdout, "", log.LstdFlags) + } else { + op.logger = log.New(io.Discard, "", 0) + } + } +} diff --git a/publisher.go b/publisher.go index e71a9b8..c938eb5 100644 --- a/publisher.go +++ b/publisher.go @@ -1,27 +1,36 @@ package rabbit import ( + "context" "errors" - "log" "time" ) type Publisher interface { - Start(chanLen uint) <-chan []byte + Start(ctx context.Context, chanLen uint) chan<- []byte } type pubHandler struct { client *Client } -func (p *pubHandler) Start(chanLen uint) <-chan []byte { +func (p *pubHandler) Start(ctx context.Context, chanLen uint) chan<- []byte { ch := make(chan []byte, chanLen) go func() { for { select { + case <-ctx.Done(): + for msg := range ch { + if err := p.push(msg); err != nil { + p.client.logger.Printf("Error publishing message (shutdown): %s", err) + } + } + p.client.logger.Println("Publisher stopped") + return + case msg := <-ch: if err := p.push(msg); err != nil { - log.Printf("Error publishing message: %s", err) + p.client.logger.Printf("Error publishing message: %s", err) } } } diff --git a/service.go b/service.go index c997307..c3f9ec8 100644 --- a/service.go +++ b/service.go @@ -8,10 +8,6 @@ import ( func (c *Client) handleReconnect(addr string) { for { - c.mutex.Lock() - c.isReady = false - c.mutex.Unlock() - c.logger.Println("Connecting to server...") conn, err := c.connect(addr) @@ -45,10 +41,6 @@ func (c *Client) connect(addr string) (*amqp.Connection, error) { func (c *Client) handleReInit(conn *amqp.Connection) bool { for { - c.mutex.Lock() - c.isReady = false - c.mutex.Unlock() - if err := c.init(conn); err != nil { c.logger.Printf("Failed to initialize connection: %s", err) @@ -86,7 +78,16 @@ func (c *Client) init(conn *amqp.Connection) error { return err } - _, err = ch.QueueDeclare(c.queueName, false, false, false, false, nil) + //_, err = ch.QueueDeclare(c.queueName, false, false, false, false, nil) + _, err = ch.QueueDeclare( + c.queueOptions.QueueName, + c.queueOptions.Durable, + c.queueOptions.AutoDelete, + c.queueOptions.Exclusive, + c.queueOptions.NoWait, + c.queueOptions.Args, + ) + if err != nil { return err } @@ -128,7 +129,7 @@ func (c *Client) unsafePush(data []byte) error { return c.Channel.PublishWithContext( ctx, "", - c.queueName, + c.queueOptions.QueueName, false, false, amqp.Publishing{ @@ -155,7 +156,7 @@ func (c *Client) consume() (<-chan amqp.Delivery, error) { } return c.Channel.Consume( - c.queueName, + c.queueOptions.QueueName, "", false, false,