conditionally kill connection when a CSOT error occurs

W-A-James · W-A-James · commit f0ab110164b8 · 2024-10-14T15:08:15.000-04:00
diff --git a/src/cmap/connection.ts b/src/cmap/connection.ts
@@ -714,8 +714,8 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
         let err = error;
         if (TimeoutError.is(error)) {
           err = new MongoOperationTimeoutError('Timed out at socket write');
+          this.cleanup(err);
         }
-        this.cleanup(error);
         throw err;
       }
     }
@@ -756,7 +756,6 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
         this.onError(error);
         throw error;
       }
-      this.cleanup(err);
       throw err;
     } finally {
       this.dataEvents = null;

Original file line number	Diff line number	Diff line change
`@@ -714,8 +714,8 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {`
`714`	`714`	`let err = error;`
`715`	`715`	`if (TimeoutError.is(error)) {`
`716`	`716`	`err = new MongoOperationTimeoutError('Timed out at socket write');`
	`717`	`+ this.cleanup(err);`
`717`	`718`	`}`
`718`		`- this.cleanup(error);`
`719`	`719`	`throw err;`
`720`	`720`	`}`
`721`	`721`	`}`
`@@ -756,7 +756,6 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {`
`756`	`756`	`this.onError(error);`
`757`	`757`	`throw error;`
`758`	`758`	`}`
`759`		`- this.cleanup(err);`
`760`	`759`	`throw err;`
`761`	`760`	`} finally {`
`762`	`761`	`this.dataEvents = null;`