Changeset 2256985

Timestamp:

03/09/2020 12:04:28 AM (6 years ago)

Author:

pcfreak30

Message:

*Version bump to 0.7.1.3

Location:

rocket-async-css/trunk

Files:

• README.txt (modified) (1 diff)
• lib/Rocket/Async/CSS.php (modified) (4 diffs)
• lib/Rocket/Async/CSS/Cache/Manager.php (modified) (6 diffs)
• lib/Rocket/Async/CSS/Integration/Manager.php (modified) (1 diff)
• lib/Rocket/Async/CSS/Integration/ResponsiveImages.php (modified) (8 diffs)
• lib/Rocket/Async/CSS/Integration/VisualComposer.php (added)
• lib/Rocket/Async/CSS/Request.php (modified) (4 diffs)
• rocket-async-css.php (modified) (1 diff)

rocket-async-css/trunk/README.txt

@@ -56 +56 @@
 
 == Changelog ==
+
+### 0.7.1.3 ###
+
+* Bug: Handle edge case where file does not have an extension when fetching remote files
+* Bug: If wpautop is hooked, call it early to prevent DOMDocument from nuking newlines in ResponsiveImages module
+* Enhancement: Optimize loading of picturefill by doing feature detection to conditionally load script
+* Enhancement: Add support for purging cache via cron, using rocket_aync_css_background_cache_purge_item_threshold filter, and preload cache if enabled after
+* Enhancement: Add object cache support to fetching the attachment ID's for a url to reduce unneeded db strain, in ResponsiveImages module
+* Enhancement: Use the remote server to detect the mime type and map it to our registered types if available when fetching files
+* Enhancement: Add filter, rocket_async_css_do_download_remote_file, to allow skipping fetching a remote file
+* Compatibility: Add Visual Composer compatibility
 
 

rocket-async-css/trunk/lib/Rocket/Async/CSS.php

@@ -20 +20 @@
      * Plugin version
      */
