Merge pull request #17 from Code-Hex/fix/workers-kv-singleton

fixed singleton behaviour for WorkersKVStoreSingle
Code-Hex · Feb 24, 2024 · ec54a6f · ec54a6f
2 parents 0f98722 + 7228c47
commit ec54a6f
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -35,17 +35,23 @@ export class Auth extends BaseAuth {
 }
 
 export class WorkersKVStoreSingle extends WorkersKVStore {
-  private static instance?: WorkersKVStoreSingle;
+  private static instance?: Map<string, WorkersKVStoreSingle>;
 
   private constructor(cacheKey: string, cfKVNamespace: KVNamespace) {
     super(cacheKey, cfKVNamespace);
   }
 
   static getOrInitialize(cacheKey: string, cfKVNamespace: KVNamespace): WorkersKVStoreSingle {
     if (!WorkersKVStoreSingle.instance) {
-      WorkersKVStoreSingle.instance = new WorkersKVStoreSingle(cacheKey, cfKVNamespace);
+      WorkersKVStoreSingle.instance = new Map<string, WorkersKVStoreSingle>();
     }
-    return WorkersKVStoreSingle.instance;
+    const instance = WorkersKVStoreSingle.instance.get(cacheKey);
+    if (instance) {
+      return instance;
+    }
+    const newInstance = new WorkersKVStoreSingle(cacheKey, cfKVNamespace);
+    WorkersKVStoreSingle.instance.set(cacheKey, newInstance);
+    return newInstance;
   }
 }