revbot.js 0.0.9 → 0.0.11

package/dist/index.d.mts

@@ -135,6 +135,7 @@ declare class RestClient {
      * @returns The API response.
      */
     private request;
+    private retryRequest;
     /**
      * GET request.
      * @param url The URL for the request.
@@ -188,6 +189,7 @@ declare class CDNClient {
      * @returns The API response.
      */
     private request;
+    private retryRequest;
     /**
      * POST request.
      * @param url The URL for the request.

package/dist/index.d.ts

@@ -135,6 +135,7 @@ declare class RestClient {
      * @returns The API response.
      */
     private request;
+    private retryRequest;
     /**
      * GET request.
      * @param url The URL for the request.
@@ -188,6 +189,7 @@ declare class CDNClient {
      * @returns The API response.
      */
     private request;
+    private retryRequest;
     /**
      * POST request.
      * @param url The URL for the request.

package/dist/index.js

@@ -3231,8 +3231,11 @@ var ServerMemberManager = class extends BaseManager {
 // src/client/baseClient.ts
 var import_node_events = require("events");
 
+// src/rest/restClient.ts
+var import_axios4 = require("axios");
+
 // package.json
-var version = "0.0.9";
+var version = "0.0.11";
 
 // src/rest/restUtils/rateLimitQueue.ts
 var import_axios3 = __toESM(require("axios"));
@@ -3296,13 +3299,7 @@ var RateLimitQueue = class {
       state.resetAfter = resetAfter;
       state.lastPath = path;
     }
-    console.log(
-      `Rate limit updated for bucket ${bucket} on path ${path}. Limit: ${limit}, Remaining: ${remaining}, Reset after: ${resetAfter} ms`
-    );
     if (remaining <= 0) {
-      console.warn(
-        `Rate limit exceeded for bucket ${bucket} on path ${path}. Remaining: ${remaining}, Reset after: ${new Date(resetAfter).toISOString()}`
-      );
       if (state.resetTimeout) clearTimeout(state.resetTimeout);
       const delay = resetIn;
       state.resetTimeout = setTimeout(() => {
@@ -3334,8 +3331,9 @@ var RestClient = class {
    * @param query Query parameters (if applicable).
    * @returns The API response.
    */
-  request(method, url, body, query) {
+  request(method, url, body, query, retry) {
     return __async(this, null, function* () {
+      var _a;
       try {
         if (!this.client.token) throw new Error("Token is required");
         const authHeader = this.client.bot ? "X-Bot-Token" : "X-Session-Token";
@@ -3354,8 +3352,43 @@ var RestClient = class {
         const response = yield this.rateLimitQueue.request(config);
         return response.data;
       } catch (error) {
-        console.error("API call failed:", error);
-        throw error;
+        if (retry) throw typeof error;
+        if (error instanceof import_axios4.AxiosError) {
+          if (error.status && (error.status === 429 || error.status >= 500)) {
+            return this.retryRequest(0, method, url, body, query);
+          }
+          if (error.status) {
+            throw new Error(
+              `API call failed with status ${error.status}: ${(_a = error.response) == null ? void 0 : _a.statusText}`
+            );
+          }
+        }
+        throw new Error(
+          `API call failed: ${error instanceof Error ? error.message : error}`
+        );
+      }
+    });
+  }
+  retryRequest(attempt = 0, method, url, body, query) {
+    return __async(this, null, function* () {
+      var _a, _b;
+      if (attempt >= ((_b = (_a = this.client.options.rest) == null ? void 0 : _a.retries) != null ? _b : 3)) {
+        throw new Error("Max retries reached");
+      }
+      try {
+        return yield this.request(method, url, body, query, true);
+      } catch (error) {
+        console.warn(`Attempt ${attempt + 1} failed:`, error);
+        yield new Promise(
+          (resolve) => {
+            var _a2, _b2, _c;
+            return setTimeout(
+              resolve,
+              (_c = (_a2 = this.client.options.rest) == null ? void 0 : _a2.timeout) != null ? _c : (_b2 = DEFAULT_CLIENT_OPTIONS.rest) == null ? void 0 : _b2.timeout
+            );
+          }
+        );
+        return this.retryRequest(attempt + 1, method, url, body, query);
       }
     });
   }
@@ -3420,6 +3453,7 @@ var RestClient = class {
 };
 
 // src/rest/CDNClient.ts
+var import_axios5 = require("axios");
 var CDNClient = class {
   constructor(client3) {
     this.client = client3;
@@ -3433,7 +3467,7 @@ var CDNClient = class {
    * @param query Query parameters (if applicable).
    * @returns The API response.
    */
-  request(method, url, data, query) {
+  request(method, url, data, query, retry) {
     return __async(this, null, function* () {
       try {
         if (!this.client.token) throw new Error("Token is required");
@@ -3455,8 +3489,44 @@ var CDNClient = class {
         const response = yield this.rateLimitQueue.request(config);
         return response.data;
       } catch (error) {
-        console.error("API call failed:", error);
-        throw error;
+        if (retry) throw typeof error;
+        if (error instanceof import_axios5.AxiosError) {
+          if (error.status && (error.status === 429 || error.status >= 500)) {
+            return this.retryRequest(0, method, url, data, query);
+          }
+          if (error.status) {
+            console.error(`API call failed with status ${error.status}:`, error);
+            throw new Error(
+              `API call failed with status ${error.status}: ${error.message}`
+            );
+          }
+        }
+        throw new Error(
+          `API call failed: ${error instanceof Error ? error.message : error}`
+        );
+      }
+    });
+  }
+  retryRequest(attempt = 0, method, url, body, query) {
+    return __async(this, null, function* () {
+      var _a, _b;
+      if (attempt >= ((_b = (_a = this.client.options.rest) == null ? void 0 : _a.retries) != null ? _b : 3)) {
+        throw new Error("Max retries reached");
+      }
+      try {
+        return yield this.request(method, url, body, query, true);
+      } catch (error) {
+        console.warn(`Attempt ${attempt + 1} failed:`, error);
+        yield new Promise(
+          (resolve) => {
+            var _a2, _b2, _c;
+            return setTimeout(
+              resolve,
+              (_c = (_a2 = this.client.options.rest) == null ? void 0 : _a2.timeout) != null ? _c : (_b2 = DEFAULT_CLIENT_OPTIONS.rest) == null ? void 0 : _b2.timeout
+            );
+          }
+        );
+        return this.retryRequest(attempt + 1, method, url, body, query);
       }
     });
   }
@@ -3489,7 +3559,7 @@ var BaseClient = class extends import_node_events.EventEmitter {
     __privateAdd(this, _token, null);
     /** Whether the client is a bot. */
     this.bot = true;
-    this.options = __spreadValues({}, options);
+    this.options = __spreadValues(__spreadValues({}, DEFAULT_CLIENT_OPTIONS), options);
     this.bot = (_a = this.options.isBot) != null ? _a : true;
     this.api = new RestClient(this);
     this.cdn = new CDNClient(this);
@@ -3725,7 +3795,7 @@ var Message6 = class extends Event {
       const channel = this.client.channels.cache.get(data.channel);
       if (channel == null ? void 0 : channel.isText()) {
         const message = channel.messages._add(data);
-        if (data.author !== SYSTEM_USER_ID) {
+        if (data.author !== SYSTEM_USER_ID && !data.webhook) {
           yield this.client.users.fetch(data.author, { force: false });
         }
         this.client.emit("message" /* MESSAGE */, message);

package/dist/index.mjs

@@ -3157,8 +3157,11 @@ var ServerMemberManager = class extends BaseManager {
 // src/client/baseClient.ts
 import { EventEmitter } from "node:events";
 
+// src/rest/restClient.ts
+import { AxiosError } from "axios";
+
 // package.json
-var version = "0.0.9";
+var version = "0.0.11";
 
 // src/rest/restUtils/rateLimitQueue.ts
 import axios3 from "axios";
@@ -3222,13 +3225,7 @@ var RateLimitQueue = class {
       state.resetAfter = resetAfter;
       state.lastPath = path;
     }
-    console.log(
-      `Rate limit updated for bucket ${bucket} on path ${path}. Limit: ${limit}, Remaining: ${remaining}, Reset after: ${resetAfter} ms`
-    );
     if (remaining <= 0) {
-      console.warn(
-        `Rate limit exceeded for bucket ${bucket} on path ${path}. Remaining: ${remaining}, Reset after: ${new Date(resetAfter).toISOString()}`
-      );
       if (state.resetTimeout) clearTimeout(state.resetTimeout);
       const delay = resetIn;
       state.resetTimeout = setTimeout(() => {
@@ -3260,8 +3257,9 @@ var RestClient = class {
    * @param query Query parameters (if applicable).
    * @returns The API response.
    */
-  request(method, url, body, query) {
+  request(method, url, body, query, retry) {
     return __async(this, null, function* () {
+      var _a;
       try {
         if (!this.client.token) throw new Error("Token is required");
         const authHeader = this.client.bot ? "X-Bot-Token" : "X-Session-Token";
@@ -3280,8 +3278,43 @@ var RestClient = class {
         const response = yield this.rateLimitQueue.request(config);
         return response.data;
       } catch (error) {
-        console.error("API call failed:", error);
-        throw error;
+        if (retry) throw typeof error;
+        if (error instanceof AxiosError) {
+          if (error.status && (error.status === 429 || error.status >= 500)) {
+            return this.retryRequest(0, method, url, body, query);
+          }
+          if (error.status) {
+            throw new Error(
+              `API call failed with status ${error.status}: ${(_a = error.response) == null ? void 0 : _a.statusText}`
+            );
+          }
+        }
+        throw new Error(
+          `API call failed: ${error instanceof Error ? error.message : error}`
+        );
+      }
+    });
+  }
+  retryRequest(attempt = 0, method, url, body, query) {
+    return __async(this, null, function* () {
+      var _a, _b;
+      if (attempt >= ((_b = (_a = this.client.options.rest) == null ? void 0 : _a.retries) != null ? _b : 3)) {
+        throw new Error("Max retries reached");
+      }
+      try {
+        return yield this.request(method, url, body, query, true);
+      } catch (error) {
+        console.warn(`Attempt ${attempt + 1} failed:`, error);
+        yield new Promise(
+          (resolve) => {
+            var _a2, _b2, _c;
+            return setTimeout(
+              resolve,
+              (_c = (_a2 = this.client.options.rest) == null ? void 0 : _a2.timeout) != null ? _c : (_b2 = DEFAULT_CLIENT_OPTIONS.rest) == null ? void 0 : _b2.timeout
+            );
+          }
+        );
+        return this.retryRequest(attempt + 1, method, url, body, query);
       }
     });
   }
@@ -3346,6 +3379,7 @@ var RestClient = class {
 };
 
 // src/rest/CDNClient.ts
+import { AxiosError as AxiosError2 } from "axios";
 var CDNClient = class {
   constructor(client3) {
     this.client = client3;
@@ -3359,7 +3393,7 @@ var CDNClient = class {
    * @param query Query parameters (if applicable).
    * @returns The API response.
    */
-  request(method, url, data, query) {
+  request(method, url, data, query, retry) {
     return __async(this, null, function* () {
       try {
         if (!this.client.token) throw new Error("Token is required");
@@ -3381,8 +3415,44 @@ var CDNClient = class {
         const response = yield this.rateLimitQueue.request(config);
         return response.data;
       } catch (error) {
-        console.error("API call failed:", error);
-        throw error;
+        if (retry) throw typeof error;
+        if (error instanceof AxiosError2) {
+          if (error.status && (error.status === 429 || error.status >= 500)) {
+            return this.retryRequest(0, method, url, data, query);
+          }
+          if (error.status) {
+            console.error(`API call failed with status ${error.status}:`, error);
+            throw new Error(
+              `API call failed with status ${error.status}: ${error.message}`
+            );
+          }
+        }
+        throw new Error(
+          `API call failed: ${error instanceof Error ? error.message : error}`
+        );
+      }
+    });
+  }
+  retryRequest(attempt = 0, method, url, body, query) {
+    return __async(this, null, function* () {
+      var _a, _b;
+      if (attempt >= ((_b = (_a = this.client.options.rest) == null ? void 0 : _a.retries) != null ? _b : 3)) {
+        throw new Error("Max retries reached");
+      }
+      try {
+        return yield this.request(method, url, body, query, true);
+      } catch (error) {
+        console.warn(`Attempt ${attempt + 1} failed:`, error);
+        yield new Promise(
+          (resolve) => {
+            var _a2, _b2, _c;
+            return setTimeout(
+              resolve,
+              (_c = (_a2 = this.client.options.rest) == null ? void 0 : _a2.timeout) != null ? _c : (_b2 = DEFAULT_CLIENT_OPTIONS.rest) == null ? void 0 : _b2.timeout
+            );
+          }
+        );
+        return this.retryRequest(attempt + 1, method, url, body, query);
       }
     });
   }
@@ -3415,7 +3485,7 @@ var BaseClient = class extends EventEmitter {
     __privateAdd(this, _token, null);
     /** Whether the client is a bot. */
     this.bot = true;
-    this.options = __spreadValues({}, options);
+    this.options = __spreadValues(__spreadValues({}, DEFAULT_CLIENT_OPTIONS), options);
     this.bot = (_a = this.options.isBot) != null ? _a : true;
     this.api = new RestClient(this);
     this.cdn = new CDNClient(this);
@@ -3651,7 +3721,7 @@ var Message6 = class extends Event {
       const channel = this.client.channels.cache.get(data.channel);
       if (channel == null ? void 0 : channel.isText()) {
         const message = channel.messages._add(data);
-        if (data.author !== SYSTEM_USER_ID) {
+        if (data.author !== SYSTEM_USER_ID && !data.webhook) {
           yield this.client.users.fetch(data.author, { force: false });
         }
         this.client.emit("message" /* MESSAGE */, message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "revbot.js",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "A Revolt bot client used to interact with the revolt api for Node.js, written in TypeScript.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",