studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Loop syncv3 for robust response without re-request overhead.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-07-30 05:27:12 +00:00
parent 1bb16c8b73
commit bd0c3e33e2
1 changed files with 48 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/api/client/sync/v3.rs
View File

@@ -34,6 +34,7 @@ use ruma::{
serde::Raw, serde::Raw,
uint, uint,
}; };
use tokio::time;
use tuwunel_core::{ use tuwunel_core::{
Result, at, err, error, extract_variant, is_equal_to, Result, at, err, error, extract_variant, is_equal_to,
matrix::{ matrix::{
@@ -133,9 +134,6 @@ pub(crate) async fn sync_events_route(
.await?; .await?;
} }
// Setup watchers, so if there's no response, we can wait for them
let watcher = services.sync.watch(sender_user, sender_device);
let next_batch = services.globals.current_count();
let since = body let since = body
.body .body
.since .since
@@ -144,50 +142,59 @@ pub(crate) async fn sync_events_route(
.flat_ok() .flat_ok()
.unwrap_or(0); .unwrap_or(0);
// Make an initial pass if there's a possibility of something to find. let timeout = body
if since < next_batch { .body
let response = build_sync_events(&services, &body, since, next_batch).await?; .timeout
if body.body.full_state .as_ref()
|| !(response.rooms.is_empty() .map(Duration::as_millis)
.map(TryInto::try_into)
.flat_ok()
.unwrap_or(services.config.client_sync_timeout_default)
.max(services.config.client_sync_timeout_min)
.min(services.config.client_sync_timeout_max);
let stop_at = time::Instant::now()
.checked_add(Duration::from_millis(timeout))
.expect("configuration must limit maximum timeout");
let mut next_batch = services.globals.current_count();
loop {
// Listen for activity
let watchers = services.sync.watch(sender_user, sender_device);
if since < next_batch || body.body.full_state {
// Check for activity
let response = build_sync_events(&services, &body, since, next_batch).await?;
let empty = response.rooms.is_empty()
&& response.presence.is_empty() && response.presence.is_empty()
&& response.account_data.is_empty() && response.account_data.is_empty()
&& response.device_lists.is_empty() && response.device_lists.is_empty()
&& response.to_device.is_empty()) && response.to_device.is_empty();
{
return Ok(response); if !empty || body.body.full_state {
return Ok(response);
}
} }
// Wait for activity
if time::timeout_at(stop_at, watchers).await.is_err() {
break;
}
trace!(
?since,
last_batch = ?next_batch,
count = ?services.globals.pending_count(),
stop_at = ?stop_at,
"waited for watchers"
);
// Synchronize activity
next_batch = services.globals.wait_pending().await?;
debug_assert!(since <= next_batch, "next_batch is monotonic");
} }
let timeout_default = services.config.client_sync_timeout_default; trace!(next_batch, "empty response");
let timeout_min = services.config.client_sync_timeout_min; return Ok(sync_events::v3::Response::new(next_batch.to_string()));
let timeout_max = services.config.client_sync_timeout_max;
let duration = body
.body
.timeout
.unwrap_or_else(|| Duration::from_millis(timeout_default))
.clamp(Duration::from_millis(timeout_min), Duration::from_millis(timeout_max));
// Wait for activity notification.
let timeout = tokio::time::timeout(duration, watcher).await;
trace!(
count = ?services.globals.pending_count(),
timedout = timeout.is_err(),
"waited for watchers"
);
// Wait for synchronization of activity.
let next_batch = services.globals.wait_pending().await?;
debug_assert!(since <= next_batch, "next_batch is monotonic");
// Return an empty response when nothing has changed.
if since == next_batch {
trace!(next_batch, "empty response");
return Ok(sync_events::v3::Response::new(next_batch.to_string()));
}
build_sync_events(&services, &body, since, next_batch)
.await
.map_err(Into::into)
} }
#[tracing::instrument( #[tracing::instrument(