refactor: refactor core message handling and update job timeout tests

- Change `core.QueuedMessage` to `core.TaskMessage` in `runFunc` definition and `WithRunFunc` function
- Update `runFunc` initialization in `newOptions` to use `core.TaskMessage`
- Modify `TestJobReachTimeout` to use `job.AllowOption` with `Timeout`
- Modify `TestCancelJobAfterShutdown` to use `job.AllowOption` with `Timeout`

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

Author: appleboy

options.go

@@ -30,7 +30,7 @@ type Option func(*options)
 // AMQP 0-9-1 Model Explained
 // ref: https://www.rabbitmq.com/tutorials/amqp-concepts.html
 type options struct {
-	runFunc func(context.Context, core.QueuedMessage) error
+	runFunc func(context.Context, core.TaskMessage) error
 	logger  queue.Logger
 	addr    string
 	queue   string
@@ -102,7 +102,7 @@ func WithQueue(val 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 func(w *options) {
 		w.runFunc = fn
 	}
@@ -125,7 +125,7 @@ func newOptions(opts ...Option) options {
 		routingKey:   "test-key",
 		logger:       queue.NewLogger(),
 		autoAck:      false,
-		runFunc: func(context.Context, core.QueuedMessage) error {
+		runFunc: func(context.Context, core.TaskMessage) error {
 			return nil
 		},
 	}

rabbitmq_test.go

@@ -125,7 +125,9 @@ func TestJobReachTimeout(t *testing.T) {
 	assert.NoError(t, err)
 	q.Start()
 	time.Sleep(50 * 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(100 * time.Millisecond)
 	q.Shutdown()
 	q.Wait()
@@ -162,7 +164,9 @@ func TestCancelJobAfterShutdown(t *testing.T) {
 	assert.NoError(t, err)
 	q.Start()
 	time.Sleep(50 * time.Millisecond)
-	assert.NoError(t, q.Queue(m, job.WithTimeout(150*time.Millisecond)))
+	assert.NoError(t, q.Queue(m, job.AllowOption{
+		Timeout: job.Time(150 * time.Millisecond),
+	}))
 	time.Sleep(100 * time.Millisecond)
 	q.Shutdown()
 	q.Wait()