fix(worker): correct variable naming conflict in Manager::emitCommand

Author: cclilshy

src/Worker/Manager.php

@@ -77,12 +77,12 @@ public function add(Worker $worker): void
      *
      * @return void
      */
-    public function emitCommand(Command $command, string $name, int $index): void
+    public function emitCommand(Command $command, string $workerName, int $index): void
     {
         switch ($command->name) {
             case BaseWorker::COMMAND_RELOAD:
-                $name = $command->arguments['name'] ?? null;
-                $this->reload($name);
+                $workerName = $command->arguments['name'] ?? null;
+                $this->reload($workerName);
                 break;
 
             case Manager::COMMAND_COMMAND_TO_WORKER:
@@ -99,27 +99,27 @@ public function emitCommand(Command $command, string $name, int $index): void
 
             case Manager::COMMAND_REFRESH_METADATA:
                 $metadata = $command->arguments['metadata'];
-                if (isset($this->process[$name][$index])) {
-                    $this->process[$name][$index]->metadata = $metadata;
+                if (isset($this->process[$workerName][$index])) {
+                    $this->process[$workerName][$index]->metadata = $metadata;
                 }
                 break;
 
             case Manager::COMMAND_SUPERVISOR_METADATA:
                 $result = [];
                 foreach ($this->workers as $worker) {
-                    $name = $worker->name;
-                    $result[$name] = [];
+                    $_workerName = $worker->name;
+                    $result[$_workerName] = [];
 
-                    foreach ($this->process as $workerName => $processes) {
+                    foreach ($this->process as $processes) {
                         foreach ($processes as $index => $process) {
-                            $result[$name][$workerName][$index] = $process->metadata;
+                            $result[$_workerName][$index] = $process->metadata;
                         }
                     }
                 }
 
                 $id = $command->arguments['id'];
                 $command = Command::make(Manager::COMMAND_SUPERVISOR_METADATA, ['metadata' => $result, 'id' => $id]);
-                $this->sendToWorker($command, $name, $index);
+                $this->sendToWorker($command, $workerName, $index);
                 break;
         }
     }

src/Worker/Process.php

@@ -100,13 +100,14 @@ private function spawnParent(): void
         });
 
         $this->parentStream->watchRead(fn () => go(function () {
-            $content = $this->parentStream->read(1024);
-            foreach ($this->zx7e->fill($content) as $string) {
-                $this->manager->emitCommand(Command::fromString($string), $this->worker->name, $this->index);
-            }
+            while ($content = $this->parentStream->read(1024)) {
+                foreach ($this->zx7e->fill($content) as $string) {
+                    $this->manager->emitCommand(Command::fromString($string), $this->worker->name, $this->index);
+                }
 
-            if ($this->parentStream->eof()) {
-                $this->parentStream->close();
+                if ($this->parentStream->eof()) {
+                    $this->parentStream->close();
+                }
             }
         }));
 
@@ -140,7 +141,7 @@ public function reload(): void
      */
     public function terminate(): void
     {
-        Scheduler::terminate($this->guard)->resolve();
+        Scheduler::terminate($this->guard)->unwrap();
 
         try {
             $this->send(Command::make(BaseWorker::COMMAND_TERMINATE));
@@ -206,33 +207,34 @@ private static function spawnChild(BaseWorker $worker, Stream $childStream): voi
 
         $childZx7e = new Zx7e();
         $childStream->watchRead(static fn () => go(static function () use ($worker, $childStream, &$childZx7e) {
-            $content = $childStream->read(1024);
-            foreach ($childZx7e->fill($content) as $string) {
-                $command = Command::fromString($string);
-                switch ($command->name) {
-                    case BaseWorker::COMMAND_RELOAD:
-                        $worker->onReload();
-                        break;
-
-                    case BaseWorker::COMMAND_TERMINATE:
-                        $worker->onTerminate();
-                        break;
-
-                    case Manager::COMMAND_SUPERVISOR_METADATA:
-                        $id = $command->arguments['id'];
-                        if ($owner = $worker->subs[$id] ?? null) {
-                            unset($worker->subs[$id]);
-                            Scheduler::resume($owner, $command->arguments['metadata']);
-                        }
-                        break;
-
-                    default:
-                        $worker->onCommand($command);
+            while ($content = $childStream->read(1024)) {
+                foreach ($childZx7e->fill($content) as $string) {
+                    $command = Command::fromString($string);
+                    switch ($command->name) {
+                        case BaseWorker::COMMAND_RELOAD:
+                            $worker->onReload();
+                            break;
+
+                        case BaseWorker::COMMAND_TERMINATE:
+                            $worker->onTerminate();
+                            break;
+
+                        case Manager::COMMAND_SUPERVISOR_METADATA:
+                            $id = $command->arguments['id'];
+                            if ($owner = $worker->subs[$id] ?? null) {
+                                unset($worker->subs[$id]);
+                                Scheduler::resume($owner, $command->arguments['metadata']);
+                            }
+                            break;
+
+                        default:
+                            $worker->onCommand($command);
+                    }
                 }
-            }
 
-            if ($childStream->eof()) {
-                exit(0);
+                if ($childStream->eof()) {
+                    exit(0);
+                }
             }
         }));