From fd10eca11586ac7bb8d8a83830580079b6239fd3 Mon Sep 17 00:00:00 2001 From: Oscar Beaumont Date: Tue, 14 May 2024 18:19:33 +0800 Subject: [PATCH] P2P Docs (#2344) * Add title to rspc * wip * rspc docs title cleanup * a * todo * `p2p/crates` * remove normalised cache docs * wip * words words and more words * a * wip * a * cleanup settings * wip p2p docs * wip --- core/Cargo.toml | 6 +- core/src/p2p/manager.rs | 24 +- core/src/p2p/metadata.rs | 7 + .../crates/block}/Cargo.toml | 4 +- .../crates/block}/src/block.rs | 0 .../crates/block}/src/block_size.rs | 0 .../crates/block}/src/lib.rs | 0 .../crates/block}/src/sb_request.rs | 0 .../crates/proto}/Cargo.toml | 0 .../crates/proto}/src/lib.rs | 0 .../crates/tunnel}/Cargo.toml | 2 +- .../crates/tunnel}/src/lib.rs | 0 .../crates/tunnel}/src/tunnel.rs | 0 docs/developers/technology/p2p.mdx | 208 ++++++++++++++++++ docs/developers/technology/rspc.mdx | 10 +- .../$libraryId/settings/client/general.tsx | 56 ++--- interface/locales/en/common.json | 5 + 17 files changed, 276 insertions(+), 46 deletions(-) rename crates/{p2p-block => p2p/crates/block}/Cargo.toml (82%) rename crates/{p2p-block => p2p/crates/block}/src/block.rs (100%) rename crates/{p2p-block => p2p/crates/block}/src/block_size.rs (100%) rename crates/{p2p-block => p2p/crates/block}/src/lib.rs (100%) rename crates/{p2p-block => p2p/crates/block}/src/sb_request.rs (100%) rename crates/{p2p-proto => p2p/crates/proto}/Cargo.toml (100%) rename crates/{p2p-proto => p2p/crates/proto}/src/lib.rs (100%) rename crates/{p2p-tunnel => p2p/crates/tunnel}/Cargo.toml (91%) rename crates/{p2p-tunnel => p2p/crates/tunnel}/src/lib.rs (100%) rename crates/{p2p-tunnel => p2p/crates/tunnel}/src/tunnel.rs (100%) create mode 100644 docs/developers/technology/p2p.mdx diff --git a/core/Cargo.toml b/core/Cargo.toml index e16f6f0dc..da0f6ddf2 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -42,9 +42,9 @@ sd-images = { path = "../crates/images", features = [ ] } sd-media-metadata = { path = "../crates/media-metadata" } sd-p2p = { path = "../crates/p2p", features = ["specta"] } -sd-p2p-block = { path = "../crates/p2p-block" } -sd-p2p-proto = { path = "../crates/p2p-proto" } -sd-p2p-tunnel = { path = "../crates/p2p-tunnel" } +sd-p2p-block = { path = "../crates/p2p/crates/block" } +sd-p2p-proto = { path = "../crates/p2p/crates/proto" } +sd-p2p-tunnel = { path = "../crates/p2p/crates/tunnel" } sd-prisma = { path = "../crates/prisma" } sd-sync = { path = "../crates/sync" } sd-utils = { path = "../crates/utils" } diff --git a/core/src/p2p/manager.rs b/core/src/p2p/manager.rs index 9d9e03771..3ce86a034 100644 --- a/core/src/p2p/manager.rs +++ b/core/src/p2p/manager.rs @@ -138,13 +138,19 @@ impl P2PManager { pub async fn on_node_config_change(&self) { let config = self.node_config.get().await; - PeerMetadata { - name: config.name.clone(), - operating_system: Some(OperatingSystem::get_os()), - device_model: Some(get_hardware_model_name().unwrap_or(HardwareModel::Other)), - version: Some(env!("CARGO_PKG_VERSION").to_string()), + if config.p2p.discovery == P2PDiscoveryState::ContactsOnly { + PeerMetadata::remove(&mut self.p2p.metadata_mut()); + + // TODO: Hash Spacedrive account ID and put it in the metadata. + } else { + PeerMetadata { + name: config.name.clone(), + operating_system: Some(OperatingSystem::get_os()), + device_model: Some(get_hardware_model_name().unwrap_or(HardwareModel::Other)), + version: Some(env!("CARGO_PKG_VERSION").to_string()), + } + .update(&mut self.p2p.metadata_mut()); } - .update(&mut self.p2p.metadata_mut()); let port = config.p2p.port.get(); @@ -185,9 +191,7 @@ impl P2PManager { } let should_revert = match config.p2p.discovery { - P2PDiscoveryState::Everyone - // TODO: Make `ContactsOnly` work - | P2PDiscoveryState::ContactsOnly => { + P2PDiscoveryState::Everyone | P2PDiscoveryState::ContactsOnly => { let mut mdns = self.mdns.lock().unwrap_or_else(PoisonError::into_inner); if mdns.is_none() { match Mdns::spawn(self.p2p.clone()) { @@ -216,7 +220,7 @@ impl P2PManager { } false - }, + } }; // The `should_revert` bit is weird but we need this future to stay `Send` as rspc requires. diff --git a/core/src/p2p/metadata.rs b/core/src/p2p/metadata.rs index a54694158..5e03e9c7d 100644 --- a/core/src/p2p/metadata.rs +++ b/core/src/p2p/metadata.rs @@ -14,6 +14,13 @@ pub struct PeerMetadata { } impl PeerMetadata { + pub fn remove(map: &mut HashMap) { + map.remove("name"); + map.remove("os"); + map.remove("device_model"); + map.remove("version"); + } + pub fn update(self, map: &mut HashMap) { map.insert("name".to_owned(), self.name.clone()); if let Some(os) = self.operating_system { diff --git a/crates/p2p-block/Cargo.toml b/crates/p2p/crates/block/Cargo.toml similarity index 82% rename from crates/p2p-block/Cargo.toml rename to crates/p2p/crates/block/Cargo.toml index 7e23b35d3..1aaa816c7 100644 --- a/crates/p2p-block/Cargo.toml +++ b/crates/p2p/crates/block/Cargo.toml @@ -8,8 +8,8 @@ repository.workspace = true [dependencies] # Spacedrive Sub-crates -sd-p2p = { path = "../p2p" } -sd-p2p-proto = { path = "../p2p-proto" } +sd-p2p = { path = "../../" } +sd-p2p-proto = { path = "../proto" } thiserror = { workspace = true } tokio = { workspace = true } diff --git a/crates/p2p-block/src/block.rs b/crates/p2p/crates/block/src/block.rs similarity index 100% rename from crates/p2p-block/src/block.rs rename to crates/p2p/crates/block/src/block.rs diff --git a/crates/p2p-block/src/block_size.rs b/crates/p2p/crates/block/src/block_size.rs similarity index 100% rename from crates/p2p-block/src/block_size.rs rename to crates/p2p/crates/block/src/block_size.rs diff --git a/crates/p2p-block/src/lib.rs b/crates/p2p/crates/block/src/lib.rs similarity index 100% rename from crates/p2p-block/src/lib.rs rename to crates/p2p/crates/block/src/lib.rs diff --git a/crates/p2p-block/src/sb_request.rs b/crates/p2p/crates/block/src/sb_request.rs similarity index 100% rename from crates/p2p-block/src/sb_request.rs rename to crates/p2p/crates/block/src/sb_request.rs diff --git a/crates/p2p-proto/Cargo.toml b/crates/p2p/crates/proto/Cargo.toml similarity index 100% rename from crates/p2p-proto/Cargo.toml rename to crates/p2p/crates/proto/Cargo.toml diff --git a/crates/p2p-proto/src/lib.rs b/crates/p2p/crates/proto/src/lib.rs similarity index 100% rename from crates/p2p-proto/src/lib.rs rename to crates/p2p/crates/proto/src/lib.rs diff --git a/crates/p2p-tunnel/Cargo.toml b/crates/p2p/crates/tunnel/Cargo.toml similarity index 91% rename from crates/p2p-tunnel/Cargo.toml rename to crates/p2p/crates/tunnel/Cargo.toml index e4e0df7bc..ff37c4c8b 100644 --- a/crates/p2p-tunnel/Cargo.toml +++ b/crates/p2p/crates/tunnel/Cargo.toml @@ -8,7 +8,7 @@ repository.workspace = true [dependencies] # Spacedrive Sub-crates -sd-p2p = { path = "../p2p" } +sd-p2p = { path = "../../" } tokio = { workspace = true, features = ["io-util"] } thiserror = { workspace = true } diff --git a/crates/p2p-tunnel/src/lib.rs b/crates/p2p/crates/tunnel/src/lib.rs similarity index 100% rename from crates/p2p-tunnel/src/lib.rs rename to crates/p2p/crates/tunnel/src/lib.rs diff --git a/crates/p2p-tunnel/src/tunnel.rs b/crates/p2p/crates/tunnel/src/tunnel.rs similarity index 100% rename from crates/p2p-tunnel/src/tunnel.rs rename to crates/p2p/crates/tunnel/src/tunnel.rs diff --git a/docs/developers/technology/p2p.mdx b/docs/developers/technology/p2p.mdx new file mode 100644 index 000000000..73abf5e27 --- /dev/null +++ b/docs/developers/technology/p2p.mdx @@ -0,0 +1,208 @@ +--- +title: ​p2p +index: 14 +--- + +# Peer-to-peer + +Our peer-to-peer technology works at the heart of Spacedrive allowing all of your devices to seamlessly communicate and share data. This documentation outlines + +## Implementing features with P2P + +TODO: + - From frontend, to backend + - Including authentication + - Versioning/making breaking change + - Show using `sd_p2p_tunnel` + +## Underlying technology + +### Terminology + + - **Node**: An application running Spacedrive's network stack. + - This could be the Spacedrive app or the P2P relay. + - If you have multiple Spacedrive installations open on your computer, each one is an independant node. + - **Library**: A logical collection of your data within Spacedrive. + - From a theorical perspective, a library is just the conflict resolved state of one or more **instances** although a lot of the time we don't stricly treat it that way. + - **Instance**: An instance of a library running on a particular node. + - An instance correlates directly to each SQLite file. + - You could *technically* have more than one instance for a library on a single node, although our core would fall apart as we identify traffic by library. + - [`Identity`](https://github.com/spacedriveapp/spacedrive/blob/518d5836f6585a5f597c3ae5a0d27d084adc0a63/crates/p2p/src/identity.rs#L29) - A public/private keypair which represents the library or node. + - [`RemoteIdentity`](https://github.com/spacedriveapp/spacedrive/blob/518d5836f6585a5f597c3ae5a0d27d084adc0a63/crates/p2p/src/identity.rs#L70) - A public key which represents the library or node. + - [`PeerId`](https://docs.rs/libp2p/latest/libp2p/struct.PeerId.html) - The identifier libp2p uses. Can be derived from a `RemoteIdentity`. + +### `sd_p2p` crate + +The P2P crate was designed from the group up to be modular. + +The `P2P` struct is the core of the system, and suprisingly doesn't actually do any P2P functionality. It's a state manager and event bus along with providing a hook system for other components of the P2P system to register themselves. + +This modular design helps with separting the concern which helps with comprehending the entire system and makes it easier for testing. + +The `sd_p2p` crate provides a hook for: + - `Mdns` - Local network discovery + - `Quic` - Quic transport layer built on top of `libp2p` + +#### What are hooks? + +A hook is very similar to an actor. It's a component which can be registered with the P2P system. + +A hook allows for processing events from the P2P system and also ensures when the P2P system shuts down, the hook is also shutdown. + +Their are special hooks called listeners. These are implemented as a superset of a regular hook and are able to create and accept connections. + +Subcrates: + - [`sd_p2p_block`](https://github.com/spacedriveapp/spacedrive/tree/main/crates/p2p/crates/block) - Block protocol based on [SyncThing Block Exchange Protocol v1](https://docs.syncthing.net/specs/bep-v1.html) + - [`sd_p2p_proto`](https://github.com/spacedriveapp/spacedrive/tree/main/crates/p2p/crates/proto) - Utilities for zero fluff encoding and decoding. + - [`sd_p2p_tunnel`](https://github.com/spacedriveapp/spacedrive/tree/main/crates/p2p/crates/tunnel) - Encrypt a stream of data between two nodes + +#### `sd_p2p_proto` + +This crate provides utilities for implementing asynchronous deserializers and matching synchronous serializers. The goal of these implementations is to really quickly send and receive Rust structs over the network. + +This crate allows for creating implementations faster than other common options, at the cost of some developer experience. + +Before building this I originally compared the performance of both [msgpack](https://docs.rs/rmp-serde) and [bincode](https://docs.rs/bincode) against manual implementations using `AsyncRead` and I found that over the network using asynchronous deserialization was faster. + +This makes logically makes sense as if you want to use a synchronous serializer you will do the following: + + - Send the total length of the message + - Allocate a buffer for the message + - Wait asynchronously for the buffer to be filled + - Synchronously copy from the buffer into each of the struct fields + +When using an asynchronous serializer you can skip sending the messages length and allocating the intermediate buffer as we can rely on the known length of each field while decoding and this is a win for performance and memory usage. + +This crate provides utilities to make the implementations less error prone, however long term it would be great to replace this with a derive macro similar to how crates like [serde](https://serde.rs) work. + +From my research no crate exists that meets these requirements. It is also a difficult problem because your juggling lifetimes and async which is rough. I attempted an implementation called [binario](https://github.com/oscartbeaumont/binario), however it is still incomplete so we never adopted it. I suspect Rust's recent stablisation of [RPITIT](https://blog.rust-lang.org/2023/12/21/async-fn-rpit-in-traits.html) would make this much easier. + +### Local Network Discovery + +Our local network discovery uses [DNS-Based Service Discovery](https://www.rfc-editor.org/rfc/rfc6763.html) which itself is built around [Multicast DNS (mDNS)](https://datatracker.ietf.org/doc/html/rfc6762). This is a really well established technology and is used in [Spotify Connect](https://support.spotify.com/au/article/spotify-connect/), [Apple Airplay](https://www.apple.com/au/airplay/) and many other services you use every day. + +#### Service Structure + +The following is an example of what would be broadcast from a single Spacedrive node: +```toml +# {remote_identity_of_self}._sd._udp.local. + +name=Oscars Laptop # Shown to the user to select a device +operating_system=macos # Used for UI purposes +device_model=MacBook Pro # Used for UI purposes +version=0.0.1 # Spacedrive version + +# For each library that's active on the Spacedrive node: +# {library_uuid}={remote_identity_of_self} +d66ed0c3-03ac-4f9b-a374-a927830dfd5b=0l9vTOWu+5aJs0cyWxdfJEGtloEepGRAXcEuDeTDRPk +``` + +Within `sd-core` this is defined in two parts. The [`PeerMetadata` struct](https://github.com/spacedriveapp/spacedrive/blob/44478207e72495b3777e294660d78939711b544f/core/src/p2p/metadata.rs#L9) takes care of the node metadata and libraries are inserted by the [`libraries_hook`](https://github.com/spacedriveapp/spacedrive/blob/44478207e72495b3777e294660d78939711b544f/core/src/p2p/libraries.rs#L13). + +#### Modes + + + +Within Spacedrive's settings the user is able to choose between three modes for local network discovery: + - **Contacts only**: Only devices that are in your contacts list will be able to see your device. + - **Enabled**: All devices on the local network will be able to see your device. + - **Disabled**: No devices on the local network will be able to see your device. + +**Enabled** and **Disabled** are implemented by spawning and shutting down the [`sd_p2p::Mdns`](https://github.com/spacedriveapp/spacedrive/blob/44478207e72495b3777e294660d78939711b544f/crates/p2p/src/mdns.rs#L17) service as required within `sd-core`. + +**Contacts only** the mDNS service will not contain the [`PeerMetadata`](https://github.com/spacedriveapp/spacedrive/blob/44478207e72495b3777e294660d78939711b544f/core/src/p2p/metadata.rs#L9) fields and instead will contain a hash of the users Spacedrive identifier. If a Spacedrive node detects another node in the local network with a hash in it's contacts, it can make a request to the node and if the remote node also has the current node in it's contacts, it will respond with the full metadata. + +#### Implementation + +We make use of the [mdns-sd](https://docs.rs/mdns-sd) crate. + +### Manual connection + +The user can manually provide a set of [`SocketAddr`](https://doc.rust-lang.org/std/net/enum.SocketAddr.html)'s and the P2P system to attempt to connect to. + +This feature primarily exists for usage in combination with Docker but it could be useful for working around difficult network setups. + +#### Implementation + +TODO - TODO + +#### Problems with Docker + +TODO - MDNS daemon +TODO - Docker and why it's a pain mDNS. Explain the current stuff i've done with it. + +### Transport layer + +TODO - Quic + +TODO - Explain authentication + +### Relay + +TODO + +### Direction Connect via Relay + +TODO + +#### Authentication + +TODO - How we gonna restrict this??? + +#### Billing + +TODO - How we gonna bill for this??? + +### Design Decisions + +TODO + +### Things I would do differently? + +TODO + +### Crates + +TODO + +#### Security + +##### Threat model + +TODO - Risks of sharing IP's using discovery, risks of compromised relay, risks of compromised local network during pairing + +##### Authentication + +TODO + +##### Authorization + +TODO + +##### Tracking + +TODO - Link to Apple stuff + +#### Version compatibility and breaking changes + +TODO - Compatibility across versions of Spacedrive + +#### libp2p + +TODO - Why libp2p fork?, Why libp2p can be problematic for what we do +TODO - How we transpose our certificates to libp2p certificates + +#### Major issues + +TODO - mDNS issues on Linux +TODO - The double up of service discovery when using local and relay + +TODO - Question? Why does remote_identity_of_self show up in metadata and the mDNS record itself. + +{/* TODO */} + +TODO - Request flow. Eg. incoming goes from Quic to mpsc to the users code, to the handlers. +TODO - Resumable uploads/transfers diff --git a/docs/developers/technology/rspc.mdx b/docs/developers/technology/rspc.mdx index 23056d19f..e42f6a93b 100644 --- a/docs/developers/technology/rspc.mdx +++ b/docs/developers/technology/rspc.mdx @@ -3,6 +3,8 @@ title: ​rspc index: 13 --- +# rspc + We use a fork based on [rspc 0.1.4](https://docs.rs/rspc) which contains heavy modifications from the upstream. ## What's different? @@ -66,17 +68,19 @@ This is due to a bug in the future that resolves requests. This was fixed [upstr A panic will also take out the entire request which could contain a batch of multiple procedures. +This will likely cause the frontend request to hang indefinitely. + ### Blocking -### Batching +#### Batching This applies to both Tauri and Axum when using the batch link (**which Spacedrive uses**). Each request within a batch is effectively run in serial. This may or may not make a major difference as the response can't be send until all items are ready but having to run them in parallel would be faster regardless. -### Tauri +#### Tauri Minus batching everything is run in parallel. -### Axum +#### Axum All queries and mutations run within a single websocket connection (**which Spacedrive uses**) are run in serial. diff --git a/interface/app/$libraryId/settings/client/general.tsx b/interface/app/$libraryId/settings/client/general.tsx index 68442ae5c..da16765d9 100644 --- a/interface/app/$libraryId/settings/client/general.tsx +++ b/interface/app/$libraryId/settings/client/general.tsx @@ -347,35 +347,37 @@ export const Component = () => { /> + + {t('p2p_visibility_description')} +

+ } + > + + + {isP2PWipFeatureEnabled && ( <> - - {t('spacedrop_description')} -

- } - > - - -