@middy/http-content-encoding 7.0.3 → 7.1.1

package/README.md

@@ -1,5 +1,5 @@
 <div align="center">
-  <h1>Middy http-content-encoding middleware</h1>
+  <h1>Middy `http-content-encoding` middleware</h1>
   <img alt="Middy logo" src="https://raw.githubusercontent.com/middyjs/middy/main/docs/img/middy-logo.svg"/>
   <p><strong>HTTP content encoding middleware for the middy framework, the stylish Node.js middleware engine for AWS Lambda</strong></p>
   <p>

package/index.d.ts

@@ -2,7 +2,9 @@
 // SPDX-License-Identifier: MIT
 import type middy from "@middy/core";
 
-interface Options {
+export type ContentEncoding = "br" | "deflate" | "gzip" | "zstd";
+
+export interface Options {
 	br?: any;
 	gzip?: any;
 	deflate?: any;
@@ -10,6 +12,10 @@ interface Options {
 	overridePreferredEncoding?: string[];
 }
 
+export declare function getContentEncodingStream(
+	preferredEncoding: ContentEncoding,
+): ReturnType<typeof import("node:zlib")["createGzip"]>;
+
 declare function httpContentEncoding(options?: Options): middy.MiddlewareObj;
 
 export default httpContentEncoding;

package/index.js

@@ -1,14 +1,14 @@
 // Copyright 2017 - 2026 will Farrell, Luciano Mammino, and Middy contributors.
 // SPDX-License-Identifier: MIT
-import { Readable } from "node:stream";
 
+import { Readable } from "node:stream";
+import { ReadableStream } from "node:stream/web";
 import {
 	createBrotliCompress as brotliCompressStream,
 	createDeflate as deflateCompressStream,
 	createGzip as gzipCompressStream,
 	createZstdCompress as zstdCompressStream,
 } from "node:zlib";
-
 import { normalizeHttpResponse } from "@middy/util";
 
 const contentEncodingStreams = {
@@ -51,6 +51,8 @@ const httpContentEncodingMiddleware = (opts) => {
 		}
 		const responseCacheControl =
 			response.headers["Cache-Control"] ?? response.headers["cache-control"];
+		const isNodeStream = response.body?._readableState;
+		const isWebStream = response.body instanceof ReadableStream;
 		if (
 			response.isBase64Encoded ||
 			!preferredEncoding ||
@@ -58,7 +60,8 @@ const httpContentEncodingMiddleware = (opts) => {
 			!response.body ||
 			(typeof response.body !== "string" &&
 				!Buffer.isBuffer(response.body) &&
-				!response.body?._readableState) ||
+				!isNodeStream &&
+				!isWebStream) ||
 			responseCacheControl?.includes("no-transform")
 		) {
 			return;
@@ -78,13 +81,21 @@ const httpContentEncodingMiddleware = (opts) => {
 		}
 
 		// Support streamifyResponse
-		if (response.body?._readableState) {
+		if (isNodeStream || isWebStream) {
 			request.response.headers["Content-Encoding"] = contentEncoding;
-			request.response.body = request.response.body.pipe(contentEncodingStream);
+			if (isNodeStream) {
+				request.response.body = request.response.body.pipe(
+					contentEncodingStream,
+				);
+			} else if (isWebStream) {
+				request.response.body = Readable.toWeb(
+					Readable.fromWeb(response.body).pipe(contentEncodingStream),
+				);
+			}
 			addHeaderPart(response, "Vary", "Accept-Encoding");
 			return;
 		}
-
+		// isString
 		const stream = Readable.from(response.body).pipe(contentEncodingStream);
 
 		const chunks = [];
@@ -116,7 +127,7 @@ const httpContentEncodingMiddleware = (opts) => {
 	};
 };
 
-// header in offical name, lowercase varient handeled
+// header in official name, lowercase variant handled
 const addHeaderPart = (response, header, value) => {
 	const headerLower = header.toLowerCase();
 	const sanitizedHeader = response.headers[headerLower] ? headerLower : header;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@middy/http-content-encoding",
-	"version": "7.0.3",
-	"description": "Http content encoding middleware for the middy framework",
+	"version": "7.1.1",
+	"description": "HTTP content encoding middleware for the middy framework",
 	"type": "module",
 	"engines": {
 		"node": ">=22"
@@ -68,11 +68,13 @@
 		"url": "https://github.com/sponsors/willfarrell"
 	},
 	"dependencies": {
-		"@middy/util": "7.0.3"
+		"@middy/util": "7.1.1"
 	},
 	"devDependencies": {
 		"@datastream/core": "0.0.42",
-		"@middy/core": "7.0.3"
+		"@middy/core": "7.1.1",
+		"@types/aws-lambda": "^8.0.0",
+		"@types/node": "^22.0.0"
 	},
 	"gitHead": "7a6c0fbb8ab71d6a2171e678697de9f237568431"
 }