mongodb 4.5.0 → 4.7.0

package/src/cmap/wire_protocol/compression.ts

@@ -1,7 +1,7 @@
 import * as zlib from 'zlib';
 
 import { LEGACY_HELLO_COMMAND } from '../../constants';
-import { PKG_VERSION, Snappy } from '../../deps';
+import { PKG_VERSION, Snappy, ZStandard } from '../../deps';
 import { MongoDecompressionError, MongoInvalidArgumentError } from '../../error';
 import type { Callback } from '../../utils';
 import type { OperationDescription } from '../message_stream';
@@ -10,7 +10,8 @@ import type { OperationDescription } from '../message_stream';
 export const Compressor = Object.freeze({
   none: 0,
   snappy: 1,
-  zlib: 2
+  zlib: 2,
+  zstd: 3
 } as const);
 
 /** @public */
@@ -32,6 +33,9 @@ export const uncompressibleCommands = new Set([
   'copydb'
 ]);
 
+const MAX_COMPRESSOR_ID = 3;
+const ZSTD_COMPRESSION_LEVEL = 3;
+
 // Facilitate compressing a message using an agreed compressor
 export function compress(
   self: { options: OperationDescription & zlib.ZlibOptions },
@@ -61,6 +65,15 @@ export function compress(
       }
       zlib.deflate(dataToBeCompressed, zlibOptions, callback as zlib.CompressCallback);
       break;
+    case 'zstd':
+      if ('kModuleError' in ZStandard) {
+        return callback(ZStandard['kModuleError']);
+      }
+      ZStandard.compress(dataToBeCompressed, ZSTD_COMPRESSION_LEVEL).then(
+        buffer => callback(undefined, buffer),
+        error => callback(error)
+      );
+      break;
     default:
       throw new MongoInvalidArgumentError(
         `Unknown compressor ${self.options.agreedCompressor} failed to compress`
@@ -74,7 +87,7 @@ export function decompress(
   compressedData: Buffer,
   callback: Callback<Buffer>
 ): void {
-  if (compressorID < 0 || compressorID > Math.max(2)) {
+  if (compressorID < 0 || compressorID > MAX_COMPRESSOR_ID) {
     throw new MongoDecompressionError(
       `Server sent message compressed using an unsupported compressor. (Received compressor ID ${compressorID})`
     );
@@ -95,6 +108,17 @@ export function decompress(
       }
       break;
     }
+    case Compressor.zstd: {
+      if ('kModuleError' in ZStandard) {
+        return callback(ZStandard['kModuleError']);
+      }
+
+      ZStandard.decompress(compressedData).then(
+        buffer => callback(undefined, buffer),
+        error => callback(error)
+      );
+      break;
+    }
     case Compressor.zlib:
       zlib.inflate(compressedData, callback as zlib.CompressCallback);
       break;

package/src/cmap/wire_protocol/constants.ts

@@ -1,7 +1,7 @@
 export const MIN_SUPPORTED_SERVER_VERSION = '3.6';
-export const MAX_SUPPORTED_SERVER_VERSION = '5.1';
+export const MAX_SUPPORTED_SERVER_VERSION = '6.0';
 export const MIN_SUPPORTED_WIRE_VERSION = 6;
-export const MAX_SUPPORTED_WIRE_VERSION = 14;
+export const MAX_SUPPORTED_WIRE_VERSION = 17;
 export const OP_REPLY = 1;
 export const OP_UPDATE = 2001;
 export const OP_INSERT = 2002;

package/src/cmap/wire_protocol/shared.ts

@@ -56,7 +56,11 @@ export function applyCommonQueryOptions(
   return queryOptions;
 }
 
-export function isSharded(topologyOrServer: Topology | Server | Connection): boolean {
+export function isSharded(topologyOrServer?: Topology | Server | Connection): boolean {
+  if (topologyOrServer == null) {
+    return false;
+  }
+
   if (topologyOrServer.description && topologyOrServer.description.type === ServerType.Mongos) {
     return true;
   }

package/src/collection.ts

@@ -2,7 +2,7 @@ import { BSONSerializeOptions, Document, resolveBSONOptions } from './bson';
 import type { AnyBulkWriteOperation, BulkWriteOptions, BulkWriteResult } from './bulk/common';
 import { OrderedBulkOperation } from './bulk/ordered';
 import { UnorderedBulkOperation } from './bulk/unordered';
-import { ChangeStream, ChangeStreamOptions } from './change_stream';
+import { ChangeStream, ChangeStreamDocument, ChangeStreamOptions } from './change_stream';
 import { AggregationCursor } from './cursor/aggregation_cursor';
 import { FindCursor } from './cursor/find_cursor';
 import type { Db } from './db';
@@ -93,7 +93,6 @@ import {
   checkCollectionName,
   DEFAULT_PK_FACTORY,
   emitWarningOnce,
-  getTopology,
   MongoDBNamespace,
   normalizeHintField,
   resolveOptions
@@ -296,7 +295,7 @@ export class Collection<TSchema extends Document = Document> {
     }
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new InsertOneOperation(
         this as TODO_NODE_3286,
         doc,
@@ -338,7 +337,7 @@ export class Collection<TSchema extends Document = Document> {
     options = options ? Object.assign({}, options) : { ordered: true };
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new InsertManyOperation(
         this as TODO_NODE_3286,
         docs,
@@ -406,7 +405,7 @@ export class Collection<TSchema extends Document = Document> {
     }
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new BulkWriteOperation(
         this as TODO_NODE_3286,
         operations as TODO_NODE_3286,
@@ -453,7 +452,7 @@ export class Collection<TSchema extends Document = Document> {
     if (typeof options === 'function') (callback = options), (options = {});
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new UpdateOneOperation(
         this as TODO_NODE_3286,
         filter,
@@ -501,7 +500,7 @@ export class Collection<TSchema extends Document = Document> {
     if (typeof options === 'function') (callback = options), (options = {});
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new ReplaceOneOperation(
         this as TODO_NODE_3286,
         filter,
@@ -549,7 +548,7 @@ export class Collection<TSchema extends Document = Document> {
     if (typeof options === 'function') (callback = options), (options = {});
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new UpdateManyOperation(
         this as TODO_NODE_3286,
         filter,
@@ -583,7 +582,7 @@ export class Collection<TSchema extends Document = Document> {
     if (typeof options === 'function') (callback = options), (options = {});
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new DeleteOneOperation(this as TODO_NODE_3286, filter, resolveOptions(this, options)),
       callback
     );
@@ -623,7 +622,7 @@ export class Collection<TSchema extends Document = Document> {
     }
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new DeleteManyOperation(this as TODO_NODE_3286, filter, resolveOptions(this, options)),
       callback
     );
@@ -652,7 +651,7 @@ export class Collection<TSchema extends Document = Document> {
 
     // Intentionally, we do not inherit options from parent for this operation.
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new RenameOperation(this as TODO_NODE_3286, newName, {
         ...options,
         readPreference: ReadPreference.PRIMARY
@@ -679,7 +678,7 @@ export class Collection<TSchema extends Document = Document> {
     options = options ?? {};
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new DropCollectionOperation(this.s.db, this.collectionName, options),
       callback
     );
@@ -759,7 +758,7 @@ export class Collection<TSchema extends Document = Document> {
     }
 
     return new FindCursor<WithId<TSchema>>(
-      getTopology(this),
+      this.s.db.s.client,
       this.s.namespace,
       filter,
       resolveOptions(this as TODO_NODE_3286, options)
@@ -783,7 +782,7 @@ export class Collection<TSchema extends Document = Document> {
     if (typeof options === 'function') (callback = options), (options = {});
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new OptionsOperation(this as TODO_NODE_3286, resolveOptions(this, options)),
       callback
     );
@@ -806,7 +805,7 @@ export class Collection<TSchema extends Document = Document> {
     if (typeof options === 'function') (callback = options), (options = {});
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new IsCappedOperation(this as TODO_NODE_3286, resolveOptions(this, options)),
       callback
     );
@@ -857,7 +856,7 @@ export class Collection<TSchema extends Document = Document> {
     if (typeof options === 'function') (callback = options), (options = {});
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new CreateIndexOperation(
         this as TODO_NODE_3286,
         this.collectionName,
@@ -918,7 +917,7 @@ export class Collection<TSchema extends Document = Document> {
     if (typeof options.maxTimeMS !== 'number') delete options.maxTimeMS;
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new CreateIndexesOperation(
         this as TODO_NODE_3286,
         this.collectionName,
@@ -952,7 +951,7 @@ export class Collection<TSchema extends Document = Document> {
     options.readPreference = ReadPreference.primary;
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new DropIndexOperation(this as TODO_NODE_3286, indexName, options),
       callback
     );
@@ -975,7 +974,7 @@ export class Collection<TSchema extends Document = Document> {
     if (typeof options === 'function') (callback = options), (options = {});
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new DropIndexesOperation(this as TODO_NODE_3286, resolveOptions(this, options)),
       callback
     );
@@ -1013,7 +1012,7 @@ export class Collection<TSchema extends Document = Document> {
     if (typeof options === 'function') (callback = options), (options = {});
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new IndexExistsOperation(this as TODO_NODE_3286, indexes, resolveOptions(this, options)),
       callback
     );
@@ -1036,7 +1035,7 @@ export class Collection<TSchema extends Document = Document> {
     if (typeof options === 'function') (callback = options), (options = {});
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new IndexInformationOperation(this.s.db, this.collectionName, resolveOptions(this, options)),
       callback
     );
@@ -1044,7 +1043,15 @@ export class Collection<TSchema extends Document = Document> {
 
   /**
    * Gets an estimate of the count of documents in a collection using collection metadata.
+   * This will always run a count command on all server versions.
    *
+   * due to an oversight in versions 5.0.0-5.0.8 of MongoDB, the count command,
+   * which estimatedDocumentCount uses in its implementation, was not included in v1 of
+   * the Stable API, and so users of the Stable API with estimatedDocumentCount are
+   * recommended to upgrade their server version to 5.0.9+ or set apiStrict: false to avoid
+   * encountering errors.
+   *
+   * @see {@link https://www.mongodb.com/docs/manual/reference/command/count/#behavior|Count: Behavior}
    * @param options - Optional settings for the command
    * @param callback - An optional callback, a Promise will be returned if none is provided
    */
@@ -1058,7 +1065,7 @@ export class Collection<TSchema extends Document = Document> {
   ): Promise<number> | void {
     if (typeof options === 'function') (callback = options), (options = {});
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new EstimatedDocumentCountOperation(this as TODO_NODE_3286, resolveOptions(this, options)),
       callback
     );
@@ -1118,7 +1125,7 @@ export class Collection<TSchema extends Document = Document> {
 
     filter ??= {};
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new CountDocumentsOperation(
         this as TODO_NODE_3286,
         filter as Document,
@@ -1193,7 +1200,7 @@ export class Collection<TSchema extends Document = Document> {
 
     filter ??= {};
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new DistinctOperation(
         this as TODO_NODE_3286,
         key as TODO_NODE_3286,
@@ -1221,7 +1228,7 @@ export class Collection<TSchema extends Document = Document> {
     if (typeof options === 'function') (callback = options), (options = {});
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new IndexesOperation(this as TODO_NODE_3286, resolveOptions(this, options)),
       callback
     );
@@ -1245,7 +1252,7 @@ export class Collection<TSchema extends Document = Document> {
     options = options ?? {};
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new CollStatsOperation(this as TODO_NODE_3286, options),
       callback
     );
@@ -1277,7 +1284,7 @@ export class Collection<TSchema extends Document = Document> {
     if (typeof options === 'function') (callback = options), (options = {});
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new FindOneAndDeleteOperation(
         this as TODO_NODE_3286,
         filter,
@@ -1324,7 +1331,7 @@ export class Collection<TSchema extends Document = Document> {
     if (typeof options === 'function') (callback = options), (options = {});
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new FindOneAndReplaceOperation(
         this as TODO_NODE_3286,
         filter,
@@ -1372,7 +1379,7 @@ export class Collection<TSchema extends Document = Document> {
     if (typeof options === 'function') (callback = options), (options = {});
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new FindOneAndUpdateOperation(
         this as TODO_NODE_3286,
         filter,
@@ -1408,7 +1415,7 @@ export class Collection<TSchema extends Document = Document> {
     }
 
     return new AggregationCursor(
-      getTopology(this),
+      this.s.db.s.client,
       this.s.namespace,
       pipeline,
       resolveOptions(this, options)
@@ -1418,21 +1425,52 @@ export class Collection<TSchema extends Document = Document> {
   /**
    * Create a new Change Stream, watching for new changes (insertions, updates, replacements, deletions, and invalidations) in this collection.
    *
-   * @since 3.0.0
+   * @remarks
+   * watch() accepts two generic arguments for distinct usecases:
+   * - The first is to override the schema that may be defined for this specific collection
+   * - The second is to override the shape of the change stream document entirely, if it is not provided the type will default to ChangeStreamDocument of the first argument
+   * @example
+   * By just providing the first argument I can type the change to be `ChangeStreamDocument<{ _id: number }>`
+   * ```ts
+   * collection.watch<{ _id: number }>()
+   *   .on('change', change => console.log(change._id.toFixed(4)));
+   * ```
+   *
+   * @example
+   * Passing a second argument provides a way to reflect the type changes caused by an advanced pipeline.
+   * Here, we are using a pipeline to have MongoDB filter for insert changes only and add a comment.
+   * No need start from scratch on the ChangeStreamInsertDocument type!
+   * By using an intersection we can save time and ensure defaults remain the same type!
+   * ```ts
+   * collection
+   *   .watch<Schema, ChangeStreamInsertDocument<Schema> & { comment: string }>([
+   *     { $addFields: { comment: 'big changes' } },
+   *     { $match: { operationType: 'insert' } }
+   *   ])
+   *   .on('change', change => {
+   *     change.comment.startsWith('big');
+   *     change.operationType === 'insert';
+   *     // No need to narrow in code because the generics did that for us!
+   *     expectType<Schema>(change.fullDocument);
+   *   });
+   * ```
+   *
    * @param pipeline - An array of {@link https://docs.mongodb.com/manual/reference/operator/aggregation-pipeline/|aggregation pipeline stages} through which to pass change stream documents. This allows for filtering (using $match) and manipulating the change stream documents.
    * @param options - Optional settings for the command
+   * @typeParam TLocal - Type of the data being detected by the change stream
+   * @typeParam TChange - Type of the whole change stream document emitted
    */
-  watch<TLocal extends Document = TSchema>(
+  watch<TLocal extends Document = TSchema, TChange extends Document = ChangeStreamDocument<TLocal>>(
     pipeline: Document[] = [],
     options: ChangeStreamOptions = {}
-  ): ChangeStream<TLocal> {
+  ): ChangeStream<TLocal, TChange> {
     // Allow optionally not specifying a pipeline
     if (!Array.isArray(pipeline)) {
       options = pipeline;
       pipeline = [];
     }
 
-    return new ChangeStream<TLocal>(this, pipeline, resolveOptions(this, options));
+    return new ChangeStream<TLocal, TChange>(this, pipeline, resolveOptions(this, options));
   }
 
   /**
@@ -1495,7 +1533,7 @@ export class Collection<TSchema extends Document = Document> {
     }
 
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new MapReduceOperation(
         this as TODO_NODE_3286,
         map,
@@ -1636,7 +1674,7 @@ export class Collection<TSchema extends Document = Document> {
 
     filter ??= {};
     return executeOperation(
-      this,
+      this.s.db.s.client,
       new CountOperation(
         MongoDBNamespace.fromString(this.namespace),
         filter,

package/src/connection_string.ts

@@ -19,7 +19,6 @@ import {
   ServerApi,
   ServerApiVersion
 } from './mongo_client';
-import type { OneOrMore } from './mongo_types';
 import { PromiseProvider } from './promise_provider';
 import { ReadConcern, ReadConcernLevel } from './read_concern';
 import { ReadPreference, ReadPreferenceMode } from './read_preference';
@@ -220,12 +219,7 @@ function getUint(name: string, value: unknown): number {
   return parsedValue;
 }
 
-/** Wrap a single value in an array if the value is not an array */
-function toArray<T>(value: OneOrMore<T>): T[] {
-  return Array.isArray(value) ? value : [value];
-}
-
-function* entriesFromString(value: string) {
+function* entriesFromString(value: string): Generator<[string, string]> {
   const keyValuePairs = value.split(',');
   for (const keyValue of keyValuePairs) {
     const [key, value] = keyValue.split(':');
@@ -269,6 +263,14 @@ export function parseOptions(
   const { hosts, isSRV } = url;
 
   const mongoOptions = Object.create(null);
+
+  // Feature flags
+  for (const flag of Object.getOwnPropertySymbols(options)) {
+    if (FEATURE_FLAGS.has(flag)) {
+      mongoOptions[flag] = options[flag];
+    }
+  }
+
   mongoOptions.hosts = isSRV ? [] : hosts.map(HostAddress.fromString);
 
   const urlOptions = new CaseInsensitiveMap<any[]>();
@@ -333,11 +335,19 @@ export function parseOptions(
   ]);
 
   for (const key of allKeys) {
-    const values = [objectOptions, urlOptions, DEFAULT_OPTIONS].flatMap(optionsObject => {
-      const options = optionsObject.get(key) ?? [];
-      return toArray(options);
-    });
-
+    const values = [];
+    const objectOptionValue = objectOptions.get(key);
+    if (objectOptionValue != null) {
+      values.push(objectOptionValue);
+    }
+    const urlValue = urlOptions.get(key);
+    if (urlValue != null) {
+      values.push(...urlValue);
+    }
+    const defaultOptionsValue = DEFAULT_OPTIONS.get(key);
+    if (defaultOptionsValue != null) {
+      values.push(defaultOptionsValue);
+    }
     allOptions.set(key, values);
   }
 
@@ -846,6 +856,16 @@ export const OPTIONS = {
       return new Logger('MongoClient', { loggerLevel: value as LoggerLevel });
     }
   },
+  maxConnecting: {
+    default: 2,
+    transform({ name, values: [value] }): number {
+      const maxConnecting = getUint(name, value);
+      if (maxConnecting === 0) {
+        throw new MongoInvalidArgumentError('maxConnecting must be > 0 if specified');
+      }
+      return maxConnecting;
+    }
+  },
   maxIdleTimeMS: {
     default: 0,
     type: 'uint'
@@ -982,9 +1002,18 @@ export const OPTIONS = {
   },
   readPreferenceTags: {
     target: 'readPreference',
-    transform({ values, options }) {
+    transform({
+      values,
+      options
+    }: {
+      values: Array<string | Record<string, string>[]>;
+      options: MongoClientOptions;
+    }) {
+      const tags: Array<string | Record<string, string>> = Array.isArray(values[0])
+        ? values[0]
+        : (values as Array<string>);
       const readPreferenceTags = [];
-      for (const tag of values) {
+      for (const tag of tags) {
         const readPreferenceTag: TagSet = Object.create(null);
         if (typeof tag === 'string') {
           for (const [k, v] of entriesFromString(tag)) {
@@ -1230,3 +1259,9 @@ export const DEFAULT_OPTIONS = new CaseInsensitiveMap(
     .filter(([, descriptor]) => descriptor.default != null)
     .map(([k, d]) => [k, d.default])
 );
+
+/**
+ * Set of permitted feature flags
+ * @internal
+ */
+export const FEATURE_FLAGS = new Set([Symbol.for('@@mdb.skipPingOnConnect')]);

package/src/constants.ts

@@ -40,6 +40,12 @@ export const COMMAND_FAILED = 'commandFailed' as const;
 export const SERVER_HEARTBEAT_STARTED = 'serverHeartbeatStarted' as const;
 export const SERVER_HEARTBEAT_SUCCEEDED = 'serverHeartbeatSucceeded' as const;
 export const SERVER_HEARTBEAT_FAILED = 'serverHeartbeatFailed' as const;
+export const RESPONSE = 'response' as const;
+export const MORE = 'more' as const;
+export const INIT = 'init' as const;
+export const CHANGE = 'change' as const;
+export const END = 'end' as const;
+export const RESUME_TOKEN_CHANGED = 'resumeTokenChanged' as const;
 
 /** @public */
 export const HEARTBEAT_EVENTS = Object.freeze([

package/src/cursor/abstract_cursor.ts

@@ -10,13 +10,13 @@ import {
   MongoRuntimeError,
   MongoTailableCursorError
 } from '../error';
+import type { MongoClient } from '../mongo_client';
 import { TODO_NODE_3286, TypedEventEmitter } from '../mongo_types';
 import { executeOperation, ExecutionResult } from '../operations/execute_operation';
 import { GetMoreOperation } from '../operations/get_more';
 import { ReadConcern, ReadConcernLike } from '../read_concern';
 import { ReadPreference, ReadPreferenceLike } from '../read_preference';
 import type { Server } from '../sdam/server';
-import type { Topology } from '../sdam/topology';
 import { ClientSession, maybeClearPinnedConnection } from '../sessions';
 import { Callback, maybePromise, MongoDBNamespace, ns } from '../utils';
 
@@ -29,7 +29,7 @@ const kServer = Symbol('server');
 /** @internal */
 const kNamespace = Symbol('namespace');
 /** @internal */
-const kTopology = Symbol('topology');
+const kClient = Symbol('client');
 /** @internal */
 const kSession = Symbol('session');
 /** @internal */
@@ -126,7 +126,7 @@ export abstract class AbstractCursor<
   /** @internal */
   [kDocuments]: TSchema[];
   /** @internal */
-  [kTopology]: Topology;
+  [kClient]: MongoClient;
   /** @internal */
   [kTransform]?: (doc: TSchema) => any;
   /** @internal */
@@ -143,13 +143,16 @@ export abstract class AbstractCursor<
 
   /** @internal */
   constructor(
-    topology: Topology,
+    client: MongoClient,
     namespace: MongoDBNamespace,
     options: AbstractCursorOptions = {}
   ) {
     super();
 
-    this[kTopology] = topology;
+    if (!client.s.isMongoClient) {
+      throw new MongoRuntimeError('Cursor must be constructed with MongoClient');
+    }
+    this[kClient] = client;
     this[kNamespace] = namespace;
     this[kDocuments] = []; // TODO: https://github.com/microsoft/TypeScript/issues/36230
     this[kInitialized] = false;
@@ -192,8 +195,8 @@ export abstract class AbstractCursor<
   }
 
   /** @internal */
-  get topology(): Topology {
-    return this[kTopology];
+  get client(): MongoClient {
+    return this[kClient];
   }
 
   /** @internal */
@@ -236,7 +239,7 @@ export abstract class AbstractCursor<
   }
 
   get loadBalanced(): boolean {
-    return this[kTopology].loadBalanced;
+    return !!this[kClient].topology?.loadBalanced;
   }
 
   /** Returns current buffered documents length */
@@ -258,7 +261,7 @@ export abstract class AbstractCursor<
     };
   }
 
-  stream(options?: CursorStreamOptions): Readable {
+  stream(options?: CursorStreamOptions): Readable & AsyncIterable<TSchema> {
     if (options?.transform) {
       const transform = options.transform;
       const readable = makeCursorStream(this);
@@ -388,7 +391,7 @@ export abstract class AbstractCursor<
     });
   }
 
-  close(): void;
+  close(): Promise<void>;
   close(callback: Callback): void;
   /**
    * @deprecated options argument is deprecated
@@ -630,7 +633,7 @@ export abstract class AbstractCursor<
       batchSize
     });
 
-    executeOperation(this, getMoreOperation, callback);
+    executeOperation(this[kClient], getMoreOperation, callback);
   }
 
   /**
@@ -642,13 +645,13 @@ export abstract class AbstractCursor<
    */
   [kInit](callback: Callback<TSchema | null>): void {
     if (this[kSession] == null) {
-      if (this[kTopology].shouldCheckForSessionSupport()) {
-        return this[kTopology].selectServer(ReadPreference.primaryPreferred, {}, err => {
+      if (this[kClient].topology?.shouldCheckForSessionSupport()) {
+        return this[kClient].topology?.selectServer(ReadPreference.primaryPreferred, {}, err => {
           if (err) return callback(err);
           return this[kInit](callback);
         });
-      } else if (this[kTopology].hasSessionSupport()) {
-        this[kSession] = this[kTopology].startSession({ owner: this, explicit: false });
+      } else if (this[kClient].topology?.hasSessionSupport()) {
+        this[kSession] = this[kClient].topology?.startSession({ owner: this, explicit: false });
       }
     }