From c532e7d94f6eda22e405104cc9cbe680683391ea Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Wed, 8 Jun 2022 15:39:00 -0700 Subject: [PATCH] server: Fix node v18 quirk --- server/src/server-settings.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/server/src/server-settings.ts b/server/src/server-settings.ts index 4f2eedcc9..a2afcbfb1 100644 --- a/server/src/server-settings.ts +++ b/server/src/server-settings.ts @@ -9,7 +9,17 @@ export function getIpAddress(): string { return nodeIp.address(); } -function nodeIpAddress(family: string): string[] { +function normalizeFamilyNodeV18(family: string|number) { + if (family === 'IPv4') + return 4; + if (family === 'IPv6') + return 6; + return family; +} + +function nodeIpAddress(family: string|number): string[] { + family = normalizeFamilyNodeV18(family); + // https://chromium.googlesource.com/external/webrtc/+/master/rtc_base/network.cc#236 const costlyNetworks = ["ipsec", "tun", "utun", "tap"]; @@ -35,7 +45,7 @@ function nodeIpAddress(family: string): string[] { } const addresses = interfaces[nic]!.filter( (details) => - details.family.toLowerCase() === family + details.family === family && !nodeIp.isLoopback(details.address) ); return {