Merge pull request #29 from utopia-php/feat-client-updates

Add reconnection
This commit is contained in:
Jake Barnby authored and GitHub committed 2025-10-01 01:45:49 +13:00
commit c1411c47b7
1 file changed
+29 -23
+29 -23
View File
@@ -197,19 +197,12 @@ class Client
if ($this->client->isConnected()) {
return $this;
}
// Validate connection parameters before attempting connection
$validateConnectionParams = function () {
if (empty($this->host)) {
throw new Exception('MongoDB host cannot be empty');
}
if ($this->port <= 0 || $this->port > 65535) {
throw new Exception('MongoDB port must be between 1 and 65535');
}
};
$validateConnectionParams();
if (empty($this->host)) {
throw new Exception('MongoDB host cannot be empty');
}
if ($this->port <= 0 || $this->port > 65535) {
throw new Exception('MongoDB port must be between 1 and 65535');
}
if (!$this->client->connect($this->host, $this->port)) {
throw new Exception("Failed to connect to MongoDB at {$this->host}:{$this->port}");
}
@@ -261,17 +254,15 @@ class Client
if (is_array($sessionData) && isset($sessionData['id'])) {
$command['lsid'] = $sessionData['id'];
$rawId = $sessionData['id']->id ?? null;
$sessionId = $rawId instanceof \MongoDB\BSON\Binary
? bin2hex($rawId->getData())
: $rawId;
} else {
$command['lsid'] = $sessionData;
$rawId = $sessionData->id ?? null;
$sessionId = $rawId instanceof \MongoDB\BSON\Binary
? bin2hex($rawId->getData())
: $rawId;
}
$sessionId = $rawId instanceof \MongoDB\BSON\Binary
? bin2hex($rawId->getData())
: $rawId;
// Add transaction parameters if session is in transaction
if ($sessionId && isset($this->sessions[$sessionId]) &&
$this->sessions[$sessionId]['state'] === self::TRANSACTION_IN_PROGRESS) {
@@ -346,7 +337,6 @@ class Client
$message = pack('V*', 21 + strlen($sections), $this->id, 0, 2013, 0) . "\0" . $sections;
$result = $this->send($message);
// Update causal consistency timestamps from response
$this->updateCausalConsistency($result);
// Update session last use time if session was provided
@@ -367,7 +357,23 @@ class Client
*/
public function send(mixed $data): stdClass|array|int
{
$this->client->send($data);
// Check if connection is alive, connect if not
if (!$this->client->isConnected()) {
$this->connect();
}
$result = $this->client->send($data);
// If send fails, try to reconnect once
if ($result === false) {
$this->close();
$this->connect();
$result = $this->client->send($data);
if ($result === false) {
throw new Exception('Failed to send data to MongoDB after reconnection attempt');
}
}
return $this->receive();
}
@@ -397,8 +403,8 @@ class Client
if ($this->client instanceof CoroutineClient) {
Coroutine::sleep(0.001); // 1ms for coroutines
} else {
\usleep($sleepTime); // Microsecond precision for sync client
$sleepTime = \min($sleepTime * 1.2, 10000); // Cap at 10ms for faster checking
\usleep((int)$sleepTime); // Microsecond precision for sync client
$sleepTime = (int)\min($sleepTime * 1.2, 10000); // Cap at 10ms for faster checking
}
continue;
}