start working on getting the client up and running

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

Author: withinboredom

.idea/codeStyles/Project.xml

@@ -12,7 +12,8 @@ endif
 
 LOCAL_MODULE := /home/withinboredom/code/durable-php/cli
 GEN_STUB := /home/withinboredom/code/php-src/build/gen_stub.php
-LOCAL_FRANKENPHP := /home/withinboredom/code/frankenphp/caddy
+LOCAL_FRANKENPHP_CADDY := /home/withinboredom/code/frankenphp/caddy
+LOCAL_FRANKENPHP := /home/withinboredom/code/frankenphp
 
 # Targets
 frankenphp: ext/build/ext.go ext/build/ext_arginfo.h
@@ -22,7 +23,8 @@ frankenphp: ext/build/ext.go ext/build/ext_arginfo.h
 	CGO_LDFLAGS="$(PHP_LDFLAGS) $(PHP_LIBS)" \
 	xcaddy build \
 		--output frankenphp \
-		--with github.com/dunglas/frankenphp/caddy=$(LOCAL_FRANKENPHP) \
+		--with github.com/dunglas/frankenphp/caddy=$(LOCAL_FRANKENPHP_CADDY) \
+		--with github.com/dunglas/frankenphp=$(LOCAL_FRANKENPHP) \
 		--with github.com/bottledcode/durable-php/cli=$(LOCAL_MODULE)
 
 ext/build/ext_arginfo.h: ext/build/ext.stub.php

cli/Makefile

@@ -57,6 +57,7 @@ void init_object_handlers() {
 }
 
 static zend_class_entry *Worker_ce = NULL;
