cargo check

src/core/instance/connection.rs

@@ -1,16 +1,21 @@
 use crossbeam::channel::{Sender, Receiver};
 use tracing::{trace, debug, info, warn, error};
 
+use crate::id::Namespace;
+use crate::mize_err;
 use crate::proto::MizeMessage;
 use crate::error::{MizeError, MizeResult, IntoMizeResult};
 
 use super::Instance;
+use crate::item::{get_raw_from_cbor, Item};
 
+// only created with Instance::new_connection()
 #[derive(Clone)]
 pub struct Connection {
     pub rx: Receiver<MizeMessage>,
     pub tx: Sender<MizeMessage>,
     pub id: u64,
+    pub ns: Option<Namespace>,
 }
 
 pub trait ConnListener : Send + Sync {
@@ -23,5 +28,33 @@ impl Connection {
     }
 }
 
+pub fn value_raw_con_by_id(item: &mut Item) -> MizeResult<Vec<u8>> {
+    if item.id().nth_part(3)? == "peer" {
+        return value_raw_from_peer(item);
+    } else {
+        return Err(mize_err!("id with path: '{}' is not supported", item.id()));
+    }
+}
 
+pub fn value_raw_from_peer(item: &mut Item) -> MizeResult<Vec<u8>> {
+    let id = item.id();
 
+    let conn_id_str = id.nth_part(2)?;
+    let conn_id : u64 = conn_id_str.parse()?;
+    let tmp_path = id.path();
+    let mut new_id_str = tmp_path.into_iter();
+    let skipped = new_id_str.skip(4);
+    let new_id = item.instance.new_id(skipped.collect::<Vec<&String>>())?;
+
+    let connection = item.instance.get_connection(conn_id)?;
+
+    let msg = MizeMessage::new_get(new_id, connection.id);
+
+    connection.tx.send(msg)?;
+
+    let data = item.instance.give_msg_wait(item.id())?;
+
+    let raw_data = get_raw_from_cbor(data.cbor(), vec![])?;
+    return Ok(raw_data.to_owned());
+
+}

src/core/instance/mod.rs

@@ -56,6 +56,7 @@ pub struct Instance {
     threads: Vec<String>,
     #[cfg(feature = "async")]
     pub runtime: Arc<Mutex<Runtime>>,
+    give_msg_wait: Arc<Mutex<HashMap<MizeId, (Sender<ItemData>, Receiver<ItemData>)>>>,
 }
 
 pub struct InstanceRef {
@@ -76,6 +77,7 @@ impl Instance {
         let subs = Arc::new(Mutex::new(HashMap::new()));
         let namespace = Namespace ( namespace_pool_raw.get("mize.default.namespace") );
         let (op_tx, op_rx) = channel::unbounded();
+        let give_msg_wait = Arc::new(Mutex::new(HashMap::new()));
 
         let mut instance = Instance { 
             store: Box::new(store), 
@@ -85,6 +87,7 @@ impl Instance {
             context: vec![],
             threads: vec![],
             next_con_id: Arc::new(Mutex::new(1)),
+            give_msg_wait,
 
             #[cfg(feature = "async")]
             runtime: Arc::new(Mutex::new(Runtime::new().mize_result_msg("Could not create async runtime")?)),
@@ -214,13 +217,34 @@ impl Instance {
         let mut conn_inner = self.connections.lock()?;
         let mut next_con_id = self.next_con_id.lock()?;
 
-        let connection = Connection { id: next_con_id.to_owned(), rx, tx};
+        let connection = Connection { id: next_con_id.to_owned(), rx, tx, ns: None};
         conn_inner.push(connection);
         *next_con_id += 1;
         Ok(next_con_id.to_owned())
     }
 
-    pub fn get_connection(&mut self, conn_id: u64) -> MizeResult<Connection> {
+    pub fn connection_set_namespace(&mut self, conn_id: u64, namespace: Namespace) -> MizeResult<()> {
+        let mut connection = self.get_connection(conn_id)?;
+        connection.ns = Some(namespace);
+        self.set_connection(conn_id, connection);
+        Ok(())
+    }
+
+    fn set_connection(&mut self, conn_id: u64, new_connection: Connection) -> MizeResult<()> {
+        let mut conn_inner = self.connections.lock()?;
+
+        for connection in conn_inner.iter_mut() {
+            if connection.id == conn_id {
+                *connection = new_connection;
+                return Ok(());
+            }
+        }
+
+        return Err(mize_err!("Connection with id {} not known to instance", conn_id));
+        Ok(())
+    }
+
+    pub fn get_connection(&self, conn_id: u64) -> MizeResult<Connection> {
         let mut conn_inner = self.connections.lock()?;
 
         for connection in conn_inner.iter() {
@@ -238,6 +262,29 @@ impl Instance {
         Ok(())
     }
 
+    pub fn give_msg_wait(&self, id: MizeId) -> MizeResult<ItemData> {
+
+        let mut give_msg_wait_inner = self.give_msg_wait.lock()?;
+
+        let rx = match give_msg_wait_inner.get(&id) {
+            // if this id is already in the process of being requested, just use the rx already there
+            Some((tx, rx)) => rx.to_owned(),
+
+            None => {
+                let (tx, rx) = crossbeam::channel::bounded::<ItemData>(1);
+                give_msg_wait_inner.insert(id, (tx, rx.clone()));
+                rx
+            },
+        };
+
+        // so that another thread can also give_msg_wait(), while we wait in the recv() of rx
+        drop(give_msg_wait_inner);
+
+        let data = rx.recv()?;
+
+        return Ok(data);
+    }
+
     #[cfg(feature = "async")]
     pub fn spawn_async<F: Future<Output = impl Send + Sync + 'static> + Send + Sync + 'static>(&mut self, name: &str, func: F) {
         self.threads.push(name.to_owned());

src/core/instance/updater.rs

@@ -47,7 +47,7 @@ fn handle_msg(msg: &mut MizeMessage, instance: &mut Instance) -> MizeResult<()>
     match msg.cmd()? {
         MessageCmd::Get => {
             let id = msg.id(instance)?;
-            let mut connection = instance.get_connection(msg.conn_id)?;
+            let mut connection = instance.get_connection(msg.conn_id)?.clone();
             let item = instance.get(id.clone())?;
             let msg = MizeMessage::new_give(id, item.as_data_full()?, msg.conn_id);
             connection.send(msg)?;