fix: Should not fail to generate sdp due to the mapping failure

Voxelum · Dec 10, 2023 · 5c9e0b0 · 5c9e0b0
1 parent 15c3487
commit 5c9e0b0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/xmcl-runtime/peer/PeerService.ts b/xmcl-runtime/peer/PeerService.ts
@@ -366,7 +366,9 @@ export class PeerService extends StatefulService<PeerState> implements IPeerServ
           const [ip, port] = parseCandidate(candidate.candidate)
           if (ip && port) {
             const state = await natService.getNatState()
-            await mapLocalPort(natService, state.localIp, privatePort, Number(port), this)
+            await mapLocalPort(natService, state.localIp, privatePort, Number(port), this).catch((e) => {
+              this.error(e)
+            })
           }
         }
         if (remoteId) {

diff --git a/xmcl-runtime/peer/mapAndGetPortCanidate.ts b/xmcl-runtime/peer/mapAndGetPortCanidate.ts
@@ -50,7 +50,15 @@ export async function mapLocalPort(natService: NatService, ip: string, priv: num
       const candidates = getUnmapCandidates(currentMappings, mappings)
       console.log(candidates)
       for (const c of candidates) {
-        await natService.unmap(c)
+        await natService.unmap(c).catch(() => {})
+      }
+      await Promise.all(mappings.map(n => natService.map(n)))
+    } else if (err.detail.UPnPError && err.detail.UPnPError.errorCode === 718) {
+      // Conflict
+      const candidates = getUnmapCandidates(currentMappings, mappings)
+      console.log(candidates)
+      for (const c of candidates) {
+        await natService.unmap(c).catch(() => {})
       }
       await Promise.all(mappings.map(n => natService.map(n)))
     } else {