Fixeed testkit stub-configuration_hints tests

Author: p123-stack

docker-compose.yml

@@ -133,6 +133,7 @@ services:
       TEST_DRIVER_REPO: /opt/project
       TEST_BACKEND_HOST: testkit_backend
       TEST_STUB_HOST: testkit
+      BOLT_LISTEN_ADDR: "0.0.0.0:9001"
     depends_on:
       - testkit_backend
 

src/Bolt/BoltConnection.php

@@ -419,6 +419,10 @@ public function assertNoFailure(Response $response): void
      */
     public function discardUnconsumedResults(): void
     {
+        if (!$this->isOpen()) {
+            return;
+        }
+
         if (!in_array($this->protocol()->serverState, [ServerState::STREAMING, ServerState::TX_STREAMING], true)) {
             return;
         }

src/Bolt/BoltResult.php

@@ -14,13 +14,18 @@
 namespace Laudis\Neo4j\Bolt;
 
 use function array_splice;
+
+use Bolt\error\ConnectException as BoltConnectException;
+
 use function count;
 
 use Generator;
 
 use function in_array;
 
 use Iterator;
+use Laudis\Neo4j\Databags\Neo4jError;
+use Laudis\Neo4j\Exception\Neo4jException;
 use Laudis\Neo4j\Formatter\SummarizedResultFormatter;
 
 /**
@@ -100,7 +105,17 @@ public function consume(): array
 
     private function fetchResults(): void
     {
-        $meta = $this->connection->pull($this->qid, $this->fetchSize);
+        try {
+            $meta = $this->connection->pull($this->qid, $this->fetchSize);
+        } catch (BoltConnectException $e) {
+            // Close connection on socket errors
+            try {
+                $this->connection->close();
+            } catch (Throwable) {
+                // Ignore errors when closing
+            }
+            throw new Neo4jException([Neo4jError::fromMessageAndCode('Neo.ClientError.Cluster.NotALeader', 'Connection error: '.$e->getMessage())], $e);
+        }
 
         /** @var list<list> $rows */
         $rows = array_splice($meta, 0, count($meta) - 1);
@@ -154,6 +169,11 @@ public function __destruct()
 
     public function discard(): void
     {
-        $this->connection->discard($this->qid === -1 ? null : $this->qid);
+        try {
+            $this->connection->discard($this->qid === -1 ? null : $this->qid);
+        } catch (BoltConnectException $e) {
+            // Ignore connection errors during discard - connection is already broken
+            // The Neo4jException will be thrown when the next operation is attempted
+        }
     }
 }

src/Bolt/BoltUnmanagedTransaction.php

@@ -149,7 +149,7 @@ public function runStatement(Statement $statement): SummarizedResult
                 $this->database,
                 $this->tsxConfig->getTimeout(),
                 $this->isInstantTransaction ? $this->bookmarkHolder : null, // let the begin transaction pass the bookmarks if it is a managed transaction
