Add modular threads

context.go

@@ -28,7 +28,9 @@ type frankenPHPContext struct {
 	// Whether the request is already closed by us
 	isDone bool
 
-	responseWriter http.ResponseWriter
+	responseWriter    http.ResponseWriter
+	handlerParameters any
+	handlerReturn     any
 
 	done      chan any
 	startedAt time.Time

frankenphp.c

@@ -432,10 +432,11 @@ PHP_FUNCTION(frankenphp_handle_request) {
   zend_unset_timeout();
 #endif
 
-  bool has_request = go_frankenphp_worker_handle_request_start(thread_index);
+  struct go_frankenphp_worker_handle_request_start_return result =
+      go_frankenphp_worker_handle_request_start(thread_index);
   if (frankenphp_worker_request_startup() == FAILURE
       /* Shutting down */
-      || !has_request) {
+      || !result.r0) {
     RETURN_FALSE;
   }
 
@@ -450,10 +451,15 @@ PHP_FUNCTION(frankenphp_handle_request) {
 
   /* Call the PHP func passed to frankenphp_handle_request() */
   zval retval = {0};
+  zval *callback_ret = NULL;
+
   fci.size = sizeof fci;
   fci.retval = &retval;
-  if (zend_call_function(&fci, &fcc) == SUCCESS) {
-    zval_ptr_dtor(&retval);
+  fci.params = result.r1;
+  fci.param_count = result.r1 == NULL ? 0 : 1;
+
+  if (zend_call_function(&fci, &fcc) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) {
+    callback_ret = &retval;
   }
 
   /*
@@ -467,7 +473,13 @@ PHP_FUNCTION(frankenphp_handle_request) {
   }
 
   frankenphp_worker_request_shutdown();
-  go_frankenphp_finish_worker_request(thread_index);
+  go_frankenphp_finish_worker_request(thread_index, callback_ret);
+  if (result.r1 != NULL) {
+    zval_ptr_dtor(result.r1);
+  }
+  if (callback_ret != NULL) {
+    zval_ptr_dtor(&retval);
+  }
 
   RETURN_TRUE;
 }

frankenphp.go

@@ -214,6 +214,11 @@ func Init(options ...Option) error {
 
 	registerExtensions()
 
+	// add registered external workers
+	for _, ew := range externalWorkers {
+		options = append(options, WithWorkers(ew.Name(), ew.FileName(), ew.GetMinThreads(), WithWorkerEnv(ew.Env())))
+	}
+
 	opt := &opt{}
 	for _, o := range options {
 		if err := o(opt); err != nil {

threadFramework.go

@@ -0,0 +1,101 @@
+package frankenphp
+
+import (
+	"context"
+	"log/slog"
+	"net/http"
+	"sync"
+)
+
+// EXPERIMENTAL: WorkerExtension allows you to register an external worker where instead of calling frankenphp handlers on
+// frankenphp_handle_request(), the ProvideRequest method is called. You are responsible for providing a standard
+// http.Request that will be conferred to the underlying worker script.
+//
+// A worker script with the provided Name and FileName will be registered, along with the provided
+// configuration. You can also provide any environment variables that you want through Env. GetMinThreads allows you to
+// reserve a minimum number of threads from the frankenphp thread pool. This number must be positive.
+// These methods are only called once at startup, so register them in an init() function.
+//
+// When a thread is activated and nearly ready, ThreadActivatedNotification will be called with an opaque threadId;
+// this is a time for setting up any per-thread resources. When a thread is about to be returned to the thread pool,
+// you will receive a call to ThreadDrainNotification that will inform you of the threadId.
+// After the thread is returned to the thread pool, ThreadDeactivatedNotification will be called.
+//
+// Once you have at least one thread activated, you will receive calls to ProvideRequest where you should respond with
+// a request. FrankenPHP will automatically pipe these requests to the worker script and handle the response.
+// The piping process is designed to run indefinitely and will be gracefully shut down when FrankenPHP shuts down.
+//
+// Note: External workers receive the lowest priority when determining thread allocations. If GetMinThreads cannot be
+// allocated, then frankenphp will panic and provide this information to the user (who will need to allocate more
+// total threads). Don't be greedy.
+type WorkerExtension interface {
+	Name() string
+	FileName() string
+	Env() PreparedEnv
+	GetMinThreads() int
+	ThreadActivatedNotification(threadId int)
+	ThreadDrainNotification(threadId int)
+	ThreadDeactivatedNotification(threadId int)
+	ProvideRequest() *WorkerRequest[any, any]
+}
+
+// EXPERIMENTAL
+type WorkerRequest[P any, R any] struct {
+	// The request for your worker script to handle
+	Request *http.Request
+	// Response is a response writer that provides the output of the provided request, it must not be nil to access the request body
+	Response http.ResponseWriter
+	// CallbackParameters is an optional field that will be converted in PHP types and passed as parameter to the PHP callback
+	CallbackParameters P
+	// AfterFunc is an optional function that will be called after the request is processed with the original value, the return of the PHP callback, converted in Go types, is passed as parameter
+	AfterFunc func(callbackReturn R)
+}
+
+var externalWorkers = make(map[string]WorkerExtension)
+var externalWorkerMutex sync.Mutex
+
+// EXPERIMENTAL
+func RegisterExternalWorker(worker WorkerExtension) {
+	externalWorkerMutex.Lock()
+	defer externalWorkerMutex.Unlock()
+
+	externalWorkers[worker.Name()] = worker
+}
+
+// startExternalWorkerPipe creates a pipe from an external worker to the main worker.
+func startExternalWorkerPipe(w *worker, externalWorker WorkerExtension, thread *phpThread) {
+	for {
+		rq := externalWorker.ProvideRequest()
+
+		if rq == nil || rq.Request == nil {
+			logger.LogAttrs(context.Background(), slog.LevelWarn, "external worker provided nil request", slog.String("worker", w.name), slog.Int("thread", thread.threadIndex))
+			continue
+		}
+
+		r := rq.Request
+		fr, err := NewRequestWithContext(r, WithOriginalRequest(r), WithWorkerName(w.name))
+		if err != nil {
+			logger.LogAttrs(context.Background(), slog.LevelError, "error creating request for external worker", slog.String("worker", w.name), slog.Int("thread", thread.threadIndex), slog.Any("error", err))
+			continue
+		}
+
+		if fc, ok := fromContext(fr.Context()); ok {
+			fc.responseWriter = rq.Response
+			fc.handlerParameters = rq.CallbackParameters
+
+			// Queue the request and wait for completion if Done channel was provided
+			logger.LogAttrs(context.Background(), slog.LevelInfo, "queue the external worker request", slog.String("worker", w.name), slog.Int("thread", thread.threadIndex))
+
+			w.requestChan <- fc
+			if rq.AfterFunc != nil {
+				go func() {
+					<-fc.done
+
+					if rq.AfterFunc != nil {
+						rq.AfterFunc(fc.handlerReturn)
+					}
+				}()
+			}
+		}
+	}
+}

threadFramework_test.go

@@ -0,0 +1,136 @@
+package frankenphp
+
+import (
+	"io"
+	"net/http/httptest"
+	"sync"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// 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
+}
+
+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
+	}
+}
+
+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
+}
+
+func (m *mockWorkerExtension) GetActivatedCount() int {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	return m.activatedCount
+}
+
+func TestWorkerExtension(t *testing.T) {
+	// Create a mock extension
+	mockExt := newMockWorkerExtension("mockWorker", "testdata/worker.php", 1)
+
+	// Register the mock extension
+	RegisterExternalWorker(mockExt)
+
+	// Clean up external workers after test to avoid interfering with other tests
+	defer func() {
+		delete(externalWorkers, mockExt.Name())
+	}()
+
+	// Initialize FrankenPHP with a worker that has a different name than our extension
+	err := Init()
+	require.NoError(t, err)
+	defer Shutdown()
+
+	// Wait a bit for the worker to be ready
+	time.Sleep(100 * time.Millisecond)
+
+	// Verify that the extension's thread was activated
+	assert.GreaterOrEqual(t, mockExt.GetActivatedCount(), 1, "Thread should have been activated")
+
+	// Create a test request
+	req := httptest.NewRequest("GET", "http://example.com/test/?foo=bar", nil)
+	req.Header.Set("X-Test-Header", "test-value")
+
+	w := httptest.NewRecorder()
+
+	// Create a channel to signal when the request is done
+	done := make(chan struct{})
+
+	// Inject the request into the worker through the extension
+	mockExt.InjectRequest(&WorkerRequest[any, any]{
+		Request:  req,
+		Response: w,
+		AfterFunc: func(callbackReturn any) {
+			close(done)
+		},
+	})
+
+	// Wait for the request to be fully processed
+	<-done
+
+	// Check the response - now safe from race conditions
+	resp := w.Result()
+	body, _ := io.ReadAll(resp.Body)
+
+	// The worker.php script should output information about the request
+	// We're just checking that we got a response, not the specific content
+	assert.NotEmpty(t, body, "Response body should not be empty")
+}