Add timeout handling

Author: clue

README.md

@@ -295,6 +295,25 @@ $connector->connect('localhost:80')->then(function (ConnectionInterface $connect
 });
 ```
 
+By default, the `tcp://` and `tls://` URI schemes will use timeout value that
+repects your `default_socket_timeout` ini setting (which defaults to 60s).
+If you want a custom timeout value, you can simply pass this like this:
+
+```php
+$connector = new Connector($loop, array(
+    'timeout' => 10.0
+));
+```
+
+Similarly, if you do not want to apply a timeout at all and let the operating
+system handle this, you can pass a boolean flag like this:
+
+```php
+$connector = new Connector($loop, array(
+    'timeout' => false
+));
+```
+
 By default, the `Connector` supports the `tcp://`, `tls://` and `unix://`
 URI schemes. If you want to explicitly prohibit any of these, you can simply
 pass boolean flags like this:
@@ -357,9 +376,11 @@ $unix = new UnixConnector($loop);
 
 $connector = new Connector($loop, array(
     'tcp' => $tcp,
-    'dns' => false,
     'tls' => $tls,
     'unix' => $unix,
+
+    'dns' => false,
+    'timeout' => false,
 ));
 
 $connector->connect('google.com:80')->then(function (ConnectionInterface $connection) {
@@ -377,6 +398,8 @@ $connector->connect('google.com:80')->then(function (ConnectionInterface $connec
   TCP/IP connection before enabling secure TLS mode. If you want to use a custom
   underlying `tcp://` connector for secure TLS connections only, you may
   explicitly pass a `tls://` connector like above instead.
+  Internally, the `tcp://` and `tls://` connectors will always be wrapped by
+  `TimeoutConnector`, unless you disable timeouts like in the above example.
 
 ## Advanced Usage
 

src/Connector.php

@@ -32,11 +32,17 @@ public function __construct(LoopInterface $loop, array $options = array())
         // apply default options if not explicitly given
         $options += array(
             'tcp' => true,
-            'dns' => true,
             'tls' => true,
             'unix' => true,
+
+            'dns' => true,
+            'timeout' => true,
         );
 
+        if ($options['timeout'] === true) {
+            $options['timeout'] = (float)ini_get("default_socket_timeout");
+        }
+
         if ($options['tcp'] instanceof ConnectorInterface) {
             $tcp = $options['tcp'];
         } else {
@@ -61,7 +67,17 @@ public function __construct(LoopInterface $loop, array $options = array())
         }
 
         if ($options['tcp'] !== false) {
-            $this->connectors['tcp'] = $tcp;
+            $options['tcp'] = $tcp;
+
+            if ($options['timeout'] !== false) {
+                $options['tcp'] = new TimeoutConnector(
+                    $options['tcp'],
+                    $options['timeout'],
+                    $loop
+                );
+            }
+
+            $this->connectors['tcp'] = $options['tcp'];
         }
 
         if ($options['tls'] !== false) {
@@ -72,6 +88,15 @@ public function __construct(LoopInterface $loop, array $options = array())
                     is_array($options['tls']) ? $options['tls'] : array()
                 );
             }
+
+            if ($options['timeout'] !== false) {
+                $options['tls'] = new TimeoutConnector(
+                    $options['tls'],
+                    $options['timeout'],
+                    $loop
+                );
+            }
+
             $this->connectors['tls'] = $options['tls'];
         }
 

tests/ConnectorTest.php

@@ -11,8 +11,9 @@ public function testConnectorUsesTcpAsDefaultScheme()
     {
         $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
 
+        $promise = new Promise(function () { });
         $tcp = $this->getMockBuilder('React\SocketClient\ConnectorInterface')->getMock();
-        $tcp->expects($this->once())->method('connect')->with('127.0.0.1:80');
+        $tcp->expects($this->once())->method('connect')->with('127.0.0.1:80')->willReturn($promise);
 
         $connector = new Connector($loop, array(
             'tcp' => $tcp
@@ -25,8 +26,9 @@ public function testConnectorPassedThroughHostnameIfDnsIsDisabled()
     {
         $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
 
+        $promise = new Promise(function () { });
         $tcp = $this->getMockBuilder('React\SocketClient\ConnectorInterface')->getMock();
-        $tcp->expects($this->once())->method('connect')->with('tcp://google.com:80');
+        $tcp->expects($this->once())->method('connect')->with('tcp://google.com:80')->willReturn($promise);
 
         $connector = new Connector($loop, array(
             'tcp' => $tcp,
@@ -112,8 +114,9 @@ public function testConnectorUsesResolvedHostnameIfDnsIsUsed()
         $resolver = $this->getMockBuilder('React\Dns\Resolver\Resolver')->disableOriginalConstructor()->getMock();
         $resolver->expects($this->once())->method('resolve')->with('google.com')->willReturn($promise);
 
+        $promise = new Promise(function () { });
         $tcp = $this->getMockBuilder('React\SocketClient\ConnectorInterface')->getMock();
-        $tcp->expects($this->once())->method('connect')->with('tcp://127.0.0.1:80?hostname=google.com');
+        $tcp->expects($this->once())->method('connect')->with('tcp://127.0.0.1:80?hostname=google.com')->willReturn($promise);
 
         $connector = new Connector($loop, array(
             'tcp' => $tcp,

tests/IntegrationTest.php

@@ -84,10 +84,6 @@ public function gettingEncryptedStuffFromGoogleShouldWorkIfHostIsResolvedFirst()
     /** @test */
     public function testConnectingFailsIfDnsUsesInvalidResolver()
     {
-        if (!function_exists('stream_socket_enable_crypto')) {
-            $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
-        }
-
         $loop = new StreamSelectLoop();
 
         $factory = new Factory();
@@ -101,6 +97,23 @@ public function testConnectingFailsIfDnsUsesInvalidResolver()
         Block\await($connector->connect('google.com:80'), $loop, self::TIMEOUT);
     }
 
+    /** @test */
+    public function testConnectingFailsIfTimeoutIsTooSmall()
+    {
+        if (!function_exists('stream_socket_enable_crypto')) {
+            $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
+        }
+
+        $loop = new StreamSelectLoop();
+
+        $connector = new Connector($loop, array(
+            'timeout' => 0.001
+        ));
+
+        $this->setExpectedException('RuntimeException');
+        Block\await($connector->connect('google.com:80'), $loop, self::TIMEOUT);
+    }
+
     /** @test */
     public function testSelfSignedRejectsIfVerificationIsEnabled()
     {