Feature/image optimization adjustments

Controller/Adminhtml/FastlyCdn/Vcl/PushImageSettings.php

@@ -104,7 +104,6 @@ public function execute()
                     'name' => $reqName,
                     'service_id' => $service->id,
                     'version' => $currActiveVersion['active_version'],
-                    'force_ssl' => true,
                     'request_condition' => $createCondition->name
                 ];
 

Model/Config.php

@@ -167,7 +167,13 @@ class Config extends \Magento\PageCache\Model\Config
      * XML path to image optimizations flag
      */
     const XML_FASTLY_IMAGE_OPTIMIZATIONS
-        = 'system/full_page_cache/fastly/fastly_advanced_configuration/image_optimizations';
+        = 'system/full_page_cache/fastly/fastly_image_optimization_configuration/image_optimizations';
+
+    /**
+     * XML path to image optimizations pixel ratio flag
+     */
+    const XML_FASTLY_IMAGE_OPTIMIZATIONS_PIXEL_RATIO
+        = 'system/full_page_cache/fastly/fastly_image_optimization_configuration/image_optimizations_pixel_ratio';
 
     /**
      * XML path to Google analytics CID
@@ -455,9 +461,27 @@ public function getGeoIpRedirectMapping()
      */
     public function isImageOptimizationEnabled()
     {
+        if ($this->isFastlyEnabled() !== true) {
+            return false;
+        }
+
         return $this->_scopeConfig->isSetFlag(self::XML_FASTLY_IMAGE_OPTIMIZATIONS);
     }
 
+    /**
+     * Determines should Image optimization pixel ratios be used
+     *
+     * @return bool
+     */
+    public function isImageOptimizationPixelRatioEnabled()
+    {
+        if ($this->isImageOptimizationEnabled() !== true) {
+            return false;
+        }
+
+        return $this->_scopeConfig->isSetFlag(self::XML_FASTLY_IMAGE_OPTIMIZATIONS_PIXEL_RATIO);
+    }
+
     /**
      * Return blocked countries
      *

Model/Product/Image.php

@@ -143,10 +143,6 @@ private function adjustSize()
         $originalImage = $this->_mediaDirectory->getAbsolutePath($this->getBaseFile());
         $originalSize = getimagesize($originalImage);
 
-        if ($this->_keepFrame) {
-            $this->fastlyParameters['canvas'] = implode(',', [$this->getWidth(), $this->getHeight()]);
-        }
-
         if ($this->getWidth() > $originalSize[0]) {
             $this->setWidth($originalSize[0]);
         }

Plugin/AdaptivePixelRationPlugin.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Fastly\Cdn\Plugin;
+
+/**
+ * Class AdaptivePixelRationPlugin
+ * @package Fastly\Cdn\Plugin
+ */
+class AdaptivePixelRationPlugin
+{
+    /**
+     * @var \Fastly\Cdn\Model\Config
+     */
+    public $config;
+
+    /**
+     * AdaptivePixelRationPlugin constructor.
+     *
+     * @param \Fastly\Cdn\Model\Config $config
+     */
+    public function __construct(\Fastly\Cdn\Model\Config $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * Adjust srcset if required
+     *
+     * @param \Magento\Catalog\Block\Product\Image $subject
+     */
+    public function beforeToHtml(\Magento\Catalog\Block\Product\Image $subject)
+    {
+        if ($this->config->isImageOptimizationPixelRatioEnabled() !== true) {
+            return;
+        }
+
+        $imageUrl = $subject->getData('image_url');
+        $glue = (strpos($imageUrl, '?') !== false) ? '&' : '?';
+        $srcSet = [
+            $imageUrl . $glue . 'dpr=1.5 1.5x',
+            $imageUrl . $glue . 'dpr=2 2x'
+        ];
+
+        $subject->setData('custom_attributes', 'srcset="' . implode(',', $srcSet) . '"');
+    }
+}

etc/adminhtml/system.xml

@@ -196,10 +196,13 @@
                                 <field id="enable_geoip">1</field>
                             </depends>
                         </field>
+                    </group>
+                    <group id="fastly_image_optimization_configuration" sortOrder="450" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <label>Image optimization</label>
                         <field id="fastly_push_image_config" translate="label comment" sortOrder="90" showInDefault="1" showInStore="0" showInWebsite="0">
                             <label><![CDATA[Enable Fastly image optimization snippet]]></label>
                             <comment>
-                                <![CDATA[Enable the Fastly image optimization snippet.]]>
+                                <![CDATA[Push VCL snippet required for image optimization.]]>
                             </comment>
                             <frontend_model>Fastly\Cdn\Block\System\Config\Form\Field\ImageBtn</frontend_model>
                         </field>
@@ -208,6 +211,14 @@
                             <comment><![CDATA[<a href="https://docs.fastly.com/guides/imageopto-setup-use/setup" target="_blank">Image optimization</a> needs to be enabled for your Fastly service.]]></comment>
                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         </field>
+                        <field id="image_optimizations_pixel_ratio" translate="label comment" type="select" sortOrder="95" showInDefault="1" showInWebsite="1" showInStore="1">
+                            <label>Enable adaptive device pixel ratios</label>
+                            <comment><![CDATA[Magento will use <a href="https://docs.fastly.com/guides/imageopto-setup-use/serving-responsive-images#adaptive-device-pixel-ratios" target="_blank">Adaptive device pixel rations</a> through Fastly service.]]></comment>
+                            <depends>
+                                <field id="image_optimizations">1</field>
+                            </depends>
+                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                        </field>
                     </group>
                     <group id="fastly_blocking" sortOrder="245" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Blocking</label>

etc/di.xml

@@ -30,6 +30,9 @@
     <type name="Magento\CacheInvalidate\Model\PurgeCache">
         <plugin name="fastly_disable_varnish_calls" type="Fastly\Cdn\Model\PageCache\PurgeCachePlugin" />
     </type>
+    <type name="Magento\Catalog\Block\Product\Image">
+        <plugin name="fastly_adaptive_pixel_ratio" type="Fastly\Cdn\Plugin\AdaptivePixelRationPlugin" />
+    </type>
     <type name="Magento\Framework\Console\CommandList">
         <arguments>
             <argument name="commands" xsi:type="array">