fix(gmail): retry 403 rateLimitExceeded and 5xx with exponential backoff

CHANGELOG.md

@@ -9,9 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- **Gmail** — Retry transient API failures (429, 5xx, and 403 `rateLimitExceeded`) with exponential backoff, honouring `Retry-After` and the retry timestamp in Google's error body.
 - **WhatsApp** — `void send` / `void reply` no longer report success on a dead or dying socket. Sends fail fast when the connection is down, and after the write a ping must round-trip before success is printed; if it does not, the command exits non-zero and says delivery is unknown.
 - **WhatsApp** — History sync after pairing is stored again. The library now delivers the backfill one conversation at a time, so the old bulk handler never ran and the pairing dump was dropped (observed: 775 conversations parsed, 4 rows stored). Progress is logged every 250 messages.
-
 - **Archive** — `void archive <id>` now dismisses the whole context group behind the item (Slack thread, Slack 1-hour channel group, Gmail thread) instead of a single row. The inbox shows one row per context, so archiving only the visible id let an older sibling resurface as the next representative. The response gains `archived_count` (rows newly archived by the call, `0` when it was already archived), and Gmail pushes the group in one `batchModify` request.
 
 ### Added

Cargo.toml

@@ -55,6 +55,9 @@ tokio-util = "0.7"
 croner = "4"
 tabled = "0.17"
 reqwest = { version = "0.13", features = ["json", "multipart", "form", "query"] }
+# Pinned to the major reqwest 0.13 re-exports, so `http::Response` round-trips
+# through `reqwest::Response` (used by the Gmail retry path to buffer a body).
+http = "1"
 quick-xml = { version = "0.42", features = ["serialize"] }
 tokio-tungstenite = { version = "0.29", features = ["native-tls"] }
 futures-util = "0.3"

crates/void-gmail/Cargo.toml

@@ -16,6 +16,7 @@ anyhow = { workspace = true }
 thiserror = { workspace = true }
 async-trait = { workspace = true }
 reqwest = { workspace = true }
+http = { workspace = true }
 uuid = { workspace = true }
 chrono = { workspace = true }
 tokio-util = { workspace = true }

crates/void-gmail/src/api/client.rs

@@ -3,6 +3,8 @@ use std::time::Duration;
 use crate::error::GmailError;
 use tracing::{debug, info};
 
+use super::retry::{RetryPolicy, SendRetrying};
+
 use super::types::{
     AttachmentResponse, DraftListResponse, GmailDraft, GmailMessage, GmailProfile, GmailThread,
     HistoryListResponse, HistoryRecord, LabelListResponse, MessageListResponse, SendAsAlias,
@@ -26,6 +28,7 @@ pub struct GmailApiClient {
     http: reqwest::Client,
     access_token: String,
     base_url: String,
+    retry: RetryPolicy,
 }
 
 impl GmailApiClient {
@@ -34,6 +37,7 @@ impl GmailApiClient {
             http: build_http_client(),
             access_token: access_token.to_string(),
             base_url: DEFAULT_BASE_URL.to_string(),
+            retry: RetryPolicy::default(),
         }
     }
 
@@ -43,6 +47,7 @@ impl GmailApiClient {
             http: build_http_client(),
             access_token: access_token.to_string(),
             base_url: base_url.to_string(),
+            retry: RetryPolicy::fast(),
         }
     }
 
@@ -56,7 +61,7 @@ impl GmailApiClient {
             .http
             .get(format!("{}/gmail/v1/users/me/profile", self.base_url))
             .bearer_auth(&self.access_token)
-            .send()
+            .send_retrying(&self.retry)
             .await?
             .json()
             .await?;
@@ -94,7 +99,7 @@ impl GmailApiClient {
             .get(format!("{}/gmail/v1/users/me/messages", self.base_url))
             .bearer_auth(&self.access_token)
             .query(&params)
-            .send()
+            .send_retrying(&self.retry)
             .await?
             .error_for_status()?;
         let resp: MessageListResponse = resp.json().await?;
@@ -117,7 +122,7 @@ impl GmailApiClient {
             ))
             .bearer_auth(&self.access_token)
             .query(&[("format", "full")])
-            .send()
+            .send_retrying(&self.retry)
             .await?
             .error_for_status()?;
         let resp: GmailMessage = resp.json().await?;
@@ -148,7 +153,7 @@ impl GmailApiClient {
                 .get(format!("{}/gmail/v1/users/me/history", self.base_url))
                 .bearer_auth(&self.access_token)
                 .query(&params)
-                .send()
+                .send_retrying(&self.retry)
                 .await?;
             // Gmail returns 404 once the startHistoryId is too old (history is
             // only kept for a limited window). Surface that distinctly so the
@@ -210,7 +215,7 @@ impl GmailApiClient {
             ))
             .bearer_auth(&self.access_token)
             .json(&body)
-            .send()
+            .send_retrying(&self.retry)
             .await?
             .json()
             .await?;
@@ -226,7 +231,7 @@ impl GmailApiClient {
             .post(format!("{}/gmail/v1/users/me/messages/send", self.base_url))
             .bearer_auth(&self.access_token)
             .json(&body)
-            .send()
+            .send_retrying(&self.retry)
             .await?
             .json()
             .await?;
@@ -244,7 +249,7 @@ impl GmailApiClient {
             ))
             .bearer_auth(&self.access_token)
             .query(&[("format", "full")])
-            .send()
+            .send_retrying(&self.retry)
             .await?
             .error_for_status()?
             .json()
@@ -267,7 +272,7 @@ impl GmailApiClient {
                 self.base_url
             ))
             .bearer_auth(&self.access_token)
