@webex/web-client-media-engine 2.0.6 → 2.0.8

package/dist/cjs/index.js

@@ -1130,6 +1130,7 @@ class LocalTrack extends EventEmitter$2 {
     constructor(stream) {
         super();
         this.isPublished = false;
+        this.loadingEffects = new Map();
         this.effects = new Map();
         this.originalStream = stream;
         this.underlyingStream = stream;
@@ -1268,9 +1269,18 @@ class LocalTrack extends EventEmitter$2 {
      */
     addEffect(name, effect) {
         return __awaiter$1(this, void 0, void 0, function* () {
+            // Load the effect
+            this.loadingEffects.set(name, effect);
             yield effect.load(this.underlyingStream);
+            // Check that the loaded effect is the latest one and dispose if not
+            if (effect !== this.loadingEffects.get(name)) {
+                yield effect.dispose();
+                throw new Error(`Effect "${name}" not required after loading`);
+            }
+            // Use the loaded effect
             this.underlyingStream = effect.getUnderlyingStream();
             this.effects.set(name, effect);
+            this.loadingEffects.delete(name);
             this.emit(exports.LocalTrackEvents.UnderlyingTrackChange);
         });
     }
@@ -1300,6 +1310,9 @@ class LocalTrack extends EventEmitter$2 {
      */
     disposeEffects() {
         return __awaiter$1(this, void 0, void 0, function* () {
+            // Clear effects that are loading to indicate that they are not needed
+            this.loadingEffects.clear();
+            // Dispose of any effects currently in use
             if (this.effects.size > 0) {
                 yield Promise.all(Array.from(this.effects.values(), (effect) => effect.dispose()));
                 this.effects.clear();
@@ -1481,7 +1494,7 @@ class ConnectionStateHandler extends EventEmitter$2 {
         else {
             mediaConnectionState = exports.ConnectionState.Connecting;
         }
-        logger$3.log(`iceConnectionState=${iceState} connectionState=${connectionState} => ${this.mediaConnectionState}`);
+        logger$3.log(`iceConnectionState=${iceState} connectionState=${connectionState} => ${mediaConnectionState}`);
         return mediaConnectionState;
     }
     /**
@@ -13543,25 +13556,29 @@ class MultistreamConnection extends EventEmitter {
     }
     createReceiveSlot(mediaType) {
         return __awaiter(this, void 0, void 0, function* () {
-            const rtcRtpTransceiver = this.pc.addTransceiver(toMediaStreamTrackKind(mediaType), {
-                direction: 'recvonly',
-            });
-            this.addMid(mediaType);
-            const recvOnlyTransceiver = new ReceiveOnlyTransceiver(rtcRtpTransceiver, (mid) => {
-                const ingressSignaler = this.streamSignalerManager.getIngressStreamSignaler(mid);
-                if (!ingressSignaler) {
-                    return null;
-                }
-                return ingressSignaler.getReceiverId();
+            return new Promise((createReceiveSlotResolve) => {
+                this.offerAnswerQueue.push(() => __awaiter(this, void 0, void 0, function* () {
+                    const rtcRtpTransceiver = this.pc.addTransceiver(toMediaStreamTrackKind(mediaType), {
+                        direction: 'recvonly',
+                    });
+                    this.addMid(mediaType);
+                    const recvOnlyTransceiver = new ReceiveOnlyTransceiver(rtcRtpTransceiver, (mid) => {
+                        const ingressSignaler = this.streamSignalerManager.getIngressStreamSignaler(mid);
+                        if (!ingressSignaler) {
+                            return null;
+                        }
+                        return ingressSignaler.getReceiverId();
+                    });
+                    if (this.pc.getRemoteDescription()) {
+                        yield this.doLocalOfferAnswer();
+                    }
+                    this.recvTransceivers.set(mediaType, [
+                        ...(this.recvTransceivers.get(mediaType) || []),
+                        recvOnlyTransceiver,
+                    ]);
+                    createReceiveSlotResolve(recvOnlyTransceiver.receiveSlot);
+                }));
             });
-            if (this.pc.getRemoteDescription()) {
-                yield this.doLocalOfferAnswer();
-            }
-            this.recvTransceivers.set(mediaType, [
-                ...(this.recvTransceivers.get(mediaType) || []),
-                recvOnlyTransceiver,
-            ]);
-            return recvOnlyTransceiver.receiveSlot;
         });
     }
     getIngressPayloadType(mediaType, mimeType) {
@@ -13638,23 +13655,28 @@ class MultistreamConnection extends EventEmitter {
                     logger.debug(`setAnswerResolve function was cleared between setAnswer and result of setRemoteDescription`);
                 }
                 if (isInitialAnswer && this.customCodecParameters.size > 0) {
-                    yield this.doLocalOfferAnswer();
+                    yield this.queueLocalOfferAnswer();
                 }
             }));
         });
     }
     doLocalOfferAnswer() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const offer = yield this.pc.createOffer();
+            if (!offer.sdp) {
+                throw new Error('No SDP offer');
+            }
+            offer.sdp = this.preProcessLocalOffer(offer.sdp);
+            yield this.pc.setLocalDescription(offer);
+            const answer = this.preProcessRemoteAnswer((_a = this.pc.getRemoteDescription()) === null || _a === void 0 ? void 0 : _a.sdp);
+            return this.pc.setRemoteDescription({ type: 'answer', sdp: answer });
+        });
+    }
+    queueLocalOfferAnswer() {
         return __awaiter(this, void 0, void 0, function* () {
             return this.offerAnswerQueue.push(() => __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                const offer = yield this.pc.createOffer();
-                if (!offer.sdp) {
-                    throw new Error('No SDP offer');
-                }
-                offer.sdp = this.preProcessLocalOffer(offer.sdp);
-                yield this.pc.setLocalDescription(offer);
-                const answer = this.preProcessRemoteAnswer((_a = this.pc.getRemoteDescription()) === null || _a === void 0 ? void 0 : _a.sdp);
-                return this.pc.setRemoteDescription({ type: 'answer', sdp: answer });
+                yield this.doLocalOfferAnswer();
             }));
         });
     }
@@ -13787,7 +13809,7 @@ class MultistreamConnection extends EventEmitter {
             });
             this.customCodecParameters.set(mediaType, currentParams);
             if (this.pc.getRemoteDescription()) {
-                yield this.doLocalOfferAnswer();
+                yield this.queueLocalOfferAnswer();
             }
         });
     }
@@ -13799,7 +13821,7 @@ class MultistreamConnection extends EventEmitter {
             });
             this.customCodecParameters.set(mediaType, currentParams);
             if (this.pc.getRemoteDescription()) {
-                yield this.doLocalOfferAnswer();
+                yield this.queueLocalOfferAnswer();
             }
         });
     }