@leofcoin/chain 1.7.77 → 1.7.79

package/exports/browser/chain.js

@@ -5019,7 +5019,7 @@ class State extends Contract {
             const localBlock = await this.lastBlock;
             if (!localBlock || Number(localBlock.index) < Number(lastBlock.index)) {
                 // TODO: check if valid
-                const localIndex = localBlock ? localBlock.index : 0;
+                const localIndex = localBlock ? Number(localBlock.index) : 0;
                 const index = lastBlock.index;
                 await this.resolveBlock(lastBlock.hash);
                 console.log('ok');
@@ -5300,6 +5300,7 @@ class ConnectionMonitor {
     #isMonitoring = false;
     #checkInterval = null;
     #reconnectAttempts = 0;
+    #peerReconnectAttempts = {};
     #maxReconnectAttempts = 10;
     #reconnectDelay = 5000;
     #healthCheckInterval = 10000;
@@ -5313,11 +5314,12 @@ class ConnectionMonitor {
     get compatiblePeers() {
         return this.connectedPeers.filter((peer) => peer.version === this.#version);
     }
-    constructor(version) {
-        console.log(`🔗 Connection Monitor initialized for version: ${this.#version}`);
+    get disconnectedPeers() {
+        return Object.values(globalThis.peernet?.connections || {}).filter((peer) => !peer.connected);
     }
     start(version) {
         this.#version = version;
+        console.log(`🔗 Connection Monitor initialized for version: ${this.#version}`);
         if (this.#isMonitoring)
             return;
         this.#isMonitoring = true;
@@ -5348,12 +5350,24 @@ class ConnectionMonitor {
         }
         else if (compatiblePeers.length === 0) {
             console.warn('⚠️ No compatible peers found');
+            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) {
+            console.warn(`⚠️ Disconnected peers: ${disconnectedPeers.map((peer) => peer.peerId).join(', ')}`);
+            // Attempt to reconnect each disconnected peer
+            const promises = [];
+            for (const peer of disconnectedPeers) {
+                promises.push(this.#attemptPeerReconnection(peer));
+            }
+            await Promise.all(promises);
+        }
         // Publish connection status
         globalThis.pubsub?.publish('connection-status', {
             connected: connectedPeers.length,
@@ -5361,6 +5375,35 @@ class ConnectionMonitor {
             healthy: compatiblePeers.length > 0
         });
     }
+    async #attemptPeerReconnection(peer) {
+        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;
+        }
+        this.#peerReconnectAttempts[peer.peerId]++;
+        console.log(`🔄 Attempting reconnection ${this.#peerReconnectAttempts[peer.peerId]}/${this.#maxReconnectAttempts}`);
+        try {
+            const peerId = peer.peerId || peer.id;
+            // Attempt to reconnect the specific peer
+            await peernet.client.reconnect(peerId, globalThis.peernet?.stars[0]);
+        }
+        catch (error) {
+            console.error('❌ Reconnection failed:', error.message);
+        }
+        //   // Try to restart the network
+        //   if (globalThis.peernet?.start) {
+        //     await globalThis.peernet.start()
+        //   } else {
+        //     console.warn('⚠️ Peernet start method not available, skipping reconnection')
+        //   }
+        // } catch (error) {
+        //   console.error('❌ Reconnection failed:', error.message)
+        // }
+    }
     async #attemptReconnection() {
         if (this.#reconnectAttempts >= this.#maxReconnectAttempts) {
             console.error('❌ Max reconnection attempts reached');

package/exports/browser/{client-Db0RyH-f-ZTHffSH0.js → client-MAPwcc7G-CjrC1JNQ.js}

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

package/exports/browser/{messages-CT983-_h-B6UgHloi.js → messages-BkkXT6WO-Cd5WEDxx.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './node-browser-g4r5zC--.js';
+import { F as FormatInterface } from './node-browser-Ctauqi8V.js';
 import './identity-Cn0iQbY3-CeW0giQS.js';
 import './index-DUfUgiQY.js';
 

package/exports/browser/{node-browser-g4r5zC--.js → node-browser-Ctauqi8V.js}

@@ -8495,7 +8495,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-CT983-_h-B6UgHloi.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-BkkXT6WO-Cd5WEDxx.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -8589,7 +8589,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-Db0RyH-f-ZTHffSH0.js');
+        const importee = await import('./client-MAPwcc7G-CjrC1JNQ.js');
         /**
          * @access public
          * @type {PeernetClient}
@@ -8630,6 +8630,11 @@ class Peernet {
                 };
                 peer.once('error', onError);
                 peer.once('connect', async () => {
+                    if (!peer.connected) {
+                        peer.removeListener('error', onError);
+                        debug('Peer not connected');
+                        return;
+                    }
                     await peer.send(data, id);
                     this.bw.up += data.length;
                     peer.removeListener('error', onError);
@@ -8739,7 +8744,7 @@ class Peernet {
         };
         let walks = [];
         for (const [peerId, peer] of Object.entries(this.connections)) {
-            if (peerId !== this.id) {
+            if (peerId !== this.id && peer.connected) {
                 walks.push(walk(peer, peerId));
             }
         }

package/exports/browser/node-browser.js

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

package/exports/chain.js

@@ -1165,7 +1165,7 @@ class State extends Contract {
             const localBlock = await this.lastBlock;
             if (!localBlock || Number(localBlock.index) < Number(lastBlock.index)) {
                 // TODO: check if valid
-                const localIndex = localBlock ? localBlock.index : 0;
+                const localIndex = localBlock ? Number(localBlock.index) : 0;
                 const index = lastBlock.index;
                 await this.resolveBlock(lastBlock.hash);
                 console.log('ok');
@@ -1446,6 +1446,7 @@ class ConnectionMonitor {
     #isMonitoring = false;
     #checkInterval = null;
     #reconnectAttempts = 0;
+    #peerReconnectAttempts = {};
     #maxReconnectAttempts = 10;
     #reconnectDelay = 5000;
     #healthCheckInterval = 10000;
@@ -1459,11 +1460,12 @@ class ConnectionMonitor {
     get compatiblePeers() {
         return this.connectedPeers.filter((peer) => peer.version === this.#version);
     }
-    constructor(version) {
-        console.log(`🔗 Connection Monitor initialized for version: ${this.#version}`);
+    get disconnectedPeers() {
+        return Object.values(globalThis.peernet?.connections || {}).filter((peer) => !peer.connected);
     }
     start(version) {
         this.#version = version;
+        console.log(`🔗 Connection Monitor initialized for version: ${this.#version}`);
         if (this.#isMonitoring)
             return;
         this.#isMonitoring = true;
@@ -1494,12 +1496,24 @@ class ConnectionMonitor {
         }
         else if (compatiblePeers.length === 0) {
             console.warn('⚠️ No compatible peers found');
+            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) {
+            console.warn(`⚠️ Disconnected peers: ${disconnectedPeers.map((peer) => peer.peerId).join(', ')}`);
+            // Attempt to reconnect each disconnected peer
+            const promises = [];
+            for (const peer of disconnectedPeers) {
+                promises.push(this.#attemptPeerReconnection(peer));
+            }
+            await Promise.all(promises);
+        }
         // Publish connection status
         globalThis.pubsub?.publish('connection-status', {
             connected: connectedPeers.length,
@@ -1507,6 +1521,35 @@ class ConnectionMonitor {
             healthy: compatiblePeers.length > 0
         });
     }
+    async #attemptPeerReconnection(peer) {
+        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;
+        }
+        this.#peerReconnectAttempts[peer.peerId]++;
+        console.log(`🔄 Attempting reconnection ${this.#peerReconnectAttempts[peer.peerId]}/${this.#maxReconnectAttempts}`);
+        try {
+            const peerId = peer.peerId || peer.id;
+            // Attempt to reconnect the specific peer
+            await peernet.client.reconnect(peerId, globalThis.peernet?.stars[0]);
+        }
+        catch (error) {
+            console.error('❌ Reconnection failed:', error.message);
+        }
+        //   // Try to restart the network
+        //   if (globalThis.peernet?.start) {
+        //     await globalThis.peernet.start()
+        //   } else {
+        //     console.warn('⚠️ Peernet start method not available, skipping reconnection')
+        //   }
+        // } catch (error) {
+        //   console.error('❌ Reconnection failed:', error.message)
+        // }
+    }
     async #attemptReconnection() {
         if (this.#reconnectAttempts >= this.#maxReconnectAttempts) {
             console.error('❌ Max reconnection attempts reached');

package/exports/connection-monitor.d.ts

@@ -1,12 +1,13 @@
+import Peer from '@netpeer/swarm/peer';
 /**
  * Connection Monitor - Monitors peer connections and handles reconnection logic
  */
 export default class ConnectionMonitor {
     #private;
     get isMonitoring(): boolean;
-    get connectedPeers(): import("@netpeer/swarm/peer").default[];
-    get compatiblePeers(): import("@netpeer/swarm/peer").default[];
-    constructor(version: string);
+    get connectedPeers(): Peer[];
+    get compatiblePeers(): Peer[];
+    get disconnectedPeers(): Peer[];
     start(version: any): void;
     stop(): void;
     waitForPeers(timeoutMs?: number): Promise<boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.7.77",
+  "version": "1.7.79",
   "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.86",
+    "@leofcoin/peernet": "^1.1.87",
     "@leofcoin/storage": "^3.5.38",
     "@leofcoin/utils": "^1.1.39",
     "@leofcoin/workers": "^1.5.23",