curl cmd

Author: asika32764

packages/http/src/Exception/HttpRequestException.php

@@ -5,8 +5,8 @@
 namespace Windwalker\Http\Exception;
 
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
 use UnexpectedValueException;
-use Windwalker\Database\Driver\StatementInterface;
 
 /**
  * The HttpRequestException class.
@@ -15,17 +15,46 @@
  */
 class HttpRequestException extends UnexpectedValueException
 {
-    public protected(set) ?ResponseInterface $response;
+    public protected(set) ?ResponseInterface $response = null;
 
-    public StatementInterface|null $body {
+    public StreamInterface|null $body {
         get => $this->response?->getBody();
     }
 
+    protected \Closure $curlCmdCallback;
+
     public function withResponse(ResponseInterface $response): static
     {
         $new = new static($this->getMessage(), $this->getCode(), $this);
         $new->response = $response;
 
         return $new;
     }
+
+    public function setCurlCmdCallback(\Closure $callback): static
+    {
+        $this->curlCmdCallback = $callback;
+
+        return $this;
+    }
+
+    public function getBodyString(): string
+    {
+        $body = $this->body;
+
+        if ($body === null) {
+            return '';
+        }
+
+        if ($body->isSeekable()) {
+            $body->rewind();
+        }
+
+        return $body->getContents();
+    }
+
+    public function toCurlCmd(): string
+    {
+        return ($this->curlCmdCallback)();
+    }
 }

packages/http/src/HttpClient.php

@@ -12,6 +12,7 @@
 use Windwalker\Event\EventAwareTrait;
 use Windwalker\Http\Event\HttpClient\AfterRequestEvent;
 use Windwalker\Http\Event\HttpClient\BeforeRequestEvent;
+use Windwalker\Http\Exception\HttpRequestException;
 use Windwalker\Http\File\HttpUploadFile;
 use Windwalker\Http\File\HttpUploadStream;
 use Windwalker\Http\File\HttpUploadStringFile;
@@ -133,10 +134,6 @@ public function download(
         return HttpClientResponse::from($transport->download($request, $dest));
     }
 
-    public function downloadStream()
-    {
-    }
-
     /**
      * Send a request to remote.
      *
@@ -474,19 +471,25 @@ public function request(
 
         $transportOptions->optionMerged = true;
 
-        $response = $this->sendRequest($request, $transportOptions);
+        try {
+            $response = $this->sendRequest($request, $transportOptions);
 
-        $httpClient = $this;
+            $httpClient = $this;
 
-        $event = $this->emit(
-            new AfterRequestEvent(
-                httpClient: $httpClient,
-                request: $request,
-                response: $response
-            ),
-        );
+            $event = $this->emit(
+                new AfterRequestEvent(
+                    httpClient: $httpClient,
+                    request: $request,
+                    response: $response
+                ),
+            );
 
-        return HttpClientResponse::from($event->response);
+            return HttpClientResponse::fromHttpClient($request, $event->response, fn () => $this->toCurlCmd($request));
+        } catch (HttpRequestException $e) {
+            $e->setCurlCmdCallback(fn () => $this->toCurlCmd($request));
+
+            throw $e;
+        }
     }
 
     public function hydrateRequest(

packages/http/src/Response/HttpClientResponse.php

@@ -4,6 +4,10 @@
 
 namespace Windwalker\Http\Response;
 
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Windwalker\Http\HttpClient;
+
 /**
  * The HttpClientResponse class.
  */
@@ -14,7 +18,23 @@ class HttpClientResponse extends Response
      *
      * @var mixed
      */
-    protected mixed $info = null;
+    public protected(set) mixed $info = null;
+
+    public protected(set) RequestInterface $request;
+
+    protected \Closure $curlCmdCallback;
+
+    public static function fromHttpClient(
+        RequestInterface $request,
+        ResponseInterface $response,
+        \Closure $curlCmdCallback,
+    ): static {
+        $res = static::from($response);
+        $res->request = $request;
+        $res->curlCmdCallback = $curlCmdCallback;
+
+        return $res;
+    }
 
     public function withInfo(mixed $info): static
     {
@@ -28,4 +48,20 @@ public function getInfo(): mixed
     {
         return $this->info;
     }
+
+    public function getBodyString(): string
+    {
+        $body = $this->getBody();
+
+        if ($body->isSeekable()) {
+            $body->rewind();
+        }
+
+        return $body->getContents();
+    }
+
+    public function toCurlCmd(): string
+    {
+        return ($this->curlCmdCallback)();
+    }
 }