@upstash/ratelimit 2.0.3 → 2.0.5-canary

package/dist/index.mjs

@@ -26,10 +26,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 {};
@@ -118,18 +118,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}`);
+    }
   }
 }
 
@@ -571,7 +577,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() });
@@ -673,7 +679,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());
     }
   }
@@ -804,15 +810,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);
   };
   /**
@@ -862,9 +863,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:
 
@@ -877,11 +878,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);
       }
       ;
     }
@@ -992,18 +993,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) {
@@ -1013,7 +1013,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);
               }
@@ -1160,16 +1161,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) => {