Merge pull request #137 from Yoshi2889/fix/better-exceptions

Decode Telegram response from ReactPHP's ResponseException

Author: unreal4u

src/Exceptions/ClientException.php

@@ -4,6 +4,7 @@
 
 namespace unreal4u\TelegramAPI\Exceptions;
 
+use React\Http\Message\ResponseException;
 use Throwable;
 use unreal4u\TelegramAPI\Telegram\Types\Custom\UnsuccessfulRequest;
 
@@ -29,6 +30,34 @@ public function __construct(string $message = '', int $code = 0, Throwable $prev
         }
     }
 
+    /**
+     * Construct a new ClientException with the parameters and, if present, body
+     * found in the given ResponseException.
+     *
+     * @param  \React\Http\Message\ResponseException  $responseException
+     *
+     * @return static
+     */
+    public static function fromResponseException(ResponseException $responseException): self {
+        $exception = new ClientException(
+            $responseException->getMessage(),
+            $responseException->getCode(),
+            $responseException
+        );
+
+        $body    = $responseException->getResponse()->getBody()->getContents();
+        $decoded = json_decode($body, true);
+
+        if (is_array($decoded)
+            && array_key_exists('description', $decoded)
+            && array_key_exists('error_code', $decoded)
+        ) {
+            $exception->setError(new UnsuccessfulRequest($decoded));
+        }
+
+        return $exception;
+    }
+
     public function setError(UnsuccessfulRequest $unsuccessfulRequest): ClientException
     {
         $this->errorRequest = $unsuccessfulRequest;

src/HttpClientRequestHandler.php

@@ -8,6 +8,7 @@
 use Psr\Http\Message\ResponseInterface;
 use React\EventLoop\LoopInterface;
 use React\Http\Browser;
+use React\Http\Message\ResponseException;
 use React\Promise\PromiseInterface;
 use React\Socket\Connector;
 use unreal4u\TelegramAPI\Exceptions\ClientException;
@@ -91,6 +92,10 @@ static function (ResponseInterface $response) {
             },
             // Promise rejected
             static function (Exception $e) {
+                if ($e instanceof ResponseException) {
+                    throw ClientException::fromResponseException($e);
+                }
+
                 throw new ClientException($e->getMessage(), $e->getCode(), $e);
             }
         );