UI: add HTTP cache headers; cache files content

buggregator · Dec 29, 2023 · a0c6e60 · a0c6e60
1 parent e5e642d
commit a0c6e60
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/Sender/Frontend/Http/StaticFiles.php b/src/Sender/Frontend/Http/StaticFiles.php
@@ -28,7 +28,10 @@ public function handle(ServerRequestInterface $request, callable $next): Respons
         if (\preg_match('#^/((?:[a-zA-Z0-9\\-_]+/)*[a-zA-Z0-9.\\-\\[\\]() _]+?\\.([a-zA-Z0-4]++))$#', $path, $matches)) {
             $file = \sprintf("%s/resources/frontend/%s", Info::TRAP_ROOT, $matches[1]);
 
-            if (!\is_file($file)) {
+            /** @var array<non-empty-string, string> $cache */
+            static $cache = [];
+
+            if (!\array_key_exists($file, $cache) && !\is_file($file)) {
                 return new Response(404);
             }
 
@@ -51,11 +54,11 @@ public function handle(ServerRequestInterface $request, callable $next): Respons
 
             if ($path === '/index.html') {
                 if (empty($this->earlyResponse)) {
-                    $content = \file_get_contents($file);
+                    $cache[$file] ??= \file_get_contents($file);
                     // Find all CSS files
                     \preg_match_all(
                         '#\\bhref="([^"]+?\\.css)"#i',
-                        $content,
+                        $cache[$file],
                         $matches,
                     );
                     $this->earlyResponse = \array_unique($matches[1]);
@@ -71,14 +74,18 @@ public function handle(ServerRequestInterface $request, callable $next): Respons
                 // (new \Buggregator\Trap\Support\Timer(2))->wait(); // to test early hints
             }
 
+            $cache[$file] ??= \file_get_contents($file);
 
             return new Response(
                 200,
                 [
-                    'Content-Type' => $type,
-                    'Content-Length' => \filesize($file),
+                    'Content-Type' => [$type],
+                    'Content-Length' => [\filesize($file)],
+                    'Date' => [\gmdate('D, d M Y H:i:s T')],
+                    'Cache-Control' => ['max-age=604801'],
+                    'ETag' => [\sha1($cache[$file])],
                 ] + $headers,
-                $content ?? \file_get_contents($file),
+                $cache[$file] ??= \file_get_contents($file),
             );
         }
 

diff --git a/src/Support/StreamHelper.php b/src/Support/StreamHelper.php
@@ -16,9 +16,9 @@
  */
 final class StreamHelper
 {
-    private const CHUNK_SIZE = 1048576; // 1 Mb
-    private const WRITE_STREAM_CHUNK_SIZE = 8388608; // 8 Mb
-    private const MAX_FILE_MEMORY_SIZE = 4194304; // 4MB
+    private const CHUNK_SIZE = 1 * 1024 * 1024; // 1 Mb
+    private const WRITE_STREAM_CHUNK_SIZE = 8 * 1024 * 1024; // 8 Mb
+    private const MAX_FILE_MEMORY_SIZE = 4 * 1024 * 1024; // 4MB
 
     /**
      * @param non-empty-string $substr