feat: switch to multiple invalidation urls

christophstockinger · christophstockinger · commit 222a50a22caa · 2023-12-29T23:48:50.000+01:00
diff --git a/config/nextjs.php b/config/nextjs.php
@@ -2,7 +2,7 @@
 
 return [
   'enabled' => env('STATAMIC_NEXTJS_ENABLED', true),
-  'revalidation_url' => env('STATAMIC_NEXTJS_REVALIDATION_URL', 'http://localhost:3000/api/revalidate'),
+  'revalidation_urls' => env('STATAMIC_NEXTJS_REVALIDATION_URLS', []),
   'revalidation_secret' => env('STATAMIC_NEXTJS_REVALIDATION_SECRET', 'secret'),
   'revalidation_type' => env('STATAMOC_NEXTJS_REVALIDATION_TYPE', 'tag'), // tag or path
   'custom_tag_revalidation' => [
diff --git a/src/Listeners/RevalidationTagByAssetSaved.php b/src/Listeners/RevalidationTagByAssetSaved.php
@@ -5,6 +5,7 @@
 use Exception;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\Log;
 use Morethingsdigital\StatamicNextjs\Services\InvalidationService;
 use Morethingsdigital\StatamicNextjs\Services\TagService;
 use Statamic\Events\AssetSaved;
@@ -28,15 +29,12 @@ public function __construct(
     public function handle(AssetSaved $event): void
     {
         try {
-            $invalidated = $this->invalidationService->all();
+            $this->invalidationService->all();
 
-            if ($invalidated) {
-                Toast::info('Next.js Cache invalidated');
-            } else {
-                Toast::error('Next.js Cache invalidation failed');
-            }
+            Toast::info('Next.js Cache invalidated');
         } catch (Exception $exception) {
-            throw new Exception($exception->getMessage());
+            Toast::error('Next.js Cache invalidation failed');
+            Log::error($exception->getTraceAsString());
         }
     }
 }
diff --git a/src/Listeners/RevalidationTagByEntryCreated.php b/src/Listeners/RevalidationTagByEntryCreated.php
@@ -5,6 +5,7 @@
 use Exception;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\Log;
 use Morethingsdigital\StatamicNextjs\Services\InvalidationService;
 use Morethingsdigital\StatamicNextjs\Services\TagService;
 use Statamic\Events\EntryCreated;
@@ -36,15 +37,12 @@ public function handle(EntryCreated $event): void
 
             if (!$tag) return;
 
-            $invalidated = $this->invalidationService->tag($tag);
+            $this->invalidationService->tag($tag);
 
-            if ($invalidated) {
-                Toast::info('Next.js Cache invalidated');
-            } else {
-                Toast::error('Next.js Cache invalidation failed');
-            }
+            Toast::info('Next.js Cache invalidated');
         } catch (Exception $exception) {
-            throw new Exception($exception->getMessage());
+            Toast::error('Next.js Cache invalidation failed');
+            Log::error($exception->getTraceAsString());
         }
     }
 }
diff --git a/src/Listeners/RevalidationTagByEntryDeleted.php b/src/Listeners/RevalidationTagByEntryDeleted.php
@@ -5,6 +5,7 @@
 use Exception;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\Log;
 use Morethingsdigital\StatamicNextjs\Services\InvalidationService;
 use Morethingsdigital\StatamicNextjs\Services\TagService;
 use Statamic\Events\EntryDeleted;
@@ -36,15 +37,12 @@ public function handle(EntryDeleted $event): void
 
             if (!$tag) return;
 
-            $invalidated = $this->invalidationService->tag($tag);
+            $this->invalidationService->tag($tag);
 
-            if ($invalidated) {
-                Toast::info('Next.js Cache invalidated');
-            } else {
-                Toast::error('Next.js Cache invalidation failed');
-            }
+            Toast::info('Next.js Cache invalidated');
         } catch (Exception $exception) {
-            throw new Exception($exception->getMessage());
+            Toast::error('Next.js Cache invalidation failed');
+            Log::error($exception->getTraceAsString());
         }
     }
 }
diff --git a/src/Listeners/RevalidationTagByEntrySaved.php b/src/Listeners/RevalidationTagByEntrySaved.php
@@ -38,15 +38,12 @@ public function handle(EntrySaved $event): void
 
             if (!$tag) return;
 
-            $invalidated = $this->invalidationService->tag($tag);
+            $this->invalidationService->tag($tag);
 
-            if ($invalidated) {
-                Toast::info('Next.js Cache invalidated');
-            } else {
-                Toast::error('Next.js Cache invalidation failed');
-            }
+            Toast::info('Next.js Cache invalidated');
         } catch (Exception $exception) {
-            throw new Exception($exception->getMessage());
+            Toast::error('Next.js Cache invalidation failed');
+            Log::error($exception->getTraceAsString());
         }
     }
 }
