@vkontakte/calls-sdk 2.5.3-dev.6fa8b9b.0 → 2.5.3-dev.80ed530.0

package/classes/Conversation.d.ts

@@ -12,12 +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 { ExternalParticipantId, ExternalParticipantListChunk, ExternalUserId } from '../types/ExternalId';
 import MediaModifiers from '../types/MediaModifiers';
 import { IVideoDimentions } from '../types/MediaSettings';
 import MuteStates from '../types/MuteStates';
 import { CompositeUserId, 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';
@@ -128,6 +129,7 @@ export default class Conversation extends EventEmitter {
     private _close;
     destroy(): void;
     private _getConversationParams;
+    private _addGeoParamsToEndpoint;
     /**
      * @throws ErrorEvent
      */
@@ -146,7 +148,19 @@ 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 _registerParticipantInCache;
+    private _getExistedParticipantByIdOrCreate;
+    private _getExternalIdByParticipantId;
+    private _registerParticipantAndSetMarkersIfChunkEnabled;
+    private _warnParticipantNotInConversation;
+    private _setParticipantMarkers;
+    private _denormalizeMarkers;
     /**
      * Обрабатывает данные connection из сигналинга. Должен вызываться после `_registerParticipants`
      *
@@ -231,6 +245,7 @@ export default class Conversation extends EventEmitter {
         effect: IVideoDimentions;
     }): Promise<void>;
     videoEffect(effect: IEffect | null): Promise<void>;
+    getParticipantListChunk(participantListChunkParameters: ParticipantListChunkParameters): Promise<ExternalParticipantListChunk>;
     private _onLocalMediaStreamChanged;
     private _onScreenSharingStatus;
     private _changeRemoteMediaSettings;
@@ -278,7 +293,6 @@ export default class Conversation extends EventEmitter {
     private _onRemoteTrackRemoved;
     private _removeAudioTrack;
     private _removeVideoTrack;
-    private _onRemoteActivityNoSignal;
     private _onTopologyChanged;
     private _onRemoteAllStall;
     private _onRemoteSignalledStall;

package/classes/Conversation.test.d.ts

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

package/classes/SpeakerDetector.d.ts

@@ -1,6 +1,6 @@
 import { ParticipantId } from '../types/Participant';
 import EventEmitter from './EventEmitter';
-import { Transport } from './transport/Transport';
+import { Transport, TransportTopology } from './transport/Transport';
 import { VolumeLevel } from './VolumeDetector';
 import { VolumesDetector } from './VolumesDetector';
 export declare const enum SpeakerDetectorEvent {
@@ -8,13 +8,12 @@ export declare const enum SpeakerDetectorEvent {
 }
 export declare class SpeakerDetector extends EventEmitter {
     private _speakerId;
-    private _serverAudioActivityAvailable;
-    constructor(volumesDetector: VolumesDetector, transport: Transport);
+    private _serverSideSpeakerDetection;
+    constructor(volumesDetector: VolumesDetector, transport: Transport, topology: TransportTopology);
     destroy(): void;
     _onVolumesDetected(volumes: {
         [key: string]: VolumeLevel;
     }): void;
     _onServerSpeakerChanged(speakerId: ParticipantId): void;
-    _onReceivedServerAudioActivity(): void;
-    _onStoppedReceivingServerAudioActivity(): void;
+    private _onTopologyChanged;
 }

package/classes/VolumesDetector.d.ts

@@ -13,5 +13,5 @@ export declare class VolumesDetector extends EventEmitter {
     private _onRemoteTrackRemoved;
     private _collectVolumes;
     private _onSignalledActiveParticipants;
-    private _onActiveParticipantsNoSignal;
+    private _onTopologyChanged;
 }

package/classes/codec/IDecoder.d.ts

@@ -1,5 +1,5 @@
 export default interface IDecoder {
-    init(onFrameImage: (image: ImageBitmap | ImageData) => void): Promise<void>;
+    init(onFrameImage: (image: VideoFrame | ImageBitmap | ImageData) => void): Promise<void>;
     decodeFrame(timestamp: number, data: Uint8Array, isVP9: boolean, keyFrame?: boolean): void;
     destroy(): void;
 }

package/classes/codec/WebCodecsDecoder.d.ts

@@ -1,7 +1,7 @@
 import IDecoder from './IDecoder';
 import WorkerBase from './WorkerBase';
 export default class WebCodecsDecoder extends WorkerBase implements IDecoder {
-    init(onFrameImage: (image: ImageBitmap) => void): Promise<void>;
+    init(onFrameImage: (frame: VideoFrame) => void): Promise<void>;
     decodeFrame(timestamp: number, data: Uint8Array, isVP9: boolean, keyFrame?: boolean): void;
     destroy(): void;
     static isBrowserSupported(): boolean;

package/classes/screenshare/BaseRenderer.d.ts

@@ -0,0 +1,8 @@
+export default abstract class BaseRenderer {
+    protected readonly _onStream: (stream: MediaStream) => void;
+    protected constructor(onStream: (stream: MediaStream) => void);
+    drawFrame(frame: VideoFrame): Promise<void>;
+    drawImage(image: ImageBitmap | ImageData): void;
+    abstract destroy(): void;
+    static isBrowserSupported(): boolean;
+}

package/classes/screenshare/CanvasRenderer.d.ts

@@ -0,0 +1,16 @@
+import BaseRenderer from './BaseRenderer';
+export default class CanvasRenderer extends BaseRenderer {
+    private readonly _useImageBitmap;
+    private _canvas;
+    private _canvasContext;
+    private _stream;
+    private _track;
+    constructor(onStream: (stream: MediaStream) => void);
+    private _createStream;
+    private _removeStream;
+    private _requestCanvasFrame;
+    drawFrame(frame: VideoFrame): Promise<void>;
+    drawImage(image: ImageBitmap | ImageData): void;
+    destroy(): void;
+    static isBrowserSupported(): boolean;
+}

package/classes/screenshare/StreamBuilder.d.ts

@@ -1,19 +1,11 @@
 import { ParticipantId } from '../../types/Participant';
 import { BaseStreamBuilder, FrameData } from './BaseStreamBuilder';
 export default class StreamBuilder extends BaseStreamBuilder {
+    private readonly _renderer;
     private readonly _decoder;
     private _decoderReady;
     private _decoderQueue;
-    private readonly _useImageBitmap;
-    private _canvas;
-    private _canvasContext;
-    private _stream;
-    private _track;
     constructor(participantId: ParticipantId, onStream: (stream: MediaStream) => void);
-    private _createStream;
-    private _removeStream;
-    private _requestCanvasFrame;
-    private _drawImage;
     protected _processFrame(frame: FrameData): void;
     private _decodeQueue;
     destroy(): void;

package/classes/screenshare/TrackGeneratorRenderer.d.ts

@@ -0,0 +1,10 @@
+import BaseRenderer from './BaseRenderer';
+export default class TrackGeneratorRenderer extends BaseRenderer {
+    private readonly _generator;
+    private readonly _writer;
+    private readonly _stream;
+    constructor(onStream: (stream: MediaStream) => void);
+    drawFrame(frame: VideoFrame): Promise<void>;
+    destroy(): void;
+    static isBrowserSupported(): boolean;
+}

package/classes/transport/Transport.d.ts

@@ -12,7 +12,6 @@ export declare const enum TransportEvent {
     STATE_CHANGED = "STATE_CHANGED",
     LOCAL_STATE_CHANGED = "LOCAL_STATE_CHANGED",
     SIGNALLED_ACTIVE_PARTICIPANTS = "SIGNALLED_ACTIVE_PARTICIPANTS",
-    ACTIVE_PARTICIPANTS_NO_SIGNAL = "ACTIVE_PARTICIPANTS_NO_SIGNAL",
     SIGNALLED_SPEAKER_CHANGED = "SIGNALLED_SPEAKER_CHANGED",
     SIGNALLED_STALLED_PARTICIPANTS = "SIGNALLED_STALLED_PARTICIPANTS",
     TOPOLOGY_CHANGED = "TOPOLOGY_CHANGED",
@@ -69,7 +68,6 @@ export declare class Transport extends EventEmitter {
     private _setLocalNoiseSuppression;
     private _onDirectTransportChanged;
     private _onServerTransportChanged;
-    private _onTransportActiveParticipantsNoSignal;
     private _onTransportActiveParticipants;
     private _onTransportStalledParticipants;
     private _onTransportSpeakerChanged;

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 {
@@ -124,6 +125,7 @@ export default class Signaling extends BaseSignaling {
      * что все подписчики готовы принимать сообщения от сигналинга.
      */
     readyToSend(): void;
+    getParticipantListChunk(participantListChunkParameters: ParticipantListChunkParameters): Promise<SignalingMessage>;
     protected _connect(connectionType: SignalingConnectionType): void;
     protected _disconnect(): void;
     private _onOpen;

package/enums/HangupType.d.ts

@@ -22,6 +22,7 @@ declare enum HangupType {
     SERVICE_DISABLED = "SERVICE_DISABLED",
     EXTERNAL_API_ERROR = "EXTERNAL_API_ERROR",
     SOCKET_CLOSED = "SOCKET_CLOSED",
-    ENDED = "ENDED"
+    ENDED = "ENDED",
+    KILLED_WITHOUT_DELETE = "KILLED_WITHOUT_DELETE"
 }
 export default HangupType;

package/enums/SignalingCommandType.d.ts

@@ -28,6 +28,7 @@ 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",
     PROMOTE_PARTICIPANT = "promote-participant",
     REQUEST_TEST_MODE = "request-test-mode",
     ADD_MOVIE = "add-movie",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/calls-sdk",
-  "version": "2.5.3-dev.6fa8b9b.0",
+  "version": "2.5.3-dev.80ed530.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,7 +7,7 @@ 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 MuteStates from '../types/MuteStates';
@@ -93,20 +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 markers
+     */
+    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;
     /**
      * Изменился статус соединения собеседников
      *
@@ -138,8 +159,9 @@ declare namespace External {
      * Пользователь отключился от звонка
      *
      * @param userId
+     * @param markers
      */
-    function onRemoteRemoved(userId: ExternalParticipantId): void;
+    function onRemoteRemoved(userId: ExternalParticipantId, markers?: ExternalParticipantListMarkers): void;
     /**
      * Изменилось состояние звонка
      *
@@ -185,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;
     /**
      * Закрепляет/открепляет текущего пользователя у других собеседников
      *
@@ -319,5 +342,11 @@ declare namespace External {
      * @param firstParticipants Первые несколько ожидающих в зале
      */
     function onChatRoomUpdated(eventType: ChatRoomEventType, totalCount: number, firstParticipants: ExternalId[]): void;
+    /**
+     * Получен микшированный аудио стрим.
+     *
+     * @param stream стрим от WebRTC
+     */
+    function onRemoteMixedAudioStream(stream: MediaStream): void;
 }
 export default External;

package/static/Params.d.ts

@@ -7,7 +7,7 @@ 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';
@@ -218,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) для групповых звонков
      */
