Skip to content

fix: resolve "Body already used" when accessing request in derive/resolve hooks #1647

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

Open
eL1fe wants to merge 1 commit into
base: main
Choose a base branch
from
+194 −77
Open

fix: resolve "Body already used" when accessing request in derive/resolve hooks #1647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
224 changes: 160 additions & 64 deletions src/compose.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,6 +874,18 @@ export const composeHandler = ({

fnLiteral += '\ntry{'

// When hooks access request.body/arrayBuffer, preserve raw body before parsing
// Clone request first so hooks can still read from it
// Skip if custom parse hooks exist - they'll read the request themselves
// Note: FormData requests cannot be cloned for reuse - derive/resolve cannot
// re-read the body for multipart/form-data requests (protocol limitation)
if (inference.request && !hooks.parse?.length) {
fnLiteral +=
`const _ct=c.request.headers.get('content-type')\n` +
`if(!_ct||!_ct.includes('multipart/form-data')){` +
`c.rawBody=await c.request.clone().arrayBuffer()}\n`
}

let parser: string | undefined =
typeof hooks.parse === 'string'
? hooks.parse
Expand Down Expand Up @@ -904,55 +916,108 @@ export const composeHandler = ({

const isOptionalBody = !!validator.body?.isOptional

switch (parser) {
case 'json':
case 'application/json':
fnLiteral += adapter.parser.json(isOptionalBody)
break
// When inference.request is true and rawBody exists, parse from it
// For FormData (no rawBody), use standard parser
if (inference.request) {
switch (parser) {
case 'json':
case 'application/json':
if (isOptionalBody)
fnLiteral += 'if(c.rawBody){try{c.body=JSON.parse(new TextDecoder().decode(c.rawBody))}catch{}}else{try{c.body=await c.request.json()}catch{}}\n'
else
fnLiteral += 'c.body=c.rawBody?JSON.parse(new TextDecoder().decode(c.rawBody)):await c.request.json()\n'
break

case 'text':
case 'text/plain':
fnLiteral += 'c.body=c.rawBody?new TextDecoder().decode(c.rawBody):await c.request.text()\n'
break

case 'urlencoded':
case 'application/x-www-form-urlencoded':
fnLiteral += 'c.body=c.rawBody?parseQuery(new TextDecoder().decode(c.rawBody)):parseQuery(await c.request.text())\n'
break

case 'arrayBuffer':
case 'application/octet-stream':
fnLiteral += 'c.body=c.rawBody??await c.request.arrayBuffer()\n'
break

case 'formdata':
case 'multipart/form-data':
// FormData reads from original request (cannot be cloned for reuse)
fnLiteral += adapter.parser.formData(isOptionalBody)
break

default:
// Custom parser - let it access rawBody via context
if (parser in app['~parser']) {
fnLiteral += hasHeaders
? `let contentType = c.headers['content-type']`
: `let contentType = c.request.headers.get('content-type')`

case 'text':
case 'text/plain':
fnLiteral += adapter.parser.text(isOptionalBody)
fnLiteral +=
`\nif(contentType){` +
`const index=contentType.indexOf(';')\n` +
`if(index!==-1)contentType=contentType.substring(0,index)}\n` +
`else{contentType=''}` +
`c.contentType=contentType\n` +
`let result=parser['${parser}'](c, contentType)\n` +
`if(result instanceof Promise)result=await result\n` +
`if(result instanceof ElysiaCustomStatusResponse)throw result\n` +
`if(result!==undefined)c.body=result\n` +
'delete c.contentType\n'
}
}
} else {
switch (parser) {
case 'json':
case 'application/json':
fnLiteral += adapter.parser.json(isOptionalBody)
break

break
case 'text':
case 'text/plain':
fnLiteral += adapter.parser.text(isOptionalBody)

case 'urlencoded':
case 'application/x-www-form-urlencoded':
fnLiteral += adapter.parser.urlencoded(isOptionalBody)
break

break
case 'urlencoded':
case 'application/x-www-form-urlencoded':
fnLiteral += adapter.parser.urlencoded(isOptionalBody)

case 'arrayBuffer':
case 'application/octet-stream':
fnLiteral += adapter.parser.arrayBuffer(isOptionalBody)
break

break
case 'arrayBuffer':
case 'application/octet-stream':
fnLiteral += adapter.parser.arrayBuffer(isOptionalBody)

case 'formdata':
case 'multipart/form-data':
fnLiteral += adapter.parser.formData(isOptionalBody)
break
break

default:
if ((parser[0] as string) in app['~parser']) {
fnLiteral += hasHeaders
? `let contentType = c.headers['content-type']`
: `let contentType = c.request.headers.get('content-type')`
case 'formdata':
case 'multipart/form-data':
fnLiteral += adapter.parser.formData(isOptionalBody)
break

fnLiteral +=
`\nif(contentType){` +
`const index=contentType.indexOf(';')\n` +
`if(index!==-1)contentType=contentType.substring(0,index)}\n` +
`else{contentType=''}` +
`c.contentType=contentType\n` +
`let result=parser['${parser}'](c, contentType)\n` +
`if(result instanceof Promise)result=await result\n` +
`if(result instanceof ElysiaCustomStatusResponse)throw result\n` +
`if(result!==undefined)c.body=result\n` +
'delete c.contentType\n'
}
default:
if (parser in app['~parser']) {
fnLiteral += hasHeaders
? `let contentType = c.headers['content-type']`
: `let contentType = c.request.headers.get('content-type')`

break
fnLiteral +=
`\nif(contentType){` +
`const index=contentType.indexOf(';')\n` +
`if(index!==-1)contentType=contentType.substring(0,index)}\n` +
`else{contentType=''}` +
`c.contentType=contentType\n` +
`let result=parser['${parser}'](c, contentType)\n` +
`if(result instanceof Promise)result=await result\n` +
`if(result instanceof ElysiaCustomStatusResponse)throw result\n` +
`if(result!==undefined)c.body=result\n` +
'delete c.contentType\n'
}
}
}

reporter.resolve()
Expand All @@ -977,31 +1042,62 @@ export const composeHandler = ({
hasDefaultParser = true
const isOptionalBody = !!validator.body?.isOptional

fnLiteral +=
`if(contentType)` +
`switch(contentType.charCodeAt(12)){` +
`\ncase 106:` +
adapter.parser.json(isOptionalBody) +
'break' +
`\n` +
`case 120:` +
adapter.parser.urlencoded(isOptionalBody) +
`break` +
`\n` +
`case 111:` +
adapter.parser.arrayBuffer(isOptionalBody) +
`break` +
`\n` +
`case 114:` +
adapter.parser.formData(isOptionalBody) +
`break` +
`\n` +
`default:` +
`if(contentType.charCodeAt(0)===116){` +
adapter.parser.text(isOptionalBody) +
`}` +
`break\n` +
`}`
// When rawBody is preserved, parse from it; for FormData use cloned request
if (inference.request) {
fnLiteral +=
`if(contentType)` +
`switch(contentType.charCodeAt(12)){` +
`\ncase 106:` + // application/json
(isOptionalBody
? 'if(c.rawBody){try{c.body=JSON.parse(new TextDecoder().decode(c.rawBody))}catch{}}else{try{c.body=await c.request.json()}catch{}}\n'
: 'c.body=c.rawBody?JSON.parse(new TextDecoder().decode(c.rawBody)):await c.request.json()\n') +
'break' +
`\n` +
`case 120:` + // application/x-www-form-urlencoded
'c.body=c.rawBody?parseQuery(new TextDecoder().decode(c.rawBody)):parseQuery(await c.request.text())\n' +
`break` +
`\n` +
`case 111:` + // application/octet-stream
'c.body=c.rawBody??await c.request.arrayBuffer()\n' +
`break` +
`\n` +
`case 114:` + // multipart/form-data
adapter.parser.formData(isOptionalBody) +
`break` +
`\n` +
`default:` +
`if(contentType.charCodeAt(0)===116){` + // text/plain
'c.body=c.rawBody?new TextDecoder().decode(c.rawBody):await c.request.text()\n' +
`}` +
`break\n` +
`}`
} else {
fnLiteral +=
`if(contentType)` +
`switch(contentType.charCodeAt(12)){` +
`\ncase 106:` +
adapter.parser.json(isOptionalBody) +
'break' +
`\n` +
`case 120:` +
adapter.parser.urlencoded(isOptionalBody) +
`break` +
`\n` +
`case 111:` +
adapter.parser.arrayBuffer(isOptionalBody) +
`break` +
`\n` +
`case 114:` +
adapter.parser.formData(isOptionalBody) +
`break` +
`\n` +
`default:` +
`if(contentType.charCodeAt(0)===116){` +
adapter.parser.text(isOptionalBody) +
`}` +
`break\n` +
`}`
}
}

const reporter = report('parse', {
Expand Down
23 changes: 18 additions & 5 deletions src/sucrose.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ export namespace Sucrose {
route: boolean
url: boolean
path: boolean
/** Whether code accesses request.body, request.arrayBuffer, etc. */
request: boolean
}

export interface LifeCycle extends Partial<LifeCycleStore> {
Expand Down Expand Up @@ -291,6 +293,7 @@ export const findParameterReference = (
if (parameters.route) inference.route = true
if (parameters.url) inference.url = true
if (parameters.path) inference.path = true
if (parameters.request) inference.request = true

if (hasParenthesis) return `{ ${Object.keys(parameters).join(', ')} }`

Expand Down Expand Up @@ -471,6 +474,7 @@ export const inferBodyReference = (
if (parameters.url) inference.url = true
if (parameters.route) inference.route = true
if (parameters.path) inference.path = true
if (parameters.request) inference.request = true

continue
}
Expand Down Expand Up @@ -498,6 +502,8 @@ export const inferBodyReference = (
if (!inference.route && access('route', alias)) inference.route = true
if (!inference.url && access('url', alias)) inference.url = true
if (!inference.path && access('path', alias)) inference.path = true
if (!inference.request && access('request', alias))
inference.request = true

if (
inference.query &&
Expand All @@ -508,7 +514,8 @@ export const inferBodyReference = (
inference.server &&
inference.route &&
inference.url &&
inference.path
inference.path &&
inference.request
)
break
}
Expand Down Expand Up @@ -645,7 +652,8 @@ export const mergeInference = (a: Sucrose.Inference, b: Sucrose.Inference) => {
server: a.server || b.server,
url: a.url || b.url,
route: a.route || b.route,
path: a.path || b.path
path: a.path || b.path,
request: a.request || b.request
}
}

Expand All @@ -660,7 +668,8 @@ export const sucrose = (
server: false,
url: false,
route: false,
path: false
path: false,
request: false
},
settings: Sucrose.Settings = {}
): Sucrose.Inference => {
Expand All @@ -674,6 +683,8 @@ export const sucrose = (
if (lifeCycle.afterHandle?.length) events.push(...lifeCycle.afterHandle)
if (lifeCycle.mapResponse?.length) events.push(...lifeCycle.mapResponse)
if (lifeCycle.afterResponse?.length) events.push(...lifeCycle.afterResponse)
if (lifeCycle.derive?.length) events.push(...lifeCycle.derive)
if (lifeCycle.resolve?.length) events.push(...lifeCycle.resolve)

if (lifeCycle.handler && typeof lifeCycle.handler === 'function')
events.push(lifeCycle.handler as Handler)
Expand Down Expand Up @@ -710,7 +721,8 @@ export const sucrose = (
server: false,
url: false,
route: false,
path: false
path: false,
request: false
}

const [parameter, body] = separateFunction(content)
Expand Down Expand Up @@ -753,7 +765,8 @@ export const sucrose = (
inference.server &&
inference.url &&
inference.route &&
inference.path
inference.path &&
inference.request
)
break
}
Expand Down
Loading