Preserve original errno and previous exception when using happy eyeballs

Author: clue

src/HappyEyeBallsConnectionBuilder.php

@@ -143,7 +143,11 @@ public function resolve($type, $reject)
             }
 
             if ($that->hasBeenResolved() && $that->ipsCount === 0) {
-                $reject(new \RuntimeException($that->error()));
+                $reject(new \RuntimeException(
+                    $that->error(),
+                    0,
+                    $e
+                ));
             }
 
             // Exception already handled above, so don't throw an unhandled rejection here
@@ -201,7 +205,11 @@ public function check($resolve, $reject)
             if ($that->ipsCount === $that->failureCount) {
                 $that->cleanUp();
 
-                $reject(new \RuntimeException($that->error()));
+                $reject(new \RuntimeException(
+                    $that->error(),
+                    $e->getCode(),
+                    $e
+                ));
             }
         });
 

tests/HappyEyeBallsConnectionBuilderTest.php

@@ -62,7 +62,11 @@ public function testConnectWillRejectWhenBothDnsLookupsReject()
         });
 
         $this->assertInstanceOf('RuntimeException', $exception);
+        assert($exception instanceof \RuntimeException);
+
         $this->assertEquals('Connection to tcp://reactphp.org:80 failed during DNS lookup: DNS lookup error', $exception->getMessage());
+        $this->assertEquals(0, $exception->getCode());
+        $this->assertInstanceOf('RuntimeException', $exception->getPrevious());
     }
 
     public function testConnectWillRejectWhenBothDnsLookupsRejectWithDifferentMessages()
@@ -98,7 +102,11 @@ public function testConnectWillRejectWhenBothDnsLookupsRejectWithDifferentMessag
         });
 
         $this->assertInstanceOf('RuntimeException', $exception);
+        assert($exception instanceof \RuntimeException);
+
         $this->assertEquals('Connection to tcp://reactphp.org:80 failed during DNS lookup. Last error for IPv6: DNS6 error. Previous error for IPv4: DNS4 error', $exception->getMessage());
+        $this->assertEquals(0, $exception->getCode());
+        $this->assertInstanceOf('RuntimeException', $exception->getPrevious());
     }
 
     public function testConnectWillStartDelayTimerWhenIpv4ResolvesAndIpv6IsPending()
@@ -468,15 +476,22 @@ public function testConnectWillRejectWhenOnlyTcp6ConnectionRejectsAndCancelNextA
         $builder = new HappyEyeBallsConnectionBuilder($loop, $connector, $resolver, $uri, $host, $parts);
 
         $promise = $builder->connect();
-        $deferred->reject(new \RuntimeException('Connection refused'));
+        $deferred->reject(new \RuntimeException(
+            'Connection refused',
+            defined('SOCKET_ECONNREFUSED') ? SOCKET_ECONNREFUSED : 111
+        ));
 
         $exception = null;
         $promise->then(null, function ($e) use (&$exception) {
             $exception = $e;
         });
 
         $this->assertInstanceOf('RuntimeException', $exception);
+        assert($exception instanceof \RuntimeException);
+
         $this->assertEquals('Connection to tcp://reactphp.org:80 failed: Last error for IPv6: Connection refused. Previous error for IPv4: DNS failed', $exception->getMessage());
+        $this->assertEquals(defined('SOCKET_ECONNREFUSED') ? SOCKET_ECONNREFUSED : 111, $exception->getCode());
+        $this->assertInstanceOf('RuntimeException', $exception->getPrevious());
     }
 
     public function testConnectWillRejectWhenOnlyTcp4ConnectionRejectsAndWillNeverStartNextAttemptTimer()
@@ -504,15 +519,22 @@ public function testConnectWillRejectWhenOnlyTcp4ConnectionRejectsAndWillNeverSt
         $builder = new HappyEyeBallsConnectionBuilder($loop, $connector, $resolver, $uri, $host, $parts);
 
         $promise = $builder->connect();
-        $deferred->reject(new \RuntimeException('Connection refused'));
+        $deferred->reject(new \RuntimeException(
+            'Connection refused',
+            defined('SOCKET_ECONNREFUSED') ? SOCKET_ECONNREFUSED : 111
+        ));
 
         $exception = null;
         $promise->then(null, function ($e) use (&$exception) {
             $exception = $e;
         });
 
         $this->assertInstanceOf('RuntimeException', $exception);
+        assert($exception instanceof \RuntimeException);
+
         $this->assertEquals('Connection to tcp://reactphp.org:80 failed: Last error for IPv4: Connection refused. Previous error for IPv6: DNS failed', $exception->getMessage());
+        $this->assertEquals(defined('SOCKET_ECONNREFUSED') ? SOCKET_ECONNREFUSED : 111, $exception->getCode());
+        $this->assertInstanceOf('RuntimeException', $exception->getPrevious());
     }
 
     public function testConnectWillRejectWhenAllConnectionsRejectAndCancelNextAttemptTimerImmediately()
@@ -542,15 +564,22 @@ public function testConnectWillRejectWhenAllConnectionsRejectAndCancelNextAttemp
         $builder = new HappyEyeBallsConnectionBuilder($loop, $connector, $resolver, $uri, $host, $parts);
 
         $promise = $builder->connect();
-        $deferred->reject(new \RuntimeException('Connection refused'));
+        $deferred->reject(new \RuntimeException(
+            'Connection refused',
+            defined('SOCKET_ECONNREFUSED') ? SOCKET_ECONNREFUSED : 111
+        ));
 
         $exception = null;
         $promise->then(null, function ($e) use (&$exception) {
             $exception = $e;
         });
 
         $this->assertInstanceOf('RuntimeException', $exception);
+        assert($exception instanceof \RuntimeException);
+
         $this->assertEquals('Connection to tcp://reactphp.org:80 failed: Connection refused', $exception->getMessage());
+        $this->assertEquals(defined('SOCKET_ECONNREFUSED') ? SOCKET_ECONNREFUSED : 111, $exception->getCode());
+        $this->assertInstanceOf('RuntimeException', $exception->getPrevious());
     }
 
     public function testConnectWillRejectWithMessageWithoutHostnameWhenAllConnectionsRejectAndCancelNextAttemptTimerImmediately()