fix some stuff

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

Author: withinboredom

cli/ext/build/ext.c

@@ -110,29 +110,6 @@ PHP_METHOD(Bottledcode_DurablePhp_Ext_Worker, __construct) {
     fflush(stderr);
 }
 
-
-PHP_METHOD(Bottledcode_DurablePhp_Ext_Worker, startEventLoop) {
-    ext_object *intern = ext_object_from_obj(Z_OBJ_P(ZEND_THIS));
-    
-    VALIDATE_GO_HANDLE(intern);
-    zend_string *kind = NULL;
-    
-    ZEND_PARSE_PARAMETERS_START(1, 1)
-        Z_PARAM_STR(kind)
-        ZEND_PARSE_PARAMETERS_END();
-    
-    startEventLoop_wrapper(intern->go_handle, kind);
-}
-
-PHP_METHOD(Bottledcode_DurablePhp_Ext_Worker, drainEventLoop) {
-    ext_object *intern = ext_object_from_obj(Z_OBJ_P(ZEND_THIS));
-    
-    VALIDATE_GO_HANDLE(intern);
-    ZEND_PARSE_PARAMETERS_NONE();
-    
-    drainEventLoop_wrapper(intern->go_handle);
-}
-
 PHP_METHOD(Bottledcode_DurablePhp_Ext_Worker, __destruct) {
     ext_object *intern = ext_object_from_obj(Z_OBJ_P(ZEND_THIS));
 

cli/ext/build/ext.go

@@ -45,6 +45,7 @@ type LocalMessage struct {
 type worker struct {
 	requestChan      chan jetstream.Msg // Channel for NATS messages
 	localMessageChan chan *LocalMessage // Channel for local synchronous requests
+	running          bool
 }
 
 var globalWorkerInstance *worker
@@ -366,7 +367,7 @@ func Authorize(ctx context.Context, ev *glue.EventMessage, from *ids.StateId, pr
 	rm := auth.GetResourceManager(ctx, helpers.Js)
 	r, err := rm.DiscoverResource(ctx, ids.ParseStateId(ev.Destination), from, helpers.Logger, preventCreation)
 	if err != nil {
-		helpers.Logger.Error("AUTHORIZATION FAILURE: Request blocked during resource discovery", 
+		helpers.Logger.Error("AUTHORIZATION FAILURE: Request blocked during resource discovery",
 			zap.String("error", err.Error()),
 			zap.String("destination", ev.Destination),
 			zap.String("phase", "resource-discovery"),
@@ -378,7 +379,7 @@ func Authorize(ctx context.Context, ev *glue.EventMessage, from *ids.StateId, pr
 	}
 
 	if !r.WantTo(operation, ctx) {
-		helpers.Logger.Error("AUTHORIZATION FAILURE: Operation not permitted", 
+		helpers.Logger.Error("AUTHORIZATION FAILURE: Operation not permitted",
 			zap.String("operation", string(operation)),
 			zap.String("destination", ev.Destination),
 			zap.String("phase", "operation-check"),
@@ -896,26 +897,6 @@ func (w *Worker) emitEvent(event *C.zval) {
 
 func (w *Worker) delete() {}
 
-//export startEventLoop_wrapper
-func startEventLoop_wrapper(handle C.uintptr_t, kind *C.zend_string) {
-	obj := getGoObject(handle)
-	if obj == nil {
-		return
-	}
-	structObj := obj.(*Worker)
-	structObj.startEventLoop(kind)
-}
-
-//export drainEventLoop_wrapper
-func drainEventLoop_wrapper(handle C.uintptr_t) {
-	obj := getGoObject(handle)
-	if obj == nil {
-		return
-	}
-	structObj := obj.(*Worker)
-	structObj.drainEventLoop()
-}
-
 //export __destruct_wrapper
 func __destruct_wrapper(handle C.uintptr_t) {
 	obj := getGoObject(handle)

cli/ext/build/ext.stub.php

@@ -12,13 +12,8 @@ public function __construct() {}
 
     public static function GetCurrent(): ?Worker {}
 
-    public function startEventLoop(string $kind): void {}
-
-    public function drainEventLoop(): void {}
-
     public function __destruct() {}
 
-
     public function queryState(string $stateId): array {}
 
     public function getUser(): ?array {}

cli/ext/build/ext_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 2cbfd4f7ba4303080cd46416ca0c29baf5b625f2 */
+ * Stub hash: ad9b266d342856e3f582dcae9b4f25192cc52140 */
 
 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)
@@ -13,13 +13,6 @@ 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()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Bottledcode_DurablePhp_Ext_Worker_drainEventLoop, 0, 0, IS_VOID, 0)
-ZEND_END_ARG_INFO()
-
 #define arginfo_class_Bottledcode_DurablePhp_Ext_Worker___destruct arginfo_class_Bottledcode_DurablePhp_Ext_Worker___construct
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Bottledcode_DurablePhp_Ext_Worker_queryState, 0, 1, IS_ARRAY, 0)
@@ -46,13 +39,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Bottledcode_DurablePhp_Ext
 	ZEND_ARG_TYPE_INFO(0, eventDescription, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_Bottledcode_DurablePhp_Ext_Worker_delete arginfo_class_Bottledcode_DurablePhp_Ext_Worker_drainEventLoop
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Bottledcode_DurablePhp_Ext_Worker_delete, 0, 0, IS_VOID, 0)
+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);
 ZEND_METHOD(Bottledcode_DurablePhp_Ext_Worker, queryState);
 ZEND_METHOD(Bottledcode_DurablePhp_Ext_Worker, getUser);
@@ -72,8 +64,6 @@ 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)
 	ZEND_ME(Bottledcode_DurablePhp_Ext_Worker, queryState, arginfo_class_Bottledcode_DurablePhp_Ext_Worker_queryState, ZEND_ACC_PUBLIC)
 	ZEND_ME(Bottledcode_DurablePhp_Ext_Worker, getUser, arginfo_class_Bottledcode_DurablePhp_Ext_Worker_getUser, ZEND_ACC_PUBLIC)

src/LocalEntityClient.php

@@ -27,6 +27,7 @@
 use Bottledcode\DurablePhp\Events\EventDescription;
 use Bottledcode\DurablePhp\Events\RaiseEvent;
 use Bottledcode\DurablePhp\Events\Shares\Operation;
+use Bottledcode\DurablePhp\Events\WithDelay;
 use Bottledcode\DurablePhp\Events\WithEntity;
 use Bottledcode\DurablePhp\Glue\Provenance;
 use Bottledcode\DurablePhp\Proxy\SpyException;
@@ -99,9 +100,13 @@ public function signalEntity(
     ): void {
         $event = WithEntity::forInstance(
             StateId::fromEntityId($entityId),
-            RaiseEvent::forSignal($operationName, SerializedArray::fromArray($input), $scheduledTime),
+            RaiseEvent::forOperation($operationName, $input),
         );
 
+        if ($scheduledTime) {
+            $event = WithDelay::forEvent($scheduledTime, $event);
+        }
+
         $eventDescription = new EventDescription($event);
         $userArray = $this->userContext ? Serializer::serialize($this->userContext) : null;
 
@@ -117,7 +122,7 @@ public function getEntitySnapshot(EntityId $entityId): ?EntityState
     #[Override]
     public function withAuth(Provenance|string|null $token): void
     {
-        $this->setUserContext($token);
+        $this->setUserContext($token instanceof Provenance ? $token : null);
     }
 
     public function setUserContext(?Provenance $userContext): void

src/LocalOrchestrationClient.php

@@ -27,6 +27,7 @@
 use Bottledcode\DurablePhp\Events\EventDescription;
 use Bottledcode\DurablePhp\Events\RaiseEvent;
 use Bottledcode\DurablePhp\Events\Shares\Operation;
+use Bottledcode\DurablePhp\Events\StartExecution;
 use Bottledcode\DurablePhp\Events\StartOrchestration;
 use Bottledcode\DurablePhp\Events\WithOrchestration;
 use Bottledcode\DurablePhp\Glue\Provenance;
@@ -97,20 +98,24 @@ public function resume(OrchestrationInstance $instance, string $reason): void
     #[Override]
     public function startNew(string $name, array $args = [], ?string $id = null): OrchestrationInstance
     {
-        $orchestrationId = OrchestrationId($name, $id ?? Uuid::uuid4()->toString());
-        $stateId = StateId::fromOrchestrationId($orchestrationId);
+        $orchestrationId = \Bottledcode\DurablePhp\OrchestrationInstance($name, $id ?? Uuid::uuid4()->toString());
+        $stateId = StateId::fromInstance($orchestrationId);
 
         $event = WithOrchestration::forInstance(
             $stateId,
-            StartOrchestration::fromArray(SerializedArray::fromArray($args)),
+            StartOrchestration::forInstance($orchestrationId),
         );
 
         $eventDescription = new EventDescription($event);
         $userArray = $this->userContext ? Serializer::serialize($this->userContext) : null;
 
         $sequence = emit_event($userArray, $eventDescription->toArray(), $stateId->id);
 
-        return $orchestrationId->toOrchestrationInstance();
+        $event = WithOrchestration::forInstance($stateId, StartExecution::asParent($args, []));
+        $eventDescription = new EventDescription($event);
+        emit_event($userArray, $eventDescription->toArray(), $sequence);
+
+        return $orchestrationId;
     }
 
     #[Override]
@@ -134,7 +139,7 @@ public function waitForCompletion(OrchestrationInstance $instance): void
     #[Override]
     public function withAuth(Provenance|string|null $token): void
     {
-        $this->setUserContext($token);
+        $this->setUserContext($token instanceof Provenance ? $token : null);
     }
 
     public function setUserContext(?Provenance $userContext): void