Merge pull request #179 from redabourial/master

fixed race condition waiting for documents to be added

lib/publication.js

@@ -18,8 +18,8 @@ class Publication {
     this.childrenOptions = options.children || []
     this.publishedDocs = new PublishedDocumentList()
     this.collectionName = options.collectionName
-    // property to store promises for added callbacks
-    this.addedPromises = []
+    this.promises = []
+    this.childrenPublication = []
   }
 
   async publish () {
@@ -41,7 +41,7 @@ class Publication {
         })
 
         // store the promise
-        this.addedPromises.push(addedPromise)
+        this.promises.push(addedPromise)
       }),
       changed: Meteor.bindEnvironment((newDoc, oldDoc) => {
         debugLog('Publication.observeHandle.changed', `${collectionName}:${newDoc._id}`)
@@ -105,6 +105,7 @@ class Publication {
       : this.childrenOptions
     await Promise.all(children.map(async (options) => {
       const pub = new Publication(this.subscription, options, [doc].concat(this.args))
+      this.childrenPublication.push(pub)
       this.publishedDocs.addChildPub(doc._id, pub)
       await pub.publish()
     }))
@@ -169,6 +170,11 @@ class Publication {
       publication.unpublish()
     })
   }
+
+  async awaitPromises () {
+    await Promise.all(this.promises)
+    await Promise.all(this.childrenPublication.map(p => p.awaitPromises()))
+  }
 }
 
 export default Publication

lib/publish_composite.js

@@ -20,9 +20,7 @@ function publishComposite (name, options) {
       publications.forEach(pub => pub.unpublish())
     })
 
-    // wait for all publications to finish processing initial added callbacks
-    await Promise.all(publications.flatMap(pub => pub.addedPromises))
-
+    await Promise.all(publications.map(p => p.awaitPromises()))
     debugLog('Meteor.publish', 'ready')
     this.ready()
   })