@stream-io/video-client 1.4.5 → 1.4.7

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+### [1.4.7](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-client-1.4.6...@stream-io/video-client-1.4.7) (2024-07-30)
+
+
+### Bug Fixes
+
+* ringing state issues when call was already ended ([#1451](https://github.com/GetStream/stream-video-js/issues/1451)) ([4a3556e](https://github.com/GetStream/stream-video-js/commit/4a3556e0f7b0bd58d0022cc635aa4391014063d7))
+
+### [1.4.6](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-client-1.4.5...@stream-io/video-client-1.4.6) (2024-07-25)
+
+
+### Bug Fixes
+
+* allow joining left call instances ([#1448](https://github.com/GetStream/stream-video-js/issues/1448)) ([2f72300](https://github.com/GetStream/stream-video-js/commit/2f72300f9377eac774516cee3366c28e99840425)), closes [#1433](https://github.com/GetStream/stream-video-js/issues/1433)
+* allow reusing call instances after leaving ([#1433](https://github.com/GetStream/stream-video-js/issues/1433)) ([61e05af](https://github.com/GetStream/stream-video-js/commit/61e05af25c441b7db9db16166a6b4eca20ec7748))
+
 ### [1.4.5](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-client-1.4.4...@stream-io/video-client-1.4.5) (2024-07-12)
 
 

package/dist/index.browser.es.js

@@ -6535,7 +6535,7 @@ function getIceCandidate(candidate) {
     }
 }
 
-const version = "1.4.5" ;
+const version = "1.4.7" ;
 const [major, minor, patch] = version.split('.');
 let sdkInfo = {
     type: SdkType.PLAIN_JAVASCRIPT,
@@ -12484,6 +12484,8 @@ class Call {
         this.reconnectAttempts = 0;
         this.maxReconnectAttempts = 10;
         this.isLeaving = false;
+        this.initialized = false;
+        this.joinLeaveConcurrencyTag = Symbol('joinLeaveConcurrencyTag');
         /**
          * A list hooks/functions to invoke when the call is left.
          * A typical use case is to clean up some global event handlers.
@@ -12535,59 +12537,61 @@ class Call {
          * Leave the call and stop the media streams that were published by the call.
          */
         this.leave = async ({ reject = false, reason = 'user is leaving the call', } = {}) => {
-            const callingState = this.state.callingState;
-            if (callingState === CallingState.LEFT) {
-                throw new Error('Cannot leave call that has already been left.');
-            }
-            if (callingState === CallingState.JOINING) {
-                await this.assertCallJoined();
-            }
-            this.isLeaving = true;
-            if (this.ringing) {
-                // I'm the one who started the call, so I should cancel it.
-                const hasOtherParticipants = this.state.remoteParticipants.length > 0;
-                if (this.isCreatedByMe &&
-                    !hasOtherParticipants &&
-                    callingState === CallingState.RINGING) {
-                    // Signals other users that I have cancelled my call to them
-                    // before they accepted it.
-                    await this.reject();
+            await withoutConcurrency(this.joinLeaveConcurrencyTag, async () => {
+                const callingState = this.state.callingState;
+                if (callingState === CallingState.LEFT) {
+                    throw new Error('Cannot leave call that has already been left.');
                 }
-                else if (reject && callingState === CallingState.RINGING) {
-                    // Signals other users that I have rejected the incoming call.
-                    await this.reject();
+                if (callingState === CallingState.JOINING) {
+                    await this.assertCallJoined();
                 }
-            }
-            this.statsReporter?.stop();
-            this.statsReporter = undefined;
-            this.sfuStatsReporter?.stop();
-            this.sfuStatsReporter = undefined;
-            this.subscriber?.close();
-            this.subscriber = undefined;
-            this.publisher?.close();
-            this.publisher = undefined;
-            this.sfuClient?.close(StreamSfuClient.NORMAL_CLOSURE, reason);
-            this.sfuClient = undefined;
-            this.dispatcher.offAll();
-            this.state.setCallingState(CallingState.LEFT);
-            // Call all leave call hooks, e.g. to clean up global event handlers
-            this.leaveCallHooks.forEach((hook) => hook());
-            this.clientStore.unregisterCall(this);
-            this.camera.dispose();
-            this.microphone.dispose();
-            this.screenShare.dispose();
-            this.speaker.dispose();
-            const stopOnLeavePromises = [];
-            if (this.camera.stopOnLeave) {
-                stopOnLeavePromises.push(this.camera.disable(true));
-            }
-            if (this.microphone.stopOnLeave) {
-                stopOnLeavePromises.push(this.microphone.disable(true));
-            }
-            if (this.screenShare.stopOnLeave) {
-                stopOnLeavePromises.push(this.screenShare.disable(true));
-            }
-            await Promise.all(stopOnLeavePromises);
+                this.isLeaving = true;
+                if (this.ringing) {
+                    // I'm the one who started the call, so I should cancel it.
+                    const hasOtherParticipants = this.state.remoteParticipants.length > 0;
+                    if (this.isCreatedByMe &&
+                        !hasOtherParticipants &&
+                        callingState === CallingState.RINGING) {
+                        // Signals other users that I have cancelled my call to them
+                        // before they accepted it.
+                        await this.reject();
+                    }
+                    else if (reject && callingState === CallingState.RINGING) {
+                        // Signals other users that I have rejected the incoming call.
+                        await this.reject();
+                    }
+                }
+                this.statsReporter?.stop();
+                this.statsReporter = undefined;
+                this.sfuStatsReporter?.stop();
+                this.sfuStatsReporter = undefined;
+                this.subscriber?.close();
+                this.subscriber = undefined;
+                this.publisher?.close();
+                this.publisher = undefined;
+                this.sfuClient?.close(StreamSfuClient.NORMAL_CLOSURE, reason);
+                this.sfuClient = undefined;
+                this.state.setCallingState(CallingState.LEFT);
+                // Call all leave call hooks, e.g. to clean up global event handlers
+                this.leaveCallHooks.forEach((hook) => hook());
+                this.initialized = false;
+                this.clientStore.unregisterCall(this);
+                this.camera.dispose();
+                this.microphone.dispose();
+                this.screenShare.dispose();
+                this.speaker.dispose();
+                const stopOnLeavePromises = [];
+                if (this.camera.stopOnLeave) {
+                    stopOnLeavePromises.push(this.camera.disable(true));
+                }
+                if (this.microphone.stopOnLeave) {
+                    stopOnLeavePromises.push(this.microphone.disable(true));
+                }
+                if (this.screenShare.stopOnLeave) {
+                    stopOnLeavePromises.push(this.screenShare.disable(true));
+                }
+                await Promise.all(stopOnLeavePromises);
+            });
         };
         /**
          * Loads the information about the call.
@@ -12597,13 +12601,15 @@ class Call {
          * @param params.members_limit the total number of members to return as part of the response.
          */
         this.get = async (params) => {
+            await this.setup();
             const response = await this.streamClient.get(this.streamClientBasePath, params);
-            if (params?.ring && !this.ringing) {
-                this.ringingSubject.next(true);
-            }
             this.state.updateFromCallResponse(response.call);
             this.state.setMembers(response.members);
             this.state.setOwnCapabilities(response.own_capabilities);
+            if (params?.ring || this.ringing) {
+                // the call response can indicate where the call is still ringing or not
+                this.ringingSubject.next(true);
+            }
             if (this.streamClient._hasConnectionID()) {
                 this.watching = true;
                 this.clientStore.registerCall(this);
@@ -12617,13 +12623,15 @@ class Call {
          * @param data the data to create the call with.
          */
         this.getOrCreate = async (data) => {
+            await this.setup();
             const response = await this.streamClient.post(this.streamClientBasePath, data);
-            if (data?.ring && !this.ringing) {
-                this.ringingSubject.next(true);
-            }
             this.state.updateFromCallResponse(response.call);
             this.state.setMembers(response.members);
             this.state.setOwnCapabilities(response.own_capabilities);
+            if (data?.ring || this.ringing) {
+                // the call response can indicate where the call is still ringing or not
+                this.ringingSubject.next(true);
+            }
             if (this.streamClient._hasConnectionID()) {
                 this.watching = true;
                 this.clientStore.registerCall(this);
@@ -12681,14 +12689,12 @@ class Call {
          * @returns a promise which resolves once the call join-flow has finished.
          */
         this.join = async (data) => {
+            await this.setup();
             const callingState = this.state.callingState;
             if ([CallingState.JOINED, CallingState.JOINING].includes(callingState)) {
                 this.logger('warn', 'Join method called twice, you should only call this once');
                 throw new Error(`Illegal State: Already joined.`);
             }
-            if (callingState === CallingState.LEFT) {
-                throw new Error('Illegal State: Cannot join already left call. Create a new Call instance to join a call.');
-            }
             const isMigrating = callingState === CallingState.MIGRATING;
             const isReconnecting = callingState === CallingState.RECONNECTING;
             this.state.setCallingState(CallingState.JOINING);
@@ -13822,20 +13828,31 @@ class Call {
         this.state.setMembers(members || []);
         this.state.setOwnCapabilities(ownCapabilities || []);
         this.state.setCallingState(ringing ? CallingState.RINGING : CallingState.IDLE);
-        this.on('all', (event) => {
-            // update state with the latest event data
-            this.state.updateFromEvent(event);
-        });
-        this.leaveCallHooks.add(registerEventHandlers(this, this.state, this.dispatcher));
-        this.registerEffects();
-        this.leaveCallHooks.add(createSubscription(this.trackSubscriptionsSubject.pipe(debounce((v) => timer(v.type)), map$1((v) => v.data)), (subscriptions) => this.sfuClient?.updateSubscriptions(subscriptions).catch((err) => {
-            this.logger('debug', `Failed to update track subscriptions`, err);
-        })));
         this.camera = new CameraManager(this);
         this.microphone = new MicrophoneManager(this);
         this.speaker = new SpeakerManager(this);
         this.screenShare = new ScreenShareManager(this);
     }
+    async setup() {
+        await withoutConcurrency(this.joinLeaveConcurrencyTag, async () => {
+            if (this.initialized) {
+                return;
+            }
+            this.leaveCallHooks.add(this.on('all', (event) => {
+                // update state with the latest event data
+                this.state.updateFromEvent(event);
+            }));
+            this.leaveCallHooks.add(registerEventHandlers(this, this.state, this.dispatcher));
+            this.registerEffects();
+            this.leaveCallHooks.add(createSubscription(this.trackSubscriptionsSubject.pipe(debounce((v) => timer(v.type)), map$1((v) => v.data)), (subscriptions) => this.sfuClient?.updateSubscriptions(subscriptions).catch((err) => {
+                this.logger('debug', `Failed to update track subscriptions`, err);
+            })));
+            if (this.state.callingState === CallingState.LEFT) {
+                this.state.setCallingState(CallingState.IDLE);
+            }
+            this.initialized = true;
+        });
+    }
     registerEffects() {
         this.leaveCallHooks.add(
         // handles updating the permissions context when the settings change.
@@ -13914,11 +13931,47 @@ class Call {
         createSubscription(this.ringingSubject, (isRinging) => {
             if (!isRinging)
                 return;
-            this.scheduleAutoDrop();
-            if (this.state.callingState === CallingState.IDLE) {
-                this.state.setCallingState(CallingState.RINGING);
+            const callSession = this.state.session;
+            const receiver_id = this.clientStore.connectedUser?.id;
+            const endedAt = this.state.endedAt;
+            const created_by_id = this.state.createdBy?.id;
+            const rejected_by = callSession?.rejected_by;
+            const accepted_by = callSession?.accepted_by;
+            let leaveCallIdle = false;
+            if (endedAt) {
+                // call was ended before it was accepted or rejected so we should leave it to idle
+                leaveCallIdle = true;
+            }
+            else if (created_by_id && rejected_by) {
+                if (rejected_by[created_by_id]) {
+                    // call was cancelled by the caller
+                    leaveCallIdle = true;
+                }
+            }
+            else if (receiver_id && rejected_by) {
+                if (rejected_by[receiver_id]) {
+                    // call was rejected by the receiver in some other device
+                    leaveCallIdle = true;
+                }
+            }
+            else if (receiver_id && accepted_by) {
+                if (accepted_by[receiver_id]) {
+                    // call was accepted by the receiver in some other device
+                    leaveCallIdle = true;
+                }
+            }
+            if (leaveCallIdle) {
+                if (this.state.callingState !== CallingState.IDLE) {
+                    this.state.setCallingState(CallingState.IDLE);
+                }
+            }
+            else {
+                this.scheduleAutoDrop();
+                if (this.state.callingState === CallingState.IDLE) {
+                    this.state.setCallingState(CallingState.RINGING);
+                }
+                this.leaveCallHooks.add(registerRingingCallEventHandlers(this));
             }
-            this.leaveCallHooks.add(registerRingingCallEventHandlers(this));
         }));
     }
     /**
@@ -15521,7 +15574,7 @@ class StreamClient {
             });
         };
         this.getUserAgent = () => {
-            const version = "1.4.5" ;
+            const version = "1.4.7" ;
             return (this.userAgent ||
                 `stream-video-javascript-client-${this.node ? 'node' : 'browser'}-${version}`);
         };