Context Navigation

Changeset 3030898

Timestamp:

02/03/2024 03:00:15 PM (2 years ago)

Author:

kovshenin

Message:

Surge 1.1.0

Location:

surge/trunk

Files:

-                      r2846380
+                      r3030898
 namespace Surge;
+if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+    return;
+}
 include_once( __DIR__ . '/common.php' );
 …
     if ( $ttl < 1 ) {
+        header( 'X-Cache: bypass' );
         return $contents;
+    }
 …
     if ( $skip ) {
+        header( 'X-Cache: bypass' );
         return $contents;
+    }
 …
     ];
     $meta = json_encode( $meta );
+    $meta_json = json_encode( $meta );
     $cache_key = md5( json_encode( $key ) );
     $level = substr( $cache_key, -2 );
 …
     // Could not create file.
     if ( false === $f ) {
+        header( 'X-Cache: bypass' );
         return $contents;
+    }
     fwrite( $f, '<?php exit; ?>' );
     fwrite( $f, pack( 'L', strlen( $meta ) ) );
     fwrite( $f, $meta );
+    fwrite( $f, pack( 'L', strlen( $meta_json ) ) );
+    fwrite( $f, $meta_json );
     fwrite( $f, $contents );
 …
+    }
+    event( 'request', [ 'meta' => $meta ] );
     return $contents;
 };

-                      r2846380
+                      r3030898
         // Add items to this array to add a unique cache variant.
         'variants' => [],
+        // Add callbacks to events early to do crazy stuff.
+        'events' => [],
     ];
 …
     return true;
+}
+/**
+ * Execute an event.
+ *
+ * @param string $event The event name.
+ * @param array $args An array for arguments to pass to callbacks.
+ */
+function event( $event, $args ) {
+    $events = config( 'events' );
+    if ( empty( $events[ $event ] ) ) {
+        return;
+    }
+    foreach ( $events[ $event ] as $key => $callback ) {
+        $callback( $args );
+    }
+}

-                      r2711432
+                      r3030898
     foreach ( $files as $filename ) {
         // Some files after scandir may already be gone/renamed.
+        if ( ! file_exists( $filename ) ) {
+            continue;
+        }
         $stat = @stat( $filename );
         if ( ! $stat ) {

-                      r2846380
+                      r3030898
     expire( sprintf( 'post:%d:%d', $blog_id, $post_id ) );
 }, 10, 2 );
+// Multisite network/blog flags.
+add_action( 'init', function() {
+    if ( is_multisite() ) {
+        flag( sprintf( 'network:%d:%d', get_current_network_id(), get_current_blog_id() ) );
+    }
+} );
 // Last-minute expirations, save flags.
 …
         'update_option_posts_per_page',
         'update_option_woocommerce_permalinks',
+    ];
+    $flush_actions = apply_filters( 'surge_flush_actions', $flush_actions );
+    $ms_flush_actions = [
+        '_core_updated_successfully',
         'automatic_updates_complete',
-        '_core_updated_successfully',
     ];
+    $expire_flag = is_multisite()
+        ? sprintf( 'network:%d:%d', get_current_network_id(), get_current_blog_id() )
+        : '/';
     foreach ( $flush_actions as $action ) {
+        if ( did_action( $action ) ) {
+            expire( $expire_flag );
+            break;
+        }
+    }
+    // Multisite flush actions expire the entire network.
+    foreach ( $ms_flush_actions as $action ) {
         if ( did_action( $action ) ) {
             expire( '/' );
 …
     fwrite( $f, '<?php exit; ?>' . json_encode( $flags ) );
     fclose( $f );
+    event( 'expire', [ 'flags' => $expire ] );
 } );

-                      r2674872
+                      r3030898
         // Invalidate by path.
         if ( substr( $flag, 0, 1 ) == '/' ) {
             if ( substr( $meta['path'], 0, strlen( $flag ) ) ) {
+            if ( substr( $meta['path'], 0, strlen( $flag ) ) === $flag ) {
                 header( 'X-Cache: expired' );
                 fclose( $f );
 …
 header( 'X-Cache: hit' );
 // header( 'X-Flags: ' . implode( ', ', $meta['flags'] ) );
+event( 'request', [ 'meta' => $meta ] );
 fpassthru( $f ); // Pass the remaining bytes to the output.
 fclose( $f );

-                      r2968909
+                      r3030898
 Tags: cache, performance, caching
 Requires at least: 5.7
 Tested up to: 6.3
+Tested up to: 6.4
 Requires PHP: 7.3
 Stable tag: 1.0.5
+Stable tag: 1.1.0
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
 …
 == Changelog ==
+= 1.1.0 =
+* Improved Multisite compatibility
+* Fixed occasional stat() warnings in cleanup routines
+* Fixed expiration by path being too broad
+* Added a filter for flush actions
+* Feature: added a simple events system for s-maxage and stale-while-revalidate support
 = 1.0.5 =
 * Fix woocommerce_product_title compatibility

-                      r2846380
+                      r3030898
 } );
+// Support for 6.1+ cache headers check.
+add_filter( 'site_status_page_cache_supported_cache_headers', function( $headers ) {
+    $headers['x-cache'] = static function( $value ) {
+        return false !== strpos( strtolower( $value ), 'hit' );
+    };
+    return $headers;
+} );
 // Schedule cron events.
 add_action( 'shutdown', function() {

Note: See TracChangeset for help on using the changeset viewer.