MoreThanText/morethantext
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make swssion pass on any additional information.

Browse Source
This commit is contained in:
Jeff Baskin
2025-04-15 09:53:38 -04:00
parent 744f2077f4
commit a5b4398eab
6 changed files with 105 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/session.rs
View File

@ -105,7 +105,7 @@ impl Session {
fn listen(&mut self) {
loop {
let msg = self.rx.recv().unwrap();
match msg.get_class() {
match msg.get_msg_type() {
MsgType::SessionValidate => self.validate(msg),
MsgType::Time => self.expire(msg),
_ => unreachable!("received unknown message"),
@ -119,8 +119,7 @@ impl Session {
Field::Uuid(sess_id) => match self.data.get_mut(&sess_id) {
Some(sess_data) => {
sess_data.extend();
let mut reply = msg.reply(MsgType::Session);
reply.add_data("sess_id", sess_id.clone());
let reply = msg.reply_with_data(MsgType::Session);
self.queue.send(reply).unwrap();
}
None => self.new_session(msg),
@ -137,7 +136,7 @@ impl Session {
id = Uuid::new_v4();
}
self.data.insert(id.clone(), SessionData::new());
let mut reply = msg.reply(MsgType::Session);
let mut reply = msg.reply_with_data(MsgType::Session);
reply.add_data("sess_id", id);
self.queue.send(reply).unwrap();
}
@ -181,19 +180,22 @@ mod sessions {
#[test]
fn get_new_session() {
let id = Uuid::new_v4();
let listen_for = [MsgType::Session];
let (queue, rx) = setup_session(listen_for.to_vec());
let msg = Message::new(MsgType::SessionValidate);
let mut msg = Message::new(MsgType::SessionValidate);
msg.add_data(id, id);
queue.send(msg.clone()).unwrap();
let result = rx.recv_timeout(TIMEOUT).unwrap();
match result.get_class() {
match result.get_msg_type() {
MsgType::Session => {}
_ => unreachable!(
"received {:?}, should have been a session",
result.get_class()
result.get_msg_type()
),
}
assert_eq!(result.get_id(), msg.get_id());
assert_eq!(result.get_data(id).unwrap().to_uuid().unwrap(), id);
}
#[test]
@ -213,15 +215,18 @@ mod sessions {
#[test]
fn existing_id_is_returned() {
let add_data = Uuid::new_v4();
let listen_for = [MsgType::Session];
let (queue, rx) = setup_session(listen_for.to_vec());
let id = create_session(&queue, &rx);
let mut msg = Message::new(MsgType::SessionValidate);
msg.add_data("sess_id", id.clone());
msg.add_data(add_data, add_data);
queue.send(msg).unwrap();
let result = rx.recv_timeout(TIMEOUT).unwrap();
let output = result.get_data("sess_id").unwrap().to_uuid().unwrap();
assert_eq!(output, id);
assert_eq!(result.get_data(add_data).unwrap().to_uuid().unwrap(), add_data);
}
#[test]