Update dependencies and improve syncback handling

- Updated versions of several dependencies in `Cargo.lock`, including `async-compression` (0.4.40), `aws-lc-rs` (1.16.0), `bumpalo` (3.20.1), and `compression-codecs` (0.4.37), ensuring compatibility and access to the latest features and fixes.
- Refactored the `fire` method in `SyncbackSignal` to return a boolean indicating whether a syncback was successfully initiated, preventing concurrent syncbacks.
- Enhanced error handling in the API syncback process to return a conflict response if a syncback is already in progress.
- Improved the `serve.rs` file by replacing `forget` with `drop` for better memory management and added checks to ensure service chunk integrity during live syncback operations.
- Added new tests for edge cases and resilience in live syncback functionality, ensuring robustness against malformed data and rapid sequential requests.

These changes aim to enhance the reliability and performance of the syncback feature while keeping dependencies up to date.

src/cli/serve.rs

@@ -1,7 +1,6 @@
 use std::{
     collections::HashMap,
     io::Cursor,
-    mem::forget,
     net::{IpAddr, Ipv4Addr, SocketAddr},
     path::{Path, PathBuf},
     sync::Arc,
@@ -58,7 +57,7 @@ impl ServeCommand {
                 .port
                 .or_else(|| session.project_port())
                 .unwrap_or(DEFAULT_PORT);
-            forget(session);
+            drop(session);
             (ip, port)
         };
 
@@ -83,8 +82,12 @@ impl ServeCommand {
             match server.start(addr) {
                 ServerExitReason::SyncbackRequested(payload) => {
                     log::info!("Live syncback requested, running...");
-                    run_live_syncback(&project_path, payload)?;
-                    log::info!("Syncback complete, restarting serve...");
+                    match run_live_syncback(&project_path, payload) {
+                        Ok(()) => log::info!("Syncback complete, restarting serve..."),
+                        Err(err) => {
+                            log::error!("Live syncback failed: {err:#}. Restarting serve...")
+                        }
+                    }
                     continue;
                 }
             }
@@ -132,7 +135,7 @@ fn run_live_syncback(project_path: &Path, payload: SyncbackPayload) -> anyhow::R
 
     crate::git::refresh_git_index(base_path);
 
-    forget(session_old);
+    drop(session_old);
 
     Ok(())
 }
@@ -184,7 +187,15 @@ fn build_dom_from_chunks(payload: SyncbackPayload) -> anyhow::Result<WeakDom> {
         let child_count = chunk.child_count as usize;
         let ref_count = chunk.ref_target_count as usize;
         let total = child_count + ref_count;
-        let end = (cursor + total).min(cloned_children.len());
+        let end = cursor + total;
+        anyhow::ensure!(
+            end <= cloned_children.len(),
+            "Service '{}' claims {} children + {} carriers but only {} instances remain in blob",
+            chunk.class_name,
+            child_count,
+            ref_count,
+            cloned_children.len().saturating_sub(cursor)
+        );
         let service_range: Vec<Ref> = cloned_children[cursor..end].to_vec();
 
         for &child_ref in &service_range[..child_count.min(service_range.len())] {
@@ -210,6 +221,13 @@ fn build_dom_from_chunks(payload: SyncbackPayload) -> anyhow::Result<WeakDom> {
         cursor = end;
     }
 
+    anyhow::ensure!(
+        cursor == cloned_children.len(),
+        "Service chunks account for {} instances but rbxm blob contains {}",
+        cursor,
+        cloned_children.len()
+    );
+
     for &service_name in VISIBLE_SERVICES {
         if !created_services.contains(service_name) {
             dom.insert(root_ref, InstanceBuilder::new(service_name));

src/snapshot/matching.rs

@@ -1528,16 +1528,10 @@ mod tests {
                 .insert(ustr("Transparency"), Variant::Float32(0.0));
             s
         };
-        let tree_model_grip_snap = make_snapshot_with_children(
-            "Weapon",
-            "Model",
-            vec![tree_child_grip],
-        );
-        let tree_model_handle_snap = make_snapshot_with_children(
-            "Weapon",
-            "Model",
-            vec![tree_child_handle],
-        );
+        let tree_model_grip_snap =
+            make_snapshot_with_children("Weapon", "Model", vec![tree_child_grip]);
+        let tree_model_handle_snap =
+            make_snapshot_with_children("Weapon", "Model", vec![tree_child_handle]);
 
         let (tree2, tree_refs2) =
             make_tree_from_snapshots(vec![tree_model_grip_snap, tree_model_handle_snap]);
@@ -1559,11 +1553,8 @@ mod tests {
             s
         };
         let snap_grip2 = {
-            let mut s = make_snapshot_with_children(
-                "Weapon",
-                "Model",
-                vec![make_snapshot("Grip", "Part")],
-            );
+            let mut s =
+                make_snapshot_with_children("Weapon", "Model", vec![make_snapshot("Grip", "Part")]);
             s.properties
                 .insert(ustr("PrimaryPart"), Variant::Ref(tree2_grip_ref));
             s

src/syncback/matching.rs

@@ -880,10 +880,8 @@ mod tests {
         let mut new_dom = WeakDom::new(InstanceBuilder::new("DataModel"));
         let new_root = new_dom.root_ref();
 
-        let new_model_a = new_dom.insert(
-            new_root,
-            InstanceBuilder::new("Model").with_name("Weapon"),
-        );
+        let new_model_a =
+            new_dom.insert(new_root, InstanceBuilder::new("Model").with_name("Weapon"));
         let new_handle = new_dom.insert(
             new_model_a,
             InstanceBuilder::new("Part").with_name("Handle"),
@@ -894,14 +892,9 @@ mod tests {
             .properties
             .insert("PrimaryPart".into(), Variant::Ref(new_handle));
 
-        let new_model_b = new_dom.insert(
-            new_root,
-            InstanceBuilder::new("Model").with_name("Weapon"),
-        );
-        let new_grip = new_dom.insert(
-            new_model_b,
-            InstanceBuilder::new("Part").with_name("Grip"),
-        );
+        let new_model_b =
+            new_dom.insert(new_root, InstanceBuilder::new("Model").with_name("Weapon"));
+        let new_grip = new_dom.insert(new_model_b, InstanceBuilder::new("Part").with_name("Grip"));
         new_dom
             .get_by_ref_mut(new_model_b)
             .unwrap()
@@ -912,24 +905,17 @@ mod tests {
         let mut old_dom = WeakDom::new(InstanceBuilder::new("DataModel"));
         let old_root = old_dom.root_ref();
 
-        let old_model_b = old_dom.insert(
-            old_root,
-            InstanceBuilder::new("Model").with_name("Weapon"),
-        );
-        let old_grip = old_dom.insert(
-            old_model_b,
-            InstanceBuilder::new("Part").with_name("Grip"),
-        );
+        let old_model_b =
+            old_dom.insert(old_root, InstanceBuilder::new("Model").with_name("Weapon"));
+        let old_grip = old_dom.insert(old_model_b, InstanceBuilder::new("Part").with_name("Grip"));
         old_dom
             .get_by_ref_mut(old_model_b)
             .unwrap()
             .properties
             .insert("PrimaryPart".into(), Variant::Ref(old_grip));
 
-        let old_model_a = old_dom.insert(
-            old_root,
-            InstanceBuilder::new("Model").with_name("Weapon"),
-        );
+        let old_model_a =
+            old_dom.insert(old_root, InstanceBuilder::new("Model").with_name("Weapon"));
         let old_handle = old_dom.insert(
             old_model_a,
             InstanceBuilder::new("Part").with_name("Handle"),
@@ -961,14 +947,8 @@ mod tests {
             let new_inst = new_dom.get_by_ref(*new_ref).unwrap();
             let old_inst = old_dom.get_by_ref(*old_ref).unwrap();
 
-            let new_child_name = &new_dom
-                .get_by_ref(new_inst.children()[0])
-                .unwrap()
-                .name;
-            let old_child_name = &old_dom
-                .get_by_ref(old_inst.children()[0])
-                .unwrap()
-                .name;
+            let new_child_name = &new_dom.get_by_ref(new_inst.children()[0]).unwrap().name;
+            let old_child_name = &old_dom.get_by_ref(old_inst.children()[0]).unwrap().name;
             assert_eq!(
                 new_child_name, old_child_name,
                 "Ref scoring failed: new model with child '{}' matched old model with child '{}'",

src/web/api.rs

@@ -256,7 +256,12 @@ async fn handle_api_syncback(
         data: syncback_request.data,
         services: syncback_request.services,
     };
-    syncback_signal.fire(payload);
+    if !syncback_signal.fire(payload) {
+        return msgpack(
+            ErrorResponse::bad_request("A syncback is already in progress"),
+            StatusCode::CONFLICT,
+        );
+    }
 
     msgpack_ok(serde_json::json!({"status": "syncback_initiated"}))
 }

src/web/interface.rs

@@ -29,7 +29,7 @@ pub const PROTOCOL_VERSION: u64 = 6;
 
 /// Metadata for a single service in the live syncback request.
 ///
-/// Children are NOT stored here — they live in the top-level `data` blob
+/// Children are NOT stored here -- they live in the top-level `data` blob
 /// (a single rbxm containing all children from all services).
 ///
 /// Each service's range in the blob is `child_count + ref_target_count`
@@ -37,10 +37,9 @@ pub const PROTOCOL_VERSION: u64 = 6;
 /// to the service). The next `ref_target_count` are ObjectValue carriers
 /// whose `Value` property holds a Ref to the actual target.
 ///
-/// `refs` maps property names to 1-based indices into the carrier slice
-/// (the ObjectValue entries after the children). Index 1 is the first
-/// carrier, 2 the second, etc. The server reads carriers via
-/// `carriers[idx - 1]`.
+/// `refs` maps property names to 1-based indices into the carrier subrange
+/// (NOT the full service range). Index 1 = first carrier, index 2 = second,
+/// etc. Index 0 or out-of-range values are ignored (treated as nil).
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ServiceChunk {

src/web/mod.rs

@@ -40,9 +40,14 @@ impl SyncbackSignal {
         }
     }
 
-    pub fn fire(&self, payload: SyncbackPayload) {
-        *self.payload.lock().unwrap_or_else(|e| e.into_inner()) = Some(payload);
+    pub fn fire(&self, payload: SyncbackPayload) -> bool {
+        let mut guard = self.payload.lock().unwrap_or_else(|e| e.into_inner());
+        if guard.is_some() {
+            return false;
+        }
+        *guard = Some(payload);
         self.notify.notify_one();
+        true
     }
 
     pub fn take_payload(&self) -> Option<SyncbackPayload> {