mongodb 4.2.0 → 4.3.1

package/src/mongo_client.ts

@@ -1,42 +1,44 @@
-import { Db, DbOptions } from './db';
+import type { TcpNetConnectOpts } from 'net';
+import type { ConnectionOptions as TLSConnectionOptions, TLSSocketOptions } from 'tls';
+
+import { BSONSerializeOptions, Document, resolveBSONOptions } from './bson';
 import { ChangeStream, ChangeStreamOptions } from './change_stream';
-import type { ReadPreference, ReadPreferenceMode } from './read_preference';
+import type { AuthMechanismProperties, MongoCredentials } from './cmap/auth/mongo_credentials';
+import type { AuthMechanism } from './cmap/auth/providers';
+import type { LEGAL_TCP_SOCKET_OPTIONS, LEGAL_TLS_SOCKET_OPTIONS } from './cmap/connect';
+import type { Connection } from './cmap/connection';
+import type { CompressorName } from './cmap/wire_protocol/compression';
+import { parseOptions } from './connection_string';
+import type { MONGO_CLIENT_EVENTS } from './constants';
+import { Db, DbOptions } from './db';
+import type { AutoEncrypter, AutoEncryptionOptions } from './deps';
+import type { Encrypter } from './encrypter';
 import {
   AnyError,
-  MongoRuntimeError,
   MongoInvalidArgumentError,
-  MongoNotConnectedError
+  MongoNotConnectedError,
+  MongoRuntimeError
 } from './error';
-import type { W, WriteConcern } from './write_concern';
+import type { Logger, LoggerLevel } from './logger';
+import { TypedEventEmitter } from './mongo_types';
+import { connect } from './operations/connect';
+import { PromiseProvider } from './promise_provider';
+import type { ReadConcern, ReadConcernLevel, ReadConcernLike } from './read_concern';
+import type { ReadPreference, ReadPreferenceMode } from './read_preference';
+import type { TagSet } from './sdam/server_description';
+import type { SrvPoller } from './sdam/srv_polling';
+import type { Topology, TopologyEvents } from './sdam/topology';
+import type { ClientSession, ClientSessionOptions } from './sessions';
 import {
-  maybePromise,
-  MongoDBNamespace,
   Callback,
-  resolveOptions,
   ClientMetadata,
+  HostAddress,
+  maybePromise,
+  MongoDBNamespace,
   ns,
-  HostAddress
+  resolveOptions
 } from './utils';
