convert entity and orchestration ids to records

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

Author: withinboredom

.idea/durable-php.iml

@@ -6,18 +6,20 @@
 use Bottledcode\DurablePhp\State\Serializer;
 use {{.Name}}\Entities\CountInterface;
 use {{.Name}}\Orchestrations\Password;
+use function Bottledcode\DurablePhp\EntityId;
+use function Bottledcode\DurablePhp\OrchestrationInstance;
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
 $client = DurableClient::get();
 
 
-$entity = new EntityId(CountInterface::class, random_int(0, 10000));
+$entity = EntityId(CountInterface::class, random_int(0, 10000));
 
 echo "Signaling an entity, which will start an orchestration, which we will wait for completion\n";
 $start = microtime(true);
 $client->signal($entity, fn(CountInterface $state) => $state->countTo(100));
-$client->waitForCompletion(new OrchestrationInstance(\{{.Name}}\Orchestrations\Counter::class, $entity->id));
+$client->waitForCompletion(OrchestrationInstance(\{{.Name}}\Orchestrations\Counter::class, $entity->id));
 $time = number_format(microtime(true) - $start, 2);
 echo "Cool! That took $time seconds\n";
 echo "Here's the state:\n" . json_encode($client->getEntitySnapshot($entity, CountInterface::class), JSON_PRETTY_PRINT) . "\n";

.idea/php.xml

