Skip to content
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.

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

fix: pass custom statusText in Response #12105

Merged
merged 2 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/moody-doors-wink.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Returns custom statusText that has been set in a Response
3 changes: 2 additions & 1 deletion packages/astro/src/core/app/node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ export class NodeApp extends App {
* @param destination NodeJS ServerResponse
*/
static async writeResponse(source: Response, destination: ServerResponse) {
const { status, headers, body } = source;
const { status, headers, body, statusText } = source;
destination.statusMessage = statusText;
destination.writeHead(status, createOutgoingHttpHeaders(headers));
if (!body) return destination.end();
try {
Expand Down
4 changes: 2 additions & 2 deletions packages/astro/src/vite-plugin-astro-server/response.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export function writeHtmlResponse(res: http.ServerResponse, statusCode: number,
}

export async function writeWebResponse(res: http.ServerResponse, webResponse: Response) {
const { status, headers, body } = webResponse;
const { status, headers, body, statusText } = webResponse;

// Attach any set-cookie headers added via Astro.cookies.set()
const setCookieHeaders = Array.from(getSetCookiesFromResponse(webResponse));
Expand All @@ -67,7 +67,7 @@ export async function writeWebResponse(res: http.ServerResponse, webResponse: Re
if (headers.has('set-cookie')) {
_headers['set-cookie'] = headers.getSetCookie();
}

res.statusMessage = statusText;
res.writeHead(status, _headers);
if (body) {
if (Symbol.for('astro.responseBody') in webResponse) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,19 @@ export function GET() {
{ name: 'lettuce' },
{ name: 'broccoli' },
{ name: 'pizza' }
])
]), {
status: 200,
statusText: `tasty`,
}
)
}

export async function POST({ params, request }) {
const body = await request.text();
return new Response(body === `some data` ? `ok` : `not ok`, {
status: 200,
const ok = body === `some data`
return new Response( ok ? `ok` : `not ok`, {
status: ok ? 200 : 400,
statusText: ok ? `ok` : `not ok`,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
Expand Down
12 changes: 12 additions & 0 deletions packages/astro/test/ssr-api-route.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ describe('API routes in SSR', () => {
const request = new Request('http://example.com/food.json');
const response = await app.render(request);
assert.equal(response.status, 200);
assert.equal(response.statusText, 'tasty');
const body = await response.json();
assert.equal(body.length, 3);
});
Expand Down Expand Up @@ -78,6 +79,17 @@ describe('API routes in SSR', () => {
assert.equal(text, 'ok');
});

it('Can read custom status text from API routes', async () => {
const response = await fixture.fetch('/food.json', {
method: 'POST',
body: `not some data`,
});
assert.equal(response.status, 400);
assert.equal(response.statusText, 'not ok');
const text = await response.text();
assert.equal(text, 'not ok');
});

it('Can be passed binary data from multipart formdata', async () => {
const formData = new FormData();
const raw = await fs.promises.readFile(
Expand Down
Loading