@upstash/ratelimit 2.0.3 → 2.0.4

package/dist/index.d.mts

@@ -1,10 +1,10 @@
 import { Aggregate } from '@upstash/core-analytics';
-import { Pipeline } from '@upstash/redis';
+import { Redis as Redis$1 } from '@upstash/redis';
 
 /**
  * EphemeralCache is used to block certain identifiers right away in case they have already exceeded the ratelimit.
  */
-interface EphemeralCache {
+type EphemeralCache = {
     isBlocked: (identifier: string) => {
         blocked: boolean;
         reset: number;
@@ -16,7 +16,7 @@ interface EphemeralCache {
     pop: (key: string) => void;
     empty: () => void;
     size: () => number;
-}
+};
 type RegionContext = {
     redis: Redis;
     cache?: EphemeralCache;
@@ -90,7 +90,6 @@ type Algorithm<TContext> = () => {
     }>;
     resetTokens: (ctx: TContext, identifier: string) => Promise<void>;
 };
-type IsDenied = 0 | 1;
 type DeniedValue = string | undefined;
 type LimitOptions = {
     geo?: Geo;
@@ -102,17 +101,15 @@ type LimitOptions = {
 /**
  * This is all we need from the redis sdk.
  */
-interface Redis {
-    sadd: <TData>(key: string, ...members: TData[]) => Promise<number>;
-    hset: <TValue>(key: string, obj: {
-        [key: string]: TValue;
-    }) => Promise<number>;
-    eval: <TArgs extends unknown[], TData = unknown>(...args: [script: string, keys: string[], args: TArgs]) => Promise<TData>;
-    evalsha: <TArgs extends unknown[], TData = unknown>(...args: [sha1: string, keys: string[], args: TArgs]) => Promise<TData>;
-    scriptLoad: (...args: [script: string]) => Promise<string>;
-    smismember: (key: string, members: string[]) => Promise<IsDenied[]>;
-    multi: () => Pipeline;
-}
+type Redis = {
+    sadd: Redis$1["sadd"];
+    hset: Redis$1["hset"];
+    eval: Redis$1["eval"];
+    evalsha: Redis$1["evalsha"];
+    scriptLoad: Redis$1["scriptLoad"];
+    smismember: Redis$1["smismember"];
+    multi: Redis$1["multi"];
+};
 
 type Geo = {
     country?: string;

package/dist/index.d.ts

@@ -1,10 +1,10 @@
 import { Aggregate } from '@upstash/core-analytics';
-import { Pipeline } from '@upstash/redis';
+import { Redis as Redis$1 } from '@upstash/redis';
 
 /**
  * EphemeralCache is used to block certain identifiers right away in case they have already exceeded the ratelimit.
  */
-interface EphemeralCache {
+type EphemeralCache = {
     isBlocked: (identifier: string) => {
         blocked: boolean;
         reset: number;
@@ -16,7 +16,7 @@ interface EphemeralCache {
     pop: (key: string) => void;
     empty: () => void;
     size: () => number;
-}
+};
 type RegionContext = {
     redis: Redis;
     cache?: EphemeralCache;
@@ -90,7 +90,6 @@ type Algorithm<TContext> = () => {
     }>;
     resetTokens: (ctx: TContext, identifier: string) => Promise<void>;
 };
-type IsDenied = 0 | 1;
 type DeniedValue = string | undefined;
 type LimitOptions = {
     geo?: Geo;
@@ -102,17 +101,15 @@ type LimitOptions = {
 /**
  * This is all we need from the redis sdk.
  */
-interface Redis {
-    sadd: <TData>(key: string, ...members: TData[]) => Promise<number>;
-    hset: <TValue>(key: string, obj: {
-        [key: string]: TValue;
-    }) => Promise<number>;
-    eval: <TArgs extends unknown[], TData = unknown>(...args: [script: string, keys: string[], args: TArgs]) => Promise<TData>;
-    evalsha: <TArgs extends unknown[], TData = unknown>(...args: [sha1: string, keys: string[], args: TArgs]) => Promise<TData>;
-    scriptLoad: (...args: [script: string]) => Promise<string>;
-    smismember: (key: string, members: string[]) => Promise<IsDenied[]>;
-    multi: () => Pipeline;
-}
+type Redis = {
+    sadd: Redis$1["sadd"];
+    hset: Redis$1["hset"];
+    eval: Redis$1["eval"];
+    evalsha: Redis$1["evalsha"];
+    scriptLoad: Redis$1["scriptLoad"];
+    smismember: Redis$1["smismember"];
+    multi: Redis$1["multi"];
+};
 
 type Geo = {
     country?: string;

package/dist/index.js

@@ -49,10 +49,10 @@ var Analytics = class {
    * @returns
    */
   extractGeo(req) {
-    if (typeof req.geo !== "undefined") {
+    if (req.geo !== void 0) {
       return req.geo;
     }
-    if (typeof req.cf !== "undefined") {
+    if (req.cf !== void 0) {
       return req.cf;
     }
     return {};
@@ -141,18 +141,24 @@ function ms(d) {
   const time = Number.parseInt(match[1]);
   const unit = match[2];
   switch (unit) {
-    case "ms":
+    case "ms": {
       return time;
-    case "s":
+    }
+    case "s": {
       return time * 1e3;
-    case "m":
+    }
+    case "m": {
       return time * 1e3 * 60;
-    case "h":
+    }
+    case "h": {
       return time * 1e3 * 60 * 60;
-    case "d":
+    }
+    case "d": {
       return time * 1e3 * 60 * 60 * 24;
-    default:
+    }
+    default: {
       throw new Error(`Unable to parse window size: ${d}`);
+    }
   }
 }
 
@@ -594,7 +600,7 @@ var updateIpDenyList = async (redis, prefix, threshold, ttl) => {
   const transaction = redis.multi();
   transaction.sdiffstore(allDenyLists, allDenyLists, ipDenyList);
   transaction.del(ipDenyList);
-  transaction.sadd(ipDenyList, ...allIps);
+  transaction.sadd(ipDenyList, allIps.at(0), ...allIps.slice(1));
   transaction.sdiffstore(ipDenyList, ipDenyList, allDenyLists);
   transaction.sunionstore(allDenyLists, allDenyLists, ipDenyList);
   transaction.set(statusKey, "valid", { px: ttl ?? getIpListTTL() });
@@ -696,7 +702,7 @@ var Ratelimit = class {
     }) : void 0;
     if (config.ephemeralCache instanceof Map) {
       this.ctx.cache = new Cache(config.ephemeralCache);
-    } else if (typeof config.ephemeralCache === "undefined") {
+    } else if (config.ephemeralCache === void 0) {
       this.ctx.cache = new Cache(/* @__PURE__ */ new Map());
     }
   }
@@ -827,15 +833,10 @@ var Ratelimit = class {
     const key = this.getKey(identifier);
     const definedMembers = this.getDefinedMembers(identifier, req);
     const deniedValue = checkDenyListCache(definedMembers);
-    let result;
-    if (deniedValue) {
-      result = [defaultDeniedResponse(deniedValue), { deniedValue, invalidIpDenyList: false }];
-    } else {
-      result = await Promise.all([
-        this.limiter().limit(this.ctx, key, req?.rate),
-        this.enableProtection ? checkDenyList(this.primaryRedis, this.prefix, definedMembers) : { deniedValue: void 0, invalidIpDenyList: false }
-      ]);
-    }
+    const result = deniedValue ? [defaultDeniedResponse(deniedValue), { deniedValue, invalidIpDenyList: false }] : await Promise.all([
+      this.limiter().limit(this.ctx, key, req?.rate),
+      this.enableProtection ? checkDenyList(this.primaryRedis, this.prefix, definedMembers) : { deniedValue: void 0, invalidIpDenyList: false }
+    ]);
     return resolveLimitPayload(this.primaryRedis, this.prefix, result, this.denyListThreshold);
   };
   /**
@@ -885,9 +886,9 @@ var Ratelimit = class {
           time: Date.now(),
           success: ratelimitResponse.reason === "denyList" ? "denied" : ratelimitResponse.success,
           ...geo
-        }).catch((err) => {
+        }).catch((error) => {
           let errorMessage = "Failed to record analytics";
-          if (`${err}`.includes("WRONGTYPE")) {
+          if (`${error}`.includes("WRONGTYPE")) {
             errorMessage = `
     Failed to record analytics. See the information below:
 
@@ -900,11 +901,11 @@ var Ratelimit = class {
 
     `;
           }
-          console.warn(errorMessage, err);
+          console.warn(errorMessage, error);
         });
         ratelimitResponse.pending = Promise.all([ratelimitResponse.pending, analyticsP]);
-      } catch (err) {
-        console.warn("Failed to record analytics", err);
+      } catch (error) {
+        console.warn("Failed to record analytics", error);
       }
       ;
     }
@@ -1015,18 +1016,17 @@ var MultiRegionRatelimit = class extends Ratelimit {
         const remaining = tokens - usedTokens;
         async function sync() {
           const individualIDs = await Promise.all(dbs.map((s) => s.request));
-          const allIDs = Array.from(
-            new Set(
-              individualIDs.flatMap((_) => _).reduce((acc, curr, index) => {
-                if (index % 2 === 0) {
-                  acc.push(curr);
-                }
-                return acc;
-              }, [])
-            ).values()
-          );
+          const allIDs = [...new Set(
+            individualIDs.flat().reduce((acc, curr, index) => {
+              if (index % 2 === 0) {
+                acc.push(curr);
+              }
+              return acc;
+            }, [])
+          ).values()];
           for (const db of dbs) {
-            const usedDbTokens = (await db.request).reduce(
+            const usedDbTokensRequest = await db.request;
+            const usedDbTokens = usedDbTokensRequest.reduce(
               (accTokens, usedToken, index) => {
                 let parsedToken = 0;
                 if (index % 2) {
@@ -1036,7 +1036,8 @@ var MultiRegionRatelimit = class extends Ratelimit {
               },
               0
             );
-            const dbIds = (await db.request).reduce((ids, currentId, index) => {
+            const dbIdsRequest = await db.request;
+            const dbIds = dbIdsRequest.reduce((ids, currentId, index) => {
               if (index % 2 === 0) {
                 ids.push(currentId);
               }
@@ -1183,16 +1184,14 @@ var MultiRegionRatelimit = class extends Ratelimit {
         const remaining = tokens - usedTokens;
         async function sync() {
           const res = await Promise.all(dbs.map((s) => s.request));
-          const allCurrentIds = Array.from(
-            new Set(
-              res.flatMap(([current2]) => current2).reduce((acc, curr, index) => {
-                if (index % 2 === 0) {
-                  acc.push(curr);
-                }
-                return acc;
-              }, [])
-            ).values()
-          );
+          const allCurrentIds = [...new Set(
+            res.flatMap(([current2]) => current2).reduce((acc, curr, index) => {
+              if (index % 2 === 0) {
+                acc.push(curr);
+              }
+              return acc;
+            }, [])
+          ).values()];
           for (const db of dbs) {
             const [current2, _previous, _success] = await db.request;
             const dbIds = current2.reduce((ids, currentId, index) => {