@catbee/utils 2.0.4 → 2.0.5

package/cache/index.cjs

@@ -33,6 +33,7 @@ var TTLCache = class {
     __name(this, "TTLCache");
   }
   cache = /* @__PURE__ */ new Map();
+  pending = /* @__PURE__ */ new Map();
   ttlMs;
   maxSize;
   cleanupInterval;
@@ -90,7 +91,7 @@ var TTLCache = class {
     const entry = this.cache.get(key);
     if (!entry) return void 0;
     const now = Date.now();
-    if (now > entry.expiresAt) {
+    if (now >= entry.expiresAt) {
       this.cache.delete(key);
       return void 0;
     }
@@ -102,17 +103,31 @@ var TTLCache = class {
   /**
   * Retrieves or computes a value if it's not in the cache or has expired.
   *
+  * Concurrent calls for the same key share the same producer promise,
+  * preventing duplicate computations while the value is being generated.
+  *
   * @param key - The key to retrieve
   * @param producer - Function to generate the value if not cached
   * @param ttlMs - Optional custom TTL for the computed value
   * @returns The cached or computed value
   */
   async getOrCompute(key, producer, ttlMs) {
-    const value = this.get(key);
-    if (value !== void 0) return value;
-    const newValue = await producer();
-    this.setWithTTL(key, newValue, ttlMs ?? this.ttlMs);
-    return newValue;
+    const cached = this.get(key);
+    if (cached !== void 0) {
+      return cached;
+    }
+    const pending = this.pending.get(key);
+    if (pending) {
+      return pending;
+    }
+    const promise = Promise.resolve().then(producer).then((value) => {
+      this.setWithTTL(key, value, ttlMs ?? this.ttlMs);
+      return value;
+    }).finally(() => {
+      this.pending.delete(key);
+    });
+    this.pending.set(key, promise);
+    return promise;
   }
   /**
   * Checks if the key exists and hasn't expired.
@@ -174,7 +189,7 @@ var TTLCache = class {
     let removed = 0;
     const now = Date.now();
     for (const [key, entry] of this.cache.entries()) {
-      if (now > entry.expiresAt) {
+      if (now >= entry.expiresAt) {
         this.cache.delete(key);
         removed++;
       }
@@ -188,7 +203,7 @@ var TTLCache = class {
   */
   *entries() {
     for (const [key, entry] of this.cache.entries()) {
-      if (Date.now() <= entry.expiresAt) {
+      if (Date.now() < entry.expiresAt) {
         yield [
           key,
           entry.value
@@ -203,7 +218,7 @@ var TTLCache = class {
   */
   *keys() {
     for (const [key, entry] of this.cache.entries()) {
-      if (Date.now() <= entry.expiresAt) {
+      if (Date.now() < entry.expiresAt) {
         yield key;
       }
     }
@@ -215,7 +230,7 @@ var TTLCache = class {
   */
   *values() {
     for (const entry of this.cache.values()) {
-      if (Date.now() <= entry.expiresAt) {
+      if (Date.now() < entry.expiresAt) {
         yield entry.value;
       }
     }
@@ -231,12 +246,14 @@ var TTLCache = class {
     const entry = this.cache.get(key);
     if (!entry) return false;
     const now = Date.now();
-    if (now > entry.expiresAt) {
+    if (now >= entry.expiresAt) {
       this.cache.delete(key);
       return false;
     }
     entry.expiresAt = now + (ttlMs ?? this.ttlMs);
     entry.lastAccessed = now;
+    this.cache.delete(key);
+    this.cache.set(key, entry);
     return true;
   }
   /**
@@ -249,7 +266,7 @@ var TTLCache = class {
     let expired = 0;
     let valid = 0;
     for (const entry of this.cache.values()) {
-      if (now > entry.expiresAt) {
+      if (now >= entry.expiresAt) {
         expired++;
       } else {
         valid++;
@@ -277,14 +294,17 @@ var TTLCache = class {
   */
   evictLRU() {
     const now = Date.now();
-    for (const [key, entry] of Array.from(this.cache.entries())) {
-      if (now > entry.expiresAt) {
+    for (const [key, entry] of this.cache.entries()) {
+      if (now >= entry.expiresAt) {
         this.cache.delete(key);
       }
     }
     while (this.maxSize && this.cache.size > this.maxSize) {
-      const oldestKey = this.cache.keys().next().value;
-      this.cache.delete(oldestKey);
+      const next = this.cache.keys().next();
+      if (next.done) {
+        break;
+      }
+      this.cache.delete(next.value);
     }
   }
 };

package/cache/index.d.ts

@@ -41,11 +41,12 @@ interface TTLCacheOptions {
  *
  * @example
  * const cache = new TTLCache<string, number>({ ttlMs: 1000 });
- * cache.set("x", 123);
- * const value = cache.get("x"); // 123
+ * cache.set('x', 123);
+ * const value = cache.get('x'); // 123
  */
 declare class TTLCache<K, V> {
     private readonly cache;
+    private readonly pending;
     private readonly ttlMs;
     private readonly maxSize?;
     private cleanupInterval?;
@@ -78,6 +79,9 @@ declare class TTLCache<K, V> {
     /**
      * Retrieves or computes a value if it's not in the cache or has expired.
      *
+     * Concurrent calls for the same key share the same producer promise,
+     * preventing duplicate computations while the value is being generated.
+     *
      * @param key - The key to retrieve
      * @param producer - Function to generate the value if not cached
      * @param ttlMs - Optional custom TTL for the computed value

package/cache/index.mjs

@@ -31,6 +31,7 @@ var TTLCache = class {
     __name(this, "TTLCache");
   }
   cache = /* @__PURE__ */ new Map();
+  pending = /* @__PURE__ */ new Map();
   ttlMs;
   maxSize;
   cleanupInterval;
@@ -88,7 +89,7 @@ var TTLCache = class {
     const entry = this.cache.get(key);
     if (!entry) return void 0;
     const now = Date.now();
-    if (now > entry.expiresAt) {
+    if (now >= entry.expiresAt) {
       this.cache.delete(key);
       return void 0;
     }
@@ -100,17 +101,31 @@ var TTLCache = class {
   /**
   * Retrieves or computes a value if it's not in the cache or has expired.
   *
+  * Concurrent calls for the same key share the same producer promise,
+  * preventing duplicate computations while the value is being generated.
+  *
   * @param key - The key to retrieve
   * @param producer - Function to generate the value if not cached
   * @param ttlMs - Optional custom TTL for the computed value
   * @returns The cached or computed value
   */
   async getOrCompute(key, producer, ttlMs) {
-    const value = this.get(key);
-    if (value !== void 0) return value;
-    const newValue = await producer();
-    this.setWithTTL(key, newValue, ttlMs ?? this.ttlMs);
-    return newValue;
+    const cached = this.get(key);
+    if (cached !== void 0) {
+      return cached;
+    }
+    const pending = this.pending.get(key);
+    if (pending) {
+      return pending;
+    }
+    const promise = Promise.resolve().then(producer).then((value) => {
+      this.setWithTTL(key, value, ttlMs ?? this.ttlMs);
+      return value;
+    }).finally(() => {
+      this.pending.delete(key);
+    });
+    this.pending.set(key, promise);
+    return promise;
   }
   /**
   * Checks if the key exists and hasn't expired.
@@ -172,7 +187,7 @@ var TTLCache = class {
     let removed = 0;
     const now = Date.now();
     for (const [key, entry] of this.cache.entries()) {
-      if (now > entry.expiresAt) {
+      if (now >= entry.expiresAt) {
         this.cache.delete(key);
         removed++;
       }
@@ -186,7 +201,7 @@ var TTLCache = class {
   */
   *entries() {
     for (const [key, entry] of this.cache.entries()) {
-      if (Date.now() <= entry.expiresAt) {
+      if (Date.now() < entry.expiresAt) {
         yield [
           key,
           entry.value
@@ -201,7 +216,7 @@ var TTLCache = class {
   */
   *keys() {
     for (const [key, entry] of this.cache.entries()) {
-      if (Date.now() <= entry.expiresAt) {
+      if (Date.now() < entry.expiresAt) {
         yield key;
       }
     }
@@ -213,7 +228,7 @@ var TTLCache = class {
   */
   *values() {
     for (const entry of this.cache.values()) {
-      if (Date.now() <= entry.expiresAt) {
+      if (Date.now() < entry.expiresAt) {
         yield entry.value;
       }
     }
@@ -229,12 +244,14 @@ var TTLCache = class {
     const entry = this.cache.get(key);
     if (!entry) return false;
     const now = Date.now();
-    if (now > entry.expiresAt) {
+    if (now >= entry.expiresAt) {
       this.cache.delete(key);
       return false;
     }
     entry.expiresAt = now + (ttlMs ?? this.ttlMs);
     entry.lastAccessed = now;
+    this.cache.delete(key);
+    this.cache.set(key, entry);
     return true;
   }
   /**
@@ -247,7 +264,7 @@ var TTLCache = class {
     let expired = 0;
     let valid = 0;
     for (const entry of this.cache.values()) {
-      if (now > entry.expiresAt) {
+      if (now >= entry.expiresAt) {
         expired++;
       } else {
         valid++;
@@ -275,14 +292,17 @@ var TTLCache = class {
   */
   evictLRU() {
     const now = Date.now();
-    for (const [key, entry] of Array.from(this.cache.entries())) {
-      if (now > entry.expiresAt) {
+    for (const [key, entry] of this.cache.entries()) {
+      if (now >= entry.expiresAt) {
         this.cache.delete(key);
       }
     }
     while (this.maxSize && this.cache.size > this.maxSize) {
-      const oldestKey = this.cache.keys().next().value;
-      this.cache.delete(oldestKey);
+      const next = this.cache.keys().next();
+      if (next.done) {
+        break;
+      }
+      this.cache.delete(next.value);
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catbee/utils",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "A modular, production-grade utility toolkit for Node.js and TypeScript, designed for robust, scalable applications (including Express-based services). All utilities are tree-shakable and can be imported independently.",
   "publishConfig": {
     "access": "public"