summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/client/encrypted.rs2
-rw-r--r--src/client/unencrypted.rs4
-rw-r--r--src/element.rs108
-rw-r--r--src/error.rs6
-rw-r--r--src/stanza/mod.rs120
-rw-r--r--src/stanza/stream.rs3
6 files changed, 127 insertions, 116 deletions
diff --git a/src/client/encrypted.rs b/src/client/encrypted.rs
index 76f600c..898dc23 100644
--- a/src/client/encrypted.rs
+++ b/src/client/encrypted.rs
@@ -6,8 +6,8 @@ use tokio::io::{BufReader, ReadHalf, WriteHalf};
use tokio::net::TcpStream;
use tokio_native_tls::TlsStream;
-use crate::element::Element;
use crate::stanza::stream::{Stream, StreamFeature};
+use crate::stanza::Element;
use crate::Jabber;
use crate::Result;
diff --git a/src/client/unencrypted.rs b/src/client/unencrypted.rs
index ce534c7..3f3a133 100644
--- a/src/client/unencrypted.rs
+++ b/src/client/unencrypted.rs
@@ -1,5 +1,3 @@
-use std::str;
-
use quick_xml::{
events::{BytesDecl, BytesStart, Event},
name::QName,
@@ -9,8 +7,8 @@ use tokio::io::{BufReader, ReadHalf, WriteHalf};
use tokio::net::TcpStream;
use tokio_native_tls::native_tls::TlsConnector;
-use crate::element::Element;
use crate::stanza::stream::StreamFeature;
+use crate::stanza::Element;
use crate::Jabber;
use crate::Result;
use crate::{error::JabberError, stanza::stream::Stream};
diff --git a/src/element.rs b/src/element.rs
deleted file mode 100644
index 21b1a3e..0000000
--- a/src/element.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-use async_recursion::async_recursion;
-use quick_xml::events::Event;
-use quick_xml::{Reader, Writer};
-use tokio::io::{AsyncBufRead, AsyncWrite};
-
-use crate::Result;
-
-#[derive(Debug)]
-pub struct Element<'e> {
- pub event: Event<'e>,
- pub content: Option<Vec<Element<'e>>>,
-}
-
-// TODO: make method
-#[async_recursion]
-pub async fn write<'e: 'async_recursion, W: AsyncWrite + Unpin + Send>(
- element: Element<'e>,
- writer: &mut Writer<W>,
-) -> Result<()> {
- match element.event {
- Event::Start(e) => {
- writer.write_event_async(Event::Start(e.clone())).await?;
- if let Some(content) = element.content {
- for e in content {
- write(e, writer).await?;
- }
- }
- writer.write_event_async(Event::End(e.to_end())).await?;
- return Ok(());
- }
- e => Ok(writer.write_event_async(e).await?),
- }
-}
-
-impl<'e> Element<'e> {
- pub async fn write_start<W: AsyncWrite + Unpin + Send>(
- &self,
- writer: &mut Writer<W>,
- ) -> Result<()> {
- match self.event.as_ref() {
- Event::Start(e) => Ok(writer.write_event_async(Event::Start(e.clone())).await?),
- e => Err(ElementError::NotAStart(e.clone().into_owned()).into()),
- }
- }
-
- pub async fn write_end<W: AsyncWrite + Unpin + Send>(
- &self,
- writer: &mut Writer<W>,
- ) -> Result<()> {
- match self.event.as_ref() {
- Event::Start(e) => Ok(writer
- .write_event_async(Event::End(e.clone().to_end()))
- .await?),
- e => Err(ElementError::NotAStart(e.clone().into_owned()).into()),
- }
- }
-
- #[async_recursion]
- pub async fn read<R: AsyncBufRead + Unpin + Send>(
- reader: &mut Reader<R>,
- ) -> Result<Option<Self>> {
- let mut buf = Vec::new();
- let event = reader.read_event_into_async(&mut buf).await?;
- match event {
- Event::Start(e) => {
- let mut content_vec = Vec::new();
- while let Some(sub_element) = Element::read(reader).await? {
- content_vec.push(sub_element)
- }
- let mut content = None;
- if !content_vec.is_empty() {
- content = Some(content_vec)
- }
- Ok(Some(Self {
- event: Event::Start(e.into_owned()),
- content,
- }))
- }
- Event::End(_) => Ok(None),
- e => Ok(Some(Self {
- event: e.into_owned(),
- content: None,
- })),
- }
- }
-
- #[async_recursion]
- pub async fn read_start<R: AsyncBufRead + Unpin + Send>(
- reader: &mut Reader<R>,
- ) -> Result<Self> {
- let mut buf = Vec::new();
- let event = reader.read_event_into_async(&mut buf).await?;
- match event {
- Event::Start(e) => {
- return Ok(Self {
- event: Event::Start(e.into_owned()),
- content: None,
- })
- }
- e => Err(ElementError::NotAStart(e.into_owned()).into()),
- }
- }
-}
-
-#[derive(Debug)]
-pub enum ElementError<'e> {
- NotAStart(Event<'e>),
-}
diff --git a/src/error.rs b/src/error.rs
index 37be7fa..7f704e5 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -4,8 +4,8 @@ use quick_xml::events::attributes::AttrError;
use rsasl::mechname::MechanismNameError;
use crate::{
- element::{self, ElementError},
jid::ParseError,
+ stanza::{self, ElementError},
};
#[derive(Debug)]
@@ -54,8 +54,8 @@ impl From<quick_xml::Error> for JabberError {
}
}
-impl From<element::ElementError<'static>> for JabberError {
- fn from(e: element::ElementError<'static>) -> Self {
+impl From<stanza::ElementError<'static>> for JabberError {
+ fn from(e: stanza::ElementError<'static>) -> Self {
Self::Element(e)
}
}
diff --git a/src/stanza/mod.rs b/src/stanza/mod.rs
index 02ea277..16f3bdd 100644
--- a/src/stanza/mod.rs
+++ b/src/stanza/mod.rs
@@ -4,3 +4,123 @@ pub mod sasl;
pub mod stream;
// const DECLARATION: BytesDecl<'_> = BytesDecl::new("1.0", None, None);
+use async_recursion::async_recursion;
+use quick_xml::events::Event;
+use quick_xml::{Reader, Writer};
+use tokio::io::{AsyncBufRead, AsyncWrite};
+
+use crate::Result;
+
+#[derive(Debug)]
+pub struct Element<'e> {
+ pub event: Event<'e>,
+ pub content: Option<Vec<Element<'e>>>,
+}
+
+impl<'e: 'async_recursion, 'async_recursion> Element<'e> {
+ pub fn write<'life0, W: AsyncWrite + Unpin + Send>(
+ &'async_recursion self,
+ writer: &'life0 mut Writer<W>,
+ ) -> ::core::pin::Pin<
+ Box<
+ dyn ::core::future::Future<Output = Result<()>>
+ + 'async_recursion
+ + ::core::marker::Send,
+ >,
+ >
+ where
+ W: 'async_recursion,
+ 'life0: 'async_recursion,
+ {
+ Box::pin(async move {
+ match &self.event {
+ Event::Start(e) => {
+ writer.write_event_async(Event::Start(e.clone())).await?;
+ if let Some(content) = &self.content {
+ for _e in content {
+ self.write(writer).await?;
+ }
+ }
+ writer.write_event_async(Event::End(e.to_end())).await?;
+ return Ok(());
+ }
+ e => Ok(writer.write_event_async(e).await?),
+ }
+ })
+ }
+}
+
+impl<'e> Element<'e> {
+ pub async fn write_start<W: AsyncWrite + Unpin + Send>(
+ &self,
+ writer: &mut Writer<W>,
+ ) -> Result<()> {
+ match self.event.as_ref() {
+ Event::Start(e) => Ok(writer.write_event_async(Event::Start(e.clone())).await?),
+ e => Err(ElementError::NotAStart(e.clone().into_owned()).into()),
+ }
+ }
+
+ pub async fn write_end<W: AsyncWrite + Unpin + Send>(
+ &self,
+ writer: &mut Writer<W>,
+ ) -> Result<()> {
+ match self.event.as_ref() {
+ Event::Start(e) => Ok(writer
+ .write_event_async(Event::End(e.clone().to_end()))
+ .await?),
+ e => Err(ElementError::NotAStart(e.clone().into_owned()).into()),
+ }
+ }
+
+ #[async_recursion]
+ pub async fn read<R: AsyncBufRead + Unpin + Send>(
+ reader: &mut Reader<R>,
+ ) -> Result<Option<Self>> {
+ let mut buf = Vec::new();
+ let event = reader.read_event_into_async(&mut buf).await?;
+ match event {
+ Event::Start(e) => {
+ let mut content_vec = Vec::new();
+ while let Some(sub_element) = Element::read(reader).await? {
+ content_vec.push(sub_element)
+ }
+ let mut content = None;
+ if !content_vec.is_empty() {
+ content = Some(content_vec)
+ }
+ Ok(Some(Self {
+ event: Event::Start(e.into_owned()),
+ content,
+ }))
+ }
+ Event::End(_) => Ok(None),
+ e => Ok(Some(Self {
+ event: e.into_owned(),
+ content: None,
+ })),
+ }
+ }
+
+ #[async_recursion]
+ pub async fn read_start<R: AsyncBufRead + Unpin + Send>(
+ reader: &mut Reader<R>,
+ ) -> Result<Self> {
+ let mut buf = Vec::new();
+ let event = reader.read_event_into_async(&mut buf).await?;
+ match event {
+ Event::Start(e) => {
+ return Ok(Self {
+ event: Event::Start(e.into_owned()),
+ content: None,
+ })
+ }
+ e => Err(ElementError::NotAStart(e.into_owned()).into()),
+ }
+ }
+}
+
+#[derive(Debug)]
+pub enum ElementError<'e> {
+ NotAStart(Event<'e>),
+}
diff --git a/src/stanza/stream.rs b/src/stanza/stream.rs
index f0fb6a1..59d0b90 100644
--- a/src/stanza/stream.rs
+++ b/src/stanza/stream.rs
@@ -5,7 +5,8 @@ use quick_xml::{
name::QName,
};
-use crate::{element::Element, JabberError, Result, JID};
+use super::Element;
+use crate::{JabberError, Result, JID};
const XMLNS_STREAM: &str = "http://etherx.jabber.org/streams";
const VERSION: &str = "1.0";
generated by cgit (git 2.34.1) at 2024-11-22 05:26:06 +0000