fix: improve pubsub example

examples/pubsub/message-filtering/1.js

@@ -68,7 +68,8 @@ const createNode = async () => {
   node3.pubsub.subscribe(topic)
 
   // wait for subscriptions to propagate
-  await delay(1000)
+  await hasSubscription(node1, node2, topic)
+  await hasSubscription(node2, node3, topic)
 
   const validateFruit = (msgTopic, msg) => {
     const fruit = uint8ArrayToString(msg.data)
@@ -91,13 +92,27 @@ const createNode = async () => {
     await node1.pubsub.publish(topic, uint8ArrayFromString(fruit))
   }
 
-  // wait a few seconds for messages to be received
-  await delay(5000)
   console.log('############## all messages sent ##############')
 })()
 
 async function delay (ms) {
   await new Promise((resolve) => {
     setTimeout(() => resolve(), ms)
   })
-}
+}
+
+/**
+ * Wait for node1 to see that node2 has subscribed to the topic
+ */
+async function hasSubscription (node1, node2, topic) {
+  while (true) {
+    const subs = await node1.pubsub.getSubscribers(topic)
+
+    if (subs.map(peer => peer.toString()).includes(node2.peerId.toString())) {
+      return
+    }
+
+    // wait for subscriptions to propagate
+    await delay(100)
+  }
+}

examples/pubsub/message-filtering/test.js

@@ -19,29 +19,36 @@ export async function test () {
     all: true
   })
 
+  let output = ''
+
+  const expected = [
+    'node2 received: banana',
+    'node2 received: apple',
+    'node2 received: orange',
+    'node3 received: banana',
+    'node3 received: apple',
+    'node3 received: orange'
+  ]
+
   proc.all.on('data', async (data) => {
     process.stdout.write(data)
-    const line = uint8ArrayToString(data)
+    output += uint8ArrayToString(data)
 
-    // End
-    if (line.includes('all messages sent')) {
-      if (messages.car > 0) {
-        defer.reject(new Error('Message validation failed - peers failed to filter car messages'))
-      }
+    if (output.includes('received: car')) {
+      defer.reject(new Error('Message validation failed - peers failed to filter car messages'))
+    }
 
-      for (const fruit of ['banana', 'apple', 'orange']) {
-        if (messages[fruit] !== 2) {
-          defer.reject(new Error(`Not enough ${fruit} messages - received ${messages[fruit] ?? 0}, expected 2`))
-        }
+    let allMessagesReceived = true
+
+    expected.forEach(message => {
+      if (!output.includes(message)) {
+        allMessagesReceived = false
       }
+    })
 
+    if (allMessagesReceived) {
       defer.resolve()
     }
-
-    if (line.includes('received:')) {
-      const fruit = line.split('received:')[1].trim()
-      messages[fruit] = (messages[fruit] ?? 0) + 1
-    }
   })
 
   await defer.promise