Adding an option to disable HTTP streaming

packages/astro/src/@types/astro.ts

@@ -72,6 +72,7 @@ export interface CLIFlags {
  experimentalSsr?: boolean;
  experimentalIntegrations?: boolean;
  drafts?: boolean;
+ streaming?: boolean;
 }
 
 export interface BuildConfig {

packages/astro/src/core/app/index.ts

@@ -117,6 +117,7 @@ export class App {
  site: this.#manifest.site,
  ssr: true,
  request,
+ streaming: import.meta.env.STREAMING,
  });
 
  return response;

packages/astro/src/core/build/generate.ts

@@ -240,6 +240,7 @@ async function generatePath(
  ? new URL(astroConfig.base, astroConfig.site).toString()
  : astroConfig.site,
  ssr,
+ streaming: astroConfig.server.streaming,
  };
 
  let body: string;

packages/astro/src/core/config.ts

@@ -34,6 +34,7 @@ const ASTRO_CONFIG_DEFAULTS: AstroUserConfig & any = {
  server: {
  host: false,
  port: 3000,
+ streaming: true,
  },
  style: { postcss: { options: {}, plugins: [] } },
  integrations: [],
@@ -154,6 +155,7 @@ export const AstroConfigSchema = z.object({
  .optional()
  .default(ASTRO_CONFIG_DEFAULTS.server.host),
  port: z.number().optional().default(ASTRO_CONFIG_DEFAULTS.server.port),
+ streaming: z.boolean().optional().default(true),
  })
  .optional()
  .default({})
@@ -315,6 +317,7 @@ export async function validateConfig(
  .optional()
  .default(ASTRO_CONFIG_DEFAULTS.server.host),
  port: z.number().optional().default(ASTRO_CONFIG_DEFAULTS.server.port),
+ streaming: z.boolean().optional().default(true),
  })
  .optional()
  .default({})
