RUST-BUG-064: cover all UDP source batch servers

Author: Threepwood-7

crates/emulebb-core/src/ed2k_sources.rs

@@ -94,6 +94,12 @@ pub(crate) fn configured_server_attempts(config: &Ed2kConfig) -> usize {
         .max(1)
 }
 
+pub(crate) fn global_udp_source_batch_server_attempts(config: &Ed2kConfig) -> usize {
+    // WHY: MFC's UDP source walk uses the server list, not the tiny diagnostic
+    // budget. Batched Rust sends selected packets before waiting for replies.
+    configured_server_attempts(config)
+}
+
 pub(crate) fn exact_ed2k_hash_query_token(query: &str) -> Option<String> {
     let trimmed = query.trim();
     let candidate = trimmed

crates/emulebb-core/src/ed2k_sources/tests.rs

@@ -1,9 +1,13 @@
 use std::net::Ipv4Addr;
 
+use emulebb_ed2k::config::Ed2kConfig;
 use emulebb_kad_dht::SourceResult;
 use emulebb_kad_proto::Ed2kHash;
 
-use super::kad_source_result_to_ed2k_found_source;
+use super::{
+    configured_server_attempts, global_udp_source_batch_server_attempts,
+    kad_source_result_to_ed2k_found_source,
+};
 
 fn kad_source(udp_port: u16) -> SourceResult {
     SourceResult {
@@ -32,3 +36,22 @@ fn kad_high_id_source_preserves_nonzero_source_udp_port() {
         None
     );
 }
+
+#[test]
+fn global_udp_source_batch_attempts_cover_effective_server_list() {
+    let mut config = Ed2kConfig {
+        source_server_attempt_budget: 1,
+        server_endpoints: vec![
+            "192.0.2.10:4661".to_string(),
+            "192.0.2.20:4661".to_string(),
+            "192.0.2.30:4661".to_string(),
+        ],
+        ..Ed2kConfig::default()
+    };
+
+    assert_eq!(configured_server_attempts(&config), 3);
+    assert_eq!(global_udp_source_batch_server_attempts(&config), 3);
+
+    config.server_endpoints.clear();
+    assert_eq!(global_udp_source_batch_server_attempts(&config), 1);
+}

crates/emulebb-core/src/lib.rs

@@ -123,13 +123,13 @@ use ed2k_sources::{
     Ed2kServerCallbackRoute, LearnedEd2kMetadata, OwnSourceIdentity, collect_kad_ed2k_metadata,
     collect_kad_ed2k_sources, configured_server_attempts, direct_download_candidate_sources,
     drop_self_sources, ed2k_server_callback_route, found_source_from_hint,
-    global_udp_source_search_excluded_endpoint, hash_only_ed2k_search_query,
-    kad_source_result_to_ed2k_found_source, keyword_target, manifest_has_ed2k_transfer_progress,
-    merge_download_sources, new_direct_ed2k_source_count, plaintext_fallback_for_obfuscated_source,
-    select_ed2k_keyword_metadata, should_adopt_hash_only_metadata_name,
-    should_query_kad_source_supplement, should_query_server_udp_source_supplement,
-    should_refresh_ed2k_server_sources, should_skip_no_progress_source_requery,
-    sort_download_sources, source_endpoint_key, source_key,
+    global_udp_source_batch_server_attempts, global_udp_source_search_excluded_endpoint,
+    hash_only_ed2k_search_query, kad_source_result_to_ed2k_found_source, keyword_target,
+    manifest_has_ed2k_transfer_progress, merge_download_sources, new_direct_ed2k_source_count,
+    plaintext_fallback_for_obfuscated_source, select_ed2k_keyword_metadata,
+    should_adopt_hash_only_metadata_name, should_query_kad_source_supplement,
+    should_query_server_udp_source_supplement, should_refresh_ed2k_server_sources,
+    should_skip_no_progress_source_requery, sort_download_sources, source_endpoint_key, source_key,
 };
 #[cfg(test)]
 use ed2k_sources::{
@@ -3398,8 +3398,6 @@ impl EmulebbCore {
     ) -> Result<Vec<Ed2kFoundSource>> {
         let cancel = CancellationToken::new();
         let config = self.effective_ed2k_config(&network.config, None).await?;
-        let attempts =
-            configured_server_attempts(&config).min(config.source_server_attempt_budget.max(1));
         let mut sources = Vec::new();
         let (preferred_endpoint, background_search) =
             if let Some(handle) = self.connected_ed2k_search_handle().await {
@@ -3454,7 +3452,7 @@ impl EmulebbCore {
                         has_background_search,
                         preferred_endpoint,
                     ),
-                    max_attempts: attempts,
+                    max_attempts: global_udp_source_batch_server_attempts(&config),
                     targets: &claimed_batch.targets,
                     timeout: Duration::from_secs(config.connect_timeout_secs.max(15)),
                     cancel: &cancel,

docs/active/INDEX.md

@@ -75,6 +75,7 @@ items.
 | [RUST-BUG-061](items/RUST-BUG-061.md) | Major | DONE | Supplement scarce connected-server sources with global UDP source search |
 | [RUST-BUG-062](items/RUST-BUG-062.md) | Major | DONE | Batch ED2K global UDP source requests like MFC |
 | [RUST-BUG-063](items/RUST-BUG-063.md) | Major | DONE | Do not serialize ED2K UDP source-batch sends behind per-server waits |
+| [RUST-BUG-064](items/RUST-BUG-064.md) | Major | IN_PROGRESS | Cover all effective servers in ED2K UDP source batches |
 
 ## Refactors (`REF`)
 

docs/active/items/RUST-BUG-064.md

@@ -0,0 +1,44 @@
+---
+id: RUST-BUG-064
+title: Cover all effective servers in ED2K UDP source batches
+status: in_progress
+priority: Major
+category: bug
+workflow: local
+---
+
+# RUST-BUG-064: Cover all effective servers in ED2K UDP source batches
+
+## Problem
+
+Rust's batched ED2K global UDP source search still capped the selected server
+walk with `source_server_attempt_budget`, whose default is intentionally tiny
+for legacy diagnostic one-shot source probes.
+
+eMuleBB MFC keeps rotating through the global server list for its UDP source
+walk. After `RUST-BUG-063`, Rust sends selected batched server packets before
+waiting for replies, so covering the effective runtime/imported server list no
+longer serializes source acquisition behind one timeout per server.
+
+## Acceptance
+
+- [x] Batched global ED2K UDP source search uses the full effective configured
+      and runtime-imported server count.
+- [x] Legacy source-server attempt budgets remain available to diagnostic
+      one-shot source paths.
+- [x] Focused unit coverage proves a small diagnostic budget does not shrink
+      the batched global source walk.
+- [ ] Live hide.me diagnostics show batched `OP_GLOBGETSOURCES*` packets cover
+      more than the old three-server cap when more candidate servers are
+      available.
+
+## Implementation Notes
+
+- Keep the change scoped to active transfer source batching.
+- Do not change the default diagnostic source-server attempt budget globally.
+
+## Evidence
+
+- `cargo test -p emulebb-core global_udp_source_batch_attempts_cover_effective_server_list --locked`
+- `python tools\check_rust_client_policy.py`
+- `python tools\rust_quality_gate.py quick`