@fjell/cache 4.7.44 → 4.7.46

package/dist/index.js

@@ -791,6 +791,18 @@ var CacheEventFactory = class {
 
 // src/ops/all.ts
 var logger2 = logger_default.get("all");
+var inFlightRequests = /* @__PURE__ */ new Map();
+var CLEANUP_INTERVAL = 3e4;
+var REQUEST_TIMEOUT = 25e3;
+setInterval(() => {
+  const now = Date.now();
+  inFlightRequests.forEach((request, key) => {
+    if (now - request.timestamp > REQUEST_TIMEOUT) {
+      logger2.debug("Cleaning up stale in-flight all() request", { key });
+      inFlightRequests.delete(key);
+    }
+  });
+}, CLEANUP_INTERVAL);
 var all = async (query = {}, locations = [], context) => {
   const { api, cacheMap, pkType, ttlManager, coordinate } = context;
   logger2.default("all", { query, locations });
@@ -870,34 +882,42 @@ async function executeAllLogic(query, locations, context) {
   } else {
     logger2.debug("QUERY_CACHE: Cache MISS - No cached query result found", { queryHash });
   }
-  logger2.debug("QUERY_CACHE: Attempting direct cache query using queryIn()", {
-    queryHash,
-    query: JSON.stringify(query),
-    locations: JSON.stringify(locations)
-  });
-  try {
-    const directCachedItems = await cacheMap.queryIn(query, locations);
-    if (directCachedItems && directCachedItems.length > 0) {
-      logger2.debug("QUERY_CACHE: Direct cache query SUCCESS - Found items in item cache", {
-        queryHash,
-        itemCount: directCachedItems.length,
-        itemKeys: directCachedItems.map((item) => JSON.stringify(item.key))
-      });
-      const itemKeys = directCachedItems.map((item) => item.key);
-      await cacheMap.setQueryResult(queryHash, itemKeys);
-      logger2.debug("QUERY_CACHE: Stored query result from direct cache hit", {
+  const isEmptyQuery = Object.keys(query).length === 0 || (Object.keys(query).length === 1 && "limit" in query || "offset" in query);
+  if (!isEmptyQuery) {
+    logger2.debug("QUERY_CACHE: Attempting direct cache query using queryIn() for filtered query", {
+      queryHash,
+      query: JSON.stringify(query),
+      locations: JSON.stringify(locations)
+    });
+    try {
+      const directCachedItems = await cacheMap.queryIn(query, locations);
+      if (directCachedItems && directCachedItems.length > 0) {
+        logger2.debug("QUERY_CACHE: Direct cache query SUCCESS - Found items in item cache", {
+          queryHash,
+          itemCount: directCachedItems.length,
+          itemKeys: directCachedItems.map((item) => JSON.stringify(item.key))
+        });
+        const itemKeys = directCachedItems.map((item) => item.key);
+        await cacheMap.setQueryResult(queryHash, itemKeys);
+        logger2.debug("QUERY_CACHE: Stored query result from direct cache hit", {
+          queryHash,
+          itemKeyCount: itemKeys.length,
+          itemKeys: itemKeys.map((k) => JSON.stringify(k))
+        });
+        return directCachedItems;
+      } else {
+        logger2.debug("QUERY_CACHE: Direct cache query returned no items", { queryHash });
+      }
+    } catch (error) {
+      logger2.debug("QUERY_CACHE: Error querying cache directly, proceeding to API", {
         queryHash,
-        itemKeyCount: itemKeys.length,
-        itemKeys: itemKeys.map((k) => JSON.stringify(k))
+        error: error instanceof Error ? error.message : String(error)
       });
-      return directCachedItems;
-    } else {
-      logger2.debug("QUERY_CACHE: Direct cache query returned no items", { queryHash });
     }
-  } catch (error) {
-    logger2.debug("QUERY_CACHE: Error querying cache directly, proceeding to API", {
+  } else {
+    logger2.debug("QUERY_CACHE: Skipping direct cache query for empty/all query - cannot trust completeness", {
       queryHash,
-      error: error instanceof Error ? error.message : String(error)
+      query: JSON.stringify(query)
     });
   }
   logger2.debug("QUERY_CACHE: Fetching from API (cache miss or invalid)", {
@@ -905,9 +925,22 @@ async function executeAllLogic(query, locations, context) {
     query: JSON.stringify(query),
     locations: JSON.stringify(locations)
   });
+  const timestamp = Date.now();
+  const existingRequest = inFlightRequests.get(queryHash);
+  if (existingRequest && timestamp - existingRequest.timestamp < REQUEST_TIMEOUT) {
+    logger2.debug("QUERY_CACHE: Using existing in-flight all() request", {
+      queryHash,
+      age: timestamp - existingRequest.timestamp
+    });
+    return await existingRequest.promise;
+  }
   let ret = [];
   try {
-    ret = await api.all(query, locations);
+    const apiRequest = api.all(query, locations);
+    inFlightRequests.set(queryHash, { promise: apiRequest, timestamp });
+    const cleanup = () => inFlightRequests.delete(queryHash);
+    apiRequest.then(cleanup, cleanup);
+    ret = await apiRequest;
     logger2.debug("QUERY_CACHE: API response received", {
       queryHash,
       itemCount: ret.length,
@@ -946,6 +979,7 @@ async function executeAllLogic(query, locations, context) {
     context.eventEmitter.emit(event);
     logger2.debug("QUERY_CACHE: Emitted query event", { queryHash });
   } catch (e) {
+    inFlightRequests.delete(queryHash);
     if (e instanceof NotFoundError) {
       logger2.debug("QUERY_CACHE: API returned NotFoundError, caching empty result", { queryHash });
       await cacheMap.setQueryResult(queryHash, []);
@@ -1353,19 +1387,19 @@ import {
   isValidItemKey
 } from "@fjell/core";
 var logger5 = logger_default.get("get");
-var inFlightRequests = /* @__PURE__ */ new Map();
+var inFlightRequests2 = /* @__PURE__ */ new Map();
 var CLEANUP_TIMEOUT = 5 * 60 * 1e3;
 var cleanupStaleRequests = () => {
   const now = Date.now();
   const keysToDelete = [];
-  inFlightRequests.forEach((request, key) => {
+  inFlightRequests2.forEach((request, key) => {
     if (now - request.timestamp > CLEANUP_TIMEOUT) {
       keysToDelete.push(key);
     }
   });
   keysToDelete.forEach((key) => {
     logger5.debug("Cleaning up stale in-flight request", { key });
-    inFlightRequests.delete(key);
+    inFlightRequests2.delete(key);
   });
 };
 var cleanupInterval = setInterval(cleanupStaleRequests, 60 * 1e3);
@@ -1495,7 +1529,7 @@ async function executeGetLogic(key, context) {
   let ret;
   const requestKeyStr = keyToString(key);
   try {
-    const requestEntry = inFlightRequests.get(requestKeyStr);
+    const requestEntry = inFlightRequests2.get(requestKeyStr);
     let apiRequest;
     const apiStartTime = Date.now();
     if (!requestEntry) {
@@ -1503,8 +1537,8 @@ async function executeGetLogic(key, context) {
       apiRequest = api.get(key);
       if (apiRequest && typeof apiRequest.then === "function") {
         const timestamp = Date.now();
-        inFlightRequests.set(requestKeyStr, { promise: apiRequest, timestamp });
-        const cleanup = () => inFlightRequests.delete(requestKeyStr);
+        inFlightRequests2.set(requestKeyStr, { promise: apiRequest, timestamp });
+        const cleanup = () => inFlightRequests2.delete(requestKeyStr);
         if (typeof apiRequest.finally === "function") {
           apiRequest.finally(cleanup);
         } else {
@@ -1588,7 +1622,7 @@ async function executeGetLogic(key, context) {
       });
     }
   } catch (e) {
-    inFlightRequests.delete(requestKeyStr);
+    inFlightRequests2.delete(requestKeyStr);
     const duration = Date.now() - startTime;
     logger5.error("CACHE_OP: Error in get() operation", {
       key: keyStr,

package/dist/ops/all.d.ts

@@ -1,4 +1,5 @@
 import { Item, ItemQuery, LocKeyArray } from "@fjell/core";
 import { CacheContext } from "../CacheContext";
+export declare const clearInFlightRequests: () => void;
 export declare const all: <V extends Item<S, L1, L2, L3, L4, L5>, S extends string, L1 extends string = never, L2 extends string = never, L3 extends string = never, L4 extends string = never, L5 extends string = never>(query: ItemQuery | undefined, locations: (LocKeyArray<L1, L2, L3, L4, L5> | []) | undefined, context: CacheContext<V, S, L1, L2, L3, L4, L5>) => Promise<[CacheContext<V, S, L1, L2, L3, L4, L5>, V[]]>;
 //# sourceMappingURL=all.d.ts.map

package/dist/ops/all.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"all.d.ts","sourceRoot":"","sources":["../../src/ops/all.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,IAAI,EACJ,SAAS,EACT,WAAW,EACZ,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAO/C,eAAO,MAAM,GAAG,GACd,CAAC,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EACrC,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EAEzB,OAAO,SAAS,YAAK,EACrB,YAAW,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,aAAK,EACpD,SAAS,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,KAC9C,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAcvD,CAAC"}
+{"version":3,"file":"all.d.ts","sourceRoot":"","sources":["../../src/ops/all.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,IAAI,EACJ,SAAS,EACT,WAAW,EACZ,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAyB/C,eAAO,MAAM,qBAAqB,YAEjC,CAAC;AAEF,eAAO,MAAM,GAAG,GACd,CAAC,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EACrC,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EAEzB,OAAO,SAAS,YAAK,EACrB,YAAW,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,aAAK,EACpD,SAAS,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,KAC9C,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAcvD,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fjell/cache",
   "description": "Cache for Fjell",
-  "version": "4.7.44",
+  "version": "4.7.46",
   "keywords": [
     "cache",
     "fjell"
@@ -37,11 +37,11 @@
     "docs:test": "cd docs && npm run test"
   },
   "dependencies": {
-    "@fjell/client-api": "^4.4.54",
+    "@fjell/client-api": "^4.4.55",
     "@fjell/core": "^4.4.61",
     "@fjell/http-api": "^4.4.51",
     "@fjell/logging": "^4.4.58",
-    "@fjell/registry": "^4.4.66",
+    "@fjell/registry": "^4.4.67",
     "fast-safe-stringify": "^2.1.1",
     "flatted": "^3.3.3",
     "yocto-queue": "^1.2.1"