Update deps

Cargo.toml

@@ -20,7 +20,7 @@ rust-version = "1.81"
 
 [workspace.dependencies]
 # First party dependencies
-sd-cloud-schema = { git = "https://github.com/spacedriveapp/cloud-services-schema", rev = "74af2a727c" }
+sd-cloud-schema = { git = "https://github.com/spacedriveapp/cloud-services-schema", rev = "4e4565bee4" }
 
 # Third party dependencies used by one or more of our crates
 async-channel       = "2.3"

core/crates/cloud-services/Cargo.toml

@@ -39,15 +39,15 @@ zeroize             = { workspace = true }
 # External dependencies
 anyhow   = "1.0.86"
 dashmap  = "6.1.0"
-iroh-net = { version = "0.28.1", features = ["discovery-local-network", "iroh-relay"] }
+iroh     = { version = "0.29.0", features = ["discovery-local-network"] }
 paste    = "=1.0.15"
-quic-rpc = { version = "0.15.1", features = ["iroh-net-transport", "quinn-transport"] }
+quic-rpc = { version = "0.17.1", features = ["iroh-transport", "quinn-transport"] }
 quinn    = { package = "iroh-quinn", version = "0.12" }
 # Using whatever version of reqwest that reqwest-middleware uses, just putting here to enable some features
 reqwest                  = { version = "0.12", features = ["json", "native-tls-vendored", "stream"] }
 reqwest-middleware       = { version = "0.4", features = ["json"] }
 reqwest-retry            = "0.7"
-rustls                   = { version = "=0.23.16", default-features = false, features = ["brotli", "ring", "std"] }
+rustls                   = { version = "=0.23.19", default-features = false, features = ["brotli", "ring", "std"] }
 rustls-platform-verifier = "0.4.0"
 
 

core/crates/cloud-services/src/client.rs

@@ -5,7 +5,7 @@ use sd_cloud_schema::{Client, Request, Response, ServicesALPN};
 use std::{net::SocketAddr, sync::Arc, time::Duration};
 
 use futures::Stream;
-use iroh_net::relay::RelayUrl;
+use iroh::relay::RelayUrl;
 use quic_rpc::{transport::quinn::QuinnConnector, RpcClient, RpcMessage};
 use quinn::{crypto::rustls::QuicClientConfig, ClientConfig, Endpoint};
 use reqwest::{IntoUrl, Url};

core/crates/cloud-services/src/p2p/mod.rs

@@ -11,13 +11,12 @@ use sd_crypto::{CryptoRng, SeedableRng};
 
 use std::{sync::Arc, time::Duration};
 
-use iroh_net::{
+use iroh::{
 	discovery::{
 		dns::DnsDiscovery, local_swarm_discovery::LocalSwarmDiscovery, pkarr::dht::DhtDiscovery,
 		ConcurrentDiscovery, Discovery,
 	},
-	relay::{RelayMap, RelayMode, RelayUrl},
-	Endpoint, NodeId,
+	Endpoint, NodeId, RelayMap, RelayMode, RelayUrl,
 };
 use reqwest::Url;
 use serde::{Deserialize, Serialize};

core/crates/cloud-services/src/p2p/new_sync_messages_notifier.rs

@@ -9,7 +9,7 @@ use sd_cloud_schema::{
 use std::time::Duration;
 
 use futures_concurrency::future::Join;
-use iroh_net::{Endpoint, NodeId};
+use iroh::{Endpoint, NodeId};
 use quic_rpc::{transport::quinn::QuinnConnector, RpcClient};
 use tokio::time::Instant;
 use tracing::{debug, error, instrument, warn};

core/crates/cloud-services/src/p2p/runner.rs

@@ -27,7 +27,7 @@ use dashmap::DashMap;
 use flume::SendError;
 use futures::StreamExt;
 use futures_concurrency::stream::Merge;
-use iroh_net::{Endpoint, NodeId};
+use iroh::{Endpoint, NodeId};
 use quic_rpc::{
 	server::{Accepting, RpcChannel, RpcServerError},
 	transport::quinn::{QuinnConnector, QuinnListener},

packages/client/src/core.ts

@@ -138,7 +138,7 @@ export type Procedures = {
         { key: "tags.delete", input: LibraryArgs<number>, result: null } | 
         { key: "tags.update", input: LibraryArgs<TagUpdateArgs>, result: null } | 
         { key: "toggleFeatureFlag", input: BackendFeature, result: null } | 
-        { key: "volumes.track", input: LibraryArgs<TrackVolumeInput>, result: null } | 
+        { key: "volumes.track", input: LibraryArgs<VolumeFingerprint>, result: null } | 
         { key: "volumes.unmount", input: LibraryArgs<number[]>, result: null },
     subscriptions: 
         { key: "cloud.listenCloudServicesNotifications", input: never, result: CloudP2PNotifyUser } | 
@@ -790,8 +790,6 @@ export type TextMatch = { contains: string } | { startsWith: string } | { endsWi
  */
 export type ThumbKey = { shard_hex: string; cas_id: CasId; base_directory_str: string }
 
-export type TrackVolumeInput = { volume_id: VolumeFingerprint }
-
 export type UpdateThumbnailerPreferences = Record<string, never>
 
 export type VideoProps = { pixel_format: string | null; color_range: string | null; bits_per_channel: number | null; color_space: string | null; color_primaries: string | null; color_transfer: string | null; field_order: string | null; chroma_location: string | null; width: number; height: number; aspect_ratio_num: number | null; aspect_ratio_den: number | null; properties: string[] }
@@ -800,6 +798,11 @@ export type VideoProps = { pixel_format: string | null; color_range: string | nu
  * Represents a physical or virtual storage volume in the system
  */
 export type Volume = { 
+/**
+ * Fingerprint of the volume as a hash of its properties, not persisted to the database
+ * Used as the unique identifier for a volume in this module
+ */
+fingerprint: VolumeFingerprint | null; 
 /**
  * Database ID (None if not yet committed to database)
  */
@@ -863,11 +866,7 @@ total_bytes_capacity: string;
 /**
  * Available storage space in bytes
  */
-total_bytes_available: string; 
-/**
- * Fingerprint of the volume, not persisted to the database
- */
-fingerprint: string }
+total_bytes_available: string }
 
 /**
  * Events emitted by the Volume Manager when volume state changes
@@ -898,4 +897,7 @@ export type VolumeEvent =
  */
 { VolumeError: { fingerprint: VolumeFingerprint; error: string } }
 
+/**
+ * A fingerprint of a volume, used to identify it when it is not persisted in the database
+ */
 export type VolumeFingerprint = number[]