@stream-io/video-client 0.0.2-alpha.9 → 0.0.4

package/src/events/call-permissions.ts

@@ -10,7 +10,10 @@ import { OwnCapability } from '../gen/coordinator';
 export const watchCallPermissionRequest = (state: CallState) => {
   return function onCallPermissionRequest(event: StreamVideoEvent) {
     if (event.type !== 'call.permission_request') return;
-    state.setCallPermissionRequest(event);
+    const { localParticipant } = state;
+    if (event.user.id !== localParticipant?.userId) {
+      state.setCallPermissionRequest(event);
+    }
   };
 };
 
@@ -22,10 +25,7 @@ export const watchCallPermissionsUpdated = (state: CallState) => {
     if (event.type !== 'call.permissions_updated') return;
     const { localParticipant } = state;
     if (event.user.id === localParticipant?.userId) {
-      state.setMetadata((metadata) => ({
-        ...metadata!,
-        own_capabilities: event.own_capabilities,
-      }));
+      state.setOwnCapabilities(event.own_capabilities);
     }
   };
 };
@@ -49,7 +49,7 @@ export const watchCallGrantsUpdated = (state: CallState) => {
         [OwnCapability.SCREENSHARE]: canScreenshare,
       };
 
-      const nextCapabilities = (state.metadata?.own_capabilities || []).filter(
+      const nextCapabilities = state.ownCapabilities.filter(
         (capability) => update[capability] !== false,
       );
       Object.entries(update).forEach(([capability, value]) => {
@@ -58,12 +58,7 @@ export const watchCallGrantsUpdated = (state: CallState) => {
         }
       });
 
-      state.setMetadata((metadata) => {
-        return {
-          ...metadata!,
-          own_capabilities: nextCapabilities,
-        };
-      });
+      state.setOwnCapabilities(nextCapabilities);
     }
   };
 };

package/src/events/sessions.ts

@@ -9,12 +9,7 @@ import { StreamVideoEvent } from '../coordinator/connection/types';
 export const watchCallSessionStarted = (state: CallState) => {
   return function onCallSessionStarted(event: StreamVideoEvent) {
     if (event.type !== 'call.session_started') return;
-    const { call } = event;
-    state.setMetadata((metadata) => ({
-      ...call,
-      // FIXME OL: temporary, until the backend sends the own_capabilities
-      own_capabilities: metadata?.own_capabilities || [],
-    }));
+    state.setMetadata(event.call);
   };
 };
 
@@ -26,12 +21,7 @@ export const watchCallSessionStarted = (state: CallState) => {
 export const watchCallSessionEnded = (state: CallState) => {
   return function onCallSessionEnded(event: StreamVideoEvent) {
     if (event.type !== 'call.session_ended') return;
-    const { call } = event;
-    state.setMetadata((metadata) => ({
-      ...call,
-      // FIXME OL: temporary, until the backend sends the own_capabilities
-      own_capabilities: metadata?.own_capabilities || [],
-    }));
+    state.setMetadata(event.call);
   };
 };
 

package/src/gen/coordinator/index.ts

@@ -1028,12 +1028,6 @@ export interface CallResponse {
    * @memberof CallResponse
    */
   ingress: CallIngressResponse;
-  /**
-   * The capabilities of the current user
-   * @type {Array<OwnCapability>}
-   * @memberof CallResponse
-   */
-  own_capabilities: Array<OwnCapability>;
   /**
    *
    * @type {boolean}
@@ -1475,6 +1469,12 @@ export interface CallStateResponseFields {
    * @memberof CallStateResponseFields
    */
   membership?: MemberResponse;
+  /**
+   *
+   * @type {Array<OwnCapability>}
+   * @memberof CallStateResponseFields
+   */
+  own_capabilities: Array<OwnCapability>;
 }
 /**
  *
@@ -2048,62 +2048,6 @@ export interface GeofenceSettingsRequest {
    */
   names?: Array<string>;
 }
