@wooksjs/event-http 0.7.19 → 0.7.21

package/dist/index.cjs

@@ -876,6 +876,21 @@ var HttpResponse = class {
 		this._hasCookies = true;
 		return this;
 	}
+	/**
+	* Renders all buffered cookies (named via `setCookie()`, then raw via `setCookieRaw()`)
+	* as `Set-Cookie` header strings, without responding.
+	*
+	* Non-destructive: the buffers stay intact, so a later `send()` still emits the same
+	* cookies — callers that drain cookies onto the wire themselves should not also send
+	* through this wrapper. Cookies placed directly into headers (via `setHeader('set-cookie', …)`
+	* or default headers) are not included.
+	*/
+	getSetCookieStrings() {
+		const rendered = [];
+		for (const [name, data] of Object.entries(this._cookies)) if (data) rendered.push(renderCookie(name, data));
+		rendered.push(...this._rawCookies);
+		return rendered;
+	}
 	/** Sets the `Cache-Control` header from a directive object (chainable). */
 	setCacheControl(data) {
 		this._headers["cache-control"] = renderCacheControl(data);
@@ -927,9 +942,7 @@ var HttpResponse = class {
 		}
 		if (hasFetchResponse && body instanceof globalThis.Response) {
 			this._status = this._status || body.status;
-			body.headers.forEach((v, k) => {
-				if (!this._headers[k]) this._headers[k] = v;
-			});
+			this.mergeFetchResponseHeaders(body);
 			return new globalThis.Response(method === "HEAD" ? null : body.body, {
 				status: this._status,
 				headers: this._buildWebHeaders()
@@ -956,6 +969,21 @@ var HttpResponse = class {
 	_buildWebHeaders() {
 		return recordToWebHeaders(this._headers);
 	}
+	/**
+	* Merges headers from a handler-returned fetch `Response` into the buffered headers.
+	* Explicitly buffered headers win. `set-cookie` is appended in array form so multiple
+	* cookies survive (`Headers` iteration would otherwise keep only the first).
+	*/
+	mergeFetchResponseHeaders(fetchResponse) {
+		fetchResponse.headers.forEach((value, key) => {
+			if (key !== "set-cookie" && !this._headers[key]) this._headers[key] = value;
+		});
+		const setCookies = typeof fetchResponse.headers.getSetCookie === "function" ? fetchResponse.headers.getSetCookie() : [];
+		if (setCookies.length > 0) {
+			const existing = this._headers["set-cookie"];
+			this._headers["set-cookie"] = existing ? [...Array.isArray(existing) ? existing : [existing], ...setCookies] : setCookies;
+		}
+	}
 	renderBody() {
 		const body = this._body;
 		if (body === void 0 || body === null) return "";
@@ -1013,10 +1041,7 @@ var HttpResponse = class {
 	}
 	finalizeCookies() {
 		if (!this._hasCookies) return;
-		const entries = Object.entries(this._cookies);
-		const rendered = [];
-		for (const [name, data] of entries) if (data) rendered.push(renderCookie(name, data));
-		if (this._rawCookies.length > 0) rendered.push(...this._rawCookies);
+		const rendered = this.getSetCookieStrings();
 		if (rendered.length > 0) {
 			const existing = this._headers["set-cookie"];
 			if (existing) this._headers["set-cookie"] = [...Array.isArray(existing) ? existing : [existing], ...rendered];
@@ -1059,10 +1084,7 @@ var HttpResponse = class {
 	}
 	async sendFetchResponse(fetchResponse, method) {
 		this._status = this._status || fetchResponse.status;
-		const fetchContentLength = fetchResponse.headers.get("content-length");
-		if (fetchContentLength) this._headers["content-length"] = fetchContentLength;
-		const fetchContentType = fetchResponse.headers.get("content-type");
-		if (fetchContentType) this._headers["content-type"] = fetchContentType;
+		this.mergeFetchResponseHeaders(fetchResponse);
 		this._res.writeHead(this._status, this._headers);
 		if (method === "HEAD") {
 			this._res.end();
@@ -1457,7 +1479,7 @@ function escapeHtml(value) {
 //#endregion
 //#region packages/event-http/src/response/wooks-http-response.ts
 let framework = {
-	version: "0.7.18",
+	version: "0.7.20",
 	poweredBy: "wooksjs",
 	link: "https://wooks.moost.org/",
 	image: "https://wooks.moost.org/wooks-full-logo.svg"
@@ -1528,13 +1550,22 @@ function renderErrorText(data) {
 
 //#endregion
 //#region packages/event-http/src/http-adapter.ts
-const DEFAULT_FORWARD_HEADERS = [
+/**
+* Identity headers forwarded from the calling HTTP context during programmatic `fetch()`
+* when no `forwardHeaders` option is configured.
+*
+* The `forwardHeaders` option REPLACES this list. To extend it instead, spread the constant:
+* ```ts
+* createHttpApp({ forwardHeaders: [...DEFAULT_FORWARD_HEADERS, 'cloudfront-viewer-address'] })
+* ```
+*/
+const DEFAULT_FORWARD_HEADERS = Object.freeze([
 	"authorization",
 	"cookie",
 	"accept-language",
 	"x-forwarded-for",
 	"x-request-id"
-];
+]);
 /** HTTP adapter for Wooks that provides route registration, server lifecycle, and request handling. */
 var WooksHttp = class extends wooks.WooksAdapterBase {
 	constructor(opts, wooks$1) {
@@ -1902,6 +1933,37 @@ var WooksHttp = class extends wooks.WooksAdapterBase {
 		const req = input instanceof Request ? input : new Request(input, init);
 		return this.fetch(req);
 	}
+	/**
+	* Runs `fn` inside an HTTP event context seeded from a real `(req, res)` pair,
+	* WITHOUT route dispatch. Composables that read request state (`useRequest`,
+	* `useHeaders`, `useCookies`, `useAuthorization`) work; route-scoped state is empty.
+	* Nested `fetch()` calls made during `fn` see this context as their caller,
+	* so `forwardHeaders` and parent `Set-Cookie` propagation apply.
+	*
+	* Never writes to `res` — the caller owns the wire. The response wrapper is
+	* created in capture mode, so even a stray `response.send()` inside `fn` only
+	* finalizes state without touching the socket. Buffered response state
+	* (e.g. `Set-Cookie` collected from nested fetches) can be applied by the
+	* caller via the returned wrapper:
+	* ```ts
+	* const { result: html, response } = await http.withHttpContext(req, res, () => render(url))
+	* for (const cookie of response.getSetCookieStrings()) {
+	*   res.appendHeader('Set-Cookie', cookie)
+	* }
+	* ```
+	*/
+	async withHttpContext(req, res, fn) {
+		const ctxOptions = this.eventContextOptions;
+		const response = new this.ResponseClass(res, req, ctxOptions.logger, this.opts?.defaultHeaders, true);
+		return {
+			result: await createHttpContext(ctxOptions, {
+				req,
+				response,
+				requestLimits: this.opts?.requestLimits
+			}, fn),
+			response
+		};
+	}
 };
 var NoopSocket = class extends stream.Duplex {
 	constructor(..._args) {
@@ -2039,6 +2101,7 @@ function prepareTestHttpContext(options) {
 }
 
 //#endregion
+exports.DEFAULT_FORWARD_HEADERS = DEFAULT_FORWARD_HEADERS;
 exports.DEFAULT_LIMITS = DEFAULT_LIMITS;
 exports.EHttpStatusCode = EHttpStatusCode;
 exports.HttpError = HttpError;

package/dist/index.d.ts

@@ -395,6 +395,16 @@ declare class HttpResponse {
     clearCookies(): this;
     /** Appends a raw `Set-Cookie` header string (chainable). Use when you need full control over the cookie format. */
     setCookieRaw(rawValue: string): this;
+    /**
+     * Renders all buffered cookies (named via `setCookie()`, then raw via `setCookieRaw()`)
+     * as `Set-Cookie` header strings, without responding.
+     *
+     * Non-destructive: the buffers stay intact, so a later `send()` still emits the same
+     * cookies — callers that drain cookies onto the wire themselves should not also send
+     * through this wrapper. Cookies placed directly into headers (via `setHeader('set-cookie', …)`
+     * or default headers) are not included.
+     */
+    getSetCookieStrings(): string[];
     /** Sets the `Cache-Control` header from a directive object (chainable). */
     setCacheControl(data: TCacheControl): this;
     /** Sets the `Age` header in seconds (chainable). Accepts a number or time string (e.g. `'2h 15m'`). */
@@ -418,6 +428,12 @@ declare class HttpResponse {
      */
     toWebResponse(): Response;
     private _buildWebHeaders;
+    /**
+     * Merges headers from a handler-returned fetch `Response` into the buffered headers.
+     * Explicitly buffered headers win. `set-cookie` is appended in array form so multiple
+     * cookies survive (`Headers` iteration would otherwise keep only the first).
+     */
+    protected mergeFetchResponseHeaders(fetchResponse: Response): void;
     protected renderBody(): string | Uint8Array;
     protected renderError(data: TWooksErrorBodyExt, _ctx: EventContext): void;
     /** Renders and sends an HTTP error response. Called automatically by the framework when a handler throws an `HttpError`. */
@@ -509,6 +525,16 @@ declare class WooksHttpResponse extends HttpResponse {
     protected renderError(data: TWooksErrorBodyExt, ctx: EventContext): void;
 }
 
+/**
+ * Identity headers forwarded from the calling HTTP context during programmatic `fetch()`
+ * when no `forwardHeaders` option is configured.
+ *
+ * The `forwardHeaders` option REPLACES this list. To extend it instead, spread the constant:
+ * ```ts
+ * createHttpApp({ forwardHeaders: [...DEFAULT_FORWARD_HEADERS, 'cloudfront-viewer-address'] })
+ * ```
+ */
+declare const DEFAULT_FORWARD_HEADERS: readonly string[];
 /** Configuration options for the WooksHttp adapter. */
 interface TWooksHttpOptions {
     logger?: TConsoleBase;
@@ -522,8 +548,10 @@ interface TWooksHttpOptions {
     defaultHeaders?: Record<string, string | string[]>;
     /**
      * Headers forwarded from the calling HTTP context during programmatic `fetch()`.
+     * REPLACES the default list entirely — to add headers while keeping the defaults,
+     * spread the exported constant: `[...DEFAULT_FORWARD_HEADERS, 'my-header']`.
      * Set to `false` to disable forwarding entirely.
-     * @default ['authorization', 'cookie', 'accept-language', 'x-forwarded-for', 'x-request-id']
+     * @default DEFAULT_FORWARD_HEADERS — ['authorization', 'cookie', 'accept-language', 'x-forwarded-for', 'x-request-id']
      */
     forwardHeaders?: string[] | false;
 }
@@ -637,6 +665,29 @@ declare class WooksHttp extends WooksAdapterBase {
      * @returns A Web Standard Response.
      */
     request(input: string | URL | Request, init?: RequestInit): Promise<Response | null>;
+    /**
+     * Runs `fn` inside an HTTP event context seeded from a real `(req, res)` pair,
+     * WITHOUT route dispatch. Composables that read request state (`useRequest`,
+     * `useHeaders`, `useCookies`, `useAuthorization`) work; route-scoped state is empty.
+     * Nested `fetch()` calls made during `fn` see this context as their caller,
+     * so `forwardHeaders` and parent `Set-Cookie` propagation apply.
+     *
+     * Never writes to `res` — the caller owns the wire. The response wrapper is
+     * created in capture mode, so even a stray `response.send()` inside `fn` only
+     * finalizes state without touching the socket. Buffered response state
+     * (e.g. `Set-Cookie` collected from nested fetches) can be applied by the
+     * caller via the returned wrapper:
+     * ```ts
+     * const { result: html, response } = await http.withHttpContext(req, res, () => render(url))
+     * for (const cookie of response.getSetCookieStrings()) {
+     *   res.appendHeader('Set-Cookie', cookie)
+     * }
+     * ```
+     */
+    withHttpContext<T>(req: IncomingMessage, res: ServerResponse, fn: () => T): Promise<{
+        result: Awaited<T>;
+        response: HttpResponse;
+    }>;
 }
 /**
  * Creates a new WooksHttp application instance.
@@ -713,5 +764,5 @@ interface TTestHttpContext {
  */
 declare function prepareTestHttpContext(options: TTestHttpContext): <T>(cb: (...a: any[]) => T) => T;
 
-export { DEFAULT_LIMITS, EHttpStatusCode, HttpError, HttpResponse, WooksHttp, WooksHttpResponse, WooksURLSearchParams, createHttpApp, createHttpContext, httpKind, httpStatusCodes, prepareTestHttpContext, rawBodySlot, recordToWebHeaders, renderCacheControl, securityHeaders, useAccept, useAuthorization, useCookies, useHeaders, useHttpContext, useRequest, useResponse, useUrlParams };
+export { DEFAULT_FORWARD_HEADERS, DEFAULT_LIMITS, EHttpStatusCode, HttpError, HttpResponse, WooksHttp, WooksHttpResponse, WooksURLSearchParams, createHttpApp, createHttpContext, httpKind, httpStatusCodes, prepareTestHttpContext, rawBodySlot, recordToWebHeaders, renderCacheControl, securityHeaders, useAccept, useAuthorization, useCookies, useHeaders, useHttpContext, useRequest, useResponse, useUrlParams };
 export type { KnownAcceptType, KnownAuthType, SecurityHeadersOptions, TCacheControl, TCookieAttributes, TCookieAttributesInput, THttpEventData, TRequestLimits, TSetCookieData, TTestHttpContext, TWooksErrorBody, TWooksErrorBodyExt, TWooksHttpOptions };

package/dist/index.mjs

@@ -847,6 +847,21 @@ var HttpResponse = class {
 		this._hasCookies = true;
 		return this;
 	}
+	/**
+	* Renders all buffered cookies (named via `setCookie()`, then raw via `setCookieRaw()`)
+	* as `Set-Cookie` header strings, without responding.
+	*
+	* Non-destructive: the buffers stay intact, so a later `send()` still emits the same
+	* cookies — callers that drain cookies onto the wire themselves should not also send
+	* through this wrapper. Cookies placed directly into headers (via `setHeader('set-cookie', …)`
+	* or default headers) are not included.
+	*/
+	getSetCookieStrings() {
+		const rendered = [];
+		for (const [name, data] of Object.entries(this._cookies)) if (data) rendered.push(renderCookie(name, data));
+		rendered.push(...this._rawCookies);
+		return rendered;
+	}
 	/** Sets the `Cache-Control` header from a directive object (chainable). */
 	setCacheControl(data) {
 		this._headers["cache-control"] = renderCacheControl(data);
@@ -898,9 +913,7 @@ var HttpResponse = class {
 		}
 		if (hasFetchResponse && body instanceof globalThis.Response) {
 			this._status = this._status || body.status;
-			body.headers.forEach((v, k) => {
-				if (!this._headers[k]) this._headers[k] = v;
-			});
+			this.mergeFetchResponseHeaders(body);
 			return new globalThis.Response(method === "HEAD" ? null : body.body, {
 				status: this._status,
 				headers: this._buildWebHeaders()
@@ -927,6 +940,21 @@ var HttpResponse = class {
 	_buildWebHeaders() {
 		return recordToWebHeaders(this._headers);
 	}
+	/**
+	* Merges headers from a handler-returned fetch `Response` into the buffered headers.
+	* Explicitly buffered headers win. `set-cookie` is appended in array form so multiple
+	* cookies survive (`Headers` iteration would otherwise keep only the first).
+	*/
+	mergeFetchResponseHeaders(fetchResponse) {
+		fetchResponse.headers.forEach((value, key) => {
+			if (key !== "set-cookie" && !this._headers[key]) this._headers[key] = value;
+		});
+		const setCookies = typeof fetchResponse.headers.getSetCookie === "function" ? fetchResponse.headers.getSetCookie() : [];
+		if (setCookies.length > 0) {
+			const existing = this._headers["set-cookie"];
+			this._headers["set-cookie"] = existing ? [...Array.isArray(existing) ? existing : [existing], ...setCookies] : setCookies;
+		}
+	}
 	renderBody() {
 		const body = this._body;
 		if (body === void 0 || body === null) return "";
@@ -984,10 +1012,7 @@ var HttpResponse = class {
 	}
 	finalizeCookies() {
 		if (!this._hasCookies) return;
-		const entries = Object.entries(this._cookies);
-		const rendered = [];
-		for (const [name, data] of entries) if (data) rendered.push(renderCookie(name, data));
-		if (this._rawCookies.length > 0) rendered.push(...this._rawCookies);
+		const rendered = this.getSetCookieStrings();
 		if (rendered.length > 0) {
 			const existing = this._headers["set-cookie"];
 			if (existing) this._headers["set-cookie"] = [...Array.isArray(existing) ? existing : [existing], ...rendered];
@@ -1030,10 +1055,7 @@ var HttpResponse = class {
 	}
 	async sendFetchResponse(fetchResponse, method) {
 		this._status = this._status || fetchResponse.status;
-		const fetchContentLength = fetchResponse.headers.get("content-length");
-		if (fetchContentLength) this._headers["content-length"] = fetchContentLength;
-		const fetchContentType = fetchResponse.headers.get("content-type");
-		if (fetchContentType) this._headers["content-type"] = fetchContentType;
+		this.mergeFetchResponseHeaders(fetchResponse);
 		this._res.writeHead(this._status, this._headers);
 		if (method === "HEAD") {
 			this._res.end();
@@ -1428,7 +1450,7 @@ function escapeHtml(value) {
 //#endregion
 //#region packages/event-http/src/response/wooks-http-response.ts
 let framework = {
-	version: "0.7.18",
+	version: "0.7.20",
 	poweredBy: "wooksjs",
 	link: "https://wooks.moost.org/",
 	image: "https://wooks.moost.org/wooks-full-logo.svg"
@@ -1499,13 +1521,22 @@ function renderErrorText(data) {
 
 //#endregion
 //#region packages/event-http/src/http-adapter.ts
-const DEFAULT_FORWARD_HEADERS = [
+/**
+* Identity headers forwarded from the calling HTTP context during programmatic `fetch()`
+* when no `forwardHeaders` option is configured.
+*
+* The `forwardHeaders` option REPLACES this list. To extend it instead, spread the constant:
+* ```ts
+* createHttpApp({ forwardHeaders: [...DEFAULT_FORWARD_HEADERS, 'cloudfront-viewer-address'] })
+* ```
+*/
+const DEFAULT_FORWARD_HEADERS = Object.freeze([
 	"authorization",
 	"cookie",
 	"accept-language",
 	"x-forwarded-for",
 	"x-request-id"
-];
+]);
 /** HTTP adapter for Wooks that provides route registration, server lifecycle, and request handling. */
 var WooksHttp = class extends WooksAdapterBase {
 	constructor(opts, wooks) {
@@ -1873,6 +1904,37 @@ var WooksHttp = class extends WooksAdapterBase {
 		const req = input instanceof Request ? input : new Request(input, init);
 		return this.fetch(req);
 	}
+	/**
+	* Runs `fn` inside an HTTP event context seeded from a real `(req, res)` pair,
+	* WITHOUT route dispatch. Composables that read request state (`useRequest`,
+	* `useHeaders`, `useCookies`, `useAuthorization`) work; route-scoped state is empty.
+	* Nested `fetch()` calls made during `fn` see this context as their caller,
+	* so `forwardHeaders` and parent `Set-Cookie` propagation apply.
+	*
+	* Never writes to `res` — the caller owns the wire. The response wrapper is
+	* created in capture mode, so even a stray `response.send()` inside `fn` only
+	* finalizes state without touching the socket. Buffered response state
+	* (e.g. `Set-Cookie` collected from nested fetches) can be applied by the
+	* caller via the returned wrapper:
+	* ```ts
+	* const { result: html, response } = await http.withHttpContext(req, res, () => render(url))
+	* for (const cookie of response.getSetCookieStrings()) {
+	*   res.appendHeader('Set-Cookie', cookie)
+	* }
+	* ```
+	*/
+	async withHttpContext(req, res, fn) {
+		const ctxOptions = this.eventContextOptions;
+		const response = new this.ResponseClass(res, req, ctxOptions.logger, this.opts?.defaultHeaders, true);
+		return {
+			result: await createHttpContext(ctxOptions, {
+				req,
+				response,
+				requestLimits: this.opts?.requestLimits
+			}, fn),
+			response
+		};
+	}
 };
 var NoopSocket = class extends Duplex {
 	constructor(..._args) {
@@ -2010,4 +2072,4 @@ function prepareTestHttpContext(options) {
 }
 
 //#endregion
-export { DEFAULT_LIMITS, EHttpStatusCode, HttpError, HttpResponse, WooksHttp, WooksHttpResponse, WooksURLSearchParams, createHttpApp, createHttpContext, httpKind, httpStatusCodes, prepareTestHttpContext, rawBodySlot, recordToWebHeaders, renderCacheControl, securityHeaders, useAccept, useAuthorization, useCookies, useHeaders, useHttpContext, useLogger, useRequest, useResponse, useRouteParams, useUrlParams };
+export { DEFAULT_FORWARD_HEADERS, DEFAULT_LIMITS, EHttpStatusCode, HttpError, HttpResponse, WooksHttp, WooksHttpResponse, WooksURLSearchParams, createHttpApp, createHttpContext, httpKind, httpStatusCodes, prepareTestHttpContext, rawBodySlot, recordToWebHeaders, renderCacheControl, securityHeaders, useAccept, useAuthorization, useCookies, useHeaders, useHttpContext, useLogger, useRequest, useResponse, useRouteParams, useUrlParams };

package/package.json

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