@vkontakte/calls-sdk 2.6.2-beta.20 → 2.6.2-beta.22

package/classes/Conversation.d.ts

@@ -12,6 +12,7 @@ import UpdateDisplayLayoutErrorReason from '../enums/UpdateDisplayLayoutErrorRea
 import UserRole from '../enums/UserRole';
 import UserType from '../enums/UserType';
 import { JSONObject } from '../static/Json';
+import { IFeaturesPerRole } from '../types/ConversationFeature';
 import { ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk, ExternalUserId } from '../types/ExternalId';
 import MediaModifiers from '../types/MediaModifiers';
 import { IVideoDimentions } from '../types/MediaSettings';
@@ -38,7 +39,7 @@ export declare type ConversationData = {
      */
     acceptTime: number | null;
     features: ConversationFeature[];
-    featuresPerRole?: Partial<Record<ConversationFeature, UserRole[]>> | null;
+    featuresPerRole?: IFeaturesPerRole | null;
     /**
      * ID звонка
      */
@@ -193,7 +194,7 @@ export default class Conversation extends EventEmitter {
     private _onAddParticipant;
     private _onRemoveParticipant;
     changeDevice(kind: MediaDeviceKind): Promise<void>;
-    toggleScreenCapturing(enabled: boolean): Promise<void>;
+    toggleScreenCapturing(screenEnabled: boolean, audioShareEnabled: boolean): Promise<void>;
     setVideoStream(stream: MediaStream, isScreen?: boolean): Promise<void>;
     setAudioStream(stream: MediaStream): Promise<void>;
     toggleLocalVideo(enabled: boolean): Promise<void>;
@@ -205,6 +206,8 @@ export default class Conversation extends EventEmitter {
     requestKeyFrame(participantStreamDescription: ParticipantStreamDescription): Promise<void | SignalingMessage>;
     requestTestMode(consumerCommand: string, producerCommand: string): Promise<void>;
     updateDisplayLayout(layouts: ParticipantLayout[]): Promise<void>;
+    /** @async */
+    feedback(key: string): Promise<SignalingMessage>;
     private _stopStreaming;
     private _sendUpdateDisplayLayout;
     private _cleanupCooldownQueue;
@@ -216,6 +219,7 @@ export default class Conversation extends EventEmitter {
     private _processSharedMovieInfo;
     private _processConnectionSharedMovieInfo;
     private _onSharedMovieInfoStopped;
+    private _onFeaturesPerRoleChanged;
     private _waitForStreamIfNeeded;
     private _matchStreamDescription;
     private _getWaitingTime;
@@ -316,6 +320,8 @@ export default class Conversation extends EventEmitter {
     private _updateDisplayLayoutFromCache;
     private _setParticipantsStatus;
     private _onJoinLinkChanged;
+    /** получили из сингналинга сообщение о реакции пользователей */
+    private _onFeedback;
     private _isMe;
 }
 export declare class UpdateDisplayLayoutError extends Error {

package/classes/MediaSource.d.ts

@@ -13,7 +13,8 @@ export declare const enum MediaSourceEvent {
 export declare const enum MediaTrackKind {
     'audio' = "audio",
     'video' = "video",
-    'screen' = "screen"
+    'screen' = "screen",
+    'audioshare' = "audioshare"
 }
 export declare class MediaSource extends EventEmitter {
     /** Стрим с камеры и микрофона пользователя */
@@ -21,6 +22,7 @@ export declare class MediaSource extends EventEmitter {
     /** Последний сохраненный оригинальный видео трек с камеры */
     private _trackVideoStreamBackup;
     private _screenTrack;
+    private _audioShareTrack;
     /** Трек для отправки в медиа-канал. Может отличаться при скриншаринге в дата-канал */
     private _sendVideoTrack;
     private _mediaSettings;
@@ -58,16 +60,19 @@ export declare class MediaSource extends EventEmitter {
     private _changeAudioInput;
     private _changeScreen;
     private _disableScreenCapture;
+    private disableAudioShare;
+    private getSilentAudioShareTrack;
     private _replaceLocalTrack;
     private _stopLocalTrack;
     private _videoEffect;
     /** останавливает и удаляет сохраненный трек с камеры пользователя */
     private _stopAndRemoveTrackVideoStreamBackup;
     destroy(): void;
-    toggleScreenCapturing(enabled: boolean): Promise<void>;
+    toggleScreenCapturing(captureScreen: boolean, captureAudio: boolean): Promise<void>;
     toggleVideo(enabled: boolean): Promise<void>;
     toggleAudio(enabled: boolean): Promise<void>;
     setResolution(width: number, height: number): Promise<void>;
     updateNoiseSuppression(): Promise<void>;
     videoEffect(effect: IEffect | null): Promise<void>;
+    getAudioShareTrack(): MediaStreamTrack | null;
 }

package/classes/transport/ServerTransport.d.ts

@@ -33,6 +33,7 @@ export default class ServerTransport extends EventEmitter {
     private _disabledSenders;
     private _rtpReceiversByStreamId;
     private _producerSessionId;
+    private _newAudioShareTrack;
     constructor(signaling: BaseSignaling, mediaSource: MediaSource, serverSettings: ServerSettings);
     getState(): TransportState;
     updateStatisticsInterval(): void;
@@ -68,6 +69,7 @@ export default class ServerTransport extends EventEmitter {
     private _detectStaleTracks;
     private _allocateConsumer;
     private _acceptProducer;
+    private handleTracks;
     _onSignalingNotification(message: SignalingMessage): Promise<void>;
     private _onProducerUpdated;
     private _onAddTrack;

package/default/Signaling.d.ts

@@ -121,6 +121,7 @@ export default class Signaling extends BaseSignaling {
     }): Promise<SignalingMessage>;
     getWaitingHall(fromId?: WaitingParticipantId | null, count?: number, backward?: boolean): Promise<SignalingMessage>;
     promoteParticipant(participantId: CompositeUserId, demote?: boolean): Promise<SignalingMessage>;
+    feedback(key: string): Promise<SignalingMessage>;
     /**
      * Close a connection with a signaling server
      */

package/enums/ConversationOption.d.ts

@@ -5,7 +5,8 @@ declare enum ConversationOption {
     REQUIRE_AUTH_TO_JOIN = "REQUIRE_AUTH_TO_JOIN",
     AUDIENCE_MODE = "AUDIENCE_MODE",
     WAITING_HALL = "WAITING_HALL",
-    ASR = "ASR"
+    ASR = "ASR",
+    FEEDBACK = "FEEDBACK"
 }
 export default ConversationOption;
 export declare function compareOptions(oldOptions: ConversationOption[], newOptions: ConversationOption[]): boolean;

package/enums/MediaOption.d.ts

@@ -5,6 +5,7 @@ declare enum MediaOption {
     AUDIO = "AUDIO",
     VIDEO = "VIDEO",
     SCREEN_SHARING = "SCREEN_SHARING",
-    MOVIE_SHARING = "MOVIE_SHARING"
+    MOVIE_SHARING = "MOVIE_SHARING",
+    AUDIO_SHARING = "AUDIO_SHARING"
 }
 export default MediaOption;

package/enums/SignalingCommandType.d.ts

@@ -35,6 +35,7 @@ declare enum SignalingCommandType {
     REQUEST_TEST_MODE = "request-test-mode",
     ADD_MOVIE = "add-movie",
     UPDATE_MOVIE = "update-movie",
-    REMOVE_MOVIE = "remove-movie"
+    REMOVE_MOVIE = "remove-movie",
+    FEEDBACK = "feedback"
 }
 export default SignalingCommandType;

package/enums/SignalingNotification.d.ts

@@ -36,9 +36,11 @@ declare enum SignalingNotification {
     CHAT_ROOM_UPDATED = "chat-room-updated",
     PROMOTION_APPROVED = "promotion-approved",
     JOIN_LINK_CHANGED = "join-link-changed",
+    FEEDBACK = "feedback",
     MOVIE_UPDATE_NOTIFICATION = "movie-update-notification",
     MOVIE_SHARE_INFO = "movie-share-info",
     MOVIE_SHARE_STARTED = "movie-share-started",
-    MOVIE_SHARE_STOPPED = "movie-share-stopped"
+    MOVIE_SHARE_STOPPED = "movie-share-stopped",
+    FEATURES_PER_ROLE_CHANGED = "features-per-role-changed"
 }
 export default SignalingNotification;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/calls-sdk",
-  "version": "2.6.2-beta.20",
+  "version": "2.6.2-beta.22",
   "author": "vk.com",
   "description": "Library for video calls based on the vk.com platform",
   "homepage": "https://vk.com",

package/static/External.d.ts

@@ -7,7 +7,9 @@ import ConversationOption from '../enums/ConversationOption';
 import FatalError from '../enums/FatalError';
 import MediaOption from '../enums/MediaOption';
 import UserRole from '../enums/UserRole';
+import { IFeaturesPerRole } from '../types/ConversationFeature';
 import { ExternalId, ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk, ExternalParticipantListMarkers } from '../types/ExternalId';
+import { IFeedbackExternal } from '../types/Feedback';
 import MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
 import { IOnRemoteMovieData, ISharedMovieInfo, ISharedMovieState, ISharedMovieStoppedInfo } from '../types/MovieShare';
@@ -412,5 +414,15 @@ declare namespace External {
      * @param joinLink токен присоединения к звонку
      */
     function onJoinLinkChanged(joinLink: string): void;
+    /**
+     * Получена новая реакция
+     */
+    function onFeedback(feedback: IFeedbackExternal[]): void;
+    /**
+     * Изменилось состояние пермиссий фич в звонке
+     *
+     * @param featuresPerRole Информация о доступных фичах по ролям
+     */
+    function onFeaturesPerRoleChanged(featuresPerRole: IFeaturesPerRole): void;
 }
 export default External;

package/static/Params.d.ts

@@ -7,7 +7,9 @@ import ConversationOption from '../enums/ConversationOption';
 import FatalError from '../enums/FatalError';
 import MediaOption from '../enums/MediaOption';
 import UserRole from '../enums/UserRole';
+import { IFeaturesPerRole } from '../types/ConversationFeature';
 import { ExternalId, ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk, ExternalParticipantListMarkers } from '../types/ExternalId';
+import { IFeedbackExternal } from '../types/Feedback';
 import IceServer from '../types/IceServer';
 import MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
@@ -523,6 +525,22 @@ export declare type ParamsObject = {
      * @param joinLink токен присоединения к звонку
      */
     onJoinLinkChanged?: (joinLink: string) => void;
+    /**
+     * Получены новые реакции в звонке
+     * @param feedback массив с реакциями
+     */
+    onFeedback?: (feedback: IFeedbackExternal[]) => void;
+    /**
+     * Включать capability c аудио шарой
+     */
+    audioShareCapabilityEnabled: boolean;
+    /**
+     * Изменился список ролей, которым доступны ConversationFeatures
+     *
+     * @param featuresPerRole Объект вида ключ: ConversationFeature = значение: UserRole[]
+     * (если ключ фичи отсутствует, или в ролях пустой массив, считаем фичу доступной для всех пользователей)
+     */
+    onFeaturesPerRoleChanged?: (featuresPerRole: IFeaturesPerRole) => void;
 };
 export default abstract class Params {
     private static _params;
@@ -624,4 +642,5 @@ export default abstract class Params {
     static get filterObservers(): boolean;
     static get muteMode(): boolean;
     static get preserveAudioTracks(): boolean;
+    static get audioShareCapabilityEnabled(): boolean;
 }

package/static/WebRTCUtils.d.ts

@@ -66,7 +66,7 @@ declare namespace WebRTCUtils {
     /**
      * Запрашивает трансляцию экрана пользователя
      */
-    function getScreenMedia(): Promise<MediaStream>;
+    function getScreenMedia(withAudioShare: boolean): Promise<MediaStream>;
     /**
      * Запрашивает камеру пользователя
      *
@@ -146,5 +146,6 @@ declare namespace WebRTCUtils {
      * Возвращает подверсию браузера (если она есть)
      */
     function browserSubVersion(): string;
+    function isAudioShareSupported(): boolean;
 }
 export default WebRTCUtils;

package/types/ConversationFeature.d.ts

@@ -0,0 +1,3 @@
+import ConversationFeature from '../enums/ConversationFeature';
+import UserRole from '../enums/UserRole';
+export declare type IFeaturesPerRole = Partial<Record<ConversationFeature, UserRole[]>>;

package/types/Feedback.d.ts

@@ -0,0 +1,22 @@
+import { CompositeUserId } from './Participant';
+import { ExternalParticipantId } from './ExternalId';
+interface IFeedbackItem {
+    participantId: CompositeUserId;
+    /** event timestamps for this participant, chronologically */
+    times: number[];
+}
+export interface IFeedbackItemExternal extends Omit<IFeedbackItem, 'participantId'> {
+    participantId: ExternalParticipantId;
+}
+export interface IFeedback {
+    /** feedback ID; key values should be negotiated by clients themselves, like in ParticipantState, and have just the same restrictions; on backend the values of these keys are not bound in any way to those in ParticipantState */
+    key: string;
+    /** total amount of reactions of this type from the start of this call */
+    totalCount: number;
+    /** list of items containing initiator & all related data, if any */
+    items: IFeedbackItem[];
+}
+export interface IFeedbackExternal extends Omit<IFeedback, 'items'> {
+    items: IFeedbackItemExternal[];
+}
+export {};

package/types/MediaSettings.d.ts

@@ -14,6 +14,10 @@ export declare type MediaSettings = {
      * Включена ли трансляция экрана
      */
     isScreenSharingEnabled: boolean;
+    /**
+     * Включена ли трансляция звука
+     */
+    isAudioSharingEnabled: boolean;
     videoStreams: VideoStreamInfo[];
 };
 export declare type VideoStreamInfo = {

package/types/ParticipantStreamDescription.d.ts

@@ -6,7 +6,8 @@ export declare enum MediaType {
     CAMERA = "CAMERA",
     SCREEN = "SCREEN",
     STREAM = "STREAM",
-    MOVIE = "MOVIE"
+    MOVIE = "MOVIE",
+    AUDIOSHARE = "AUDIOSHARE"
 }
 export declare function serializeParticipantStreamDescription(description: ParticipantStreamDescription): string;
 export declare function parseParticipantStreamDescription(descriptionString: string): ParticipantStreamDescription;

package/types/SignalingMessage.d.ts

@@ -7,6 +7,8 @@ import MediaOption from '../enums/MediaOption';
 import ParticipantState from '../enums/ParticipantState';
 import UserRole from '../enums/UserRole';
 import UserType from '../enums/UserType';
+import { IFeaturesPerRole } from './ConversationFeature';
+import { IFeedback } from './Feedback';
 import MediaModifiers from './MediaModifiers';
 import MediaSettings from './MediaSettings';
 import { ISharedMovieInfo, ISharedMovieState, ISharedMovieStoppedInfo } from './MovieShare';
@@ -74,7 +76,7 @@ declare namespace SignalingMessage {
         multichatId: string | null;
         tamtamMultichatId: string | null;
         recordInfo: RecordInfo | null;
-        featuresPerRole?: Partial<Record<ConversationFeature, UserRole[]>> | null;
+        featuresPerRole?: IFeaturesPerRole | null;
         pinnedParticipantId: ParticipantId | null;
         options: ConversationOption[];
         muteStates?: MuteStates;
@@ -189,7 +191,7 @@ declare namespace SignalingMessage {
     }
     export interface FeatureSetChanged extends Notification {
         features: ConversationFeature[];
-        featuresPerRole?: Partial<Record<ConversationFeature, UserRole[]>> | null;
+        featuresPerRole?: IFeaturesPerRole | null;
     }
     export interface MultipartyChatCreated extends Notification {
         chatId: string;
@@ -283,6 +285,9 @@ declare namespace SignalingMessage {
     export interface JoinLinkChanged extends Notification {
         joinLink: string;
     }
+    export interface Feedback extends Notification {
+        feedback: IFeedback[];
+    }
     export interface SharedMovieState extends Notification {
         data: ISharedMovieState[];
     }
@@ -291,6 +296,9 @@ declare namespace SignalingMessage {
     }
     export interface SharedMovieStoppedInfo extends Notification, ISharedMovieStoppedInfo {
     }
+    export interface FeaturesPerRoleChanged extends Notification {
+        featuresPerRole?: IFeaturesPerRole | null;
+    }
     export {};
 }
 export default SignalingMessage;

package/types/WaitingHall.d.ts

@@ -1,6 +1,7 @@
 import { ExternalId } from './ExternalId';
 import { CompositeUserId } from './Participant';
 import SignalingMessage from './SignalingMessage';
+import { IFeedback } from './Feedback';
 export declare type WaitingParticipantId = {
     addedTs: number;
     id: CompositeUserId;
@@ -9,18 +10,11 @@ export declare type WaitingParticipant = {
     id: WaitingParticipantId;
     externalId?: SignalingMessage.ExternalId;
 };
-export declare type Feedback = {
-    key: string;
-    totalCount: number;
-    currentCount: number;
-    timeout: number;
-    participantIds: CompositeUserId[];
-};
 export declare type ChatRoom = {
     totalCount: number;
     firstParticipants?: WaitingParticipant[];
     handCount?: number;
-    feedback?: Feedback[];
+    feedback?: IFeedback[];
 };
 /**
  * Ответ на запрос `getWaitingHall`