feat: refactor MediaType handling and introduce Node and NodeContent structures

Author: krypton-byte

src/clients/tryx.rs

@@ -58,7 +58,6 @@ use crate::events::types::{
 };
 use crate::exceptions::UnsupportedBackend;
 use crate::events::dispatcher::Dispatcher;
-use crate::types::MessageInfo;
 
 
 #[pyclass]
@@ -616,8 +615,7 @@ impl Tryx {
                             Self::call_event(connect_failure_callbacks, payload, locals.clone()).await.unwrap();
                         }
                         Event::StreamError(_) => {
-                            let payload = Python::attach(|py| pyo3::Py::new(py, EvStreamError {})).map_err(|e| e).unwrap();
-                            Self::call_event(stream_error_callbacks, payload, locals.clone()).await.unwrap();
+                            todo!()
                         }
                     }
                 }

src/clients/tryx_client.rs

@@ -10,7 +10,7 @@ use prost::Message;
 use whatsapp_rust::Client;
 use crate::events::types::{EvMessage};
 use crate::types::{JID, UploadResponse};
-use crate::wacore::MediaType;
+use crate::wacore::download::MediaType;
 #[pyclass]
 pub struct TryxClient {
     pub client_rx: watch::Receiver<Option<Arc<Client>>>,

src/events/types.rs

@@ -10,6 +10,7 @@ use whatsapp_rust::{Jid, types::events::{ConnectFailureReason, LoggedOut as What
 use pyo3::sync::PyOnceLock;
 use whatsapp_rust::types::message::{MessageInfo as WhatsappMessageInfo};
 use crate::types::{JID, MessageInfo, MessageSource};
+use crate::wacore::node::{Node, NodeContent, NodeValue};
 
 static WHATSAPP_MESSAGE_PROTO: PyOnceLock<Py<PyType>> = PyOnceLock::new();
 static SYNC_ACTION_VALUE: PyOnceLock<Py<PyType>> = PyOnceLock::new();
@@ -413,7 +414,11 @@ impl EvTemporaryBan {
 pub struct EvConnectFailure;
 
 #[pyclass]
-pub struct EvStreamError;
+pub struct EvStreamError{
+    #[pyo3(get)]
+    code: String,
+    raw: Option<Py<Node>>
+}
 
 #[pyclass]
 pub struct EvMessage {

src/lib.rs

@@ -41,7 +41,7 @@ use self::events::types::{
 };
 use self::backend::SqliteBackend;
 use self::types::{JID, MessageInfo, UploadResponse};
-use self::wacore::MediaType;
+use self::wacore::download::MediaType;
 
 /// A Python module implemented in Rust.
 /// 

src/types.rs

@@ -51,7 +51,7 @@ impl JID {
     fn server(&self) -> String {
         self.inner.server.clone()
     }
-    fn __repr__(&self) -> String {
+    pub fn __repr__(&self) -> String {
         format!("JID(user='{}', server='{}')", self.inner.user, self.inner.server)
     }
 }
@@ -318,144 +318,3 @@ pub struct UploadResponse {
     #[pyo3(get)]
     pub file_length: u64,
 }
-pub enum NodeValueEnum {
-    String(String),
-    Jid(pyo3::Py<JID>),
-}
-
-/// PyClass wrapper untuk NodeValue
-#[pyclass]
-pub struct NodeValue {
-    inner: NodeValueEnum,
-}
-
-#[pymethods]
-impl NodeValue {
-    #[new]
-    pub fn new_string(value: String) -> Self {
-        Self { inner: NodeValueEnum::String(value) }
-    }
-
-    #[staticmethod]
-    pub fn jid(value: pyo3::Py<JID>) -> Self {
-        Self { inner: NodeValueEnum::Jid(value) }
-    }
-
-    pub fn set_string(&mut self, value: String) {
-        self.inner = NodeValueEnum::String(value);
-    }
-
-    pub fn set_jid(&mut self, value: pyo3::Py<JID>) {
-        self.inner = NodeValueEnum::Jid(value);
-    }
-
-    pub fn __repr__(&self, py: Python<'_>) -> String {
-        match &self.inner {
-            NodeValueEnum::String(s) => format!("NodeValue::String({})", s),
-            NodeValueEnum::Jid(jid) => {
-                let jid_ref = jid.bind(py).borrow();
-                format!("NodeValue::Jid({})", jid_ref.__repr__())
-            }
-        }
-    }
-}
-
-/// NodeContent enum internal
-pub enum NodeContentEnum {
-    Bytes(Vec<u8>),
-    String(String),
-    Nodes(Vec<pyo3::Py<Node>>),
-}
-
-/// PyClass wrapper untuk NodeContent
-#[pyclass]
-pub struct NodeContent {
-    inner: NodeContentEnum,
-}
-
-#[pymethods]
-impl NodeContent {
-    #[staticmethod]
-    pub fn bytes(data: Vec<u8>) -> Self {
-        Self { inner: NodeContentEnum::Bytes(data) }
-    }
-
-    #[staticmethod]
-    pub fn string(data: String) -> Self {
-        Self { inner: NodeContentEnum::String(data) }
-    }
-
-    #[staticmethod]
-    pub fn nodes(data: Vec<pyo3::Py<Node>>) -> Self {
-        Self { inner: NodeContentEnum::Nodes(data) }
-    }
-
-    pub fn is_bytes(&self) -> bool {
-        matches!(self.inner, NodeContentEnum::Bytes(_))
-    }
-
-    pub fn is_string(&self) -> bool {
-        matches!(self.inner, NodeContentEnum::String(_))
-    }
-
-    pub fn is_nodes(&self) -> bool {
-        matches!(self.inner, NodeContentEnum::Nodes(_))
-    }
-
-    pub fn as_bytes<'py>(&self, py: Python<'py>) -> Option<pyo3::Py<PyBytes>> {
-        match &self.inner {
-            NodeContentEnum::Bytes(b) => Some(PyBytes::new(py, b).unbind()),
-            _ => None,
-        }
-    }
-
-    pub fn as_string(&self) -> Option<&str> {
-        match &self.inner {
-            NodeContentEnum::String(s) => Some(s),
-            _ => None,
-        }
-    }
-
-    pub fn as_nodes(&self) -> Option<&Vec<pyo3::Py<Node>>> {
-        match &self.inner {
-            NodeContentEnum::Nodes(n) => Some(n),
-            _ => None,
-        }
-    }
-
-    pub fn __repr__(&self) -> String {
-        match &self.inner {
-            NodeContentEnum::Bytes(_) => "NodeContent::Bytes(...)".to_string(),
-            NodeContentEnum::String(s) => format!("NodeContent::String({})", s),
-            NodeContentEnum::Nodes(n) => format!("NodeContent::Nodes(len={})", n.len()),
-        }
-    }
-}
-
-/// PyClass Node
-#[pyclass]
-pub struct Node {
-    #[pyo3(get, set)]
-    pub tag: String,
-
-    #[pyo3(get, set)]
-    pub content: Option<pyo3::Py<NodeContent>>,
-}
-
-#[pymethods]
-impl Node {
-    #[new]
-    pub fn new(tag: String, content: Option<pyo3::Py<NodeContent>>) -> Self {
-        Self { tag, content }
-    }
-
-    pub fn __repr__(&self, py: Python<'_>) -> String {
-        match &self.content {
-            Some(c) => {
-                let content_ref = c.bind(py).borrow();
-                format!("Node(tag={}, content={})", self.tag, content_ref.__repr__())
-            }
-            None => format!("Node(tag={}, content=None)", self.tag),
-        }
-    }
-}

src/wacore.rs src/wacore/download.rssrc/wacore.rs renamed to src/wacore/download.rs

@@ -0,0 +1,2 @@
+pub mod node;
+pub mod download;