@webex/web-client-media-engine 3.7.2 → 3.8.0

package/dist/cjs/index.js

@@ -14153,6 +14153,7 @@ class MultistreamConnection extends EventEmitter$2 {
         this.overuseUpdateCallback = () => { };
         this.midPredictor = new MidPredictor();
         this.offerAnswerQueue = new AsyncQueue();
+        this.currentCreateOfferId = 0;
         this.options = Object.assign(Object.assign({}, defaultMultistreamConnectionOptions), userOptions);
         logger.info(`Creating multistream connection with options ${JSON.stringify(this.options)}`);
         this.initializePeerConnection();
@@ -14516,16 +14517,16 @@ class MultistreamConnection extends EventEmitter$2 {
             if (!this.pc.getLocalDescription()) {
                 this.midPredictor.allocateMidForDatachannel();
             }
+            if (this.setAnswerResolve) {
+                logger.info('Canceling previous offer since setAnswer was never called for it');
+                this.setAnswerResolve();
+                this.setAnswerResolve = undefined;
+            }
+            const createOfferId = ++this.currentCreateOfferId;
             return new Promise((createOfferResolve, createOfferReject) => {
                 this.offerAnswerQueue.push(() => __awaiter(this, void 0, void 0, function* () {
                     var _a;
                     try {
-                        if (this.setAnswerResolve !== undefined) {
-                            throw new Error(`Tried to start a new createOffer flow before the old one had finished`);
-                        }
-                        const setAnswerPromise = new Promise((resolve) => {
-                            this.setAnswerResolve = resolve;
-                        });
                         const offer = yield this.pc.createOffer();
                         if (!offer.sdp) {
                             throw new Error('No SDP offer');
@@ -14534,11 +14535,17 @@ class MultistreamConnection extends EventEmitter$2 {
                         yield this.pc.setLocalDescription(offer);
                         const sdpToSend = this.prepareLocalOfferForRemoteServer((_a = this.pc.getLocalDescription()) === null || _a === void 0 ? void 0 : _a.sdp);
                         createOfferResolve({ type: 'offer', sdp: sdpToSend });
-                        yield setAnswerPromise;
+                        if (this.currentCreateOfferId > createOfferId) {
+                            logger.log('Canceling previous offer since createOffer was called while it was being created');
+                        }
+                        else {
+                            yield new Promise((setAnswerResolve) => {
+                                this.setAnswerResolve = setAnswerResolve;
+                            });
+                        }
                     }
                     catch (error) {
                         createOfferReject(error);
-                        this.setAnswerResolve = undefined;
                     }
                 }));
             });
@@ -14774,13 +14781,18 @@ class MultistreamConnection extends EventEmitter$2 {
                         const statsToModify = stats.get(senderStats.id);
                         statsToModify.mid = transceiver.mid;
                         statsToModify.csi = transceiver.csi;
-                        statsToModify.mediaType = mediaType;
+                        statsToModify.calliopeMediaType = mediaType;
                         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);
+                    }
                 });
             })));
             yield Promise.all([...this.recvTransceivers.entries()].map(([mediaType, transceivers]) => __awaiter(this, void 0, void 0, function* () {
@@ -14791,7 +14803,7 @@ class MultistreamConnection extends EventEmitter$2 {
                             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.mediaType = mediaType;
+                            statsToModify.calliopeMediaType = mediaType;
                             Object.assign(statsToModify, transceiver.receiverId);
                             stats.set(receiverStats.id, statsToModify);
                         }