11import { GetMore , KillCursor , Msg , WriteProtocolMessageType } from './commands' ;
22import { calculateDurationInMs , deepCopy } from '../utils' ;
3- import type { ConnectionPool } from './connection_pool' ;
43import type { Connection } from './connection' ;
5- import type { Document } from '../bson' ;
4+ import type { Document , ObjectId } from '../bson' ;
65
76/**
87 * An event indicating the start of a given
@@ -17,6 +16,7 @@ export class CommandStartedEvent {
1716 command : Document ;
1817 address : string ;
1918 connectionId ?: string | number ;
19+ serviceId ?: ObjectId ;
2020
2121 /**
2222 * Create a started event
@@ -25,10 +25,10 @@ export class CommandStartedEvent {
2525 * @param pool - the pool that originated the command
2626 * @param command - the command
2727 */
28- constructor ( pool : Connection | ConnectionPool , command : WriteProtocolMessageType ) {
28+ constructor ( connection : Connection , command : WriteProtocolMessageType ) {
2929 const cmd = extractCommand ( command ) ;
3030 const commandName = extractCommandName ( cmd ) ;
31- const { address, connectionId } = extractConnectionDetails ( pool ) ;
31+ const { address, connectionId, serviceId } = extractConnectionDetails ( connection ) ;
3232
3333 // TODO: remove in major revision, this is not spec behavior
3434 if ( SENSITIVE_COMMANDS . has ( commandName ) ) {
@@ -38,11 +38,17 @@ export class CommandStartedEvent {
3838
3939 this . address = address ;
4040 this . connectionId = connectionId ;
41+ this . serviceId = serviceId ;
4142 this . requestId = command . requestId ;
4243 this . databaseName = databaseName ( command ) ;
4344 this . commandName = commandName ;
4445 this . command = maybeRedact ( commandName , cmd , cmd ) ;
4546 }
47+
48+ /* @internal */
49+ get hasServiceId ( ) : boolean {
50+ return ! ! this . serviceId ;
51+ }
4652}
4753
4854/**
@@ -57,6 +63,7 @@ export class CommandSucceededEvent {
5763 duration : number ;
5864 commandName : string ;
5965 reply : unknown ;
66+ serviceId ?: ObjectId ;
6067
6168 /**
6269 * Create a succeeded event
@@ -68,22 +75,28 @@ export class CommandSucceededEvent {
6875 * @param started - a high resolution tuple timestamp of when the command was first sent, to calculate duration
6976 */
7077 constructor (
71- pool : Connection | ConnectionPool ,
78+ connection : Connection ,
7279 command : WriteProtocolMessageType ,
7380 reply : Document | undefined ,
7481 started : number
7582 ) {
7683 const cmd = extractCommand ( command ) ;
7784 const commandName = extractCommandName ( cmd ) ;
78- const { address, connectionId } = extractConnectionDetails ( pool ) ;
85+ const { address, connectionId, serviceId } = extractConnectionDetails ( connection ) ;
7986
8087 this . address = address ;
8188 this . connectionId = connectionId ;
89+ this . serviceId = serviceId ;
8290 this . requestId = command . requestId ;
8391 this . commandName = commandName ;
8492 this . duration = calculateDurationInMs ( started ) ;
8593 this . reply = maybeRedact ( commandName , cmd , extractReply ( command , reply ) ) ;
8694 }
95+
96+ /* @internal */
97+ get hasServiceId ( ) : boolean {
98+ return ! ! this . serviceId ;
99+ }
87100}
88101
89102/**
@@ -98,6 +111,8 @@ export class CommandFailedEvent {
98111 duration : number ;
99112 commandName : string ;
100113 failure : Error ;
114+ serviceId ?: ObjectId ;
115+
101116 /**
102117 * Create a failure event
103118 *
@@ -108,23 +123,29 @@ export class CommandFailedEvent {
108123 * @param started - a high resolution tuple timestamp of when the command was first sent, to calculate duration
109124 */
110125 constructor (
111- pool : Connection | ConnectionPool ,
126+ connection : Connection ,
112127 command : WriteProtocolMessageType ,
113128 error : Error | Document ,
114129 started : number
115130 ) {
116131 const cmd = extractCommand ( command ) ;
117132 const commandName = extractCommandName ( cmd ) ;
118- const { address, connectionId } = extractConnectionDetails ( pool ) ;
133+ const { address, connectionId, serviceId } = extractConnectionDetails ( connection ) ;
119134
120135 this . address = address ;
121136 this . connectionId = connectionId ;
137+ this . serviceId = serviceId ;
122138
123139 this . requestId = command . requestId ;
124140 this . commandName = commandName ;
125141 this . duration = calculateDurationInMs ( started ) ;
126142 this . failure = maybeRedact ( commandName , cmd , error ) as Error ;
127143 }
144+
145+ /* @internal */
146+ get hasServiceId ( ) : boolean {
147+ return ! ! this . serviceId ;
148+ }
128149}
129150
130151/** Commands that we want to redact because of the sensitive nature of their contents */
@@ -300,13 +321,14 @@ function extractReply(command: WriteProtocolMessageType, reply?: Document) {
300321 return deepCopy ( reply . result ? reply . result : reply ) ;
301322}
302323
303- function extractConnectionDetails ( connection : Connection | ConnectionPool ) {
324+ function extractConnectionDetails ( connection : Connection ) {
304325 let connectionId ;
305326 if ( 'id' in connection ) {
306327 connectionId = connection . id ;
307328 }
308329 return {
309330 address : connection . address ,
331+ serviceId : connection . serviceId ,
310332 connectionId
311333 } ;
312334}
0 commit comments