@@ -404,6 +407,11 @@ function mergeCLIFlags(astroConfig: AstroUserConfig, flags: CLIFlags, cmd: strin
  if (typeof flags.experimentalIntegrations === 'boolean')
  astroConfig.experimental.integrations = flags.experimentalIntegrations;
  if (typeof flags.drafts === 'boolean') astroConfig.markdown.drafts = flags.drafts;
+ if (typeof flags.streaming === 'boolean') {
+ // @ts-expect-error astroConfig.server may be a function, but TS doesn't like attaching properties to a function.
+ // TODO: Come back here and refactor to remove this expected error.
+ astroConfig.server.streaming = flags.streaming;
+ }
  if (typeof flags.port === 'number') {
  // @ts-expect-error astroConfig.server may be a function, but TS doesn't like attaching properties to a function.
  // TODO: Come back here and refactor to remove this expected error.

packages/astro/src/core/render/core.ts

@@ -80,6 +80,7 @@ export interface RenderOptions {
  routeCache: RouteCache;
  site?: string;
  ssr: boolean;
+ streaming: boolean;
  request: Request;
 }
 
@@ -100,6 +101,7 @@ export async function render(opts: RenderOptions): Promise<Response> {
  routeCache,
  site,
  ssr,
+ streaming,
  } = opts;
 
  const paramsAndPropsRes = await getParamsAndProps({
@@ -138,13 +140,14 @@ export async function render(opts: RenderOptions): Promise<Response> {
  site,
  scripts,
  ssr,
+ streaming,
  });
 
  if (!Component.isAstroComponentFactory) {
  const props: Record<string, any> = { ...(pageProps ?? {}), 'server:root': true };
  const html = await renderComponent(result, Component.name, Component, props, null);
  return new Response(html.toString(), result.response);
  } else {
- return await renderPage(result, Component, pageProps, null);
+ return await renderPage(result, Component, pageProps, null, streaming);
  }
 }

packages/astro/src/core/render/dev/index.ts

@@ -184,6 +184,7 @@ export async function render(
  routeCache,
  site: astroConfig.site ? new URL(astroConfig.base, astroConfig.site).toString() : undefined,
  ssr: isBuildingToSSR(astroConfig),
+ streaming: astroConfig.server.streaming,
  });
 
  return response;

packages/astro/src/core/render/result.ts

@@ -24,6 +24,7 @@ function onlyAvailableInSSR(name: string) {
 
 export interface CreateResultArgs {
  ssr: boolean;
+ streaming: boolean;
  logging: LogOptions;
  origin: string;
  markdown: MarkdownRenderingOptions;
@@ -114,7 +115,11 @@ export function createResult(args: CreateResultArgs): SSRResult {
  const url = new URL(request.url);
  const canonicalURL = createCanonicalURL('.' + pathname, site ?? url.origin, paginated);
  const headers = new Headers();
- headers.set('Transfer-Encoding', 'chunked');
+ if (args.streaming) {
+ headers.set('Transfer-Encoding', 'chunked');
+ } else {
+ headers.set('Content-Type', 'text/html');
+ }
  const response: ResponseInit = {
  status: 200,
  statusText: 'OK',

packages/astro/src/runtime/server/index.ts

@@ -692,33 +692,50 @@ export async function renderPage(
  result: SSRResult,
  componentFactory: AstroComponentFactory,
  props: any,
- children: any
+ children: any,
+ streaming: boolean,
 ): Promise<Response> {
  const factoryReturnValue = await componentFactory(result, props, children);
 
  if (isAstroComponent(factoryReturnValue)) {
  let iterable = renderAstroComponent(factoryReturnValue);
- let stream = new ReadableStream({
- start(controller) {
- async function read() {
- let i = 0;
- for await (const chunk of iterable) {
- let html = chunk.toString();
- if (i === 0) {
- if (!/<!doctype html/i.test(html)) {
- controller.enqueue(encoder.encode('<!DOCTYPE html>\n'));
+ let body: BodyInit;
+ if (streaming) {
+ body = new ReadableStream({
+ start(controller) {
+ async function read() {
+ let i = 0;
+ for await (const chunk of iterable) {
+ let html = chunk.toString();
+ if (i === 0) {
+ if (!/<!doctype html/i.test(html)) {
+ controller.enqueue(encoder.encode('<!DOCTYPE html>\n'));
+ }
  }
+ controller.enqueue(encoder.encode(html));
+ i++;
  }
- controller.enqueue(encoder.encode(html));
- i++;
+ controller.close();
+ }
+ read();
+ },
+ });
+ } else {
+ body = '';
+ let i = 0;
+ for await (const chunk of iterable) {
+ let html = chunk.toString();
+ if (i === 0) {
+ if (!/<!doctype html/i.test(html)) {
+ body += '<!DOCTYPE html>\n';
  }
- controller.close();
  }
- read();
- },
- });
+ body += chunk;
+ i++;
+ }
+ }
  let init = result.response;
- let response = createResponse(stream, init);
+ let response = createResponse(body, init);
  return response;
  } else {
  return factoryReturnValue;

packages/astro/src/runtime/server/response.ts

@@ -51,6 +51,9 @@ type CreateResponseFn = (body?: BodyInit | null, init?: ResponseInit) => Respons
 
 export const createResponse: CreateResponseFn = isNodeJS
  ? (body, init) => {
+ if (typeof body === 'string') {
+ return new Response(body, init);
+ }
  if (typeof StreamingCompatibleResponse === 'undefined') {
  return new (createResponseClass())(body, init);
  }

packages/astro/src/vite-plugin-astro-server/index.ts

@@ -84,6 +84,8 @@ async function writeWebResponse(res: http.ServerResponse, webResponse: Response)
  } else if (body instanceof Readable) {
  body.pipe(res);
  return;
+ } else if (typeof body === 'string') {
+ res.write(body);
  } else {
  const reader = body.getReader();
  while (true) {

packages/astro/src/vite-plugin-env/index.ts

@@ -79,6 +79,7 @@ export default function envVitePlugin({
  if (privateEnv) {
  privateEnv.SITE = astroConfig.site ? `'${astroConfig.site}'` : 'undefined';
  privateEnv.SSR = JSON.stringify(true);
+ privateEnv.STREAMING = JSON.stringify(astroConfig.server.streaming);
  const entries = Object.entries(privateEnv).map(([key, value]) => [
  `import.meta.env.${key}`,
  value,
@@ -88,6 +89,7 @@ export default function envVitePlugin({
  replacements = Object.assign(replacements, {
  'import.meta.env.SITE': astroConfig.site ? `'${astroConfig.site}'` : 'undefined',
  'import.meta.env.SSR': JSON.stringify(true),
+ 'import.meta.env.STREAMING': JSON.stringify(astroConfig.server.streaming),
  // This catches destructed `import.meta.env` calls,
  // BUT we only want to inject private keys referenced in the file.
  // We overwrite this value on a per-file basis.

packages/astro/test/streaming.test.js

@@ -71,3 +71,67 @@ describe('Streaming', () => {
  });
  });
 });
+
+describe('Streaming disabled', () => {
+ if (isWindows) return;
+
+ /** @type {import('./test-utils').Fixture} */
+ let fixture;
+
+ before(async () => {
+ fixture = await loadFixture({
+ root: './fixtures/streaming/',
+ adapter: testAdapter(),
+ experimental: {
+ ssr: true,
+ },
+ server: {
+ streaming: false,
+ }
+ });
+ });
+
+ describe('Development', () => {
+ /** @type {import('./test-utils').DevServer} */
+ let devServer;
+
+ before(async () => {
+ devServer = await fixture.startDevServer();
+ });
+
+ after(async () => {
+ await devServer.stop();
+ });
+
+ it('Body is not chunked', async () => {
+ let res = await fixture.fetch('/');
+
+ expect(res.status).to.equal(200);
+ expect(res.headers.get('content-type')).to.equal('text/html');
+
+ let body = await res.text();
+ expect(body.startsWith('<!DOCTYPE html>')).to.equal(true);
+ });
+ });
+
+ describe('Production', () => {
+ before(async () => {
+ await fixture.build();
+ });
+
+ it('Can get the full html body', async () => {
+ const app = await fixture.loadTestAdapterApp();
+ const request = new Request('http:https://example.com/');
+ const response = await app.render(request);
+
+ expect(response.status).to.equal(200);
+ expect(response.headers.get('content-type')).to.equal('text/html');
+
+ const html = await response.text();
+ const $ = cheerio.load(html);
+
+ expect($('header h1')).to.have.a.lengthOf(1);
+ expect($('ul li')).to.have.a.lengthOf(10);
+ });
+ });
+});

packages/integrations/cloudflare/src/index.ts

@@ -18,6 +18,13 @@ export default function createIntegration(): AstroIntegration {
  return {
  name: '@astrojs/cloudflare',
  hooks: {
+ 'astro:config:setup': ({ updateConfig }) => {
+ updateConfig({
+ server: {
+ streaming: false
+ }
+ });
+ },
  'astro:config:done': ({ setAdapter, config }) => {
  setAdapter(getAdapter());
  _config = config;