Refactor connection handling in Translator and RequestHandler to use inherited scopes for improved coroutine management

Author: EdmondDantes

examples/LoadMonitor.php

@@ -37,7 +37,7 @@ function loadMonitor(\Async\Coroutine $task, float $threshold = 1.00, int $check
             return;
         }
 
-        sleep($checkInterval);
+        Async\timeout($checkInterval * 1000);
         unset($output);
     }
 }

examples/RequestHandler.php

@@ -8,6 +8,7 @@
 final class RequestHandler
 {
     private Scope $scope;
+    private Scope $connectionScope;
 
     public function __construct()
     {
@@ -21,25 +22,28 @@ public function start(): void
     {
         $server = stream_socket_server('tcp://0.0.0.0:8080');
 
-        $this->scope->spawn(function() use ($server) {
+        spawn with $this->scope use($server) {
             try {
-                while ($client = stream_socket_accept($server)) {
-                    $this->scope->spawn($this->handleConnection(...), $client);
+                while (($client = stream_socket_accept($server)) !== false) {
+                    spawn with $this->connectionScope $this->handleConnection($client);
                 }
             } finally {
                 fclose($server);
+                $this->scope->cancel();
             }
-        });
+        };
     }
 
     private function handleConnection($client): void
     {
-        try {
-            $request = fread($client, 1024);
-            $response = "HTTP/1.1 200 OK\r\nContent-Length: 12\r\n\r\nHello World!";
-            fwrite($client, $response);
-        } finally {
-            fclose($client);
+        async inherit bounded $scope {
+            try {
+                $request = fread($client, 1024);
+                $response = "HTTP/1.1 200 OK\r\nContent-Length: 12\r\n\r\nHello World!";
+                fwrite($client, $response);
+            } finally {
+                fclose($client);
+            }
         }
     }
 }

examples/Translator/Translator.php

@@ -19,10 +19,12 @@
 final class Translator
 {
     private Scope $scope;
+    private Scope $connectionScope;
 
     public function __construct(private LongPoll $longPoll, private \TranslatorHttpClient $translatorClient)
     {
         $this->scope = new Scope();
+        $this->connectionScope = Scope::inherit($this->scope);
 
         // Define an exception handle for all child scopes
         // Handling exceptions from child **Scopes** ensures that errors in child coroutines do not propagate
@@ -40,19 +42,21 @@ public function start(): void
     private function run(): void
     {
         while (($socket = $this->longPoll->receive()) !== null) {
-            spawn with Scope::inherit($this->scope) $this->handleRequest($socket);
+            spawn with $this->connectionScope $this->handleRequest($socket);
         }
     }
 
     private function handleRequest(\Socket $socket): void
     {
-        try {
-            $this->handleLines($socket);
-        } catch (\Throwable $exception) {
-            $response = json_encode(['error' => $exception->getMessage(), 'code' => $exception->getCode()]);
-            socket_write($socket, $response);
-        } finally {
-            socket_close($socket);
+        async inherit bounded $scope {
+            try {
+                $this->handleLines($socket);
+            } catch (\Throwable $exception) {
+                $response = json_encode(['error' => $exception->getMessage(), 'code' => $exception->getCode()]);
+                socket_write($socket, $response);
+            } finally {
+                socket_close($socket);
+            }
         }
     }