refactor: store weak client in the nodes

src/nodes/core.rs

@@ -1,22 +1,24 @@
 use crate::core::client::Client;
-use crate::core::scenegraph::Scenegraph;
 use anyhow::{anyhow, ensure, Result};
-use libstardustxr::messenger::Messenger;
-use std::{collections::HashMap, rc::Weak, vec::Vec};
+use rccell::{RcCell, WeakCell};
+use std::{collections::HashMap, vec::Vec};
 
 pub type Signal<'a> = Box<dyn Fn(&[u8]) -> Result<()> + 'a>;
 pub type Method<'a> = Box<dyn Fn(&[u8]) -> Result<Vec<u8>> + 'a>;
 
 pub struct Node<'a> {
+	client: WeakCell<Client<'a>>,
 	path: String,
 	trailing_slash_pos: usize,
-	messenger: Weak<Messenger<'a>>,
-	scenegraph: Option<&'a Scenegraph<'a>>,
 	local_signals: HashMap<String, Signal<'a>>,
 	local_methods: HashMap<String, Method<'a>>,
+	destroyable: bool,
 }
 
 impl<'a> Node<'a> {
+	pub fn get_client(&self) -> Option<RcCell<Client<'a>>> {
+		self.client.clone().upgrade()
+	}
 	pub fn get_name(&self) -> &str {
 		&self.path[self.trailing_slash_pos + 1..]
 	}
@@ -25,24 +27,20 @@ impl<'a> Node<'a> {
 	}
 
 	pub fn from_path(
-		client: Option<&Client<'a>>,
+		client: WeakCell<Client<'a>>,
 		path: &str,
 		destroyable: bool,
 	) -> Result<Node<'a>> {
 		ensure!(path.starts_with('/'), "Invalid path {}", path);
-		let mut weak_messenger = Weak::default();
-		if let Some(c) = client.as_ref() {
-			weak_messenger = c.get_weak_messenger();
-		}
 		Ok(Node {
+			client,
 			path: path.to_string(),
 			trailing_slash_pos: path
 				.rfind('/')
 				.ok_or_else(|| anyhow!("Invalid path {}", path))?,
-			messenger: weak_messenger,
-			scenegraph: client.as_ref().map(|f| f.scenegraph.as_ref().unwrap()),
 			local_signals: HashMap::new(),
 			local_methods: HashMap::new(),
+			destroyable,
 		})
 	}
 
@@ -61,9 +59,10 @@ impl<'a> Node<'a> {
 			.ok_or_else(|| anyhow!("Method {} not found", method))?(data)
 	}
 	pub fn send_remote_signal(&self, method: &str, data: &[u8]) -> Result<()> {
-		self.messenger
-			.upgrade()
-			.ok_or_else(|| anyhow!("Invalid messenger"))?
+		self.get_client()
+			.ok_or(anyhow!("Node has no client, can't send remote signal!"))?
+			.borrow()
+			.get_messenger()
 			.send_remote_signal(self.path.as_str(), method, data)
 			.map_err(|_| anyhow!("Unable to write in messenger"))
 	}
@@ -73,9 +72,10 @@ impl<'a> Node<'a> {
 		data: &[u8],
 		callback: Box<dyn Fn(&[u8]) + 'a>,
 	) -> Result<()> {
-		self.messenger
-			.upgrade()
-			.ok_or_else(|| anyhow!("Invalid messenger"))?
+		self.get_client()
+			.ok_or(anyhow!("Node has no client, can't send remote signal!"))?
+			.borrow()
+			.get_messenger()
 			.execute_remote_method(self.path.as_str(), method, data, callback)
 			.map_err(|_| anyhow!("Unable to write in messenger"))
 	}

src/nodes/spatial.rs

@@ -1,7 +1,7 @@
 use super::core::Node;
 use crate::core::client::Client;
 use anyhow::{anyhow, Result};
-use euler::Mat4;
+// use euler::Mat4;
 use libstardustxr::{flex_to_quat, flex_to_vec3};
 use mint::RowMatrix4;
 use rccell::{RcCell, WeakCell};
@@ -14,44 +14,46 @@ pub struct Spatial<'a> {
 
 impl<'a> Spatial<'a> {
 	pub fn new(
-		client: Option<&mut Client<'a>>,
+		client: WeakCell<Client<'a>>,
 		path: &str,
 		transform: RowMatrix4<f32>,
 	) -> Result<WeakCell<Self>> {
-		let mut spatial = Spatial {
-			node: Node::from_path(client.as_deref(), path, true).unwrap(),
+		let spatial = RcCell::new(Spatial {
+			node: Node::from_path(client.clone(), path, true).unwrap(),
 			parent: WeakCell::new(),
 			transform,
-		};
-		let spatial_cell = RcCell::new(spatial);
-		let weak_spatial = spatial_cell.downgrade();
-		if let Some(client) = client {
-			let weak_spatial = weak_spatial.clone();
-			spatial.node.add_local_signal(
-				"setTransform",
-				Box::new(|data| {
-					let root = flexbuffers::Reader::get_root(data).unwrap();
-					let flex_vec = root.get_vector().unwrap();
-					let spatial = client
-						.scenegraph
-						.as_ref()
-						.unwrap()
-						.spatial_nodes
-						.get(flex_vec.idx(1).as_str())
-						.ok_or(anyhow!("Spatial not found"))?;
-					let pos = flex_to_vec3!(flex_vec.idx(1));
-					let rot = flex_to_quat!(flex_vec.idx(2));
-					let scl = flex_to_vec3!(flex_vec.idx(3));
-					Ok(())
-				}),
-			);
-			client
-				.scenegraph
-				.as_mut()
-				.unwrap()
-				.spatial_nodes
-				.insert(path.to_string(), spatial_cell);
-		}
+		});
+		let weak_spatial = spatial.downgrade();
+		let captured_spatial = weak_spatial.clone();
+		let captured_client = client.clone();
+		spatial.borrow_mut().node.add_local_signal(
+			"setTransform",
+			Box::new(move |data| {
+				let root = flexbuffers::Reader::get_root(data)?;
+				let flex_vec = root.get_vector()?;
+				let spatial = captured_spatial
+					.upgrade()
+					.ok_or(anyhow!("Invalid spatial"))?;
+				let client = captured_client.upgrade().ok_or(anyhow!("Invalid client"))?;
+				let other_spatial = client
+					.borrow()
+					.get_scenegraph()
+					.spatial_nodes
+					.get(flex_vec.idx(1).as_str())
+					.ok_or(anyhow!("Spatial not found"))?;
+				let pos = flex_to_vec3!(flex_vec.idx(1));
+				let rot = flex_to_quat!(flex_vec.idx(2));
+				let scl = flex_to_vec3!(flex_vec.idx(3));
+				Ok(())
+			}),
+		);
+		client
+			.upgrade()
+			.unwrap()
+			.borrow_mut()
+			.get_scenegraph_mut()
+			.spatial_nodes
+			.insert(path.to_string(), spatial);
 		Ok(weak_spatial)
 	}