wip

Author: nbbeeken

src/error.ts

@@ -1157,27 +1157,14 @@ export class MongoServerSelectionError extends MongoSystemError {
   }
 }
 
-function makeWriteConcernResultObject(input: any) {
-  const output = Object.assign({}, input);
-
-  if (output.ok === 0) {
-    output.ok = 1;
-    delete output.errmsg;
-    delete output.code;
-    delete output.codeName;
-  }
-
-  return output;
-}
-
 /**
  * An error thrown when the server reports a writeConcernError
  * @public
  * @category Error
  */
 export class MongoWriteConcernError extends MongoServerError {
-  /** The result document (provided if ok: 1) */
-  result?: Document;
+  /** The result document */
+  result: Document;
 
   /**
    * **Do not use this constructor!**
@@ -1190,17 +1177,20 @@ export class MongoWriteConcernError extends MongoServerError {
    *
    * @public
    **/
-  constructor(message: ErrorDescription, result?: Document) {
-    if (result && Array.isArray(result.errorLabels)) {
-      message.errorLabels = result.errorLabels;
-    }
-
-    super(message);
-    this.errInfo = message.errInfo;
-
-    if (result != null) {
-      this.result = makeWriteConcernResultObject(result);
-    }
+  constructor({
+    writeConcernError,
+    ...result
+  }: {
+    writeConcernError: {
+      code: number;
+      errmsg: string;
+      codeName?: string;
+      errInfo?: Document;
+    };
+  } & Document) {
+    super(writeConcernError);
+    this.errInfo = writeConcernError.errInfo;
+    this.result = result;
   }
 
   override get name(): string {

src/operations/bulk_write.ts

@@ -7,6 +7,7 @@ import type {
 import type { Collection } from '../collection';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
+import { throwIfWriteConcernError } from '../utils';
 import { AbstractOperation, Aspect, defineAspects } from './operation';
 
 /** @internal */
@@ -51,6 +52,7 @@ export class BulkWriteOperation extends AbstractOperation<BulkWriteResult> {
 
     // Execute the bulk
     const result = await bulk.execute({ ...options, session });
+    throwIfWriteConcernError(result);
     return result;
   }
 }

src/operations/delete.ts

@@ -4,7 +4,7 @@ import { MongoCompatibilityError, MongoServerError } from '../error';
 import { type TODO_NODE_3286 } from '../mongo_types';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
-import type { MongoDBNamespace } from '../utils';
+import { type MongoDBNamespace, throwIfWriteConcernError } from '../utils';
 import type { WriteConcernOptions } from '../write_concern';
 import { type CollationOptions, CommandOperation, type CommandOperationOptions } from './command';
 import { Aspect, defineAspects, type Hint } from './operation';
@@ -96,6 +96,7 @@ export class DeleteOperation extends CommandOperation<DeleteResult> {
     }
 
     const res: TODO_NODE_3286 = await super.executeCommand(server, session, command);
+    throwIfWriteConcernError(res);
     return res;
   }
 }

src/operations/find_and_modify.ts

@@ -5,7 +5,12 @@ import { ReadPreference } from '../read_preference';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
 import { formatSort, type Sort, type SortForCmd } from '../sort';
-import { decorateWithCollation, hasAtomicOperators, maxWireVersion } from '../utils';
+import {
+  decorateWithCollation,
+  hasAtomicOperators,
+  maxWireVersion,
+  throwIfWriteConcernError
+} from '../utils';
 import type { WriteConcern, WriteConcernSettings } from '../write_concern';
 import { CommandOperation, type CommandOperationOptions } from './command';
 import { Aspect, defineAspects } from './operation';
@@ -214,6 +219,7 @@ export class FindAndModifyOperation extends CommandOperation<Document> {
 
     // Execute the command
     const result = await super.executeCommand(server, session, cmd);
+    throwIfWriteConcernError(result);
     return options.includeResultMetadata ? result : result.value ?? null;
   }
 }

src/operations/update.ts

@@ -4,7 +4,7 @@ import { MongoCompatibilityError, MongoInvalidArgumentError, MongoServerError }
 import type { InferIdType, TODO_NODE_3286 } from '../mongo_types';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
-import { hasAtomicOperators, type MongoDBNamespace } from '../utils';
+import { hasAtomicOperators, type MongoDBNamespace, throwIfWriteConcernError } from '../utils';
 import { type CollationOptions, CommandOperation, type CommandOperationOptions } from './command';
 import { Aspect, defineAspects, type Hint } from './operation';
 
@@ -122,7 +122,9 @@ export class UpdateOperation extends CommandOperation<Document> {
       }
     }
 
-    return await super.executeCommand(server, session, command);
+    const res = await super.executeCommand(server, session, command);
+    throwIfWriteConcernError(res);
+    return res;
   }
 }
 

src/sdam/server.ts

@@ -46,7 +46,8 @@ import {
   makeStateMachine,
   maxWireVersion,
   type MongoDBNamespace,
-  supportsRetryableWrites
+  supportsRetryableWrites,
+  throwIfWriteConcernError
 } from '../utils';
 import {
   type ClusterTime,
@@ -323,7 +324,9 @@ export class Server extends TypedEventEmitter<ServerEvents> {
 
     try {
       try {
-        return await conn.command(ns, cmd, finalOptions, responseType);
+        const res = await conn.command(ns, cmd, finalOptions, responseType);
+        throwIfWriteConcernError(res);
+        return res;
       } catch (commandError) {
         throw this.decorateCommandError(conn, cmd, finalOptions, commandError);
       }

src/utils.ts

@@ -11,6 +11,7 @@ import { promisify } from 'util';
 import { deserialize, type Document, ObjectId, resolveBSONOptions } from './bson';
 import type { Connection } from './cmap/connection';
 import { MAX_SUPPORTED_WIRE_VERSION } from './cmap/wire_protocol/constants';
+import { MongoDBResponse } from './cmap/wire_protocol/responses';
 import type { Collection } from './collection';
 import { kDecoratedKeys, LEGACY_HELLO_COMMAND } from './constants';
 import type { AbstractCursor } from './cursor/abstract_cursor';
@@ -23,7 +24,8 @@ import {
   MongoNetworkTimeoutError,
   MongoNotConnectedError,
   MongoParseError,
-  MongoRuntimeError
+  MongoRuntimeError,
+  MongoWriteConcernError
 } from './error';
 import type { Explain } from './explain';
 import type { MongoClient } from './mongo_client';
@@ -1416,3 +1418,15 @@ export function decorateDecryptionResult(
     decorateDecryptionResult(decrypted[k], originalValue, false);
   }
 }
+
+/** Called with either a plain object or MongoDBResponse */
+export function throwIfWriteConcernError(response: unknown): void {
+  if (typeof response === 'object' && response != null) {
+    if (MongoDBResponse.is(response) && response.has('writeConcernError')) {
+      const object = response.toObject();
+      throw new MongoWriteConcernError(object.writeConcernError, object);
+    } else if ('writeConcernError' in response) {
+      throw new MongoWriteConcernError(response.writeConcernError as any, response);
+    }
+  }
+}