graphile-cache 3.0.0 → 3.1.0

package/esm/graphile-cache.js

@@ -74,6 +74,9 @@ const disposeEntry = async (entry, key) => {
     catch (err) {
         log.error(`Error disposing PostGraphile[${key}]:`, err);
     }
+    finally {
+        disposedKeys.delete(key);
+    }
 };
 /**
  * Determine the eviction reason for a cache entry
@@ -172,26 +175,31 @@ export const closeAllCaches = async (verbose = false) => {
     if (closePromise.promise)
         return closePromise.promise;
     closePromise.promise = (async () => {
-        if (verbose)
-            log.info('Closing all server caches...');
-        // Collect all entries and dispose them properly
-        const entries = [...graphileCache.entries()];
-        // Mark all as manual evictions
-        for (const [key] of entries) {
-            manualEvictionKeys.add(key);
+        try {
+            if (verbose)
+                log.info('Closing all server caches...');
+            // Collect all entries and dispose them properly
+            const entries = [...graphileCache.entries()];
+            // Mark all as manual evictions
+            for (const [key] of entries) {
+                manualEvictionKeys.add(key);
+            }
+            const disposePromises = entries.map(([key, entry]) => disposeEntry(entry, key));
+            // Wait for all disposals to complete
+            await Promise.allSettled(disposePromises);
+            // Clear the cache after disposal (dispose callback will no-op due to disposedKeys)
+            graphileCache.clear();
+            // Clear disposed keys tracking after full cleanup
+            disposedKeys.clear();
+            manualEvictionKeys.clear();
+            // Close pg pools
+            await pgCache.close();
+            if (verbose)
+                log.success('All caches disposed.');
+        }
+        finally {
+            closePromise.promise = null;
         }
-        const disposePromises = entries.map(([key, entry]) => disposeEntry(entry, key));
-        // Wait for all disposals to complete
-        await Promise.allSettled(disposePromises);
-        // Clear the cache after disposal (dispose callback will no-op due to disposedKeys)
-        graphileCache.clear();
-        // Clear disposed keys tracking after full cleanup
-        disposedKeys.clear();
-        manualEvictionKeys.clear();
-        // Close pg pools
-        await pgCache.close();
-        if (verbose)
-            log.success('All caches disposed.');
     })();
     return closePromise.promise;
 };

package/graphile-cache.js

@@ -81,6 +81,9 @@ const disposeEntry = async (entry, key) => {
     catch (err) {
         log.error(`Error disposing PostGraphile[${key}]:`, err);
     }
+    finally {
+        disposedKeys.delete(key);
+    }
 };
 /**
  * Determine the eviction reason for a cache entry
@@ -179,26 +182,31 @@ const closeAllCaches = async (verbose = false) => {
     if (closePromise.promise)
         return closePromise.promise;
     closePromise.promise = (async () => {
-        if (verbose)
-            log.info('Closing all server caches...');
-        // Collect all entries and dispose them properly
-        const entries = [...exports.graphileCache.entries()];
-        // Mark all as manual evictions
-        for (const [key] of entries) {
-            manualEvictionKeys.add(key);
+        try {
+            if (verbose)
+                log.info('Closing all server caches...');
+            // Collect all entries and dispose them properly
+            const entries = [...exports.graphileCache.entries()];
+            // Mark all as manual evictions
+            for (const [key] of entries) {
+                manualEvictionKeys.add(key);
+            }
+            const disposePromises = entries.map(([key, entry]) => disposeEntry(entry, key));
+            // Wait for all disposals to complete
+            await Promise.allSettled(disposePromises);
+            // Clear the cache after disposal (dispose callback will no-op due to disposedKeys)
+            exports.graphileCache.clear();
+            // Clear disposed keys tracking after full cleanup
+            disposedKeys.clear();
+            manualEvictionKeys.clear();
+            // Close pg pools
+            await pg_cache_1.pgCache.close();
+            if (verbose)
+                log.success('All caches disposed.');
+        }
+        finally {
+            closePromise.promise = null;
         }
-        const disposePromises = entries.map(([key, entry]) => disposeEntry(entry, key));
-        // Wait for all disposals to complete
-        await Promise.allSettled(disposePromises);
-        // Clear the cache after disposal (dispose callback will no-op due to disposedKeys)
-        exports.graphileCache.clear();
-        // Clear disposed keys tracking after full cleanup
-        disposedKeys.clear();
-        manualEvictionKeys.clear();
-        // Close pg pools
-        await pg_cache_1.pgCache.close();
-        if (verbose)
-            log.success('All caches disposed.');
     })();
     return closePromise.promise;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphile-cache",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostGraphile v5 LRU cache with automatic pool cleanup integration",
   "main": "index.js",
@@ -29,12 +29,12 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@pgpmjs/logger": "^2.1.0",
+    "@pgpmjs/logger": "^2.2.0",
     "express": "^5.2.1",
-    "grafserv": "^1.0.0-rc.4",
+    "grafserv": "1.0.0-rc.6",
     "lru-cache": "^11.2.4",
-    "pg-cache": "^3.0.0",
-    "postgraphile": "^5.0.0-rc.4"
+    "pg-cache": "^3.1.0",
+    "postgraphile": "5.0.0-rc.7"
   },
   "devDependencies": {
     "@types/express": "^5.0.6",
@@ -51,5 +51,5 @@
     "constructive",
     "v5"
   ],
-  "gitHead": "b2daeefe49cdefb3d01ea63cf778fb9b847ab5fe"
+  "gitHead": "b758178b808ce0bf451e86c0bd7e92079155db7c"
 }