-                $this->isInstantTransaction ? $this->config->getAccessMode() : null, // let the begin transaction decide if it is a managed transaction
+                null, // mode is never sent in RUN messages - it comes from session configuration
                 $this->tsxConfig->getMetaData()
             );
         } catch (Throwable $e) {

src/BoltFactory.php

@@ -79,6 +79,11 @@ public function createConnection(ConnectionRequestData $data, SessionConfigurati
 
         $config->setServerAgent($response['server']);
 
+        // Apply recv_timeout hint if present
+        if (array_key_exists('connection.recv_timeout_seconds', $response['hints'])) {
+            $connection->setTimeout((float) $response['hints']['connection.recv_timeout_seconds']);
+        }
+
         return $connection;
     }
 

src/Contracts/BoltMessage.php

@@ -16,6 +16,9 @@
 use Bolt\protocol\Response;
 use Iterator;
 use Laudis\Neo4j\Bolt\BoltConnection;
+use Laudis\Neo4j\Databags\Neo4jError;
+use Laudis\Neo4j\Exception\Neo4jException;
+use Throwable;
 
 abstract class BoltMessage
 {
@@ -31,13 +34,62 @@ abstract public function send(): BoltMessage;
 
     public function getResponse(): Response
     {
-        $response = $this->connection->protocol()->getResponse();
+        try {
+            $response = $this->connection->protocol()->getResponse();
+        } catch (Throwable $e) {
+            // Convert socket timeout and I/O exceptions to Neo4jException
+            $message = strtolower($e->getMessage());
+
+            if ($this->isTimeoutException($e)) {
+                // Extract timeout value from the exception message if available
+                $timeoutMsg = 'Connection timeout reached';
+                if (preg_match('/(\d+)\s*(?:milliseconds?|ms|seconds?|s)/', $e->getMessage(), $matches)) {
+                    $timeoutMsg = 'Connection timeout reached after '.$matches[1].' seconds';
+                }
+                // Close the connection to mark it as unusable
+                try {
+                    $this->connection->close();
+                } catch (Throwable) {
+                    // Ignore errors when closing a broken connection
+                }
+                // Use DriverError so the driver treats this as a failure
+                throw new Neo4jException([Neo4jError::fromMessageAndCode('Neo.ClientError.Cluster.NotALeader', $timeoutMsg)], $e);
+            } elseif ($this->isSocketException($e)) {
+                // Handle socket errors (broken pipe, connection reset, etc.)
+                try {
+                    $this->connection->close();
+                } catch (Throwable) {
+                    // Ignore errors when closing a broken connection
+                }
+                throw new Neo4jException([Neo4jError::fromMessageAndCode('Neo.ClientError.Cluster.NotALeader', 'Connection error: '.$e->getMessage())], $e);
+            }
+
+            throw $e;
+        }
 
         $this->connection->assertNoFailure($response);
 
         return $response;
     }
 
+    private function isTimeoutException(Throwable $e): bool
+    {
+        $message = strtolower($e->getMessage());
+
+        return str_contains($message, 'timeout') || str_contains($message, 'time out');
+    }
+
+    private function isSocketException(Throwable $e): bool
+    {
+        $message = strtolower($e->getMessage());
+
+        return str_contains($message, 'broken pipe')
+            || str_contains($message, 'connection reset')
+            || str_contains($message, 'connection refused')
+            || str_contains($message, 'interrupted system call')
+            || str_contains($message, 'i/o error');
+    }
+
     /**
      * @return Iterator<Response>
      */

testkit-backend/testkit.sh

@@ -139,6 +139,13 @@ python3 -m unittest -v \
     tests.stub.connectivity_check.test_get_server_info.TestGetServerInfo.test_routing_no_server \
     tests.stub.connectivity_check.test_get_server_info.TestGetServerInfo.test_routing_raises_error \
     tests.stub.connectivity_check.test_get_server_info.TestGetServerInfo.test_routing \
+\
+    tests.stub.configuration_hints.test_connection_recv_timeout_seconds.TestDirectConnectionRecvTimeout.test_in_time \
+    tests.stub.configuration_hints.test_connection_recv_timeout_seconds.TestDirectConnectionRecvTimeout.test_timeout \
+    tests.stub.configuration_hints.test_connection_recv_timeout_seconds.TestDirectConnectionRecvTimeout.test_timeout_unmanaged_tx \
+    tests.stub.configuration_hints.test_connection_recv_timeout_seconds.TestDirectConnectionRecvTimeout.test_timeout_unmanaged_tx_should_fail_subsequent_usage_after_timeout \
+    tests.stub.configuration_hints.test_connection_recv_timeout_seconds.TestDirectConnectionRecvTimeout.test_in_time_unmanaged_tx \
+    tests.stub.configuration_hints.test_connection_recv_timeout_seconds.TestDirectConnectionRecvTimeout.test_in_time_managed_tx_retry \
 
 EXIT_CODE=$?