Use ECONNRESET and EIO error codes for connection issues

Author: clue

src/Client.php

@@ -185,6 +185,14 @@ public function handleConnectedSocks(ConnectionInterface $stream, $host, $port)
         $reader = new StreamReader();
         $stream->on('data', array($reader, 'write'));
 
+        $stream->on('error', $onError = function (Exception $e) use ($deferred) {
+            $deferred->reject(new RuntimeException('Stream error while waiting for response from proxy (EIO)', defined('SOCKET_EIO') ? SOCKET_EIO : 5, $e));
+        });
+
+        $stream->on('close', $onClose = function () use ($deferred) {
+            $deferred->reject(new RuntimeException('Connection to proxy lost while waiting for response (ECONNRESET)', defined('SOCKET_ECONNRESET') ? SOCKET_ECONNRESET : 104));
+        });
+
         if ($this->protocolVersion === '5') {
             $promise = $this->handleSocks5($stream, $host, $port, $reader);
         } else {
@@ -196,26 +204,21 @@ public function handleConnectedSocks(ConnectionInterface $stream, $host, $port)
             $deferred->reject(new Exception('Unable to communicate...', 0, $error));
         });
 
-        $deferred->promise()->then(
-            function (ConnectionInterface $stream) use ($reader) {
-                $stream->removeAllListeners('end');
-
+        return $deferred->promise()->then(
+            function (ConnectionInterface $stream) use ($reader, $onError, $onClose) {
                 $stream->removeListener('data', array($reader, 'write'));
+                $stream->removeListener('error', $onError);
+                $stream->removeListener('close', $onClose);
 
                 return $stream;
             },
-            function ($error) use ($stream) {
+            function ($error) use ($stream, $onClose) {
+                $stream->removeListener('close', $onClose);
                 $stream->close();
 
-                return $error;
+                throw $error;
             }
         );
-
-        $stream->on('end', function () use ($stream, $deferred) {
-            $deferred->reject(new Exception('Premature end while establishing socks session'));
-        });
-
-        return $deferred->promise();
     }
 
     private function handleSocks4(ConnectionInterface $stream, $host, $port, StreamReader $reader)

tests/ClientTest.php

@@ -122,7 +122,7 @@ public function testCreateWithInvalidPortDoesNotConnect()
 
     public function testConnectorRejectsWillRejectConnection()
     {
-        $promise = \React\Promise\Reject(new RuntimeException());
+        $promise = \React\Promise\reject(new RuntimeException());
 
         $this->connector->expects($this->once())->method('connect')->with('127.0.0.1:1080?hostname=google.com')->willReturn($promise);
 
@@ -159,4 +159,34 @@ public function testCancelConnectionDuringSessionWillCloseStream()
 
         $promise->then(null, $this->expectCallableOnceWithExceptionCode(SOCKET_ECONNABORTED));
     }
+
+    public function testEmitConnectionCloseDuringSessionWillRejectConnection()
+    {
+        $stream = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('write', 'close'))->getMock();
+
+        $promise = \React\Promise\resolve($stream);
+
+        $this->connector->expects($this->once())->method('connect')->with('127.0.0.1:1080?hostname=google.com')->willReturn($promise);
+
+        $promise = $this->client->connect('google.com:80');
+
+        $stream->emit('close');
+
+        $promise->then(null, $this->expectCallableOnceWithExceptionCode(SOCKET_ECONNRESET));
+    }
+
+    public function testEmitConnectionErrorDuringSessionWillRejectConnection()
+    {
+        $stream = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(array('write', 'close'))->getMock();
+
+        $promise = \React\Promise\resolve($stream);
+
+        $this->connector->expects($this->once())->method('connect')->with('127.0.0.1:1080?hostname=google.com')->willReturn($promise);
+
+        $promise = $this->client->connect('google.com:80');
+
+        $stream->emit('error', array(new RuntimeException()));
+
+        $promise->then(null, $this->expectCallableOnceWithExceptionCode(SOCKET_EIO));
+    }
 }