refactor(authenticator): extract retry logic to configurable callbacks

- Introduce $decider and $delay callables to customize retry behavior
- Move default retry decision logic from inline closure to $decider property
- Support optional delay strategy via $delay callable
- Improve flexibility for handling 401 responses by invalidating cache key before retry
- Preserve existing retry limit of one attempt per request

Signed-off-by: guanguans <[email protected]>

Author: guanguans

src/ZohoCliq/Authenticator.php

@@ -51,6 +51,9 @@ class Authenticator extends NullAuthenticator implements \Stringable
     private DataCenter $dataCenter;
     private CacheInterface $cache;
     private string $cacheKey;
+
+    /** @var null|callable */
+    private $retryDelay;
     private Client $client;
 
     /**
@@ -65,11 +68,13 @@ public function __construct(
         ?string $dataCenter = null,
         ?CacheInterface $cache = null,
         ?string $cacheKey = null,
+        ?callable $retryDelay = null,
         ?Client $client = null,
     ) {
         $this->dataCenter = new DataCenter($dataCenter);
         $this->cache = $cache ?? new FileCache;
         $this->cacheKey = $cacheKey ?? "zoho_cliq.access_token.$this->dataCenter.$clientId.$clientSecret";
+        $this->retryDelay = $retryDelay;
         $this->client = ($client ?? new Client)->push($this->baseUriMiddleware($this->dataCenter->toOauthBaseUri()));
     }
 
@@ -124,6 +129,7 @@ private function authMiddleware(): callable
     }
 
     /**
+     * @see \GuzzleHttp\RetryMiddleware::exponentialDelay()
      * @see \GuzzleHttp\RetryMiddleware::onFulfilled()
      * @see \GuzzleHttp\RetryMiddleware::onRejected()
      */
@@ -143,7 +149,8 @@ function (int $retries, RequestInterface $request, ?ResponseInterface $response
                 }
 
                 return false;
-            }
+            },
+            $this->retryDelay
         );
     }
 

tests/ZohoCliq/ClientTest.php

@@ -38,6 +38,7 @@
         // dataCenter: DataCenter::US,
         // cache: new MemoryCache,
         cache: new NullCache,
+        retryDelay: fn (): int => 0,
         client: (new \Guanguans\Notify\Foundation\Client)->mock(array_pad(
             [],
             6,
@@ -165,15 +166,15 @@
 
 it('can retry send user message', function (): void {
     /** @var \Guanguans\Notify\Foundation\Response $response */
-    $message = UserMessage::make($this->message)->emailId(fake()->email());
+    $userMessage = UserMessage::make($this->message)->emailId(fake()->email());
     $response = $this
         ->client
         ->mock([
             response('retries0', 401),
             response('retries1', 401),
             response('retries2', 401),
             response(status: 204),
-        ])->send($message);
+        ])->send($userMessage);
     expect($response)
         ->body()->toBe('retries1')
         ->status()->toBe(401);
@@ -184,7 +185,7 @@
             response('retries0', 400),
             response('retries1', 401),
             response(status: 204),
-        ])->send($message);
+        ])->send($userMessage);
     expect($response)
         ->body()->toBe('retries0')
         ->status()->toBe(400);
@@ -195,7 +196,7 @@
             response('retries0', 200),
             response('retries1', 401),
             response(status: 204),
-        ])->send($message);
+        ])->send($userMessage);
     expect($response)
         ->body()->toBe('retries0')
         ->status()->toBe(200);
@@ -205,7 +206,7 @@
         ->mock([
             response('retries0', 401),
             response(status: 204),
-        ])->send($message);
+        ])->send($userMessage);
     expect($response)
         ->body()->toBeEmpty()
         ->status()->toBe(204);