Azure
diff --git a/‎libs/skype-spool-sdk-1.0.0.tgz‎
464 KB b/‎libs/skype-spool-sdk-1.0.0.tgz‎
464 KB
diff --git a/‎packages/calling-stateful-client/review/beta/calling-stateful-client.api.md‎
Lines changed: 16 additions & 23 deletions b/‎packages/calling-stateful-client/review/beta/calling-stateful-client.api.md‎
Lines changed: 16 additions & 23 deletions
diff --git a/‎packages/calling-stateful-client/src/CallClientState.ts‎
Lines changed: 33 additions & 16 deletions b/‎packages/calling-stateful-client/src/CallClientState.ts‎
Lines changed: 33 additions & 16 deletions
diff --git a/‎packages/calling-stateful-client/src/CallContext.ts‎
Lines changed: 18 additions & 18 deletions b/‎packages/calling-stateful-client/src/CallContext.ts‎
Lines changed: 18 additions & 18 deletions
diff --git a/‎packages/calling-stateful-client/src/CallDeclarativeCommon.ts‎
Lines changed: 20 additions & 26 deletions b/‎packages/calling-stateful-client/src/CallDeclarativeCommon.ts‎
Lines changed: 20 additions & 26 deletions
diff --git a/‎packages/calling-stateful-client/src/CallSubscriber.ts‎
Lines changed: 9 additions & 9 deletions b/‎packages/calling-stateful-client/src/CallSubscriber.ts‎
Lines changed: 9 additions & 9 deletions
@@ -16,6 +16,7 @@ import { CallEndReason } from '@azure/communication-calling';
 import { CallerInfo } from '@azure/communication-calling';
 import { CallKind } from '@azure/communication-calling';
 import { CallState as CallState_2 } from '@azure/communication-calling';
+import { CaptionsResultType } from '@azure/communication-calling';
 import { CommunicationIdentifier } from '@azure/communication-common';
 import { CommunicationIdentifierKind } from '@azure/communication-common';
 import { CommunicationUserIdentifier } from '@azure/communication-common';
@@ -33,11 +34,9 @@ import { LocalVideoStream } from '@azure/communication-calling';
 import { MediaStreamType } from '@azure/communication-calling';
 import { MicrosoftTeamsUserIdentifier } from '@azure/communication-common';
 import { MicrosoftTeamsUserKind } from '@azure/communication-common';
-import { ParticipantInfo } from '@azure/communication-calling';
 import { ParticipantRole } from '@azure/communication-calling';
 import { PhoneNumberKind } from '@azure/communication-common';
 import { RemoteParticipantState as RemoteParticipantState_2 } from '@azure/communication-calling';
-import { ResultType } from '@azure/communication-calling';
 import { ScalingMode } from '@azure/communication-calling';
 import { TeamsCall as TeamsCall_2 } from '@azure/communication-calling';
 import { TeamsCallAgent as TeamsCallAgent_2 } from '@azure/communication-calling';
@@ -126,30 +125,24 @@ export interface CallState {
 }
 
 // @beta (undocumented)
