Skip to content

fix: gracefully handle errors when setting headers #5411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 2 commits into from
Jan 20, 2023
Merged

fix: gracefully handle errors when setting headers #5411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2288f53
fix: gracefully handle errors when setting headers
eduardoboucas Jan 20, 2023
16a660b
feat: show error page
eduardoboucas Jan 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/functions/server.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export const createHandler = function (options) {
return
}

handleSynchronousFunction(error, result, request, response)
handleSynchronousFunction({ error, functionName: func.name, result, request, response })
}
}
}
Expand Down
35 changes: 28 additions & 7 deletions src/lib/functions/synchronous.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @ts-check
import { Buffer } from 'buffer'

import { NETLIFYDEVERR } from '../../utils/command-helpers.mjs'
import { chalk, log, NETLIFYDEVERR } from '../../utils/command-helpers.mjs'
import renderErrorTemplate from '../render-error-template.mjs'

import { detectAwsSdkError } from './utils.mjs'
Expand All @@ -16,27 +16,48 @@ const addHeaders = (headers, response) => {
})
}

export const handleSynchronousFunction = function (err, result, request, response) {
if (err) {
return handleErr(err, request, response)
export const handleSynchronousFunction = function ({
error: invocationError,
functionName,
request,
response,
result,
}) {
if (invocationError) {
return handleErr(invocationError, request, response)
}

const { error } = validateLambdaResponse(result)
if (error) {
console.log(`${NETLIFYDEVERR} ${error}`)
log(`${NETLIFYDEVERR} ${error}`)
return handleErr(error, request, response)
}

response.statusCode = result.statusCode
addHeaders(result.headers, response)
addHeaders(result.multiValueHeaders, response)

try {
addHeaders(result.headers, response)
addHeaders(result.multiValueHeaders, response)
} catch (headersError) {
formatError(headersError)

log(`${NETLIFYDEVERR} Failed to set header in function ${chalk.yellow(functionName)}: ${headersError.message}`)

return handleErr(headersError, request, response)
}

if (result.body) {
response.write(result.isBase64Encoded ? Buffer.from(result.body, 'base64') : result.body)
}
response.end()
}

const formatError = (err) => {
err.errorType = err.code
err.errorMessage = err.message
err.stackTrace = err.trace
}

const formatLambdaLocalError = (err, acceptsHtml) =>
acceptsHtml
? JSON.stringify({
Expand Down