Add SVG push support and excluding favicons (#24)

multiwebinc · JacobBennett · commit 79b1a8d1bf41 · 2019-01-23T06:06:11.000-06:00
* Add SVG push support * Update AddHttp2ServerPush.php * Adding page with SVG object * Adding tests for SVG in <img> and <object> tags * Adding SVG <img> * Update pageWithSVGObject.html * Excluding favicons When preloading favicon files (e.g. regular favicon or Apple touch icon), Chrome complains with the following message: > The resource https://example.net/favicon.png was preloaded using link preload but not used within a few seconds from the window's load event. Please make sure it has an appropriate `as` value and it is preloaded intentionally. The syntax for icon files is like: ``` <link rel="icon" href="/favicon.png"> <link rel="apple-touch-icon-precomposed" href="/favicon-apple.png"/> ``` So excluding anything that contains `icon` somewhere in the `rel` attribute would exclude these from being preloaded. * Add files via upload * Adding test for favicons
diff --git a/src/Middleware/AddHttp2ServerPush.php b/src/Middleware/AddHttp2ServerPush.php
@@ -87,7 +87,7 @@ protected function fetchLinkableNodes($response)
     {
         $crawler = $this->getCrawler($response);
 
-        return collect($crawler->filter('link, script[src], img[src]')->extract(['src', 'href']));
+        return collect($crawler->filter('link:not([rel*="icon"]), script[src], img[src], object[data]')->extract(['src', 'href', 'data']));
     }
 
     /**
@@ -107,6 +107,7 @@ private function buildLinkHeaderString($url)
             '.JPG'  => 'image',
             '.JPEG' => 'image',
             '.PNG'  => 'image',
+            '.SVG'  => 'image',
             '.TIFF' => 'image',
         ];
 
diff --git a/tests/AddHttp2ServerPushTest.php b/tests/AddHttp2ServerPushTest.php
@@ -2,8 +2,6 @@
 
 namespace JacobBennett\Http2ServerPush\Test;
 
-// TODO: test for invalid file types like .svg
-
 use Illuminate\Http\Request;
 use JacobBennett\Http2ServerPush\Middleware\AddHttp2ServerPush;
 use Symfony\Component\HttpFoundation\Response;
@@ -57,7 +55,19 @@ public function it_will_return_an_image_link_header_for_images()
 
         $this->assertTrue($this->isServerPushResponse($response));
         $this->assertStringEndsWith("as=image", $response->headers->get('link'));
-        $this->assertCount(6, explode(",", $response->headers->get('link')));
+        $this->assertCount(7, explode(",", $response->headers->get('link')));
+    }
+
+    /** @test */
+    public function it_will_return_an_image_link_header_for_svg_objects()
+    {
+        $request = new Request();
+
+        $response = $this->middleware->handle($request, $this->getNext('pageWithSVGObject'));
+
+        $this->assertTrue($this->isServerPushResponse($response));
+        $this->assertStringEndsWith("as=image", $response->headers->get('link'));
+        $this->assertCount(1, explode(",", $response->headers->get('link')));
     }
 
     /** @test */
@@ -93,6 +103,16 @@ public function it_will_not_return_a_push_header_for_inline_js()
         $this->assertFalse($this->isServerPushResponse($response));
     }
 
+    /** @test */
+    public function it_will_not_return_a_push_header_for_icons()
+    {
+        $request = new Request();
+
+        $response = $this->middleware->handle($request, $this->getNext('pageWithFavicon'));
+
+        $this->assertFalse($this->isServerPushResponse($response));
+    }
+
     /** @test */
     public function it_will_return_limit_count_of_links()
     {
diff --git a/tests/fixtures/pageWithFavicon.html b/tests/fixtures/pageWithFavicon.html
@@ -0,0 +1,12 @@
+<html>
+
+    <head>
+        <title>Page title</title>
+        <link rel="apple-touch-icon-precomposed" href="/favicon-apple.png"/>
+        <link rel="icon" href="favicon.png">
+    </head>
+
+    <body>
+    </body>
+
+</html>
diff --git a/tests/fixtures/pageWithImages.html b/tests/fixtures/pageWithImages.html
@@ -11,6 +11,7 @@
         <img src="/images/photo.jpeg" alt="">
         <img src="/images/logo.png" alt="">
         <img src="/images/noidea.tiff" alt="">
+        <img src="/images/vector.svg" alt="">
     </body>
 
 </html>
diff --git a/tests/fixtures/pageWithSVGObject.html b/tests/fixtures/pageWithSVGObject.html
@@ -0,0 +1,11 @@
+<html>
+
+    <head>
+        <title>Page title</title>
+    </head>
+
+    <body>
+        <object data="/images/vector.svg" type="image/svg+xml"></object>
+    </body>
+
+</html>

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ protected function fetchLinkableNodes($response)`
`87`	`87`	`{`
`88`	`88`	`$crawler = $this->getCrawler($response);`
`89`	`89`
`90`		`- return collect($crawler->filter('link, script[src], img[src]')->extract(['src', 'href']));`
	`90`	`+ return collect($crawler->filter('link:not([rel*="icon"]), script[src], img[src], object[data]')->extract(['src', 'href', 'data']));`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`/**`
`@@ -107,6 +107,7 @@ private function buildLinkHeaderString($url)`
`107`	`107`	`'.JPG' => 'image',`
`108`	`108`	`'.JPEG' => 'image',`
`109`	`109`	`'.PNG' => 'image',`
	`110`	`+ '.SVG' => 'image',`
`110`	`111`	`'.TIFF' => 'image',`
`111`	`112`	`];`
`112`	`113`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,11 @@ @@
 +<html>
++
 +    <head>
 +        <title>Page title</title>
 +    </head>
++
 +    <body>
 +        <object data="/images/vector.svg" type="image/svg+xml"></object>
 +    </body>
++
 +</html>