@upstash/ratelimit 2.1.0-rc → 2.1.0

package/dist/index.js

@@ -188,7 +188,7 @@ var fixedWindowLimitScript = `#!lua flags=allow-key-locking
 
   -- Check for dynamic limit
   local effectiveLimit = tokens
-  if dynamicLimitKey ~= "" then
+  if dynamicLimitKey and dynamicLimitKey ~= "" then
     local dynamicLimit = redis.call("GET", dynamicLimitKey)
     if dynamicLimit then
       effectiveLimit = tonumber(dynamicLimit)
@@ -211,7 +211,7 @@ var fixedWindowRemainingTokensScript = `#!lua flags=allow-key-locking
 
   -- Check for dynamic limit
   local effectiveLimit = tokens
-  if dynamicLimitKey ~= "" then
+  if dynamicLimitKey and dynamicLimitKey ~= "" then
     local dynamicLimit = redis.call("GET", dynamicLimitKey)
     if dynamicLimit then
       effectiveLimit = tonumber(dynamicLimit)
@@ -237,7 +237,7 @@ var slidingWindowLimitScript = `#!lua flags=allow-key-locking
 
   -- Check for dynamic limit
   local effectiveLimit = tokens
-  if dynamicLimitKey ~= "" then
+  if dynamicLimitKey and dynamicLimitKey ~= "" then
     local dynamicLimit = redis.call("GET", dynamicLimitKey)
     if dynamicLimit then
       effectiveLimit = tonumber(dynamicLimit)
@@ -280,7 +280,7 @@ var slidingWindowRemainingTokensScript = `#!lua flags=allow-key-locking
 
   -- Check for dynamic limit
   local effectiveLimit = tokens
-  if dynamicLimitKey ~= "" then
+  if dynamicLimitKey and dynamicLimitKey ~= "" then
     local dynamicLimit = redis.call("GET", dynamicLimitKey)
     if dynamicLimit then
       effectiveLimit = tonumber(dynamicLimit)
@@ -315,7 +315,7 @@ var tokenBucketLimitScript = `#!lua flags=allow-key-locking
 
   -- Check for dynamic limit
   local effectiveLimit = maxTokens
-  if dynamicLimitKey ~= "" then
+  if dynamicLimitKey and dynamicLimitKey ~= "" then
     local dynamicLimit = redis.call("GET", dynamicLimitKey)
     if dynamicLimit then
       effectiveLimit = tonumber(dynamicLimit)
@@ -365,7 +365,7 @@ var tokenBucketRemainingTokensScript = `#!lua flags=allow-key-locking
 
   -- Check for dynamic limit
   local effectiveLimit = maxTokens
-  if dynamicLimitKey ~= "" then
+  if dynamicLimitKey and dynamicLimitKey ~= "" then
     local dynamicLimit = redis.call("GET", dynamicLimitKey)
     if dynamicLimit then
       effectiveLimit = tonumber(dynamicLimit)
@@ -522,31 +522,31 @@ var SCRIPTS = {
     fixedWindow: {
       limit: {
         script: fixedWindowLimitScript,
-        hash: "4ef8749b9e927b157546ebad13061fa86b9ffc2e"
+        hash: "b2efc02798c8e9b471a10f9b1d5745db89923ff3"
       },
       getRemaining: {
         script: fixedWindowRemainingTokensScript,
-        hash: "e62252cb05b4676b27a5d396da02f0ca0d375d88"
+        hash: "823cb2a5a902d69681244f5e28e5ebb8f2a89edd"
       }
     },
     slidingWindow: {
       limit: {
         script: slidingWindowLimitScript,
-        hash: "5cd9665be7533e4dfabb3581021737fc69b41ae8"
+        hash: "74740bb3d7792848093cdef586b6b6037c455fd6"
       },
       getRemaining: {
         script: slidingWindowRemainingTokensScript,
-        hash: "1bdbbdb2082bb557084518c64486d7d5a29d1bfe"
+        hash: "7ca36169e0fc9caedd81b4eef8e99854c157f9b5"
       }
     },
     tokenBucket: {
       limit: {
         script: tokenBucketLimitScript,
-        hash: "8f7286b9b0f65d631f760ba615f7b3c598a569a3"
+        hash: "a9873a8026b509e99a49a0e5a2049756c693c384"
       },
       getRemaining: {
         script: tokenBucketRemainingTokensScript,
-        hash: "08d3b3381c507b6f7bfec1bbfa0a6053434b16bd"
+        hash: "40daf4a441df736f5c99f8b77bbe176c909e5de4"
       }
     },
     cachedFixedWindow: {
@@ -1060,7 +1060,7 @@ var Ratelimit = class {
 };
 
 // src/version.ts
-var VERSION = "2.1.0-rc";
+var VERSION = "2.1.0";
 
 // src/telemetry.ts
 var taggedClients = /* @__PURE__ */ new WeakSet();
@@ -1522,11 +1522,11 @@ var RegionRatelimit = class extends Ratelimit {
             };
           }
         }
