wip
This commit is contained in:
1 parent
f6a7ebf737
commit
cf55e1e218
3 files changed
+16
-12
No files matched your search
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Services;
|
namespace App\Services;
|
||||||
|
|
||||||
|
use App\Utilities\Notice;
|
||||||
use Illuminate\Support\Facades\Http;
|
use Illuminate\Support\Facades\Http;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
|
|
||||||
@@ -13,7 +14,7 @@ class CloudflareSolverService
|
|||||||
* Holt die Daten und gibt das extrahierte JSON als PHP-Array zurück.
|
* Holt die Daten und gibt das extrahierte JSON als PHP-Array zurück.
|
||||||
* Wenn etwas schiefgeht, wird null zurückgegeben.
|
* Wenn etwas schiefgeht, wird null zurückgegeben.
|
||||||
*/
|
*/
|
||||||
public function getJsonFromUrl(string $targetUrl): ?array
|
public function getJsonFromUrl(string $targetUrl, int $debug): ?array
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* set in .env
|
* set in .env
|
||||||
@@ -21,6 +22,10 @@ class CloudflareSolverService
|
|||||||
*/
|
*/
|
||||||
$this->solverUrl = env('FLARESOLVERR_IP_DOCKER', 'http://flaresolverr:8191/v1');
|
$this->solverUrl = env('FLARESOLVERR_IP_DOCKER', 'http://flaresolverr:8191/v1');
|
||||||
|
|
||||||
|
if ($debug) {
|
||||||
|
Notice::note($this->solverUrl, 'bb');
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$response = Http::withHeaders([
|
$response = Http::withHeaders([
|
||||||
'Content-Type' => 'application/json',
|
'Content-Type' => 'application/json',
|
||||||
@@ -38,9 +43,7 @@ class CloudflareSolverService
|
|||||||
|
|
||||||
$data = $response->json();
|
$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) {
|
if (strpos($data['solution']['response'], '"code": 403, "reason": "challenge"') !== false) {
|
||||||
dd($data);
|
dd($data);
|
||||||
@@ -70,7 +73,8 @@ class CloudflareSolverService
|
|||||||
Log::error('PHP Exception im CloudflareSolverService: ' . $e->getMessage());
|
Log::error('PHP Exception im CloudflareSolverService: ' . $e->getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Falls irgendwo ein Fehler auftrat, geben wir null zurück
|
Notice::note('ERROR connecting FLARESOLVERR_IP_DOCKER', 'br', 1);
|
||||||
return null;
|
|
||||||
|
return [];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -34,7 +34,7 @@ trait GrapperEvent
|
|||||||
|
|
||||||
$cloudflareService = new CloudflareSolverService;
|
$cloudflareService = new CloudflareSolverService;
|
||||||
|
|
||||||
$data = $cloudflareService->getJsonFromUrl($url);
|
$data = $cloudflareService->getJsonFromUrl($url, $this->debug);
|
||||||
|
|
||||||
if (isset($data['events'])) {
|
if (isset($data['events'])) {
|
||||||
|
|
||||||
@@ -74,7 +74,7 @@ trait GrapperEvent
|
|||||||
|
|
||||||
$this->sleep();
|
$this->sleep();
|
||||||
|
|
||||||
$data = $cloudflareService->getJsonFromUrl($url);
|
$data = $cloudflareService->getJsonFromUrl($url, $this->debug);
|
||||||
|
|
||||||
$data['id'] = $event_id;
|
$data['id'] = $event_id;
|
||||||
|
|
||||||
@@ -92,7 +92,7 @@ trait GrapperEvent
|
|||||||
|
|
||||||
$this->sleep();
|
$this->sleep();
|
||||||
|
|
||||||
$data = $cloudflareService->getJsonFromUrl($url);
|
$data = $cloudflareService->getJsonFromUrl($url, $this->debug);
|
||||||
|
|
||||||
$data['id'] = $event_id;
|
$data['id'] = $event_id;
|
||||||
|
|
||||||
@@ -110,7 +110,7 @@ trait GrapperEvent
|
|||||||
|
|
||||||
$this->sleep();
|
$this->sleep();
|
||||||
|
|
||||||
$data = $cloudflareService->getJsonFromUrl($url);
|
$data = $cloudflareService->getJsonFromUrl($url, $this->debug);
|
||||||
|
|
||||||
$data['id'] = $event_id;
|
$data['id'] = $event_id;
|
||||||
|
|
||||||
@@ -128,7 +128,7 @@ trait GrapperEvent
|
|||||||
|
|
||||||
$this->sleep();
|
$this->sleep();
|
||||||
|
|
||||||
$data = $cloudflareService->getJsonFromUrl($url);
|
$data = $cloudflareService->getJsonFromUrl($url, $this->debug);
|
||||||
|
|
||||||
$data['id'] = $event_id;
|
$data['id'] = $event_id;
|
||||||
|
|
||||||
|
|||||||
@@ -250,7 +250,7 @@ trait GrappingHelper
|
|||||||
|
|
||||||
$cloudflareService = new CloudflareSolverService;
|
$cloudflareService = new CloudflareSolverService;
|
||||||
|
|
||||||
$data = $cloudflareService->getJsonFromUrl($url);
|
$data = $cloudflareService->getJsonFromUrl($url, $this->debug);
|
||||||
|
|
||||||
if ($data['hasNextPage']) {
|
if ($data['hasNextPage']) {
|
||||||
$page++;
|
$page++;
|
||||||
|
|||||||
Reference in new issue
Block a user