Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix: add git blame view bad merge (#4446)

Wolf Mermelstein4cdc0cb657bf
diff --git a/rust/sync-service/src/d1.rs b/rust/sync-service/src/d1.rs
index b4a40e00ff..c539c94dbd 100644
--- a/rust/sync-service/src/d1.rs
+++ b/rust/sync-service/src/d1.rs
@@ -105,10 +105,7 @@ const BATCH_CHUNK_SIZE: usize = 100;
/// Bulk-upsert a list of buffered blame events. Uses D1's `batch()` so all
/// events in a chunk commit in a single round-trip.
-pub async fn insert_blame_many(
- env: &worker::Env,
- events: &[BlameEvent],
-) -> worker::Result<()> {
+pub async fn insert_blame_many(env: &worker::Env, events: &[BlameEvent]) -> worker::Result<()> {
if events.is_empty() {
return Ok(());
}
@@ -140,7 +137,6 @@ pub async fn insert_blame_many(
Ok(())
}
-
#[derive(serde::Deserialize, serde::Serialize)]
pub struct BlameRow {
pub peer_id: String,
diff --git a/rust/sync-service/src/durable_object.rs b/rust/sync-service/src/durable_object.rs
index d1d6ae6862..acb1d201ec 100644
--- a/rust/sync-service/src/durable_object.rs
+++ b/rust/sync-service/src/durable_object.rs
@@ -11,7 +11,7 @@ use matchit::Router;
use serde::{Deserialize, Serialize};
use tracing::{debug, error, info, instrument, trace, warn};
use worker::{
- Context, Cors, Date, DurableObject, Env, Error, Method, Request, Response, ResponseBody,
+ Cors, Date, DurableObject, Env, Error, Method, Request, Response, ResponseBody,
ResponseBuilder, Result, ScheduledTime, State, WebSocket, WebSocketIncomingMessage,
WebSocketPair, durable_object,
};
diff --git a/rust/sync-service/src/state.rs b/rust/sync-service/src/state.rs
index 28e32599d9..d534003c84 100644
--- a/rust/sync-service/src/state.rs
+++ b/rust/sync-service/src/state.rs
@@ -1,7 +1,8 @@
use std::{borrow::Cow, sync::Mutex};
-use loro::{Container, ContainerID, ExportMode, Frontiers, LoroDoc, LoroValue, ToJson};
-use loro::{ExportMode, Frontiers, LoroDoc, ToJson, VersionVector};
+use loro::{
+ Container, ContainerID, ExportMode, Frontiers, LoroDoc, LoroValue, ToJson, VersionVector,
+};
use tracing::debug;
use web_time::Instant;
use worker::Result;
@@ -138,7 +139,9 @@ impl DocumentState {
let Container::Map(map) = container else {
continue;
};
- let Some(meta_voc) = map.get("$") else { continue };
+ let Some(meta_voc) = map.get("$") else {
+ continue;
+ };
let Some(Container::Map(meta_map)) = meta_voc.into_container().ok() else {
continue;
};
diff --git a/rust/sync-service/src/websocket.rs b/rust/sync-service/src/websocket.rs
index 74e7d19a7c..7b584eae54 100644
--- a/rust/sync-service/src/websocket.rs
+++ b/rust/sync-service/src/websocket.rs
@@ -14,13 +14,6 @@ use crate::{
storage::SessionStorage,
};
-fn now_ms() -> i64 {
- web_time::SystemTime::now()
- .duration_since(web_time::UNIX_EPOCH)
- .map(|d| d.as_millis() as i64)
- .unwrap_or(0)
-}
-
fn serialize<'a, T: bebop::Record<'a>>(
obj: T,
msg_buf: &mut Vec<u8>,
@@ -119,50 +112,32 @@ pub async fn process_message(
tracing::warn!("received update from peer without edit permission");
return Ok(());
}
- let touched_nodes = session_storage
- .append_pending_operation(&update, document_state)
- .await?;
-
- if !touched_nodes.is_empty() {
- let peer_ids = Wsm::new(dss, ws).get_peer_ids().await.unwrap_or_default();
- if let Some(&peer_id) = peer_ids.first() {
- let now_ms = now_ms();
- dss.push_blame_events(
- touched_nodes
- .into_iter()
- .map(|node_id| crate::d1::BlameEvent {
- document_id: document_id.to_string(),
- node_id,
- peer_id,
- timestamp_ms: now_ms,
- })
- .collect(),
- );
- }
- }
-
- {
- // ACK the sender first: the update is durably stored at this
- // point, and a failed send to some *other* peer must not block
- // the ack, or the sender tears down a healthy connection. The
- // reverse holds too — if the sender's socket is broken the
- // peers below must still receive the update (the sender will
- // re-send it after reconnecting, which is a harmless
- // duplicate), so a failed ack is logged rather than returned.
- let message = FromRemote::RemoteUpdateAck {
- update: SliceWrapper::Raw(&update),
- };
- let mut buf = buf.lock("serialize RemoteUpdateAck in PeerUpdate handler");
- let serialized =
- serialize(message, &mut buf).context("Failed serializing update")?;
- if let Err(e) = ws.send_with_bytes(serialized) {
- tracing::warn!(error = ?e, "failed to send ack to the update's sender");
- }
+ let peer_ids = Wsm::new(dss, ws).get_peer_ids().await.unwrap_or_default();
+ let peer_id = peer_ids.first().copied();
+ let now_ms = web_time::SystemTime::now()
+ .duration_since(web_time::UNIX_EPOCH)
+ .map(|d| d.as_millis() as i64)
+ .unwrap_or(0);
for update in &updates {
- session_storage
+ let touched_nodes = session_storage
.append_pending_operation(update, document_state)
.await?;
+ if !touched_nodes.is_empty() {
+ if let Some(peer_id) = peer_id {
+ dss.push_blame_events(
+ touched_nodes
+ .into_iter()
+ .map(|node_id| crate::d1::BlameEvent {
+ document_id: document_id.to_string(),
+ node_id,
+ peer_id,
+ timestamp_ms: now_ms,
+ })
+ .collect(),
+ );
+ }
+ }
}
{