TASK: Move public caching into requestCache Middleware

Author: mficzel

Classes/Middleware/PublicCacheHeaderMiddleware.php

@@ -52,6 +52,12 @@ class RequestCacheMiddleware implements MiddlewareInterface
      */
     protected $ignoredCookieParams;
 
+    /**
+     * @var boolean
+     * @Flow\InjectConfiguration(path="maxPublicCacheTime")
+     */
+    protected $maxPublicCacheTime;
+
     public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         if (!$this->enabled) {
@@ -82,6 +88,23 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 ->withoutHeader(self::HEADER_LIFTIME)
                 ->withoutHeader(self::HEADER_TAGS);
 
+            $publicLifetime = 0;
+            if ($this->maxPublicCacheTime > 0) {
+                if ($lifetime > 0 && $lifetime < $this->maxPublicCacheTime) {
+                    $publicLifetime = $lifetime;
+                } else {
+                    $publicLifetime = $this->maxPublicCacheTime;
+                }
+            }
+
+            if ($publicLifetime > 0) {
+                $entryContentHash = md5($response->getBody()->getContents());
+                $response->getBody()->rewind();
+                $response = $response
+                    ->withHeader('ETag', '"' . $entryContentHash . '"')
+                    ->withHeader('Cache-Control', 'public, max-age=' . $publicLifetime);
+            }
+
             $this->cacheFrontend->set($entryIdentifier,[ 'timestamp' => time(), 'response' => str($response) ], $tags, $lifetime);
             $response->getBody()->rewind();
             return $response->withHeader(self::HEADER_INFO, 'MISS: ' . $entryIdentifier);

Classes/Middleware/RequestCacheMiddleware.php

@@ -38,12 +38,9 @@ Neos:
         'fullPageRequestCache':
           middleware: 'Flowpack\FullPageCache\Middleware\RequestCacheMiddleware'
           position: 'after trustedProxies'
-        'fullPageCachePublicHeader':
-          middleware: 'Flowpack\FullPageCache\Middleware\PublicCacheHeaderMiddleware'
-          position: 'after fullPageRequestCache 20'
         'fullPageCacheFusionAutoconfiguration':
           middleware: 'Flowpack\FullPageCache\Middleware\FusionAutoconfigurationMiddleware'
-          position: 'after fullPageRequestCache 10'
+          position: 'after fullPageRequestCache'
   Neos:
     fusion:
       autoInclude:

Configuration/Settings.yaml

@@ -54,19 +54,18 @@ You can also move the cache backend to something faster if available, to improve
 How it works
 ------------
 
-The package defines three http middlewares:
+The package defines two http middlewares:
 
-- `fullPageRequestCache`: If a request is cacheble the cache is asked first and only if no response is found the 
+- `RequestCacheMiddleware`: If a request is cacheable the cache is asked first and only if no response is found the 
   request is passed down the middleware chain. The cache lifetime and tags are determined from the 
   `X-FullPageCache-Enabled`, `X-FullPageCache-Lifetime` and `X-FullPageCache-Tags` that are set by upstream middlewares 
-  or controllers. 
+  or controllers. Additionally the middleware adds `ETag` and `CacheControl` Headers taking the lifetime and setting
+  `maxPublicCacheTime` into account.
 
-- `fullPageCachePublicHeader` : Set `ETag` and `CacheControl` Headers based on the `X-FullPageCache-Enabled` and the 
-  `X-FullPageCache-Lifetime` headers taking the `maxPublicCacheTime` into account.
-  
-- `fullPageCacheFusionAutoconfiguration`: Connects to the fusion cache and extracts tags plus the allowed lifetime which is then 
+- `FusionAutoconfigurationMiddleware`: Connects to the fusion cache and extracts tags plus the allowed lifetime which is then 
   stored in the response headers `X-FullPageCache-Enabled`, `X-FullPageCache-Lifetime` and `X-FullPageCache-Tags`. 
-  This component expects a header `X-FullPageCache-EnableFusionAutoconfiguration` which is set automatically for `Neos.Neos:Page`.
+  This component is only active if the header `X-FullPageCache-EnableFusionAutoconfiguration` is present in the response 
+  which is set automatically for `Neos.Neos:Page`.
 
 Custom controllers that want to control the caching behavior directly can set the headers `X-FullPageCache-Enabled`, 
 `X-FullPageCache-Lifetime` and `X-FullPageCache-Tags` directly while fusion based controllers can enable the autoconfiguration