Unverified Commit d6d45914 authored by conico974's avatar conico974 Committed by GitHub

fix: top level await in node middleware (#76012)

### What?

Using top level await with a node middleware will crash with `adapterFn`
is not a function

### Why?

When using top level await requiring `middleware.js` will return a
promise that need to be awaited

### How?

Await the require and changed `getMiddleware` signature
Co-authored-by: 's avatarJJ Kasper <jj@jjsweb.site>
parent 8102bc56
...@@ -731,7 +731,7 @@ export default abstract class Server< ...@@ -731,7 +731,7 @@ export default abstract class Server<
private handleNextDataRequest: RouteHandler<ServerRequest, ServerResponse> = private handleNextDataRequest: RouteHandler<ServerRequest, ServerResponse> =
async (req, res, parsedUrl) => { async (req, res, parsedUrl) => {
const middleware = this.getMiddleware() const middleware = await this.getMiddleware()
const params = matchNextDataPathname(parsedUrl.pathname) const params = matchNextDataPathname(parsedUrl.pathname)
// ignore for non-next data URLs // ignore for non-next data URLs
...@@ -3754,7 +3754,7 @@ export default abstract class Server< ...@@ -3754,7 +3754,7 @@ export default abstract class Server<
) )
} }
protected abstract getMiddleware(): MiddlewareRoutingItem | undefined protected abstract getMiddleware(): Promise<MiddlewareRoutingItem | undefined>
protected abstract getFallbackErrorComponents( protected abstract getFallbackErrorComponents(
url?: string url?: string
): Promise<LoadComponentsReturnType | null> ): Promise<LoadComponentsReturnType | null>
...@@ -3871,8 +3871,9 @@ export default abstract class Server< ...@@ -3871,8 +3871,9 @@ export default abstract class Server<
return response return response
} }
const middleware = await this.getMiddleware()
if ( if (
this.getMiddleware() && middleware &&
!!ctx.req.headers['x-nextjs-data'] && !!ctx.req.headers['x-nextjs-data'] &&
(!res.statusCode || res.statusCode === 200 || res.statusCode === 404) (!res.statusCode || res.statusCode === 200 || res.statusCode === 404)
) { ) {
......
...@@ -615,7 +615,7 @@ export default class DevServer extends Server { ...@@ -615,7 +615,7 @@ export default class DevServer extends Server {
return rewrites ?? [] return rewrites ?? []
} }
protected getMiddleware() { protected async getMiddleware() {
// We need to populate the match // We need to populate the match
// field as it isn't serializable // field as it isn't serializable
if (this.middleware?.match === null) { if (this.middleware?.match === null) {
......
...@@ -1343,11 +1343,11 @@ export default class NextNodeServer extends BaseServer< ...@@ -1343,11 +1343,11 @@ export default class NextNodeServer extends BaseServer<
} }
/** Returns the middleware routing item if there is one. */ /** Returns the middleware routing item if there is one. */
protected getMiddleware(): MiddlewareRoutingItem | undefined { protected async getMiddleware(): Promise<MiddlewareRoutingItem | undefined> {
const manifest = this.getMiddlewareManifest() const manifest = this.getMiddlewareManifest()
const middleware = manifest?.middleware?.['/'] const middleware = manifest?.middleware?.['/']
if (!middleware) { if (!middleware) {
const middlewareModule = this.loadNodeMiddleware() const middlewareModule = await this.loadNodeMiddleware()
if (middlewareModule) { if (middlewareModule) {
return { return {
...@@ -1437,7 +1437,7 @@ export default class NextNodeServer extends BaseServer< ...@@ -1437,7 +1437,7 @@ export default class NextNodeServer extends BaseServer<
} }
} }
private loadNodeMiddleware() { private async loadNodeMiddleware() {
if (!this.nextConfig.experimental.nodeMiddleware) { if (!this.nextConfig.experimental.nodeMiddleware) {
return return
} }
...@@ -1448,6 +1448,7 @@ export default class NextNodeServer extends BaseServer< ...@@ -1448,6 +1448,7 @@ export default class NextNodeServer extends BaseServer<
: require(join(this.distDir, 'server', FUNCTIONS_CONFIG_MANIFEST)) : require(join(this.distDir, 'server', FUNCTIONS_CONFIG_MANIFEST))
if (this.renderOpts.dev || functionsConfig?.functions?.['/_middleware']) { if (this.renderOpts.dev || functionsConfig?.functions?.['/_middleware']) {
// if used with top level await, this will be a promise
return require(join(this.distDir, 'server', 'middleware.js')) return require(join(this.distDir, 'server', 'middleware.js'))
} }
} catch (err) { } catch (err) {
...@@ -1468,8 +1469,9 @@ export default class NextNodeServer extends BaseServer< ...@@ -1468,8 +1469,9 @@ export default class NextNodeServer extends BaseServer<
*/ */
protected async hasMiddleware(pathname: string): Promise<boolean> { protected async hasMiddleware(pathname: string): Promise<boolean> {
const info = this.getEdgeFunctionInfo({ page: pathname, middleware: true }) const info = this.getEdgeFunctionInfo({ page: pathname, middleware: true })
const nodeMiddleware = await this.loadNodeMiddleware()
if (!info && this.loadNodeMiddleware()) { if (!info && nodeMiddleware) {
return true return true
} }
return Boolean(info && info.paths.length > 0) return Boolean(info && info.paths.length > 0)
...@@ -1543,7 +1545,7 @@ export default class NextNodeServer extends BaseServer< ...@@ -1543,7 +1545,7 @@ export default class NextNodeServer extends BaseServer<
params?: { [key: string]: string | string[] } params?: { [key: string]: string | string[] }
} = {} } = {}
const middleware = this.getMiddleware() const middleware = await this.getMiddleware()
if (!middleware) { if (!middleware) {
return { finished: false } return { finished: false }
} }
...@@ -1588,7 +1590,7 @@ export default class NextNodeServer extends BaseServer< ...@@ -1588,7 +1590,7 @@ export default class NextNodeServer extends BaseServer<
// we decide we want to // we decide we want to
if (!middlewareInfo) { if (!middlewareInfo) {
let middlewareModule let middlewareModule
middlewareModule = this.loadNodeMiddleware() middlewareModule = await this.loadNodeMiddleware()
if (!middlewareModule) { if (!middlewareModule) {
throw new MiddlewareNotFoundError() throw new MiddlewareNotFoundError()
...@@ -1666,7 +1668,7 @@ export default class NextNodeServer extends BaseServer< ...@@ -1666,7 +1668,7 @@ export default class NextNodeServer extends BaseServer<
return true return true
} }
const middleware = this.getMiddleware() const middleware = await this.getMiddleware()
if (!middleware) { if (!middleware) {
return handleFinished() return handleFinished()
} }
......
...@@ -378,10 +378,10 @@ export default class NextWebServer extends BaseServer< ...@@ -378,10 +378,10 @@ export default class NextWebServer extends BaseServer<
return undefined return undefined
} }
protected getMiddleware(): MiddlewareRoutingItem | undefined { protected getMiddleware(): Promise<MiddlewareRoutingItem | undefined> {
// The web server does not need to handle middleware. This is done by the // The web server does not need to handle middleware. This is done by the
// upstream proxy (edge runtime or node server). // upstream proxy (edge runtime or node server).
return undefined return Promise.resolve(undefined)
} }
protected getFilesystemPaths() { protected getFilesystemPaths() {
......
...@@ -7,6 +7,11 @@ export const config = { ...@@ -7,6 +7,11 @@ export const config = {
runtime: 'nodejs', runtime: 'nodejs',
} }
// When there is a top level await, requiring middleware.js will return a Promise
await new Promise((resolve) => {
setTimeout(resolve, 100)
})
const PATTERNS = [] const PATTERNS = []
const params = (url) => { const params = (url) => {
......
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