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

Window sync ranges below any partially completed writes.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-07-25 18:21:03 +00:00
parent 992abfab8f
commit e09a2c0e0f
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,7 +133,8 @@ pub(crate) async fn sync_events_route(
// Setup watchers, so if there's no response, we can wait for them // Setup watchers, so if there's no response, we can wait for them
let watcher = services.sync.watch(sender_user, sender_device); let watcher = services.sync.watch(sender_user, sender_device);
let response = build_sync_events(&services, &body).await?; let next_batch = services.globals.current_count();
let response = build_sync_events(&services, &body, next_batch).await?;
if body.body.full_state if body.body.full_state
|| !(response.rooms.is_empty() || !(response.rooms.is_empty()
&& response.presence.is_empty() && response.presence.is_empty()
@@ -147,20 +148,22 @@ pub(crate) async fn sync_events_route(
// Hang a few seconds so requests are not spammed // Hang a few seconds so requests are not spammed
// Stop hanging if new info arrives // Stop hanging if new info arrives
let default = Duration::from_secs(30); let default = Duration::from_secs(30);
let duration = cmp::min(body.body.timeout.unwrap_or(default), default); let timeout = body.body.timeout.unwrap_or(default);
let duration = cmp::min(timeout, default);
_ = tokio::time::timeout(duration, watcher).await; _ = tokio::time::timeout(duration, watcher).await;
// Retry returning data // Retry returning data
build_sync_events(&services, &body).await let next_batch = services.globals.current_count();
build_sync_events(&services, &body, next_batch).await
} }
pub(crate) async fn build_sync_events( pub(crate) async fn build_sync_events(
services: &Services, services: &Services,
body: &Ruma<sync_events::v3::Request>, body: &Ruma<sync_events::v3::Request>,
next_batch: u64,
) -> Result<sync_events::v3::Response, RumaResponse<UiaaResponse>> { ) -> Result<sync_events::v3::Response, RumaResponse<UiaaResponse>> {
let (sender_user, sender_device) = body.sender(); let (sender_user, sender_device) = body.sender();
let next_batch = services.globals.current_count();
let since = body let since = body
.body .body
.since .since

2
src/api/client/sync/v5.rs
View File

@@ -87,7 +87,7 @@ pub(crate) async fn sync_events_v5_route(
// Setup watchers, so if there's no response, we can wait for them // Setup watchers, so if there's no response, we can wait for them
let watcher = services.sync.watch(sender_user, sender_device); let watcher = services.sync.watch(sender_user, sender_device);
let next_batch = services.globals.next_count(); let next_batch = services.globals.current_count();
// Get sticky parameters from cache // Get sticky parameters from cache
let mut cached = body.body.clone(); let mut cached = body.body.clone();