Add peer ID to web-client PlainPeerInfo objects

nimiq · Jun 13, 2024 · e4c44c2 · e4c44c2
1 parent 52cc912
commit e4c44c2
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 19 deletions.
diff --git a/network-libp2p/src/discovery/peer_contacts.rs b/network-libp2p/src/discovery/peer_contacts.rs
@@ -439,19 +439,22 @@ impl PeerContactBook {
     /// Additional addresses aside from the first are omitted.
     ///
     /// The returned Vec may be empty.
-    pub fn known_peers(&self) -> Vec<PeerInfo> {
+    pub fn known_peers(&self) -> Vec<(PeerId, PeerInfo)> {
         self.peer_contacts
-            .values()
-            .map(|contact| {
-                PeerInfo::new(
-                    contact
-                        .contact
-                        .inner
-                        .addresses
-                        .first()
-                        .expect("every peer should have at least one address")
-                        .clone(),
-                    contact.contact.inner.services,
+            .iter()
+            .map(|(peer_id, contact)| {
+                (
+                    *peer_id,
+                    PeerInfo::new(
+                        contact
+                            .contact
+                            .inner
+                            .addresses
+                            .first()
+                            .expect("every peer should have at least one address")
+                            .clone(),
+                        contact.contact.inner.services,
+                    ),
                 )
             })
             .collect()

diff --git a/network-libp2p/src/network.rs b/network-libp2p/src/network.rs
@@ -154,7 +154,7 @@ impl Network {
 
     /// Retrieves a single PeerInfo peer existing in the PeerAddressBook.
     /// If that peer has multiple associated addresses all but the first are omitted.
-    pub fn get_address_book(&self) -> Vec<PeerInfo> {
+    pub fn get_address_book(&self) -> Vec<(PeerId, PeerInfo)> {
         self.contacts.read().known_peers()
     }
 

diff --git a/web-client/example/module.js b/web-client/example/module.js
@@ -46,7 +46,7 @@ init().then(async () => {
 
     document.querySelector('#address-book').addEventListener("click", async () => {
         let contacts = await client.getAddressBook();
-        console.log(contacts);
+        console.table(contacts);
     });
 
     /**

diff --git a/web-client/src/client/lib.rs b/web-client/src/client/lib.rs
@@ -402,7 +402,7 @@ impl Client {
             .network()
             .get_address_book()
             .into_iter()
-            .map(PlainPeerInfo::from)
+            .map(|(peer_id, peer_info)| PlainPeerInfo::from(peer_id.to_string(), peer_info))
             .collect();
 
         serde_wasm_bindgen::to_value(&contacts).unwrap().into()
@@ -966,8 +966,11 @@ impl Client {
                             peer_id.to_string(),
                             "joined",
                             Some(
-                                serde_wasm_bindgen::to_value(&PlainPeerInfo::from(peer_info))
-                                    .unwrap(),
+                                serde_wasm_bindgen::to_value(&PlainPeerInfo::from(
+                                    peer_id.to_string(),
+                                    peer_info,
+                                ))
+                                .unwrap(),
                             ),
                         ))
                     }

diff --git a/web-client/src/client/peer_info.rs b/web-client/src/client/peer_info.rs
@@ -6,6 +6,7 @@ use wasm_bindgen::prelude::*;
 #[derive(serde::Serialize, Tsify)]
 #[serde(rename_all = "camelCase")]
 pub struct PlainPeerInfo {
+    pub peer_id: String,
     /// Address of the peer in `Multiaddr` format
     address: String,
     /// Node type of the peer
@@ -14,8 +15,8 @@ pub struct PlainPeerInfo {
     node_type: String,
 }
 
-impl From<nimiq_network_interface::peer_info::PeerInfo> for PlainPeerInfo {
-    fn from(peer_info: nimiq_network_interface::peer_info::PeerInfo) -> Self {
+impl PlainPeerInfo {
+    pub fn from(peer_id: String, peer_info: nimiq_network_interface::peer_info::PeerInfo) -> Self {
         let node_type = if peer_info
             .get_services()
             .contains(Services::provided(NodeType::History))
@@ -31,6 +32,7 @@ impl From<nimiq_network_interface::peer_info::PeerInfo> for PlainPeerInfo {
         };
 
         Self {
+            peer_id,
             address: peer_info.get_address().to_string(),
             node_type: node_type.to_string(),
         }