@vkontakte/calls-sdk 2.6.2-dev.aa1b4e2.0 → 2.6.2-dev.abf49ca.0

package/classes/Conversation.d.ts

@@ -15,6 +15,7 @@ import { JSONObject } from '../static/Json';
 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, IGetParticipantsParameters, OkUserId, ParticipantId } from '../types/Participant';
 import { ParticipantLayout } from '../types/ParticipantLayout';
@@ -76,6 +77,7 @@ export default class Conversation extends EventEmitter {
     private readonly _signaling;
     private _mediaSource;
     private _conversation;
+    private _myLastRequestedLayouts;
     private _state;
     private _participantState;
     private _participants;
@@ -151,12 +153,12 @@ export default class Conversation extends EventEmitter {
     private _processConnection;
     private _prepareParticipants;
     private _onConversationParticipantListChunk;
+    private _createParticipantListChunk;
     private _participantListChunkToExternalChunk;
     private _registerConnectionParticipants;
     private _registerParticipants;
     /** Установим состояние локальных мьютов */
     private _registerParticipantLocalMuteState;
-    private _getClientType;
     private _getStatusByTransportState;
     private _registerParticipantInCache;
     private _getExistedParticipantByIdOrCreate;
@@ -208,6 +210,9 @@ export default class Conversation extends EventEmitter {
     private _onParticipantSourcesUpdate;
     private _onParticipantPromoted;
     private _onChatRoomUpdated;
+    private _onSharedMovieUpdate;
+    private _onSharedMovieInfoStarted;
+    private _onSharedMovieInfoStopped;
     private _waitForStreamIfNeeded;
     private _matchStreamDescription;
     private _getWaitingTime;
@@ -231,11 +236,11 @@ export default class Conversation extends EventEmitter {
     customData(data: JSONObject, participantId?: ParticipantId | null): Promise<void>;
     createJoinLink(): Promise<string>;
     removeJoinLink(): Promise<never>;
-    addMovie(movieId: string): Promise<{
+    addMovie({ movieId, gain, metadata }: IAddMovieParams): Promise<{
         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>;
@@ -307,6 +312,7 @@ export default class Conversation extends EventEmitter {
     private _updateDisplayLayoutFromCache;
     private _setParticipantsStatus;
     private _onJoinLinkChanged;
+    private _isMe;
 }
 export declare class UpdateDisplayLayoutError extends Error {
     readonly participantErrors: {

package/classes/ProducerCommandSerializationService.d.ts

@@ -11,7 +11,7 @@ export declare class ProducerCommandSerializationService {
     private writeLayout;
     private writeStreamDesc;
     serializePerfStatReport(sequenceNumber: number, report: PerfStatReport): ArrayBuffer;
-    deserializeCommandResponse(data: BufferSource): SignalingMessage | undefined;
+    deserializeCommandResponse(data: BufferSource | Blob): Promise<SignalingMessage | undefined>;
     private deserializeUpdateDisplayLayoutResponse;
     private deserializeReportPerfStatResponse;
 }

package/default/Api.d.ts

@@ -18,6 +18,7 @@ export default class Api extends BaseApi {
     joinConversation(conversationId: string, isVideo?: boolean, chatId?: string): Promise<ConversationResponse>;
     createConversation(conversationId: string, payload?: string, requireAuthToJoin?: boolean): Promise<ConversationResponse>;
     startConversation(conversationId: string, ids?: OkUserId[], type?: CallType, isVideo?: boolean, payload?: string, joiningAllowed?: boolean, requireAuthToJoin?: boolean): Promise<ConversationResponse>;
+    private _preareStartConversationData;
     private _startConversation;
     createJoinLink(conversationId: string): Promise<{
         join_link: string;

package/default/Api.test.d.ts

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

package/default/Signaling.d.ts

@@ -11,6 +11,7 @@ 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 ParticipantLayout, { RequestKeyFrame, StopStream } from '../types/ParticipantLayout';
@@ -96,8 +97,8 @@ export default class Signaling extends BaseSignaling {
     updateDisplayLayout(layouts: {
         [streamDesc: string]: ParticipantLayout | StopStream | RequestKeyFrame;
     }): 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>;

package/enums/ConversationOption.d.ts

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

package/enums/HangupType.d.ts

@@ -16,6 +16,7 @@ declare enum HangupType {
     CALLER_IS_BLOCKED = "CALLER_IS_BLOCKED",
     NOT_FRIENDS = "NOT_FRIENDS",
     CALLEE_IS_OFFLINE = "CALLEE_IS_OFFLINE",
+    CALLER_IS_REJECTED = "CALLER_IS_REJECTED",
     UNKNOWN_ERROR = "UNKNOWN_ERROR",
     UNSUPPORTED = "UNSUPPORTED",
     OLD_VERSION = "OLD_VERSION",
@@ -23,6 +24,7 @@ declare enum HangupType {
     EXTERNAL_API_ERROR = "EXTERNAL_API_ERROR",
     SOCKET_CLOSED = "SOCKET_CLOSED",
     ENDED = "ENDED",
-    KILLED_WITHOUT_DELETE = "KILLED_WITHOUT_DELETE"
+    KILLED_WITHOUT_DELETE = "KILLED_WITHOUT_DELETE",
+    ANOTHER_DEVICE = "ANOTHER_DEVICE"
 }
 export default HangupType;

package/enums/SignalingNotification.d.ts

@@ -35,6 +35,10 @@ declare enum SignalingNotification {
     PROMOTE_PARTICIPANT = "promote-participant",
     CHAT_ROOM_UPDATED = "chat-room-updated",
     PROMOTION_APPROVED = "promotion-approved",
-    JOIN_LINK_CHANGED = "join-link-changed"
+    JOIN_LINK_CHANGED = "join-link-changed",
+    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.6.2-dev.aa1b4e2.0",
+  "version": "2.6.2-dev.abf49ca.0",
   "author": "vk.com",
   "description": "Library for video calls based on the vk.com platform",
   "homepage": "https://vk.com",

package/static/External.d.ts

@@ -10,6 +10,7 @@ import UserRole from '../enums/UserRole';
 import { ExternalId, ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk, ExternalParticipantListMarkers } from '../types/ExternalId';
 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 { DebugMessageType } from './Debug';
@@ -72,10 +73,31 @@ declare namespace External {
      * Если сервер закончил стримить собеседника, вместо стрима будет передан null
      *
      * @param userId
-     * @param streamName
-     * @param stream
+     * @param data
+     */
+    function onRemoteLive(userId: ExternalParticipantId, data: IOnRemoteMovieData): void;
+    /**
+     * Получен собственный стрим лайв.
+     * Если сервер закончил стримить собеседника, вместо стрима будет передан null
+     *
+     * @param userId
+     * @param data
+     */
+    function onLocalLive(userId: ExternalParticipantId, data: IOnRemoteMovieData): void;
+    /**
+     * Получено обновление стрима или лайва от собеседника.
+     *
+     * @param userId
+     * @param data
+     */
+    function onRemoteLiveUpdate(userId: ExternalParticipantId, data: ISharedMovieState): void;
+    /**
+     * Получено обновление собственного стрима или лайва.
+     *
+     * @param userId
+     * @param data
      */
-    function onRemoteLive(userId: ExternalParticipantId, streamName: string, stream: MediaStream | null): void;
+    function onLocalLiveUpdate(userId: ExternalParticipantId, data: ISharedMovieState): void;
     /**
      * Получен стрим с экрана собеседника.
      * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
@@ -106,6 +128,41 @@ declare namespace External {
      * @param markers
      */
     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;
     /**
      * Добавили участника
      *

package/static/Params.d.ts

@@ -11,6 +11,7 @@ import { ExternalId, ExternalParticipant, ExternalParticipantId, ExternalPartici
 import IceServer from '../types/IceServer';
 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 AuthData from './AuthData';
@@ -24,6 +25,7 @@ import { FacingMode } from './WebRTCUtils';
 export declare type ParamsObject = {
     platform: string;
     clientType: string;
+    externalUserType: string;
     device: string;
     /**
      * API ключ приложения
@@ -43,6 +45,11 @@ export declare type ParamsObject = {
      * Домен, чтобы попасть в тестовую группу. Для тестирования экспериментальных улучшений существуют отдельные сервера, чтобы собирать фидбек и уже потом раскатывать на всех юзеров. Если передать сюда специальный ключ, то конверсейшн будет обрабатываться на таком сервере.
      */
     domain: string;
+    /**
+     * Домен, куда будет ходить Ok api за данными
+     * @hidden
+     */
+    externalDomain: string;
     iceServers: IceServer[];
     wssBase: string;
     wssToken: string;
@@ -247,6 +254,11 @@ export declare type ParamsObject = {
      * Включать RED-extension (redundancy) для p2p звонков
      */
     p2pAudioRed: boolean;
+    /**
+     * Добавлять флаг spsPpsIdrInKeyframe для h264 кодека. В результате ключевые фреймы без sps и pps
+     * не используются как ключевые. Решает проблему с артефактами на видео в случае потерь пакетов.
+     */
+    h264spsPpsIdrInKeyframe: boolean;
     /**
      * Получать список участников звонка третьим аргументом в `onConversation`
      * @hidden
@@ -300,7 +312,20 @@ export declare type ParamsObject = {
      * Получен стрим трансляция или мувик от собеседника.
      * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
      */
-    onRemoteLive?: (userId: ExternalParticipantId, streamId: string, stream: MediaStream | null) => void;
+    onRemoteLive?: (userId: ExternalParticipantId, data: IOnRemoteMovieData) => void;
+    /**
+     * Получен собственный стрим трансляция или мувик.
+     * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
+     */
+    onLocalLive?: (userId: ExternalParticipantId, data: IOnRemoteMovieData) => void;
+    /**
+     * Получено обновление стрима или лайва от собеседника.
+     */
+    onRemoteLiveUpdate?: (userId: ExternalParticipantId, data: ISharedMovieState) => void;
+    /**
+     * Получено обновление собственного стрима или лайва.
+     */
+    onLocalLiveUpdate?: (userId: ExternalParticipantId, data: ISharedMovieState) => void;
     /**
      * Начат звонок
      */
@@ -313,6 +338,26 @@ export declare type ParamsObject = {
      * Изменились данные стрима собеседника
      */
     onRemoteMediaSettings?: (userId: ExternalParticipantId, mediaSettings: MediaSettings, markers?: ExternalParticipantListMarkers) => 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;
     /**
      * Добавили участника
      */
@@ -494,6 +539,8 @@ export default abstract class Params {
     static set platform(value: string);
     static get clientType(): string;
     static set clientType(value: string);
+    static get externalUserType(): string;
+    static set externalUserType(value: string);
     static get device(): string;
     static get apiKey(): string;
     static get apiEnv(): string;
@@ -503,6 +550,7 @@ export default abstract class Params {
     static get anonymToken(): string;
     static set anonymToken(value: string);
     static get domain(): string;
+    static get externalDomain(): string;
     static get iceServers(): IceServer[];
     static set iceServers(value: IceServer[]);
     static get wssBase(): string;
@@ -571,6 +619,7 @@ export default abstract class Params {
     static get participantListChunkInitCount(): number;
     static get serverAudioRed(): boolean;
     static get p2pAudioRed(): boolean;
+    static get h264spsPpsIdrInKeyframe(): boolean;
     static get batchParticipantsOnStart(): boolean;
     static get filterObservers(): boolean;
     static get muteMode(): boolean;

package/static/Utils.d.ts

@@ -6,7 +6,7 @@ import VideoSettings from '../types/VideoSettings';
 export declare const PARAMETERS_SEPARATOR = ":";
 export declare const DEVICE_IDX_PARAMETER = "d";
 declare namespace Utils {
-    function patchSDP(sdp: string, preferH264: boolean, brokenH264: boolean, preferVP9: boolean, isAudioNack?: boolean, preferRed?: boolean): string;
+    function patchSDP(sdp: string, preferH264: boolean, brokenH264: boolean, preferVP9: boolean, h264spsPpsIdrInKeyframe: boolean, isAudioNack?: boolean, preferRed?: boolean): string;
     function getPeerIdString(peerId: SignalingMessage.PeerId): string;
     function comparePeerId(peerId1: SignalingMessage.PeerId, peerId2: SignalingMessage.PeerId): boolean;
     function getPeerConnectionHostInfo(pc: RTCPeerConnection): Promise<any>;

package/types/ConversationParams.d.ts

@@ -10,5 +10,6 @@ declare type ConversationParams = {
     isp_as_org?: string;
     loc_cc?: string;
     loc_reg?: string;
+    external_user_type: string;
 };
 export default ConversationParams;

package/types/ExternalId.d.ts

@@ -1,6 +1,7 @@
 import MediaOption from '../enums/MediaOption';
 import { ParticipantStatus } from '../static/External';
 import MediaSettings from './MediaSettings';
+import { ISharedMovieInfo } from './MovieShare';
 import MuteStates from './MuteStates';
 import { ParticipantListMarker, ParticipantListType, ParticipantStateMapped } from './Participant';
 import SignalingMessage from './SignalingMessage';
@@ -94,6 +95,7 @@ export interface ExternalParticipant {
      */
     unmuteOptions: MediaOption[];
     markers?: ExternalParticipantListMarkers;
+    movieShareInfos?: ISharedMovieInfo[];
 }
 export interface ExternalParticipantListChunk {
     participants: ExternalParticipant[];

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

@@ -0,0 +1,42 @@
+import { OkUserId, CompositeUserId } from './Participant';
+import { MediaType } from './ParticipantStreamDescription';
+export interface IMoviePreview {
+    url: string;
+    width: number;
+    height: number;
+}
+export interface IAddMovieParams {
+    movieId: string;
+    gain?: number;
+    metadata?: {
+        title?: string;
+        thumbnails?: IMoviePreview[];
+    };
+}
+export declare type ISharedMovieStateResponse = [number, number, boolean, number, number];
+export interface ISharedMovieState {
+    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;
+    thumbnails: IMoviePreview[];
+}
+export interface ISharedMovieStoppedInfo {
+    movieId: OkUserId;
+    initiatorId: CompositeUserId;
+    source: MediaType;
+}
+export interface IOnRemoteMovieData {
+    streamName: string;
+    stream: MediaStream | null;
+    mediaType: MediaType;
+}

package/types/Participant.d.ts

@@ -4,6 +4,7 @@ import UserRole from '../enums/UserRole';
 import { ParticipantStatus } from '../static/External';
 import MediaSettings from '../types/MediaSettings';
 import { ExternalId, ExternalParticipantId, ExternalParticipantListMarkers } from './ExternalId';
+import { ISharedMovieInfo } from './MovieShare';
 import MuteStates from './MuteStates';
 import ParticipantLayout from './ParticipantLayout';
 /**
@@ -55,6 +56,7 @@ export interface Participant {
     unmuteOptions: MediaOption[];
     observedIds: CompositeUserId[];
     markers?: ExternalParticipantListMarkers;
+    movieShareInfos?: ISharedMovieInfo[];
 }
 export interface IGetParticipantsParameters {
     externalIds: ExternalId[];

package/types/SignalingMessage.d.ts

@@ -9,6 +9,7 @@ import UserRole from '../enums/UserRole';
 import UserType from '../enums/UserType';
 import MediaModifiers from './MediaModifiers';
 import MediaSettings from './MediaSettings';
+import { ISharedMovieInfo, ISharedMovieState, ISharedMovieStoppedInfo } from './MovieShare';
 import MuteStates from './MuteStates';
 import { CompositeUserId, OkUserId, ParticipantId, ParticipantListMarker as ParticipantParticipantListMarker, ParticipantListMarkers, ParticipantListType as ParticipantParticipantListType } from './Participant';
 import VideoSettings from './VideoSettings';
@@ -54,6 +55,7 @@ declare namespace SignalingMessage {
         unmuteOptions?: MediaOption[];
         markers?: ParticipantListMarkers;
         observedIds?: CompositeUserId[];
+        movieShareInfos?: ISharedMovieInfo[];
     }
     export interface ParticipantListChunk extends Notification {
         participants: (Participant & Required<Pick<Participant, 'markers'>>)[];
@@ -279,6 +281,14 @@ declare namespace SignalingMessage {
     export interface JoinLinkChanged extends Notification {
         joinLink: string;
     }
+    export interface SharedMovieState extends Notification {
+        data: ISharedMovieState[];
+    }
+    export interface SharedMovieInfo extends Notification {
+        movieShareInfo: ISharedMovieInfo;
+    }
+    export interface SharedMovieStoppedInfo extends Notification, ISharedMovieStoppedInfo {
+    }
     export {};
 }
 export default SignalingMessage;