Merge pull request #97 from upstash/cache-fix

pop identifier from cache in resetTokens calls
upstash · Apr 15, 2024 · c326516 · c326516
2 parents 1cb10c3 + 1ba7e3b
commit c326516
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/src/cache.ts b/src/cache.ts
@@ -41,6 +41,10 @@ export class Cache implements EphemeralCache {
     return value;
   }
 
+  public pop(key: string): void {
+    this.cache.delete(key)
+  }
+
   public empty(): void {
     this.cache.clear()
   }

diff --git a/src/multi.ts b/src/multi.ts
@@ -284,6 +284,9 @@ export class MultiRegionRatelimit extends Ratelimit<MultiRegionContext> {
       },
       async resetTokens(ctx: MultiRegionContext, identifier: string) {
         const pattern = [identifier, "*"].join(":");
+        if (ctx.cache) {
+          ctx.cache.pop(identifier)
+        }
         for (const db of ctx.redis) {
           await db.eval(resetScript, [pattern], [null]);
         }
@@ -470,6 +473,9 @@ export class MultiRegionRatelimit extends Ratelimit<MultiRegionContext> {
       },
       async resetTokens(ctx: MultiRegionContext, identifier: string) {
         const pattern = [identifier, "*"].join(":");
+        if (ctx.cache) {
+          ctx.cache.pop(identifier)
+        }
         for (const db of ctx.redis) {
           await db.eval(resetScript, [pattern], [null]);
         }

diff --git a/src/single.ts b/src/single.ts
@@ -190,7 +190,9 @@ export class RegionRatelimit extends Ratelimit<RegionContext> {
       },
       async resetTokens(ctx: RegionContext, identifier: string) {
         const pattern = [identifier, "*"].join(":");
-
+        if (ctx.cache) {
+          ctx.cache.pop(identifier)
+        }
         await ctx.redis.eval(resetScript, [pattern], [null]);
       },
     });
@@ -284,7 +286,9 @@ export class RegionRatelimit extends Ratelimit<RegionContext> {
       },
       async resetTokens(ctx: RegionContext, identifier: string) {
         const pattern = [identifier, "*"].join(":");
-
+        if (ctx.cache) {
+          ctx.cache.pop(identifier)
+        }
         await ctx.redis.eval(resetScript, [pattern], [null]);
       },
     });
@@ -370,7 +374,9 @@ export class RegionRatelimit extends Ratelimit<RegionContext> {
       },
       async resetTokens(ctx: RegionContext, identifier: string) {
         const pattern = identifier;
-
+        if (ctx.cache) {
+          ctx.cache.pop(identifier)
+        }
         await ctx.redis.eval(resetScript, [pattern], [null]);
       },
     });
@@ -486,7 +492,7 @@ export class RegionRatelimit extends Ratelimit<RegionContext> {
         if (!ctx.cache) {
           throw new Error("This algorithm requires a cache");
         }
-        ctx.cache.empty()
+        ctx.cache.pop(identifier)
         await ctx.redis.eval(resetScript, [pattern], [null]);
       },
     });

diff --git a/src/types.ts b/src/types.ts
@@ -10,6 +10,7 @@ export interface EphemeralCache {
 
   incr: (key: string) => number;
 
+  pop: (key: string) => void;
   empty: () => void;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ export interface EphemeralCache { @@
       incr: (key: string) => number;
+      pop: (key: string) => void;
       empty: () => void;
     }
@@ Expand Down @@