elysia 2.0.0-rc.1 → 2.0.0-rc.4

package/dist/adapter/bun/index.js

@@ -189,7 +189,7 @@ const BunAdapter = require_adapter_index.createAdapter({
 		const requestReady = Promise.withResolvers();
 		function gatedFetch(request, srv) {
 			return live && app.server === server ? live(request, srv) : requestReady.promise.then(() => {
-				if (app.server !== server || !live) return unavailableFetch();
+				if (app.server !== server || !live || wsDrifted && request.headers.has("upgrade")) return unavailableFetch();
 				return live(request, srv);
 			});
 		}
@@ -207,12 +207,18 @@ const BunAdapter = require_adapter_index.createAdapter({
 		} : _options;
 		const handoff = (request, server) => serve.fetch(request, server);
 		const htmlRoutes = collectNativeRoutes(app, app.pending ? void 0 : handoff);
+		const wsBound = (app["~hasWS"] ? app["~ext"]?.capability?.ws?.provider : void 0)?.declaredOptions(app);
+		if (wsBound) serve.websocket = {
+			...wsBound,
+			message() {}
+		};
 		const server = app.server = Bun.serve(serve.routes || serve.error || htmlRoutes ? {
 			...serve,
 			error: unavailableFetch,
 			routes: htmlRoutes ?? {}
 		} : serve);
 		let live;
+		let wsDrifted = false;
 		let shutdownAttempt;
 		let wsLifecycle;
 		let modulesReady;
@@ -229,6 +235,7 @@ const BunAdapter = require_adapter_index.createAdapter({
 			if (app["~hasWS"]) {
 				const resolved = require_generation.resolvedWsOf(app);
 				if (!resolved) throw new Error("[Elysia] internal: WebSocket routes are present but no capability provider was resolved");
+				wsDrifted = !!wsBound && !Bun.deepEquals(wsBound, resolved.config ?? {});
 				const handler = resolved.provider.buildGlobalWSHandler();
 				websocket = resolved.config ? Object.assign(handler, resolved.config) : handler;
 				const setter = Object.getOwnPropertyDescriptor(handler, "~lifecycle")?.set;

package/dist/adapter/bun/index.mjs

@@ -189,7 +189,7 @@ const BunAdapter = createAdapter({
 		const requestReady = Promise.withResolvers();
 		function gatedFetch(request, srv) {
 			return live && app.server === server ? live(request, srv) : requestReady.promise.then(() => {
-				if (app.server !== server || !live) return unavailableFetch();
+				if (app.server !== server || !live || wsDrifted && request.headers.has("upgrade")) return unavailableFetch();
 				return live(request, srv);
 			});
 		}
@@ -207,12 +207,18 @@ const BunAdapter = createAdapter({
 		} : _options;
 		const handoff = (request, server) => serve.fetch(request, server);
 		const htmlRoutes = collectNativeRoutes(app, app.pending ? void 0 : handoff);
+		const wsBound = (app["~hasWS"] ? app["~ext"]?.capability?.ws?.provider : void 0)?.declaredOptions(app);
+		if (wsBound) serve.websocket = {
+			...wsBound,
+			message() {}
+		};
 		const server = app.server = Bun.serve(serve.routes || serve.error || htmlRoutes ? {
 			...serve,
 			error: unavailableFetch,
 			routes: htmlRoutes ?? {}
 		} : serve);
 		let live;
+		let wsDrifted = false;
 		let shutdownAttempt;
 		let wsLifecycle;
 		let modulesReady;
@@ -229,6 +235,7 @@ const BunAdapter = createAdapter({
 			if (app["~hasWS"]) {
 				const resolved = resolvedWsOf(app);
 				if (!resolved) throw new Error("[Elysia] internal: WebSocket routes are present but no capability provider was resolved");
+				wsDrifted = !!wsBound && !Bun.deepEquals(wsBound, resolved.config ?? {});
 				const handler = resolved.provider.buildGlobalWSHandler();
 				websocket = resolved.config ? Object.assign(handler, resolved.config) : handler;
 				const setter = Object.getOwnPropertyDescriptor(handler, "~lifecycle")?.set;

package/dist/adapter/utils.d.ts

@@ -3,6 +3,7 @@ import { BaseCookie } from "../cookie/types.js";
 import { Context } from "../context.js";
 import { ElysiaFile } from "../universal/file.js";
 import { HTTPHeaders } from "../types.js";
+
 //#region src/adapter/utils.d.ts
 declare const hget: (h: Headers | Record<string, unknown>, k: string) => unknown;
 declare function hput(h: Headers | Record<string, unknown>, k: string, v: unknown, soft?: 1): void;
@@ -17,7 +18,7 @@ declare function responseToSetHeaders(response: Response, set?: Context['set']):
   redirect?: never;
 } | {
   headers: any;
-  status: number | "Continue" | "Switching Protocols" | "Processing" | "Early Hints" | "OK" | "Created" | "Accepted" | "Non-Authoritative Information" | "No Content" | "Reset Content" | "Partial Content" | "Multi-Status" | "Already Reported" | "Multiple Choices" | "Moved Permanently" | "Found" | "See Other" | "Not Modified" | "Temporary Redirect" | "Permanent Redirect" | "Bad Request" | "Unauthorized" | "Payment Required" | "Forbidden" | "Not Found" | "Method Not Allowed" | "Not Acceptable" | "Proxy Authentication Required" | "Request Timeout" | "Conflict" | "Gone" | "Length Required" | "Precondition Failed" | "Payload Too Large" | "URI Too Long" | "Unsupported Media Type" | "Range Not Satisfiable" | "Expectation Failed" | "I'm a teapot" | "Enhance Your Calm" | "Misdirected Request" | "Unprocessable Content" | "Locked" | "Failed Dependency" | "Too Early" | "Upgrade Required" | "Precondition Required" | "Too Many Requests" | "Request Header Fields Too Large" | "Unavailable For Legal Reasons" | "Internal Server Error" | "Not Implemented" | "Bad Gateway" | "Service Unavailable" | "Gateway Timeout" | "HTTP Version Not Supported" | "Variant Also Negotiates" | "Insufficient Storage" | "Loop Detected" | "Not Extended" | "Network Authentication Required";
+  status: number | "Not Found" | "Continue" | "Switching Protocols" | "Processing" | "Early Hints" | "OK" | "Created" | "Accepted" | "Non-Authoritative Information" | "No Content" | "Reset Content" | "Partial Content" | "Multi-Status" | "Already Reported" | "Multiple Choices" | "Moved Permanently" | "Found" | "See Other" | "Not Modified" | "Temporary Redirect" | "Permanent Redirect" | "Bad Request" | "Unauthorized" | "Payment Required" | "Forbidden" | "Method Not Allowed" | "Not Acceptable" | "Proxy Authentication Required" | "Request Timeout" | "Conflict" | "Gone" | "Length Required" | "Precondition Failed" | "Payload Too Large" | "URI Too Long" | "Unsupported Media Type" | "Range Not Satisfiable" | "Expectation Failed" | "I'm a teapot" | "Enhance Your Calm" | "Misdirected Request" | "Unprocessable Content" | "Locked" | "Failed Dependency" | "Too Early" | "Upgrade Required" | "Precondition Required" | "Too Many Requests" | "Request Header Fields Too Large" | "Unavailable For Legal Reasons" | "Internal Server Error" | "Not Implemented" | "Bad Gateway" | "Service Unavailable" | "Gateway Timeout" | "HTTP Version Not Supported" | "Variant Also Negotiates" | "Insufficient Storage" | "Loop Detected" | "Not Extended" | "Network Authentication Required";
 };
 interface CreateHandlerParameter {
   mapResponse(response: unknown, set: Context['set'], request?: Request, owned?: boolean): Response;
@@ -38,23 +39,18 @@ declare function createResponseHandler(): (response: Response, set?: Context["se
  */
 declare function observeStream(source: ReadableStream): [ReadableStream, AsyncIterable<unknown>, AsyncIterableIterator<unknown>] | undefined;
 /**
- * Split async source into `branches` independent iterators
+ * Split async source into a value iterator and a completion iterator
  *
- * A producer drains the source ahead of consumers
+ * A producer drains the source ahead of the value consumer (response/client)
  *
  * To prevent long/infinite stream, the unconsumed window is capped:
- * Consumed-by-every-branch entries are trimmed off the front
  * Producer backpressures whenever the window hits `cap` ENTRIES or
  * `capBytes` bytes, whichever comes first
  *
- * Streams below both caps buffer eagerly
- * Only streams exceeding one gate on the slowest consumer
- *
- * Branch 0 is the value consumer (response/client)
- * When `return()` (client abort / early exit), source is stopped
- * so the observer branches can still reach completion instead of spinning
- * an infinite source
+ * The second iterator yields nothing: it settles once the source ends
+ * (rejects with its error) or the value iterator returns, which stops
+ * the source so an infinite one can't keep afterResponse waiting
  */
-declare function tee<T>(source: AsyncIterable<T>, branches?: number, cap?: number, capBytes?: number): AsyncIterableIterator<T>[];
+declare function tee<T>(source: AsyncIterable<T>, cap?: number, capBytes?: number): AsyncIterableIterator<T>[];
 //#endregion
 export { createResponseHandler, createStreamHandler, handleFile, handleSet, hget, hput, materializeSetHeaders, normalizeContentType, observeStream, parseSetCookies, responseToSetHeaders, streamResponse, tee };

package/dist/adapter/utils.js

@@ -3,6 +3,7 @@ const require_universal_constants = require('../universal/constants.js');
 const require_constants = require('../constants.js');
 const require_utils = require('../utils.js');
 const require_adapter_skip_clone = require('./skip-clone.js');
+const require_error = require('../error.js');
 const require_cookie_serialize = require('../cookie/serialize.js');
 const require_adapter_response_ownership = require('./response-ownership.js');
 const require_adapter_default_headers = require('./default-headers.js');
@@ -18,7 +19,7 @@ function hput(h, k, v, soft) {
 function materializeSetHeaders(set) {
 	const headers = set.headers;
 	if (headers["\0"] !== headers) return headers;
-	return set.headers = Object.assign(require_utils.nullObject(), headers);
+	return set.headers = Object.assign(new require_utils.EmptyObject(), headers);
 }
 const sseFormat = (data) => require_utils.sseData(data) + "\n";
 const identityFormat = (data) => data;
@@ -45,7 +46,7 @@ function handleFile(response, set, request, size = response.size) {
 			}
 			if (!match[1] && !match[2] || start >= size || start > end) return new Response(null, {
 				status: 416,
-				headers: mergeHeaders(new Headers({ "content-range": `bytes */${size}` }), set?.headers ?? require_utils.nullObject())
+				headers: mergeHeaders(new Headers({ "content-range": `bytes */${size}` }), set?.headers ?? new require_utils.EmptyObject())
 			});
 			const contentLength = end - start + 1;
 			const rangeHeaders = new Headers({
@@ -55,13 +56,13 @@ function handleFile(response, set, request, size = response.size) {
 			});
 			return new Response(response.slice(start, end + 1, response.type), {
 				status: 206,
-				headers: mergeHeaders(rangeHeaders, set?.headers ?? require_utils.nullObject())
+				headers: mergeHeaders(rangeHeaders, set?.headers ?? new require_utils.EmptyObject())
 			});
 		}
 	}
 	const body = "value" in response ? response.value : response;
 	const immutable = set && (set.status === 206 || set.status === 304 || set.status === 412 || set.status === 416);
-	const defaultHeader = immutable ? require_utils.nullObject() : { "accept-ranges": "bytes" };
+	const defaultHeader = immutable ? new require_utils.EmptyObject() : { "accept-ranges": "bytes" };
 	if (!immutable && size) defaultHeader["content-range"] = `bytes 0-${size - 1}/${size}`;
 	if (!set && !size) return new Response(body);
 	if (!set) return new Response(body, { headers: defaultHeader });
@@ -81,7 +82,7 @@ function handleFile(response, set, request, size = response.size) {
 function normalizeHeaders(set) {
 	const headers = set.headers;
 	if (!(headers instanceof Headers)) return;
-	const flat = Object.create(null);
+	const flat = new require_utils.EmptyObject();
 	for (const [key, value] of headers) if (key !== setCookie) flat[key] = value;
 	const cookies = headers.getSetCookie();
 	if (cookies.length) flat[setCookie] = cookies;
@@ -101,7 +102,7 @@ function responseToSetHeaders(response, set) {
 		else for (const [key, value] of response.headers.entries()) set.headers[key] = value;
 		if (set.status === void 0 || set.status === 200) set.status = response.status;
 	} else if (!response) return {
-		headers: require_utils.nullObject(),
+		headers: new require_utils.EmptyObject(),
 		status: set?.status ?? 200
 	};
 	else if (require_universal_constants.hasHeaderShorthand) set = {
@@ -110,7 +111,7 @@ function responseToSetHeaders(response, set) {
 	};
 	else {
 		set = {
-			headers: require_utils.nullObject(),
+			headers: new require_utils.EmptyObject(),
 			status: set?.status ?? 200
 		};
 		for (const [key, value] of response.headers.entries()) set.headers[key] = value;
@@ -118,6 +119,23 @@ function responseToSetHeaders(response, set) {
 	if (set.headers["content-encoding"]) delete set.headers["content-encoding"];
 	return set;
 }
+const describesFields = (schema) => schema?.type === "object" || schema?.type === "array" || !!schema?.allOf?.some(describesFields);
+const hasFields = (value) => Array.isArray(value) || Object.prototype.toString.call(value) === "[object Object]";
+const unwrapChunk = (chunk, value, typedSSE) => chunk.toSSE ? {
+	...chunk,
+	...value,
+	data: value.data
+} : typedSSE ? value.data : value;
+function cleanChunk(validator, chunk, typedSSE) {
+	const payload = chunk.toSSE ? { ...chunk } : typedSSE ? { data: chunk } : chunk;
+	if (validator.Clean) return hasFields(payload) || !describesFields(validator.schema) ? unwrapChunk(chunk, validator.Clean(payload), typedSSE) : chunk;
+	try {
+		const parsed = validator.From(payload, "response", true);
+		return parsed instanceof Promise ? parsed.then((value) => unwrapChunk(chunk, value, typedSSE), () => chunk) : unwrapChunk(chunk, parsed, typedSSE);
+	} catch {
+		return chunk;
+	}
+}
 function createStreamHandler({ mapResponse, mapCompactResponse }) {
 	return async (generator, set, request, skipFormat, owned = false) => {
 		if (request === null) return void 0;
@@ -130,6 +148,8 @@ function createStreamHandler({ mapResponse, mapCompactResponse }) {
 			}
 			return new Response(generator, { headers: { "content-type": "application/octet-stream" } });
 		}
+		const pickChunk = set?.["~chunk"];
+		if (pickChunk) set["~chunk"] = void 0;
 		const typedSSE = !skipFormat && "sse" in generator && generator.sse === true;
 		const sourceIterator = typeof generator.next === "function" ? generator : void 0;
 		let init = typedSSE ? void 0 : generator.next?.();
@@ -147,15 +167,30 @@ function createStreamHandler({ mapResponse, mapCompactResponse }) {
 		const yieldedStream = init?.value instanceof ReadableStream;
 		if (yieldedStream) generator = init.value;
 		else if (init && (typeof init?.done === "undefined" || init?.done)) {
-			if (set) return mapResponse(init.value, set, request, owned);
-			return mapCompactResponse(init.value, request, owned);
+			let value = init.value;
+			if (pickChunk) {
+				if (value instanceof Promise || typeof value?.then === "function") value = await value;
+				const wrapped = value instanceof require_error.ElysiaStatus;
+				const validator = pickChunk(wrapped ? value.status : set?.status ?? 200);
+				if (validator) {
+					let body = wrapped ? value.response : value;
+					if (body instanceof Promise || typeof body?.then === "function") body = await body;
+					if (typeof body?.next === "function") {
+						if (set) set["~chunk"] = pickChunk;
+					} else if (!(body instanceof Error) && !(body instanceof Response) && !(body instanceof ReadableStream)) body = await (validator.mayReturnPromise ? validator.From(body, "response", true) : validator.EncodeFrom(body, "response"));
+					if (wrapped) value.response = body;
+					else value = body;
+				}
+			}
+			if (set) return mapResponse(value, set, request, owned);
+			return mapCompactResponse(value, request, owned);
 		}
 		const isSSE = typedSSE || !skipFormat && (init?.value?.sse ?? generator?.sse ?? (set && hget(set.headers, "content-type")?.startsWith("text/event-stream")));
 		const format = isSSE ? sseFormat : identityFormat;
 		const contentType = isSSE ? "text/event-stream" : init?.value && typeof init?.value === "object" ? ArrayBuffer.isView(init.value) ? "application/octet-stream" : "application/json" : "text/plain";
 		set ??= {
 			status: 200,
-			headers: require_utils.nullObject()
+			headers: new require_utils.EmptyObject()
 		};
 		const headers = materializeSetHeaders(set);
 		if (!typedSSE) hput(headers, "transfer-encoding", "chunked", 1);
@@ -227,48 +262,48 @@ function createStreamHandler({ mapResponse, mapCompactResponse }) {
 				controller.enqueue(new Uint8Array(value.buffer, value.byteOffset, value.byteLength));
 				return;
 			}
-			if (typeof value === "object") try {
-				controller.enqueue(textEncoder.encode(format(JSON.stringify(value))));
-			} catch {
-				controller.enqueue(textEncoder.encode(format(value.toString())));
-			}
+			if (typeof value === "object") controller.enqueue(textEncoder.encode(format(JSON.stringify(value))));
 			else controller.enqueue(textEncoder.encode(format(value.toString())));
 		};
+		const validator = sourceStream ? void 0 : pickChunk?.(set.status ?? 200);
+		const enqueueChunk = validator?.Clean || validator?.mayReturnPromise ? (controller, value) => {
+			const cleaned = cleanChunk(validator, value, typedSSE);
+			return cleaned instanceof Promise && cleaned !== value ? cleaned.then((value) => enqueueValue(controller, value)) : enqueueValue(controller, cleaned);
+		} : enqueueValue;
+		let controller;
+		const fail = (error) => {
+			finalize("error", controller, error);
+		};
+		const step = (result) => {
+			while (true) {
+				if (result.done || end) {
+					finalize("close", controller);
+					return;
+				}
+				const chunk = result.value;
+				if (chunk !== void 0 && chunk !== null) return enqueueChunk(controller, chunk);
+				const next = iterator.next();
+				if (typeof next.then === "function") return Promise.resolve(next).then(step);
+				result = next;
+			}
+		};
 		return new Response(new ReadableStream({
-			start(controller) {
+			start(c) {
+				controller = c;
 				if (signal) {
 					onAbort = () => finalize("close", controller);
 					if (signal.aborted) onAbort();
 					else signal.addEventListener("abort", onAbort, { once: true });
 				}
 				if (!init || init.value instanceof ReadableStream || init.value === void 0 || init.value === null) return;
-				const fail = (error) => {
-					finalize("error", controller, error);
-				};
 				try {
-					return enqueueValue(controller, init.value)?.catch(fail);
+					return enqueueChunk(controller, init.value)?.catch(fail);
 				} catch (error) {
 					fail(error);
 				}
 			},
-			pull(controller) {
+			pull() {
 				if (end) return;
-				const fail = (error) => {
-					finalize("error", controller, error);
-				};
-				const step = (result) => {
-					while (true) {
-						if (result.done || end) {
-							finalize("close", controller);
-							return;
-						}
-						const chunk = result.value;
-						if (chunk !== void 0 && chunk !== null) return enqueueValue(controller, chunk);
-						const next = iterator.next();
-						if (typeof next.then === "function") return Promise.resolve(next).then(step);
-						result = next;
-					}
-				};
 				try {
 					const next = iterator.next();
 					return (typeof next.then === "function" ? Promise.resolve(next).then(step) : step(next))?.catch(fail);
@@ -290,8 +325,8 @@ function handleSet(set) {
 	if (typeof set.status === "string") set.status = require_constants.StatusMap[set.status];
 	if (set.headers instanceof Headers) normalizeHeaders(set);
 	const proto = Object.getPrototypeOf(set.headers);
-	if (proto !== null && proto !== Object.prototype) {
-		const flat = Object.create(null);
+	if (proto !== null && proto !== Object.prototype && proto !== require_utils.EmptyObject.prototype) {
+		const flat = new require_utils.EmptyObject();
 		for (const key of Object.keys(set.headers)) flat[key] = set.headers[key];
 		set.headers = flat;
 	}
@@ -420,20 +455,23 @@ function observeStream(source) {
 		value
 	];
 }
-function tee(source, branches = 2, cap = 64, capBytes = 1 << 22) {
+function tee(source, cap = 64, capBytes = 1 << 22) {
 	const iterator = source[Symbol.asyncIterator]?.() ?? source[Symbol.iterator]();
 	const buffer = [];
 	const sizes = [];
-	let base = 0;
 	let windowBytes = 0;
 	let done = false;
 	let stopped = false;
 	let failed = false;
 	let sourceError;
 	let drainResume = null;
-	const cursors = new Array(branches).fill(0);
-	let active = branches;
-	const pending = new Array(branches).fill(null);
+	let pending = null;
+	let finish;
+	const completed = new Promise((resolve, reject) => finish = {
+		resolve,
+		reject
+	});
+	completed.catch(() => {});
 	const resumeProducer = () => {
 		if (drainResume) {
 			const resume = drainResume;
@@ -441,119 +479,102 @@ function tee(source, branches = 2, cap = 64, capBytes = 1 << 22) {
 			resume();
 		}
 	};
-	const trim = () => {
-		if (active > 0) {
-			let min = Infinity;
-			for (const c of cursors) if (c < min) min = c;
-			const consumed = min - base;
-			if (min !== Infinity && consumed > 0) {
-				for (let i = 0; i < consumed; i++) windowBytes -= sizes[i];
-				buffer.splice(0, consumed);
-				sizes.splice(0, consumed);
-				base = min;
-			}
-		}
-		if (buffer.length < cap && windowBytes < capBytes) resumeProducer();
-	};
-	const closeBranch = (me) => {
-		if (cursors[me] === Infinity) return;
-		cursors[me] = Infinity;
-		active--;
-		if (me === 0 && !stopped) {
-			stopped = true;
-			done = true;
-			resumeProducer();
-			try {
-				const r = iterator.return?.();
-				if (r && typeof r.then === "function") r.catch(() => {});
-			} catch {}
-			wakeAll();
-		}
-		if (active === 0) {
-			buffer.length = 0;
-			sizes.length = 0;
-			windowBytes = 0;
-		} else trim();
-	};
-	const serve = (me, p) => {
-		const i = cursors[me];
-		if (i === Infinity) return p.resolve(doneResult);
-		if (i < base + buffer.length) {
-			const value = buffer[i - base];
-			cursors[me] = i + 1;
-			trim();
-			return p.resolve({
-				done: false,
-				value
-			});
-		}
-		if (failed) return p.reject(sourceError);
-		if (done) {
-			closeBranch(me);
-			return p.resolve(doneResult);
-		}
-		pending[me] = p;
-	};
-	const wakeAll = () => {
-		for (let b = 0; b < branches; b++) {
-			const p = pending[b];
-			if (!p) continue;
-			pending[b] = null;
-			serve(b, p);
-		}
+	const stop = (p) => {
+		pending = null;
+		p?.resolve(doneResult);
+		if (stopped) return;
+		stopped = done = true;
+		buffer.length = sizes.length = windowBytes = 0;
+		resumeProducer();
+		try {
+			const r = iterator.return?.();
+			if (r && typeof r.then === "function") r.catch(() => {});
+		} catch {}
+		finish.resolve(doneResult);
 	};
 	(async () => {
 		try {
 			while (!stopped) {
 				const result = await iterator.next();
 				if (result.done || stopped) break;
+				const p = pending;
+				if (p) {
+					pending = null;
+					p.resolve({
+						done: false,
+						value: result.value
+					});
+					continue;
+				}
 				buffer.push(result.value);
 				sizes.push(teeChunkCost(result.value));
 				windowBytes += sizes[sizes.length - 1];
-				wakeAll();
-				if ((buffer.length >= cap || windowBytes >= capBytes) && active > 0 && !stopped) await new Promise((resolve) => {
+				if ((buffer.length >= cap || windowBytes >= capBytes) && !stopped) await new Promise((resolve) => {
 					drainResume = resolve;
 				});
 			}
 		} catch (error) {
-			failed = true;
+			failed = !stopped;
 			sourceError = error;
 		} finally {
 			done = true;
-			wakeAll();
+			const p = pending;
+			pending = null;
+			if (failed) {
+				p?.reject(sourceError);
+				finish.reject(sourceError);
+			} else {
+				p?.resolve(doneResult);
+				finish.resolve(doneResult);
+			}
 		}
 	})();
-	const makeBranch = (me) => Object.assign(Object.create(null), {
+	const value = Object.assign(Object.create(null), {
 		[Symbol.asyncIterator]() {
 			return this;
 		},
-		next: () => new Promise((resolve, reject) => serve(me, {
-			resolve,
-			reject
-		})),
-		return: (value) => {
-			const p = pending[me];
-			if (p) {
-				pending[me] = null;
-				p.resolve(doneResult);
+		next: () => {
+			if (buffer.length) {
+				const value = buffer.shift();
+				windowBytes -= sizes.shift();
+				if (buffer.length < cap && windowBytes < capBytes) resumeProducer();
+				return Promise.resolve({
+					done: false,
+					value
+				});
 			}
-			closeBranch(me);
+			if (failed) return Promise.reject(sourceError);
+			if (done) return Promise.resolve(doneResult);
+			return new Promise((resolve, reject) => pending = {
+				resolve,
+				reject
+			});
+		},
+		return: (result) => {
+			stop(pending);
 			return Promise.resolve({
 				done: true,
-				value
+				value: result
 			});
 		},
 		throw: (error) => {
-			const p = pending[me];
-			if (p) {
-				pending[me] = null;
-				p.resolve(doneResult);
-			}
-			closeBranch(me);
+			stop(pending);
 			return Promise.reject(error);
 		}
 	});
-	return Array.from({ length: branches }, (_, b) => makeBranch(b));
+	const observer = Object.assign(Object.create(null), {
+		[Symbol.asyncIterator]() {
+			return this;
+		},
+		next: () => completed,
+		return: (result) => Promise.resolve({
+			done: true,
+			value: result
+		}),
+		throw: (error) => Promise.reject(error)
+	});
+	if (source.sse === true) value.sse = true;
+	return [value, observer];
 }
 
 //#endregion