Merge branch 'master' of https://github.com/murat-dogan/node-datachannel

murat-dogan · Sep 14, 2024 · d1bf7f8 · d1bf7f8
2 parents 18ace38 + 7519ce5
commit d1bf7f8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -25,6 +25,7 @@ jobs:
             libc: musl
             gcc_install: clang lld
             gcc: clang
+            gxx: clang++
           # libc is intentionally not set here, as prebuild-install requires libc to not be set for glibc builds
           - triple: "linux-gnu"
             platform: debian
@@ -48,17 +49,20 @@ jobs:
             platform: debian
             gcc_install: gcc g++
             gcc: gcc
+            gxx: g++
           - arch: arm64
             platform: debian
             gcc_install: gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
             gcc: aarch64-linux-gnu-gcc
+            gxx: aarch64-linux-gnu-g++
           # debian uses the triple `arm-linux-gnueabihf` instead of alpine's `armv7-alpine-linux-musleabihf`
           # because of this, we explicitly override triple_arch for debian arm
           - triple_arch: arm
             arch: arm
             platform: debian
             gcc_install: gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
             gcc: arm-linux-gnueabihf-gcc
+            gxx: arm-linux-gnueabihf-g++
 
     steps:
       - uses: actions/checkout@v4

diff --git a/cmake/toolchain/ci.cmake b/cmake/toolchain/ci.cmake
@@ -3,7 +3,7 @@ set(triple $ENV{TRIPLE})
 
 # use clang and lld
 set(CMAKE_C_COMPILER $ENV{GCC})
-set(CMAKE_CXX_COMPILER $ENV{GCC})
+set(CMAKE_CXX_COMPILER $ENV{GXX})
 if (CMAKE_C_COMPILER MATCHES clang)
     add_link_options("-fuse-ld=lld")
 endif()

diff --git a/polyfill/RTCPeerConnection.js b/polyfill/RTCPeerConnection.js
@@ -55,10 +55,18 @@ export default class _RTCPeerConnection extends EventTarget {
                 if (config.iceServers[i].urls?.some((url) => url == ''))
                     throw exceptions.SyntaxError('IceServers urls cannot be empty');
 
-                // urls should match the regex "stun\:\w*|turn\:\w*|turns\:\w*"
+                // urls should be valid URLs and match the protocols "stun:|turn:|turns:"
                 if (
                     config.iceServers[i].urls?.some(
-                        (url) => !/^(stun:[\w,\.,:]*|turn:[\w,\.,:]*|turns:[\w,\.,:]*)$/.test(url),
+                        (url) => {
+                            try {
+                                const parsedURL = new URL(url)
+
+                                return !/^(stun:|turn:|turns:)$/.test(parsedURL.protocol)
+                            } catch (error) {
+                                return true
+                            }
+                        },
                     )
                 )
                     throw exceptions.SyntaxError('IceServers urls wrong format');