@vkontakte/calls-sdk 2.6.2-dev.974887b.0 → 2.6.2-dev.9a503c1.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.
@@ -15,6 +15,7 @@ import { JSONObject } from '../static/Json';
15
15
  import { ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk, ExternalUserId } from '../types/ExternalId';
16
16
  import MediaModifiers from '../types/MediaModifiers';
17
17
  import { IVideoDimentions } from '../types/MediaSettings';
18
+ import { IAddMovieParams } from '../types/MovieShare';
18
19
  import MuteStates from '../types/MuteStates';
19
20
  import { CompositeUserId, IGetParticipantsParameters, OkUserId, ParticipantId } from '../types/Participant';
20
21
  import { ParticipantLayout } from '../types/ParticipantLayout';
@@ -37,6 +38,7 @@ export declare type ConversationData = {
37
38
  */
38
39
  acceptTime: number | null;
39
40
  features: ConversationFeature[];
41
+ featuresPerRole?: Partial<Record<ConversationFeature, UserRole[]>> | null;
40
42
  /**
41
43
  * ID звонка
42
44
  */
@@ -76,6 +78,7 @@ export default class Conversation extends EventEmitter {
76
78
  private readonly _signaling;
77
79
  private _mediaSource;
78
80
  private _conversation;
81
+ private _myLastRequestedLayouts;
79
82
  private _state;
80
83
  private _participantState;
81
84
  private _participants;
@@ -106,7 +109,7 @@ export default class Conversation extends EventEmitter {
106
109
  static current(): Conversation | null;
107
110
  static hangupAfterInit(): void;
108
111
  static id(): string | null;
109
- onStart(opponentIds: OkUserId[], opponentType: CallType, mediaOptions: MediaOption[], payload?: string, joiningAllowed?: boolean, requireAuthToJoin?: boolean): Promise<ConversationData>;
112
+ onStart(opponentIds: OkUserId[], opponentType: CallType, mediaOptions: MediaOption[], payload?: string, joiningAllowed?: boolean, requireAuthToJoin?: boolean, onlyAdminCanShareMovie?: boolean): Promise<ConversationData>;
110
113
  onJoin(joinArgs: {
111
114
  conversationId?: string;
112
115
  mediaOptions: MediaOption[];
@@ -151,10 +154,12 @@ export default class Conversation extends EventEmitter {
151
154
  private _processConnection;
152
155
  private _prepareParticipants;
153
156
  private _onConversationParticipantListChunk;
157
+ private _createParticipantListChunk;
154
158
  private _participantListChunkToExternalChunk;
155
159
  private _registerConnectionParticipants;
156
160
  private _registerParticipants;
157
- private _getClientType;
161
+ /** Установим состояние локальных мьютов */
162
+ private _registerParticipantLocalMuteState;
158
163
  private _getStatusByTransportState;
159
164
  private _registerParticipantInCache;
160
165
  private _getExistedParticipantByIdOrCreate;
@@ -206,6 +211,9 @@ export default class Conversation extends EventEmitter {
206
211
  private _onParticipantSourcesUpdate;
207
212
  private _onParticipantPromoted;
208
213
  private _onChatRoomUpdated;
214
+ private _onSharedMovieUpdate;
215
+ private _onSharedMovieInfoStarted;
216
+ private _onSharedMovieInfoStopped;
209
217
  private _waitForStreamIfNeeded;
210
218
  private _matchStreamDescription;
211
219
  private _getWaitingTime;
@@ -213,6 +221,7 @@ export default class Conversation extends EventEmitter {
213
221
  private _checkAdminRole;
214
222
  grantRoles(participantId: CompositeUserId, roles: UserRole[], revoke: boolean): Promise<void>;
215
223
  muteParticipant(participantId: ParticipantId | null, muteStates: MuteStates, requestedMedia?: MediaOption[]): Promise<void>;
224
+ enableFeatureForRoles(feature: ConversationFeature, roles: UserRole[]): Promise<void>;
216
225
  pinParticipant(participantId: ParticipantId, unpin: boolean): Promise<void>;
217
226
  updateMediaModifiers(mediaModifiers: MediaModifiers): Promise<void>;
218
227
  changeOptions(changes: {
@@ -229,12 +238,16 @@ export default class Conversation extends EventEmitter {
229
238
  customData(data: JSONObject, participantId?: ParticipantId | null): Promise<void>;
230
239
  createJoinLink(): Promise<string>;
231
240
  removeJoinLink(): Promise<never>;
232
- addMovie(movieId: string): Promise<{
241
+ addMovie({ movieId, gain, metadata }: IAddMovieParams): Promise<{
233
242
  movieId: string;
234
243
  streamType: string;
235
244
  }>;
236
- updateMovie(movieId: string, gain?: number, offset?: string, pause?: boolean): Promise<void>;
245
+ updateMovie(movieId: string, gain?: number, offset?: number, pause?: boolean): Promise<void>;
237
246
  removeMovie(movieId: string): Promise<void>;
247
+ updateRooms(rooms: SignalingMessage.Room[], assignRandomly: boolean): Promise<void>;
248
+ activateRooms(roomIds: number[], deactivate: boolean): Promise<void>;
249
+ switchRoom(toRoomId?: number, participantId?: ParticipantId): Promise<void>;
250
+ removeRooms(roomIds: number[]): Promise<void>;
238
251
  startStream(isRecord?: boolean, name?: string | null, movieId?: string | null, privacy?: 'PUBLIC' | 'FRIENDS' | 'DIRECT_LINK', groupId?: string | null): Promise<SignalingMessage>;
239
252
  stopStream(): Promise<SignalingMessage>;
240
253
  recordSetRole(participantId: ParticipantId, role: RecordRole | null): Promise<void>;
@@ -305,6 +318,11 @@ export default class Conversation extends EventEmitter {
305
318
  private _updateDisplayLayoutFromCache;
306
319
  private _setParticipantsStatus;
307
320
  private _onJoinLinkChanged;
321
+ private _onRoomsUpdated;
322
+ private _onRoomUpdated;
323
+ private _convertRoomToExternal;
324
+ private _onRoomParticipantsUpdated;
325
+ private _isMe;
308
326
  }
309
327
  export declare class UpdateDisplayLayoutError extends Error {
310
328
  readonly participantErrors: {
@@ -11,7 +11,7 @@ export declare class ProducerCommandSerializationService {
11
11
  private writeLayout;
12
12
  private writeStreamDesc;
13
13
  serializePerfStatReport(sequenceNumber: number, report: PerfStatReport): ArrayBuffer;
14
- deserializeCommandResponse(data: BufferSource): SignalingMessage | undefined;
14
+ deserializeCommandResponse(data: BufferSource | Blob): Promise<SignalingMessage | undefined>;
15
15
  private deserializeUpdateDisplayLayoutResponse;
16
16
  private deserializeReportPerfStatResponse;
17
17
  }
package/default/Api.d.ts CHANGED
@@ -16,8 +16,13 @@ export default class Api extends BaseApi {
16
16
  log(items: LogItem[]): void;
17
17
  init(): void;
18
18
  joinConversation(conversationId: string, isVideo?: boolean, chatId?: string): Promise<ConversationResponse>;
19
- createConversation(conversationId: string, payload?: string, requireAuthToJoin?: boolean): Promise<ConversationResponse>;
20
- startConversation(conversationId: string, ids?: OkUserId[], type?: CallType, isVideo?: boolean, payload?: string, joiningAllowed?: boolean, requireAuthToJoin?: boolean): Promise<ConversationResponse>;
19
+ createConversation(conversationId: string, payload?: string, requireAuthToJoin?: boolean, { onlyAdminCanShareMovie }?: {
20
+ onlyAdminCanShareMovie?: boolean;
21
+ }): Promise<ConversationResponse>;
22
+ startConversation(conversationId: string, ids?: OkUserId[], type?: CallType, isVideo?: boolean, payload?: string, joiningAllowed?: boolean, requireAuthToJoin?: boolean, { onlyAdminCanShareMovie }?: {
23
+ onlyAdminCanShareMovie?: boolean;
24
+ }): Promise<ConversationResponse>;
25
+ private _preareStartConversationData;
21
26
  private _startConversation;
22
27
  createJoinLink(conversationId: string): Promise<{
23
28
  join_link: string;
@@ -0,0 +1 @@
1
+ export {};
@@ -2,6 +2,7 @@ import BaseSignaling, { AddParticipantParams } from '../abstract/BaseSignaling';
2
2
  import { ParticipantIdRegistry } from '../classes/ParticipantIdRegistry';
3
3
  import { PerfStatReport } from '../classes/transport/PerfStatReporter';
4
4
  import { TransportTopology } from '../classes/transport/Transport';
5
+ import ConversationFeature from '../enums/ConversationFeature';
5
6
  import ConversationOption from '../enums/ConversationOption';
6
7
  import MediaOption from '../enums/MediaOption';
7
8
  import RecordRole from '../enums/RecordRole';
@@ -11,6 +12,7 @@ import UserRole from '../enums/UserRole';
11
12
  import { JSONObject } from '../static/Json';
12
13
  import MediaModifiers from '../types/MediaModifiers';
13
14
  import MediaSettings from '../types/MediaSettings';
15
+ import { IAddMovieParams, ISharedMovieState } from '../types/MovieShare';
14
16
  import MuteStates from '../types/MuteStates';
15
17
  import { CompositeUserId, ParticipantId } from '../types/Participant';
16
18
  import ParticipantLayout, { RequestKeyFrame, StopStream } from '../types/ParticipantLayout';
@@ -96,9 +98,13 @@ export default class Signaling extends BaseSignaling {
96
98
  updateDisplayLayout(layouts: {
97
99
  [streamDesc: string]: ParticipantLayout | StopStream | RequestKeyFrame;
98
100
  }): Promise<SignalingMessage>;
99
- addMovie(data: any): Promise<SignalingMessage>;
100
- updateMovie(data: any): Promise<SignalingMessage>;
101
+ addMovie(data: IAddMovieParams): Promise<SignalingMessage>;
102
+ updateMovie(data: ISharedMovieState): Promise<SignalingMessage>;
101
103
  removeMovie(data: any): Promise<SignalingMessage>;
104
+ updateRooms(rooms: SignalingMessage.Room[], assignRandomly: boolean): Promise<SignalingMessage>;
105
+ activateRooms(roomIds: number[], deactivate: boolean): Promise<SignalingMessage>;
106
+ switchRoom(toRoomId?: number, participantId?: ParticipantId): Promise<SignalingMessage>;
107
+ removeRooms(roomIds: number[]): Promise<SignalingMessage>;
102
108
  startStream(data: any): Promise<SignalingMessage>;
103
109
  stopStream(): Promise<SignalingMessage>;
104
110
  recordSetRole(participantId: ParticipantId, role: RecordRole | null): Promise<SignalingMessage>;
@@ -111,6 +117,7 @@ export default class Signaling extends BaseSignaling {
111
117
  customData(data: JSONObject, participantId: ParticipantId | null): Promise<SignalingMessage>;
112
118
  grantRoles(participantId: CompositeUserId, roles: UserRole[], revoke: boolean): Promise<SignalingMessage>;
113
119
  muteParticipant(participantId: ParticipantId | null, muteStates: MuteStates, requestedMedia: MediaOption[]): Promise<SignalingMessage>;
120
+ enableFeatureForRoles(feature: ConversationFeature, roles: UserRole[]): Promise<SignalingMessage>;
114
121
  pinParticipant(participantId: ParticipantId, unpin: boolean): Promise<SignalingMessage>;
115
122
  updateMediaModifiers(mediaModifiers: MediaModifiers): Promise<SignalingMessage>;
116
123
  changeOptions(changes: {
@@ -1,5 +1,6 @@
1
1
  declare const enum ConversationFeature {
2
2
  ADD_PARTICIPANT = "ADD_PARTICIPANT",
3
- RECORD = "RECORD"
3
+ RECORD = "RECORD",
4
+ MOVIE_SHARE = "MOVIE_SHARE"
4
5
  }
5
6
  export default ConversationFeature;
@@ -4,7 +4,8 @@
4
4
  declare enum ConversationOption {
5
5
  REQUIRE_AUTH_TO_JOIN = "REQUIRE_AUTH_TO_JOIN",
6
6
  AUDIENCE_MODE = "AUDIENCE_MODE",
7
- WAITING_HALL = "WAITING_HALL"
7
+ WAITING_HALL = "WAITING_HALL",
8
+ ASR = "ASR"
8
9
  }
9
10
  export default ConversationOption;
10
11
  export declare function compareOptions(oldOptions: ConversationOption[], newOptions: ConversationOption[]): boolean;
@@ -16,6 +16,7 @@ declare enum HangupType {
16
16
  CALLER_IS_BLOCKED = "CALLER_IS_BLOCKED",
17
17
  NOT_FRIENDS = "NOT_FRIENDS",
18
18
  CALLEE_IS_OFFLINE = "CALLEE_IS_OFFLINE",
19
+ CALLER_IS_REJECTED = "CALLER_IS_REJECTED",
19
20
  UNKNOWN_ERROR = "UNKNOWN_ERROR",
20
21
  UNSUPPORTED = "UNSUPPORTED",
21
22
  OLD_VERSION = "OLD_VERSION",
@@ -23,6 +24,7 @@ declare enum HangupType {
23
24
  EXTERNAL_API_ERROR = "EXTERNAL_API_ERROR",
24
25
  SOCKET_CLOSED = "SOCKET_CLOSED",
25
26
  ENDED = "ENDED",
26
- KILLED_WITHOUT_DELETE = "KILLED_WITHOUT_DELETE"
27
+ KILLED_WITHOUT_DELETE = "KILLED_WITHOUT_DELETE",
28
+ ANOTHER_DEVICE = "ANOTHER_DEVICE"
27
29
  }
28
30
  export default HangupType;
@@ -4,6 +4,7 @@
4
4
  declare enum MediaOption {
5
5
  AUDIO = "AUDIO",
6
6
  VIDEO = "VIDEO",
7
- SCREEN_SHARING = "SCREEN_SHARING"
7
+ SCREEN_SHARING = "SCREEN_SHARING",
8
+ MOVIE_SHARING = "MOVIE_SHARING"
8
9
  }
9
10
  export default MediaOption;
@@ -0,0 +1,6 @@
1
+ declare enum RoomsEventType {
2
+ UPDATE = "UPDATE",
3
+ REMOVE = "REMOVE",
4
+ ACTIVATE = "ACTIVATE"
5
+ }
6
+ export default RoomsEventType;
@@ -24,6 +24,7 @@ declare enum SignalingCommandType {
24
24
  CUSTOM_DATA = "custom-data",
25
25
  GRANT_ROLES = "grant-roles",
26
26
  MUTE_PARTICIPANT = "mute-participant",
27
+ ENABLE_FEATURE_FOR_ROLES = "enable-feature-for-roles",
27
28
  PIN_PARTICIPANT = "pin-participant",
28
29
  UPDATE_MEDIA_MODIFIERS = "update-media-modifiers",
29
30
  CHANGE_OPTIONS = "change-options",
@@ -34,6 +35,12 @@ declare enum SignalingCommandType {
34
35
  REQUEST_TEST_MODE = "request-test-mode",
35
36
  ADD_MOVIE = "add-movie",
36
37
  UPDATE_MOVIE = "update-movie",
37
- REMOVE_MOVIE = "remove-movie"
38
+ REMOVE_MOVIE = "remove-movie",
39
+ GET_ROOMS = "get_rooms",
40
+ GET_ROOM = "get_room",
41
+ UPDATE_ROOMS = "update-rooms",
42
+ ACTIVATE_ROOMS = "activate-rooms",
43
+ REMOVE_ROOMS = "remove-rooms",
44
+ SWITCH_ROOM = "switch-room"
38
45
  }
39
46
  export default SignalingCommandType;
@@ -35,6 +35,13 @@ declare enum SignalingNotification {
35
35
  PROMOTE_PARTICIPANT = "promote-participant",
36
36
  CHAT_ROOM_UPDATED = "chat-room-updated",
37
37
  PROMOTION_APPROVED = "promotion-approved",
38
- JOIN_LINK_CHANGED = "join-link-changed"
38
+ JOIN_LINK_CHANGED = "join-link-changed",
39
+ MOVIE_UPDATE_NOTIFICATION = "movie-update-notification",
40
+ MOVIE_SHARE_INFO = "movie-share-info",
41
+ MOVIE_SHARE_STARTED = "movie-share-started",
42
+ MOVIE_SHARE_STOPPED = "movie-share-stopped",
43
+ ROOM_UPDATED = "room-updated",
44
+ ROOMS_UPDATED = "rooms-updated",
45
+ ROOM_PARTICIPANTS_UPDATED = "room-participants-updated"
39
46
  }
40
47
  export default SignalingNotification;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vkontakte/calls-sdk",
3
- "version": "2.6.2-dev.974887b.0",
3
+ "version": "2.6.2-dev.9a503c1.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",
@@ -6,12 +6,15 @@ import ChatRoomEventType from '../enums/ChatRoomEventType';
6
6
  import ConversationOption from '../enums/ConversationOption';
7
7
  import FatalError from '../enums/FatalError';
8
8
  import MediaOption from '../enums/MediaOption';
9
+ import RoomsEventType from '../enums/RoomsEventType';
9
10
  import UserRole from '../enums/UserRole';
10
11
  import { ExternalId, ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk, ExternalParticipantListMarkers } from '../types/ExternalId';
11
12
  import MediaModifiers from '../types/MediaModifiers';
12
13
  import MediaSettings from '../types/MediaSettings';
14
+ import { IOnRemoteMovieData, ISharedMovieInfo, ISharedMovieState, ISharedMovieStoppedInfo } from '../types/MovieShare';
13
15
  import MuteStates from '../types/MuteStates';
14
16
  import { ParticipantStateMapped } from '../types/Participant';
17
+ import { Room, RoomParticipantUpdate, RoomsUpdate } from '../types/Room';
15
18
  import { DebugMessageType } from './Debug';
16
19
  import { JSONObject } from './Json';
17
20
  /**
@@ -72,10 +75,31 @@ declare namespace External {
72
75
  * Если сервер закончил стримить собеседника, вместо стрима будет передан null
73
76
  *
74
77
  * @param userId
75
- * @param streamName
76
- * @param stream
78
+ * @param data
79
+ */
80
+ function onRemoteLive(userId: ExternalParticipantId, data: IOnRemoteMovieData): void;
81
+ /**
82
+ * Получен собственный стрим лайв.
83
+ * Если сервер закончил стримить собеседника, вместо стрима будет передан null
84
+ *
85
+ * @param userId
86
+ * @param data
77
87
  */
78
- function onRemoteLive(userId: ExternalParticipantId, streamName: string, stream: MediaStream | null): void;
88
+ function onLocalLive(userId: ExternalParticipantId, data: IOnRemoteMovieData): void;
89
+ /**
90
+ * Получено обновление стрима или лайва от собеседника.
91
+ *
92
+ * @param userId
93
+ * @param data
94
+ */
95
+ function onRemoteLiveUpdate(userId: ExternalParticipantId, data: ISharedMovieState): void;
96
+ /**
97
+ * Получено обновление собственного стрима или лайва.
98
+ *
99
+ * @param userId
100
+ * @param data
101
+ */
102
+ function onLocalLiveUpdate(userId: ExternalParticipantId, data: ISharedMovieState): void;
79
103
  /**
80
104
  * Получен стрим с экрана собеседника.
81
105
  * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
@@ -92,7 +116,7 @@ declare namespace External {
92
116
  * @param muteStates Состояние устройств при входе в звонок
93
117
  * @param participants Список участников звонка (при `Params.batchParticipantsOnStart = true`)
94
118
  */
95
- function onConversation(userId: ExternalParticipantId, mediaModifiers: MediaModifiers, muteStates: MuteStates, participants?: ExternalParticipant[]): void;
119
+ function onConversation(userId: ExternalParticipantId, mediaModifiers: MediaModifiers, muteStates: MuteStates, participants?: ExternalParticipant[], rooms?: Room[]): void;
96
120
  /**
97
121
  * Постраничные данные про участников при начале звонка
98
122
  * @param chunk
@@ -106,6 +130,41 @@ declare namespace External {
106
130
  * @param markers
107
131
  */
108
132
  function onRemoteMediaSettings(userId: ExternalParticipantId, mediaSettings: MediaSettings, markers?: ExternalParticipantListMarkers): void;
133
+ /**
134
+ * Изменились данные собственного стрима
135
+ *
136
+ * @param userId
137
+ * @param mediaSettings
138
+ */
139
+ function onLocalMediaSettings(userId: ExternalParticipantId, mediaSettings: MediaSettings): void;
140
+ /**
141
+ * Полученны данные по стримам (лайв/мувик) от собеседника
142
+ *
143
+ * @param userId
144
+ * @param sharedMovieInfo
145
+ */
146
+ function onRemoteSharedMovieInfo(userId: ExternalParticipantId, sharedMovieInfo: ISharedMovieInfo): void;
147
+ /**
148
+ * Полученны данные по остановленным стримам (лайв/мувик) от собеседника
149
+ *
150
+ * @param userId
151
+ * @param sharedMovieStoppedInfo
152
+ */
153
+ function onRemoteSharedMovieStoppedInfo(userId: ExternalParticipantId, sharedMovieStoppedInfo: ISharedMovieStoppedInfo): void;
154
+ /**
155
+ * Полученны данные по собственным стримам (лайв/мувик)
156
+ *
157
+ * @param userId
158
+ * @param sharedMovieInfo
159
+ */
160
+ function onLocalSharedMovieInfo(userId: ExternalParticipantId, sharedMovieInfo: ISharedMovieInfo): void;
161
+ /**
162
+ * Полученны данные по собственным остановленным стримам (лайв/мувик)
163
+ *
164
+ * @param userId
165
+ * @param sharedMovieStoppedInfo
166
+ */
167
+ function onLocalSharedMovieStoppedInfo(userId: ExternalParticipantId, sharedMovieStoppedInfo: ISharedMovieStoppedInfo): void;
109
168
  /**
110
169
  * Добавили участника
111
170
  *
@@ -355,5 +414,14 @@ declare namespace External {
355
414
  * @param joinLink токен присоединения к звонку
356
415
  */
357
416
  function onJoinLinkChanged(joinLink: string): void;
417
+ /**
418
+ */
419
+ function onRoomsUpdated(updates: Partial<Record<RoomsEventType, RoomsUpdate>>): void;
420
+ /**
421
+ */
422
+ function onRoomUpdated(eventTypes: RoomsEventType[], roomId: number, room: Room | null): void;
423
+ /**
424
+ */
425
+ function onRoomParticipantsUpdated(update: RoomParticipantUpdate): void;
358
426
  }
359
427
  export default External;
@@ -6,13 +6,16 @@ import ChatRoomEventType from '../enums/ChatRoomEventType';
6
6
  import ConversationOption from '../enums/ConversationOption';
7
7
  import FatalError from '../enums/FatalError';
8
8
  import MediaOption from '../enums/MediaOption';
9
+ import RoomsEventType from '../enums/RoomsEventType';
9
10
  import UserRole from '../enums/UserRole';
10
11
  import { ExternalId, ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk, ExternalParticipantListMarkers } from '../types/ExternalId';
11
12
  import IceServer from '../types/IceServer';
12
13
  import MediaModifiers from '../types/MediaModifiers';
13
14
  import MediaSettings from '../types/MediaSettings';
15
+ import { IOnRemoteMovieData, ISharedMovieInfo, ISharedMovieState, ISharedMovieStoppedInfo } from '../types/MovieShare';
14
16
  import MuteStates from '../types/MuteStates';
15
17
  import { ParticipantStateMapped } from '../types/Participant';
18
+ import { Room, RoomParticipantUpdate, RoomsUpdate } from '../types/Room';
16
19
  import AuthData from './AuthData';
17
20
  import { DebugMessageType } from './Debug';
18
21
  import { ParticipantStatus } from './External';
@@ -24,6 +27,7 @@ import { FacingMode } from './WebRTCUtils';
24
27
  export declare type ParamsObject = {
25
28
  platform: string;
26
29
  clientType: string;
30
+ externalUserType: string;
27
31
  device: string;
28
32
  /**
29
33
  * API ключ приложения
@@ -43,6 +47,11 @@ export declare type ParamsObject = {
43
47
  * Домен, чтобы попасть в тестовую группу. Для тестирования экспериментальных улучшений существуют отдельные сервера, чтобы собирать фидбек и уже потом раскатывать на всех юзеров. Если передать сюда специальный ключ, то конверсейшн будет обрабатываться на таком сервере.
44
48
  */
45
49
  domain: string;
50
+ /**
51
+ * Домен, куда будет ходить Ok api за данными
52
+ * @hidden
53
+ */
54
+ externalDomain: string;
46
55
  iceServers: IceServer[];
47
56
  wssBase: string;
48
57
  wssToken: string;
@@ -247,6 +256,11 @@ export declare type ParamsObject = {
247
256
  * Включать RED-extension (redundancy) для p2p звонков
248
257
  */
249
258
  p2pAudioRed: boolean;
259
+ /**
260
+ * Добавлять флаг spsPpsIdrInKeyframe для h264 кодека. В результате ключевые фреймы без sps и pps
261
+ * не используются как ключевые. Решает проблему с артефактами на видео в случае потерь пакетов.
262
+ */
263
+ h264spsPpsIdrInKeyframe: boolean;
250
264
  /**
251
265
  * Получать список участников звонка третьим аргументом в `onConversation`
252
266
  * @hidden
@@ -300,11 +314,24 @@ export declare type ParamsObject = {
300
314
  * Получен стрим трансляция или мувик от собеседника.
301
315
  * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
302
316
  */
303
- onRemoteLive?: (userId: ExternalParticipantId, streamId: string, stream: MediaStream | null) => void;
317
+ onRemoteLive?: (userId: ExternalParticipantId, data: IOnRemoteMovieData) => void;
318
+ /**
319
+ * Получен собственный стрим трансляция или мувик.
320
+ * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
321
+ */
322
+ onLocalLive?: (userId: ExternalParticipantId, data: IOnRemoteMovieData) => void;
323
+ /**
324
+ * Получено обновление стрима или лайва от собеседника.
325
+ */
326
+ onRemoteLiveUpdate?: (userId: ExternalParticipantId, data: ISharedMovieState) => void;
327
+ /**
328
+ * Получено обновление собственного стрима или лайва.
329
+ */
330
+ onLocalLiveUpdate?: (userId: ExternalParticipantId, data: ISharedMovieState) => void;
304
331
  /**
305
332
  * Начат звонок
306
333
  */
307
- onConversation?: (userId: ExternalParticipantId, mediaModifiers: MediaModifiers, muteStates: MuteStates, participants?: ExternalParticipant[]) => void;
334
+ onConversation?: (userId: ExternalParticipantId, mediaModifiers: MediaModifiers, muteStates: MuteStates, participants?: ExternalParticipant[], rooms?: Room[]) => void;
308
335
  /**
309
336
  * Начальный список участников для постраничного звонка
310
337
  */
@@ -313,6 +340,26 @@ export declare type ParamsObject = {
313
340
  * Изменились данные стрима собеседника
314
341
  */
315
342
  onRemoteMediaSettings?: (userId: ExternalParticipantId, mediaSettings: MediaSettings, markers?: ExternalParticipantListMarkers) => void;
343
+ /**
344
+ * Изменились данные стрима собеседника
345
+ */
346
+ onLocalMediaSettings?: (userId: ExternalParticipantId, mediaSettings: MediaSettings) => void;
347
+ /**
348
+ * Полученны данные по стримам (лайв/мувик) от собеседника
349
+ */
350
+ onRemoteSharedMovieInfo?: (userId: ExternalParticipantId, sharedMovieInfo: ISharedMovieInfo) => void;
351
+ /**
352
+ * Полученны данные по остановленным стримам (лайв/мувик) от собеседника
353
+ */
354
+ onRemoteSharedMovieStoppedInfo?: (userId: ExternalParticipantId, sharedMovieStoppedInfo: ISharedMovieStoppedInfo) => void;
355
+ /**
356
+ * Полученны данные по собственным стримам (лайв/мувик)
357
+ */
358
+ onLocalSharedMovieInfo?: (userId: ExternalParticipantId, sharedMovieInfo: ISharedMovieInfo) => void;
359
+ /**
360
+ * Полученны данные по собственным остановленным стримам (лайв/мувик)
361
+ */
362
+ onLocalSharedMovieStoppedInfo?: (userId: ExternalParticipantId, sharedMovieStoppedInfo: ISharedMovieStoppedInfo) => void;
316
363
  /**
317
364
  * Добавили участника
318
365
  */
@@ -478,6 +525,15 @@ export declare type ParamsObject = {
478
525
  * @param joinLink токен присоединения к звонку
479
526
  */
480
527
  onJoinLinkChanged?: (joinLink: string) => void;
528
+ /**
529
+ */
530
+ onRoomsUpdated?: (updates: Partial<Record<RoomsEventType, RoomsUpdate>>) => void;
531
+ /**
532
+ */
533
+ onRoomUpdated?: (eventTypes: RoomsEventType[], roomId: number, room: Room | null) => void;
534
+ /**
535
+ */
536
+ onRoomParticipantsUpdated?: (update: RoomParticipantUpdate) => void;
481
537
  };
482
538
  export default abstract class Params {
483
539
  private static _params;
@@ -494,6 +550,8 @@ export default abstract class Params {
494
550
  static set platform(value: string);
495
551
  static get clientType(): string;
496
552
  static set clientType(value: string);
553
+ static get externalUserType(): string;
554
+ static set externalUserType(value: string);
497
555
  static get device(): string;
498
556
  static get apiKey(): string;
499
557
  static get apiEnv(): string;
@@ -503,6 +561,7 @@ export default abstract class Params {
503
561
  static get anonymToken(): string;
504
562
  static set anonymToken(value: string);
505
563
  static get domain(): string;
564
+ static get externalDomain(): string;
506
565
  static get iceServers(): IceServer[];
507
566
  static set iceServers(value: IceServer[]);
508
567
  static get wssBase(): string;
@@ -571,6 +630,7 @@ export default abstract class Params {
571
630
  static get participantListChunkInitCount(): number;
572
631
  static get serverAudioRed(): boolean;
573
632
  static get p2pAudioRed(): boolean;
633
+ static get h264spsPpsIdrInKeyframe(): boolean;
574
634
  static get batchParticipantsOnStart(): boolean;
575
635
  static get filterObservers(): boolean;
576
636
  static get muteMode(): boolean;
package/static/Utils.d.ts CHANGED
@@ -6,7 +6,7 @@ import VideoSettings from '../types/VideoSettings';
6
6
  export declare const PARAMETERS_SEPARATOR = ":";
7
7
  export declare const DEVICE_IDX_PARAMETER = "d";
8
8
  declare namespace Utils {
9
- function patchSDP(sdp: string, preferH264: boolean, brokenH264: boolean, preferVP9: boolean, isAudioNack?: boolean, preferRed?: boolean): string;
9
+ function patchSDP(sdp: string, preferH264: boolean, brokenH264: boolean, preferVP9: boolean, h264spsPpsIdrInKeyframe: boolean, isAudioNack?: boolean, preferRed?: boolean): string;
10
10
  function getPeerIdString(peerId: SignalingMessage.PeerId): string;
11
11
  function comparePeerId(peerId1: SignalingMessage.PeerId, peerId2: SignalingMessage.PeerId): boolean;
12
12
  function getPeerConnectionHostInfo(pc: RTCPeerConnection): Promise<any>;
@@ -62,5 +62,7 @@ declare namespace Utils {
62
62
  function participantMarkerCompare(marker1: ExternalParticipantListMarker | undefined, marker2: ExternalParticipantListMarker | undefined): number;
63
63
  /** убирает все ключи со значением `V` на 1 уровне */
64
64
  function objectFilterOutValues<T extends Record<string, V>, V = unknown>(obj: T, value?: V | V[]): Partial<T>;
65
+ function objectReduce<R, T extends Object>(obj: T, callback: (acc: R, value: T[keyof T], key: keyof T) => R, initialValue: R): R;
66
+ const setImmediate: (fn: VoidFunction) => VoidFunction;
65
67
  }
66
68
  export default Utils;
@@ -0,0 +1,12 @@
1
+ import MediaOption from '../enums/MediaOption';
2
+ import MediaSettings from './MediaSettings';
3
+ import { Participant } from './Participant';
4
+ export interface IProcessMuteStateParams {
5
+ mediaOptions?: MediaOption[];
6
+ muteAll?: boolean;
7
+ unmute?: boolean;
8
+ serverSettings?: MediaSettings | null;
9
+ admin?: Participant | null;
10
+ stateUpdated?: boolean;
11
+ requestedMedia?: MediaOption[];
12
+ }
@@ -10,5 +10,6 @@ declare type ConversationParams = {
10
10
  isp_as_org?: string;
11
11
  loc_cc?: string;
12
12
  loc_reg?: string;
13
+ external_user_type: string;
13
14
  };
14
15
  export default ConversationParams;
@@ -1,6 +1,7 @@
1
1
  import MediaOption from '../enums/MediaOption';
2
2
  import { ParticipantStatus } from '../static/External';
3
3
  import MediaSettings from './MediaSettings';
4
+ import { ISharedMovieInfo } from './MovieShare';
4
5
  import MuteStates from './MuteStates';
5
6
  import { ParticipantListMarker, ParticipantListType, ParticipantStateMapped } from './Participant';
6
7
  import SignalingMessage from './SignalingMessage';
@@ -94,6 +95,7 @@ export interface ExternalParticipant {
94
95
  */
95
96
  unmuteOptions: MediaOption[];
96
97
  markers?: ExternalParticipantListMarkers;
98
+ movieShareInfos?: ISharedMovieInfo[];
97
99
  }
98
100
  export interface ExternalParticipantListChunk {
99
101
  participants: ExternalParticipant[];
@@ -19,7 +19,7 @@ export declare type MediaSettings = {
19
19
  export declare type VideoStreamInfo = {
20
20
  id: string;
21
21
  source: string;
22
- vkMovieId?: string;
22
+ externalMovieId?: string;
23
23
  };
24
24
  export default MediaSettings;
25
25
  export declare function compareMediaSettings(ms1: MediaSettings, ms2: MediaSettings): boolean;
@@ -0,0 +1,42 @@
1
+ import { OkUserId, CompositeUserId } from './Participant';
2
+ import { MediaType } from './ParticipantStreamDescription';
3
+ export interface IMoviePreview {
4
+ url: string;
5
+ width: number;
6
+ height: number;
7
+ }
8
+ export interface IAddMovieParams {
9
+ movieId: string;
10
+ gain?: number;
11
+ metadata?: {
12
+ title?: string;
13
+ thumbnails?: IMoviePreview[];
14
+ };
15
+ }
16
+ export declare type ISharedMovieStateResponse = [number, number, boolean, number, number];
17
+ export interface ISharedMovieState {
18
+ participantId: CompositeUserId;
19
+ gain?: number;
20
+ pause?: boolean;
21
+ offset?: number;
22
+ duration?: number;
23
+ }
24
+ export interface ISharedMovieInfo {
25
+ movieId: OkUserId;
26
+ initiatorId: CompositeUserId;
27
+ title: string;
28
+ source: MediaType;
29
+ externalMovieId: string;
30
+ duration: number;
31
+ thumbnails: IMoviePreview[];
32
+ }
33
+ export interface ISharedMovieStoppedInfo {
34
+ movieId: OkUserId;
35
+ initiatorId: CompositeUserId;
36
+ source: MediaType;
37
+ }
38
+ export interface IOnRemoteMovieData {
39
+ streamName: string;
40
+ stream: MediaStream | null;
41
+ mediaType: MediaType;
42
+ }
@@ -4,6 +4,7 @@ import UserRole from '../enums/UserRole';
4
4
  import { ParticipantStatus } from '../static/External';
5
5
  import MediaSettings from '../types/MediaSettings';
6
6
  import { ExternalId, ExternalParticipantId, ExternalParticipantListMarkers } from './ExternalId';
7
+ import { ISharedMovieInfo } from './MovieShare';
7
8
  import MuteStates from './MuteStates';
8
9
  import ParticipantLayout from './ParticipantLayout';
9
10
  /**
@@ -55,6 +56,7 @@ export interface Participant {
55
56
  unmuteOptions: MediaOption[];
56
57
  observedIds: CompositeUserId[];
57
58
  markers?: ExternalParticipantListMarkers;
59
+ movieShareInfos?: ISharedMovieInfo[];
58
60
  }
59
61
  export interface IGetParticipantsParameters {
60
62
  externalIds: ExternalId[];