From ac49df6214f58df496118a6a04277ca22c7bef43 Mon Sep 17 00:00:00 2001
From: Warren James <28974128+W-A-James@users.noreply.github.com>
Date: Thu, 17 Jun 2021 18:04:42 -0400
Subject: [PATCH] fix(NODE-2035): exceptions thrown from awaited cursor forEach
 do not propagate (#2835)

---
 src/cursor/abstract_cursor.ts  | 18 +++++++++-----
 test/functional/cursor.test.js | 44 ++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/src/cursor/abstract_cursor.ts b/src/cursor/abstract_cursor.ts
index ec29e6b0a9..3c8cfd0050 100644
--- a/src/cursor/abstract_cursor.ts
+++ b/src/cursor/abstract_cursor.ts
@@ -326,21 +326,27 @@ export abstract class AbstractCursor<
       const fetchDocs = () => {
         next<T>(this, true, (err, doc) => {
           if (err || doc == null) return done(err);
-          if (doc == null) return done();
-
+          let result;
           // NOTE: no need to transform because `next` will do this automatically
-          let result = iterator(doc); // TODO(NODE-3283): Improve transform typing
+          try {
+            result = iterator(doc); // TODO(NODE-3283): Improve transform typing
+          } catch (error) {
+            return done(error);
+          }
+
           if (result === false) return done();
 
           // these do need to be transformed since they are copying the rest of the batch
           const internalDocs = this[kDocuments].splice(0, this[kDocuments].length);
-          if (internalDocs) {
-            for (let i = 0; i < internalDocs.length; ++i) {
+          for (let i = 0; i < internalDocs.length; ++i) {
+            try {
               result = iterator(
                 (transform ? transform(internalDocs[i]) : internalDocs[i]) as T // TODO(NODE-3283): Improve transform typing
               );
-              if (result === false) return done();
+            } catch (error) {
+              return done(error);
             }
+            if (result === false) return done();
           }
 
           fetchDocs();
diff --git a/test/functional/cursor.test.js b/test/functional/cursor.test.js
index f55de943ae..af56b72315 100644
--- a/test/functional/cursor.test.js
+++ b/test/functional/cursor.test.js
@@ -3901,6 +3901,50 @@ describe('Cursor', function () {
     });
   });
 
+  describe('Cursor forEach Error propagation', function () {
+    let configuration;
+    let client;
+    let cursor;
+    let collection;
+
+    beforeEach(async function () {
+      configuration = this.configuration;
+      client = configuration.newClient({ w: 1 }, { maxPoolSize: 1 });
+      await client.connect().catch(() => {
+        expect.fail('Failed to connect to client');
+      });
+      collection = client.db(configuration.db).collection('cursor_session_tests2');
+    });
+
+    afterEach(async function () {
+      await cursor.close();
+      await client.close();
+    });
+
+    // NODE-2035
+    it('should propagate error when exceptions are thrown from an awaited forEach call', async function () {
+      const docs = [{ unique_key_2035: 1 }, { unique_key_2035: 2 }, { unique_key_2035: 3 }];
+      await collection.insertMany(docs).catch(() => {
+        expect.fail('Failed to insert documents');
+      });
+      cursor = collection.find({
+        unique_key_2035: {
+          $exists: true
+        }
+      });
+      await cursor
+        .forEach(() => {
+          throw new Error('FAILURE IN FOREACH CALL');
+        })
+        .then(() => {
+          expect.fail('Error in forEach call not caught');
+        })
+        .catch(err => {
+          expect(err.message).to.deep.equal('FAILURE IN FOREACH CALL');
+        });
+    });
+  });
+
   it('should return a promise when no callback supplied to forEach method', function () {
     const configuration = this.configuration;
     const client = configuration.newClient({ w: 1 }, { maxPoolSize: 1 });