Merge pull request #39 from padhie/multiple_stream_search

implement multiple stream searches and error response for twitch api …
padhie · Jan 5, 2023 · 84ba4a6 · 84ba4a6
2 parents a3b2fe4 + 73e330f
commit 84ba4a6
Show file tree

Hide file tree

Showing 6 changed files with 106 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "padhie/twitch-api-bundle",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "type": "library",
     "keywords": [
         "twitch",

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -6,3 +6,6 @@ services:
         volumes:
             - .:/application
         working_dir: "/application"
+        environment:
+            PHP_EXTENSION_XDEBUG: 1
+            PHP_INI_XDEBUG__REMOTE_AUTOSTART: 1
diff --git a/src/Request/Streams/GetStreamsRequest.php b/src/Request/Streams/GetStreamsRequest.php
@@ -19,7 +19,8 @@ final class GetStreamsRequest implements PaginationRequestInterface
     private ?string $gameId = null;
     private ?string $language = null;
     private ?string $userId = null;
-    private ?string $userLogin = null;
+    /** @var array<string> */
+    private array $userLogins = [];
 
     public function getMethod(): string
     {
@@ -38,14 +39,26 @@ public function getHeader(): array
 
     public function getParameter(): array
     {
+        $userLoginString = '';
+        if (count($this->userLogins) > 1) {
+            $userLoginString = $this->userLogins[0];
+            if (count($this->userLogins) > 2) {
+                $userLogins = $this->userLogins;
+                array_shift($userLogins);
+                $userLoginString .= implode('&', array_map(static function (string $item) {
+                    return 'userLogin=' . $item;
+                }, $userLogins));
+            }
+        }
+
         return [
             'after' => $this->after,
             'before' => $this->before,
             'first' => $this->first,
             'game_id' => $this->gameId,
             'language' => $this->language,
             'user_id' => $this->userId,
-            'user_login' => $this->userLogin,
+            'user_login' => $userLoginString,
         ];
     }
 
@@ -110,7 +123,7 @@ public function withUserId(string $userId): self
     public function withUserLogin(string $userLogin): self
     {
         $self = clone $this;
-        $self->userLogin = $userLogin;
+        $self->userLogins[] = $userLogin;
 
         return $self;
     }

diff --git a/src/Response/ErrorResponse.php b/src/Response/ErrorResponse.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Padhie\TwitchApiBundle\Response;
+
+final class ErrorResponse implements ResponseInterface
+{
+    private string $error;
+    private int $status;
+    private string $message;
+
+    public static function createFromArray(array $data): self
+    {
+        $self = new self();
+
+        $self->error = $data['error'];
+        $self->status = $data['status'];
+        $self->message = $data['message'];
+
+        return $self;
+    }
+
+    public function jsonSerialize(): array
+    {
+        return [
+            'error' => $this->error,
+            'status' => $this->status,
+            'message' => $this->message,
+        ];
+    }
+}
diff --git a/src/Response/ResponseGenerator.php b/src/Response/ResponseGenerator.php
@@ -4,6 +4,7 @@
 
 namespace Padhie\TwitchApiBundle\Response;
 
+use GuzzleHttp\Exception\ClientException;
 use Padhie\TwitchApiBundle\Request\RequestInterface;
 
 use function call_user_func;
@@ -16,9 +17,35 @@ public function generateFromString(RequestInterface $request, string $response):
         $response = $response !== '' ? $response : '{}';
         $jsonResponse = json_decode($response, true, 512, JSON_THROW_ON_ERROR);
 
+        if ($this->isErrorResponse($jsonResponse)) {
+            return ErrorResponse::createFromArray($jsonResponse);
+        }
+
         return $this->generateFromArray($request, $jsonResponse);
     }
 
+    public function generateErrorResponseFromException(\Throwable $exception): ErrorResponse
+    {
+        if ($exception instanceof ClientException) {
+            $message = $exception->getMessage();
+            $posOfResponse = strpos($message, 'response:') + 9;
+
+            if ($posOfResponse >= 9) {
+                $response = substr($message, $posOfResponse);
+                $jsonResponse = json_decode($response, true, 512, JSON_THROW_ON_ERROR);
+
+                return ErrorResponse::createFromArray($jsonResponse);
+            }
+        }
+
+        return ErrorResponse::createFromArray([
+            'error' => get_class($exception),
+            'status' => $exception->getCode(),
+            'message' => $exception->getMessage(),
+        ]);
+    }
+
+
     /**
      * @param array<mixed> $response
      */
@@ -31,4 +58,13 @@ public function generateFromArray(RequestInterface $request, array $response): R
             $response
         );
     }
+
+    /**
+     * @param array<mixed> $response
+     */
+    private function isErrorResponse(array $response): bool
+    {
+        return array_key_exists('error', $response)
+            && !empty($response['error']);
+    }
 }
diff --git a/src/TwitchClient.php b/src/TwitchClient.php
@@ -5,6 +5,7 @@
 namespace Padhie\TwitchApiBundle;
 
 use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Promise\Utils;
 use JsonException;
 use Padhie\TwitchApiBundle\Exception\InvalidRequestException;
@@ -44,7 +45,12 @@ public function __construct(ClientInterface $client, RequestGenerator $requestGe
     public function send(RequestInterface $request): ResponseInterface
     {
         $prsRequest = $this->requestGenerator->generate($request);
-        $response = $this->executeRequest($prsRequest);
+
+        try {
+            $response = $this->executeRequest($prsRequest);
+        } catch (ClientException $exception) {
+            return $this->responseGenerator->generateErrorResponseFromException($exception);
+        }
 
         return $this->responseGenerator->generateFromString($request, $response);
     }
@@ -60,7 +66,13 @@ public function sendWithPagination(PaginationRequestInterface $request): Respons
             }
 
             $prsRequest = $this->requestGenerator->generate($request);
-            $responseString = $this->executeRequest($prsRequest);
+
+            try {
+                $responseString = $this->executeRequest($prsRequest);
+            } catch (ClientException $exception) {
+                return $this->responseGenerator->generateErrorResponseFromException($exception);
+            }
+
             $jsonResponse = json_decode($responseString, true, 512, JSON_THROW_ON_ERROR);
 
             $dataCollection = array_merge($dataCollection, $jsonResponse['data'] ?? []);
@@ -101,8 +113,10 @@ function($response) use ($request, $key, &$responses): void {
                     $responseString = $this->loadBody($response);
                     $responses[$key] = $this->responseGenerator->generateFromString($request, $responseString);
                 },
-                function($response) use ($key,  &$responses): void {
-                    $responses[$key] = null;
+                function($response) use ($key, &$responses): void {
+                    $responses[$key] = $response instanceof \Throwable
+                        ? $this->responseGenerator->generateErrorResponseFromException($response)
+                        : null;
                 }
             );