Add connectTimeout() and timeout() options (#5)

Author: nexxai

src/Console/Commands/CurlCommand.php

@@ -7,7 +7,7 @@
 
 class CurlCommand extends Command
 {
-    protected $signature = 'shift:curl {--X|request=GET} {--H|header=*} {--d|data=*} {--F|form=*} {--digest} {--basic} {--connect-timeout=} {--retry=} {--s|silent} {--u|user=} {url}';
+    protected $signature = 'shift:curl {--X|request=GET} {--H|header=*} {--d|data=*} {--F|form=*} {--digest} {--basic} {--connect-timeout=} {--max-timeout=} {--retry=} {--s|silent} {--u|user=} {url}';
 
     protected $description = 'Convert a UNIX curl request to an HTTP Client request';
 
@@ -31,7 +31,8 @@ private function gatherOptions()
             'fields' => $this->option('form'),
             'digest' => $this->option('digest'),
             'basic' => $this->option('basic'),
-            'timeout' => $this->option('connect-timeout'),
+            'connectTimeout' => $this->option('connect-timeout'),
+            'maxTimeout' => $this->option('max-timeout'),
             'retry' => $this->option('retry'),
             'silent' => $this->option('silent'),
             'user' => $this->option('user'),

src/Models/Request.php

@@ -22,6 +22,10 @@ class Request
 
     private ?string $password = null;
 
+    private ?int $maxTimeout = null;
+
+    private ?int $connectTimeout = null;
+
     private function __construct($url, $method)
     {
         $this->url = $url;
@@ -70,6 +74,14 @@ public static function create(array $data): self
             [$request->username, $request->password] = explode(':', $data['user'], 2);
         }
 
+        if ($data['maxTimeout']) {
+            $request->maxTimeout = $data['maxTimeout'];
+        }
+
+        if ($data['connectTimeout']) {
+            $request->connectTimeout = $data['connectTimeout'];
+        }
+
         return $request;
     }
 
@@ -83,6 +95,16 @@ public function hasUsernameOrPassword(): bool
         return isset($this->username) || isset($this->password);
     }
 
+    public function hasMaxTimeout(): bool
+    {
+        return isset($this->maxTimeout);
+    }
+
+    public function hasConnectTimeout(): bool
+    {
+        return isset($this->connectTimeout);
+    }
+
     public function headers(): array
     {
         return $this->headers;
@@ -118,6 +140,16 @@ public function password(): string
         return $this->password ?? '';
     }
 
+    public function maxTimeout(): int
+    {
+        return $this->maxTimeout;
+    }
+
+    public function connectTimeout(): int
+    {
+        return $this->connectTimeout;
+    }
+
     private static function convertDataType(string $value)
     {
         return preg_match('/^[1-9]\d*$/', $value) ? intval($value) : $value;

src/Support/HttpCall.php

@@ -85,6 +85,14 @@ private static function generateOptions(Request $request): string
             $options[] = 'withHeaders(' . self::prettyPrintArray($headers) . ')';
         }
 
+        if ($request->hasMaxTimeout()) {
+            $options[] = 'timeout(' . $request->maxTimeout() . ')';
+        }
+
+        if ($request->hasConnectTimeout()) {
+            $options[] = 'connectTimeout(' . $request->connectTimeout() . ')';
+        }
+
         if (empty($options)) {
             return '';
         }

tests/Feature/Console/Commands/CurlCommandTest.php

@@ -37,6 +37,8 @@ public function curlCommandFixtures()
             'Mailgun example request' => ['mailgun-example'],
             'Digital Ocean example request' => ['digital-ocean-example'],
             'Stripe example request' => ['stripe-example'],
+            'Initial connection timeout' => ['connect-timeout'],
+            'Entire transaction timeout' => ['max-timeout'],
         ];
     }
 }

tests/fixtures/connect-timeout.in

@@ -0,0 +1 @@
+curl --connect-timeout 5 https://example.com

tests/fixtures/connect-timeout.out

@@ -0,0 +1,2 @@
+Http::connectTimeout(5)
+    ->get('https://example.com');

tests/fixtures/max-timeout.in

@@ -0,0 +1 @@
+curl --max-timeout 5 https://example.com

tests/fixtures/max-timeout.out

@@ -0,0 +1,2 @@
+Http::timeout(5)
+    ->get('https://example.com');