Interaction endpoints bypass concurrency limit

Author: valzargaming

src/Discord/Http.php

@@ -121,6 +121,14 @@ class Http
      */
     protected $queue;
 
+    /**
+     * Request queue to prevent API
+     * overload.
+     *
+     * @var SplQueue
+     */
+    protected $interactionQueue;
+
     /**
      * Number of requests that are waiting for a response.
      *
@@ -148,6 +156,7 @@ public function __construct(string $token, LoopInterface $loop, LoggerInterface
         $this->logger = $logger;
         $this->driver = $driver;
         $this->queue = new SplQueue;
+        $this->interactionQueue = new SplQueue;
 
         $this->promiseV3 = str_starts_with(InstalledVersions::getVersion('react/promise'), '3.');
     }
@@ -451,7 +460,9 @@ protected function getBucket(string $key): Bucket
         if (! isset($this->buckets[$key])) {
             $bucket = new Bucket($key, $this->loop, $this->logger, function (Request $request) {
                 $deferred = new Deferred();
-                $this->queue->enqueue([$request, $deferred]);
+                self::isInteractionEndpoint($request)
+                    ? $this->interactionQueue->enqueue([$request, $deferred])
+                    : $this->queue->enqueue([$request, $deferred]);
                 $this->checkQueue();
 
                 return $deferred->promise();
@@ -469,8 +480,10 @@ protected function getBucket(string $key): Bucket
      */
     protected function checkQueue(): void
     {
+        $this->checkInteractionQueue();
+
         if ($this->waiting >= static::CONCURRENT_REQUESTS || $this->queue->isEmpty()) {
-            $this->logger->debug('http not checking', ['waiting' => $this->waiting, 'empty' => $this->queue->isEmpty()]);
+            $this->logger->debug('http not checking queue', ['waiting' => $this->waiting, 'empty' => $this->queue->isEmpty()]);
 
             return;
         }
@@ -493,6 +506,47 @@ protected function checkQueue(): void
         });
     }
 
+    /**
+     * Checks the interaction queue to see if more requests can be
+     * sent out.
+     */
+    protected function checkInteractionQueue(): void
+    {
+        if ($this->interactionQueue->isEmpty()) {
+            $this->logger->debug('http not checking interaction queue', ['waiting' => $this->waiting, 'empty' => $this->interactionQueue->isEmpty()]);
+
+            return;
+        }
+
+        /**
+         * @var Request  $request
+         * @var Deferred $deferred
+         */
+        [$request, $deferred] = $this->interactionQueue->dequeue();
+
+        $this->executeRequest($request)->then(function ($result) use ($deferred) {
+            $this->checkQueue();
+            $deferred->resolve($result);
+        }, function ($e) use ($deferred) {
+            $this->checkQueue();
+            $deferred->reject($e);
+        });
+    }
+
+    /**
+     * Checks if the request is for an interaction endpoint.
+     * 
+     * @link https://discord.com/developers/docs/interactions/receiving-and-responding#endpoints
+     *
+     * @param Request $request
+     * @return bool
+     */
+    public static function isInteractionEndpoint(Request $request): bool
+    {
+        $endpoint = (string) $request->getUrl();
+        return strpos($endpoint, '/interactions') === 0;
+    }
+
     /**
      * Returns an exception based on the request.
      *