Remove media access conditional compile - part 1 (#5587)

* Remove media access condition compile * Change files * update * update * address pr comment * update
Azure · Jan 28, 2025 · 167e634 · 167e634
1 parent b0f2c1f
commit 167e634
Show file tree

Hide file tree

Showing 13 changed files with 4,950 additions and 4,971 deletions.
diff --git a/change-beta/@azure-communication-react-cc9a918b-409e-4290-baa7-a73df9ef8032.json b/change-beta/@azure-communication-react-cc9a918b-409e-4290-baa7-a73df9ef8032.json
@@ -0,0 +1,9 @@
+{
+  "type": "patch",
+  "area": "improvement",
+  "workstream": "Hard mute",
+  "comment": "Remove conditional compile media access part 1",
+  "packageName": "@azure/communication-react",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-communication-react-cc9a918b-409e-4290-baa7-a73df9ef8032.json b/change/@azure-communication-react-cc9a918b-409e-4290-baa7-a73df9ef8032.json
@@ -0,0 +1,9 @@
+{
+  "type": "patch",
+  "area": "improvement",
+  "workstream": "Hard mute",
+  "comment": "Remove conditional compile media access part 1",
+  "packageName": "@azure/communication-react",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/calling-stateful-client/src/CallClientState.ts b/packages/calling-stateful-client/src/CallClientState.ts
@@ -485,7 +485,6 @@ export interface VideoStreamRendererViewState {
   target: HTMLElement;
 }
 
-/* @conditional-compile-remove(media-access) */
 /**
  * Media access state
  * @public
@@ -562,7 +561,6 @@ export interface RemoteParticipantState {
    * Proxy of {@link @azure/communication-calling#SpotlightCallFeature.spotlightedParticipants}.
    */
   spotlight?: SpotlightState;
-  /* @conditional-compile-remove(media-access) */
   /**
    * Proxy of {@link @azure/communication-calling#Call.MediaAccessCallFeature.MediaAccess}.
    */
@@ -759,7 +757,6 @@ export interface CallState {
    */
   breakoutRooms?: BreakoutRoomsState;
 
-  /* @conditional-compile-remove(media-access) */
   /**
    * Proxy of {@link @azure/communication-calling#MediaAccessFeature}.
    */
@@ -1001,7 +998,6 @@ export interface CallClientState {
    * See documentation of {@Link CallErrors} for details.
    */
   latestErrors: CallErrors;
-  /* @conditional-compile-remove(breakout-rooms) */ /* @conditional-compile-remove(media-access) */
   /**
    * Stores the latest notifications.
    *
@@ -1124,15 +1120,13 @@ export type CallErrorTarget =
   | 'Call.muteAllRemoteParticipants'
   | 'Call.setConstraints';
 
-/* @conditional-compile-remove(breakout-rooms) */ /* @conditional-compile-remove(media-access) */
 /**
  * @public
  */
 export type CallNotifications = {
   [target in NotificationTarget]: CallNotification;
 };
 
-/* @conditional-compile-remove(breakout-rooms) */ /* @conditional-compile-remove(media-access) */
 /**
  * @public
  */
@@ -1142,18 +1136,17 @@ export interface CallNotification {
   timestamp: Date;
 }
 
-/* @conditional-compile-remove(breakout-rooms) */ /* @conditional-compile-remove(media-access) */
 /** @public */
 export type NotificationTarget =
-  | 'assignedBreakoutRoomOpened'
-  | 'assignedBreakoutRoomOpenedPromptJoin'
-  | 'assignedBreakoutRoomChanged'
-  | 'breakoutRoomJoined'
-  | 'breakoutRoomClosingSoon'
-  | /* @conditional-compile-remove(media-access) */ 'capabilityTurnVideoOnPresent'
-  | /* @conditional-compile-remove(media-access) */ 'capabilityTurnVideoOnAbsent'
-  | /* @conditional-compile-remove(media-access) */ 'capabilityUnmuteMicPresent'
-  | /* @conditional-compile-remove(media-access) */ 'capabilityUnmuteMicAbsent'
+  | /* @conditional-compile-remove(breakout-rooms) */ 'assignedBreakoutRoomOpened'
+  | /* @conditional-compile-remove(breakout-rooms) */ 'assignedBreakoutRoomOpenedPromptJoin'
+  | /* @conditional-compile-remove(breakout-rooms) */ 'assignedBreakoutRoomChanged'
+  | /* @conditional-compile-remove(breakout-rooms) */ 'breakoutRoomJoined'
+  | /* @conditional-compile-remove(breakout-rooms) */ 'breakoutRoomClosingSoon'
+  | 'capabilityTurnVideoOnPresent'
+  | 'capabilityTurnVideoOnAbsent'
+  | 'capabilityUnmuteMicPresent'
+  | 'capabilityUnmuteMicAbsent'
   | /* @conditional-compile-remove(together-mode) */ 'togetherModeStarted'
   | /* @conditional-compile-remove(together-mode) */ 'togetherModeEnded';
 

diff --git a/packages/calling-stateful-client/src/CallContext.ts b/packages/calling-stateful-client/src/CallContext.ts
@@ -10,9 +10,7 @@ import {
   ScalingMode,
   VideoDeviceInfo
 } from '@azure/communication-calling';
-/* @conditional-compile-remove(media-access) */
-import { MediaAccess, MeetingMediaAccess } from '@azure/communication-calling';
-import { RaisedHand } from '@azure/communication-calling';
+import { RaisedHand, MediaAccess, MeetingMediaAccess } from '@azure/communication-calling';
 /* @conditional-compile-remove(breakout-rooms) */
 import { BreakoutRoom, BreakoutRoomsSettings } from '@azure/communication-calling';
 
@@ -48,7 +46,6 @@ import {
   CallErrorTarget,
   CallError
 } from './CallClientState';
-/* @conditional-compile-remove(breakout-rooms) */ /* @conditional-compile-remove(media-access) */
 import { NotificationTarget, CallNotifications, CallNotification } from './CallClientState';
 import { TeamsIncomingCallState } from './CallClientState';
 import { CaptionsInfo } from './CallClientState';
@@ -94,7 +91,6 @@ export class CallContext {
   private _atomicId: number;
   private _callIdHistory: CallIdHistory = new CallIdHistory();
   private _timeOutId: { [key: string]: ReturnType<typeof setTimeout> } = {};
-  /* @conditional-compile-remove(breakout-rooms) */ /* @conditional-compile-remove(media-access) */
   private _latestCallIdsThatPushedNotifications: Partial<Record<NotificationTarget, string>> = {};
 
   constructor(userId: CommunicationIdentifierKind, maxListeners = 50) {
@@ -115,8 +111,7 @@ export class CallContext {
       userId: userId,
       environmentInfo: undefined,
       latestErrors: {} as CallErrors,
-      /* @conditional-compile-remove(breakout-rooms) */ /* @conditional-compile-remove(media-access) */ latestNotifications:
-        {} as CallNotifications
+      latestNotifications: {} as CallNotifications
     };
     this._emitter = new EventEmitter();
     this._emitter.setMaxListeners(maxListeners);
@@ -1396,15 +1391,13 @@ export class CallContext {
     });
   }
 
-  /* @conditional-compile-remove(breakout-rooms) */ /* @conditional-compile-remove(media-access) */
   public setLatestNotification(callId: string, notification: CallNotification): void {
     this._latestCallIdsThatPushedNotifications[notification.target] = callId;
     this.modifyState((draft: CallClientState) => {
       draft.latestNotifications[notification.target] = notification;
     });
   }
 
-  /* @conditional-compile-remove(breakout-rooms) */ /* @conditional-compile-remove(media-access) */
   public deleteLatestNotification(callId: string, notificationTarget: NotificationTarget): void {
     let callIdToPushLatestNotification = this._latestCallIdsThatPushedNotifications[notificationTarget];
     callIdToPushLatestNotification = callIdToPushLatestNotification
@@ -1421,7 +1414,6 @@ export class CallContext {
     });
   }
 
-  /* @conditional-compile-remove(media-access) */
   public setMediaAccesses(callId: string, mediaAccesses: MediaAccess[]): void {
     this.modifyState((draft: CallClientState) => {
       const call = draft.calls[this._callIdHistory.latestCallId(callId)];
@@ -1441,7 +1433,6 @@ export class CallContext {
     });
   }
 
-  /* @conditional-compile-remove(media-access) */
   public setMeetingMediaAccess(callId: string, meetingMediaAccess: MeetingMediaAccess): void {
     this.modifyState((draft: CallClientState) => {
       const call = draft.calls[this._callIdHistory.latestCallId(callId)];

diff --git a/packages/calling-stateful-client/src/CallSubscriber.ts b/packages/calling-stateful-client/src/CallSubscriber.ts
@@ -32,7 +32,6 @@ import { LocalRecordingSubscriber } from './LocalRecordingSubscriber';
 import { BreakoutRoomsSubscriber } from './BreakoutRoomsSubscriber';
 /* @conditional-compile-remove(together-mode) */
 import { TogetherModeSubscriber } from './TogetherModeSubscriber';
-/* @conditional-compile-remove(media-access) */
 import { MediaAccessSubscriber } from './MediaAccessSubscriber';
 import { _isTeamsMeeting } from './TypeGuards';
 
@@ -67,7 +66,6 @@ export class CallSubscriber {
   private _breakoutRoomsSubscriber: BreakoutRoomsSubscriber;
   /* @conditional-compile-remove(together-mode) */
   private _togetherModeSubscriber: TogetherModeSubscriber;
-  /* @conditional-compile-remove(media-access) */
   private _mediaAccessSubscriber: MediaAccessSubscriber;
 
   constructor(call: CallCommon, context: CallContext, internalContext: InternalCallContext) {
@@ -136,7 +134,6 @@ export class CallSubscriber {
       this._call.feature(Features.TogetherMode)
     );
 
-    /* @conditional-compile-remove(media-access) */
     this._mediaAccessSubscriber = new MediaAccessSubscriber(
       this._callIdRef,
       this._context,
@@ -251,7 +248,6 @@ export class CallSubscriber {
     this._breakoutRoomsSubscriber.unsubscribe();
     /* @conditional-compile-remove(together-mode) */
     this._togetherModeSubscriber.unsubscribe();
-    /* @conditional-compile-remove(media-access) */
     this._mediaAccessSubscriber.unsubscribe();
   };
 

diff --git a/packages/calling-stateful-client/src/CapabilitiesSubscriber.ts b/packages/calling-stateful-client/src/CapabilitiesSubscriber.ts
@@ -14,7 +14,6 @@ export class CapabilitiesSubscriber {
   private _callIdRef: CallIdRef;
   private _context: CallContext;
   private _capabilitiesFeature: CapabilitiesFeature;
-  /* @conditional-compile-remove(media-access) */
   private _capabilitiesInitialized: boolean = false;
 
   constructor(callIdRef: CallIdRef, context: CallContext, capabilities: CapabilitiesFeature) {
@@ -38,14 +37,11 @@ export class CapabilitiesSubscriber {
     if (data.oldValue.viewAttendeeNames !== data.newValue.viewAttendeeNames) {
       this._context.setHideAttendeeNames(this._callIdRef.callId, data);
     }
-    /* @conditional-compile-remove(media-access) */
-    this.setUnmuteMicAndTurnVideoOnNotification(data);
 
-    /* @conditional-compile-remove(media-access) */
+    this.setUnmuteMicAndTurnVideoOnNotification(data);
     this._capabilitiesInitialized = true;
   };
 
-  /* @conditional-compile-remove(media-access) */
   private setUnmuteMicAndTurnVideoOnNotification = (data: CapabilitiesChangeInfo): void => {
     if (data.oldValue.turnVideoOn?.isPresent !== data.newValue.turnVideoOn?.isPresent) {
       if (

diff --git a/packages/calling-stateful-client/src/Converter.ts b/packages/calling-stateful-client/src/Converter.ts
@@ -118,7 +118,7 @@ export function convertSdkParticipantToDeclarativeParticipant(
     raisedHand: undefined,
     role: participant.role,
     spotlight: undefined,
-    /* @conditional-compile-remove(media-access) */ mediaAccess: undefined
+    mediaAccess: undefined
   };
 }
 

diff --git a/packages/calling-stateful-client/src/MediaAccessSubscriber.ts b/packages/calling-stateful-client/src/MediaAccessSubscriber.ts
@@ -1,18 +1,14 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-/* @conditional-compile-remove(media-access) */
 import {
   MediaAccessCallFeature,
   MediaAccessChangedEvent,
   MeetingMediaAccessChangedEvent
 } from '@azure/communication-calling';
-/* @conditional-compile-remove(media-access) */
 import { CallContext } from './CallContext';
-/* @conditional-compile-remove(media-access) */
 import { CallIdRef } from './CallIdRef';
 
-/* @conditional-compile-remove(media-access) */
 /**
  * @private
  */

diff --git a/packages/calling-stateful-client/src/StatefulCallClient.test.ts b/packages/calling-stateful-client/src/StatefulCallClient.test.ts
@@ -100,12 +100,7 @@ describe('Stateful call client', () => {
       agent.testHelperPushCall(createMockCall());
       expect(await waitWithBreakCondition(() => Object.keys(client.getState().calls).length === 1)).toBe(true);
       expect(await waitWithBreakCondition(() => Object.keys(client.getState().callsEnded).length === 0)).toBe(true);
-      // Expecting different results for different flavors, 1 for stable and 2 for beta.
-      /* @conditional-compile-remove(breakout-rooms) */ /* @conditional-compile-remove(media-access) */
       expect(listener.onChangeCalledCount).toBe(2);
-      /* @conditional-compile-remove(breakout-rooms) */ /* @conditional-compile-remove(media-access) */
-      return;
-      expect(listener.onChangeCalledCount).toBe(1);
     }
     {
       const listener = new StateChangeListener(client);

diff --git a/packages/calling-stateful-client/src/TestUtils.ts b/packages/calling-stateful-client/src/TestUtils.ts
@@ -20,7 +20,6 @@ import {
   CallFeature
 } from '@azure/communication-calling';
 import { RaiseHandCallFeature, RaisedHandListener, RaisedHand } from '@azure/communication-calling';
-/* @conditional-compile-remove(media-access) */
 import {
   MediaAccessCallFeature,
   MediaAccessChangedListener,
@@ -183,7 +182,6 @@ export class MockRaiseHandCallFeatureImpl implements RaiseHandCallFeature {
     /* No state to clean up */
   }
 }
-/* @conditional-compile-remove(media-access) */
 /**
  * @private
  */
@@ -496,9 +494,7 @@ export function createMockApiFeatures(
       name: 'Default',
       isRecordingActive: false,
       isTranscriptionActive: false,
-      /* @conditional-compile-remove(media-access) */
       getAllOthersMediaAccess: () => [],
-      /* @conditional-compile-remove(media-access) */
       getMeetingMediaAccess: () => ({ isAudioPermitted: true, isVideoPermitted: true })
     });
     return generic;

diff --git a/packages/calling-stateful-client/src/index-public.ts b/packages/calling-stateful-client/src/index-public.ts
@@ -24,7 +24,6 @@ export type {
   VideoStreamRendererViewState,
   CallInfoState
 } from './CallClientState';
-/* @conditional-compile-remove(breakout-rooms) */ /* @conditional-compile-remove(media-access) */
 export type { CallNotification, CallNotifications, NotificationTarget } from './CallClientState';
 export type { TeamsIncomingCallState } from './CallClientState';
 /* @conditional-compile-remove(remote-ufd) */
@@ -58,5 +57,4 @@ export type { LocalRecordingCallFeatureState } from './CallClientState';
 export type { ConferencePhoneInfo } from './CallClientState';
 /* @conditional-compile-remove(breakout-rooms) */
 export type { BreakoutRoomsState } from './CallClientState';
-/* @conditional-compile-remove(media-access) */
 export type { MediaAccessState } from './CallClientState';
diff --git a/packages/communication-react/review/beta/communication-react.api.md b/packages/communication-react/review/beta/communication-react.api.md
@@ -4246,7 +4246,7 @@ export interface NotificationStyles {
 }
 
 // @public (undocumented)
-export type NotificationTarget = 'assignedBreakoutRoomOpened' | 'assignedBreakoutRoomOpenedPromptJoin' | 'assignedBreakoutRoomChanged' | 'breakoutRoomJoined' | 'breakoutRoomClosingSoon' | /* @conditional-compile-remove(media-access) */ 'capabilityTurnVideoOnPresent' | /* @conditional-compile-remove(media-access) */ 'capabilityTurnVideoOnAbsent' | /* @conditional-compile-remove(media-access) */ 'capabilityUnmuteMicPresent' | /* @conditional-compile-remove(media-access) */ 'capabilityUnmuteMicAbsent' | /* @conditional-compile-remove(together-mode) */ 'togetherModeStarted' | /* @conditional-compile-remove(together-mode) */ 'togetherModeEnded';
+export type NotificationTarget = /* @conditional-compile-remove(breakout-rooms) */ 'assignedBreakoutRoomOpened' | /* @conditional-compile-remove(breakout-rooms) */ 'assignedBreakoutRoomOpenedPromptJoin' | /* @conditional-compile-remove(breakout-rooms) */ 'assignedBreakoutRoomChanged' | /* @conditional-compile-remove(breakout-rooms) */ 'breakoutRoomJoined' | /* @conditional-compile-remove(breakout-rooms) */ 'breakoutRoomClosingSoon' | 'capabilityTurnVideoOnPresent' | 'capabilityTurnVideoOnAbsent' | 'capabilityUnmuteMicPresent' | 'capabilityUnmuteMicAbsent' | /* @conditional-compile-remove(together-mode) */ 'togetherModeStarted' | /* @conditional-compile-remove(together-mode) */ 'togetherModeEnded';
 
 // @public
 export type NotificationType = keyof NotificationStackStrings;