disable remote sync for server "all"

crates/unavi-server/src/lib.rs

@@ -61,20 +61,37 @@ pub enum Storage {
     Memory,
 }
 
+#[derive(Clone)]
+pub struct StartOptions {
+    pub enable_remote_sync: bool,
+}
+
+impl Default for StartOptions {
+    fn default() -> Self {
+        Self {
+            enable_remote_sync: true,
+        }
+    }
+}
+
 #[async_recursion::async_recursion]
 pub async fn start(
     args: Args,
+    opts: StartOptions,
     dwn: Arc<DWN<impl DataStore + 'static, impl MessageStore + 'static>>,
 ) -> Result<()> {
     debug!("Processing args: {:?}", args);
 
     match args.command {
         Command::All => {
+            let mut opts = opts.clone();
+            opts.enable_remote_sync = false;
+
             tokio::select! {
-                res = start(Args::parse_from(["unavi-server", "social"]), dwn.clone()) => {
+                res = start(Args::parse_from(["unavi-server", "social"]), opts.clone(), dwn.clone()) => {
                     res?;
                 }
-                res = start(Args::parse_from(["unavi-server", "world"]), dwn) => {
+                res = start(Args::parse_from(["unavi-server", "world"]), opts, dwn) => {
                     res?;
                 }
             }
@@ -117,6 +134,7 @@ pub async fn start(
                 dwn,
                 port,
                 remote_dwn,
+                remote_sync: opts.enable_remote_sync,
                 storage,
             };
 

crates/unavi-server/src/main.rs

@@ -15,7 +15,7 @@ use surrealdb::{
     Surreal,
 };
 use tracing::{error, Level};
-use unavi_server::Storage;
+use unavi_server::{StartOptions, Storage};
 
 #[tokio::main]
 async fn main() {
@@ -42,7 +42,7 @@ async fn main() {
     };
     let dwn = Arc::new(DWN::from(store));
 
-    if let Err(e) = unavi_server::start(args, dwn).await {
+    if let Err(e) = unavi_server::start(args, StartOptions::default(), dwn).await {
         error!("{}", e);
     };
 }

crates/unavi-server/tests/world_host.rs

@@ -8,7 +8,7 @@ use dwn::{
 };
 use surrealdb::{engine::local::Mem, Surreal};
 use tracing_test::traced_test;
-use unavi_server::{Args, Command, Storage};
+use unavi_server::{Args, Command, StartOptions, Storage};
 use wired_social::protocols::world_host::{world_host_protocol_url, WORLD_HOST_PROTOCOL_VERSION};
 use wtransport::{ClientConfig, Endpoint, VarInt};
 
@@ -52,8 +52,10 @@ async fn test_world_host() {
     let store = SurrealStore::new(db).await.unwrap();
     let dwn = Arc::new(DWN::from(store));
 
-    let social_task = tokio::spawn(unavi_server::start(args_social, dwn.clone()));
-    let world_task = tokio::spawn(unavi_server::start(args_world, dwn));
+    let opts = StartOptions::default();
+
+    let social_task = tokio::spawn(unavi_server::start(args_social, opts.clone(), dwn.clone()));
+    let world_task = tokio::spawn(unavi_server::start(args_world, opts, dwn));
     tokio::time::sleep(Duration::from_secs(5)).await;
 
     // DID document is available.
@@ -72,9 +74,6 @@ async fn test_world_host() {
         .unwrap();
     assert_eq!(service_endpoint, remote_dwn);
 
-    // World host synced with social server.
-    assert!(logs_contain("Sync successful."));
-
     // Can query protocols and records using world host DID.
     let world_host_did = format!("did:web:localhost%3A{}", port_world);
 

crates/unavi-world-host/src/lib.rs

@@ -27,6 +27,7 @@ pub struct ServerOptions<D: DataStore, M: MessageStore> {
     pub dwn: Arc<DWN<D, M>>,
     pub port: u16,
     pub remote_dwn: String,
+    pub remote_sync: bool,
     pub storage: Storage,
 }
 
@@ -43,7 +44,10 @@ pub async fn start(opts: ServerOptions<impl DataStore, impl MessageStore>) -> st
         dwn: opts.dwn,
         storage: opts.storage.clone(),
     });
-    actor.add_remote(opts.remote_dwn.clone());
+
+    if opts.remote_sync {
+        actor.add_remote(opts.remote_dwn.clone());
+    }
 
     let document = did::document::create_document(&actor, opts.remote_dwn.clone());
 
@@ -59,14 +63,18 @@ pub async fn start(opts: ServerOptions<impl DataStore, impl MessageStore>) -> st
     tokio::time::sleep(Duration::from_secs(1)).await;
 
     // Sync first.
-    sync_retry(&mut actor).await;
+    if opts.remote_sync {
+        sync_retry(&mut actor).await;
+    }
 
     // Interact with DWN.
     let connect_url = format!("https://{}", opts.domain);
     world_host::create_world_host(&actor, &connect_url).await;
 
     // Sync after.
-    sync_retry(&mut actor).await;
+    if opts.remote_sync {
+        sync_retry(&mut actor).await;
+    }
 
     server.await??;
 

crates/unavi-world-server/src/connection/mod.rs

@@ -47,7 +47,7 @@ async fn handle_connection_impl<D: DataStore + 'static, M: MessageStore + 'stati
         tokio::select! {
             stream = session.accept_bi() => {
                 let stream = stream?;
-                info!("Accepted bi stream");
+                info!("Accepted bi stream.");
                 tokio::task::spawn_local(
                     bi_stream::handle_bi_stream(new_connection.id, dwn, stream).instrument(info_span!("bi"))
                 );