fix: overhaul headers proxy

Author: huseeiin

packages/start/src/server/fetchEvent.ts

@@ -1,112 +1,78 @@
 import {
-	H3Event,
-	appendResponseHeader,
-	getRequestIP,
-	getResponseHeader,
-	getResponseHeaders,
-	getResponseStatus,
-	getResponseStatusText,
-	getWebRequest,
-	removeResponseHeader,
-	setResponseHeader,
-	setResponseStatus
+  H3Event,
+  appendResponseHeader,
+  getRequestIP,
+  getResponseStatus,
+  getResponseStatusText,
+  getWebRequest,
+  setResponseHeader,
+  setResponseStatus
 } from "vinxi/http";
 import type { FetchEvent, ResponseStub } from "./types";
 
 const fetchEventContext = "solidFetchEvent";
 
 export function createFetchEvent(event: H3Event): FetchEvent {
-	return {
-		request: getWebRequest(event),
-		response: createResponseStub(event),
-		clientAddress: getRequestIP(event),
-		locals: {},
-		nativeEvent: event
-	};
+  return {
+    request: getWebRequest(event),
+    response: createResponseStub(event),
+    clientAddress: getRequestIP(event),
+    locals: {},
+    nativeEvent: event
+  };
 }
 
 export function cloneEvent<T extends FetchEvent>(fetchEvent: T): T {
-	return {
-		...fetchEvent
-	};
+  return {
+    ...fetchEvent
+  };
 }
 
 export function getFetchEvent(h3Event: H3Event): FetchEvent {
-	if (!h3Event.context[fetchEventContext]) {
-		const fetchEvent = createFetchEvent(h3Event);
-		h3Event.context[fetchEventContext] = fetchEvent;
-	}
+  if (!h3Event.context[fetchEventContext]) {
+    const fetchEvent = createFetchEvent(h3Event);
+    h3Event.context[fetchEventContext] = fetchEvent;
+  }
 
-	return h3Event.context[fetchEventContext];
+  return h3Event.context[fetchEventContext];
 }
 
 export function mergeResponseHeaders(h3Event: H3Event, headers: Headers) {
-	for (const [key, value] of headers.entries()) {
-		appendResponseHeader(h3Event, key, value);
-	}
+  for (const [key, value] of headers.entries()) {
+    appendResponseHeader(h3Event, key, value);
+  }
 }
+function createHeadersProxy(event: H3Event) {
+  const headers = new Headers();
 
-class HeaderProxy {
-	constructor(private event: H3Event) {}
-	get(key: string) {
-		const h = getResponseHeader(this.event, key);
-		return Array.isArray(h) ? h.join(", ") : (h as string) || null;
-	}
-	has(key: string) {
-		return this.get(key) !== undefined;
-	}
-	set(key: string, value: string) {
-		return setResponseHeader(this.event, key, value);
-	}
-	delete(key: string) {
-		return removeResponseHeader(this.event, key);
-	}
-	append(key: string, value: string) {
-		appendResponseHeader(this.event, key, value);
-	}
-	getSetCookie() {
-		const cookies = getResponseHeader(this.event, "Set-Cookie");
-		return Array.isArray(cookies) ? cookies : [cookies as string];
-	}
-	forEach(fn: (value: string, key: string, object: Headers) => void) {
-		return Object.entries(getResponseHeaders(this.event)).forEach(([key, value]) =>
-			fn(Array.isArray(value) ? value.join(", ") : (value as string), key, this)
-		);
-	}
-	entries() {
-		return Object.entries(getResponseHeaders(this.event))
-			.map(
-				([key, value]) => [key, Array.isArray(value) ? value.join(", ") : value] as [string, string]
-			)
-			[Symbol.iterator]();
-	}
-	keys() {
-		return Object.keys(getResponseHeaders(this.event))[Symbol.iterator]();
-	}
-	values() {
-		return Object.values(getResponseHeaders(this.event))
-			.map(value => (Array.isArray(value) ? value.join(", ") : (value as string)))
-			[Symbol.iterator]();
-	}
-	[Symbol.iterator]() {
-		return this.entries()[Symbol.iterator]();
-	}
+  const origSet = headers.set.bind(headers);
+  headers.set = (name, value) => {
+    origSet(name, value);
+    setResponseHeader(event, name, value);
+  };
+  const origAppend = headers.append.bind(headers);
+  headers.append = (name, value) => {
+    origAppend(name, value);
+    appendResponseHeader(event, name, value);
+  };
+
+  return headers;
 }
 
 function createResponseStub(event: H3Event): ResponseStub {
-	return {
-		get status() {
-			return getResponseStatus(event);
-		},
-		set status(v) {
-			setResponseStatus(event, v);
-		},
-		get statusText() {
-			return getResponseStatusText(event);
-		},
-		set statusText(v) {
-			setResponseStatus(event, getResponseStatus(event), v);
-		},
-		headers: new HeaderProxy(event)
-	};
+  return {
+    get status() {
+      return getResponseStatus(event);
+    },
+    set status(v) {
+      setResponseStatus(event, v);
+    },
+    get statusText() {
+      return getResponseStatusText(event);
+    },
+    set statusText(v) {
+      setResponseStatus(event, getResponseStatus(event), v);
+    },
+    headers: createHeadersProxy(event)
+  };
 }