fix(query): handle find() when buffering on initial connection

Fix #10610
Automattic · Aug 26, 2021 · 86f53ad · 86f53ad
1 parent c23a76e
commit 86f53ad
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/lib/query.js b/lib/query.js
@@ -2145,6 +2145,20 @@ Query.prototype._find = wrapThunk(function(callback) {
 
   const cursor = this._collection.collection.find(filter, options);
 
+  if (typeof cursor.then === 'function' && cursor.constructor.name !== 'FindCursor') {
+    cursor.then(cursor => {
+      if (options.explain) {
+        return cursor.explain(cb);
+      }
+      try {
+        return cursor.toArray(cb);
+      } catch (err) {
+        return cb(err);
+      }
+    });
+    return;
+  }
+
   if (options.explain) {
     return cursor.explain(cb);
   }