Unverified Commit 71bc0db9 authored by Gerald Monaco's avatar Gerald Monaco Committed by GitHub

Combine sendPayload and sendHTML (#15475)

parent 193ffe76
...@@ -83,6 +83,7 @@ export function createEntrypoints( ...@@ -83,6 +83,7 @@ export function createEntrypoints(
buildId, buildId,
assetPrefix: config.assetPrefix, assetPrefix: config.assetPrefix,
generateEtags: config.generateEtags, generateEtags: config.generateEtags,
poweredByHeader: config.poweredByHeader,
canonicalBase: config.canonicalBase, canonicalBase: config.canonicalBase,
basePath: config.basePath, basePath: config.basePath,
runtimeConfig: hasRuntimeConfig runtimeConfig: hasRuntimeConfig
......
...@@ -22,6 +22,7 @@ export type ServerlessLoaderQuery = { ...@@ -22,6 +22,7 @@ export type ServerlessLoaderQuery = {
buildId: string buildId: string
assetPrefix: string assetPrefix: string
generateEtags: string generateEtags: string
poweredByHeader: string
canonicalBase: string canonicalBase: string
basePath: string basePath: string
runtimeConfig: string runtimeConfig: string
...@@ -43,6 +44,7 @@ const nextServerlessLoader: loader.Loader = function () { ...@@ -43,6 +44,7 @@ const nextServerlessLoader: loader.Loader = function () {
absoluteDocumentPath, absoluteDocumentPath,
absoluteErrorPath, absoluteErrorPath,
generateEtags, generateEtags,
poweredByHeader,
basePath, basePath,
runtimeConfig, runtimeConfig,
previewProps, previewProps,
...@@ -266,7 +268,6 @@ const nextServerlessLoader: loader.Loader = function () { ...@@ -266,7 +268,6 @@ const nextServerlessLoader: loader.Loader = function () {
const {parse: parseQs} = require('querystring') const {parse: parseQs} = require('querystring')
const {renderToHTML} = require('next/dist/next-server/server/render'); const {renderToHTML} = require('next/dist/next-server/server/render');
const { tryGetPreviewData } = require('next/dist/next-server/server/api-utils'); const { tryGetPreviewData } = require('next/dist/next-server/server/api-utils');
const {sendHTML} = require('next/dist/next-server/server/send-html');
const {sendPayload} = require('next/dist/next-server/server/send-payload'); const {sendPayload} = require('next/dist/next-server/server/send-payload');
const buildManifest = require('${buildManifest}'); const buildManifest = require('${buildManifest}');
const reactLoadableManifest = require('${reactLoadableManifest}'); const reactLoadableManifest = require('${reactLoadableManifest}');
...@@ -494,9 +495,9 @@ const nextServerlessLoader: loader.Loader = function () { ...@@ -494,9 +495,9 @@ const nextServerlessLoader: loader.Loader = function () {
await initServer() await initServer()
const html = await renderReqToHTML(req, res) const html = await renderReqToHTML(req, res)
if (html) { if (html) {
sendHTML(req, res, html, {generateEtags: ${ sendPayload(req, res, html, 'html', {generateEtags: ${JSON.stringify(
generateEtags === 'true' ? true : false generateEtags === 'true'
}}) )}, poweredByHeader: ${JSON.stringify(poweredByHeader === 'true')}})
} }
} catch(err) { } catch(err) {
console.error(err) console.error(err)
......
...@@ -52,7 +52,6 @@ import Router, { ...@@ -52,7 +52,6 @@ import Router, {
route, route,
Route, Route,
} from './router' } from './router'
import { sendHTML } from './send-html'
import { sendPayload } from './send-payload' import { sendPayload } from './send-payload'
import { serveStatic } from './serve-static' import { serveStatic } from './serve-static'
import { IncrementalCache } from './incremental-cache' import { IncrementalCache } from './incremental-cache'
...@@ -813,7 +812,10 @@ export default class Server { ...@@ -813,7 +812,10 @@ export default class Server {
html: string html: string
): Promise<void> { ): Promise<void> {
const { generateEtags, poweredByHeader } = this.renderOpts const { generateEtags, poweredByHeader } = this.renderOpts
return sendHTML(req, res, html, { generateEtags, poweredByHeader }) return sendPayload(req, res, html, 'html', {
generateEtags,
poweredByHeader,
})
} }
public async render( public async render(
...@@ -996,7 +998,10 @@ export default class Server { ...@@ -996,7 +998,10 @@ export default class Server {
res, res,
data, data,
isDataReq ? 'json' : 'html', isDataReq ? 'json' : 'html',
this.renderOpts.generateEtags, {
generateEtags: this.renderOpts.generateEtags,
poweredByHeader: this.renderOpts.poweredByHeader,
},
!this.renderOpts.dev !this.renderOpts.dev
? { ? {
private: isPreviewMode, private: isPreviewMode,
...@@ -1126,7 +1131,10 @@ export default class Server { ...@@ -1126,7 +1131,10 @@ export default class Server {
html = renderResult.html html = renderResult.html
} }
sendPayload(req, res, html, 'html', this.renderOpts.generateEtags) sendPayload(req, res, html, 'html', {
generateEtags: this.renderOpts.generateEtags,
poweredByHeader: this.renderOpts.poweredByHeader,
})
return null return null
} }
...@@ -1141,7 +1149,10 @@ export default class Server { ...@@ -1141,7 +1149,10 @@ export default class Server {
res, res,
isDataReq ? JSON.stringify(pageData) : html, isDataReq ? JSON.stringify(pageData) : html,
isDataReq ? 'json' : 'html', isDataReq ? 'json' : 'html',
this.renderOpts.generateEtags, {
generateEtags: this.renderOpts.generateEtags,
poweredByHeader: this.renderOpts.poweredByHeader,
},
!this.renderOpts.dev || (isServerProps && !isDataReq) !this.renderOpts.dev || (isServerProps && !isDataReq)
? { ? {
private: isPreviewMode, private: isPreviewMode,
......
import { IncomingMessage, ServerResponse } from 'http'
import generateETag from 'next/dist/compiled/etag'
import fresh from 'next/dist/compiled/fresh'
import { isResSent } from '../lib/utils'
export function sendHTML(
req: IncomingMessage,
res: ServerResponse,
html: string,
{
generateEtags,
poweredByHeader,
}: { generateEtags: boolean; poweredByHeader: boolean }
) {
if (isResSent(res)) return
const etag = generateEtags ? generateETag(html) : undefined
if (poweredByHeader) {
res.setHeader('X-Powered-By', 'Next.js')
}
if (fresh(req.headers, { etag })) {
res.statusCode = 304
res.end()
return
}
if (etag) {
res.setHeader('ETag', etag)
}
if (!res.getHeader('Content-Type')) {
res.setHeader('Content-Type', 'text/html; charset=utf-8')
}
res.setHeader('Content-Length', Buffer.byteLength(html))
res.end(req.method === 'HEAD' ? null : html)
}
...@@ -8,7 +8,10 @@ export function sendPayload( ...@@ -8,7 +8,10 @@ export function sendPayload(
res: ServerResponse, res: ServerResponse,
payload: any, payload: any,
type: 'html' | 'json', type: 'html' | 'json',
generateEtags: boolean, {
generateEtags,
poweredByHeader,
}: { generateEtags: boolean; poweredByHeader: boolean },
options?: options?:
| { private: true } | { private: true }
| { private: boolean; stateful: true } | { private: boolean; stateful: true }
...@@ -18,6 +21,10 @@ export function sendPayload( ...@@ -18,6 +21,10 @@ export function sendPayload(
return return
} }
if (poweredByHeader && type === 'html') {
res.setHeader('X-Powered-By', 'Next.js')
}
const etag = generateEtags ? generateETag(payload) : undefined const etag = generateEtags ? generateETag(payload) : undefined
if (fresh(req.headers, { etag })) { if (fresh(req.headers, { etag })) {
...@@ -30,10 +37,12 @@ export function sendPayload( ...@@ -30,10 +37,12 @@ export function sendPayload(
res.setHeader('ETag', etag) res.setHeader('ETag', etag)
} }
res.setHeader( if (!res.getHeader('Content-Type')) {
'Content-Type', res.setHeader(
type === 'json' ? 'application/json' : 'text/html; charset=utf-8' 'Content-Type',
) type === 'json' ? 'application/json' : 'text/html; charset=utf-8'
)
}
res.setHeader('Content-Length', Buffer.byteLength(payload)) res.setHeader('Content-Length', Buffer.byteLength(payload))
if (options != null) { if (options != null) {
if (options.private || options.stateful) { if (options.private || options.stateful) {
...@@ -61,5 +70,5 @@ export function sendPayload( ...@@ -61,5 +70,5 @@ export function sendPayload(
) )
} }
} }
res.end(payload) res.end(req.method === 'HEAD' ? null : payload)
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment