Odis Signer 3.0.1

packages/phone-number-privacy/signer/src/common/handler.ts

@@ -119,6 +119,20 @@ export function timeoutHandler<R extends OdisRequest>(
   }
 }
 
+export function connectionClosedHandler<R extends OdisRequest>(
+  handler: PromiseHandler<R>
+): PromiseHandler<R> {
+  return async (req, res) => {
+    req.on('close', () => {
+      if (res.socket?.closed) {
+        res.end()
+      }
+    })
+
+    await handler(req, res)
+  }
+}
+
 export async function disabledHandler<R extends OdisRequest>(
   req: Request<{}, {}, R>,
   response: Response<OdisResponse<R>, Locals>
@@ -141,8 +155,11 @@ export function resultHandler<R extends OdisRequest>(
 ): PromiseHandler<R> {
   return async (req, res) => {
     const result = await resHandler(req, res)
-    send(res, result.body, result.status, res.locals.logger)
-    Counters.responses.labels(req.url, result.status.toString()).inc()
+    // Check if the response was ended
+    if (!res.writableEnded) {
+      send(res, result.body, result.status, res.locals.logger)
+      Counters.responses.labels(req.url, result.status.toString()).inc()
+    }
   }
 }
 
@@ -170,16 +187,19 @@ function sendFailure(
   endpoint: string,
   body?: Record<any, any> // TODO remove any
 ) {
-  send(
-    response,
-    {
-      success: false,
-      version: getSignerVersion(),
-      error,
-      ...body,
-    },
-    status,
-    response.locals.logger
-  )
-  Counters.responses.labels(endpoint, status.toString()).inc()
+  // Check if the response was ended
+  if (!response.writableEnded) {
+    send(
+      response,
+      {
+        success: false,
+        version: getSignerVersion(),
+        error,
+        ...body,
+      },
+      status,
+      response.locals.logger
+    )
+    Counters.responses.labels(endpoint, status.toString()).inc()
+  }
 }

packages/phone-number-privacy/signer/src/server.ts

@@ -14,6 +14,7 @@ import { IncomingMessage, ServerResponse } from 'node:http'
 import * as PromClient from 'prom-client'
 import {
   catchErrorHandler,
+  connectionClosedHandler,
   disabledHandler,
   Locals,
   meteringHandler,
@@ -144,7 +145,10 @@ function createHandler<R extends OdisRequest>(
     tracingHandler(
       meteringHandler(
         Histograms.responseLatency,
-        timeoutHandler(timeoutMs, enabled ? resultHandler(action) : disabledHandler)
+        timeoutHandler(
+          timeoutMs,
+          enabled ? connectionClosedHandler(resultHandler(action)) : disabledHandler
+        )
       )
     )
   )