Merge pull request #19 from yankewei/fix-the-reset-limit-if-based-on-response

Fix the bug when resetting the limit based on the response handler

Author: Sammyjo20

src/Exceptions/RateLimitReachedException.php

@@ -12,7 +12,7 @@ class RateLimitReachedException extends SaloonException
     /**
      * Constructor
      */
-    public function __construct(readonly protected Limit $limit)
+    public function __construct(protected readonly Limit $limit)
     {
         parent::__construct(sprintf('Request Rate Limit Reached (Name: %s)', $this->limit->getName()));
     }

src/Limit.php

@@ -349,7 +349,13 @@ public function save(RateLimitStore $store, int $resetHits = 1): static
         // reset the limit completely and hit once.
 
         if ($this->getRemainingSeconds() < 1) {
-            $this->resetLimit()->hit($resetHits);
+            // When using the fromResponse limiter, we don't need to update the hit
+            // as we only update the hit when the detect the too many attempts
+            if ($this->usesResponse()) {
+                $this->resetLimit();
+            } else {
+                $this->resetLimit()->hit($resetHits);
+            }
         }
 
         $data = [

src/Stores/FileStore.php

@@ -21,7 +21,7 @@ class FileStore implements RateLimitStore
      * @throws \Saloon\Exceptions\DirectoryNotFoundException
      * @throws \Saloon\Exceptions\UnableToCreateDirectoryException
      */
-    public function __construct(readonly protected string $directory)
+    public function __construct(protected readonly string $directory)
     {
         $this->storage = new Storage($this->directory, false);
     }

src/Stores/PsrStore.php

@@ -12,7 +12,7 @@ class PsrStore implements RateLimitStore
     /**
      * Constructor
      */
-    public function __construct(readonly protected CacheInterface $cache)
+    public function __construct(protected readonly CacheInterface $cache)
     {
         //
     }

src/Stores/RedisStore.php

@@ -12,7 +12,7 @@ class RedisStore implements RateLimitStore
     /**
      * Constructor
      */
-    public function __construct(readonly protected Redis $redis)
+    public function __construct(protected readonly Redis $redis)
     {
         //
     }