-            .send()
+            .send_retrying(&self.retry)
             .await?
             .error_for_status()?
             .json()
@@ -282,7 +287,7 @@ impl GmailApiClient {
             .http
             .get(format!("{}/gmail/v1/users/me/labels", self.base_url))
             .bearer_auth(&self.access_token)
-            .send()
+            .send_retrying(&self.retry)
             .await?
             .error_for_status()?
             .json()
@@ -316,7 +321,7 @@ impl GmailApiClient {
             ))
             .bearer_auth(&self.access_token)
             .json(&body)
-            .send()
+            .send_retrying(&self.retry)
             .await?
             .error_for_status()?
             .json()
@@ -349,7 +354,7 @@ impl GmailApiClient {
             ))
             .bearer_auth(&self.access_token)
             .json(&body)
-            .send()
+            .send_retrying(&self.retry)
             .await?
             .error_for_status()?;
         debug!("gmail: batch_modify ok");
@@ -363,7 +368,7 @@ impl GmailApiClient {
             .get(format!("{}/gmail/v1/users/me/drafts", self.base_url))
             .bearer_auth(&self.access_token)
             .query(&[("maxResults", max_results.to_string())])
-            .send()
+            .send_retrying(&self.retry)
             .await?
             .error_for_status()?
             .json()
@@ -383,7 +388,7 @@ impl GmailApiClient {
             ))
             .bearer_auth(&self.access_token)
             .query(&[("format", "full")])
-            .send()
+            .send_retrying(&self.retry)
             .await?
             .error_for_status()?
             .json()
@@ -408,7 +413,7 @@ impl GmailApiClient {
             .post(format!("{}/gmail/v1/users/me/drafts", self.base_url))
             .bearer_auth(&self.access_token)
             .json(&body)
-            .send()
+            .send_retrying(&self.retry)
             .await?
             .error_for_status()?
             .json()
@@ -430,7 +435,7 @@ impl GmailApiClient {
             ))
             .bearer_auth(&self.access_token)
             .json(&body)
-            .send()
+            .send_retrying(&self.retry)
             .await?
             .error_for_status()?
             .json()
@@ -447,7 +452,7 @@ impl GmailApiClient {
                 self.base_url
             ))
             .bearer_auth(&self.access_token)
-            .send()
+            .send_retrying(&self.retry)
             .await?
             .error_for_status()?;
         debug!(draft_id, "gmail: delete_draft ok");
@@ -464,7 +469,7 @@ impl GmailApiClient {
                 self.base_url
             ))
             .bearer_auth(&self.access_token)
-            .send()
+            .send_retrying(&self.retry)
             .await?;
         let resp: SendAsListResponse = Self::json_or_scope_error(resp).await?;
         let count = resp.send_as.as_ref().map(|s| s.len()).unwrap_or(0);
@@ -483,7 +488,7 @@ impl GmailApiClient {
                 self.base_url
             ))
             .bearer_auth(&self.access_token)
-            .send()
+            .send_retrying(&self.retry)
             .await?;
         let resp: SendAsAlias = Self::json_or_scope_error(resp).await?;
         debug!(send_as_email, "gmail: get_send_as ok");

crates/void-gmail/src/api/mod.rs

@@ -1,10 +1,12 @@
 mod client;
 mod message;
+mod retry;
 mod types;
 
 #[cfg(test)]
 mod tests;
 
 pub use client::{build_http_client, GmailApiClient};
 pub use message::decode_attachment_data;
+pub use retry::RetryPolicy;
 pub use types::*;