feat(lib): chat-room protocol (list, join, leave, say) with events
Implement the Soulseek chat-room server messages against soulfind's wire format: - MessageFactory builders: room-list request (64), join (14), leave (15), say (13). - Handlers parsing the server side: RoomList (64) names+counts, JoinRoom (14) membership, SayChatroom (13), UserJoinedRoom (16), UserLeftRoom (17), LeaveRoom (15). - Surface everything to the client as a drained RoomEvent stream plus a room-list snapshot; new Client API: request_room_list, join_room, leave_room, say_in_room, room_list, take_room_events. Unit tests cover each builder and handler; server-gated e2e tests exercise message delivery and room listing against soulfind.
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
use crate::{
|
||||
actor::server_actor::ServerMessage,
|
||||
message::{Message, MessageHandler},
|
||||
types::RoomInfo,
|
||||
};
|
||||
use std::sync::mpsc::Sender;
|
||||
|
||||
@@ -11,8 +12,101 @@ impl MessageHandler<ServerMessage> for RoomListHandler {
|
||||
64
|
||||
}
|
||||
|
||||
fn handle(&self, _message: &mut Message, _sender: Sender<ServerMessage>) {
|
||||
// Room listing is not yet exposed to the client; this handler exists
|
||||
// so the dispatcher can ack code 64 without logging an unknown message.
|
||||
fn handle(&self, message: &mut Message, sender: Sender<ServerMessage>) {
|
||||
let rooms = parse_room_list(message);
|
||||
let _ = sender.send(ServerMessage::RoomListReceived(rooms));
|
||||
}
|
||||
}
|
||||
|
||||
/// Parse the public rooms out of a `RoomList` (code 64) message: a vector of
|
||||
/// room names followed by a vector of user counts. The remaining private-room
|
||||
/// sections are ignored. `message` must be positioned at the payload (the
|
||||
/// dispatcher sets pointer 8).
|
||||
#[must_use]
|
||||
pub fn parse_room_list(message: &mut Message) -> Vec<RoomInfo> {
|
||||
let name_count = message.read_int32();
|
||||
let mut names = Vec::new();
|
||||
for _ in 0..name_count {
|
||||
names.push(message.read_string());
|
||||
}
|
||||
let count_count = message.read_int32();
|
||||
let mut counts = Vec::new();
|
||||
for _ in 0..count_count {
|
||||
counts.push(message.read_int32());
|
||||
}
|
||||
names
|
||||
.into_iter()
|
||||
.zip(counts)
|
||||
.map(|(name, user_count)| RoomInfo { name, user_count })
|
||||
.collect()
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
/// Build a received message (8-byte header + payload) and position it the
|
||||
/// way the dispatcher would.
|
||||
fn framed(build: impl FnOnce(&mut Message)) -> Message {
|
||||
let mut message = Message::new();
|
||||
message.write_raw_bytes(vec![0u8; 8]);
|
||||
build(&mut message);
|
||||
message.set_pointer(8);
|
||||
message
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parses_names_zipped_with_counts() {
|
||||
let mut message = framed(|m| {
|
||||
m.write_int32(2);
|
||||
m.write_string("nicotine");
|
||||
m.write_string("jazz");
|
||||
m.write_int32(2);
|
||||
m.write_int32(42);
|
||||
m.write_int32(7);
|
||||
});
|
||||
let rooms = parse_room_list(&mut message);
|
||||
assert_eq!(
|
||||
rooms,
|
||||
vec![
|
||||
RoomInfo {
|
||||
name: "nicotine".to_string(),
|
||||
user_count: 42
|
||||
},
|
||||
RoomInfo {
|
||||
name: "jazz".to_string(),
|
||||
user_count: 7
|
||||
},
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn empty_room_list_parses_to_empty() {
|
||||
let mut message = framed(|m| {
|
||||
m.write_int32(0);
|
||||
m.write_int32(0);
|
||||
});
|
||||
assert!(parse_room_list(&mut message).is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn handler_forwards_parsed_rooms() {
|
||||
let (tx, rx) = std::sync::mpsc::channel();
|
||||
let mut message = framed(|m| {
|
||||
m.write_int32(1);
|
||||
m.write_string("room");
|
||||
m.write_int32(1);
|
||||
m.write_int32(5);
|
||||
});
|
||||
RoomListHandler.handle(&mut message, tx);
|
||||
match rx.try_recv() {
|
||||
Ok(ServerMessage::RoomListReceived(rooms)) => {
|
||||
assert_eq!(rooms.len(), 1);
|
||||
assert_eq!(rooms[0].name, "room");
|
||||
assert_eq!(rooms[0].user_count, 5);
|
||||
}
|
||||
other => panic!("unexpected: {other:?}"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user