revbot.js 0.2.0 → 0.2.2

package/README.md

@@ -3,7 +3,7 @@
 # Note: this package is currently in the early stages of development and testing
 
 `revbot.js` is a Node.js library for building bots on the Revolt platform. It provides an easy-to-use interface for interacting with Revolt's API, managing events, and handling various bot functionalities. NOTE: node 21 is required to run this
-[revolt server](https://rvlt.gg/2NcCgYZ0) [docs](https://jade3375.github.io/revbot.js/)
+[revolt server](https://stt.gg/cFSwBt4R) [docs](https://jade3375.github.io/revbot.js/)
 
 ## Installation
 

package/dist/index.d.mts

@@ -2190,6 +2190,8 @@ declare class WebSocketClient {
     reconnecting: Promise<unknown> | null;
     /** Whether the WebSocket client is ready. */
     ready: boolean;
+    /** The number of reconnection attempts made. */
+    retryCount: number;
     /**
      * Creates a new WebSocketClient instance.
      *
@@ -2272,7 +2274,7 @@ declare class WebSocketClient {
      *
      * @returns {Promise<void>} A promise that resolves when the connection is destroyed.
      */
-    destroy(): Promise<void>;
+    destroy(isUserInitiated?: boolean): Promise<void>;
 }
 
 /**

package/dist/index.d.ts

@@ -2190,6 +2190,8 @@ declare class WebSocketClient {
     reconnecting: Promise<unknown> | null;
     /** Whether the WebSocket client is ready. */
     ready: boolean;
+    /** The number of reconnection attempts made. */
+    retryCount: number;
     /**
      * Creates a new WebSocketClient instance.
      *
@@ -2272,7 +2274,7 @@ declare class WebSocketClient {
      *
      * @returns {Promise<void>} A promise that resolves when the connection is destroyed.
      */
-    destroy(): Promise<void>;
+    destroy(isUserInitiated?: boolean): Promise<void>;
 }
 
 /**

package/dist/index.js

@@ -3304,7 +3304,7 @@ var import_node_events = require("events");
 var import_axios4 = __toESM(require("axios"));
 
 // package.json
-var version = "0.2.0";
+var version = "0.2.1";
 
 // src/rest/restUtils/rateLimitQueue.ts
 var import_axios3 = __toESM(require("axios"));
@@ -3869,6 +3869,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) {
@@ -4303,6 +4306,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.
@@ -4442,6 +4447,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.`);
@@ -4501,6 +4508,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) {
@@ -4528,7 +4544,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);
@@ -4537,11 +4553,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();
       }
     });
@@ -4633,7 +4658,7 @@ var client2 = class extends BaseClient {
       this.token = null;
       this.user = null;
       this.readyAt = null;
-      yield this.ws.destroy();
+      yield this.ws.destroy(true);
     });
   }
   /**