wip

Author: no30bit

hermes/bin/src/cli/playground.rs

@@ -115,7 +115,7 @@ fn init_ipfs(temp_dir: &TempDir) -> anyhow::Result<()> {
     ipfs::bootstrap(ipfs::Config {
         base_dir: ipfs_dir.as_path(),
         // enable bootstrapping the IPFS node to default addresses
-        default_bootstrap: true,
+        default_bootstrap: false,
     })
 }
 

hermes/bin/src/ipfs/api.rs

@@ -153,14 +153,19 @@ pub(crate) fn hermes_ipfs_subscribe(
     app_name: &ApplicationName,
     topic: PubsubTopic,
 ) -> Result<bool, Errno> {
+    dbg!();
     let ipfs = HERMES_IPFS.get().ok_or(Errno::ServiceUnavailable)?;
     tracing::debug!(app_name = %app_name, pubsub_topic = %topic, "subscribing to PubSub topic");
+    dbg!();
     if ipfs.apps.topic_subscriptions_contains(kind, &topic) {
         tracing::debug!(app_name = %app_name, pubsub_topic = %topic, "topic subscription stream already exists");
     } else {
+        dbg!();
         let handle = ipfs.pubsub_subscribe(kind, &topic)?;
+        dbg!();
         ipfs.apps.added_topic_stream(kind, topic.clone(), handle);
         tracing::debug!(app_name = %app_name, pubsub_topic = %topic, "added subscription topic stream");
+        dbg!();
     }
     ipfs.apps
         .added_app_topic_subscription(kind, app_name.clone(), topic);

hermes/bin/src/ipfs/mod.rs

@@ -79,7 +79,8 @@ pub fn bootstrap(config: Config) -> anyhow::Result<()> {
 
 /// Hermes IPFS Internal Node
 pub(crate) struct HermesIpfsNode<N>
-where N: hermes_ipfs::rust_ipfs::NetworkBehaviour<ToSwarm = Infallible> + Send + Sync
+where
+    N: hermes_ipfs::rust_ipfs::NetworkBehaviour<ToSwarm = Infallible> + Send + Sync,
 {
     /// Send events to the IPFS node.
     sender: Option<mpsc::Sender<IpfsCommand>>,
@@ -90,7 +91,8 @@ where N: hermes_ipfs::rust_ipfs::NetworkBehaviour<ToSwarm = Infallible> + Send +
 }
 
 impl<N> HermesIpfsNode<N>
-where N: hermes_ipfs::rust_ipfs::NetworkBehaviour<ToSwarm = Infallible> + Send + Sync
+where
+    N: hermes_ipfs::rust_ipfs::NetworkBehaviour<ToSwarm = Infallible> + Send + Sync,
 {
     /// Create, initialize, and bootstrap a new `HermesIpfsNode`
     pub(crate) fn init(
@@ -326,11 +328,13 @@ where N: hermes_ipfs::rust_ipfs::NetworkBehaviour<ToSwarm = Infallible> + Send +
         topic: &PubsubTopic,
     ) -> Result<JoinHandle<()>, Errno> {
         let (cmd_tx, cmd_rx) = oneshot::channel();
+        dbg!();
         self.sender
             .as_ref()
             .ok_or(Errno::PubsubSubscribeError)?
-            .blocking_send(IpfsCommand::Subscribe(topic.clone(), kind, cmd_tx))
+            .blocking_send(IpfsCommand::Subscribe(dbg!(topic).clone(), kind, cmd_tx))
             .map_err(|_| Errno::PubsubSubscribeError)?;
+        dbg!();
         cmd_rx
             .blocking_recv()
             .map_err(|_| Errno::PubsubSubscribeError)?

hermes/bin/src/ipfs/task.rs

@@ -138,14 +138,22 @@ pub(crate) async fn ipfs_command_handler(
                 send_response(result, tx);
             },
             IpfsCommand::Subscribe(topic, kind, tx) => {
+                dbg!();
                 let stream = hermes_node
                     .pubsub_subscribe(&topic)
                     .await
                     .map_err(|_| Errno::PubsubSubscribeError)?;
-                let message_handler = TopicMessageHandler::new(&topic, match kind {
-                    SubscriptionKind::Default => topic_message_handler,
-                    SubscriptionKind::DocSync => doc_sync_topic_message_handler,
-                });
+                dbg!();
+
+                let message_handler = TopicMessageHandler::new(
+                    &topic,
+                    match kind {
+                        SubscriptionKind::Default => topic_message_handler,
+                        SubscriptionKind::DocSync => doc_sync_topic_message_handler,
+                    },
+                );
+                dbg!();
+
                 let subscription_handler =
                     TopicSubscriptionStatusHandler::new(&topic, topic_subscription_handler);
                 let handle = hermes_ipfs::subscription_stream_task(
@@ -183,12 +191,10 @@ pub(crate) async fn ipfs_command_handler(
             },
             IpfsCommand::Identity(peer_id, tx) => {
                 let peer_id = match peer_id {
-                    Some(peer_id) => {
-                        Some(
-                            hermes_ipfs::PeerId::from_str(&peer_id)
-                                .map_err(|_| Errno::InvalidPeerId)?,
-                        )
-                    },
+                    Some(peer_id) => Some(
+                        hermes_ipfs::PeerId::from_str(&peer_id)
+                            .map_err(|_| Errno::InvalidPeerId)?,
+                    ),
                     None => None,
                 };
 
@@ -207,7 +213,8 @@ pub(crate) async fn ipfs_command_handler(
 
 /// A handler for messages from the IPFS pubsub topic
 pub(super) struct TopicMessageHandler<T>
-where T: Fn(hermes_ipfs::rust_ipfs::GossipsubMessage, String) + Send + Sync + 'static
+where
+    T: Fn(hermes_ipfs::rust_ipfs::GossipsubMessage, String) + Send + Sync + 'static,
 {
     /// The topic.
     topic: String,
@@ -217,7 +224,8 @@ where T: Fn(hermes_ipfs::rust_ipfs::GossipsubMessage, String) + Send + Sync + 's
 }
 
 impl<T> TopicMessageHandler<T>
-where T: Fn(hermes_ipfs::rust_ipfs::GossipsubMessage, String) + Send + Sync + 'static
+where
+    T: Fn(hermes_ipfs::rust_ipfs::GossipsubMessage, String) + Send + Sync + 'static,
 {
     /// Creates the new handler.
     pub fn new(
@@ -241,7 +249,8 @@ where T: Fn(hermes_ipfs::rust_ipfs::GossipsubMessage, String) + Send + Sync + 's
 
 /// A handler for subscribe/unsubscribe events from the IPFS pubsub topic
 pub(super) struct TopicSubscriptionStatusHandler<T>
-where T: Fn(hermes_ipfs::SubscriptionStatusEvent, String) + Send + Sync + 'static
+where
+    T: Fn(hermes_ipfs::SubscriptionStatusEvent, String) + Send + Sync + 'static,
 {
     /// The topic.
     topic: String,
@@ -251,7 +260,8 @@ where T: Fn(hermes_ipfs::SubscriptionStatusEvent, String) + Send + Sync + 'stati
 }
 
 impl<T> TopicSubscriptionStatusHandler<T>
-where T: Fn(hermes_ipfs::SubscriptionStatusEvent, String) + Send + Sync + 'static
+where
+    T: Fn(hermes_ipfs::SubscriptionStatusEvent, String) + Send + Sync + 'static,
 {
     /// Creates the new handler.
     pub fn new(