@vkontakte/calls-sdk 2.5.3-dev.fe8ad1c.0 → 2.6.2-dev.14b086c.0

package/classes/Conversation.d.ts

@@ -12,13 +12,14 @@ 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';
@@ -129,6 +130,7 @@ export default class Conversation extends EventEmitter {
     private _close;
     destroy(): void;
     private _getConversationParams;
+    private _addGeoParamsToEndpoint;
     /**
      * @throws ErrorEvent
      */
@@ -147,7 +149,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`
      *
@@ -183,6 +199,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,6 +210,8 @@ export default class Conversation extends EventEmitter {
     private _onParticipantPromoted;
     private _onChatRoomUpdated;
     private _onSharedMovieUpdate;
+    private _onSharedMovieInfoStarted;
+    private _onSharedMovieInfoStopped;
     private _waitForStreamIfNeeded;
     private _matchStreamDescription;
     private _getWaitingTime;
@@ -220,7 +239,7 @@ export default class Conversation extends EventEmitter {
         movieId: string;
         streamType: string;
     }>;
-    updateMovie(movieId: string, gain?: number, offset?: string, pause?: boolean): Promise<void>;
+    updateMovie(movieId: string, gain?: number, offset?: number, 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>;
@@ -233,6 +252,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;
@@ -288,6 +309,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

@@ -11,8 +11,10 @@ import UserRole from '../enums/UserRole';
 import { JSONObject } from '../static/Json';
 import MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
+import { IAddMovieParams, ISharedMovieState } from '../types/MovieShare';
 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 +74,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>;
@@ -91,8 +93,8 @@ export default class Signaling extends BaseSignaling {
     updateDisplayLayout(layout: {
         [key: string]: string;
     }): Promise<SignalingMessage>;
-    addMovie(data: any): Promise<SignalingMessage>;
-    updateMovie(data: any): Promise<SignalingMessage>;
+    addMovie(data: IAddMovieParams): Promise<SignalingMessage>;
+    updateMovie(data: ISharedMovieState): Promise<SignalingMessage>;
     removeMovie(data: any): Promise<SignalingMessage>;
     startStream(data: any): Promise<SignalingMessage>;
     stopStream(): Promise<SignalingMessage>;
@@ -124,6 +126,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/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,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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/calls-sdk",
-  "version": "2.5.3-dev.fe8ad1c.0",
+  "version": "2.6.2-dev.14b086c.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,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 MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
-import { ISharedMovieState } from '../types/MovieShare';
+import { ISharedMovieInfo, ISharedMovieState, ISharedMovieStoppedInfo } from '../types/MovieShare';
 import MuteStates from '../types/MuteStates';
 import { ParticipantStateMapped } from '../types/Participant';
 import { DebugMessageType } from './Debug';
@@ -117,20 +117,76 @@ 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
+     */
+    function onLocalMediaSettings(userId: ExternalParticipantId, mediaSettings: MediaSettings): void;
+    /**
+     * Полученны данные по стримам (лайв/мувик) от собеседника
+     *
+     * @param userId
+     * @param sharedMovieInfo
+     */
+    function onRemoteSharedMovieInfo(userId: ExternalParticipantId, sharedMovieInfo: ISharedMovieInfo): void;
+    /**
+     * Полученны данные по остановленным стримам (лайв/мувик) от собеседника
+     *
+     * @param userId
+     * @param sharedMovieStoppedInfo
+     */
+    function onRemoteSharedMovieStoppedInfo(userId: ExternalParticipantId, sharedMovieStoppedInfo: ISharedMovieStoppedInfo): void;
+    /**
+     * Полученны данные по собственным стримам (лайв/мувик)
+     *
+     * @param userId
+     * @param sharedMovieInfo
+     */
+    function onLocalSharedMovieInfo(userId: ExternalParticipantId, sharedMovieInfo: ISharedMovieInfo): void;
+    /**
+     * Полученны данные по собственным остановленным стримам (лайв/мувик)
+     *
+     * @param userId
+     * @param sharedMovieStoppedInfo
+     */
+    function onLocalSharedMovieStoppedInfo(userId: ExternalParticipantId, sharedMovieStoppedInfo: ISharedMovieStoppedInfo): 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;
     /**
      * Изменился статус соединения собеседников
      *
@@ -162,8 +218,9 @@ declare namespace External {
      * Пользователь отключился от звонка
      *
      * @param userId
+     * @param markers
      */
-    function onRemoteRemoved(userId: ExternalParticipantId): void;
+    function onRemoteRemoved(userId: ExternalParticipantId, markers?: ExternalParticipantListMarkers): void;
     /**
      * Изменилось состояние звонка
      *
@@ -209,8 +266,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;
     /**
      * Закрепляет/открепляет текущего пользователя у других собеседников
      *
@@ -349,5 +407,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,10 +7,11 @@ 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 { ISharedMovieInfo, ISharedMovieState, ISharedMovieStoppedInfo } from '../types/MovieShare';
 import MuteStates from '../types/MuteStates';
 import { ParticipantStateMapped } from '../types/Participant';
 import AuthData from './AuthData';
@@ -218,6 +219,19 @@ export declare type ParamsObject = {
     movieShare: boolean;
     filteredMessages: boolean;
     breakVideoPayloadTypes: boolean;
+    /**
+     * Включить постраничный вывод участников. Работает только если включено videoTracksCount (слоты)
+     */
+    useParticipantListChunk: boolean;
+    /**
+     * Индекс участника для первого chunk'а который придет при установки соединения с сервером
+     */
+    participantListChunkInitIndex: number;
+    /**
+     * Количество участников которые придут в первом chunk'е при установки соединения с сервером
+     * если параметр не проставлен то будет использоваться значение по умолчанию установленное на сервере
+     */
+    participantListChunkInitCount: number | null;
     /**
      * Включать RED-extension (redundancy) для групповых звонков
      */
@@ -285,18 +299,58 @@ export declare type ParamsObject = {
      * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
      */
     onLocalLive?: (userId: ExternalParticipantId, streamId: string, stream: MediaStream | null) => void;
+    /**
+     * Получено обновление стрима или лайва от собеседника.
+     */
+    onRemoteLiveUpdate?: (userId: ExternalParticipantId, data: ISharedMovieState) => void;
+    /**
+     * Получено обновление собственного стрима или лайва.
+     */
+    onLocalLiveUpdate?: (userId: ExternalParticipantId, data: ISharedMovieState) => void;
     /**
      * Начат звонок
      */
     onConversation?: (userId: ExternalParticipantId, mediaModifiers: MediaModifiers, muteStates: MuteStates, participants?: ExternalParticipant[]) => void;
+    /**
+     * Начальный список участников для постраничного звонка
+     */
+    onConversationParticipantListChunk?: (chunk: ExternalParticipantListChunk) => void;
+    /**
+     * Изменились данные стрима собеседника
+     */
+    onRemoteMediaSettings?: (userId: ExternalParticipantId, mediaSettings: MediaSettings, markers?: ExternalParticipantListMarkers) => void;
     /**
      * Изменились данные стрима собеседника
      */
-    onRemoteMediaSettings?: (userId: ExternalParticipantId, mediaSettings: MediaSettings) => void;
+    onLocalMediaSettings?: (userId: ExternalParticipantId, mediaSettings: MediaSettings) => void;
+    /**
+     * Полученны данные по стримам (лайв/мувик) от собеседника
+     */
+    onRemoteSharedMovieInfo?: (userId: ExternalParticipantId, sharedMovieInfo: ISharedMovieInfo) => void;
+    /**
+     * Полученны данные по остановленным стримам (лайв/мувик) от собеседника
+     */
+    onRemoteSharedMovieStoppedInfo?: (userId: ExternalParticipantId, sharedMovieStoppedInfo: ISharedMovieStoppedInfo) => void;
+    /**
+     * Полученны данные по собственным стримам (лайв/мувик)
+     */
+    onLocalSharedMovieInfo?: (userId: ExternalParticipantId, sharedMovieInfo: ISharedMovieInfo) => void;
+    /**
+     * Полученны данные по собственным остановленным стримам (лайв/мувик)
+     */
+    onLocalSharedMovieStoppedInfo?: (userId: ExternalParticipantId, sharedMovieStoppedInfo: ISharedMovieStoppedInfo) => 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;
     /**
      * Изменился статус соединения собеседников
      */
@@ -317,7 +371,7 @@ export declare type ParamsObject = {
     /**
      * Пользователь отключился от звонка
      */
-    onRemoteRemoved?: (userId: ExternalParticipantId) => void;
+    onRemoteRemoved?: (userId: ExternalParticipantId, markers?: ExternalParticipantListMarkers) => void;
     /**
      * Изменилось состояние звонка
      */
@@ -341,7 +395,7 @@ export declare type ParamsObject = {
     /**
      * Закрепляет/открепляет собеседника для всех
      */
-    onPinnedParticipant?: (userId: ExternalParticipantId, unpin: boolean) => void;
+    onPinnedParticipant?: (userId: ExternalParticipantId, unpin: boolean, markers?: ExternalParticipantListMarkers) => void;
     /**
      * Закрепляет/открепляет текущего пользователя у других собеседников
      */
@@ -445,6 +499,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;
@@ -454,7 +513,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;
@@ -532,6 +591,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

@@ -1,8 +1,9 @@
 import MediaOption from '../enums/MediaOption';
 import { ParticipantStatus } from '../static/External';
 import MediaSettings from './MediaSettings';
+import { ISharedMovieInfo } from './MovieShare';
 import MuteStates from './MuteStates';
-import { ParticipantStateMapped } from './Participant';
+import { ParticipantListMarker, ParticipantListType, ParticipantStateMapped } from './Participant';
 import SignalingMessage from './SignalingMessage';
 /**
  * Тип внешнего пользователя
@@ -57,6 +58,14 @@ export interface ExternalParticipantId extends ExternalId {
      */
     deviceIdx: number;
 }
+/**
+ * Маркер определяющий положение участника в списке
+ */
+export declare type ExternalParticipantListMarker = Required<ParticipantListMarker>;
+/**
+ * Словарь сопоставляющий тип списка участников с маркером (положением участника в списке)
+ */
+export declare type ExternalParticipantListMarkers = Record<ParticipantListType, ExternalParticipantListMarker>;
 /**
  * Участник звонка
  */
@@ -85,4 +94,12 @@ export interface ExternalParticipant {
      * Разрешения на включение устройств
      */
     unmuteOptions: MediaOption[];
+    markers?: ExternalParticipantListMarkers;
+    movieShareInfos?: ISharedMovieInfo[];
+}
+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;
-    vkMovieId?: string;
+    externalMovieId?: string;
 };
 export default MediaSettings;
 export declare function compareMediaSettings(ms1: MediaSettings, ms2: MediaSettings): boolean;

package/types/MovieShare.d.ts

@@ -1,16 +1,32 @@
-import { ParticipantId } from './Participant';
+import { OkUserId, CompositeUserId } from './Participant';
+import { MediaType } from './ParticipantStreamDescription';
 export interface IAddMovieParams {
     movieId: string;
     gain?: number;
 }
-declare type Gain = number | null;
-declare type Offset = number | null;
-export declare type ISharedMovieStateResponse = [number, Gain, boolean, Offset, number];
+export declare type ISharedMovieStateResponse = [number, number, boolean, number, number];
 export interface ISharedMovieState {
-    participantId: ParticipantId;
-    gain: Gain;
-    pause: boolean;
-    offset: Offset;
+    participantId: CompositeUserId;
+    gain?: number;
+    pause?: boolean;
+    offset?: number;
+    duration?: number;
+}
+export interface ISharedMovieInfo {
+    movieId: OkUserId;
+    initiatorId: CompositeUserId;
+    title: string;
+    source: MediaType;
+    externalMovieId: string;
     duration: number;
+    thumbnailNormal: string;
+    thumbnailMedium: string;
+    thumbnailBig: string;
+    thumbnailHigh: string;
+    thumbnailHd: string;
+}
+export interface ISharedMovieStoppedInfo {
+    movieId: OkUserId;
+    initiatorId: CompositeUserId;
+    source: MediaType;
 }
-export {};

package/types/Participant.d.ts

@@ -3,7 +3,8 @@ 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 { ISharedMovieInfo } from './MovieShare';
 import MuteStates from './MuteStates';
 import ParticipantLayout from './ParticipantLayout';
 /**
@@ -16,6 +17,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 +55,9 @@ export interface Participant {
     muteStates: MuteStates;
     unmuteOptions: MediaOption[];
     observedIds: CompositeUserId[];
+    markers?: ExternalParticipantListMarkers;
+    movieShareInfos?: ISharedMovieInfo[];
+}
+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;
+}