__checkQueue method

Author: valzargaming

src/Discord/Bucket.php

@@ -132,88 +132,86 @@ public function checkQueue()
             return;
         }
 
-        $checkQueue = function () use (&$checkQueue) {
-            // Check for rate-limits
-            if ($this->requestRemaining < 1 && ! is_null($this->requestRemaining)) {
-                $interval = 0;
-                if ($this->resetTimer) {
-                    $interval = $this->resetTimer->getInterval() ?? 0;
-                }
-                $this->logger->info($this.' expecting rate limit, timer interval '.($interval * 1000).' ms');
-                $this->checkerRunning = false;
-                $checkQueue = null;
+        $this->checkerRunning = true;
+        $this->__checkQueue();
+    }
 
-                return;
+    protected function __checkQueue()
+    {
+        // Check for rate-limits
+        if ($this->requestRemaining < 1 && ! is_null($this->requestRemaining)) {
+            $interval = 0;
+            if ($this->resetTimer) {
+                $interval = $this->resetTimer->getInterval() ?? 0;
             }
+            $this->logger->info($this.' expecting rate limit, timer interval '.($interval * 1000).' ms');
+            $this->checkerRunning = false;
 
-            // Queue is empty, job done.
-            if ($this->queue->isEmpty()) {
-                $this->checkerRunning = false;
-                $checkQueue = null;
+            return;
+        }
 
-                return;
-            }
+        // Queue is empty, job done.
+        if ($this->queue->isEmpty()) {
+            $this->checkerRunning = false;
 
-            /** @var Request */
-            $request = $this->queue->dequeue();
+            return;
+        }
 
-            // Promises v3 changed `->then` to behave as `->done` and removed `->then`. We still need the behaviour of `->done` in projects using v2
-            ($this->runRequest)($request)->{$this->promiseV3 ? 'then' : 'done'}(function (ResponseInterface $response) use (&$checkQueue) {
-                $resetAfter = (float) $response->getHeaderLine('X-Ratelimit-Reset-After');
-                $limit = $response->getHeaderLine('X-Ratelimit-Limit');
-                $remaining = $response->getHeaderLine('X-Ratelimit-Remaining');
+        /** @var Request */
+        $request = $this->queue->dequeue();
 
-                if ($resetAfter) {
-                    $resetAfter = (float) $resetAfter;
+        // Promises v3 changed `->then` to behave as `->done` and removed `->then`. We still need the behaviour of `->done` in projects using v2
+        ($this->runRequest)($request)->{$this->promiseV3 ? 'then' : 'done'}(function (ResponseInterface $response) {
+            $resetAfter = (float) $response->getHeaderLine('X-Ratelimit-Reset-After');
+            $limit = $response->getHeaderLine('X-Ratelimit-Limit');
+            $remaining = $response->getHeaderLine('X-Ratelimit-Remaining');
 
-                    if ($this->resetTimer) {
-                        $this->loop->cancelTimer($this->resetTimer);
-                    }
+            if ($resetAfter) {
+                $resetAfter = (float) $resetAfter;
 
-                    $this->resetTimer = $this->loop->addTimer($resetAfter, function () {
-                        // Reset requests remaining and check queue
-                        $this->requestRemaining = $this->requestLimit;
-                        $this->resetTimer = null;
-                        $this->checkQueue();
-                    });
+                if ($this->resetTimer) {
+                    $this->loop->cancelTimer($this->resetTimer);
                 }
 
-                // Check if rate-limit headers are present and store
-                if (is_numeric($limit)) {
-                    $this->requestLimit = (int) $limit;
-                }
+                $this->resetTimer = $this->loop->addTimer($resetAfter, function () {
+                    // Reset requests remaining and check queue
+                    $this->requestRemaining = $this->requestLimit;
+                    $this->resetTimer = null;
+                    $this->checkQueue();
+                });
+            }
 
-                if (is_numeric($remaining)) {
-                    $this->requestRemaining = (int) $remaining;
-                }
+            // Check if rate-limit headers are present and store
+            if (is_numeric($limit)) {
+                $this->requestLimit = (int) $limit;
+            }
+
+            if (is_numeric($remaining)) {
+                $this->requestRemaining = (int) $remaining;
+            }
+
+            // Check for more requests
+            $this->__checkQueue();
+        }, function ($rateLimit) use ($request) {
+            if ($rateLimit instanceof RateLimit) {
+                $this->queue->enqueue($request);
 
-                // Check for more requests
-                $checkQueue();
-            }, function ($rateLimit) use (&$checkQueue, $request) {
-                if ($rateLimit instanceof RateLimit) {
-                    $this->queue->enqueue($request);
-
-                    // Bucket-specific rate-limit
-                    // Re-queue the request and wait the retry after time
-                    if (! $rateLimit->isGlobal()) {
-                        $this->loop->addTimer($rateLimit->getRetryAfter(), $checkQueue);
-                    }
-                    // Stop the queue checker for a global rate-limit.
-                    // Will be restarted when global rate-limit finished.
-                    else {
-                        $this->checkerRunning = false;
-                        $checkQueue = null;
-
-                        $this->logger->debug($this.' stopping queue checker');
-                    }
-                } else {
-                    $checkQueue();
+                // Bucket-specific rate-limit
+                // Re-queue the request and wait the retry after time
+                if (! $rateLimit->isGlobal()) {
+                    $this->loop->addTimer($rateLimit->getRetryAfter(), fn () => $this->__checkQueue());
                 }
-            });
-        };
+                // Stop the queue checker for a global rate-limit.
+                // Will be restarted when global rate-limit finished.
+                else {
+                    $this->checkerRunning = false;
 
-        $this->checkerRunning = true;
-        $checkQueue();
+                    $this->logger->debug($this.' stopping queue checker');
+                }
+            } else {
+                $this->__checkQueue();
+            }
+        });
     }
 
     /**