From 2cbff814d495a4cb060793570a5e2607579625a5 Mon Sep 17 00:00:00 2001
From: Benoit Viguier <benoit.viguier@m6.fr>
Date: Wed, 24 Oct 2018 23:01:21 +0200
Subject: [PATCH] Fixed unwatched generators issue with Synchronous Tornado
 adapter

---
 src/Adapter/Tornado/SynchronousEventLoop.php | 76 ++++++++++----------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/src/Adapter/Tornado/SynchronousEventLoop.php b/src/Adapter/Tornado/SynchronousEventLoop.php
index f0d0581..1861464 100644
--- a/src/Adapter/Tornado/SynchronousEventLoop.php
+++ b/src/Adapter/Tornado/SynchronousEventLoop.php
@@ -7,22 +7,33 @@
 
 class SynchronousEventLoop implements \M6Web\Tornado\EventLoop
 {
+    /**
+     * @var \Throwable[]
+     */
+    private $asyncThrowables = [];
+
     /**
      * {@inheritdoc}
      */
     public function wait(Promise $promise)
     {
-        // Is it a fulfilled promise
-        if (property_exists($promise, 'value')) {
-            return $promise->value;
+        // If there are some uncaught exceptions, throw the first one.
+        if ($throwable = reset($this->asyncThrowables)) {
+            throw $throwable;
         }
 
-        // Is it a rejected promise?
-        if (property_exists($promise, 'exception')) {
-            throw $promise->exception;
-        }
+        $promise = Internal\PendingPromise::downcast($promise);
+        $result = null;
+        $promise->addCallbacks(
+            function ($value) use (&$result) {
+                $result = $value;
+            },
+            function (\Throwable $throwable) {
+                throw $throwable;
+            }
+        );
 
-        throw new \LogicException('Cannot wait a promise not created from the same EventLoop');
+        return $result;
     }
 
     /**
@@ -32,29 +43,26 @@ public function async(\Generator $generator): Promise
     {
         try {
             while ($generator->valid()) {
-                $blockingPromise = $generator->current();
-
-                if (!$blockingPromise instanceof Promise) {
-                    throw new \Error('Asynchronous function is yielding a ['.gettype($blockingPromise).'] instead of a Promise.');
-                }
-
-                // Resolves blocking promise and forwards result to the generator
-                $blockingPromiseValue = null;
-                $blockingPromiseException = null;
-                try {
-                    $blockingPromiseValue = $this->wait($blockingPromise);
-                } catch (\Throwable $exception) {
-                    $blockingPromiseException = $exception;
-                }
-                if ($blockingPromiseException) {
-                    $generator->throw($blockingPromiseException);
-                } else {
-                    $generator->send($blockingPromiseValue);
-                }
+                Internal\PendingPromise::fromGenerator($generator)->addCallbacks(
+                    function ($value) use ($generator) {
+                        $generator->send($value);
+                    },
+                    function (\Throwable $throwable) use ($generator) {
+                        // Since this exception is caught, remove it from the list
+                        $index = array_search($throwable, $this->asyncThrowables, true);
+                        if ($index !== false) {
+                            unset($this->asyncThrowables[$index]);
+                        }
+                        $generator->throw($throwable);
+                    }
+                );
             }
 
             return $this->promiseFulfilled($generator->getReturn());
         } catch (\Throwable $exception) {
+            // Will have to check that this exception is caught later…
+            $this->asyncThrowables[] = $exception;
+
             return $this->promiseRejected($exception);
         }
     }
@@ -101,12 +109,7 @@ public function promiseRace(Promise ...$promises): Promise
      */
     public function promiseFulfilled($value): Promise
     {
-        $promise = new class() implements Promise {
-            public $value;
-        };
-        $promise->value = $value;
-
-        return $promise;
+        return (new Internal\PendingPromise())->resolve($value);
     }
 
     /**
@@ -114,12 +117,7 @@ public function promiseFulfilled($value): Promise
      */
     public function promiseRejected(\Throwable $throwable): Promise
     {
-        $promise = new class() implements Promise {
-            public $exception;
-        };
-        $promise->exception = $throwable;
-
-        return $promise;
+        return (new Internal\PendingPromise())->reject($throwable);
     }
 
     /**