@middy/http-content-encoding 5.5.1 → 6.0.0-beta.0

package/index.js

@@ -43,12 +43,21 @@ const httpContentEncodingMiddleware = (opts) => {
       response
     } = request
 
-    // Encoding not supported OR already encoded
+    // Encoding not supported, already encoded, or doesn't need to'
+    const eventCacheControl =
+      request.event.headers['cache-control'] ??
+      request.event.headers['Cache-Control']
+    if (eventCacheControl?.includes('no-transform')) {
+      addHeaderPart(response, 'Cache-Control', 'no-transform')
+    }
+    const responseCacheControl =
+      response.headers['Cache-Control'] ?? response.headers['cache-control']
     if (
       response.isBase64Encoded ||
       !preferredEncoding ||
       !supportedContentEncodings.includes(preferredEncoding) ||
-      !response.body
+      !response.body ||
+      responseCacheControl?.includes('no-transform')
     ) {
       return
     }
@@ -70,6 +79,7 @@ const httpContentEncodingMiddleware = (opts) => {
     if (response.body?._readableState) {
       request.response.headers['Content-Encoding'] = contentEncoding
       request.response.body = request.response.body.pipe(contentEncodingStream)
+      addHeaderPart(response, 'Vary', 'Accept-Encoding')
       return
     }
 
@@ -87,6 +97,7 @@ const httpContentEncodingMiddleware = (opts) => {
       response.headers['Content-Encoding'] = contentEncoding
       response.body = body
       response.isBase64Encoded = true
+      addHeaderPart(response, 'Vary', 'Accept-Encoding')
     }
 
     request.response = response
@@ -103,4 +114,13 @@ const httpContentEncodingMiddleware = (opts) => {
   }
 }
 
+// header in offical name, lowercase varient handeled
+const addHeaderPart = (response, header, value) => {
+  const headerLower = header.toLowerCase()
+  header = response.headers[headerLower] ? headerLower : header
+  response.headers[header] ??= ''
+  response.headers[header] &&= response.headers[header] + ', '
+  response.headers[header] += value
+}
+
 export default httpContentEncodingMiddleware

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@middy/http-content-encoding",
-  "version": "5.5.1",
+  "version": "6.0.0-beta.0",
   "description": "Http content encoding middleware for the middy framework",
   "type": "module",
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "engineStrict": true,
   "publishConfig": {
@@ -16,6 +16,9 @@
       "import": {
         "types": "./index.d.ts",
         "default": "./index.js"
+      },
+      "require": {
+        "default": "./index.js"
       }
     }
   },
@@ -63,11 +66,11 @@
     "url": "https://github.com/sponsors/willfarrell"
   },
   "dependencies": {
-    "@middy/util": "5.5.1"
+    "@middy/util": "6.0.0-beta.0"
   },
   "devDependencies": {
-    "@datastream/core": "0.0.38",
-    "@middy/core": "5.5.1"
+    "@datastream/core": "0.0.40",
+    "@middy/core": "6.0.0-beta.0"
   },
   "gitHead": "7a6c0fbb8ab71d6a2171e678697de9f237568431"
 }