@webex/web-client-media-engine 3.12.0 → 3.13.0

package/dist/cjs/index.js

@@ -9422,6 +9422,8 @@ function deepCopy(source) {
                     : source;
 }
 
+const ipv4Regex = /(\b\d{1,3}\.\d{1,3}\.\d{1,3}\.)(\d{1,3}\b)/g;
+const ipv6Regex = /(\b[\da-fA-F]{1,4}(:[\da-fA-F]{1,4}){7}\b)/g;
 function matchMediaDescriptionsInAnswer(parsedOffer, parsedAnswer) {
     parsedAnswer.session.groups = parsedOffer.session.groups;
     parsedAnswer.media = parsedOffer.media.map((offerMediaDescription) => {
@@ -9509,6 +9511,15 @@ function injectDummyCandidates(mediaDescription) {
     mediaDescription.addLine(new CandidateLine('dummy2', 1, 'tcp', 2, '0.0.0.0', 9, 'host'));
     mediaDescription.addLine(new CandidateLine('dummy3', 1, 'udp', 1, '0.0.0.0', 9, 'relay'));
 }
+function maskIp(sdp) {
+    let maskedSdp = sdp.replace(ipv4Regex, (match, firstOctets) => {
+        return `${firstOctets}0`;
+    });
+    maskedSdp = maskedSdp.replace(ipv6Regex, (match) => {
+        return match.replace(/:[\da-fA-F]{1,4}$/, ':0');
+    });
+    return maskedSdp;
+}
 function removeMidRidExtensions(mediaDescription) {
     mediaDescription.extMaps.forEach((extMapLine, extId, extMap) => {
         if (/^urn:ietf:params:rtp-hdrext:sdes:(?:mid|rtp-stream-id|repaired-rtp-stream-id)$/.test(extMapLine.uri)) {
@@ -14217,6 +14228,22 @@ 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;
@@ -14846,7 +14873,15 @@ class MultistreamConnection extends EventEmitter$2 {
                             logErrorAndThrow(exports.WcmeErrorType.CREATE_OFFER_FAILED, 'SDP not found in offer.');
                         }
                         offer.sdp = this.preProcessLocalOffer(offer.sdp);
-                        yield this.pc.setLocalDescription(offer);
+                        yield this.pc
+                            .setLocalDescription(offer)
+                            .then(() => __awaiter$1(this, void 0, void 0, function* () {
+                            logger.info('this.pc.setLocalDescription() resolved');
+                        }))
+                            .catch((error) => {
+                            var _a;
+                            logErrorAndThrow(exports.WcmeErrorType.CREATE_OFFER_FAILED, `Error: ${error}. SDP: ${maskIp((_a = offer.sdp) !== null && _a !== void 0 ? _a : '')}`);
+                        });
                         const sdpToSend = this.prepareLocalOfferForRemoteServer((_a = this.pc.getLocalDescription()) === null || _a === void 0 ? void 0 : _a.sdp);
                         createOfferResolve({ type: 'offer', sdp: sdpToSend });
                         if (this.currentCreateOfferId > createOfferId) {
@@ -14872,7 +14907,9 @@ class MultistreamConnection extends EventEmitter$2 {
                 logErrorAndThrow(exports.WcmeErrorType.SET_ANSWER_FAILED, `Call to setAnswer without having previously called createOffer.`);
             }
             logger.info('calling this.pc.setRemoteDescription()');
-            return this.pc.setRemoteDescription({ type: 'answer', sdp }).then(() => __awaiter$1(this, void 0, void 0, function* () {
+            return this.pc
+                .setRemoteDescription({ type: 'answer', sdp })
+                .then(() => __awaiter$1(this, void 0, void 0, function* () {
                 logger.info('this.pc.setRemoteDescription() resolved');
                 if (this.setAnswerResolve) {
                     this.setAnswerResolve();
@@ -14881,7 +14918,10 @@ class MultistreamConnection extends EventEmitter$2 {
                 else {
                     logger.debug(`setAnswerResolve function was cleared between setAnswer and result of setRemoteDescription`);
                 }
-            }));
+            }))
+                .catch((error) => {
+                logErrorAndThrow(exports.WcmeErrorType.CREATE_OFFER_FAILED, `Error: ${error}. SDP: ${maskIp(answer)}`);
+            });
         });
     }
     doLocalOfferAnswer() {
@@ -14892,9 +14932,24 @@ class MultistreamConnection extends EventEmitter$2 {
                 logErrorAndThrow(exports.WcmeErrorType.CREATE_OFFER_FAILED, 'SDP not found in offer.');
             }
             offer.sdp = this.preProcessLocalOffer(offer.sdp);
-            yield this.pc.setLocalDescription(offer);
+            yield this.pc
+                .setLocalDescription(offer)
+                .then(() => __awaiter$1(this, void 0, void 0, function* () {
+                logger.info('this.pc.setLocalDescription() resolved');
+            }))
+                .catch((error) => {
+                var _a;
+                logErrorAndThrow(exports.WcmeErrorType.CREATE_OFFER_FAILED, `Error: ${error}. SDP: ${maskIp((_a = offer.sdp) !== null && _a !== void 0 ? _a : '')}`);
+            });
             const answer = this.preProcessRemoteAnswer((_a = this.pc.getRemoteDescription()) === null || _a === void 0 ? void 0 : _a.sdp);
-            return this.pc.setRemoteDescription({ type: 'answer', sdp: answer });
+            return this.pc
+                .setRemoteDescription({ type: 'answer', sdp: answer })
+                .then(() => __awaiter$1(this, void 0, void 0, function* () {
+                logger.info('this.pc.setRemoteDescription() resolved');
+            }))
+                .catch((error) => {
+                logErrorAndThrow(exports.WcmeErrorType.CREATE_OFFER_FAILED, `Error ${error}. SDP: ${maskIp(answer)}`);
+            });
         });
     }
     queueLocalOfferAnswer() {
@@ -15024,6 +15079,17 @@ class MultistreamConnection extends EventEmitter$2 {
                 }
             });
             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));
+                const affectedTransceivers = (_a = this.recvTransceivers
+                    .get(mediaType)) === null || _a === void 0 ? void 0 : _a.filter(isAffectedInStreamRequest);
+                affectedTransceivers === null || affectedTransceivers === void 0 ? void 0 : affectedTransceivers.forEach((t) => {
+                    var _a, _b;
+                    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;
+                });
+            });
         };
         if (((_a = this.dataChannel) === null || _a === void 0 ? void 0 : _a.readyState) === 'open') {
             task();
@@ -15096,6 +15162,8 @@ class MultistreamConnection extends EventEmitter$2 {
                         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;
@@ -15118,6 +15186,8 @@ class MultistreamConnection extends EventEmitter$2 {
                             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);
                         }