refactor: move wait_for_server() into client

Author: ErikBjare

aw-client-rust/src/blocking.rs

@@ -79,4 +79,8 @@ impl AwClient {
     proxy_method!(delete_event, (), bucketname: &str, event_id: i64);
     proxy_method!(get_event_count, i64, bucketname: &str);
     proxy_method!(get_info, aw_models::Info,);
+
+    pub fn wait_for_server(&self) -> Result<(), Box<dyn Error>> {
+        self.client.wait_for_server()
+    }
 }

aw-client-rust/src/lib.rs

@@ -11,6 +11,8 @@ use std::{collections::HashMap, error::Error};
 
 use chrono::{DateTime, Utc};
 use serde_json::{json, Map};
+use std::net::TcpStream;
+use std::time::Duration;
 
 pub use aw_models::{Bucket, BucketMetadata, Event};
 
@@ -221,4 +223,37 @@ impl AwClient {
         let url = format!("{}/api/0/info", self.baseurl);
         self.client.get(url).send().await?.json().await
     }
+
+    // TODO: make async
+    pub fn wait_for_server(&self) -> Result<(), Box<dyn Error>> {
+        let socket_addrs = self.baseurl.socket_addrs(|| None)?;
+        let socket_addr = socket_addrs.first()
+            .ok_or("Unable to resolve baseurl into socket address")?;
+
+        // Check if server is running with exponential backoff
+        let mut retry_delay = Duration::from_millis(100);
+        let max_wait = Duration::from_secs(10);
+        let mut total_wait = Duration::from_secs(0);
+
+        while total_wait < max_wait {
+            match TcpStream::connect_timeout(socket_addr, retry_delay) {
+                Ok(_) => break,
+                Err(_) => {
+                    std::thread::sleep(retry_delay);
+                    total_wait += retry_delay;
+                    retry_delay *= 2;
+                }
+            }
+        }
+
+        if total_wait >= max_wait {
+            return Err(format!(
+                "Local server {} not running after 10 seconds of retrying",
+                socket_addr
+            )
+            .into());
+        }
+
+        Ok(())
+    }
 }

aw-sync/src/sync_wrapper.rs

@@ -14,41 +14,8 @@ pub fn pull_all(client: &AwClient) -> Result<(), Box<dyn Error>> {
     Ok(())
 }
 
-fn wait_for_server(socket_addr: &std::net::SocketAddr) -> Result<(), Box<dyn Error>> {
-    // Check if server is running with exponential backoff
-    let mut retry_delay = Duration::from_millis(100);
-    let max_wait = Duration::from_secs(10);
-    let mut total_wait = Duration::from_secs(0);
-
-    while total_wait < max_wait {
-        match TcpStream::connect_timeout(socket_addr, retry_delay) {
-            Ok(_) => break,
-            Err(_) => {
-                std::thread::sleep(retry_delay);
-                total_wait += retry_delay;
-                retry_delay *= 2;
-            }
-        }
-    }
-
-    if total_wait >= max_wait {
-        return Err(format!(
-            "Local server {} not running after 10 seconds of retrying",
-            socket_addr
-        )
-        .into());
-    }
-
-    Ok(())
-}
-
 pub fn pull(host: &str, client: &AwClient) -> Result<(), Box<dyn Error>> {
-    let socket_addrs = client.baseurl.socket_addrs(|| None)?;
-    let socket_addr = socket_addrs
-        .get(0)
-        .ok_or("Unable to resolve baseurl into socket address")?;
-
-    wait_for_server(socket_addr)?;
+    client.wait_for_server()?;
 
     // Path to the sync folder
     // Sync folder is structured ./{hostname}/{device_id}/test.db