@leofcoin/chain 1.7.92 → 1.7.94

package/exports/browser/chain.js

@@ -5312,7 +5312,6 @@ class VersionControl extends State {
 class ConnectionMonitor {
     #isMonitoring = false;
     #checkInterval = null;
-    #reconnectAttempts = 0;
     #peerReconnectAttempts = {};
     #maxReconnectAttempts = 10;
     #reconnectDelay = 5000;
@@ -5366,10 +5365,6 @@ class ConnectionMonitor {
             await this.#attemptReconnection();
             // Could attempt to find compatible peers or trigger version negotiation
         }
-        else {
-            // Reset reconnect attempts on successful connection
-            this.#reconnectAttempts = 0;
-        }
         // Log disconnected peers
         const disconnectedPeers = this.disconnectedPeers;
         if (disconnectedPeers.length > 0) {
@@ -5392,7 +5387,6 @@ class ConnectionMonitor {
         if (this.#peerReconnectAttempts[peer.peerId] >= this.#maxReconnectAttempts) {
             console.error('❌ Max reconnection attempts reached');
             this.#peerReconnectAttempts[peer.peerId] = 0;
-            return;
         }
         if (!this.#peerReconnectAttempts[peer.peerId]) {
             this.#peerReconnectAttempts[peer.peerId] = 0;
@@ -5418,24 +5412,26 @@ class ConnectionMonitor {
         // }
     }
     async #attemptReconnection() {
-        if (this.#reconnectAttempts >= this.#maxReconnectAttempts) {
-            console.error('❌ Max reconnection attempts reached');
-            return;
-        }
-        this.#reconnectAttempts++;
-        console.log(`🔄 Attempting reconnection ${this.#reconnectAttempts}/${this.#maxReconnectAttempts}`);
+        console.warn('⚠️ Attempting to reconnect to peers...');
         try {
             // Try to restart the network
-            if (globalThis.peernet?.start) {
-                await globalThis.peernet.start();
-            }
+            // if (globalThis.peernet?.start) {
+            //   await globalThis.peernet.start()
+            // }
             // Wait a bit before next check
             await new Promise((resolve) => setTimeout(resolve, this.#reconnectDelay));
         }
         catch (error) {
             console.error('❌ Reconnection failed:', error.message);
-            // Exponential backoff
-            this.#reconnectDelay = Math.min(this.#reconnectDelay * 1.5, 30000);
+            if (this.#reconnectDelay >= 30000) {
+                console.warn('⚠️ Reconnection delay reached maximum, resetting to 5 seconds');
+                this.#reconnectDelay = 5000;
+            }
+            else {
+                // Exponential backoff
+                this.#reconnectDelay = Math.min(this.#reconnectDelay * 1.5, 30000);
+                console.warn(`⚠️ Increasing reconnection delay to ${this.#reconnectDelay} ms`);
+            }
         }
     }
     async waitForPeers(timeoutMs = 30000) {

package/exports/browser/{client-BScgNzXE-Vdpk0JDu.js → client-BGaLaHk2-CA-9lfx-.js}

@@ -1,4 +1,4 @@
-import { L as LittlePubSub } from './node-browser-D4im-c4V.js';
+import { L as LittlePubSub } from './node-browser-DwZGtboN.js';
 import './identity-Cn0iQbY3-CeW0giQS.js';
 import './index-DUfUgiQY.js';
 

package/exports/browser/{messages-B9TrXtD1-B5p-nLLO.js → messages-BqTna7yM-sC5s4kYG.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './node-browser-D4im-c4V.js';
+import { F as FormatInterface } from './node-browser-DwZGtboN.js';
 import './identity-Cn0iQbY3-CeW0giQS.js';
 import './index-DUfUgiQY.js';
 
@@ -50,6 +50,9 @@ var proto$9 = {
   has: Boolean()
 };
 
+/**
+ * @extends typeof {FormatInterface}
+ */
 class DHTMessageResponse extends FormatInterface {
   get messageName() {
     return 'PeernetDHTMessageResponse'

package/exports/browser/{node-browser-D4im-c4V.js → node-browser-DwZGtboN.js}

@@ -8496,7 +8496,7 @@ class Peernet {
         this.root = options.root;
         const { RequestMessage, ResponseMessage, PeerMessage, PeerMessageResponse, PeernetMessage, DHTMessage, DHTMessageResponse, DataMessage, DataMessageResponse, PsMessage, ChatMessage, PeernetFile
         // FolderMessageResponse
-         } = await import(/* webpackChunkName: "messages" */ './messages-B9TrXtD1-B5p-nLLO.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-BqTna7yM-sC5s4kYG.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -8590,7 +8590,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-BScgNzXE-Vdpk0JDu.js');
+        const importee = await import('./client-BGaLaHk2-CA-9lfx-.js');
         /**
          * @access public
          * @type {PeernetClient}
@@ -8738,7 +8738,7 @@ class Peernet {
                 if (proto.name !== 'peernet-dht-response')
                     throw dhtError(proto.name);
                 const peerInfo = {
-                    ...peer.connectionStats,
+                    address: peer.remoteAddress,
                     id: peerId
                 };
                 if (proto.decoded.has)
@@ -8746,6 +8746,7 @@ class Peernet {
             }
             catch (error) {
                 console.error(`Error while walking ${peerId}`, error);
+                return undefined;
             }
         };
         let walks = [];
@@ -8754,7 +8755,7 @@ class Peernet {
                 walks.push(walk(peer, peerId));
             }
         }
-        return Promise.all(walks);
+        return Promise.race(walks);
     }
     /**
      * Override DHT behavior, try's finding the content three times
@@ -8811,18 +8812,26 @@ class Peernet {
             throw nothingFoundError(hash);
         debug(`found ${Object.keys(providers).length} provider(s) for ${hash}`);
         // get closest peer on earth
-        const closestPeer = Object.values(providers)[0];
+        let closestPeer = await this.dht.closestPeer(Object.values(providers));
+        // fallback to first provider if no closest peer found
+        if (!closestPeer || !closestPeer.id)
+            closestPeer = Object.values(providers)[0];
+        debug(`closest peer for ${hash} is ${closestPeer?.address}`);
         // get peer instance by id
         if (!closestPeer || !closestPeer.id)
             return this.requestData(hash, store?.name || store);
         const id = closestPeer.id;
         const peer = this.connections[id];
+        if (!peer || !peer?.connected) {
+            this.dht.removeProvider(id, hash);
+            return this.requestData(hash, store?.name || store);
+        }
+        let data = await new globalThis.peernet.protos['peernet-data']({
+            hash,
+            store: store?.name || store
+        });
+        const node = await this.prepareMessage(data);
         if (peer?.connected) {
-            let data = await new globalThis.peernet.protos['peernet-data']({
-                hash,
-                store: store?.name || store
-            });
-            const node = await this.prepareMessage(data);
             try {
                 if (peer)
                     data = await peer.request(node.encoded);
@@ -8848,10 +8857,10 @@ class Peernet {
             catch (error) {
                 debug(`Error while requesting data from ${id}`, error);
                 // if error, remove provider
-                this.dht.removeProvider(id, hash);
                 if (this.#peerAttempts[id] > 1) {
                     this.#peerAttempts[id] = 0;
                     debug(`Removed provider ${id} for ${hash} after 3 attempts`);
+                    this.dht.removeProvider(id, hash);
                     console.error(nothingFoundError(hash));
                     return undefined;
                 }

package/exports/browser/node-browser.js

@@ -1,3 +1,3 @@
-export { N as default } from './node-browser-D4im-c4V.js';
+export { N as default } from './node-browser-DwZGtboN.js';
 import './identity-Cn0iQbY3-CeW0giQS.js';
 import './index-DUfUgiQY.js';

package/exports/chain.js

@@ -1458,7 +1458,6 @@ class VersionControl extends State {
 class ConnectionMonitor {
     #isMonitoring = false;
     #checkInterval = null;
-    #reconnectAttempts = 0;
     #peerReconnectAttempts = {};
     #maxReconnectAttempts = 10;
     #reconnectDelay = 5000;
@@ -1512,10 +1511,6 @@ class ConnectionMonitor {
             await this.#attemptReconnection();
             // Could attempt to find compatible peers or trigger version negotiation
         }
-        else {
-            // Reset reconnect attempts on successful connection
-            this.#reconnectAttempts = 0;
-        }
         // Log disconnected peers
         const disconnectedPeers = this.disconnectedPeers;
         if (disconnectedPeers.length > 0) {
@@ -1538,7 +1533,6 @@ class ConnectionMonitor {
         if (this.#peerReconnectAttempts[peer.peerId] >= this.#maxReconnectAttempts) {
             console.error('❌ Max reconnection attempts reached');
             this.#peerReconnectAttempts[peer.peerId] = 0;
-            return;
         }
         if (!this.#peerReconnectAttempts[peer.peerId]) {
             this.#peerReconnectAttempts[peer.peerId] = 0;
@@ -1564,24 +1558,26 @@ class ConnectionMonitor {
         // }
     }
     async #attemptReconnection() {
-        if (this.#reconnectAttempts >= this.#maxReconnectAttempts) {
-            console.error('❌ Max reconnection attempts reached');
-            return;
-        }
-        this.#reconnectAttempts++;
-        console.log(`🔄 Attempting reconnection ${this.#reconnectAttempts}/${this.#maxReconnectAttempts}`);
+        console.warn('⚠️ Attempting to reconnect to peers...');
         try {
             // Try to restart the network
-            if (globalThis.peernet?.start) {
-                await globalThis.peernet.start();
-            }
+            // if (globalThis.peernet?.start) {
+            //   await globalThis.peernet.start()
+            // }
             // Wait a bit before next check
             await new Promise((resolve) => setTimeout(resolve, this.#reconnectDelay));
         }
         catch (error) {
             console.error('❌ Reconnection failed:', error.message);
-            // Exponential backoff
-            this.#reconnectDelay = Math.min(this.#reconnectDelay * 1.5, 30000);
+            if (this.#reconnectDelay >= 30000) {
+                console.warn('⚠️ Reconnection delay reached maximum, resetting to 5 seconds');
+                this.#reconnectDelay = 5000;
+            }
+            else {
+                // Exponential backoff
+                this.#reconnectDelay = Math.min(this.#reconnectDelay * 1.5, 30000);
+                console.warn(`⚠️ Increasing reconnection delay to ${this.#reconnectDelay} ms`);
+            }
         }
     }
     async waitForPeers(timeoutMs = 30000) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.7.92",
+  "version": "1.7.94",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {
@@ -69,7 +69,7 @@
     "@leofcoin/messages": "^1.4.40",
     "@leofcoin/multi-wallet": "^3.1.8",
     "@leofcoin/networks": "^1.1.25",
-    "@leofcoin/peernet": "^1.1.92",
+    "@leofcoin/peernet": "^1.1.95",
     "@leofcoin/storage": "^3.5.38",
     "@leofcoin/utils": "^1.1.40",
     "@leofcoin/workers": "^1.5.27",