Refactored SaloonHelper to EventHelper

Author: pascalbaljet

src/EventHelper.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Onlime\LaravelHttpClientGlobalLogger;
+
+use Exception;
+use Illuminate\Http\Client\Events\RequestSending;
+use Illuminate\Http\Client\Events\ResponseReceived;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Saloon\HttpSender\HttpSender;
+use Saloon\Laravel\Events\SendingSaloonRequest;
+use Saloon\Laravel\Events\SentSaloonRequest;
+
+class EventHelper
+{
+    public static function shouldBeLogged($event): bool
+    {
+        if ($event instanceof SendingSaloonRequest || $event instanceof SentSaloonRequest) {
+            $saloonUsesHttpSender = config('saloon.default_sender') === HttpSender::class;
+
+            return $event->pendingRequest->hasMockClient() || ! $saloonUsesHttpSender;
+        }
+
+        return true;
+    }
+
+    public static function getPsrRequest($event): RequestInterface
+    {
+        return match (true) {
+            $event instanceof RequestSending || $event instanceof ResponseReceived => $event->request->toPsrRequest(),
+            $event instanceof SendingSaloonRequest || $event instanceof SentSaloonRequest =>  $event->pendingRequest->createPsrRequest(),
+            default => throw new Exception('Can not get PSR Request from Event: '.get_class($event)),
+        };
+    }
+
+    public static function getPsrResponse($event): ResponseInterface
+    {
+        return match (true) {
+            $event instanceof ResponseReceived => $event->response->toPsrResponse(),
+            $event instanceof SentSaloonRequest => $event->response->getPsrResponse(),
+            default => throw new Exception('Can not get PSR Response from Event: '.get_class($event)),
+        };
+    }
+}

src/Listeners/LogRequestSending.php

@@ -5,8 +5,8 @@
 use GuzzleHttp\MessageFormatter;
 use Illuminate\Http\Client\Events\RequestSending;
 use Illuminate\Support\Facades\Log;
+use Onlime\LaravelHttpClientGlobalLogger\EventHelper;
 use Onlime\LaravelHttpClientGlobalLogger\HttpClientLogger;
-use Onlime\LaravelHttpClientGlobalLogger\SaloonHelper;
 use Psr\Http\Message\RequestInterface;
 use Saloon\Laravel\Events\SendingSaloonRequest;
 
@@ -27,13 +27,11 @@ public function handle(RequestSending|SendingSaloonRequest $event): void
      */
     public function handleEvent(RequestSending|SendingSaloonRequest $event): void
     {
-        if (! SaloonHelper::shouldBeLogged($event)) {
+        if (! EventHelper::shouldBeLogged($event)) {
             return;
         }
 
-        $psrRequest = $event instanceof RequestSending
-            ? $event->request->toPsrRequest()
-            : $event->pendingRequest->createPsrRequest();
+        $psrRequest = EventHelper::getPsrRequest($event);
 
         $obfuscate  = config('http-client-global-logger.obfuscate.enabled');
 

src/Listeners/LogResponseReceived.php

@@ -5,7 +5,7 @@
 use GuzzleHttp\MessageFormatter;
 use Illuminate\Http\Client\Events\ResponseReceived;
 use Illuminate\Support\Facades\Log;
-use Onlime\LaravelHttpClientGlobalLogger\SaloonHelper;
+use Onlime\LaravelHttpClientGlobalLogger\EventHelper;
 use Saloon\Laravel\Events\SentSaloonRequest;
 
 class LogResponseReceived
@@ -17,22 +17,14 @@ class LogResponseReceived
      */
     public function handle(ResponseReceived|SentSaloonRequest $event)
     {
-        if (! SaloonHelper::shouldBeLogged($event)) {
+        if (! EventHelper::shouldBeLogged($event)) {
             return;
         }
 
-        $psrRequest = $event instanceof ResponseReceived
-            ? $event->request->toPsrRequest()
-            : $event->pendingRequest->createPsrRequest();
-
-        $psrResponse = $event instanceof ResponseReceived
-            ? $event->response->toPsrResponse()
-            : $event->response->getPsrResponse();
-
         $formatter = new MessageFormatter(config('http-client-global-logger.format.response'));
         Log::channel(config('http-client-global-logger.channel'))->info($formatter->format(
-            $psrRequest,
-            $psrResponse
+            EventHelper::getPsrRequest($event),
+            EventHelper::getPsrResponse($event)
         ));
     }
 }