|
|
|
|
@ -1,8 +1,11 @@
@@ -1,8 +1,11 @@
|
|
|
|
|
use std::{convert::TryFrom, time::SystemTime}; |
|
|
|
|
use std::{collections::HashSet, convert::TryFrom, time::SystemTime}; |
|
|
|
|
|
|
|
|
|
use crate::{server_server, utils, Error, Result}; |
|
|
|
|
use federation::transactions::send_transaction_message; |
|
|
|
|
use log::warn; |
|
|
|
|
use rocket::futures::stream::{FuturesUnordered, StreamExt}; |
|
|
|
|
use ruma::{api::federation, Raw, ServerName}; |
|
|
|
|
use sled::IVec; |
|
|
|
|
use tokio::select; |
|
|
|
|
|
|
|
|
|
pub struct Sending { |
|
|
|
|
@ -18,29 +21,87 @@ impl Sending {
@@ -18,29 +21,87 @@ impl Sending {
|
|
|
|
|
|
|
|
|
|
tokio::spawn(async move { |
|
|
|
|
let mut futures = FuturesUnordered::new(); |
|
|
|
|
let mut waiting_servers = HashSet::new(); |
|
|
|
|
|
|
|
|
|
let mut subscriber = serverpduids.watch_prefix(b""); |
|
|
|
|
loop { |
|
|
|
|
select! { |
|
|
|
|
Some(_) = futures.next() => {}, |
|
|
|
|
Some(server) = futures.next() => { |
|
|
|
|
warn!("response: {:?}", &server); |
|
|
|
|
match server { |
|
|
|
|
Ok((server, _response)) => { |
|
|
|
|
waiting_servers.remove(&server) |
|
|
|
|
} |
|
|
|
|
Err((server, _e)) => { |
|
|
|
|
waiting_servers.remove(&server) |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
Some(event) = &mut subscriber => { |
|
|
|
|
let serverpduid = if let sled::Event::Insert {key, ..} = event { |
|
|
|
|
key |
|
|
|
|
} else |
|
|
|
|
{ return Err::<(), Error>(Error::bad_database("")); }; |
|
|
|
|
if let sled::Event::Insert { key, .. } = event { |
|
|
|
|
let serverpduid = key.clone(); |
|
|
|
|
let mut parts = serverpduid.splitn(2, |&b| b == 0xff); |
|
|
|
|
let server = Box::<ServerName>::try_from( |
|
|
|
|
utils::string_from_bytes(parts.next().expect("splitn will always return 1 or more elements")) |
|
|
|
|
.map_err(|_| Error::bad_database("ServerName in serverpduid bytes are invalid."))? |
|
|
|
|
).map_err(|_| Error::bad_database("ServerName in serverpduid is invalid."))?; |
|
|
|
|
|
|
|
|
|
let pdu_id = parts.next().ok_or_else(|| Error::bad_database("Invalid serverpduid in db."))?; |
|
|
|
|
let mut pdu_json = rooms.get_pdu_json_from_id(&pdu_id.into())?.ok_or_else(|| Error::bad_database("Event in serverpduids not found in db."))?; |
|
|
|
|
if let Some((server, pdu_id)) = utils::string_from_bytes( |
|
|
|
|
parts |
|
|
|
|
.next() |
|
|
|
|
.expect("splitn will always return 1 or more elements"), |
|
|
|
|
) |
|
|
|
|
.map_err(|_| Error::bad_database("ServerName in serverpduid bytes are invalid.")) |
|
|
|
|
.and_then(|server_str|Box::<ServerName>::try_from(server_str) |
|
|
|
|
.map_err(|_| Error::bad_database("ServerName in serverpduid is invalid."))) |
|
|
|
|
.ok() |
|
|
|
|
.filter(|server| waiting_servers.insert(server.clone())) |
|
|
|
|
.and_then(|server| parts |
|
|
|
|
.next() |
|
|
|
|
.ok_or_else(|| Error::bad_database("Invalid serverpduid in db.")).ok().map(|pdu_id| (server, pdu_id))) |
|
|
|
|
{ |
|
|
|
|
futures.push(Self::handle_event(server, pdu_id.into(), &globals, &rooms)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
pub fn send_pdu(&self, server: Box<ServerName>, pdu_id: &[u8]) -> Result<()> { |
|
|
|
|
let mut key = server.as_bytes().to_vec(); |
|
|
|
|
key.push(0xff); |
|
|
|
|
key.extend_from_slice(pdu_id); |
|
|
|
|
self.serverpduids.insert(key, b"")?; |
|
|
|
|
|
|
|
|
|
Ok(()) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
async fn handle_event( |
|
|
|
|
server: Box<ServerName>, |
|
|
|
|
pdu_id: IVec, |
|
|
|
|
globals: &super::globals::Globals, |
|
|
|
|
rooms: &super::rooms::Rooms, |
|
|
|
|
) -> std::result::Result< |
|
|
|
|
(Box<ServerName>, send_transaction_message::v1::Response), |
|
|
|
|
(Box<ServerName>, Error), |
|
|
|
|
> { |
|
|
|
|
let mut pdu_json = rooms |
|
|
|
|
.get_pdu_json_from_id(&pdu_id) |
|
|
|
|
.map_err(|e| (server.clone(), e))? |
|
|
|
|
.ok_or_else(|| { |
|
|
|
|
( |
|
|
|
|
server.clone(), |
|
|
|
|
Error::bad_database("Event in serverpduids not found in db."), |
|
|
|
|
) |
|
|
|
|
})?; |
|
|
|
|
|
|
|
|
|
if let Some(unsigned) = pdu_json |
|
|
|
|
.as_object_mut() |
|
|
|
|
.expect("json is object") |
|
|
|
|
.get_mut("unsigned") { |
|
|
|
|
unsigned.as_object_mut().expect("unsigned is object").remove("transaction_id"); |
|
|
|
|
.get_mut("unsigned") |
|
|
|
|
{ |
|
|
|
|
unsigned |
|
|
|
|
.as_object_mut() |
|
|
|
|
.expect("unsigned is object") |
|
|
|
|
.remove("transaction_id"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
pdu_json |
|
|
|
|
@ -53,38 +114,22 @@ impl Sending {
@@ -53,38 +114,22 @@ impl Sending {
|
|
|
|
|
|
|
|
|
|
let globals = &globals; |
|
|
|
|
|
|
|
|
|
futures.push( |
|
|
|
|
async move { |
|
|
|
|
let pdus = vec![raw_json]; |
|
|
|
|
let transaction_id = utils::random_string(16); |
|
|
|
|
|
|
|
|
|
server_server::send_request( |
|
|
|
|
&globals, |
|
|
|
|
server, |
|
|
|
|
federation::transactions::send_transaction_message::v1::Request { |
|
|
|
|
server.clone(), |
|
|
|
|
send_transaction_message::v1::Request { |
|
|
|
|
origin: globals.server_name(), |
|
|
|
|
pdus: &pdus, |
|
|
|
|
edus: &[], |
|
|
|
|
origin_server_ts: SystemTime::now(), |
|
|
|
|
transaction_id: &transaction_id, |
|
|
|
|
}, |
|
|
|
|
).await |
|
|
|
|
} |
|
|
|
|
); |
|
|
|
|
}, |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
/* |
|
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
pub fn send_pdu(&self, server: Box<ServerName>, pdu_id: &[u8]) -> Result<()> { |
|
|
|
|
let mut key = server.as_bytes().to_vec(); |
|
|
|
|
key.push(0xff); |
|
|
|
|
key.extend_from_slice(pdu_id); |
|
|
|
|
self.serverpduids.insert(key, b"")?; |
|
|
|
|
|
|
|
|
|
Ok(()) |
|
|
|
|
) |
|
|
|
|
.await |
|
|
|
|
.map(|response| (server.clone(), response)) |
|
|
|
|
.map_err(|e| (server, e)) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
Timo Kösters
5 years ago