Selectively invalidate stale paths, but invalidate all when needed.

If the cfMaxPathsToInvalidate option is set, invalidate up to that
many paths. If there are more stale paths than that, invalidate
everything.

This also changes the log message terminology from CloudFront 'items' to
'paths', which is more accurate.

Changed create_invalidation to count up $items itself instead of taking
an argument.

Author: john-shaffer

src/Controller.php

@@ -20,13 +20,6 @@ public function run() : void {
             1
         );
 
-        add_action(
-            'wp2static_post_deploy_trigger',
-            [ $this, 'post_deploy_trigger' ],
-            15,
-            1
-        );
-
         if ( defined( 'WP_CLI' ) ) {
             \WP_CLI::add_command(
                 'wp2static s3',
@@ -226,12 +219,6 @@ public function deploy( string $processed_site_path ) : void {
         $s3_deployer->upload_files( $processed_site_path );
     }
 
-    public static function post_deploy_trigger() : void {
-        if ( Controller::getValue( 'cfInvalidateAllFiles' ) ) {
-            \WP2StaticS3\Deployer::cloudfront_invalidate_all_items();
-        }
-    }
-
     public static function activate_for_single_site() : void {
         global $wpdb;
 

src/Deployer.php

@@ -45,6 +45,10 @@ public function upload_files( string $processed_site_path ) : void {
             $put_data['CacheControl'] = $cache_control;
         }
 
+        $cf_max_paths = Controller::getValue( 'cfMaxPathsToInvalidate' );
+        $cf_max_paths = $cf_max_paths ? intval( $cf_max_paths ) : 0;
+        $cf_stale_paths = [];
+
         foreach ( $iterator as $filename => $file_object ) {
             $base_name = basename( $filename );
             if ( $base_name != '.' && $base_name != '..' ) {
@@ -87,9 +91,29 @@ public function upload_files( string $processed_site_path ) : void {
 
                 if ( $result['@metadata']['statusCode'] === 200 ) {
                     \WP2Static\DeployCache::addFile( $cache_key );
+
+                    if ( $cf_max_paths >= count( $cf_stale_paths ) ) {
+                        $cf_key = $cache_key;
+                        if ( 0 === substr_compare( $cf_key, '/index.html', -11) ) {
+                            $cf_key = substr( $cf_key, 0, -10 );
+                        }
+                        array_push( $cf_stale_paths, $cf_key );
+                    }
                 }
             }
         }
+
+        $distribution_id = Controller::getValue( 'cfDistributionID' );
+        $num_stale = count ( $cf_stale_paths );
+        if ( $distribution_id && $num_stale > 0 ) {
+            if ( $num_stale > $cf_max_paths ) {
+                self::cloudfront_invalidate_all_items();
+            } else {
+                $path_text = ( $num_stale === 1 ) ? 'path' : 'paths';
+                \WP2Static\WsLog::l( "Invalidating $num_stale CloudFront $path_text" );
+                self::create_invalidation( $distribution_id, $cf_stale_paths );
+            }
+        }
     }
 
     public static function s3_client() : \Aws\S3\S3Client {
@@ -173,8 +197,8 @@ public static function cloudfront_client() : \Aws\CloudFront\CloudFrontClient {
         return $client;
     }
 
-    public static function create_invalidation( string $distribution_id, array $items,
-                                                int $quantity ) : string {
+    public static function create_invalidation( string $distribution_id, array $items )
+    : string {
         $client = self::cloudfront_client();
 
         return $client->createInvalidation(
@@ -184,7 +208,7 @@ public static function create_invalidation( string $distribution_id, array $item
                     'CallerReference' => 'WP2Static S3 Add-on ' . time(),
                     'Paths' => [
                         'Items' => $items,
-                        'Quantity' => $quantity,
+                        'Quantity' => count( $items ),
                     ],
                 ],
             ]
@@ -196,11 +220,11 @@ public static function cloudfront_invalidate_all_items() : void {
             return;
         }
 
-        \WP2Static\WsLog::l( 'Invalidating all CloudFront items' );
+        \WP2Static\WsLog::l( 'Invalidating all CloudFront paths' );
 
         try {
             self::create_invalidation( Controller::getValue( 'cfDistributionID' ),
-                                       [ '/*' ], 1);
+                                       [ '/*' ]);
         } catch ( AwsException $e ) {
             // output error message if fails
             error_log( $e->getMessage() );