@stream-io/video-client 1.61.0 → 2.0.0-beta.1

package/src/__tests__/Call.ringingLifecycle.test.ts

@@ -10,7 +10,7 @@ import { CallingState } from '../store';
 import { StreamClient } from '../coordinator/connection/client';
 import { ClientEventReporter } from '../reporting';
 import { generateUUIDv4 } from '../coordinator/connection/utils';
-import { StreamVideoWriteableStateStore } from '../store';
+import { ClientState } from '../store';
 
 /**
  * The core's whole part in the React Native ringing lifecycle: await RN's
@@ -30,7 +30,7 @@ const createCall = (ringing: boolean) => {
       streamClient,
       enabled: false,
     }),
-    clientStore: new StreamVideoWriteableStateStore(),
+    clientState: new ClientState(),
   });
 };
 

package/src/__tests__/StreamVideoClient.disconnect.test.ts

@@ -0,0 +1,62 @@
+import '../rtc/__tests__/mocks/webrtc.mocks';
+import { describe, expect, it, vi } from 'vitest';
+import { StreamVideoClient } from '../StreamVideoClient';
+import { CallingState } from '../store';
+
+const fakeCall = (cid: string, callingState: CallingState) => ({
+  cid,
+  state: { callingState },
+  leave: vi.fn().mockResolvedValue(undefined),
+  watching: false,
+});
+
+describe('disconnectUser leaves calls', () => {
+  it('leaves non-LEFT calls, before closing the connection', async () => {
+    const client = new StreamVideoClient('abc');
+    const order: string[] = [];
+
+    const active = fakeCall('default:active', CallingState.JOINED);
+    const left = fakeCall('default:left', CallingState.LEFT);
+    active.leave.mockImplementation(async () => {
+      order.push('leave:active');
+    });
+    left.leave.mockImplementation(async () => {
+      order.push('leave:left');
+    });
+
+    client.state.setCalls([active, left] as never);
+
+    // @ts-expect-error faking the minimum the guard needs
+    client.streamClient.user = { id: 'jane' };
+    vi.spyOn(client.streamClient, 'disconnectUser').mockImplementation(
+      async () => {
+        order.push('ws:close');
+      },
+    );
+
+    await client.disconnectUser();
+
+    expect(active.leave).toHaveBeenCalledWith({
+      message: 'client.disconnectUser() called',
+    });
+    expect(left.leave).not.toHaveBeenCalled();
+    expect(order).toEqual(['leave:active', 'ws:close']);
+    expect(client.state.connectedUser).toBeUndefined();
+  });
+
+  it('a failing leave does not block the disconnect', async () => {
+    const client = new StreamVideoClient('abc');
+    const boom = fakeCall('default:boom', CallingState.JOINED);
+    boom.leave.mockRejectedValue(new Error('nope'));
+    client.state.setCalls([boom] as never);
+
+    // @ts-expect-error faking the minimum the guard needs
+    client.streamClient.user = { id: 'jane' };
+    vi.spyOn(client.streamClient, 'disconnectUser').mockResolvedValue(
+      undefined as never,
+    );
+
+    await expect(client.disconnectUser()).resolves.toBeUndefined();
+    expect(boom.leave).toHaveBeenCalled();
+  });
+});

package/src/devices/__tests__/CameraManager.test.ts

@@ -1,7 +1,7 @@
 import { Call } from '../../Call';
 import { StreamClient } from '../../coordinator/connection/client';
 import { ClientEventReporter } from '../../reporting';
-import { CallingState, StreamVideoWriteableStateStore } from '../../store';
+import { CallingState, ClientState } from '../../store';
 
 import { afterEach, beforeEach, describe, expect, it, Mock, vi } from 'vitest';
 import { fromPartial } from '@total-typescript/shoehorn';
@@ -89,7 +89,7 @@ describe('CameraManager', () => {
       type: '',
       streamClient,
       clientEventReporter: new ClientEventReporter({ streamClient }),
-      clientStore: new StreamVideoWriteableStateStore(),
+      clientState: new ClientState(),
     });
     manager = new CameraManager(call, devicePersistence);
   });

package/src/devices/__tests__/DeviceManager.test.ts

@@ -2,7 +2,7 @@
 import { Call } from '../../Call';
 import { StreamClient } from '../../coordinator/connection/client';
 import { ClientEventReporter } from '../../reporting';
-import { CallingState, StreamVideoWriteableStateStore } from '../../store';
+import { CallingState, ClientState } from '../../store';
 
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import {
@@ -99,7 +99,7 @@ describe('Device Manager', () => {
         type: '',
         streamClient,
         clientEventReporter: new ClientEventReporter({ streamClient }),
-        clientStore: new StreamVideoWriteableStateStore(),
+        clientState: new ClientState(),
       }),
       { enabled: false, storageKey },
     );

package/src/devices/__tests__/DeviceManagerFilters.test.ts

@@ -3,7 +3,7 @@ import { of } from 'rxjs';
 import { Call } from '../../Call';
 import { StreamClient } from '../../coordinator/connection/client';
 import { ClientEventReporter } from '../../reporting';
-import { StreamVideoWriteableStateStore } from '../../store';
+import { ClientState } from '../../store';
 import { DeviceManagerState } from '../DeviceManagerState';
 import { DeviceManager } from '../DeviceManager';
 import {
@@ -53,7 +53,7 @@ describe('MediaStream Filters', () => {
         type: '',
         streamClient,
         clientEventReporter: new ClientEventReporter({ streamClient }),
-        clientStore: new StreamVideoWriteableStateStore(),
+        clientState: new ClientState(),
       }),
     );
   });

package/src/devices/__tests__/MicrophoneManager.test.ts

@@ -12,7 +12,7 @@ import {
   AudioBitrateProfile,
   TrackType,
 } from '../../gen/video/sfu/models/models';
-import { CallingState, StreamVideoWriteableStateStore } from '../../store';
+import { CallingState, ClientState } from '../../store';
 import {
   createLocalStorageMock,
   emitDeviceIds,
@@ -105,7 +105,7 @@ describe('MicrophoneManager', () => {
       type: '',
       streamClient,
       clientEventReporter: new ClientEventReporter({ streamClient }),
-      clientStore: new StreamVideoWriteableStateStore(),
+      clientState: new ClientState(),
     });
     const devicePersistence = { enabled: false, storageKey: '' };
     manager = new MicrophoneManager(call, devicePersistence, 'disable-tracks');

package/src/devices/__tests__/MicrophoneManagerRN.test.ts

@@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { MicrophoneManager } from '../MicrophoneManager';
 import { Call } from '../../Call';
 import { StreamClient } from '../../coordinator/connection/client';
-import { StreamVideoWriteableStateStore } from '../../store';
+import { ClientState } from '../../store';
 import {
   mockAudioDevices,
   mockAudioStream,
@@ -91,7 +91,7 @@ describe('MicrophoneManager React Native', () => {
         id: '',
         type: '',
         streamClient,
-        clientStore: new StreamVideoWriteableStateStore(),
+        clientState: new ClientState(),
         clientEventReporter: new ClientEventReporter({ streamClient }),
       }),
       devicePersistence,

package/src/devices/__tests__/ScreenShareManager.test.ts

@@ -3,7 +3,7 @@ import { ScreenShareManager } from '../ScreenShareManager';
 import { Call } from '../../Call';
 import { StreamClient } from '../../coordinator/connection/client';
 import { ClientEventReporter } from '../../reporting';
-import { CallingState, StreamVideoWriteableStateStore } from '../../store';
+import { CallingState, ClientState } from '../../store';
 import * as RxUtils from '../../store/rxUtils';
 import { mockCall, mockDeviceIds$, mockScreenShareStream } from './mocks';
 import { getScreenShareStream } from '../devices';
@@ -44,7 +44,7 @@ describe('ScreenShareManager', () => {
         type: '',
         streamClient,
         clientEventReporter: new ClientEventReporter({ streamClient }),
-        clientStore: new StreamVideoWriteableStateStore(),
+        clientState: new ClientState(),
       }),
     );
   });
@@ -99,7 +99,7 @@ describe('ScreenShareManager', () => {
 
   it('should use call settings to set up constraints', async () => {
     const call = manager['call'];
-    call.state.setCurrentValue(call.state['settingsSubject'], {
+    RxUtils.setCurrentValue(call.state['settingsSubject'], {
       // @ts-expect-error partial data
       screensharing: {
         target_resolution: {

package/src/devices/__tests__/SpeakerManager.test.ts

@@ -17,7 +17,7 @@ import { checkIfAudioOutputChangeSupported } from '../devices';
 import { Call } from '../../Call';
 import { StreamClient } from '../../coordinator/connection/client';
 import { ClientEventReporter } from '../../reporting';
-import { StreamVideoWriteableStateStore } from '../../store';
+import { ClientState } from '../../store';
 import { defaultDeviceId } from '../devicePersistence';
 
 vi.mock('../devices.ts', () => {
@@ -55,7 +55,7 @@ describe('SpeakerManager.test', () => {
         type: '',
         streamClient,
         clientEventReporter: new ClientEventReporter({ streamClient }),
-        clientStore: new StreamVideoWriteableStateStore(),
+        clientState: new ClientState(),
       }),
       devicePersistence,
     );
@@ -162,7 +162,7 @@ describe('SpeakerManager.test', () => {
         type: '',
         streamClient,
         clientEventReporter: new ClientEventReporter({ streamClient }),
-        clientStore: new StreamVideoWriteableStateStore(),
+        clientState: new ClientState(),
       }),
       { enabled: true, storageKey },
     );
@@ -190,7 +190,7 @@ describe('SpeakerManager.test', () => {
           type: '',
           streamClient,
           clientEventReporter: new ClientEventReporter({ streamClient }),
-          clientStore: new StreamVideoWriteableStateStore(),
+          clientState: new ClientState(),
         }),
         { enabled: true, storageKey },
       );

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

@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest';
-import { CallingState, StreamVideoWriteableStateStore } from '../../store';
+import { CallingState, ClientState } from '../../store';
 import { watchCallEnded, watchSfuCallEnded } from '../call';
 import {
   CallEndedEvent,
@@ -166,7 +166,7 @@ describe('Call lifecycle events', () => {
 });
 
 const fakeCall = ({ ring = true, currentUserId = 'test-user-id' } = {}) => {
-  const store = new StreamVideoWriteableStateStore();
+  const store = new ClientState();
   store.setConnectedUser({
     id: currentUserId,
     created_at: '',
@@ -181,7 +181,7 @@ const fakeCall = ({ ring = true, currentUserId = 'test-user-id' } = {}) => {
   return new Call({
     type: 'development',
     id: '12345',
-    clientStore: store,
+    clientState: store,
     streamClient: client,
     clientEventReporter: new ClientEventReporter({ streamClient: client }),
     ringing: ring,

package/src/helpers/__tests__/AudioBindingsWatchdog.test.ts

@@ -9,7 +9,7 @@ import { AudioBindingsWatchdog } from '../AudioBindingsWatchdog';
 import { Call } from '../../Call';
 import { StreamClient } from '../../coordinator/connection/client';
 import { ClientEventReporter } from '../../reporting';
-import { CallingState, StreamVideoWriteableStateStore } from '../../store';
+import { CallingState, ClientState } from '../../store';
 import { noopComparator } from '../../sorting';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { TrackType } from '../../gen/video/sfu/models/models';
@@ -28,7 +28,7 @@ describe('AudioBindingsWatchdog', () => {
       type: 'default',
       streamClient,
       clientEventReporter: new ClientEventReporter({ streamClient }),
-      clientStore: new StreamVideoWriteableStateStore(),
+      clientState: new ClientState(),
     });
     call.setSortParticipantsBy(noopComparator());
     watchdog = new AudioBindingsWatchdog(call.state, call.tracer);

package/src/helpers/__tests__/DynascaleManager.test.ts

@@ -18,7 +18,7 @@ import { DynascaleManager } from '../DynascaleManager';
 import { Call } from '../../Call';
 import { StreamClient } from '../../coordinator/connection/client';
 import { ClientEventReporter } from '../../reporting';
-import { StreamVideoWriteableStateStore } from '../../store';
+import { ClientState } from '../../store';
 import { getCurrentValue } from '../../store/rxUtils';
 import { VisibilityState } from '../../types';
 import { noopComparator } from '../../sorting';
@@ -45,7 +45,7 @@ describe('DynascaleManager', () => {
       type: 'default',
       streamClient,
       clientEventReporter: new ClientEventReporter({ streamClient }),
-      clientStore: new StreamVideoWriteableStateStore(),
+      clientState: new ClientState(),
     });
     call.setSortParticipantsBy(noopComparator());
     dynascaleManager = call.dynascaleManager;

package/src/helpers/__tests__/ViewportTracker.test.ts

@@ -8,7 +8,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { Call } from '../../Call';
 import { StreamClient } from '../../coordinator/connection/client';
 import { ClientEventReporter } from '../../reporting';
-import { StreamVideoWriteableStateStore } from '../../store';
+import { ClientState } from '../../store';
 import { noopComparator } from '../../sorting';
 import { VisibilityState } from '../../types';
 import { ViewportTracker } from '../ViewportTracker';
@@ -26,7 +26,7 @@ describe('ViewportTracker', () => {
       type: 'default',
       streamClient,
       clientEventReporter: new ClientEventReporter({ streamClient }),
-      clientStore: new StreamVideoWriteableStateStore(),
+      clientState: new ClientState(),
     });
     call.setSortParticipantsBy(noopComparator());
     viewportTracker = call.viewportTracker!;

package/src/ringing/__tests__/RingStatePoller.test.ts

@@ -7,7 +7,7 @@ import { RingStatePoller } from '../RingStatePoller';
 import { StreamClient } from '../../coordinator/connection/client';
 import { ClientEventReporter } from '../../reporting';
 import { generateUUIDv4 } from '../../coordinator/connection/utils';
-import { CallingState, StreamVideoWriteableStateStore } from '../../store';
+import { CallingState, ClientState } from '../../store';
 import {
   ErrorFromResponse,
   type StreamClientOptions,
@@ -37,18 +37,18 @@ describe('RingStatePoller', () => {
   let poller: RingStatePoller;
 
   const createCall = (options?: StreamClientOptions) => {
-    const clientStore = new StreamVideoWriteableStateStore();
+    const clientState = new ClientState();
     const streamClient = new StreamClient('abc', options);
     const newCall = new Call({
       type: 'test',
       id: generateUUIDv4(),
       streamClient,
       clientEventReporter: new ClientEventReporter({ streamClient }),
-      clientStore,
+      clientState,
     });
 
     // @ts-expect-error mocking only what we need for the test
-    clientStore.setConnectedUser({ id: userId });
+    clientState.setConnectedUser({ id: userId });
     // @ts-expect-error mocking only what we need for the test
     newCall.state['createdBySubject'].next({ id: userId });
     // @ts-expect-error mocking only what we need for the test
@@ -391,19 +391,19 @@ describe('Call ring state polling', () => {
   const userId = 'jane';
 
   const createRingingCall = (options?: StreamClientOptions) => {
-    const clientStore = new StreamVideoWriteableStateStore();
+    const clientState = new ClientState();
     const streamClient = new StreamClient('abc', options);
     const call = new Call({
       type: 'test',
       id: generateUUIDv4(),
       streamClient,
       clientEventReporter: new ClientEventReporter({ streamClient }),
-      clientStore,
+      clientState,
       ringing: true,
     });
 
     // @ts-expect-error mocking only what we need for the test
-    clientStore.setConnectedUser({ id: userId });
+    clientState.setConnectedUser({ id: userId });
     // @ts-expect-error mocking only what we need for the test
     call.state['sessionSubject'].next({
       id: SESSION_ID,

package/src/ringing/__tests__/RingTimeout.test.ts

@@ -7,7 +7,7 @@ import { RingTimeout } from '../RingTimeout';
 import { StreamClient } from '../../coordinator/connection/client';
 import { ClientEventReporter } from '../../reporting';
 import { generateUUIDv4 } from '../../coordinator/connection/utils';
-import { CallingState, StreamVideoWriteableStateStore } from '../../store';
+import { CallingState, ClientState } from '../../store';
 import { CallSettingsResponse } from '../../gen/coordinator';
 
 const TIMEOUT_MS = 30_000;
@@ -28,17 +28,17 @@ describe('RingTimeout', () => {
     createdById?: string;
     ring?: Partial<CallSettingsResponse['ring']> | null;
   } = {}) => {
-    const clientStore = new StreamVideoWriteableStateStore();
+    const clientState = new ClientState();
     const streamClient = new StreamClient('abc');
     const newCall = new Call({
       type: 'test',
       id: generateUUIDv4(),
       streamClient,
       clientEventReporter: new ClientEventReporter({ streamClient }),
-      clientStore,
+      clientState,
     });
 
-    clientStore.setConnectedUser(fromPartial({ id: userId }));
+    clientState.setConnectedUser(fromPartial({ id: userId }));
     newCall.state['createdBySubject'].next(fromPartial({ id: createdById }));
     // leaving `settings` unset is how a call built from a push notification
     // looks until `get()` resolves

package/src/ringing/__tests__/reconcileRingState.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it, vi } from 'vitest';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { reconcileRingState } from '../reconcileRingState';
-import { CallingState, StreamVideoWriteableStateStore } from '../../store';
+import { CallingState, ClientState } from '../../store';
 import {
   CallResponse,
   CallSessionResponse,
@@ -305,13 +305,13 @@ const ringingCall = ({
   createdById: string;
   members?: string[];
 }) => {
-  const store = new StreamVideoWriteableStateStore();
+  const store = new ClientState();
   store.setConnectedUser(fromPartial({ id: currentUserId }));
   const streamClient = new StreamClient('api-key');
   const call = new Call({
     type: 'development',
     id: '12345',
-    clientStore: store,
+    clientState: store,
     streamClient,
     clientEventReporter: new ClientEventReporter({ streamClient }),
     ringing: true,

package/src/rtc/__tests__/Call.reconnect.test.ts

@@ -4,7 +4,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { Call } from '../../Call';
 import { StreamClient } from '../../coordinator/connection/client';
 import { ClientEventReporter } from '../../reporting';
-import { StreamVideoWriteableStateStore } from '../../store';
+import { ClientState } from '../../store';
 import { CallingState } from '../../store';
 import { NegotiationError } from '../NegotiationError';
 import { ReconnectReason } from '../types';
@@ -27,7 +27,7 @@ vi.mock('../../StreamSfuClient', () => ({
 
 const makeCall = ({ reportingEnabled = false } = {}) => {
   const streamClient = new StreamClient('test-key');
-  const clientStore = new StreamVideoWriteableStateStore();
+  const clientState = new ClientState();
   return new Call({
     type: 'default',
     id: 'test-call',
@@ -36,7 +36,7 @@ const makeCall = ({ reportingEnabled = false } = {}) => {
       streamClient,
       enabled: reportingEnabled,
     }),
-    clientStore,
+    clientState,
     ringing: false,
     watching: false,
   });
@@ -729,13 +729,13 @@ describe('Call reconnect wiring (PC event → leave)', () => {
     sfuClient.iceTrickleBuffer = new IceTrickleBuffer();
 
     const streamClient = new StreamClient('test-key');
-    const clientStore = new StreamVideoWriteableStateStore();
+    const clientState = new ClientState();
     call = new Call({
       type: 'default',
       id: 'test-call',
       streamClient,
       clientEventReporter: new ClientEventReporter({ streamClient }),
-      clientStore,
+      clientState,
       ringing: false,
       watching: false,
     });