@vkontakte/calls-sdk 2.5.2-beta.3 → 2.5.2-beta.4

package/static/Utils.d.ts

@@ -1,21 +1,29 @@
 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/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;

package/types/ParticipantLayout.d.ts

@@ -1,4 +1,4 @@
-import { ExternalId } from './ExternalId';
+import { ExternalParticipantId } from './ExternalId';
 import { MediaType } from './ParticipantStreamDescription';
 /**
  * Лейаут собеседника в звонке
@@ -21,10 +21,6 @@ export declare type Layout = {
      * Поддерживаемые значения: `cv` и `cn`, что соответствует CSS `cover` и `contain`
      */
     fit: string;
-    /**
-     * Запрос опорного кадра, нужно не злоупотреблять, негативно влияет на качество видео
-     */
-    keyFrame: boolean;
 };
 /**
  * Запрос остановки стрима
@@ -42,7 +38,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, 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[];
@@ -61,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;
     }
@@ -73,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;
@@ -86,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;
     }
@@ -101,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: {
@@ -115,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[];
@@ -129,7 +136,7 @@ declare namespace SignalingMessage {
         muteAll?: boolean;
     }
     export interface PinParticipant extends Notification {
-        participantId: CompositeUserId;
+        participantId: ParticipantId;
         unpin?: boolean;
     }
     export interface ParticipantAdded extends Notification {
@@ -153,6 +160,7 @@ declare namespace SignalingMessage {
         topology: TransportTopology;
         offerTo: OkUserId[];
         offerToTypes: UserType[];
+        offerToDeviceIdxs: number[];
     }
     export interface RateCallData extends Notification {
         maxRateForQuestion: number;
@@ -169,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 {
@@ -184,6 +190,7 @@ declare namespace SignalingMessage {
     export interface ChatMessage extends Notification {
         participantId: OkUserId;
         participantType: UserType;
+        deviceIdx?: number;
         direct: boolean;
         message: string;
     }
@@ -196,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[];
@@ -211,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;
@@ -222,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 {
@@ -235,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 {