Merge pull request #47 from sixlive/add-timeout

Add timeout
kitetail · Sep 18, 2017 · 018bac4 · 018bac4
2 parents 390efa5 + cae19d9
commit 018bac4
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/src/Zttp.php b/src/Zttp.php
@@ -103,6 +103,13 @@ function withDigestAuth($username, $password)
         });
     }
 
+    function timeout($seconds)
+    {
+        $this->options['timeout'] = $seconds;
+
+        return $this;
+    }
+
     function beforeSending($callback)
     {
         return tap($this, function () use ($callback) {
@@ -147,9 +154,13 @@ function delete($url, $params = [])
 
     function send($method, $url, $options)
     {
-        return new ZttpResponse($this->buildClient()->request($method, $url, $this->mergeOptions([
-            'query' => $this->parseQueryParams($url),
-        ], $options)));
+        try {
+            return new ZttpResponse($this->buildClient()->request($method, $url, $this->mergeOptions([
+                'query' => $this->parseQueryParams($url),
+            ], $options)));
+        } catch (\GuzzleHttp\Exception\ConnectException $e) {
+            throw new ConnectionException($e->getMessage(), 0, $e);
+        }
     }
 
     function buildClient()
@@ -300,6 +311,8 @@ function __call($method, $args)
     }
 }
 
+class ConnectionException extends \Exception {}
+
 function tap($value, $callback) {
     $callback($value);
     return $value;

diff --git a/tests/ZttpTest.php b/tests/ZttpTest.php
@@ -462,6 +462,15 @@ function can_use_basic_auth()
 
        $this->assertTrue($response->isOk());
     }
+
+    /**
+     * @test
+     * @expectedException \Zttp\ZttpConnectException
+     */
+    function client_will_force_timeout()
+    {
+        Zttp::timeout(1)->get($this->url('/timeout'));
+    }
 }
 
 class ZttpServer

diff --git a/tests/server/public/index.php b/tests/server/public/index.php
@@ -48,6 +48,10 @@ function build_response($request)
     return "A simple string response";
 });
 
+$app->get('/timeout', function () {
+    sleep(2);
+});
+
 $app->get('/basic-auth', function () {
     $headers = [
         (bool) preg_match('/Basic\s[a-zA-Z0-9]+/', app('request')->header('Authorization')),