logs refactoring, fix unlock request handling

Author: ITernovtsii

src/Cache/Middleware/Response/ReloadLockedResponseResponseModifier.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Hengebytes\SoapCoreAsyncBundle\Cache\Middleware\Response;
+
+use Hengebytes\SoapCoreAsyncBundle\Handler\SoapAsyncRequestHandler;
+use Hengebytes\SoapCoreAsyncBundle\Request\SoapWSRequest;
+use Hengebytes\WebserviceCoreAsyncBundle\Cache\Middleware\Response\ReloadLockedResponseResponseModifier as BaseModifier;
+use Hengebytes\WebserviceCoreAsyncBundle\Callback\OnResponseReceivedCallback;
+use Hengebytes\WebserviceCoreAsyncBundle\Middleware\ResponseModificationInterface;
+use Hengebytes\WebserviceCoreAsyncBundle\Response\AsyncResponse;
+use Hengebytes\WebserviceCoreAsyncBundle\Response\ParsedResponse;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Attribute\AsDecorator;
+use Symfony\Component\HttpFoundation\Response;
+
+#[AsDecorator(decorates: BaseModifier::class, onInvalid: ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]
+readonly class ReloadLockedResponseResponseModifier implements ResponseModificationInterface
+{
+    public function __construct(
+        #[AutowireDecorated]
+        private ?BaseModifier $inner,
+        private SoapAsyncRequestHandler $requestHandler,
+    ) {
+    }
+
+    public function modify(AsyncResponse $response): void
+    {
+        if ($response->WSRequest instanceof SoapWSRequest) {
+            $response->addOnResponseReceivedCallback(new OnResponseReceivedCallback(
+                function (ParsedResponse $parsedResponse) {
+                    if (
+                        $parsedResponse->response
+                        || $parsedResponse->headers
+                        || $parsedResponse->mainAsyncResponse->WSResponse->getStatusCode() !== Response::HTTP_LOCKED
+                    ) {
+                        return;
+                    }
+                    $parsedResponse->mainAsyncResponse->WSResponse = $this->requestHandler->request($parsedResponse->mainAsyncResponse->WSRequest)->WSResponse;
+                }
+            ));
+
+            return;
+        }
+
+
+        $this->inner->modify($response);
+    }
+
+    public function supports(AsyncResponse $response): bool
+    {
+        if (!$this->inner) {
+            return false; // if original disabled - we assume lock mechanism is disabled as well
+        }
+
+        return $this->inner->supports($response);
+    }
+
+    public static function getPriority(): int
+    {
+        return BaseModifier::getPriority();
+    }
+}

src/Handler/SoapAsyncRequestHandler.php

@@ -3,6 +3,7 @@
 namespace Hengebytes\SoapCoreAsyncBundle\Handler;
 
 use Hengebytes\SoapCoreAsyncBundle\Engine\AsyncEngineFactory;
+use Hengebytes\SoapCoreAsyncBundle\Request\SoapWSRequest;
 use Hengebytes\WebserviceCoreAsyncBundle\Cache\CacheManager;
 use Hengebytes\WebserviceCoreAsyncBundle\Handler\BaseRequestHandler;
 use Hengebytes\WebserviceCoreAsyncBundle\Middleware\RequestModification;
@@ -29,13 +30,19 @@ public function __construct(
      */
     protected function performRequest(WSRequest $request): ResponseInterface
     {
+        if (!$request instanceof SoapWSRequest) {
+            throw new \InvalidArgumentException(
+                'SoapAsyncRequestHandler can only handle SoapWSRequest but got ' . get_class($request)
+            );
+        }
+
         $requestOptions = $request->getOptions();
         $client = AsyncEngineFactory::createFromWSDL($requestOptions['base_uri'], $this->client);
 
         [$req, $res] = $client->request(
             $request->action, $request->getRequestParams(), $requestOptions['headers'] ?? []
         );
-        $request->setBody(['body' => $req->getRequest()]);
+        $request->encodedRequest = $req->getRequest();
 
         return $res;
     }

src/Request/SoapWSRequest.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Hengebytes\SoapCoreAsyncBundle\Request;
+
+use Hengebytes\WebserviceCoreAsyncBundle\Request\WSRequest;
+
+class SoapWSRequest extends WSRequest
+{
+    public ?string $encodedRequest = null;
+
+    public function getLogString(): string
+    {
+        $logString = parent::getLogString();
+
+        return trim($logString . "\n\n" . $this->encodedRequest);
+    }
+}

src/Resources/config/services.yaml

@@ -11,5 +11,3 @@ services:
             - '../../Resources'
             - '../../Response'
             - '../../HBSoapCoreAsyncBundle.php'
-
-