From 73687fd2bd30c81ce6cc008fd27bb789530b13ad Mon Sep 17 00:00:00 2001 From: Oscar Beaumont Date: Sat, 4 Nov 2023 21:20:22 +1100 Subject: [PATCH] [ENG-1399] Upgrade Rust workspace + IPv6 mDNS (#1729) Upgrade Rust workspace + IPv6 mDNS --- Cargo.lock | Bin 235615 -> 239379 bytes Cargo.toml | 6 ++-- apps/cli/Cargo.toml | 4 +-- apps/desktop/crates/windows/Cargo.toml | 2 +- apps/desktop/src-tauri/Cargo.toml | 4 +-- apps/mobile/modules/sd-core/core/Cargo.toml | 4 +-- core/Cargo.toml | 24 +++++++-------- crates/deps-generator/Cargo.toml | 6 ++-- crates/ffmpeg/Cargo.toml | 4 +-- crates/file-ext/Cargo.toml | 2 +- crates/images/Cargo.toml | 4 +-- crates/media-metadata/Cargo.toml | 4 +-- crates/p2p/Cargo.toml | 22 +++++++------- crates/p2p/src/discovery/mdns.rs | 11 ++----- crates/p2p/src/manager.rs | 32 +++++++++++++------- crates/p2p/src/spacetime/connection.rs | 2 ++ crates/sync-generator/Cargo.toml | 4 +-- crates/sync/Cargo.toml | 4 +-- 18 files changed, 72 insertions(+), 67 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index efe7541bfbe47cb2cfd7256d4f5275f819238eab..a9968dfade42cdf8094b9a659e174b9d26a48264 100644 GIT binary patch delta 17164 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 delta 15544 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 diff --git a/Cargo.toml b/Cargo.toml index cddf716c7..77f5aa896 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,14 +49,14 @@ tauri-specta = { version = "1.0.2" } swift-rs = { version = "1.0.6" } -tokio = { version = "1.32.0" } -uuid = { version = "1.4.1", features = ["v4", "serde"] } +tokio = { version = "1.33.0" } +uuid = { version = "1.5.0", features = ["v4", "serde"] } serde = { version = "1.0" } serde_json = { version = "1.0" } [patch.crates-io] # Proper IOS Support -if-watch = { git = "https://github.com/oscartbeaumont/if-watch.git", rev = "f804ad9b2005e4e760732a708aa95b4bfb376ddf" } +if-watch = { git = "https://github.com/oscartbeaumont/if-watch.git", rev = "f732786057e57250e863a9ea0b1874e4cc9907c2" } # Beta features specta = { git = "https://github.com/oscartbeaumont/specta", rev = "4bc6e46fc8747cd8d8a07597c1fe13c52aa16a41" } diff --git a/apps/cli/Cargo.toml b/apps/cli/Cargo.toml index 1d50cbba8..15bb1cddb 100644 --- a/apps/cli/Cargo.toml +++ b/apps/cli/Cargo.toml @@ -6,8 +6,8 @@ repository = { workspace = true } edition = { workspace = true } [dependencies] -indoc = "2.0.3" -clap = { version = "4.4.2", features = ["derive"] } +indoc = "2.0.4" +clap = { version = "4.4.7", features = ["derive"] } anyhow = "1.0.75" hex = "0.4.3" sd-crypto = { path = "../../crates/crypto" } diff --git a/apps/desktop/crates/windows/Cargo.toml b/apps/desktop/crates/windows/Cargo.toml index ced6ba86b..d98293462 100644 --- a/apps/desktop/crates/windows/Cargo.toml +++ b/apps/desktop/crates/windows/Cargo.toml @@ -6,7 +6,7 @@ repository = { workspace = true } edition = { workspace = true } [dependencies] -thiserror = "1.0.48" +thiserror = "1.0.50" normpath = "1.1.1" libc = "0.2" diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml index 044a1d939..e6281c7f0 100644 --- a/apps/desktop/src-tauri/Cargo.toml +++ b/apps/desktop/src-tauri/Cargo.toml @@ -30,12 +30,12 @@ sd-core = { path = "../../../core", features = [ ] } tokio = { workspace = true, features = ["sync"] } tracing = { workspace = true } -serde = "1.0.188" +serde = "1.0.190" http = "0.2.9" opener = { version = "0.6.1", features = ["reveal"] } specta = { workspace = true } tauri-specta = { workspace = true, features = ["typescript"] } -uuid = { version = "1.4.1", features = ["serde"] } +uuid = { version = "1.5.0", features = ["serde"] } futures = "0.3" axum = { version = "0.6.20", features = ["headers", "query"] } rand = "0.8.5" diff --git a/apps/mobile/modules/sd-core/core/Cargo.toml b/apps/mobile/modules/sd-core/core/Cargo.toml index 6e489054e..62a0ead34 100644 --- a/apps/mobile/modules/sd-core/core/Cargo.toml +++ b/apps/mobile/modules/sd-core/core/Cargo.toml @@ -14,7 +14,7 @@ sd-core = { path = "../../../../../core", features = [ rspc = { workspace = true } serde_json = { workspace = true } tokio = { workspace = true } -futures = "0.3.28" +futures = "0.3.29" tracing = { workspace = true } -futures-channel = "0.3.28" +futures-channel = "0.3.29" futures-locks = "0.7.1" diff --git a/core/Cargo.toml b/core/Cargo.toml index b8c283dba..aa37de849 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -57,29 +57,29 @@ tokio = { workspace = true, features = [ "process", ] } serde = { version = "1.0", features = ["derive"] } -chrono = { version = "0.4.30", features = ["serde"] } +chrono = { version = "0.4.31", features = ["serde"] } serde_json = { workspace = true } futures = "0.3" rmp-serde = "^1.1.2" rmpv = "^1.0.1" -blake3 = "1.4.1" +blake3 = "1.5.0" hostname = "0.3.1" uuid = { workspace = true } sysinfo = "0.29.10" -thiserror = "1.0.48" -async-trait = "^0.1.73" +thiserror = "1.0.50" +async-trait = "^0.1.74" image = "0.24.7" webp = "0.2.6" tracing = { workspace = true } tracing-subscriber = { workspace = true, features = ["env-filter"] } async-stream = "0.3.5" once_cell = "1.18.0" -ctor = "0.2.4" +ctor = "0.2.5" globset = { version = "^0.4.13", features = ["serde1"] } itertools = "^0.11.0" http-range = "0.1.5" mini-moka = "0.10.2" -serde_with = "3.3.0" +serde_with = "3.4.0" notify = { version = "=5.2.0", default-features = false, features = [ "macos_fsevent", ], optional = true } @@ -89,21 +89,21 @@ normpath = { version = "1.1.1", features = ["localization"] } tracing-appender = { workspace = true } strum = { version = "0.25", features = ["derive"] } strum_macros = "0.25" -regex = "1.9.5" +regex = "1.10.2" int-enum = "0.5.0" tokio-stream = { version = "0.1.14", features = ["fs"] } futures-concurrency = "7.4.3" async-channel = "2.0.0" -tokio-util = { version = "0.7.8", features = ["io"] } +tokio-util = { version = "0.7.10", features = ["io"] } slotmap = "1.0.6" -flate2 = "1.0.27" +flate2 = "1.0.28" tar = "0.4.40" -tempfile = "^3.8.0" +tempfile = "^3.8.1" axum = "0.6.20" http-body = "0.4.5" pin-project-lite = "0.2.13" bytes = "1.5.0" -reqwest = { version = "0.11.20", features = ["json", "native-tls-vendored"] } +reqwest = { version = "0.11.22", features = ["json", "native-tls-vendored"] } directories = "5.0.1" async-recursion = "1.0.5" @@ -119,7 +119,7 @@ features = ["vendored"] plist = "1" [target.'cfg(windows)'.dependencies.winapi-util] -version = "0.1.5" +version = "0.1.6" [dev-dependencies] tracing-test = "^0.2.4" diff --git a/crates/deps-generator/Cargo.toml b/crates/deps-generator/Cargo.toml index 51336e234..78dd27459 100644 --- a/crates/deps-generator/Cargo.toml +++ b/crates/deps-generator/Cargo.toml @@ -8,9 +8,9 @@ repository = { workspace = true } edition = { workspace = true } [dependencies] -reqwest = { version = "0.11.20", features = ["blocking"] } -clap = { version = "4.4.2", features = ["derive"] } +reqwest = { version = "0.11.22", features = ["blocking"] } +clap = { version = "4.4.7", features = ["derive"] } anyhow = "1.0.75" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -cargo_metadata = "0.18.0" +cargo_metadata = "0.18.1" diff --git a/crates/ffmpeg/Cargo.toml b/crates/ffmpeg/Cargo.toml index ab6f4b6dd..ba9943d1f 100644 --- a/crates/ffmpeg/Cargo.toml +++ b/crates/ffmpeg/Cargo.toml @@ -13,10 +13,10 @@ edition = { workspace = true } ffmpeg-sys-next = "6.0.1" tracing = { workspace = true } -thiserror = "1.0.48" +thiserror = "1.0.50" webp = "0.2.6" tokio = { workspace = true, features = ["fs", "rt"] } [dev-dependencies] -tempfile = "3.8.0" +tempfile = "3.8.1" tokio = { workspace = true, features = ["fs", "rt", "macros"] } diff --git a/crates/file-ext/Cargo.toml b/crates/file-ext/Cargo.toml index 5b36ea765..506efb48b 100644 --- a/crates/file-ext/Cargo.toml +++ b/crates/file-ext/Cargo.toml @@ -10,7 +10,7 @@ repository = { workspace = true } edition = { workspace = true } [dependencies] -serde = { version = "1.0.188", features = ["derive"] } +serde = { version = "1.0.190", features = ["derive"] } serde_json = { workspace = true } strum = { version = "0.25", features = ["derive"] } tokio = { workspace = true, features = ["fs", "rt", "io-util"] } diff --git a/crates/images/Cargo.toml b/crates/images/Cargo.toml index 740917871..83f1c19a5 100644 --- a/crates/images/Cargo.toml +++ b/crates/images/Cargo.toml @@ -14,7 +14,7 @@ heif = ["dep:libheif-rs", "dep:libheif-sys"] [dependencies] image = "0.24.7" -thiserror = "1.0.49" +thiserror = "1.0.50" resvg = "0.36.0" rspc = { workspace = true, optional = true } # error conversion specta = { workspace = true, optional = true } @@ -30,4 +30,4 @@ tracing = { workspace = true } # this broke builds as we build our own liibheif, so i disabled their default features libheif-rs = { version = "0.22.0", default-features = false, optional = true } libheif-sys = { version = "2.0.0", default-features = false, optional = true } -pdfium-render = { version = "0.8.8", features = ["image"] } +pdfium-render = { version = "0.8.14", features = ["image"] } diff --git a/crates/media-metadata/Cargo.toml b/crates/media-metadata/Cargo.toml index ff392ef65..47017c43b 100644 --- a/crates/media-metadata/Cargo.toml +++ b/crates/media-metadata/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" [dependencies] kamadak-exif = "0.5.5" -thiserror = "1.0.49" +thiserror = "1.0.50" image-rs = { package = "image", version = "0.24.7" } -serde = { version = "1.0.188", features = ["derive"] } +serde = { version = "1.0.190", features = ["derive"] } serde_json = { workspace = true } specta = { workspace = true, features = ["chrono"] } chrono = { version = "0.4.31", features = ["serde"] } diff --git a/crates/p2p/Cargo.toml b/crates/p2p/Cargo.toml index d4c4f5bea..5254f368c 100644 --- a/crates/p2p/Cargo.toml +++ b/crates/p2p/Cargo.toml @@ -21,30 +21,30 @@ tokio = { workspace = true, features = [ "io-util", "fs", ] } -libp2p = { version = "0.52.3", features = ["tokio", "serde"] } -libp2p-quic = { version = "0.9.2", features = ["tokio"] } -if-watch = { version = "=3.0.1", features = [ +libp2p = { version = "0.52.4", features = ["tokio", "serde"] } +libp2p-quic = { version = "0.9.3", features = ["tokio"] } +if-watch = { version = "=3.1.0", features = [ "tokio", ] } # Override the features of if-watch which is used by libp2p-quic -mdns-sd = "0.7.4" -thiserror = "1.0.48" +mdns-sd = "0.9.3" +thiserror = "1.0.50" tracing = { workspace = true } -serde = { version = "1.0.188", features = ["derive"] } # TODO: Optional or remove feature +serde = { version = "1.0.190", features = [ + "derive", +] } # TODO: Optional or remove feature specta = { workspace = true } flume = "0.10.0" # Must match version used by `mdns-sd` -tokio-util = { version = "0.7.8", features = ["compat"] } +tokio-util = { version = "0.7.10", features = ["compat"] } ed25519-dalek = { version = "2.0.0", features = [] } rand_core = { version = "0.6.4" } -uuid = "1.4.1" +uuid = "1.5.0" streamunordered = "0.5.3" futures-core = "0.3.29" tokio-stream = { version = "0.1.14", features = ["sync"] } pin-project-lite = "0.2.13" base64 = "0.21.5" -# chacha20poly1305 = "0.10.1" -# rand = "0.8.5" [dev-dependencies] tokio = { workspace = true, features = ["rt-multi-thread"] } tracing-subscriber = { workspace = true, features = ["env-filter"] } -uuid = { version = "1.4.1", features = ["v4"] } +uuid = { version = "1.5.0", features = ["v4"] } diff --git a/crates/p2p/src/discovery/mdns.rs b/crates/p2p/src/discovery/mdns.rs index c0a410c93..730c06204 100644 --- a/crates/p2p/src/discovery/mdns.rs +++ b/crates/p2p/src/discovery/mdns.rs @@ -1,6 +1,6 @@ use std::{ collections::HashMap, - net::{IpAddr, SocketAddr}, + net::SocketAddr, pin::Pin, str::FromStr, sync::PoisonError, @@ -64,13 +64,6 @@ impl Mdns { let mut ports_to_service = HashMap::new(); for addr in listen_addrs.iter() { - let addr = match addr { - SocketAddr::V4(addr) => addr, - // TODO: Our mdns library doesn't support Ipv6. This code has the infra to support it so once this issue is fixed upstream we can just flip it on. - // Refer to issue: https://github.com/keepsimple1/mdns-sd/issues/61 - SocketAddr::V6(_) => continue, - }; - ports_to_service .entry(addr.port()) .or_insert_with(Vec::new) @@ -254,7 +247,7 @@ impl Mdns { addresses: info .get_addresses() .iter() - .map(|addr| SocketAddr::new(IpAddr::V4(*addr), info.get_port())) + .map(|addr| SocketAddr::new(*addr, info.get_port())) .collect(), }, ); diff --git a/crates/p2p/src/manager.rs b/crates/p2p/src/manager.rs index b75978f77..fd17249ea 100644 --- a/crates/p2p/src/manager.rs +++ b/crates/p2p/src/manager.rs @@ -1,5 +1,6 @@ use std::{ collections::{HashMap, HashSet}, + convert::Infallible, fmt, net::SocketAddr, sync::{ @@ -10,8 +11,7 @@ use std::{ use libp2p::{ core::{muxing::StreamMuxerBox, transport::ListenerId, ConnectedPoint}, - swarm::SwarmBuilder, - PeerId, Transport, + PeerId, SwarmBuilder, Transport, }; use serde::{Deserialize, Serialize}; use specta::Type; @@ -94,15 +94,16 @@ impl Manager { event_stream_tx2, }); - let mut swarm = SwarmBuilder::with_tokio_executor( - libp2p_quic::GenTransport::::new( - libp2p_quic::Config::new(&keypair.inner()), - ) - .map(|(p, c), _| (p, StreamMuxerBox::new(c))) - .boxed(), - SpaceTime::new(this.clone()), - keypair.peer_id(), - ) + let mut swarm = ok(ok(SwarmBuilder::with_existing_identity(keypair.inner()) + .with_tokio() + .with_other_transport(|keypair| { + libp2p_quic::GenTransport::::new( + libp2p_quic::Config::new(keypair), + ) + .map(|(p, c), _| (p, StreamMuxerBox::new(c))) + .boxed() + })) + .with_behaviour(|_| SpaceTime::new(this.clone()))) .build(); ManagerStream::refresh_listeners( @@ -280,6 +281,8 @@ pub enum ManagerError { InvalidAppName, #[error("error with mdns discovery: {0}")] Mdns(#[from] mdns_sd::Error), + // #[error("todo")] + // Manager(#[from] ManagerError), } /// The configuration for the P2P Manager @@ -302,3 +305,10 @@ impl Default for ManagerConfig { } } } + +fn ok(v: Result) -> T { + match v { + Ok(v) => v, + Err(_) => unreachable!(), + } +} diff --git a/crates/p2p/src/spacetime/connection.rs b/crates/p2p/src/spacetime/connection.rs index 130b76dd3..94eded516 100644 --- a/crates/p2p/src/spacetime/connection.rs +++ b/crates/p2p/src/spacetime/connection.rs @@ -28,6 +28,7 @@ const SUBSTREAM_TIMEOUT: Duration = Duration::from_secs(10); // TODO: Tune value pub struct SpaceTimeConnection { peer_id: PeerId, manager: Arc, + #[allow(deprecated)] pending_events: VecDeque< ConnectionHandlerEvent< OutboundProtocol, @@ -91,6 +92,7 @@ impl ConnectionHandler for SpaceTimeConnection { KeepAlive::Yes // TODO: Make this work how the old one did with storing it on `self` and updating on events } + #[allow(deprecated)] fn poll( &mut self, _cx: &mut Context<'_>, diff --git a/crates/sync-generator/Cargo.toml b/crates/sync-generator/Cargo.toml index 053e7a379..904154a2d 100644 --- a/crates/sync-generator/Cargo.toml +++ b/crates/sync-generator/Cargo.toml @@ -8,5 +8,5 @@ edition = { workspace = true } [dependencies] nom = "7.1.3" prisma-client-rust-sdk = { workspace = true } -serde = { version = "1.0.188", features = ["derive"] } -thiserror = "1.0.48" +serde = { version = "1.0.190", features = ["derive"] } +thiserror = "1.0.50" diff --git a/crates/sync/Cargo.toml b/crates/sync/Cargo.toml index 2b0f2ec81..c951151af 100644 --- a/crates/sync/Cargo.toml +++ b/crates/sync/Cargo.toml @@ -7,8 +7,8 @@ edition = { workspace = true } [dependencies] specta = { workspace = true, features = ["uuid", "uhlc"] } -serde = "1.0.188" +serde = "1.0.190" serde_json = { workspace = true } uhlc = "=0.5.2" -uuid = { version = "1.4.1", features = ["serde", "v4"] } +uuid = { version = "1.5.0", features = ["serde", "v4"] } prisma-client-rust = { workspace = true }