chore: refactor message handling and update dependencies

- Change function parameter type from `core.QueuedMessage` to `core.TaskMessage` in multiple files
- Update Go version in `go.mod` from 1.20 to 1.22
- Update `github.com/golang-queue/queue` dependency to version `v0.3.0`
- Add `Payload` method to `mockMessage` struct in `nsq_test.go`
- Modify test assertions to use `job.AllowOption` for timeout settings in `nsq_test.go`

Signed-off-by: appleboy <[email protected]>

Author: appleboy

_example/producer-consumer/consumer/main.go

@@ -36,7 +36,7 @@ func main() {
 		nsq.WithAddr("127.0.0.1:4150"),
 		nsq.WithTopic("example"),
 		nsq.WithChannel("foobar"),
-		nsq.WithRunFunc(func(ctx context.Context, m core.QueuedMessage) error {
+		nsq.WithRunFunc(func(ctx context.Context, m core.TaskMessage) error {
 			var v *job
 			if err := json.Unmarshal(m.Bytes(), &v); err != nil {
 				return err

_example/worker/main.go

@@ -35,7 +35,7 @@ func main() {
 		nsq.WithChannel("foobar"),
 		// concurrent job number
 		nsq.WithMaxInFlight(10),
-		nsq.WithRunFunc(func(ctx context.Context, m core.QueuedMessage) error {
+		nsq.WithRunFunc(func(ctx context.Context, m core.TaskMessage) error {
 			var v *job
 			if err := json.Unmarshal(m.Bytes(), &v); err != nil {
 				return err

go.mod

@@ -1,18 +1,18 @@
 module github.com/golang-queue/nsq
 
-go 1.20
+go 1.22
 
 require (
-	github.com/golang-queue/queue v0.1.4-0.20221230133718-0314ef173f98
+	github.com/golang-queue/queue v0.3.0
 	github.com/nsqio/go-nsq v1.1.0
 	github.com/stretchr/testify v1.10.0
 	go.uber.org/goleak v1.3.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/goccy/go-json v0.10.0 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
+	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,15 +1,18 @@
+github.com/appleboy/com v0.2.1 h1:dHAHauX3eYDuheAahI83HIGFxpi0SEb2ZAu9EZ9hbUM=
+github.com/appleboy/com v0.2.1/go.mod h1:kByEI3/vzI5GM1+O5QdBHLsXaOsmFsJcOpCSgASi4sg=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA=
-github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/golang-queue/queue v0.1.4-0.20221230133718-0314ef173f98 h1:T2DoUcMWZr6uSUQAr5wCEzOiwHB1zJOiATAZ4BUAefg=
-github.com/golang-queue/queue v0.1.4-0.20221230133718-0314ef173f98/go.mod h1:8P7IgwdxwKh0/W1I9yCuQQGI8OHIuc7fIHi4OYr1COU=
-github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
+github.com/golang-queue/queue v0.3.0 h1:gyBLNT9EDOsChazYScp8iLiwLfG0SdnCDmNUybcHig4=
+github.com/golang-queue/queue v0.3.0/go.mod h1:SkjMwz1TjxZOrF7kABvbar1CagcMxwRtXt5Tx00wb4g=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/nsqio/go-nsq v1.1.0 h1:PQg+xxiUjA7V+TLdXw7nVrJ5Jbl3sN86EhGCQj4+FYE=
 github.com/nsqio/go-nsq v1.1.0/go.mod h1:vKq36oyeVXgsS5Q8YEO7WghqidAVXQlcFxzQbQTuDEY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -18,7 +21,10 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
+go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

nsq.go

@@ -101,7 +101,7 @@ func (w *Worker) startConsumer() (err error) {
 }
 
 // Run start the worker
-func (w *Worker) Run(ctx context.Context, task core.QueuedMessage) error {
+func (w *Worker) Run(ctx context.Context, task core.TaskMessage) error {
 	return w.opts.runFunc(ctx, task)
 }
 
@@ -129,7 +129,7 @@ func (w *Worker) Shutdown() error {
 }
 
 // Queue send notification to queue
-func (w *Worker) Queue(job core.QueuedMessage) error {
+func (w *Worker) Queue(job core.TaskMessage) error {
 	if atomic.LoadInt32(&w.stopFlag) == 1 {
 		return queue.ErrQueueShutdown
 	}
@@ -138,7 +138,7 @@ func (w *Worker) Queue(job core.QueuedMessage) error {
 }
 
 // Request fetch new task from queue
-func (w *Worker) Request() (core.QueuedMessage, error) {
+func (w *Worker) Request() (core.TaskMessage, error) {
 	if err := w.startConsumer(); err != nil {
 		return nil, err
 	}

nsq_test.go

@@ -31,6 +31,10 @@ func (m mockMessage) Bytes() []byte {
 	return []byte(m.Message)
 }
 
+func (m mockMessage) Payload() []byte {
+	return []byte(m.Message)
+}
+
 func TestNSQDefaultFlow(t *testing.T) {
 	m := &mockMessage{
 		Message: "foo",
@@ -80,7 +84,7 @@ func TestNSQCustomFuncAndWait(t *testing.T) {
 		WithAddr(host+":4150"),
 		WithTopic("test3"),
 		WithMaxInFlight(10),
-		WithRunFunc(func(ctx context.Context, m core.QueuedMessage) error {
+		WithRunFunc(func(ctx context.Context, m core.TaskMessage) error {
 			time.Sleep(500 * time.Millisecond)
 			return nil
 		}),
@@ -131,7 +135,7 @@ func TestJobReachTimeout(t *testing.T) {
 		WithAddr(host+":4150"),
 		WithTopic("timeout"),
 		WithMaxInFlight(2),
-		WithRunFunc(func(ctx context.Context, m core.QueuedMessage) error {
+		WithRunFunc(func(ctx context.Context, m core.TaskMessage) error {
 			for {
 				select {
 				case <-ctx.Done():
@@ -155,7 +159,9 @@ func TestJobReachTimeout(t *testing.T) {
 	assert.NoError(t, err)
 	q.Start()
 	time.Sleep(400 * time.Millisecond)
-	assert.NoError(t, q.Queue(m, job.WithTimeout(20*time.Millisecond)))
+	assert.NoError(t, q.Queue(m, job.AllowOption{
+		Timeout: job.Time(20 * time.Millisecond),
+	}))
 	time.Sleep(2 * time.Second)
 	q.Release()
 }
@@ -168,7 +174,7 @@ func TestCancelJobAfterShutdown(t *testing.T) {
 		WithAddr(host+":4150"),
 		WithTopic("cancel"),
 		WithLogger(queue.NewLogger()),
-		WithRunFunc(func(ctx context.Context, m core.QueuedMessage) error {
+		WithRunFunc(func(ctx context.Context, m core.TaskMessage) error {
 			for {
 				select {
 				case <-ctx.Done():
@@ -192,7 +198,9 @@ func TestCancelJobAfterShutdown(t *testing.T) {
 	assert.NoError(t, err)
 	q.Start()
 	time.Sleep(400 * time.Millisecond)
-	assert.NoError(t, q.Queue(m, job.WithTimeout(3*time.Second)))
+	assert.NoError(t, q.Queue(m, job.AllowOption{
+		Timeout: job.Time(3 * time.Second),
+	}))
 	time.Sleep(2 * time.Second)
 	q.Release()
 }
@@ -205,7 +213,7 @@ func TestGoroutineLeak(t *testing.T) {
 		WithAddr(host+":4150"),
 		WithTopic("GoroutineLeak"),
 		WithLogger(queue.NewEmptyLogger()),
-		WithRunFunc(func(ctx context.Context, m core.QueuedMessage) error {
+		WithRunFunc(func(ctx context.Context, m core.TaskMessage) error {
 			for {
 				select {
 				case <-ctx.Done():
@@ -249,7 +257,7 @@ func TestGoroutinePanic(t *testing.T) {
 	w := NewWorker(
 		WithAddr(host+":4150"),
 		WithTopic("GoroutinePanic"),
-		WithRunFunc(func(ctx context.Context, m core.QueuedMessage) error {
+		WithRunFunc(func(ctx context.Context, m core.TaskMessage) error {
 			panic("missing something")
 		}),
 	)
@@ -275,7 +283,7 @@ func TestNSQStatsinQueue(t *testing.T) {
 	w := NewWorker(
 		WithAddr(host+":4150"),
 		WithTopic("nsq_stats"),
-		WithRunFunc(func(ctx context.Context, m core.QueuedMessage) error {
+		WithRunFunc(func(ctx context.Context, m core.TaskMessage) error {
 			log.Println("get message")
 			return nil
 		}),

options.go

@@ -27,7 +27,7 @@ type Options struct {
 	addr        string
 	topic       string
 	channel     string
-	runFunc     func(context.Context, core.QueuedMessage) error
+	runFunc     func(context.Context, core.TaskMessage) error
 	logger      queue.Logger
 	logLevel    nsq.LogLevel
 }
@@ -54,7 +54,7 @@ func WithChannel(channel string) Option {
 }
 
 // WithRunFunc setup the run func of queue
-func WithRunFunc(fn func(context.Context, core.QueuedMessage) error) Option {
+func WithRunFunc(fn func(context.Context, core.TaskMessage) error) Option {
 	return OptionFunc(func(o *Options) {
 		o.runFunc = fn
 	})
@@ -90,7 +90,7 @@ func newOptions(opts ...Option) Options {
 
 		logger:   queue.NewLogger(),
 		logLevel: nsq.LogLevelInfo,
-		runFunc: func(context.Context, core.QueuedMessage) error {
+		runFunc: func(context.Context, core.TaskMessage) error {
 			return nil
 		},
 	}