@@ -8,7 +8,10 @@
   "autoload": {
     "psr-4": {
       "Bottledcode\\DurablePhp\\": "src/"
-    }
+    },
+    "files": [
+      "src/functions.php"
+    ]
   },
   "autoload-dev": {
     "psr-4": {
@@ -33,13 +36,13 @@
     "amphp/parallel": "^2.2.9",
     "crell/serde": "^1.2.0",
     "nesbot/carbon": ">2.0",
+    "nikic/php-parser": "^5.1",
     "php": ">=8.4",
     "php-di/php-di": "^7.0.7",
     "ramsey/uuid": "^4.7.6",
     "webonyx/graphql-php": "^15.12.5",
-    "withinboredom/time": "^6.0.0",
-    "nikic/php-parser": "^5.1",
-    "withinboredom/record": "v0.1.0"
+    "withinboredom/records": "v0.1.2",
+    "withinboredom/time": "^6.0.0"
   },
   "require-dev": {
     "laravel/pint": "^1.17.2",

cli/init/template/tests/integrationTest.php

@@ -132,7 +132,7 @@ Here's an example showing a lock:
 
 ```php
 function orch(\Bottledcode\DurablePhp\OrchestrationContext $context): void {
-    $entityId = new \Bottledcode\DurablePhp\State\EntityId('myEntity', 'id');
+    $entityId = \Bottledcode\DurablePhp\EntityId('myEntity', 'id');
     $lock = $context->lockEntity($entityId);
     // from here-on, you have exclusive access to the entity
     $context->entityOp($entityId, fn($entity) => $entity->add(5));

composer.json

@@ -36,7 +36,6 @@
 use Bottledcode\DurablePhp\State\EntityHistory;
 use Bottledcode\DurablePhp\State\EntityId;
 use Bottledcode\DurablePhp\State\Ids\StateId;
-use Bottledcode\DurablePhp\State\OrchestrationInstance;
 use Closure;
 use Crell\Serde\Attributes\ClassSettings;
 use DateTimeImmutable;
@@ -132,7 +131,7 @@ public function startNewOrchestration(string $orchestration, array $input = [],
             $id = Uuid::uuid7()->toString();
         }
 
-        $instance = StateId::fromInstance(new OrchestrationInstance($orchestration, $id));
+        $instance = StateId::fromInstance(OrchestrationInstance($orchestration, $id));
         $this->eventDispatcher->fire(
             WithOrchestration::forInstance(
                 $instance,

docs/orchestrations.md

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright ©2024 Robert Landers
  *
@@ -25,15 +26,16 @@
 
 use Bottledcode\DurablePhp\DurableClient;
 use Bottledcode\DurablePhp\SerializedArray;
-use Bottledcode\DurablePhp\State\EntityId;
-use Bottledcode\DurablePhp\State\OrchestrationInstance;
 use Bottledcode\DurablePhp\State\Serializer;
 use GraphQL\Error\DebugFlag;
 use GraphQL\Language\AST\TypeDefinitionNode;
 use GraphQL\Server\ServerConfig;
 use GraphQL\Server\StandardServer;
 use GraphQL\Utils\BuildSchema;
 
+use function Bottledcode\DurablePhp\EntityId;
+use function Bottledcode\DurablePhp\OrchestrationInstance;
+
 require_once __DIR__ . '/../../Glue/autoload.php';
 
 header('Content-Type: text/plain');
@@ -52,7 +54,7 @@
 
 function getOrchestrationStatus(array $args, DurableClient $context): array
 {
-    $id = new OrchestrationInstance($args['id']['instance'], $args['id']['execution']);
+    $id = OrchestrationInstance($args['id']['instance'], $args['id']['execution']);
     if ($args['waitForCompletion'] ?? false) {
         $context->waitForCompletion($id);
     }
@@ -65,7 +67,7 @@ function getOrchestrationStatus(array $args, DurableClient $context): array
 
 function getEntitySnapshot(array $args, DurableClient $context): array
 {
-    $id = new EntityId($args['id']['name'], $args['id']['id']);
+    $id = EntityId($args['id']['name'], $args['id']['id']);
 
     return Serializer::serialize($context->getEntitySnapshot($id));
 }
@@ -90,7 +92,7 @@ function startOrchestration(array $args, DurableClient $context): array
 
 function raiseEvent(array $args, DurableClient $context): array
 {
-    $id = new OrchestrationInstance($args['id']['instance'], $args['id']['execution']);
+    $id = OrchestrationInstance($args['id']['instance'], $args['id']['execution']);
     $arguments = array_map(
         static fn($x, $i) => ['key' => $i, ...$x],
         $args['arguments'],
@@ -104,7 +106,7 @@ function raiseEvent(array $args, DurableClient $context): array
 
 function signal(array $args, DurableClient $context): array
 {
-    $id = new EntityId($args['id']['name'], $args['id']['id']);
+    $id = EntityId($args['id']['name'], $args['id']['id']);
     $signal = $args['signal'];
     unset($args['id'], $args['signal']);
 

src/EntityContext.php

@@ -40,7 +40,6 @@
 use Bottledcode\DurablePhp\State\EntityHistory;
 use Bottledcode\DurablePhp\State\Ids\StateId;
 use Bottledcode\DurablePhp\State\OrchestrationHistory;
-use Bottledcode\DurablePhp\State\OrchestrationInstance;
 use Bottledcode\DurablePhp\State\Serializer;
 use Bottledcode\DurablePhp\State\StateInterface;
 use Bottledcode\DurablePhp\Task;
@@ -60,6 +59,8 @@
 use ReflectionFunction;
 use Withinboredom\Time\Unit;
 
+use function Bottledcode\DurablePhp\OrchestrationInstance;
+
 require_once __DIR__ . '/autoload.php';
 
 class Glue
@@ -193,7 +194,7 @@ private function startOrchestration(): void
     {
         if (!$this->target->toOrchestrationInstance()->executionId) {
             $this->target = StateId::fromInstance(
-                new OrchestrationInstance(
+                OrchestrationInstance(
                     $this->target->toOrchestrationInstance()->instanceId,
                     Uuid::uuid7()->toString(),
                 ),

src/Gateway/Graph/index.php

@@ -76,12 +76,13 @@ public function callActivity(string $name, array $args = [], ?RetryOptions $retr
         $identity = $this->newGuid();
 
         return $this->createFuture(
-            fn() => $this->taskController->fire(
-                AwaitResult::forEvent(
-                    StateId::fromInstance($this->id),
-                    WithActivity::forEvent($identity, ScheduleTask::forName($name, $args)),
+            fn()
+                => $this->taskController->fire(
+                    AwaitResult::forEvent(
+                        StateId::fromInstance($this->id),
+                        WithActivity::forEvent($identity, ScheduleTask::forName($name, $args)),
+                    ),
                 ),
-            ),
             function (Event $event, string $eventIdentity) use ($identity): array {
                 if (($event instanceof TaskCompleted || $event instanceof TaskFailed) &&
                     $eventIdentity === $identity->toString()) {
@@ -114,7 +115,7 @@ private function createFuture(
         ?string $identity = null,
     ): DurableFuture {
         $identity ??= $this->history->historicalTaskResults->getIdentity();
-        if (! $this->history->historicalTaskResults->hasSentIdentity($identity)) {
+        if (!$this->history->historicalTaskResults->hasSentIdentity($identity)) {
             $this->durableLogger->debug('Future requested for an unsent identity', [$identity]);
             [$eventId] = $onSent();
             $deferred = new DeferredFuture();
@@ -141,7 +142,12 @@ public function callActivityInline(Closure $activity): DurableFuture
         return $this->createFuture(function () use ($activity, $identity) {
             try {
                 $result = $activity();
-                $this->taskController->fire(WithOrchestration::forInstance(StateId::fromInstance($this->id), TaskCompleted::forId($identity->toString(), $result)));
+                $this->taskController->fire(
+                    WithOrchestration::forInstance(
+                        StateId::fromInstance($this->id),
+                        TaskCompleted::forId($identity->toString(), $result),
+                    ),
+                );
 
                 return [$identity];
             } catch (Throwable $exception) {
@@ -160,7 +166,8 @@ public function callActivityInline(Closure $activity): DurableFuture
                 return [$identity];
             }
         }, function (Event $event, string $eventIdentity) use ($identity): array {
-            if (($event instanceof TaskCompleted || $event instanceof TaskFailed) && $eventIdentity === $identity->toString()) {
+            if (($event instanceof TaskCompleted || $event instanceof TaskFailed) &&
+                $eventIdentity === $identity->toString()) {
                 return [$event, true];
             }
 
@@ -189,7 +196,10 @@ public function continueAsNew(array $args = []): never
 
         $this->history->restartAsNew($args);
         $this->taskController->fire(
-            WithOrchestration::forInstance(StateId::fromInstance($this->id), StartOrchestration::forInstance($this->id)),
+            WithOrchestration::forInstance(
+                StateId::fromInstance($this->id),
+                StartOrchestration::forInstance($this->id),
+            ),
         );
         throw new Unwind();
     }
@@ -204,12 +214,13 @@ public function createTimer(DateTimeImmutable|DateInterval $fireAt): DurableFutu
         $identity = sha1($fireAt->format('c'));
 
         return $this->createFuture(
-            fn() => $this->taskController->fire(
-                WithOrchestration::forInstance(
-                    StateId::fromInstance($this->id),
-                    WithDelay::forEvent($fireAt, RaiseEvent::forTimer($identity)),
+            fn()
+                => $this->taskController->fire(
+                    WithOrchestration::forInstance(
+                        StateId::fromInstance($this->id),
+                        WithDelay::forEvent($fireAt, RaiseEvent::forTimer($identity)),
+                    ),
                 ),
-            ),
             function (Event $event) use ($identity): array {
                 if ($event instanceof RaiseEvent && $event->eventName === $identity) {
                     return [$event, true];
@@ -300,13 +311,11 @@ public function createInterval(
         ?int $seconds = null,
         ?int $microseconds = null,
     ): DateInterval {
-        if (
-            empty(
-                array_filter(
-                    compact('years', 'months', 'weeks', 'days', 'hours', 'minutes', 'seconds', 'microseconds'),
-                )
+        if (empty(
+            array_filter(
+                compact('years', 'months', 'weeks', 'days', 'hours', 'minutes', 'seconds', 'microseconds'),
             )
-        ) {
+        )) {
             throw new LogicException('At least one interval part must be specified');
         }
 
@@ -361,7 +370,7 @@ public function isLockedOwned(EntityId $entityId): bool
     public function lockEntity(EntityId ...$entityId): EntityLock
     {
         $this->durableLogger->debug('Locking entities', ['entityId' => $entityId]);
-        if (! empty($this->history->locks ?? []) && ! $this->isReplaying()) {
+        if (!empty($this->history->locks ?? []) && !$this->isReplaying()) {
             throw new LogicException('Cannot lock an entity while holding locks');
         }
 
@@ -375,12 +384,11 @@ public function lockEntity(EntityId ...$entityId): EntityLock
             WithEntity::forInstance(current($entityId), RaiseEvent::forLockNotification($owner->id)),
         );
         $identity = $this->newGuid()->toString();
-        $future =
-            $this->createFuture(
-                fn() => $this->taskController->fire(WithLock::onEntity($owner, $event, ...$entityId)),
-                fn(Event $event, string $eventIdentity) => [$event, $identity === $eventIdentity],
-                $identity,
-            );
+        $future = $this->createFuture(
+            fn() => $this->taskController->fire(WithLock::onEntity($owner, $event, ...$entityId)),
+            fn(Event $event, string $eventIdentity) => [$event, $identity === $eventIdentity],
+            $identity,
+        );
         $this->waitOne($future);
 
         $this->history->locks = $entityId;
@@ -439,17 +447,17 @@ public function waitAll(DurableFuture ...$tasks): array
     /**
      * @template T
      *
-     * @param  class-string<T>  $className
+     * @param class-string<T> $className
      * @return T
      */
     public function createEntityProxy(string $className, ?EntityId $entityId = null): object
     {
         if ($entityId === null) {
-            $entityId = new EntityId($className, $this->newGuid());
+            $entityId = EntityId($className, $this->newGuid());
         }
 
         $class = new ReflectionClass($className);
-        if (! $class->isInterface()) {
+        if (!$class->isInterface()) {
             throw new LogicException('Only interfaces can be proxied');
         }
 
@@ -569,7 +577,7 @@ public function entityOp(string|EntityId $id, Closure $operation): mixed
         }
 
         $name = $type->getName();
-        if (! interface_exists($name)) {
+        if (!interface_exists($name)) {
             throw new LogicException('Unable to load interface: ' . $name);
         }
 
@@ -588,7 +596,7 @@ public function entityOp(string|EntityId $id, Closure $operation): mixed
             throw new LogicException('Did not call an operation');
         }
 
-        $entityId = $id instanceof EntityId ? $id : new EntityId($name, $id);
+        $entityId = $id instanceof EntityId ? $id : EntityId($name, $id);
 
         if ($returns) {
             return $this->waitOne($this->callEntity($entityId, $operationName, $arguments));

src/Glue/glue.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright ©2024 Robert Landers
  *
@@ -47,7 +48,7 @@ public function __construct(
         private HttpClient $client = new HttpClient(),
         private SpyProxy $spyProxy = new SpyProxy(),
     ) {
-        $this->apiHost = rtrim($this->apiHost, '/');
+        $this->apiHost = mb_rtrim($this->apiHost, '/');
     }
 
     #[Override]
@@ -56,7 +57,11 @@ public function cleanEntityStorage(): void {}
     #[Override]
     public function listEntities(EntityFilter $filter, int $page): Generator
     {
-        $req = new Request($this->apiHost . '/entities/filter/' . $page, 'POST', json_encode($filter, JSON_THROW_ON_ERROR));
+        $req = new Request(
+            $this->apiHost . '/entities/filter/' . $page,
+            'POST',
+            json_encode($filter, JSON_THROW_ON_ERROR),
+        );
         if ($this->userToken) {
             $req->setHeader('Authorization', 'Bearer ' . $this->userToken);
         }
@@ -82,7 +87,11 @@ public function signal(EntityId|string $entityId, Closure $signal): void
         } catch (Throwable) {
             // spies always throw
         }
-        $this->signalEntity(is_string($entityId) ? new EntityId($interfaceName, $entityId) : $entityId, $operationName, $arguments);
+        $this->signalEntity(
+            is_string($entityId) ? EntityId($interfaceName, $entityId) : $entityId,
+            $operationName,
+            $arguments,
+        );
     }
 
     #[Override]