mongodb 4.2.2 → 4.3.0

package/src/operations/find_and_modify.ts

@@ -1,14 +1,14 @@
-import { ReadPreference } from '../read_preference';
-import { maxWireVersion, decorateWithCollation, hasAtomicOperators, Callback } from '../utils';
-import { MongoInvalidArgumentError, MongoCompatibilityError } from '../error';
-import { CommandOperation, CommandOperationOptions } from './command';
-import { defineAspects, Aspect } from './operation';
 import type { Document } from '../bson';
-import type { Server } from '../sdam/server';
 import type { Collection } from '../collection';
-import { Sort, SortForCmd, formatSort } from '../sort';
+import { MongoCompatibilityError, MongoInvalidArgumentError } from '../error';
+import { ReadPreference } from '../read_preference';
+import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
+import { formatSort, Sort, SortForCmd } from '../sort';
+import { Callback, decorateWithCollation, hasAtomicOperators, maxWireVersion } from '../utils';
 import type { WriteConcern, WriteConcernSettings } from '../write_concern';
+import { CommandOperation, CommandOperationOptions } from './command';
+import { Aspect, defineAspects } from './operation';
 
 /** @public */
 export const ReturnDocument = Object.freeze({

package/src/operations/get_more.ts

@@ -1,9 +1,9 @@
 import type { Document, Long } from '../bson';
 import { MongoRuntimeError } from '../error';
-import type { Callback, MongoDBNamespace } from '../utils';
 import type { Server } from '../sdam/server';
-import { Aspect, AbstractOperation, OperationOptions, defineAspects } from './operation';
 import type { ClientSession } from '../sessions';
+import type { Callback, MongoDBNamespace } from '../utils';
+import { AbstractOperation, Aspect, defineAspects, OperationOptions } from './operation';
 
 /**
  * @public

package/src/operations/indexes.ts

@@ -1,28 +1,28 @@
-import { indexInformation, IndexInformationOptions } from './common_functions';
-import { AbstractOperation, Aspect, defineAspects } from './operation';
-import { MONGODB_ERROR_CODES, MongoServerError, MongoCompatibilityError } from '../error';
+import type { Document } from '../bson';
+import type { Collection } from '../collection';
+import { AbstractCursor } from '../cursor/abstract_cursor';
+import type { Db } from '../db';
+import { MongoCompatibilityError, MONGODB_ERROR_CODES, MongoServerError } from '../error';
+import type { OneOrMore } from '../mongo_types';
+import { ReadPreference } from '../read_preference';
+import type { Server } from '../sdam/server';
+import type { ClientSession } from '../sessions';
 import {
+  Callback,
+  getTopology,
   maxWireVersion,
-  parseIndexOptions,
   MongoDBNamespace,
-  Callback,
-  getTopology
+  parseIndexOptions
 } from '../utils';
 import {
+  CollationOptions,
   CommandOperation,
   CommandOperationOptions,
-  OperationParent,
-  CollationOptions
+  OperationParent
 } from './command';
-import { ReadPreference } from '../read_preference';
-import type { Server } from '../sdam/server';
-import type { Document } from '../bson';
-import type { Collection } from '../collection';
-import type { Db } from '../db';
-import { AbstractCursor } from '../cursor/abstract_cursor';
-import type { ClientSession } from '../sessions';
+import { indexInformation, IndexInformationOptions } from './common_functions';
 import { executeOperation, ExecutionResult } from './execute_operation';
-import type { OneOrMore } from '../mongo_types';
+import { AbstractOperation, Aspect, defineAspects } from './operation';
 
 const LIST_INDEXES_WIRE_VERSION = 3;
 const VALID_INDEX_OPTIONS = new Set([

package/src/operations/insert.ts

@@ -1,16 +1,16 @@
-import { MongoServerError, MongoInvalidArgumentError } from '../error';
-import { defineAspects, Aspect, AbstractOperation } from './operation';
-import { CommandOperation, CommandOperationOptions } from './command';
-import { prepareDocs } from './common_functions';
-import type { Callback, MongoDBNamespace } from '../utils';
-import type { Server } from '../sdam/server';
-import type { Collection } from '../collection';
 import type { Document } from '../bson';
 import type { BulkWriteOptions } from '../bulk/common';
-import { WriteConcern } from '../write_concern';
+import type { Collection } from '../collection';
+import { MongoInvalidArgumentError, MongoServerError } from '../error';
+import type { InferIdType } from '../mongo_types';
+import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
+import type { Callback, MongoDBNamespace } from '../utils';
+import { WriteConcern } from '../write_concern';
 import { BulkWriteOperation } from './bulk_write';
-import type { InferIdType } from '../mongo_types';
+import { CommandOperation, CommandOperationOptions } from './command';
+import { prepareDocs } from './common_functions';
+import { AbstractOperation, Aspect, defineAspects } from './operation';
 
 /** @internal */
 export class InsertOperation extends CommandOperation<Document> {

package/src/operations/is_capped.ts

@@ -1,9 +1,9 @@
-import type { Callback } from '../utils';
 import type { Collection } from '../collection';
-import { OperationOptions, AbstractOperation } from './operation';
+import { MongoAPIError } from '../error';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
-import { MongoAPIError } from '../error';
+import type { Callback } from '../utils';
+import { AbstractOperation, OperationOptions } from './operation';
 
 /** @internal */
 export class IsCappedOperation extends AbstractOperation<boolean> {

package/src/operations/list_collections.ts

@@ -1,13 +1,13 @@
-import { CommandOperation, CommandOperationOptions } from './command';
-import { Aspect, defineAspects } from './operation';
-import { maxWireVersion, Callback, getTopology, MongoDBNamespace } from '../utils';
-import * as CONSTANTS from '../constants';
 import type { Binary, Document } from '../bson';
-import type { Server } from '../sdam/server';
-import type { Db } from '../db';
+import * as CONSTANTS from '../constants';
 import { AbstractCursor } from '../cursor/abstract_cursor';
+import type { Db } from '../db';
+import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
+import { Callback, getTopology, maxWireVersion, MongoDBNamespace } from '../utils';
+import { CommandOperation, CommandOperationOptions } from './command';
 import { executeOperation, ExecutionResult } from './execute_operation';
+import { Aspect, defineAspects } from './operation';
 
 const LIST_COLLECTIONS_WIRE_VERSION = 3;
 

package/src/operations/list_databases.ts

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

package/src/operations/map_reduce.ts

@@ -1,22 +1,22 @@
+import type { ObjectId } from '../bson';
 import { Code, Document } from '../bson';
+import type { Collection } from '../collection';
+import { Db } from '../db';
+import { MongoCompatibilityError, MongoServerError } from '../error';
+import { ReadPreference, ReadPreferenceMode } from '../read_preference';
+import type { Server } from '../sdam/server';
+import type { ClientSession } from '../sessions';
+import type { Sort } from '../sort';
 import {
   applyWriteConcern,
+  Callback,
   decorateWithCollation,
   decorateWithReadConcern,
   isObject,
-  Callback,
   maxWireVersion
 } from '../utils';
-import { ReadPreference, ReadPreferenceMode } from '../read_preference';
 import { CommandOperation, CommandOperationOptions } from './command';
-import type { Server } from '../sdam/server';
-import type { Collection } from '../collection';
-import type { Sort } from '../sort';
-import { MongoServerError, MongoCompatibilityError } from '../error';
-import type { ObjectId } from '../bson';
 import { Aspect, defineAspects } from './operation';
-import type { ClientSession } from '../sessions';
-import { Db } from '../db';
 
 const exclusionList = [
   'explain',
@@ -33,6 +33,7 @@ const exclusionList = [
   'bsonRegExp',
   'serializeFunctions',
   'ignoreUndefined',
+  'enableUtf8Validation',
   'scope' // this option is reformatted thus exclude the original
 ];
 

package/src/operations/operation.ts

@@ -1,8 +1,8 @@
+import { BSONSerializeOptions, Document, resolveBSONOptions } from '../bson';
 import { ReadPreference, ReadPreferenceLike } from '../read_preference';
-import type { ClientSession } from '../sessions';
-import { Document, BSONSerializeOptions, resolveBSONOptions } from '../bson';
-import type { MongoDBNamespace, Callback } from '../utils';
 import type { Server } from '../sdam/server';
+import type { ClientSession } from '../sessions';
+import type { Callback, MongoDBNamespace } from '../utils';
 
 export const Aspect = {
   READ_OPERATION: Symbol('READ_OPERATION'),

package/src/operations/options_operation.ts

@@ -1,10 +1,10 @@
-import { AbstractOperation, OperationOptions } from './operation';
-import { MongoAPIError } from '../error';
-import type { Callback } from '../utils';
 import type { Document } from '../bson';
 import type { Collection } from '../collection';
+import { MongoAPIError } from '../error';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
+import type { Callback } from '../utils';
+import { AbstractOperation, OperationOptions } from './operation';
 
 /** @internal */
 export class OptionsOperation extends AbstractOperation<Document> {

package/src/operations/profiling_level.ts

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

package/src/operations/remove_user.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 RemoveUserOptions = CommandOperationOptions;

package/src/operations/rename.ts

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

package/src/operations/run_command.ts

@@ -1,8 +1,8 @@
-import { CommandOperation, CommandOperationOptions, OperationParent } from './command';
-import { MongoDBNamespace, Callback } from '../utils';
-import type { Server } from '../sdam/server';
 import type { Document } from '../bson';
+import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
+import { Callback, MongoDBNamespace } from '../utils';
+import { CommandOperation, CommandOperationOptions, OperationParent } from './command';
 
 /** @public */
 export type RunCommandOptions = CommandOperationOptions;

package/src/operations/set_profiling_level.ts

@@ -1,10 +1,11 @@
-import { CommandOperation, CommandOperationOptions } from './command';
-import type { Callback } from '../utils';
-import { enumToString } from '../utils';
-import type { Server } from '../sdam/server';
 import type { Db } from '../db';
+import { MongoInvalidArgumentError, MongoRuntimeError } from '../error';
+import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
-import { MongoRuntimeError, MongoInvalidArgumentError } from '../error';
+import type { Callback } from '../utils';
+import { enumToString } from '../utils';
+import { CommandOperation, CommandOperationOptions } from './command';
+
 const levelValues = new Set(['off', 'slow_only', 'all']);
 
 /** @public */

package/src/operations/stats.ts

@@ -1,11 +1,11 @@
-import { Aspect, defineAspects } from './operation';
-import { CommandOperation, CommandOperationOptions } from './command';
-import type { Callback } from '../utils';
 import type { Document } from '../bson';
-import type { Server } from '../sdam/server';
 import type { Collection } from '../collection';
 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 interface CollStatsOptions extends CommandOperationOptions {

package/src/operations/update.ts

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

package/src/operations/validate_collection.ts

@@ -1,10 +1,10 @@
-import { CommandOperation, CommandOperationOptions } from './command';
-import type { Callback } from '../utils';
+import type { Admin } from '../admin';
 import type { Document } from '../bson';
+import { MongoRuntimeError } from '../error';
 import type { Server } from '../sdam/server';
-import type { Admin } from '../admin';
 import type { ClientSession } from '../sessions';
-import { MongoRuntimeError } from '../error';
+import type { Callback } from '../utils';
+import { CommandOperation, CommandOperationOptions } from './command';
 
 /** @public */
 export interface ValidateCollectionOptions extends CommandOperationOptions {

package/src/read_preference.ts

@@ -1,7 +1,7 @@
-import type { TagSet } from './sdam/server_description';
 import type { Document } from './bson';
-import type { ClientSession } from './sessions';
 import { MongoInvalidArgumentError } from './error';
+import type { TagSet } from './sdam/server_description';
+import type { ClientSession } from './sessions';
 
 /** @public */
 export type ReadPreferenceLike = ReadPreference | ReadPreferenceMode;
@@ -232,19 +232,27 @@ export class ReadPreference {
   }
 
   /**
-   * Indicates that this readPreference needs the "slaveOk" bit when sent over the wire
-   *
+   * Indicates that this readPreference needs the "secondaryOk" bit when sent over the wire
+   * @deprecated Use secondaryOk instead
    * @see https://docs.mongodb.com/manual/reference/mongodb-wire-protocol/#op-query
    */
   slaveOk(): boolean {
-    const NEEDS_SLAVEOK = new Set<string>([
+    return this.secondaryOk();
+  }
+
+  /**
+   * Indicates that this readPreference needs the "SecondaryOk" bit when sent over the wire
+   * @see https://docs.mongodb.com/manual/reference/mongodb-wire-protocol/#op-query
+   */
+  secondaryOk(): boolean {
+    const NEEDS_SECONDARYOK = new Set<string>([
       ReadPreference.PRIMARY_PREFERRED,
       ReadPreference.SECONDARY,
       ReadPreference.SECONDARY_PREFERRED,
       ReadPreference.NEAREST
     ]);
 
-    return NEEDS_SLAVEOK.has(this.mode);
+    return NEEDS_SECONDARYOK.has(this.mode);
   }
 
   /**

package/src/sdam/common.ts

@@ -1,6 +1,6 @@
-import type { Timestamp, Binary, Long } from '../bson';
-import type { Topology } from './topology';
+import type { Binary, Long, Timestamp } from '../bson';
 import type { ClientSession } from '../sessions';
+import type { Topology } from './topology';
 
 // shared state names
 export const STATE_CLOSING = 'closing';

package/src/sdam/events.ts

@@ -1,6 +1,6 @@
+import type { Document } from '../bson';
 import type { ServerDescription } from './server_description';
 import type { TopologyDescription } from './topology_description';
-import type { Document } from '../bson';
 
 /**
  * Emitted when server description changes, but does NOT include changes to the RTT.

package/src/sdam/monitor.ts

@@ -1,26 +1,25 @@
-import { ServerType, STATE_CLOSED, STATE_CLOSING } from './common';
+import { Document, Long } from '../bson';
+import { connect } from '../cmap/connect';
+import { Connection, ConnectionOptions } from '../cmap/connection';
+import { AnyError, MongoNetworkError } from '../error';
+import { CancellationToken, TypedEventEmitter } from '../mongo_types';
+import type { Callback, InterruptibleAsyncInterval } from '../utils';
 import {
-  now,
-  makeStateMachine,
   calculateDurationInMs,
+  EventEmitterWithState,
   makeInterruptibleAsyncInterval,
-  ns,
-  EventEmitterWithState
+  makeStateMachine,
+  now,
+  ns
 } from '../utils';
-import { connect } from '../cmap/connect';
-import { Connection, ConnectionOptions } from '../cmap/connection';
-import { MongoNetworkError, AnyError } from '../error';
-import { Long, Document } from '../bson';
+import { ServerType, STATE_CLOSED, STATE_CLOSING } from './common';
 import {
+  ServerHeartbeatFailedEvent,
   ServerHeartbeatStartedEvent,
-  ServerHeartbeatSucceededEvent,
-  ServerHeartbeatFailedEvent
+  ServerHeartbeatSucceededEvent
 } from './events';
-
 import { Server } from './server';
-import type { InterruptibleAsyncInterval, Callback } from '../utils';
 import type { TopologyVersion } from './server_description';
-import { CancellationToken, TypedEventEmitter } from '../mongo_types';
 
 /** @internal */
 const kServer = Symbol('server');

package/src/sdam/server.ts

@@ -1,62 +1,72 @@
-import { Logger } from '../logger';
+import type { Document, Long } from '../bson';
+import {
+  CommandOptions,
+  Connection,
+  DestroyOptions,
+  GetMoreOptions,
+  QueryOptions
+} from '../cmap/connection';
 import {
   ConnectionPool,
-  ConnectionPoolOptions,
-  CMAP_EVENTS,
-  ConnectionPoolEvents
+  ConnectionPoolEvents,
+  ConnectionPoolOptions
 } from '../cmap/connection_pool';
-import { ServerDescription, compareTopologyVersion } from './server_description';
-import { Monitor, MonitorOptions } from './monitor';
+import {
+  APM_EVENTS,
+  CLOSED,
+  CMAP_EVENTS,
+  CONNECT,
+  DESCRIPTION_RECEIVED,
+  ENDED,
+  HEARTBEAT_EVENTS,
+  SERVER_HEARTBEAT_FAILED,
+  SERVER_HEARTBEAT_STARTED,
+  SERVER_HEARTBEAT_SUCCEEDED
+} from '../constants';
+import type { AutoEncrypter } from '../deps';
+import {
+  isNetworkErrorBeforeHandshake,
+  isNodeShuttingDownError,
+  isRetryableWriteError,
+  isSDAMUnrecoverableError,
+  MongoCompatibilityError,
+  MongoError,
+  MongoInvalidArgumentError,
+  MongoNetworkError,
+  MongoNetworkTimeoutError,
+  MongoServerClosedError
+} from '../error';
+import { Logger } from '../logger';
+import type { ServerApi } from '../mongo_client';
+import { TypedEventEmitter } from '../mongo_types';
+import type { ClientSession } from '../sessions';
 import { isTransactionCommand } from '../transactions';
 import {
+  Callback,
+  CallbackWithType,
   collationNotSupported,
+  EventEmitterWithState,
   makeStateMachine,
   maxWireVersion,
-  Callback,
-  CallbackWithType,
   MongoDBNamespace,
-  EventEmitterWithState
+  supportsRetryableWrites
 } from '../utils';
 import {
+  ClusterTime,
   STATE_CLOSED,
   STATE_CLOSING,
-  STATE_CONNECTING,
   STATE_CONNECTED,
-  ClusterTime,
+  STATE_CONNECTING,
   TopologyType
 } from './common';
-import {
-  MongoError,
-  MongoNetworkError,
-  MongoNetworkTimeoutError,
-  isSDAMUnrecoverableError,
-  isRetryableWriteError,
-  isNodeShuttingDownError,
-  isNetworkErrorBeforeHandshake,
-  MongoCompatibilityError,
-  MongoInvalidArgumentError,
-  MongoServerClosedError
-} from '../error';
-import {
-  Connection,
-  DestroyOptions,
-  QueryOptions,
-  GetMoreOptions,
-  CommandOptions,
-  APM_EVENTS
-} from '../cmap/connection';
-import type { Topology } from './topology';
 import type {
   ServerHeartbeatFailedEvent,
   ServerHeartbeatStartedEvent,
   ServerHeartbeatSucceededEvent
 } from './events';
-import type { ClientSession } from '../sessions';
-import type { Document, Long } from '../bson';
-import type { AutoEncrypter } from '../deps';
-import type { ServerApi } from '../mongo_client';
-import { TypedEventEmitter } from '../mongo_types';
-import { supportsRetryableWrites } from '../utils';
+import { Monitor, MonitorOptions } from './monitor';
+import { compareTopologyVersion, ServerDescription } from './server_description';
+import type { Topology } from './topology';
 
 const stateTransition = makeStateMachine({
   [STATE_CLOSED]: [STATE_CLOSED, STATE_CONNECTING],
@@ -108,24 +118,23 @@ export class Server extends TypedEventEmitter<ServerEvents> {
   /** @internal */
   s: ServerPrivate;
   serverApi?: ServerApi;
-  clusterTime?: ClusterTime;
   ismaster?: Document;
   [kMonitor]: Monitor;
 
   /** @event */
-  static readonly SERVER_HEARTBEAT_STARTED = 'serverHeartbeatStarted' as const;
+  static readonly SERVER_HEARTBEAT_STARTED = SERVER_HEARTBEAT_STARTED;
   /** @event */
-  static readonly SERVER_HEARTBEAT_SUCCEEDED = 'serverHeartbeatSucceeded' as const;
+  static readonly SERVER_HEARTBEAT_SUCCEEDED = SERVER_HEARTBEAT_SUCCEEDED;
   /** @event */
-  static readonly SERVER_HEARTBEAT_FAILED = 'serverHeartbeatFailed' as const;
+  static readonly SERVER_HEARTBEAT_FAILED = SERVER_HEARTBEAT_FAILED;
   /** @event */
-  static readonly CONNECT = 'connect' as const;
+  static readonly CONNECT = CONNECT;
   /** @event */
-  static readonly DESCRIPTION_RECEIVED = 'descriptionReceived' as const;
+  static readonly DESCRIPTION_RECEIVED = DESCRIPTION_RECEIVED;
   /** @event */
-  static readonly CLOSED = 'closed' as const;
+  static readonly CLOSED = CLOSED;
   /** @event */
-  static readonly ENDED = 'ended' as const;
+  static readonly ENDED = ENDED;
 
   /**
    * Create a server
@@ -184,6 +193,14 @@ export class Server extends TypedEventEmitter<ServerEvents> {
     });
   }
 
+  get clusterTime(): ClusterTime | undefined {
+    return this.s.topology.clusterTime;
+  }
+
+  set clusterTime(clusterTime: ClusterTime | undefined) {
+    this.s.topology.clusterTime = clusterTime;
+  }
+
   get description(): ServerDescription {
     return this.s.description;
   }
@@ -453,21 +470,6 @@ export class Server extends TypedEventEmitter<ServerEvents> {
   }
 }
 
-export const HEARTBEAT_EVENTS = [
-  Server.SERVER_HEARTBEAT_STARTED,
-  Server.SERVER_HEARTBEAT_SUCCEEDED,
-  Server.SERVER_HEARTBEAT_FAILED
-];
-
-Object.defineProperty(Server.prototype, 'clusterTime', {
-  get() {
-    return this.s.topology.clusterTime;
-  },
-  set(clusterTime: ClusterTime) {
-    this.s.topology.clusterTime = clusterTime;
-  }
-});
-
 function calculateRoundTripTime(oldRtt: number, duration: number): number {
   if (oldRtt === -1) {
     return duration;