feat: upgrade to numerical IDs

src/nodes/alias.rs

@@ -1,17 +1,28 @@
 use super::{Aspect, Node};
-use crate::core::client::Client;
-use color_eyre::eyre::{ensure, Result};
+use crate::core::{client::Client, registry::Registry};
+use color_eyre::eyre::Result;
 use portable_atomic::AtomicBool;
-use std::sync::{Arc, Weak};
+use std::{
+	ops::Add,
+	sync::{Arc, Weak},
+};
 
 #[derive(Debug, Default, Clone)]
 pub struct AliasInfo {
-	pub(super) server_signals: Vec<&'static str>,
-	pub(super) server_methods: Vec<&'static str>,
-	pub(super) client_signals: Vec<&'static str>,
+	pub(super) server_signals: Vec<u64>,
+	pub(super) server_methods: Vec<u64>,
+	pub(super) client_signals: Vec<u64>,
+}
+impl Add for AliasInfo {
+	type Output = AliasInfo;
+	fn add(mut self, mut rhs: Self) -> Self::Output {
+		self.server_signals.append(&mut rhs.server_signals);
+		self.server_methods.append(&mut rhs.server_methods);
+		self.client_signals.append(&mut rhs.client_signals);
+		self
+	}
 }
 
-#[allow(dead_code)]
 pub struct Alias {
 	pub enabled: Arc<AtomicBool>,
 	pub(super) node: Weak<Node>,
@@ -21,32 +32,86 @@ pub struct Alias {
 }
 impl Alias {
 	pub fn create(
-		client: &Arc<Client>,
-		parent: &str,
-		name: &str,
 		original: &Arc<Node>,
+		client: &Arc<Client>,
 		info: AliasInfo,
+		list: Option<&AliasList>,
 	) -> Result<Arc<Node>> {
-		ensure!(
-			client
-				.scenegraph
-				.get_node(&(parent.to_string() + "/" + name))
-				.is_none(),
-			"Node already exists"
-		);
+		let node = Node::generate(client, true).add_to_scenegraph()?;
+		Self::add_to(&node, original, info)?;
+		if let Some(list) = list {
+			list.add(&node);
+		}
+		Ok(node)
+	}
+	pub fn create_with_id(
+		original: &Arc<Node>,
+		client: &Arc<Client>,
+		new_id: u64,
+		info: AliasInfo,
+		list: Option<&AliasList>,
+	) -> Result<Arc<Node>> {
+		let node = Node::from_id(client, new_id, true).add_to_scenegraph()?;
+		Self::add_to(&node, original, info)?;
+		if let Some(list) = list {
+			list.add(&node);
+		}
+		Ok(node)
+	}
 
-		let node = Node::create_parent_name(client, parent, name, true).add_to_scenegraph()?;
+	fn add_to(new_node: &Arc<Node>, original: &Arc<Node>, info: AliasInfo) -> Result<()> {
 		let alias = Alias {
 			enabled: Arc::new(AtomicBool::new(true)),
-			node: Arc::downgrade(&node),
+			node: Arc::downgrade(&new_node),
 			original: Arc::downgrade(original),
 			info,
 		};
 		let alias = original.aliases.add(alias);
-		node.add_aspect_raw(alias);
-		Ok(node)
+		new_node.add_aspect_raw(alias);
+		Ok(())
 	}
 }
 impl Aspect for Alias {
 	const NAME: &'static str = "Alias";
 }
+
+pub fn get_original(node: Arc<Node>) -> Option<Arc<Node>> {
+	let Ok(alias) = node.get_aspect::<Alias>() else {
+		return Some(node);
+	};
+	get_original(alias.original.upgrade()?)
+}
+
+#[derive(Debug, Default, Clone)]
+pub struct AliasList(Registry<Node>);
+impl AliasList {
+	fn add(&self, node: &Arc<Node>) {
+		self.0.add_raw(node);
+	}
+	pub fn get<A: Aspect>(&self, aspect: &A) -> Option<Arc<Node>> {
+		self.0.get_valid_contents().into_iter().find(|node| {
+			let Ok(aspect2) = node.get_aspect::<A>() else {
+				return false;
+			};
+			Arc::as_ptr(&aspect2) != (aspect as *const A)
+		})
+	}
+	pub fn get_aliases(&self) -> Vec<Arc<Node>> {
+		self.0.get_valid_contents()
+	}
+	pub fn remove_aspect<A: Aspect>(&self, aspect: &A) {
+		self.0.retain(|node| {
+			let Ok(aspect2) = node.get_aspect::<A>() else {
+				return false;
+			};
+			Arc::as_ptr(&aspect2) != (aspect as *const A)
+		})
+	}
+}
+impl Drop for AliasList {
+	fn drop(&mut self) {
+		for node in self.0.take_valid_contents() {
+			node.destroy();
+		}
+	}
+}