feature: support new plugins api

.githooks/pre-commit

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e -o pipefail
+
+# https://github.com/koalaman/shellcheck/wiki/SC2039#redirect-both-stdout-and-stderr
+if ! command -v golangci-lint 2>&1 /dev/null; then
+    echo "golangci-lint is not installed"
+    exit 1
+fi
+
+exec golangci-lint --build-tags=race run "$@"

.github/workflows/linters.yml

@@ -18,6 +18,6 @@ jobs:
       - name: Run linter
         uses: golangci/[email protected] # Action page: <https://github.com/golangci/golangci-lint-action>
         with:
-          version: v1.54 # without patch version
+          version: v1.59 # without patch version
           only-new-issues: false # show only new issues if it's a pull request
           args: --timeout=10m --build-tags=race ./...

.github/workflows/linux.yml

@@ -17,9 +17,9 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        php: [ "8.2" ]
-        go: [ stable ]
-        os: [ "ubuntu-latest" ]
+        php: ["8.3"]
+        go: [stable]
+        os: ["ubuntu-latest"]
     steps:
       - name: Set up Go ${{ matrix.go }}
         uses: actions/setup-go@v5 # action page: <https://github.com/actions/setup-go>

.golangci.yml

@@ -2,21 +2,11 @@
 
 run:
   timeout: 1m
-  skip-dirs:
-    - .github
-    - .git
   allow-parallel-runners: true
 
-output:
-  format: colored-line-number # colored-line-number|line-number|json|tab|checkstyle|code-climate
-
 linters-settings:
   wsl:
     allow-assign-and-anything: true
-  govet:
-    check-shadowing: true
-  golint:
-    min-confidence: 0.1
   gocyclo:
     min-complexity: 15
   godot:
@@ -36,7 +26,6 @@ linters-settings:
     range-loops: true
     for-loops: true
   nolintlint:
-    allow-leading-space: false
     require-specific: true
 
 linters: # All available linters list: <https://golangci-lint.run/usage/linters/>
@@ -78,6 +67,9 @@ linters: # All available linters list: <https://golangci-lint.run/usage/linters/
     - whitespace # Tool for detection of leading and trailing whitespace
 
 issues:
+  exclude-dirs:
+    - .github
+    - .git
   exclude-rules:
     - path: _test\.go
       linters:

beanstalkjobs/driver.go

@@ -9,7 +9,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/roadrunner-server/api/v4/plugins/v3/jobs"
+	"github.com/roadrunner-server/api/v4/plugins/v4/jobs"
 	"github.com/roadrunner-server/errors"
 	jprop "go.opentelemetry.io/contrib/propagators/jaeger"
 	"go.opentelemetry.io/otel"

beanstalkjobs/item.go

@@ -4,16 +4,19 @@ import (
 	"bytes"
 	"context"
 	"encoding/gob"
+	"maps"
 	"sync/atomic"
 	"time"
 
 	"github.com/beanstalkd/go-beanstalk"
 	"github.com/goccy/go-json"
 	"github.com/google/uuid"
-	"github.com/roadrunner-server/api/v4/plugins/v3/jobs"
+	"github.com/roadrunner-server/api/v4/plugins/v4/jobs"
 	"go.uber.org/zap"
 )
 
+var _ jobs.Job = (*Item)(nil)
+
 const (
 	auto string = "deduced_by_rr"
 )
@@ -39,7 +42,7 @@ type Options struct {
 	// Pipeline manually specified pipeline.
 	Pipeline string `json:"pipeline,omitempty"`
 	// Delay defines time duration to delay execution for. Defaults to none.
-	Delay int64 `json:"delay,omitempty"`
+	Delay int `json:"delay,omitempty"`
 	// AutoAck option
 	AutoAck bool `json:"auto_ack"`
 	// Beanstalk Tube
@@ -112,17 +115,36 @@ func (i *Item) Ack() error {
 	return i.Options.conn.Load().Delete(i.Options.id)
 }
 
+func (i *Item) NackWithOptions(redeliver bool, delay int) error {
+	if i.Options.AutoAck {
+		return nil
+	}
+
+	if redeliver {
+		i.Options.Delay = delay
+		err := i.Options.requeueFn(context.Background(), i)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	}
+
+	return i.Options.conn.Load().Delete(i.Options.id)
+}
+
 func (i *Item) Nack() error {
 	if i.Options.AutoAck {
 		return nil
 	}
+
 	return i.Options.conn.Load().Delete(i.Options.id)
 }
 
-func (i *Item) Requeue(headers map[string][]string, delay int64) error {
+func (i *Item) Requeue(headers map[string][]string, delay int) error {
 	// overwrite the delay
 	i.Options.Delay = delay
-	i.headers = headers
+	maps.Copy(i.headers, headers)
 
 	err := i.Options.requeueFn(context.Background(), i)
 	if err != nil {
@@ -152,7 +174,7 @@ func fromJob(job jobs.Message) *Item {
 			AutoAck:  job.AutoAck(),
 			Priority: job.Priority(),
 			Pipeline: job.GroupID(),
-			Delay:    job.Delay(),
+			Delay:    int(job.Delay()),
 		},
 	}
 }

githooks-installer.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+cp ./.githooks/pre-commit .git/hooks/pre-commit
+
+echo "DONE"

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/cenkalti/backoff/v4 v4.3.0
 	github.com/goccy/go-json v0.10.3
 	github.com/google/uuid v1.6.0
-	github.com/roadrunner-server/api/v4 v4.12.0
+	github.com/roadrunner-server/api/v4 v4.13.0
 	github.com/roadrunner-server/endure/v2 v2.4.5
 	github.com/roadrunner-server/errors v1.4.0
 	go.opentelemetry.io/contrib/propagators/jaeger v1.27.0

go.sum

@@ -17,8 +17,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/roadrunner-server/api/v4 v4.12.0 h1:N8AC+b7uzrDpTPnFTBVWNIs9ZMV42hwKDCo29X84iS8=
-github.com/roadrunner-server/api/v4 v4.12.0/go.mod h1:nLV2f4O7tDh5DaMDff4oX1bNJ9erz7eyq+4TajgKGck=
+github.com/roadrunner-server/api/v4 v4.13.0 h1:ciC5nzkIHqfbnzFgaUb1If/+fKLbL39OVqUdnEKrXdE=
+github.com/roadrunner-server/api/v4 v4.13.0/go.mod h1:J8ZzDCNFs3BQDql793eBeshpjNJxLrCpEMooGzapTLo=
 github.com/roadrunner-server/endure/v2 v2.4.5 h1:GoZm/1HjKCKm8TpaP/Pm2KbN0X9gLyN840cA3Fn/TCE=
 github.com/roadrunner-server/endure/v2 v2.4.5/go.mod h1:83UvLdt+RNxELTSna+SZMWQiu+Thj6wOz6hmlp65XFI=
 github.com/roadrunner-server/errors v1.4.0 h1:Odjg3VZrj1q5Y8ILwoN+JgERyv0pkhrWPNOM4h68iQ8=