revbot.js 0.0.8 → 0.0.11

package/dist/index.d.mts

@@ -124,6 +124,7 @@ declare class BitField {
 
 declare class RestClient {
     private readonly client;
+    private rateLimitQueue;
     constructor(client: BaseClient);
     /**
      * Helper function to handle API requests.
@@ -134,6 +135,7 @@ declare class RestClient {
      * @returns The API response.
      */
     private request;
+    private retryRequest;
     /**
      * GET request.
      * @param url The URL for the request.
@@ -176,6 +178,7 @@ declare class RestClient {
 
 declare class CDNClient {
     private readonly client;
+    private rateLimitQueue;
     constructor(client: BaseClient);
     /**
      * Helper function to handle API requests.
@@ -186,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

@@ -124,6 +124,7 @@ declare class BitField {
 
 declare class RestClient {
     private readonly client;
+    private rateLimitQueue;
     constructor(client: BaseClient);
     /**
      * Helper function to handle API requests.
@@ -134,6 +135,7 @@ declare class RestClient {
      * @returns The API response.
      */
     private request;
+    private retryRequest;
     /**
      * GET request.
      * @param url The URL for the request.
@@ -176,6 +178,7 @@ declare class RestClient {
 
 declare class CDNClient {
     private readonly client;
+    private rateLimitQueue;
     constructor(client: BaseClient);
     /**
      * Helper function to handle API requests.
@@ -186,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

@@ -3232,15 +3232,96 @@ var ServerMemberManager = class extends BaseManager {
 var import_node_events = require("events");
 
 // src/rest/restClient.ts
-var import_axios3 = __toESM(require("axios"));
+var import_axios4 = require("axios");
 
 // package.json
-var version = "0.0.8";
+var version = "0.0.11";
+
+// src/rest/restUtils/rateLimitQueue.ts
+var import_axios3 = __toESM(require("axios"));
+var RateLimitQueue = class {
+  constructor() {
+    this.bucketMap = /* @__PURE__ */ new Map();
+    this.pathToBucket = /* @__PURE__ */ new Map();
+  }
+  request(config) {
+    return __async(this, null, function* () {
+      const path = config.url;
+      const bucketId = this.pathToBucket.get(path);
+      let bucket = bucketId ? this.bucketMap.get(bucketId) : void 0;
+      if (bucket && bucket.remaining <= 0 && Date.now() < bucket.resetAfter) {
+        return new Promise((resolve, reject) => {
+          bucket.queue.push(() => __async(this, null, function* () {
+            try {
+              const res = yield this._doRequest(config, path);
+              resolve(res);
+            } catch (e) {
+              reject(e);
+            }
+          }));
+        });
+      } else {
+        return this._doRequest(config, path);
+      }
+    });
+  }
+  _doRequest(config, path) {
+    return __async(this, null, function* () {
+      const response = yield (0, import_axios3.default)(config);
+      this._updateRateLimit(path, response);
+      return response;
+    });
+  }
+  _updateRateLimit(path, response) {
+    const headers = response.headers;
+    const limit = parseInt(headers["x-ratelimit-limit"]);
+    const remaining = parseInt(headers["x-ratelimit-remaining"]);
+    const resetAfter = parseFloat(headers["x-ratelimit-reset-after"]) * 1e3 + Date.now();
+    const bucket = headers["x-ratelimit-bucket"];
+    const resetIn = parseInt(headers["x-ratelimit-reset-after"]);
+    if (!bucket) return;
+    this.pathToBucket.set(path, bucket);
+    let state = this.bucketMap.get(bucket);
+    if (!state) {
+      state = {
+        limit,
+        remaining,
+        resetAfter,
+        bucket,
+        resetIn,
+        queue: [],
+        lastPath: path
+      };
+      this.bucketMap.set(bucket, state);
+    } else {
+      state.limit = limit;
+      state.remaining = remaining;
+      state.resetAfter = resetAfter;
+      state.lastPath = path;
+    }
+    if (remaining <= 0) {
+      if (state.resetTimeout) clearTimeout(state.resetTimeout);
+      const delay = resetIn;
+      state.resetTimeout = setTimeout(() => {
+        state.remaining = state.limit;
+        state.resetTimeout = void 0;
+        while (state.queue.length > 0 && state.remaining > 0) {
+          const fn = state.queue.shift();
+          if (fn) {
+            state.remaining--;
+            fn();
+          }
+        }
+      }, delay);
+    }
+  }
+};
 
 // src/rest/restClient.ts
 var RestClient = class {
   constructor(client3) {
     this.client = client3;
+    this.rateLimitQueue = new RateLimitQueue();
   }
   /**
    * Helper function to handle API requests.
@@ -3250,12 +3331,13 @@ 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";
-        const config = {
+        const config = __spreadProps(__spreadValues({}, {
           method,
           url: `${apiUrl}${url}`,
           params: query,
@@ -3264,12 +3346,49 @@ var RestClient = class {
             [authHeader]: this.client.token,
             "User-Agent": `RevBot.js/${version}`
           }
-        };
-        const response = yield (0, import_axios3.default)(config);
+        }), {
+          url: `${apiUrl}${url}`
+        });
+        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);
       }
     });
   }
@@ -3334,10 +3453,11 @@ var RestClient = class {
 };
 
 // src/rest/CDNClient.ts
-var import_axios4 = __toESM(require("axios"));
+var import_axios5 = require("axios");
 var CDNClient = class {
   constructor(client3) {
     this.client = client3;
+    this.rateLimitQueue = new RateLimitQueue();
   }
   /**
    * Helper function to handle API requests.
@@ -3347,12 +3467,12 @@ 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");
         const authHeader = this.client.bot ? "X-Bot-Token" : "X-Session-Token";
-        const config = {
+        const config = __spreadProps(__spreadValues({}, {
           method,
           url: `${cdnUrl}${url}`,
           params: query,
@@ -3363,12 +3483,50 @@ var CDNClient = class {
             "Content-Type": "multipart/form-data",
             "User-Agent": `RevBot.js/${version}`
           }, data.getHeaders())
-        };
-        const response = yield (0, import_axios4.default)(config);
+        }), {
+          url: `${cdnUrl}${url}`
+        });
+        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);
       }
     });
   }
@@ -3401,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);
@@ -3637,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

@@ -3158,15 +3158,96 @@ var ServerMemberManager = class extends BaseManager {
 import { EventEmitter } from "node:events";
 
 // src/rest/restClient.ts
-import axios3 from "axios";
+import { AxiosError } from "axios";
 
 // package.json
-var version = "0.0.8";
+var version = "0.0.11";
+
+// src/rest/restUtils/rateLimitQueue.ts
+import axios3 from "axios";
+var RateLimitQueue = class {
+  constructor() {
+    this.bucketMap = /* @__PURE__ */ new Map();
+    this.pathToBucket = /* @__PURE__ */ new Map();
+  }
+  request(config) {
+    return __async(this, null, function* () {
+      const path = config.url;
+      const bucketId = this.pathToBucket.get(path);
+      let bucket = bucketId ? this.bucketMap.get(bucketId) : void 0;
+      if (bucket && bucket.remaining <= 0 && Date.now() < bucket.resetAfter) {
+        return new Promise((resolve, reject) => {
+          bucket.queue.push(() => __async(this, null, function* () {
+            try {
+              const res = yield this._doRequest(config, path);
+              resolve(res);
+            } catch (e) {
+              reject(e);
+            }
+          }));
+        });
+      } else {
+        return this._doRequest(config, path);
+      }
+    });
+  }
+  _doRequest(config, path) {
+    return __async(this, null, function* () {
+      const response = yield axios3(config);
+      this._updateRateLimit(path, response);
+      return response;
+    });
+  }
+  _updateRateLimit(path, response) {
+    const headers = response.headers;
+    const limit = parseInt(headers["x-ratelimit-limit"]);
+    const remaining = parseInt(headers["x-ratelimit-remaining"]);
+    const resetAfter = parseFloat(headers["x-ratelimit-reset-after"]) * 1e3 + Date.now();
+    const bucket = headers["x-ratelimit-bucket"];
+    const resetIn = parseInt(headers["x-ratelimit-reset-after"]);
+    if (!bucket) return;
+    this.pathToBucket.set(path, bucket);
+    let state = this.bucketMap.get(bucket);
+    if (!state) {
+      state = {
+        limit,
+        remaining,
+        resetAfter,
+        bucket,
+        resetIn,
+        queue: [],
+        lastPath: path
+      };
+      this.bucketMap.set(bucket, state);
+    } else {
+      state.limit = limit;
+      state.remaining = remaining;
+      state.resetAfter = resetAfter;
+      state.lastPath = path;
+    }
+    if (remaining <= 0) {
+      if (state.resetTimeout) clearTimeout(state.resetTimeout);
+      const delay = resetIn;
+      state.resetTimeout = setTimeout(() => {
+        state.remaining = state.limit;
+        state.resetTimeout = void 0;
+        while (state.queue.length > 0 && state.remaining > 0) {
+          const fn = state.queue.shift();
+          if (fn) {
+            state.remaining--;
+            fn();
+          }
+        }
+      }, delay);
+    }
+  }
+};
 
 // src/rest/restClient.ts
 var RestClient = class {
   constructor(client3) {
     this.client = client3;
+    this.rateLimitQueue = new RateLimitQueue();
   }
   /**
    * Helper function to handle API requests.
@@ -3176,12 +3257,13 @@ 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";
-        const config = {
+        const config = __spreadProps(__spreadValues({}, {
           method,
           url: `${apiUrl}${url}`,
           params: query,
@@ -3190,12 +3272,49 @@ var RestClient = class {
             [authHeader]: this.client.token,
             "User-Agent": `RevBot.js/${version}`
           }
-        };
-        const response = yield axios3(config);
+        }), {
+          url: `${apiUrl}${url}`
+        });
+        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);
       }
     });
   }
@@ -3260,10 +3379,11 @@ var RestClient = class {
 };
 
 // src/rest/CDNClient.ts
-import axios4 from "axios";
+import { AxiosError as AxiosError2 } from "axios";
 var CDNClient = class {
   constructor(client3) {
     this.client = client3;
+    this.rateLimitQueue = new RateLimitQueue();
   }
   /**
    * Helper function to handle API requests.
@@ -3273,12 +3393,12 @@ 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");
         const authHeader = this.client.bot ? "X-Bot-Token" : "X-Session-Token";
-        const config = {
+        const config = __spreadProps(__spreadValues({}, {
           method,
           url: `${cdnUrl}${url}`,
           params: query,
@@ -3289,12 +3409,50 @@ var CDNClient = class {
             "Content-Type": "multipart/form-data",
             "User-Agent": `RevBot.js/${version}`
           }, data.getHeaders())
-        };
-        const response = yield axios4(config);
+        }), {
+          url: `${cdnUrl}${url}`
+        });
+        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);
       }
     });
   }
@@ -3327,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);
@@ -3563,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.8",
+  "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",