-export interface CaptionInfoState {
-    originalText?: string;
-    resultType: ResultType;
-    speaker: ParticipantInfo;
-    spokenLanguage: string;
-    subtitleLanguage?: string;
-    text: string;
-    timestamp: Date;
+export interface CaptionsCallFeatureState {
+    captions: CaptionsInfo[];
+    currentCaptionLanguage: string;
+    currentSpokenLanguage: string;
+    isCaptionsFeatureActive: boolean;
+    supportedCaptionLanguages: string[];
+    supportedSpokenLangauges: string[];
 }
 
 // @beta (undocumented)
-export interface CaptionsCallFeatureState {
-    // (undocumented)
-    availableSpokenLanguages: string[];
-    // (undocumented)
-    availableSubtitleLanguages?: string[];
-    // (undocumented)
-    captions: CaptionInfoState[];
-    // (undocumented)
-    isActive: boolean;
-    // (undocumented)
-    selectedSpokenLanguage?: string;
-    // (undocumented)
-    selectedSubtitleLanguage?: string;
+export interface CaptionsInfo {
+    captionLanguage?: string;
+    captionText: string;
+    resultType: CaptionsResultType;
+    speaker: CallerInfo;
+    spokenLanguage: string;
+    spokenText?: string;
+    timestamp: Date;
 }
 
 // @public
 
@@ -12,9 +12,8 @@ import {
   LatestMediaDiagnostics,
   LatestNetworkDiagnostics,
   MediaStreamType,
-  ParticipantInfo,
   RemoteParticipantState as RemoteParticipantStatus,
-  ResultType,
+  CaptionsResultType,
   ScalingMode,
   VideoDeviceInfo
 } from '@azure/communication-calling';
@@ -52,48 +51,66 @@ export interface CallAgentState {
 /**
  * @beta
  */
-export interface CaptionInfoState {
+export interface CaptionsInfo {
   /**
    * The state in which this caption data can be classified.
    */
-  resultType: ResultType;
+  resultType: CaptionsResultType;
   /**
    * The information of the call participant who spoke the captioned text.
    */
-  speaker: ParticipantInfo;
+  speaker: CallerInfo;
   /**
-   * The language that the spoken words were interpretted as. Corresponds to the language specified in startCaptions / selectLanguage.
+   * The language that the spoken words were interpretted as. Corresponds to the language specified in startCaptions / setSpokenLanguage.
    */
   spokenLanguage: string;
   /**
    * The caption text.
    */
-  text: string;
+  captionText: string;
   /**
    * Timestamp of when the captioned words were initially spoken.
    */
   timestamp: Date;
   /**
-   * The language that the captions are presented in. Corresponds to the subtitleLanguage specified in startCaptions / selectLanguage.
+   * The language that the captions are presented in. Corresponds to the captionLanguage specified in startCaptions / setCaptionLanguage.
    */
-  subtitleLanguage?: string;
+  captionLanguage?: string;
   /**
    * The original spoken caption text prior to translating to subtitle language
    */
-  originalText?: string;
+  spokenText?: string;
 }
 
 /**
  *
  * @beta
  */
 export interface CaptionsCallFeatureState {
-  captions: CaptionInfoState[];
-  selectedSpokenLanguage?: string;
-  selectedSubtitleLanguage?: string;
-  availableSpokenLanguages: string[];
-  availableSubtitleLanguages?: string[];
-  isActive: boolean;
+  /**
+   * supported spoken languages
+   */
+  supportedSpokenLangauges: string[];
+  /**
+   * array of received captions
+   */
+  captions: CaptionsInfo[];
+  /**
+   * whether captions is on/off
+   */
+  isCaptionsFeatureActive: boolean;
+  /**
+   * supported caption languages
+   */
+  supportedCaptionLanguages: string[];
+  /**
+   * current spoken language
+   */
+  currentSpokenLanguage: string;
+  /**
+   * current caption language
+   */
+  currentCaptionLanguage: string;
 }
 
 /**
 
@@ -3,14 +3,12 @@
 
 import { CommunicationIdentifierKind } from '@azure/communication-common';
 import {
-  AcsCaptionsInfo,
   AudioDeviceInfo,
   DeviceAccess,
   DominantSpeakersInfo,
-  ResultType,
   ScalingMode,
-  TeamsCaptionsInfo,
-  VideoDeviceInfo
+  VideoDeviceInfo,
+  TeamsCaptionsInfo
 } from '@azure/communication-calling';
 /* @conditional-compile-remove(unsupported-browser) */
 import { EnvironmentInfo } from '@azure/communication-calling';
@@ -37,7 +35,7 @@ import {
   CallErrors,
   CallErrorTarget,
   CallError,
-  CaptionInfoState
+  CaptionsInfo
 } from './CallClientState';
 import { callingStatefulLogger } from './Logger';
 import { CallIdHistory } from './CallIdHistory';
@@ -702,28 +700,30 @@ export class CallContext {
     return id;
   }
 
-  private processNewCaption(captions: CaptionInfoState[], captionInfo: CaptionInfoState): void {
+  private processNewCaption(captions: CaptionsInfo[], newCaption: CaptionsInfo): void {
     // Check if the incoming caption is a replacement for the latest one
     const latestCaption = captions[captions.length - 1];
     if (
       latestCaption &&
-      latestCaption.resultType !== ResultType.Final &&
-      latestCaption.timestamp.getTime() === captionInfo.timestamp.getTime() &&
+      latestCaption.resultType !== 'Final' &&
+      latestCaption.timestamp.getTime() === newCaption.timestamp.getTime() &&
+      latestCaption.speaker.identifier &&
+      newCaption.speaker.identifier &&
       toFlatCommunicationIdentifier(latestCaption.speaker.identifier) ===
-        toFlatCommunicationIdentifier(captionInfo.speaker.identifier)
+        toFlatCommunicationIdentifier(newCaption.speaker.identifier)
     ) {
       captions.pop();
     }
 
-    captions.push(captionInfo);
+    captions.push(newCaption);
 
     // If the array length exceeds 50, remove the oldest caption
     if (captions.length > 50) {
       captions.shift();
     }
   }
 
-  public addCaption(callId: string, caption: AcsCaptionsInfo | TeamsCaptionsInfo): void {
+  public addCaption(callId: string, caption: TeamsCaptionsInfo): void {
     this.modifyState((draft: CallClientState) => {
       const call = draft.calls[this._callIdHistory.latestCallId(callId)];
       if (call) {
@@ -736,7 +736,7 @@ export class CallContext {
     this.modifyState((draft: CallClientState) => {
       const call = draft.calls[this._callIdHistory.latestCallId(callId)];
       if (call) {
-        call.captionsFeature.isActive = isCaptionsActive;
+        call.captionsFeature.isCaptionsFeatureActive = isCaptionsActive;
       }
     });
   }
@@ -745,25 +745,25 @@ export class CallContext {
     this.modifyState((draft: CallClientState) => {
       const call = draft.calls[this._callIdHistory.latestCallId(callId)];
       if (call) {
-        call.captionsFeature.selectedSpokenLanguage = spokenLanguage;
+        call.captionsFeature.currentSpokenLanguage = spokenLanguage;
       }
     });
   }
 
-  setSelectedSubtitleLanguage(callId: string, subtitleLanguage: string): void {
+  setSelectedCaptionLanguage(callId: string, captionLanguage: string): void {
     this.modifyState((draft: CallClientState) => {
       const call = draft.calls[this._callIdHistory.latestCallId(callId)];
       if (call) {
-        call.captionsFeature.selectedSubtitleLanguage = subtitleLanguage;
+        call.captionsFeature.currentCaptionLanguage = captionLanguage;
       }
     });
   }
 
-  setAvailableSubtitleLanguages(callId: string, subtitleLanguages: string[]): void {
+  setAvailableCaptionLanguages(callId: string, captionLanguages: string[]): void {
     this.modifyState((draft: CallClientState) => {
       const call = draft.calls[this._callIdHistory.latestCallId(callId)];
       if (call) {
-        call.captionsFeature.availableSubtitleLanguages = subtitleLanguages;
+        call.captionsFeature.supportedCaptionLanguages = captionLanguages;
       }
     });
   }
@@ -772,7 +772,7 @@ export class CallContext {
     this.modifyState((draft: CallClientState) => {
       const call = draft.calls[this._callIdHistory.latestCallId(callId)];
       if (call) {
-        call.captionsFeature.availableSpokenLanguages = spokenLanguages;
+        call.captionsFeature.supportedSpokenLangauges = spokenLanguages;
       }
     });
   }
 
@@ -3,7 +3,7 @@
 
 import { CallContext } from './CallContext';
 import { CallCommon } from './BetaToStableTypes';
-import { AcsCaptionsCallFeature, Features, TeamsCaptionsCallFeature } from '@azure/communication-calling';
+import { Features, TeamsCaptionsCallFeature } from '@azure/communication-calling';
 
 /**
  * @private
@@ -74,47 +74,41 @@ export abstract class ProxyCallCommon implements ProxyHandler<CallCommon> {
       case 'feature': {
         // these are mini version of Proxy object - if it grows too big, a real Proxy object should be used.
         return this._context.withErrorTeedToState((...args: Parameters<CallCommon['feature']>) => {
-          if (args[0] === Features.AcsCaptions) {
-            const captionsFeature = target.feature(Features.AcsCaptions);
-            return {
-              ...captionsFeature,
-              startCaptions: async (...args: Parameters<AcsCaptionsCallFeature['startCaptions']>) => {
-                const ret = await captionsFeature.startCaptions(...args);
-                this._context.setIsCaptionActive(target.id, true);
-                return ret;
-              },
-              selectSpokenLanguage: async (...args: Parameters<TeamsCaptionsCallFeature['selectSpokenLanguage']>) => {
-                const ret = await captionsFeature.selectSpokenLanguage(...args);
-                this._context.setSelectedSpokenLanguage(target.id, args[0]);
-                return ret;
-              }
-            };
-          } else if (args[0] === Features.TeamsCaptions) {
+          if (args[0] === Features.TeamsCaptions) {
             const captionsFeature = target.feature(Features.TeamsCaptions);
             return {
               ...captionsFeature,
               startCaptions: async (...args: Parameters<TeamsCaptionsCallFeature['startCaptions']>) => {
-                const ret = await captionsFeature.startCaptions(...args);
+                let ret;
+                if (args) {
+                  ret = await captionsFeature.startCaptions(...args);
+                } else {
+                  ret = await captionsFeature.startCaptions();
+                }
+
                 this._context.setIsCaptionActive(target.id, true);
                 return ret;
               },
-              selectSpokenLanguage: async (...args: Parameters<TeamsCaptionsCallFeature['selectSpokenLanguage']>) => {
-                const ret = await captionsFeature.selectSpokenLanguage(...args);
+              stopCaptions: async () => {
+                const ret = await captionsFeature.stopCaptions();
+                this._context.setIsCaptionActive(target.id, false);
+                return ret;
+              },
+              setSpokenLanguage: async (...args: Parameters<TeamsCaptionsCallFeature['setSpokenLanguage']>) => {
+                const ret = await captionsFeature.setSpokenLanguage(...args);
                 this._context.setSelectedSpokenLanguage(target.id, args[0]);
                 return ret;
               },
-              selectSubtitleLanguage: async (
-                ...args: Parameters<TeamsCaptionsCallFeature['selectSubtitleLanguage']>
-              ) => {
-                const ret = await captionsFeature.selectSubtitleLanguage(...args);
-                this._context.setSelectedSubtitleLanguage(target.id, args[0]);
+              setCaptionLanguage: async (...args: Parameters<TeamsCaptionsCallFeature['setCaptionLanguage']>) => {
+                const ret = await captionsFeature.setCaptionLanguage(...args);
+                this._context.setSelectedCaptionLanguage(target.id, args[0]);
                 return ret;
               }
             };
           } else {
             return target.feature(...args);
           }
-        }, 'Call.resume');
+        }, 'Call.feature');
       }
       default:
         return Reflect.get(target, prop);
 
@@ -36,7 +36,7 @@ export class CallSubscriber {
   private _participantSubscribers: Map<string, ParticipantSubscriber>;
   private _recordingSubscriber: RecordingSubscriber;
   private _transcriptionSubscriber: TranscriptionSubscriber;
-  private _captionsSubscriber: CaptionsSubscriber;
+  private _captionsSubscriber?: CaptionsSubscriber;
   /* @conditional-compile-remove(video-background-effects) */
   private _localVideoStreamVideoEffectsSubscribers: Map<string, LocalVideoStreamVideoEffectsSubscriber>;
 
@@ -62,13 +62,13 @@ export class CallSubscriber {
       this._context,
       this._call.feature(Features.Transcription)
     );
-    this._captionsSubscriber = new CaptionsSubscriber(
-      this._callIdRef,
-      this._context,
-      _isTeamsMeetingCall(this._call)
-        ? this._call.feature(Features.TeamsCaptions)
-        : this._call.feature(Features.AcsCaptions)
-    );
+    if (_isTeamsMeetingCall(this._call)) {
+      this._captionsSubscriber = new CaptionsSubscriber(
+        this._callIdRef,
+        this._context,
+        this._call.feature(Features.TeamsCaptions)
+      );
+    }
     /* @conditional-compile-remove(video-background-effects) */
     this._localVideoStreamVideoEffectsSubscribers = new Map();
 
@@ -145,7 +145,7 @@ export class CallSubscriber {
     this._diagnosticsSubscriber.unsubscribe();
     this._recordingSubscriber.unsubscribe();
     this._transcriptionSubscriber.unsubscribe();
-    this._captionsSubscriber.unsubscribe();
+    this._captionsSubscriber?.unsubscribe();
   };
 
   private addParticipantListener(participant: RemoteParticipant): void {