address.go

@@ -1,34 +0,0 @@
-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
-}

consumer.go

@@ -4,42 +4,18 @@ import (
 	"context"
 	amqp "github.com/rabbitmq/amqp091-go"
 	"golang.org/x/time/rate"
-	"time"
+	"log"
 )
 
-type Consumer interface {
-	Start(ctx context.Context, chanLen uint) <-chan []byte
-}
-
-type consumeHandler struct {
-	client *Client
-}
-
-func (c *consumeHandler) Start(ctx context.Context, chanLen uint) <-chan []byte {
-	msgCh := make(chan []byte, chanLen)
-	go runConsumer(ctx, c.client, msgCh)
-
-	return msgCh
-}
-
 func runConsumer(ctx context.Context, client *Client, msgCh chan []byte) {
 	runCtx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
 	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 {
-		client.logger.Printf("Could not start consuming: %s\n", err)
+		log.Printf("Could not start consuming: %s\n", err)
 		return
 	}
 
@@ -48,66 +24,33 @@ func runConsumer(ctx context.Context, client *Client, msgCh chan []byte) {
 
 	for {
 		select {
-
 		case <-runCtx.Done():
 			err = client.Close()
 			if err != nil {
-				client.logger.Printf("Close failed: %s\n", err)
+				log.Printf("Close failed: %s\n", err)
 			}
 			return
 
-		case <-reconnectSignal:
-			select {
-			case <-runCtx.Done():
-				return
-			case <-time.After(client.opts.reconnectDelay):
-			}
+		case amqErr := <-chClosedCh:
+			log.Printf("AMQP Channel closed due to: %s\n", amqErr)
 
 			deliveries, err = client.consume()
 			if err != nil {
-				client.logger.Printf("Consume reconnect failed, retry: %s\n", err)
-				reconnectTrigger()
+				log.Println("Error trying to consume, will try again")
 				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 := <-deliveries:
+			msgCh <- delivery.Body
+			log.Printf("Received message: %s\n", delivery.Body)
 
-		case delivery, ok := <-deliveries:
-			if !ok {
-				client.logger.Println("Deliveries channel closed unexpectedly")
-				reconnectTrigger()
-				continue
-			}
-
-			if err = limiter.Wait(runCtx); err != nil {
-				client.logger.Printf("Wait limiter failed: %s\n", err)
-			}
-
-			select {
-			case <-runCtx.Done():
-				if err = delivery.Nack(false, true); err != nil {
-					client.logger.Printf("Error nacking message: %s\n", err)
-				}
-
-				err = client.Close()
-				if err != nil {
-					client.logger.Printf("Close failed: %s\n", err)
-				}
-				return
-
-			case msgCh <- delivery.Body:
-				client.logger.Printf("Received message: %s\n", delivery.Body)
 			if err = delivery.Ack(false); err != nil {
-					client.logger.Printf("Error acknowledging message: %s\n", err)
-				}
-			}
+				log.Printf("Error acknowledging message: %s\n", err)
+			}
+			limiter.Wait(runCtx)
 		}
 	}
 }

handler.go

@@ -1,10 +1,8 @@
 package rabbit
 
 import (
-	"errors"
-	"fmt"
+	"context"
 	amqp "github.com/rabbitmq/amqp091-go"
-	"io"
 	"log"
 	"os"
 	"sync"
@@ -13,7 +11,7 @@ import (
 
 type Client struct {
 	mutex           *sync.Mutex
-	queueOptions    *QueueOpts
+	queueName       string
 	logger          *log.Logger
 	connection      *amqp.Connection
 	Channel         *amqp.Channel
@@ -23,108 +21,56 @@ 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
 }
 
-type QueueOpts struct {
-	QueueName  string
-	Durable    bool
-	AutoDelete bool
-	Exclusive  bool
-	NoWait     bool
-	Args       amqp.Table
+func NewClient(addr, queueName string, opts ...Option) (*Client, error) {
+	if addr == "" {
+		return nil, errNoAddr
 	}
 
-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 queueOpts.QueueName == "" {
-		l.Fatal(errNoQueue)
+	if queueName == "" {
+		return nil, errNoQueue
 	}
 
 	client := Client{
 		mutex:     &sync.Mutex{},
-		queueOptions: &queueOpts,
+		logger:    log.New(os.Stdout, "", log.LstdFlags),
+		queueName: queueName,
 		done:      make(chan bool),
-		connected:    make(chan struct{}),
-		logger:       l,
 	}
 
 	o := options{
-		connectTimeout:    15 * time.Second,
-		reconnectDelay:    5 * time.Second,
-		reInitDelay:       2 * time.Second,
-		resendDelay:       5 * time.Second,
+		reconnectDelay:    5,
+		reInitDelay:       2,
+		resendDelay:       5,
 		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, nil
 }
 
+func StartConsumer(ctx context.Context, client *Client, chanLen int) chan []byte {
+	msgCh := make(chan []byte, chanLen)
+	go runConsumer(ctx, client, msgCh)
+
+	return msgCh
+}
+
 func NewPublisher(client *Client) Publisher {
-	return &pubHandler{client: client}
-}
-
-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
-	}
+	return &PubHandler{client: client}
 }

messages.go

@@ -3,7 +3,7 @@ package rabbit
 import "errors"
 
 var (
-	errBadAddr       = errors.New("bad address")
+	errNoAddr        = errors.New("no address")
 	errNoQueue       = errors.New("no queue")
 	errNotConnected  = errors.New("not connected to a server")
 	errAlreadyClosed = errors.New("already closed: not connected to the server")

options.go

@@ -1,20 +1,9 @@
 package rabbit
 
-import (
-	"io"
-	"log"
-	"os"
-	"time"
-)
+import "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
@@ -44,17 +33,3 @@ 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)
-		}
-	}
-}

publisher.go

@@ -1,44 +1,19 @@
 package rabbit
 
 import (
-	"context"
 	"errors"
 	"time"
 )
 
 type Publisher interface {
-	Start(ctx context.Context, chanLen uint) chan<- []byte
+	Push(data []byte) error
 }
 
-type pubHandler struct {
+type PubHandler struct {
 	client *Client
 }
 
-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 {
-					p.client.logger.Printf("Error publishing message: %s", err)
-				}
-			}
-		}
-	}()
-	return ch
-}
-
-func (p *pubHandler) push(data []byte) error {
+func (p *PubHandler) Push(data []byte) error {
 	p.client.mutex.Lock()
 	if !p.client.isReady {
 		p.client.mutex.Unlock()

service.go

@@ -8,6 +8,10 @@ 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)
@@ -41,6 +45,10 @@ 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)
 
@@ -78,16 +86,7 @@ func (c *Client) init(conn *amqp.Connection) error {
 		return err
 	}
 
-	//_, 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,
-	)
-
+	_, err = ch.QueueDeclare(c.queueName, false, false, false, false, nil)
 	if err != nil {
 		return err
 	}
@@ -129,7 +128,7 @@ func (c *Client) unsafePush(data []byte) error {
 	return c.Channel.PublishWithContext(
 		ctx,
 		"",
-		c.queueOptions.QueueName,
+		c.queueName,
 		false,
 		false,
 		amqp.Publishing{
@@ -156,7 +155,7 @@ func (c *Client) consume() (<-chan amqp.Delivery, error) {
 	}
 
 	return c.Channel.Consume(
-		c.queueOptions.QueueName,
+		c.queueName,
 		"",
 		false,
 		false,