@stream-io/video-client 1.20.0 → 1.20.1

package/dist/index.cjs.js

@@ -5645,7 +5645,7 @@ const aggregate = (stats) => {
     return report;
 };
 
-const version = "1.20.0";
+const version = "1.20.1";
 const [major, minor, patch] = version.split('.');
 let sdkInfo = {
     type: SdkType.PLAIN_JAVASCRIPT,
@@ -5786,9 +5786,9 @@ class SfuStatsReporter {
         this.logger = getLogger(['SfuStatsReporter']);
         this.inputDevices = new Map();
         this.observeDevice = (device, kind) => {
-            const { hasBrowserPermission$ } = device.state;
+            const { browserPermissionState$ } = device.state;
             this.unsubscribeDevicePermissionsSubscription?.();
-            this.unsubscribeDevicePermissionsSubscription = createSubscription(rxjs.combineLatest([hasBrowserPermission$, this.state.ownCapabilities$]), ([hasPermission, ownCapabilities]) => {
+            this.unsubscribeDevicePermissionsSubscription = createSubscription(rxjs.combineLatest([browserPermissionState$, this.state.ownCapabilities$]), ([browserPermissionState, ownCapabilities]) => {
                 // cleanup the previous listDevices() subscription in case
                 // permissions or capabilities have changed.
                 // we will subscribe again if everything is in order.
@@ -5796,7 +5796,7 @@ class SfuStatsReporter {
                 const hasCapability = kind === 'mic'
                     ? ownCapabilities.includes(OwnCapability.SEND_AUDIO)
                     : ownCapabilities.includes(OwnCapability.SEND_VIDEO);
-                if (!hasPermission || !hasCapability) {
+                if (browserPermissionState !== 'granted' || !hasCapability) {
                     this.inputDevices.set(kind, {
                         currentDevice: '',
                         availableDevices: [],
@@ -8730,6 +8730,9 @@ class BrowserPermission {
         // Instead of checking if a permission is granted, we check if it isn't denied
         rxjs.map((state) => state !== 'denied'));
     }
+    asStateObservable() {
+        return this.getStateObservable();
+    }
     getIsPromptingObservable() {
         return this.getStateObservable().pipe(rxjs.map((state) => state === 'prompting'));
     }
@@ -9256,122 +9259,130 @@ class InputMediaDeviceManager {
         this.logger('debug', 'Starting stream');
         let stream;
         let rootStream;
-        if (this.state.mediaStream &&
-            this.getTracks().every((t) => t.readyState === 'live')) {
-            stream = this.state.mediaStream;
-            this.enableTracks();
-        }
-        else {
-            const defaultConstraints = this.state.defaultConstraints;
-            const constraints = {
-                ...defaultConstraints,
-                deviceId: this.state.selectedDevice
-                    ? { exact: this.state.selectedDevice }
-                    : undefined,
-            };
-            /**
-             * Chains two media streams together.
-             *
-             * In our case, filters MediaStreams are derived from their parent MediaStream.
-             * However, once a child filter's track is stopped,
-             * the tracks of the parent MediaStream aren't automatically stopped.
-             * This leads to a situation where the camera indicator light is still on
-             * even though the user stopped publishing video.
-             *
-             * This function works around this issue by stopping the parent MediaStream's tracks
-             * as well once the child filter's tracks are stopped.
-             *
-             * It works by patching the stop() method of the child filter's tracks to also stop
-             * the parent MediaStream's tracks of the same type. Here we assume that
-             * the parent MediaStream has only one track of each type.
-             *
-             * @param parentStream the parent MediaStream. Omit for the root stream.
-             */
-            const chainWith = (parentStream) => async (filterStream) => {
-                if (!parentStream)
-                    return filterStream;
-                // TODO OL: take care of track.enabled property as well
-                const parent = await parentStream;
-                filterStream.getTracks().forEach((track) => {
-                    const originalStop = track.stop;
-                    track.stop = function stop() {
-                        originalStop.call(track);
-                        parent.getTracks().forEach((parentTrack) => {
-                            if (parentTrack.kind === track.kind) {
-                                parentTrack.stop();
-                            }
-                        });
-                    };
-                });
-                parent.getTracks().forEach((parentTrack) => {
-                    // When the parent stream abruptly ends, we propagate the event
-                    // to the filter stream.
-                    // This usually happens when the camera/microphone permissions
-                    // are revoked or when the device is disconnected.
-                    const handleParentTrackEnded = () => {
-                        filterStream.getTracks().forEach((track) => {
-                            if (parentTrack.kind !== track.kind)
-                                return;
-                            track.stop();
-                            track.dispatchEvent(new Event('ended')); // propagate the event
+        try {
+            if (this.state.mediaStream &&
+                this.getTracks().every((t) => t.readyState === 'live')) {
+                stream = this.state.mediaStream;
+                this.enableTracks();
+            }
+            else {
+                const defaultConstraints = this.state.defaultConstraints;
+                const constraints = {
+                    ...defaultConstraints,
+                    deviceId: this.state.selectedDevice
+                        ? { exact: this.state.selectedDevice }
+                        : undefined,
+                };
+                /**
+                 * Chains two media streams together.
+                 *
+                 * In our case, filters MediaStreams are derived from their parent MediaStream.
+                 * However, once a child filter's track is stopped,
+                 * the tracks of the parent MediaStream aren't automatically stopped.
+                 * This leads to a situation where the camera indicator light is still on
+                 * even though the user stopped publishing video.
+                 *
+                 * This function works around this issue by stopping the parent MediaStream's tracks
+                 * as well once the child filter's tracks are stopped.
+                 *
+                 * It works by patching the stop() method of the child filter's tracks to also stop
+                 * the parent MediaStream's tracks of the same type. Here we assume that
+                 * the parent MediaStream has only one track of each type.
+                 *
+                 * @param parentStream the parent MediaStream. Omit for the root stream.
+                 */
+                const chainWith = (parentStream) => async (filterStream) => {
+                    if (!parentStream)
+                        return filterStream;
+                    // TODO OL: take care of track.enabled property as well
+                    const parent = await parentStream;
+                    filterStream.getTracks().forEach((track) => {
+                        const originalStop = track.stop;
+                        track.stop = function stop() {
+                            originalStop.call(track);
+                            parent.getTracks().forEach((parentTrack) => {
+                                if (parentTrack.kind === track.kind) {
+                                    parentTrack.stop();
+                                }
+                            });
+                        };
+                    });
+                    parent.getTracks().forEach((parentTrack) => {
+                        // When the parent stream abruptly ends, we propagate the event
+                        // to the filter stream.
+                        // This usually happens when the camera/microphone permissions
+                        // are revoked or when the device is disconnected.
+                        const handleParentTrackEnded = () => {
+                            filterStream.getTracks().forEach((track) => {
+                                if (parentTrack.kind !== track.kind)
+                                    return;
+                                track.stop();
+                                track.dispatchEvent(new Event('ended')); // propagate the event
+                            });
+                        };
+                        parentTrack.addEventListener('ended', handleParentTrackEnded);
+                        this.subscriptions.push(() => {
+                            parentTrack.removeEventListener('ended', handleParentTrackEnded);
                         });
-                    };
-                    parentTrack.addEventListener('ended', handleParentTrackEnded);
+                    });
+                    return filterStream;
+                };
+                // the rootStream represents the stream coming from the actual device
+                // e.g. camera or microphone stream
+                rootStream = this.getStream(constraints);
+                // we publish the last MediaStream of the chain
+                stream = await this.filters.reduce((parent, entry) => parent
+                    .then((inputStream) => {
+                    const { stop, output } = entry.start(inputStream);
+                    entry.stop = stop;
+                    return output;
+                })
+                    .then(chainWith(parent), (error) => {
+                    this.logger('warn', 'Filter failed to start and will be ignored', error);
+                    return parent;
+                }), rootStream);
+            }
+            if (this.call.state.callingState === exports.CallingState.JOINED) {
+                await this.publishStream(stream);
+            }
+            if (this.state.mediaStream !== stream) {
+                this.state.setMediaStream(stream, await rootStream);
+                const handleTrackEnded = async () => {
+                    await this.statusChangeSettled();
+                    if (this.enabled) {
+                        this.isTrackStoppedDueToTrackEnd = true;
+                        setTimeout(() => {
+                            this.isTrackStoppedDueToTrackEnd = false;
+                        }, 2000);
+                        await this.disable();
+                    }
+                };
+                const createTrackMuteHandler = (muted) => () => {
+                    if (!isMobile() || this.trackType !== TrackType.VIDEO)
+                        return;
+                    this.call.notifyTrackMuteState(muted, this.trackType).catch((err) => {
+                        this.logger('warn', 'Error while notifying track mute state', err);
+                    });
+                };
+                stream.getTracks().forEach((track) => {
+                    const muteHandler = createTrackMuteHandler(true);
+                    const unmuteHandler = createTrackMuteHandler(false);
+                    track.addEventListener('mute', muteHandler);
+                    track.addEventListener('unmute', unmuteHandler);
+                    track.addEventListener('ended', handleTrackEnded);
                     this.subscriptions.push(() => {
-                        parentTrack.removeEventListener('ended', handleParentTrackEnded);
+                        track.removeEventListener('mute', muteHandler);
+                        track.removeEventListener('unmute', unmuteHandler);
+                        track.removeEventListener('ended', handleTrackEnded);
                     });
                 });
-                return filterStream;
-            };
-            // the rootStream represents the stream coming from the actual device
-            // e.g. camera or microphone stream
-            rootStream = this.getStream(constraints);
-            // we publish the last MediaStream of the chain
-            stream = await this.filters.reduce((parent, entry) => parent
-                .then((inputStream) => {
-                const { stop, output } = entry.start(inputStream);
-                entry.stop = stop;
-                return output;
-            })
-                .then(chainWith(parent), (error) => {
-                this.logger('warn', 'Filter failed to start and will be ignored', error);
-                return parent;
-            }), rootStream);
-        }
-        if (this.call.state.callingState === exports.CallingState.JOINED) {
-            await this.publishStream(stream);
+            }
         }
-        if (this.state.mediaStream !== stream) {
-            this.state.setMediaStream(stream, await rootStream);
-            const handleTrackEnded = async () => {
-                await this.statusChangeSettled();
-                if (this.enabled) {
-                    this.isTrackStoppedDueToTrackEnd = true;
-                    setTimeout(() => {
-                        this.isTrackStoppedDueToTrackEnd = false;
-                    }, 2000);
-                    await this.disable();
-                }
-            };
-            const createTrackMuteHandler = (muted) => () => {
-                if (!isMobile() || this.trackType !== TrackType.VIDEO)
-                    return;
-                this.call.notifyTrackMuteState(muted, this.trackType).catch((err) => {
-                    this.logger('warn', 'Error while notifying track mute state', err);
-                });
-            };
-            stream.getTracks().forEach((track) => {
-                const muteHandler = createTrackMuteHandler(true);
-                const unmuteHandler = createTrackMuteHandler(false);
-                track.addEventListener('mute', muteHandler);
-                track.addEventListener('unmute', unmuteHandler);
-                track.addEventListener('ended', handleTrackEnded);
-                this.subscriptions.push(() => {
-                    track.removeEventListener('mute', muteHandler);
-                    track.removeEventListener('unmute', unmuteHandler);
-                    track.removeEventListener('ended', handleTrackEnded);
-                });
-            });
+        catch (err) {
+            if (rootStream) {
+                disposeOfMediaStream(await rootStream);
+            }
+            throw err;
         }
     }
     get mediaDeviceKind() {
@@ -9493,6 +9504,9 @@ class InputMediaDeviceManagerState {
         this.hasBrowserPermission$ = permission
             ? permission.asObservable().pipe(rxjs.shareReplay(1))
             : rxjs.of(true);
+        this.browserPermissionState$ = permission
+            ? permission.asStateObservable().pipe(rxjs.shareReplay(1))
+            : rxjs.of('prompt');
         this.isPromptingPermission$ = permission
             ? permission.getIsPromptingObservable().pipe(rxjs.shareReplay(1))
             : rxjs.of(false);
@@ -13458,7 +13472,7 @@ class StreamClient {
         this.getUserAgent = () => {
             if (!this.cachedUserAgent) {
                 const { clientAppIdentifier = {} } = this.options;
-                const { sdkName = 'js', sdkVersion = "1.20.0", ...extras } = clientAppIdentifier;
+                const { sdkName = 'js', sdkVersion = "1.20.1", ...extras } = clientAppIdentifier;
                 this.cachedUserAgent = [
                     `stream-video-${sdkName}-v${sdkVersion}`,
                     ...Object.entries(extras).map(([key, value]) => `${key}=${value}`),