Unverified Commit 8822630d authored by Shu Ding's avatar Shu Ding Committed by GitHub

Clean up promises after resolving (#52656)

Long-hanging promises are retaining the closure context where it's being
`await`'ed even it's resolved already. You can tell it from this
screenshot:

<img width="1822" alt="CleanShot 2023-07-13 at 18 09 11@2x"
src="https://github.com/vercel/next.js/assets/3676859/1d6210b0-16ba-440e-a8b6-c8c4343f4850">

In some cases, the entire `req` object is retained because of that. This
increases the memory usage a bit.

So this PR changes these promises to be cleaned up after they got
resolved.
Co-authored-by: 's avatarkodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
parent ca1129c4
...@@ -1014,14 +1014,20 @@ export default abstract class Server<ServerOptions extends Options = Options> { ...@@ -1014,14 +1014,20 @@ export default abstract class Server<ServerOptions extends Options = Options> {
this.renderOpts.assetPrefix = prefix ? prefix.replace(/\/$/, '') : '' this.renderOpts.assetPrefix = prefix ? prefix.replace(/\/$/, '') : ''
} }
protected prepared: boolean = false
protected preparedPromise: Promise<void> | null = null protected preparedPromise: Promise<void> | null = null
/** /**
* Runs async initialization of server. * Runs async initialization of server.
* It is idempotent, won't fire underlying initialization more than once. * It is idempotent, won't fire underlying initialization more than once.
*/ */
public async prepare(): Promise<void> { public async prepare(): Promise<void> {
if (this.prepared) return
if (this.preparedPromise === null) { if (this.preparedPromise === null) {
this.preparedPromise = this.prepareImpl() this.preparedPromise = this.prepareImpl().then(() => {
this.prepared = true
this.preparedPromise = null
})
} }
return this.preparedPromise return this.preparedPromise
} }
......
...@@ -35,8 +35,11 @@ export class DefaultRouteMatcherManager implements RouteMatcherManager { ...@@ -35,8 +35,11 @@ export class DefaultRouteMatcherManager implements RouteMatcherManager {
} }
private waitTillReadyPromise?: Promise<void> private waitTillReadyPromise?: Promise<void>
public waitTillReady(): Promise<void> { public async waitTillReady(): Promise<void> {
return this.waitTillReadyPromise ?? Promise.resolve() if (this.waitTillReadyPromise) {
await this.waitTillReadyPromise
delete this.waitTillReadyPromise
}
} }
private previousMatchers: ReadonlyArray<RouteMatcher> = [] private previousMatchers: ReadonlyArray<RouteMatcher> = []
......
...@@ -51,6 +51,7 @@ const SYMBOL_LOAD_CONFIG = Symbol('next.load_config') ...@@ -51,6 +51,7 @@ const SYMBOL_LOAD_CONFIG = Symbol('next.load_config')
export class NextServer { export class NextServer {
private serverPromise?: Promise<Server> private serverPromise?: Promise<Server>
private server?: Server private server?: Server
private reqHandler?: NodeRequestHandler
private reqHandlerPromise?: Promise<NodeRequestHandler> private reqHandlerPromise?: Promise<NodeRequestHandler>
private preparedAssetPrefix?: string private preparedAssetPrefix?: string
...@@ -217,14 +218,18 @@ export class NextServer { ...@@ -217,14 +218,18 @@ export class NextServer {
} }
private async getServerRequestHandler() { private async getServerRequestHandler() {
if (this.reqHandler) return this.reqHandler
// Memoize request handler creation // Memoize request handler creation
if (!this.reqHandlerPromise) { if (!this.reqHandlerPromise) {
this.reqHandlerPromise = this.getServer().then((server) => this.reqHandlerPromise = this.getServer().then((server) => {
getTracer().wrap( this.reqHandler = getTracer().wrap(
NextServerSpan.getServerRequestHandler, NextServerSpan.getServerRequestHandler,
server.getRequestHandler().bind(server) server.getRequestHandler().bind(server)
) )
) delete this.reqHandlerPromise
return this.reqHandler
})
} }
return this.reqHandlerPromise return this.reqHandlerPromise
} }
......
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