WIP handle Saloon events

Author: pascalbaljet

composer.json

@@ -38,7 +38,12 @@
         "orchestra/testbench": "^8.8",
         "pestphp/pest": "^2.20",
         "pestphp/pest-plugin-arch": "^2.0",
-        "pestphp/pest-plugin-laravel": "^2.0"
+        "pestphp/pest-plugin-laravel": "^2.0",
+        "saloonphp/laravel-http-sender": "^2.0",
+        "saloonphp/laravel-plugin": "^3.0"
+    },
+    "suggest": {
+        "saloonphp/laravel-plugin": "To support logging of Saloon events (^3.0)"
     },
     "autoload": {
         "psr-4": {

src/Listeners/LogRequestSending.php

@@ -6,14 +6,16 @@
 use Illuminate\Http\Client\Events\RequestSending;
 use Illuminate\Support\Facades\Log;
 use Onlime\LaravelHttpClientGlobalLogger\HttpClientLogger;
+use Onlime\LaravelHttpClientGlobalLogger\SaloonHelper;
 use Psr\Http\Message\RequestInterface;
+use Saloon\Laravel\Events\SendingSaloonRequest;
 
 class LogRequestSending
 {
     /**
      * Handle the event if the middleware was not added manually.
      */
-    public function handle(RequestSending $event): void
+    public function handle(RequestSending|SendingSaloonRequest $event): void
     {
         if (! HttpClientLogger::requestMiddlewareWasAdded()) {
             $this->handleEvent($event);
@@ -23,10 +25,17 @@ public function handle(RequestSending $event): void
     /**
      * Handle the event.
      */
-    public function handleEvent(RequestSending $event): void
+    public function handleEvent(RequestSending|SendingSaloonRequest $event): void
     {
+        if (! SaloonHelper::shouldBeLogged($event)) {
+            return;
+        }
+
+        $psrRequest = $event instanceof RequestSending
+            ? $event->request->toPsrRequest()
+            : $event->pendingRequest->createPsrRequest();
+
         $obfuscate  = config('http-client-global-logger.obfuscate.enabled');
-        $psrRequest = $event->request->toPsrRequest();
 
         if ($obfuscate) {
             $psrRequest = $this->obfuscateHeaders($psrRequest);

src/Listeners/LogResponseReceived.php

@@ -5,6 +5,8 @@
 use GuzzleHttp\MessageFormatter;
 use Illuminate\Http\Client\Events\ResponseReceived;
 use Illuminate\Support\Facades\Log;
+use Onlime\LaravelHttpClientGlobalLogger\SaloonHelper;
+use Saloon\Laravel\Events\SentSaloonRequest;
 
 class LogResponseReceived
 {
@@ -13,11 +15,24 @@ class LogResponseReceived
      *
      * @return void
      */
-    public function handle(ResponseReceived $event)
+    public function handle(ResponseReceived|SentSaloonRequest $event)
     {
+        if (! SaloonHelper::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(
-            $event->request->toPsrRequest(), $event->response->toPsrResponse()
+            $psrRequest,
+            $psrResponse
         ));
     }
 }

src/Providers/EventServiceProvider.php

@@ -7,6 +7,8 @@
 use Illuminate\Http\Client\Events\ResponseReceived;
 use Onlime\LaravelHttpClientGlobalLogger\Listeners\LogRequestSending;
 use Onlime\LaravelHttpClientGlobalLogger\Listeners\LogResponseReceived;
+use Saloon\Laravel\Events\SendingSaloonRequest;
+use Saloon\Laravel\Events\SentSaloonRequest;
 
 class EventServiceProvider extends BaseEventServiceProvider
 {
@@ -16,12 +18,21 @@ class EventServiceProvider extends BaseEventServiceProvider
      * @var array
      */
     protected $listen = [
+        // Laravel HTTP Client
         RequestSending::class => [
             LogRequestSending::class,
         ],
         ResponseReceived::class => [
             LogResponseReceived::class,
         ],
+
+        // Saloon
+        SendingSaloonRequest::class => [
+            LogRequestSending::class,
+        ],
+        SentSaloonRequest::class => [
+            LogResponseReceived::class,
+        ],
     ];
 
     /**

src/SaloonHelper.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Onlime\LaravelHttpClientGlobalLogger;
+
+use Saloon\HttpSender\HttpSender;
+use Saloon\Laravel\Events\SendingSaloonRequest;
+use Saloon\Laravel\Events\SentSaloonRequest;
+
+class SaloonHelper
+{
+    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;
+    }
+}