OXYGENHUB
# e5acd2a2ceb5 oxygenhub / crates / hub / src / diffusion.rs
17.7 KiB · Rust · last changed Diffusion: the bump 24 days ago source blame history raw
f677d627 Andy McCall ↶ 1
//! Diffusion (#148, docs/diffusion.md): an upstream's changes reach the
2
//! repositories that pin it as a subrepo.
3
//!
4
//! D1 starts with the reverse pin index (§4.1): when a push moves a
5
//! repository's default bookmark, or the bookmark its work lands on, each
6
//! Oxygen subrepo pin in the new state is recorded. That answers "who
7
//! consumes this repository, at which state, and how far behind", which
8
//! an upstream's page shows as Used by.
9
10
use crate::auth::roles;
11
use crate::db::{self, accounts::Account, repos::RepoRow, Pool};
12
use crate::repos::RepoName;
13
use crate::Shared;
14
use oxy_core::hash::ChangeHash;
15
use serde::Serialize;
16
17
/// How far back landed proposals teach where a repository's work lands.
18
pub const LEARN_DAYS: i64 = 90;
19
20
/// The bookmark a repository's work lands on (§4.3): the most common
21
/// target of its proposals landed in the last `LEARN_DAYS`, else its
22
/// default bookmark.
23
pub async fn target(pool: &Pool, row: &RepoRow) -> String {
24
    let since = db::now_ms() - LEARN_DAYS * 24 * 3600 * 1000;
25
    let learned: Option<String> = sqlx::query_scalar(
26
        "SELECT target FROM proposals WHERE repo_id = ? AND state = 'landed' AND landed_ms >= ?
27
         GROUP BY target ORDER BY COUNT(*) DESC, MAX(landed_ms) DESC LIMIT 1",
28
    )
29
    .bind(row.id)
30
    .bind(since)
31
    .fetch_optional(pool)
32
    .await
33
    .ok()
34
    .flatten();
35
    learned.filter(|t| !t.is_empty()).unwrap_or_else(|| row.default_bookmark.clone())
36
}
37
38
/// The bookmarks whose pins are indexed: the default and the learned
39
/// target (one when they are the same).
40
pub async fn followed_bookmarks(pool: &Pool, row: &RepoRow) -> Vec<String> {
41
    let mut out = vec![row.default_bookmark.clone()];
42
    let t = target(pool, row).await;
43
    if !out.contains(&t) {
44
        out.push(t);
45
    }
46
    out
47
}
48
49
/// Record `row`'s pins on `bookmark` at `heads`, replacing what was there.
50
pub async fn record(app: &Shared, row: &RepoRow, bookmark: &str, heads: &[ChangeHash]) {
51
    let Some(name) = RepoName::new(&row.owner, &row.name) else { return };
52
    let pins = if heads.is_empty() { Vec::new() } else { crate::flow::pins_in(app, name, heads.to_vec()).await };
53
    let now = db::now_ms();
54
    let Ok(mut tx) = app.db.begin().await else { return };
55
    let mut ok = sqlx::query("DELETE FROM diffusion_pins WHERE consumer_id = ? AND bookmark = ?")
56
        .bind(row.id)
57
        .bind(bookmark)
58
        .execute(&mut *tx)
59
        .await
60
        .is_ok();
61
    for (path, id, pinned) in &pins {
62
        let heads: Vec<String> = pinned.iter().map(|h| h.to_hex()).collect();
63
        ok &=
64
            sqlx::query("INSERT INTO diffusion_pins (consumer_id, bookmark, path, upstream, heads, updated_ms) VALUES (?, ?, ?, ?, ?, ?)")
65
                .bind(row.id)
66
                .bind(bookmark)
67
                .bind(path)
68
                .bind(hex::encode(id))
69
                .bind(heads.join("+"))
70
                .bind(now)
71
                .execute(&mut *tx)
72
                .await
73
                .is_ok();
74
    }
75
    if ok {
76
        tx.commit().await.ok();
77
    }
78
}
79
80
/// After a push: index the pins of each moved bookmark that is followed.
81
pub async fn after_push(app: &Shared, row: &RepoRow, moved: &[(String, String, Vec<ChangeHash>)]) {
82
    let followed = followed_bookmarks(&app.db, row).await;
83
    for (bookmark, _, heads) in moved {
84
        if followed.contains(bookmark) {
85
            record(app, row, bookmark, heads).await;
86
        }
87
    }
88
}
89
90
/// Index every repository's followed bookmarks, for a hub that had no
91
/// index before (run once at start, in the background).
92
pub async fn backfill(app: &Shared) {
93
    let Ok(rows) = db::repos::list(&app.db).await else { return };
94
    for row in rows {
95
        let Some(name) = RepoName::new(&row.owner, &row.name) else { continue };
96
        for bookmark in followed_bookmarks(&app.db, &row).await {
97
            let b = bookmark.clone();
98
            let heads = app.repos.read(&name, move |r, _| heads_of(r, &b)).await;
99
            if let Ok(heads) = heads {
100
                record(app, &row, &bookmark, &heads).await;
101
            }
102
        }
103
    }
104
}
105
106
/// A bookmark's heads as the repository has them now (not a cached
107
/// list, which a push refreshes a moment later); empty when it has none.
108
fn heads_of(r: &oxy_core::repo::Repo, bookmark: &str) -> Result<Vec<ChangeHash>, crate::repos::RepoError> {
109
    Ok(r.bookmarks()?.into_iter().find(|b| b.name == bookmark).map(|b| b.heads).unwrap_or_default())
110
}
111
112
/// One consumer of an upstream, as an upstream's page and API show it.
113
#[derive(Clone, Debug, Serialize)]
114
pub struct Consumer {
115
    pub owner: String,
116
    pub name: String,
117
    pub bookmark: String,
118
    pub path: String,
119
    /// The upstream heads it pins, hex.
120
    pub pinned: Vec<String>,
121
    /// Upstream changes on its default bookmark the pin lacks; `None` when
122
    /// the hub cannot tell (the pinned changes are not in the upstream).
123
    pub behind: Option<usize>,
124
}
125
126
/// The consumers of `row` that `account` may read, with how far behind
127
/// the upstream's default bookmark each pin is.
128
pub async fn consumers(app: &Shared, row: &RepoRow, account: Option<&Account>) -> Result<Vec<Consumer>, crate::repos::RepoError> {
129
    let Some(name) = RepoName::new(&row.owner, &row.name) else { return Ok(Vec::new()) };
130
    let id = app.repos.read(&name, |r, _| Ok(r.id()?)).await?;
131
    let found: Vec<(i64, String, String, String)> = sqlx::query_as(
132
        "SELECT consumer_id, bookmark, path, heads FROM diffusion_pins WHERE upstream = ? ORDER BY consumer_id, bookmark, path",
133
    )
134
    .bind(hex::encode(id))
135
    .fetch_all(&app.db)
136
    .await
137
    .map_err(|e| crate::repos::RepoError::Io(std::io::Error::other(e)))?;
138
    let mut out = Vec::new();
139
    let mut pinned_sets = Vec::new();
140
    for (consumer_id, bookmark, path, heads) in found {
141
        let Ok(Some(c)) = db::repos::get_by_id(&app.db, consumer_id).await else { continue };
142
        if !roles::allows(roles::role_for(&app.db, account, &c).await.ok().flatten(), crate::auth::Access::Read) {
143
            continue;
144
        }
145
        let pinned: Vec<String> = heads.split('+').filter(|h| !h.is_empty()).map(String::from).collect();
146
        pinned_sets.push(pinned.iter().filter_map(|h| ChangeHash::from_hex(h)).collect::<Vec<_>>());
147
        out.push(Consumer { owner: c.owner, name: c.name, bookmark, path, pinned, behind: None });
148
    }
149
    if out.is_empty() {
150
        return Ok(out);
151
    }
152
    let default = row.default_bookmark.clone();
153
    let behind = app
154
        .repos
155
        .read(&name, move |r, cache| {
156
            let tip = heads_of(r, &default)?;
157
            let tip = cache.summary(r, &tip)?;
158
            Ok(pinned_sets
159
                .iter()
160
                .map(|p| cache.summary(r, p).ok().map(|s| tip.changes.iter().filter(|c| !s.changes.contains(*c)).count()))
161
                .collect::<Vec<_>>())
162
        })
163
        .await?;
164
    for (c, b) in out.iter_mut().zip(behind) {
165
        c.behind = b;
166
    }
167
    Ok(out)
168
}
e7158350 Andy McCall ↶ 169
1d634f69 Andy McCall ↶ 170
/// The bookmark a consumer's bump for the subrepo at `path` lives on.
171
pub fn bump_bookmark(path: &str) -> String {
172
    format!("diffusion/{}", path.trim_matches('/'))
173
}
174
175
/// What a bump did.
176
#[derive(Clone, Debug, PartialEq, Eq)]
177
pub enum Bumped {
178
    /// The bump bookmark now holds the target plus one change moving the pin.
179
    Moved { bookmark: String, change: ChangeHash, heads: Vec<ChangeHash> },
180
    /// The pin already holds the upstream state.
181
    UpToDate,
182
    /// The bump bookmark already moves the pin to that state.
183
    Already,
184
    /// The upstream state does not hold everything the pin does (upstream
185
    /// moved backwards or was rewritten): consumers only move forward.
186
    Backwards,
187
    /// The consumer has no Oxygen pin of that upstream at `path` on its
188
    /// target bookmark.
189
    NoPin,
190
}
191
192
/// How the upstream's state `new` relates to a consumer's pin `old`, read
193
/// in the upstream: `Some(n)` new changes when `new` holds all of `old`
194
/// and more, `Some(0)` when it adds nothing, `None` when it lacks some.
195
pub async fn ahead_of(
196
    app: &Shared,
197
    upstream: &RepoName,
198
    old: Vec<ChangeHash>,
199
    new: Vec<ChangeHash>,
200
) -> Result<Option<usize>, crate::repos::RepoError> {
201
    app.repos
202
        .read(upstream, move |r, cache| {
203
            let (o, n) = (cache.summary(r, &old)?, cache.summary(r, &new)?);
204
            if !o.changes.iter().all(|c| n.changes.contains(c)) {
205
                return Ok(None);
206
            }
207
            Ok(Some(n.changes.len() - o.changes.len()))
208
        })
209
        .await
210
}
211
212
/// Move `consumer`'s pin of `upstream` at `path` to `new_heads`, on a bump
213
/// bookmark built from `target` (§4.3): one change, signed with the hub's
214
/// key, on the target's heads. The upstream decides forwardness.
215
pub async fn bump(
216
    app: &Shared,
217
    consumer: &RepoRow,
218
    target: &str,
219
    path: &str,
220
    upstream: &RepoRow,
221
    new_heads: Vec<ChangeHash>,
222
) -> Result<Bumped, crate::repos::RepoError> {
223
    use oxy_core::identity::Domain;
224
    use oxy_core::subrepo::Pin;
225
    let (Some(cname), Some(uname)) = (RepoName::new(&consumer.owner, &consumer.name), RepoName::new(&upstream.owner, &upstream.name))
226
    else {
227
        return Ok(Bumped::NoPin);
228
    };
229
    let upstream_id = app.repos.read(&uname, |r, _| Ok(r.id()?)).await?;
230
    // The consumer's current pin at `path` on its target, and on its bump
231
    // bookmark if it has one.
232
    let (t, p) = (target.to_string(), path.trim_matches('/').to_string());
233
    let (current, bumped) = app
234
        .repos
235
        .read(&cname, move |r, cache| {
236
            let pin_on = |bookmark: &str| -> Result<Option<Pin>, crate::repos::RepoError> {
237
                let heads = heads_of(r, bookmark)?;
238
                if heads.is_empty() {
239
                    return Ok(None);
240
                }
241
                let loaded = cache.load(r, &heads)?;
242
                let Some(f) = loaded.snapshot.files.get(&p) else { return Ok(None) };
243
                let oxy_core::state::FileContent::Opaque { blobs } = &f.content else { return Ok(None) };
244
                let Some(b) = blobs.first() else { return Ok(None) };
245
                Ok(Pin::decode(&r.read_blob(b)?).ok())
246
            };
247
            Ok((pin_on(&t)?, pin_on(&bump_bookmark(&p))?))
248
        })
249
        .await?;
250
    let Some(Pin::Oxy { repo, heads: old, bookmark }) = current else { return Ok(Bumped::NoPin) };
251
    if let Some(Pin::Oxy { heads: b, .. }) = &bumped {
252
        let (mut b, mut n) = (b.clone(), new_heads.clone());
253
        b.sort();
254
        n.sort();
255
        if b == n {
256
            return Ok(Bumped::Already);
257
        }
258
    }
259
    if repo != upstream_id {
260
        return Ok(Bumped::NoPin);
261
    }
262
    match ahead_of(app, &uname, old.clone(), new_heads.clone()).await? {
263
        None => return Ok(Bumped::Backwards),
264
        Some(0) => return Ok(Bumped::UpToDate),
265
        Some(_) => {}
266
    }
267
    let (key, secret) =
268
        crate::keys::load_secret(&app.config.keys_dir()).map_err(|e| crate::repos::RepoError::Io(std::io::Error::other(e.to_string())))?;
269
    let identity = app.hub_key.identity.clone();
270
    let upstream_label = format!("{}/{}", upstream.owner, upstream.name);
271
    let (t, p) = (target.to_string(), path.trim_matches('/').to_string());
272
    let pin = Pin::Oxy { repo, heads: new_heads.clone(), bookmark };
273
    let short: Vec<String> = new_heads.iter().map(|h| h.to_hex()[..12].to_string()).collect();
274
    let message = format!("Diffusion: move {p} to {upstream_label} {}", short.join("+"));
275
    app.repos
276
        .write(&cname, move |r, _| {
277
            let base = heads_of(r, &t)?;
278
            let change = r.build_pin_change(&base, &p, &pin, &message, key)?;
279
            let hash = change.hash();
280
            let sig = secret.sign(Domain::Change, &key, &hash);
281
            let mut state = r.load_state(&base)?;
282
            state.add(change.clone()).map_err(|e| crate::repos::RepoError::Oxy(oxy_core::repo::RepoError::Msg(e.to_string())))?;
283
            let mut candidates = base.clone();
284
            candidates.push(hash);
285
            let heads = state.maximal(&candidates);
286
            let bookmark = bump_bookmark(&p);
287
            // The bump bookmark is the hub's own and is rebuilt on the
288
            // target each time, so the bump it replaces may go.
289
            let mut update = r.host_ref_update(&bookmark, &heads, Some((&key, &secret)))?;
290
            update.force = true;
291
            let report = r.apply_hosted(Some((change, vec![sig])), &[identity], update)?;
292
            if let Some(refused) = report.results.iter().find(|x| !x.ok) {
293
                return Err(crate::repos::RepoError::Oxy(oxy_core::repo::RepoError::Msg(format!(
294
                    "the bump was refused: {}",
295
                    refused.reason
296
                ))));
297
            }
298
            Ok(Bumped::Moved { bookmark, change: hash, heads })
299
        })
300
        .await
301
}
302
e7158350 Andy McCall ↶ 303
/// When a consumer takes an upstream's moves (§4.2).
304
#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize)]
305
#[serde(rename_all = "lowercase")]
306
pub enum Follow {
307
    Off,
308
    /// When the upstream state's checks pass.
309
    Green,
310
    /// On every move.
311
    Any,
312
}
313
314
impl Follow {
315
    pub fn parse(s: &str) -> Option<Follow> {
316
        match s.trim() {
317
            "off" => Some(Follow::Off),
318
            "green" => Some(Follow::Green),
319
            "any" => Some(Follow::Any),
320
            _ => None,
321
        }
322
    }
323
}
324
325
/// How one consumer follows one subrepo, from its `.oxymodules` entry, its
326
/// repository setting and the site's default, in that order.
327
#[derive(Clone, Debug, PartialEq, Eq, Serialize)]
328
pub struct Rule {
329
    pub follow: Follow,
330
    /// Land a green bump itself (D5); D1 only proposes.
331
    pub land_auto: bool,
332
    /// The bookmark to bump, when `.oxymodules` names one (else learned).
333
    pub target: Option<String>,
334
    /// Paths the consumer watches: upstream changes touching them are
335
    /// flagged in a bump's changelog.
336
    pub watch: Vec<String>,
337
    /// Where `follow` came from: `.oxymodules`, `setting` or `site`.
338
    pub from: &'static str,
339
}
340
341
/// The Diffusion keys of `path`'s entry in `.oxymodules` text: `follow`,
342
/// `land`, `target` and `watch` (comma-separated, or a TOML list).
343
pub fn module_keys(text: &str, path: &str) -> (Option<Follow>, Option<bool>, Option<String>, Vec<String>) {
344
    let (mut follow, mut land, mut target, mut watch) = (None, None, None, Vec::new());
345
    let mut here = false;
346
    for line in text.lines() {
347
        let line = line.trim();
348
        if line.is_empty() || line.starts_with('#') {
349
            continue;
350
        }
351
        if let Some(inner) = line.strip_prefix('[').and_then(|l| l.strip_suffix(']')) {
352
            here = inner.trim().trim_matches('"').trim_end_matches('/') == path.trim_end_matches('/');
353
            continue;
354
        }
355
        let (true, Some((k, v))) = (here, line.split_once('=')) else { continue };
356
        let v = v.trim();
357
        let unquoted = v.trim_matches('"').trim();
358
        match k.trim() {
359
            "follow" => follow = Follow::parse(unquoted),
360
            "land" => land = Some(unquoted == "auto"),
361
            "target" if !unquoted.is_empty() => target = Some(unquoted.to_string()),
362
            "watch" => {
363
                watch = v
364
                    .trim_start_matches('[')
365
                    .trim_end_matches(']')
366
                    .split(',')
367
                    .map(|w| w.trim().trim_matches('"').trim().to_string())
368
                    .filter(|w| !w.is_empty())
369
                    .collect()
370
            }
371
            _ => {}
372
        }
373
    }
374
    (follow, land, target, watch)
375
}
376
377
/// How `row` follows its subrepo at `path`, given its `.oxymodules` text.
378
pub fn rule(site_default: &str, row: &RepoRow, oxymodules: Option<&str>, path: &str) -> Rule {
379
    let (follow, land, target, watch) = oxymodules.map(|t| module_keys(t, path)).unwrap_or_default();
380
    let (follow, from) = match follow {
381
        Some(f) => (f, ".oxymodules"),
382
        None => match Follow::parse(&row.diffusion) {
383
            Some(f) => (f, "setting"),
384
            None => (Follow::parse(site_default).unwrap_or(Follow::Off), "site"),
385
        },
386
    };
387
    Rule { follow, land_auto: land.unwrap_or(false), target, watch, from }
388
}
389
390
#[cfg(test)]
391
mod tests {
392
    use super::*;
393
394
    const MODULES: &str = r#"
395
[rstar-api]
396
url = https://oxygenhub.io/doomsdayone/rstar-api
397
follow = green
398
land = "propose"
399
target = develop
400
watch = ["src/x16/irq*", "src/x16/frame*"]
401
402
[other]
403
url = https://example/other
404
follow = any
405
"#;
406
407
    fn row(diffusion: &str) -> RepoRow {
408
        RepoRow {
409
            id: 1,
410
            owner: "o".into(),
411
            name: "n".into(),
412
            description: String::new(),
413
            default_bookmark: "main".into(),
414
            visibility: "public".into(),
415
            created_ms: 0,
416
            updated_ms: 0,
417
            git_mirror: false,
418
            git_mirror_state: String::new(),
419
            forked_from: None,
420
            topics: String::new(),
421
            flow: String::new(),
422
            diffusion: diffusion.into(),
423
            ..Default::default()
424
        }
425
    }
426
427
    #[test]
428
    fn oxymodules_keys_are_read_per_entry() {
429
        let (f, land, target, watch) = module_keys(MODULES, "rstar-api");
430
        assert_eq!((f, land, target.as_deref()), (Some(Follow::Green), Some(false), Some("develop")));
431
        assert_eq!(watch, vec!["src/x16/irq*", "src/x16/frame*"]);
432
        assert_eq!(module_keys(MODULES, "other").0, Some(Follow::Any));
433
        assert_eq!(module_keys(MODULES, "missing"), (None, None, None, vec![]));
434
        assert_eq!(module_keys("[a]\nwatch = x, y\n", "a").3, vec!["x", "y"]);
435
    }
436
437
    #[test]
438
    fn oxymodules_wins_then_the_setting_then_the_site() {
439
        let r = rule("off", &row("any"), Some(MODULES), "rstar-api");
440
        assert_eq!((r.follow, r.from), (Follow::Green, ".oxymodules"));
441
        let r = rule("off", &row("any"), Some("[rstar-api]\nurl = x\n"), "rstar-api");
442
        assert_eq!((r.follow, r.from), (Follow::Any, "setting"));
443
        let r = rule("green", &row(""), None, "rstar-api");
444
        assert_eq!((r.follow, r.from), (Follow::Green, "site"));
445
        assert_eq!(rule("nonsense", &row(""), None, "x").follow, Follow::Off);
446
    }
447
}