@upstash/ratelimit 0.1.0-alpha.0 → 0.1.2

package/package.json

@@ -3,7 +3,7 @@
   "main": "./script/mod.js",
   "types": "./types/mod.d.ts",
   "name": "@upstash/ratelimit",
-  "version": "v0.1.0-alpha.0",
+  "version": "v0.1.2",
   "description": "A serverless ratelimiter built on top of Upstash REST API.",
   "repository": {
     "type": "git",
@@ -29,16 +29,16 @@
     "size-limit": "latest"
   },
   "peerDependencies": {
-    "@upstash/redis": "1.3.3-alpha.1"
+    "@upstash/redis": "^1.3.4"
   },
   "size-limit": [
     {
       "path": "esm/mod.js",
-      "limit": "2 KB"
+      "limit": "15 KB"
     },
     {
       "path": "script/mod.js",
-      "limit": "52 KB"
+      "limit": "15 KB"
     }
   ],
   "exports": {

package/script/global.js

@@ -0,0 +1,232 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GlobalRatelimit = void 0;
+const duration_js_1 = require("./duration.js");
+const ratelimit_js_1 = require("./ratelimit.js");
+/**
+ * Ratelimiter using serverless redis from https://upstash.com/
+ *
+ * @example
+ * ```ts
+ * const { limit } = new GlobalRatelimit({
+ *    redis: Redis.fromEnv(),
+ *    limiter: GlobalRatelimit.fixedWindow(
+ *      10,     // Allow 10 requests per window of 30 minutes
+ *      "30 m", // interval of 30 minutes
+ *    )
+ * })
+ *
+ * ```
+ */
+class GlobalRatelimit extends ratelimit_js_1.Ratelimit {
+    /**
+     * Create a new Ratelimit instance by providing a `@upstash/redis` instance and the algorithn of your choice.
+     */
+    constructor(config) {
+        super({
+            prefix: config.prefix,
+            limiter: config.limiter,
+            ctx: { redis: config.redis },
+        });
+    }
+    /**
+     * Each requests inside a fixed time increases a counter.
+     * Once the counter reaches a maxmimum allowed number, all further requests are
+     * rejected.
+     *
+     * **Pro:**
+     *
+     * - Newer requests are not starved by old ones.
+     * - Low storage cost.
+     *
+     * **Con:**
+     *
+     * A burst of requests near the boundary of a window can result in a very
+     * high request rate because two windows will be filled with requests quickly.
+     *
+     * @param tokens - How many requests a user can make in each time window.
+     * @param window - A fixed timeframe
+     */
+    static fixedWindow(
+    /**
+     * How many requests are allowed per window.
+     */
+    tokens, 
+    /**
+     * The duration in which `tokens` requests are allowed.
+     */
+    window) {
+        const windowDuration = (0, duration_js_1.ms)(window);
+        const script = `
+    local key     = KEYS[1]
+    local id      = ARGV[1]
+    local window  = ARGV[2]
+    
+    redis.call("SADD", key, id)
+    local members = redis.call("SMEMBERS", key)
+    if #members == 1 then
+    -- The first time this key is set, the value will be 1.
+    -- So we only need the expire command once
+      redis.call("PEXPIRE", key, window)
+    end
+    
+    return members
+`;
+        return async function (ctx, identifier) {
+            const requestID = crypto.randomUUID();
+            const bucket = Math.floor(Date.now() / windowDuration);
+            const key = [identifier, bucket].join(":");
+            const dbs = ctx.redis.map((redis) => ({
+                redis,
+                request: redis.eval(script, [key], [requestID, windowDuration]),
+            }));
+            const firstResponse = await Promise.any(dbs.map((s) => s.request));
+            const usedTokens = firstResponse.length;
+            const remaining = tokens - usedTokens - 1;
+            /**
+             * If the length between two databases does not match, we sync the two databases
+             */
+            async function sync() {
+                const individualIDs = await Promise.all(dbs.map((s) => s.request));
+                const allIDs = Array.from(new Set(individualIDs.flatMap((_) => _)).values());
+                for (const db of dbs) {
+                    const ids = await db.request;
+                    /**
+                     * If the bucket in this db is already full, it doesn't matter which ids it contains.
+                     * So we do not have to sync.
+                     */
+                    if (ids.length >= tokens) {
+                        continue;
+                    }
+                    const diff = allIDs.filter((id) => !ids.includes(id));
+                    /**
+                     * Don't waste a request if there is nothing to send
+                     */
+                    if (diff.length === 0) {
+                        continue;
+                    }
+                    await db.redis.sadd(key, ...allIDs);
+                }
+            }
+            /**
+             * Do not await sync. This should not run in the critical path.
+             */
+            sync();
+            return {
+                success: remaining > 0,
+                limit: tokens,
+                remaining,
+                reset: (bucket + 1) * windowDuration,
+            };
+        };
+    }
+    /**
+     * Combined approach of `slidingLogs` and `fixedWindow` with lower storage
+     * costs than `slidingLogs` and improved boundary behavior by calcualting a
+     * weighted score between two windows.
+     *
+     * **Pro:**
+     *
+     * Good performance allows this to scale to very high loads.
+     *
+     * **Con:**
+     *
+     * Nothing major.
+     *
+     * @param tokens - How many requests a user can make in each time window.
+     * @param window - The duration in which the user can max X requests.
+     */
+    static slidingWindow(
+    /**
+     * How many requests are allowed per window.
+     */
+    tokens, 
+    /**
+     * The duration in which `tokens` requests are allowed.
+     */
+    window) {
+        const windowSize = (0, duration_js_1.ms)(window);
+        const script = `
+      local currentKey  = KEYS[1]           -- identifier including prefixes
+      local previousKey = KEYS[2]           -- key of the previous bucket
+      local tokens      = tonumber(ARGV[1]) -- tokens per window
+      local now         = ARGV[2]           -- current timestamp in milliseconds
+      local window      = ARGV[3]           -- interval in milliseconds
+      local requestID   = ARGV[4]           -- uuid for this request
+
+
+      local currentMembers = redis.call("SMEMBERS", currentKey)
+      local requestsInCurrentWindow = #currentMembers
+      local previousMembers = redis.call("SMEMBERS", previousKey)
+      local requestsInPreviousWindow = #previousMembers
+
+      local percentageInCurrent = ( now % window) / window
+      if requestsInPreviousWindow * ( 1 - percentageInCurrent ) + requestsInCurrentWindow >= tokens then
+        return {currentMembers, previousMembers}
+      end
+
+      redis.call("SADD", currentKey, requestID)
+      table.insert(currentMembers, requestID)
+      if requestsInCurrentWindow == 0 then 
+        -- The first time this key is set, the value will be 1.
+        -- So we only need the expire command once
+        redis.call("PEXPIRE", currentKey, window * 2 + 1000) -- Enough time to overlap with a new window + 1 second
+      end
+      return {currentMembers, previousMembers}
+      `;
+        const windowDuration = (0, duration_js_1.ms)(window);
+        return async function (ctx, identifier) {
+            const requestID = crypto.randomUUID();
+            const now = Date.now();
+            const currentWindow = Math.floor(now / windowSize);
+            const currentKey = [identifier, currentWindow].join(":");
+            const previousWindow = currentWindow - windowSize;
+            const previousKey = [identifier, previousWindow].join(":");
+            const dbs = ctx.redis.map((redis) => ({
+                redis,
+                request: redis.eval(script, [currentKey, previousKey], [tokens, now, windowDuration, requestID]),
+            }));
+            const percentageInCurrent = (now % windowDuration) / windowDuration;
+            const [current, previous] = await Promise.any(dbs.map((s) => s.request));
+            const usedTokens = previous.length * (1 - percentageInCurrent) +
+                current.length;
+            const remaining = tokens - usedTokens;
+            /**
+             * If a database differs from the consensus, we sync it
+             */
+            async function sync() {
+                const [individualIDs] = await Promise.all(dbs.map((s) => s.request));
+                const allIDs = Array.from(new Set(individualIDs.flatMap((_) => _)).values());
+                for (const db of dbs) {
+                    const [ids] = await db.request;
+                    /**
+                     * If the bucket in this db is already full, it doesn't matter which ids it contains.
+                     * So we do not have to sync.
+                     */
+                    if (ids.length >= tokens) {
+                        continue;
+                    }
+                    const diff = allIDs.filter((id) => !ids.includes(id));
+                    /**
+                     * Don't waste a request if there is nothing to send
+                     */
+                    if (diff.length === 0) {
+                        continue;
+                    }
+                    await db.redis.sadd(currentKey, ...allIDs);
+                }
+            }
+            /**
+             * Do not await sync. This should not run in the critical path.
+             */
+            sync();
+            return {
+                success: remaining > 0,
+                limit: tokens,
+                remaining,
+                reset: (currentWindow + 1) * windowDuration,
+            };
+        };
+    }
+}
+exports.GlobalRatelimit = GlobalRatelimit;

package/script/mod.js

@@ -1,18 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./ratelimiter.js"), exports);
-__exportStar(require("./types.js"), exports);
+exports.GlobalRatelimit = exports.Ratelimit = void 0;
+var region_js_1 = require("./region.js");
+Object.defineProperty(exports, "Ratelimit", { enumerable: true, get: function () { return region_js_1.RegionRatelimit; } });
+var global_js_1 = require("./global.js");
+Object.defineProperty(exports, "GlobalRatelimit", { enumerable: true, get: function () { return global_js_1.GlobalRatelimit; } });

package/script/ratelimit.js

@@ -0,0 +1,133 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Ratelimit = void 0;
+/**
+ * Ratelimiter using serverless redis from https://upstash.com/
+ *
+ * @example
+ * ```ts
+ * const { limit } = new Ratelimit({
+ *    redis: Redis.fromEnv(),
+ *    limiter: Ratelimit.slidingWindow(
+ *      10,     // Allow 10 requests per window of 30 minutes
+ *      "30 m", // interval of 30 minutes
+ *    )
+ * })
+ *
+ * ```
+ */
+class Ratelimit {
+    constructor(config) {
+        Object.defineProperty(this, "limiter", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "ctx", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "prefix", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        /**
+         * Determine if a request should pass or be rejected based on the identifier and previously chosen ratelimit.
+         *
+         * Use this if you want to reject all requests that you can not handle right now.
+         *
+         * @example
+         * ```ts
+         *  const ratelimit = new Ratelimit({
+         *    redis: Redis.fromEnv(),
+         *    limiter: Ratelimit.slidingWindow(10, "10 s")
+         *  })
+         *
+         *  const { success } = await ratelimit.limit(id)
+         *  if (!success){
+         *    return "Nope"
+         *  }
+         *  return "Yes"
+         * ```
+         */
+        Object.defineProperty(this, "limit", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: async (identifier) => {
+                const key = [this.prefix, identifier].join(":");
+                return await this.limiter(this.ctx, key);
+            }
+        });
+        /**
+         * Block until the request may pass or timeout is reached.
+         *
+         * This method returns a promsie that resolves as soon as the request may be processed
+         * or after the timeoue has been reached.
+         *
+         * Use this if you want to delay the request until it is ready to get processed.
+         *
+         * @example
+         * ```ts
+         *  const ratelimit = new Ratelimit({
+         *    redis: Redis.fromEnv(),
+         *    limiter: Ratelimit.slidingWindow(10, "10 s")
+         *  })
+         *
+         *  const { success } = await ratelimit.blockUntilReady(id, 60_000)
+         *  if (!success){
+         *    return "Nope"
+         *  }
+         *  return "Yes"
+         * ```
+         */
+        Object.defineProperty(this, "blockUntilReady", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: async (
+            /**
+             * An identifier per user or api.
+             * Choose a userID, or api token, or ip address.
+             *
+             * If you want to globally limit your api, you can set a constant string.
+             */
+            identifier, 
+            /**
+             * Maximum duration to wait in milliseconds.
+             * After this time the request will be denied.
+             */
+            timeout) => {
+                if (timeout <= 0) {
+                    throw new Error("timeout must be positive");
+                }
+                let res;
+                const deadline = Date.now() + timeout;
+                while (true) {
+                    res = await this.limit(identifier);
+                    if (res.success) {
+                        break;
+                    }
+                    if (res.reset === 0) {
+                        throw new Error("This should not happen");
+                    }
+                    const wait = Math.min(res.reset, deadline) - Date.now();
+                    await new Promise((r) => setTimeout(r, wait));
+                    if (Date.now() > deadline) {
+                        break;
+                    }
+                }
+                return res;
+            }
+        });
+        this.ctx = config.ctx;
+        this.limiter = config.limiter;
+        this.prefix = config.prefix ?? "@upstash/ratelimit";
+    }
+}
+exports.Ratelimit = Ratelimit;

