1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
|
//! Core Sync Algorithms for Proactive Sync
//!
//! This module provides the decision-making algorithms for the sync system:
//!
//! - `derive_relay_targets()` - Inverts RepoSyncIndex to per-relay view
//! - `compute_actions()` - Three-way diff to determine new sync actions
//!
//! See `docs/explanation/grasp-02-proactive-sync-v4.md` for full design details.
use std::collections::{HashMap, HashSet};
use nostr_sdk::prelude::*;
use super::{ConnectionStatus, PendingBatch, RelayState};
// =============================================================================
// Data Structures
// =============================================================================
/// Relay-centric view of what needs syncing
///
/// This is the inverted view of `RepoSyncNeeds` - instead of "what relays does
/// this repo need to sync from", it's "what repos does this relay need to sync".
#[derive(Debug, Clone, Default)]
pub struct RelaySyncNeeds {
/// Repos that need to be synced from this relay
pub repos: HashSet<String>,
/// Root events that need to be tracked from this relay
pub root_events: HashSet<EventId>,
}
/// Action to add filters to a relay
///
/// Produced by `compute_actions()` to describe incremental sync work needed.
#[derive(Debug)]
pub struct AddFilters {
/// The relay URL to add filters to
pub relay_url: String,
/// Repos being synced in this action
pub repos: HashSet<String>,
/// Root events being tracked in this action
pub root_events: HashSet<EventId>,
/// The actual filters to subscribe with
pub filters: Vec<Filter>,
}
// =============================================================================
// Core Algorithms
// =============================================================================
/// Inverts RepoSyncIndex to per-relay view
///
/// Takes the repo-centric index (repo -> {relays, root_events}) and inverts it
/// to a relay-centric view (relay -> {repos, root_events}).
///
/// # Arguments
/// * `repo_index` - Map of repo addressable refs to their sync needs
///
/// # Returns
/// Map of relay URLs to the combined sync needs from all repos
pub fn derive_relay_targets(
repo_index: &HashMap<String, super::RepoSyncNeeds>,
) -> HashMap<String, RelaySyncNeeds> {
let mut relay_targets: HashMap<String, RelaySyncNeeds> = HashMap::new();
for (repo_id, needs) in repo_index {
for relay_url in &needs.relays {
let entry = relay_targets.entry(relay_url.clone()).or_default();
entry.repos.insert(repo_id.clone());
entry.root_events.extend(needs.root_events.iter().cloned());
}
}
relay_targets
}
/// Three-way diff: target - pending - confirmed = new
///
/// Computes what sync actions are needed by comparing:
/// 1. What we want (targets)
/// 2. What's already in-flight (pending)
/// 3. What's already confirmed (confirmed)
///
/// Only creates AddFilters actions for items not already pending or confirmed.
///
/// # Arguments
/// * `targets` - Per-relay sync needs (from `derive_relay_targets`)
/// * `pending` - In-flight batches per relay
/// * `confirmed` - Confirmed relay states
///
/// # Returns
/// Vec of AddFilters actions for new sync work
pub fn compute_actions(
targets: &HashMap<String, RelaySyncNeeds>,
pending: &HashMap<String, Vec<PendingBatch>>,
confirmed: &HashMap<String, RelayState>,
) -> Vec<AddFilters> {
use crate::sync::filters::build_layer2_and_layer3_filters;
let mut actions = Vec::new();
for (relay_url, target_needs) in targets {
// Skip disconnected relays
if let Some(state) = confirmed.get(relay_url) {
if matches!(state.connection_status, ConnectionStatus::Disconnected) {
continue;
}
}
// Calculate what's already pending
let pending_repos: HashSet<String> = pending
.get(relay_url)
.map(|batches| {
batches
.iter()
.flat_map(|batch| batch.items.repos.iter().cloned())
.collect()
})
.unwrap_or_default();
let pending_events: HashSet<EventId> = pending
.get(relay_url)
.map(|batches| {
batches
.iter()
.flat_map(|batch| batch.items.root_events.iter().cloned())
.collect()
})
.unwrap_or_default();
// Calculate what's already confirmed
let confirmed_repos: HashSet<String> = confirmed
.get(relay_url)
.map(|state| state.repos.clone())
.unwrap_or_default();
let confirmed_events: HashSet<EventId> = confirmed
.get(relay_url)
.map(|state| state.root_events.clone())
.unwrap_or_default();
// Calculate what's NEW (not in pending, not in confirmed)
let new_repos: HashSet<String> = target_needs
.repos
.difference(&pending_repos)
.filter(|repo| !confirmed_repos.contains(*repo))
.cloned()
.collect();
let new_events: HashSet<EventId> = target_needs
.root_events
.difference(&pending_events)
.filter(|event| !confirmed_events.contains(*event))
.cloned()
.collect();
// If there's anything new, create an AddFilters action
if !new_repos.is_empty() || !new_events.is_empty() {
let filters = build_layer2_and_layer3_filters(&new_repos, &new_events, None);
actions.push(AddFilters {
relay_url: relay_url.clone(),
repos: new_repos,
root_events: new_events,
filters,
});
}
}
actions
}
#[cfg(test)]
mod tests {
use super::*;
use crate::sync::RepoSyncNeeds as ModRepoSyncNeeds;
// =========================================================================
// derive_relay_targets tests
// =========================================================================
#[test]
fn test_derive_relay_targets_empty() {
let repo_index = HashMap::new();
let targets = derive_relay_targets(&repo_index);
assert!(targets.is_empty());
}
#[test]
fn test_derive_relay_targets_single_repo_single_relay() {
let mut repo_index = HashMap::new();
let mut relays = HashSet::new();
relays.insert("wss://relay1.com".to_string());
let mut root_events = HashSet::new();
root_events.insert(EventId::all_zeros());
repo_index.insert(
"repo1".to_string(),
ModRepoSyncNeeds {
relays,
root_events,
},
);
let targets = derive_relay_targets(&repo_index);
assert_eq!(targets.len(), 1);
let relay_needs = targets.get("wss://relay1.com").unwrap();
assert_eq!(relay_needs.repos.len(), 1);
assert!(relay_needs.repos.contains("repo1"));
assert_eq!(relay_needs.root_events.len(), 1);
}
#[test]
fn test_derive_relay_targets_multiple_repos_same_relay() {
let mut repo_index = HashMap::new();
for i in 1..=3 {
let mut relays = HashSet::new();
relays.insert("wss://relay1.com".to_string());
repo_index.insert(
format!("repo{}", i),
ModRepoSyncNeeds {
relays,
root_events: HashSet::new(),
},
);
}
let targets = derive_relay_targets(&repo_index);
assert_eq!(targets.len(), 1);
let relay_needs = targets.get("wss://relay1.com").unwrap();
assert_eq!(relay_needs.repos.len(), 3);
}
#[test]
fn test_derive_relay_targets_repo_across_multiple_relays() {
let mut repo_index = HashMap::new();
let mut relays = HashSet::new();
relays.insert("wss://relay1.com".to_string());
relays.insert("wss://relay2.com".to_string());
repo_index.insert(
"repo1".to_string(),
ModRepoSyncNeeds {
relays,
root_events: HashSet::new(),
},
);
let targets = derive_relay_targets(&repo_index);
assert_eq!(targets.len(), 2);
assert!(targets
.get("wss://relay1.com")
.unwrap()
.repos
.contains("repo1"));
assert!(targets
.get("wss://relay2.com")
.unwrap()
.repos
.contains("repo1"));
}
#[test]
fn test_derive_relay_targets_combines_root_events() {
let mut repo_index = HashMap::new();
// Repo1 has one root event
let mut relays1 = HashSet::new();
relays1.insert("wss://relay1.com".to_string());
let mut root_events1 = HashSet::new();
root_events1.insert(EventId::all_zeros());
repo_index.insert(
"repo1".to_string(),
ModRepoSyncNeeds {
relays: relays1,
root_events: root_events1,
},
);
// Repo2 also points to same relay but should have same event combined
let mut relays2 = HashSet::new();
relays2.insert("wss://relay1.com".to_string());
let mut root_events2 = HashSet::new();
root_events2.insert(EventId::all_zeros()); // Same event
repo_index.insert(
"repo2".to_string(),
ModRepoSyncNeeds {
relays: relays2,
root_events: root_events2,
},
);
let targets = derive_relay_targets(&repo_index);
assert_eq!(targets.len(), 1);
let relay_needs = targets.get("wss://relay1.com").unwrap();
assert_eq!(relay_needs.repos.len(), 2);
// Root events should be deduplicated
assert_eq!(relay_needs.root_events.len(), 1);
}
// =========================================================================
// compute_actions tests
// =========================================================================
#[test]
fn test_compute_actions_empty() {
let targets = HashMap::new();
let pending = HashMap::new();
let confirmed = HashMap::new();
let actions = compute_actions(&targets, &pending, &confirmed);
assert!(actions.is_empty());
}
#[test]
fn test_compute_actions_skips_disconnected() {
let mut targets = HashMap::new();
targets.insert(
"wss://relay1.com".to_string(),
RelaySyncNeeds {
repos: vec!["repo1".to_string()].into_iter().collect(),
root_events: HashSet::new(),
},
);
let pending = HashMap::new();
let mut confirmed = HashMap::new();
confirmed.insert(
"wss://relay1.com".to_string(),
RelayState {
repos: HashSet::new(),
root_events: HashSet::new(),
is_bootstrap: false,
connection_status: ConnectionStatus::Disconnected,
last_connected: None,
disconnected_at: None,
},
);
let actions = compute_actions(&targets, &pending, &confirmed);
assert!(actions.is_empty(), "Should skip disconnected relays");
}
#[test]
fn test_compute_actions_new_repo() {
let mut targets = HashMap::new();
targets.insert(
"wss://relay1.com".to_string(),
RelaySyncNeeds {
repos: vec!["repo1".to_string()].into_iter().collect(),
root_events: HashSet::new(),
},
);
let pending = HashMap::new();
let confirmed = HashMap::new();
let actions = compute_actions(&targets, &pending, &confirmed);
assert_eq!(actions.len(), 1);
let action = &actions[0];
assert_eq!(action.relay_url, "wss://relay1.com");
assert!(action.repos.contains("repo1"));
assert!(!action.filters.is_empty());
}
#[test]
fn test_compute_actions_excludes_pending() {
let mut targets = HashMap::new();
targets.insert(
"wss://relay1.com".to_string(),
RelaySyncNeeds {
repos: vec!["repo1".to_string()].into_iter().collect(),
root_events: HashSet::new(),
},
);
let mut pending = HashMap::new();
pending.insert(
"wss://relay1.com".to_string(),
vec![super::super::PendingBatch {
batch_id: 1,
items: super::super::PendingItems {
repos: vec!["repo1".to_string()].into_iter().collect(),
root_events: HashSet::new(),
},
outstanding_subs: HashSet::new(),
}],
);
let confirmed = HashMap::new();
let actions = compute_actions(&targets, &pending, &confirmed);
assert!(
actions.is_empty(),
"Should not create action for pending items"
);
}
#[test]
fn test_compute_actions_excludes_confirmed() {
let mut targets = HashMap::new();
targets.insert(
"wss://relay1.com".to_string(),
RelaySyncNeeds {
repos: vec!["repo1".to_string()].into_iter().collect(),
root_events: HashSet::new(),
},
);
let pending = HashMap::new();
let mut confirmed = HashMap::new();
confirmed.insert(
"wss://relay1.com".to_string(),
RelayState {
repos: vec!["repo1".to_string()].into_iter().collect(),
root_events: HashSet::new(),
is_bootstrap: false,
connection_status: ConnectionStatus::Connected,
last_connected: None,
disconnected_at: None,
},
);
let actions = compute_actions(&targets, &pending, &confirmed);
assert!(
actions.is_empty(),
"Should not create action for confirmed items"
);
}
#[test]
fn test_compute_actions_allows_connecting_relays() {
let mut targets = HashMap::new();
targets.insert(
"wss://relay1.com".to_string(),
RelaySyncNeeds {
repos: vec!["repo1".to_string()].into_iter().collect(),
root_events: HashSet::new(),
},
);
let pending = HashMap::new();
let mut confirmed = HashMap::new();
confirmed.insert(
"wss://relay1.com".to_string(),
RelayState {
repos: HashSet::new(),
root_events: HashSet::new(),
is_bootstrap: false,
connection_status: ConnectionStatus::Connecting,
last_connected: None,
disconnected_at: None,
},
);
let actions = compute_actions(&targets, &pending, &confirmed);
assert_eq!(
actions.len(),
1,
"Should create action for connecting relays"
);
}
#[test]
fn test_compute_actions_partial_overlap() {
// Target has repo1, repo2, repo3
let mut targets = HashMap::new();
targets.insert(
"wss://relay1.com".to_string(),
RelaySyncNeeds {
repos: vec![
"repo1".to_string(),
"repo2".to_string(),
"repo3".to_string(),
]
.into_iter()
.collect(),
root_events: HashSet::new(),
},
);
// repo1 is pending
let mut pending = HashMap::new();
pending.insert(
"wss://relay1.com".to_string(),
vec![super::super::PendingBatch {
batch_id: 1,
items: super::super::PendingItems {
repos: vec!["repo1".to_string()].into_iter().collect(),
root_events: HashSet::new(),
},
outstanding_subs: HashSet::new(),
}],
);
// repo2 is confirmed
let mut confirmed = HashMap::new();
confirmed.insert(
"wss://relay1.com".to_string(),
RelayState {
repos: vec!["repo2".to_string()].into_iter().collect(),
root_events: HashSet::new(),
is_bootstrap: false,
connection_status: ConnectionStatus::Connected,
last_connected: None,
disconnected_at: None,
},
);
let actions = compute_actions(&targets, &pending, &confirmed);
assert_eq!(actions.len(), 1);
let action = &actions[0];
// Only repo3 should be in the action (repo1 pending, repo2 confirmed)
assert_eq!(action.repos.len(), 1);
assert!(action.repos.contains("repo3"));
assert!(!action.repos.contains("repo1"));
assert!(!action.repos.contains("repo2"));
}
#[test]
fn test_compute_actions_with_root_events() {
let event_id = EventId::all_zeros();
let mut targets = HashMap::new();
targets.insert(
"wss://relay1.com".to_string(),
RelaySyncNeeds {
repos: HashSet::new(),
root_events: vec![event_id].into_iter().collect(),
},
);
let pending = HashMap::new();
let confirmed = HashMap::new();
let actions = compute_actions(&targets, &pending, &confirmed);
assert_eq!(actions.len(), 1);
let action = &actions[0];
assert!(action.repos.is_empty());
assert_eq!(action.root_events.len(), 1);
assert!(action.root_events.contains(&event_id));
// Should have 3 filters for the root event (e, E, q tags)
assert_eq!(action.filters.len(), 3);
}
#[test]
fn test_compute_actions_unknown_relay_creates_action() {
// When a relay is not in confirmed at all, it should still create an action
// (it's treated as connected by default if missing from confirmed)
let mut targets = HashMap::new();
targets.insert(
"wss://new-relay.com".to_string(),
RelaySyncNeeds {
repos: vec!["repo1".to_string()].into_iter().collect(),
root_events: HashSet::new(),
},
);
let pending = HashMap::new();
let confirmed = HashMap::new(); // relay not in confirmed
let actions = compute_actions(&targets, &pending, &confirmed);
assert_eq!(
actions.len(),
1,
"Should create action for unknown relay (not yet tracked)"
);
assert_eq!(actions[0].relay_url, "wss://new-relay.com");
}
}
|