Update for CoroutineGen!

Author: VennDev

src/vennv/vapm/CoroutineGen.php

@@ -80,19 +80,22 @@ final class CoroutineGen implements CoroutineGenInterface
      */
     public static function runBlocking(mixed ...$coroutines): void
     {
-        foreach ($coroutines as $coroutine) {
-            if (is_callable($coroutine)) $coroutine = call_user_func($coroutine);
-
-            if ($coroutine instanceof CoroutineScope) {
-                self::schedule($coroutine);
-            } else if ($coroutine instanceof Generator) {
-                self::schedule(new ChildCoroutine($coroutine));
-            } else {
-                call_user_func(fn() => $coroutine);
+        new Async(function () use ($coroutines): void {
+            foreach ($coroutines as $coroutine) {
+                if (is_callable($coroutine)) $coroutine = call_user_func($coroutine);
+
+                if ($coroutine instanceof CoroutineScope) {
+                    self::schedule($coroutine);
+                } else if ($coroutine instanceof Generator) {
+                    self::schedule(new ChildCoroutine($coroutine));
+                } else {
+                    call_user_func(fn() => $coroutine);
+                }
+                FiberManager::wait();
             }
-        }
 
-        self::run();
+            self::run();
+        });
     }
 
     /**
@@ -151,19 +154,26 @@ private static function schedule(ChildCoroutine|CoroutineScope $childCoroutine):
      */
     private static function run(): void
     {
-        while (self::$taskQueue?->isEmpty() === false) {
-            $coroutine = self::$taskQueue->dequeue();
-
-            if ($coroutine instanceof ChildCoroutine) {
-                $coroutine->run();
-                if (!$coroutine->isFinished()) self::schedule($coroutine);
-            }
-
-            if ($coroutine instanceof CoroutineScope) {
-                $coroutine->run();
-                if (!$coroutine->isFinished()) self::schedule($coroutine);
+        new Async(function (): void {
+            try {
+                while (self::$taskQueue?->isEmpty() === false) {
+                    $coroutine = self::$taskQueue->dequeue();
+
+                    if ($coroutine instanceof ChildCoroutine) {
+                        $coroutine->run();
+                        if (!$coroutine->isFinished()) self::schedule($coroutine);
+                    }
+
+                    if ($coroutine instanceof CoroutineScope) {
+                        Async::await($coroutine->run());
+                        if (!$coroutine->isFinished()) self::schedule($coroutine);
+                    }
+                    FiberManager::wait();
+                }
+            } catch (Throwable $e) {
+                echo $e->getMessage();
             }
-        }
+        });
     }
 
 }

src/vennv/vapm/CoroutineScope.php

@@ -64,7 +64,7 @@ public function launch(mixed ...$callbacks): void;
     /**
      * This function runs the coroutine.
      */
-    public function run(): void;
+    public function run(): Async;
 
 }
 
@@ -127,25 +127,27 @@ public function launch(mixed ...$callbacks): void
      * @throws ReflectionException
      * @throws Throwable
      */
-    public function run(): void
+    public function run(): Async
     {
-        if (self::$taskQueue?->isEmpty() === false && !self::$cancelled) {
-            $coroutine = self::$taskQueue->dequeue();
+        return new Async(function (): void {
+            if (self::$taskQueue?->isEmpty() === false && !self::$cancelled) {
+                $coroutine = self::$taskQueue->dequeue();
 
-            if ($coroutine instanceof ChildCoroutine) {
-                $coroutine->run();
+                if ($coroutine instanceof ChildCoroutine) {
+                    $coroutine->run();
 
-                if (!$coroutine->isFinished()) self::schedule($coroutine);
-            }
+                    if (!$coroutine->isFinished()) self::schedule($coroutine);
+                }
 
-            if ($coroutine instanceof CoroutineScope) {
-                $coroutine->run();
+                if ($coroutine instanceof CoroutineScope) {
+                    Async::await($coroutine->run());
 
-                if (!$coroutine->isFinished()) self::schedule($coroutine);
+                    if (!$coroutine->isFinished()) self::schedule($coroutine);
+                }
+            } else {
+                self::$finished = true;
             }
-        } else {
-            self::$finished = true;
-        }
+        });
     }
 
     private static function schedule(ChildCoroutine|CoroutineScope $childCoroutine): void