-    const VERSION = '0.7.1.2';
+    const VERSION = '0.7.1.3';
 
     /**
@@ -1356 +1356 @@
         }
         $fixed_match = http_build_url( $this->get_url_parts( $match, $url ) );
-        $data        = $this->remote_fetch( $fixed_match );
+
+        if ( ! apply_filters( 'rocket_async_css_do_download_remote_file', true, $fixed_match, $css ) ) {
+            return $css;
+        }
+
+        $data = $this->remote_fetch( $fixed_match );
+
         if ( ! empty( $data ) ) {
             $content_hash = md5( $data );
@@ -1368 +1374 @@
             }
 
+            if ( empty( $info['extension'] ) ) {
+                $request = wp_remote_head( $fixed_match, [
+                    'user-agent' => 'WP-Rocket',
+                    'sslverify'  => false,
+                ] );
+
+                $mime_type = wp_remote_retrieve_header( $request, 'content-type' );
+                if ( empty( $mime_type ) ) {
+                    $mime_type = wp_remote_retrieve_header( $request, 'Content-Type' );
+                }
+                $mimes = array_flip( wp_get_mime_types() );
+                if ( isset( $mimes[ $mime_type ] ) ) {
+                    $info['extension'] = $mimes[ $mime_type ];
+                }
+            }
+
             $hash      = md5( $match_parts['scheme'] . '://' . $info['dirname'] . ( ! empty( $match_parts['port'] ) ? ":{$match_parts['port']}" : '' ) . '/' . $info['filename'] );
-            $filename  = $this->get_cache_path() . $hash . '.' . $info['extension'];
+            $filename  = $this->get_cache_path() . $hash . ( ! empty( $info['extension'] ) ? '.' . $info['extension'] : '' );
             $final_url = parse_url( get_rocket_cdn_url( set_url_scheme( str_replace( WP_CONTENT_DIR, WP_CONTENT_URL, $filename ) ), [
                 'all',
@@ -1508 +1530 @@
     private function parse_css_imports( $matches, $match, $index, $match_parts, $css, $url ) {
         if ( $this->is_url_parts_remote( $match_parts ) ) {
-            $imported_data = $this->remote_fetch( $match );
+            $imported_data = $this->remote_fetch( http_build_url( $match_parts ) );
         } else {
-            $match = $this->strip_cdn( $match );
+            $match = $this->strip_cdn( http_build_url( $match_parts ) );
             // Is this a URL? If so replace with ABSPATH
             $path          = str_replace( $this->home, untrailingslashit( ABSPATH ), $match );

rocket-async-css/trunk/lib/Rocket/Async/CSS/Cache/Manager.php

@@ -34 +34 @@
         add_action( 'after_rocket_clean_term', [ $this, 'purge_term' ] );
         add_action( 'after_rocket_clean_file', [ $this, 'purge_url' ] );
-        add_action( 'after_rocket_clean_domain', [ $this, 'do_preload' ], 10, 0 );
         add_action( 'wp_rocket_start_preload', 'run_rocket_sitemap_preload', 10, 0 );
+        add_action( 'rocket_async_css_purge_cache', [ $this, 'do_purge_cache' ] );
+        if ( is_admin() && $this->get_admin_cache_flag() ) {
+            add_action( 'admin_notices', [ $this, 'cache_purge_notice' ] );
+        }
         $this->store->set_prefix( CSS::TRANSIENT_PREFIX );
         $interval = 0;
@@ -45 +48 @@
     }
 
+    private function get_admin_cache_flag() {
+        return get_transient( $this->get_admin_cache_flag_name() );
+    }
+
+    private function get_admin_cache_flag_name() {
+        return "{$this->plugin->get_safe_slug()}_cache_purging";
+    }
+
+    /**
+     *
+     */
+    public function purge_cache() {
+        if ( $this->get_admin_cache_flag() && ! wp_next_scheduled( 'rocket_async_css_purge_cache' ) ) {
+            $this->clear_admin_cache_flag();
+        }
+        if ( $this->get_admin_cache_flag() ) {
+            return;
+        }
+        $size = $this->store->get_cache_fragment( [ 'count' ] );
+
+        if ( $size > apply_filters( 'rocket_aync_css_background_cache_purge_item_threshold', 25, $size ) && ! wp_doing_cron() ) {
+            wp_schedule_single_event( time(), 'rocket_async_css_purge_cache' );
+            $this->set_admin_cache_flag();
+            return;
+        }
+        $this->do_purge_cache();
+    }
+
+    private function clear_admin_cache_flag() {
+        delete_transient( $this->get_admin_cache_flag_name() );
+    }
+
+    private function set_admin_cache_flag() {
+        set_transient( $this->get_admin_cache_flag_name(), true, DAY_IN_SECONDS );
+    }
+
+    public function do_purge_cache() {
+        $this->set_admin_cache_flag();
+        $this->store->delete_cache_branch();
+        $this->delete_minify_files();
+        $this->clear_admin_cache_flag();
+        remove_action( 'after_rocket_clean_domain', [ $this, 'purge_cache' ] );
+        rocket_clean_domain();
+        $this->do_preload();
+    }
+
+    private function delete_minify_files() {
+        rocket_rrmdir( $this->plugin->get_cache_path() );
+    }
 
     function do_preload() {
@@ -55 +107 @@
     }
 
-    /**
-     *
-     */
-    public function purge_cache() {
-        $this->store->delete_cache_branch();
-        rocket_rrmdir( $this->plugin->get_cache_path() );
+    public function cache_purge_notice() {
+        $class   = 'notice notice-info';
+        $message = __( sprintf( '%s is currently purging the CSS minify cache in the background', $this->plugin->get_plugin_info( 'Name' ) ), $this->plugin->get_safe_slug() );
+
+        printf( '<div class="%1$s"><p>%2$s</p></div>', esc_attr( $class ), esc_html( $message ) );
     }
 
@@ -67 +118 @@
      */
     public function purge_post( $post ) {
-        $this->store->delete_cache_branch( [ 'cache', "post_{$post->ID}" ] );
+        $path = [ 'cache', "post_{$post->ID}" ];
+        $this->delete_cache_file( $path );
+    }
+
+    private function delete_cache_file( $path ) {
+        $cache = $this->store->get_cache_fragment( array_merge( $path, [ 'cache_1' ] ) );
+        if ( ! empty( $cache ) ) {
+            foreach ( $cache as $item ) {
+                $item = explode( '_', $item );
+                $item = end( $item );
+                $item = $this->store->get_cache_fragment( array_merge( $path, [ $item ] ) );
+                if ( ! empty( $item['filename'] ) ) {
+                    $this->plugin->wp_filesystem->delete( $item['filename'] );
+                }
+            }
+        }
+        $this->store->delete_cache_branch( $path );
     }
 
@@ -74 +141 @@
      */
     public function purge_term( $term ) {
-        $this->store->delete_cache_branch( [ 'cache', "term_{$term->term_id}" ] );
+        $path = [ 'cache', "term_{$term->term_id}" ];
+        $this->delete_cache_file( $path );
     }
 
@@ -81 +149 @@
      */
     public function purge_url( $url ) {
-        $url = md5( $url );
-        $this->store->delete_cache_branch( [ 'cache', "url_{$url}" ] );
+        $url  = md5( $url );
+        $path = [ 'cache', "url_{$url}" ];
+        $this->delete_cache_file( $path );
     }
 

rocket-async-css/trunk/lib/Rocket/Async/CSS/Integration/Manager.php

@@ -34 +34 @@
         'EssentialAddonsElementor',
         'Genesis',
+        'VisualComposer',
     ];
 

