Fix cache symfony response instead of guzzle response

tsekka · Jan 7, 2022 · 6d2b36b · 6d2b36b
1 parent 258b45a
commit 6d2b36b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 31 deletions.
diff --git a/src/Actions/GetPrerenderedPageResponse.php b/src/Actions/GetPrerenderedPageResponse.php
@@ -8,7 +8,6 @@
 use Illuminate\Support\Facades\App;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\RequestException;
-use Symfony\Contracts\HttpClient\ResponseInterface;
 
 class GetPrerenderedPageResponse
 {
@@ -58,6 +57,11 @@ public function __construct(
         $this->throwExceptions = config('prerender.throw_exceptions');
     }
 
+    /**
+     * Prerender the page and return the Guzzle Response
+     * 
+     * @return null|\GuzzleHttp\Psr7\Response
+     */
     public function handle(): ?Response
     {
         $headers = [

diff --git a/src/Console/Commands/CachePagesCommand.php b/src/Console/Commands/CachePagesCommand.php
@@ -151,7 +151,8 @@ private function prerenderAndCache(string $url): string
             return 'SKIPPED_REDIRECT_STATUS_CODE:' . $httpStatusCode;
         }
 
-        $cached = Prerender::cacheTheResponse($url, $prerenderedResponse);
+        $symfonyResponse = Prerender::buildSymfonyResponseFromGuzzleResponse($prerenderedResponse);
+        $cached = Prerender::cacheTheResponse($url, $symfonyResponse);
         return $cached ? 'CACHED' : 'NOT_CACHED';
     }
     /**

diff --git a/src/Http/Middleware/PrerenderMiddleware.php b/src/Http/Middleware/PrerenderMiddleware.php
@@ -86,7 +86,7 @@ public function handle(Request $request, Closure $next): RedirectResponse|Symfon
             return $next($request);
         }
 
-        $prerenderedResponse = $this->getPrerenderedPageResponse($request);
+        $prerenderedResponse = (new GetPrerenderedPageResponse($request))->handle();
         if (!$prerenderedResponse) {
             $this->status = 'PRERENDER_RESPONSE_MISSING';
             $this->recordCrawlerVisit();
@@ -107,11 +107,11 @@ public function handle(Request $request, Closure $next): RedirectResponse|Symfon
             return Redirect::to(array_change_key_case($headers, CASE_LOWER)["location"][0], $this->httpStatusCode);
         }
 
-        $response = $this->buildSymfonyResponseFromGuzzleResponse($prerenderedResponse);
-        Prerender::cacheTheResponse($this->fullUrl, $response);
+        $symfonyResponse = Prerender::buildSymfonyResponseFromGuzzleResponse($prerenderedResponse);
+        Prerender::cacheTheResponse($this->fullUrl, $symfonyResponse);
         $this->status = 'PRERENDERED';
         $this->recordCrawlerVisit();
-        return $response;
+        return $symfonyResponse;
     }
 
 
@@ -140,26 +140,4 @@ private function shouldShowPrerenderedPage(Request $request): bool
 
         return $shouldShow;
     }
-
-    /**
-     * Prerender the page and return the Guzzle Response
-     *
-     * @param Request $request
-     * @return ResponseInterface|null
-     */
-    private function getPrerenderedPageResponse(Request $request): ?ResponseInterface
-    {
-        return (new GetPrerenderedPageResponse($request))->handle();
-    }
-
-    /**
-     * Convert a Guzzle Response to a Symfony Response
-     *
-     * @param GuzzleResponse $prerenderedResponse
-     * @return SymfonyResponse
-     */
-    private function buildSymfonyResponseFromGuzzleResponse(GuzzleResponse $prerenderedResponse): SymfonyResponse
-    {
-        return (new HttpFoundationFactory)->createResponse($prerenderedResponse);
-    }
 }
diff --git a/src/Prerender.php b/src/Prerender.php
@@ -2,10 +2,12 @@
 
 namespace Tsekka\Prerender;
 
-use GuzzleHttp\Psr7\Response;
 use Illuminate\Support\Facades\Cache;
+use GuzzleHttp\Psr7\Response as GuzzleResponse;
 use Illuminate\Cache\Repository as CacheRepository;
 use Tsekka\Prerender\Actions\RecordOrTouchPrerenderedPage;
+use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
+use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 
 class Prerender
 {
@@ -42,7 +44,7 @@ public function cacheEnabled()
         return true;
     }
 
-    public function cacheTheResponse(string $url, Response $response): bool
+    public function cacheTheResponse(string $url, SymfonyResponse $response): bool
     {
         if (!$this->cacheEnabled()) return false;
 
@@ -52,7 +54,7 @@ public function cacheTheResponse(string $url, Response $response): bool
         return $this->cache->put($cacheKey, $response, $this->cacheTtl);
     }
 
-    public function getCachedResponse(string $url): Response|null
+    public function getCachedResponse(string $url): SymfonyResponse|null
     {
         if (
             $this->cacheEnabled()
@@ -62,4 +64,15 @@ public function getCachedResponse(string $url): Response|null
 
         return null;
     }
+
+    /**
+     * Convert a Guzzle Response to a Symfony Response
+     *
+     * @param GuzzleResponse $prerenderedResponse
+     * @return SymfonyResponse
+     */
+    public function buildSymfonyResponseFromGuzzleResponse(GuzzleResponse $prerenderedResponse): SymfonyResponse
+    {
+        return (new HttpFoundationFactory)->createResponse($prerenderedResponse);
+    }
 }