@vkontakte/calls-sdk 2.5.2-dev.b16dd83.0 → 2.5.2

package/classes/Conversation.d.ts

@@ -12,11 +12,11 @@ import UpdateDisplayLayoutErrorReason from '../enums/UpdateDisplayLayoutErrorRea
 import UserRole from '../enums/UserRole';
 import UserType from '../enums/UserType';
 import { JSONObject } from '../static/Json';
-import { ExternalId } from '../types/ExternalId';
+import { ExternalParticipantId, ExternalUserId } from '../types/ExternalId';
 import MediaModifiers from '../types/MediaModifiers';
 import { IVideoDimentions } from '../types/MediaSettings';
 import MuteStates from '../types/MuteStates';
-import { CompositeUserId, OkUserId } from '../types/Participant';
+import { CompositeUserId, OkUserId, ParticipantId } from '../types/Participant';
 import { ParticipantLayout } from '../types/ParticipantLayout';
 import ParticipantPriority from '../types/ParticipantPriority';
 import { ParticipantStreamDescription } from '../types/ParticipantStreamDescription';
@@ -29,8 +29,8 @@ import { TransportTopology } from './transport/Transport';
  */
 export declare type ConversationData = {
     userId: OkUserId;
-    compositeUserId: CompositeUserId;
-    externalId: ExternalId;
+    compositeUserId: ParticipantId;
+    externalId: ExternalParticipantId;
     /**
      * Время принятия звонка
      */
@@ -55,13 +55,14 @@ export declare type ConversationData = {
      * Токен комнаты для подключения к звонку по ссылке
      */
     joinLink?: string;
-    pinnedParticipantId: CompositeUserId | null;
+    pinnedParticipantId: ParticipantId | null;
     mediaModifiers: MediaModifiers;
     options: ConversationOption[];
     muteStates: MuteStates;
     unmuteOptions: MediaOption[];
     networkRating: number;
     waitingHall: boolean;
+    observer: boolean;
 };
 export declare type ParticipantUpdateInfo = {
     participantStreamDescription: ParticipantStreamDescription | null;
@@ -110,6 +111,7 @@ export default class Conversation extends EventEmitter {
         mediaOptions: MediaOption[];
         chatId?: string;
         joinLink?: string;
+        observedIds?: ExternalUserId[];
     }): Promise<ConversationData>;
     private _onJoinPart2;
     onPush(conversationId: string, type?: UserType, peerId?: number): Promise<void>;
@@ -139,7 +141,7 @@ export default class Conversation extends EventEmitter {
      */
     private _prepareConversation;
     private _createParticipant;
-    private _getUserId;
+    private _getParticipantId;
     private _setConversation;
     private _updateConversation;
     private _createMediaSource;
@@ -195,8 +197,8 @@ export default class Conversation extends EventEmitter {
     private _isCallAdmin;
     private _checkAdminRole;
     grantRoles(participantId: CompositeUserId, roles: UserRole[], revoke: boolean): Promise<void>;
-    muteParticipant(participantId: CompositeUserId | null, muteStates: MuteStates, requestedMedia?: MediaOption[]): Promise<void>;
-    pinParticipant(participantId: CompositeUserId, unpin: boolean): Promise<void>;
+    muteParticipant(participantId: ParticipantId | null, muteStates: MuteStates, requestedMedia?: MediaOption[]): Promise<void>;
+    pinParticipant(participantId: ParticipantId, unpin: boolean): Promise<void>;
     updateMediaModifiers(mediaModifiers: MediaModifiers): Promise<void>;
     changeOptions(changes: {
         [key in ConversationOption]?: boolean;
@@ -209,7 +211,7 @@ export default class Conversation extends EventEmitter {
     promoteParticipant(participantId: CompositeUserId, demote?: boolean): Promise<void>;
     chatMessage(message: string, participantId?: CompositeUserId | null): Promise<void>;
     chatHistory(count: number): Promise<void>;
-    customData(data: JSONObject, participantId?: CompositeUserId | null): Promise<void>;
+    customData(data: JSONObject, participantId?: ParticipantId | null): Promise<void>;
     createJoinLink(): Promise<string>;
     removeJoinLink(): Promise<never>;
     addMovie(movieId: string): Promise<{
@@ -220,7 +222,7 @@ export default class Conversation extends EventEmitter {
     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>;
-    recordSetRole(participantId: CompositeUserId, role: RecordRole | null): Promise<void>;
+    recordSetRole(participantId: ParticipantId, role: RecordRole | null): Promise<void>;
     getStreamInfo(): Promise<{
         movieId: any;
         preview: any;
@@ -288,11 +290,11 @@ export default class Conversation extends EventEmitter {
 }
 export declare class UpdateDisplayLayoutError extends Error {
     readonly participantErrors: {
-        externalId: ExternalId;
+        externalId: ExternalParticipantId;
         errorReason: UpdateDisplayLayoutErrorReason;
     }[];
     constructor(m: string, participantErrors: {
-        externalId: ExternalId;
+        externalId: ExternalParticipantId;
         errorReason: UpdateDisplayLayoutErrorReason;
     }[]);
 }

package/classes/DebugInfo.d.ts

@@ -1,8 +1,8 @@
-import { CompositeUserId, Participant } from '../types/Participant';
+import { Participant, ParticipantId } from '../types/Participant';
 import EventEmitter from './EventEmitter';
 import { StatResult } from './transport/Statistics';
 export default class DebugInfo extends EventEmitter {
     private _lastMemoryStat;
-    onRemoteDataStats(stats: StatResult, participants: Record<CompositeUserId, Participant>): void;
+    onRemoteDataStats(stats: StatResult, participants: Record<ParticipantId, Participant>): void;
     _calcMemory(): void;
 }

package/classes/MediaSource.d.ts

@@ -26,13 +26,14 @@ export declare class MediaSource extends EventEmitter {
     private _mediaSettings;
     private _videoStatusOnScreenCapturingEnabled;
     private _effect;
+    private _onDeviceChange;
     constructor();
-    request(mediaOptions?: MediaOption[]): Promise<void>;
+    request(mediaOptions?: MediaOption[], needEmptyTracks?: boolean): Promise<void>;
     getStream(): MediaStream | null;
     getScreenTrack(): MediaStreamTrack | null;
     getSendVideoTrack(noDataChannel?: boolean): MediaStreamTrack | null;
     private _getSendAudioTrack;
-    addTrackToPeerConnection(pc: RTCPeerConnection, noDataChannel?: boolean): void;
+    addTrackToPeerConnection(pc: RTCPeerConnection, observer?: boolean, noDataChannel?: boolean): void;
     getMediaSettings(): MediaSettings;
     changeDevice(kind: MediaDeviceKind): Promise<void>;
     /**
@@ -42,6 +43,7 @@ export declare class MediaSource extends EventEmitter {
      */
     setVideoStream(stream: MediaStream, isScreen: boolean): Promise<void>;
     private _initDeviceChangeListener;
+    private _destroyDeviceChangeListener;
     private _changeVideoInput;
     /**
      * хелпер для получения трека для передаче либе эффектов. нужен для сохранения оригинального трека с камеры.

package/classes/SpeakerDetector.d.ts

@@ -1,4 +1,4 @@
-import { CompositeUserId } from '../types/Participant';
+import { ParticipantId } from '../types/Participant';
 import EventEmitter from './EventEmitter';
 import { Transport } from './transport/Transport';
 import { VolumeLevel } from './VolumeDetector';
@@ -14,7 +14,7 @@ export declare class SpeakerDetector extends EventEmitter {
     _onVolumesDetected(volumes: {
         [key: string]: VolumeLevel;
     }): void;
-    _onServerSpeakerChanged(speakerId: CompositeUserId): void;
+    _onServerSpeakerChanged(speakerId: ParticipantId): void;
     _onReceivedServerAudioActivity(): void;
     _onStoppedReceivingServerAudioActivity(): void;
 }

package/classes/SpecListener.d.ts

@@ -1,5 +1,5 @@
 import MediaSettings from '../types/MediaSettings';
-import { CompositeUserId, Participant } from '../types/Participant';
+import { Participant, ParticipantId } from '../types/Participant';
 import EventEmitter from './EventEmitter';
 import { Transport } from './transport/Transport';
 import { VolumesDetector } from './VolumesDetector';
@@ -10,9 +10,9 @@ export default class SpecListener extends EventEmitter {
     private readonly _participants;
     private _connectionTimeout;
     private _volumeTimeout;
-    constructor(transport: Transport, volumesDetector: VolumesDetector, participants: Record<CompositeUserId, Participant>);
+    constructor(transport: Transport, volumesDetector: VolumesDetector, participants: Record<ParticipantId, Participant>);
     destroy(): void;
-    onChangeRemoteMediaSettings(participantId: CompositeUserId, mediaSettings: MediaSettings): void;
+    onChangeRemoteMediaSettings(participantId: ParticipantId, mediaSettings: MediaSettings): void;
     private _onTransportStateChanged;
     private _onVolumesDetected;
     private _onConnectionTimeout;

package/classes/TabsChannel.d.ts

@@ -0,0 +1,11 @@
+export declare class TabsChannel {
+    private _channel;
+    private _sequence;
+    constructor();
+    private _onMessage;
+    private _sendRequest;
+    private _sendResponse;
+    private _waitResponse;
+    requestActiveCall(): Promise<boolean>;
+    destroy(): void;
+}

package/classes/screenshare/BaseStreamBuilder.d.ts

@@ -1,10 +1,10 @@
-import { CompositeUserId } from '../../types/Participant';
+import { ParticipantId } from '../../types/Participant';
 import { FrameChunk } from './Utils';
 export declare abstract class BaseStreamBuilder {
-    protected readonly _participantId: CompositeUserId;
+    protected readonly _participantId: ParticipantId;
     protected readonly _onStream: (stream: MediaStream) => void;
     protected _chunks: FrameChunk[];
-    protected constructor(participantId: CompositeUserId, onStream: (stream: MediaStream) => void);
+    protected constructor(participantId: ParticipantId, onStream: (stream: MediaStream) => void);
     appendChunk(chunk: FrameChunk): void;
     destroy(): void;
     protected abstract _processFrame(frame: FrameData): void;

package/classes/screenshare/ScreenCaptureReceiver.d.ts

@@ -1,4 +1,4 @@
-import { CompositeUserId } from '../../types/Participant';
+import { ParticipantId } from '../../types/Participant';
 import { ParticipantIdRegistry } from '../ParticipantIdRegistry';
 export default class ScreenCaptureReceiver {
     private readonly _datachannel;
@@ -8,7 +8,7 @@ export default class ScreenCaptureReceiver {
     private _onEos;
     constructor(datachannel: RTCDataChannel, participantIdRegistry: ParticipantIdRegistry, onStream: (streamId: string, stream: MediaStream) => void, onEos: (streamId: string) => void);
     private _onDataChannelMessage;
-    close(participantId: CompositeUserId): void;
+    close(participantId: ParticipantId): void;
     destroy(): void;
     static isBrowserSupported(): boolean;
 }

package/classes/screenshare/StreamBuilder.d.ts

@@ -1,4 +1,4 @@
-import { CompositeUserId } from '../../types/Participant';
+import { ParticipantId } from '../../types/Participant';
 import { BaseStreamBuilder, FrameData } from './BaseStreamBuilder';
 export default class StreamBuilder extends BaseStreamBuilder {
     private readonly _decoder;
@@ -9,7 +9,7 @@ export default class StreamBuilder extends BaseStreamBuilder {
     private _canvasContext;
     private _stream;
     private _track;
-    constructor(participantId: CompositeUserId, onStream: (stream: MediaStream) => void);
+    constructor(participantId: ParticipantId, onStream: (stream: MediaStream) => void);
     private _createStream;
     private _removeStream;
     private _requestCanvasFrame;

package/classes/screenshare/WebmBuilder.d.ts

@@ -1,4 +1,4 @@
-import { CompositeUserId } from '../../types/Participant';
+import { ParticipantId } from '../../types/Participant';
 import { BaseStreamBuilder, FrameData } from './BaseStreamBuilder';
 export default class WebmBuilder extends BaseStreamBuilder {
     private _mediaBuffer;
@@ -7,7 +7,7 @@ export default class WebmBuilder extends BaseStreamBuilder {
     private _earliestTimestamp;
     private _clusterStartTime;
     private _lastFrameTimestamp;
-    constructor(participantId: CompositeUserId, onStream: (stream: MediaStream) => void);
+    constructor(participantId: ParticipantId, onStream: (stream: MediaStream) => void);
     private static _intToU16BE;
     private static _genWebmHeader;
     private static _genSegmentHeader;

package/classes/transport/DirectTransport.d.ts

@@ -1,5 +1,5 @@
 import BaseSignaling from '../../abstract/BaseSignaling';
-import { CompositeUserId } from '../../types/Participant';
+import { ParticipantId } from '../../types/Participant';
 import ServerSettings from '../../types/ServerSettings';
 import EventEmitter from '../EventEmitter';
 import { MediaSource } from '../MediaSource';
@@ -31,7 +31,7 @@ export default class DirectTransport extends EventEmitter {
     private _remoteNetworkStat;
     private _networkLimits;
     private _perfStatReporter;
-    constructor(participantId: CompositeUserId, isMaster: boolean, signaling: BaseSignaling, mediaSource: MediaSource, serverSettings: ServerSettings);
+    constructor(participantId: ParticipantId, isMaster: boolean, signaling: BaseSignaling, mediaSource: MediaSource, serverSettings: ServerSettings);
     getState(): TransportState;
     updateStatisticsInterval(): void;
     open(peerId?: string | null): Promise<void>;

package/classes/transport/ServerTransport.d.ts

@@ -1,5 +1,5 @@
 import BaseSignaling from '../../abstract/BaseSignaling';
-import { CompositeUserId } from '../../types/Participant';
+import { ParticipantId } from '../../types/Participant';
 import ServerSettings from '../../types/ServerSettings';
 import SignalingMessage from '../../types/SignalingMessage';
 import EventEmitter from '../EventEmitter';
@@ -14,6 +14,7 @@ export default class ServerTransport extends EventEmitter {
     private _producerScreen;
     private _consumerScreen;
     private _isOpen;
+    private _observer;
     private _reconnectionPrevented;
     private _state;
     private _statInterval;
@@ -35,9 +36,9 @@ export default class ServerTransport extends EventEmitter {
     constructor(signaling: BaseSignaling, mediaSource: MediaSource, serverSettings: ServerSettings);
     getState(): TransportState;
     updateStatisticsInterval(): void;
-    open(): void;
+    open(observer?: boolean): void;
     close(error?: Error): void;
-    removeParticipant(participantId: CompositeUserId): void;
+    removeParticipant(participantId: ParticipantId): void;
     preventRestart(): void;
     allowRestart(): void;
     updateSettings(settings: ServerSettings): void;

package/classes/transport/Statistics.d.ts

@@ -1,4 +1,4 @@
-import { ExternalId } from '../../types/ExternalId';
+import { ExternalParticipantId } from '../../types/ExternalId';
 import { TransportTopology } from './Transport';
 export declare type StatTransport = {
     totalRoundTripTime: number;
@@ -20,7 +20,7 @@ export declare type StatRtp = {
     pliCount: number;
     firCount: number;
     nackCount: number;
-    userId?: string | ExternalId;
+    userId?: string | ExternalParticipantId;
     bandwidth?: number;
     packetLoss?: number;
     clockRate?: number;

package/classes/transport/Transport.d.ts

@@ -1,5 +1,5 @@
 import BaseSignaling from '../../abstract/BaseSignaling';
-import { CompositeUserId } from '../../types/Participant';
+import { ParticipantId } from '../../types/Participant';
 import ServerSettings from '../../types/ServerSettings';
 import EventEmitter from '../EventEmitter';
 import { MediaSource } from '../MediaSource';
@@ -48,12 +48,12 @@ export declare class Transport extends EventEmitter {
     constructor(topology: TransportTopology, signaling: BaseSignaling, mediaSource: MediaSource, serverSettings: ServerSettings);
     updateSettings(settings: ServerSettings): void;
     updateStatisticsInterval(): void;
-    allocate(participantId: CompositeUserId, isMaster?: boolean): void;
-    open(participantIds: CompositeUserId[], peerId?: string | null): void;
-    close(participantId: CompositeUserId): void;
+    allocate(participantId: ParticipantId, isMaster?: boolean): void;
+    open(participantIds: ParticipantId[], peerId?: string | null, observer?: boolean): void;
+    close(participantId: ParticipantId): void;
     destroy(): void;
     getTopology(): TransportTopology;
-    isAllocated(participantId: CompositeUserId): boolean;
+    isAllocated(participantId: ParticipantId): boolean;
     allocated(): string[];
     opened(): string[];
     private _setStates;

package/default/Api.d.ts

@@ -2,7 +2,7 @@ import BaseApi, { LogItem } from '../abstract/BaseApi';
 import CallType from '../enums/CallType';
 import ConversationParams from '../types/ConversationParams';
 import ConversationResponse from '../types/ConversationResponse';
-import { ExternalId } from '../types/ExternalId';
+import { ExternalId, ExternalUserId } from '../types/ExternalId';
 import { CompositeUserId, OkUserId } from '../types/Participant';
 export default class Api extends BaseApi {
     private _userId;
@@ -10,7 +10,7 @@ export default class Api extends BaseApi {
     private _externalUidsCache;
     private _callUnsafe;
     private _call;
-    userId(participantId: CompositeUserId): Promise<ExternalId>;
+    userId(compositeUserId: CompositeUserId): Promise<ExternalId>;
     prepareUserIds(ids: OkUserId[]): Promise<void>;
     authorize(): Promise<void>;
     log(items: LogItem[]): void;
@@ -26,7 +26,7 @@ export default class Api extends BaseApi {
         success: boolean;
     }>;
     getAnonymTokenByLink(joinLink: string, username?: string): Promise<string>;
-    joinConversationByLink(joinLink: string, isVideo?: boolean): Promise<ConversationResponse>;
+    joinConversationByLink(joinLink: string, isVideo?: boolean, observedIds?: ExternalUserId[]): Promise<ConversationResponse>;
     /**
      * NB: Не сохраняет порядок возвращаемых ID
      * @hidden

package/default/Signaling.d.ts

@@ -12,7 +12,7 @@ import { JSONObject } from '../static/Json';
 import MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
 import MuteStates from '../types/MuteStates';
-import { CompositeUserId } from '../types/Participant';
+import { CompositeUserId, ParticipantId } from '../types/Participant';
 import SignalingMessage from '../types/SignalingMessage';
 import { WaitingParticipantId } from '../types/WaitingHall';
 export default class Signaling extends BaseSignaling {
@@ -71,9 +71,9 @@ export default class Signaling extends BaseSignaling {
     private static _isDataChannelResponseRequired;
     getNextCommandSequenceNumber(): number;
     hangup(reason: string): Promise<SignalingMessage | void>;
-    sendCandidate(participantId: CompositeUserId, candidate: RTCIceCandidate): Promise<SignalingMessage>;
+    sendCandidate(participantId: ParticipantId, candidate: RTCIceCandidate): Promise<SignalingMessage>;
     requestTestMode(command: string): Promise<SignalingMessage>;
-    sendSdp(participantId: CompositeUserId, sdp: RTCSessionDescription): Promise<SignalingMessage>;
+    sendSdp(participantId: ParticipantId, sdp: RTCSessionDescription): Promise<SignalingMessage>;
     acceptCall(mediaSettings: MediaSettings): Promise<SignalingMessage>;
     changeMediaSettings(mediaSettings: MediaSettings): Promise<SignalingMessage>;
     changeParticipantState(state: {
@@ -96,17 +96,17 @@ export default class Signaling extends BaseSignaling {
     removeMovie(data: any): Promise<SignalingMessage>;
     startStream(data: any): Promise<SignalingMessage>;
     stopStream(): Promise<SignalingMessage>;
-    recordSetRole(participantId: CompositeUserId, role: RecordRole | null): Promise<SignalingMessage>;
+    recordSetRole(participantId: ParticipantId, role: RecordRole | null): Promise<SignalingMessage>;
     getRecordStatus(): Promise<SignalingMessage>;
     switchTopology(topology: TransportTopology, force?: boolean): Promise<SignalingMessage>;
     requestRealloc(): Promise<SignalingMessage>;
     reportPerfStat(report: PerfStatReport): Promise<SignalingMessage>;
     chatMessage(message: string, participantId?: CompositeUserId | null): Promise<SignalingMessage>;
     chatHistory(count: number): Promise<SignalingMessage>;
-    customData(data: JSONObject, participantId: CompositeUserId | null): Promise<SignalingMessage>;
+    customData(data: JSONObject, participantId: ParticipantId | null): Promise<SignalingMessage>;
     grantRoles(participantId: CompositeUserId, roles: UserRole[], revoke: boolean): Promise<SignalingMessage>;
-    muteParticipant(participantId: CompositeUserId | null, muteStates: MuteStates, requestedMedia: MediaOption[]): Promise<SignalingMessage>;
-    pinParticipant(participantId: CompositeUserId, unpin: boolean): Promise<SignalingMessage>;
+    muteParticipant(participantId: ParticipantId | null, muteStates: MuteStates, requestedMedia: MediaOption[]): Promise<SignalingMessage>;
+    pinParticipant(participantId: ParticipantId, unpin: boolean): Promise<SignalingMessage>;
     updateMediaModifiers(mediaModifiers: MediaModifiers): Promise<SignalingMessage>;
     changeOptions(changes: {
         [key in ConversationOption]?: boolean;

package/enums/HangupType.d.ts

@@ -12,6 +12,7 @@ declare enum HangupType {
     NETWORK_ERROR = "NETWORK_ERROR",
     KILLED = "KILLED",
     BANNED = "BANNED",
+    HAS_ACTIVE_CALL = "HAS_ACTIVE_CALL",
     CALLER_IS_BLOCKED = "CALLER_IS_BLOCKED",
     NOT_FRIENDS = "NOT_FRIENDS",
     CALLEE_IS_OFFLINE = "CALLEE_IS_OFFLINE",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/calls-sdk",
-  "version": "2.5.2-dev.b16dd83.0",
+  "version": "2.5.2",
   "author": "vk.com",
   "description": "Library for video calls based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -14,12 +14,12 @@
     "**/*.d.ts"
   ],
   "dependencies": {
-    "@vkontakte/calls-video-effects": "^1.0.6-beta.18",
+    "@vkontakte/calls-video-effects": "1.0.6-beta.18",
     "@vkontakte/libvpx": "2.0.9",
     "big-integer": "1.6.48",
     "bit-buffer": "0.2.5",
     "messagepack": "1.1.12",
-    "simple-ebml-builder": "^0.2.2",
+    "simple-ebml-builder": "0.2.2",
     "webrtc-adapter": "7.7.0"
   }
 }

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 } from '../types/ExternalId';
+import { ExternalId, ExternalParticipant, ExternalParticipantId } from '../types/ExternalId';
 import MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
 import MuteStates from '../types/MuteStates';
@@ -66,7 +66,7 @@ declare namespace External {
      * @param userId
      * @param stream
      */
-    function onRemoteStream(userId: ExternalId, stream: MediaStream | null): void;
+    function onRemoteStream(userId: ExternalParticipantId, stream: MediaStream | null): void;
     /**
      * Получен стрим лайв от собеседника.
      * Если сервер закончил стримить собеседника, вместо стрима будет передан null
@@ -75,7 +75,7 @@ declare namespace External {
      * @param streamName
      * @param stream
      */
-    function onRemoteLive(userId: ExternalId, streamName: string, stream: MediaStream | null): void;
+    function onRemoteLive(userId: ExternalParticipantId, streamName: string, stream: MediaStream | null): void;
     /**
      * Получен стрим с экрана собеседника.
      * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
@@ -83,7 +83,7 @@ declare namespace External {
      * @param userId
      * @param stream
      */
-    function onRemoteScreenStream(userId: ExternalId, stream: MediaStream | null): void;
+    function onRemoteScreenStream(userId: ExternalParticipantId, stream: MediaStream | null): void;
     /**
      * Начат звонок
      *
@@ -92,21 +92,21 @@ declare namespace External {
      * @param muteStates Состояние устройств при входе в звонок
      * @param participants Список участников звонка (при `Params.batchParticipantsOnStart = true`)
      */
-    function onConversation(userId: ExternalId, mediaModifiers: MediaModifiers, muteStates: MuteStates, participants?: ExternalParticipant[]): void;
+    function onConversation(userId: ExternalParticipantId, mediaModifiers: MediaModifiers, muteStates: MuteStates, participants?: ExternalParticipant[]): void;
     /**
      * Изменились данные стрима собеседника
      *
      * @param userId
      * @param mediaSettings
      */
-    function onRemoteMediaSettings(userId: ExternalId, mediaSettings: MediaSettings): void;
+    function onRemoteMediaSettings(userId: ExternalParticipantId, mediaSettings: MediaSettings): void;
     /**
      * Изменились данные состояний собеседника
      *
      * @param userId
      * @param participantState
      */
-    function onRemoteParticipantState(userId: ExternalId, participantState: {
+    function onRemoteParticipantState(userId: ExternalParticipantId, participantState: {
         [key: string]: string;
     } | ParticipantStateMapped): void;
     /**
@@ -116,7 +116,7 @@ declare namespace External {
      * @param status
      * @param data
      */
-    function onRemoteStatus(userIds: ExternalId[], status: ParticipantStatus, data?: any): void;
+    function onRemoteStatus(userIds: ExternalParticipantId[], status: ParticipantStatus, data?: any): void;
     /**
      * Изменился статус соединения собеседника
      *
@@ -125,7 +125,7 @@ declare namespace External {
      * @param data
      * @deprecated
      */
-    function onParticipantStatus(userId: ExternalId, status: ParticipantStatus, data?: any): void;
+    function onParticipantStatus(userId: ExternalParticipantId, status: ParticipantStatus, data?: any): void;
     /**
      * Разрешения на доступы были запрошены в браузере
      */
@@ -141,7 +141,7 @@ declare namespace External {
      *
      * @param userId
      */
-    function onRemoteRemoved(userId: ExternalId): void;
+    function onRemoteRemoved(userId: ExternalParticipantId): void;
     /**
      * Изменилось состояние звонка
      *
@@ -168,7 +168,7 @@ declare namespace External {
      * @param userId Пользователь, для которого изменились разрешения или `null` для текущего пользователя
      * @param adminId Пользователь, который изменил разрешения
      */
-    function onMuteStates(muteStates: MuteStates, unmuteOptions: MediaOption[], mediaOptions: MediaOption[], muteAll?: boolean, unmute?: boolean, userId?: ExternalId | null, adminId?: ExternalId | null): void;
+    function onMuteStates(muteStates: MuteStates, unmuteOptions: MediaOption[], mediaOptions: MediaOption[], muteAll?: boolean, unmute?: boolean, userId?: ExternalParticipantId | null, adminId?: ExternalParticipantId | null): void;
     /**
      * Изменились роли собеседника в звонке
      *
@@ -188,7 +188,7 @@ declare namespace External {
      * @param userId Внешний ID пользователя
      * @param unpin Открепить или закрепить
      */
-    function onPinnedParticipant(userId: ExternalId, unpin: boolean): void;
+    function onPinnedParticipant(userId: ExternalParticipantId, unpin: boolean): void;
     /**
      * Закрепляет/открепляет текущего пользователя у других собеседников
      *
@@ -211,14 +211,14 @@ declare namespace External {
      *
      * @param userId
      */
-    function onSpeakerChanged(userId: ExternalId): void;
+    function onSpeakerChanged(userId: ExternalParticipantId): void;
     /**
      * Громкость собеседников
      *
      * @param volumes
      */
     function onVolumesDetected(volumes: {
-        uid: ExternalId;
+        uid: ExternalParticipantId;
         volume: number;
     }[]): void;
     /**
@@ -256,7 +256,7 @@ declare namespace External {
      * @param from ID отправителя
      * @param direct Личное сообщение или общее
      */
-    function onChatMessage(message: string, from: ExternalId, direct?: boolean): void;
+    function onChatMessage(message: string, from: ExternalParticipantId, direct?: boolean): void;
     /**
      * Получены данные от собеседника
      *
@@ -264,7 +264,7 @@ declare namespace External {
      * @param from ID отправителя
      * @param direct Личное сообщение или общее
      */
-    function onCustomData(data: JSONObject, from: ExternalId, direct?: boolean): void;
+    function onCustomData(data: JSONObject, from: ExternalParticipantId, direct?: boolean): void;
     /**
      * Начата запись звонка
      *
@@ -275,7 +275,7 @@ declare namespace External {
      * @param externalMovieId Внешний ID ролика
      * @param externalOwnerId Внешний ID пользователя/группы от которого ведётся трансляция
      */
-    function onRecordStarted(initiator: ExternalId, movieId: number, startTime: number, type: 'STREAM' | 'RECORD', externalMovieId?: string, externalOwnerId?: string): void;
+    function onRecordStarted(initiator: ExternalParticipantId, movieId: number, startTime: number, type: 'STREAM' | 'RECORD', externalMovieId?: string, externalOwnerId?: string): void;
     /**
      * Закончена запись звонка
      */
@@ -292,7 +292,7 @@ declare namespace External {
      * @param status Оценки качества соединения участников от 0 до 1
      */
     function onNetworkStatusChanged(status: {
-        uid: ExternalId;
+        uid: ExternalParticipantId;
         rating: number;
     }[]): void;
     /**