Merge pull request #284 from waku-org/chore/only-wss-peers

chore: only show websocket peers in discovery

examples/web-chat/.cspell.json

@@ -3,11 +3,12 @@
   "$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/master/cspell.schema.json",
   "language": "en",
   "words": [
+    "Alives",
     "asym",
     "backoff",
     "backoffs",
-    "bitjson",
     "bitauth",
+    "bitjson",
     "bufbuild",
     "chainsafe",
     "cimg",
@@ -16,6 +17,7 @@
     "codecov",
     "commitlint",
     "dependabot",
+    "Dialable",
     "dingpu",
     "Dlazy",
     "dnsaddr",
@@ -52,13 +54,13 @@
     "lightpush",
     "livechat",
     "mkdir",
+    "mplex",
     "multiaddr",
     "multiaddresses",
     "multiaddrs",
     "multicodec",
     "multicodecs",
     "multiformats",
-    "mplex",
     "multihashes",
     "muxed",
     "muxer",
@@ -100,13 +102,12 @@
     "varint",
     "waku",
     "wakuconnect",
-    "wakuv",
     "wakunode",
+    "wakuv",
     "webfonts",
     "websockets",
     "wifi",
-    "xsalsa20",
+    "xsalsa20"
-    "Alives"
   ],
   "flagWords": [],
   "ignorePaths": [

examples/web-chat/src/hooks.ts

@@ -81,8 +81,12 @@ export const useNodePeers = (node: undefined | LightNode) => {
   useEffect(() => {
     if (!node) return;
 
-    const handleDiscoveryBootstrap = (event: CustomEvent<PeerId>) => {
+    const handleDiscoveryBootstrap = async (event: CustomEvent<PeerId>) => {
-      setBootstrapPeers((peers) => new Set([...peers, event.detail]));
+      (async () => {
+        if (!(await isPeerDialable(event.detail, node))) return;
+
+        setBootstrapPeers((peers) => new Set([...peers, event.detail]));
+      })().catch((error) => console.error(error));
     };
 
     const handleConnectBootstrap = (event: CustomEvent<PeerId>) => {
@@ -90,7 +94,11 @@ export const useNodePeers = (node: undefined | LightNode) => {
     };
 
     const handleDiscoveryPeerExchange = (event: CustomEvent<PeerId>) => {
-      setPeerExchangePeers((peers) => new Set([...peers, event.detail]));
+      (async () => {
+        if (!(await isPeerDialable(event.detail, node))) return;
+
+        setPeerExchangePeers((peers) => new Set([...peers, event.detail]));
+      })().catch((error) => console.error(error));
     };
 
     const handleConnectPeerExchange = (event: CustomEvent<PeerId>) => {
@@ -210,3 +218,20 @@ export const usePeers = (params: UsePeersParams): UsePeersResults => {
 
   return peers;
 };
+
+// we only support websocket connections for now
+const isPeerDialable = async (peerId: PeerId, node: LightNode) => {
+  const peer = await node.libp2p.peerStore.get(peerId);
+  if (!peer) return false;
+  if (peer.addresses.length === 0) return false;
+  const connectableMultiaddrs = peer.addresses.filter(({ multiaddr }) =>
+    isMultiaddrConnectable(multiaddr.toString())
+  );
+  if (connectableMultiaddrs.length === 0) return false;
+
+  return true;
+};
+
+const isMultiaddrConnectable = (multiaddr: string) => {
+  return multiaddr.includes("wss") || multiaddr.includes("/tls/ws");
+};