netlify-cli 15.8.0 → 15.8.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "15.8.0",
+  "version": "15.8.1",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -44,14 +44,14 @@
   "dependencies": {
     "@bugsnag/js": "7.20.2",
     "@fastify/static": "6.10.2",
-    "@netlify/build": "29.14.0",
-    "@netlify/build-info": "7.0.8",
-    "@netlify/config": "20.5.1",
+    "@netlify/build": "29.15.2",
+    "@netlify/build-info": "7.3.4",
+    "@netlify/config": "20.5.2",
     "@netlify/edge-bundler": "8.16.2",
     "@netlify/framework-info": "9.8.10",
     "@netlify/local-functions-proxy": "1.1.1",
     "@netlify/serverless-functions-api": "1.5.1",
-    "@netlify/zip-it-and-ship-it": "9.11.0",
+    "@netlify/zip-it-and-ship-it": "9.12.1",
     "@octokit/rest": "19.0.13",
     "@skn0tt/lambda-local": "2.0.3",
     "ansi-escapes": "6.2.0",
@@ -60,7 +60,7 @@
     "ascii-table": "0.0.9",
     "backoff": "2.5.0",
     "better-opn": "3.0.2",
-    "boxen": "7.1.0",
+    "boxen": "7.1.1",
     "chalk": "5.2.0",
     "chokidar": "3.5.3",
     "ci-info": "3.8.0",
@@ -92,7 +92,7 @@
     "from2-array": "0.0.4",
     "fuzzy": "0.1.3",
     "get-port": "5.1.1",
-    "gh-release-fetch": "4.0.2",
+    "gh-release-fetch": "4.0.3",
     "git-repo-info": "2.1.1",
     "gitconfiglocal": "2.1.0",
     "hasbin": "1.2.3",
@@ -106,7 +106,7 @@
     "is-stream": "3.0.0",
     "is-wsl": "2.2.0",
     "isexe": "2.0.0",
-    "jsonwebtoken": "9.0.0",
+    "jsonwebtoken": "9.0.1",
     "jwt-decode": "3.1.2",
     "listr": "0.14.3",
     "locate-path": "7.2.0",
@@ -119,7 +119,7 @@
     "netlify-headers-parser": "7.1.2",
     "netlify-redirect-parser": "14.1.3",
     "netlify-redirector": "0.4.0",
-    "node-fetch": "2.6.11",
+    "node-fetch": "2.6.12",
     "node-version-alias": "3.4.1",
     "ora": "6.3.1",
     "p-filter": "3.0.0",

package/src/commands/base-command.mjs

@@ -407,7 +407,8 @@ export default class BaseCommand extends Command {
   }
 
   setAnalyticsPayload(payload) {
-    this.analytics = { ...this.analytics, payload }
+    const newPayload = { ...this.analytics.payload, ...payload }
+    this.analytics = { ...this.analytics, payload: newPayload }
   }
 
   /**

package/src/lib/functions/synchronous.mjs

@@ -75,20 +75,20 @@ const formatLambdaLocalError = (err, acceptsHtml) =>
       })
     : `${err.errorType}: ${err.errorMessage}\n ${err.stackTrace?.join('\n ')}`
 
-const processRenderedResponse = async (err, request) => {
-  const acceptsHtml = request.headers && request.headers.accept && request.headers.accept.includes('text/html')
-  const errorString = typeof err === 'string' ? err : formatLambdaLocalError(err, acceptsHtml)
-
-  return acceptsHtml
-    ? await renderErrorTemplate(errorString, './templates/function-error.html', 'function')
-    : errorString
-}
-
 const handleErr = async (err, request, response) => {
   detectAwsSdkError({ err })
 
+  const acceptsHtml = request.headers && request.headers.accept && request.headers.accept.includes('text/html')
+  const errorString = typeof err === 'string' ? err : formatLambdaLocalError(err, acceptsHtml)
+
   response.statusCode = 500
-  response.end(await processRenderedResponse(err, request))
+
+  if (acceptsHtml) {
+    response.setHeader('Content-Type', 'text/html')
+    response.end(await renderErrorTemplate(errorString, './templates/function-error.html', 'function'))
+  } else {
+    response.end(errorString)
+  }
 }
 
 const validateLambdaResponse = (lambdaResponse) => {

package/src/utils/proxy.mjs

@@ -36,9 +36,29 @@ import { generateRequestID } from './request-id.mjs'
 import { createRewriter, onChanges } from './rules-proxy.mjs'
 import { signRedirect } from './sign-redirect.mjs'
 
-const decompress = util.promisify(zlib.gunzip)
+const gunzip = util.promisify(zlib.gunzip)
+const brotliDecompress = util.promisify(zlib.brotliDecompress)
+const deflate = util.promisify(zlib.deflate)
 const shouldGenerateETag = Symbol('Internal: response should generate ETag')
 
+/**
+ * @param {Buffer} body
+ * @param {string | undefined} contentEncoding
+ * @returns {Promise<Buffer>}
+ */
+const decompressResponseBody = async function (body, contentEncoding = '') {
+  switch (contentEncoding) {
+    case 'gzip':
+      return await gunzip(body)
+    case 'br':
+      return await brotliDecompress(body)
+    case 'deflate':
+      return await deflate(body)
+    default:
+      return body
+  }
+}
+
 const formatEdgeFunctionError = (errorBuffer, acceptsHtml) => {
   const {
     error: { message, name, stack },
@@ -479,7 +499,7 @@ const initializeProxy = async function ({ configPath, distDir, env, host, port,
 
       if (isEdgeFunctionsRequest(req) && isUncaughtError) {
         const acceptsHtml = req.headers && req.headers.accept && req.headers.accept.includes('text/html')
-        const decompressedBody = await decompress(responseBody)
+        const decompressedBody = await decompressResponseBody(responseBody, req.headers['content-encoding'])
         const formattedBody = formatEdgeFunctionError(decompressedBody, acceptsHtml)
         const errorResponse = acceptsHtml
           ? await renderErrorTemplate(formattedBody, './templates/function-error.html', 'edge function')
@@ -487,6 +507,7 @@ const initializeProxy = async function ({ configPath, distDir, env, host, port,
         const contentLength = Buffer.from(errorResponse, 'utf8').byteLength
 
         res.setHeader('content-length', contentLength)
+        res.statusCode = 500
         res.write(errorResponse)
         return res.end()
       }