-/**
- *
- * @export
- * @interface GetCallEdgeServerRequest
- */
-export interface GetCallEdgeServerRequest {
-  /**
-   *
-   * @type {{ [key: string]: Array<number>; }}
-   * @memberof GetCallEdgeServerRequest
-   */
-  latency_measurements: { [key: string]: Array<number> };
-}
-/**
- *
- * @export
- * @interface GetCallEdgeServerResponse
- */
-export interface GetCallEdgeServerResponse {
-  /**
-   *
-   * @type {Array<UserResponse>}
-   * @memberof GetCallEdgeServerResponse
-   */
-  blocked_users: Array<UserResponse>;
-  /**
-   *
-   * @type {CallResponse}
-   * @memberof GetCallEdgeServerResponse
-   */
-  call: CallResponse;
-  /**
-   *
-   * @type {Credentials}
-   * @memberof GetCallEdgeServerResponse
-   */
-  credentials: Credentials;
-  /**
-   * Duration of the request in human-readable format
-   * @type {string}
-   * @memberof GetCallEdgeServerResponse
-   */
-  duration: string;
-  /**
-   *
-   * @type {Array<MemberResponse>}
-   * @memberof GetCallEdgeServerResponse
-   */
-  members: Array<MemberResponse>;
-  /**
-   *
-   * @type {MemberResponse}
-   * @memberof GetCallEdgeServerResponse
-   */
-  membership?: MemberResponse;
-}
 /**
  *
  * @export
@@ -2140,6 +2084,12 @@ export interface GetCallResponse {
    * @memberof GetCallResponse
    */
   membership?: MemberResponse;
+  /**
+   *
+   * @type {Array<OwnCapability>}
+   * @memberof GetCallResponse
+   */
+  own_capabilities: Array<OwnCapability>;
 }
 /**
  *
@@ -2282,6 +2232,12 @@ export interface GetOrCreateCallResponse {
    * @memberof GetOrCreateCallResponse
    */
   membership?: MemberResponse;
+  /**
+   *
+   * @type {Array<OwnCapability>}
+   * @memberof GetOrCreateCallResponse
+   */
+  own_capabilities: Array<OwnCapability>;
 }
 /**
  *
@@ -2468,6 +2424,12 @@ export interface JoinCallResponse {
    * @memberof JoinCallResponse
    */
   membership?: MemberResponse;
+  /**
+   *
+   * @type {Array<OwnCapability>}
+   * @memberof JoinCallResponse
+   */
+  own_capabilities: Array<OwnCapability>;
 }
 /**
  *
@@ -3745,6 +3707,12 @@ export interface UpdateCallRequest {
  * @interface UpdateCallResponse
  */
 export interface UpdateCallResponse {
+  /**
+   *
+   * @type {Array<UserResponse>}
+   * @memberof UpdateCallResponse
+   */
+  blocked_users: Array<UserResponse>;
   /**
    *
    * @type {CallResponse}
@@ -3757,6 +3725,24 @@ export interface UpdateCallResponse {
    * @memberof UpdateCallResponse
    */
   duration: string;
+  /**
+   *
+   * @type {Array<MemberResponse>}
+   * @memberof UpdateCallResponse
+   */
+  members: Array<MemberResponse>;
+  /**
+   *
+   * @type {MemberResponse}
+   * @memberof UpdateCallResponse
+   */
+  membership?: MemberResponse;
+  /**
+   *
+   * @type {Array<OwnCapability>}
+   * @memberof UpdateCallResponse
+   */
+  own_capabilities: Array<OwnCapability>;
 }
 /**
  *

package/src/helpers/sdp-munging.ts

@@ -69,7 +69,7 @@ const getMediaSection = (sdp: string, mediaType: 'video' | 'audio') => {
   sdp.split(/(\r\n|\r|\n)/).forEach((line) => {
     const isValidLine = /^([a-z])=(.*)/.test(line);
     if (!isValidLine) return;
-    /* 
+    /*
       NOTE: according to https://www.rfc-editor.org/rfc/rfc8866.pdf
       Each media description starts with an "m=" line and continues to the next media description or the end of the whole session description, whichever comes first
     */
