@wooksjs/event-http 0.6.4 → 0.6.6

package/dist/index.cjs

@@ -697,7 +697,7 @@ function error_tl_default(ctx) {
 //#endregion
 //#region packages/event-http/src/errors/error-renderer.ts
 let framework = {
-	version: "0.6.3",
+	version: "0.6.5",
 	poweredBy: `wooksjs`,
 	link: `https://wooks.moost.org/`,
 	image: `https://wooks.moost.org/wooks-full-logo.png`
@@ -750,14 +750,8 @@ var HttpErrorRenderer = class extends BaseHttpResponseRenderer {
 		}, null, "  ")}` : ""}`;
 	}
 	renderJson(response) {
-		const data = response.body || {};
 		response.setContentType("application/json");
-		const keys = Object.keys(data).filter((key) => ![
-			"statusCode",
-			"error",
-			"message"
-		].includes(key));
-		return `{"statusCode":${escapeQuotes(data.statusCode)},"error":"${escapeQuotes(data.error)}","message":"${escapeQuotes(data.message)}"${keys.length > 0 ? `,${keys.map((k) => `"${escapeQuotes(k)}":${JSON.stringify(data[k])}`).join(",")}` : ""}}`;
+		return JSON.stringify(response.body || {});
 	}
 	render(response) {
 		const { acceptsJson, acceptsText, acceptsHtml } = useAccept();
@@ -768,9 +762,6 @@ var HttpErrorRenderer = class extends BaseHttpResponseRenderer {
 		else return this.renderJson(response);
 	}
 };
-function escapeQuotes(s) {
-	return (typeof s === "number" ? s : s || "").toString().replace(/"/gu, "\\\"");
-}
 
 //#endregion
 //#region packages/event-http/src/errors/http-error.ts