-import { connect, MONGO_CLIENT_EVENTS } from './operations/connect';
-import { PromiseProvider } from './promise_provider';
-import type { Logger, LoggerLevel } from './logger';
-import type { ReadConcern, ReadConcernLevel, ReadConcernLike } from './read_concern';
-import { BSONSerializeOptions, Document, resolveBSONOptions } from './bson';
-import type { AutoEncrypter, AutoEncryptionOptions } from './deps';
-import type { AuthMechanism } from './cmap/auth/defaultAuthProviders';
-import type { Topology, TopologyEvents } from './sdam/topology';
-import type { ClientSession, ClientSessionOptions } from './sessions';
-import type { TagSet } from './sdam/server_description';
-import type { AuthMechanismProperties, MongoCredentials } from './cmap/auth/mongo_credentials';
-import { parseOptions } from './connection_string';
-import type { CompressorName } from './cmap/wire_protocol/compression';
-import type { TLSSocketOptions, ConnectionOptions as TLSConnectionOptions } from 'tls';
-import type { TcpNetConnectOpts } from 'net';
-import type { SrvPoller } from './sdam/srv_polling';
-import type { Connection } from './cmap/connection';
-import type { LEGAL_TLS_SOCKET_OPTIONS, LEGAL_TCP_SOCKET_OPTIONS } from './cmap/connect';
-import type { Encrypter } from './encrypter';
-import { TypedEventEmitter } from './mongo_types';
+import type { W, WriteConcern } from './write_concern';
 
 /** @public */
 export const ServerApiVersion = Object.freeze({
@@ -246,6 +248,14 @@ export interface MongoClientOptions extends BSONSerializeOptions, SupportedNodeC
   autoEncryption?: AutoEncryptionOptions;
   /** Allows a wrapping driver to amend the client metadata generated by the driver to include information about the wrapping driver */
   driverInfo?: DriverInfo;
+  /** Configures a Socks5 proxy host used for creating TCP connections. */
+  proxyHost?: string;
+  /** Configures a Socks5 proxy port used for creating TCP connections. */
+  proxyPort?: number;
+  /** Configures a Socks5 proxy username when the proxy in proxyHost requires username/password authentication. */
+  proxyUsername?: string;
+  /** Configures a Socks5 proxy password when the proxy in proxyHost requires username/password authentication. */
+  proxyPassword?: string;
 
   /** @internal */
   srvPoller?: SrvPoller;
@@ -411,9 +421,9 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> {
    *
    * @see docs.mongodb.org/manual/reference/connection-string/
    */
-  connect(): Promise<MongoClient>;
-  connect(callback: Callback<MongoClient>): void;
-  connect(callback?: Callback<MongoClient>): Promise<MongoClient> | void {
+  connect(): Promise<this>;
+  connect(callback: Callback<this>): void;
+  connect(callback?: Callback<this>): Promise<this> | void {
     if (callback && typeof callback !== 'function') {
       throw new MongoInvalidArgumentError('Method `connect` only accepts a callback');
     }
@@ -675,6 +685,10 @@ export interface MongoOptions
   dbName: string;
   metadata: ClientMetadata;
   autoEncrypter?: AutoEncrypter;
+  proxyHost?: string;
+  proxyPort?: number;
+  proxyUsername?: string;
+  proxyPassword?: string;
   /** @internal */
   connectionType?: typeof Connection;
 

package/src/mongo_types.ts

@@ -1,28 +1,32 @@
+import type { ObjectIdLike } from 'bson';
+import { EventEmitter } from 'events';
+
 import type {
   Binary,
-  Document,
-  ObjectId,
   BSONRegExp,
-  Timestamp,
   Decimal128,
+  Document,
   Double,
   Int32,
-  Long
+  Long,
+  ObjectId,
+  Timestamp
 } from './bson';
-import { EventEmitter } from 'events';
 import type { Sort } from './sort';
 
 /** @internal */
 export type TODO_NODE_3286 = any;
 
 /** Given an object shaped type, return the type of the _id field or default to ObjectId @public */
-export type InferIdType<TSchema> = TSchema extends { _id: infer IdType } // user has defined a type for _id
-  ? // eslint-disable-next-line @typescript-eslint/ban-types
-    {} extends IdType // TODO(NODE-3285): Improve type readability
-    ? // eslint-disable-next-line @typescript-eslint/ban-types
-      Exclude<IdType, {}>
-    : unknown extends IdType
-    ? ObjectId
+export type InferIdType<TSchema> = TSchema extends { _id: infer IdType }
+  ? // user has defined a type for _id
+    Record<any, never> extends IdType
+    ? never // explicitly forbid empty objects as the type of _id
+    : IdType
+  : TSchema extends { _id?: infer IdType }
+  ? // optional _id defined - return ObjectId | IdType
+    unknown extends IdType
+    ? ObjectId // infer the _id type as ObjectId if the type of _id is unknown
     : IdType
   : ObjectId; // user has not defined _id on schema
 
@@ -32,17 +36,23 @@ export type WithId<TSchema> = EnhancedOmit<TSchema, '_id'> & { _id: InferIdType<
 /**
  * Add an optional _id field to an object shaped type
  * @public
+ */
+export type OptionalId<TSchema> = EnhancedOmit<TSchema, '_id'> & { _id?: InferIdType<TSchema> };
+
+/**
+ * Adds an optional _id field to an object shaped type, unless the _id field is requried on that type.
+ * In the case _id is required, this method continues to require_id.
+ *
+ * @public
  *
  * @privateRemarks
  * `ObjectId extends TSchema['_id']` is a confusing ordering at first glance. Rather than ask
  * `TSchema['_id'] extends ObjectId` which translated to "Is the _id property ObjectId?"
  * we instead ask "Does ObjectId look like (have the same shape) as the _id?"
  */
-export type OptionalId<TSchema> = TSchema extends { _id?: any }
-  ? ObjectId extends TSchema['_id'] // a Schema with ObjectId _id type or "any" or "indexed type" provided
-    ? EnhancedOmit<TSchema, '_id'> & { _id?: InferIdType<TSchema> } // a Schema provided but _id type is not ObjectId
-    : WithId<TSchema>
-  : EnhancedOmit<TSchema, '_id'> & { _id?: InferIdType<TSchema> }; // TODO(NODE-3285): Improve type readability
+export type OptionalUnlessRequiredId<TSchema> = TSchema extends { _id: any }
+  ? TSchema
+  : OptionalId<TSchema>;
 
 /** TypeScript Omit (Exclude to be specific) does not work for objects with an "any" indexed type, and breaks discriminated unions @public */
 export type EnhancedOmit<TRecordOrUnion, KeyUnion> = string extends keyof TRecordOrUnion
@@ -55,9 +65,13 @@ export type EnhancedOmit<TRecordOrUnion, KeyUnion> = string extends keyof TRecor
 export type WithoutId<TSchema> = Omit<TSchema, '_id'>;
 
 /** A MongoDB filter can be some portion of the schema or a set of operators @public */
-export type Filter<TSchema> = {
-  [P in keyof TSchema]?: Condition<TSchema[P]>;
-} & RootFilterOperators<TSchema>;
+export type Filter<TSchema> =
+  | Partial<TSchema>
+  | ({
+      [Property in Join<NestedPaths<WithId<TSchema>>, '.'>]?: Condition<
+        PropertyType<WithId<TSchema>, Property>
+      >;
+    } & RootFilterOperators<WithId<TSchema>>);
 
 /** @public */
 export type Condition<T> = AlternativeType<T> | FilterOperators<AlternativeType<T>>;
@@ -90,8 +104,16 @@ export interface RootFilterOperators<TSchema> extends Document {
   $comment?: string | Document;
 }
 
+/**
+ * @public
+ * A type that extends Document but forbids anything that "looks like" an object id.
+ */
+export type NonObjectIdLikeDocument = {
+  [key in keyof ObjectIdLike]?: never;
+} & Document;
+
 /** @public */
-export interface FilterOperators<TValue> extends Document {
+export interface FilterOperators<TValue> extends NonObjectIdLikeDocument {
   // Comparison
   $eq?: TValue;
   $gt?: TValue;
@@ -422,3 +444,79 @@ export class TypedEventEmitter<Events extends EventsDescription> extends EventEm
 
 /** @public */
 export class CancellationToken extends TypedEventEmitter<{ cancel(): void }> {}
+
+/**
+ * Helper types for dot-notation filter attributes
+ */
+
+/** @public */
+export type Join<T extends unknown[], D extends string> = T extends []
+  ? ''
+  : T extends [string | number]
+  ? `${T[0]}`
+  : T extends [string | number, ...infer R]
+  ? `${T[0]}${D}${Join<R, D>}`
+  : string;
+
+/** @public */
+export type PropertyType<Type, Property extends string> = string extends Property
+  ? unknown
+  : Property extends keyof Type
+  ? Type[Property]
+  : Property extends `${number}`
+  ? Type extends ReadonlyArray<infer ArrayType>
+    ? ArrayType
+    : unknown
+  : Property extends `${infer Key}.${infer Rest}`
+  ? Key extends `${number}`
+    ? Type extends ReadonlyArray<infer ArrayType>
+      ? PropertyType<ArrayType, Rest>
+      : unknown
+    : Key extends keyof Type
+    ? Type[Key] extends Map<string, infer MapType>
+      ? MapType
+      : PropertyType<Type[Key], Rest>
+    : unknown
+  : unknown;
+
+/**
+ * @public
+ * returns tuple of strings (keys to be joined on '.') that represent every path into a schema
+ * https://docs.mongodb.com/manual/tutorial/query-embedded-documents/
+ */
+export type NestedPaths<Type> = Type extends
+  | string
+  | number
+  | boolean
+  | Date
+  | RegExp
+  | Buffer
+  | Uint8Array
+  | ((...args: any[]) => any)
+  | { _bsontype: string }
+  ? []
+  : Type extends ReadonlyArray<infer ArrayType>
+  ? [number, ...NestedPaths<ArrayType>]
+  : Type extends Map<string, any>
+  ? [string]
+  : // eslint-disable-next-line @typescript-eslint/ban-types
+  Type extends object
+  ? {
+      [Key in Extract<keyof Type, string>]: Type[Key] extends Type // type of value extends the parent
+        ? [Key]
+        : // for a recursive union type, the child will never extend the parent type.
+        // but the parent will still extend the child
+        Type extends Type[Key]
+        ? [Key]
+        : Type[Key] extends ReadonlyArray<infer ArrayType> // handling recursive types with arrays
+        ? Type extends ArrayType // is the type of the parent the same as the type of the array?
+          ? [Key] // yes, it's a recursive array type
+          : // for unions, the child type extends the parent
+          ArrayType extends Type
+          ? [Key] // we have a recursive array union
+          : // child is an array, but it's not a recursive array
+            [Key, ...NestedPaths<Type[Key]>]
+        : // child is not structured the same as the parent
+          [Key, ...NestedPaths<Type[Key]>];
+    }[Extract<keyof Type, string>]
+  : [];

package/src/operations/add_user.ts

@@ -1,12 +1,13 @@
 import * as crypto from 'crypto';
-import { Aspect, defineAspects } from './operation';
-import { CommandOperation, CommandOperationOptions } from './command';
-import { MongoInvalidArgumentError } from '../error';
-import { Callback, emitWarningOnce, getTopology } from '../utils';
+
 import type { Document } from '../bson';
-import type { Server } from '../sdam/server';
 import type { Db } from '../db';
+import { MongoInvalidArgumentError } from '../error';
+import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
+import { Callback, emitWarningOnce, getTopology } from '../utils';
+import { CommandOperation, CommandOperationOptions } from './command';
+import { Aspect, defineAspects } from './operation';
 
 /** @public */
 export interface RoleSpecification {
@@ -74,7 +75,7 @@ export class AddUserOperation extends CommandOperation<Document> {
       roles = Array.isArray(options.roles) ? options.roles : [options.roles];
     }
 
-    const digestPassword = getTopology(db).lastIsMaster().maxWireVersion >= 7;
+    const digestPassword = getTopology(db).lastHello().maxWireVersion >= 7;
 
     let userPassword = password;
 

package/src/operations/aggregate.ts

@@ -1,11 +1,11 @@
-import { CommandOperation, CommandOperationOptions, CollationOptions } from './command';
-import { MongoInvalidArgumentError } from '../error';
-import { maxWireVersion, MongoDBNamespace } from '../utils';
-import { Aspect, defineAspects, Hint } from './operation';
-import type { Callback } from '../utils';
 import type { Document } from '../bson';
+import { MongoInvalidArgumentError } from '../error';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
+import type { Callback } from '../utils';
+import { maxWireVersion, MongoDBNamespace } from '../utils';
+import { CollationOptions, CommandOperation, CommandOperationOptions } from './command';
+import { Aspect, defineAspects, Hint } from './operation';
 
 /** @internal */
 export const DB_AGGREGATE_COLLECTION = 1 as const;

package/src/operations/bulk_write.ts

@@ -1,14 +1,14 @@
-import { Aspect, defineAspects, AbstractOperation } from './operation';
-import type { Callback } from '../utils';
-import type { Collection } from '../collection';
 import type {
+  AnyBulkWriteOperation,
   BulkOperationBase,
-  BulkWriteResult,
   BulkWriteOptions,
-  AnyBulkWriteOperation
+  BulkWriteResult
 } from '../bulk/common';
+import type { Collection } from '../collection';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
+import type { Callback } from '../utils';
+import { AbstractOperation, Aspect, defineAspects } from './operation';
 
 /** @internal */
 export class BulkWriteOperation extends AbstractOperation<BulkWriteResult> {

package/src/operations/collections.ts

@@ -1,9 +1,9 @@
-import { AbstractOperation, OperationOptions } from './operation';
 import { Collection } from '../collection';
-import type { Callback } from '../utils';
 import type { Db } from '../db';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
+import type { Callback } from '../utils';
+import { AbstractOperation, OperationOptions } from './operation';
 
 export interface CollectionsOptions extends OperationOptions {
   nameOnly?: boolean;

package/src/operations/command.ts

@@ -1,16 +1,22 @@
-import { Aspect, AbstractOperation, OperationOptions } from './operation';
+import type { BSONSerializeOptions, Document } from '../bson';
+import { MongoCompatibilityError, MongoInvalidArgumentError } from '../error';
+import { Explain, ExplainOptions } from '../explain';
+import type { Logger } from '../logger';
 import { ReadConcern } from '../read_concern';
-import { WriteConcern, WriteConcernOptions } from '../write_concern';
-import { maxWireVersion, MongoDBNamespace, Callback, decorateWithExplain } from '../utils';
 import type { ReadPreference } from '../read_preference';
-import { ClientSession, commandSupportsReadConcern } from '../sessions';
-import { MongoInvalidArgumentError, MongoCompatibilityError } from '../error';
-import type { Logger } from '../logger';
 import type { Server } from '../sdam/server';
-import type { BSONSerializeOptions, Document } from '../bson';
-import type { ReadConcernLike } from './../read_concern';
-import { Explain, ExplainOptions } from '../explain';
 import { MIN_SECONDARY_WRITE_WIRE_VERSION } from '../sdam/server_selection';
+import type { ClientSession } from '../sessions';
+import {
+  Callback,
+  commandSupportsReadConcern,
+  decorateWithExplain,
+  maxWireVersion,
+  MongoDBNamespace
+} from '../utils';
+import { WriteConcern, WriteConcernOptions } from '../write_concern';
+import type { ReadConcernLike } from './../read_concern';
+import { AbstractOperation, Aspect, OperationOptions } from './operation';
 
 const SUPPORTS_WRITE_CONCERN_AND_COLLATION = 5;
 

package/src/operations/common_functions.ts

@@ -1,10 +1,10 @@
-import { MongoTopologyClosedError } from '../error';
-import { Callback, getTopology } from '../utils';
 import type { Document } from '../bson';
+import type { Collection } from '../collection';
 import type { Db } from '../db';
-import type { ClientSession } from '../sessions';
+import { MongoTopologyClosedError } from '../error';
 import type { ReadPreference } from '../read_preference';
-import type { Collection } from '../collection';
+import type { ClientSession } from '../sessions';
+import { Callback, getTopology } from '../utils';
 
 /** @public */
 export interface IndexInformationOptions {

package/src/operations/connect.ts

@@ -1,19 +1,9 @@
-import { MongoRuntimeError, MongoInvalidArgumentError } from '../error';
-import { Topology, TOPOLOGY_EVENTS } from '../sdam/topology';
 import { resolveSRVRecord } from '../connection_string';
-import type { Callback } from '../utils';
+import { MONGO_CLIENT_EVENTS } from '../constants';
+import { MongoInvalidArgumentError, MongoRuntimeError } from '../error';
 import type { MongoClient, MongoOptions } from '../mongo_client';
-import { CMAP_EVENTS } from '../cmap/connection_pool';
-import { APM_EVENTS } from '../cmap/connection';
-import { HEARTBEAT_EVENTS } from '../sdam/server';
-
-/** @public */
-export const MONGO_CLIENT_EVENTS = [
-  ...CMAP_EVENTS,
-  ...APM_EVENTS,
-  ...TOPOLOGY_EVENTS,
-  ...HEARTBEAT_EVENTS
-] as const;
+import { Topology } from '../sdam/topology';
+import type { Callback } from '../utils';
 
 export function connect(
   mongoClient: MongoClient,

package/src/operations/count.ts

@@ -1,10 +1,10 @@
-import { Aspect, defineAspects } from './operation';
-import { CommandOperation, CommandOperationOptions } from './command';
-import type { Callback, MongoDBNamespace } from '../utils';
 import type { Document } from '../bson';
-import type { Server } from '../sdam/server';
 import type { Collection } from '../collection';
+import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
+import type { Callback, MongoDBNamespace } from '../utils';
+import { CommandOperation, CommandOperationOptions } from './command';
+import { Aspect, defineAspects } from './operation';
 
 /** @public */
 export interface CountOptions extends CommandOperationOptions {

package/src/operations/count_documents.ts

@@ -1,9 +1,9 @@
-import { AggregateOperation, AggregateOptions } from './aggregate';
-import type { Callback } from '../utils';
 import type { Document } from '../bson';
-import type { Server } from '../sdam/server';
 import type { Collection } from '../collection';
+import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
+import type { Callback } from '../utils';
+import { AggregateOperation, AggregateOptions } from './aggregate';
 
 /** @public */
 export interface CountDocumentsOptions extends AggregateOptions {

package/src/operations/create_collection.ts

@@ -1,12 +1,12 @@
-import { CommandOperation, CommandOperationOptions } from './command';
-import { Aspect, defineAspects } from './operation';
-import { Collection } from '../collection';
-import type { Callback } from '../utils';
 import type { Document } from '../bson';
-import type { Server } from '../sdam/server';
+import { Collection } from '../collection';
 import type { Db } from '../db';
 import type { PkFactory } from '../mongo_client';
+import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
+import type { Callback } from '../utils';
+import { CommandOperation, CommandOperationOptions } from './command';
+import { Aspect, defineAspects } from './operation';
 
 const ILLEGAL_COMMAND_FIELDS = new Set([
   'w',
@@ -27,7 +27,8 @@ const ILLEGAL_COMMAND_FIELDS = new Set([
   'promoteBuffers',
   'bsonRegExp',
   'serializeFunctions',
-  'ignoreUndefined'
+  'ignoreUndefined',
+  'enableUtf8Validation'
 ]);
 
 /** @public

package/src/operations/delete.ts

@@ -1,12 +1,12 @@
-import { defineAspects, Aspect, Hint } from './operation';
-import { CommandOperation, CommandOperationOptions, CollationOptions } from './command';
-import { Callback, maxWireVersion, MongoDBNamespace, collationNotSupported } from '../utils';
 import type { Document } from '../bson';
-import type { Server } from '../sdam/server';
 import type { Collection } from '../collection';
+import { MongoCompatibilityError, MongoServerError } from '../error';
+import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
-import { MongoServerError, MongoCompatibilityError } from '../error';
+import { Callback, collationNotSupported, maxWireVersion, MongoDBNamespace } from '../utils';
 import type { WriteConcernOptions } from '../write_concern';
+import { CollationOptions, CommandOperation, CommandOperationOptions } from './command';
+import { Aspect, defineAspects, Hint } from './operation';
 
 /** @public */
 export interface DeleteOptions extends CommandOperationOptions, WriteConcernOptions {

package/src/operations/distinct.ts

@@ -1,11 +1,11 @@
-import { Aspect, defineAspects } from './operation';
-import { CommandOperation, CommandOperationOptions } from './command';
-import { decorateWithCollation, decorateWithReadConcern, Callback, maxWireVersion } from '../utils';
 import type { Document } from '../bson';
-import type { Server } from '../sdam/server';
 import type { Collection } from '../collection';
 import { MongoCompatibilityError } from '../error';
+import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
+import { Callback, decorateWithCollation, decorateWithReadConcern, maxWireVersion } from '../utils';
+import { CommandOperation, CommandOperationOptions } from './command';
+import { Aspect, defineAspects } from './operation';
 
 /** @public */
 export type DistinctOptions = CommandOperationOptions;

package/src/operations/drop.ts

@@ -1,9 +1,9 @@
-import { Aspect, defineAspects } from './operation';
-import { CommandOperation, CommandOperationOptions } from './command';
-import type { Callback } from '../utils';
-import type { Server } from '../sdam/server';
 import type { Db } from '../db';
+import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
+import type { Callback } from '../utils';
+import { CommandOperation, CommandOperationOptions } from './command';
+import { Aspect, defineAspects } from './operation';
 
 /** @public */
 export type DropCollectionOptions = CommandOperationOptions;

package/src/operations/estimated_document_count.ts

@@ -1,11 +1,11 @@
-import { Aspect, defineAspects } from './operation';
-import { CommandOperation, CommandOperationOptions } from './command';
-import { Callback, maxWireVersion } from '../utils';
 import type { Document } from '../bson';
-import type { Server } from '../sdam/server';
 import type { Collection } from '../collection';
-import type { ClientSession } from '../sessions';
 import type { MongoServerError } from '../error';
+import type { Server } from '../sdam/server';
+import type { ClientSession } from '../sessions';
+import { Callback, maxWireVersion } from '../utils';
+import { CommandOperation, CommandOperationOptions } from './command';
+import { Aspect, defineAspects } from './operation';
 
 /** @public */
 export interface EstimatedDocumentCountOptions extends CommandOperationOptions {

package/src/operations/eval.ts

@@ -1,12 +1,12 @@
-import { CommandOperation, CommandOperationOptions } from './command';
 import { Code, Document } from '../bson';
-import { ReadPreference } from '../read_preference';
+import type { Collection } from '../collection';
+import type { Db } from '../db';
 import { MongoServerError } from '../error';
-import type { Callback } from '../utils';
+import { ReadPreference } from '../read_preference';
 import type { Server } from '../sdam/server';
-import type { Db } from '../db';
-import type { Collection } from '../collection';
 import type { ClientSession } from '../sessions';
+import type { Callback } from '../utils';
+import { CommandOperation, CommandOperationOptions } from './command';
 
 /** @public */
 export interface EvalOptions extends CommandOperationOptions {

package/src/operations/execute_operation.ts

@@ -1,23 +1,26 @@
-import { ReadPreference } from '../read_preference';
+import type { Document } from '../bson';
 import {
-  MongoError,
   isRetryableError,
+  MongoCompatibilityError,
   MONGODB_ERROR_CODES,
-  MongoRuntimeError,
+  MongoError,
+  MongoExpiredSessionError,
   MongoNetworkError,
-  MongoCompatibilityError,
+  MongoRuntimeError,
   MongoServerError,
-  MongoExpiredSessionError,
   MongoTransactionError
 } from '../error';
-import { Aspect, AbstractOperation } from './operation';
-import { maxWireVersion, maybePromise, Callback } from '../utils';
+import { ReadPreference } from '../read_preference';
 import type { Server } from '../sdam/server';
+import {
+  sameServerSelector,
+  secondaryWritableServerSelector,
+  ServerSelector
+} from '../sdam/server_selection';
 import type { Topology } from '../sdam/topology';
 import type { ClientSession } from '../sessions';
-import type { Document } from '../bson';
-import { supportsRetryableWrites } from '../utils';
-import { secondaryWritableServerSelector, ServerSelector } from '../sdam/server_selection';
+import { Callback, maxWireVersion, maybePromise, supportsRetryableWrites } from '../utils';
+import { AbstractOperation, Aspect } from './operation';
 
 const MMAPv1_RETRY_WRITES_ERROR_CODE = MONGODB_ERROR_CODES.IllegalOperation;
 const MMAPv1_RETRY_WRITES_ERROR_MESSAGE =
@@ -153,9 +156,14 @@ function executeWithServerSelection(
 
   let selector: ReadPreference | ServerSelector;
 
-  // If operation should try to write to secondary use the custom server selector
-  // otherwise provide the read preference.
-  if (operation.trySecondaryWrite) {
+  if (operation.hasAspect(Aspect.CURSOR_ITERATING)) {
+    // Get more operations must always select the same server, but run through
+    // server selection to potentially force monitor checks if the server is
+    // in an unknown state.
+    selector = sameServerSelector(operation.server?.description);
+  } else if (operation.trySecondaryWrite) {
+    // If operation should try to write to secondary use the custom server selector
+    // otherwise provide the read preference.
     selector = secondaryWritableServerSelector(topology.commonWireVersion, readPreference);
   } else {
     selector = readPreference;