From aee0fd8373ce506713f6e6a14d3dd53e5b08406f Mon Sep 17 00:00:00 2001
From: WebStreamr <210764791+webstreamr@users.noreply.github.com>
Date: Fri, 27 Jun 2025 19:18:56 +0000
Subject: [PATCH] revert: Revert "fix(fetcher): remove 200 minimum cache"

This reverts commit 80e4f4edc41351b9c92da4bc22e54a0c000947dd.
---
 src/utils/Fetcher.test.ts |  4 ++--
 src/utils/Fetcher.ts      | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/utils/Fetcher.test.ts b/src/utils/Fetcher.test.ts
index 0884140..721e046 100644
--- a/src/utils/Fetcher.test.ts
+++ b/src/utils/Fetcher.test.ts
@@ -16,8 +16,8 @@ describe('fetch', () => {
     fetchMock.clearHistory();
   });
 
-  test('text passes successful response through setting headers and utilising cache', async () => {
-    fetchMock.get('https://some-url.test/', { body: 'some text', status: 200, headers: { 'Cache-Control': 'max-age=123' } });
+  test('text passes successful response through setting headers', async () => {
+    fetchMock.get('https://some-url.test/', 'some text');
 
     const responseText1 = await fetcher.text(ctx, new URL('https://some-url.test/'));
     const responseText2 = await fetcher.text(ctx, new URL('https://some-url.test/'), { headers: { 'User-Agent': 'jest' } });
diff --git a/src/utils/Fetcher.ts b/src/utils/Fetcher.ts
index bcab03e..57edf53 100644
--- a/src/utils/Fetcher.ts
+++ b/src/utils/Fetcher.ts
@@ -51,6 +51,7 @@ export type CustomRequestInit = RequestInit & {
 };
 
 export class Fetcher {
+  private readonly MIN_CACHE_TTL = 900000; // 15m
   private readonly DEFAULT_TIMEOUT = 10000;
   private readonly DEFAULT_QUEUE_LIMIT = 5;
   private readonly DEFAULT_QUEUE_TIMEOUT = 5000;
@@ -163,7 +164,7 @@ export class Fetcher {
 
       httpCacheItem.body = challengeResult.solution.response;
 
-      const ttl = httpCacheItem.policy.timeToLive();
+      const ttl = this.determineCacheTtl(httpCacheItem);
       /* istanbul ignore next */
       if (ttl > 0) {
         this.httpCache.set(this.determineCacheKey(url, init), httpCacheItem, { ttl });
@@ -196,6 +197,14 @@ export class Fetcher {
     return `${url.href}_${init?.body?.toString()}`;
   }
 
+  private determineCacheTtl(httpCacheItem: HttpCacheItem): number {
+    if (httpCacheItem.status === 200) {
+      return Math.max(httpCacheItem.policy.timeToLive(), this.MIN_CACHE_TTL);
+    }
+
+    return httpCacheItem.policy.timeToLive();
+  };
+
   private headersToObject(headers: Headers): Record<string, string> {
     const obj: Record<string, string> = {};
 
@@ -225,7 +234,7 @@ export class Fetcher {
 
     httpCacheItem = { policy, status: response.status, statusText: response.statusText, body };
 
-    const ttl = httpCacheItem.policy.timeToLive();
+    const ttl = this.determineCacheTtl(httpCacheItem);
     if (ttl > 0) {
       this.httpCache.set(cacheKey, httpCacheItem, { ttl });
     }