Fix main & improve cursor sync (#101)

sync-server/src/app_state/cursors.rs

@@ -47,7 +47,7 @@ impl Cursors {
         all_device_cursors.retain(|c| &c.client_cursors.device_id != device_id);
         all_device_cursors.push(ClientCursorsWithTimeToLive::new(ClientCursors {
             user_name,
-            device_id: device_id.to_string(),
+            device_id: device_id.clone(),
             documents_with_cursors: document_to_cursors,
         }));
 
@@ -126,5 +126,7 @@ impl ClientCursorsWithTimeToLive {
         }
     }
 
-    pub fn is_expired(&self, ttl: Duration) -> bool { self.last_updated.elapsed() > ttl }
+    pub fn is_expired(&self, ttl: Duration) -> bool {
+        self.last_updated.elapsed() > ttl
+    }
 }

sync-server/src/app_state/database/models.rs

@@ -23,7 +23,9 @@ pub struct StoredDocumentVersion {
 }
 
 impl PartialEq<Self> for StoredDocumentVersion {
-    fn eq(&self, other: &Self) -> bool { self.vault_update_id == other.vault_update_id }
+    fn eq(&self, other: &Self) -> bool {
+        self.vault_update_id == other.vault_update_id
+    }
 }
 
 #[derive(TS, Debug, Clone, Serialize)]

sync-server/src/app_state/websocket/models.rs

@@ -23,8 +23,13 @@ pub struct CursorPositionFromClient {
 
 #[derive(TS, Serialize, Deserialize, Clone, Debug)]
 pub struct DocumentWithCursors {
-    #[ts(as = "u32")]
-    pub vault_update_id: VaultUpdateId,
+    // It's None in case the document is dirty.
+    // We still want to sync the cursor to mark
+    // that it exists and can be client-side
+    // interpolated. However, the actual
+    // position is meaningless.
+    #[ts(as = "Option<u32>")]
+    pub vault_update_id: Option<VaultUpdateId>,
 
     pub document_id: DocumentId,
     pub relative_path: String,

sync-server/src/server.rs

@@ -179,6 +179,10 @@ async fn shutdown_signal() {
     }
 }
 
-async fn handle_404() -> impl IntoResponse { not_found_error(anyhow!("Page not found")) }
+async fn handle_404() -> impl IntoResponse {
+    not_found_error(anyhow!("Page not found"))
+}
 
-async fn handle_405() -> impl IntoResponse { client_error(anyhow!("Method not allowed")) }
+async fn handle_405() -> impl IntoResponse {
+    client_error(anyhow!("Method not allowed"))
+}

sync-server/src/server/device_id_header.rs

@@ -6,7 +6,9 @@ pub struct DeviceIdHeader(pub String);
 pub static DEVICE_ID_HEADER_NAME: HeaderName = HeaderName::from_static("device-id");
 
 impl Header for DeviceIdHeader {
-    fn name() -> &'static HeaderName { &DEVICE_ID_HEADER_NAME }
+    fn name() -> &'static HeaderName {
+        &DEVICE_ID_HEADER_NAME
+    }
 
     fn decode<'i, I>(values: &mut I) -> Result<Self, headers::Error>
     where
@@ -26,7 +28,7 @@ impl Header for DeviceIdHeader {
     where
         E: Extend<HeaderValue>,
     {
-        let value = HeaderValue::from_static(Box::leak(self.0.to_string().into_boxed_str()));
+        let value = HeaderValue::from_static(Box::leak(self.0.clone().into_boxed_str()));
 
         values.extend(std::iter::once(value));
     }

sync-server/src/utils/normalize.rs

@@ -8,4 +8,6 @@ where
     Ok(normalize_string(&s))
 }
 
-pub fn normalize_string(s: &str) -> String { s.trim().to_lowercase() }
+pub fn normalize_string(s: &str) -> String {
+    s.trim().to_lowercase()
+}