diff --git a/app/Services/CloudflareSolverService.php b/app/Services/CloudflareSolverService.php index f4fcbd9b..46517051 100644 --- a/app/Services/CloudflareSolverService.php +++ b/app/Services/CloudflareSolverService.php @@ -2,6 +2,7 @@ namespace App\Services; +use App\Utilities\Notice; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Log; @@ -13,7 +14,7 @@ class CloudflareSolverService * Holt die Daten und gibt das extrahierte JSON als PHP-Array zurück. * Wenn etwas schiefgeht, wird null zurückgegeben. */ - public function getJsonFromUrl(string $targetUrl): ?array + public function getJsonFromUrl(string $targetUrl, int $debug): ?array { /** * set in .env @@ -21,6 +22,10 @@ class CloudflareSolverService */ $this->solverUrl = env('FLARESOLVERR_IP_DOCKER', 'http://flaresolverr:8191/v1'); + if ($debug) { + Notice::note($this->solverUrl, 'bb'); + } + try { $response = Http::withHeaders([ 'Content-Type' => 'application/json', @@ -38,9 +43,7 @@ class CloudflareSolverService $data = $response->json(); - if (strpos($data['solution']['response'], '"code": 403, "reason": "challenge"') !== false) { - dd($data); - } + dd($data); if (strpos($data['solution']['response'], '"code": 403, "reason": "challenge"') !== false) { dd($data); @@ -70,7 +73,8 @@ class CloudflareSolverService Log::error('PHP Exception im CloudflareSolverService: ' . $e->getMessage()); } - // Falls irgendwo ein Fehler auftrat, geben wir null zurück - return null; + Notice::note('ERROR connecting FLARESOLVERR_IP_DOCKER', 'br', 1); + + return []; } } diff --git a/app/Traits/Sofascore/GrapperEvent.php b/app/Traits/Sofascore/GrapperEvent.php index cedc2d02..06460dbb 100644 --- a/app/Traits/Sofascore/GrapperEvent.php +++ b/app/Traits/Sofascore/GrapperEvent.php @@ -34,7 +34,7 @@ trait GrapperEvent $cloudflareService = new CloudflareSolverService; - $data = $cloudflareService->getJsonFromUrl($url); + $data = $cloudflareService->getJsonFromUrl($url, $this->debug); if (isset($data['events'])) { @@ -74,7 +74,7 @@ trait GrapperEvent $this->sleep(); - $data = $cloudflareService->getJsonFromUrl($url); + $data = $cloudflareService->getJsonFromUrl($url, $this->debug); $data['id'] = $event_id; @@ -92,7 +92,7 @@ trait GrapperEvent $this->sleep(); - $data = $cloudflareService->getJsonFromUrl($url); + $data = $cloudflareService->getJsonFromUrl($url, $this->debug); $data['id'] = $event_id; @@ -110,7 +110,7 @@ trait GrapperEvent $this->sleep(); - $data = $cloudflareService->getJsonFromUrl($url); + $data = $cloudflareService->getJsonFromUrl($url, $this->debug); $data['id'] = $event_id; @@ -128,7 +128,7 @@ trait GrapperEvent $this->sleep(); - $data = $cloudflareService->getJsonFromUrl($url); + $data = $cloudflareService->getJsonFromUrl($url, $this->debug); $data['id'] = $event_id; diff --git a/app/Traits/Sofascore/GrappingHelper.php b/app/Traits/Sofascore/GrappingHelper.php index bb709155..fc4213ac 100644 --- a/app/Traits/Sofascore/GrappingHelper.php +++ b/app/Traits/Sofascore/GrappingHelper.php @@ -250,7 +250,7 @@ trait GrappingHelper $cloudflareService = new CloudflareSolverService; - $data = $cloudflareService->getJsonFromUrl($url); + $data = $cloudflareService->getJsonFromUrl($url, $this->debug); if ($data['hasNextPage']) { $page++;