@vkontakte/calls-sdk 2.4.4-dev.71e1f68.0 → 2.4.4-dev.9dfe59f.0

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 } from '../types/ExternalId';
+import { ExternalId, ExternalParticipant, ExternalParticipantId } from '../types/ExternalId';
 import IceServer from '../types/IceServer';
 import MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
@@ -212,6 +212,7 @@ export declare type ParamsObject = {
      * он хочет видеть, через вызов updateDisplayLayout
      */
     videoTracksCount: number;
+    movieShare: boolean;
     filteredMessages: boolean;
     breakVideoPayloadTypes: boolean;
     /**
@@ -220,8 +221,7 @@ export declare type ParamsObject = {
      */
     batchParticipantsOnStart: boolean;
     participantStateMapped: boolean;
-    /** использовать ли список партисипантов через метод чанками, вместо `onConversation` */
-    useParticipantListChunk: boolean;
+    joinFromMultipleDevices: boolean;
     /**
      * Получен локальный стрим с камеры/микрофона
      */
@@ -242,40 +242,40 @@ export declare type ParamsObject = {
      * Получен стрим собеседника.
      * Если сервер закончил стримить собеседника, вместо стрима будет передан null
      */
-    onRemoteStream?: (userId: ExternalId, stream: MediaStream | null) => void;
+    onRemoteStream?: (userId: ExternalParticipantId, stream: MediaStream | null) => void;
     /**
      * Получен стрим с экрана собеседника.
      * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
      */
-    onRemoteScreenStream?: (userId: ExternalId, stream: MediaStream | null) => void;
+    onRemoteScreenStream?: (userId: ExternalParticipantId, stream: MediaStream | null) => void;
     /**
      * Получен стрим трансляция или мувик от собеседника.
      * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
      */
-    onRemoteLive?: (userId: ExternalId, streamId: string, stream: MediaStream | null) => void;
+    onRemoteLive?: (userId: ExternalParticipantId, streamId: string, stream: MediaStream | null) => void;
     /**
      * Начат звонок
      */
-    onConversation?: (userId: ExternalId, mediaModifiers: MediaModifiers, muteStates: MuteStates, participants?: ExternalParticipant[]) => void;
+    onConversation?: (userId: ExternalParticipantId, mediaModifiers: MediaModifiers, muteStates: MuteStates, participants?: ExternalParticipant[]) => void;
     /**
      * Изменились данные стрима собеседника
      */
-    onRemoteMediaSettings?: (userId: ExternalId, mediaSettings: MediaSettings) => void;
+    onRemoteMediaSettings?: (userId: ExternalParticipantId, mediaSettings: MediaSettings) => void;
     /**
      * Изменились данные состояний собеседника
      */
-    onRemoteParticipantState?: (userId: ExternalId, participantState: {
+    onRemoteParticipantState?: (userId: ExternalParticipantId, participantState: {
         [key: string]: string;
     }) => void;
     /**
      * Изменился статус соединения собеседников
      */
-    onRemoteStatus?: (userIds: ExternalId[], status: ParticipantStatus, data: any) => void;
+    onRemoteStatus?: (userIds: ExternalParticipantId[], status: ParticipantStatus, data: any) => void;
     /**
      * Изменился статус соединения собеседника
      * @deprecated
      */
-    onParticipantStatus?: (userId: ExternalId, status: ParticipantStatus, data: any) => void;
+    onParticipantStatus?: (userId: ExternalParticipantId, status: ParticipantStatus, data: any) => void;
     /**
      * Разрешения на доступы были запрошены в браузере
      */
@@ -287,7 +287,7 @@ export declare type ParamsObject = {
     /**
      * Пользователь отключился от звонка
      */
-    onRemoteRemoved?: (userId: ExternalId) => void;
+    onRemoteRemoved?: (userId: ExternalParticipantId) => void;
     /**
      * Изменилось состояние звонка
      */
@@ -299,11 +299,11 @@ export declare type ParamsObject = {
     /**
      * Изменились состояния устройств пользователя или разрешения включать камеру/микрофон
      */
-    onMuteStates?: (muteStates: MuteStates, unmuteOptions: MediaOption[], mediaOptions: MediaOption[], muteAll: boolean, unmute: boolean, userId: ExternalId | null, adminId: ExternalId | null) => void;
+    onMuteStates?: (muteStates: MuteStates, unmuteOptions: MediaOption[], mediaOptions: MediaOption[], muteAll: boolean, unmute: boolean, userId: ExternalParticipantId | null, adminId: ExternalParticipantId | null) => void;
     /**
      * Изменились роли собеседника в звонке
      */
-    onRolesChanged?: (userId: ExternalId, roles: UserRole[]) => void;
+    onRolesChanged?: (userId: ExternalParticipantId, roles: UserRole[]) => void;
     /**
      * Изменились свои роли в звонке
      */
@@ -311,7 +311,7 @@ export declare type ParamsObject = {
     /**
      * Закрепляет/открепляет собеседника для всех
      */
-    onPinnedParticipant?: (userId: ExternalId, unpin: boolean) => void;
+    onPinnedParticipant?: (userId: ExternalParticipantId, unpin: boolean) => void;
     /**
      * Закрепляет/открепляет текущего пользователя у других собеседников
      */
@@ -324,12 +324,12 @@ export declare type ParamsObject = {
     /**
      * Изменился говорящий в звонке
      */
-    onSpeakerChanged?: (userId: ExternalId) => void;
+    onSpeakerChanged?: (userId: ExternalParticipantId) => void;
     /**
      * Громкость собеседников
      */
     onVolumesDetected?: (volumes: {
-        uid: ExternalId;
+        uid: ExternalParticipantId;
         volume: number;
     }[]) => void;
     /**
@@ -361,15 +361,15 @@ export declare type ParamsObject = {
     /**
      * Получено сообщение чата
      */
-    onChatMessage?: (message: string, from: ExternalId, direct: boolean) => void;
+    onChatMessage?: (message: string, from: ExternalParticipantId, direct: boolean) => void;
     /**
      * Получены данные от собеседника
      */
-    onCustomData?: (data: JSONObject, from: ExternalId, direct: boolean) => void;
+    onCustomData?: (data: JSONObject, from: ExternalParticipantId, direct: boolean) => void;
     /**
      * Начата трансляция/запись звонка
      */
-    onRecordStarted?: (initiator: ExternalId, movieId: number, startTime: number, type: 'STREAM' | 'RECORD', externalMovieId?: string, externalOwnerId?: string) => void;
+    onRecordStarted?: (initiator: ExternalParticipantId, movieId: number, startTime: number, type: 'STREAM' | 'RECORD', externalMovieId?: string, externalOwnerId?: string) => void;
     /**
      * Закончена трансляция/запись звонка
      */
@@ -386,7 +386,7 @@ export declare type ParamsObject = {
      * @param status Оценки качества соединения участников от 0 до 1
      */
     onNetworkStatusChanged?: (status: {
-        uid: ExternalId;
+        uid: ExternalParticipantId;
         rating: number;
     }[]) => void;
     /**
@@ -420,7 +420,7 @@ export default abstract class Params {
     static get appVersion(): number;
     static get sdkVersion(): string | number | boolean;
     static get debug(): string | number | boolean;
-    static get protocolVersion(): number;
+    static get protocolVersion(): 5 | 6;
     static get platform(): string;
     static set platform(value: string);
     static get clientType(): string;
@@ -493,10 +493,10 @@ export default abstract class Params {
     static get consumerScreenTrack(): boolean;
     static get producerScreenTrack(): boolean;
     static isUnifiedPlanSupported(name: string, version: number): boolean;
+    static get movieShare(): boolean;
     static get videoTracksCount(): number;
     static get breakVideoPayloadTypes(): boolean;
     static get filteredMessages(): boolean;
     static get batchParticipantsOnStart(): boolean;
     static get participantStateMapped(): boolean;
-    static get useParticipantListChunk(): boolean;
 }

package/static/Utils.d.ts

@@ -1,21 +1,29 @@
-import type { BigInteger } from 'big-integer';
+import { BigInteger } from 'big-integer';
 import UserType from '../enums/UserType';
 import { ExternalParticipant } from '../types/ExternalId';
-import { CompositeUserId, OkUserId, Participant, ParticipantStateMapped } from '../types/Participant';
+import { CompositeUserId, OkUserId, Participant, ParticipantId, ParticipantStateMapped } from '../types/Participant';
 import SignalingMessage from '../types/SignalingMessage';
 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): string;
     function getPeerIdString(peerId: SignalingMessage.PeerId): string;
     function comparePeerId(peerId1: SignalingMessage.PeerId, peerId2: SignalingMessage.PeerId): boolean;
     function getPeerConnectionHostInfo(pc: RTCPeerConnection): Promise<any>;
-    function composeId(id: CompositeUserId | OkUserId, type: UserType): CompositeUserId;
-    function composeParticipantId(participant: SignalingMessage.Participant): CompositeUserId;
-    function composeMessageId(message: SignalingMessage): CompositeUserId;
+    function composeUserId(id: CompositeUserId | OkUserId, type: UserType): CompositeUserId;
+    function composeParticipantId(id: CompositeUserId | OkUserId, type: UserType, deviceIdx: number): ParticipantId;
+    function compose(compositeId: CompositeUserId, deviceIdx: number): ParticipantId;
+    function composeId(participant: SignalingMessage.Participant): ParticipantId;
+    function composeMessageId(message: SignalingMessage): ParticipantId;
     function decomposeId(compositeId: CompositeUserId | OkUserId): {
         id: OkUserId;
         type: UserType;
     };
+    function decomposeParticipantId(participantId: ParticipantId): {
+        compositeUserId: CompositeUserId;
+        deviceIdx: number;
+    };
     function uuid(): string;
     function throttle(func: Function, ms: number): (this: any) => void;
     function sdpFingerprint(sdp: string): BigInteger;

package/types/ConversationParams.d.ts

@@ -5,5 +5,6 @@ declare type ConversationParams = {
     turn_server?: IceServer;
     stun_server?: IceServer;
     client_type?: string;
+    device_idx?: number;
 };
 export default ConversationParams;

package/types/ConversationResponse.d.ts

@@ -23,5 +23,9 @@ declare type ConversationResponse = {
         status: HangupType;
     }[];
     peerId?: number;
+    /**
+     * Порядковый номер, присвоенный устройству при входе в звонок
+     */
+    device_idx?: number;
 };
 export default ConversationResponse;

package/types/ExternalId.d.ts

@@ -22,6 +22,13 @@ export declare namespace ExternalIdUtils {
     function compare(id1: ExternalId, id2: ExternalId): boolean;
 }
 export declare type ExternalIdString = string;
+export declare namespace ExternalParticipantIdUtils {
+    function fromId(id: string, type?: ExternalIdType, deviceIdx?: number): ExternalParticipantId;
+    function toString(externalId: ExternalParticipantId): ExternalParticipantIdString;
+    function fromSignaling(signalingId: SignalingMessage.ExternalId, deviceIdx: number): ExternalParticipantId;
+    function getDeviceIdx(externalId: string | ExternalParticipantId | null): number;
+}
+export declare type ExternalParticipantIdString = string;
 /**
  * Идентификатор внешнего пользователя
  */
@@ -35,6 +42,15 @@ export interface ExternalId {
      */
     type: ExternalIdType;
 }
+/**
+ * Идентификатор участника звонка
+ */
+export interface ExternalParticipantId extends ExternalId {
+    /**
+     * Индекс устройства (позволяет отличать участников, которые присоединяются к звонку под одной учётной записью с разных устройств)
+     */
+    deviceIdx: number;
+}
 /**
  * Участник звонка
  */
@@ -42,7 +58,7 @@ export interface ExternalParticipant {
     /**
      * Идентификатор пользователя
      */
-    uid: ExternalId;
+    uid: ExternalParticipantId;
     /**
      * Данные стрима
      */

package/types/MediaSettings.d.ts

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

package/types/Participant.d.ts

@@ -3,10 +3,18 @@ import ParticipantState from '../enums/ParticipantState';
 import UserRole from '../enums/UserRole';
 import { ParticipantStatus } from '../static/External';
 import MediaSettings from '../types/MediaSettings';
-import { ExternalId } from './ExternalId';
+import { ExternalParticipantId } from './ExternalId';
 import MuteStates from './MuteStates';
 import ParticipantLayout from './ParticipantLayout';
+/**
+ * Уникально идентифицирует пользователя или группу
+ */
 export declare type CompositeUserId = string;
+/**
+ * Уникально идентифицирует участника звонка
+ * (одному пользователю могут соответствовать несколько участников, в случае если пользователь зашёл в звонок с нескольких устройств)
+ */
+export declare type ParticipantId = string;
 export declare type OkUserId = number;
 /**
  * Стейт участника звонка
@@ -18,8 +26,8 @@ export interface ParticipantStateMapped {
     };
 }
 export interface Participant {
-    id: CompositeUserId;
-    externalId: ExternalId;
+    id: ParticipantId;
+    externalId: ExternalParticipantId;
     mediaSettings: MediaSettings;
     state: ParticipantState;
     status: ParticipantStatus | null;
@@ -38,31 +46,4 @@ export interface Participant {
     };
     muteStates: MuteStates;
     unmuteOptions: MediaOption[];
-    markers?: IParticipantListMarkers;
-}
-/** format "u123" or "g456", where 123 is user's id and 456 is group's id */
-export declare type ICompositeEntityId = string;
-export declare type IParticipantListType = 'GRID' | 'SIDE' | 'ADMIN';
-export declare type IParticipantListMarkers = {
-    [k in IParticipantListType]?: IParticipantMarker;
-};
-export interface IParticipantMarker {
-    /** server-calculated synthetic value - first criterion for sorting participants (DESC) */
-    rank: number;
-    /** sorting timestamp - second criterion for sorting participants (ASC) */
-    ts: number;
-    /** participant ID - third (and actually fourth) criterion for sorting participants (ASC); sorted first by one-letter prefix (participant type, 'u' < 'g') and second - by long participant id - numerically! */
-    id: ICompositeEntityId;
-}
-export interface IGetParticipantListChunkPayload {
-    listType: IParticipantListType;
-    /** optional, anchor in sorted list to start from, mutually exclusive with fromIdx */
-    fromMarker?: IParticipantMarker;
-    /** optional, 0-based position in sorted list to start from, mutually exclusive with fromMarker */
-    fromIdx?: number;
-    count: number;
-    /** optional, if true then list is to be iterated in reverse order */
-    backward?: boolean;
-    /** optional, if true then resulting chunk will start from Participant with specified marker, if such Participant (still) exists */
-    includeMarker?: boolean;
 }

package/types/ParticipantLayout.d.ts

@@ -1,4 +1,4 @@
-import { ExternalId } from './ExternalId';
+import { ExternalParticipantId } from './ExternalId';
 import { MediaType } from './ParticipantStreamDescription';
 /**
  * Лейаут собеседника в звонке
@@ -42,7 +42,7 @@ export declare type ParticipantLayout = (Layout | StopStream) & {
     /**
      * Внешний ID пользователя
      */
-    uid: ExternalId | string;
+    uid: ExternalParticipantId | string;
     /**
      * Тип медиа (видео с камеры, картинка с экрана, лайв или мувик)
      */

package/types/ParticipantPriority.d.ts

@@ -1,12 +1,12 @@
-import { ExternalId } from './ExternalId';
+import { ExternalParticipantId } from './ExternalId';
 /**
  * Приоритет собеседника в звонке
  */
 declare type ParticipantPriority = {
     /**
-     * Внешний ID пользователя
+     * Внешний ID участника звонка
      */
-    uid: ExternalId | string;
+    uid: ExternalParticipantId | string;
     /**
      * Приоритет [-1..MAX_INT]
      */

package/types/ParticipantStreamDescription.d.ts

@@ -1,4 +1,4 @@
-import { CompositeUserId } from './Participant';
+import { ParticipantId } from './Participant';
 /**
  * Тип пользовательского медиа
  */
@@ -11,7 +11,7 @@ export declare enum MediaType {
 export declare function serializeParticipantStreamDescription(description: ParticipantStreamDescription): string;
 export declare function parseParticipantStreamDescription(descriptionString: string): ParticipantStreamDescription;
 export declare type ParticipantStreamDescription = {
-    participantId: CompositeUserId;
+    participantId: ParticipantId;
     mediaType: MediaType | null;
     streamName?: string;
 };

package/types/SignalingMessage.d.ts

@@ -10,12 +10,12 @@ import UserType from '../enums/UserType';
 import MediaModifiers from './MediaModifiers';
 import MediaSettings from './MediaSettings';
 import MuteStates from './MuteStates';
-import { CompositeUserId, IParticipantListMarkers, OkUserId } from './Participant';
+import { OkUserId, ParticipantId } from './Participant';
 import VideoSettings from './VideoSettings';
 import { WaitingParticipant } from './WaitingHall';
 declare type SignalingMessage = Record<string, any>;
 export declare type RecordInfo = {
-    initiator: CompositeUserId;
+    initiator: ParticipantId;
     recordMovieId: number;
     recordStartTime: number;
     recordType: 'STREAM' | 'RECORD';
@@ -34,6 +34,7 @@ declare namespace SignalingMessage {
     export interface Participant {
         id: OkUserId;
         idType?: UserType;
+        deviceIdx?: number;
         externalId?: ExternalId;
         state: ParticipantState;
         responders?: OkUserId[];
@@ -49,7 +50,6 @@ declare namespace SignalingMessage {
         restricted?: boolean;
         muteStates?: MuteStates;
         unmuteOptions?: MediaOption[];
-        markers?: IParticipantListMarkers;
     }
     interface Conversation {
         id: string;
@@ -62,7 +62,7 @@ declare namespace SignalingMessage {
         multichatId: string | null;
         tamtamMultichatId: string | null;
         recordInfo: RecordInfo | null;
-        pinnedParticipantId: CompositeUserId | null;
+        pinnedParticipantId: ParticipantId | null;
         options: ConversationOption[];
         muteStates?: MuteStates;
     }
@@ -74,12 +74,14 @@ declare namespace SignalingMessage {
     export interface TransmittedData extends Notification {
         participantId: OkUserId;
         participantType: UserType;
+        deviceIdx?: number;
         peerId: PeerId;
         data: any;
     }
     export interface RegisteredPeer extends Notification {
         participantId: OkUserId;
         participantType: UserType;
+        deviceIdx?: number;
         peerId: PeerId;
         platform: string;
         clientType: string;
@@ -87,12 +89,14 @@ declare namespace SignalingMessage {
     export interface AcceptedCall extends Notification {
         participantId: OkUserId;
         participantType: UserType;
+        deviceIdx?: number;
         peerId: PeerId;
         mediaSettings: Partial<MediaSettings>;
     }
     export interface Hungup extends Notification {
         participantId: OkUserId;
         participantType: UserType;
+        deviceIdx?: number;
         peerId: PeerId;
         reason: HangupType;
     }
@@ -102,12 +106,14 @@ declare namespace SignalingMessage {
     export interface MediaSettingsChanged extends Notification {
         participantId: OkUserId;
         participantType: UserType;
+        deviceIdx?: number;
         peerId: PeerId;
         mediaSettings: Partial<MediaSettings>;
     }
     export interface ParticipantStateChanged extends Notification {
         participantId: OkUserId;
         participantType: UserType;
+        deviceIdx?: number;
         peerId: PeerId;
         mediaSettings: Partial<MediaSettings>;
         participantState: {
@@ -116,13 +122,13 @@ declare namespace SignalingMessage {
         };
     }
     export interface RolesChanged extends Notification {
-        adminId: CompositeUserId;
-        participantId: CompositeUserId;
+        adminId: ParticipantId;
+        participantId: ParticipantId;
         roles?: UserRole[];
     }
     export interface MuteParticipant extends Notification {
-        adminId?: CompositeUserId;
-        participantId?: CompositeUserId;
+        adminId?: ParticipantId;
+        participantId?: ParticipantId;
         muteStates: MuteStates;
         unmuteOptions?: MediaOption[];
         mediaOptions: MediaOption[];
@@ -130,7 +136,7 @@ declare namespace SignalingMessage {
         muteAll?: boolean;
     }
     export interface PinParticipant extends Notification {
-        participantId: CompositeUserId;
+        participantId: ParticipantId;
         unpin?: boolean;
     }
     export interface ParticipantAdded extends Notification {
@@ -154,6 +160,7 @@ declare namespace SignalingMessage {
         topology: TransportTopology;
         offerTo: OkUserId[];
         offerToTypes: UserType[];
+        offerToDeviceIdxs: number[];
     }
     export interface RateCallData extends Notification {
         maxRateForQuestion: number;
@@ -170,12 +177,10 @@ declare namespace SignalingMessage {
         reason: string;
     }
     export interface RecordStarted extends Notification {
-        idType: UserType;
-        id: OkUserId;
         recordInfo: RecordInfo;
     }
     export interface RecordStopped extends Notification {
-        participant: CompositeUserId;
+        participant: ParticipantId;
         recordMovieId: number;
     }
     export interface ReallocCon extends Notification {
@@ -185,6 +190,7 @@ declare namespace SignalingMessage {
     export interface ChatMessage extends Notification {
         participantId: OkUserId;
         participantType: UserType;
+        deviceIdx?: number;
         direct: boolean;
         message: string;
     }
@@ -197,13 +203,13 @@ declare namespace SignalingMessage {
         settings: Record<string, any>;
     }
     export interface StalledActivity extends Notification {
-        stalledParticipants: CompositeUserId[];
+        stalledParticipants: ParticipantId[];
     }
     export interface AudioActivity extends Notification {
-        activeParticipants: CompositeUserId[];
+        activeParticipants: ParticipantId[];
     }
     export interface SpeakerChanged extends Notification {
-        speaker: CompositeUserId;
+        speaker: ParticipantId;
     }
     export interface OptionsChanged extends Notification {
         options: ConversationOption[];
@@ -212,7 +218,7 @@ declare namespace SignalingMessage {
         statuses: Record<string, number>;
     }
     export interface PromotionApproved extends Notification {
-        adminId: CompositeUserId;
+        adminId: ParticipantId;
     }
     export interface PromoteParticipant extends Notification {
         demote: boolean;
@@ -223,8 +229,8 @@ declare namespace SignalingMessage {
         eventType: ChatRoomEventType;
         totalCount: number;
         firstParticipants: WaitingParticipant[];
-        addedParticipantIds: CompositeUserId[];
-        removedParticipantIds: CompositeUserId[];
+        addedParticipantIds: ParticipantId[];
+        removedParticipantIds: ParticipantId[];
         feedback: Record<string, any>[];
     }
     export interface VideoQualityUpdate extends Notification {
@@ -236,6 +242,7 @@ declare namespace SignalingMessage {
     export interface CustomData extends Notification {
         participantId: OkUserId;
         participantType: UserType;
+        deviceIdx?: number;
         data: Record<string, any>;
     }
     export interface SwitchMicro extends Notification {
@@ -248,16 +255,6 @@ declare namespace SignalingMessage {
         peerId: PeerId;
         mediaModifiers: MediaModifiers;
     }
-    export interface IParticipantListChunk extends Notification {
-        response: 'get-participant-list-chunk';
-        chunk: {
-            /** each contains ParticipantListMarker for requested ParticipantListType */
-            participants: Participant[];
-            countBefore: number;
-            countAfter: number;
-            markerFound: boolean;
-        };
-    }
     export {};
 }
 export default SignalingMessage;

package/static/LibraryManager.d.ts

@@ -1,2 +0,0 @@
-export declare function loadDependencies(): Promise<void>;
-export declare function getLibrary(name: string): any;