ts fixes

Author: jasisk

src/telemetry/requestLogger.ts

@@ -24,6 +24,10 @@ interface WithLogPrefs {
   [LOG_PREFS]: LogPrefs;
 }
 
+interface WithFinishedSemaphore {
+  [SUCCESS_SEMAPHORE]?: true;
+}
+
 interface WithIdentifiedSession {
   session?: {
     id?: string;
@@ -59,7 +63,7 @@ function finishLog<SLocals extends AnyServiceLocals = ServiceLocals<Configuratio
   app: ServiceExpress<SLocals>,
   error: Error | undefined,
   req: Request,
-  res: Response & { [LOGGED_SEMAPHORE]?: boolean },
+  res: Response & { [LOGGED_SEMAPHORE]?: boolean } & WithFinishedSemaphore,
   histogram: Histogram,
 ) {
   if (res[LOGGED_SEMAPHORE]) {
@@ -83,7 +87,6 @@ function finishLog<SLocals extends AnyServiceLocals = ServiceLocals<Configuratio
 
   let responseType = 'unknown';
 
-  // ts warning is known and incorrect—`aborted` is a subset of `destroyed`
   if (res[SUCCESS_SEMAPHORE]) {
     responseType = 'finished';
   } else if (req.aborted) {
@@ -208,7 +211,7 @@ export function loggerMiddleware<
 
     const logWriter = (err?: Error) => finishLog(app, err, req, res, histogram);
     res.on('finish', () => {
-      res[SUCCESS_SEMAPHORE] = true;
+      (res as Response & WithFinishedSemaphore)[SUCCESS_SEMAPHORE] = true;
       logWriter();
     });
     res.on('close', logWriter);