homycdev
/
lavina
forked from lavina/lavina
1
0
Fork 0
Code Pull Requests Activity

feat(xmpp): send muc messages to clients

This commit is contained in:
Nikita Vilunov 2023-04-11 16:42:09 +02:00
parent 58582f4e51
commit c44101d5d0
1 changed files with 70 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/projections/xmpp/mod.rs
View File

@ -291,33 +291,80 @@ async fn socket_final(
xml_writer.get_mut().flush().await?; xml_writer.get_mut().flush().await?;
let mut parser = proto::ClientPacket::parse(); let mut parser = proto::ClientPacket::parse();
loop { let mut events = vec![];
reader_buf.clear(); reader_buf.clear();
let (ns, event) = xml_reader let mut next_xml_event = Box::pin(xml_reader.read_resolved_event_into_async(reader_buf));
.read_resolved_event_into_async(reader_buf)
.await?; 'outer: loop {
if let Event::Text(ref e) = event { let should_recreate_xml_future = select! {
if e.iter().all(|x| *x == 0xA) { biased;
continue; res = &mut next_xml_event => 's: {
} let (ns, event) = res?;
} if let Event::Text(ref e) = event {
let mut events = vec![]; if e.iter().all(|x| *x == 0xA) {
match parser.consume(ns, &event) { break 's true;
Continuation::Final(res) => { }
let res = res?;
dbg!(&res);
let stop = handle_packet(&mut events, res, authenticated, user_handle).await?;
for i in &events {
xml_writer.write_event_async(i).await?;
} }
events.clear(); match parser.consume(ns, &event) {
xml_writer.get_mut().flush().await?; Continuation::Final(res) => {
if stop { let res = res?;
dbg!(&res);
let stop = handle_packet(&mut events, res, authenticated, user_handle).await?;
for i in &events {
xml_writer.write_event_async(i).await?;
}
events.clear();
xml_writer.get_mut().flush().await?;
if stop {
break 'outer;
}
parser = proto::ClientPacket::parse();
}
Continuation::Continue(p) => parser = p,
}
true
},
update = user_handle.receiver.recv() => {
if let Some(update) = update {
match update {
crate::core::player::Updates::NewMessage { room_id, author_id, body } => {
Message {
to: Some(Jid {
name: Some(authenticated.xmpp_name.clone()),
server: Server("localhost".into()),
resource: Some(authenticated.xmpp_resource.clone()),
}),
from: Some(Jid {
name: Some(Name(std::str::from_utf8(room_id.as_bytes())?.to_owned())),
server: Server("rooms.localhost".into()),
resource: Some(Resource(std::str::from_utf8(author_id.as_bytes())?.to_owned())),
}),
id: None,
r#type: xmpp::client::MessageType::Groupchat,
lang: None,
subject: None,
body: body,
}
.serialize(&mut events);
}
_ => {},
}
for i in &events {
xml_writer.write_event_async(i).await?;
}
events.clear();
xml_writer.get_mut().flush().await?;
} else {
log::warn!("Player is terminated, must terminate the connection");
break; break;
} }
parser = proto::ClientPacket::parse(); false
} }
Continuation::Continue(p) => parser = p,
};
if should_recreate_xml_future {
drop(next_xml_event);
next_xml_event = Box::pin(xml_reader.read_resolved_event_into_async(reader_buf));
} }
} }
Ok(()) Ok(())