Check if all X-RateLimit headers are available (#2)

Author: ramonrietdijk

src/Listeners/StoreRateLimitsListener.php

@@ -8,6 +8,15 @@
 
 class StoreRateLimitsListener
 {
+    protected array $headers = [
+        'X-RateLimit-Limit',
+        'X-RateLimit-Remaining',
+        'X-RateLimit-Reset',
+        'X-RateLimit-Minutely-Limit',
+        'X-RateLimit-Minutely-Remaining',
+        'X-RateLimit-Minutely-Reset',
+    ];
+
     public function handle(ExactResponseEvent $event): void
     {
         $response = $event->response;
@@ -16,15 +25,23 @@ public function handle(ExactResponseEvent $event): void
             return;
         }
 
+        $headers = $response->headers();
+
+        $missing = array_diff($this->headers, array_keys($headers));
+
+        if (count($missing) > 0) {
+            return;
+        }
+
         RateLimit::query()->updateOrCreate([
             'exact_division' => $event->division,
             'timestamp' => now()->startOfDay()->getTimestamp(),
         ], [
-            'limit' => $response->header('X-RateLimit-Limit'),
-            'remaining' => $response->header('X-RateLimit-Remaining'),
+            'limit' => (int) $response->header('X-RateLimit-Limit'),
+            'remaining' => (int) $response->header('X-RateLimit-Remaining'),
             'reset_at' => Carbon::createFromTimestampMs($response->header('X-RateLimit-Reset')),
-            'minutely_limit' => $response->header('X-RateLimit-Minutely-Limit'),
-            'minutely_remaining' => $response->header('X-RateLimit-Minutely-Remaining'),
+            'minutely_limit' => (int) $response->header('X-RateLimit-Minutely-Limit'),
+            'minutely_remaining' => (int) $response->header('X-RateLimit-Minutely-Remaining'),
             'minutely_reset_at' => Carbon::createFromTimestampMs($response->header('X-RateLimit-Minutely-Reset')),
         ]);
     }

tests/Listeners/StoreRateLimitsListenerTest.php

@@ -70,4 +70,28 @@ public function it_can_skip_failures(): void
 
         $this->assertNull($rateLimit);
     }
+
+    #[Test]
+    public function it_can_skip_when_headers_are_missing(): void
+    {
+        Carbon::setTestNow('2024-01-01 00:00:00');
+
+        $response = new Response(
+            new Psr7Response(200, [
+                'X-RateLimit-Limit' => '1000',
+                'X-RateLimit-Remaining' => '500',
+                'X-RateLimit-Reset' => (string) now()->addMinute()->getTimestampMs(),
+            ])
+        );
+
+        ExactResponseEvent::dispatch($response, '::connection::', '::division::');
+
+        /** @var ?RateLimit $rateLimit */
+        $rateLimit = RateLimit::query()
+            ->where('exact_division', '=', '::division::')
+            ->where('timestamp', '=', now()->getTimestamp())
+            ->first();
+
+        $this->assertNull($rateLimit);
+    }
 }