peerpigeon 1.0.7 โ†’ 1.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/server/index.js +66 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "peerpigeon",
3
- "version": "1.0.7",
3
+ "version": "1.0.8",
4
4
  "description": "WebRTC-based peer-to-peer mesh networking library with intelligent routing and signaling server",
5
5
  "main": "index.js",
6
6
  "type": "module",
package/server/index.js CHANGED
@@ -40,6 +40,8 @@ export class PeerPigeonServer extends EventEmitter {
40
40
  this.networkPeers = new Map(); // networkName -> Set of peerIds
41
41
  this.hubs = new Map(); // peerId -> hub info (for peers identified as hubs)
42
42
  this.bootstrapConnections = new Map(); // bootstrapUri -> connection info
43
+ this.relayedDiscoveries = new Map(); // Track relayed peer discoveries to prevent loops: "peerId:networkName" -> timestamp
44
+ this.relayedSignaling = new Map(); // Track relayed signaling messages to prevent loops: "fromPeerId:targetPeerId:type" -> timestamp
43
45
  this.isRunning = false;
44
46
  this.cleanupTimer = null;
45
47
  this.startTime = null;
@@ -717,6 +719,13 @@ export class PeerPigeonServer extends EventEmitter {
717
719
  case 'peer-discovered':
718
720
  if (data?.isHub) {
719
721
  const hubPeerId = data.peerId;
722
+
723
+ // CRITICAL: Ignore our own announcements to prevent loops
724
+ if (hubPeerId === this.hubPeerId) {
725
+ console.log(`๐Ÿ”‡ Ignoring self-announcement from ${uri}`);
726
+ break;
727
+ }
728
+
720
729
  console.log(`๐Ÿข Discovered hub via bootstrap: ${hubPeerId?.substring(0, 8)}...`);
721
730
 
722
731
  // Register this remotely discovered hub (even though it's not directly connected to us)
@@ -1036,7 +1045,10 @@ export class PeerPigeonServer extends EventEmitter {
1036
1045
  this.networkPeers.get(peerNetworkName).add(peerId);
1037
1046
 
1038
1047
  // If this is a hub, broadcast BOTH hubs and regular peers to ALL other connected hubs
1039
- if (this.isHub) {
1048
+ // BUT only if this is a NEW announcement (not already known)
1049
+ const isNewAnnouncement = peerInfo && !peerInfo.broadcastedToHubs;
1050
+
1051
+ if (this.isHub && isNewAnnouncement) {
1040
1052
  const connectedHubs = [];
1041
1053
 
1042
1054
  // 1. Add outgoing bootstrap connections
@@ -1073,6 +1085,9 @@ export class PeerPigeonServer extends EventEmitter {
1073
1085
  timestamp: Date.now()
1074
1086
  };
1075
1087
 
1088
+ // Mark as broadcasted to prevent re-broadcasting
1089
+ peerInfo.broadcastedToHubs = true;
1090
+
1076
1091
  for (const hub of connectedHubs) {
1077
1092
  try {
1078
1093
  if (hub.type === 'bootstrap') {
@@ -1193,8 +1208,22 @@ export class PeerPigeonServer extends EventEmitter {
1193
1208
  this.sendToConnection(targetConnection, responseMessage);
1194
1209
  } else {
1195
1210
  // Target peer not on this hub - relay to other hubs
1211
+ // CRITICAL: Check if we've already relayed this signaling message to prevent loops
1212
+ const signalingKey = `${peerId}:${targetPeerId}:${message.type}`;
1213
+ const now = Date.now();
1214
+ const lastRelayed = this.relayedSignaling.get(signalingKey);
1215
+
1216
+ // If we've relayed this within the last 5 seconds, skip it
1217
+ if (lastRelayed && (now - lastRelayed) < 5000) {
1218
+ console.log(`๐Ÿ”‡ Skipping relay - already relayed ${message.type} from ${peerId.substring(0, 8)}... to ${targetPeerId.substring(0, 8)}... recently`);
1219
+ return;
1220
+ }
1221
+
1196
1222
  console.log(`๐Ÿ”„ Target peer ${targetPeerId.substring(0, 8)}... NOT LOCAL, relaying to other hubs (network: ${networkName})`);
1197
1223
 
1224
+ // Mark as relayed BEFORE relaying to prevent loops
1225
+ this.relayedSignaling.set(signalingKey, now);
1226
+
1198
1227
  let relayed = false;
1199
1228
 
1200
1229
  // First try relaying through bootstrap hubs (if we're not the bootstrap)
@@ -1281,8 +1310,18 @@ export class PeerPigeonServer extends EventEmitter {
1281
1310
 
1282
1311
  console.log(`๐Ÿ” Received peer discovery from hub ${fromHubPeerId.substring(0, 8)}... - Peer ${discoveredPeerId.substring(0, 8)}... in network '${networkName}'`);
1283
1312
 
1284
- // If this is a hub, relay this peer to OTHER connected hubs as well (to ensure full mesh awareness)
1285
- if (this.isHub) {
1313
+ // CRITICAL: Check if we've already relayed this peer discovery to prevent infinite loops
1314
+ const discoveryKey = `${discoveredPeerId}:${networkName}`;
1315
+ const now = Date.now();
1316
+ const lastRelayed = this.relayedDiscoveries.get(discoveryKey);
1317
+
1318
+ // If we've relayed this within the last 60 seconds, skip it
1319
+ if (lastRelayed && (now - lastRelayed) < 60000) {
1320
+ console.log(`๐Ÿ”‡ Skipping relay - already relayed ${discoveredPeerId.substring(0, 8)}... in network '${networkName}' recently`);
1321
+ } else if (this.isHub) {
1322
+ // Mark as relayed before relaying to prevent loops
1323
+ this.relayedDiscoveries.set(discoveryKey, now);
1324
+
1286
1325
  const relayedToHubs = [];
1287
1326
 
1288
1327
  // Relay to outgoing bootstrap connections (except the one we received from)
@@ -1518,6 +1557,30 @@ export class PeerPigeonServer extends EventEmitter {
1518
1557
  if (cleanedUp > 0) {
1519
1558
  console.log(`๐Ÿงน Periodic cleanup: removed ${cleanedUp} stale connections, ${this.connections.size} active across ${this.networkPeers.size} networks`);
1520
1559
  }
1560
+
1561
+ // Clean up old relay tracking entries (older than 5 minutes)
1562
+ const fiveMinutesAgo = Date.now() - 300000;
1563
+ let relayEntriesRemoved = 0;
1564
+ for (const [key, timestamp] of this.relayedDiscoveries) {
1565
+ if (timestamp < fiveMinutesAgo) {
1566
+ this.relayedDiscoveries.delete(key);
1567
+ relayEntriesRemoved++;
1568
+ }
1569
+ }
1570
+
1571
+ // Clean up old signaling relay tracking entries (older than 1 minute)
1572
+ const oneMinuteAgo = Date.now() - 60000;
1573
+ let signalingEntriesRemoved = 0;
1574
+ for (const [key, timestamp] of this.relayedSignaling) {
1575
+ if (timestamp < oneMinuteAgo) {
1576
+ this.relayedSignaling.delete(key);
1577
+ signalingEntriesRemoved++;
1578
+ }
1579
+ }
1580
+
1581
+ if (relayEntriesRemoved > 0 || signalingEntriesRemoved > 0) {
1582
+ console.log(`๐Ÿงน Cleaned up ${relayEntriesRemoved} relay tracking entries, ${signalingEntriesRemoved} signaling relay entries`);
1583
+ }
1521
1584
  }
1522
1585
 
1523
1586
  /**