@webex/web-client-media-engine 3.17.2 → 3.19.0

package/dist/cjs/index.js

@@ -10441,6 +10441,25 @@ class ReceiveSlot extends EventEmitter$2 {
 }
 ReceiveSlot.Events = exports.ReceiveSlotEvents;
 
+function getCurrentTimestamp() {
+    return performance.timeOrigin + performance.now();
+}
+class StatsManager {
+    constructor(statsGetter, statsPreprocessor = () => __awaiter$1(this, void 0, void 0, function* () { })) {
+        this.statsGetter = statsGetter;
+        this.statsPreProcessor = statsPreprocessor;
+    }
+    getStats() {
+        return __awaiter$1(this, void 0, void 0, function* () {
+            const statsReport = yield this.statsGetter();
+            const statsMap = new Map();
+            statsReport.forEach((stats, key) => statsMap.set(key, stats));
+            yield this.statsPreProcessor(statsMap);
+            return statsMap;
+        });
+    }
+}
+
 class Transceiver {
     constructor(rtcRtpTransceiver, mid) {
         this.twccDisabled = false;
@@ -10464,7 +10483,7 @@ class Transceiver {
 class ReceiveOnlyTransceiver extends Transceiver {
     constructor(rtcRtpTransceiver, mid, munger) {
         super(rtcRtpTransceiver, mid);
-        this.metadata = { isActiveSpeaker: false };
+        this.metadata = { isRequested: false, isActiveSpeaker: false };
         this.munger = munger;
         this._receiveSlot = new ReceiveSlot(() => {
             if (!this._rtcRtpTransceiver.mid) {
@@ -10495,6 +10514,8 @@ class ReceiveOnlyTransceiver extends Transceiver {
                     stats.calliopeMediaType = this.metadata.mediaType;
                     stats.requestedBitrate = this.metadata.requestedBitrate;
                     stats.requestedFrameSize = this.metadata.requestedFrameSize;
+                    stats.isRequested = this.metadata.isRequested;
+                    stats.lastRequestedUpdateTimestamp = this.metadata.lastRequestedUpdateTimestamp;
                     stats.isActiveSpeaker = this.metadata.isActiveSpeaker;
                     stats.lastActiveSpeakerUpdateTimestamp = this.metadata.lastActiveSpeakerUpdateTimestamp;
                     Object.assign(stats, this.receiverId);
@@ -10518,10 +10539,18 @@ class ReceiveOnlyTransceiver extends Transceiver {
     }
     handleRequested(streamRequest) {
         var _a, _b;
+        if (!this.metadata.isRequested) {
+            this.metadata.isRequested = true;
+            this.metadata.lastRequestedUpdateTimestamp = getCurrentTimestamp();
+        }
         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() {
+        if (this.metadata.isRequested) {
+            this.metadata.isRequested = false;
+            this.metadata.lastRequestedUpdateTimestamp = getCurrentTimestamp();
+        }
         this.metadata.requestedBitrate = undefined;
         this.metadata.requestedFrameSize = undefined;
         this.receiveSlot._updateSource('no source', undefined);
@@ -10529,7 +10558,7 @@ class ReceiveOnlyTransceiver extends Transceiver {
     handleActiveSpeakerUpdate(value) {
         if (this.metadata.isActiveSpeaker !== value) {
             this.metadata.isActiveSpeaker = value;
-            this.metadata.lastActiveSpeakerUpdateTimestamp = performance.timeOrigin + performance.now();
+            this.metadata.lastActiveSpeakerUpdateTimestamp = getCurrentTimestamp();
         }
     }
 }
@@ -14250,6 +14279,7 @@ class SendOnlyTransceiver extends Transceiver {
         this.namedMediaGroupsChange = new TypedEvent();
         this.requestedIdEncodingParamsMap = new Map();
         this.updateSendParametersQueue = new AsyncQueue();
+        this.metadata = { lastRequestedUpdateTimestampsMap: new Map() };
         this.csi = csi;
         this.direction = 'sendrecv';
         this.handleTrackChange = this.handleTrackChange.bind(this);
@@ -14360,8 +14390,16 @@ class SendOnlyTransceiver extends Transceiver {
                     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 senderId = this.munger.getSenderIds().find((id) => id.ssrc === stats.ssrc);
+                    if (senderId) {
+                        const encodingIndex = this.getEncodingIndexForStreamId(senderId);
+                        const encodingParams = this.requestedIdEncodingParamsMap.get(encodingIndex);
+                        stats.requestedBitrate = encodingParams === null || encodingParams === void 0 ? void 0 : encodingParams.maxPayloadBitsPerSecond;
+                        stats.requestedFrameSize = encodingParams === null || encodingParams === void 0 ? void 0 : encodingParams.maxFs;
+                        stats.isRequested = !!encodingParams;
+                        stats.lastRequestedUpdateTimestamp =
+                            this.metadata.lastRequestedUpdateTimestampsMap.get(encodingIndex);
+                    }
                     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;
@@ -14395,6 +14433,17 @@ class SendOnlyTransceiver extends Transceiver {
                     }
                 });
                 yield this.sender.setParameters(sendParameters);
+                const timestamp = getCurrentTimestamp();
+                requestedIdEncodingParamsMap.forEach((_, index) => {
+                    if (!this.requestedIdEncodingParamsMap.has(index)) {
+                        this.metadata.lastRequestedUpdateTimestampsMap.set(index, timestamp);
+                    }
+                });
+                this.requestedIdEncodingParamsMap.forEach((_, index) => {
+                    if (!requestedIdEncodingParamsMap.has(index)) {
+                        this.metadata.lastRequestedUpdateTimestampsMap.set(index, timestamp);
+                    }
+                });
                 const oldRequested = this.requested;
                 const newRequested = requestedIdEncodingParamsMap.size > 0;
                 this.requestedIdEncodingParamsMap = requestedIdEncodingParamsMap;
@@ -14404,22 +14453,6 @@ class SendOnlyTransceiver extends Transceiver {
             }));
         });
     }
-    getRequestedBitrate(ssrc) {
-        const index = this.senderIds.findIndex((streamId) => streamId.ssrc === ssrc);
-        if (this.requestedIdEncodingParamsMap.has(index)) {
-            const encodingParams = this.requestedIdEncodingParamsMap.get(index);
-            return encodingParams === null || encodingParams === void 0 ? void 0 : encodingParams.maxPayloadBitsPerSecond;
-        }
-        return undefined;
-    }
-    getRequestedFrameSize(ssrc) {
-        const index = this.senderIds.findIndex((streamId) => streamId.ssrc === ssrc);
-        if (this.requestedIdEncodingParamsMap.has(index)) {
-            const encodingParams = this.requestedIdEncodingParamsMap.get(index);
-            return encodingParams === null || encodingParams === void 0 ? void 0 : encodingParams.maxFs;
-        }
-        return undefined;
-    }
     isSimulcastEnabled() {
         const params = this.sender.getParameters();
         return params.encodings.length > 1;
@@ -14507,22 +14540,6 @@ class SendSlot {
     }
 }
 
-class StatsManager {
-    constructor(statsGetter, statsPreprocessor = () => __awaiter$1(this, void 0, void 0, function* () { })) {
-        this.statsGetter = statsGetter;
-        this.statsPreProcessor = statsPreprocessor;
-    }
-    getStats() {
-        return __awaiter$1(this, void 0, void 0, function* () {
-            const statsReport = yield this.statsGetter();
-            const statsMap = new Map();
-            statsReport.forEach((stats, key) => statsMap.set(key, stats));
-            yield this.statsPreProcessor(statsMap);
-            return statsMap;
-        });
-    }
-}
-
 const organizeTransceiverStats = (sendTransceivers, recvTransceivers) => __awaiter$1(void 0, void 0, void 0, function* () {
     const result = {
         audio: {
@@ -15285,12 +15302,20 @@ SCTP Max Message Size: ${maxMessageSize}`);
             }
             const requestedReceiveSlotIds = [];
             streamRequests.forEach((request) => {
+                if (request.receiveSlots.length === 0) {
+                    logger.error('Stream request ids cannot be empty.');
+                    return;
+                }
                 request.receiveSlots.forEach((slot) => {
                     if (!slot.id) {
-                        logger.error(`Running stream request task, but ReceiveSlot ID is missing!`);
-                        return;
+                        logger.error('Running stream request task, but ReceiveSlot ID is missing.');
+                    }
+                    if (!requestedReceiveSlotIds.some((id) => compareStreamIds(id, slot.id))) {
+                        requestedReceiveSlotIds.push(slot.id);
+                    }
+                    else {
+                        logger.error(`Stream id duplicate found ${JSON.stringify(slot.id)}.`);
                     }
-                    requestedReceiveSlotIds.push(slot.id);
                 });
             });
             jmpSession.sendRequests(streamRequests.map((sr) => sr._toJmpStreamRequest()));