fix(server): set reason in ServerAdapterRequestAbortSignal to get…

… a proper error message when aborted (#1218)
ardatan · Mar 21, 2024 · 1443f93 · 1443f93
1 parent dfb4290
commit 1443f93
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.changeset/sharp-months-hunt.md b/.changeset/sharp-months-hunt.md
@@ -0,0 +1,5 @@
+---
+"@whatwg-node/server": patch
+---
+
+Set \`reason\` in \`ServerAdapterRequestAbortSignal\` to get a proper error when the request got aborted by the client
diff --git a/packages/server/src/utils.ts b/packages/server/src/utils.ts
@@ -90,11 +90,12 @@ export class ServerAdapterRequestAbortSignal extends EventTarget implements Abor
 
   throwIfAborted(): void {
     if (this.aborted) {
-      throw new DOMException('Aborted', 'AbortError');
+      throw this.reason;
     }
   }
 
   sendAbort() {
+    this.reason = new DOMException('This operation was aborted', 'AbortError');
     this.aborted = true;
     this.dispatchEvent(new Event('abort'));
   }
@@ -563,7 +564,7 @@ export function handleAbortSignalAndPromiseResponse(
   if (isPromise(response$) && abortSignal) {
     const deferred$ = createDeferredPromise<Response>();
     abortSignal.addEventListener('abort', function abortSignalFetchErrorHandler() {
-      deferred$.reject(new DOMException('Aborted', 'AbortError'));
+      deferred$.reject(abortSignal.reason);
     });
     response$
       .then(function fetchSuccessHandler(res) {

diff --git a/packages/server/test/adapter.fetch.spec.ts b/packages/server/test/adapter.fetch.spec.ts
@@ -223,6 +223,6 @@ describe('adapter.fetch', () => {
     const signal = controller.signal;
     const promise = adapter.fetch('http://localhost', { signal });
     controller.abort();
-    await expect(promise).rejects.toThrow('Aborted');
+    await expect(promise).rejects.toThrow('This operation was aborted');
   });
 });