diff --git a/Cargo.lock b/Cargo.lock index 9356f568..58996cdc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1907,9 +1907,9 @@ dependencies = [ [[package]] name = "iroh" -version = "0.91.0" +version = "0.92.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef05c956df0788a649d65c33fdbbb8fc4442d7716af3d67a1bd6d00a9ee56ead" +checksum = "135ad6b793a5851b9e5435ad36fea63df485f8fd4520a58117e7dc3326a69c15" dependencies = [ "aead", "axum", @@ -1934,11 +1934,11 @@ dependencies = [ "iroh-quinn-proto", "iroh-quinn-udp", "iroh-relay", - "n0-future", + "n0-future 0.1.3", "n0-snafu", "n0-watcher", "nested_enum_utils 0.2.2", - "netdev", + "netdev 0.36.0", "netwatch", "pin-project", "pkarr", @@ -1969,9 +1969,9 @@ dependencies = [ [[package]] name = "iroh-base" -version = "0.91.0" +version = "0.92.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f68b5c5e190d8965699b2fd583f301a7e6094a0b89bb4d6c5baa94761fd1b7a3" +checksum = "04ae51a14c9255a735b1db2d8cf29b875b971e96a5b23e4d0d1ee7d85bf32132" dependencies = [ "curve25519-dalek", "data-encoding", @@ -1988,9 +1988,9 @@ dependencies = [ [[package]] name = "iroh-blobs" -version = "0.93.0" +version = "0.94.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26339cddac491899d7e38d4ff24a629b893f7e7fbaa7e818742477ab7442efb" +checksum = "b1ebaa36eb3a36492c3b661bdd6eaf359f85def358c1c661d2d04edbe4ad5778" dependencies = [ "anyhow", "arrayvec", @@ -2008,7 +2008,7 @@ dependencies = [ "iroh-metrics", "iroh-quinn", "irpc", - "n0-future", + "n0-future 0.2.0", "n0-snafu", "nested_enum_utils 0.2.2", "postcard", @@ -2048,7 +2048,7 @@ dependencies = [ "iroh-metrics", "iroh-quinn", "irpc", - "n0-future", + "n0-future 0.1.3", "nested_enum_utils 0.1.0", "num_enum", "parking_lot", @@ -2078,9 +2078,9 @@ dependencies = [ [[package]] name = "iroh-gossip" -version = "0.91.0" +version = "0.92.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee288f27ee48e02390d688bb5490a8e6676b885773e68834c8f3135d77bc9493" +checksum = "7d530166ebdcfe321fb3a406dba62d777c98e1159237c7aaf0591e3758eb013c" dependencies = [ "blake3", "bytes", @@ -2096,7 +2096,7 @@ dependencies = [ "iroh-base", "iroh-metrics", "irpc", - "n0-future", + "n0-future 0.1.3", "n0-snafu", "nested_enum_utils 0.2.2", "postcard", @@ -2210,9 +2210,9 @@ dependencies = [ [[package]] name = "iroh-relay" -version = "0.91.0" +version = "0.92.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49596b5079817d0904fe4985307f532a4e23a33eb494bd680baaf2743f0c456b" +checksum = "315cb02e660de0de339303296df9a29b27550180bb3979d0753a267649b34a7f" dependencies = [ "ahash", "blake3", @@ -2235,7 +2235,7 @@ dependencies = [ "iroh-quinn", "iroh-quinn-proto", "lru", - "n0-future", + "n0-future 0.1.3", "n0-snafu", "nested_enum_utils 0.2.2", "num_enum", @@ -2276,16 +2276,16 @@ dependencies = [ [[package]] name = "irpc" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9f8f1d0987ea9da3d74698f921d0a817a214c83b2635a33ed4bc3efa4de1acd" +checksum = "092c0b20697bbc7de4839eebcb49be975cc09221021626d301eea55fc10bfeb7" dependencies = [ "anyhow", "futures-buffered", "futures-util", "iroh-quinn", "irpc-derive", - "n0-future", + "n0-future 0.1.3", "postcard", "rcgen 0.13.2", "rustls", @@ -2299,9 +2299,9 @@ dependencies = [ [[package]] name = "irpc-derive" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0b26b834d401a046dd9d47bc236517c746eddbb5d25ff3e1a6075bfa4eebdb" +checksum = "209d38d83c0f7043916e90de2d3a8d01035db3a2f49ea7d5fb41b8f43e889924" dependencies = [ "proc-macro2", "quote", @@ -2428,11 +2428,11 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" [[package]] name = "matchers" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" dependencies = [ - "regex-automata 0.1.10", + "regex-automata", ] [[package]] @@ -2525,11 +2525,32 @@ dependencies = [ "web-time", ] +[[package]] +name = "n0-future" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89d7dd42bd0114c9daa9c4f2255d692a73bba45767ec32cf62892af6fe5d31f6" +dependencies = [ + "cfg_aliases", + "derive_more 1.0.0", + "futures-buffered", + "futures-lite", + "futures-util", + "js-sys", + "pin-project", + "send_wrapper", + "tokio", + "tokio-util", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-time", +] + [[package]] name = "n0-snafu" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4fed465ff57041f29db78a9adc8864296ef93c6c16029f9e192dc303404ebd0" +checksum = "1815107e577a95bfccedb4cfabc73d709c0db6d12de3f14e0f284a8c5036dc4f" dependencies = [ "anyhow", "btparse", @@ -2545,7 +2566,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c31462392a10d5ada4b945e840cbec2d5f3fee752b96c4b33eb41414d8f45c2a" dependencies = [ "derive_more 1.0.0", - "n0-future", + "n0-future 0.1.3", "snafu", ] @@ -2590,6 +2611,23 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "netdev" +version = "0.37.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daa1e3eaf125c54c21e6221df12dd2a0a682784a068782dd564c836c0f281b6d" +dependencies = [ + "dlopen2", + "ipnet", + "libc", + "netlink-packet-core", + "netlink-packet-route 0.22.0", + "netlink-sys", + "once_cell", + "system-configuration", + "windows-sys 0.59.0", +] + [[package]] name = "netlink-packet-core" version = "0.7.0" @@ -2672,9 +2710,9 @@ dependencies = [ [[package]] name = "netwatch" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901dbb408894af3df3fc51420ba0c6faf3a7d896077b797c39b7001e2f787bd" +checksum = "8a63d76f52f3f15ebde3ca751a2ab73a33ae156662bc04383bac8e824f84e9bb" dependencies = [ "atomic-waker", "bytes", @@ -2683,10 +2721,10 @@ dependencies = [ "iroh-quinn-udp", "js-sys", "libc", - "n0-future", + "n0-future 0.1.3", "n0-watcher", "nested_enum_utils 0.2.2", - "netdev", + "netdev 0.37.3", "netlink-packet-core", "netlink-packet-route 0.24.0", "netlink-proto", @@ -2759,12 +2797,11 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.46.0" +version = "0.50.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" dependencies = [ - "overload", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -2869,12 +2906,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "parking" version = "2.2.1" @@ -3123,9 +3154,9 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "portmapper" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f1975debe62a70557e42b9ff9466e4890cf9d3d156d296408a711f1c5f642b" +checksum = "a9f99e8cd25cd8ee09fc7da59357fd433c0a19272956ebb4ad7443b21842988d" dependencies = [ "base64", "bytes", @@ -3309,7 +3340,7 @@ dependencies = [ "rand 0.9.2", "rand_chacha 0.9.0", "rand_xorshift", - "regex-syntax 0.8.5", + "regex-syntax", "rusty-fork", "tempfile", "unarray", @@ -3599,17 +3630,8 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.9", - "regex-syntax 0.8.5", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", + "regex-automata", + "regex-syntax", ] [[package]] @@ -3620,7 +3642,7 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.5", + "regex-syntax", ] [[package]] @@ -3629,12 +3651,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - [[package]] name = "regex-syntax" version = "0.8.5" @@ -4157,9 +4173,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" [[package]] name = "smallvec" @@ -4903,14 +4919,14 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" dependencies = [ "matchers", "nu-ansi-term", "once_cell", - "regex", + "regex-automata", "sharded-slab", "smallvec", "thread_local", diff --git a/Cargo.toml b/Cargo.toml index 4533696f..195f1897 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,12 +31,12 @@ futures-buffered = "0.2.4" futures-lite = "2.3.0" futures-util = { version = "0.3.25" } hex = "0.4" -iroh = { version = "0.91" } -iroh-base = { version = "0.91", features = ["ticket"] } -iroh-blobs = { version = "0.93" } -iroh-gossip = { version = "0.91", features = ["net"] } +iroh = { version = "0.92" } +iroh-base = { version = "0.92", features = ["ticket"] } +iroh-blobs = { version = "0.94" } +iroh-gossip = { version = "0.92", features = ["net"] } iroh-metrics = { version = "0.35", default-features = false } -irpc = { version = "0.7.0" } +irpc = { version = "0.8.0" } n0-future = "0.1.3" num_enum = "0.7" postcard = { version = "1", default-features = false, features = [ @@ -62,7 +62,7 @@ tracing = "0.1" [dev-dependencies] data-encoding = "2.6.0" -iroh = { version = "0.91", features = ["test-utils"] } +iroh = { version = "0.92", features = ["test-utils"] } nested_enum_utils = "0.1.0" parking_lot = "0.12.3" proptest = "1.2.0" @@ -72,7 +72,7 @@ test-strategy = "0.4" testdir = "0.7" testresult = "0.4.1" tokio = { version = "1", features = ["sync", "macros"] } -tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } +tracing-subscriber = { version = "0.3.20", features = ["env-filter"] } tracing-test = "0.2.5" [features] diff --git a/tests/sync.rs b/tests/sync.rs index 829dba78..72d04da7 100644 --- a/tests/sync.rs +++ b/tests/sync.rs @@ -551,7 +551,7 @@ async fn test_sync_via_relay() -> Result<()> { .await?; assert_next_unordered_with_optionals( &mut events, - Duration::from_secs(2), + Duration::from_secs(10), vec![ Box::new( move |e| matches!(e, LiveEvent::InsertRemote { from, content_status: ContentStatus::Missing | ContentStatus::Incomplete, .. } if *from == node1_id), @@ -1176,7 +1176,7 @@ async fn doc_delete() -> Result<()> { // wait for gc // TODO: allow to manually trigger gc - tokio::time::sleep(Duration::from_secs(1)).await; + tokio::time::sleep(Duration::from_secs(2)).await; let bytes = client.blobs().get_bytes(hash).await; assert!(bytes.is_err()); node.shutdown().await?;