Skip to content

Reason Network: your team's coding agents, talking to each other. The engine behind `reason network`.

ulid 3 (#84)

Lars Talian3e08ce1d4e53
diff --git a/Cargo.lock b/Cargo.lock
index f68b65c..1aa9bf6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -302,7 +302,7 @@ checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06"
dependencies = [
"cfg-if",
"cpufeatures 0.3.1",
- "rand_core 0.10.1",
+ "rand_core",
]
[[package]]
@@ -536,7 +536,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453"
dependencies = [
"hybrid-array",
- "rand_core 0.10.1",
+ "rand_core",
]
[[package]]
@@ -568,7 +568,7 @@ dependencies = [
"curve25519-dalek-derive",
"digest",
"fiat-crypto",
- "rand_core 0.10.1",
+ "rand_core",
"rustc_version",
"serde",
"subtle",
@@ -773,7 +773,7 @@ checksum = "6ebaa1a2bf1290ab3bfe5a7b771d050ebffab2711c19a81691c683a5144a25de"
dependencies = [
"curve25519-dalek",
"ed25519",
- "rand_core 0.10.1",
+ "rand_core",
"serde",
"sha2",
"signature",
@@ -1049,18 +1049,6 @@ dependencies = [
"wasm-bindgen",
]
-[[package]]
-name = "getrandom"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
-dependencies = [
- "cfg-if",
- "libc",
- "r-efi 5.3.0",
- "wasip2",
-]
-
[[package]]
name = "getrandom"
version = "0.4.3"
@@ -1070,8 +1058,8 @@ dependencies = [
"cfg-if",
"js-sys",
"libc",
- "r-efi 6.0.0",
- "rand_core 0.10.1",
+ "r-efi",
+ "rand_core",
"wasm-bindgen",
]
@@ -1151,7 +1139,7 @@ dependencies = [
"ipnet",
"jni 0.22.4",
"once_cell",
- "rand 0.10.3",
+ "rand",
"thiserror 2.0.21",
"tinyvec",
"tracing",
@@ -1472,7 +1460,7 @@ dependencies = [
"hyper",
"hyper-util",
"log",
- "rand 0.10.3",
+ "rand",
"tokio",
"url",
"xmltree",
@@ -1564,7 +1552,7 @@ dependencies = [
"pin-project",
"portable-atomic",
"portmapper",
- "rand 0.10.3",
+ "rand",
"reqwest",
"rustc-hash",
"rustls",
@@ -1594,7 +1582,7 @@ dependencies = [
"ed25519-dalek",
"getrandom 0.4.3",
"n0-error",
- "rand 0.10.3",
+ "rand",
"serde",
"url",
"zeroize",
@@ -1614,7 +1602,7 @@ dependencies = [
"n0-error",
"n0-future",
"portable-atomic",
- "rand 0.10.3",
+ "rand",
"rustls",
"simple-dns",
"strum",
@@ -1697,7 +1685,7 @@ dependencies = [
"num_enum",
"pin-project",
"postcard",
- "rand 0.10.3",
+ "rand",
"reqwest",
"rustls",
"rustls-pki-types",
@@ -1976,7 +1964,7 @@ dependencies = [
"n0-error",
"n0-future",
"ndk-context",
- "rand 0.10.3",
+ "rand",
"reqwest",
"rustc-hash",
"rustls",
@@ -2250,7 +2238,7 @@ dependencies = [
"getrandom 0.4.3",
"identity-hash",
"lru-slab",
- "rand 0.10.3",
+ "rand",
"rand_pcg",
"ring",
"rustc-hash",
@@ -2645,7 +2633,7 @@ dependencies = [
"n0-future",
"netwatch",
"num_enum",
- "rand 0.10.3",
+ "rand",
"serde",
"smallvec",
"socket2",
@@ -2698,15 +2686,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a6394b9e965e73d0a289ee54f589087e2c676aedf60885baf52c76b771e4958"
-[[package]]
-name = "ppv-lite86"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
-dependencies = [
- "zerocopy",
-]
-
[[package]]
name = "proc-macro-crate"
version = "3.5.0"
@@ -2743,28 +2722,12 @@ dependencies = [
"proc-macro2",
]
-[[package]]
-name = "r-efi"
-version = "5.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
-
[[package]]
name = "r-efi"
version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
-[[package]]
-name = "rand"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41"
-dependencies = [
- "rand_chacha",
- "rand_core 0.9.5",
-]
-
[[package]]
name = "rand"
version = "0.10.3"
@@ -2773,26 +2736,7 @@ checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af"
dependencies = [
"chacha20",
"getrandom 0.4.3",
- "rand_core 0.10.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.9.5",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
-dependencies = [
- "getrandom 0.3.4",
+ "rand_core",
]
[[package]]
@@ -2807,7 +2751,7 @@ version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a"
dependencies = [
- "rand_core 0.10.1",
+ "rand_core",
]
[[package]]
@@ -3322,7 +3266,7 @@ version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28d567dcbaf0049cb8ac2608a76cd95ff9e4412e1899d389ee400918ca7537f5"
dependencies = [
- "rand_core 0.10.1",
+ "rand_core",
]
[[package]]
@@ -3470,7 +3414,7 @@ checksum = "02d5d53c7843e046d7dddcf13254388f432306bbc538cd0029224e2eb6817477"
dependencies = [
"acto",
"hickory-proto",
- "rand 0.10.3",
+ "rand",
"socket2",
"thiserror 2.0.21",
"tokio",
@@ -3726,7 +3670,7 @@ dependencies = [
"getrandom 0.4.3",
"http",
"httparse",
- "rand 0.10.3",
+ "rand",
"ring",
"rustls-pki-types",
"sha1_smol",
@@ -3928,11 +3872,11 @@ checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
[[package]]
name = "ulid"
-version = "1.2.1"
+version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "470dbf6591da1b39d43c14523b2b469c86879a53e8b758c8e090a470fe7b1fbe"
+checksum = "947dde63b6d514cc5e044edad4e0ca7261afd1099d16c83d942cb2b2f348689c"
dependencies = [
- "rand 0.9.5",
+ "rand",
"web-time",
]
@@ -4061,15 +4005,6 @@ version = "0.11.1+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
-[[package]]
-name = "wasip2"
-version = "1.0.4+wasi-0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
-dependencies = [
- "wit-bindgen",
-]
-
[[package]]
name = "wasm-bindgen"
version = "0.2.129"
@@ -4492,12 +4427,6 @@ dependencies = [
"memchr",
]
-[[package]]
-name = "wit-bindgen"
-version = "0.57.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
-
[[package]]
name = "wmi"
version = "0.18.4"
diff --git a/Cargo.toml b/Cargo.toml
index efd433b..31ded79 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,7 +31,7 @@ serde_json = { version = "1", features = ["preserve_order"] }
tokio = { version = "1", features = ["full"] }
toml = "1.1"
toml_edit = "0.25"
-ulid = "1"
+ulid = "3"
[target.'cfg(unix)'.dependencies]
libc = "0.2"
diff --git a/src/config.rs b/src/config.rs
index 2468255..22001ff 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -309,7 +309,7 @@ mod tests {
}
fn temp() -> std::path::PathBuf {
- let d = std::env::temp_dir().join(format!("reason-network-folders-{}", ulid::Ulid::new()));
+ let d = std::env::temp_dir().join(format!("reason-network-folders-{}", ulid::Ulid::generate()));
std::fs::create_dir_all(d.join("real").join("personal").join("sub")).unwrap();
std::fs::create_dir_all(d.join("x")).unwrap();
d
diff --git a/src/daemon/ask.rs b/src/daemon/ask.rs
index 3496a7d..14fab89 100644
--- a/src/daemon/ask.rs
+++ b/src/daemon/ask.rs
@@ -241,7 +241,7 @@ impl Daemon {
return log(&format!("{key} had gone before {} answered its question", self.person));
};
let mut msg = Message {
- id: Ulid::new().to_string(),
+ id: Ulid::generate().to_string(),
from: format!("{}/terminal", self.person),
from_agent: None,
from_repo: None,
diff --git a/src/daemon/mail.rs b/src/daemon/mail.rs
index 79df3d8..659e41a 100644
--- a/src/daemon/mail.rs
+++ b/src/daemon/mail.rs
@@ -135,7 +135,7 @@ impl Daemon {
}
if own {
let msg = Message {
- id: Ulid::new().to_string(),
+ id: Ulid::generate().to_string(),
from: from_addr.clone(),
from_agent: from_agent.clone(),
from_repo: from_repo.clone(),
@@ -170,7 +170,7 @@ impl Daemon {
let targets = if own { Vec::new() } else { self.resolve(&g, &remotes, to, Some(&exclude))? };
for t in targets {
let mut msg = Message {
- id: Ulid::new().to_string(),
+ id: Ulid::generate().to_string(),
from: from_addr.clone(),
from_agent: from_agent.clone(),
from_repo: from_repo.clone(),
@@ -758,7 +758,7 @@ mod tests {
approval: None,
files: Vec::new(),
};
- let id = Ulid::new().to_string();
+ let id = Ulid::generate().to_string();
assert!(clean(msg(&id)).is_ok());
for bad in [id.to_lowercase(), "CON".into(), "01ALICEMSG".into(), format!("{id}0"), String::new()] {
assert!(clean(msg(&bad)).is_err(), "{bad}");
diff --git a/src/daemon/mod.rs b/src/daemon/mod.rs
index 77a3317..4374e7b 100644
--- a/src/daemon/mod.rs
+++ b/src/daemon/mod.rs
@@ -376,7 +376,7 @@ impl Daemon {
/// A daemon on an in-memory store, outside any team, with `cfg`.
#[cfg(test)]
fn test_daemon(cfg: Config) -> Daemon {
- let inbox = std::env::temp_dir().join(format!("reason-network-inbox-{}", ulid::Ulid::new()));
+ let inbox = std::env::temp_dir().join(format!("reason-network-inbox-{}", ulid::Ulid::generate()));
let store = Store::open(std::path::Path::new(":memory:"), inbox).unwrap();
Daemon::with(cfg, store, SecretKey::generate()).unwrap()
}
diff --git a/src/daemon/notify.rs b/src/daemon/notify.rs
index aff3705..92e34ed 100644
--- a/src/daemon/notify.rs
+++ b/src/daemon/notify.rs
@@ -173,7 +173,7 @@ mod tests {
/// A private session bus whose only service directory is `services`, so what the host has installed doesn't count.
fn bus(services: &[&str]) -> Option<(std::process::Child, String, std::path::PathBuf)> {
let daemon = agent::find_bin("dbus-daemon").filter(|_| agent::find_bin("busctl").is_some())?;
- let dir = std::env::temp_dir().join(format!("reason-network-bus-{}", ulid::Ulid::new()));
+ let dir = std::env::temp_dir().join(format!("reason-network-bus-{}", ulid::Ulid::generate()));
std::fs::create_dir_all(dir.join("services")).unwrap();
for name in services {
let service = format!("[D-BUS Service]\nName={name}\nExec=/nonexistent\n");
diff --git a/src/daemon/reason.rs b/src/daemon/reason.rs
index b5d427e..8a1a626 100644
--- a/src/daemon/reason.rs
+++ b/src/daemon/reason.rs
@@ -208,7 +208,7 @@ mod tests {
impl Stub {
fn new(narrow_err: &str, plain_err: Option<&str>) -> Stub {
- let dir = std::env::temp_dir().join(format!("reason-network-reason-{}", ulid::Ulid::new()));
+ let dir = std::env::temp_dir().join(format!("reason-network-reason-{}", ulid::Ulid::generate()));
std::fs::create_dir_all(&dir).unwrap();
let (bin, calls) = (dir.join("reason"), dir.join("calls"));
let plain = match plain_err {
diff --git a/src/files.rs b/src/files.rs
index fbe414b..c4d0295 100644
--- a/src/files.rs
+++ b/src/files.rs
@@ -458,7 +458,7 @@ mod tests {
}
fn temp() -> PathBuf {
- let d = std::env::temp_dir().join(format!("reason-network-files-{}", ulid::Ulid::new()));
+ let d = std::env::temp_dir().join(format!("reason-network-files-{}", ulid::Ulid::generate()));
std::fs::create_dir_all(&d).unwrap();
d
}
@@ -575,7 +575,8 @@ mod tests {
#[test]
fn an_agent_sends_only_from_its_own_folder_everywhere() {
// Not in the temp folder: on Windows that is under %LOCALAPPDATA%, which is out of reach (see `Confine`).
- let d = Path::new(env!("CARGO_MANIFEST_DIR")).join("target").join(format!("files-test-{}", ulid::Ulid::new()));
+ let d =
+ Path::new(env!("CARGO_MANIFEST_DIR")).join("target").join(format!("files-test-{}", ulid::Ulid::generate()));
std::fs::create_dir_all(&d).unwrap();
let (home, repo, state) = (d.join("home"), d.join("home").join("src").join("api"), d.join("state"));
for dir in [repo.join("docs"), repo.join(".github"), home.join(".ssh"), state.clone()] {
@@ -671,7 +672,8 @@ mod tests {
#[test]
fn an_agent_sends_nothing_from_a_folder_that_is_off() {
// Not in the temp folder, which on Windows is out of reach anyway (see the test above).
- let d = Path::new(env!("CARGO_MANIFEST_DIR")).join("target").join(format!("files-test-{}", ulid::Ulid::new()));
+ let d =
+ Path::new(env!("CARGO_MANIFEST_DIR")).join("target").join(format!("files-test-{}", ulid::Ulid::generate()));
let (home, repo, state) = (d.join("home"), d.join("home").join("work"), d.join("state"));
std::fs::create_dir_all(repo.join("private")).unwrap();
std::fs::create_dir_all(&state).unwrap();
diff --git a/src/relays.rs b/src/relays.rs
index 2269f23..c9be0a4 100644
--- a/src/relays.rs
+++ b/src/relays.rs
@@ -164,7 +164,7 @@ async fn refresh_in(home: &Path, url: &str) -> Result<()> {
if std::fs::read(cache(home)).ok().as_deref() == Some(doc.as_slice()) {
return Ok(());
}
- let tmp = home.join(format!("relays.json.{}.tmp", ulid::Ulid::new()));
+ let tmp = home.join(format!("relays.json.{}.tmp", ulid::Ulid::generate()));
std::fs::write(&tmp, &doc)?;
std::fs::rename(&tmp, cache(home))?;
Ok(())
@@ -248,7 +248,7 @@ mod tests {
}
fn home() -> std::path::PathBuf {
- let d = std::env::temp_dir().join(format!("reason-network-relays-{}", ulid::Ulid::new()));
+ let d = std::env::temp_dir().join(format!("reason-network-relays-{}", ulid::Ulid::generate()));
std::fs::create_dir_all(&d).unwrap();
d
}
diff --git a/src/store.rs b/src/store.rs
index d48ffea..4d8f7dc 100644
--- a/src/store.rs
+++ b/src/store.rs
@@ -161,7 +161,7 @@ impl Store {
return Ok(false);
}
let mut kept = (!m.files.is_empty()).then(|| Kept {
- dir: ulid::Ulid::new().to_string(),
+ dir: ulid::Ulid::generate().to_string(),
bytes: files::size(&m.files),
files: m.files.iter().map(|f| Attachment { path: None, ..f.clone() }).collect(),
});
@@ -547,7 +547,7 @@ mod tests {
#[cfg(unix)]
fn the_database_is_this_users_and_keeps_nothing_it_deleted() {
use std::os::unix::fs::PermissionsExt;
- let dir = std::env::temp_dir().join(format!("reason-network-store-{}", ulid::Ulid::new()));
+ let dir = std::env::temp_dir().join(format!("reason-network-store-{}", ulid::Ulid::generate()));
std::fs::create_dir_all(&dir).unwrap();
let db = dir.join("network.db");
// A database made before, with the default mode.
@@ -572,7 +572,7 @@ mod tests {
#[test]
fn messages_are_counted_by_day_for_a_week_and_kept_across_restarts() {
- let dir = std::env::temp_dir().join(format!("reason-network-counts-{}", ulid::Ulid::new()));
+ let dir = std::env::temp_dir().join(format!("reason-network-counts-{}", ulid::Ulid::generate()));
std::fs::create_dir_all(&dir).unwrap();
let db = dir.join("network.db");
let day = 86_400_000;
@@ -715,7 +715,7 @@ mod tests {
}
fn temp_inbox() -> PathBuf {
- std::env::temp_dir().join(format!("reason-network-inbox-{}", ulid::Ulid::new()))
+ std::env::temp_dir().join(format!("reason-network-inbox-{}", ulid::Ulid::generate()))
}
fn file(name: &str, content: &str) -> Attachment {