-        const dynamicLimitKey = ctx.dynamicLimits ? `${ctx.prefix}${DYNAMIC_LIMIT_KEY_SUFFIX}` : "";
+        const dynamicLimitKeys = ctx.dynamicLimits ? [`${ctx.prefix}${DYNAMIC_LIMIT_KEY_SUFFIX}`] : [];
         const [usedTokensAfterUpdate, effectiveLimit] = await safeEval(
           ctx,
           SCRIPTS.singleRegion.fixedWindow.limit,
-          [key, dynamicLimitKey],
+          [key, ...dynamicLimitKeys],
           [tokens, windowDuration, incrementBy]
         );
         const success = usedTokensAfterUpdate <= effectiveLimit;
@@ -1550,11 +1550,11 @@ var RegionRatelimit = class extends Ratelimit {
       async getRemaining(ctx, identifier) {
         const bucket = Math.floor(Date.now() / windowDuration);
         const key = [identifier, bucket].join(":");
-        const dynamicLimitKey = ctx.dynamicLimits ? `${ctx.prefix}${DYNAMIC_LIMIT_KEY_SUFFIX}` : "";
+        const dynamicLimitKeys = ctx.dynamicLimits ? [`${ctx.prefix}${DYNAMIC_LIMIT_KEY_SUFFIX}`] : [];
         const [remaining, effectiveLimit] = await safeEval(
           ctx,
           SCRIPTS.singleRegion.fixedWindow.getRemaining,
-          [key, dynamicLimitKey],
+          [key, ...dynamicLimitKeys],
           [tokens]
         );
         return {
@@ -1616,11 +1616,11 @@ var RegionRatelimit = class extends Ratelimit {
             };
           }
         }
-        const dynamicLimitKey = ctx.dynamicLimits ? `${ctx.prefix}${DYNAMIC_LIMIT_KEY_SUFFIX}` : "";
+        const dynamicLimitKeys = ctx.dynamicLimits ? [`${ctx.prefix}${DYNAMIC_LIMIT_KEY_SUFFIX}`] : [];
         const [remainingTokens, effectiveLimit] = await safeEval(
           ctx,
           SCRIPTS.singleRegion.slidingWindow.limit,
-          [currentKey, previousKey, dynamicLimitKey],
+          [currentKey, previousKey, ...dynamicLimitKeys],
           [tokens, now, windowSize, incrementBy]
         );
         const success = remainingTokens >= 0;
@@ -1646,11 +1646,11 @@ var RegionRatelimit = class extends Ratelimit {
         const currentKey = [identifier, currentWindow].join(":");
         const previousWindow = currentWindow - 1;
         const previousKey = [identifier, previousWindow].join(":");
-        const dynamicLimitKey = ctx.dynamicLimits ? `${ctx.prefix}${DYNAMIC_LIMIT_KEY_SUFFIX}` : "";
+        const dynamicLimitKeys = ctx.dynamicLimits ? [`${ctx.prefix}${DYNAMIC_LIMIT_KEY_SUFFIX}`] : [];
         const [remaining, effectiveLimit] = await safeEval(
           ctx,
           SCRIPTS.singleRegion.slidingWindow.getRemaining,
-          [currentKey, previousKey, dynamicLimitKey],
+          [currentKey, previousKey, ...dynamicLimitKeys],
           [tokens, now, windowSize]
         );
         return {
@@ -1705,11 +1705,11 @@ var RegionRatelimit = class extends Ratelimit {
             };
           }
         }
-        const dynamicLimitKey = ctx.dynamicLimits ? `${ctx.prefix}${DYNAMIC_LIMIT_KEY_SUFFIX}` : "";
+        const dynamicLimitKeys = ctx.dynamicLimits ? [`${ctx.prefix}${DYNAMIC_LIMIT_KEY_SUFFIX}`] : [];
         const [remaining, reset, effectiveLimit] = await safeEval(
           ctx,
           SCRIPTS.singleRegion.tokenBucket.limit,
-          [identifier, dynamicLimitKey],
+          [identifier, ...dynamicLimitKeys],
           [maxTokens, intervalDuration, refillRate, now, incrementBy]
         );
         const success = remaining >= 0;
@@ -1729,11 +1729,11 @@ var RegionRatelimit = class extends Ratelimit {
         };
       },
       async getRemaining(ctx, identifier) {
-        const dynamicLimitKey = ctx.dynamicLimits ? `${ctx.prefix}${DYNAMIC_LIMIT_KEY_SUFFIX}` : "";
+        const dynamicLimitKeys = ctx.dynamicLimits ? [`${ctx.prefix}${DYNAMIC_LIMIT_KEY_SUFFIX}`] : [];
         const [remainingTokens, refilledAt, effectiveLimit] = await safeEval(
           ctx,
           SCRIPTS.singleRegion.tokenBucket.getRemaining,
-          [identifier, dynamicLimitKey],
+          [identifier, ...dynamicLimitKeys],
           [maxTokens]
         );
         const freshRefillAt = Date.now() + intervalDuration;