Improve ice and webrtc connection to use

Promise.allSettled
shinyoshiaki · Nov 10, 2023 · 2ec055b · 2ec055b
1 parent 5f160ec
commit 2ec055b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/packages/ice/src/ice.ts b/packages/ice/src/ice.ts
@@ -141,7 +141,7 @@ export class Connection {
   ) {
     let candidates: Candidate[] = [];
 
-    await Promise.all(
+    await Promise.allSettled(
       addresses.map(async (address) => {
         // # create transport
         const protocol = new StunProtocol(this);
@@ -257,9 +257,16 @@ export class Connection {
       candidatePromises.push(turnCandidate);
     }
 
-    const extraCandidates = (await Promise.all(candidatePromises)).filter(
-      (v): v is Candidate => typeof v !== "undefined"
-    );
+    const extraCandidates = [...(await Promise.allSettled(candidatePromises))]
+      .filter(
+        (
+          v
+        ): v is PromiseFulfilledResult<
+          Awaited<typeof candidatePromises[number]>
+        > => v.status === "fulfilled"
+      )
+      .map((v) => v.value)
+      .filter((v): v is Candidate => typeof v !== "undefined");
 
     candidates.push(...extraCandidates);
 

diff --git a/packages/webrtc/src/peerConnection.ts b/packages/webrtc/src/peerConnection.ts
@@ -661,7 +661,7 @@ export class RTCPeerConnection extends EventTarget {
       // no need to gather ice candidates on an existing bundled connection
       await connected.iceGather.gather();
     } else {
-      await Promise.all(
+      await Promise.allSettled(
         this.iceTransports.map((iceTransport) =>
           iceTransport.iceGather.gather()
         )
@@ -755,7 +755,7 @@ export class RTCPeerConnection extends EventTarget {
 
     this.setConnectionState("connecting");
 
-    await Promise.all(
+    await Promise.allSettled(
       this.dtlsTransports.map(async (dtlsTransport) => {
         const { iceTransport } = dtlsTransport;
         await iceTransport.start().catch((err) => {
@@ -995,7 +995,7 @@ export class RTCPeerConnection extends EventTarget {
       // no need to gather ice candidates on an existing bundled connection
       await connected.iceGather.gather();
     } else {
-      await Promise.all(
+      await Promise.allSettled(
         transports.map((iceTransport) => iceTransport.iceGather.gather())
       );
     }