Webpack build for branch wsrewrite: a75d2efc291481f0cc96873bfd7aecca67e20291

discord.wsrewrite.js

@@ -24520,39 +24520,42 @@ class SequentialRequestHandler extends RequestHandler {
   execute(item) {
     this.busy = true;
     return new Promise(resolve => {
-      item.request.gen().end((err, res) => {
-        if (res && res.headers) {
-          this.requestLimit = Number(res.headers['x-ratelimit-limit']);
-          this.requestResetTime = Number(res.headers['x-ratelimit-reset']) * 1000;
-          this.requestRemaining = Number(res.headers['x-ratelimit-remaining']);
-          this.timeDifference = Date.now() - new Date(res.headers.date).getTime();
-        }
-        if (err) {
-          if (err.status === 429) {
-            this.queue.unshift(item);
-            this.restManager.client.setTimeout(() => {
-              this.globalLimit = false;
-              resolve();
-            }, Number(res.headers['retry-after']) + this.restManager.client.options.restTimeOffset);
-            if (res.headers['x-ratelimit-global']) this.globalLimit = true;
-          } else {
-            item.reject(err);
-            resolve(err);
+      item.request
+        .gen()
+        .on('error', e => item.reject(e))
+        .end((err, res) => {
+          if (res && res.headers) {
+            this.requestLimit = Number(res.headers['x-ratelimit-limit']);
+            this.requestResetTime = Number(res.headers['x-ratelimit-reset']) * 1000;
+            this.requestRemaining = Number(res.headers['x-ratelimit-remaining']);
+            this.timeDifference = Date.now() - new Date(res.headers.date).getTime();
           }
-        } else {
-          this.globalLimit = false;
-          const data = res && res.body ? res.body : {};
-          item.resolve(data);
-          if (this.requestRemaining === 0) {
-            this.restManager.client.setTimeout(
+          if (err) {
+            if (err.status === 429) {
+              this.queue.unshift(item);
+              this.restManager.client.setTimeout(() => {
+                this.globalLimit = false;
+                resolve();
+              }, Number(res.headers['retry-after']) + this.restManager.client.options.restTimeOffset);
+              if (res.headers['x-ratelimit-global']) this.globalLimit = true;
+            } else {
+              item.reject(err);
+              resolve(err);
+            }
+          } else {
+            this.globalLimit = false;
+            const data = res && res.body ? res.body : {};
+            item.resolve(data);
+            if (this.requestRemaining === 0) {
+              this.restManager.client.setTimeout(
               () => resolve(data),
               this.requestResetTime - Date.now() + this.timeDifference + this.restManager.client.options.restTimeOffset
             );
-          } else {
-            resolve(data);
+            } else {
+              resolve(data);
+            }
           }
-        }
-      });
+        });
     });
   }
 
@@ -24656,6 +24659,11 @@ class WebSocketManager extends EventEmitter {
     return this.connection.destroy();
   }
 
+  send(packet) {
+    if (!this.connection) return this.debug('No connection to websocket');
+    return this.connection.send(packet);
+  }
+
   connect(gateway) {
     if (!this.connection) {
       this.connection = new WebSocketConnection(this, gateway);