revbot.js 0.0.8 → 0.0.9

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.
@@ -176,6 +177,7 @@ declare class RestClient {
 
 declare class CDNClient {
     private readonly client;
+    private rateLimitQueue;
     constructor(client: BaseClient);
     /**
      * Helper function to handle API requests.

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.
@@ -176,6 +177,7 @@ declare class RestClient {
 
 declare class CDNClient {
     private readonly client;
+    private rateLimitQueue;
     constructor(client: BaseClient);
     /**
      * Helper function to handle API requests.

package/dist/index.js

@@ -3231,16 +3231,100 @@ var ServerMemberManager = class extends BaseManager {
 // src/client/baseClient.ts
 var import_node_events = require("events");
 
-// src/rest/restClient.ts
-var import_axios3 = __toESM(require("axios"));
-
 // package.json
-var version = "0.0.8";
+var version = "0.0.9";
+
+// 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;
+    }
+    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(() => {
+        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.
@@ -3255,7 +3339,7 @@ var RestClient = class {
       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,8 +3348,10 @@ 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);
@@ -3334,10 +3420,10 @@ var RestClient = class {
 };
 
 // src/rest/CDNClient.ts
-var import_axios4 = __toESM(require("axios"));
 var CDNClient = class {
   constructor(client3) {
     this.client = client3;
+    this.rateLimitQueue = new RateLimitQueue();
   }
   /**
    * Helper function to handle API requests.
@@ -3352,7 +3438,7 @@ var CDNClient = class {
       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,8 +3449,10 @@ 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);

package/dist/index.mjs

@@ -3157,16 +3157,100 @@ var ServerMemberManager = class extends BaseManager {
 // src/client/baseClient.ts
 import { EventEmitter } from "node:events";
 
-// src/rest/restClient.ts
-import axios3 from "axios";
-
 // package.json
-var version = "0.0.8";
+var version = "0.0.9";
+
+// 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;
+    }
+    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(() => {
+        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.
@@ -3181,7 +3265,7 @@ var RestClient = class {
       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,8 +3274,10 @@ 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);
@@ -3260,10 +3346,10 @@ var RestClient = class {
 };
 
 // src/rest/CDNClient.ts
-import axios4 from "axios";
 var CDNClient = class {
   constructor(client3) {
     this.client = client3;
+    this.rateLimitQueue = new RateLimitQueue();
   }
   /**
    * Helper function to handle API requests.
@@ -3278,7 +3364,7 @@ var CDNClient = class {
       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,8 +3375,10 @@ 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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "revbot.js",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "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",