@stream-io/video-client 0.0.2-alpha.6 → 0.0.2-alpha.8

package/src/events/__tests__/call.test.ts

@@ -13,6 +13,7 @@ import {
 import {
   CallAcceptedEvent,
   CallEndedEvent,
+  CallResponse,
   CallUpdatedEvent,
 } from '../../gen/coordinator';
 import { Call } from '../../Call';
@@ -93,28 +94,58 @@ describe('Call ringing events', () => {
   });
 
   describe(`call.rejected`, () => {
-    it(`will leave the call if all callees have rejected`, async () => {
-      const call = fakeCall();
-      // @ts-expect-error
-      call.state.setMembers([{ user_id: 'm1' }, { user_id: 'm2' }]);
+    it(`caller will leave the call if all callees have rejected`, async () => {
+      const call = fakeCall({ currentUserId: 'm1' });
+      call.state.setMetadata({
+        ...fakeMetadata(),
+        // @ts-ignore
+        created_by: { id: 'm1' },
+      });
+      call.state.setMembers([
+        // @ts-expect-error
+        { user_id: 'm1' },
+        // @ts-expect-error
+        { user_id: 'm2' },
+        // @ts-expect-error
+        { user_id: 'm3' },
+      ]);
+      call.state.setCallingState(CallingState.RINGING);
       vi.spyOn(call, 'leave').mockImplementation(async () => {
         console.log(`TEST: leave() called`);
       });
 
       const handler = watchCallRejected(call);
       // all members reject the call
-      call.state.members.forEach(() => {
-        // @ts-ignore
-        const event: CallAcceptedEvent = { type: 'call.rejected' };
+      await handler({
+        type: 'call.rejected',
         // @ts-ignore
-        handler(event);
+        user: {
+          id: 'm2',
+        },
+        call: {
+          // @ts-ignore
+          created_by: {
+            id: 'm1',
+          },
+          // @ts-ignore
+          session: {
+            rejected_by: {
+              m2: new Date().toISOString(),
+              m3: new Date().toISOString(),
+            },
+          },
+        },
       });
-
       expect(call.leave).toHaveBeenCalled();
     });
 
-    it(`will not leave the call if only one callee rejects`, async () => {
+    it(`caller will not leave the call if only one callee rejects`, async () => {
       const call = fakeCall();
+      call.state.setMetadata({
+        ...fakeMetadata(),
+        // @ts-ignore
+        created_by: { id: 'm0' },
+      });
       // @ts-expect-error
       call.state.setMembers([{ user_id: 'm1' }, { user_id: 'm2' }]);
       vi.spyOn(call, 'leave').mockImplementation(async () => {
@@ -124,12 +155,71 @@ describe('Call ringing events', () => {
 
       // only one member rejects the call
       // @ts-ignore
-      const event: CallAcceptedEvent = { type: 'call.rejected' };
+      const event: CallAcceptedEvent = {
+        type: 'call.rejected',
+        // @ts-ignore
+        user: {
+          id: 'm2',
+        },
+        call: {
+          // @ts-ignore
+          created_by: {
+            id: 'm0',
+          },
+          // @ts-ignore
+          session: {
+            rejected_by: {
+              m2: new Date().toISOString(),
+            },
+          },
+        },
+      };
       // @ts-ignore
       await handler(event);
 
       expect(call.leave).not.toHaveBeenCalled();
     });
+
+    it('callee will leave the call if caller rejects', async () => {
+      const call = fakeCall({ currentUserId: 'm1' });
+      call.state.setMetadata({
+        ...fakeMetadata(),
+        // @ts-ignore
+        created_by: { id: 'm0' },
+      });
+      // @ts-expect-error
+      call.state.setMembers([{ user_id: 'm1' }, { user_id: 'm2' }]);
+      vi.spyOn(call, 'leave').mockImplementation(async () => {
+        console.log(`TEST: leave() called`);
+      });
+      const handler = watchCallRejected(call);
+
+      // only one member rejects the call
+      // @ts-ignore
+      const event: CallAcceptedEvent = {
+        type: 'call.rejected',
+        // @ts-ignore
+        user: {
+          id: 'm0',
+        },
+        call: {
+          // @ts-ignore
+          created_by: {
+            id: 'm0',
+          },
+          // @ts-ignore
+          session: {
+            rejected_by: {
+              m0: new Date().toISOString(),
+            },
+          },
+        },
+      };
+      // @ts-ignore
+      await handler(event);
+
+      expect(call.leave).toHaveBeenCalled();
+    });
   });
 
   describe(`call.ended`, () => {
@@ -171,8 +261,7 @@ describe('Call ringing events', () => {
     });
 
     it(`will not leave the call if idle`, async () => {
-      const ringing = false;
-      const call = fakeCall(ringing);
+      const call = fakeCall({ ring: false });
       vi.spyOn(call, 'leave').mockImplementation(async () => {
         console.log(`TEST: leave() called`);
       });
@@ -189,10 +278,10 @@ describe('Call ringing events', () => {
   });
 });
 
-const fakeCall = (ring = true) => {
+const fakeCall = ({ ring = true, currentUserId = 'test-user-id' } = {}) => {
   const store = new StreamVideoWriteableStateStore();
   store.setConnectedUser({
-    id: 'test-user-id',
+    id: currentUserId,
   });
   const client = new StreamClient('api-key');
   return new Call({
@@ -203,3 +292,26 @@ const fakeCall = (ring = true) => {
     ringing: ring,
   });
 };
+
+const fakeMetadata = (): CallResponse => {
+  return {
+    id: '12345',
+    type: 'development',
+    cid: 'development:12345',
+
+    // @ts-ignore
+    created_by: {
+      id: 'test-user-id',
+    },
+    own_capabilities: [],
+    blocked_user_ids: [],
+
+    // @ts-ignore
+    settings: {
+      ring: {
+        auto_cancel_timeout_ms: 30000,
+        incoming_call_timeout_ms: 30000,
+      },
+    },
+  };
+};

package/src/events/call.ts

@@ -27,16 +27,39 @@ export const watchCallAccepted = (call: Call) => {
  * Once the event is received, the call is left.
  */
 export const watchCallRejected = (call: Call) => {
-  let totalRejections = 0;
   return async function onCallRejected(event: StreamVideoEvent) {
     if (event.type !== 'call.rejected') return;
-    totalRejections++;
-    const { state } = call;
-    if (
-      totalRejections >= state.members.length &&
-      state.callingState === CallingState.RINGING
-    ) {
-      await call.leave();
+    // We want to discard the event if it's from the current user
+    if (event.user.id === call.currentUserId) return;
+    const { call: eventCall } = event;
+    const { session: callSession } = eventCall;
+
+    if (!callSession) {
+      console.log('No call session provided. Ignoring call.rejected event.');
+      return;
+    }
+
+    const rejectedBy = callSession.rejected_by;
+    const { members, callingState } = call.state;
+    if (callingState !== CallingState.RINGING) {
+      console.log(
+        'Call is not in ringing mode (it is either accepted or rejected already). Ignoring call.rejected event.',
+      );
+      return;
+    }
+    if (call.isCreatedByMe) {
+      const everyoneElseRejected = members
+        .filter((m) => m.user_id !== call.currentUserId)
+        .every((m) => rejectedBy[m.user_id]);
+      if (everyoneElseRejected) {
+        console.log('everyone rejected, leaving the call');
+        await call.leave();
+      }
+    } else {
+      if (rejectedBy[eventCall.created_by.id]) {
+        console.log('call creator rejected, leaving call');
+        await call.leave();
+      }
     }
   };
 };

package/src/events/callEventHandlers.ts

@@ -45,13 +45,22 @@ type RingCallEvents = Extract<
   'call.accepted' | 'call.rejected'
 >;
 
-// call.created is handled by the StreamVideoClient
-// custom events should be handled by integrators
 type AllCallEvents = Exclude<
   CallEventTypes,
-  'call.created' | 'custom' | RingCallEvents
+  | 'call.created' // handled by StreamVideoClient
+  | 'call.ring' // handled by StreamVideoClient
+  | 'call.notification' // not used currently
+  | 'custom' // integrators should handle custom events
+  | RingCallEvents // handled by registerRingingCallEventHandlers
 >;
 
+/**
+ * Registers the default event handlers for a call during its lifecycle.
+ *
+ * @param call the call to register event handlers for.
+ * @param state the call state.
+ * @param dispatcher the dispatcher.
+ */
 export const registerEventHandlers = (
   call: Call,
   state: CallState,
@@ -80,10 +89,6 @@ export const registerEventHandlers = (
     'call.session_participant_left': watchCallSessionParticipantLeft(state),
     'call.unblocked_user': watchUnblockedUser(state),
     'call.updated': watchCallUpdated(state),
-    'call.notification': (event: StreamCallEvent) =>
-      console.log(`Received ${event.type} event`, event),
-    'call.ring': (event: StreamCallEvent) =>
-      console.log(`Received ${event.type} event`, event),
   };
   const eventHandlers = [
     watchChangePublishQuality(dispatcher, call),
@@ -117,6 +122,11 @@ export const registerEventHandlers = (
   };
 };
 
+/**
+ * Registers event handlers for a call that is of ringing type.
+ *
+ * @param call the call to register event handlers for.
+ */
 export const registerRingingCallEventHandlers = (call: Call) => {
   const coordinatorRingEvents: {
     [key in RingCallEvents]: (e: StreamCallEvent) => any;

package/src/gen/coordinator/index.ts

@@ -708,6 +708,12 @@ export interface CallNotificationEvent {
    * @memberof CallNotificationEvent
    */
   created_at: string;
+  /**
+   * Call members
+   * @type {Array<MemberResponse>}
+   * @memberof CallNotificationEvent
+   */
+  members: Array<MemberResponse>;
   /**
    * Call session ID
    * @type {string}
@@ -1101,6 +1107,12 @@ export interface CallRingEvent {
    * @memberof CallRingEvent
    */
   created_at: string;
+  /**
+   * Call members
+   * @type {Array<MemberResponse>}
+   * @memberof CallRingEvent
+   */
+  members: Array<MemberResponse>;
   /**
    * Call session ID
    * @type {string}
@@ -3213,12 +3225,6 @@ export interface RingSettings {
    * @memberof RingSettings
    */
   auto_cancel_timeout_ms: number;
-  /**
-   *
-   * @type {number}
-   * @memberof RingSettings
-   */
-  auto_reject_timeout_ms: number;
   /**
    *
    * @type {number}
@@ -3238,12 +3244,6 @@ export interface RingSettingsRequest {
    * @memberof RingSettingsRequest
    */
   auto_cancel_timeout_ms?: number;
-  /**
-   *
-   * @type {number}
-   * @memberof RingSettingsRequest
-   */
-  auto_reject_timeout_ms?: number;
   /**
    *
    * @type {number}

package/src/store/stateStore.ts

@@ -137,6 +137,16 @@ export class StreamVideoWriteableStateStore {
     return this.setCalls((calls) => calls.filter((c) => c !== call));
   };
 
+  /**
+   * Finds a {@link Call} object in the list of {@link Call} objects created/tracked by this client.
+   *
+   * @param type the type of call to find.
+   * @param id the id of the call to find.
+   */
+  findCall = (type: string, id: string) => {
+    return this.calls.find((c) => c.type === type && c.id === id);
+  };
+
   /**
    * A list of objects describing incoming calls.
    * @deprecated derive from calls$ instead.