diff --git a/src/Listeners/RevalidationTagByGlobalSetDeleted.php b/src/Listeners/RevalidationTagByGlobalSetDeleted.php
@@ -5,6 +5,7 @@
 use Exception;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\Log;
 use Morethingsdigital\StatamicNextjs\Services\InvalidationService;
 use Morethingsdigital\StatamicNextjs\Services\TagService;
 use Statamic\Events\GlobalSetDeleted;
@@ -32,15 +33,12 @@ public function handle(GlobalSetDeleted $event): void
 
             if (!$tag) return;
 
-            $invalidated = $this->invalidationService->tag($tag);
+            $this->invalidationService->tag($tag);
 
-            if ($invalidated) {
-                Toast::info('Next.js Cache invalidated');
-            } else {
-                Toast::error('Next.js Cache invalidation failed');
-            }
+            Toast::info('Next.js Cache invalidated');
         } catch (Exception $exception) {
-            throw new Exception($exception->getMessage());
+            Toast::error('Next.js Cache invalidation failed');
+            Log::error($exception->getTraceAsString());
         }
     }
 }
diff --git a/src/Listeners/RevalidationTagByGlobalSetSaved.php b/src/Listeners/RevalidationTagByGlobalSetSaved.php
@@ -5,6 +5,7 @@
 use Exception;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\Log;
 use Morethingsdigital\StatamicNextjs\Services\InvalidationService;
 use Morethingsdigital\StatamicNextjs\Services\TagService;
 use Statamic\Events\GlobalSetSaved;
@@ -32,15 +33,12 @@ public function handle(GlobalSetSaved $event): void
 
             if (!$tag) return;
 
-            $invalidated = $this->invalidationService->tag($tag);
+            $this->invalidationService->tag($tag);
 
-            if ($invalidated) {
-                Toast::info('Next.js Cache invalidated');
-            } else {
-                Toast::error('Next.js Cache invalidation failed');
-            }
+            Toast::info('Next.js Cache invalidated');
         } catch (Exception $exception) {
-            throw new Exception($exception->getMessage());
+            Toast::error('Next.js Cache invalidation failed');
+            Log::error($exception->getTraceAsString());
         }
     }
 }
diff --git a/src/Listeners/RevalidationTagByNavDeleted.php b/src/Listeners/RevalidationTagByNavDeleted.php
@@ -5,6 +5,7 @@
 use Exception;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\Log;
 use Morethingsdigital\StatamicNextjs\Services\InvalidationService;
 use Morethingsdigital\StatamicNextjs\Services\TagService;
 use Statamic\Events\NavDeleted;
@@ -32,15 +33,12 @@ public function handle(NavDeleted $event): void
 
             if (!$tag) return;
 
-            $invalidated = $this->invalidationService->tag($tag);
+            $this->invalidationService->tag($tag);
 
-            if ($invalidated) {
-                Toast::info('Next.js Cache invalidated');
-            } else {
-                Toast::error('Next.js Cache invalidation failed');
-            }
+            Toast::info('Next.js Cache invalidated');
         } catch (Exception $exception) {
-            throw new Exception($exception->getMessage());
+            Toast::error('Next.js Cache invalidation failed');
+            Log::error($exception->getTraceAsString());
         }
     }
 }
diff --git a/src/Listeners/RevalidationTagByNavSaved.php b/src/Listeners/RevalidationTagByNavSaved.php
@@ -5,6 +5,7 @@
 use Exception;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\Log;
 use Morethingsdigital\StatamicNextjs\Services\InvalidationService;
 use Morethingsdigital\StatamicNextjs\Services\TagService;
 use Statamic\Events\NavSaved;
@@ -32,15 +33,12 @@ public function handle(NavSaved $event): void
 
             if (!$tag) return;
 
-            $invalidated = $this->invalidationService->tag($tag);
+            $this->invalidationService->tag($tag);
 
-            if ($invalidated) {
-                Toast::info('Next.js Cache invalidated');
-            } else {
-                Toast::error('Next.js Cache invalidation failed');
-            }
+            Toast::info('Next.js Cache invalidated');
         } catch (Exception $exception) {
-            throw new Exception($exception->getMessage());
+            Toast::error('Next.js Cache invalidation failed');
+            Log::error($exception->getTraceAsString());
         }
     }
 }
diff --git a/src/Listeners/RevalidationTagByNavTreeSaved.php b/src/Listeners/RevalidationTagByNavTreeSaved.php
@@ -5,6 +5,7 @@
 use Exception;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\Log;
 use Morethingsdigital\StatamicNextjs\Services\InvalidationService;
 use Morethingsdigital\StatamicNextjs\Services\TagService;
 use Statamic\Events\NavTreeSaved;
