reworked http connections

Author: transistive

src/Http/HttpConnectionPool.php

@@ -17,6 +17,7 @@
 use function json_encode;
 use Laudis\Neo4j\Common\ConnectionConfiguration;
 use Laudis\Neo4j\Common\Resolvable;
+use Laudis\Neo4j\Common\Uri;
 use Laudis\Neo4j\Contracts\AuthenticateInterface;
 use Laudis\Neo4j\Contracts\ConnectionInterface;
 use Laudis\Neo4j\Contracts\ConnectionPoolInterface;
@@ -49,41 +50,44 @@ final class HttpConnectionPool implements ConnectionPoolInterface
      * @psalm-readonly
      */
     private Resolvable $streamFactory;
-    private UriInterface $uri;
     private AuthenticateInterface $auth;
     private string $userAgent;
+    /** @var Resolvable<string> */
+    private Resolvable $tsxUrl;
 
     /**
      * @param Resolvable<StreamFactoryInterface> $streamFactory
      * @param Resolvable<RequestFactory>         $requestFactory
      * @param Resolvable<ClientInterface>        $client
+     * @param Resolvable<string>                 $tsxUrl
      *
      * @psalm-mutation-free
      */
     public function __construct(
         Resolvable $client,
         Resolvable $requestFactory,
         Resolvable $streamFactory,
-        UriInterface $uri,
         AuthenticateInterface $auth,
-        string $userAgent
+        string $userAgent,
+        Resolvable $tsxUrl
     ) {
         $this->client = $client;
         $this->requestFactory = $requestFactory;
         $this->streamFactory = $streamFactory;
-        $this->uri = $uri;
         $this->auth = $auth;
         $this->userAgent = $userAgent;
+        $this->tsxUrl = $tsxUrl;
     }
 
     public function acquire(SessionConfiguration $config): Generator
     {
         yield 0.0;
 
-        $request = $this->requestFactory->resolve()->createRequest('POST', $this->uri);
+        $uri = Uri::create($this->tsxUrl->resolve());
+        $request = $this->requestFactory->resolve()->createRequest('POST', $uri);
 
         $path = $request->getUri()->getPath().'/commit';
-        $uri = $this->uri->withPath($path);
+        $uri = $uri->withPath($path);
         $request = $request->withUri($uri);
 
         $body = json_encode([

src/Http/HttpDriver.php

@@ -111,57 +111,40 @@ public function createSession(?SessionConfiguration $config = null): SessionInte
         $config = $config->merge(SessionConfiguration::fromUri($this->uri));
         $streamFactoryResolve = $this->streamFactory();
 
+        $tsxUrl = $this->tsxUrl($config);
+
         return new HttpSession(
             $streamFactoryResolve,
-            $this->getHttpConnectionPool(),
+            $this->getHttpConnectionPool($tsxUrl),
             $config,
             $this->formatter,
             $factory,
-            Resolvable::once($this->key.':tsxUrl', function () use ($config, $factory) {
-                $database = $config->getDatabase() ?? 'neo4j';
-                $request = $factory->resolve()->createRequest('GET', $this->uri);
-                $client = $this->config->getHttpPsrBindings()->getClient();
-
-                $response = $client->sendRequest($request);
-
-                $discovery = HttpHelper::interpretResponse($response);
-                /** @var string|null */
-                $version = $discovery->neo4j_version ?? null;
-
-                if ($version === null) {
-                    /** @var string */
-                    $uri = $discovery->data;
-                    $request = $request->withUri(Uri::create($uri));
-                    $discovery = HttpHelper::interpretResponse($client->sendRequest($request));
-                }
-
-                /** @var string */
-                $tsx = $discovery->transaction;
-
-                return str_replace('{databaseName}', $database, $tsx);
-            }),
+            $tsxUrl,
             $this->auth,
             $this->config->getUserAgent()
         );
     }
 
     public function verifyConnectivity(?SessionConfiguration $config = null): bool
     {
-        return $this->getHttpConnectionPool()->canConnect($this->uri, $this->auth);
+        return $this->getHttpConnectionPool($this->tsxUrl($config ?? SessionConfiguration::default()))
+                    ->canConnect($this->uri, $this->auth);
     }
 
     /**
+     * @param Resolvable<string> $tsxUrl
+     *
      * @psalm-mutation-free
      */
-    private function getHttpConnectionPool(): HttpConnectionPool
+    private function getHttpConnectionPool(Resolvable $tsxUrl): HttpConnectionPool
     {
         return new HttpConnectionPool(
             Resolvable::once($this->key.':client', fn () => $this->config->getHttpPsrBindings()->getClient()),
             $this->resolvableFactory(),
             $this->streamFactory(),
-            $this->uri,
             $this->auth,
-            $this->config->getUserAgent()
+            $this->config->getUserAgent(),
+            $tsxUrl
         );
     }
 
@@ -188,4 +171,36 @@ private function streamFactory(): Resolvable
     {
         return Resolvable::once($this->key.':streamFactory', fn () => $this->config->getHttpPsrBindings()->getStreamFactory());
     }
+
+    /**
+     * @return Resolvable<string>
+     *
+     * @psalm-mutation-free
+     */
+    private function tsxUrl(SessionConfiguration $config): Resolvable
+    {
+        return Resolvable::once($this->key.':tsxUrl', function () use ($config) {
+            $database = $config->getDatabase() ?? 'neo4j';
+            $request = $this->resolvableFactory()->resolve()->createRequest('GET', $this->uri);
+            $client = $this->config->getHttpPsrBindings()->getClient();
+
+            $response = $client->sendRequest($request);
+
+            $discovery = HttpHelper::interpretResponse($response);
+            /** @var string|null */
+            $version = $discovery->neo4j_version ?? null;
+
+            if ($version === null) {
+                /** @var string */
+                $uri = $discovery->data;
+                $request = $request->withUri(Uri::create($uri));
+                $discovery = HttpHelper::interpretResponse($client->sendRequest($request));
+            }
+
+            /** @var string */
+            $tsx = $discovery->transaction;
+
+            return str_replace('{databaseName}', $database, $tsx);
+        });
+    }
 }

src/Http/HttpSession.php

@@ -69,10 +69,6 @@ final class HttpSession implements SessionInterface
      * @var Resolvable<string>
      */
     private Resolvable $uri;
-    /** @psalm-readonly */
-    private AuthenticateInterface $auth;
-    /** @psalm-readonly */
-    private string $userAgent;
 
     /**
      * @psalm-mutation-free
@@ -98,8 +94,6 @@ public function __construct(
         $this->formatter = $formatter;
         $this->requestFactory = $requestFactory;
         $this->uri = $uri;
-        $this->auth = $auth;
-        $this->userAgent = $userAgent;
     }
 
     /**