wip

Author: driesvints

app/Crawler.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace App;
+
+use Embed\Http\CurlClient;
+use Embed\Http\FactoryDiscovery;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\UriFactoryInterface;
+use Psr\Http\Message\UriInterface;
+
+class Crawler extends \Embed\Http\Crawler implements ClientInterface, RequestFactoryInterface, UriFactoryInterface
+{
+    protected RequestFactoryInterface $requestFactory;
+    protected UriFactoryInterface $uriFactory;
+    protected ClientInterface $client;
+    protected array $defaultHeaders = [
+        'User-Agent' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:73.0) Gecko/20100101 Firefox/73.0',
+        'Cache-Control' => 'max-age=0',
+    ];
+
+    public function __construct(?ClientInterface $client = null, ?RequestFactoryInterface $requestFactory = null, ?UriFactoryInterface $uriFactory = null)
+    {
+        $this->client = $client ?: new CurlClient();
+        $this->requestFactory = $requestFactory ?: FactoryDiscovery::getRequestFactory();
+        $this->uriFactory = $uriFactory ?: FactoryDiscovery::getUriFactory();
+    }
+
+    public function addDefaultHeaders(array $headers): void
+    {
+        $this->defaultHeaders = $headers + $this->defaultHeaders;
+    }
+
+    /**
+     * @param UriInterface|string $uri The URI associated with the request.
+     */
+    public function createRequest(string $method, $uri): RequestInterface
+    {
+        $request = $this->requestFactory->createRequest($method, $uri);
+
+        foreach ($this->defaultHeaders as $name => $value) {
+            $request = $request->withHeader($name, $value);
+        }
+
+        return $request;
+    }
+
+    public function createUri(string $uri = ''): UriInterface
+    {
+        return $this->uriFactory->createUri($uri);
+    }
+
+    public function sendRequest(RequestInterface $request): ResponseInterface
+    {
+        return $this->client->sendRequest($request);
+    }
+
+    public function sendRequests(RequestInterface ...$requests): array
+    {
+        if ($this->client instanceof CurlClient) {
+            $response = $this->client->sendRequests(...$requests);
+
+            logger(print_r($response, true));
+
+            return $response;
+        }
+
+        return array_map(
+            fn ($request) => $this->client->sendRequest($request),
+            $requests
+        );
+    }
+
+    public function getResponseUri(ResponseInterface $response): ?UriInterface
+    {
+        $location = $response->getHeaderLine('Content-Location');
+
+        return $location ? $this->uriFactory->createUri($location) : null;
+    }
+}

app/Markdown/MarkdownServiceProvider.php

@@ -2,9 +2,9 @@
 
 namespace App\Markdown;
 
+use App\Crawler;
 use App\OscaroteroEmbedAdapter;
 use Embed\Embed;
-use Embed\Http\Crawler;
 use Embed\Http\CurlClient;
 use Illuminate\Support\ServiceProvider;
 use League\CommonMark\Environment\Environment;
@@ -22,7 +22,7 @@ public function register(): void
         $this->app->singleton(Converter::class, function ($app, array $params = []) {
             $client = new CurlClient;
             $client->setSettings([
-                'follow_location' => false,
+                // 'follow_location' => false,
                 // 'ignored_errors' => true,
             ]);
 

app/OscaroteroEmbedAdapter.php

@@ -31,7 +31,6 @@ public function updateEmbeds(array $embeds): void
     {
         $extractors = $this->embedLib->getMulti(...\array_map(static fn (Embed $embed) => $embed->getUrl(), $embeds));
         foreach ($extractors as $i => $extractor) {
-            logger(print_r($extractor, true));
             if ($extractor->code !== null) {
                 $embeds[$i]->setEmbedCode($extractor->code->html);
             }