Report proxy connection issues

Author: clue

src/ProxyConnector.php

@@ -189,6 +189,8 @@ public function connect($uri)
             $stream->write("CONNECT " . $host . ":" . $port . " HTTP/1.1\r\nHost: " . $host . ":" . $port . "\r\n" . $auth . "\r\n");
 
             return $deferred->promise();
+        }, function (Exception $e) use ($proxyUri) {
+            throw new RuntimeException('Unable to connect to proxy (ECONNREFUSED)', defined('SOCKET_ECONNREFUSED') ? SOCKET_ECONNREFUSED : 111, $e);
         });
     }
 }

tests/FunctionalTest.php

@@ -28,6 +28,16 @@ public function setUp()
         $this->dnsConnector = new DnsConnector($this->tcpConnector, $resolver);
     }
 
+    public function testNonListeningSocketRejectsConnection()
+    {
+        $proxy = new ProxyConnector('127.0.0.1:9999', $this->dnsConnector);
+
+        $promise = $proxy->connect('google.com:80');
+
+        $this->setExpectedException('RuntimeException', 'Unable to connect to proxy', SOCKET_ECONNREFUSED);
+        Block\await($promise, $this->loop, 3.0);
+    }
+
     public function testPlainGoogleDoesNotAcceptConnectMethod()
     {
         $proxy = new ProxyConnector('google.com', $this->dnsConnector);

tests/ProxyConnectorTest.php

@@ -162,6 +162,18 @@ public function testRejectsUriWithNonTcpScheme()
         $promise->then(null, $this->expectCallableOnce());
     }
 
+    public function testRejectsIfConnectorRejects()
+    {
+        $promise = \React\Promise\reject(new \RuntimeException());
+        $this->connector->expects($this->once())->method('connect')->willReturn($promise);
+
+        $proxy = new ProxyConnector('proxy.example.com', $this->connector);
+
+        $promise = $proxy->connect('google.com:80');
+
+        $promise->then(null, $this->expectCallableOnce());
+    }
+
     public function testRejectsAndClosesIfStreamWritesNonHttp()
     {
         $stream = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('close', 'write'))->getMock();