Fix MS Exchange EWS: add support for version negotiation and other enhancements (closes #6)

src/sync/import_exchange_ews/coordinator.rs

@@ -149,6 +149,7 @@ pub fn run(common: CommonConfig, config: EwsImportConfig) -> Result<Summary, Err
         attachment_batch: config.attachment_batch.max(1),
         connections: config.ews_connections.clamp(1, 8),
         use_syncfolderitems: config.use_syncfolderitems,
+        sync_batch: super::items::SYNC_BATCH_MAX,
         logger,
     };
 

src/sync/import_exchange_ews/items.rs

@@ -26,9 +26,17 @@ pub struct ItemRunCtx<'a> {
     pub attachment_batch: usize,
     pub connections: usize,
     pub use_syncfolderitems: bool,
+    pub sync_batch: u32,
     pub logger: Logger,
 }
 
+pub const SYNC_BATCH_MAX: u32 = 512;
+const SYNC_BATCH_MIN: u32 = 32;
+
+fn shrink_sync_batch(current: u32) -> u32 {
+    (current / 2).max(SYNC_BATCH_MIN)
+}
+
 #[derive(Debug, Clone)]
 pub struct EnumeratedItem {
     pub element: String,
@@ -84,8 +92,10 @@ fn try_sync_folder_items(
     let mut items: Vec<EnumeratedItem> = Vec::new();
     let mut deletions: Vec<String> = Vec::new();
     let mut iters = 0;
+    let mut batch = ctx.sync_batch.clamp(SYNC_BATCH_MIN, SYNC_BATCH_MAX);
     loop {
-        let body = sync_folder_items_body(folder, &sync_state, 512);
+        let retries_before = ctx.client.retries_observed();
+        let body = sync_folder_items_body(folder, &sync_state, batch);
         let resp = match ctx.client.call(ctx.url, "SyncFolderItems", &body) {
             Ok(r) => r,
             Err(EwsError::SoapFault {
@@ -116,6 +126,15 @@ fn try_sync_folder_items(
                 }
             }
         }
+        if ctx.client.retries_observed() > retries_before {
+            let shrunk = shrink_sync_batch(batch);
+            if shrunk != batch {
+                ctx.logger.warn(&format!(
+                    "EWS SyncFolderItems throttled; shrinking change batch {batch} -> {shrunk}"
+                ));
+                batch = shrunk;
+            }
+        }
         sync_state = parsed.sync_state;
         if !parsed.more {
             break;
@@ -383,6 +402,15 @@ pub fn delete_vanished(
 mod tests {
     use super::*;
 
+    #[test]
+    fn sync_batch_shrinks_by_half_down_to_floor() {
+        assert_eq!(shrink_sync_batch(512), 256);
+        assert_eq!(shrink_sync_batch(256), 128);
+        assert_eq!(shrink_sync_batch(64), 32);
+        assert_eq!(shrink_sync_batch(32), 32);
+        assert_eq!(shrink_sync_batch(40), 32);
+    }
+
     #[test]
     fn diff_delta_only_yields_changes_from_server_response() {
         use crate::db::exchange_ews_ids::ItemRow;