Fix min-fresh

kornelski · kornelski · commit 9f01d46c264c · 2025-02-02T13:15:20.000Z
diff --git a/index.js b/index.js
@@ -247,10 +247,7 @@ module.exports = class CachePolicy {
             return false;
         }
 
-        if (
-            requestCC['min-fresh'] &&
-            this.timeToLive() < 1000 * requestCC['min-fresh']
-        ) {
+        if (requestCC['min-fresh'] && this.maxAge() - this.age() < toNumberOrZero(requestCC['min-fresh'])) {
             return false;
         }
 
@@ -455,9 +452,9 @@ module.exports = class CachePolicy {
     }
 
     /**
-     * Up-to-date `max-age` value, in *milliseconds*.
+     * Remaining time this cache entry may be useful for, in *milliseconds*.
      *
-     * Prefer this method over `maxAge()`.
+     * Prefer this method over `maxAge()`, because it includes other factors.
      */
     timeToLive() {
         const age = this.maxAge() - this.age();
diff --git a/test/okhttptest.js b/test/okhttptest.js
@@ -369,6 +369,17 @@ describe('okhttp tests', function() {
         );
     });
 
+    it('request min fresh with stale-while-revalidate', function() {
+        const cache = new CachePolicy(
+            { headers: {} },
+            { headers: {'cache-control': 'max-age=60, stale-while-revalidate=100000'} },
+            { shared: false }
+        );
+
+        assert(!cache.satisfiesWithoutRevalidation({headers: {'cache-control': 'min-fresh=120'}}));
+        assert(cache.satisfiesWithoutRevalidation({headers: {'cache-control': 'min-fresh=10'}}));
+    });
+
     it('request max stale', function() {
         const cache = new CachePolicy(
             { headers: {} },

Original file line number	Diff line number	Diff line change
`@@ -247,10 +247,7 @@ module.exports = class CachePolicy {`
`247`	`247`	`return false;`
`248`	`248`	`}`
`249`	`249`
`250`		`- if (`
`251`		`- requestCC['min-fresh'] &&`
`252`		`- this.timeToLive() < 1000 * requestCC['min-fresh']`
`253`		`- ) {`
	`250`	`+ if (requestCC['min-fresh'] && this.maxAge() - this.age() < toNumberOrZero(requestCC['min-fresh'])) {`
`254`	`251`	`return false;`
`255`	`252`	`}`
`256`	`253`
`@@ -455,9 +452,9 @@ module.exports = class CachePolicy {`
`455`	`452`	`}`
`456`	`453`
`457`	`454`	`/**`
`458`		- * Up-to-date `max-age` value, in milliseconds.
	`455`	`+ * Remaining time this cache entry may be useful for, in milliseconds.`
`459`	`456`	`*`
`460`		- * Prefer this method over `maxAge()`.
	`457`	+ * Prefer this method over `maxAge()`, because it includes other factors.
`461`	`458`	`*/`
`462`	`459`	`timeToLive() {`
`463`	`460`	`const age = this.maxAge() - this.age();`