elysia 2.0.0-exp.0 → 2.0.0-exp.10

package/dist/_virtual/_rolldown/runtime.js

@@ -32,7 +32,6 @@ var __copyProps = (to, from, except, desc) => {
 	}
 	return to;
 };
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
 	value: mod,
 	enumerable: true
@@ -41,5 +40,4 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 //#endregion
 
 exports.__exportAll = __exportAll;
-exports.__reExport = __reExport;
 exports.__toESM = __toESM;

package/dist/adapter/bun/index.d.ts

@@ -6,7 +6,7 @@ import { AnyElysia } from "../../base.js";
 declare function collectStaticRoutes(app: AnyElysia): readonly [Record<string, Record<string, Response>>, Promise<void>[]] | undefined;
 declare const BunAdapter: {
   parse: {
-    default: (context: Context, contentType: string) => string | ArrayBuffer | unknown[] | Record<string, unknown> | Promise<unknown[] | Record<string | number | symbol, undefined>> | Promise<ArrayBuffer> | Promise<Record<string, unknown>> | Promise<string> | undefined;
+    default: (context: Context, contentType: string) => string | ArrayBuffer | unknown[] | Record<string, unknown> | Promise<Record<string, unknown>> | Promise<ArrayBuffer> | Promise<string> | Promise<unknown[] | Record<string | number | symbol, undefined>> | undefined;
     json: (context: Context) => MaybePromise<Record<keyof any, undefined> | unknown[]>;
     text: (context: Context) => MaybePromise<string>;
     urlencoded: (context: Context) => MaybePromise<Record<string, string | string[]>>;

package/dist/adapter/bun/index.js

@@ -35,9 +35,17 @@ const BunAdapter = require_adapter_index.createAdapter({
 	name: "bun",
 	runtime: "bun",
 	listen(app, options, callback) {
-		const serve = typeof options === "object" ? options : { port: +options };
+		const _config = app["~config"]?.serve;
+		const _options = typeof options === "object" ? options : {
+			port: +options,
+			fetch: (request, server) => app.fetch(request, server)
+		};
+		const serve = _config ? {
+			..._config,
+			..._options
+		} : _options;
 		const hasWs = app["~hasWS"];
-		serve.fetch = (request, server) => app.fetch(request, server);
+		if (!serve.fetch) serve.fetch = (request, server) => app.fetch(request, server);
 		app.server = Bun.serve(serve);
 		if (!hasWs) callback?.(app.server);
 		queueMicrotask(() => {

package/dist/adapter/bun/index.mjs

@@ -34,9 +34,17 @@ const BunAdapter = createAdapter({
 	name: "bun",
 	runtime: "bun",
 	listen(app, options, callback) {
-		const serve = typeof options === "object" ? options : { port: +options };
+		const _config = app["~config"]?.serve;
+		const _options = typeof options === "object" ? options : {
+			port: +options,
+			fetch: (request, server) => app.fetch(request, server)
+		};
+		const serve = _config ? {
+			..._config,
+			..._options
+		} : _options;
 		const hasWs = app["~hasWS"];
-		serve.fetch = (request, server) => app.fetch(request, server);
+		if (!serve.fetch) serve.fetch = (request, server) => app.fetch(request, server);
 		app.server = Bun.serve(serve);
 		if (!hasWs) callback?.(app.server);
 		queueMicrotask(() => {

package/dist/adapter/bun/router.js

@@ -9,7 +9,7 @@ const require_handler_error = require('../../handler/error.js');
 
 //#region src/adapter/bun/router.ts
 function createBunContext(app) {
-	const headers = app["~ext"]?.headers ? Object.assign(require_utils.nullObject(), structuredClone(app["~ext"].headers)) : null;
+	const headers = app["~ext"]?.headers ? Object.assign(require_utils.nullObject(), app["~ext"].headers) : null;
 	return class Context extends require_context.createBaseContext(app) {
 		constructor(request) {
 			super();
@@ -62,13 +62,13 @@ function createPlainHandler(handler, handleError, Context) {
 }
 function createRouteMap(app) {
 	const Context = createBunContext(app);
+	const handleError = require_handler_error.createErrorHandler(require_utils.flattenChain(app["~hookChain"])?.error, require_adapter_web_standard_index.WebStandardAdapter.response.map, new Response("Not Found", { status: 404 }), app["~config"]?.allowUnsafeValidationDetails);
 	function fetch(request) {
 		return handleError(new Context(request), new require_error.NotFound());
 	}
 	const history = app.history;
 	const length = history?.length ?? 0;
 	if (length === 0) return [{ "/elysia": new Response("hi") }, fetch];
-	const handleError = require_handler_error.createErrorHandler(require_utils.flattenChain(app["~hookChain"])?.error, require_adapter_web_standard_index.WebStandardAdapter.response.map, new Response("Not Found", { status: 404 }), app["~config"]?.allowUnsafeValidationDetails);
 	const routes = require_utils.nullObject();
 	for (let i = 0; i < length; i++) {
 		const route = history[i];

package/dist/adapter/bun/router.mjs

@@ -8,7 +8,7 @@ import { createErrorHandler } from "../../handler/error.mjs";
 
 //#region src/adapter/bun/router.ts
 function createBunContext(app) {
-	const headers = app["~ext"]?.headers ? Object.assign(nullObject(), structuredClone(app["~ext"].headers)) : null;
+	const headers = app["~ext"]?.headers ? Object.assign(nullObject(), app["~ext"].headers) : null;
 	return class Context extends createBaseContext(app) {
 		constructor(request) {
 			super();
@@ -61,13 +61,13 @@ function createPlainHandler(handler, handleError, Context) {
 }
 function createRouteMap(app) {
 	const Context = createBunContext(app);
+	const handleError = createErrorHandler(flattenChain(app["~hookChain"])?.error, WebStandardAdapter.response.map, new Response("Not Found", { status: 404 }), app["~config"]?.allowUnsafeValidationDetails);
 	function fetch(request) {
 		return handleError(new Context(request), new NotFound());
 	}
 	const history = app.history;
 	const length = history?.length ?? 0;
 	if (length === 0) return [{ "/elysia": new Response("hi") }, fetch];
-	const handleError = createErrorHandler(flattenChain(app["~hookChain"])?.error, WebStandardAdapter.response.map, new Response("Not Found", { status: 404 }), app["~config"]?.allowUnsafeValidationDetails);
 	const routes = nullObject();
 	for (let i = 0; i < length; i++) {
 		const route = history[i];

package/dist/adapter/constants.d.ts

@@ -5,7 +5,7 @@ import { AnyElysia } from "../base.js";
 //#region src/adapter/constants.d.ts
 declare const defaultAdapter: {
   parse: {
-    default: (context: Context, contentType: string) => string | ArrayBuffer | unknown[] | Record<string, unknown> | Promise<unknown[] | Record<string | number | symbol, undefined>> | Promise<ArrayBuffer> | Promise<Record<string, unknown>> | Promise<string> | undefined;
+    default: (context: Context, contentType: string) => string | ArrayBuffer | unknown[] | Record<string, unknown> | Promise<Record<string, unknown>> | Promise<ArrayBuffer> | Promise<string> | Promise<unknown[] | Record<string | number | symbol, undefined>> | undefined;
     json: (context: Context) => MaybePromise<Record<keyof any, undefined> | unknown[]>;
     text: (context: Context) => MaybePromise<string>;
     urlencoded: (context: Context) => MaybePromise<Record<string, string | string[]>>;

package/dist/adapter/index.d.ts

@@ -7,7 +7,7 @@ import { AnyElysia } from "../base.js";
 //#region src/adapter/index.d.ts
 declare function createAdapter(adapter: ElysiaAdapterOptions): {
   parse: {
-    default: (context: Context, contentType: string) => string | ArrayBuffer | unknown[] | Record<string, unknown> | Promise<unknown[] | Record<string | number | symbol, undefined>> | Promise<ArrayBuffer> | Promise<Record<string, unknown>> | Promise<string> | undefined;
+    default: (context: Context, contentType: string) => string | ArrayBuffer | unknown[] | Record<string, unknown> | Promise<Record<string, unknown>> | Promise<ArrayBuffer> | Promise<string> | Promise<unknown[] | Record<string | number | symbol, undefined>> | undefined;
     json: (context: Context) => MaybePromise<Record<keyof any, undefined> | unknown[]>;
     text: (context: Context) => MaybePromise<string>;
     urlencoded: (context: Context) => MaybePromise<Record<string, string | string[]>>;

package/dist/adapter/utils.d.ts

@@ -18,15 +18,12 @@ interface CreateHandlerParameter {
   mapResponse(response: unknown, set: Context['set'], request?: Request): Response;
   mapCompactResponse(response: unknown, request?: Request): Response;
 }
-declare const createStreamHandler: ({
-  mapResponse,
-  mapCompactResponse
-}: CreateHandlerParameter) => (generator: Generator | AsyncGenerator | ReadableStream, set?: Context["set"], request?: Request, skipFormat?: boolean) => Promise<Response>;
+declare function createStreamHandler(_: CreateHandlerParameter): (generator: Generator | AsyncGenerator | ReadableStream, set?: Context["set"], request?: Request, skipFormat?: boolean) => Promise<Response>;
 declare function streamResponse(response: Response): AsyncGenerator<any, void, any>;
 declare function handleSet(set: Context['set']): void;
 declare function mergeHeaders(responseHeaders: Headers, setHeaders: Context['set']['headers']): Headers;
 declare function mergeStatus(responseStatus: number, setStatus: Context['set']['status']): number | undefined;
-declare const createResponseHandler: (handler: CreateHandlerParameter) => (response: Response, set?: Context["set"], request?: Request) => any;
+declare function createResponseHandler(handler: CreateHandlerParameter): (response: Response, set?: Context["set"], request?: Request) => any;
 /**
  * Split async source into `branches` independent iterators
  *

package/dist/adapter/utils.js

@@ -2,7 +2,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_universal_constants = require('../universal/constants.js');
 const require_constants = require('../constants.js');
 const require_utils = require('../utils.js');
-const require_cookie_utils = require('../cookie/utils.js');
+const require_cookie_serialize = require('../cookie/serialize.js');
+const require_adapter_web_standard_handler = require('./web-standard/handler.js');
 
 //#region src/adapter/utils.ts
 const setCookie = "set-cookie";
@@ -51,7 +52,7 @@ function handleFile(response, set, request) {
 	if (!set && !size) return new Response(response);
 	if (!set) return new Response(response, { headers: defaultHeader });
 	if (set.headers instanceof Headers) {
-		for (const key of Object.keys(defaultHeader)) if (key in set.headers) set.headers.append(key, defaultHeader[key]);
+		for (const key of Object.keys(defaultHeader)) if (!set.headers.has(key)) set.headers.append(key, defaultHeader[key]);
 		if (immutable) {
 			set.headers.delete("content-length");
 			set.headers.delete("accept-ranges");
@@ -96,10 +97,12 @@ function responseToSetHeaders(response, set) {
 		};
 		for (const [key, value] of response.headers.entries()) set.headers[key] = value;
 	}
-	if (set.headers["content-encoding"]) delete set.headers["content-encoding"];
+	if (set.headers instanceof Headers) {
+		if (set.headers.has("content-encoding")) set.headers.delete("content-encoding");
+	} else if (set.headers["content-encoding"]) delete set.headers["content-encoding"];
 	return set;
 }
-const enqueueBinaryChunk = (controller, chunk) => {
+function enqueueBinaryChunk(controller, chunk) {
 	if (chunk instanceof Blob) return chunk.arrayBuffer().then((buffer) => {
 		controller.enqueue(new Uint8Array(buffer));
 		return true;
@@ -117,91 +120,93 @@ const enqueueBinaryChunk = (controller, chunk) => {
 		return true;
 	}
 	return false;
-};
-const createStreamHandler = ({ mapResponse, mapCompactResponse }) => async (generator, set, request, skipFormat) => {
-	let init = generator.next?.();
-	if (set) handleSet(set);
-	if (init instanceof Promise) init = await init;
-	if (init?.value instanceof ReadableStream) generator = init.value;
-	else if (init && (typeof init?.done === "undefined" || init?.done)) {
-		if (set) return mapResponse(init.value, set, request);
-		return mapCompactResponse(init.value, request);
-	}
-	const isSSE = !skipFormat && (init?.value?.sse ?? generator?.sse ?? set?.headers["content-type"]?.startsWith("text/event-stream"));
-	const format = isSSE ? (data) => `data: ${data}\n\n` : (data) => data;
-	const contentType = isSSE ? "text/event-stream" : init?.value && typeof init?.value === "object" ? ArrayBuffer.isView(init.value) ? "application/octet-stream" : "application/json" : "text/plain";
-	const headers = set?.headers;
-	if (headers) {
-		if (!headers["transfer-encoding"]) headers["transfer-encoding"] = "chunked";
-		if (!headers["content-type"]) headers["content-type"] = contentType;
-		if (!headers["cache-control"]) headers["cache-control"] = "no-cache";
-	} else set = {
-		status: 200,
-		headers: {
-			"content-type": contentType,
-			"transfer-encoding": "chunked",
-			"cache-control": "no-cache",
-			connection: "keep-alive"
+}
+function createStreamHandler(_) {
+	return async (generator, set, request, skipFormat) => {
+		let init = generator.next?.();
+		if (set) handleSet(set);
+		if (init instanceof Promise) init = await init;
+		if (init?.value instanceof ReadableStream) generator = init.value;
+		else if (init && (typeof init?.done === "undefined" || init?.done)) {
+			if (set) return require_adapter_web_standard_handler.mapResponse(init.value, set, request);
+			return require_adapter_web_standard_handler.mapCompactResponse(init.value, request);
 		}
-	};
-	const iterator = typeof generator.next === "function" ? generator : generator[Symbol.asyncIterator]();
-	let end = false;
-	return new Response(new ReadableStream({
-		start(controller) {
-			request?.signal?.addEventListener("abort", () => {
-				end = true;
-				iterator.return?.();
-				try {
-					controller.close();
-				} catch {}
-			});
-			if (!init || init.value instanceof ReadableStream || init.value === void 0 || init.value === null) return;
-			if (init.value.toSSE) controller.enqueue(init.value.toSSE());
-			else if (enqueueBinaryChunk(controller, init.value)) return;
-			else if (typeof init.value === "object") try {
-				controller.enqueue(format(JSON.stringify(init.value)));
-			} catch {
-				controller.enqueue(format(init.value.toString()));
-			}
-			else controller.enqueue(format(init.value.toString()));
-		},
-		async pull(controller) {
-			if (end) {
-				try {
-					controller.close();
-				} catch {}
-				return;
+		const isSSE = !skipFormat && (init?.value?.sse ?? generator?.sse ?? set?.headers["content-type"]?.startsWith("text/event-stream"));
+		const format = isSSE ? (data) => `data: ${data}\n\n` : (data) => data;
+		const contentType = isSSE ? "text/event-stream" : init?.value && typeof init?.value === "object" ? ArrayBuffer.isView(init.value) ? "application/octet-stream" : "application/json" : "text/plain";
+		const headers = set?.headers;
+		if (headers) {
+			if (!headers["transfer-encoding"]) headers["transfer-encoding"] = "chunked";
+			if (!headers["content-type"]) headers["content-type"] = contentType;
+			if (!headers["cache-control"]) headers["cache-control"] = "no-cache";
+		} else set = {
+			status: 200,
+			headers: {
+				"content-type": contentType,
+				"transfer-encoding": "chunked",
+				"cache-control": "no-cache",
+				connection: "keep-alive"
 			}
-			try {
-				const { value: chunk, done } = await iterator.next();
-				if (done || end) {
+		};
+		const iterator = typeof generator.next === "function" ? generator : generator[Symbol.asyncIterator]();
+		let end = false;
+		return new Response(new ReadableStream({
+			start(controller) {
+				request?.signal?.addEventListener("abort", () => {
+					end = true;
+					iterator.return?.();
 					try {
 						controller.close();
 					} catch {}
-					return;
-				}
-				if (chunk === void 0 || chunk === null) return;
-				if (chunk.toSSE) controller.enqueue(chunk.toSSE());
-				else if (enqueueBinaryChunk(controller, chunk)) return;
-				else if (typeof chunk === "object") try {
-					controller.enqueue(format(JSON.stringify(chunk)));
+				});
+				if (!init || init.value instanceof ReadableStream || init.value === void 0 || init.value === null) return;
+				if (init.value.toSSE) controller.enqueue(init.value.toSSE());
+				else if (enqueueBinaryChunk(controller, init.value)) return;
+				else if (typeof init.value === "object") try {
+					controller.enqueue(format(JSON.stringify(init.value)));
 				} catch {
-					controller.enqueue(format(chunk.toString()));
+					controller.enqueue(format(init.value.toString()));
+				}
+				else controller.enqueue(format(init.value.toString()));
+			},
+			async pull(controller) {
+				if (end) {
+					try {
+						controller.close();
+					} catch {}
+					return;
 				}
-				else controller.enqueue(format(chunk.toString()));
-			} catch (error) {
-				console.warn(error);
 				try {
-					controller.close();
-				} catch {}
+					const { value: chunk, done } = await iterator.next();
+					if (done || end) {
+						try {
+							controller.close();
+						} catch {}
+						return;
+					}
+					if (chunk === void 0 || chunk === null) return;
+					if (chunk.toSSE) controller.enqueue(chunk.toSSE());
+					else if (enqueueBinaryChunk(controller, chunk)) return;
+					else if (typeof chunk === "object") try {
+						controller.enqueue(format(JSON.stringify(chunk)));
+					} catch {
+						controller.enqueue(format(chunk.toString()));
+					}
+					else controller.enqueue(format(chunk.toString()));
+				} catch (error) {
+					console.warn(error);
+					try {
+						controller.close();
+					} catch {}
+				}
+			},
+			cancel() {
+				end = true;
+				iterator.return?.();
 			}
-		},
-		cancel() {
-			end = true;
-			iterator.return?.();
-		}
-	}), set);
-};
+		}), set);
+	};
+}
 async function* streamResponse(response) {
 	const body = response.body;
 	if (body) yield* body;
@@ -209,13 +214,13 @@ async function* streamResponse(response) {
 function handleSet(set) {
 	if (typeof set.status === "string") set.status = require_constants.StatusMap[set.status];
 	const proto = Object.getPrototypeOf(set.headers);
-	if (proto !== null && proto !== Object.prototype) {
+	if (proto !== null && proto !== Object.prototype && !(set.headers instanceof Headers)) {
 		const flat = Object.create(null);
 		for (const key in set.headers) flat[key] = set.headers[key];
 		set.headers = flat;
 	}
 	if (set.cookie && require_utils.isNotEmpty(set.cookie)) {
-		const cookie = require_cookie_utils.serializeCookie(set.cookie);
+		const cookie = require_cookie_serialize.serializeCookie(set.cookie);
 		if (cookie) set.headers[setCookie] = cookie;
 	}
 	if (set.headers[setCookie] && Array.isArray(set.headers[setCookie])) set.headers = parseSetCookies(new Headers(set.headers), set.headers[setCookie]);
@@ -239,7 +244,7 @@ function mergeStatus(responseStatus, setStatus) {
 	if (responseStatus === 200) return setStatus;
 	return responseStatus;
 }
-const createResponseHandler = (handler) => {
+function createResponseHandler(handler) {
 	const handleStream = createStreamHandler(handler);
 	return (response, set, request) => {
 		if (set) {
@@ -263,7 +268,7 @@ const createResponseHandler = (handler) => {
 		if (!newResponse.headers.has("content-length") && newResponse.headers.get("transfer-encoding") === "chunked") return handleStream(streamResponse(newResponse), responseToSetHeaders(newResponse, set), request, true);
 		return newResponse;
 	};
-};
+}
 /**
 * Split async source into `branches` independent iterators
 *

package/dist/adapter/utils.mjs

@@ -1,7 +1,8 @@
 import { hasHeaderShorthand, isBun } from "../universal/constants.mjs";
 import { StatusMap } from "../constants.mjs";
 import { isNotEmpty, nullObject } from "../utils.mjs";
-import { serializeCookie } from "../cookie/utils.mjs";
+import { serializeCookie } from "../cookie/serialize.mjs";
+import { mapCompactResponse, mapResponse } from "./web-standard/handler.mjs";
 
 //#region src/adapter/utils.ts
 const setCookie = "set-cookie";
@@ -50,7 +51,7 @@ function handleFile(response, set, request) {
 	if (!set && !size) return new Response(response);
 	if (!set) return new Response(response, { headers: defaultHeader });
 	if (set.headers instanceof Headers) {
-		for (const key of Object.keys(defaultHeader)) if (key in set.headers) set.headers.append(key, defaultHeader[key]);
+		for (const key of Object.keys(defaultHeader)) if (!set.headers.has(key)) set.headers.append(key, defaultHeader[key]);
 		if (immutable) {
 			set.headers.delete("content-length");
 			set.headers.delete("accept-ranges");
@@ -95,10 +96,12 @@ function responseToSetHeaders(response, set) {
 		};
 		for (const [key, value] of response.headers.entries()) set.headers[key] = value;
 	}
-	if (set.headers["content-encoding"]) delete set.headers["content-encoding"];
+	if (set.headers instanceof Headers) {
+		if (set.headers.has("content-encoding")) set.headers.delete("content-encoding");
+	} else if (set.headers["content-encoding"]) delete set.headers["content-encoding"];
 	return set;
 }
-const enqueueBinaryChunk = (controller, chunk) => {
+function enqueueBinaryChunk(controller, chunk) {
 	if (chunk instanceof Blob) return chunk.arrayBuffer().then((buffer) => {
 		controller.enqueue(new Uint8Array(buffer));
 		return true;
@@ -116,91 +119,93 @@ const enqueueBinaryChunk = (controller, chunk) => {
 		return true;
 	}
 	return false;
-};
-const createStreamHandler = ({ mapResponse, mapCompactResponse }) => async (generator, set, request, skipFormat) => {
-	let init = generator.next?.();
-	if (set) handleSet(set);
-	if (init instanceof Promise) init = await init;
-	if (init?.value instanceof ReadableStream) generator = init.value;
-	else if (init && (typeof init?.done === "undefined" || init?.done)) {
-		if (set) return mapResponse(init.value, set, request);
-		return mapCompactResponse(init.value, request);
-	}
-	const isSSE = !skipFormat && (init?.value?.sse ?? generator?.sse ?? set?.headers["content-type"]?.startsWith("text/event-stream"));
-	const format = isSSE ? (data) => `data: ${data}\n\n` : (data) => data;
-	const contentType = isSSE ? "text/event-stream" : init?.value && typeof init?.value === "object" ? ArrayBuffer.isView(init.value) ? "application/octet-stream" : "application/json" : "text/plain";
-	const headers = set?.headers;
-	if (headers) {
-		if (!headers["transfer-encoding"]) headers["transfer-encoding"] = "chunked";
-		if (!headers["content-type"]) headers["content-type"] = contentType;
-		if (!headers["cache-control"]) headers["cache-control"] = "no-cache";
-	} else set = {
-		status: 200,
-		headers: {
-			"content-type": contentType,
-			"transfer-encoding": "chunked",
-			"cache-control": "no-cache",
-			connection: "keep-alive"
+}
+function createStreamHandler(_) {
+	return async (generator, set, request, skipFormat) => {
+		let init = generator.next?.();
+		if (set) handleSet(set);
+		if (init instanceof Promise) init = await init;
+		if (init?.value instanceof ReadableStream) generator = init.value;
+		else if (init && (typeof init?.done === "undefined" || init?.done)) {
+			if (set) return mapResponse(init.value, set, request);
+			return mapCompactResponse(init.value, request);
 		}
-	};
-	const iterator = typeof generator.next === "function" ? generator : generator[Symbol.asyncIterator]();
-	let end = false;
-	return new Response(new ReadableStream({
-		start(controller) {
-			request?.signal?.addEventListener("abort", () => {
-				end = true;
-				iterator.return?.();
-				try {
-					controller.close();
-				} catch {}
-			});
-			if (!init || init.value instanceof ReadableStream || init.value === void 0 || init.value === null) return;
-			if (init.value.toSSE) controller.enqueue(init.value.toSSE());
-			else if (enqueueBinaryChunk(controller, init.value)) return;
-			else if (typeof init.value === "object") try {
-				controller.enqueue(format(JSON.stringify(init.value)));
-			} catch {
-				controller.enqueue(format(init.value.toString()));
-			}
-			else controller.enqueue(format(init.value.toString()));
-		},
-		async pull(controller) {
-			if (end) {
-				try {
-					controller.close();
-				} catch {}
-				return;
+		const isSSE = !skipFormat && (init?.value?.sse ?? generator?.sse ?? set?.headers["content-type"]?.startsWith("text/event-stream"));
+		const format = isSSE ? (data) => `data: ${data}\n\n` : (data) => data;
+		const contentType = isSSE ? "text/event-stream" : init?.value && typeof init?.value === "object" ? ArrayBuffer.isView(init.value) ? "application/octet-stream" : "application/json" : "text/plain";
+		const headers = set?.headers;
+		if (headers) {
+			if (!headers["transfer-encoding"]) headers["transfer-encoding"] = "chunked";
+			if (!headers["content-type"]) headers["content-type"] = contentType;
+			if (!headers["cache-control"]) headers["cache-control"] = "no-cache";
+		} else set = {
+			status: 200,
+			headers: {
+				"content-type": contentType,
+				"transfer-encoding": "chunked",
+				"cache-control": "no-cache",
+				connection: "keep-alive"
 			}
-			try {
-				const { value: chunk, done } = await iterator.next();
-				if (done || end) {
+		};
+		const iterator = typeof generator.next === "function" ? generator : generator[Symbol.asyncIterator]();
+		let end = false;
+		return new Response(new ReadableStream({
+			start(controller) {
+				request?.signal?.addEventListener("abort", () => {
+					end = true;
+					iterator.return?.();
 					try {
 						controller.close();
 					} catch {}
-					return;
-				}
-				if (chunk === void 0 || chunk === null) return;
-				if (chunk.toSSE) controller.enqueue(chunk.toSSE());
-				else if (enqueueBinaryChunk(controller, chunk)) return;
-				else if (typeof chunk === "object") try {
-					controller.enqueue(format(JSON.stringify(chunk)));
+				});
+				if (!init || init.value instanceof ReadableStream || init.value === void 0 || init.value === null) return;
+				if (init.value.toSSE) controller.enqueue(init.value.toSSE());
+				else if (enqueueBinaryChunk(controller, init.value)) return;
+				else if (typeof init.value === "object") try {
+					controller.enqueue(format(JSON.stringify(init.value)));
 				} catch {
-					controller.enqueue(format(chunk.toString()));
+					controller.enqueue(format(init.value.toString()));
+				}
+				else controller.enqueue(format(init.value.toString()));
+			},
+			async pull(controller) {
+				if (end) {
+					try {
+						controller.close();
+					} catch {}
+					return;
 				}
-				else controller.enqueue(format(chunk.toString()));
-			} catch (error) {
-				console.warn(error);
 				try {
-					controller.close();
-				} catch {}
+					const { value: chunk, done } = await iterator.next();
+					if (done || end) {
+						try {
+							controller.close();
+						} catch {}
+						return;
+					}
+					if (chunk === void 0 || chunk === null) return;
+					if (chunk.toSSE) controller.enqueue(chunk.toSSE());
+					else if (enqueueBinaryChunk(controller, chunk)) return;
+					else if (typeof chunk === "object") try {
+						controller.enqueue(format(JSON.stringify(chunk)));
+					} catch {
+						controller.enqueue(format(chunk.toString()));
+					}
+					else controller.enqueue(format(chunk.toString()));
+				} catch (error) {
+					console.warn(error);
+					try {
+						controller.close();
+					} catch {}
+				}
+			},
+			cancel() {
+				end = true;
+				iterator.return?.();
 			}
-		},
-		cancel() {
-			end = true;
-			iterator.return?.();
-		}
-	}), set);
-};
+		}), set);
+	};
+}
 async function* streamResponse(response) {
 	const body = response.body;
 	if (body) yield* body;
@@ -208,7 +213,7 @@ async function* streamResponse(response) {
 function handleSet(set) {
 	if (typeof set.status === "string") set.status = StatusMap[set.status];
 	const proto = Object.getPrototypeOf(set.headers);
-	if (proto !== null && proto !== Object.prototype) {
+	if (proto !== null && proto !== Object.prototype && !(set.headers instanceof Headers)) {
 		const flat = Object.create(null);
 		for (const key in set.headers) flat[key] = set.headers[key];
 		set.headers = flat;
@@ -238,7 +243,7 @@ function mergeStatus(responseStatus, setStatus) {
 	if (responseStatus === 200) return setStatus;
 	return responseStatus;
 }
-const createResponseHandler = (handler) => {
+function createResponseHandler(handler) {
 	const handleStream = createStreamHandler(handler);
 	return (response, set, request) => {
 		if (set) {
@@ -262,7 +267,7 @@ const createResponseHandler = (handler) => {
 		if (!newResponse.headers.has("content-length") && newResponse.headers.get("transfer-encoding") === "chunked") return handleStream(streamResponse(newResponse), responseToSetHeaders(newResponse, set), request, true);
 		return newResponse;
 	};
-};
+}
 /**
 * Split async source into `branches` independent iterators
 *