blah/blahrs
1
0
Fork 0
mirror of https://github.com/Blah-IM/blahrs.git synced 2025-07-12 00:55:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(blahd,types): hoist more types into types crate

Browse source
This commit is contained in:
oxalica 2024-10-04 22:31:42 -04:00
parent 719c19dc64
commit 4e8124cda6
5 changed files with 129 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

29
blahd/tests/webapi.rs
View file

@ -15,9 +15,12 @@ use blah_types::msg::{
SignedChatMsg, SignedChatMsgWithId, UserRegisterChallengeResponse, UserRegisterPayload,
WithMsgId,
};
use blah_types::server::{RoomMetadata, ServerMetadata, UserRegisterChallenge};
use blah_types::server::{
RoomList, RoomMember, RoomMemberList, RoomMetadata, RoomMsgs, ServerEvent, ServerMetadata,
UserRegisterChallenge,
};
use blah_types::{Id, SignExt, Signed, UserKey};
use blahd::{AppState, Database, RoomList, RoomMember, RoomMemberList, RoomMsgs};
use blahd::{AppState, Database};
use ed25519_dalek::SigningKey;
use expect_test::expect;
use futures_util::future::BoxFuture;
@ -140,14 +143,6 @@ impl fmt::Display for ApiError {
impl std::error::Error for ApiError {}
// TODO: Hoist this into types crate.
#[derive(Debug, Clone, PartialEq, Eq, Deserialize)]
#[serde(rename_all = "snake_case")]
pub enum WsEvent {
// TODO: Include cid?
Msg(SignedChatMsg),
}
#[derive(Debug)]
struct Server {
port: u16,
@ -166,7 +161,7 @@ impl Server {
async fn connect_ws(
&self,
auth_user: Option<&User>,
) -> Result<impl Stream<Item = Result<WsEvent>> + Unpin> {
) -> Result<impl Stream<Item = Result<ServerEvent>> + Unpin> {
let url = format!("ws://{}/_blah/ws", self.domain());
let (mut ws, _) = tokio_tungstenite::connect_async(url).await.unwrap();
if let Some(user) = auth_user {
@ -180,7 +175,7 @@ impl Server {
if wsmsg.is_close() {
return Ok(None);
}
let event = serde_json::from_slice::<WsEvent>(&wsmsg.into_data())?;
let event = serde_json::from_slice::<ServerEvent>(&wsmsg.into_data())?;
Ok(Some(event))
})
.filter_map(|ret| std::future::ready(ret.transpose())))
@ -1530,7 +1525,7 @@ async fn event(server: Server) {
{
let chat = server.post_chat(rid1, &ALICE, "alice1").await.unwrap();
let got = ws.next().await.unwrap().unwrap();
assert_eq!(got, WsEvent::Msg(chat.msg));
assert_eq!(got, ServerEvent::Msg(chat.msg));
}
// Should receive msgs from other user.
@ -1541,7 +1536,7 @@ async fn event(server: Server) {
.unwrap();
let chat = server.post_chat(rid1, &BOB, "bob1").await.unwrap();
let got = ws.next().await.unwrap().unwrap();
assert_eq!(got, WsEvent::Msg(chat.msg));
assert_eq!(got, ServerEvent::Msg(chat.msg));
}
// Should receive msgs from new room.
@ -1552,7 +1547,7 @@ async fn event(server: Server) {
{
let chat = server.post_chat(rid2, &ALICE, "alice2").await.unwrap();
let got = ws.next().await.unwrap().unwrap();
assert_eq!(got, WsEvent::Msg(chat.msg));
assert_eq!(got, ServerEvent::Msg(chat.msg));
}
// Each streams should receive each message once.
@ -1561,9 +1556,9 @@ async fn event(server: Server) {
let chat = server.post_chat(rid1, &ALICE, "alice1").await.unwrap();
let got1 = ws.next().await.unwrap().unwrap();
assert_eq!(got1, WsEvent::Msg(chat.msg.clone()));
assert_eq!(got1, ServerEvent::Msg(chat.msg.clone()));
let got2 = ws2.next().await.unwrap().unwrap();
assert_eq!(got2, WsEvent::Msg(chat.msg));
assert_eq!(got2, ServerEvent::Msg(chat.msg));
}
}