Clean up promises after resolving

packages/next/src/server/base-server.ts

@@ -1014,14 +1014,20 @@ export default abstract class Server<ServerOptions extends Options = Options> {
     this.renderOpts.assetPrefix = prefix ? prefix.replace(/\/$/, '') : ''
   }
 
+  protected prepared: boolean = false
   protected preparedPromise: Promise<void> | null = null
   /**
    * Runs async initialization of server.
    * It is idempotent, won't fire underlying initialization more than once.
    */
   public async prepare(): Promise<void> {
+    if (this.prepared) return
+
     if (this.preparedPromise === null) {
-      this.preparedPromise = this.prepareImpl()
+      this.preparedPromise = this.prepareImpl().then(() => {
+        this.prepared = true
+        this.preparedPromise = null
+      })
     }
     return this.preparedPromise
   }

packages/next/src/server/future/route-matcher-managers/default-route-matcher-manager.ts

@@ -35,8 +35,11 @@ export class DefaultRouteMatcherManager implements RouteMatcherManager {
   }
 
   private waitTillReadyPromise?: Promise<void>
-  public waitTillReady(): Promise<void> {
-    return this.waitTillReadyPromise ?? Promise.resolve()
+  public async waitTillReady(): Promise<void> {
+    if (this.waitTillReadyPromise) {
+      await this.waitTillReadyPromise
+      delete this.waitTillReadyPromise
+    }
   }
 
   private previousMatchers: ReadonlyArray<RouteMatcher> = []

packages/next/src/server/next.ts

@@ -51,6 +51,7 @@ const SYMBOL_LOAD_CONFIG = Symbol('next.load_config')
 export class NextServer {
   private serverPromise?: Promise<Server>
   private server?: Server
+  private reqHandler?: NodeRequestHandler
   private reqHandlerPromise?: Promise<NodeRequestHandler>
   private preparedAssetPrefix?: string
 
@@ -217,14 +218,18 @@ export class NextServer {
   }
 
   private async getServerRequestHandler() {
+    if (this.reqHandler) return this.reqHandler
+
     // Memoize request handler creation
     if (!this.reqHandlerPromise) {
-      this.reqHandlerPromise = this.getServer().then((server) =>
-        getTracer().wrap(
+      this.reqHandlerPromise = this.getServer().then((server) => {
+        this.reqHandler = getTracer().wrap(
           NextServerSpan.getServerRequestHandler,
           server.getRequestHandler().bind(server)
         )
-      )
+        delete this.reqHandlerPromise
+        return this.reqHandler
+      })
     }
     return this.reqHandlerPromise
   }