helia-coord 1.9.1 → 1.9.2

package/examples/create-helia-node.js

@@ -81,7 +81,10 @@ class CreateHeliaNode {
       // Configure services
       const services = {
         identify: identify(),
-        pubsub: gossipsub({ allowPublishToZeroTopicPeers: true })
+        pubsub: gossipsub({
+          allowPublishToZeroTopicPeers: true,
+          emitSelf: true // Enable receiving own messages for testing
+        })
       }
 
       // libp2p is the networking layer that underpins Helia

package/examples/start-node.js

@@ -26,7 +26,7 @@ async function start () {
       type: 'node.js',
       // type: 'browser'
       nodeType: 'external',
-      debugLevel: 2
+      debugLevel: 3
     })
 
     await ipfsCoord.start()

package/lib/adapters/pubsub-adapter/index.js

@@ -15,7 +15,10 @@ class PubsubAdapter {
     // Dependency Injection
     this.ipfs = localConfig.ipfsAdapter
     if (!this.ipfs) {
-      console.log('this.ipfs: ', this.ipfs)
+      // Only log if log is available (may not be during construction)
+      if (this.log) {
+        this.log.statusLog(3, `this.ipfs: ${this.ipfs}`)
+      }
       throw new Error(
         'Instance of IPFS adapter required when instantiating Pubsub Adapter.'
       )
@@ -89,13 +92,14 @@ class PubsubAdapter {
 
       throw new Error('Pubsub service not initialized. Ensure gossipsub is configured in libp2p services.')
     } catch (err) {
+      this.log.statusLog(1, `Error getting pubsub service: ${err.message}`)
       console.error('Error getting pubsub service:', err)
       throw err
     }
   }
 
   // Set up a single global message listener that routes to topic-specific handlers
-  _setupGlobalMessageListener () {
+  async _setupGlobalMessageListener () {
     if (this._globalListenerSetup) {
       this.log.statusLog(3, 'Global message listener already set up, skipping')
       return
@@ -104,19 +108,73 @@ class PubsubAdapter {
     try {
       const pubsub = this._getPubsubService()
 
+      this.log.statusLog(3, `Pubsub service: ${pubsub.constructor?.name || 'unknown'}, type: ${typeof pubsub}`)
+      this.log.statusLog(3, `Has addEventListener: ${typeof pubsub.addEventListener}, has on: ${typeof pubsub.on}`)
+
       this.log.statusLog(2, 'Setting up global pubsub message listener...')
 
-      // Set up a single event listener for all messages
-      pubsub.addEventListener('message', (event) => {
-        this.log.statusLog(3, 'Pubsub message event received')
-        this._routeMessage(event)
-      })
+      // Try multiple event listener patterns for compatibility
+      let listenerAttached = false
+
+      // Check if service is started (it's a property, not a method)
+      // Services are typically started automatically by libp2p, but verify
+      if (pubsub.isStarted === false && typeof pubsub.start === 'function') {
+        this.log.statusLog(2, 'Pubsub service not started, starting...')
+        await pubsub.start()
+        this.log.statusLog(2, 'Pubsub service started')
+      }
+
+      // Pattern 1: addEventListener (EventTarget pattern) - for 'message' event
+      if (typeof pubsub.addEventListener === 'function') {
+        this.log.statusLog(3, 'Using addEventListener pattern for "message" event')
+        const messageHandler = (event) => {
+          this.log.statusLog(3, `Pubsub message event received (addEventListener), topic: ${event.detail?.topic || 'unknown'}`)
+          this._routeMessage(event)
+        }
+        pubsub.addEventListener('message', messageHandler)
+        // Store handler reference for potential cleanup
+        this._messageHandler = messageHandler
+        listenerAttached = true
+        this.log.statusLog(3, 'addEventListener attached successfully')
+      }
+
+      // Pattern 2: on() method (EventEmitter pattern) - for 'message' event
+      if (typeof pubsub.on === 'function') {
+        this.log.statusLog(3, 'Using on() pattern for "message" event')
+        pubsub.on('message', (event) => {
+          this.log.statusLog(3, `Pubsub message event received (on), topic: ${event.detail?.topic || 'unknown'}`)
+          this._routeMessage(event)
+        })
+        listenerAttached = true
+      }
+
+      // Pattern 3: Also listen for 'gossipsub:message' event (gossipsub-specific)
+      if (typeof pubsub.addEventListener === 'function') {
+        this.log.statusLog(3, 'Also listening for "gossipsub:message" event')
+        const gossipsubMessageHandler = (event) => {
+          // Convert gossipsub:message to message format
+          if (event.detail?.msg) {
+            const convertedEvent = {
+              detail: event.detail.msg
+            }
+            this.log.statusLog(3, `Pubsub gossipsub:message event received, converting, topic: ${event.detail.msg?.topic || 'unknown'}`)
+            this._routeMessage(convertedEvent)
+          }
+        }
+        pubsub.addEventListener('gossipsub:message', gossipsubMessageHandler)
+        this._gossipsubMessageHandler = gossipsubMessageHandler
+        this.log.statusLog(3, 'gossipsub:message listener attached successfully')
+      }
+
+      if (!listenerAttached) {
+        throw new Error('No supported event listener method found on pubsub service')
+      }
 
       this._globalListenerSetup = true
       this.log.statusLog(0, 'Global pubsub message listener successfully set up')
     } catch (err) {
-      console.error('Error setting up global message listener:', err)
       this.log.statusLog(1, `Error setting up global message listener: ${err.message}`)
+      console.error('Error setting up global message listener:', err)
       throw err
     }
   }
@@ -124,13 +182,12 @@ class PubsubAdapter {
   // Route incoming messages to the appropriate handler based on topic
   async _routeMessage (event) {
     try {
-      // Handle both event.detail and direct event properties
-      // In libp2p v3/gossipsub, events typically have event.detail structure
-      // Extract the message data - prefer event.detail if it exists
-      const msgDetail = event.detail || event
+      // In Helia v6/gossipsub, the 'message' event has event.detail as the Message object directly
+      // Message structure: { type: 'signed'|'unsigned', topic: string, data: Uint8Array, from?: PeerId, sequenceNumber?: bigint, ... }
+      const message = event.detail || event
 
-      // Extract topic - check multiple possible locations
-      const topic = msgDetail.topic || event.topic
+      // Extract topic from the Message object
+      const topic = message.topic
 
       if (!topic) {
         this.log.statusLog(1, `Received pubsub message without topic. Event keys: ${Object.keys(event).join(', ')}`)
@@ -143,14 +200,14 @@ class PubsubAdapter {
       const handler = this.topicHandlers.get(topic)
 
       if (handler) {
-        // Wrap event in expected format (msg.detail structure)
-        // Ensure we have the proper structure that existing handlers expect
+        // Wrap message in expected format (msg.detail structure) for backward compatibility
+        // The existing handlers expect: { detail: { topic, from, data, sequenceNumber } }
         const wrappedEvent = {
           detail: {
-            topic,
-            from: msgDetail.from || event.from,
-            data: msgDetail.data || event.data,
-            sequenceNumber: msgDetail.sequenceNumber || event.sequenceNumber
+            topic: message.topic,
+            from: message.from, // PeerId object
+            data: message.data, // Uint8Array
+            sequenceNumber: message.sequenceNumber // bigint
           }
         }
 
@@ -163,8 +220,8 @@ class PubsubAdapter {
         this.log.statusLog(3, `No handler registered for topic: ${topic}. Registered topics: ${Array.from(this.topicHandlers.keys()).join(', ')}`)
       }
     } catch (err) {
-      console.error('Error routing pubsub message:', err)
       this.log.statusLog(1, `Error routing pubsub message: ${err.message}`)
+      console.error('Error routing pubsub message:', err)
     }
   }
 
@@ -179,7 +236,7 @@ class PubsubAdapter {
   async subscribeToPubsubChannel (chanName, handler, thisNode) {
     try {
       // Ensure global listener is set up
-      this._setupGlobalMessageListener()
+      await this._setupGlobalMessageListener()
 
       // Get and validate pubsub service
       const pubsub = this._getPubsubService()
@@ -232,8 +289,8 @@ class PubsubAdapter {
 
       return true
     } catch (err) {
-      console.error('Error in subscribeToPubsubChannel():', err)
       this.log.statusLog(1, `Error subscribing to pubsub channel ${chanName}: ${err.message}`)
+      console.error('Error in subscribeToPubsubChannel():', err)
       throw err
     }
   }
@@ -246,7 +303,7 @@ class PubsubAdapter {
       const { chanName, handler } = inObj
 
       // Ensure global listener is set up
-      this._setupGlobalMessageListener()
+      await this._setupGlobalMessageListener()
 
       // Get and validate pubsub service
       const pubsub = this._getPubsubService()
@@ -263,8 +320,8 @@ class PubsubAdapter {
 
       return true
     } catch (err) {
-      console.error('Error in subscribeToCoordChannel():', err)
       this.log.statusLog(1, `Error subscribing to coordination channel: ${err.message}`)
+      console.error('Error in subscribeToCoordChannel():', err)
       throw err
     }
   }
@@ -294,7 +351,8 @@ class PubsubAdapter {
 
       return false
     } catch (err) {
-      console.error('Error in handleNewMessage()')
+      this.log.statusLog(1, `Error in handleNewMessage(): ${err.message}`)
+      console.error('Error in handleNewMessage()', err)
       throw err
     }
   }
@@ -340,9 +398,9 @@ class PubsubAdapter {
       }
 
       // This is not an /about JSON RPC query.
-      // console.log('JSON RPC is not targeting the /about endpoint')
       return false
     } catch (err) {
+      this.log.statusLog(1, `Error in captureMetrics: ${err.message}`)
       console.error('Error in captureMetrics: ', err)
       return false
     }
@@ -404,8 +462,8 @@ class PubsubAdapter {
 
       return true
     } catch (err) {
-      console.error('Error in parsePubsubMessage(): ', err.message)
       this.log.statusLog(2, `Error in parsePubsubMessage(): ${err.message}`)
+      console.error('Error in parsePubsubMessage(): ', err)
       // Do not throw an error. This is a top-level function.
 
       return false
@@ -453,14 +511,21 @@ class PubsubAdapter {
       const topics = pubsub.getTopics ? pubsub.getTopics() : []
       const registeredHandlers = Array.from(this.topicHandlers.keys())
 
+      // Log debug info at level 2
+      this.log.statusLog(2, `Pubsub service available: ${!!pubsub}, listener setup: ${this._globalListenerSetup}, topics: ${topics.length}, handlers: ${this.topicHandlers.size}`)
+
       return {
         serviceAvailable: true,
         globalListenerSetup: this._globalListenerSetup,
         subscribedTopics: topics,
         registeredHandlers,
-        handlerCount: this.topicHandlers.size
+        handlerCount: this.topicHandlers.size,
+        hasAddEventListener: typeof pubsub.addEventListener === 'function',
+        hasOn: typeof pubsub.on === 'function'
       }
     } catch (err) {
+      this.log.statusLog(1, `Error in getPubsubStatus: ${err.message}`)
+      console.error('Error in getPubsubStatus:', err)
       return {
         serviceAvailable: false,
         error: err.message,

package/lib/adapters/pubsub-adapter/messaging.js

@@ -74,7 +74,8 @@ class Messaging {
 
       return true
     } catch (err) {
-      console.error('Error in messaging.js/sendMsg()')
+      this.log.statusLog(1, `Error in messaging.js/sendMsg(): ${err.message}`)
+      console.error('Error in messaging.js/sendMsg()', err)
       throw err
     }
   }
@@ -90,12 +91,13 @@ class Messaging {
 
       return true
     } catch (err) {
-      console.error('Error in sendAck()')
+      this.log.statusLog(1, `Error in sendAck(): ${err.message}`)
+      console.error('Error in sendAck()', err)
       throw err
     }
   }
 
-  // A handler function that is called when a new message is recieved on the
+  // A handler function that is called when a new message is received on the
   // pubsub channel for this IPFS node. It does the following:
   // - Decrypts the message.
   // - Sends an ACK message to the sender of the message.
@@ -180,6 +182,7 @@ class Messaging {
 
       return retObj
     } catch (err) {
+      this.log.statusLog(1, `Error in handleIncomingData(): ${err.message}`)
       console.error('Error in helia-coord/lib/adpaters/pubsub-adapter/messaging.js/handleIncomingData(): ', err)
 
       // Do not throw an error. This is a top-level function called by an Interval.
@@ -218,7 +221,8 @@ class Messaging {
 
       return outMsgObj
     } catch (err) {
-      console.log('Error in generateMsgObj()')
+      this.log.statusLog(1, `Error in generateMsgObj(): ${err.message}`)
+      console.error('Error in generateMsgObj()', err)
       throw err
     }
   }
@@ -240,7 +244,7 @@ class Messaging {
       // 3/24/24 CT - Debugging issue with passing data between ipfs-bch-wallet
       // -service and -consumer.
       if (!peerData || !peerData[0] || !peerData[0].data) {
-        console.log(`peerData[0]: ${JSON.stringify(peerData[0])}`)
+        this.log.statusLog(3, `peerData[0]: ${JSON.stringify(peerData[0])}`)
         throw new Error('Required encryption information for peer is not available.')
       }
 
@@ -274,6 +278,7 @@ class Messaging {
 
       return outMsgObj
     } catch (err) {
+      this.log.statusLog(1, `Error in generateAckMsg(): ${err.message}`)
       console.error('Error in generateAckMsg()', err)
       throw err
     }
@@ -302,6 +307,7 @@ class Messaging {
 
       throw new Error('Pubsub service not initialized. Ensure gossipsub is configured in libp2p services.')
     } catch (err) {
+      this.log.statusLog(1, `Error getting pubsub service: ${err.message}`)
       console.error('Error getting pubsub service:', err)
       throw err
     }
@@ -335,8 +341,8 @@ class Messaging {
 
       return true
     } catch (err) {
-      console.error('Error in publishToPubsubChannel():', err)
       this.log.statusLog(1, `Error publishing to channel ${chanName}: ${err.message}`)
+      console.error('Error in publishToPubsubChannel():', err)
       throw err
     }
   }
@@ -410,7 +416,8 @@ class Messaging {
 
       return msgObj
     } catch (err) {
-      console.error('Error in addMsgToQueue')
+      this.log.statusLog(1, `Error in addMsgToQueue: ${err.message}`)
+      console.error('Error in addMsgToQueue', err)
       throw err
     }
   }

package/lib/adapters/pubsub-adapter/resend-msg.js

@@ -21,7 +21,11 @@ class ResendMsg {
       // console.log(`resendMsg() msgObj: ${JSON.stringify(msgObj, null, 2)}`)
 
       if (!this.msgObj) {
-        console.log('ipfs-coord-esm/lib/adapters/pubsub-adapter/resend-msg.js/resend() given empty message object. Can not resend message. Skipping.')
+        if (this.msgLib?.log) {
+          this.msgLib.log.statusLog(3, 'resend() given empty message object. Can not resend message. Skipping.')
+        } else {
+          console.log('ipfs-coord-esm/lib/adapters/pubsub-adapter/resend-msg.js/resend() given empty message object. Can not resend message. Skipping.')
+        }
         return 0
       }
 
@@ -48,6 +52,9 @@ class ResendMsg {
         return 2
       }
     } catch (err) {
+      if (this.msgLib?.log) {
+        this.msgLib.log.statusLog(1, `Error in resendMsg(): ${err.message}`)
+      }
       console.error('Error in resendMsg(): ', err)
       // Do not throw an error. This is a top-level function called by an Interval.
       return 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "helia-coord",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "A JS library for helping IPFS peers coordinate, find a common interest, and stay connected around that interest.",
   "main": "./index.js",
   "type": "module",
@@ -37,7 +37,7 @@
     "cross-env": "7.0.3",
     "datastore-fs": "10.0.2",
     "delay": "6.0.0",
-    "helia": "5.2.1",
+    "helia": "6.0.16",
     "lodash.clonedeep": "4.5.0",
     "minimal-slp-wallet": "7.1.4",
     "mocha": "10.0.0",