rocket-async-css/trunk/lib/Rocket/Async/CSS/Integration/ResponsiveImages.php

@@ -9 +9 @@
 use Rocket\Async\CSS\DOMDocument;
 
+/**
+ * Class ResponsiveImages
+ * @package Rocket\Async\CSS\Integration
+ */
 class ResponsiveImages extends Component {
+    /**
+     *
+     */
+    const CACHE_NAME_URL_TO_ID = 'rocket_async_css_responsive_images_urls';
+    /**
+     *
+     */
+    const CACHE_NAME_ID_TO_URL = 'rocket_async_css_responsive_images';
+    /**
+     * @var
+     */
     private $current_guid;
+    /**
+     * @var DOMDocument
+     */
     private $document;
 
@@ -22 +40 @@
     }
 
+    /**
+     *
+     */
     public function init() {
         add_filter( 'wp', [ $this, 'wp_loaded' ] );
     }
 
+    /**
+     *
+     */
     public function wp_loaded() {
         if ( is_admin() || wp_is_xml_request() || wp_is_json_request() || is_feed() || ( function_exists( 'is_amp_endpoint' ) && is_amp_endpoint() ) ) {
@@ -44 +68 @@
         add_filter( 'rocket_async_css_request_buffer', [ $this, 'process' ], 10000 );
         add_filter( 'wp_get_attachment_image_attributes', [ $this, 'maybe_remove_src' ], 10, 2 );
-    }
-
+        add_action( 'attachment_updated', [ $this, 'clear_attachment_cache' ] );
+        add_action( 'delete_attachment', [ $this, 'clear_attachment_cache' ] );
+    }
+
+    /**
+     * @param $content
+     *
+     * @return string|string[]|null
+     */
     public function process( $content ) {
 
@@ -57 +88 @@
 
         $partial = false;
+
+        if ( has_filter( current_filter(), 'wpautop' ) ) {
+            $new_content = wpautop( $new_content );
+            $new_content = shortcode_unautop( $new_content );
+        }
 
         if ( ! preg_match( '/<html[^>]*>/', $new_content ) ) {
@@ -132 +168 @@
                     continue;
                 }
-                add_filter( 'posts_where_paged', [ $this, 'filter_where' ] );
-                $this->current_guid = $this->plugin->strip_cdn( $src );
-                $attachments        = get_posts( [
-                    'post_type'        => 'attachment',
-                    'suppress_filters' => false,
-                    'posts_per_page'   => 1,
-                    'order_by'         => 'none',
-                ] );
-                remove_filter( 'posts_where_paged', [ $this, 'filter_where' ] );
-                if ( ! empty( $attachments ) ) {
-                    $attachment_id = end( $attachments )->ID;
-                }
+                $striped_src = $this->plugin->strip_cdn( $src );
+                if ( ! ( $attachments = wp_cache_get( $striped_src, self::CACHE_NAME_URL_TO_ID ) ) ) {
+                    add_filter( 'posts_where_paged', [ $this, 'filter_where' ] );
+                    $this->current_guid = $striped_src;
+                    $attachments        = get_posts( [
+                        'post_type'        => 'attachment',
+                        'suppress_filters' => false,
+                        'posts_per_page'   => 1,
+                        'order_by'         => 'none',
+                    ] );
+                    remove_filter( 'posts_where_paged', [ $this, 'filter_where' ] );
+                    if ( ! empty( $attachments ) ) {
+                        $attachment_id = end( $attachments )->ID;
+                    }
+                    wp_cache_set( $striped_src, $attachment_id, self::CACHE_NAME_URL_TO_ID );
+                    wp_cache_set( $attachment_id, $striped_src, self::CACHE_NAME_ID_TO_URL );
+                }
+
                 if ( empty( $attachment_id ) ) {
                     $collection->next();
@@ -227 +269 @@
     }
 
+    /**
+     * @param $where
+     *
+     * @return string
+     */
     public
     function filter_where(
@@ -243 +290 @@
     }
 
+    /**
+     * @param $attr
+     * @param \WP_Post $attachment
+     *
+     * @return mixed
+     */
     public function maybe_remove_src( $attr, \WP_Post $attachment ) {
         if ( ! empty( $attr['srcset'] ) || ! empty( $attr['data-srcset'] ) ) {
@@ -262 +315 @@
         return $attr;
     }
+
+    /**
+     * @param $post_id
+     */
+    public function clear_attachment_cache( $post_id ) {
+        if ( $url = wp_cache_get( $post_id, self::CACHE_NAME_ID_TO_URL ) ) {
+            wp_cache_delete( $url, self::CACHE_NAME_URL_TO_ID );
+            wp_cache_delete( $post_id, self::CACHE_NAME_ID_TO_URL );
+        }
+    }
 }

rocket-async-css/trunk/lib/Rocket/Async/CSS/Request.php

@@ -28 +28 @@
             add_filter( 'pre_get_rocket_option_async_css', '__return_zero' );
             add_action( 'wp_footer', [ $this, 'scripts' ], PHP_INT_MAX );
-            add_action( 'wp_enqueue_scripts', [ $this, 'enqueue_scripts' ] );
+            add_action( 'wp_head', [ $this, 'polyfill_detect' ] );
+            add_action( 'mime_types', [ $this, 'register_mimes' ] );
         }
         add_filter( 'pre_get_rocket_option_minify_concatenate_css', '__return_zero' );
