Fix Redis get timeout re-uses promise (#27)

* Fix Redis get timeout re-uses promise * remove extra async
soundxyz · Jan 12, 2023 · c4904ea · c4904ea
1 parent b46f04b
commit c4904ea
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/.changeset/fresh-coins-cover.md b/.changeset/fresh-coins-cover.md
@@ -0,0 +1,5 @@
+---
+"@soundxyz/fine-grained-cache": patch
+---
+
+Fix Redis get timeout re-uses promise for calls within the same event cycle
diff --git a/src/fineGrained.ts b/src/fineGrained.ts
@@ -406,6 +406,19 @@ export function FineGrainedCache({
     }
   }
 
+  let currentTimeout: Promise<undefined> | null = null;
+  function timeoutRedisPromise() {
+    if (currentTimeout) return currentTimeout;
+
+    currentTimeout = timersSetTimeout(GETRedisTimeout, undefined);
+
+    setTimeout(() => {
+      currentTimeout = null;
+    });
+
+    return currentTimeout;
+  }
+
   async function getRedisCacheValue<T>(
     key: string,
     useSuperjson: boolean,
@@ -439,7 +452,7 @@ export function FineGrainedCache({
           );
 
       const redisValue = await (GETRedisTimeout != null
-        ? Promise.race([redisGet, timersSetTimeout(GETRedisTimeout, undefined)])
+        ? Promise.race([redisGet, timeoutRedisPromise()])
         : redisGet);
 
       if (redisValue === undefined) {