From e3fd9a963a7acb693f1ae8cbf76de694a3ace935 Mon Sep 17 00:00:00 2001
From: Juliusz Chroboczek <jch@irif.fr>
Date: Fri, 25 Dec 2020 18:26:30 +0100
Subject: [PATCH] Improve error handling during negotiation.

---
 static/protocol.js | 43 ++++++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/static/protocol.js b/static/protocol.js
index 2f89f15..18f83a9 100644
--- a/static/protocol.js
+++ b/static/protocol.js
@@ -620,17 +620,30 @@ ServerConnection.prototype.gotOffer = async function(id, labels, offer, renegoti
     if(sc.ondownstream)
         sc.ondownstream.call(sc, c);
 
-    await c.pc.setRemoteDescription(offer);
-    await c.flushRemoteIceCandidates()
-    let answer = await c.pc.createAnswer();
-    if(!answer)
-        throw new Error("Didn't create answer");
-    await c.pc.setLocalDescription(answer);
-    this.send({
-        type: 'answer',
-        id: id,
-        answer: answer,
-    });
+    try {
+        await c.pc.setRemoteDescription(offer);
+
+        await c.flushRemoteIceCandidates();
+
+        let answer = await c.pc.createAnswer();
+        if(!answer)
+            throw new Error("Didn't create answer");
+        await c.pc.setLocalDescription(answer);
+        this.send({
+            type: 'answer',
+            id: id,
+            answer: answer,
+        });
+    } catch(e) {
+        try {
+            if(c.onerror)
+                c.onerror.call(c, e);
+        } finally {
+            c.abort();
+        }
+        return;
+    }
+
     c.localDescriptionSent = true;
     c.flushLocalIceCandidates();
     if(c.onnegotiationcompleted)
@@ -667,8 +680,12 @@ ServerConnection.prototype.gotAnswer = async function(id, answer) {
     try {
         await c.pc.setRemoteDescription(answer);
     } catch(e) {
-        if(c.onerror)
-            c.onerror.call(c, e);
+        try {
+            if(c.onerror)
+                c.onerror.call(c, e);
+        } finally {
+            c.close();
+        }
         return;
     }
     await c.flushRemoteIceCandidates();