Use socket error codes for connection rejections

Author: clue

src/ProxyConnector.php

@@ -128,7 +128,7 @@ public function connect($uri)
 
         return $this->connector->connect($proxyUri)->then(function (ConnectionInterface $stream) use ($host, $port, $auth) {
             $deferred = new Deferred(function ($_, $reject) use ($stream) {
-                $reject(new RuntimeException('Operation canceled while waiting for response from proxy'));
+                $reject(new RuntimeException('Connection canceled while waiting for response from proxy (ECONNABORTED)', defined('SOCKET_ECONNABORTED') ? SOCKET_ECONNABORTED : 103));
                 $stream->close();
             });
 
@@ -146,14 +146,14 @@ public function connect($uri)
                     try {
                         $response = Psr7\parse_response(substr($buffer, 0, $pos));
                     } catch (Exception $e) {
-                        $deferred->reject(new RuntimeException('Invalid response received from proxy: ' . $e->getMessage(), 0, $e));
+                        $deferred->reject(new RuntimeException('Invalid response received from proxy (EBADMSG)', defined('SOCKET_EBADMSG') ? SOCKET_EBADMSG: 71, $e));
                         $stream->close();
                         return;
                     }
 
                     // status must be 2xx
                     if ($response->getStatusCode() < 200 || $response->getStatusCode() >= 300) {
-                        $deferred->reject(new RuntimeException('Proxy rejected with HTTP error code: ' . $response->getStatusCode() . ' ' . $response->getReasonPhrase(), $response->getStatusCode()));
+                        $deferred->reject(new RuntimeException('Proxy refused connection with HTTP error code ' . $response->getStatusCode() . ' (' . $response->getReasonPhrase() . ') (ECONNREFUSED)', defined('SOCKET_ECONNREFUSED') ? SOCKET_ECONNREFUSED : 111));
                         $stream->close();
                         return;
                     }
@@ -172,18 +172,18 @@ public function connect($uri)
 
                 // stop buffering when 8 KiB have been read
                 if (isset($buffer[8192])) {
-                    $deferred->reject(new RuntimeException('Proxy must not send more than 8 KiB of headers'));
+                    $deferred->reject(new RuntimeException('Proxy must not send more than 8 KiB of headers (EMSGSIZE)', defined('SOCKET_EMSGSIZE') ? SOCKET_EMSGSIZE : 90));
                     $stream->close();
                 }
             };
             $stream->on('data', $fn);
 
             $stream->on('error', function (Exception $e) use ($deferred) {
-                $deferred->reject(new RuntimeException('Stream error while waiting for response from proxy', 0, $e));
+                $deferred->reject(new RuntimeException('Stream error while waiting for response from proxy (EIO)', defined('SOCKET_EIO') ? SOCKET_EIO : 5, $e));
             });
 
             $stream->on('close', function () use ($deferred) {
-                $deferred->reject(new RuntimeException('Connection to proxy lost while waiting for response'));
+                $deferred->reject(new RuntimeException('Connection to proxy lost while waiting for response (ECONNRESET)', defined('SOCKET_ECONNRESET') ? SOCKET_ECONNRESET : 104));
             });
 
             $stream->write("CONNECT " . $host . ":" . $port . " HTTP/1.1\r\nHost: " . $host . ":" . $port . "\r\n" . $auth . "\r\n");

tests/AbstractTestCase.php

@@ -37,6 +37,20 @@ protected function expectCallableOnceWith($value)
         return $mock;
     }
 
+    protected function expectCallableOnceWithExceptionCode($code)
+    {
+        $mock = $this->createCallableMock();
+        $mock
+            ->expects($this->once())
+            ->method('__invoke')
+            ->with($this->callback(function ($e) use ($code) {
+                return $e->getCode() === $code;
+            }));
+
+        return $mock;
+    }
+
+
     protected function expectCallableOnceParameter($type)
     {
         $mock = $this->createCallableMock();

tests/FunctionalTest.php

@@ -44,7 +44,7 @@ public function testPlainGoogleDoesNotAcceptConnectMethod()
 
         $promise = $proxy->connect('google.com:80');
 
-        $this->setExpectedException('RuntimeException', 'Method Not Allowed', 405);
+        $this->setExpectedException('RuntimeException', '405 (Method Not Allowed)', SOCKET_ECONNREFUSED);
         Block\await($promise, $this->loop, 3.0);
     }
 
@@ -59,7 +59,7 @@ public function testSecureGoogleDoesNotAcceptConnectMethod()
 
         $promise = $proxy->connect('google.com:80');
 
-        $this->setExpectedException('RuntimeException', 'Method Not Allowed', 405);
+        $this->setExpectedException('RuntimeException', '405 (Method Not Allowed)', SOCKET_ECONNREFUSED);
         Block\await($promise, $this->loop, 3.0);
     }
 
@@ -69,7 +69,7 @@ public function testSecureGoogleDoesNotAcceptPlainStream()
 
         $promise = $proxy->connect('google.com:80');
 
-        $this->setExpectedException('RuntimeException', 'Connection to proxy lost');
+        $this->setExpectedException('RuntimeException', 'Connection to proxy lost', SOCKET_ECONNRESET);
         Block\await($promise, $this->loop, 3.0);
     }
 }

tests/ProxyConnectorTest.php

@@ -188,7 +188,7 @@ public function testRejectsAndClosesIfStreamWritesNonHttp()
         $stream->expects($this->once())->method('close');
         $stream->emit('data', array("invalid\r\n\r\n"));
 
-        $promise->then(null, $this->expectCallableOnce());
+        $promise->then(null, $this->expectCallableOnceWithExceptionCode(SOCKET_EBADMSG));
     }
 
     public function testRejectsAndClosesIfStreamWritesTooMuchData()
@@ -205,7 +205,7 @@ public function testRejectsAndClosesIfStreamWritesTooMuchData()
         $stream->expects($this->once())->method('close');
         $stream->emit('data', array(str_repeat('*', 100000)));
 
-        $promise->then(null, $this->expectCallableOnce());
+        $promise->then(null, $this->expectCallableOnceWithExceptionCode(SOCKET_EMSGSIZE));
     }
 
     public function testRejectsAndClosesIfStreamReturnsNonSuccess()
@@ -222,7 +222,7 @@ public function testRejectsAndClosesIfStreamReturnsNonSuccess()
         $stream->expects($this->once())->method('close');
         $stream->emit('data', array("HTTP/1.1 403 Not allowed\r\n\r\n"));
 
-        $promise->then(null, $this->expectCallableOnce());
+        $promise->then(null, $this->expectCallableOnceWithExceptionCode(SOCKET_ECONNREFUSED));
     }
 
     public function testResolvesIfStreamReturnsSuccess()
@@ -280,6 +280,6 @@ public function testCancelPromiseWillCloseOpenConnectionAndReject()
 
         $promise->cancel();
 
-        $promise->then(null, $this->expectCallableOnce());
+        $promise->then(null, $this->expectCallableOnceWithExceptionCode(SOCKET_ECONNABORTED));
     }
 }