Add a warning when using encoding in SSR and headers on objects in endpoints (#6358)

* fix(endpoints): Add a warning when trying to set encoding and headers in SSR

* fix(endpoint): Oops, it'd be great if it actually worked

* fix(endpoint): Fix import path

* fix(endpoint): Add link to docs

* Update packages/astro/src/core/endpoint/index.ts

Co-authored-by: Emanuele Stoppa <my.burning@gmail.com>

* fix: don't output encoding warning if endpoint is pre-rendered

* Update packages/astro/src/core/endpoint/index.ts

* Update packages/astro/src/core/endpoint/index.ts

---------

Co-authored-by: Emanuele Stoppa <my.burning@gmail.com>
Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
This commit is contained in:
Erika 2023-02-27 19:07:13 +01:00 committed by GitHub
parent ff2e4dac7b
commit 95164bfdd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 33 additions and 8 deletions

View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Add warning when using headers and encoding in endpoints in SSR

View file

@ -5,14 +5,13 @@ import type {
RouteData, RouteData,
SSRElement, SSRElement,
} from '../../@types/astro'; } from '../../@types/astro';
import type { LogOptions } from '../logger/core.js';
import type { RouteInfo, SSRManifest as Manifest } from './types'; import type { RouteInfo, SSRManifest as Manifest } from './types';
import mime from 'mime'; import mime from 'mime';
import { attachToResponse, getSetCookiesFromResponse } from '../cookies/index.js'; import { attachToResponse, getSetCookiesFromResponse } from '../cookies/index.js';
import { call as callEndpoint } from '../endpoint/index.js'; import { call as callEndpoint } from '../endpoint/index.js';
import { consoleLogDestination } from '../logger/console.js'; import { consoleLogDestination } from '../logger/console.js';
import { error } from '../logger/core.js'; import { error, type LogOptions } from '../logger/core.js';
import { joinPaths, prependForwardSlash, removeTrailingForwardSlash } from '../path.js'; import { joinPaths, prependForwardSlash, removeTrailingForwardSlash } from '../path.js';
import { import {
createEnvironment, createEnvironment,
@ -228,7 +227,7 @@ export class App {
status, status,
}); });
const result = await callEndpoint(handler, this.#env, ctx); const result = await callEndpoint(handler, this.#env, ctx, this.#logging);
if (result.type === 'response') { if (result.type === 'response') {
if (result.response.headers.get('X-Astro-Response') === 'Not-Found') { if (result.response.headers.get('X-Astro-Response') === 'Not-Found') {

View file

@ -386,7 +386,7 @@ async function generatePath(
let encoding: BufferEncoding | undefined; let encoding: BufferEncoding | undefined;
if (pageData.route.type === 'endpoint') { if (pageData.route.type === 'endpoint') {
const endpointHandler = mod as unknown as EndpointHandler; const endpointHandler = mod as unknown as EndpointHandler;
const result = await callEndpoint(endpointHandler, env, ctx); const result = await callEndpoint(endpointHandler, env, ctx, logging);
if (result.type === 'response') { if (result.type === 'response') {
throwIfRedirectNotAllowed(result.response, opts.settings.config); throwIfRedirectNotAllowed(result.response, opts.settings.config);

View file

@ -1,9 +1,10 @@
import type { EndpointHandler } from '../../../@types/astro'; import type { EndpointHandler } from '../../../@types/astro';
import type { LogOptions } from '../../logger/core';
import type { SSROptions } from '../../render/dev'; import type { SSROptions } from '../../render/dev';
import { createRenderContext } from '../../render/index.js'; import { createRenderContext } from '../../render/index.js';
import { call as callEndpoint } from '../index.js'; import { call as callEndpoint } from '../index.js';
export async function call(options: SSROptions) { export async function call(options: SSROptions, logging: LogOptions) {
const { const {
env, env,
preload: [, mod], preload: [, mod],
@ -17,5 +18,5 @@ export async function call(options: SSROptions) {
route: options.route, route: options.route,
}); });
return await callEndpoint(endpointHandler, env, ctx); return await callEndpoint(endpointHandler, env, ctx, logging);
} }

View file

@ -5,6 +5,7 @@ import { renderEndpoint } from '../../runtime/server/index.js';
import { ASTRO_VERSION } from '../constants.js'; import { ASTRO_VERSION } from '../constants.js';
import { AstroCookies, attachToResponse } from '../cookies/index.js'; import { AstroCookies, attachToResponse } from '../cookies/index.js';
import { AstroError, AstroErrorData } from '../errors/index.js'; import { AstroError, AstroErrorData } from '../errors/index.js';
import { LogOptions, warn } from '../logger/core.js';
import { getParamsAndProps, GetParamsAndPropsError } from '../render/core.js'; import { getParamsAndProps, GetParamsAndPropsError } from '../render/core.js';
const clientAddressSymbol = Symbol.for('astro.clientAddress'); const clientAddressSymbol = Symbol.for('astro.clientAddress');
@ -71,7 +72,8 @@ function createAPIContext({
export async function call( export async function call(
mod: EndpointHandler, mod: EndpointHandler,
env: Environment, env: Environment,
ctx: RenderContext ctx: RenderContext,
logging: LogOptions
): Promise<EndpointCallResult> { ): Promise<EndpointCallResult> {
const paramsAndPropsResp = await getParamsAndProps({ const paramsAndPropsResp = await getParamsAndProps({
mod: mod as any, mod: mod as any,
@ -111,6 +113,24 @@ export async function call(
}; };
} }
if (env.ssr && !mod.prerender) {
if (response.hasOwnProperty('headers')) {
warn(
logging,
'ssr',
'Setting headers is not supported when returning an object. Please return an instance of Response. See https://docs.astro.build/en/core-concepts/endpoints/#server-endpoints-api-routes for more information.'
);
}
if (response.encoding) {
warn(
logging,
'ssr',
'`encoding` is ignored in SSR. To return a charset other than UTF-8, please return an instance of Response. See https://docs.astro.build/en/core-concepts/endpoints/#server-endpoints-api-routes for more information.'
);
}
}
return { return {
type: 'simple', type: 'simple',
body: response.body, body: response.body,

View file

@ -172,7 +172,7 @@ export async function handleRoute(
// Route successfully matched! Render it. // Route successfully matched! Render it.
if (route.type === 'endpoint') { if (route.type === 'endpoint') {
const result = await callEndpoint(options); const result = await callEndpoint(options, logging);
if (result.type === 'response') { if (result.type === 'response') {
if (result.response.headers.get('X-Astro-Response') === 'Not-Found') { if (result.response.headers.get('X-Astro-Response') === 'Not-Found') {
const fourOhFourRoute = await matchRoute('/404', env, manifest); const fourOhFourRoute = await matchRoute('/404', env, manifest);