From fded0e12bf7824fe8823e3d30324f8634cbacca5 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Fri, 8 May 2026 16:05:12 +0400
Subject: [PATCH] fix(storage): refresh streamed cache hits through cache save

---
 app/controllers/shared/api.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
index 1c5e9ac439..1d9e1a5d97 100644
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@@ -713,11 +713,18 @@ Http::init()
                     }
                 }
 
+                $cachedPayload = null;
                 $accessedAt = $cacheLog->getAttribute('accessedAt', '');
                 if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_CACHE_UPDATE)) > $accessedAt) {
                     $authorization->skip(fn () => $dbForProject->updateDocument('cache', $cacheLog->getId(), new Document([
                         'accessedAt' => DateTime::now(),
                     ])));
+                    $cachedPayload = \stream_get_contents($data);
+                    if ($cachedPayload === false) {
+                        throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to read cached response stream');
+                    }
+                    // Overwrite the file every APP_CACHE_UPDATE seconds to update the file modified time that is used in the TTL checks in cache->load()
+                    $cache->save($key, $cachedPayload);
                 }
 
                 $response
@@ -727,6 +734,12 @@ Http::init()
                 $storageCacheOperationsCounter->add(1, ['result' => 'hit']);
                 if (! $isImageTransformation || ! $isDisabled) {
                     Span::add('storage.cache.hit', true);
+                    if ($cachedPayload !== null) {
+                        \fclose($data);
+                        $response->send($cachedPayload);
+                        return;
+                    }
+
                     try {
                         while (! \feof($data)) {
                             $chunk = \fread($data, MAX_OUTPUT_CHUNK_SIZE);