@wooksjs/event-http 0.7.6 → 0.7.8

package/dist/index.cjs

@@ -28,9 +28,9 @@ const node_util = __toESM(require("node:util"));
 const node_zlib = __toESM(require("node:zlib"));
 const url = __toESM(require("url"));
 const http = __toESM(require("http"));
-const net = __toESM(require("net"));
-const wooks = __toESM(require("wooks"));
 const stream = __toESM(require("stream"));
+const wooks = __toESM(require("wooks"));
+const net = __toESM(require("net"));
 
 //#region packages/event-http/src/http-kind.ts
 /** Event kind definition for HTTP requests. Provides typed context slots for `req`, `response`, and `requestLimits`. */
@@ -1449,7 +1449,7 @@ function error_tl_default(ctx) {
 //#endregion
 //#region packages/event-http/src/response/wooks-http-response.ts
 let framework = {
-	version: "0.7.5",
+	version: "0.7.7",
 	poweredBy: "wooksjs",
 	link: "https://wooks.moost.org/",
 	image: "https://wooks.moost.org/wooks-full-logo.svg"
@@ -1673,14 +1673,9 @@ var WooksHttp = class extends wooks.WooksAdapterBase {
 			}, () => {
 				const ctx = (0, __wooksjs_event_core.current)();
 				const handlers = this.wooks.lookupHandlers(method, url$1, ctx);
-				if (handlers || notFoundHandler) {
-					const result = this.processHandlers(handlers || [notFoundHandler], ctx, response);
-					if (result !== null && result !== void 0 && typeof result.then === "function") result.catch((error) => {
-						this.logger.error("Internal error, please report", error);
-						this.respond(error, response, ctx);
-					});
-					return result;
-				} else if (onNoMatch) onNoMatch(req, res);
+				if (handlers) return this.processAndCatch(handlers, ctx, response);
+				else if (onNoMatch) onNoMatch(req, res);
+				else if (notFoundHandler) return this.processAndCatch([notFoundHandler], ctx, response);
 				else {
 					this.logger.debug(`404 Not found (${method})${url$1}`);
 					const error = new HttpError(404);
@@ -1742,6 +1737,15 @@ var WooksHttp = class extends wooks.WooksAdapterBase {
 			}
 		}
 	}
+	/** Runs handlers and attaches a `.catch()` for async results to avoid unhandled rejections. */
+	processAndCatch(handlers, ctx, response) {
+		const result = this.processHandlers(handlers, ctx, response);
+		if (result !== null && result !== void 0 && typeof result.then === "function") result.catch((error) => {
+			this.logger.error("Internal error, please report", error);
+			this.respond(error, response, ctx);
+		});
+		return result;
+	}
 	processHandlers(handlers, ctx, response) {
 		for (let i = 0; i < handlers.length; i++) {
 			const handler = handlers[i];
@@ -1812,24 +1816,32 @@ var WooksHttp = class extends wooks.WooksAdapterBase {
 		} catch {}
 		const fakeReq = createFakeIncomingMessage(request, pathname, callerReq, this.opts?.forwardHeaders);
 		const fakeRes = new http.ServerResponse(fakeReq);
-		const rawChunks = [];
-		const rawHeaders = {};
+		let rawChunks;
+		let rawHeaders;
 		let rawStatusCode = 0;
 		fakeRes.writeHead = (...args) => {
 			rawStatusCode = args[0];
-			for (const arg of args) if (typeof arg === "object" && arg !== null) for (const [k, v] of Object.entries(arg)) rawHeaders[k] = v;
+			for (const arg of args) if (typeof arg === "object" && arg !== null) {
+				if (!rawHeaders) rawHeaders = {};
+				for (const [k, v] of Object.entries(arg)) rawHeaders[k] = v;
+			}
 			return fakeRes;
 		};
-		fakeRes.write = (chunk, ...args) => {
-			if (chunk !== null && chunk !== void 0) rawChunks.push(typeof chunk === "string" ? buffer.Buffer.from(chunk) : chunk);
-			const cb = args.find((a) => typeof a === "function");
-			if (cb) cb();
+		fakeRes.write = (chunk, _encoding, cb) => {
+			if (chunk !== null && chunk !== void 0) {
+				if (!rawChunks) rawChunks = [];
+				rawChunks.push(typeof chunk === "string" ? buffer.Buffer.from(chunk) : chunk);
+			}
+			if (typeof cb === "function") cb();
 			return true;
 		};
-		fakeRes.end = (chunk, ...args) => {
-			if (chunk !== null && chunk !== void 0 && typeof chunk !== "function") rawChunks.push(typeof chunk === "string" ? buffer.Buffer.from(chunk) : chunk);
-			const cb = args.find((a) => typeof a === "function");
-			if (cb) cb();
+		fakeRes.end = (chunk, _encoding, cb) => {
+			if (chunk !== null && chunk !== void 0 && typeof chunk !== "function") {
+				if (!rawChunks) rawChunks = [];
+				rawChunks.push(typeof chunk === "string" ? buffer.Buffer.from(chunk) : chunk);
+			}
+			if (typeof chunk === "function") chunk();
+			else if (typeof cb === "function") cb();
 			return fakeRes;
 		};
 		const response = new this.ResponseClass(fakeRes, fakeReq, this.logger, this.opts?.defaultHeaders, true);
@@ -1837,7 +1849,6 @@ var WooksHttp = class extends wooks.WooksAdapterBase {
 		if (request.body) bodyBuffer = buffer.Buffer.from(await request.bytes());
 		const ctxOptions = this.eventContextOptions;
 		const requestLimits = this.opts?.requestLimits;
-		const notFoundHandler = this.opts?.onNotFound;
 		return createHttpContext(ctxOptions, {
 			req: fakeReq,
 			response,
@@ -1847,8 +1858,8 @@ var WooksHttp = class extends wooks.WooksAdapterBase {
 			if (bodyBuffer) ctx.set(rawBodySlot, Promise.resolve(bodyBuffer));
 			try {
 				const handlers = this.wooks.lookupHandlers(method, pathname, ctx);
-				if (handlers || notFoundHandler) {
-					const result = this.processHandlers(handlers || [notFoundHandler], ctx, response);
+				if (handlers) {
+					const result = this.processHandlers(handlers, ctx, response);
 					if (result !== null && result !== void 0 && typeof result.then === "function") await result.catch((error) => {
 						if (!response.responded) this.respond(error, response, ctx);
 					});
@@ -1860,11 +1871,11 @@ var WooksHttp = class extends wooks.WooksAdapterBase {
 				fakeRes.destroy();
 			}
 			let webResponse;
-			if (rawChunks.length > 0 || rawStatusCode > 0) {
-				const body = buffer.Buffer.concat(rawChunks);
-				webResponse = new Response(body.length > 0 ? body : null, {
+			if (rawChunks || rawStatusCode > 0) {
+				const body = rawChunks ? buffer.Buffer.concat(rawChunks) : null;
+				webResponse = new Response(body && body.length > 0 ? body : null, {
 					status: rawStatusCode || 200,
-					headers: recordToWebHeaders(rawHeaders)
+					headers: rawHeaders ? recordToWebHeaders(rawHeaders) : void 0
 				});
 			} else webResponse = response.toWebResponse();
 			if (callerReq) try {
@@ -1889,8 +1900,16 @@ var WooksHttp = class extends wooks.WooksAdapterBase {
 		return this.fetch(req);
 	}
 };
+var NoopSocket = class extends stream.Duplex {
+	remoteAddress = "127.0.0.1";
+	_read() {}
+	_write(_chunk, _enc, cb) {
+		cb();
+	}
+};
+const NOOP_SOCKET = new NoopSocket();
 function createFakeIncomingMessage(request, pathname, forwardFrom, forwardHeaders) {
-	const req = new http.IncomingMessage(new net.Socket({}));
+	const req = new http.IncomingMessage(NOOP_SOCKET);
 	req.method = request.method;
 	req.url = pathname;
 	const headers = {};
@@ -1901,9 +1920,7 @@ function createFakeIncomingMessage(request, pathname, forwardFrom, forwardHeader
 			if (typeof val === "string" && val) headers[h] = val;
 		}
 	}
-	request.headers.forEach((value, key) => {
-		headers[key] = value;
-	});
+	for (const [key, value] of request.headers) headers[key] = value;
 	req.headers = headers;
 	return req;
 }

package/dist/index.d.ts

@@ -610,6 +610,8 @@ declare class WooksHttp extends WooksAdapterBase {
      */
     getUpgradeCb(): (req: IncomingMessage, socket: Duplex, head: Buffer) => void;
     protected processUpgradeHandlers(handlers: TWooksHandler[], ctx: EventContext, socket: Duplex): void | Promise<unknown>;
+    /** Runs handlers and attaches a `.catch()` for async results to avoid unhandled rejections. */
+    private processAndCatch;
     protected processHandlers(handlers: TWooksHandler[], ctx: EventContext, response: HttpResponse): void | Promise<unknown>;
     private processAsyncResult;
     /**

package/dist/index.mjs

@@ -5,9 +5,9 @@ import { promisify } from "node:util";
 import { createBrotliCompress, createBrotliDecompress, createDeflate, createGunzip, createGzip, createInflate } from "node:zlib";
 import { URLSearchParams } from "url";
 import http, { IncomingMessage, ServerResponse } from "http";
-import { Socket } from "net";
+import { Duplex, Readable as Readable$1 } from "stream";
 import { WooksAdapterBase } from "wooks";
-import { Readable as Readable$1 } from "stream";
+import { Socket } from "net";
 
 //#region packages/event-http/src/http-kind.ts
 /** Event kind definition for HTTP requests. Provides typed context slots for `req`, `response`, and `requestLimits`. */
@@ -1426,7 +1426,7 @@ function error_tl_default(ctx) {
 //#endregion
 //#region packages/event-http/src/response/wooks-http-response.ts
 let framework = {
-	version: "0.7.5",
+	version: "0.7.7",
 	poweredBy: "wooksjs",
 	link: "https://wooks.moost.org/",
 	image: "https://wooks.moost.org/wooks-full-logo.svg"
@@ -1650,14 +1650,9 @@ var WooksHttp = class extends WooksAdapterBase {
 			}, () => {
 				const ctx = current();
 				const handlers = this.wooks.lookupHandlers(method, url, ctx);
-				if (handlers || notFoundHandler) {
-					const result = this.processHandlers(handlers || [notFoundHandler], ctx, response);
-					if (result !== null && result !== void 0 && typeof result.then === "function") result.catch((error) => {
-						this.logger.error("Internal error, please report", error);
-						this.respond(error, response, ctx);
-					});
-					return result;
-				} else if (onNoMatch) onNoMatch(req, res);
+				if (handlers) return this.processAndCatch(handlers, ctx, response);
+				else if (onNoMatch) onNoMatch(req, res);
+				else if (notFoundHandler) return this.processAndCatch([notFoundHandler], ctx, response);
 				else {
 					this.logger.debug(`404 Not found (${method})${url}`);
 					const error = new HttpError(404);
@@ -1719,6 +1714,15 @@ var WooksHttp = class extends WooksAdapterBase {
 			}
 		}
 	}
+	/** Runs handlers and attaches a `.catch()` for async results to avoid unhandled rejections. */
+	processAndCatch(handlers, ctx, response) {
+		const result = this.processHandlers(handlers, ctx, response);
+		if (result !== null && result !== void 0 && typeof result.then === "function") result.catch((error) => {
+			this.logger.error("Internal error, please report", error);
+			this.respond(error, response, ctx);
+		});
+		return result;
+	}
 	processHandlers(handlers, ctx, response) {
 		for (let i = 0; i < handlers.length; i++) {
 			const handler = handlers[i];
@@ -1789,24 +1793,32 @@ var WooksHttp = class extends WooksAdapterBase {
 		} catch {}
 		const fakeReq = createFakeIncomingMessage(request, pathname, callerReq, this.opts?.forwardHeaders);
 		const fakeRes = new ServerResponse(fakeReq);
-		const rawChunks = [];
-		const rawHeaders = {};
+		let rawChunks;
+		let rawHeaders;
 		let rawStatusCode = 0;
 		fakeRes.writeHead = (...args) => {
 			rawStatusCode = args[0];
-			for (const arg of args) if (typeof arg === "object" && arg !== null) for (const [k, v] of Object.entries(arg)) rawHeaders[k] = v;
+			for (const arg of args) if (typeof arg === "object" && arg !== null) {
+				if (!rawHeaders) rawHeaders = {};
+				for (const [k, v] of Object.entries(arg)) rawHeaders[k] = v;
+			}
 			return fakeRes;
 		};
-		fakeRes.write = (chunk, ...args) => {
-			if (chunk !== null && chunk !== void 0) rawChunks.push(typeof chunk === "string" ? Buffer$1.from(chunk) : chunk);
-			const cb = args.find((a) => typeof a === "function");
-			if (cb) cb();
+		fakeRes.write = (chunk, _encoding, cb) => {
+			if (chunk !== null && chunk !== void 0) {
+				if (!rawChunks) rawChunks = [];
+				rawChunks.push(typeof chunk === "string" ? Buffer$1.from(chunk) : chunk);
+			}
+			if (typeof cb === "function") cb();
 			return true;
 		};
-		fakeRes.end = (chunk, ...args) => {
-			if (chunk !== null && chunk !== void 0 && typeof chunk !== "function") rawChunks.push(typeof chunk === "string" ? Buffer$1.from(chunk) : chunk);
-			const cb = args.find((a) => typeof a === "function");
-			if (cb) cb();
+		fakeRes.end = (chunk, _encoding, cb) => {
+			if (chunk !== null && chunk !== void 0 && typeof chunk !== "function") {
+				if (!rawChunks) rawChunks = [];
+				rawChunks.push(typeof chunk === "string" ? Buffer$1.from(chunk) : chunk);
+			}
+			if (typeof chunk === "function") chunk();
+			else if (typeof cb === "function") cb();
 			return fakeRes;
 		};
 		const response = new this.ResponseClass(fakeRes, fakeReq, this.logger, this.opts?.defaultHeaders, true);
@@ -1814,7 +1826,6 @@ var WooksHttp = class extends WooksAdapterBase {
 		if (request.body) bodyBuffer = Buffer$1.from(await request.bytes());
 		const ctxOptions = this.eventContextOptions;
 		const requestLimits = this.opts?.requestLimits;
-		const notFoundHandler = this.opts?.onNotFound;
 		return createHttpContext(ctxOptions, {
 			req: fakeReq,
 			response,
@@ -1824,8 +1835,8 @@ var WooksHttp = class extends WooksAdapterBase {
 			if (bodyBuffer) ctx.set(rawBodySlot, Promise.resolve(bodyBuffer));
 			try {
 				const handlers = this.wooks.lookupHandlers(method, pathname, ctx);
-				if (handlers || notFoundHandler) {
-					const result = this.processHandlers(handlers || [notFoundHandler], ctx, response);
+				if (handlers) {
+					const result = this.processHandlers(handlers, ctx, response);
 					if (result !== null && result !== void 0 && typeof result.then === "function") await result.catch((error) => {
 						if (!response.responded) this.respond(error, response, ctx);
 					});
@@ -1837,11 +1848,11 @@ var WooksHttp = class extends WooksAdapterBase {
 				fakeRes.destroy();
 			}
 			let webResponse;
-			if (rawChunks.length > 0 || rawStatusCode > 0) {
-				const body = Buffer$1.concat(rawChunks);
-				webResponse = new Response(body.length > 0 ? body : null, {
+			if (rawChunks || rawStatusCode > 0) {
+				const body = rawChunks ? Buffer$1.concat(rawChunks) : null;
+				webResponse = new Response(body && body.length > 0 ? body : null, {
 					status: rawStatusCode || 200,
-					headers: recordToWebHeaders(rawHeaders)
+					headers: rawHeaders ? recordToWebHeaders(rawHeaders) : void 0
 				});
 			} else webResponse = response.toWebResponse();
 			if (callerReq) try {
@@ -1866,8 +1877,16 @@ var WooksHttp = class extends WooksAdapterBase {
 		return this.fetch(req);
 	}
 };
+var NoopSocket = class extends Duplex {
+	remoteAddress = "127.0.0.1";
+	_read() {}
+	_write(_chunk, _enc, cb) {
+		cb();
+	}
+};
+const NOOP_SOCKET = new NoopSocket();
 function createFakeIncomingMessage(request, pathname, forwardFrom, forwardHeaders) {
-	const req = new IncomingMessage(new Socket({}));
+	const req = new IncomingMessage(NOOP_SOCKET);
 	req.method = request.method;
 	req.url = pathname;
 	const headers = {};
@@ -1878,9 +1897,7 @@ function createFakeIncomingMessage(request, pathname, forwardFrom, forwardHeader
 			if (typeof val === "string" && val) headers[h] = val;
 		}
 	}
-	request.headers.forEach((value, key) => {
-		headers[key] = value;
-	});
+	for (const [key, value] of request.headers) headers[key] = value;
 	req.headers = headers;
 	return req;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wooksjs/event-http",
-  "version": "0.7.6",
+  "version": "0.7.8",
   "description": "@wooksjs/event-http",
   "keywords": [
     "api",
@@ -47,14 +47,14 @@
   "devDependencies": {
     "typescript": "^5.9.3",
     "vitest": "^3.2.4",
-    "@wooksjs/event-core": "^0.7.6",
-    "wooks": "^0.7.6"
+    "@wooksjs/event-core": "^0.7.8",
+    "wooks": "^0.7.8"
   },
   "peerDependencies": {
     "@prostojs/logger": "^0.4.3",
     "@prostojs/router": "^0.3.3",
-    "@wooksjs/event-core": "^0.7.6",
-    "wooks": "^0.7.6"
+    "@wooksjs/event-core": "^0.7.8",
+    "wooks": "^0.7.8"
   },
   "scripts": {
     "build": "rolldown -c ../../rolldown.config.mjs",