@@ -242,6 +255,13 @@ export declare type ParamsObject = {
      * @hidden
      */
     muteMode: boolean;
+    /**
+     * Сохранять (не удалять) аудио дорожки в стримах, поступающих клиенту
+     * Позволяет клиенту получать и сохранять аудио данные
+     * Внимание: может привести к "двойному" звуку при проигрывании
+     * @hidden
+     */
+    preserveAudioTracks: boolean;
     /**
      * Получен локальный стрим с камеры/микрофона
      */
@@ -277,14 +297,26 @@ export declare type ParamsObject = {
      * Начат звонок
      */
     onConversation?: (userId: ExternalParticipantId, mediaModifiers: MediaModifiers, muteStates: MuteStates, participants?: ExternalParticipant[]) => void;
+    /**
+     * Начальный список участников для постраничного звонка
+     */
+    onConversationParticipantListChunk?: (chunk: ExternalParticipantListChunk) => void;
     /**
      * Изменились данные стрима собеседника
      */
-    onRemoteMediaSettings?: (userId: ExternalParticipantId, mediaSettings: MediaSettings) => void;
+    onRemoteMediaSettings?: (userId: ExternalParticipantId, mediaSettings: MediaSettings, markers?: ExternalParticipantListMarkers) => void;
+    /**
+     * Добавили участника
+     */
+    onParticipantAdded?: (userId: ExternalParticipantId, markers?: ExternalParticipantListMarkers) => void;
+    /**
+     * Участник присоединился к звонку
+     */
+    onParticipantJoined?: (userId: ExternalParticipantId, markers?: ExternalParticipantListMarkers) => void;
     /**
      * Изменились данные состояний собеседника
      */
-    onRemoteParticipantState?: (userId: ExternalParticipantId, participantState: ParticipantStateMapped) => void;
+    onRemoteParticipantState?: (userId: ExternalParticipantId, participantState: ParticipantStateMapped, markers?: ExternalParticipantListMarkers) => void;
     /**
      * Изменился статус соединения собеседников
      */
@@ -305,7 +337,7 @@ export declare type ParamsObject = {
     /**
      * Пользователь отключился от звонка
      */
-    onRemoteRemoved?: (userId: ExternalParticipantId) => void;
+    onRemoteRemoved?: (userId: ExternalParticipantId, markers?: ExternalParticipantListMarkers) => void;
     /**
      * Изменилось состояние звонка
      */
@@ -329,7 +361,7 @@ export declare type ParamsObject = {
     /**
      * Закрепляет/открепляет собеседника для всех
      */
-    onPinnedParticipant?: (userId: ExternalParticipantId, unpin: boolean) => void;
+    onPinnedParticipant?: (userId: ExternalParticipantId, unpin: boolean, markers?: ExternalParticipantListMarkers) => void;
     /**
      * Закрепляет/открепляет текущего пользователя у других собеседников
      */
@@ -427,6 +459,12 @@ export declare type ParamsObject = {
      * @param firstParticipants Первые несколько ожидающих в зале
      */
     onChatRoomUpdated?: (eventType: ChatRoomEventType, totalCount: number, firstParticipants: ExternalId[]) => void;
+    /**
+     * Получен микшированный аудио стрим.
+     * @hidden
+     * @param stream стрим от WebRTC
+     */
+    onRemoteMixedAudioStream?: (stream: MediaStream) => void;
 };
 export default abstract class Params {
     private static _params;
@@ -514,9 +552,13 @@ 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;
     static get filterObservers(): boolean;
     static get muteMode(): boolean;
+    static get preserveAudioTracks(): boolean;
 }

package/types/ConversationParams.d.ts

@@ -6,5 +6,9 @@ declare type ConversationParams = {
     stun_server?: IceServer;
     client_type?: string;
     device_idx?: number;
+    isp_as_no?: number;
+    isp_as_org?: string;
+    loc_cc?: string;
+    loc_reg?: string;
 };
 export default ConversationParams;

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/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 { 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,5 @@ export interface Participant {
     muteStates: MuteStates;
     unmuteOptions: MediaOption[];
     observedIds: CompositeUserId[];
+    markers?: ExternalParticipantListMarkers;
 }

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

@@ -10,7 +10,7 @@ import UserType from '../enums/UserType';
 import MediaModifiers from './MediaModifiers';
 import MediaSettings from './MediaSettings';
 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';
 declare type SignalingMessage = Record<string, any>;
@@ -31,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;
@@ -56,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;
@@ -107,6 +109,7 @@ declare namespace SignalingMessage {
         deviceIdx?: number;
         peerId: PeerId;
         reason: HangupType;
+        markers?: ParticipantListMarkers;
     }
     export interface ClosedConversation extends Notification {
         reason: HangupType;
@@ -117,6 +120,7 @@ declare namespace SignalingMessage {
         deviceIdx?: number;
         peerId: PeerId;
         mediaSettings: Partial<MediaSettings>;
+        markers?: ParticipantListMarkers;
     }
     export interface ParticipantStateChanged extends Notification {
         participantId: OkUserId;
@@ -128,6 +132,7 @@ declare namespace SignalingMessage {
             state: Record<string, string>;
             stateUpdateTs: Record<string, number>;
         };
+        markers?: ParticipantListMarkers;
     }
     export interface RolesChanged extends Notification {
         adminId: ParticipantId;
@@ -262,6 +267,7 @@ declare namespace SignalingMessage {
         isConcurrent: boolean;
         peerId: PeerId;
         mediaModifiers: MediaModifiers;
+        participants?: ParticipantListChunk;
     }
     export {};
 }