[FEATURE] Add TYPO3 v11 support

Author: bmack

Classes/Http/ResourcePusher.php

@@ -0,0 +1,54 @@
+<?php
+declare(strict_types = 1);
+namespace B13\Http2\Http;
+
+/*
+ * This file is part of TYPO3 CMS-based extension "http2" by b13.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ */
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use TYPO3\CMS\Core\Http\NormalizedParams;
+use TYPO3\CMS\Core\Utility\PathUtility;
+use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
+
+/**
+ * Takes existing accumulated resources and pushes them as HTTP2 <link> headers as middleware.
+ *
+ * This considers that everything is required, thus is marked as "preload", not via "prefetch".
+ *
+ * Also, it only tackles "script", "style", but we should incorporate font as well.
+ * See https://w3c.github.io/preload/#as-attribute
+ */
+class ResourcePusher implements MiddlewareInterface
+{
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $response = $handler->handle($request);
+        if (($GLOBALS['TSFE'] ?? null) instanceof TypoScriptFrontendController) {
+            $resources = $GLOBALS['TSFE']->config['b13/http2'] ?? null;
+            /** @var NormalizedParams $normalizedParams */
+            $normalizedParams = $request->getAttribute('normalizedParams');
+            if (is_array($resources) && $normalizedParams->isHttps()) {
+                foreach ($resources['scripts'] ?? []  as $resource) {
+                    $response = $this->addPreloadHeaderToResponse($response, $resource, 'script');
+                }
+                foreach ($resources['styles'] ?? []  as $resource) {
+                    $response = $this->addPreloadHeaderToResponse($response, $resource, 'style');
+                }
+            }
+        }
+        return $response;
+    }
+
+    protected function addPreloadHeaderToResponse(ResponseInterface $response, string $uri, string $type): ResponseInterface
+    {
+        return $response->withAddedHeader('Link', '<' . htmlspecialchars(PathUtility::getAbsoluteWebPath($uri)) . '>; rel=preload; as=' . $type);
+    }
+}

Classes/ResourcePusher.php

@@ -10,6 +10,7 @@
  * of the License, or any later version.
  */
 
+use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
@@ -29,23 +30,23 @@ class ResourcePusher
      */
     public function pushAll(array $resources)
     {
-        foreach ($resources['scripts'] as $resource) {
+        foreach ($resources['scripts'] ?? [] as $resource) {
             $this->addPreloadHeader($resource, 'script');
         }
-        foreach ($resources['styles'] as $resource) {
+        foreach ($resources['styles'] ?? [] as $resource) {
             $this->addPreloadHeader($resource, 'style');
         }
     }
 
     /**
      * @param array $params
      * @param TypoScriptFrontendController $typoScriptFrontendController
-     * @internal this is just a hook implementation.
+     * @internal this is just a hook implementation. can be removed when TYPO3 v9 support is removed.
      */
     public function pushForFrontend(array $params, TypoScriptFrontendController $typoScriptFrontendController)
     {
-        $allResources = $typoScriptFrontendController->config['b13/http2'];
-        if (GeneralUtility::getIndpEnv('TYPO3_SSL') && is_array($allResources)) {
+        $allResources = $typoScriptFrontendController->config['b13/http2'] ?? null;
+        if ($this->useHook() && GeneralUtility::getIndpEnv('TYPO3_SSL') && is_array($allResources)) {
             $this->pushAll($allResources);
         }
     }
@@ -60,4 +61,12 @@ protected function addPreloadHeader(string $uri, string $type)
     {
         header('Link: <' . htmlspecialchars(PathUtility::getAbsoluteWebPath($uri)) . '>; rel=preload; as=' . $type, false);
     }
+
+    protected function useHook(): bool
+    {
+        if (class_exists(Typo3Version::class) && (new Typo3Version())->getMajorVersion() >= 10) {
+            return false;
+        }
+        return true;
+    }
 }

Configuration/RequestMiddlewares.php

@@ -0,0 +1,14 @@
+<?php
+return [
+    'frontend' => [
+        'b13/http2/push-resources' => [
+            'target' => \B13\Http2\Http\ResourcePusher::class,
+            'before' => [
+                'typo3/cms-frontend/prepare-tsfe-rendering',
+            ],
+            'after' => [
+                'typo3/cms-frontend/authentication',
+            ],
+        ],
+    ]
+];

README.md

@@ -8,7 +8,8 @@ This TYPO3 extension fetches all CSS and JS resources that are used
 for a page-rendering and sends additional HTTP/2 Headers "Link" for each resource
 resulting in a faster first contentful paint for TYPO3 CMS.
 
-This extension currently runs on TYPO3 v7 LTS, TYPO3 v8 LTS and TYPO3 v9 LTS.
+This extension currently runs on TYPO3 v7, TYPO3 v8, TYPO3 v9, TYPO3 v10 and TYPO3 v11,
+and needs PHP 7.0 or higher.
 
 ## Installation
 
@@ -33,11 +34,10 @@ Also, use PHP7 - if you care about performance or supported PHP versions, there
 1. Hook into the "PageRenderer" API class by fetching the concatenated CSS / JS files, and
 libraries.
 2. If in FE, this is stored within TSFE together with cached data (could be run twice here for non-cached info)
-3. Send to the client via `header()` - in BE directly or in FE at the end of the request.
+3. Send to the client via `header()` - in BE directly or in FE at the end of the request via a PSR-15 middleware (TYPO3 v10+ only).
 
 ## ToDo
 
-* Use Middlewares and PSR-7 for TYPO3 v9
 * Implement options to also allow to define other resources (fonts/images), e.g. via TypoScript.
 * Use proper DTOs instead of arrays.
 

composer.json

@@ -4,8 +4,9 @@
 	"description": "Speed up TYPO3 rendering via HTTP/2 Server Push",
 	"require": {
 		"php": "^7.0",
-		"typo3/cms-core": "^7.6 || ^8.7 || ^9.5 || ^10.0",
-		"typo3/cms-frontend": "^7.6 || ^8.7 || ^9.5 || ^10.0"
+		"psr/http-server-middleware": "^1.0",
+		"typo3/cms-core": "^7.6 || ^8.7 || ^9.5 || ^10.0 || ^11.0",
+		"typo3/cms-frontend": "^7.6 || ^8.7 || ^9.5 || ^10.0 || ^11.0"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "~7.0",

ext_emconf.php

@@ -8,11 +8,11 @@
     'state' => 'stable',
     'clearcacheonload' => 1,
     'author' => 'b13 GmbH',
-    'author_email' => 'typo3@b13.de',
+    'author_email' => 'typo3@b13.com',
     'author_company' => 'b13 GmbH',
     'constraints' => [
         'depends' => [
-            'typo3' => '7.6.0-10.99.99',
+            'typo3' => '7.6.0-11.99.99',
         ],
     ],
 ];

ext_localconf.php

@@ -2,4 +2,6 @@
 defined('TYPO3_MODE') or die();
 
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_pagerenderer.php']['render-postProcess']['b13/http2'] = B13\Http2\PageRendererHook::class . '->accumulateResources';
+
+// can be removed as soon as TYPO3 v9 support is dropped, as this is now taken care of by a middleware
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['contentPostProc-output']['b13/http2'] = B13\Http2\ResourcePusher::class . '->pushForFrontend';