used route message where possible

Author: transistive

src/Enum/ConnectionProtocol.php

@@ -32,13 +32,13 @@ final class ConnectionProtocol extends TypedEnum
     private const BOLT_V40 = 'bolt-v40';
     private const BOLT_V41 = 'bolt-v41';
     private const BOLT_V42 = 'bolt-v42';
-    private const BOLT_V43 = 'bolt-43';
+    private const BOLT_V43 = 'bolt-v43';
     private const HTTP = 'http';
 
     public static function determineBoltVersion(Bolt $bolt): self
     {
         switch ($bolt->getProtocolVersion()) {
-            case 3.0:
+            case 3:
                 $tbr = self::BOLT_V3();
                 break;
             case 4.0:
@@ -58,4 +58,21 @@ public static function determineBoltVersion(Bolt $bolt): self
 
         return $tbr;
     }
+
+    public function compare(ConnectionProtocol $protocol): int
+    {
+        $x = 0;
+        $y = 0;
+        foreach (array_values(self::getAllInstances()) as $index => $instance) {
+            if ($instance === $this) {
+                $x = $index;
+            }
+
+            if ($instance === $protocol) {
+                $y = $index;
+            }
+        }
+
+        return $x - $y;
+    }
 }

src/Neo4j/Neo4jConnectionPool.php

@@ -16,6 +16,8 @@
 use Bolt\Bolt;
 use Bolt\connection\StreamSocket;
 use Exception;
+use Laudis\Neo4j\Bolt\BoltConnectionPool;
+use Laudis\Neo4j\Enum\ConnectionProtocol;
 use function explode;
 use Laudis\Neo4j\Bolt\BoltDriver;
 use Laudis\Neo4j\Common\TransactionHelper;
@@ -40,6 +42,12 @@
 final class Neo4jConnectionPool implements ConnectionPoolInterface
 {
     private ?RoutingTable $table = null;
+    private BoltConnectionPool $pool;
+
+    public function __construct(BoltConnectionPool $pool)
+    {
+        $this->pool = $pool;
+    }
 
     /**
      * @throws Exception
@@ -51,7 +59,8 @@ public function acquire(
         string $userAgent,
         SessionConfiguration $config
     ): ConnectionInterface {
-        $table = $this->routingTable($uri, $authenticate);
+        $connection = $this->pool->acquire($uri, $authenticate, $socketTimeout, $userAgent, $config);
+        $table = $this->routingTable($connection);
         $server = $this->getNextServer($table, $config->getAccessMode());
 
         $socket = new StreamSocket($server->getHost(), $server->getPort() ?? 7687, $socketTimeout);
@@ -76,26 +85,28 @@ private function getNextServer(RoutingTable $table, AccessMode $mode): Uri
     }
 
     /**
-     * @param BasicDriver $driver
+     * @param ConnectionInterface<Bolt> $driver
      *
      * @throws Exception
      */
-    private function routingTable(UriInterface $uri, AuthenticateInterface $authenticate): RoutingTable
+    private function routingTable(ConnectionInterface $connection): RoutingTable
     {
         if ($this->table === null || $this->table->getTtl() < time()) {
-            $session = BoltDriver::create($uri, null, $authenticate)->createSession();
-            $row = $session->run(<<<'CYPHER'
-CALL dbms.components() YIELD versions UNWIND versions AS version RETURN version
-CYPHER
-            )->first();
-            /** @var string */
-            $version = $row->get('version');
-
-            if (str_starts_with($version, '3')) {
-                $response = $session->run('CALL dbms.cluster.overview()');
-
-                /** @var iterable<array{addresses: list<string>, role:string}> $values */
-                $values = [];
+            $bolt = $connection->getImplementation();
+            $protocol = $connection->getProtocol();
+            if ($protocol->compare(ConnectionProtocol::BOLT_V43()) >= 0) {
+                $route = $bolt->route()['rt'];
+                ['servers' => $servers, 'ttl' => $ttl ] = $route;
+            } elseif ($protocol->compare(ConnectionProtocol::BOLT_V40()) >= 0) {
+                $bolt->run('CALL dbms.routing.getRoutingTable({context: []})');
+                ['servers' => $servers, 'ttl' => $ttl] = $bolt->pullAll();
+            } else {
+                $bolt->run('CALL dbms.cluster.overview()');
+                $response = $bolt->pullAll();
+
+                /** @var iterable<array{addresses: list<string>, role:string}> $servers */
+                $servers = [];
+                $ttl = time() + 3600;
                 foreach ($response as $server) {
                     /** @var CypherList<string> $addresses */
                     $addresses = $server->get('addresses');
@@ -105,19 +116,10 @@ private function routingTable(UriInterface $uri, AuthenticateInterface $authenti
                      *
                      * @var array{addresses: list<string>, role:string}
                      */
-                    $values[] = ['addresses' => $addresses->toArray(), 'role' => $server->get('role')];
+                    $servers[] = ['addresses' => $addresses->toArray(), 'role' => $server->get('role')];
                 }
-
-                $this->table = new RoutingTable($values, time() + 3600);
-            } else {
-                $response = $session->run('CALL dbms.routing.getRoutingTable({context: []})')->first();
-                /** @var iterable<array{addresses: list<string>, role:string}> $values */
-                $values = $response->get('servers');
-                /** @var int $ttl */
-                $ttl = $response->get('ttl');
-
-                $this->table = new RoutingTable($values, time() + $ttl);
             }
+            $this->table = new RoutingTable($servers, $ttl);
         }
 
         return $this->table;

src/Neo4j/Neo4jDriver.php

@@ -15,6 +15,7 @@
 
 use Bolt\Bolt;
 use Exception;
+use Laudis\Neo4j\Bolt\BoltConnectionPool;
 use function is_string;
 use Laudis\Neo4j\Authentication\Authenticate;
 use Laudis\Neo4j\Bolt\Session;
@@ -92,7 +93,7 @@ public static function create($uri, ?DriverConfiguration $configuration = null,
             return new self(
                 $uri,
                 $authenticate ?? Authenticate::fromUrl(),
-                new Neo4jConnectionPool(),
+                new Neo4jConnectionPool(new BoltConnectionPool()),
                 $configuration ?? DriverConfiguration::default(),
                 $formatter,
                 $socketTimeout
@@ -102,7 +103,7 @@ public static function create($uri, ?DriverConfiguration $configuration = null,
         return new self(
             $uri,
             $authenticate ?? Authenticate::fromUrl(),
-            new Neo4jConnectionPool(),
+            new Neo4jConnectionPool(new BoltConnectionPool()),
             $configuration ?? DriverConfiguration::default(),
             OGMFormatter::create(),
             $socketTimeout