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

Got document service functioning.

Browse Source
This commit is contained in:
Jeff Baskin
2025-04-15 18:37:02 -04:00
parent a5b4398eab
commit a38bfc200d
3 changed files with 116 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
src/client.rs
View File

@ -13,7 +13,7 @@ use std::{
};
use uuid::Uuid;
const RESPONS_TO: [MsgType; 2] = [MsgType::Document, MsgType::Session];
const RESPONS_TO: [MsgType; 2] = [MsgType::Document, MsgType::SessionValidated];
pub struct Request {
pub session: Option<Field>,
@ -33,6 +33,10 @@ pub mod requests {
Request::new(None)
}
pub fn get_root_with_session(sess_id: &Uuid) -> Request {
Request::new(Some(sess_id.clone().into()))
}
pub fn get_root_document_eith_session<F>(id: F) -> Request
where
F: Into<Field>,
@ -60,11 +64,15 @@ pub mod requests {
pub struct Reply {
sess_id: Uuid,
content: String,
}
impl Reply {
fn new(sess_id: Uuid) -> Self {
Self { sess_id: sess_id }
fn new(sess_id: Uuid, content: String) -> Self {
Self {
sess_id: sess_id,
content: content,
}
}
pub fn get_session(&self) -> Uuid {
@ -72,7 +80,7 @@ impl Reply {
}
pub fn get_content(&self) -> String {
"Something goes here.".to_string()
self.content.clone()
}
}
@ -83,14 +91,17 @@ mod replies {
pub fn create_reply() -> Reply {
Reply {
sess_id: Uuid::new_v4(),
content: "some text".to_string(),
}
}
#[test]
fn create_new_reply() {
let sess_id = Uuid::new_v4();
let reply = Reply::new(sess_id);
let txt = Uuid::new_v4().to_string();
let reply = Reply::new(sess_id, txt.clone());
assert_eq!(reply.get_session(), sess_id);
assert_eq!(reply.get_content(), txt);
}
}
@ -197,9 +208,9 @@ impl ClientLink {
}
}
pub fn send(&mut self, _req: Request) -> Receiver<Reply> {
pub fn send(&mut self, req: Request) -> Receiver<Reply> {
let (tx, rx) = channel();
let mut msg = Message::new(MsgType::ClientRequest);
let mut msg: Message = req.into();
let id = self.registry.add(tx);
msg.add_data("tx_id", id);
self.tx.send(msg).unwrap();
@ -241,7 +252,7 @@ mod clientlinks {
pub struct Client {
queue: Queue,
registry: ClientRegistry,
return_to: HashMap<Uuid, Uuid>,
return_to: HashMap<Uuid, Message>,
rx: Receiver<Message>,
}
@ -271,8 +282,8 @@ impl Client {
let msg = self.rx.recv().unwrap();
match msg.get_msg_type() {
MsgType::ClientRequest => self.client_request(msg),
MsgType::Document => {},
MsgType::Session => self.session(msg),
MsgType::Document => self.document(msg),
MsgType::SessionValidated => self.session(msg),
_ => unreachable!("Received message it did not understand"),
}
}
@ -283,35 +294,52 @@ impl Client {
}
fn client_request(&mut self, msg: Message) {
let tx_id = msg.get_data("tx_id").unwrap().to_uuid().unwrap();
self.return_to.insert(msg.get_id(), tx_id);
self.queue
.send(msg.reply(MsgType::SessionValidate))
.unwrap();
self.return_to.insert(msg.get_id(), msg.clone());
let mut reply = msg.reply(MsgType::SessionValidate);
match msg.get_data("sess_id") {
Some(sess_id) => reply.add_data("sess_id", sess_id.clone()),
None => {}
}
self.queue.send(reply).unwrap();
}
fn session(&mut self, msg: Message) {
let rx_id = self.return_to.remove(&msg.get_id()).unwrap();
let sess_id = msg.get_data("sess_id").unwrap().to_uuid().unwrap();
/*
self.queue
.send(Message::new(MsgType::DocumentRequest))
.unwrap();
*/
self.registry.send(&rx_id, Reply::new(sess_id));
let initial_msg = self.return_to.get_mut(&msg.get_id()).unwrap();
let mut reply = msg.reply(MsgType::DocumentRequest);
match msg.get_data("sess_id") {
Some(sess_id) => {
initial_msg.add_data("sess_id", sess_id.clone());
reply.add_data("sess_id", sess_id.clone());
}
None => unreachable!("validated should always have an id"),
}
self.queue.send(reply).unwrap();
}
fn document(&mut self, msg: Message) {
let initial_msg = self.return_to.remove(&msg.get_id()).unwrap();
let tx_id = initial_msg.get_data("tx_id").unwrap().to_uuid().unwrap();
let reply = Reply::new(
initial_msg.get_data("sess_id").unwrap().to_uuid().unwrap(),
msg.get_data("doc").unwrap().to_string(),
);
self.registry.send(&tx_id, reply);
}
}
#[cfg(test)]
mod clients {
use super::*;
use requests::get_root_document;
use requests::get_root_with_session;
use std::time::Duration;
static TIMEOUT: Duration = Duration::from_millis(500);
#[test]
fn start_client() {
let sess_id1 = Uuid::new_v4();
let sess_id2 = Uuid::new_v4();
let doc = Uuid::new_v4().to_string();
let (tx, rx) = channel();
let queue = Queue::new();
queue.add(
@ -319,21 +347,36 @@ mod clients {
[MsgType::SessionValidate, MsgType::DocumentRequest].to_vec(),
);
let mut link = Client::start(queue.clone());
let req = get_root_document();
let req = get_root_with_session(&sess_id1);
let reply_rx = link.send(req);
let sess = rx.recv_timeout(TIMEOUT).unwrap();
match sess.get_msg_type() {
let send1 = rx.recv_timeout(TIMEOUT).unwrap();
match send1.get_msg_type() {
MsgType::SessionValidate => {}
_ => unreachable!("should request session validation"),
}
let sess_id = Uuid::new_v4();
let mut sess_res = sess.reply(MsgType::Session);
sess_res.add_data("sess_id", sess_id.clone());
queue.send(sess_res).unwrap();
//let doc_req = rx.recv_timeout(TIMEOUT).unwrap();
assert_eq!(
send1.get_data("sess_id").unwrap().to_uuid().unwrap(),
sess_id1
);
assert!(send1.get_data("tx_id").is_none());
let mut response = send1.reply_with_data(MsgType::SessionValidated);
response.add_data("sess_id", sess_id2);
queue.send(response).unwrap();
let send2 = rx.recv_timeout(TIMEOUT).unwrap();
assert_eq!(send2.get_id(), send1.get_id());
match send2.get_msg_type() {
MsgType::DocumentRequest => {}
_ => unreachable!("should request session validation"),
}
assert_eq!(
send2.get_data("sess_id").unwrap().to_uuid().unwrap(),
sess_id2
);
let mut document = send2.reply(MsgType::Document);
document.add_data("doc", doc.clone());
queue.send(document).unwrap();
let reply = reply_rx.recv_timeout(TIMEOUT).unwrap();
assert_eq!(reply.get_session(), sess_id);
assert_eq!(reply.get_session(), sess_id2);
assert_eq!(reply.get_content(), doc);
}
}