nostr/nostr-rs-relay
1
0
Fork 0
mirror of https://github.com/scsibug/nostr-rs-relay.git synced 2024-11-14 23:19:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename request container enums

Browse Source
This commit is contained in:
Greg Heartsfield 2021-11-24 15:22:31 -06:00
parent 439174417a
commit 433bb0f130
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/proto.rs
View File

@ -1,17 +1,22 @@
use crate::close::Close;
use crate::error::{Error, Result}; use crate::error::{Error, Result};
use crate::{close, event, subscription}; use crate::event::Event;
use crate::subscription::Subscription;
use log::{debug, info}; use log::{debug, info};
use uuid::Uuid; use uuid::Uuid;
// A protocol handler/helper. Use one per client. // A protocol handler/helper. Use one per client.
pub struct Proto { pub struct Proto {
client_id: Uuid, client_id: Uuid,
// current set of subscriptions
subscriptions: Vec<Subscription>,
} }
impl Proto { impl Proto {
pub fn new() -> Self { pub fn new() -> Self {
let p = Proto { let p = Proto {
client_id: Uuid::new_v4(), client_id: Uuid::new_v4(),
subscriptions: Vec::new(),
}; };
debug!("New client: {:?}", p.client_id); debug!("New client: {:?}", p.client_id);
p p
@ -25,33 +30,41 @@ impl Proto {
// check what kind of message // check what kind of message
info!("Parse result: {:?}", parse_type(cmd)); info!("Parse result: {:?}", parse_type(cmd));
} }
pub fn subscribe(s: Subscription) {
unimplemented!();
}
pub fn unsubscribe(c: Close) {
unimplemented!();
}
} }
// A raw message with the expected type // A raw message with the expected type
#[derive(PartialEq, Debug)] #[derive(PartialEq, Debug)]
pub enum NostrRawMessage { pub enum NostrRawMessage {
Ev(String), EvRaw(String),
Sub(String), SubRaw(String),
Close(String), CloseRaw(String),
} }
// A fully parsed request // A fully parsed request
#[derive(PartialEq, Debug)] #[derive(PartialEq, Debug)]
pub enum NostrRequest { pub enum NostrRequest {
Ev(event::Event), EvReq(Event),
Sub(subscription::Subscription), SubReq(Subscription),
Close(close::Close), CloseReq(Close),
} }
// Wrap the message in the expected request type // Wrap the message in the expected request type
fn msg_type_wrapper(msg: String) -> Result<NostrRawMessage> { fn msg_type_wrapper(msg: String) -> Result<NostrRawMessage> {
// check prefix. // check prefix.
if msg.starts_with(r#"["EVENT","#) { if msg.starts_with(r#"["EVENT","#) {
Ok(NostrRawMessage::Ev(msg)) Ok(NostrRawMessage::EvRaw(msg))
} else if msg.starts_with(r#"["REQ","#) { } else if msg.starts_with(r#"["REQ","#) {
Ok(NostrRawMessage::Sub(msg)) Ok(NostrRawMessage::SubRaw(msg))
} else if msg.starts_with(r#"["CLOSE","#) { } else if msg.starts_with(r#"["CLOSE","#) {
Ok(NostrRawMessage::Close(msg)) Ok(NostrRawMessage::CloseRaw(msg))
} else { } else {
Err(Error::CommandNotFound) Err(Error::CommandNotFound)
} }
@ -61,9 +74,9 @@ pub fn parse_type(msg: String) -> Result<NostrRequest> {
// turn this raw string into a parsed request // turn this raw string into a parsed request
let typ = msg_type_wrapper(msg)?; let typ = msg_type_wrapper(msg)?;
match typ { match typ {
NostrRawMessage::Ev(_) => Err(Error::EventParseFailed), NostrRawMessage::EvRaw(_) => Err(Error::EventParseFailed),
NostrRawMessage::Sub(m) => Ok(NostrRequest::Sub(subscription::Subscription::parse(&m)?)), NostrRawMessage::SubRaw(m) => Ok(NostrRequest::SubReq(Subscription::parse(&m)?)),
NostrRawMessage::Close(m) => Ok(NostrRequest::Close(close::Close::parse(&m)?)), NostrRawMessage::CloseRaw(m) => Ok(NostrRequest::CloseReq(Close::parse(&m)?)),
} }
} }