@vkontakte/calls-sdk 2.4.4-beta.9 → 2.4.4-dev.23d413b.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -12,10 +12,11 @@ import UpdateDisplayLayoutErrorReason from '../enums/UpdateDisplayLayoutErrorRea
12
12
  import UserRole from '../enums/UserRole';
13
13
  import UserType from '../enums/UserType';
14
14
  import { JSONObject } from '../static/Json';
15
- import { ExternalId } from '../types/ExternalId';
15
+ import { ExternalParticipantId } from '../types/ExternalId';
16
16
  import MediaModifiers from '../types/MediaModifiers';
17
+ import { IVideoDimentions } from '../types/MediaSettings';
17
18
  import MuteStates from '../types/MuteStates';
18
- import { CompositeUserId, OkUserId } from '../types/Participant';
19
+ import { CompositeUserId, OkUserId, ParticipantId } from '../types/Participant';
19
20
  import { ParticipantLayout } from '../types/ParticipantLayout';
20
21
  import ParticipantPriority from '../types/ParticipantPriority';
21
22
  import { ParticipantStreamDescription } from '../types/ParticipantStreamDescription';
@@ -28,8 +29,8 @@ import { TransportTopology } from './transport/Transport';
28
29
  */
29
30
  export declare type ConversationData = {
30
31
  userId: OkUserId;
31
- compositeUserId: CompositeUserId;
32
- externalId: ExternalId;
32
+ compositeUserId: ParticipantId;
33
+ externalId: ExternalParticipantId;
33
34
  /**
34
35
  * Время принятия звонка
35
36
  */
@@ -54,7 +55,7 @@ export declare type ConversationData = {
54
55
  * Токен комнаты для подключения к звонку по ссылке
55
56
  */
56
57
  joinLink?: string;
57
- pinnedParticipantId: CompositeUserId | null;
58
+ pinnedParticipantId: ParticipantId | null;
58
59
  mediaModifiers: MediaModifiers;
59
60
  options: ConversationOption[];
60
61
  muteStates: MuteStates;
@@ -85,7 +86,6 @@ export default class Conversation extends EventEmitter {
85
86
  private _activeSpeakerId;
86
87
  private _lastSignalledActiveSpeakerId;
87
88
  private _serverSettings;
88
- private _signalingServerSettings;
89
89
  private static _current;
90
90
  private static _activationMutex;
91
91
  private static _delayedHangup;
@@ -139,7 +139,7 @@ export default class Conversation extends EventEmitter {
139
139
  */
140
140
  private _prepareConversation;
141
141
  private _createParticipant;
142
- private _getUserId;
142
+ private _getParticipantId;
143
143
  private _setConversation;
144
144
  private _updateConversation;
145
145
  private _createMediaSource;
@@ -194,8 +194,8 @@ export default class Conversation extends EventEmitter {
194
194
  private _isCallAdmin;
195
195
  private _checkAdminRole;
196
196
  grantRoles(participantId: CompositeUserId, roles: UserRole[], revoke: boolean): Promise<void>;
197
- muteParticipant(participantId: CompositeUserId | null, muteStates: MuteStates, requestedMedia?: MediaOption[]): Promise<void>;
198
- pinParticipant(participantId: CompositeUserId, unpin: boolean): Promise<void>;
197
+ muteParticipant(participantId: ParticipantId | null, muteStates: MuteStates, requestedMedia?: MediaOption[]): Promise<void>;
198
+ pinParticipant(participantId: ParticipantId, unpin: boolean): Promise<void>;
199
199
  updateMediaModifiers(mediaModifiers: MediaModifiers): Promise<void>;
200
200
  changeOptions(changes: {
201
201
  [key in ConversationOption]?: boolean;
@@ -208,23 +208,25 @@ export default class Conversation extends EventEmitter {
208
208
  promoteParticipant(participantId: CompositeUserId, demote?: boolean): Promise<void>;
209
209
  chatMessage(message: string, participantId?: CompositeUserId | null): Promise<void>;
210
210
  chatHistory(count: number): Promise<void>;
211
- customData(data: JSONObject, participantId?: CompositeUserId | null): Promise<void>;
211
+ customData(data: JSONObject, participantId?: ParticipantId | null): Promise<void>;
212
212
  createJoinLink(): Promise<string>;
213
213
  removeJoinLink(): Promise<never>;
214
214
  addMovie(movieId: string): Promise<{
215
215
  movieId: string;
216
216
  streamType: string;
217
217
  }>;
218
- updateMovie(movieId: string, gain?: number): Promise<void>;
218
+ updateMovie(movieId: string, gain?: number, offset?: string, pause?: boolean): Promise<void>;
219
219
  removeMovie(movieId: string): Promise<void>;
220
220
  startStream(isRecord?: boolean, name?: string | null, movieId?: string | null, privacy?: 'PUBLIC' | 'FRIENDS' | 'DIRECT_LINK', groupId?: string | null): Promise<SignalingMessage>;
221
221
  stopStream(): Promise<SignalingMessage>;
222
- recordSetRole(participantId: CompositeUserId, role: RecordRole | null): Promise<void>;
222
+ recordSetRole(participantId: ParticipantId, role: RecordRole | null): Promise<void>;
223
223
  getStreamInfo(): Promise<{
224
224
  movieId: any;
225
225
  preview: any;
226
226
  }>;
227
- setLocalResolution(width: number, height: number): Promise<void>;
227
+ setLocalResolution(width: number, height: number, params?: {
228
+ effect: IVideoDimentions;
229
+ }): Promise<void>;
228
230
  videoEffect(effect: IEffect | null): Promise<void>;
229
231
  private _onLocalMediaStreamChanged;
230
232
  private _onScreenSharingStatus;
@@ -284,11 +286,11 @@ export default class Conversation extends EventEmitter {
284
286
  }
285
287
  export declare class UpdateDisplayLayoutError extends Error {
286
288
  readonly participantErrors: {
287
- externalId: ExternalId;
289
+ externalId: ExternalParticipantId;
288
290
  errorReason: UpdateDisplayLayoutErrorReason;
289
291
  }[];
290
292
  constructor(m: string, participantErrors: {
291
- externalId: ExternalId;
293
+ externalId: ExternalParticipantId;
292
294
  errorReason: UpdateDisplayLayoutErrorReason;
293
295
  }[]);
294
296
  }
@@ -1,8 +1,8 @@
1
- import { CompositeUserId, Participant } from '../types/Participant';
1
+ import { Participant, ParticipantId } from '../types/Participant';
2
2
  import EventEmitter from './EventEmitter';
3
3
  import { StatResult } from './transport/Statistics';
4
4
  export default class DebugInfo extends EventEmitter {
5
5
  private _lastMemoryStat;
6
- onRemoteDataStats(stats: StatResult, participants: Record<CompositeUserId, Participant>): void;
6
+ onRemoteDataStats(stats: StatResult, participants: Record<ParticipantId, Participant>): void;
7
7
  _calcMemory(): void;
8
8
  }
@@ -16,8 +16,12 @@ export declare const enum MediaTrackKind {
16
16
  'screen' = "screen"
17
17
  }
18
18
  export declare class MediaSource extends EventEmitter {
19
+ /** Стрим с камеры и микрофона пользователя */
19
20
  private _stream;
21
+ /** Последний сохраненный оригинальный видео трек с камеры */
22
+ private _trackVideoStreamBackup;
20
23
  private _screenTrack;
24
+ /** Трек для отправки в медиа-канал. Может отличаться при скриншаринге в дата-канал */
21
25
  private _sendVideoTrack;
22
26
  private _mediaSettings;
23
27
  private _videoStatusOnScreenCapturingEnabled;
@@ -39,6 +43,11 @@ export declare class MediaSource extends EventEmitter {
39
43
  setVideoStream(stream: MediaStream, isScreen: boolean): Promise<void>;
40
44
  private _initDeviceChangeListener;
41
45
  private _changeVideoInput;
46
+ /**
47
+ * хелпер для получения трека для передаче либе эффектов. нужен для сохранения оригинального трека с камеры.
48
+ * рассчитываем, что либы при очистке останавливают треки, поэтому передаем копию.
49
+ */
50
+ private _getVideoEffectTrack;
42
51
  /**
43
52
  * Установка кастомного стрима для аудио, например аудио-трек вместо звука с микрофона.
44
53
  * Может использоваться для тестирования.
@@ -50,6 +59,8 @@ export declare class MediaSource extends EventEmitter {
50
59
  private _replaceLocalTrack;
51
60
  private _stopLocalTrack;
52
61
  private _videoEffect;
62
+ /** останавливает и удаляет сохраненный трек с камеры пользователя */
63
+ private _stopAndRemoveTrackVideoStreamBackup;
53
64
  destroy(): void;
54
65
  toggleScreenCapturing(enabled: boolean): Promise<void>;
55
66
  toggleVideo(enabled: boolean): Promise<void>;
@@ -1,4 +1,4 @@
1
- import { CompositeUserId } from '../types/Participant';
1
+ import { ParticipantId } from '../types/Participant';
2
2
  import EventEmitter from './EventEmitter';
3
3
  import { Transport } from './transport/Transport';
4
4
  import { VolumeLevel } from './VolumeDetector';
@@ -14,7 +14,7 @@ export declare class SpeakerDetector extends EventEmitter {
14
14
  _onVolumesDetected(volumes: {
15
15
  [key: string]: VolumeLevel;
16
16
  }): void;
17
- _onServerSpeakerChanged(speakerId: CompositeUserId): void;
17
+ _onServerSpeakerChanged(speakerId: ParticipantId): void;
18
18
  _onReceivedServerAudioActivity(): void;
19
19
  _onStoppedReceivingServerAudioActivity(): void;
20
20
  }
@@ -1,5 +1,5 @@
1
1
  import MediaSettings from '../types/MediaSettings';
2
- import { CompositeUserId, Participant } from '../types/Participant';
2
+ import { Participant, ParticipantId } from '../types/Participant';
3
3
  import EventEmitter from './EventEmitter';
4
4
  import { Transport } from './transport/Transport';
5
5
  import { VolumesDetector } from './VolumesDetector';
@@ -10,9 +10,9 @@ export default class SpecListener extends EventEmitter {
10
10
  private readonly _participants;
11
11
  private _connectionTimeout;
12
12
  private _volumeTimeout;
13
- constructor(transport: Transport, volumesDetector: VolumesDetector, participants: Record<CompositeUserId, Participant>);
13
+ constructor(transport: Transport, volumesDetector: VolumesDetector, participants: Record<ParticipantId, Participant>);
14
14
  destroy(): void;
15
- onChangeRemoteMediaSettings(participantId: CompositeUserId, mediaSettings: MediaSettings): void;
15
+ onChangeRemoteMediaSettings(participantId: ParticipantId, mediaSettings: MediaSettings): void;
16
16
  private _onTransportStateChanged;
17
17
  private _onVolumesDetected;
18
18
  private _onConnectionTimeout;
@@ -0,0 +1,25 @@
1
+ import { ParticipantId } from '../../types/Participant';
2
+ import { FrameChunk } from './Utils';
3
+ export declare abstract class BaseStreamBuilder {
4
+ protected readonly _participantId: ParticipantId;
5
+ protected readonly _onStream: (stream: MediaStream) => void;
6
+ protected _chunks: FrameChunk[];
7
+ protected constructor(participantId: ParticipantId, onStream: (stream: MediaStream) => void);
8
+ appendChunk(chunk: FrameChunk): void;
9
+ destroy(): void;
10
+ protected abstract _processFrame(frame: FrameData): void;
11
+ private _processFrameData;
12
+ static getFrameSize(frameData: Uint8Array): {
13
+ width: number;
14
+ height: number;
15
+ };
16
+ static isBrowserSupported(): boolean;
17
+ }
18
+ export interface FrameData {
19
+ timestamp: number;
20
+ frameData: Uint8Array;
21
+ isVP9: boolean;
22
+ keyframe: boolean;
23
+ width: number;
24
+ height: number;
25
+ }
@@ -1,4 +1,4 @@
1
- import { CompositeUserId } from '../../types/Participant';
1
+ import { ParticipantId } from '../../types/Participant';
2
2
  import { ParticipantIdRegistry } from '../ParticipantIdRegistry';
3
3
  export default class ScreenCaptureReceiver {
4
4
  private readonly _datachannel;
@@ -8,7 +8,7 @@ export default class ScreenCaptureReceiver {
8
8
  private _onEos;
9
9
  constructor(datachannel: RTCDataChannel, participantIdRegistry: ParticipantIdRegistry, onStream: (streamId: string, stream: MediaStream) => void, onEos: (streamId: string) => void);
10
10
  private _onDataChannelMessage;
11
- close(participantId: CompositeUserId): void;
11
+ close(participantId: ParticipantId): void;
12
12
  destroy(): void;
13
13
  static isBrowserSupported(): boolean;
14
14
  }
@@ -1,25 +1,21 @@
1
- import { CompositeUserId } from '../../types/Participant';
2
- import { FrameChunk } from './Utils';
3
- export default class StreamBuilder {
1
+ import { ParticipantId } from '../../types/Participant';
2
+ import { BaseStreamBuilder, FrameData } from './BaseStreamBuilder';
3
+ export default class StreamBuilder extends BaseStreamBuilder {
4
4
  private readonly _decoder;
5
5
  private _decoderReady;
6
6
  private _decoderQueue;
7
- private readonly _participantId;
8
- private _chunks;
9
7
  private readonly _useImageBitmap;
10
- private _onStream;
11
8
  private _canvas;
12
9
  private _canvasContext;
13
10
  private _stream;
14
11
  private _track;
15
- constructor(participantId: CompositeUserId, onStream: (stream: MediaStream) => void);
12
+ constructor(participantId: ParticipantId, onStream: (stream: MediaStream) => void);
16
13
  private _createStream;
17
14
  private _removeStream;
18
- private _processFrameData;
19
15
  private _requestCanvasFrame;
20
16
  private _drawImage;
21
- private _decodeFrame;
17
+ protected _processFrame(frame: FrameData): void;
22
18
  private _decodeQueue;
23
- appendChunk(chunk: FrameChunk): void;
24
19
  destroy(): void;
20
+ static isBrowserSupported(): boolean;
25
21
  }
@@ -0,0 +1,19 @@
1
+ import { ParticipantId } from '../../types/Participant';
2
+ import { BaseStreamBuilder, FrameData } from './BaseStreamBuilder';
3
+ export default class WebmBuilder extends BaseStreamBuilder {
4
+ private _mediaBuffer;
5
+ private _video;
6
+ private _stream;
7
+ private _earliestTimestamp;
8
+ private _clusterStartTime;
9
+ private _lastFrameTimestamp;
10
+ constructor(participantId: ParticipantId, onStream: (stream: MediaStream) => void);
11
+ private static _intToU16BE;
12
+ private static _genWebmHeader;
13
+ private static _genSegmentHeader;
14
+ private static _genClusterHeader;
15
+ private _createVideo;
16
+ protected _processFrame(frame: FrameData): void;
17
+ destroy(): void;
18
+ static isBrowserSupported(): boolean;
19
+ }
@@ -1,5 +1,5 @@
1
1
  import BaseSignaling from '../../abstract/BaseSignaling';
2
- import { CompositeUserId } from '../../types/Participant';
2
+ import { ParticipantId } from '../../types/Participant';
3
3
  import ServerSettings from '../../types/ServerSettings';
4
4
  import EventEmitter from '../EventEmitter';
5
5
  import { MediaSource } from '../MediaSource';
@@ -30,7 +30,7 @@ export default class DirectTransport extends EventEmitter {
30
30
  private _lastNetworkStat;
31
31
  private _remoteNetworkStat;
32
32
  private _networkLimits;
33
- constructor(participantId: CompositeUserId, isMaster: boolean, signaling: BaseSignaling, mediaSource: MediaSource, serverSettings: ServerSettings);
33
+ constructor(participantId: ParticipantId, isMaster: boolean, signaling: BaseSignaling, mediaSource: MediaSource, serverSettings: ServerSettings);
34
34
  getState(): TransportState;
35
35
  updateStatisticsInterval(): void;
36
36
  open(peerId?: string | null): Promise<void>;
@@ -1,5 +1,5 @@
1
1
  import BaseSignaling from '../../abstract/BaseSignaling';
2
- import { CompositeUserId } from '../../types/Participant';
2
+ import { ParticipantId } from '../../types/Participant';
3
3
  import ServerSettings from '../../types/ServerSettings';
4
4
  import SignalingMessage from '../../types/SignalingMessage';
5
5
  import EventEmitter from '../EventEmitter';
@@ -37,7 +37,7 @@ export default class ServerTransport extends EventEmitter {
37
37
  updateStatisticsInterval(): void;
38
38
  open(): void;
39
39
  close(error?: Error): void;
40
- removeParticipant(participantId: CompositeUserId): void;
40
+ removeParticipant(participantId: ParticipantId): void;
41
41
  preventRestart(): void;
42
42
  allowRestart(): void;
43
43
  updateSettings(settings: ServerSettings): void;
@@ -1,4 +1,4 @@
1
- import { ExternalId } from '../../types/ExternalId';
1
+ import { ExternalParticipantId } from '../../types/ExternalId';
2
2
  import { TransportTopology } from './Transport';
3
3
  export declare type StatTransport = {
4
4
  totalRoundTripTime: number;
@@ -20,7 +20,7 @@ export declare type StatRtp = {
20
20
  pliCount: number;
21
21
  firCount: number;
22
22
  nackCount: number;
23
- userId?: string | ExternalId;
23
+ userId?: string | ExternalParticipantId;
24
24
  bandwidth?: number;
25
25
  packetLoss?: number;
26
26
  clockRate?: number;
@@ -1,5 +1,5 @@
1
1
  import BaseSignaling from '../../abstract/BaseSignaling';
2
- import { CompositeUserId } from '../../types/Participant';
2
+ import { ParticipantId } from '../../types/Participant';
3
3
  import ServerSettings from '../../types/ServerSettings';
4
4
  import EventEmitter from '../EventEmitter';
5
5
  import { MediaSource } from '../MediaSource';
@@ -48,12 +48,12 @@ export declare class Transport extends EventEmitter {
48
48
  constructor(topology: TransportTopology, signaling: BaseSignaling, mediaSource: MediaSource, serverSettings: ServerSettings);
49
49
  updateSettings(settings: ServerSettings): void;
50
50
  updateStatisticsInterval(): void;
51
- allocate(participantId: CompositeUserId, isMaster?: boolean): void;
52
- open(participantIds: CompositeUserId[], peerId?: string | null): void;
53
- close(participantId: CompositeUserId): void;
51
+ allocate(participantId: ParticipantId, isMaster?: boolean): void;
52
+ open(participantIds: ParticipantId[], peerId?: string | null): void;
53
+ close(participantId: ParticipantId): void;
54
54
  destroy(): void;
55
55
  getTopology(): TransportTopology;
56
- isAllocated(participantId: CompositeUserId): boolean;
56
+ isAllocated(participantId: ParticipantId): boolean;
57
57
  allocated(): string[];
58
58
  opened(): string[];
59
59
  private _setStates;
package/default/Api.d.ts CHANGED
@@ -10,7 +10,7 @@ export default class Api extends BaseApi {
10
10
  private _externalUidsCache;
11
11
  private _callUnsafe;
12
12
  private _call;
13
- userId(participantId: CompositeUserId): Promise<ExternalId>;
13
+ userId(compositeUserId: CompositeUserId): Promise<ExternalId>;
14
14
  prepareUserIds(ids: OkUserId[]): Promise<void>;
15
15
  authorize(): Promise<void>;
16
16
  log(items: LogItem[]): void;
@@ -12,7 +12,7 @@ import { JSONObject } from '../static/Json';
12
12
  import MediaModifiers from '../types/MediaModifiers';
13
13
  import MediaSettings from '../types/MediaSettings';
14
14
  import MuteStates from '../types/MuteStates';
15
- import { CompositeUserId } from '../types/Participant';
15
+ import { CompositeUserId, ParticipantId } from '../types/Participant';
16
16
  import SignalingMessage from '../types/SignalingMessage';
17
17
  import { WaitingParticipantId } from '../types/WaitingHall';
18
18
  export default class Signaling extends BaseSignaling {
@@ -71,9 +71,9 @@ export default class Signaling extends BaseSignaling {
71
71
  private static _isDataChannelResponseRequired;
72
72
  getNextCommandSequenceNumber(): number;
73
73
  hangup(reason: string): Promise<SignalingMessage | void>;
74
- sendCandidate(participantId: CompositeUserId, candidate: RTCIceCandidate): Promise<SignalingMessage>;
74
+ sendCandidate(participantId: ParticipantId, candidate: RTCIceCandidate): Promise<SignalingMessage>;
75
75
  requestTestMode(command: string): Promise<SignalingMessage>;
76
- sendSdp(participantId: CompositeUserId, sdp: RTCSessionDescription): Promise<SignalingMessage>;
76
+ sendSdp(participantId: ParticipantId, sdp: RTCSessionDescription): Promise<SignalingMessage>;
77
77
  acceptCall(mediaSettings: MediaSettings): Promise<SignalingMessage>;
78
78
  changeMediaSettings(mediaSettings: MediaSettings): Promise<SignalingMessage>;
79
79
  changeParticipantState(state: {
@@ -96,17 +96,17 @@ export default class Signaling extends BaseSignaling {
96
96
  removeMovie(data: any): Promise<SignalingMessage>;
97
97
  startStream(data: any): Promise<SignalingMessage>;
98
98
  stopStream(): Promise<SignalingMessage>;
99
- recordSetRole(participantId: CompositeUserId, role: RecordRole | null): Promise<SignalingMessage>;
99
+ recordSetRole(participantId: ParticipantId, role: RecordRole | null): Promise<SignalingMessage>;
100
100
  getRecordStatus(): Promise<SignalingMessage>;
101
101
  switchTopology(topology: TransportTopology, force?: boolean): Promise<SignalingMessage>;
102
102
  requestRealloc(): Promise<SignalingMessage>;
103
103
  reportPerfStat(report: PerfStatReport): Promise<SignalingMessage>;
104
104
  chatMessage(message: string, participantId?: CompositeUserId | null): Promise<SignalingMessage>;
105
105
  chatHistory(count: number): Promise<SignalingMessage>;
106
- customData(data: JSONObject, participantId: CompositeUserId | null): Promise<SignalingMessage>;
106
+ customData(data: JSONObject, participantId: ParticipantId | null): Promise<SignalingMessage>;
107
107
  grantRoles(participantId: CompositeUserId, roles: UserRole[], revoke: boolean): Promise<SignalingMessage>;
108
- muteParticipant(participantId: CompositeUserId | null, muteStates: MuteStates, requestedMedia: MediaOption[]): Promise<SignalingMessage>;
109
- pinParticipant(participantId: CompositeUserId, unpin: boolean): Promise<SignalingMessage>;
108
+ muteParticipant(participantId: ParticipantId | null, muteStates: MuteStates, requestedMedia: MediaOption[]): Promise<SignalingMessage>;
109
+ pinParticipant(participantId: ParticipantId, unpin: boolean): Promise<SignalingMessage>;
110
110
  updateMediaModifiers(mediaModifiers: MediaModifiers): Promise<SignalingMessage>;
111
111
  changeOptions(changes: {
112
112
  [key in ConversationOption]?: boolean;
@@ -10,6 +10,8 @@ declare enum HangupType {
10
10
  BUSY = "BUSY",
11
11
  FAILED = "FAILED",
12
12
  NETWORK_ERROR = "NETWORK_ERROR",
13
+ KILLED = "KILLED",
14
+ BANNED = "BANNED",
13
15
  CALLER_IS_BLOCKED = "CALLER_IS_BLOCKED",
14
16
  NOT_FRIENDS = "NOT_FRIENDS",
15
17
  CALLEE_IS_OFFLINE = "CALLEE_IS_OFFLINE",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vkontakte/calls-sdk",
3
- "version": "2.4.4-beta.9",
3
+ "version": "2.4.4-dev.23d413b.0",
4
4
  "author": "vk.com",
5
5
  "description": "Library for video calls based on the vk.com platform",
6
6
  "homepage": "https://vk.com",
@@ -14,10 +14,12 @@
14
14
  "**/*.d.ts"
15
15
  ],
16
16
  "dependencies": {
17
- "@vkontakte/calls-video-effects": "^1.0.6-beta.14",
17
+ "@vkontakte/calls-video-effects": "^1.0.6-beta.18",
18
18
  "@vkontakte/libvpx": "2.0.9",
19
19
  "big-integer": "1.6.48",
20
+ "bit-buffer": "0.2.5",
20
21
  "messagepack": "1.1.12",
22
+ "simple-ebml-builder": "^0.2.2",
21
23
  "webrtc-adapter": "7.7.0"
22
24
  }
23
25
  }
@@ -7,7 +7,7 @@ import ConversationOption from '../enums/ConversationOption';
7
7
  import FatalError from '../enums/FatalError';
8
8
  import MediaOption from '../enums/MediaOption';
9
9
  import UserRole from '../enums/UserRole';
10
- import { ExternalId, ExternalParticipant } from '../types/ExternalId';
10
+ import { ExternalId, ExternalParticipant, ExternalParticipantId } from '../types/ExternalId';
11
11
  import MediaModifiers from '../types/MediaModifiers';
12
12
  import MediaSettings from '../types/MediaSettings';
13
13
  import MuteStates from '../types/MuteStates';
@@ -66,7 +66,7 @@ declare namespace External {
66
66
  * @param userId
67
67
  * @param stream
68
68
  */
69
- function onRemoteStream(userId: ExternalId, stream: MediaStream | null): void;
69
+ function onRemoteStream(userId: ExternalParticipantId, stream: MediaStream | null): void;
70
70
  /**
71
71
  * Получен стрим лайв от собеседника.
72
72
  * Если сервер закончил стримить собеседника, вместо стрима будет передан null
@@ -75,7 +75,7 @@ declare namespace External {
75
75
  * @param streamName
76
76
  * @param stream
77
77
  */
78
- function onRemoteLive(userId: ExternalId, streamName: string, stream: MediaStream | null): void;
78
+ function onRemoteLive(userId: ExternalParticipantId, streamName: string, stream: MediaStream | null): void;
79
79
  /**
80
80
  * Получен стрим с экрана собеседника.
81
81
  * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
@@ -83,7 +83,7 @@ declare namespace External {
83
83
  * @param userId
84
84
  * @param stream
85
85
  */
86
- function onRemoteScreenStream(userId: ExternalId, stream: MediaStream | null): void;
86
+ function onRemoteScreenStream(userId: ExternalParticipantId, stream: MediaStream | null): void;
87
87
  /**
88
88
  * Начат звонок
89
89
  *
@@ -92,21 +92,21 @@ declare namespace External {
92
92
  * @param muteStates Состояние устройств при входе в звонок
93
93
  * @param participants Список участников звонка (при `Params.batchParticipantsOnStart = true`)
94
94
  */
95
- function onConversation(userId: ExternalId, mediaModifiers: MediaModifiers, muteStates: MuteStates, participants?: ExternalParticipant[]): void;
95
+ function onConversation(userId: ExternalParticipantId, mediaModifiers: MediaModifiers, muteStates: MuteStates, participants?: ExternalParticipant[]): void;
96
96
  /**
97
97
  * Изменились данные стрима собеседника
98
98
  *
99
99
  * @param userId
100
100
  * @param mediaSettings
101
101
  */
102
- function onRemoteMediaSettings(userId: ExternalId, mediaSettings: MediaSettings): void;
102
+ function onRemoteMediaSettings(userId: ExternalParticipantId, mediaSettings: MediaSettings): void;
103
103
  /**
104
104
  * Изменились данные состояний собеседника
105
105
  *
106
106
  * @param userId
107
107
  * @param participantState
108
108
  */
109
- function onRemoteParticipantState(userId: ExternalId, participantState: {
109
+ function onRemoteParticipantState(userId: ExternalParticipantId, participantState: {
110
110
  [key: string]: string;
111
111
  } | ParticipantStateMapped): void;
112
112
  /**
@@ -116,7 +116,7 @@ declare namespace External {
116
116
  * @param status
117
117
  * @param data
118
118
  */
119
- function onRemoteStatus(userIds: ExternalId[], status: ParticipantStatus, data?: any): void;
119
+ function onRemoteStatus(userIds: ExternalParticipantId[], status: ParticipantStatus, data?: any): void;
120
120
  /**
121
121
  * Изменился статус соединения собеседника
122
122
  *
@@ -125,7 +125,7 @@ declare namespace External {
125
125
  * @param data
126
126
  * @deprecated
127
127
  */
128
- function onParticipantStatus(userId: ExternalId, status: ParticipantStatus, data?: any): void;
128
+ function onParticipantStatus(userId: ExternalParticipantId, status: ParticipantStatus, data?: any): void;
129
129
  /**
130
130
  * Разрешения на доступы были запрошены в браузере
131
131
  */
@@ -141,7 +141,7 @@ declare namespace External {
141
141
  *
142
142
  * @param userId
143
143
  */
144
- function onRemoteRemoved(userId: ExternalId): void;
144
+ function onRemoteRemoved(userId: ExternalParticipantId): void;
145
145
  /**
146
146
  * Изменилось состояние звонка
147
147
  *
@@ -168,7 +168,7 @@ declare namespace External {
168
168
  * @param userId Пользователь, для которого изменились разрешения или `null` для текущего пользователя
169
169
  * @param adminId Пользователь, который изменил разрешения
170
170
  */
171
- function onMuteStates(muteStates: MuteStates, unmuteOptions: MediaOption[], mediaOptions: MediaOption[], muteAll?: boolean, unmute?: boolean, userId?: ExternalId | null, adminId?: ExternalId | null): void;
171
+ function onMuteStates(muteStates: MuteStates, unmuteOptions: MediaOption[], mediaOptions: MediaOption[], muteAll?: boolean, unmute?: boolean, userId?: ExternalParticipantId | null, adminId?: ExternalParticipantId | null): void;
172
172
  /**
173
173
  * Изменились роли собеседника в звонке
174
174
  *
@@ -188,7 +188,7 @@ declare namespace External {
188
188
  * @param userId Внешний ID пользователя
189
189
  * @param unpin Открепить или закрепить
190
190
  */
191
- function onPinnedParticipant(userId: ExternalId, unpin: boolean): void;
191
+ function onPinnedParticipant(userId: ExternalParticipantId, unpin: boolean): void;
192
192
  /**
193
193
  * Закрепляет/открепляет текущего пользователя у других собеседников
194
194
  *
@@ -211,14 +211,14 @@ declare namespace External {
211
211
  *
212
212
  * @param userId
213
213
  */
214
- function onSpeakerChanged(userId: ExternalId): void;
214
+ function onSpeakerChanged(userId: ExternalParticipantId): void;
215
215
  /**
216
216
  * Громкость собеседников
217
217
  *
218
218
  * @param volumes
219
219
  */
220
220
  function onVolumesDetected(volumes: {
221
- uid: ExternalId;
221
+ uid: ExternalParticipantId;
222
222
  volume: number;
223
223
  }[]): void;
224
224
  /**
@@ -256,7 +256,7 @@ declare namespace External {
256
256
  * @param from ID отправителя
257
257
  * @param direct Личное сообщение или общее
258
258
  */
259
- function onChatMessage(message: string, from: ExternalId, direct?: boolean): void;
259
+ function onChatMessage(message: string, from: ExternalParticipantId, direct?: boolean): void;
260
260
  /**
261
261
  * Получены данные от собеседника
262
262
  *
@@ -264,7 +264,7 @@ declare namespace External {
264
264
  * @param from ID отправителя
265
265
  * @param direct Личное сообщение или общее
266
266
  */
267
- function onCustomData(data: JSONObject, from: ExternalId, direct?: boolean): void;
267
+ function onCustomData(data: JSONObject, from: ExternalParticipantId, direct?: boolean): void;
268
268
  /**
269
269
  * Начата запись звонка
270
270
  *
@@ -275,7 +275,7 @@ declare namespace External {
275
275
  * @param externalMovieId Внешний ID ролика
276
276
  * @param externalOwnerId Внешний ID пользователя/группы от которого ведётся трансляция
277
277
  */
278
- function onRecordStarted(initiator: ExternalId, movieId: number, startTime: number, type: 'STREAM' | 'RECORD', externalMovieId?: string, externalOwnerId?: string): void;
278
+ function onRecordStarted(initiator: ExternalParticipantId, movieId: number, startTime: number, type: 'STREAM' | 'RECORD', externalMovieId?: string, externalOwnerId?: string): void;
279
279
  /**
280
280
  * Закончена запись звонка
281
281
  */
@@ -292,7 +292,7 @@ declare namespace External {
292
292
  * @param status Оценки качества соединения участников от 0 до 1
293
293
  */
294
294
  function onNetworkStatusChanged(status: {
295
- uid: ExternalId;
295
+ uid: ExternalParticipantId;
296
296
  rating: number;
297
297
  }[]): void;
298
298
  /**