@@ -63 +64 @@
     }
 
-    public function enqueue_scripts() {
-        wp_enqueue_script( 'picturefill', plugins_url( 'assets/js/picturefill.min.js', $this->plugin->get_plugin_file() ), '3.0.3' );
-    }
-
     public function process_buffer( $buffer ) {
         if ( apply_filters( 'rocket_async_css_do_request_buffer', true ) ) {
@@ -73 +70 @@
 
         return $buffer;
+    }
+
+    public function polyfill_detect() {
+        $polyfill_url = plugins_url( 'assets/js/picturefill.min.js', $this->plugin->get_plugin_file() );
+        ?>
+        <script type="text/javascript" data-no-minify="1">
+            !(window.HTMLPictureElement||"sizes"in document.createElement("img"))&&function(b,a){a=b.createElement("script");a.type="text/javascript";a.async=!0;a.src=<?= wp_json_encode( $polyfill_url ) ?>;b.getElementsByTagName("head")[0].appendChild(a)}(document);
+        </script>
+        <?php
     }
 
@@ -83 +89 @@
                 window.dispatchEvent(new CustomEvent("JSLoaded"));
             }
+
         </script>
         <?php
     }
+
+    public function register_mimes( $mimes ) {
+        $mimes['woff2'] = 'application/font-woff2';
+        $mimes['woff']  = 'application/font-woff';
+        $mimes['otf']   = 'font/opentype';
+        $mimes['ttf']   = 'font/truetype';
+        return $mimes;
+    }
 }

rocket-async-css/trunk/rocket-async-css.php

@@ -17 +17 @@
  * Plugin URI:        https://github.com/pcfreak30/rocket-async-css
  * Description:       WordPress plugin to combine all CSS load async including inline scripts. Extends WP-Rocket
- * Version:           0.7.1.2
+ * Version:           0.7.1.3
  * Author:            Derrick Hammer
  * Author URI:        http://www.derrickhammer.com