+static ext_object *current_worker = NULL;
 
 PHP_METHOD(Bottledcode_DurablePhp_Ext_Worker, __construct) {
     ZEND_PARSE_PARAMETERS_NONE();
@@ -227,6 +228,16 @@ PHP_METHOD(Bottledcode_DurablePhp_Ext_Worker, delete) {
     delete_wrapper(intern->go_handle);
 }
 
+PHP_METHOD(Bottledcode_DurablePhp_Ext_Worker, GetCurrent) {
+    ZEND_PARSE_PARAMETERS_NONE();
+    
+    if (current_worker == NULL) {
+        RETURN_NULL();
+    }
+    
+    RETURN_OBJ_COPY(&current_worker->std);
+}
+
 void register_all_classes() {
     init_object_handlers();
     Worker_ce = register_class_Bottledcode_DurablePhp_Ext_Worker();
@@ -237,6 +248,33 @@ void register_all_classes() {
     Worker_ce->create_object = ext_create_object;
 }
 
+/* Function to set the current worker from Go */
+void set_current_worker_handle(uintptr_t handle) {
+    if (current_worker != NULL) {
+        /* Release previous worker */
+        zend_object_release(&current_worker->std);
+        current_worker = NULL;
+    }
+    
+    if (handle != 0) {
+        /* Create a new Worker object and set its handle */
+        zend_object *obj = ext_create_object(Worker_ce);
+        current_worker = ext_object_from_obj(obj);
+        current_worker->go_handle = handle;
+        
+        /* Add ref to keep it alive */
+        GC_ADDREF(&current_worker->std);
+    }
+}
+
+/* Function to clear current worker */
+void clear_current_worker() {
+    if (current_worker != NULL) {
+        zend_object_release(&current_worker->std);
+        current_worker = NULL;
+    }
+}
+
 PHP_MINIT_FUNCTION(ext) {
     register_all_classes();
 

cli/ext/build/ext.c

@@ -3,6 +3,9 @@ package build
 /*
 #include <stdlib.h>
 #include "ext.h"
+
+void set_current_worker_handle(uintptr_t handle);
+void clear_current_worker(void);
 */
 import "C"
 import (
@@ -31,19 +34,22 @@ import "github.com/nats-io/nats.go/jetstream"
 import "go.uber.org/zap"
 
 type worker struct {
+	requestChan chan *frankenphp.WorkerRequest
 }
 
+var globalWorkerInstance *worker
+
 func (w *worker) Name() string {
 	return "m#durable-php"
 }
 
 func (w *worker) FileName() string {
 	// check if target exists
-	if _, err := os.Stat("src/glue/worker.php"); !os.IsNotExist(err) {
-		return "src/glue/worker.php"
+	if _, err := os.Stat("src/Glue/worker.php"); !os.IsNotExist(err) {
+		return "src/Glue/worker.php"
 	}
 
-	return "vendor/bottledcode/durable-php/src/glue/worker.php"
+	return "vendor/bottledcode/durable-php/src/Glue/worker.php"
 }
 
 func (w *worker) Env() frankenphp.PreparedEnv {
@@ -64,14 +70,18 @@ func (w *worker) ThreadDeactivatedNotification(threadId int) {
 }
 
 func (w *worker) ProvideRequest() *frankenphp.WorkerRequest {
-	return nil
+	req := <-w.requestChan
+	return req
 }
 
 func init() {
 	frankenphp.RegisterExtension(unsafe.Pointer(&C.ext_module_entry))
 
 	// initialize the workers
-	frankenphp.RegisterExternalWorker(&worker{})
+	globalWorkerInstance = &worker{
+		requestChan: make(chan *frankenphp.WorkerRequest, 100), // Buffer for 100 requests
+	}
+	frankenphp.RegisterExternalWorker(globalWorkerInstance)
 }
 
 func Authorize(ctx context.Context, ev *glue.EventMessage, from *ids.StateId, preventCreation bool, operation auth.Operation) (bool, error) {
@@ -825,3 +835,41 @@ func delete_wrapper(handle C.uintptr_t) {
 	structObj := obj.(*Worker)
 	structObj.delete()
 }
+
+// SetCurrentWorker sets the current worker context for the PHP extension
+func SetCurrentWorker(worker *Worker) {
+	if worker == nil {
+		C.clear_current_worker()
+		return
+	}
+
+	handle := registerGoObject(worker)
+	C.set_current_worker_handle(C.uintptr_t(handle))
+}
+
+// ClearCurrentWorker clears the current worker context
+func ClearCurrentWorker() {
+	C.clear_current_worker()
+}
+
+// GetWorkerInstance returns the global worker instance for feeding requests
+func GetWorkerInstance() *worker {
+	return globalWorkerInstance
+}
+
+// InjectWorkerRequest sends a request to the worker for processing
+func InjectWorkerRequest(req *frankenphp.WorkerRequest) {
+	if globalWorkerInstance != nil {
+		globalWorkerInstance.requestChan <- req
+	}
+}
+
+// StartWorkerConsumer starts a NATS consumer that feeds requests to the worker channel
+func StartWorkerConsumer(ctx context.Context, cfg *config.Config, logger *zap.Logger) {
+	// This will create NATS consumers and convert messages to HTTP requests for the worker
+	// Instead of using the old lib/consumer.go approach, we create consumers here
+	// and feed HTTP requests directly to the worker channel
+	
+	logger.Info("Starting worker-based consumer")
+	// TODO: Implement NATS consumer logic here
+}

cli/ext/build/ext.go

@@ -6,6 +6,8 @@
 
 extern zend_module_entry ext_module_entry;
 
-
+/* Functions for managing current worker */
+void set_current_worker_handle(uintptr_t handle);
+void clear_current_worker(void);
 
 #endif

cli/ext/build/ext.h

@@ -10,6 +10,8 @@ class Worker {
 
     public function __construct() {}
 
+    public static function GetCurrent(): ?Worker {}
+
     public function startEventLoop(string $kind): void {}
 
     public function drainEventLoop(): void {}

cli/ext/build/ext.stub.php

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 2033dbbdb5b447b9b6e5f1eb6f7b7758b95b40cc */
+ * Stub hash: 60118ea78de15908a849b87c3010bbd972e60e71 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_Bottledcode_DurablePhp_Ext_emit_event, 0, 3, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, userContext, IS_ARRAY, 1)
@@ -10,6 +10,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Bottledcode_DurablePhp_Ext_Worker___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Bottledcode_DurablePhp_Ext_Worker_GetCurrent, 0, 0, Bottledcode\\DurablePhp\\Ext\\Worker, 1)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Bottledcode_DurablePhp_Ext_Worker_startEventLoop, 0, 1, IS_VOID, 0)
 	ZEND_ARG_TYPE_INFO(0, kind, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -50,6 +53,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_FUNCTION(Bottledcode_DurablePhp_Ext_emit_event);
 ZEND_METHOD(Bottledcode_DurablePhp_Ext_Worker, __construct);
+ZEND_METHOD(Bottledcode_DurablePhp_Ext_Worker, GetCurrent);
 ZEND_METHOD(Bottledcode_DurablePhp_Ext_Worker, startEventLoop);
 ZEND_METHOD(Bottledcode_DurablePhp_Ext_Worker, drainEventLoop);
 ZEND_METHOD(Bottledcode_DurablePhp_Ext_Worker, __destruct);
@@ -71,6 +75,7 @@ static const zend_function_entry ext_functions[] = {
 
 static const zend_function_entry class_Bottledcode_DurablePhp_Ext_Worker_methods[] = {
 	ZEND_ME(Bottledcode_DurablePhp_Ext_Worker, __construct, arginfo_class_Bottledcode_DurablePhp_Ext_Worker___construct, ZEND_ACC_PUBLIC)
+	ZEND_ME(Bottledcode_DurablePhp_Ext_Worker, GetCurrent, arginfo_class_Bottledcode_DurablePhp_Ext_Worker_GetCurrent, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	ZEND_ME(Bottledcode_DurablePhp_Ext_Worker, startEventLoop, arginfo_class_Bottledcode_DurablePhp_Ext_Worker_startEventLoop, ZEND_ACC_PUBLIC)
 	ZEND_ME(Bottledcode_DurablePhp_Ext_Worker, drainEventLoop, arginfo_class_Bottledcode_DurablePhp_Ext_Worker_drainEventLoop, ZEND_ACC_PUBLIC)
 	ZEND_ME(Bottledcode_DurablePhp_Ext_Worker, __destruct, arginfo_class_Bottledcode_DurablePhp_Ext_Worker___destruct, ZEND_ACC_PUBLIC)

cli/ext/build/ext_arginfo.h

@@ -643,3 +643,4 @@ func processMsg(ctx context.Context, logger *zap.Logger, msg jetstream.Msg, js j
 
 	return nil
 }
+

cli/lib/consumer.go

@@ -40,7 +40,8 @@
     "ramsey/uuid": "^4.9.0",
     "webonyx/graphql-php": "^15.22.0",
     "withinboredom/records": "^0.1.3",
-    "withinboredom/time": "^6.0.0"
+    "withinboredom/time": "^6.0.0",
+    "ext-frankenphp": "*"
   },
   "require-dev": {
     "laravel/pint": "^1.24.0",

composer.json

@@ -26,6 +26,7 @@
 
 use Amp\Http\Client\HttpClientBuilder;
 use Bottledcode\DurablePhp\Events\Shares\Operation;
+use Bottledcode\DurablePhp\Glue\Provenance;
 use Bottledcode\DurablePhp\Search\EntityFilter;
 use Bottledcode\DurablePhp\State\EntityId;
 use Bottledcode\DurablePhp\State\EntityState;
@@ -43,7 +44,44 @@ public function __construct(
         private OrchestrationClientInterface $orchestrationClient,
     ) {}
 
-    public static function get(string $apiHost = 'http://localhost:8080'): self
+    public static function get(string $apiHost = 'http://localhost:8080', ?Provenance $userContext = null): self
+    {
+        if (function_exists('Bottledcode\DurablePhp\Ext\emit_event')) {
+            $entityClient = new LocalEntityClient();
+            $orchestrationClient = new LocalOrchestrationClient();
+
+            if ($userContext !== null) {
+                $entityClient->setUserContext($userContext);
+                $orchestrationClient->setUserContext($userContext);
+            }
+
+            return new self($entityClient, $orchestrationClient);
+        }
+
+        $builder = new HttpClientBuilder();
+        $builder->retry(3);
+
+        $httpClient = $builder->build();
+        $entityClient = new RemoteEntityClient($apiHost, $httpClient);
+        $orchestrationClient = new RemoteOrchestrationClient($apiHost, $httpClient);
+
+        return new self($entityClient, $orchestrationClient);
+    }
+
+    public static function local(?Provenance $userContext = null): self
+    {
+        $entityClient = new LocalEntityClient();
+        $orchestrationClient = new LocalOrchestrationClient();
+
+        if ($userContext !== null) {
+            $entityClient->setUserContext($userContext);
+            $orchestrationClient->setUserContext($userContext);
+        }
+
+        return new self($entityClient, $orchestrationClient);
+    }
+
+    public static function remote(string $apiHost = 'http://localhost:8080'): self
     {
         $builder = new HttpClientBuilder();
         $builder->retry(3);