From fb2f34bf4f2a7beea3302f7489c1055e4a83e6d2 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Tue, 15 Nov 2022 20:00:55 -0800 Subject: [PATCH] common: fix closeQuiet to actually be quiet --- common/src/listen-cluster.ts | 9 ++++++++- common/src/rtsp-server.ts | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/common/src/listen-cluster.ts b/common/src/listen-cluster.ts index a74bfa1b1..99a3ca360 100644 --- a/common/src/listen-cluster.ts +++ b/common/src/listen-cluster.ts @@ -6,7 +6,14 @@ export async function closeQuiet(socket: dgram.Socket | net.Server) { if (!socket) return; try { - await new Promise(resolve => socket.close(resolve)); + await new Promise((r, f) => { + try { + socket.close(r); + } + catch (e) { + f(e); + } + }); } catch (e) { } diff --git a/common/src/rtsp-server.ts b/common/src/rtsp-server.ts index 8dea21008..595503c1a 100644 --- a/common/src/rtsp-server.ts +++ b/common/src/rtsp-server.ts @@ -943,8 +943,8 @@ export class RtspServer { const rtpServer = await createBindZero(); const rtcpServer = await createBindUdp(rtpServer.port + 1); - this.client.on('close', () => rtpServer.server.close()) - this.client.on('close', () => rtcpServer.server.close()) + this.client.on('close', () => closeQuiet(rtpServer.server)); + this.client.on('close', () => closeQuiet(rtcpServer.server)); this.setupTracks[msection.control] = { control: msection.control, protocol: 'udp',