refactor: make Worker an embeddable struct (#1884)

* make WorkerExtension embeddable

Signed-off-by: Robert Landers <landers.robert@gmail.com>

* change names

Signed-off-by: Robert Landers <landers.robert@gmail.com>

---------

Signed-off-by: Robert Landers <landers.robert@gmail.com>

Author: withinboredom

threadFramework.go

@@ -5,6 +5,7 @@ import (
 	"log/slog"
 	"net/http"
 	"sync"
+	"sync/atomic"
 )
 
 // EXPERIMENTAL: WorkerExtension allows you to register an external worker where instead of calling frankenphp handlers on
@@ -99,3 +100,46 @@ func startExternalWorkerPipe(w *worker, externalWorker WorkerExtension, thread *
 		}
 	}
 }
+
+type Worker struct {
+	ExtensionName  string
+	WorkerFileName string
+	WorkerEnv      PreparedEnv
+	MinThreads     int
+	RequestChan    chan *WorkerRequest[any, any]
+	ActivatedCount atomic.Int32
+	DrainCount     atomic.Int32
+}
+
+func (w *Worker) Name() string {
+	return w.ExtensionName
+}
+
+func (w *Worker) FileName() string {
+	return w.WorkerFileName
+}
+
+func (w *Worker) Env() PreparedEnv {
+	return w.WorkerEnv
+}
+
+func (w *Worker) GetMinThreads() int {
+	return w.MinThreads
+}
+
+func (w *Worker) ThreadActivatedNotification(threadId int) {
+	w.ActivatedCount.Add(1)
+}
+
+func (w *Worker) ThreadDrainNotification(threadId int) {
+	w.DrainCount.Add(1)
+}
+
+func (w *Worker) ThreadDeactivatedNotification(threadId int) {
+	w.DrainCount.Add(-1)
+	w.ActivatedCount.Add(-1)
+}
+
+func (w *Worker) ProvideRequest() *WorkerRequest[any, any] {
+	return <-w.RequestChan
+}

threadFramework_test.go

@@ -3,7 +3,7 @@ package frankenphp
 import (
 	"io"
 	"net/http/httptest"
-	"sync"
+	"sync/atomic"
 	"testing"
 	"time"
 
@@ -13,73 +13,29 @@ import (
 
 // mockWorkerExtension implements the WorkerExtension interface
 type mockWorkerExtension struct {
-	name             string
-	fileName         string
-	env              PreparedEnv
-	minThreads       int
-	requestChan      chan *WorkerRequest[any, any]
-	activatedCount   int
-	drainCount       int
-	deactivatedCount int
-	mu               sync.Mutex
+	Worker
 }
 
 func newMockWorkerExtension(name, fileName string, minThreads int) *mockWorkerExtension {
 	return &mockWorkerExtension{
-		name:        name,
-		fileName:    fileName,
-		env:         make(PreparedEnv),
-		minThreads:  minThreads,
-		requestChan: make(chan *WorkerRequest[any, any], 10), // Buffer to avoid blocking
+		Worker: Worker{
+			ExtensionName:  name,
+			WorkerFileName: fileName,
+			WorkerEnv:      nil,
+			MinThreads:     minThreads,
+			RequestChan:    make(chan *WorkerRequest[any, any], minThreads),
+			ActivatedCount: atomic.Int32{},
+			DrainCount:     atomic.Int32{},
+		},
 	}
 }
 
-func (m *mockWorkerExtension) Name() string {
-	return m.name
-}
-
-func (m *mockWorkerExtension) FileName() string {
-	return m.fileName
-}
-
-func (m *mockWorkerExtension) Env() PreparedEnv {
-	return m.env
-}
-
-func (m *mockWorkerExtension) GetMinThreads() int {
-	return m.minThreads
-}
-
-func (m *mockWorkerExtension) ThreadActivatedNotification(threadId int) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	m.activatedCount++
-}
-
-func (m *mockWorkerExtension) ThreadDrainNotification(threadId int) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	m.drainCount++
-}
-
-func (m *mockWorkerExtension) ThreadDeactivatedNotification(threadId int) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	m.deactivatedCount++
-}
-
-func (m *mockWorkerExtension) ProvideRequest() *WorkerRequest[any, any] {
-	return <-m.requestChan
-}
-
 func (m *mockWorkerExtension) InjectRequest(r *WorkerRequest[any, any]) {
-	m.requestChan <- r
+	m.RequestChan <- r
 }
 
 func (m *mockWorkerExtension) GetActivatedCount() int {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	return m.activatedCount
+	return int(m.ActivatedCount.Load())
 }
 
 func TestWorkerExtension(t *testing.T) {