@webex/web-client-media-engine 3.16.0 → 3.17.0

package/dist/esm/index.js

@@ -10460,6 +10460,7 @@ class Transceiver {
 class ReceiveOnlyTransceiver extends Transceiver {
     constructor(rtcRtpTransceiver, mid, munger) {
         super(rtcRtpTransceiver, mid);
+        this.metadata = {};
         this.munger = munger;
         this._receiveSlot = new ReceiveSlot(() => {
             if (!this._rtcRtpTransceiver.mid) {
@@ -10480,7 +10481,22 @@ class ReceiveOnlyTransceiver extends Transceiver {
         return this._receiveSlot;
     }
     getStats() {
-        return this.receiver.getStats();
+        return __awaiter$1(this, void 0, void 0, function* () {
+            const statsMap = new Map();
+            const statsReport = yield this.receiver.getStats();
+            statsReport.forEach((stats, key) => {
+                if (stats.type === 'inbound-rtp') {
+                    stats.mid = this.mid;
+                    stats.csi = this.receiveSlot.currentRxCsi;
+                    stats.calliopeMediaType = this.metadata.mediaType;
+                    stats.requestedBitrate = this.metadata.requestedBitrate;
+                    stats.requestedFrameSize = this.metadata.requestedFrameSize;
+                    Object.assign(stats, this.receiverId);
+                }
+                statsMap.set(key, stats);
+            });
+            return statsMap;
+        });
     }
     mungeLocalDescription(mediaDescription) {
         this.munger.mungeLocalDescription(mediaDescription, { twccDisabled: this.twccDisabled });
@@ -10494,6 +10510,16 @@ class ReceiveOnlyTransceiver extends Transceiver {
     resetSdpMunger() {
         this.munger.reset();
     }
+    handleRequested(streamRequest) {
+        var _a, _b;
+        this.metadata.requestedBitrate = streamRequest.maxPayloadBitsPerSecond;
+        this.metadata.requestedFrameSize = (_b = (_a = streamRequest.codecInfos[0]) === null || _a === void 0 ? void 0 : _a.h264) === null || _b === void 0 ? void 0 : _b.maxFs;
+    }
+    handleUnrequested() {
+        this.metadata.requestedBitrate = undefined;
+        this.metadata.requestedFrameSize = undefined;
+        this.receiveSlot._updateSource('no source', undefined);
+    }
 }
 ReceiveOnlyTransceiver.rid = '1';
 
@@ -14313,7 +14339,29 @@ class SendOnlyTransceiver extends Transceiver {
         }
     }
     getStats() {
-        return this.sender.getStats();
+        return __awaiter$1(this, void 0, void 0, function* () {
+            const statsMap = new Map();
+            const statsReport = yield this.sender.getStats();
+            statsReport.forEach((stats, key) => {
+                var _a;
+                if (stats.type === 'outbound-rtp') {
+                    stats.mid = this.mid;
+                    stats.csi = this.csi;
+                    stats.calliopeMediaType = this.mediaType;
+                    stats.requestedBitrate = this.getRequestedBitrate(stats.ssrc);
+                    stats.requestedFrameSize = this.getRequestedFrameSize(stats.ssrc);
+                    const trackSettings = (_a = this.publishedStream) === null || _a === void 0 ? void 0 : _a.getSettings();
+                    if (trackSettings === null || trackSettings === void 0 ? void 0 : trackSettings.frameRate) {
+                        stats.targetFrameRate = trackSettings === null || trackSettings === void 0 ? void 0 : trackSettings.frameRate;
+                    }
+                }
+                else if (stats.type === 'media-source') {
+                    stats.calliopeMediaType = this.mediaType;
+                }
+                statsMap.set(key, stats);
+            });
+            return statsMap;
+        });
     }
     updateSendParameters(requestedIdEncodingParamsMap) {
         return __awaiter$1(this, void 0, void 0, function* () {
@@ -14484,14 +14532,8 @@ const organizeTransceiverStats = (sendTransceivers, recvTransceivers) => __await
     };
     yield Promise.all([...sendTransceivers.entries()].map(([mediaType, transceiver]) => __awaiter$1(void 0, void 0, void 0, function* () {
         var _a;
-        const report = [];
-        (yield transceiver.getStats()).forEach((senderStats) => {
-            if (senderStats.type === 'outbound-rtp') {
-                report.push(Object.assign(Object.assign({}, senderStats), { requestedBitrate: transceiver.getRequestedBitrate(senderStats.ssrc), requestedFrameSize: transceiver.getRequestedFrameSize(senderStats.ssrc) }));
-            }
-        });
         const item = {
-            report,
+            report: yield transceiver.getStats(),
             mid: transceiver.mid,
             csi: transceiver.csi,
             currentDirection: 'sendonly',
@@ -14513,14 +14555,8 @@ const organizeTransceiverStats = (sendTransceivers, recvTransceivers) => __await
     yield Promise.all([...recvTransceivers.entries()].map(([mediaType, transceivers]) => __awaiter$1(void 0, void 0, void 0, function* () {
         return Promise.all(transceivers.map((t) => __awaiter$1(void 0, void 0, void 0, function* () {
             var _b, _c;
-            const report = [];
-            (yield t.getStats()).forEach((receiverStats) => {
-                if (receiverStats.type === 'inbound-rtp') {
-                    report.push(Object.assign(Object.assign({}, receiverStats), { requestedBitrate: t.requestedBitrate, requestedFrameSize: t.requestedFrameSize }));
-                }
-            });
             const item = {
-                report,
+                report: yield t.getStats(),
                 mid: (_b = t.receiveSlot.id) === null || _b === void 0 ? void 0 : _b.mid,
                 csi: t.receiveSlot.currentRxCsi,
                 currentDirection: 'recvonly',
@@ -14953,6 +14989,7 @@ SCTP Max Message Size: ${maxMessageSize}`);
         const transceiverMid = this.midPredictor.getNextMid(mediaType);
         const munger = new IngressSdpMunger();
         const recvOnlyTransceiver = new ReceiveOnlyTransceiver(rtcRtpTransceiver, transceiverMid, munger);
+        recvOnlyTransceiver.metadata.mediaType = mediaType;
         recvOnlyTransceiver.twccDisabled =
             getMediaFamily(mediaType) === MediaFamily.Audio ? this.options.disableAudioTwcc : false;
         this.recvTransceivers.set(mediaType, [
@@ -15226,35 +15263,24 @@ SCTP Max Message Size: ${maxMessageSize}`);
                 return;
             }
             const requestedReceiveSlotIds = [];
-            streamRequests.forEach((sr) => {
-                sr.receiveSlots.forEach((rs) => {
-                    if (!rs.id) {
+            streamRequests.forEach((request) => {
+                request.receiveSlots.forEach((slot) => {
+                    if (!slot.id) {
                         logger.error(`Running stream request task, but ReceiveSlot ID is missing!`);
                         return;
                     }
-                    requestedReceiveSlotIds.push(rs.id);
+                    requestedReceiveSlotIds.push(slot.id);
                 });
             });
+            jmpSession.sendRequests(streamRequests.map((sr) => sr._toJmpStreamRequest()));
             (_a = this.recvTransceivers.get(mediaType)) === null || _a === void 0 ? void 0 : _a.forEach((transceiver) => {
-                if (!requestedReceiveSlotIds.some((id) => compareStreamIds(id, transceiver.receiveSlot.id))) {
-                    transceiver.receiveSlot._updateSource('no source', undefined);
+                if (requestedReceiveSlotIds.some((id) => compareStreamIds(id, transceiver.receiveSlot.id))) {
+                    const relevantRequest = streamRequests.find((request) => request.receiveSlots.some((slot) => compareStreamIds(slot.id, transceiver.receiveSlot.id)));
+                    transceiver.handleRequested(relevantRequest);
+                }
+                else {
+                    transceiver.handleUnrequested();
                 }
-            });
-            jmpSession.sendRequests(streamRequests.map((sr) => sr._toJmpStreamRequest()));
-            streamRequests.forEach((sr) => {
-                var _a;
-                const isAffectedInStreamRequest = (t) => sr.receiveSlots.some((rs) => rs.id && compareStreamIds(rs.id, t.receiverId));
-                (_a = this.recvTransceivers.get(mediaType)) === null || _a === void 0 ? void 0 : _a.forEach((t) => {
-                    var _a, _b;
-                    if (isAffectedInStreamRequest(t)) {
-                        t.requestedBitrate = sr.maxPayloadBitsPerSecond;
-                        t.requestedFrameSize = (_b = (_a = sr.codecInfos[0]) === null || _a === void 0 ? void 0 : _a.h264) === null || _b === void 0 ? void 0 : _b.maxFs;
-                    }
-                    else {
-                        t.requestedBitrate = undefined;
-                        t.requestedFrameSize = undefined;
-                    }
-                });
             });
         };
         if (((_a = this.dataChannel) === null || _a === void 0 ? void 0 : _a.readyState) === 'open') {
@@ -15320,42 +15346,18 @@ SCTP Max Message Size: ${maxMessageSize}`);
     }
     preProcessStats(stats) {
         return __awaiter$1(this, void 0, void 0, function* () {
-            yield Promise.all([...this.sendTransceivers.entries()].map(([mediaType, transceiver]) => __awaiter$1(this, void 0, void 0, function* () {
+            yield Promise.all([...this.sendTransceivers.values()].map((transceiver) => __awaiter$1(this, void 0, void 0, function* () {
                 (yield transceiver.getStats()).forEach((senderStats) => {
-                    var _a;
-                    if (senderStats.type === 'outbound-rtp') {
-                        const statsToModify = stats.get(senderStats.id);
-                        statsToModify.mid = transceiver.mid;
-                        statsToModify.csi = transceiver.csi;
-                        statsToModify.calliopeMediaType = mediaType;
-                        statsToModify.requestedBitrate = transceiver.getRequestedBitrate(senderStats.ssrc);
-                        statsToModify.requestedFrameSize = transceiver.getRequestedFrameSize(senderStats.ssrc);
-                        const trackSettings = (_a = transceiver.publishedStream) === null || _a === void 0 ? void 0 : _a.getSettings();
-                        if (trackSettings === null || trackSettings === void 0 ? void 0 : trackSettings.frameRate) {
-                            statsToModify.targetFrameRate = trackSettings === null || trackSettings === void 0 ? void 0 : trackSettings.frameRate;
-                        }
-                        stats.set(senderStats.id, statsToModify);
-                    }
-                    else if (senderStats.type === 'media-source') {
-                        const statsToModify = stats.get(senderStats.id);
-                        statsToModify.calliopeMediaType = mediaType;
-                        stats.set(senderStats.id, statsToModify);
+                    if (senderStats.type === 'outbound-rtp' || senderStats.type === 'media-source') {
+                        stats.set(senderStats.id, senderStats);
                     }
                 });
             })));
-            yield Promise.all([...this.recvTransceivers.entries()].map(([mediaType, transceivers]) => __awaiter$1(this, void 0, void 0, function* () {
+            yield Promise.all([...this.recvTransceivers.values()].map((transceivers) => __awaiter$1(this, void 0, void 0, function* () {
                 yield Promise.all(transceivers.map((transceiver) => __awaiter$1(this, void 0, void 0, function* () {
                     (yield transceiver.getStats()).forEach((receiverStats) => {
-                        var _a;
                         if (receiverStats.type === 'inbound-rtp') {
-                            const statsToModify = stats.get(receiverStats.id);
-                            statsToModify.mid = (_a = transceiver.receiveSlot.id) === null || _a === void 0 ? void 0 : _a.mid;
-                            statsToModify.csi = transceiver.receiveSlot.currentRxCsi;
-                            statsToModify.calliopeMediaType = mediaType;
-                            statsToModify.requestedBitrate = transceiver.requestedBitrate;
-                            statsToModify.requestedFrameSize = transceiver.requestedFrameSize;
-                            Object.assign(statsToModify, transceiver.receiverId);
-                            stats.set(receiverStats.id, statsToModify);
+                            stats.set(receiverStats.id, receiverStats);
                         }
                     });
                 })));