mirror of
https://forgejo.ellis.link/continuwuation/continuwuity.git
synced 2026-11-16 05:36:50 +00:00
fix(federation): Queue PDUs during remote joins
This commit is contained in:
1 parent
0907323588
commit
df95abf5ab
8 files changed
+141
-10
No files matched your search
@@ -7,6 +7,7 @@ mod handle_incoming_pdu;
|
||||
mod handle_outlier_pdu;
|
||||
mod parse_incoming_pdu;
|
||||
pub mod pdu_checks;
|
||||
mod pending_join_pdus;
|
||||
mod policy_server;
|
||||
mod resolve_state;
|
||||
mod state_at_incoming;
|
||||
@@ -20,9 +21,10 @@ pub use fetch_and_handle_outliers::{
|
||||
DagBuilderTree, GET_MISSING_EVENTS_MAX_BATCH_SIZE, build_local_dag,
|
||||
};
|
||||
use ruma::{
|
||||
OwnedEventId, OwnedRoomId, events::room::create::RoomCreateEventContent,
|
||||
OwnedEventId, OwnedRoomId, OwnedServerName, events::room::create::RoomCreateEventContent,
|
||||
room_version_rules::RoomVersionRules,
|
||||
};
|
||||
use serde_json::value::RawValue as RawJsonValue;
|
||||
use tokio::sync::{Notify, mpsc};
|
||||
|
||||
use crate::{Dep, globals, rooms, sending, server_keys};
|
||||
@@ -30,6 +32,7 @@ pub struct Service {
|
||||
pub mutex_federation: RoomMutexMap,
|
||||
pub federation_handletime: SyncRwLock<HandleTimeMap>,
|
||||
pub extremity_squashers: SyncRwLock<HashMap<OwnedRoomId, mpsc::Sender<(usize, bool)>>>,
|
||||
joining_rooms: SyncRwLock<HashMap<OwnedRoomId, mpsc::Sender<PendingJoinPdu>>>,
|
||||
services: Services,
|
||||
server_shutdown: Notify,
|
||||
me: std::sync::Weak<Self>,
|
||||
@@ -55,6 +58,11 @@ struct Services {
|
||||
type RoomMutexMap = MutexMap<OwnedRoomId, ()>;
|
||||
type HandleTimeMap = HashMap<OwnedRoomId, (OwnedEventId, Instant)>;
|
||||
|
||||
enum PendingJoinPdu {
|
||||
Pdu(OwnedServerName, Box<RawJsonValue>),
|
||||
Complete,
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl crate::Service for Service {
|
||||
fn build(args: crate::Args<'_>) -> Result<Arc<Self>> {
|
||||
@@ -63,6 +71,7 @@ impl crate::Service for Service {
|
||||
mutex_federation: RoomMutexMap::new(),
|
||||
federation_handletime: HandleTimeMap::new().into(),
|
||||
extremity_squashers: SyncRwLock::new(HashMap::new()),
|
||||
joining_rooms: HashMap::new().into(),
|
||||
services: Services {
|
||||
globals: args.depend::<globals::Service>("globals"),
|
||||
sending: args.depend::<sending::Service>("sending"),
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
use conduwuit::{debug, debug_warn};
|
||||
use ruma::{CanonicalJsonObject, RoomId, ServerName};
|
||||
use serde_json::value::RawValue as RawJsonValue;
|
||||
|
||||
impl super::Service {
|
||||
pub fn begin_remote_join(&self, room_id: &RoomId) {
|
||||
let (tx, mut rx) = tokio::sync::mpsc::channel(
|
||||
self.services.server.config.remote_join_pdu_queue_capacity,
|
||||
);
|
||||
self.joining_rooms.write().insert(room_id.to_owned(), tx);
|
||||
let Some(service) = self.me.upgrade() else {
|
||||
return;
|
||||
};
|
||||
let room_id = room_id.to_owned();
|
||||
|
||||
self.services.server.runtime().spawn(async move {
|
||||
let mut pdus = Vec::new();
|
||||
let mut complete = false;
|
||||
while let Some(pdu) = rx.recv().await {
|
||||
match pdu {
|
||||
| super::PendingJoinPdu::Pdu(origin, pdu) => pdus.push((origin, pdu)),
|
||||
| super::PendingJoinPdu::Complete => {
|
||||
complete = true;
|
||||
break;
|
||||
},
|
||||
}
|
||||
}
|
||||
if !complete {
|
||||
return;
|
||||
}
|
||||
let _room_lock = service.mutex_federation.lock(room_id.as_str()).await;
|
||||
|
||||
for (origin, pdu) in pdus {
|
||||
let Ok((room_id, event_id, value)) = service.parse_incoming_pdu(&pdu, None).await
|
||||
else {
|
||||
debug_warn!("Failed to parse PDU queued during remote join");
|
||||
continue;
|
||||
};
|
||||
if let Err(error) = service
|
||||
.handle_incoming_pdu(&origin, &room_id, &event_id, value, false)
|
||||
.await
|
||||
{
|
||||
debug_warn!(%room_id, %event_id, "Failed to process PDU queued during remote join: {error}");
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
pub fn cancel_remote_join(&self, room_id: &RoomId) {
|
||||
self.joining_rooms.write().remove(room_id);
|
||||
}
|
||||
|
||||
pub fn queue_pending_join_pdu(&self, origin: &ServerName, pdu: Box<RawJsonValue>) -> bool {
|
||||
let Ok(value) = serde_json::from_str::<CanonicalJsonObject>(pdu.get()) else {
|
||||
return false;
|
||||
};
|
||||
let Some(room_id) = value.get("room_id").and_then(|value| value.as_str()) else {
|
||||
return false;
|
||||
};
|
||||
let Ok(room_id) = RoomId::parse(room_id) else {
|
||||
return false;
|
||||
};
|
||||
let joining_rooms = self.joining_rooms.read();
|
||||
let Some(tx) = joining_rooms.get(&room_id) else {
|
||||
return false;
|
||||
};
|
||||
let pdu = super::PendingJoinPdu::Pdu(origin.to_owned(), pdu);
|
||||
if tx.try_send(pdu).is_err() {
|
||||
debug_warn!(%room_id, "Dropping PDU received during remote join because the queue is full");
|
||||
} else {
|
||||
debug!(%room_id, "Queued PDU received during remote join");
|
||||
}
|
||||
true
|
||||
}
|
||||
|
||||
pub async fn process_pending_join_pdus(&self, room_id: &RoomId) {
|
||||
let Some(tx) = self.joining_rooms.write().remove(room_id) else {
|
||||
return;
|
||||
};
|
||||
let _ = tx.send(super::PendingJoinPdu::Complete).await;
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,8 @@
|
||||
use std::{collections::HashMap, sync::Arc};
|
||||
|
||||
use conduwuit::{
|
||||
Err, Event, Pdu, Result, Server, debug, debug_info, debug_warn, err, error, info, is_true,
|
||||
Err, Event, Pdu, Result, Server, debug, debug_info, debug_warn, defer, err, error, info,
|
||||
is_true,
|
||||
matrix::{
|
||||
StateKey,
|
||||
event::{gen_event_id, gen_event_id_canonical_json},
|
||||
@@ -404,6 +405,8 @@ impl Service {
|
||||
.mutex_federation
|
||||
.lock(room_id.as_str())
|
||||
.await;
|
||||
self.services.event_handler.begin_remote_join(room_id);
|
||||
defer! {{ self.services.event_handler.cancel_remote_join(room_id); }}
|
||||
info!("Asking {remote_server} for send_join in room {room_id}");
|
||||
let send_join_response = match self
|
||||
.services
|
||||
@@ -675,6 +678,10 @@ impl Service {
|
||||
drop(cork);
|
||||
|
||||
self.services.sync.wake_all_joined(room_id).await;
|
||||
self.services
|
||||
.event_handler
|
||||
.process_pending_join_pdus(room_id)
|
||||
.await;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user