@wooksjs/event-http 0.7.20 → 0.7.21

package/dist/index.cjs

@@ -942,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()
@@ -971,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 "";
@@ -1071,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();
@@ -1469,7 +1479,7 @@ function escapeHtml(value) {
 //#endregion
 //#region packages/event-http/src/response/wooks-http-response.ts
 let framework = {
-	version: "0.7.19",
+	version: "0.7.20",
 	poweredBy: "wooksjs",
 	link: "https://wooks.moost.org/",
 	image: "https://wooks.moost.org/wooks-full-logo.svg"

package/dist/index.d.ts

@@ -428,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`. */

package/dist/index.mjs

@@ -913,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()
@@ -942,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 "";
@@ -1042,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();
@@ -1440,7 +1450,7 @@ function escapeHtml(value) {
 //#endregion
 //#region packages/event-http/src/response/wooks-http-response.ts
 let framework = {
-	version: "0.7.19",
+	version: "0.7.20",
 	poweredBy: "wooksjs",
 	link: "https://wooks.moost.org/",
 	image: "https://wooks.moost.org/wooks-full-logo.svg"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wooksjs/event-http",
-  "version": "0.7.20",
+  "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.20",
-    "wooks": "^0.7.20"
+    "@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.20",
-    "wooks": "^0.7.20"
+    "@wooksjs/event-core": "^0.7.21",
+    "wooks": "^0.7.21"
   },
   "scripts": {
     "build": "rolldown -c ../../rolldown.config.mjs"