Skip to content

Commit a9ad436

Browse files
authored
fix: server.close should close http server (#3263)
1 parent 8f0e61a commit a9ad436

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

packages/core/src/server/devServer.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ export async function createDevServer<
120120
};
121121

122122
let outputFileSystem: Rspack.OutputFileSystem = fs;
123-
124123
let lastStats: Stats[];
125124

126125
// should register onDevCompileDone hook before startCompile
@@ -283,9 +282,12 @@ export async function createDevServer<
283282
serverConfig: config.server,
284283
middlewares,
285284
});
285+
286286
const serverTerminator = getServerTerminator(httpServer);
287287
logger.debug('listen dev server');
288288

289+
options.context.hooks.onCloseDevServer.tap(serverTerminator);
290+
289291
return new Promise<StartServerResult>((resolve) => {
290292
httpServer.listen(
291293
{
@@ -298,24 +300,19 @@ export async function createDevServer<
298300
}
299301

300302
middlewares.use(notFoundMiddleware);
301-
302303
httpServer.on('upgrade', devMiddlewares.onUpgrade);
303304

304305
logger.debug('listen dev server done');
305306

306307
await devServerAPI.afterListen();
307308

308-
const closeServer = async () => {
309-
await Promise.all([devServerAPI.close(), serverTerminator()]);
310-
};
311-
312-
onBeforeRestartServer(closeServer);
309+
onBeforeRestartServer(devServerAPI.close);
313310

314311
resolve({
315312
port,
316313
urls: urls.map((item) => item.url),
317314
server: {
318-
close: closeServer,
315+
close: devServerAPI.close,
319316
},
320317
});
321318
},

packages/core/src/server/prodServer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ export async function startProdServer(
214214
port,
215215
urls: urls.map((item) => item.url),
216216
server: {
217-
close: async () => onClose(),
217+
close: onClose,
218218
},
219219
});
220220
},

0 commit comments

Comments
 (0)