fix: persist relay call count, exit node bytes tracking, UI data display cleanup

Author: CaptainMirage

src/bin/ui.rs

@@ -1278,7 +1278,7 @@ impl eframe::App for App {
                         .num_columns(4)
                         .spacing([16.0, 4.0])
                         .show(ui, |ui| {
-                            // Row 1: fetches today | bytes relayed
+                            // Row 1: fetches today | resets in
                             ui.add_sized(
                                 [110.0, 18.0],
                                 egui::Label::new(
@@ -1290,22 +1290,6 @@ impl eframe::App for App {
                                 [140.0, 18.0],
                                 egui::Label::new(calls_text),
                             );
-                            ui.add_sized(
-                                [110.0, 18.0],
-                                egui::Label::new(
-                                    egui::RichText::new("bytes relayed")
-                                        .color(egui::Color32::from_gray(150)),
-                                ),
-                            );
-                            ui.add_sized(
-                                [140.0, 18.0],
-                                egui::Label::new(
-                                    egui::RichText::new(fmt_bytes(s.bytes_relayed)).monospace(),
-                                ),
-                            );
-                            ui.end_row();
-
-                            // Row 2: next reset (remaining removed — already shown in fetches today X/Y)
                             ui.add_sized(
                                 [110.0, 18.0],
                                 egui::Label::new(
@@ -1319,8 +1303,6 @@ impl eframe::App for App {
                                     egui::RichText::new(&reset_str).monospace(),
                                 ),
                             );
-                            ui.label("");
-                            ui.label("");
                             ui.end_row();
 
                             // Row 3: relay calls+failures | cache
@@ -1408,19 +1390,23 @@ impl eframe::App for App {
                             }
                             ui.end_row();
 
-                            // Row 5: data transferred with estimated daily total
+                            // Row 5: data transferred with stable estimated daily total.
+                            // Uses bytes_relayed (all relay paths: exit node + Apps Script).
+                            // Estimate clamps avg bytes/call to 50 KB–500 KB so early sparse
+                            // samples don't make the projection swing wildly.
                             if let Some(q) = &quota_state {
-                                if q.bytes_total > 0 {
-                                    let data_str = if q.requests_used_total > 0 {
-                                        let avg = q.bytes_total as f64 / q.requests_used_total as f64;
+                                if s.bytes_relayed > 0 {
+                                    let data_str = if s.total_relay_calls >= 5 {
+                                        let raw_avg = s.bytes_relayed as f64 / s.total_relay_calls as f64;
+                                        let avg = raw_avg.clamp(50_000.0, 500_000.0);
                                         let est = (avg * q.daily_capacity_total as f64) as u64;
                                         format!(
                                             "{} / {} (est.)",
-                                            fmt_bytes_approx(q.bytes_total),
+                                            fmt_bytes_approx(s.bytes_relayed),
                                             fmt_bytes_approx(est),
                                         )
                                     } else {
-                                        fmt_bytes_approx(q.bytes_total)
+                                        fmt_bytes_approx(s.bytes_relayed)
                                     };
                                     ui.add_sized(
                                         [110.0, 18.0],

src/domain_fronter.rs

@@ -365,11 +365,6 @@ pub struct DomainFronter {
     /// strike state is per-deployment health bookkeeping, not the
     /// permanent ban list.
     script_timeouts: Arc<std::sync::Mutex<HashMap<String, (Instant, u32)>>>,
-    /// Every call to `relay()` increments this — exit node AND Apps Script.
-    /// Use this for UI "fetches today" display. Distinct from `relay_calls`
-    /// (Apps-Script-direct only) and from the quota tracker's `requests_used`
-    /// (also Apps-Script-only).
-    total_relay_calls: AtomicU64,
     relay_calls: AtomicU64,
     relay_failures: AtomicU64,
     bytes_relayed: AtomicU64,
@@ -638,7 +633,6 @@ impl DomainFronter {
             coalesced: AtomicU64::new(0),
             blacklist: Arc::new(std::sync::Mutex::new(HashMap::new())),
             script_timeouts: Arc::new(std::sync::Mutex::new(HashMap::new())),
-            total_relay_calls: AtomicU64::new(0),
             relay_calls: AtomicU64::new(0),
             relay_failures: AtomicU64::new(0),
             bytes_relayed: AtomicU64::new(0),
@@ -780,8 +774,9 @@ impl DomainFronter {
             }
             guard.clone()
         };
+        let quota = self.quota_tracker.summary();
         StatsSnapshot {
-            total_relay_calls: self.total_relay_calls.load(Ordering::Relaxed),
+            total_relay_calls: quota.total_relay_calls,
             relay_calls: self.relay_calls.load(Ordering::Relaxed),
             relay_failures: self.relay_failures.load(Ordering::Relaxed),
             coalesced: self.coalesced.load(Ordering::Relaxed),
@@ -798,7 +793,7 @@ impl DomainFronter {
             h2_calls: self.h2_calls.load(Ordering::Relaxed),
             h2_fallbacks: self.h2_fallbacks.load(Ordering::Relaxed),
             h2_disabled: self.h2_disabled.load(Ordering::Relaxed),
-            quota: self.quota_tracker.summary(),
+            quota,
         }
     }
 
@@ -1791,7 +1786,7 @@ impl DomainFronter {
         headers: &[(String, String)],
         body: &[u8],
     ) -> Vec<u8> {
-        self.total_relay_calls.fetch_add(1, Ordering::Relaxed);
+        self.quota_tracker.record_relay();
 
         // Block ALL relay paths (exit node + Apps Script) when every account
         // bucket is quota-exhausted. Checked here so the exit node short-circuit
@@ -1842,6 +1837,10 @@ impl DomainFronter {
                         bytes.len() as u64,
                         t0.elapsed().as_nanos() as u64,
                     );
+                    self.bytes_relayed.fetch_add(
+                        (body.len() + bytes.len()) as u64,
+                        Ordering::Relaxed,
+                    );
                     return bytes;
                 }
                 Err(e) if !e.is_retryable() => {
@@ -4931,8 +4930,8 @@ fn decode_js_string_escapes(s: &str) -> Option<String> {
 
 #[derive(Debug, Clone)]
 pub struct StatsSnapshot {
-    /// Total calls to `relay()` — all traffic through this fronter including
-    /// exit node and Apps Script. Use for "fetches today" display.
+    /// Total relay() calls today (exit node + Apps Script). Sourced from the
+    /// persisted quota tracker so this survives proxy restarts.
     pub total_relay_calls: u64,
     pub relay_calls: u64,
     pub relay_failures: u64,

src/quota_tracker.rs

@@ -92,13 +92,24 @@ pub struct QuotaSummary {
     /// hard-stopped ones. Used by the UI to show a meaningful reset time even
     /// when all accounts are exhausted.
     pub next_reset_at_any: Option<u64>,
+    /// Total relay() calls today (all paths). Persisted across restarts.
+    /// Resets at UTC midnight.
+    pub total_relay_calls: u64,
 }
 
 // ── Disk state wrapper ────────────────────────────────────────────────────────
 
 #[derive(Serialize, Deserialize, Default)]
 struct QuotaState {
     buckets: HashMap<String, AccountBucket>,
+    /// Total relay() calls today across all paths (exit node + Apps Script).
+    /// Persisted so restarts don't reset the "fetches today" counter.
+    #[serde(default)]
+    total_relay_calls: u64,
+    /// UTC day number (unix_secs / 86400) when total_relay_calls was last reset.
+    /// When the day changes, total_relay_calls is zeroed on the next record_relay().
+    #[serde(default)]
+    relay_today_day: u64,
 }
 
 // ── Tracker ───────────────────────────────────────────────────────────────────
@@ -377,6 +388,7 @@ impl QuotaTracker {
         let mut hard_stopped = 0usize;
         let mut next_reset: Option<u64> = None;
         let mut next_reset_any: Option<u64> = None;
+        let total_relay_calls = st.total_relay_calls;
 
         for sid in &self.script_ids {
             let Some(b) = st.buckets.get(sid) else { continue };
@@ -422,6 +434,7 @@ impl QuotaTracker {
             global_hard_stop: global_stop,
             next_reset_at: next_reset,
             next_reset_at_any: next_reset_any,
+            total_relay_calls,
         }
     }
 
@@ -443,7 +456,7 @@ impl QuotaTracker {
     }
 
     /// Save if any mutations have occurred since the last flush.
-    /// Called from the periodic 60-second stats task.
+    /// Called from the 1-second save task and periodic stats task.
     pub fn save_if_needed(&self) {
         if self.dirty_count.load(Ordering::Relaxed) > 0 {
             self.save();
@@ -453,7 +466,7 @@ impl QuotaTracker {
     }
 
     /// Roll any expired 24-hour windows for all tracked buckets.
-    /// Called from the 60-second stats task so windows reset even when the
+    /// Called from the periodic stats task so windows reset even when the
     /// proxy is idle and no new requests arrive to trigger record_attempt.
     pub fn roll_expired_windows(&self) {
         let now = now_unix();
@@ -486,7 +499,20 @@ impl QuotaTracker {
         }
     }
 
-    /// Build a human-readable startup summary line.
+    /// Record one call to relay() — all paths (exit node + Apps Script).
+    /// Persisted so "fetches today" survives proxy restarts. Resets at UTC midnight.
+    pub fn record_relay(&self) {
+        let today = now_unix() / 86_400;
+        let mut st = self.state.lock().unwrap();
+        if st.relay_today_day != today {
+            st.relay_today_day = today;
+            st.total_relay_calls = 0;
+        }
+        st.total_relay_calls += 1;
+        drop(st);
+        self.dirty_count.fetch_add(1, Ordering::Relaxed);
+    }
+
     /// Log the masked ID and exhaustion reason for every hard-stopped bucket.
     /// Called once when global hard stop transitions from false to true.
     pub fn log_exhaustion_details(&self) {
@@ -500,6 +526,7 @@ impl QuotaTracker {
         }
     }
 
+    /// Build a human-readable startup summary line.
     pub fn startup_summary(&self) -> String {
         let s = self.summary();
         let now = now_unix();