@waku/core 0.0.30-00c77c6.0 → 0.0.30-42126a6.0

package/bundle/{base_protocol-kugTP2Op.js → base_protocol-C6HnrRx8.js}

@@ -1,5 +1,4 @@
-import { c as bytesToUtf8, L as Logger, e as ensureShardingConfigured } from './index-egXdK_Fb.js';
-import { T as Tags } from './browser-B9234RhB.js';
+import { h as bytesToUtf8, T as Tags, L as Logger, i as ensureShardingConfigured } from './index-DnW8ifxc.js';
 
 const decodeRelayShard = (bytes) => {
     // explicitly converting to Uint8Array to avoid Buffer
@@ -175,6 +174,9 @@ function filterPeersByDiscovery(peers, numPeers, maxBootstrapPeers) {
     return selectedPeers;
 }
 
+const CONNECTION_TIMEOUT = 5_000;
+const RETRY_BACKOFF_BASE = 1_000;
+const MAX_RETRIES = 3;
 class StreamManager {
     multicodec;
     getConnections;
@@ -186,47 +188,78 @@ class StreamManager {
         this.getConnections = getConnections;
         this.addEventListener = addEventListener;
         this.log = new Logger(`stream-manager:${multicodec}`);
-        this.addEventListener("peer:update", this.handlePeerUpdateStreamPool.bind(this));
-        this.getStream = this.getStream.bind(this);
         this.streamPool = new Map();
+        this.addEventListener("peer:update", this.handlePeerUpdateStreamPool);
     }
     async getStream(peer) {
         const peerIdStr = peer.id.toString();
         const streamPromise = this.streamPool.get(peerIdStr);
         if (!streamPromise) {
-            return this.newStream(peer); // fallback by creating a new stream on the spot
+            return this.createStream(peer);
         }
-        // We have the stream, let's remove it from the map
         this.streamPool.delete(peerIdStr);
-        this.prepareNewStream(peer);
-        const stream = await streamPromise;
-        if (!stream || stream.status === "closed") {
-            return this.newStream(peer); // fallback by creating a new stream on the spot
+        this.prepareStream(peer);
+        try {
+            const stream = await streamPromise;
+            if (stream && stream.status !== "closed") {
+                return stream;
+            }
+        }
+        catch (error) {
+            this.log.warn(`Failed to get stream for ${peerIdStr} -- `, error);
+            this.log.warn("Attempting to create a new stream for the peer");
         }
-        return stream;
+        return this.createStream(peer);
     }
-    async newStream(peer) {
+    async createStream(peer, retries = 0) {
         const connections = this.getConnections(peer.id);
         const connection = selectConnection(connections);
         if (!connection) {
             throw new Error("Failed to get a connection to the peer");
         }
-        return connection.newStream(this.multicodec);
+        try {
+            return await connection.newStream(this.multicodec);
+        }
+        catch (error) {
+            if (retries < MAX_RETRIES) {
+                const backoff = RETRY_BACKOFF_BASE * Math.pow(2, retries);
+                await new Promise((resolve) => setTimeout(resolve, backoff));
+                return this.createStream(peer, retries + 1);
+            }
+            throw new Error(`Failed to create a new stream for ${peer.id.toString()} -- ` + error);
+        }
     }
-    prepareNewStream(peer) {
-        const streamPromise = this.newStream(peer).catch(() => {
-            // No error thrown as this call is not triggered by the user
-            this.log.error(`Failed to prepare a new stream for ${peer.id.toString()}`);
+    prepareStream(peer) {
+        const timeoutPromise = new Promise((resolve) => setTimeout(resolve, CONNECTION_TIMEOUT));
+        const streamPromise = Promise.race([
+            this.createStream(peer),
+            timeoutPromise.then(() => {
+                throw new Error("Connection timeout");
+            })
+        ]).catch((error) => {
+            this.log.error(`Failed to prepare a new stream for ${peer.id.toString()} -- `, error);
         });
         this.streamPool.set(peer.id.toString(), streamPromise);
     }
     handlePeerUpdateStreamPool = (evt) => {
-        const peer = evt.detail.peer;
+        const { peer } = evt.detail;
         if (peer.protocols.includes(this.multicodec)) {
-            this.log.info(`Preemptively opening a stream to ${peer.id.toString()}`);
-            this.prepareNewStream(peer);
+            const isConnected = this.isConnectedTo(peer.id);
+            if (isConnected) {
+                this.log.info(`Preemptively opening a stream to ${peer.id.toString()}`);
+                this.prepareStream(peer);
+            }
+            else {
+                const peerIdStr = peer.id.toString();
+                this.streamPool.delete(peerIdStr);
+                this.log.info(`Removed pending stream for disconnected peer ${peerIdStr}`);
+            }
         }
     };
+    isConnectedTo(peerId) {
+        const connections = this.getConnections(peerId);
+        return connections.some((connection) => connection.status === "open");
+    }
 }
 
 /**