@vkontakte/calls-sdk 2.5.3-dev.dbb762f.0 → 2.6.2-beta.0

package/classes/Conversation.d.ts

@@ -12,13 +12,13 @@ import UpdateDisplayLayoutErrorReason from '../enums/UpdateDisplayLayoutErrorRea
 import UserRole from '../enums/UserRole';
 import UserType from '../enums/UserType';
 import { JSONObject } from '../static/Json';
-import { ExternalParticipantId, ExternalUserId } from '../types/ExternalId';
+import { ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk, ExternalUserId } from '../types/ExternalId';
 import MediaModifiers from '../types/MediaModifiers';
 import { IVideoDimentions } from '../types/MediaSettings';
-import { IAddMovieParams } from '../types/MovieShare';
 import MuteStates from '../types/MuteStates';
-import { CompositeUserId, OkUserId, ParticipantId } from '../types/Participant';
+import { CompositeUserId, IGetParticipantsParameters, OkUserId, ParticipantId } from '../types/Participant';
 import { ParticipantLayout } from '../types/ParticipantLayout';
+import { ParticipantListChunkParameters } from '../types/ParticipantListChunk';
 import ParticipantPriority from '../types/ParticipantPriority';
 import { ParticipantStreamDescription } from '../types/ParticipantStreamDescription';
 import SignalingMessage, { RecordInfo } from '../types/SignalingMessage';
