@webex/web-client-media-engine 1.34.2 → 1.34.4

package/dist/cjs/index.js

@@ -5613,7 +5613,11 @@ class JmpSession extends events$2.EventEmitter {
     }
     updateSourceIndication(numTotalSources, numLiveSources, sources) {
         var _a;
-        const sourceIndicationMsg = new SourceIndicationMsg(this.currSourceIndicationSeqNum++, numTotalSources, numLiveSources, sources);
+        const filteredSources = sources.filter((source) => {
+            var _a;
+            return (_a = this.lastReceivedScr) === null || _a === void 0 ? void 0 : _a.requests.some((req) => req.ids.find((streamId) => compareStreamIds(streamId, source.id)));
+        });
+        const sourceIndicationMsg = new SourceIndicationMsg(this.currSourceIndicationSeqNum++, numTotalSources, numLiveSources, filteredSources);
         const jmpMsg = new JmpMsg(this.mediaFamily, this.mediaContent, {
             msgType: JmpMsgType.SourceIndication,
             payload: sourceIndicationMsg,
@@ -6440,6 +6444,43 @@ var uuid_1 = require$$0;
  * @returns - Copied value.
  */
 var deepCopy$1 = function (value) { return JSON.parse(JSON.stringify(value)); };
+/**
+ * Check deep equality between two values.
+ *
+ * @param value1 - First value to check.
+ * @param value2 - Second value to check.
+ * @returns True if values are deeply equal, false otherwise.
+ */
+var deepEqual = function (value1, value2) {
+    // If both immutable values are equal, return true.
+    if (value1 === value2) {
+        return true;
+    }
+    // If both are objects, we check the length and properties of each.
+    if (value1 && value2 && typeof value1 === 'object' && typeof value2 === 'object') {
+        if (value1.constructor !== value2.constructor)
+            return false;
+        // Return false if the objects are of different sizes.
+        if (Object.keys(value1).length !== Object.keys(value2).length) {
+            return false;
+        }
+        // Deep equal check each property in the opject.
+        for (var prop in value1) {
+            if (value2.hasOwnProperty(prop)) {
+                if (!deepEqual(value1[prop], value2[prop])) {
+                    return false;
+                }
+            }
+            else {
+                return false;
+            }
+        }
+        // Return true if we found no differing properties.
+        return true;
+    }
+    // Return false if no other conditions are met.
+    return false;
+};
 /**
  * Translates a RTCStatsReport into an object.
  *
@@ -6456,6 +6497,16 @@ var map2obj = function (report) {
     });
     return o;
 };
+var persistedKeys = ['type', 'id', 'timestamp'];
+/**
+ * Check to see if the report consists of more than just the persisted metadata.
+ *
+ * @param report - The report line being checked.
+ * @returns True if the report item contains non-persisted keys, false otherwise.
+ */
+var hasNonMetadata = function (report) {
+    return !!Object.keys(report).filter(function (key) { return !persistedKeys.includes(key); }).length;
+};
 /**
  * Apply a delta compression to the stats report. Reduces size by ~90%.
  * To reduce further, report keys could be compressed.
@@ -6468,20 +6519,21 @@ var deltaCompression = function (oldStats, newStats) {
     var updatedStats = deepCopy$1(newStats);
     Object.keys(updatedStats).forEach(function (id) {
         var report = updatedStats[id];
-        delete report.id;
         if (!oldStats[id]) {
             return;
         }
+        // Persist specific values beyond delta compression, as long as they
+        // aren't the only non-deduped keys.
         Object.keys(report).forEach(function (name) {
-            if (report[name] === oldStats[id][name]) {
+            if (deepEqual(report[name], oldStats[id][name]) && !persistedKeys.includes(name)) {
                 delete updatedStats[id][name];
             }
-            if (Object.keys(report).length === 0 ||
-                (Object.keys(report).length === 1 && report.timestamp)) {
+            if (!hasNonMetadata(report)) {
                 delete updatedStats[id];
             }
         });
     });
+    // Use the most recent timestamp.
     var timestamp = -Infinity;
     Object.keys(updatedStats).forEach(function (id) {
         var report = updatedStats[id];
@@ -6489,15 +6541,34 @@ var deltaCompression = function (oldStats, newStats) {
             timestamp = report.timestamp;
         }
     });
+    // Delete the timestamps on each item.
     Object.keys(updatedStats).forEach(function (id) {
         var report = updatedStats[id];
         if (report.timestamp === timestamp) {
-            report.timestamp = 0;
+            delete report.timestamp;
         }
     });
     updatedStats.timestamp = timestamp;
     return updatedStats;
 };
+/**
+ * Format the stats report into an array.
+ *
+ * @param report - A WebRTC stats report.
+ * @returns - An array of Stats Report items.
+ */
+var formatStatsReport = function (report) {
+    return Object.keys(report)
+        .filter(function (name) { return name !== 'timestamp'; })
+        .map(function (name) { return report[name]; });
+};
+/**
+ * Parametrize a single string event to contain type and an (empty) id.
+ *
+ * @param value - The value to parametrize.
+ * @returns An event object.
+ */
+var makeEvent = function (value) { return ([{ value: value, type: 'string', id: '' }]); };
 /**
  * Attach a Peer Connection to periodically get updated on events and stats.
  *
@@ -6514,39 +6585,41 @@ var rtcStats = function (pc, logger, intervalTime, id, statsPreProcessor) {
     /**
      * Log stats or event data with additional tracking information.
      *
-     * @param args - Array of parameters to log of any type.
+     * @param name - Name of the event to log.
+     * @param payload - Log data pertaining to the event.
      */
-    var trace = function (eventName, data) {
-        logger({ name: '[rtcstats]', id: id, eventName: eventName, data: data });
+    var trace = function (name, payload, timestamp) {
+        logger({ id: id, timestamp: timestamp ? Math.round(timestamp) : Date.now(), name: name, payload: payload });
     };
-    trace('creating stats report');
     pc.addEventListener('icecandidate', function (e) {
-        trace('onicecandidate', e.candidate);
+        if (e.candidate) {
+            trace('onicecandidate', makeEvent(JSON.stringify(e.candidate)));
+        }
     });
     pc.addEventListener('icecandidateerror', function (event) {
         var _a = event, errorCode = _a.errorCode, errorText = _a.errorText;
-        trace('onicecandidateerror', { errorText: errorText, errorCode: errorCode });
+        trace('onicecandidateerror', makeEvent("".concat(errorCode, ": ").concat(errorText)));
     });
     pc.addEventListener('track', function (e) {
-        trace('ontrack', "".concat(e.track.kind, ":").concat(e.track.id, " ").concat(e.streams.map(function (stream) { return "stream:".concat(stream.id); })));
+        trace('ontrack', makeEvent("".concat(e.track.kind, ":").concat(e.track.id, " ").concat(e.streams.map(function (stream) { return "stream:".concat(stream.id); }).join(' '))));
     });
     pc.addEventListener('signalingstatechange', function () {
-        trace('onsignalingstatechange', pc.signalingState);
+        trace('onsignalingstatechange', makeEvent(pc.signalingState));
     });
     pc.addEventListener('iceconnectionstatechange', function () {
-        trace('oniceconnectionstatechange', pc.iceConnectionState);
+        trace('oniceconnectionstatechange', makeEvent(pc.iceConnectionState));
     });
     pc.addEventListener('icegatheringstatechange', function () {
-        trace('onicegatheringstatechange', pc.iceGatheringState);
+        trace('onicegatheringstatechange', makeEvent(pc.iceGatheringState));
     });
     pc.addEventListener('connectionstatechange', function () {
-        trace('onconnectionstatechange', pc.connectionState);
+        trace('onconnectionstatechange', makeEvent(pc.connectionState));
     });
     pc.addEventListener('negotiationneeded', function () {
-        trace('onnegotiationneeded');
+        trace('onnegotiationneeded', makeEvent('negotiationneeded'));
     });
     pc.addEventListener('datachannel', function (event) {
-        trace('ondatachannel', [event.channel.id, event.channel.label]);
+        trace('ondatachannel', makeEvent("".concat(event.channel.id, ": ").concat(event.channel.label)));
     });
     var interval = window.setInterval(function () {
         if (pc.signalingState === 'closed') {
@@ -6557,7 +6630,8 @@ var rtcStats = function (pc, logger, intervalTime, id, statsPreProcessor) {
             var now = map2obj(res);
             statsPreProcessor(now).then(function () {
                 var base = deepCopy$1(now); // our new prev
-                trace('stats-report', deltaCompression(prev, now));
+                var compressed = deltaCompression(prev, now);
+                trace('stats-report', formatStatsReport(compressed), compressed.timestamp !== -Infinity ? compressed.timestamp : undefined);
                 prev = base;
             });
         });