feat! retry mechanism

Author: NietThijmen

.ci/build-version.php

@@ -2,6 +2,7 @@
 
 namespace App\Commands\Compare;
 
+use App\Service\RetryService;
 use Illuminate\Console\Command;
 use Spatie\Fork\Fork;
 
@@ -73,7 +74,17 @@ public function handle(): void
         $forkArray = [];
         foreach ($sitemapUrls as $url) {
             $forkArray[] = function () use ($url) {
-                return $this->checkUrl($url);
+                /**
+                 * Retry mechanism to handle errors gracefully instead of just killing the whole process
+                 * if one URL fails.
+                 */
+                return RetryService::Retry(
+                    3,
+                    fn () => $this->checkUrl($url),
+                    500,
+                    fn ($exception) => $this->warn("[Retry] Error checking URL $url: ".$exception->getMessage()),
+                    fn ($exception) => $this->warn("[Retry] Failed to check URL $url after multiple attempts: ".$exception->getMessage())
+                );
             };
         }
 
@@ -83,8 +94,13 @@ public function handle(): void
             ->run(...$forkArray);
 
         foreach ($outputs as $output) {
-            if ($output['is_successful']) {
-                $foundUrls[] = $output['url'];
+            try {
+                if ($output['is_successful']) {
+                    $foundUrls[] = $output['url'];
+                }
+                // @phpstan-ignore-next-line
+            } catch (\Throwable $exception) {
+                $this->warn('Unknown output from output array: '.json_encode($output));
             }
         }
 
@@ -106,7 +122,7 @@ public function handle(): void
     private function outputCli(
         array $sitemapUrls,
         array $foundUrls
-    ) {
+    ): void {
         $this->info('Sitemap URLs from source1:');
         foreach ($sitemapUrls as $url) {
             $this->line($url);
@@ -132,7 +148,7 @@ private function outputCli(
     private function outputJson(
         array $sitemapUrls,
         array $foundUrls
-    ) {
+    ): void {
 
         $urlsNotFound = array_values(array_diff($sitemapUrls, $foundUrls));
         $output = [

app/Commands/Compare/CompareSitemapAToWebsiteB.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Service;
+
+class RetryService
+{
+    /**
+     * Retry a callable function a specified number of times with optional sleep and error handling.
+     *
+     * @param  int  $times  how many times to retry
+     * @param  callable  $callback  the function to execute
+     * @param  int  $sleep  milliseconds to wait between retries
+     * @param  callable|null  $onError  function to call on each error
+     * @param  callable|null  $onFail  function to call if all retries fail
+     * @return mixed the result of the callback
+     *
+     * @throws \Exception if all retries fail and no onFail is provided
+     */
+    public static function Retry(
+        int $times,
+        callable $callback,
+        int $sleep = 0,
+        ?callable $onError = null,
+        ?callable $onFail = null
+    ): mixed {
+        $attempts = 0;
+        beginning:
+        $attempts++;
+        try {
+            return $callback($attempts);
+        } catch (\Exception $e) {
+            if ($attempts >= $times) {
+                if ($onFail) {
+                    $onFail($e, $attempts);
+
+                    return null;
+                }
+
+                throw $e;
+            }
+            if ($onError) {
+                $onError($e, $attempts);
+            }
+            if ($sleep > 0) {
+                usleep($sleep * 1000); // Convert milliseconds to microseconds
+            }
+            goto beginning;
+        }
+
+        return null; // Yes, I know this is unreachable, but phpstan complains without it
+    }
+}