querysub 0.465.0 → 0.466.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.465.0",
+  "version": "0.466.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/storage/diskCache2.ts

@@ -14,7 +14,12 @@ let requestPersist = lazy(() => {
     }
 });
 
-let existingDiskCaches = new Set<string>();
+type DiskCache = {
+    get(key: string): Promise<Buffer | undefined>;
+    set(key: string, value: Buffer): void;
+};
+
+let existingDiskCaches = new Map<string, DiskCache>();
 /** NOTE: Slower than diskCache for reading, but... less flakey, and faster at writing. ALSO,
  *      doesn't synchronously block, which diskCache does.
  */
@@ -24,10 +29,7 @@ export function bufferDiskCache(
         /** Default = 64MB */
         inMemoryLimit?: number;
     }
-): {
-    get(key: string): Promise<Buffer | undefined>;
-    set(key: string, value: Buffer): void;
-} {
+): DiskCache {
     if (isNode()) {
         return {
             get: async (key: string) => undefined,
@@ -37,10 +39,10 @@ export function bufferDiskCache(
     let { uniqueName } = config;
     const inMemoryLimit = config.inMemoryLimit ?? 64 * 1024 * 1024;
 
-    if (existingDiskCaches.has(uniqueName)) {
-        throw new Error(`Duplicate diskCache ${uniqueName}`);
+    let prev = existingDiskCaches.get(uniqueName);
+    if (prev) {
+        return prev;
     }
-    existingDiskCaches.add(uniqueName);
     uniqueName = "diskCache7_" + uniqueName;
 
     let totalBufferCacheSize = 0;
@@ -89,10 +91,12 @@ export function bufferDiskCache(
         await writeFile({ path, data });
     };
 
-    return {
+    let diskCache: DiskCache = {
         get: getDiskCached,
         set: (key, value) => logErrors(setDiskCached(key, value)),
     };
+    existingDiskCaches.set(uniqueName, diskCache);
+    return diskCache;
 }