@vkontakte/calls-sdk 2.8.5-dev.043879f0.0 → 2.8.5-dev.2b864c42.0

package/classes/Conversation.d.ts

@@ -1,7 +1,8 @@
 import type { IEffect } from '@vkontakte/calls-video-effects';
+import type { RGBTuple } from '@vkontakte/calls-vmoji';
 import BaseApi from '../abstract/BaseApi';
 import BaseLogger from '../abstract/BaseLogger';
-import BaseSignaling, { AddParticipantParams } from '../abstract/BaseSignaling';
+import { AddParticipantParams } from '../abstract/BaseSignaling';
 import CallType from '../enums/CallType';
 import ConversationFeature from '../enums/ConversationFeature';
 import ConversationOption from '../enums/ConversationOption';
@@ -61,7 +62,7 @@ export default class Conversation extends EventEmitter {
     private _cooldownTimestampByStreamDescription;
     private _cooldownQueueCleanupTimer;
     private readonly _statFirstMediaReceived;
-    constructor(api: BaseApi, signaling: BaseSignaling, externalLogger: BaseLogger | null);
+    constructor(api: BaseApi, externalLogger: BaseLogger | null);
     static current(): Conversation | null;
     static hangupAfterInit(): void;
     static id(): string | null;
@@ -187,6 +188,7 @@ export default class Conversation extends EventEmitter {
     participantId?: ParticipantId | null, 
     /** ключ расшифровки svg внешнего пользователя или кастомный ключ, не требуется для незашифрованных svg */
     decryptionKey?: string | null): void;
+    setAnimojiFill(fill: RGBTuple | string): void;
     setVideoStream(stream: MediaStream, isScreen?: boolean): Promise<void>;
     setAudioStream(stream: MediaStream): Promise<void>;
     toggleLocalVideo(enabled: boolean): Promise<void>;
@@ -195,9 +197,8 @@ export default class Conversation extends EventEmitter {
      * @deprecated Use updateDisplayLayout instead
      */
     changePriorities(priorities: ParticipantPriority[]): Promise<void>;
-    changeParticipantState(state: {
-        [key: string]: string;
-    }): Promise<void>;
+    changeParticipantState(state: Record<string, string>, compositeUserId?: CompositeUserId): Promise<void>;
+    putHandsDown(): Promise<void>;
     requestKeyFrame(participantStreamDescription: ParticipantStreamDescription): Promise<void | SignalingMessage>;
     requestTestMode(consumerCommand: string, producerCommand: string): Promise<void>;
     updateDisplayLayout(layouts: ParticipantLayout[]): Promise<void>;
@@ -236,6 +237,7 @@ export default class Conversation extends EventEmitter {
     pinParticipant(participantId: ParticipantId, unpin: boolean, roomId?: number | null): Promise<void>;
     updateMediaModifiers(mediaModifiers: MediaModifiers): Promise<void>;
     enableVideoSuspend(enabled: boolean): Promise<void>;
+    enableVideoSuspendSuggest(enabled: boolean): Promise<void>;
     changeOptions(changes: {
         [key in ConversationOption]?: boolean;
     }): Promise<void>;
@@ -266,7 +268,7 @@ export default class Conversation extends EventEmitter {
     activateRooms(roomIds: number[], deactivate: boolean): Promise<void>;
     switchRoom(toRoomId: number | null, participantId?: ParticipantId): Promise<void>;
     removeRooms(roomIds: number[]): Promise<void>;
-    startStream(isRecord?: boolean, name?: string | null, movieId?: string | null, privacy?: 'PUBLIC' | 'FRIENDS' | 'DIRECT_LINK', groupId?: string | null, roomId?: number | null, externalAccessKey?: string | null): Promise<undefined>;
+    startStream(isRecord?: boolean, name?: string | null, movieId?: string | null, privacy?: 'PUBLIC' | 'FRIENDS' | 'DIRECT_LINK', groupId?: string | null, roomId?: number | null): Promise<undefined>;
     stopStream(roomId?: number | null): Promise<undefined>;
     publishStream(roomId?: number | null): Promise<undefined>;
     recordSetConf(king?: ParticipantId, pawns?: ParticipantId[], hideParticipantCount?: boolean, roomId?: number | null): Promise<void>;
@@ -285,7 +287,9 @@ export default class Conversation extends EventEmitter {
     private _onLocalMediaStreamChanged;
     private _onScreenSharingStatus;
     private _changeRemoteMediaSettings;
+    private _changeLocalParticipantState;
     private _changeRemoteParticipantState;
+    private _changeMultipleParticipantState;
     private _invokeRolesChangedCallbackIfNeeded;
     private _onSignalingNotification;
     private _onPromotionApproved;
@@ -298,6 +302,7 @@ export default class Conversation extends EventEmitter {
     private _onClosedConversation;
     private _onMediaSettingsChanged;
     private _onParticipantStateChanged;
+    private _onParticipantsStateChanged;
     private _onNeedRate;
     private _onFeatureSetChanged;
     private _onMultipartyChatCreated;
@@ -373,6 +378,7 @@ export default class Conversation extends EventEmitter {
     /** получили из сингналинга сообщение о реакции пользователей */
     private _onFeedback;
     private _onDecorativeParticipantIdChanged;
+    private _onVideoSuspendSuggest;
     private _isMe;
     private _getMuteStatesForRoomId;
     private _getMuteStatesForCurrentRoom;

package/classes/ProducerCommandSerializationService.d.ts

@@ -2,6 +2,7 @@ import { NetworkStatReport } from '../types/NetworkStatReport';
 import ParticipantLayout, { RequestKeyFrame, StopStream } from '../types/ParticipantLayout';
 import { RequestAsr } from '../types/RequestAsr';
 import { EnableVideoSuspend } from '../types/EnableVideoSuspend';
+import { EnableVideoSuspendSuggest } from '../types/EnableVideoSuspendSuggest';
 import SignalingMessage from '../types/SignalingMessage';
 import { PerfStatReport } from '../types/PerfStatReporter';
 import { SharingStatReport } from './screenshare/SharingStatReport';
@@ -19,6 +20,7 @@ export declare class ProducerCommandSerializationService {
     serializeRequestAsr(sequenceNumber: number, params: RequestAsr): ArrayBuffer;
     serializeNetworkStatReport(sequenceNumber: number, report: NetworkStatReport): ArrayBuffer;
     serializeEnableVideoSuspend(sequenceNumber: number, params: EnableVideoSuspend): ArrayBuffer;
+    serializeEnableVideoSuspendSuggest(sequenceNumber: number, params: EnableVideoSuspendSuggest): ArrayBuffer;
     deserializeCommandResponse(data: BufferSource | Blob): Promise<SignalingMessage | undefined>;
     private deserializeUpdateDisplayLayoutResponse;
     private deserializeReportPerfStatResponse;

package/classes/screenshare/StreamBuilder.d.ts

@@ -4,6 +4,7 @@ export default class StreamBuilder extends BaseStreamBuilder {
     private readonly _renderer;
     private readonly _decoder;
     private _decoderReady;
+    private _decoderBusy;
     private _decoderQueue;
     private readonly _fpsMeter;
     constructor(participantId: ParticipantId, onStream: IOnStream, onStat: IOnStat);

package/classes/transport/DirectStatReporter.d.ts

@@ -1,4 +1,5 @@
-import { BaseSignaling, StatResult } from '../../CallsSDK';
+import BaseSignaling from '../../abstract/BaseSignaling';
+import { StatResult } from '../../types/Statistics';
 import EventEmitter from '../EventEmitter';
 import { WeightedAverage } from '../stat/WeightedAverage';
 interface NetworkStat {

package/classes/transport/DirectTransport.d.ts

@@ -13,6 +13,7 @@ export default class DirectTransport extends BaseTransport {
     private _animojiDataChannel;
     private _animojiReceiver;
     private _animojiSender;
+    private _remoteAnimojiVersion;
     private _isOpen;
     private _remotePeerId;
     private _statInterval;
@@ -49,6 +50,7 @@ export default class DirectTransport extends BaseTransport {
     private _addIceCandidate;
     private _setRemoteCandidates;
     private _setRemoteDescription;
+    private _processAnimojiProtocolVersion;
     private _onAddTrack;
     private _handleIceCandidate;
     private _onSignalingStateChange;

package/classes/transport/Transport.d.ts

@@ -1,4 +1,4 @@
-import type { AnimojiSvgData } from '@vkontakte/calls-vmoji';
+import type { AnimojiSvgData, RGBTuple } from '@vkontakte/calls-vmoji';
 import BaseSignaling from '../../abstract/BaseSignaling';
 import { ParticipantId } from '../../types/Participant';
 import ServerSettings from '../../types/ServerSettings';
@@ -65,6 +65,7 @@ export declare class Transport extends EventEmitter {
     getState(): TransportState | undefined;
     getStates(): Record<string, TransportState>;
     setAnimojiSvg(participantId: ParticipantId, svgData: AnimojiSvgData): void;
+    setAnimojiFill(fill: RGBTuple | string): void;
     private _setStates;
     private _setLocalState;
     private _onSignalingNotification;

package/default/Signaling.d.ts

@@ -82,12 +82,11 @@ export default class Signaling extends BaseSignaling {
     hangup(reason: string): Promise<SignalingMessage | void>;
     sendCandidate(participantId: ParticipantId, candidate: RTCIceCandidate): Promise<SignalingMessage>;
     requestTestMode(consumerCommand: string, producerCommand: string | null): Promise<SignalingMessage>;
-    sendSdp(participantId: ParticipantId, sdp: RTCSessionDescriptionInit): Promise<SignalingMessage>;
+    sendSdp(participantId: ParticipantId, sdp: RTCSessionDescriptionInit, extraPayload?: Record<string, any>): Promise<SignalingMessage>;
     acceptCall(mediaSettings: MediaSettings): Promise<SignalingMessage>;
     changeMediaSettings(mediaSettings: MediaSettings): Promise<SignalingMessage>;
-    changeParticipantState(state: {
-        [key: string]: string;
-    }): Promise<SignalingMessage>;
+    changeParticipantState(state: Record<string, string>, compositeUserId?: CompositeUserId): Promise<SignalingMessage>;
+    putHandsDown(): Promise<SignalingMessage>;
     addParticipant(participantId: CompositeUserId, params?: AddParticipantParams): Promise<SignalingMessage>;
     removeParticipant(participantId: CompositeUserId, ban?: boolean): Promise<SignalingMessage>;
     allocateConsumer(description: RTCSessionDescription | null, capabilities: {
@@ -132,6 +131,7 @@ export default class Signaling extends BaseSignaling {
     pinParticipant(participantId: ParticipantId, unpin: boolean, roomId: number | null): Promise<SignalingMessage>;
     updateMediaModifiers(mediaModifiers: MediaModifiers): Promise<SignalingMessage>;
     enableVideoSuspend(enabled: boolean): Promise<SignalingMessage>;
+    enableVideoSuspendSuggest(enabled: boolean): Promise<SignalingMessage>;
     changeOptions(changes: {
         [key in ConversationOption]?: boolean;
     }): Promise<SignalingMessage>;
@@ -154,6 +154,7 @@ export default class Signaling extends BaseSignaling {
     readyToSend(isReady?: boolean): void;
     getParticipantListChunk(participantListChunkParameters: ParticipantListChunkParameters): Promise<SignalingMessage>;
     getParticipants(externalIds: SignalingMessage.ExternalId[]): Promise<GetParticipantsSignalingResponse>;
+    getPeerId(): number | null;
     startAsr(params: IAsrStartParams): Promise<SignalingMessage>;
     stopAsr(params?: IAsrStopParams): Promise<SignalingMessage>;
     requestAsr(request: boolean): Promise<SignalingMessage>;

package/enums/SignalingCommandType.d.ts

@@ -53,6 +53,8 @@ declare enum SignalingCommandType {
     REQUEST_PROMOTION = "request-promotion",
     ACCEPT_PROMOTION = "accept-promotion",
     GET_HAND_QUEUE = "get-hand-queue",
-    ENABLE_VIDEO_SUSPEND = "enable-video-suspend"
+    ENABLE_VIDEO_SUSPEND = "enable-video-suspend",
+    ENABLE_VIDEO_SUSPEND_SUGGEST = "enable-video-suspend-suggest",
+    PUT_HANDS_DOWN = "put-hands-down"
 }
 export default SignalingCommandType;

package/enums/SignalingNotification.d.ts

@@ -7,6 +7,7 @@ declare enum SignalingNotification {
     CLOSED_CONVERSATION = "closed-conversation",
     MEDIA_SETTINGS_CHANGED = "media-settings-changed",
     PARTICIPANT_STATE_CHANGED = "participant-state-changed",
+    PARTICIPANTS_STATE_CHANGED = "participants-state-changed",
     RATE_CALL_DATA = "rate-call-data",
     FEATURE_SET_CHANGED = "feature-set-changed",
     TOPOLOGY_CHANGED = "topology-changed",
@@ -48,6 +49,7 @@ declare enum SignalingNotification {
     PARTICIPANT_ANIMOJI_CHANGED = "participant-animoji-changed",
     ASR_STARTED = "asr-started",
     ASR_STOPPED = "asr-stopped",
-    DECORATIVE_PARTICIPANT_ID_CHANGED = "decorative-participant-id-changed"
+    DECORATIVE_PARTICIPANT_ID_CHANGED = "decorative-participant-id-changed",
+    VIDEO_SUSPEND_SUGGEST = "video-suspend-suggest"
 }
 export default SignalingNotification;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/calls-sdk",
-  "version": "2.8.5-dev.043879f0.0",
+  "version": "2.8.5-dev.2b864c42.0",
   "author": "vk.com",
   "description": "Library for video calls based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -15,7 +15,7 @@
   ],
   "dependencies": {
     "@vkontakte/calls-video-effects": "2.2.3-beta.2",
-    "@vkontakte/calls-vmoji": "1.0.9-beta.54",
+    "@vkontakte/calls-vmoji": "1.0.10-beta.6",
     "@vkontakte/libvpx": "2.0.9",
     "bit-buffer": "0.2.5",
     "messagepack": "1.1.12",

package/static/External.d.ts

@@ -17,7 +17,7 @@ import MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
 import { IOnRemoteMovieData, ISharedMovieInfo, ISharedMovieState, ISharedMovieStoppedInfo } from '../types/MovieShare';
 import MuteStates from '../types/MuteStates';
-import { ParticipantStateMapped } from '../types/Participant';
+import { ParticipantsStateList, ParticipantStateMapped } from '../types/Participant';
 import { IRoomId, Room, RoomParticipantUpdate, Rooms, RoomsUpdate } from '../types/Room';
 import { VmojiError } from '../types/Vmoji';
 import { DebugMessageType } from './Debug';
@@ -226,6 +226,7 @@ declare namespace External {
      * @param markers
      */
     function onParticipantJoined(userId: ExternalId, markers: ExternalParticipantListMarkers | null): void;
+    function onLocalParticipantState(participantState: ParticipantStateMapped): void;
     /**
      * Изменились данные состояний собеседника
      *
@@ -234,6 +235,13 @@ declare namespace External {
      * @param markers
      */
     function onRemoteParticipantState(userId: ExternalParticipantId, participantState: ParticipantStateMapped, markers: ExternalParticipantListMarkers | null): void;
+    /**
+     * Изменились данные состояний нескольких собеседников
+     *
+     * @param stateList
+     * @param roomId
+     */
+    function onRemoteParticipantsState(stateList: ParticipantsStateList, roomId?: IRoomId): void;
     /**
      * Изменился статус соединения собеседников
      *
@@ -539,6 +547,7 @@ declare namespace External {
      * @param newId
      */
     function onParticipantIdChanged(prevId: ExternalParticipantId, newId: ExternalParticipantId): void;
+    function onVideoSuspendSuggest(bandwidth: number): void;
     /**
      * Одобрено повышение пользователя в зеле ожидания/зале в режиме Audience
      *

package/static/Params.d.ts

@@ -18,7 +18,7 @@ import MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
 import { IOnRemoteMovieData, ISharedMovieInfo, ISharedMovieState, ISharedMovieStoppedInfo } from '../types/MovieShare';
 import MuteStates from '../types/MuteStates';
-import { ParticipantStateMapped } from '../types/Participant';
+import { ParticipantsStateList, ParticipantStateMapped } from '../types/Participant';
 import { MediaType } from '../types/ParticipantStreamDescription';
 import { IRoomId, Room, RoomParticipantUpdate, Rooms, RoomsUpdate } from '../types/Room';
 import { IApiEnv } from '../types/Params';
@@ -178,11 +178,12 @@ export type ParamsObject = {
      */
     vmoji: typeof Vmoji | null;
     /**
-     * Настройки отрисовки Vmoji.
-     *
-     * Экземпляр класса `RenderingOptions` из [`@vkontakte/calls-vmoji`](https://npmjs.com/package/@vkontakte/calls-vmoji)
+     * Настройки Vmoji
      */
-    vmojiRenderingOptions: Partial<Vmoji.RenderingOptions> | null;
+    vmojiOptions: {
+        protocolVersion: Vmoji.AnimojiVersion;
+        renderingOptions: Partial<Vmoji.RenderingOptions>;
+    } | null;
     /** @hidden */
     iceRestartWaitTime: number;
     /** @hidden */
@@ -564,10 +565,19 @@ export type ParamsObject = {
      * Участник присоединился к звонку
      */
     onParticipantJoined?: (userId: ExternalParticipantId, markers: ExternalParticipantListMarkers) => void;
+    /**
+     * Получены данные по изменению локальных состояний со стороны админа
+     * Например, принудительно опущена рука
+     */
+    onLocalParticipantState?: (participantState: ParticipantStateMapped) => void;
     /**
      * Изменились данные состояний собеседника
      */
     onRemoteParticipantState?: (userId: ExternalParticipantId, participantState: ParticipantStateMapped, markers: ExternalParticipantListMarkers | null) => void;
+    /**
+     * Изменились данные состояний нескольких собеседников
+     */
+    onRemoteParticipantsState?: (stateList: ParticipantsStateList, roomId?: IRoomId) => void;
     /**
      * Изменился статус соединения собеседников
      */
@@ -805,6 +815,12 @@ export type ParamsObject = {
      * @param newId
      */
     onParticipantIdChanged?: (prevId: ExternalParticipantId, newId: ExternalParticipantId) => void;
+    /**
+     * Предложение включить режим автоматического отключения приёма видео
+     * в плохой сети
+     * @param bandwidth текущая полоса пропускания, kbps
+     */
+    onVideoSuspendSuggest?: (bandwidth: number) => void;
     /**
      * Одобрено повышение пользователя в зале ожидания/зале в режиме Audience
      *
@@ -893,8 +909,8 @@ export default abstract class Params {
     static set videoEffectMaxHeight(value: number);
     static get vmoji(): typeof Vmoji | null;
     static set vmoji(value: typeof Vmoji | null);
-    static get vmojiRenderingOptions(): Partial<Vmoji.RenderingOptions>;
-    static set vmojiRenderingOptions(value: Partial<Vmoji.RenderingOptions> | null);
+    static get vmojiOptions(): NonNullable<ParamsObject['vmojiOptions']>;
+    static set vmojiOptions(value: ParamsObject['vmojiOptions']);
     static get voiceParams(): {
         [key: string]: number;
     };

package/types/EnableVideoSuspendSuggest.d.ts

@@ -0,0 +1,3 @@
+export type EnableVideoSuspendSuggest = {
+    enabled: boolean;
+};

package/types/Participant.d.ts

@@ -44,6 +44,11 @@ export interface ParticipantStateMapped {
         ts: number;
     };
 }
+export type ParticipantsStateList = {
+    externalId: ExternalParticipantId;
+    participantState: ParticipantStateMapped;
+    markers: ExternalParticipantListMarkers | null;
+}[];
 export interface Participant {
     /**
      * string representation

package/types/SignalingMessage.d.ts

@@ -1,3 +1,4 @@
+import { AnimojiVersion } from '@vkontakte/calls-vmoji';
 import { TransportTopology } from '../classes/transport/Transport';
 import ChatRoomEventType from '../enums/ChatRoomEventType';
 import ConversationFeature from '../enums/ConversationFeature';
@@ -162,6 +163,7 @@ declare namespace SignalingMessage {
         data: {
             candidate?: RTCIceCandidateInit;
             sdp?: Required<RTCSessionDescriptionInit>;
+            animojiVersion?: AnimojiVersion;
         };
     }
     export interface RegisteredPeer extends Notification {
@@ -210,6 +212,17 @@ declare namespace SignalingMessage {
         };
         markers?: ParticipantListMarkers;
     }
+    export interface ParticipantsStateChanged extends Notification {
+        participants: {
+            id: CompositeUserId;
+            participantState?: {
+                state: Record<string, string>;
+                stateUpdateTs: Record<string, number>;
+            };
+            markers?: ParticipantListMarkers;
+        }[];
+        roomId?: IRoomId;
+    }
     export interface RolesChanged extends Notification {
         adminId: ParticipantId;
         participantId: ParticipantId;
@@ -427,6 +440,9 @@ declare namespace SignalingMessage {
         decorativeParticipantId?: CompositeUserId;
         decorativeExternalParticipantId?: ExternalId;
     }
+    export interface VideoSuspendSuggest extends Notification {
+        bandwidth: number;
+    }
     export {};
 }
 export default SignalingMessage;

package/types/Streams.d.ts

@@ -6,7 +6,6 @@ export interface IStartStreamData {
     groupId: string | null;
     roomId: number | null;
     streamMovie: boolean;
-    externalAccessKey: string | null;
 }
 export interface IStopStreamData {
     roomId: number | null;

package/utils/Conversation.d.ts

@@ -1,2 +1,4 @@
-import { MuteState, MediaOption, MuteStates } from '../CallsSDK';
+import MediaOption from '../enums/MediaOption';
+import MuteState from '../enums/MuteState';
+import MuteStates from '../types/MuteStates';
 export declare const getMediaOptionsByMuteState: (muteStates: MuteStates, value: MuteState) => MediaOption[];