Call cleanup every time instead of abort

connectrpc · Jun 26, 2024 · 2e32fb8 · 2e32fb8
1 parent 1d71dc9
commit 2e32fb8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/packages/connect/src/implementation.ts b/packages/connect/src/implementation.ts
@@ -150,6 +150,7 @@ interface HandlerContextInit {
 }
 
 interface HandlerContextController extends HandlerContext {
+  cleanup(): void;
   abort(reason?: unknown): void;
 }
 
@@ -183,6 +184,7 @@ export function createHandlerContext(
     requestHeader: new Headers(init.requestHeader),
     responseHeader: new Headers(init.responseHeader),
     responseTrailer: new Headers(init.responseTrailer),
+    cleanup: deadline.cleanup,
     abort(reason?: unknown) {
       deadline.cleanup();
       abortController.abort(reason);

diff --git a/packages/connect/src/protocol-connect/handler-factory.ts b/packages/connect/src/protocol-connect/handler-factory.ts
@@ -269,7 +269,7 @@ function createUnaryHandler<I extends Message<I>, O extends Message<O>>(
       });
       body = errorToJsonBytes(error, opt.jsonOptions);
     } finally {
-      context.abort();
+      context.cleanup();
     }
     if (compression.response && body.byteLength >= opt.compressMinBytes) {
       body = await compression.response.compress(body);