Apply feedback

Author: Murderlon

packages/server/src/handlers/PatchHandler.ts

@@ -127,7 +127,7 @@ export class PatchHandler extends BaseHandler {
             if (status_code) responseData.status = status_code
             if (body) responseData.body = body
             if (headers)
-              responseData.headers = Object.assign(headers, responseData.headers)
+              responseData.headers = Object.assign(responseData.headers, headers)
           }
         } catch (error) {
           log(`onUploadFinish: ${error.body}`)

packages/server/src/server.ts

@@ -140,7 +140,7 @@ export class Server extends EventEmitter {
     return this.handler(req)
   }
 
-  handler(req: Request) {
+  private async handler(req: Request) {
     const context = this.createContext()
     const headers = new Headers()
 
@@ -165,8 +165,9 @@ export class Server extends EventEmitter {
 
     if (req.method === 'GET') {
       const handler = this.handlers.GET
-      // TODO: abort context after wait send()?
-      return handler.send(req, context, headers).catch(onError)
+      const res = await handler.send(req, context, headers).catch(onError)
+      context.abort
+      return res
     }
 
     // The Tus-Resumable header MUST be included in every request and
@@ -257,12 +258,6 @@ export class Server extends EventEmitter {
     }
 
     return new Response(body, {status, headers})
-
-    // Abort the context once the response is sent.
-    // Useful for clean-up when the server uses keep-alive
-    // if (!isAborted) {
-    //   context.abort()
-    // }
   }
 
   // biome-ignore lint/suspicious/noExplicitAny: <explanation>
@@ -287,16 +282,13 @@ export class Server extends EventEmitter {
     const abortWithDelayController = new AbortController()
 
     const onDelayedAbort = (err: unknown) => {
-      abortWithDelayController.signal.removeEventListener('abort', onDelayedAbort)
       setTimeout(() => {
         requestAbortController.abort(err)
       }, this.options.lockDrainTimeout)
     }
-    abortWithDelayController.signal.addEventListener('abort', onDelayedAbort)
-
-    // req.on('close', () => {
-    //   abortWithDelayController.signal.removeEventListener('abort', onDelayedAbort)
-    // })
+    abortWithDelayController.signal.addEventListener('abort', onDelayedAbort, {
+      once: true,
+    })
 
     return {
       signal: requestAbortController.signal,

packages/server/src/types.ts

@@ -147,7 +147,7 @@ export type ServerOptions = {
     | undefined
 }
 
-export type RouteHandler = (req: Request) => Response
+export type RouteHandler = (req: Request) => Response | Promise<Response>
 
 export type WithOptional<T, K extends keyof T> = Omit<T, K> & {[P in K]+?: T[P]}
 

packages/server/src/web.ts

@@ -3,7 +3,7 @@ import {createReadStream} from 'node:fs'
 import {Readable} from 'node:stream'
 import * as set_cookie_parser from 'set-cookie-parser'
 
-function get_raw_body(req: http.IncomingMessage) {
+function getRawBody(req: http.IncomingMessage) {
   const h = req.headers
 
   if (!h['content-type']) {
@@ -64,8 +64,6 @@ function get_raw_body(req: http.IncomingMessage) {
   })
 }
 
-// TODO 3.0 make the signature synchronous?
-// eslint-disable-next-line @typescript-eslint/require-await
 export async function getRequest({
   request,
   base,
@@ -92,12 +90,10 @@ export async function getRequest({
     body:
       request.method === 'GET' || request.method === 'HEAD'
         ? undefined
-        : get_raw_body(request),
+        : getRawBody(request),
   })
 }
 
-// TODO 3.0 make the signature synchronous?
-// eslint-disable-next-line @typescript-eslint/require-await
 export async function setResponse(res: http.ServerResponse, response: Response) {
   for (const [key, value] of response.headers) {
     try {