@stream-io/video-client 1.18.4 → 1.18.6

package/dist/index.cjs.js

@@ -3647,7 +3647,10 @@ function hasPending(tag) {
     return pendingPromises.has(tag);
 }
 async function settled(tag) {
-    await pendingPromises.get(tag)?.promise;
+    let pending;
+    while ((pending = pendingPromises.get(tag))) {
+        await pending.promise;
+    }
 }
 /**
  * Implements common functionality of running async functions serially, by chaining
@@ -5346,8 +5349,6 @@ class BasePeerConnection {
         this.pc.removeEventListener('icecandidateerror', this.onIceCandidateError);
         this.pc.removeEventListener('signalingstatechange', this.onSignalingChange);
         this.pc.removeEventListener('iceconnectionstatechange', this.onIceConnectionStateChange);
-        // cancel any ongoing ICE restart process
-        withCancellation('onIceConnectionStateChange', () => Promise.resolve());
         this.pc.removeEventListener('icegatheringstatechange', this.onIceGatherChange);
         this.unsubscribeIceTrickle?.();
         this.subscriptions.forEach((unsubscribe) => unsubscribe());
@@ -5377,12 +5378,6 @@ class TransceiverCache {
         this.get = (publishOption) => {
             return this.findTransceiver(publishOption)?.transceiver;
         };
-        /**
-         * Gets the last transceiver for the given track type and publish option id.
-         */
-        this.getWith = (trackType, id) => {
-            return this.findTransceiver({ trackType, id })?.transceiver;
-        };
         /**
          * Checks if the cache has the given publish option.
          */
