made bolt session correctly choose read and write servers when requested

Author: transistive

src/Bolt/Session.php

@@ -28,6 +28,7 @@
 use Laudis\Neo4j\Databags\SessionConfiguration;
 use Laudis\Neo4j\Databags\Statement;
 use Laudis\Neo4j\Databags\TransactionConfiguration;
+use Laudis\Neo4j\Enum\AccessMode;
 use Laudis\Neo4j\Exception\Neo4jException;
 use Laudis\Neo4j\Types\CypherList;
 use Psr\Http\Message\UriInterface;
@@ -70,7 +71,7 @@ public function __construct(
 
     public function runStatements(iterable $statements, ?TransactionConfiguration $config = null): CypherList
     {
-        return $this->beginInstantTransaction()->runStatements($statements);
+        return $this->beginInstantTransaction($this->config)->runStatements($statements);
     }
 
     public function openTransaction(iterable $statements = null, ?TransactionConfiguration $config = null): UnmanagedTransactionInterface
@@ -90,16 +91,24 @@ public function run(string $statement, iterable $parameters = [], ?TransactionCo
 
     public function writeTransaction(callable $tsxHandler, ?TransactionConfiguration $config = null)
     {
+        $config ??= TransactionConfiguration::default();
+
         return TransactionHelper::retry(
-            fn () => $this->beginTransaction([], $config),
+            fn () => $this->startTransaction($config, $this->config->withAccessMode(AccessMode::WRITE())),
             $tsxHandler,
-            $config ?? TransactionConfiguration::default()
+            $config
         );
     }
 
     public function readTransaction(callable $tsxHandler, ?TransactionConfiguration $config = null)
     {
-        return $this->writeTransaction($tsxHandler);
+        $config ??= TransactionConfiguration::default();
+
+        return TransactionHelper::retry(
+            fn () => $this->startTransaction($config, $this->config->withAccessMode(AccessMode::READ())),
+            $tsxHandler,
+            $config
+        );
     }
 
     public function transaction(callable $tsxHandler, ?TransactionConfiguration $config = null)
@@ -110,22 +119,7 @@ public function transaction(callable $tsxHandler, ?TransactionConfiguration $con
     public function beginTransaction(?iterable $statements = null, ?TransactionConfiguration $config = null): UnmanagedTransactionInterface
     {
         $config ??= TransactionConfiguration::default();
-        try {
-            $bolt = $this->acquireBolt($config);
-
-            $begin = $bolt->begin(['db' => $this->config->getDatabase()]);
-
-            if (!$begin) {
-                throw new Neo4jException(new Vector([new Neo4jError('', 'Cannot open new transaction')]));
-            }
-        } catch (Exception $e) {
-            if ($e instanceof Neo4jException) {
-                throw $e;
-            }
-            throw new Neo4jException(new Vector([new Neo4jError('', $e->getMessage())]), $e);
-        }
-
-        $tsx = new BoltUnmanagedTransaction($this->config->getDatabase(), $this->formatter, $bolt);
+        $tsx = $this->startTransaction($config, $this->config);
 
         $tsx->runStatements($statements ?? []);
 
@@ -135,16 +129,40 @@ public function beginTransaction(?iterable $statements = null, ?TransactionConfi
     /**
      * @return UnmanagedTransactionInterface<T>
      */
-    private function beginInstantTransaction(): TransactionInterface
+    private function beginInstantTransaction(SessionConfiguration $config): TransactionInterface
     {
-        return new BoltUnmanagedTransaction($this->config->getDatabase(), $this->formatter, $this->acquireBolt(TransactionConfiguration::default()));
+        return new BoltUnmanagedTransaction(
+            $this->config->getDatabase(),
+            $this->formatter,
+            $this->acquireBolt(TransactionConfiguration::default(), $config)
+        );
     }
 
-    private function acquireBolt(TransactionConfiguration $config): Bolt
+    private function acquireBolt(TransactionConfiguration $config, SessionConfiguration $sessionConfig): Bolt
     {
-        $bolt = new Bolt($this->pool->acquire($this->uri, $this->config->getAccessMode(), $this->auth, $config));
+        $bolt = new Bolt($this->pool->acquire($this->uri, $sessionConfig->getAccessMode(), $this->auth, $config));
         $this->auth->authenticateBolt($bolt, $this->uri, $this->userAgent);
 
         return $bolt;
     }
+
+    private function startTransaction(TransactionConfiguration $config, SessionConfiguration $sessionConfig): UnmanagedTransactionInterface
+    {
+        try {
+            $bolt = $this->acquireBolt($config, $sessionConfig);
+
+            $begin = $bolt->begin(['db' => $this->config->getDatabase()]);
+
+            if (!$begin) {
+                throw new Neo4jException(new Vector([new Neo4jError('', 'Cannot open new transaction')]));
+            }
+        } catch (Exception $e) {
+            if ($e instanceof Neo4jException) {
+                throw $e;
+            }
+            throw new Neo4jException(new Vector([new Neo4jError('', $e->getMessage())]), $e);
+        }
+
+        return new BoltUnmanagedTransaction($this->config->getDatabase(), $this->formatter, $bolt);
+    }
 }