package/script/{ratelimiter.js → region.js}

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Ratelimit = void 0;
+exports.RegionRatelimit = void 0;
 const duration_js_1 = require("./duration.js");
+const ratelimit_js_1 = require("./ratelimit.js");
 /**
  * Ratelimiter using serverless redis from https://upstash.com/
  *
@@ -17,121 +18,16 @@ const duration_js_1 = require("./duration.js");
  *
  * ```
  */
-class Ratelimit {
+class RegionRatelimit extends ratelimit_js_1.Ratelimit {
     /**
      * Create a new Ratelimit instance by providing a `@upstash/redis` instance and the algorithn of your choice.
      */
     constructor(config) {
-        Object.defineProperty(this, "redis", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
+        super({
+            prefix: config.prefix,
+            limiter: config.limiter,
+            ctx: { redis: config.redis },
         });
-        Object.defineProperty(this, "limiter", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "prefix", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        /**
-         * Determine if a request should pass or be rejected based on the identifier and previously chosen ratelimit.
-         *
-         * Use this if you want to reject all requests that you can not handle right now.
-         *
-         * @example
-         * ```ts
-         *  const ratelimit = new Ratelimit({
-         *    redis: Redis.fromEnv(),
-         *    limiter: Ratelimit.slidingWindow(10, "10 s")
-         *  })
-         *
-         *  const { success } = await ratelimit.limit(id)
-         *  if (!success){
-         *    return "Nope"
-         *  }
-         *  return "Yes"
-         * ```
-         */
-        Object.defineProperty(this, "limit", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: async (identifier) => {
-                const key = [this.prefix, identifier].join(":");
-                return await this.limiter({ redis: this.redis }, key);
-            }
-        });
-        /**
-         * Block until the request may pass or timeout is reached.
-         *
-         * This method returns a promsie that resolves as soon as the request may be processed
-         * or after the timeoue has been reached.
-         *
-         * Use this if you want to delay the request until it is ready to get processed.
-         *
-         * @example
-         * ```ts
-         *  const ratelimit = new Ratelimit({
-         *    redis: Redis.fromEnv(),
-         *    limiter: Ratelimit.slidingWindow(10, "10 s")
-         *  })
-         *
-         *  const { success } = await ratelimit.blockUntilReady(id, 60_000)
-         *  if (!success){
-         *    return "Nope"
-         *  }
-         *  return "Yes"
-         * ```
-         */
-        Object.defineProperty(this, "blockUntilReady", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: async (
-            /**
-             * An identifier per user or api.
-             * Choose a userID, or api token, or ip address.
-             *
-             * If you want to globally limit your api, you can set a constant string.
-             */
-            identifier, 
-            /**
-             * Maximum duration to wait in milliseconds.
-             * After this time the request will be denied.
-             */
-            timeout) => {
-                if (timeout <= 0) {
-                    throw new Error("timeout must be positive");
-                }
-                let res;
-                const deadline = Date.now() + timeout;
-                while (true) {
-                    res = await this.limit(identifier);
-                    if (res.success) {
-                        break;
-                    }
-                    if (res.reset === 0) {
-                        throw new Error("This should not happen");
-                    }
-                    const wait = Math.min(res.reset, deadline) - Date.now();
-                    await new Promise((r) => setTimeout(r, wait));
-                    if (Date.now() > deadline) {
-                        break;
-                    }
-                }
-                return res;
-            }
-        });
-        this.redis = config.redis;
-        this.limiter = config.limiter;
-        this.prefix = config.prefix ?? "@upstash/ratelimit";
     }
     /**
      * Each requests inside a fixed time increases a counter.
@@ -186,54 +82,6 @@ class Ratelimit {
             };
         };
     }
-    // /**
-    //  * For each request all past requests in the last `{window}` are summed up and
-    //  * if they exceed `{tokens}`, the request will be rejected.
-    //  *
-    //  * **Pro:**
-    //  *
-    //  * Does not have the problem of `fixedWindow` at the window boundaries.
-    //  *
-    //  * **Con:**
-    //  *
-    //  * More expensive to store and compute, which makes this unsuitable for apis
-    //  * with very high traffic.
-    //  *
-    //  * @param window - The duration in which the user can max X requests.
-    //  * @param tokens - How many requests a user can make in each time window.
-    //  */
-    // static slidingLogs(window: Duration, tokens: number): Ratelimiter {
-    //   const script = `
-    //   local key         = KEYS[1] -- identifier including prefixes
-    //   local windowStart = ARGV[1] -- timestamp of window start
-    //   local windowEnd   = ARGV[2] -- timestamp of window end
-    //   local tokens      = ARGV[3] -- tokens per window
-    //   local now         = ARGV[4] -- current timestamp
-    //   local count = redis.call("ZCOUNT", key, windowStart, windowEnd)
-    //   if count < tonumber(tokens) then
-    //     -- Log the current request
-    //     redis.call("ZADD", key, now, now)
-    //     -- Remove all previous requests that are outside the window
-    //     redis.call("ZREMRANGEBYSCORE", key, "-inf", windowStart - 1)
-    //   end
-    //   return count
-    //   `;
-    //   return async function (ctx: Context, identifier: string) {
-    //     const windowEnd = Date.now();
-    //     const windowStart = windowEnd - ms(window);
-    //     const count = (await ctx.redis.eval(
-    //       script,
-    //       [identifier],
-    //       [windowStart, windowEnd, tokens, Date.now()]
-    //     )) as number;
-    //     return {
-    //       success: count < tokens,
-    //       limit: tokens,
-    //       remaining: Math.max(0, tokens - count - 1),
-    //       reset: windowEnd,
-    //     };
-    //   };
-    // }
     /**
      * Combined approach of `slidingLogs` and `fixedWindow` with lower storage
      * costs than `slidingLogs` and improved boundary behavior by calcualting a
@@ -385,4 +233,4 @@ class Ratelimit {
         };
     }
 }
-exports.Ratelimit = Ratelimit;
+exports.RegionRatelimit = RegionRatelimit;