fix(collection): correctly handle buffer timeouts with find()

Fix #14184
Automattic · Jan 21, 2024 · 900e9fa · 900e9fa
1 parent 2d68983
commit 900e9fa
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/lib/drivers/node-mongodb-native/collection.js b/lib/drivers/node-mongodb-native/collection.js
@@ -138,10 +138,23 @@ function iter(i) {
       let _args = args;
       let promise = null;
       let timeout = null;
-      if (syncCollectionMethods[i]) {
-        this.addQueue(() => {
-          lastArg.call(this, null, this[i].apply(this, _args.slice(0, _args.length - 1)));
-        }, []);
+      if (syncCollectionMethods[i] && typeof lastArg === 'function') {
+        this.addQueue(i, _args);
+        callback = lastArg;
+      } else if (syncCollectionMethods[i]) {
+        promise = new this.Promise((resolve, reject) => {
+          callback = function collectionOperationCallback(err, res) {
+            if (timeout != null) {
+              clearTimeout(timeout);
+            }
+            if (err != null) {
+              return reject(err);
+            }
+            resolve(res);
+          };
+          _args = args.concat([callback]);
+          this.addQueue(i, _args);
+        });
       } else if (typeof lastArg === 'function') {
         callback = function collectionOperationCallback() {
           if (timeout != null) {