michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix test

Browse source
This commit is contained in:
bluwy 2023-07-07 21:39:44 +08:00
parent e14e9dd1d9
commit 5debbc74a1
1 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
packages/astro/src/core/endpoint/index.ts
View file

@ -144,7 +144,7 @@ export async function callEndpoint<MiddlewareResult = Response | EndpointOutput>
// If return simple endpoint object, convert to response // If return simple endpoint object, convert to response
if (!(response instanceof Response)) { if (!(response instanceof Response)) {
// In SSR, we convert to a full response with the correct headers to be sent out // Validate properties not available in SSR
if (env.ssr && !ctx.route?.prerender) { if (env.ssr && !ctx.route?.prerender) {
if (response.hasOwnProperty('headers')) { if (response.hasOwnProperty('headers')) {
warn( warn(
@ -172,23 +172,40 @@ export async function callEndpoint<MiddlewareResult = Response | EndpointOutput>
}; };
} }
let body: BodyInit;
const headers = new Headers(); const headers = new Headers();
const pathname = new URL(ctx.request.url).pathname; const pathname = ctx.route
? // Try the static route `pathname`
ctx.route.pathname ??
// Dynamic routes don't include `pathname`, so synthesize a path for these (e.g. 'src/pages/[slug].svg')
ctx.route.segments.map((s) => s.map((p) => p.content).join('')).join('/')
: // Fallback to pathname of the request
ctx.pathname;
const mimeType = mime.getType(pathname) || 'text/plain'; const mimeType = mime.getType(pathname) || 'text/plain';
headers.set('Content-Type', `${mimeType};charset=utf-8`); headers.set('Content-Type', `${mimeType};charset=utf-8`);
const bytes = encoder.encode(response.body); if (typeof Buffer !== 'undefined' && Buffer.from) {
headers.set('Content-Length', bytes.byteLength.toString()); body = Buffer.from(response.body, response.encoding);
} else if (
response.encoding == null ||
response.encoding === 'utf8' ||
response.encoding === 'utf-8'
) {
body = encoder.encode(response.body);
headers.set('Content-Length', body.byteLength.toString());
} else {
body = response.body;
}
response = new Response(bytes, { response = new Response(body, {
status: 200, status: 200,
headers, headers,
}); });
attachToResponse(response, context.cookies);
} }
attachToResponse(response, context.cookies);
return response; return response;
} }