cachette 4.0.15 → 4.0.16

package/dist/src/lib/CacheInstance.d.ts

@@ -108,6 +108,7 @@ export declare abstract class CacheInstance extends EventEmitter {
      * simultaneous requests to the same resource in parallel.
      */
     private activeFetches;
+    private getValueWithErrorHandling;
     /**
      * Get or fetch a value
      *

package/dist/src/lib/CacheInstance.js

@@ -51,6 +51,18 @@ class CacheInstance extends node_events_1.EventEmitter {
      * simultaneous requests to the same resource in parallel.
      */
     activeFetches = {};
+    async getValueWithErrorHandling(key, shouldCacheError) {
+        const cached = await this.getValue(key);
+        if (cached instanceof Error) {
+            if (shouldCacheError && shouldCacheError(cached)) {
+                throw cached;
+            }
+            else {
+                return undefined;
+            }
+        }
+        return cached;
+    }
     /**
      * Get or fetch a value
      *
@@ -66,15 +78,7 @@ class CacheInstance extends node_events_1.EventEmitter {
      */
     async getOrFetchValue(key, ttl, fetchFunction, lockTtl, shouldCacheError) {
         // already cached?
-        let cached = await this.getValue(key);
-        if (cached instanceof Error) {
-            if (shouldCacheError) {
-                throw cached;
-            }
-            else {
-                cached = undefined;
-            }
-        }
+        let cached = await this.getValueWithErrorHandling(key, shouldCacheError);
         if (cached !== undefined) {
             return cached;
         }
@@ -83,54 +87,61 @@ class CacheInstance extends node_events_1.EventEmitter {
         if (currentFetch) {
             return currentFetch;
         }
-        // I'm the one fetching.
-        let lock;
-        try {
-            // get the lock if needed
-            const lockName = `lock__${key}`;
-            if (lockTtl && this.isLockingSupported()) {
-                lock = await this.lock(lockName, lockTtl * 1000);
-                // check if the value has been populated while we were locking
-                let cachedValue = await this.getValue(key);
-                if (cachedValue instanceof Error) {
-                    if (shouldCacheError) {
-                        throw cachedValue;
+        // I'm the one fetching - immediately register the fetch promise to prevent race conditions
+        this.activeFetches[key] = (async () => {
+            let lock;
+            let lockErrorMessage;
+            try {
+                // get the lock if needed
+                if (lockTtl && this.isLockingSupported()) {
+                    const lockName = `lock__${key}`;
+                    try {
+                        lock = await this.lock(lockName, lockTtl * 1000);
                     }
-                    else {
-                        cachedValue = undefined;
+                    catch (lockError) {
+                        lockErrorMessage = lockError instanceof Error ? lockError.message : String(lockError);
                     }
                 }
+                // check gain if the value has been populated while we previously checked
+                const cachedValue = await this.getValueWithErrorHandling(key, shouldCacheError);
                 if (cachedValue !== undefined) {
                     return cachedValue;
                 }
+                if (lockErrorMessage) {
+                    throw new Error(`Failed to acquire lock for key ${key}. No active fetch or cached value found: ${lockErrorMessage}`);
+                }
+                // fetch!
+                let error;
+                let result;
+                try {
+                    result = await fetchFunction();
+                }
+                catch (err) {
+                    error = err;
+                }
+                // cache! results: always, errors: only if satisfying user assertion
+                if (error && shouldCacheError && shouldCacheError(error)) {
+                    await this.setValue(key, error, ttl);
+                }
+                else if (result !== undefined) {
+                    await this.setValue(key, result, ttl);
+                }
+                if (error) {
+                    throw error;
+                }
+                return result;
             }
-            // fetch!
-            let error;
-            let result;
-            try {
-                const fetchPromise = (this.activeFetches[key] = fetchFunction());
-                result = await fetchPromise;
-            }
-            catch (err) {
-                error = err;
-            }
-            // cache! results: always, errors: only if satisfying user assertion
-            if (error && shouldCacheError && shouldCacheError(error)) {
-                await this.setValue(key, error, ttl);
-            }
-            else if (result !== undefined) {
-                await this.setValue(key, result, ttl);
-            }
-            if (error) {
-                throw error;
+            finally {
+                if (lock) {
+                    await this.unlock(lock);
+                }
             }
-            return result;
+        })();
+        try {
+            return await this.activeFetches[key];
         }
         finally {
             delete this.activeFetches[key];
-            if (lock) {
-                await this.unlock(lock);
-            }
         }
     }
 }

package/dist/src/lib/CacheInstance.js.map

@@ -1 +1 @@
-{"version":3,"file":"CacheInstance.js","sourceRoot":"","sources":["../../../src/lib/CacheInstance.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CacheInstance.js","sourceRoot":"","sources":["../../../src/lib/CacheInstance.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cachette",
-  "version": "4.0.15",
+  "version": "4.0.16",
   "engines": {
     "node": ">=20",
     "npm": ">=10"

package/src/lib/CacheInstance.ts

@@ -139,6 +139,19 @@ export abstract class CacheInstance extends EventEmitter {
    */
   private activeFetches: { [key: string]: Promise<CachableValue> } = {};
 
+  private async getValueWithErrorHandling(key: string, shouldCacheError?: (err: Error) => boolean): Promise<CachableValue> {
+    const cached = await this.getValue(key);
+    if (cached instanceof Error) {
+      if (shouldCacheError && shouldCacheError(cached)) {
+        throw cached;
+      } else {
+        return undefined;
+      }
+    }
+
+    return cached;
+  }
+
   /**
    * Get or fetch a value
    *
@@ -160,14 +173,7 @@ export abstract class CacheInstance extends EventEmitter {
     shouldCacheError?: (err: Error) => boolean,
   ): Promise<ReturnType<F>> {
     // already cached?
-    let cached = await this.getValue(key);
-    if (cached instanceof Error) {
-      if (shouldCacheError) {
-        throw cached;
-      } else {
-        cached = undefined;
-      }
-    }
+    let cached = await this.getValueWithErrorHandling(key, shouldCacheError);
     if (cached !== undefined) {
       return cached;
     }
@@ -178,53 +184,63 @@ export abstract class CacheInstance extends EventEmitter {
       return currentFetch;
     }
 
-    // I'm the one fetching.
-    let lock: Lock | undefined;
-    try {
-      // get the lock if needed
-      const lockName = `lock__${key}`;
-      if (lockTtl && this.isLockingSupported()) {
-        lock = await this.lock(lockName, lockTtl * 1000);
-        // check if the value has been populated while we were locking
-        let cachedValue = await this.getValue(key);
-        if (cachedValue instanceof Error) {
-          if (shouldCacheError) {
-            throw cachedValue;
-          } else {
-            cachedValue = undefined;
+    // I'm the one fetching - immediately register the fetch promise to prevent race conditions
+    this.activeFetches[key] = (async () => {
+      let lock: Lock | undefined;
+      let lockErrorMessage: string | undefined;
+
+      try {
+        // get the lock if needed
+        if (lockTtl && this.isLockingSupported()) {
+          const lockName = `lock__${key}`;
+          try {
+            lock = await this.lock(lockName, lockTtl * 1000);
+          } catch (lockError) {
+            lockErrorMessage = lockError instanceof Error ? lockError.message : String(lockError);
           }
         }
+
+        // check gain if the value has been populated while we previously checked
+        const cachedValue = await this.getValueWithErrorHandling(key, shouldCacheError);
         if (cachedValue !== undefined) {
           return cachedValue;
         }
-      }
 
-      // fetch!
-      let error: Error | undefined;
-      let result: any;
-      try {
-        const fetchPromise = (this.activeFetches[key] = fetchFunction());
-        result = await fetchPromise;
-      } catch (err) {
-        error = err;
-      }
+        if (lockErrorMessage) {
+          throw new Error(`Failed to acquire lock for key ${key}. No active fetch or cached value found: ${lockErrorMessage}`);
+        }
 
-      // cache! results: always, errors: only if satisfying user assertion
-      if (error && shouldCacheError && shouldCacheError(error)) {
-        await this.setValue(key, error, ttl);
-      } else if (result !== undefined) {
-        await this.setValue(key, result, ttl);
-      }
+        // fetch!
+        let error: Error | undefined;
+        let result: any;
+        try {
+          result = await fetchFunction();
+        } catch (err) {
+          error = err;
+        }
 
-      if (error) {
-        throw error;
+        // cache! results: always, errors: only if satisfying user assertion
+        if (error && shouldCacheError && shouldCacheError(error)) {
+          await this.setValue(key, error, ttl);
+        } else if (result !== undefined) {
+          await this.setValue(key, result, ttl);
+        }
+
+        if (error) {
+          throw error;
+        }
+        return result;
+      } finally {
+        if (lock) {
+          await this.unlock(lock);
+        }
       }
-      return result;
+    })();
+
+    try {
+      return await this.activeFetches[key];
     } finally {
       delete this.activeFetches[key];
-      if (lock) {
-        await this.unlock(lock);
-      }
     }
   }
 }

package/test/CacheClient_test.ts

@@ -132,6 +132,50 @@ describe('CacheClient', () => {
       expect(myObj.numCalled).to.equal(2); // from cache -> NO increase
     });
 
+    it('correctly evaluates shouldCacheError callback when retrieving cached errors', async () => {
+      const cache = new LocalCache();
+      const key = 'test-key';
+
+      // Manually cache an error with a specific property
+      const cachedError = new Error('cached error');
+      cachedError['errorType'] = 'temporary';
+      await cache.setValue(key, cachedError, 60);
+
+      // Try to retrieve with a shouldCacheError that should reject this error
+      const result = await cache.getOrFetchValue(
+        key,
+        60,
+        async () => 'fresh value',
+        undefined,
+        (err) => err['errorType'] === 'permanent', // Only cache permanent errors
+      );
+
+      // Should return 'fresh value' because the cached error doesn't match the callback criteria
+      expect(result).to.equal('fresh value');
+
+      // Now try with a callback that accepts the cached error
+      const cachedError2 = new Error('cached error 2');
+      cachedError2['errorType'] = 'permanent';
+      await cache.setValue(key, cachedError2, 60);
+
+      let didThrow = false;
+      try {
+        await cache.getOrFetchValue(
+          key,
+          60,
+          async () => 'fresh value',
+          undefined,
+          (err) => err['errorType'] === 'permanent', // Only cache permanent errors
+        );
+      } catch (err) {
+        didThrow = true;
+        expect(err.message).to.equal('cached error 2');
+      }
+
+      // Should throw because the cached error matches the callback criteria
+      expect(didThrow).to.be.true;
+    });
+
     it('protect against concurrent fetches', async () => {
       const myObj = new MyClass();
       const jobs: Promise<any>[] = [];

package/test/CacheInstance_test.ts

@@ -456,5 +456,63 @@ function runTests(name: string, cache: CacheInstance): void {
       sinon.assert.calledTwice(lockSpy); // includes our own call above
       sinon.assert.calledTwice(unlockSpy);
     });
+
+    ifLockIt('returns cached value if lock acquisition fails and value was populated meanwhile', async () => {
+      const key = `key${Math.random()}`;
+      let numCalled = 0;
+      const object = {
+        fetch: async (v) => {
+          numCalled++;
+          return v;
+        },
+      };
+
+      const fetchFunction = object.fetch.bind(object, 'newvalue');
+
+      // Restore the spy temporarily so we can stub it
+      lockSpy.restore();
+
+      const lockStub = sinon.stub(cache, 'lock').callsFake(async () => {
+        // Before failing, simulate the cache being populated
+        await cache.setValue(key, 'from-cache');
+        throw new Error('Lock acquisition failed');
+      });
+
+      const value = await cache.getOrFetchValue(key, 10, fetchFunction, 1);
+
+      expect(value).to.eql('from-cache');
+      expect(numCalled).to.eql(0); // never called fetch, got from cache
+
+      lockStub.restore();
+      lockSpy = sinon.spy(cache, 'lock');
+    });
+
+    ifLockIt('throws detailed error if lock fails with no activeFetch or cached value', async () => {
+      const key = `key${Math.random()}`;
+      const object = {
+        fetch: async (v) => v,
+      };
+
+      const fetchFunction = object.fetch.bind(object, 'newvalue');
+
+      // Restore the spy temporarily so we can stub it
+      lockSpy.restore();
+
+      const lockStub = sinon.stub(cache, 'lock').rejects(new Error('Lock acquisition failed'));
+
+      let thrownError: Error | undefined;
+      try {
+        await cache.getOrFetchValue(key, 10, fetchFunction, 1);
+      } catch (err) {
+        thrownError = err as Error;
+      }
+
+      expect(thrownError).to.exist;
+      expect(thrownError!.message).to.include(`Failed to acquire lock for key ${key}. No active fetch or cached value found: Lock acquisition failed`);
+
+      // Restore and recreate the spy
+      lockStub.restore();
+      lockSpy = sinon.spy(cache, 'lock');
+    });
   });
 }