@@ -170,7 +170,7 @@ export const removeCodec = (
   sdp: string,
   mediaType: 'video' | 'audio',
   codecToRemove: string,
-) => {
+): string => {
   const section = getMediaSection(sdp, mediaType);
   const mediaSection = section?.media;
   if (!mediaSection) {
@@ -190,30 +190,26 @@ export const removeCodec = (
       mediaSection.original,
       `${mediaSection.mediaWithPorts} ${newCodecOrder}`,
     )
-    .replace(new RegExp(`${rtpMap.original}[\r\n|\r|\n]`), '') // remove the corresponding rtpmap line
-    .replace(
-      fmtp?.original ? new RegExp(`${fmtp?.original}[\r\n|\r|\n]`) : '',
-      '',
-    ); // remove the corresponding fmtp line
+    .replace(new RegExp(`${rtpMap.original}[\r\n]+`), '') // remove the corresponding rtpmap line
+    .replace(fmtp?.original ? new RegExp(`${fmtp?.original}[\r\n]+`) : '', ''); // remove the corresponding fmtp line
 };
 
 /**
  * Gets the fmtp line corresponding to opus
  */
-const getOpusFmtp = (sdp: string) => {
+const getOpusFmtp = (sdp: string): Fmtp | undefined => {
   const section = getMediaSection(sdp, 'audio');
   const rtpMap = section?.rtpMap.find((r) => r.codec.toLowerCase() === 'opus');
   const codecId = rtpMap?.payload;
   if (codecId) {
-    const fmtp = section?.fmtp.find((f) => f.payload === codecId);
-    return fmtp;
+    return section?.fmtp.find((f) => f.payload === codecId);
   }
 };
 
 /**
  * Returns an SDP with DTX enabled or disabled.
  */
-export const toggleDtx = (sdp: string, enable: boolean) => {
+export const toggleDtx = (sdp: string, enable: boolean): string => {
   const opusFmtp = getOpusFmtp(sdp);
   if (opusFmtp) {
     const matchDtx = /usedtx=(\d)/.exec(opusFmtp.config);

package/src/helpers/sound-detector.ts

@@ -27,6 +27,17 @@ export type SoundDetectorOptions = {
   destroyStreamOnStop?: boolean;
 };
 
+export type SoundDetectorState = {
+  isSoundDetected: boolean;
+  /**
+   * Represented as percentage (0-100) where 100% is defined by `audioLevelThreshold` property.
+   * Decrease time between samples (to 50-100ms) with `detectionFrequencyInMs` property.
+   */
+  audioLevel: number;
+};
+
+export type SoundStateChangeHandler = (state: SoundDetectorState) => void;
+
 const DETECTION_FREQUENCY_IN_MS = 500;
 const AUDIO_LEVEL_THRESHOLD = 150;
 const FFT_SIZE = 128;
@@ -41,14 +52,7 @@ const FFT_SIZE = 128;
  */
 export const createSoundDetector = (
   audioStream: MediaStream,
-  onSoundDetectedStateChanged: (
-    isSoundDetected: boolean,
-    /**
-     * Represented as percentage (0-100) where 100% is defined by `audioLevelThreshold` property.
-     * Decrease time between samples (to 50-100ms) with `detectionFrequencyInMs` property.
-     */
-    audioLevel: number,
-  ) => void,
+  onSoundDetectedStateChanged: SoundStateChangeHandler,
   options: SoundDetectorOptions = {},
 ) => {
   const {
@@ -78,7 +82,7 @@ export const createSoundDetector = (
         ? 100
         : Math.round((averagedDataValue / audioLevelThreshold) * 100);
 
-    onSoundDetectedStateChanged(isSoundDetected, percentage);
+    onSoundDetectedStateChanged({ isSoundDetected, audioLevel: percentage });
   }, detectionFrequencyInMs);
 
   return async function stop() {

package/src/rtc/__tests__/publisher.test.ts

@@ -35,12 +35,12 @@ describe('Publisher', () => {
 
   beforeEach(() => {
     const dispatcher = new Dispatcher();
-    sfuClient = new StreamSfuClient(
+    sfuClient = new StreamSfuClient({
       dispatcher,
-      'https://getstream.io/',
-      'https://getstream.io/ws',
-      'token',
-    );
+      url: 'https://getstream.io/',
+      wsEndpoint: 'https://getstream.io/ws',
+      token: 'token',
+    });
 
     // @ts-ignore
     sfuClient['sessionId'] = sessionId;

package/src/rtc/flows/join.ts

@@ -24,13 +24,14 @@ export const join = async (
   await httpClient.connectionIdPromise;
 
   const joinCallResponse = await doJoin(httpClient, type, id, data);
-  const { call, credentials, members } = joinCallResponse;
+  const { call, credentials, members, own_capabilities } = joinCallResponse;
   return {
     connectionConfig: toRtcConfiguration(credentials.ice_servers),
     sfuServer: credentials.server,
     token: credentials.token,
     metadata: call,
     members,
+    ownCapabilities: own_capabilities,
   };
 };
 
@@ -68,15 +69,20 @@ const doJoin = async (
 
 const getLocationHint = async () => {
   const hintURL = `https://hint.stream-io-video.com/`;
+  const abortController = new AbortController();
+  const timeoutId = setTimeout(() => abortController.abort(), 1000);
   try {
     const response = await fetch(hintURL, {
       method: 'HEAD',
+      signal: abortController.signal,
     });
     const awsPop = response.headers.get('x-amz-cf-pop') || 'ERR';
     return awsPop.substring(0, 3); // AMS1-P2 -> AMS
   } catch (e) {
     console.error(`Failed to get location hint from ${hintURL}`, e);
     return 'ERR';
+  } finally {
+    clearTimeout(timeoutId);
   }
 };
 

package/src/rtc/publisher.ts

@@ -269,19 +269,14 @@ export class Publisher {
   };
 
   updateVideoPublishQuality = async (enabledRids: string[]) => {
-    console.log(
-      'Updating publish quality, qualities requested by SFU:',
-      enabledRids,
-    );
+    console.log('Update publish quality, requested rids by SFU:', enabledRids);
 
     const videoSender = this.transceiverRegistry[TrackType.VIDEO]?.sender;
-
     if (!videoSender) return;
 
     const params = videoSender.getParameters();
     let changed = false;
     params.encodings.forEach((enc) => {
-      console.log(enc.rid, enc.active);
       // flip 'active' flag only when necessary
       const shouldEnable = enabledRids.includes(enc.rid!);
       if (shouldEnable !== enc.active) {
@@ -294,6 +289,12 @@ export class Publisher {
         console.warn('No suitable video encoding quality found');
       }
       await videoSender.setParameters(params);
+      console.log(
+        `Update publish quality, enabled rids: ${params.encodings
+          .filter((e) => e.active)
+          .map((e) => e.rid)
+          .join(', ')}`,
+      );
     }
   };
 
@@ -341,7 +342,7 @@ export class Publisher {
     const offer = await this.publisher.createOffer();
     let sdp = offer.sdp;
     if (sdp) {
-      toggleDtx(sdp, this.isDtxEnabled);
+      sdp = toggleDtx(sdp, this.isDtxEnabled);
       if (isReactNative()) {
         if (this.preferredVideoCodec) {
           sdp = setPreferredCodec(sdp, 'video', this.preferredVideoCodec);

package/src/rtc/videoLayers.ts

@@ -25,7 +25,10 @@ export const findOptimalVideoLayers = (
 ) => {
   const optimalVideoLayers: OptimalVideoLayer[] = [];
   const settings = videoTrack.getSettings();
-  const { width: w = 0, height: h = 0 } = settings;
+  const {
+    width: w = targetResolution.width,
+    height: h = targetResolution.height,
+  } = settings;
 
   const maxBitrate = getComputedMaxBitrate(targetResolution, w, h);
   let downscaleFactor = 1;

package/src/store/CallState.ts

@@ -14,6 +14,7 @@ import {
   CallRecording,
   CallResponse,
   MemberResponse,
+  OwnCapability,
   PermissionRequestEvent,
 } from '../gen/coordinator';
 import { TrackType } from '../gen/video/sfu/models/models';
@@ -91,6 +92,13 @@ export class CallState {
    */
   private membersSubject = new BehaviorSubject<MemberResponse[]>([]);
 
+  /**
+   * The list of capabilities of the current user.
+   *
+   * @private
+   */
+  private ownCapabilitiesSubject = new BehaviorSubject<OwnCapability[]>([]);
+
   /**
    * The calling state.
    *
@@ -249,6 +257,11 @@ export class CallState {
    */
   members$: Observable<MemberResponse[]>;
 
+  /**
+   * The list of capabilities of the current user.
+   */
+  ownCapabilities$: Observable<OwnCapability[]>;
+
   /**
    * The calling state.
    */
@@ -307,6 +320,7 @@ export class CallState {
     this.callRecordingList$ = this.callRecordingListSubject.asObservable();
     this.metadata$ = this.metadataSubject.asObservable();
     this.members$ = this.membersSubject.asObservable();
+    this.ownCapabilities$ = this.ownCapabilitiesSubject.asObservable();
     this.callingState$ = this.callingStateSubject.asObservable();
   }
 
@@ -555,6 +569,23 @@ export class CallState {
     this.setCurrentValue(this.membersSubject, members);
   };
 
+  /**
+   * The capabilities of the current user for the current call.
+   */
+  get ownCapabilities() {
+    return this.getCurrentValue(this.ownCapabilities$);
+  }
+
+  /**
+   * Sets the own capabilities.
+   *
+   * @internal
+   * @param capabilities the capabilities to set.
+   */
+  setOwnCapabilities = (capabilities: Patch<OwnCapability[]>) => {
+    return this.setCurrentValue(this.ownCapabilitiesSubject, capabilities);
+  };
+
   /**
    * Will try to find the participant with the given sessionId in the current call.
    *

package/src/types.ts

@@ -6,6 +6,7 @@ import type {
   CallResponse,
   JoinCallRequest,
   MemberResponse,
+  OwnCapability,
   ReactionResponse,
 } from './gen/coordinator';
 import type { StreamClient } from './coordinator/connection/client';
@@ -184,6 +185,13 @@ export type CallConstructor = {
    */
   members?: MemberResponse[];
 
+  /**
+   * An optional list of {@link OwnCapability} coming from the backed.
+   * If provided, the call will be initialized with the data from this object.
+   * This is useful when initializing a new "pending call" from an event.
+   */
+  ownCapabilities?: OwnCapability[];
+
   /**
    * Flags the call as a ringing call.
    * @default false