fix: make sure close does not end early but killed does

mongodb · Apr 30, 2024 · ff12d3d · ff12d3d
1 parent c2a18e4
commit ff12d3d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/cursor/abstract_cursor.ts b/src/cursor/abstract_cursor.ts
@@ -2,12 +2,10 @@ import { Readable, Transform } from 'stream';
 
 import { type BSONSerializeOptions, type Document, Long, pluckBSONSerializeOptions } from '../bson';
 import {
-  type AnyError,
   MongoAPIError,
   MongoCursorExhaustedError,
   MongoCursorInUseError,
   MongoInvalidArgumentError,
-  MongoNetworkError,
   MongoRuntimeError,
   MongoTailableCursorError
 } from '../error';
@@ -300,7 +298,11 @@ export abstract class AbstractCursor<
 
     try {
       while (true) {
-        if (this.closed) {
+        if (this.killed) {
+          return;
+        }
+
+        if (this.closed && this[kDocuments].length === 0) {
           return;
         }
 

diff --git a/test/integration/change-streams/change_stream.test.ts b/test/integration/change-streams/change_stream.test.ts
@@ -7,7 +7,6 @@ import { PassThrough } from 'stream';
 import { setTimeout } from 'timers';
 
 import {
-  AbstractCursor,
   type ChangeStream,
   type ChangeStreamOptions,
   type Collection,

diff --git a/test/integration/change-streams/change_streams.prose.test.ts b/test/integration/change-streams/change_streams.prose.test.ts
@@ -4,7 +4,6 @@ import * as sinon from 'sinon';
 import { setTimeout } from 'timers';
 
 import {
-  AbstractCursor,
   type ChangeStream,
   type CommandFailedEvent,
   type CommandStartedEvent,
@@ -18,7 +17,6 @@ import {
   Timestamp
 } from '../../mongodb';
 import * as mock from '../../tools/mongodb-mock/index';
-import { getSymbolFrom } from '../../tools/utils';
 import { setupDatabase } from '../shared';
 
 /**

diff --git a/test/integration/crud/misc_cursors.test.js b/test/integration/crud/misc_cursors.test.js
@@ -1870,7 +1870,7 @@ describe('Cursor', function () {
     const rejectedEarlyBecauseClientClosed = cursor.next().catch(error => error);
 
     await client.close();
-    expect(cursor).to.have.property('killed', true);
+    expect(cursor).to.have.property('closed', true);
 
     const error = await rejectedEarlyBecauseClientClosed;
     expect(error).to.be.instanceOf(MongoExpiredSessionError);

diff --git a/test/integration/node-specific/cursor_async_iterator.test.js b/test/integration/node-specific/cursor_async_iterator.test.js
@@ -77,6 +77,7 @@ describe('Cursor Async Iterator Tests', function () {
       await cursor.close();
 
       let count = 0;
+      // eslint-disable-next-line no-unused-vars
       for await (const _ of cursor) count++;
 
       expect(count).to.equal(0);