Added response handler to retry 429. bunq#109

src/Http/ApiClient.php

@@ -9,17 +9,19 @@
 use bunq\Http\Handler\RequestHandlerEncryption;
 use bunq\Http\Handler\RequestHandlerSignature;
 use bunq\Http\Handler\ResponseHandlerError;
+use bunq\Http\Handler\ResponseHandlerRateLimit;
 use bunq\Http\Handler\ResponseHandlerSignature;
 use bunq\Util\BunqEnumApiEnvironmentType;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Uri;
+use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
 /**
  */
-class ApiClient
+class ApiClient implements RequestRetryer
 {
     /**
      * Error constants.
@@ -235,6 +237,33 @@ private function request(
         return $this->createBunqResponseRaw($response);
     }
 
+    /**
+     * @param RequestInterface $request
+     * @return ResponseInterface
+     */
+    public function retryRequest(RequestInterface $request): ResponseInterface {
+        $this->initialize($request->getUri());
+
+        if ($request->getBody()->isSeekable()) {
+            $request->getBody()->rewind();
+        }
+
+        $body = $request->getBody()->getContents();
+
+        if (!$this->isBinary || !empty($body)) {
+            $body = json_decode($body, true);
+        }
+
+        return $this->httpClient->request(
+            $request->getMethod(),
+            $request->getUri(),
+            $this->determineRequestOptions(
+                $body,
+                $request->getHeaders()
+            )
+        );
+    }
+
     /**
      */
     private function initialize(string $uri)
@@ -298,6 +327,7 @@ private function determineMiddleware(): HandlerStack
         }
 
         $handlerStack->push(HandlerUtil::applyResponseHandler(new ResponseHandlerError()));
+        $handlerStack->push(HandlerUtil::applyResponseHandler(new ResponseHandlerRateLimit($this)));
 
         return $handlerStack;
     }

src/Http/Handler/ResponseHandlerRateLimit.php

@@ -0,0 +1,48 @@
+<?php declare(strict_types=1);
+
+
+namespace bunq\Http\Handler;
+
+
+use bunq\Http\ApiClient;
+use phpDocumentor\Reflection\Types\This;
+use bunq\Http\RequestRetryer;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * Class ResponseHandlerRateLimit
+ * @package bunq\Http\Handler
+ */
+class ResponseHandlerRateLimit extends ResponseHandlerBase
+{
+    /**
+     * @var RequestRetryert
+     */
+    private $retryer;
+
+    /**
+     * ResponseHandlerRateLimit constructor.
+     * @param ApiClient $client
+     */
+    public function __construct(RequestRetryer $retryer)
+    {
+        $this->retryer = $retryer;
+    }
+
+    /**
+     * @param ResponseInterface $response
+     * @param RequestInterface $request
+     *
+     * @return ResponseInterface
+     */
+    public function execute(ResponseInterface $response, RequestInterface $request): ResponseInterface
+    {
+        if ($response->getStatusCode() === 429) {
+            usleep(1500);
+            return $this->retryer->retryRequest($request);
+        }
+
+        return $response;
+    }
+}

src/Http/RequestRetryer.php

@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+namespace bunq\Http;
+
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * Interface RequestRertier
+ * @package bunq\Http
+ */
+interface RequestRetryer
+{
+    /**
+     * @param RequestInterface $request
+     * @return ResponseInterface
+     */
+    public function retryRequest(RequestInterface $request): ResponseInterface;
+}

tests/Http/RequestRertyerForTest.php

@@ -0,0 +1,25 @@
+<?php declare(strict_types=1);
+
+
+namespace bunq\test\Http;
+
+use bunq\Http\RequestRetryer;
+use GuzzleHttp\Psr7\Response;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * Class RequesRertyerForTest
+ * @package bunq\test\Http
+ */
+class RequestRertyerForTest implements RequestRetryer
+{
+    /**
+     * @param RequestInterface $request
+     * @return ResponseInterface
+     */
+    public function retryRequest(RequestInterface $request): ResponseInterface
+    {
+        return new Response();
+    }
+}

tests/Http/ResponseHandlerRateLimitTest.php

@@ -0,0 +1,33 @@
+<?php declare(strict_types=1);
+
+namespace bunq\test\Http;
+
+use bunq\Http\Handler\ResponseHandlerRateLimit;
+use bunq\test\BunqSdkTestBase;
+use GuzzleHttp\Psr7\Request;
+use GuzzleHttp\Psr7\Response;
+
+/**
+ * Class ResponseHandlerRateLimitTest
+ * @package bunq\test\Http
+ */
+class ResponseHandlerRateLimitTest extends BunqSdkTestBase
+{
+    /**
+     */
+    public function testExecute()
+    {
+        $sut = new ResponseHandlerRateLimit(new RequestRertyerForTest());
+
+        $response = $sut->execute(new Response(429), new Request('GET', 'https://whatthecommit.com/index.txt'));
+
+        static::assertEquals(200, $response->getStatusCode());
+    }
+
+    /**
+     */
+    public function testActualRequest()
+    {
+        static::markTestSkipped('how do we want to test this');
+    }
+}