Fixed Date Entry and fixed that the Prune Callback did not got called…

… on peek deletion
Duell10111 · Jul 12, 2021 · 4c44c9b · 4c44c9b
1 parent fed87b3
commit 4c44c9b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 4 deletions.
diff --git a/src/cache.test.ts b/src/cache.test.ts
@@ -10,6 +10,10 @@ const cache = new Cache({
     backend: MemoryStore
 });
 
+function Sleep(milliseconds : number) {
+    return new Promise(resolve => setTimeout(resolve, milliseconds));
+}
+
 describe("cache", () => {
     it("can set and get entry", async () => {
         await cache.set("key1", "value1");
@@ -75,4 +79,24 @@ describe("cache", () => {
 
         expect(Object.keys(entries).length).toBe(0);
     });
+
+    it("can get notified when element got deleted", async () => {
+        let lastprunekeys : string[] = []
+        const testCache = new Cache({
+            backend: MemoryStore,
+            namespace: "ntest",
+            policy: {
+                maxEntries: 1,
+                stdTTL: 1,
+            },
+            prunecallback: (keys) => lastprunekeys = keys
+        })
+        await testCache.set("key", "value")
+        const value = await testCache.peek("key")
+
+        expect(value).toBe("value")
+        await Sleep(1000)
+        expect(await testCache.peek("key")).toBeUndefined()
+        expect(lastprunekeys[0]).toBe("key")
+    })
 });
diff --git a/src/cache.ts b/src/cache.ts
@@ -11,6 +11,11 @@ export interface ICachePolicy {
     stdTTL: number; // second
 }
 
+interface Entry {
+    created : number
+    value : string
+}
+
 export default class Cache {
     protected backend: any;
     protected namespace: string;
@@ -101,7 +106,7 @@ export default class Cache {
         const compositeKey = this.makeCompositeKey(key);
         const entryJsonString = await this.backend.getItem(compositeKey);
 
-        let entry;
+        let entry : Entry | undefined;
         if (entryJsonString) {
             entry = JSON.parse(entryJsonString);
         }
@@ -110,9 +115,12 @@ export default class Cache {
         if (entry) {
             value = entry.value;
             if (this.policy.stdTTL > 0) {
-                const deadline = entry.created.getTime() + this.policy.stdTTL * 1000;
+                const deadline = entry.created + this.policy.stdTTL * 1000;
                 const now = Date.now();
                 if (deadline < now) {
+                    if(this.prunecallback) {
+                        this.prunecallback([key])
+                    }
                     this.remove(key);
                     value = undefined;
                 }
@@ -130,8 +138,8 @@ export default class Cache {
     }
 
     public async set(key: string, value: string): Promise<void> {
-        const entry = {
-            created: new Date(),
+        const entry : Entry = {
+            created: Date.now(),
             value
         };