xiaoxue_admin
/
dbx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(mongodb): allow legacy fallback after native timeout

This commit is contained in:
t8y2 2026-06-03 02:39:07 +08:00
parent a95b82aea2
commit 6ef7eba566
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/desktop/src/lib/connectionAttemptTimeout.ts
View File

@ -1,6 +1,7 @@
import type { ConnectionConfig } from "@/types/database";
export const CONNECTION_ATTEMPT_TIMEOUT_BUFFER_MS = 2_000;
export const MONGO_LEGACY_FALLBACK_TIMEOUT_BUFFER_MS = 30_000;
const DEFAULT_CONNECT_TIMEOUT_SECS = 5;
function positiveSeconds(value: unknown, fallback: number): number {
@ -8,7 +9,8 @@ function positiveSeconds(value: unknown, fallback: number): number {
}
export function connectionAttemptTimeoutMs(
config: Pick<ConnectionConfig, "connect_timeout_secs" | "ssh_enabled" | "ssh_connect_timeout_secs" | "ssh_tunnels">,
config: Pick<ConnectionConfig, "connect_timeout_secs" | "ssh_enabled" | "ssh_connect_timeout_secs" | "ssh_tunnels"> &
Partial<Pick<ConnectionConfig, "db_type">>,
): number {
const timeouts = [positiveSeconds(config.connect_timeout_secs, DEFAULT_CONNECT_TIMEOUT_SECS)];
if (config.ssh_enabled) {
@ -17,7 +19,8 @@ export function connectionAttemptTimeoutMs(
timeouts.push(positiveSeconds(tunnel.connect_timeout_secs, DEFAULT_CONNECT_TIMEOUT_SECS));
}
}
return Math.ceil(Math.max(...timeouts) * 1000 + CONNECTION_ATTEMPT_TIMEOUT_BUFFER_MS);
const fallbackBuffer = config.db_type === "mongodb" ? MONGO_LEGACY_FALLBACK_TIMEOUT_BUFFER_MS : 0;
return Math.ceil(Math.max(...timeouts) * 1000 + CONNECTION_ATTEMPT_TIMEOUT_BUFFER_MS + fallbackBuffer);
}
export function connectionAttemptTimeoutMessage(timeoutMs: number): string {

13
crates/dbx-core/src/db/mongo_driver.rs
View File

@ -1,5 +1,6 @@
use mongodb::{
bson::{doc, oid::ObjectId, Bson, Document},
options::ClientOptions,
Client,
};
use serde::{Deserialize, Serialize};
@ -15,16 +16,20 @@ pub struct MongoDocumentResult {
pub async fn connect(url: &str, timeout: Duration) -> Result<Client, String> {
with_connection_timeout("MongoDB", timeout, async {
Client::with_uri_str(url).await.map_err(|e| format!("MongoDB connection failed: {e}"))
let mut options = ClientOptions::parse(url).await.map_err(|e| format!("MongoDB connection failed: {e}"))?;
options.connect_timeout = Some(timeout);
options.server_selection_timeout = Some(timeout);
Client::with_options(options).map_err(|e| format!("MongoDB connection failed: {e}"))
})
.await
}
pub async fn test_connection(client: &Client, timeout: Duration, database: Option<&str>) -> Result<(), String> {
pub async fn test_connection(client: &Client, _timeout: Duration, database: Option<&str>) -> Result<(), String> {
let database = database.map(str::trim).filter(|value| !value.is_empty()).unwrap_or("admin");
tokio::time::timeout(timeout, client.database(database).run_command(doc! { "ping": 1 }))
client
.database(database)
.run_command(doc! { "ping": 1 })
.await
.map_err(|_| format!("MongoDB connection timed out ({}s)", timeout.as_secs()))?
.map(|_| ())
.map_err(|e| format!("MongoDB connection failed: {e}"))
}

8
packages/app-tests/connectionAttemptTimeout.test.ts
View File

@ -2,6 +2,7 @@ import { strict as assert } from "node:assert";
import test from "node:test";
import {
CONNECTION_ATTEMPT_TIMEOUT_BUFFER_MS,
MONGO_LEGACY_FALLBACK_TIMEOUT_BUFFER_MS,
connectionAttemptTimeoutMessage,
connectionAttemptTimeoutMs,
} from "../../apps/desktop/src/lib/connectionAttemptTimeout.ts";
@ -27,6 +28,13 @@ test("honors slower SSH tunnel connection timeouts", () => {
);
});
test("allows MongoDB legacy agent fallback after native driver timeout", () => {
assert.equal(
connectionAttemptTimeoutMs({ db_type: "mongodb", connect_timeout_secs: 5 }),
5_000 + CONNECTION_ATTEMPT_TIMEOUT_BUFFER_MS + MONGO_LEGACY_FALLBACK_TIMEOUT_BUFFER_MS,
);
});
test("formats connection attempt timeout messages", () => {
assert.match(connectionAttemptTimeoutMessage(7_001), /timed out after 8s/);
assert.match(connectionAttemptTimeoutMessage(7_001), /VPN/);