@@ -5696,7 +5691,7 @@ class Publisher extends BasePeerConnection {
                 const trackToPublish = this.cloneTrack(track);
                 const transceiver = this.transceiverCache.get(publishOption);
                 if (!transceiver) {
-                    this.addTransceiver(trackToPublish, publishOption);
+                    await this.addTransceiver(trackToPublish, publishOption);
                 }
                 else {
                     const previousTrack = transceiver.sender.track;
@@ -5710,7 +5705,7 @@ class Publisher extends BasePeerConnection {
         /**
          * Adds a new transceiver carrying the given track to the peer connection.
          */
-        this.addTransceiver = (track, publishOption) => {
+        this.addTransceiver = async (track, publishOption) => {
             const videoEncodings = computeVideoLayers(track, publishOption);
             const sendEncodings = isSvcCodec(publishOption.codec?.name)
                 ? toSvcEncodings(videoEncodings)
@@ -5722,6 +5717,7 @@ class Publisher extends BasePeerConnection {
             const trackType = publishOption.trackType;
             this.logger('debug', `Added ${TrackType[trackType]} transceiver`);
             this.transceiverCache.add(publishOption, transceiver);
+            await this.negotiate();
         };
         /**
          * Synchronizes the current Publisher state with the provided publish options.
@@ -5741,7 +5737,7 @@ class Publisher extends BasePeerConnection {
                 // take the track from the existing transceiver for the same track type,
                 // clone it and publish it with the new publish options
                 const track = this.cloneTrack(item.transceiver.sender.track);
-                this.addTransceiver(track, publishOption);
+                await this.addTransceiver(track, publishOption);
             }
             // stop publishing with options not required anymore -> [vp9]
             for (const item of this.transceiverCache.items()) {
@@ -5811,7 +5807,9 @@ class Publisher extends BasePeerConnection {
             const enabledLayers = layers.filter((l) => l.active);
             const tag = 'Update publish quality:';
             this.logger('info', `${tag} requested layers by SFU:`, enabledLayers);
-            const sender = this.transceiverCache.getWith(trackType, publishOptionId)?.sender;
+            const transceiverId = this.transceiverCache.find((t) => t.publishOption.id === publishOptionId &&
+                t.publishOption.trackType === trackType);
+            const sender = transceiverId?.transceiver.sender;
             if (!sender) {
                 return this.logger('warn', `${tag} no video sender found.`);
             }
@@ -5819,8 +5817,8 @@ class Publisher extends BasePeerConnection {
             if (params.encodings.length === 0) {
                 return this.logger('warn', `${tag} there are no encodings set.`);
             }
-            const [codecInUse] = params.codecs;
-            const usesSvcCodec = codecInUse && isSvcCodec(codecInUse.mimeType);
+            const codecInUse = transceiverId?.publishOption.codec?.name;
+            const usesSvcCodec = codecInUse && isSvcCodec(codecInUse);
             let changed = false;
             for (const encoder of params.encodings) {
                 const layer = usesSvcCodec
@@ -5878,40 +5876,32 @@ class Publisher extends BasePeerConnection {
             }
             await this.negotiate({ iceRestart: true });
         };
-        this.onNegotiationNeeded = () => {
-            withCancellation('publisher.negotiate', (signal) => this.negotiate().catch((err) => {
-                if (signal.aborted)
-                    return;
-                this.logger('error', `Negotiation failed.`, err);
-                this.onUnrecoverableError?.();
-            }));
-        };
         /**
          * Initiates a new offer/answer exchange with the currently connected SFU.
          *
          * @param options the optional offer options to use.
          */
         this.negotiate = async (options) => {
-            const offer = await this.pc.createOffer(options);
-            const trackInfos = this.getAnnouncedTracks(offer.sdp);
-            if (trackInfos.length === 0) {
-                throw new Error(`Can't negotiate without announcing any tracks`);
-            }
-            try {
-                this.isIceRestarting = options?.iceRestart ?? false;
-                await this.pc.setLocalDescription(offer);
-                const { response } = await this.sfuClient.setPublisher({
-                    sdp: offer.sdp || '',
-                    tracks: trackInfos,
-                });
-                if (response.error)
-                    throw new Error(response.error.message);
-                await this.pc.setRemoteDescription({ type: 'answer', sdp: response.sdp });
-            }
-            finally {
-                this.isIceRestarting = false;
-            }
-            this.addTrickledIceCandidates();
+            return withoutConcurrency('publisher.negotiate', async () => {
+                const offer = await this.pc.createOffer(options);
+                const tracks = this.getAnnouncedTracks(offer.sdp);
+                if (!tracks.length)
+                    throw new Error(`Can't negotiate without any tracks`);
+                try {
+                    this.isIceRestarting = options?.iceRestart ?? false;
+                    await this.pc.setLocalDescription(offer);
+                    const { sdp = '' } = offer;
+                    const { response } = await this.sfuClient.setPublisher({ sdp, tracks });
+                    if (response.error)
+                        throw new Error(response.error.message);
+                    const { sdp: answerSdp } = response;
+                    await this.pc.setRemoteDescription({ type: 'answer', sdp: answerSdp });
+                }
+                finally {
+                    this.isIceRestarting = false;
+                }
+                this.addTrickledIceCandidates();
+            });
         };
         /**
          * Returns a list of tracks that are currently being published.
@@ -5995,7 +5985,6 @@ class Publisher extends BasePeerConnection {
             this.clonedTracks.delete(track);
         };
         this.publishOptions = publishOptions;
-        this.pc.addEventListener('negotiationneeded', this.onNegotiationNeeded);
         this.on('iceRestart', (iceRestart) => {
             if (iceRestart.peerType !== PeerType.PUBLISHER_UNSPECIFIED)
                 return;
@@ -6014,17 +6003,6 @@ class Publisher extends BasePeerConnection {
             return this.syncPublishOptions();
         });
     }
-    /**
-     * Detaches the event handlers from the `RTCPeerConnection`.
-     * This is useful when we want to replace the `RTCPeerConnection`
-     * instance with a new one (in case of migration).
-     */
-    detachEventHandlers() {
-        super.detachEventHandlers();
-        this.pc.removeEventListener('negotiationneeded', this.onNegotiationNeeded);
-        // abort any ongoing negotiation
-        withCancellation('publisher.negotiate', () => Promise.resolve());
-    }
     /**
      * Disposes this Publisher instance.
      */
@@ -7456,7 +7434,7 @@ const aggregate = (stats) => {
     return report;
 };
 
-const version = "1.18.4";
+const version = "1.18.6";
 const [major, minor, patch] = version.split('.');
 let sdkInfo = {
     type: SdkType.PLAIN_JAVASCRIPT,
@@ -8390,6 +8368,7 @@ class BrowserPermission {
             }
             try {
                 this.wasPrompted = true;
+                this.setState('prompting');
                 const stream = await navigator.mediaDevices.getUserMedia(this.permission.constraints);
                 disposeOfMediaStream(stream);
                 this.setState('granted');
@@ -8413,6 +8392,7 @@ class BrowserPermission {
                     error: e,
                     permission: this.permission,
                 });
+                this.setState('prompt');
                 throw e;
             }
         });
@@ -8424,13 +8404,19 @@ class BrowserPermission {
         return () => this.listeners.delete(cb);
     }
     asObservable() {
-        return rxjs.fromEventPattern((handler) => this.listen(handler), (handler, unlisten) => unlisten()).pipe(
+        return this.getStateObservable().pipe(
         // In some browsers, the 'change' event doesn't reliably emit and hence,
         // permissionState stays in 'prompt' state forever.
         // Typically, this happens when a user grants one-time permission.
         // Instead of checking if a permission is granted, we check if it isn't denied
         rxjs.map((state) => state !== 'denied'));
     }
+    getIsPromptingObservable() {
+        return this.getStateObservable().pipe(rxjs.map((state) => state === 'prompting'));
+    }
+    getStateObservable() {
+        return rxjs.fromEventPattern((handler) => this.listen(handler), (handler, unlisten) => unlisten());
+    }
     setState(state) {
         if (this.state !== state) {
             this.state = state;
@@ -9186,6 +9172,9 @@ class InputMediaDeviceManagerState {
         this.hasBrowserPermission$ = permission
             ? permission.asObservable().pipe(rxjs.shareReplay(1))
             : rxjs.of(true);
+        this.isPromptingPermission$ = permission
+            ? permission.getIsPromptingObservable().pipe(rxjs.shareReplay(1))
+            : rxjs.of(false);
     }
     /**
      * The device status
@@ -13082,7 +13071,7 @@ class StreamClient {
         this.getUserAgent = () => {
             if (!this.cachedUserAgent) {
                 const { clientAppIdentifier = {} } = this.options;
-                const { sdkName = 'js', sdkVersion = "1.18.4", ...extras } = clientAppIdentifier;
+                const { sdkName = 'js', sdkVersion = "1.18.6", ...extras } = clientAppIdentifier;
                 this.cachedUserAgent = [
                     `stream-video-${sdkName}-v${sdkVersion}`,
                     ...Object.entries(extras).map(([key, value]) => `${key}=${value}`),