ready for review

lint fix

lont fix 2

Author: aditi-khare-mongoDB

src/cmap/commands.ts

@@ -465,7 +465,7 @@ export class OpMsgRequest {
 
     // flags
     this.checksumPresent = false;
-    this.moreToCome = options.moreToCome || options.writeConcern?.w === 0 || false;
+    this.moreToCome = options.moreToCome || command.writeConcern?.w === 0 || false;
     this.exhaustAllowed =
       typeof options.exhaustAllowed === 'boolean' ? options.exhaustAllowed : false;
   }

src/cmap/connection.ts

@@ -438,7 +438,7 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
         zlibCompressionLevel: this.description.zlibCompressionLevel
       });
 
-      if (options.noResponse || ('moreToCome' in message && message?.moreToCome)) {
+      if (options.noResponse) {
         yield MongoDBResponse.empty;
         return;
       }
@@ -500,9 +500,13 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
     let document: MongoDBResponse | undefined = undefined;
     /** Cached result of a toObject call */
     let object: Document | undefined = undefined;
+    const wireOptions = options;
+    if (message instanceof OpMsgRequest) {
+      wireOptions.noResponse = options.noResponse || message.moreToCome;
+    }
     try {
       this.throwIfAborted();
-      for await (document of this.sendWire(message, options, responseType)) {
+      for await (document of this.sendWire(message, wireOptions, responseType)) {
         object = undefined;
         if (options.session != null) {
           updateSessionFromResponse(options.session, document);
@@ -526,7 +530,7 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
             new CommandSucceededEvent(
               this,
               message,
-              options.noResponse ? undefined : (object ??= document.toObject(bsonOptions)),
+              wireOptions.noResponse ? { ok: 1 } : (object ??= document.toObject(bsonOptions)),
               started,
               this.description.serverConnectionId
             )
@@ -629,8 +633,8 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
           });
 
     const buffer = Buffer.concat(await finalCommand.toBin());
-
     if (this.socket.write(buffer)) return;
+
     return await once(this.socket, 'drain');
   }
 

test/integration/read-write-concern/write_concern.test.ts

@@ -1,17 +1,21 @@
 import { expect } from 'chai';
 import { on, once } from 'events';
+import { gte } from 'semver';
+import * as sinon from 'sinon';
 
 import {
   type Collection,
   type CommandStartedEvent,
+  type CommandSucceededEvent,
   type Db,
   LEGACY_HELLO_COMMAND,
-  MongoClient
+  MongoClient,
+  OpMsgRequest
 } from '../../mongodb';
 import * as mock from '../../tools/mongodb-mock/index';
 import { filterForCommands } from '../shared';
 
-describe.only('Write Concern', function () {
+describe('Write Concern', function () {
   context('when the WriteConcern is set in the uri', function () {
     let client;
     const events: CommandStartedEvent[] = [];
@@ -29,8 +33,7 @@ describe.only('Write Concern', function () {
       expect(events[0]).to.containSubset({
         commandName: 'insert',
         command: {
-          writeConcern: { w: 0 },
-          moreToCome: true
+          writeConcern: { w: 0 }
         }
       });
     });
@@ -169,4 +172,136 @@ describe.only('Write Concern', function () {
       });
     });
   });
+
+  describe('fire-and-forget protocol', function () {
+    context('when writeConcern = 0 and OP_MSG is used', function () {
+      const writeOperations: { name: string; command: any; expectedReturnVal: any }[] = [
+        {
+          name: 'insertOne',
+          command: client => client.db('test').collection('test').insertOne({ a: 1 }),
+          expectedReturnVal: { acknowledged: false }
+        },
+        {
+          name: 'insertMany',
+          command: client =>
+            client
+              .db('test')
+              .collection('test')
+              .insertMany([{ a: 1 }, { b: 2 }]),
+          expectedReturnVal: { acknowledged: false }
+        },
+        {
+          name: 'updateOne',
+          command: client =>
+            client
+              .db('test')
+              .collection('test')
+              .updateOne({ i: 128 }, { $set: { c: 2 } }),
+          expectedReturnVal: { acknowledged: false }
+        },
+        {
+          name: 'updateMany',
+          command: client =>
+            client
+              .db('test')
+              .collection('test')
+              .updateMany({ name: 'foobar' }, { $set: { name: 'fizzbuzz' } }),
+          expectedReturnVal: { acknowledged: false }
+        },
+        {
+          name: 'deleteOne',
+          command: client => client.db('test').collection('test').deleteOne({ a: 1 }),
+          expectedReturnVal: { acknowledged: false }
+        },
+        {
+          name: 'deleteMany',
+          command: client => client.db('test').collection('test').deleteMany({ name: 'foobar' }),
+          expectedReturnVal: { acknowledged: false }
+        },
+        {
+          name: 'replaceOne',
+          command: client => client.db('test').collection('test').replaceOne({ a: 1 }, { b: 2 }),
+          expectedReturnVal: { acknowledged: false }
+        },
+        {
+          name: 'removeUser',
+          command: client => client.db('test').removeUser('albert'),
+          expectedReturnVal: true
+        },
+        {
+          name: 'findAndModify',
+          command: client =>
+            client
+              .db('test')
+              .collection('test')
+              .findOneAndUpdate({}, { $setOnInsert: { a: 1 } }, { upsert: true }),
+          expectedReturnVal: null
+        },
+        {
+          name: 'dropDatabase',
+          command: client => client.db('test').dropDatabase(),
+          expectedReturnVal: true
+        },
+        {
+          name: 'dropCollection',
+          command: client => client.db('test').dropCollection('test'),
+          expectedReturnVal: true
+        },
+        {
+          name: 'dropIndexes',
+          command: client => client.db('test').collection('test').dropIndex('a'),
+          expectedReturnVal: { ok: 1 }
+        },
+        {
+          name: 'createIndexes',
+          command: client => client.db('test').collection('test').createIndex({ a: 1 }),
+          expectedReturnVal: 'a_1'
+        },
+        {
+          name: 'createCollection',
+          command: client => client.db('test').createCollection('test'),
+          expectedReturnVal: {}
+        }
+      ];
+
+      for (const op of writeOperations) {
+        context(`when the write operation ${op.name} is run`, function () {
+          let client;
+          let spy;
+
+          beforeEach(async function () {
+            if (gte('3.6.0', this.configuration.version)) {
+              this.currentTest.skipReason = 'Test requires OP_MSG, needs to be on MongoDB 3.6+';
+              this.skip();
+            }
+            spy = sinon.spy(OpMsgRequest.prototype, 'toBin');
+            client = this.configuration.newClient({ monitorCommands: true, w: 0 });
+            await client.connect();
+          });
+
+          afterEach(function () {
+            sinon.restore();
+            client.close();
+          });
+
+          it('the request should have moreToCome bit set', async function () {
+            await op.command(client);
+            expect(spy.returnValues[spy.returnValues.length - 1][0][16]).to.equal(2);
+          });
+
+          it('the return value of the command should be nullish', async function () {
+            const result = await op.command(client);
+            expect(result).to.containSubset(op.expectedReturnVal);
+          });
+
+          it('commandSucceededEvent should have reply with only {ok: 1}', async function () {
+            const events: CommandSucceededEvent[] = [];
+            client.on('commandSucceeded', event => events.push(event));
+            await op.command(client);
+            expect(events[0]).to.containSubset({ reply: { ok: 1 } });
+          });
+        });
+      }
+    });
+  });
 });

test/unit/commands.test.ts

@@ -6,8 +6,6 @@ import * as compression from '../../src/cmap/wire_protocol/compression';
 import {
   compress,
   Compressor,
-  Connection,
-  MongoClient,
   OP_MSG,
   OP_QUERY,
   OpCompressedRequest,
@@ -112,11 +110,11 @@ describe('class OpCompressedRequest', () => {
   });
 });
 
-describe.only('fire-and-forget', () => {
-  describe('OpMsgRequest', () => {
-    context('when writeConcern.w is 0', () => {
+describe('OpMsgRequest', () => {
+  describe('fire-and-forget', () => {
+    context('when writeConcern = 0', () => {
       it('moreToCome is set to true', async () => {
-        const request = new OpMsgRequest('db', { a: 1 }, { writeConcern: { w: 0 } });
+        const request = new OpMsgRequest('db', { a: 1, writeConcern: { w: 0 } }, {});
         expect(request.moreToCome).to.be.true;
       });
     });