Remove h3, write conversion ourselves

Author: Murderlon

biome.json

@@ -12,6 +12,9 @@
       "recommended": true,
       "style": {
         "noParameterAssign": "off"
+      },
+      "performance": {
+        "noDelete": "off"
       }
     }
   },

package-lock.json

@@ -21,14 +21,15 @@
   "dependencies": {
     "@tus/utils": "^0.5.1",
     "debug": "^4.3.4",
-    "h3": "^1.14.0",
-    "lodash.throttle": "^4.1.1"
+    "lodash.throttle": "^4.1.1",
+    "set-cookie-parser": "^2.7.1"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
     "@types/lodash.throttle": "^4.1.9",
     "@types/mocha": "^10.0.6",
     "@types/node": "^22.10.1",
+    "@types/set-cookie-parser": "^2.4.10",
     "@types/sinon": "^17.0.3",
     "@types/supertest": "^2.0.16",
     "mocha": "^11.0.1",

packages/server/package.json

@@ -38,7 +38,10 @@ export class BaseHandler extends EventEmitter {
 
     if (this.options.generateUrl) {
       // user-defined generateUrl function
-      const {proto, host} = this.extractHostAndProto(req)
+      const {proto, host} = BaseHandler.extractHostAndProto(
+        req.headers,
+        this.options.respectForwardedHeaders
+      )
 
       return this.options.generateUrl(req, {
         proto,
@@ -53,7 +56,10 @@ export class BaseHandler extends EventEmitter {
       return `${path}/${id}`
     }
 
-    const {proto, host} = this.extractHostAndProto(req)
+    const {proto, host} = BaseHandler.extractHostAndProto(
+      req.headers,
+      this.options.respectForwardedHeaders
+    )
 
     return `${proto}://${host}${path}/${id}`
   }
@@ -73,19 +79,19 @@ export class BaseHandler extends EventEmitter {
     return decodeURIComponent(match[1])
   }
 
-  protected extractHostAndProto(req: Request) {
+  static extractHostAndProto(headers: Headers, respectForwardedHeaders?: boolean) {
     let proto: string | undefined
     let host: string | undefined
 
-    if (this.options.respectForwardedHeaders) {
-      const forwarded = req.headers.get('forwarded')
+    if (respectForwardedHeaders) {
+      const forwarded = headers.get('forwarded')
       if (forwarded) {
         host ??= reForwardedHost.exec(forwarded)?.[1]
         proto ??= reForwardedProto.exec(forwarded)?.[1]
       }
 
-      const forwardHost = req.headers.get('x-forwarded-host')
-      const forwardProto = req.headers.get('x-forwarded-proto')
+      const forwardHost = headers.get('x-forwarded-host')
+      const forwardProto = headers.get('x-forwarded-proto')
 
       // @ts-expect-error we can pass undefined
       if (['http', 'https'].includes(forwardProto)) {
@@ -95,10 +101,10 @@ export class BaseHandler extends EventEmitter {
       host ??= forwardHost as string
     }
 
-    host ??= req.headers.get('host') || new URL(req.url).host
+    host ??= headers.get('host') as string
     proto ??= 'http'
 
-    return {host: host as string, proto}
+    return {host, proto}
   }
 
   protected async getLocker(req: Request) {

packages/server/src/handlers/BaseHandler.ts

@@ -2,7 +2,7 @@ import {BaseHandler} from './BaseHandler'
 import {ERRORS, EVENTS, type CancellationContext} from '@tus/utils'
 
 export class DeleteHandler extends BaseHandler {
-  async send(req: Request, context: CancellationContext) {
+  async send(req: Request, context: CancellationContext, headers = new Headers()) {
     const id = this.getFileIdFromRequest(req)
     if (!id) {
       throw ERRORS.FILE_NOT_FOUND
@@ -25,7 +25,7 @@ export class DeleteHandler extends BaseHandler {
     } finally {
       await lock.unlock()
     }
-    const writtenRes = this.write(204)
+    const writtenRes = this.write(204, headers)
     this.emit(EVENTS.POST_TERMINATE, req, writtenRes, id)
     return writtenRes
   }

packages/server/src/handlers/DeleteHandler.ts

@@ -57,7 +57,11 @@ export class GetHandler extends BaseHandler {
   /**
    * Read data from the DataStore and send the stream.
    */
-  async send(req: Request, context: CancellationContext): Promise<Response> {
+  async send(
+    req: Request,
+    context: CancellationContext,
+    headers = new Headers()
+  ): Promise<Response> {
     const path = new URL(req.url).pathname
     const handler = this.paths.get(path)
 
@@ -90,11 +94,9 @@ export class GetHandler extends BaseHandler {
     // @ts-expect-error exists if supported
     const file_stream = await this.store.read(id)
     await lock.unlock()
-    const headers = {
-      'Content-Length': stats.offset.toString(),
-      'Content-Type': contentType,
-      'Content-Disposition': contentDisposition,
-    }
+    headers.set('Content-Length', stats.offset.toString())
+    headers.set('Content-Type', contentType)
+    headers.set('Content-Disposition', contentDisposition)
     return new Response(file_stream, {headers, status: 200})
   }