Update tickTime and replay on batch only

Author: wolfy-j

src/Internal/ServiceContainer.php

@@ -107,6 +107,7 @@ final class ServiceContainer
 
     /**
      * @param LoopInterface $loop
+     * @param EnvironmentInterface $env
      * @param ClientInterface $client
      * @param ReaderInterface $reader
      * @param QueueInterface $queue
@@ -115,20 +116,21 @@ final class ServiceContainer
      */
     public function __construct(
         LoopInterface $loop,
+        EnvironmentInterface $env,
         ClientInterface $client,
         ReaderInterface $reader,
         QueueInterface $queue,
         MarshallerInterface $marshaller,
         DataConverterInterface $dataConverter
     ) {
+        $this->env = $env;
         $this->loop = $loop;
         $this->client = $client;
         $this->reader = $reader;
         $this->queue = $queue;
         $this->marshaller = $marshaller;
         $this->dataConverter = $dataConverter;
 
-        $this->env = new Environment();
         $this->workflows = new WorkflowCollection();
         $this->activities = new ActivityCollection();
         $this->running = new ProcessCollection($client);
@@ -145,6 +147,7 @@ public static function fromWorker(WorkerFactory $worker): self
     {
         return new self(
             $worker,
+            $worker->getEnviroment(),
             $worker->getClient(),
             $worker->getReader(),
             $worker->getQueue(),

src/Worker/Worker.php

@@ -90,8 +90,6 @@ public function getOptions(): WorkerOptions
      */
     public function dispatch(RequestInterface $request, array $headers): PromiseInterface
     {
-        $this->services->env->update($headers);
-
         return $this->router->dispatch($request, $headers);
     }
 

src/WorkerFactory.php

@@ -25,6 +25,8 @@
 use Temporal\Internal\Marshaller\Marshaller;
 use Temporal\Internal\Marshaller\MarshallerInterface;
 use Temporal\Internal\ServiceContainer;
+use Temporal\Worker\Environment\Environment;
+use Temporal\Worker\Environment\EnvironmentInterface;
 use Temporal\Worker\Transport\Codec\CodecInterface;
 use Temporal\Internal\Events\EventEmitterTrait;
 use Temporal\Internal\Queue\ArrayQueue;
@@ -52,7 +54,7 @@
 
 /**
  * WorkerFactory is primary entry point for the temporal application. This class is responsible for the communication
- * with parent RoadRunnner process and can be used to create taskQueue workflow and activity workers.
+ * with parent RoadRunner process and can be used to create taskQueue workflow and activity workers.
  *
  * <code>
  * $factory = WorkerFactory::create();
@@ -150,6 +152,11 @@ final class WorkerFactory implements WorkerFactoryInterface, LoopInterface
      */
     private MarshallerInterface $marshaller;
 
+    /**
+     * @var EnvironmentInterface
+     */
+    private EnvironmentInterface $env;
+
     /**
      * @param DataConverterInterface $dataConverter
      * @param RPCConnectionInterface $rpc
@@ -235,6 +242,14 @@ public function getMarshaller(): MarshallerInterface
         return $this->marshaller;
     }
 
+    /**
+     * @return EnvironmentInterface
+     */
+    public function getEnviroment(): EnvironmentInterface
+    {
+        return $this->env;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -277,6 +292,7 @@ private function boot(): void
         $this->responses = $this->createQueue();
         $this->client = $this->createClient();
         $this->server = $this->createServer();
+        $this->env = new Environment();
     }
 
     /**
@@ -375,6 +391,7 @@ private function createCodec(): CodecInterface
     private function dispatch(string $messages, array $headers): string
     {
         $commands = $this->codec->decode($messages);
+        $this->env->update($headers);
 
         foreach ($commands as $command) {
             if ($command instanceof RequestInterface) {