@stream-io/video-client 1.4.6 → 1.4.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stream-io/video-client",
-  "version": "1.4.6",
+  "version": "1.4.7",
   "packageManager": "yarn@3.2.4",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",

package/src/Call.ts

@@ -435,11 +435,43 @@ export class Call {
       // "ringing" mode effects and event handlers
       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));
       }),
     );
   }
@@ -611,14 +643,15 @@ export class Call {
       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);
@@ -641,14 +674,15 @@ export class Call {
       GetOrCreateCallRequest
     >(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);