revbot.js 0.2.0 → 0.2.2

package/dist/index.mjs

@@ -3228,7 +3228,7 @@ import { EventEmitter } from "node:events";
 import axios4, { AxiosError } from "axios";
 
 // package.json
-var version = "0.2.0";
+var version = "0.2.1";
 
 // src/rest/restUtils/rateLimitQueue.ts
 import axios3 from "axios";
@@ -3793,6 +3793,9 @@ var Message = class extends Event {
   handle(data) {
     return __async(this, null, function* () {
       var _a;
+      if (data.system) {
+        return {};
+      }
       const channel = this.client.channels.cache.get(data.channel);
       if (channel == null ? void 0 : channel.isText()) {
         if (((_a = data.user) == null ? void 0 : _a.bot) && this.client.options.ignoreBots) {
@@ -4227,6 +4230,8 @@ var WebSocketClient = class {
     this.reconnecting = null;
     /** Whether the WebSocket client is ready. */
     this.ready = false;
+    /** The number of reconnection attempts made. */
+    this.retryCount = 0;
   }
   /**
    * Logs a debug message.
@@ -4366,6 +4371,8 @@ var WebSocketClient = class {
           break;
         case "Authenticated" /* AUTHENTICATED */:
           this.connected = true;
+          this.retryCount = 0;
+          this.debug(`Successfully authenticated.`);
           break;
         case "Pong" /* PONG */:
           this.debug(`Received a heartbeat.`);
@@ -4425,6 +4432,15 @@ var WebSocketClient = class {
    * @returns {Promise<this>} A promise that resolves when the connection is established.
    */
   connect() {
+    this.retryCount = this.retryCount + 1;
+    if (this.retryCount > 10) {
+      this.debug("Max retry attempts reached");
+      return Promise.reject(
+        new Error(
+          "Max retry attempts reached on WS connection, try again later."
+        )
+      );
+    }
     return new Promise((resolve) => __async(this, null, function* () {
       var _a, _b, _c, _d;
       if (((_a = this.socket) == null ? void 0 : _a.readyState) === WebSocket.OPEN && this.ready) {
@@ -4452,7 +4468,7 @@ var WebSocketClient = class {
    *
    * @returns {Promise<void>} A promise that resolves when the connection is destroyed.
    */
-  destroy() {
+  destroy(isUserInitiated) {
     return new Promise((resolve) => {
       var _a;
       this.setHeartbeatTimer(-1);
@@ -4461,11 +4477,20 @@ var WebSocketClient = class {
       if (((_a = this.socket) == null ? void 0 : _a.readyState) === WebSocket.OPEN) {
         this.socket.addEventListener("close", () => {
           this.socket = null;
+          if (!isUserInitiated) {
+            setTimeout(() => this.connect(), 1e3);
+          }
           resolve();
         });
         this.socket.close();
+        if (!isUserInitiated) {
+          setTimeout(() => this.connect(), 1e3);
+        }
       } else {
         this.socket = null;
+        if (!isUserInitiated) {
+          setTimeout(() => this.connect(), 1e3);
+        }
         resolve();
       }
     });
@@ -4557,7 +4582,7 @@ var client2 = class extends BaseClient {
       this.token = null;
       this.user = null;
       this.readyAt = null;
-      yield this.ws.destroy();
+      yield this.ws.destroy(true);
     });
   }
   /**