Fast forward resolved/rejected promises with await

WyriHaximus · WyriHaximus · commit c30cebf0019f · 2022-01-14T12:58:03.000+01:00
This makes `await`ing an already resolved promise significantly faster. Ported from: #18
diff --git a/src/functions.php b/src/functions.php
@@ -51,18 +51,27 @@
 function await(PromiseInterface $promise)
 {
     $wait = true;
-    $resolved = null;
-    $exception = null;
+    $resolved = false;
     $rejected = false;
+    $resolvedValue = null;
+    $rejectedThrowable = null;
 
     $promise->then(
-        function ($c) use (&$resolved, &$wait) {
-            $resolved = $c;
+        function ($c) use (&$resolved, &$resolvedValue, &$wait) {
+            $resolvedValue = $c;
+            $resolved = true;
             $wait = false;
             Loop::stop();
         },
-        function ($error) use (&$exception, &$rejected, &$wait) {
-            $exception = $error;
+        function ($error) use (&$rejected, &$rejectedThrowable, &$wait) {
+            // promise is rejected with an unexpected value (Promise API v1 or v2 only)
+            if (!$error instanceof \Exception && !$error instanceof \Throwable) {
+                $error = new \UnexpectedValueException(
+                    'Promise rejected with unexpected value of type ' . (is_object($error) ? get_class($error) : gettype($error))
+                );
+            }
+
+            $rejectedThrowable = $error;
             $rejected = true;
             $wait = false;
             Loop::stop();
@@ -73,22 +82,23 @@ function ($error) use (&$exception, &$rejected, &$wait) {
     // argument does not show up in the stack trace in PHP 7+ only.
     $promise = null;
 
+    if ($rejected) {
+        throw $rejectedThrowable;
+    }
+
+    if ($resolved) {
+        return $resolvedValue;
+    }
+
     while ($wait) {
         Loop::run();
     }
 
     if ($rejected) {
-        // promise is rejected with an unexpected value (Promise API v1 or v2 only)
-        if (!$exception instanceof \Exception && !$exception instanceof \Throwable) {
-            $exception = new \UnexpectedValueException(
-                'Promise rejected with unexpected value of type ' . (is_object($exception) ? get_class($exception) : gettype($exception))
-            );
-        }
-
-        throw $exception;
+        throw $rejectedThrowable;
     }
 
-    return $resolved;
+    return $resolvedValue;
 }
 
 /**
diff --git a/tests/AwaitTest.php b/tests/AwaitTest.php
@@ -145,6 +145,13 @@ public function testAwaitShouldNotCreateAnyGarbageReferencesForPromiseRejectedWi
         $this->assertEquals(0, gc_collect_cycles());
     }
 
+    public function testAlreadyFulfilledPromiseShouldNotSuspendFiber()
+    {
+        for ($i = 0; $i < 6; $i++) {
+            $this->assertSame($i, React\Async\await(React\Promise\resolve($i)));
+        }
+    }
+
     public function setExpectedException($exception, $exceptionMessage = '', $exceptionCode = null)
     {
         if (method_exists($this, 'expectException')) {

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,13 @@ public function testAwaitShouldNotCreateAnyGarbageReferencesForPromiseRejectedWi`
`145`	`145`	`$this->assertEquals(0, gc_collect_cycles());`
`146`	`146`	`}`
`147`	`147`
	`148`	`+ public function testAlreadyFulfilledPromiseShouldNotSuspendFiber()`
	`149`	`+ {`
	`150`	`+ for ($i = 0; $i < 6; $i++) {`
	`151`	`+ $this->assertSame($i, React\Async\await(React\Promise\resolve($i)));`
	`152`	`+ }`
	`153`	`+ }`
	`154`	`+`
`148`	`155`	`public function setExpectedException($exception, $exceptionMessage = '', $exceptionCode = null)`
`149`	`156`	`{`
`150`	`157`	`if (method_exists($this, 'expectException')) {`