@wireapp/avs 9.9.8 → 9.10.9

package/dist/avs_pc.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var ENV_FIREFOX = 1;
+var TIMEOUT_GATHER = 2000;
 var em_module;
 var logFn = null;
 var userMediaHandler = null;
@@ -308,6 +309,21 @@ function ccallGetMediaKey(self, index) {
 function ccallGetCurrentMediaKey(self) {
     em_module.ccall("pc_get_current_media_key", null, ["number"], [self]);
 }
+function gatheringComplete(pc) {
+    if (pc.gatherTimer != null) {
+        clearTimeout(pc.gatherTimer);
+        pc.gatherTimer = null;
+    }
+    var rtc = pc.rtc;
+    if (!rtc) {
+        return;
+    }
+    var sdp = rtc.localDescription;
+    if (!sdp) {
+        return;
+    }
+    ccallGatheringHandler(pc, sdp.type.toString(), sdp.sdp.toString());
+}
 function gatheringHandler(pc) {
     var rtc = pc.rtc;
     if (!rtc) {
@@ -321,11 +337,7 @@ function gatheringHandler(pc) {
         case "gathering":
             break;
         case "complete":
-            var sdp = rtc.localDescription;
-            if (!sdp) {
-                return;
-            }
-            ccallGatheringHandler(pc, sdp.type.toString(), sdp.sdp.toString());
+            gatheringComplete(pc);
             break;
     }
 }
@@ -366,11 +378,21 @@ function candidateHandler(pc, cand) {
         return;
     if (!cand) {
         pc_log(LOG_LEVEL_INFO, 'candidateHandler: end-of-candidates');
-        var sdp = pc.rtc.localDescription;
-        if (sdp)
-            ccallGatheringHandler(pc, sdp.type.toString(), sdp.sdp.toString());
+        gatheringComplete(pc);
         return;
     }
+    /* As soon as we get the first relay, we start a gathering timer
+     * this was we ensure that gathering never takes more than the
+     * timeout period.
+     */
+    if (cand.type === 'relay') {
+        if (pc.gatherTimer == null) {
+            pc.gatherTimer = setTimeout(function () {
+                pc.gatherTimer = null;
+                gatheringComplete(pc);
+            }, TIMEOUT_GATHER);
+        }
+    }
 }
 function connectionHandler(pc) {
     var rtc = pc.rtc;
@@ -451,6 +473,7 @@ function pc_New(self, convidPtr, audioIvPtr, videoIvPtr, ivlen) {
             rtt: 0
         },
         streams: {},
+        gatherTimer: null
     };
     worker.postMessage({ op: 'create', self: pc.self, iva: iva8, ivv: ivv8 });
     var hnd = connectionsStore.storePeerConnection(pc);

package/package.json

@@ -21,5 +21,5 @@
     "prepack": "prettier -w src/avs_wcall.ts && tsc && cp src/*.js src/*.d.ts dist/",
     "test": "karma start"
   },
-  "version": "9.9.8"
+  "version": "9.10.9"
 }