@vkontakte/calls-sdk 2.6.2-dev.aa1b4e2.0 → 2.6.2-dev.aa45c56.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,9 +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 { IFeaturesPerRole } from '../types/ConversationFeature';
15
16
  import { ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk, ExternalUserId } from '../types/ExternalId';
16
17
  import MediaModifiers from '../types/MediaModifiers';
17
18
  import { IVideoDimentions } from '../types/MediaSettings';
19
+ import { IAddMovieParams, IUpdateMovieData } from '../types/MovieShare';
18
20
  import MuteStates from '../types/MuteStates';
19
21
  import { CompositeUserId, IGetParticipantsParameters, OkUserId, ParticipantId } from '../types/Participant';
20
22
  import { ParticipantLayout } from '../types/ParticipantLayout';
@@ -37,6 +39,7 @@ export declare type ConversationData = {
37
39
  */
38
40
  acceptTime: number | null;
39
41
  features: ConversationFeature[];
42
+ featuresPerRole?: IFeaturesPerRole | null;
40
43
  /**
41
44
  * ID звонка
42
45
  */
@@ -76,6 +79,7 @@ export default class Conversation extends EventEmitter {
76
79
  private readonly _signaling;
77
80
  private _mediaSource;
78
81
  private _conversation;
82
+ private _myLastRequestedLayouts;
79
83
  private _state;
80
84
  private _participantState;
81
85
  private _participants;
@@ -106,7 +110,7 @@ export default class Conversation extends EventEmitter {
106
110
  static current(): Conversation | null;
107
111
  static hangupAfterInit(): void;
108
112
  static id(): string | null;
109
- onStart(opponentIds: OkUserId[], opponentType: CallType, mediaOptions: MediaOption[], payload?: string, joiningAllowed?: boolean, requireAuthToJoin?: boolean): Promise<ConversationData>;
113
+ onStart(opponentIds: OkUserId[], opponentType: CallType, mediaOptions: MediaOption[], payload?: string, joiningAllowed?: boolean, requireAuthToJoin?: boolean, onlyAdminCanShareMovie?: boolean): Promise<ConversationData>;
110
114
  onJoin(joinArgs: {
111
115
  conversationId?: string;
112
116
  mediaOptions: MediaOption[];
@@ -151,12 +155,12 @@ export default class Conversation extends EventEmitter {
151
155
  private _processConnection;
152
156
  private _prepareParticipants;
153
157
  private _onConversationParticipantListChunk;
158
+ private _createParticipantListChunk;
154
159
  private _participantListChunkToExternalChunk;
155
160
  private _registerConnectionParticipants;
156
161
  private _registerParticipants;
157
162
  /** Установим состояние локальных мьютов */
158
163
  private _registerParticipantLocalMuteState;
159
- private _getClientType;
160
164
  private _getStatusByTransportState;
161
165
  private _registerParticipantInCache;
162
166
  private _getExistedParticipantByIdOrCreate;
@@ -190,7 +194,7 @@ export default class Conversation extends EventEmitter {
190
194
  private _onAddParticipant;
191
195
  private _onRemoveParticipant;
192
196
  changeDevice(kind: MediaDeviceKind): Promise<void>;
193
- toggleScreenCapturing(enabled: boolean): Promise<void>;
197
+ toggleScreenCapturing(screenEnabled: boolean, audioShareEnabled: boolean): Promise<void>;
194
198
  setVideoStream(stream: MediaStream, isScreen?: boolean): Promise<void>;
195
199
  setAudioStream(stream: MediaStream): Promise<void>;
196
200
  toggleLocalVideo(enabled: boolean): Promise<void>;
@@ -202,12 +206,20 @@ export default class Conversation extends EventEmitter {
202
206
  requestKeyFrame(participantStreamDescription: ParticipantStreamDescription): Promise<void | SignalingMessage>;
203
207
  requestTestMode(consumerCommand: string, producerCommand: string): Promise<void>;
204
208
  updateDisplayLayout(layouts: ParticipantLayout[]): Promise<void>;
209
+ /** @async */
210
+ feedback(key: string): Promise<SignalingMessage>;
205
211
  private _stopStreaming;
206
212
  private _sendUpdateDisplayLayout;
207
213
  private _cleanupCooldownQueue;
208
214
  private _onParticipantSourcesUpdate;
209
215
  private _onParticipantPromoted;
210
216
  private _onChatRoomUpdated;
217
+ private _onSharedMovieUpdate;
218
+ private _onSharedMovieInfoStarted;
219
+ private _processSharedMovieInfo;
220
+ private _processConnectionSharedMovieInfo;
221
+ private _onSharedMovieInfoStopped;
222
+ private _onFeaturesPerRoleChanged;
211
223
  private _waitForStreamIfNeeded;
212
224
  private _matchStreamDescription;
213
225
  private _getWaitingTime;
@@ -215,6 +227,7 @@ export default class Conversation extends EventEmitter {
215
227
  private _checkAdminRole;
216
228
  grantRoles(participantId: CompositeUserId, roles: UserRole[], revoke: boolean): Promise<void>;
217
229
  muteParticipant(participantId: ParticipantId | null, muteStates: MuteStates, requestedMedia?: MediaOption[]): Promise<void>;
230
+ enableFeatureForRoles(feature: ConversationFeature, roles: UserRole[]): Promise<void>;
218
231
  pinParticipant(participantId: ParticipantId, unpin: boolean): Promise<void>;
219
232
  updateMediaModifiers(mediaModifiers: MediaModifiers): Promise<void>;
220
233
  changeOptions(changes: {
@@ -231,11 +244,11 @@ export default class Conversation extends EventEmitter {
231
244
  customData(data: JSONObject, participantId?: ParticipantId | null): Promise<void>;
232
245
  createJoinLink(): Promise<string>;
233
246
  removeJoinLink(): Promise<never>;
234
- addMovie(movieId: string): Promise<{
247
+ addMovie({ movieId, gain, metadata }: IAddMovieParams): Promise<{
235
248
  movieId: string;
236
249
  streamType: string;
237
250
  }>;
238
- updateMovie(movieId: string, gain?: number, offset?: string, pause?: boolean): Promise<void>;
251
+ updateMovie(params: IUpdateMovieData): Promise<void>;
239
252
  removeMovie(movieId: string): Promise<void>;
240
253
  startStream(isRecord?: boolean, name?: string | null, movieId?: string | null, privacy?: 'PUBLIC' | 'FRIENDS' | 'DIRECT_LINK', groupId?: string | null): Promise<SignalingMessage>;
241
254
  stopStream(): Promise<SignalingMessage>;
@@ -307,6 +320,9 @@ export default class Conversation extends EventEmitter {
307
320
  private _updateDisplayLayoutFromCache;
308
321
  private _setParticipantsStatus;
309
322
  private _onJoinLinkChanged;
323
+ /** получили из сингналинга сообщение о реакции пользователей */
324
+ private _onFeedback;
325
+ private _isMe;
310
326
  }
311
327
  export declare class UpdateDisplayLayoutError extends Error {
312
328
  readonly participantErrors: {
@@ -13,7 +13,8 @@ export declare const enum MediaSourceEvent {
13
13
  export declare const enum MediaTrackKind {
14
14
  'audio' = "audio",
15
15
  'video' = "video",
16
- 'screen' = "screen"
16
+ 'screen' = "screen",
17
+ 'audioshare' = "audioshare"
17
18
  }
18
19
  export declare class MediaSource extends EventEmitter {
19
20
  /** Стрим с камеры и микрофона пользователя */
@@ -21,6 +22,7 @@ export declare class MediaSource extends EventEmitter {
21
22
  /** Последний сохраненный оригинальный видео трек с камеры */
22
23
  private _trackVideoStreamBackup;
23
24
  private _screenTrack;
25
+ private _audioShareTrack;
24
26
  /** Трек для отправки в медиа-канал. Может отличаться при скриншаринге в дата-канал */
25
27
  private _sendVideoTrack;
26
28
  private _mediaSettings;
@@ -58,16 +60,19 @@ export declare class MediaSource extends EventEmitter {
58
60
  private _changeAudioInput;
59
61
  private _changeScreen;
60
62
  private _disableScreenCapture;
63
+ private disableAudioShare;
64
+ private getSilentAudioShareTrack;
61
65
  private _replaceLocalTrack;
62
66
  private _stopLocalTrack;
63
67
  private _videoEffect;
64
68
  /** останавливает и удаляет сохраненный трек с камеры пользователя */
65
69
  private _stopAndRemoveTrackVideoStreamBackup;
66
70
  destroy(): void;
67
- toggleScreenCapturing(enabled: boolean): Promise<void>;
71
+ toggleScreenCapturing(captureScreen: boolean, captureAudio: boolean): Promise<void>;
68
72
  toggleVideo(enabled: boolean): Promise<void>;
69
73
  toggleAudio(enabled: boolean): Promise<void>;
70
74
  setResolution(width: number, height: number): Promise<void>;
71
75
  updateNoiseSuppression(): Promise<void>;
72
76
  videoEffect(effect: IEffect | null): Promise<void>;
77
+ getAudioShareTrack(): MediaStreamTrack | null;
73
78
  }
@@ -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
  }
@@ -33,6 +33,7 @@ export default class ServerTransport extends EventEmitter {
33
33
  private _disabledSenders;
34
34
  private _rtpReceiversByStreamId;
35
35
  private _producerSessionId;
36
+ private _newAudioShareTrack;
36
37
  constructor(signaling: BaseSignaling, mediaSource: MediaSource, serverSettings: ServerSettings);
37
38
  getState(): TransportState;
38
39
  updateStatisticsInterval(): void;
@@ -68,6 +69,7 @@ export default class ServerTransport extends EventEmitter {
68
69
  private _detectStaleTracks;
69
70
  private _allocateConsumer;
70
71
  private _acceptProducer;
72
+ private handleTracks;
71
73
  _onSignalingNotification(message: SignalingMessage): Promise<void>;
72
74
  private _onProducerUpdated;
73
75
  private _onAddTrack;
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, IUpdateMovieData } 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,8 +98,8 @@ 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: IUpdateMovieData): Promise<SignalingMessage>;
101
103
  removeMovie(data: any): Promise<SignalingMessage>;
102
104
  startStream(data: any): Promise<SignalingMessage>;
103
105
  stopStream(): Promise<SignalingMessage>;
@@ -111,6 +113,7 @@ export default class Signaling extends BaseSignaling {
111
113
  customData(data: JSONObject, participantId: ParticipantId | null): Promise<SignalingMessage>;
112
114
  grantRoles(participantId: CompositeUserId, roles: UserRole[], revoke: boolean): Promise<SignalingMessage>;
113
115
  muteParticipant(participantId: ParticipantId | null, muteStates: MuteStates, requestedMedia: MediaOption[]): Promise<SignalingMessage>;
116
+ enableFeatureForRoles(feature: ConversationFeature, roles: UserRole[]): Promise<SignalingMessage>;
114
117
  pinParticipant(participantId: ParticipantId, unpin: boolean): Promise<SignalingMessage>;
115
118
  updateMediaModifiers(mediaModifiers: MediaModifiers): Promise<SignalingMessage>;
116
119
  changeOptions(changes: {
@@ -118,6 +121,7 @@ export default class Signaling extends BaseSignaling {
118
121
  }): Promise<SignalingMessage>;
119
122
  getWaitingHall(fromId?: WaitingParticipantId | null, count?: number, backward?: boolean): Promise<SignalingMessage>;
120
123
  promoteParticipant(participantId: CompositeUserId, demote?: boolean): Promise<SignalingMessage>;
124
+ feedback(key: string): Promise<SignalingMessage>;
121
125
  /**
122
126
  * Close a connection with a signaling server
123
127
  */
@@ -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,9 @@
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",
9
+ FEEDBACK = "FEEDBACK"
8
10
  }
9
11
  export default ConversationOption;
10
12
  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,8 @@
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",
9
+ AUDIO_SHARING = "AUDIO_SHARING"
8
10
  }
9
11
  export default MediaOption;
@@ -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,7 @@ 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
+ FEEDBACK = "feedback"
38
40
  }
39
41
  export default SignalingCommandType;
@@ -35,6 +35,12 @@ 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
+ FEEDBACK = "feedback",
40
+ MOVIE_UPDATE_NOTIFICATION = "movie-update-notification",
41
+ MOVIE_SHARE_INFO = "movie-share-info",
42
+ MOVIE_SHARE_STARTED = "movie-share-started",
43
+ MOVIE_SHARE_STOPPED = "movie-share-stopped",
44
+ FEATURES_PER_ROLE_CHANGED = "features-per-role-changed"
39
45
  }
40
46
  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.aa1b4e2.0",
3
+ "version": "2.6.2-dev.aa45c56.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",
@@ -7,9 +7,12 @@ 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 { IFeaturesPerRole } from '../types/ConversationFeature';
10
11
  import { ExternalId, ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk, ExternalParticipantListMarkers } from '../types/ExternalId';
12
+ import { IFeedbackExternal } from '../types/Feedback';
11
13
  import MediaModifiers from '../types/MediaModifiers';
12
14
  import MediaSettings from '../types/MediaSettings';
15
+ import { IOnRemoteMovieData, ISharedMovieInfo, ISharedMovieState, ISharedMovieStoppedInfo } from '../types/MovieShare';
13
16
  import MuteStates from '../types/MuteStates';
14
17
  import { ParticipantStateMapped } from '../types/Participant';
15
18
  import { DebugMessageType } from './Debug';
@@ -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
87
+ */
88
+ function onLocalLive(userId: ExternalParticipantId, data: IOnRemoteMovieData): void;
89
+ /**
90
+ * Получено обновление стрима или лайва от собеседника.
91
+ *
92
+ * @param userId
93
+ * @param data
77
94
  */
78
- function onRemoteLive(userId: ExternalParticipantId, streamName: string, stream: MediaStream | null): void;
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
@@ -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,15 @@ declare namespace External {
355
414
  * @param joinLink токен присоединения к звонку
356
415
  */
357
416
  function onJoinLinkChanged(joinLink: string): void;
417
+ /**
418
+ * Получена новая реакция
419
+ */
420
+ function onFeedback(feedback: IFeedbackExternal[]): void;
421
+ /**
422
+ * Изменилось состояние пермиссий фич в звонке
423
+ *
424
+ * @param featuresPerRole Информация о доступных фичах по ролям
425
+ */
426
+ function onFeaturesPerRoleChanged(featuresPerRole: IFeaturesPerRole): void;
358
427
  }
359
428
  export default External;
@@ -7,10 +7,13 @@ 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 { IFeaturesPerRole } from '../types/ConversationFeature';
10
11
  import { ExternalId, ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk, ExternalParticipantListMarkers } from '../types/ExternalId';
12
+ import { IFeedbackExternal } from '../types/Feedback';
11
13
  import IceServer from '../types/IceServer';
12
14
  import MediaModifiers from '../types/MediaModifiers';
13
15
  import MediaSettings from '../types/MediaSettings';
16
+ import { IOnRemoteMovieData, ISharedMovieInfo, ISharedMovieState, ISharedMovieStoppedInfo } from '../types/MovieShare';
14
17
  import MuteStates from '../types/MuteStates';
15
18
  import { ParticipantStateMapped } from '../types/Participant';
16
19
  import AuthData from './AuthData';
@@ -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,7 +314,20 @@ 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
  */
@@ -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,22 @@ export declare type ParamsObject = {
478
525
  * @param joinLink токен присоединения к звонку
479
526
  */
480
527
  onJoinLinkChanged?: (joinLink: string) => void;
528
+ /**
529
+ * Получены новые реакции в звонке
530
+ * @param feedback массив с реакциями
531
+ */
532
+ onFeedback?: (feedback: IFeedbackExternal[]) => void;
533
+ /**
534
+ * Включать capability c аудио шарой
535
+ */
536
+ audioShareCapabilityEnabled: boolean;
537
+ /**
538
+ * Изменился список ролей, которым доступны ConversationFeatures
539
+ *
540
+ * @param featuresPerRole Объект вида ключ: ConversationFeature = значение: UserRole[]
541
+ * (если ключ фичи отсутствует, или в ролях пустой массив, считаем фичу доступной для всех пользователей)
542
+ */
543
+ onFeaturesPerRoleChanged?: (featuresPerRole: IFeaturesPerRole) => void;
481
544
  };
482
545
  export default abstract class Params {
483
546
  private static _params;
@@ -494,6 +557,8 @@ export default abstract class Params {
494
557
  static set platform(value: string);
495
558
  static get clientType(): string;
496
559
  static set clientType(value: string);
560
+ static get externalUserType(): string;
561
+ static set externalUserType(value: string);
497
562
  static get device(): string;
498
563
  static get apiKey(): string;
499
564
  static get apiEnv(): string;
@@ -503,6 +568,7 @@ export default abstract class Params {
503
568
  static get anonymToken(): string;
504
569
  static set anonymToken(value: string);
505
570
  static get domain(): string;
571
+ static get externalDomain(): string;
506
572
  static get iceServers(): IceServer[];
507
573
  static set iceServers(value: IceServer[]);
508
574
  static get wssBase(): string;
@@ -571,8 +637,10 @@ export default abstract class Params {
571
637
  static get participantListChunkInitCount(): number;
572
638
  static get serverAudioRed(): boolean;
573
639
  static get p2pAudioRed(): boolean;
640
+ static get h264spsPpsIdrInKeyframe(): boolean;
574
641
  static get batchParticipantsOnStart(): boolean;
575
642
  static get filterObservers(): boolean;
576
643
  static get muteMode(): boolean;
577
644
  static get preserveAudioTracks(): boolean;
645
+ static get audioShareCapabilityEnabled(): boolean;
578
646
  }
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>;
@@ -66,7 +66,7 @@ declare namespace WebRTCUtils {
66
66
  /**
67
67
  * Запрашивает трансляцию экрана пользователя
68
68
  */
69
- function getScreenMedia(): Promise<MediaStream>;
69
+ function getScreenMedia(withAudioShare: boolean): Promise<MediaStream>;
70
70
  /**
71
71
  * Запрашивает камеру пользователя
72
72
  *
@@ -146,5 +146,6 @@ declare namespace WebRTCUtils {
146
146
  * Возвращает подверсию браузера (если она есть)
147
147
  */
148
148
  function browserSubVersion(): string;
149
+ function isAudioShareSupported(): boolean;
149
150
  }
150
151
  export default WebRTCUtils;
@@ -0,0 +1,3 @@
1
+ import ConversationFeature from '../enums/ConversationFeature';
2
+ import UserRole from '../enums/UserRole';
3
+ export declare type IFeaturesPerRole = Partial<Record<ConversationFeature, UserRole[]>>;
@@ -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[];