fix: should terminate http server correctly

packages/core/src/server/devServer.ts

@@ -25,6 +25,7 @@ import {
   getAddressUrls,
   getRoutes,
   getServerConfig,
+  getServerTerminator,
   printServerURLs,
 } from './helper';
 import { createHttpServer } from './httpServer';
@@ -273,7 +274,7 @@ export async function createDevServer<
     }
   }
 
-  const server: RsbuildDevServer = {
+  const devServerAPI: RsbuildDevServer = {
     port,
     middlewares,
     environments: environmentAPI,
@@ -282,6 +283,7 @@ export async function createDevServer<
         serverConfig: config.server,
         middlewares,
       });
+      const serverTerminator = getServerTerminator(httpServer);
       logger.debug('listen dev server');
 
       return new Promise<StartServerResult>((resolve) => {
@@ -301,11 +303,10 @@ export async function createDevServer<
 
             logger.debug('listen dev server done');
 
-            await server.afterListen();
+            await devServerAPI.afterListen();
 
             const closeServer = async () => {
-              await server.close();
-              httpServer.close();
+              await Promise.all([devServerAPI.close(), serverTerminator()]);
             };
 
             onBeforeRestartServer(closeServer);
@@ -333,13 +334,12 @@ export async function createDevServer<
     },
     close: async () => {
       await options.context.hooks.onCloseDevServer.call();
-      await devMiddlewares.close();
-      await fileWatcher?.close();
+      await Promise.all([devMiddlewares.close(), fileWatcher?.close()]);
     },
     printUrls,
   };
 
   logger.debug('create dev server done');
 
-  return server;
+  return devServerAPI;
 }

packages/core/src/server/helper.ts

@@ -1,4 +1,5 @@
-import type { IncomingMessage } from 'node:http';
+import type { IncomingMessage, Server } from 'node:http';
+import type { Http2SecureServer } from 'node:http2';
 import net from 'node:net';
 import type { Socket } from 'node:net';
 import os from 'node:os';
@@ -386,3 +387,35 @@ export const getAddressUrls = ({
 export const getCompilationName = (
   compiler: Rspack.Compiler | Rspack.Compilation,
 ) => `${compiler.name ?? ''}_${compiler.options.output.uniqueName ?? ''}`;
+
+export function getServerTerminator(
+  server: Server | Http2SecureServer,
+): () => Promise<void> {
+  let listened = false;
+  const pendingSockets = new Set<net.Socket>();
+
+  const onConnection = (socket: net.Socket) => {
+    pendingSockets.add(socket);
+    socket.on('close', () => {
+      pendingSockets.delete(socket);
+    });
+  };
+
+  server.on('connection', onConnection);
+  server.on('secureConnection', onConnection);
+  server.once('listening', () => {
+    listened = true;
+  });
+
+  return () =>
+    new Promise<void>((resolve, reject) => {
+      for (const socket of pendingSockets) {
+        socket.destroy();
+      }
+      if (listened) {
+        server.close((err) => (err ? reject(err) : resolve()));
+      } else {
+        resolve();
+      }
+    });
+}

packages/core/src/server/prodServer.ts

@@ -15,6 +15,7 @@ import {
   getAddressUrls,
   getRoutes,
   getServerConfig,
+  getServerTerminator,
   printServerURLs,
 } from './helper';
 import { createHttpServer } from './httpServer';
@@ -140,7 +141,7 @@ export class RsbuildProdServer {
     });
   }
 
-  public close(): void {}
+  public async close(): Promise<void> {}
 }
 
 export async function startProdServer(
@@ -177,6 +178,7 @@ export async function startProdServer(
     serverConfig,
     middlewares: server.middlewares,
   });
+  const serverTerminator = getServerTerminator(httpServer);
 
   await server.onInit(httpServer);
 
@@ -204,18 +206,15 @@ export async function startProdServer(
           printUrls: serverConfig.printUrls,
         });
 
-        const onClose = () => {
-          server.close();
-          httpServer.close();
+        const onClose = async () => {
+          await Promise.all([server.close(), serverTerminator()]);
         };
 
         resolve({
           port,
           urls: urls.map((item) => item.url),
           server: {
-            close: async () => {
-              onClose();
-            },
+            close: async () => onClose(),
           },
         });
       },