Support PHP serialization and update Handler signature

- Added `github.com/elliotchance/phpserialize` dependency
- Added `UnserializeCommand` helper in `pkg/queue/serializer.go`
- Updated `Handler` signature to `func(context.Context, *Job) error`
- Updated `Job` struct to include `Payload` (*LaravelJob) and `UnserializedData` (any)
- Updated worker to automatically unserialize PHP command strings if present
- Updated main.go and tests to reflect new signature

Author: google-labs-jules[bot]

cmd/worker/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"encoding/json"
 	"log"
 	"os"
 	"os/signal"
@@ -15,12 +14,15 @@ import (
 )
 
 // ExampleHandler is a sample job handler
-func ExampleHandler(ctx context.Context, body []byte) error {
-	var job queue.LaravelJob
-	if err := json.Unmarshal(body, &job); err != nil {
-		return err
+func ExampleHandler(ctx context.Context, job *queue.Job) error {
+	log.Printf("Processing job: %s, ID: %s", job.Payload.DisplayName, job.Payload.UUID)
+
+	// Example of accessing unserialized PHP data
+	if job.UnserializedData != nil {
+		// Map properties if needed
+		// props := queue.GetPHPProperty(job.UnserializedData, "podcastId")
+		log.Printf("Unserialized data present")
 	}
-	log.Printf("Processing job: %s, ID: %s", job.DisplayName, job.UUID)
 	return nil
 }
 

go.mod

@@ -8,4 +8,5 @@ require (
 	github.com/DATA-DOG/go-sqlmock v1.5.2 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/elliotchance/phpserialize v1.4.0 // indirect
 )

go.sum

@@ -8,6 +8,8 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/elliotchance/phpserialize v1.4.0 h1:cAp/9+KSnEbUC8oYCE32n2n84BeW8HOY3HMDI8hG2OY=
+github.com/elliotchance/phpserialize v1.4.0/go.mod h1:gt7XX9+ETUcLXbtTKEuyrqW3lcLUAeS/AnGZ2e49TZs=
 github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE=
 github.com/redis/go-redis/v9 v9.17.2 h1:P2EGsA4qVIM3Pp+aPocCJ7DguDHhqrXNhVcEp4ViluI=
 github.com/redis/go-redis/v9 v9.17.2/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370=

pkg/queue/interfaces.go

@@ -6,12 +6,14 @@ import (
 
 // Job represents a generic job retrieved from the queue
 type Job struct {
-	ID   string
-	Body []byte
+	ID               string
+	Body             []byte
+	Payload          *LaravelJob // The parsed JSON envelope
+	UnserializedData any         // The unserialized PHP command properties (if applicable)
 }
 
-// Handler is the function signature for processing a job's payload
-type Handler func(ctx context.Context, payload []byte) error
+// Handler is the function signature for processing a job
+type Handler func(ctx context.Context, job *Job) error
 
 // Driver defines the interface for queue backends
 type Driver interface {

pkg/queue/serializer.go

@@ -0,0 +1,54 @@
+package queue
+
+import (
+	"encoding/json"
+	"strings"
+
+	"github.com/elliotchance/phpserialize"
+)
+
+// UnserializeCommand attempts to parse the PHP serialized command from the job payload
+func UnserializeCommand(data json.RawMessage) (any, error) {
+	// First, try to unmarshal data as a map to find "command"
+	var dataMap map[string]interface{}
+	if err := json.Unmarshal(data, &dataMap); err != nil {
+		return nil, err
+	}
+
+	commandStr, ok := dataMap["command"].(string)
+	if !ok {
+		// Not a standard Laravel serialized command job
+		return dataMap, nil
+	}
+
+	var out interface{}
+	err := phpserialize.Unmarshal([]byte(commandStr), &out)
+	return out, err
+}
+
+// Helper to extract a private property from a PHP object map if needed
+// PHP serialized objects often have keys like "\x00*\x00propName" or "\x00ClassName\x00propName"
+func GetPHPProperty(obj any, propName string) any {
+	m, ok := obj.(map[interface{}]interface{})
+	if !ok {
+		return nil
+	}
+
+	// Try direct match
+	if val, ok := m[propName]; ok {
+		return val
+	}
+
+	// Try protected/private match (* for protected, ClassName for private)
+	// We iterate because constructing the exact key with null bytes is tricky in Go string literals
+	for k, v := range m {
+		ks, ok := k.(string)
+		if !ok {
+			continue
+		}
+		if strings.HasSuffix(ks, "\x00"+propName) {
+			return v
+		}
+	}
+	return nil
+}

pkg/worker/worker.go

@@ -83,6 +83,13 @@ func (w *Worker) handleJob(ctx context.Context, job *queue.Job) {
 		return
 	}
 
+	// Attempt to unserialize PHP command if present
+	unserialized, _ := queue.UnserializeCommand(payload.Data)
+
+	// Populate job details
+	job.Payload = &payload
+	job.UnserializedData = unserialized
+
 	// Execute handler
 	var jobCtx context.Context
 	var cancel context.CancelFunc
@@ -94,7 +101,7 @@ func (w *Worker) handleJob(ctx context.Context, job *queue.Job) {
 	}
 	defer cancel()
 
-	err = handler(jobCtx, job.Body)
+	err = handler(jobCtx, job)
 	if err != nil {
 		log.Printf("Job %s failed: %v", payload.DisplayName, err)
 		w.handleFailure(ctx, payload, err)

pkg/worker/worker_test.go

@@ -41,7 +41,7 @@ func TestWorker_Run_Success(t *testing.T) {
 	// Setup Registry
 	jobName := "TestJob"
 	handled := false
-	queue.Register(jobName, func(ctx context.Context, body []byte) error {
+	queue.Register(jobName, func(ctx context.Context, job *queue.Job) error {
 		handled = true
 		return nil
 	})
@@ -77,7 +77,7 @@ func TestWorker_Run_Retry(t *testing.T) {
 	// Setup Registry
 	jobName := "RetryJob"
 	calls := 0
-	queue.Register(jobName, func(ctx context.Context, body []byte) error {
+	queue.Register(jobName, func(ctx context.Context, job *queue.Job) error {
 		calls++
 		return errors.New("failed")
 	})