@@ -1009,6 +1000,15 @@ function useSetHeader(name) {
 
 //#endregion
 //#region packages/event-http/src/composables/cookies.ts
+const cookieRegExpCache = /* @__PURE__ */ new Map();
+function getCookieRegExp(name) {
+	let re = cookieRegExpCache.get(name);
+	if (!re) {
+		re = new RegExp(`(?:^|; )${escapeRegex(name)}=(.*?)(?:;?$|; )`, "i");
+		cookieRegExpCache.set(name, re);
+	}
+	return re;
+}
 /**
 * Provides access to parsed request cookies.
 * @example
@@ -1023,7 +1023,7 @@ function useCookies() {
 	const { init } = store("cookies");
 	const getCookie = (name) => init(name, () => {
 		if (cookie) {
-			const result = new RegExp(`(?:^|; )${escapeRegex(name)}=(.*?)(?:;?$|; )`, "i").exec(cookie);
+			const result = getCookieRegExp(name).exec(cookie);
 			return result?.[1] ? safeDecodeURIComponent(result[1]) : null;
 		} else return null;
 	});
@@ -1043,7 +1043,9 @@ function useSetCookies() {
 		});
 	}
 	function cookies() {
-		return cookiesStore.entries().filter((a) => !!a[1]).map(([key, value]) => renderCookie(key, value));
+		const entries = cookiesStore.entries();
+		if (entries.length === 0) return [];
+		return entries.filter((a) => !!a[1]).map(([key, value]) => renderCookie(key, value));
 	}
 	return {
 		setCookie,
@@ -1367,12 +1369,10 @@ var BaseHttpResponse = class {
 		const { cookies, removeCookie } = useSetCookies();
 		const newCookies = this._headers["set-cookie"] || [];
 		for (const cookie of newCookies) removeCookie(cookie.slice(0, cookie.indexOf("=")));
-		this._headers = {
-			...headers(),
-			...this._headers
-		};
-		const setCookie = [...newCookies, ...cookies()];
-		if (setCookie.length > 0) this._headers["set-cookie"] = setCookie;
+		const composableHeaders = headers();
+		for (const key in composableHeaders) if (!(key in this._headers)) this._headers[key] = composableHeaders[key];
+		const renderedCookies = cookies();
+		if (newCookies.length > 0 || renderedCookies.length > 0) this._headers["set-cookie"] = newCookies.length > 0 && renderedCookies.length > 0 ? [...newCookies, ...renderedCookies] : newCookies.length > 0 ? newCookies : renderedCookies;
 		return this;
 	}
 	mergeStatus(renderedBody) {
@@ -1400,7 +1400,7 @@ var BaseHttpResponse = class {
 		const res = rawResponse();
 		if (this.body instanceof stream.Readable) {
 			const stream$1 = this.body;
-			this.mergeStatus("ok");
+			this.mergeStatus(true);
 			res.writeHead(this.status, { ...this._headers });
 			rawRequest.once("close", () => {
 				stream$1.destroy();
@@ -1422,32 +1422,37 @@ var BaseHttpResponse = class {
 			});
 		} else if (globalThis.Response && this.body instanceof Response) {
 			this.mergeFetchStatus(this.body.status);
+			const additionalHeaders = {};
+			const fetchContentLength = this.body.headers.get("content-length");
+			if (fetchContentLength) additionalHeaders["content-length"] = fetchContentLength;
+			const fetchContentType = this.body.headers.get("content-type");
+			if (fetchContentType) additionalHeaders["content-type"] = fetchContentType;
+			res.writeHead(this.status, {
+				...this._headers,
+				...additionalHeaders
+			});
 			if (method === "HEAD") res.end();
-			else {
-				const additionalHeaders = {};
-				if (this.body.headers.get("content-length")) additionalHeaders["content-length"] = this.body.headers.get("content-length");
-				if (this.body.headers.get("content-type")) additionalHeaders["content-type"] = this.body.headers.get("content-type");
-				res.writeHead(this.status, {
-					...additionalHeaders,
-					...this._headers
-				});
-				await respondWithFetch(this.body.body, res);
-			}
+			else await respondWithFetch(this.body.body, res, logger);
 		} else {
 			const renderedBody = this.renderer.render(this);
 			this.mergeStatus(renderedBody);
-			res.writeHead(this.status, {
-				"content-length": Buffer.byteLength(renderedBody),
-				...this._headers
-			}).end(method === "HEAD" ? "" : renderedBody);
+			const contentLength = typeof renderedBody === "string" ? Buffer.byteLength(renderedBody) : renderedBody.byteLength;
+			return new Promise((resolve) => {
+				res.writeHead(this.status, {
+					"content-length": contentLength,
+					...this._headers
+				}).end(method === "HEAD" ? "" : renderedBody, resolve);
+			});
 		}
 	}
 };
-async function respondWithFetch(fetchBody, res) {
+async function respondWithFetch(fetchBody, res, logger) {
 	if (fetchBody) try {
 		for await (const chunk of fetchBody) res.write(chunk);
-	} catch {}
-	res.end();
+	} catch (error) {
+		logger.error("Error streaming fetch response body", error);
+	}
+	if (!res.writableEnded) res.end();
 }
 
 //#endregion
@@ -1477,10 +1482,12 @@ function createWooksResponder(renderer = new BaseHttpResponseRenderer(), errorRe
 /** HTTP adapter for Wooks that provides route registration, server lifecycle, and request handling. */
 var WooksHttp = class extends wooks.WooksAdapterBase {
 	logger;
+	_cachedEventOptions;
 	constructor(opts, wooks$1) {
 		super(wooks$1, opts?.logger, opts?.router);
 		this.opts = opts;
 		this.logger = opts?.logger || this.getLogger(`[wooks-http]`);
+		this._cachedEventOptions = this.mergeEventOptions(opts?.eventOptions);
 	}
 	/** Registers a handler for all HTTP methods on the given path. */
 	all(path, handler) {
@@ -1568,7 +1575,7 @@ var WooksHttp = class extends wooks.WooksAdapterBase {
 	}
 	responder = createWooksResponder();
 	respond(data) {
-		this.responder.respond(data)?.catch((error) => {
+		return this.responder.respond(data)?.catch((error) => {
 			this.logger.error("Uncaught response exception", error);
 		});
 	}
@@ -1590,20 +1597,23 @@ var WooksHttp = class extends wooks.WooksAdapterBase {
 				req,
 				res,
 				requestLimits: this.opts?.requestLimits
-			}, this.mergeEventOptions(this.opts?.eventOptions));
+			}, this._cachedEventOptions);
+			const method = req.method || "";
+			const url$1 = req.url || "";
 			runInContext(async () => {
-				const { handlers } = this.wooks.lookup(req.method, req.url);
-				if (handlers || this.opts?.onNotFound) try {
-					return await this.processHandlers(handlers || [this.opts?.onNotFound]);
+				const notFoundHandler = this.opts?.onNotFound;
+				const { handlers } = this.wooks.lookup(method, url$1);
+				if (handlers || notFoundHandler) try {
+					return await this.processHandlers(handlers || [notFoundHandler]);
 				} catch (error) {
 					this.logger.error("Internal error, please report", error);
-					this.respond(error);
+					await this.respond(error);
 					return error;
 				}
 				else {
-					this.logger.debug(`404 Not found (${req.method})${req.url}`);
+					this.logger.debug(`404 Not found (${method})${url$1}`);
 					const error = new HttpError(404);
-					this.respond(error);
+					await this.respond(error);
 					return error;
 				}
 			});
@@ -1611,17 +1621,18 @@ var WooksHttp = class extends wooks.WooksAdapterBase {
 	}
 	async processHandlers(handlers) {
 		const { store } = useHttpContext();
-		for (const [i, handler] of handlers.entries()) {
-			const isLastHandler = handlers.length === i + 1;
+		for (let i = 0; i < handlers.length; i++) {
+			const handler = handlers[i];
+			const isLastHandler = i === handlers.length - 1;
 			try {
 				const promise = handler();
 				const result = await promise;
-				this.respond(result);
+				await this.respond(result);
 				return result;
 			} catch (error) {
 				if (error instanceof HttpError) {} else this.logger.error(`Uncaught route handler exception: ${store("event").get("req")?.url || ""}`, error);
 				if (isLastHandler) {
-					this.respond(error);
+					await this.respond(error);
 					return error;
 				}
 			}

package/dist/index.d.ts

@@ -445,7 +445,7 @@ declare class BaseHttpResponse<BodyType = unknown> {
     setHeader(name: string, value: string): this;
     getHeader(name: string): string | string[];
     protected mergeHeaders(): this;
-    protected mergeStatus(renderedBody: string | Uint8Array): this;
+    protected mergeStatus(renderedBody: string | Uint8Array | boolean): this;
     protected mergeFetchStatus(fetchStatus: number): void;
     protected panic(text: string, logger: TConsoleBase): void;
     respond(): Promise<unknown>;
@@ -506,7 +506,7 @@ declare class HttpErrorRenderer extends BaseHttpResponseRenderer<TWooksErrorBody
 }
 
 /** Creates an async event context for an incoming HTTP request/response pair. */
-declare function createHttpContext(data: THttpEventData, options: TEventOptions): <T>(cb: (...a: any[]) => T) => T;
+declare function createHttpContext(data: THttpEventData, options: TEventOptions): <T>(cb: (...a: unknown[]) => T) => T;
 /**
  * Wrapper on useEventContext with HTTP event types
  * @returns set of hooks { getCtx, restoreCtx, clearCtx, hookStore, getStore, setStore }
@@ -531,6 +531,7 @@ interface TWooksHttpOptions {
 declare class WooksHttp extends WooksAdapterBase {
     protected opts?: TWooksHttpOptions | undefined;
     protected logger: TConsoleBase;
+    protected _cachedEventOptions: TEventOptions;
     constructor(opts?: TWooksHttpOptions | undefined, wooks?: Wooks | WooksAdapterBase);
     /** Registers a handler for all HTTP methods on the given path. */
     all<ResType = unknown, ParamsType = Record<string, string | string[]>>(path: string, handler: TWooksHandler<ResType>): wooks.TProstoRouterPathHandle<ParamsType>;
@@ -561,8 +562,8 @@ declare class WooksHttp extends WooksAdapterBase {
     listen(path: string, backlog?: number, listeningListener?: () => void): Promise<void>;
     listen(path: string, listeningListener?: () => void): Promise<void>;
     listen(options: ListenOptions, listeningListener?: () => void): Promise<void>;
-    listen(handle: any, backlog?: number, listeningListener?: () => void): Promise<void>;
-    listen(handle: any, listeningListener?: () => void): Promise<void>;
+    listen(handle: unknown, backlog?: number, listeningListener?: () => void): Promise<void>;
+    listen(handle: unknown, listeningListener?: () => void): Promise<void>;
     /**
      * Stops the server if it was attached or passed via argument
      * @param server
@@ -587,7 +588,7 @@ declare class WooksHttp extends WooksAdapterBase {
         createResponse: <T = unknown>(data: T) => BaseHttpResponse<T | TWooksErrorBodyExt> | null;
         respond: (data: unknown) => Promise<unknown> | undefined;
     };
-    protected respond(data: unknown): void;
+    protected respond(data: unknown): Promise<unknown> | undefined;
     /**
      * Returns server callback function
      * that can be passed to any node server:

package/dist/index.mjs

@@ -674,7 +674,7 @@ function error_tl_default(ctx) {
 //#endregion
 //#region packages/event-http/src/errors/error-renderer.ts
 let framework = {
-	version: "0.6.3",
+	version: "0.6.5",
 	poweredBy: `wooksjs`,
 	link: `https://wooks.moost.org/`,
 	image: `https://wooks.moost.org/wooks-full-logo.png`
@@ -727,14 +727,8 @@ var HttpErrorRenderer = class extends BaseHttpResponseRenderer {
 		}, null, "  ")}` : ""}`;
 	}
 	renderJson(response) {
-		const data = response.body || {};
 		response.setContentType("application/json");
-		const keys = Object.keys(data).filter((key) => ![
-			"statusCode",
-			"error",
-			"message"
-		].includes(key));
-		return `{"statusCode":${escapeQuotes(data.statusCode)},"error":"${escapeQuotes(data.error)}","message":"${escapeQuotes(data.message)}"${keys.length > 0 ? `,${keys.map((k) => `"${escapeQuotes(k)}":${JSON.stringify(data[k])}`).join(",")}` : ""}}`;
+		return JSON.stringify(response.body || {});
 	}
 	render(response) {
 		const { acceptsJson, acceptsText, acceptsHtml } = useAccept();
@@ -745,9 +739,6 @@ var HttpErrorRenderer = class extends BaseHttpResponseRenderer {
 		else return this.renderJson(response);
 	}
 };
-function escapeQuotes(s) {
-	return (typeof s === "number" ? s : s || "").toString().replace(/"/gu, "\\\"");
-}
 
 //#endregion
 //#region packages/event-http/src/errors/http-error.ts
@@ -986,6 +977,15 @@ function useSetHeader(name) {
 
 //#endregion
 //#region packages/event-http/src/composables/cookies.ts
+const cookieRegExpCache = /* @__PURE__ */ new Map();
+function getCookieRegExp(name) {
+	let re = cookieRegExpCache.get(name);
+	if (!re) {
+		re = new RegExp(`(?:^|; )${escapeRegex(name)}=(.*?)(?:;?$|; )`, "i");
+		cookieRegExpCache.set(name, re);
+	}
+	return re;
+}
 /**
 * Provides access to parsed request cookies.
 * @example
@@ -1000,7 +1000,7 @@ function useCookies() {
 	const { init } = store("cookies");
 	const getCookie = (name) => init(name, () => {
 		if (cookie) {
-			const result = new RegExp(`(?:^|; )${escapeRegex(name)}=(.*?)(?:;?$|; )`, "i").exec(cookie);
+			const result = getCookieRegExp(name).exec(cookie);
 			return result?.[1] ? safeDecodeURIComponent(result[1]) : null;
 		} else return null;
 	});
@@ -1020,7 +1020,9 @@ function useSetCookies() {
 		});
 	}
 	function cookies() {
-		return cookiesStore.entries().filter((a) => !!a[1]).map(([key, value]) => renderCookie(key, value));
+		const entries = cookiesStore.entries();
+		if (entries.length === 0) return [];
+		return entries.filter((a) => !!a[1]).map(([key, value]) => renderCookie(key, value));
 	}
 	return {
 		setCookie,
@@ -1344,12 +1346,10 @@ var BaseHttpResponse = class {
 		const { cookies, removeCookie } = useSetCookies();
 		const newCookies = this._headers["set-cookie"] || [];
 		for (const cookie of newCookies) removeCookie(cookie.slice(0, cookie.indexOf("=")));
-		this._headers = {
-			...headers(),
-			...this._headers
-		};
-		const setCookie = [...newCookies, ...cookies()];
-		if (setCookie.length > 0) this._headers["set-cookie"] = setCookie;
+		const composableHeaders = headers();
+		for (const key in composableHeaders) if (!(key in this._headers)) this._headers[key] = composableHeaders[key];
+		const renderedCookies = cookies();
+		if (newCookies.length > 0 || renderedCookies.length > 0) this._headers["set-cookie"] = newCookies.length > 0 && renderedCookies.length > 0 ? [...newCookies, ...renderedCookies] : newCookies.length > 0 ? newCookies : renderedCookies;
 		return this;
 	}
 	mergeStatus(renderedBody) {
@@ -1377,7 +1377,7 @@ var BaseHttpResponse = class {
 		const res = rawResponse();
 		if (this.body instanceof Readable$1) {
 			const stream = this.body;
-			this.mergeStatus("ok");
+			this.mergeStatus(true);
 			res.writeHead(this.status, { ...this._headers });
 			rawRequest.once("close", () => {
 				stream.destroy();
@@ -1399,32 +1399,37 @@ var BaseHttpResponse = class {
 			});
 		} else if (globalThis.Response && this.body instanceof Response) {
 			this.mergeFetchStatus(this.body.status);
+			const additionalHeaders = {};
+			const fetchContentLength = this.body.headers.get("content-length");
+			if (fetchContentLength) additionalHeaders["content-length"] = fetchContentLength;
+			const fetchContentType = this.body.headers.get("content-type");
+			if (fetchContentType) additionalHeaders["content-type"] = fetchContentType;
+			res.writeHead(this.status, {
+				...this._headers,
+				...additionalHeaders
+			});
 			if (method === "HEAD") res.end();
-			else {
-				const additionalHeaders = {};
-				if (this.body.headers.get("content-length")) additionalHeaders["content-length"] = this.body.headers.get("content-length");
-				if (this.body.headers.get("content-type")) additionalHeaders["content-type"] = this.body.headers.get("content-type");
-				res.writeHead(this.status, {
-					...additionalHeaders,
-					...this._headers
-				});
-				await respondWithFetch(this.body.body, res);
-			}
+			else await respondWithFetch(this.body.body, res, logger);
 		} else {
 			const renderedBody = this.renderer.render(this);
 			this.mergeStatus(renderedBody);
-			res.writeHead(this.status, {
-				"content-length": Buffer.byteLength(renderedBody),
-				...this._headers
-			}).end(method === "HEAD" ? "" : renderedBody);
+			const contentLength = typeof renderedBody === "string" ? Buffer.byteLength(renderedBody) : renderedBody.byteLength;
+			return new Promise((resolve) => {
+				res.writeHead(this.status, {
+					"content-length": contentLength,
+					...this._headers
+				}).end(method === "HEAD" ? "" : renderedBody, resolve);
+			});
 		}
 	}
 };
-async function respondWithFetch(fetchBody, res) {
+async function respondWithFetch(fetchBody, res, logger) {
 	if (fetchBody) try {
 		for await (const chunk of fetchBody) res.write(chunk);
-	} catch {}
-	res.end();
+	} catch (error) {
+		logger.error("Error streaming fetch response body", error);
+	}
+	if (!res.writableEnded) res.end();
 }
 
 //#endregion
@@ -1454,10 +1459,12 @@ function createWooksResponder(renderer = new BaseHttpResponseRenderer(), errorRe
 /** HTTP adapter for Wooks that provides route registration, server lifecycle, and request handling. */
 var WooksHttp = class extends WooksAdapterBase {
 	logger;
+	_cachedEventOptions;
 	constructor(opts, wooks) {
 		super(wooks, opts?.logger, opts?.router);
 		this.opts = opts;
 		this.logger = opts?.logger || this.getLogger(`[wooks-http]`);
+		this._cachedEventOptions = this.mergeEventOptions(opts?.eventOptions);
 	}
 	/** Registers a handler for all HTTP methods on the given path. */
 	all(path, handler) {
@@ -1545,7 +1552,7 @@ var WooksHttp = class extends WooksAdapterBase {
 	}
 	responder = createWooksResponder();
 	respond(data) {
-		this.responder.respond(data)?.catch((error) => {
+		return this.responder.respond(data)?.catch((error) => {
 			this.logger.error("Uncaught response exception", error);
 		});
 	}
@@ -1567,20 +1574,23 @@ var WooksHttp = class extends WooksAdapterBase {
 				req,
 				res,
 				requestLimits: this.opts?.requestLimits
-			}, this.mergeEventOptions(this.opts?.eventOptions));
+			}, this._cachedEventOptions);
+			const method = req.method || "";
+			const url = req.url || "";
 			runInContext(async () => {
-				const { handlers } = this.wooks.lookup(req.method, req.url);
-				if (handlers || this.opts?.onNotFound) try {
-					return await this.processHandlers(handlers || [this.opts?.onNotFound]);
+				const notFoundHandler = this.opts?.onNotFound;
+				const { handlers } = this.wooks.lookup(method, url);
+				if (handlers || notFoundHandler) try {
+					return await this.processHandlers(handlers || [notFoundHandler]);
 				} catch (error) {
 					this.logger.error("Internal error, please report", error);
-					this.respond(error);
+					await this.respond(error);
 					return error;
 				}
 				else {
-					this.logger.debug(`404 Not found (${req.method})${req.url}`);
+					this.logger.debug(`404 Not found (${method})${url}`);
 					const error = new HttpError(404);
-					this.respond(error);
+					await this.respond(error);
 					return error;
 				}
 			});
@@ -1588,17 +1598,18 @@ var WooksHttp = class extends WooksAdapterBase {
 	}
 	async processHandlers(handlers) {
 		const { store } = useHttpContext();
-		for (const [i, handler] of handlers.entries()) {
-			const isLastHandler = handlers.length === i + 1;
+		for (let i = 0; i < handlers.length; i++) {
+			const handler = handlers[i];
+			const isLastHandler = i === handlers.length - 1;
 			try {
 				const promise = handler();
 				const result = await promise;
-				this.respond(result);
+				await this.respond(result);
 				return result;
 			} catch (error) {
 				if (error instanceof HttpError) {} else this.logger.error(`Uncaught route handler exception: ${store("event").get("req")?.url || ""}`, error);
 				if (isLastHandler) {
-					this.respond(error);
+					await this.respond(error);
 					return error;
 				}
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wooksjs/event-http",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "@wooksjs/event-http",
   "keywords": [
     "api",
@@ -47,18 +47,17 @@
   "devDependencies": {
     "typescript": "^5.9.3",
     "vitest": "^3.2.4",
-    "@wooksjs/event-core": "^0.6.4",
-    "wooks": "^0.6.4"
+    "@wooksjs/event-core": "^0.6.6",
+    "wooks": "^0.6.6"
   },
   "peerDependencies": {
     "@prostojs/logger": "^0.4.3",
-    "@prostojs/router": "^0.2.1",
-    "@wooksjs/event-core": "^0.6.4",
-    "wooks": "^0.6.4"
+    "@prostojs/router": "^0.3.1",
+    "@wooksjs/event-core": "^0.6.6",
+    "wooks": "^0.6.6"
   },
   "scripts": {
     "build": "rolldown -c ../../rolldown.config.mjs",
-    "postinstall": "node scripts/setup-skills.js",
     "setup-skills": "node scripts/setup-skills.js"
   }
 }