@@ -32,15 +33,12 @@ public function handle(NavTreeSaved $event): void
 
             if (!$tag) return;
 
-            $invalidated = $this->invalidationService->tag($tag);
+            $this->invalidationService->tag($tag);
 
-            if ($invalidated) {
-                Toast::info('Next.js Cache invalidated');
-            } else {
-                Toast::error('Next.js Cache invalidation failed');
-            }
+            Toast::info('Next.js Cache invalidated');
         } catch (Exception $exception) {
-            throw new Exception($exception->getMessage());
+            Toast::error('Next.js Cache invalidation failed');
+            Log::error($exception->getTraceAsString());
         }
     }
 }
diff --git a/src/Services/InvalidationService.php b/src/Services/InvalidationService.php
@@ -3,41 +3,59 @@
 namespace Morethingsdigital\StatamicNextjs\Services;
 
 use Exception;
-use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
 
 class InvalidationService
 {
 
-  private PendingRequest $request;
+  private array $requests = [];
 
   public function __construct(private readonly TagService $tagService)
   {
     if (config('statamic.nextjs.enabled')) {
-      if (is_null(config('statamic.nextjs.revalidation_url'))) throw new Exception('revalidation url not defined');
+      $invalidationUrls = $this->invalidationUrls();
 
+      Log::info($invalidationUrls);
       $headers = $this->getHeaders();
-      $this->request = Http::withHeaders($headers)->baseUrl(config('statamic.nextjs.revalidation_url'));
+
+      foreach ($invalidationUrls as $revalidationUrrl) {
+        $this->requests[] = Http::withHeaders($headers)->baseUrl($revalidationUrrl);
+      }
     }
   }
 
   public function all()
   {
+    Log::info('all');
+    
+    $tags = $this->tagService->all();
+
+    foreach ($tags as $tag) {
+      $this->tag($tag);
+    }
   }
 
   public function tag(string $tag)
   {
     try {
-      if (!$this->request) throw new Exception('request not defined');
+      Log::info(count($this->requests));
 
-      $key = config('statamic.nextjs.revalidation_type') ?? 'tag';
-      $response = $this->request->get('', [
-        $key  => $tag
-      ]);
+      if (count($this->requests) === 0) throw new Exception('request not defined');
 
-      if (!$response->successful()) throw new Exception($response->clientError());
+      Log::info(count($this->requests));
 
-      return true;
+      foreach ($this->requests as $request) {
+        $key = config('statamic.nextjs.revalidation_type') ?? 'tag';
+        $response = $request->withQueryParameters([
+          $key  => $tag
+        ])->post('');
+
+        if (!$response->successful()) throw new Exception($response->clientError());
+
+        Log::info($response->json());
+      }
     } catch (Exception $exception) {
       throw new Exception($exception->getMessage());
     }
@@ -51,10 +69,24 @@ private function getHeaders()
     $headers['accept'] = 'application/json';
     $headers['Content-Type'] = 'application/json';
 
-    if (!is_null(config('nextjs.revalidation_secret')))
+    if (!is_null(config('statamic.nextjs.revalidation_secret')))
       $headers['Authorization'] = config('statamic.nextjs.revalidation_secret');
 
 
     return $headers;
   }
+
+  private function invalidationUrls()
+  {
+    if (is_null(config('statamic.nextjs.revalidation_urls')))
+      throw new Exception('revalidation urls not defined');
+
+    if (is_array(config('statamic.nextjs.revalidation_urls')))
+      return config('statamic.nextjs.revalidation_urls');
+
+    if (is_string(config('statamic.nextjs.revalidation_urls')))
+      return Str::of(config('statamic.nextjs.revalidation_urls'))->explode(',')->toArray();
+
+    return [];
+  }
 }
diff --git a/src/Services/TagService.php b/src/Services/TagService.php

Original file line number	Diff line number	Diff line change
`@@ -38,15 +38,12 @@ public function handle(EntrySaved $event): void`
`38`	`38`
`39`	`39`	`if (!$tag) return;`
`40`	`40`
`41`		`- $invalidated = $this->invalidationService->tag($tag);`
	`41`	`+ $this->invalidationService->tag($tag);`
`42`	`42`
`43`		`- if ($invalidated) {`
`44`		`- Toast::info('Next.js Cache invalidated');`
`45`		`- } else {`
`46`		`- Toast::error('Next.js Cache invalidation failed');`
`47`		`- }`
	`43`	`+ Toast::info('Next.js Cache invalidated');`
`48`	`44`	`} catch (Exception $exception) {`
`49`		`- throw new Exception($exception->getMessage());`
	`45`	`+ Toast::error('Next.js Cache invalidation failed');`
	`46`	`+ Log::error($exception->getTraceAsString());`
`50`	`47`	`}`
`51`	`48`	`}`
`52`	`49`	`}`