@@ -148,7 +148,21 @@ export default class Conversation extends EventEmitter {
     private _updateConversation;
     private _createMediaSource;
     private _connectSignaling;
+    private _processConnection;
+    private _prepareParticipants;
+    private _onConversationParticipantListChunk;
+    private _participantListChunkToExternalChunk;
+    private _registerConnectionParticipants;
     private _registerParticipants;
+    private _getClientType;
+    private _getStatusByTransportState;
+    private _registerParticipantInCache;
+    private _getExistedParticipantByIdOrCreate;
+    private _getExternalIdByParticipantId;
+    private _registerParticipantAndSetMarkersIfChunkEnabled;
+    private _warnParticipantNotInConversation;
+    private _setParticipantMarkers;
+    private _denormalizeMarkers;
     /**
      * Обрабатывает данные connection из сигналинга. Должен вызываться после `_registerParticipants`
      *
@@ -184,6 +198,7 @@ export default class Conversation extends EventEmitter {
         [key: string]: string;
     }): Promise<void>;
     requestKeyFrame(participantStreamDescription: ParticipantStreamDescription): Promise<void | SignalingMessage>;
+    requestTestMode(consumerCommand: string, producerCommand: string): Promise<void>;
     updateDisplayLayout(layouts: ParticipantLayout[]): Promise<void>;
     private _stopStreaming;
     private _sendUpdateDisplayLayout;
@@ -193,7 +208,6 @@ export default class Conversation extends EventEmitter {
     private _onParticipantSourcesUpdate;
     private _onParticipantPromoted;
     private _onChatRoomUpdated;
-    private _onSharedMovieUpdate;
     private _waitForStreamIfNeeded;
     private _matchStreamDescription;
     private _getWaitingTime;
@@ -217,11 +231,11 @@ export default class Conversation extends EventEmitter {
     customData(data: JSONObject, participantId?: ParticipantId | null): Promise<void>;
     createJoinLink(): Promise<string>;
     removeJoinLink(): Promise<never>;
-    addMovie({ movieId, gain }: IAddMovieParams): Promise<{
+    addMovie(movieId: string): Promise<{
         movieId: string;
         streamType: string;
     }>;
-    updateMovie(movieId: string, gain?: number, offset?: number, pause?: boolean): Promise<void>;
+    updateMovie(movieId: string, gain?: number, offset?: string, pause?: boolean): Promise<void>;
     removeMovie(movieId: string): Promise<void>;
     startStream(isRecord?: boolean, name?: string | null, movieId?: string | null, privacy?: 'PUBLIC' | 'FRIENDS' | 'DIRECT_LINK', groupId?: string | null): Promise<SignalingMessage>;
     stopStream(): Promise<SignalingMessage>;
@@ -234,6 +248,8 @@ export default class Conversation extends EventEmitter {
         effect: IVideoDimentions;
     }): Promise<void>;
     videoEffect(effect: IEffect | null): Promise<void>;
+    getParticipants(parameters: IGetParticipantsParameters): Promise<ExternalParticipant[]>;
+    getParticipantListChunk(participantListChunkParameters: ParticipantListChunkParameters): Promise<ExternalParticipantListChunk>;
     private _onLocalMediaStreamChanged;
     private _onScreenSharingStatus;
     private _changeRemoteMediaSettings;
@@ -289,6 +305,7 @@ export default class Conversation extends EventEmitter {
     private _toggleJoinAvailability;
     private _updateDisplayLayoutFromCache;
     private _setParticipantsStatus;
+    private _onJoinLinkChanged;
 }
 export declare class UpdateDisplayLayoutError extends Error {
     readonly participantErrors: {

package/classes/Conversation.test.d.ts

@@ -0,0 +1 @@
+import 'jasmine-ajax';

package/classes/transport/DirectTransport.d.ts

@@ -44,7 +44,7 @@ export default class DirectTransport extends EventEmitter {
     private _handleTransmittedData;
     private _addIceCandidate;
     private _setRemoteCandidates;
-    _setRemoteDescription(peerId: string, sdp: any): Promise<void>;
+    _setRemoteDescription(peerId: string, sdp: RTCSessionDescriptionInit): Promise<void>;
     private _onAddTrack;
     private _handleIceCandidate;
     private _onSignalingStateChange;

package/classes/transport/Transport.d.ts

@@ -48,19 +48,19 @@ export declare class Transport extends EventEmitter {
     updateSettings(settings: ServerSettings): void;
     updateStatisticsInterval(): void;
     allocate(participantId: ParticipantId, isMaster?: boolean): void;
-    open(participantIds: ParticipantId[], peerId?: string | null, observer?: boolean): void;
+    open(participantIds: ParticipantId[], peerId?: string | null, observer?: boolean, force?: boolean): void;
     close(participantId: ParticipantId): void;
     destroy(): void;
     getTopology(): TransportTopology;
     isAllocated(participantId: ParticipantId): boolean;
     allocated(): string[];
     opened(): string[];
+    getState(): TransportState;
     private _setStates;
     private _setState;
     private _setLocalState;
     private _onSignalingNotification;
     private _onTopologyChanged;
-    private _onRecordStarted;
     private _createDirectTransport;
     private _createServerTransport;
     private _releaseDirectTransport;

package/default/Signaling.d.ts

@@ -13,6 +13,7 @@ import MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
 import MuteStates from '../types/MuteStates';
 import { CompositeUserId, ParticipantId } from '../types/Participant';
+import { ParticipantListChunkParameters } from '../types/ParticipantListChunk';
 import SignalingMessage from '../types/SignalingMessage';
 import { WaitingParticipantId } from '../types/WaitingHall';
 export default class Signaling extends BaseSignaling {
@@ -72,7 +73,7 @@ export default class Signaling extends BaseSignaling {
     getNextCommandSequenceNumber(): number;
     hangup(reason: string): Promise<SignalingMessage | void>;
     sendCandidate(participantId: ParticipantId, candidate: RTCIceCandidate): Promise<SignalingMessage>;
-    requestTestMode(command: string): Promise<SignalingMessage>;
+    requestTestMode(consumerCommand: string, producerCommand: string): Promise<SignalingMessage>;
     sendSdp(participantId: ParticipantId, sdp: RTCSessionDescription): Promise<SignalingMessage>;
     acceptCall(mediaSettings: MediaSettings): Promise<SignalingMessage>;
     changeMediaSettings(mediaSettings: MediaSettings): Promise<SignalingMessage>;
@@ -124,6 +125,8 @@ export default class Signaling extends BaseSignaling {
      * что все подписчики готовы принимать сообщения от сигналинга.
      */
     readyToSend(): void;
+    getParticipantListChunk(participantListChunkParameters: ParticipantListChunkParameters): Promise<SignalingMessage>;
+    getParticipants(externalIds: SignalingMessage.ExternalId[]): Promise<SignalingMessage>;
     protected _connect(connectionType: SignalingConnectionType): void;
     protected _disconnect(): void;
     private _onOpen;

package/enums/SignalingCommandType.d.ts

@@ -28,6 +28,8 @@ declare enum SignalingCommandType {
     UPDATE_MEDIA_MODIFIERS = "update-media-modifiers",
     CHANGE_OPTIONS = "change-options",
     GET_WAITING_HALL = "get-waiting-hall",
+    GET_PARTICIPANT_LIST_CHUNK = "get-participant-list-chunk",
+    GET_PARTICIPANTS = "get-participants",
     PROMOTE_PARTICIPANT = "promote-participant",
     REQUEST_TEST_MODE = "request-test-mode",
     ADD_MOVIE = "add-movie",

package/enums/SignalingNotification.d.ts

@@ -35,7 +35,6 @@ declare enum SignalingNotification {
     PROMOTE_PARTICIPANT = "promote-participant",
     CHAT_ROOM_UPDATED = "chat-room-updated",
     PROMOTION_APPROVED = "promotion-approved",
-    JOIN_LINK_CHANGED = "join-link-changed",
-    MOVIE_UPDATE_NOTIFICATION = "movie-update-notification"
+    JOIN_LINK_CHANGED = "join-link-changed"
 }
 export default SignalingNotification;

package/package.json

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

package/static/External.d.ts

@@ -7,10 +7,9 @@ import ConversationOption from '../enums/ConversationOption';
 import FatalError from '../enums/FatalError';
 import MediaOption from '../enums/MediaOption';
 import UserRole from '../enums/UserRole';
-import { ExternalId, ExternalParticipant, ExternalParticipantId } from '../types/ExternalId';
+import { ExternalId, ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk, ExternalParticipantListMarkers } from '../types/ExternalId';
 import MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
-import { ISharedMovieState } from '../types/MovieShare';
 import MuteStates from '../types/MuteStates';
 import { ParticipantStateMapped } from '../types/Participant';
 import { DebugMessageType } from './Debug';
@@ -77,29 +76,6 @@ declare namespace External {
      * @param stream
      */
     function onRemoteLive(userId: ExternalParticipantId, streamName: string, stream: MediaStream | null): void;
-    /**
-     * Получен собственный стрим лайв.
-     * Если сервер закончил стримить собеседника, вместо стрима будет передан null
-     *
-     * @param userId
-     * @param streamName
-     * @param stream
-     */
-    function onLocalLive(userId: ExternalParticipantId, streamName: string, stream: MediaStream | null): void;
-    /**
-     * Получено обновление стрима или лайва от собеседника.
-     *
-     * @param userId
-     * @param data
-     */
-    function onRemoteLiveUpdate(userId: ExternalParticipantId, data: ISharedMovieState): void;
-    /**
-     * Получено обновление собственного стрима или лайва.
-     *
-     * @param userId
-     * @param data
-     */
-    function onLocalLiveUpdate(userId: ExternalParticipantId, data: ISharedMovieState): void;
     /**
      * Получен стрим с экрана собеседника.
      * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
@@ -117,27 +93,41 @@ declare namespace External {
      * @param participants Список участников звонка (при `Params.batchParticipantsOnStart = true`)
      */
     function onConversation(userId: ExternalParticipantId, mediaModifiers: MediaModifiers, muteStates: MuteStates, participants?: ExternalParticipant[]): void;
+    /**
+     * Постраничные данные про участников при начале звонка
+     * @param chunk
+     */
+    function onConversationParticipantListChunk(chunk: ExternalParticipantListChunk): void;
     /**
      * Изменились данные стрима собеседника
      *
      * @param userId
      * @param mediaSettings
+     * @param markers
      */
-    function onRemoteMediaSettings(userId: ExternalParticipantId, mediaSettings: MediaSettings): void;
+    function onRemoteMediaSettings(userId: ExternalParticipantId, mediaSettings: MediaSettings, markers?: ExternalParticipantListMarkers): void;
     /**
-     * Изменились данные собственного стрима
+     * Добавили участника
      *
      * @param userId
-     * @param mediaSettings
+     * @param markers
      */
-    function onLocalMediaSettings(userId: ExternalParticipantId, mediaSettings: MediaSettings): void;
+    function onParticipantAdded(userId: ExternalId, markers?: ExternalParticipantListMarkers): void;
+    /**
+     * Участник подключился
+     *
+     * @param userId
+     * @param markers
+     */
+    function onParticipantJoined(userId: ExternalId, markers?: ExternalParticipantListMarkers): void;
     /**
      * Изменились данные состояний собеседника
      *
      * @param userId
      * @param participantState
+     * @param markers
      */
-    function onRemoteParticipantState(userId: ExternalParticipantId, participantState: ParticipantStateMapped): void;
+    function onRemoteParticipantState(userId: ExternalParticipantId, participantState: ParticipantStateMapped, markers?: ExternalParticipantListMarkers): void;
     /**
      * Изменился статус соединения собеседников
      *
@@ -169,8 +159,9 @@ declare namespace External {
      * Пользователь отключился от звонка
      *
      * @param userId
+     * @param markers
      */
-    function onRemoteRemoved(userId: ExternalParticipantId): void;
+    function onRemoteRemoved(userId: ExternalParticipantId, markers?: ExternalParticipantListMarkers): void;
     /**
      * Изменилось состояние звонка
      *
@@ -216,8 +207,9 @@ declare namespace External {
      *
      * @param userId Внешний ID пользователя
      * @param unpin Открепить или закрепить
+     * @param markers
      */
-    function onPinnedParticipant(userId: ExternalParticipantId, unpin: boolean): void;
+    function onPinnedParticipant(userId: ExternalParticipantId, unpin: boolean, markers?: ExternalParticipantListMarkers): void;
     /**
      * Закрепляет/открепляет текущего пользователя у других собеседников
      *
@@ -356,5 +348,10 @@ declare namespace External {
      * @param stream стрим от WebRTC
      */
     function onRemoteMixedAudioStream(stream: MediaStream): void;
+    /**
+     * Получена новая ссылка на звонок
+     * @param joinLink токен присоединения к звонку
+     */
+    function onJoinLinkChanged(joinLink: string): void;
 }
 export default External;

package/static/Params.d.ts

@@ -7,11 +7,10 @@ import ConversationOption from '../enums/ConversationOption';
 import FatalError from '../enums/FatalError';
 import MediaOption from '../enums/MediaOption';
 import UserRole from '../enums/UserRole';
-import { ExternalId, ExternalParticipant, ExternalParticipantId } from '../types/ExternalId';
+import { ExternalId, ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk, ExternalParticipantListMarkers } from '../types/ExternalId';
 import IceServer from '../types/IceServer';
 import MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
-import { ISharedMovieState } from '../types/MovieShare';
 import MuteStates from '../types/MuteStates';
 import { ParticipantStateMapped } from '../types/Participant';
 import AuthData from './AuthData';
@@ -219,6 +218,19 @@ export declare type ParamsObject = {
     movieShare: boolean;
     filteredMessages: boolean;
     breakVideoPayloadTypes: boolean;
+    /**
+     * Включить постраничный вывод участников. Работает только если включено videoTracksCount (слоты)
+     */
+    useParticipantListChunk: boolean;
+    /**
+     * Индекс участника для первого chunk'а который придет при установки соединения с сервером
+     */
+    participantListChunkInitIndex: number;
+    /**
+     * Количество участников которые придут в первом chunk'е при установки соединения с сервером
+     * если параметр не проставлен то будет использоваться значение по умолчанию установленное на сервере
+     */
+    participantListChunkInitCount: number | null;
     /**
      * Включать RED-extension (redundancy) для групповых звонков
      */
@@ -282,34 +294,29 @@ export declare type ParamsObject = {
      */
     onRemoteLive?: (userId: ExternalParticipantId, streamId: string, stream: MediaStream | null) => void;
     /**
-     * Получен собственный стрим трансляция или мувик.
-     * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
-     */
-    onLocalLive?: (userId: ExternalParticipantId, streamId: string, stream: MediaStream | null) => void;
-    /**
-     * Получено обновление стрима или лайва от собеседника.
+     * Начат звонок
      */
-    onRemoteLiveUpdate?: (userId: ExternalParticipantId, data: ISharedMovieState) => void;
+    onConversation?: (userId: ExternalParticipantId, mediaModifiers: MediaModifiers, muteStates: MuteStates, participants?: ExternalParticipant[]) => void;
     /**
-     * Получено обновление собственного стрима или лайва.
+     * Начальный список участников для постраничного звонка
      */
-    onLocalLiveUpdate?: (userId: ExternalParticipantId, data: ISharedMovieState) => void;
+    onConversationParticipantListChunk?: (chunk: ExternalParticipantListChunk) => void;
     /**
-     * Начат звонок
+     * Изменились данные стрима собеседника
      */
-    onConversation?: (userId: ExternalParticipantId, mediaModifiers: MediaModifiers, muteStates: MuteStates, participants?: ExternalParticipant[]) => void;
+    onRemoteMediaSettings?: (userId: ExternalParticipantId, mediaSettings: MediaSettings, markers?: ExternalParticipantListMarkers) => void;
     /**
-     * Изменились данные стрима собеседника
+     * Добавили участника
      */
-    onRemoteMediaSettings?: (userId: ExternalParticipantId, mediaSettings: MediaSettings) => void;
+    onParticipantAdded?: (userId: ExternalParticipantId, markers?: ExternalParticipantListMarkers) => void;
     /**
-     * Изменились данные стрима собеседника
+     * Участник присоединился к звонку
      */
-    onLocalMediaSettings?: (userId: ExternalParticipantId, mediaSettings: MediaSettings) => void;
+    onParticipantJoined?: (userId: ExternalParticipantId, markers?: ExternalParticipantListMarkers) => void;
     /**
      * Изменились данные состояний собеседника
      */
-    onRemoteParticipantState?: (userId: ExternalParticipantId, participantState: ParticipantStateMapped) => void;
+    onRemoteParticipantState?: (userId: ExternalParticipantId, participantState: ParticipantStateMapped, markers?: ExternalParticipantListMarkers) => void;
     /**
      * Изменился статус соединения собеседников
      */
@@ -330,7 +337,7 @@ export declare type ParamsObject = {
     /**
      * Пользователь отключился от звонка
      */
-    onRemoteRemoved?: (userId: ExternalParticipantId) => void;
+    onRemoteRemoved?: (userId: ExternalParticipantId, markers?: ExternalParticipantListMarkers) => void;
     /**
      * Изменилось состояние звонка
      */
@@ -354,7 +361,7 @@ export declare type ParamsObject = {
     /**
      * Закрепляет/открепляет собеседника для всех
      */
-    onPinnedParticipant?: (userId: ExternalParticipantId, unpin: boolean) => void;
+    onPinnedParticipant?: (userId: ExternalParticipantId, unpin: boolean, markers?: ExternalParticipantListMarkers) => void;
     /**
      * Закрепляет/открепляет текущего пользователя у других собеседников
      */
@@ -458,6 +465,11 @@ export declare type ParamsObject = {
      * @param stream стрим от WebRTC
      */
     onRemoteMixedAudioStream?: (stream: MediaStream) => void;
+    /**
+     * Получена новая ссылка на звонок
+     * @param joinLink токен присоединения к звонку
+     */
+    onJoinLinkChanged?: (joinLink: string) => void;
 };
 export default abstract class Params {
     private static _params;
@@ -467,7 +479,7 @@ export default abstract class Params {
     static get(name: string): any;
     static get appName(): string;
     static get appVersion(): number;
-    static get sdkVersion(): string | number | boolean;
+    static get sdkVersion(): string;
     static get debug(): string | number | boolean;
     static get protocolVersion(): 5 | 6;
     static get platform(): string;
@@ -545,6 +557,9 @@ export default abstract class Params {
     static get videoTracksCount(): number;
     static get breakVideoPayloadTypes(): boolean;
     static get filteredMessages(): boolean;
+    static get useParticipantListChunk(): boolean;
+    static get participantListChunkInitIndex(): number;
+    static get participantListChunkInitCount(): number;
     static get serverAudioRed(): boolean;
     static get p2pAudioRed(): boolean;
     static get batchParticipantsOnStart(): boolean;

package/static/Utils.d.ts

@@ -1,5 +1,5 @@
 import UserType from '../enums/UserType';
-import { ExternalParticipant } from '../types/ExternalId';
+import { ExternalParticipant, ExternalParticipantListMarker } from '../types/ExternalId';
 import { CompositeUserId, OkUserId, Participant, ParticipantId, ParticipantStateMapped } from '../types/Participant';
 import SignalingMessage from '../types/SignalingMessage';
 import VideoSettings from '../types/VideoSettings';
@@ -55,5 +55,10 @@ declare namespace Utils {
     }): boolean;
     function isArraysEquals<T>(arr1: T[], arr2: T[]): boolean;
     function isEmptyObject(obj: object): boolean;
+    /**
+     * @see https://wiki.odkl.ru/pages/viewpage.action?spaceKey=VIDEO&title=Signaling+API#SignalingAPI-Постраничныйвыводпартисипантов
+     * https://stash.odkl.ru/projects/ODKL/repos/odnoklassniki-webrtc/browse/src/main/java/one/webrtc/domain/conversation/ParticipantIndex.java#67-78
+     */
+    function participantMarkerCompare(marker1: ExternalParticipantListMarker | undefined, marker2: ExternalParticipantListMarker | undefined): number;
 }
 export default Utils;

package/static/Utils.test.d.ts

@@ -0,0 +1 @@
+export {};

package/types/ExternalId.d.ts

@@ -2,7 +2,7 @@ import MediaOption from '../enums/MediaOption';
 import { ParticipantStatus } from '../static/External';
 import MediaSettings from './MediaSettings';
 import MuteStates from './MuteStates';
-import { ParticipantStateMapped } from './Participant';
+import { ParticipantListMarker, ParticipantListType, ParticipantStateMapped } from './Participant';
 import SignalingMessage from './SignalingMessage';
 /**
  * Тип внешнего пользователя
@@ -57,6 +57,14 @@ export interface ExternalParticipantId extends ExternalId {
      */
     deviceIdx: number;
 }
+/**
+ * Маркер определяющий положение участника в списке
+ */
+export declare type ExternalParticipantListMarker = Required<ParticipantListMarker>;
+/**
+ * Словарь сопоставляющий тип списка участников с маркером (положением участника в списке)
+ */
+export declare type ExternalParticipantListMarkers = Record<ParticipantListType, ExternalParticipantListMarker>;
 /**
  * Участник звонка
  */
@@ -85,4 +93,11 @@ export interface ExternalParticipant {
      * Разрешения на включение устройств
      */
     unmuteOptions: MediaOption[];
+    markers?: ExternalParticipantListMarkers;
+}
+export interface ExternalParticipantListChunk {
+    participants: ExternalParticipant[];
+    countBefore: number;
+    countAfter: number;
+    markerFound: boolean;
 }

package/types/MediaSettings.d.ts

@@ -19,7 +19,7 @@ export declare type MediaSettings = {
 export declare type VideoStreamInfo = {
     id: string;
     source: string;
-    externalMovieId?: string;
+    vkMovieId?: string;
 };
 export default MediaSettings;
 export declare function compareMediaSettings(ms1: MediaSettings, ms2: MediaSettings): boolean;

package/types/Participant.d.ts

@@ -3,7 +3,7 @@ import ParticipantState from '../enums/ParticipantState';
 import UserRole from '../enums/UserRole';
 import { ParticipantStatus } from '../static/External';
 import MediaSettings from '../types/MediaSettings';
-import { ExternalParticipantId } from './ExternalId';
+import { ExternalId, ExternalParticipantId, ExternalParticipantListMarkers } from './ExternalId';
 import MuteStates from './MuteStates';
 import ParticipantLayout from './ParticipantLayout';
 /**
@@ -16,6 +16,13 @@ export declare type CompositeUserId = string;
  */
 export declare type ParticipantId = string;
 export declare type OkUserId = number;
+export declare type ParticipantListType = 'GRID' | 'SIDE' | 'ADMIN';
+export interface ParticipantListMarker {
+    rank?: number;
+    ts?: number;
+    id?: CompositeUserId;
+}
+export declare type ParticipantListMarkers = Record<ParticipantListType, ParticipantListMarker>;
 /**
  * Стейт участника звонка
  */
@@ -47,4 +54,8 @@ export interface Participant {
     muteStates: MuteStates;
     unmuteOptions: MediaOption[];
     observedIds: CompositeUserId[];
+    markers?: ExternalParticipantListMarkers;
+}
+export interface IGetParticipantsParameters {
+    externalIds: ExternalId[];
 }

package/types/ParticipantListChunk.d.ts

@@ -0,0 +1,13 @@
+import { ParticipantListMarker, ParticipantListType } from './Participant';
+export interface ParticipantListChunkParameters {
+    listType: ParticipantListType;
+    count: number;
+    /** Anchor in sorted list to start from. Mutually exclusive with "fromIdx" */
+    fromMarker?: ParticipantListMarker;
+    /** Position in sorted list to start from (0-based). Mutually exclusive with "fromMarker" */
+    fromIdx?: number;
+    /** If true then list is to be iterated in reverse order */
+    backward?: boolean;
+    /** If true then resulting chunk will start from Participant with specified marker, if such Participant (still) exists */
+    includeMarker?: boolean;
+}

package/types/SignalingMessage.d.ts

@@ -9,11 +9,10 @@ import UserRole from '../enums/UserRole';
 import UserType from '../enums/UserType';
 import MediaModifiers from './MediaModifiers';
 import MediaSettings from './MediaSettings';
-import { ISharedMovieState } from './MovieShare';
 import MuteStates from './MuteStates';
-import { CompositeUserId, OkUserId, ParticipantId } from './Participant';
+import { CompositeUserId, OkUserId, ParticipantId, ParticipantListMarker as ParticipantParticipantListMarker, ParticipantListMarkers, ParticipantListType as ParticipantParticipantListType } from './Participant';
 import VideoSettings from './VideoSettings';
-import { WaitingParticipant } from './WaitingHall';
+import { ChatRoom } from './WaitingHall';
 declare type SignalingMessage = Record<string, any>;
 export declare type RecordInfo = {
     initiator: ParticipantId;
@@ -32,12 +31,8 @@ declare namespace SignalingMessage {
         id: number;
         type?: string;
     }
-    export type ParticipantListType = 'GRID' | 'SIDE' | 'ADMIN';
-    export interface ParticipantListMarker {
-        rank: number;
-        ts: number;
-        id?: CompositeUserId;
-    }
+    export type ParticipantListType = ParticipantParticipantListType;
+    export type ParticipantListMarker = ParticipantParticipantListMarker;
     export interface Participant {
         id: OkUserId;
         idType?: UserType;
@@ -57,9 +52,15 @@ declare namespace SignalingMessage {
         restricted?: boolean;
         muteStates?: MuteStates;
         unmuteOptions?: MediaOption[];
-        markers?: Record<ParticipantListType, ParticipantListMarker>;
+        markers?: ParticipantListMarkers;
         observedIds?: CompositeUserId[];
     }
+    export interface ParticipantListChunk extends Notification {
+        participants: (Participant & Required<Pick<Participant, 'markers'>>)[];
+        countBefore: number;
+        countAfter: number;
+        markerFound: boolean;
+    }
     interface Conversation {
         id: string;
         state: string;
@@ -85,7 +86,10 @@ declare namespace SignalingMessage {
         participantType: UserType;
         deviceIdx?: number;
         peerId: PeerId;
-        data: any;
+        data: {
+            candidate?: RTCIceCandidateInit;
+            sdp?: RTCSessionDescriptionInit;
+        };
     }
     export interface RegisteredPeer extends Notification {
         participantId: OkUserId;
@@ -108,6 +112,7 @@ declare namespace SignalingMessage {
         deviceIdx?: number;
         peerId: PeerId;
         reason: HangupType;
+        markers?: ParticipantListMarkers;
     }
     export interface ClosedConversation extends Notification {
         reason: HangupType;
@@ -118,6 +123,7 @@ declare namespace SignalingMessage {
         deviceIdx?: number;
         peerId: PeerId;
         mediaSettings: Partial<MediaSettings>;
+        markers?: ParticipantListMarkers;
     }
     export interface ParticipantStateChanged extends Notification {
         participantId: OkUserId;
@@ -129,6 +135,7 @@ declare namespace SignalingMessage {
             state: Record<string, string>;
             stateUpdateTs: Record<string, number>;
         };
+        markers?: ParticipantListMarkers;
     }
     export interface RolesChanged extends Notification {
         adminId: ParticipantId;
@@ -236,11 +243,11 @@ declare namespace SignalingMessage {
     }
     export interface ChatRoomUpdated extends Notification {
         eventType: ChatRoomEventType;
-        totalCount: number;
-        firstParticipants: WaitingParticipant[];
-        addedParticipantIds: ParticipantId[];
-        removedParticipantIds: ParticipantId[];
-        feedback: Record<string, any>[];
+        totalCount: ChatRoom['totalCount'];
+        firstParticipants?: ChatRoom['firstParticipants'];
+        addedParticipantIds?: ParticipantId[];
+        removedParticipantIds?: ParticipantId[];
+        feedback?: ChatRoom['feedback'];
     }
     export interface VideoQualityUpdate extends Notification {
         quality: {
@@ -263,9 +270,11 @@ declare namespace SignalingMessage {
         isConcurrent: boolean;
         peerId: PeerId;
         mediaModifiers: MediaModifiers;
+        participants?: ParticipantListChunk;
+        chatRoom?: ChatRoom;
     }
-    export interface SharedMovieState extends Notification {
-        data: ISharedMovieState[];
+    export interface JoinLinkChanged extends Notification {
+        joinLink: string;
     }
     export {};
 }