@vkontakte/calls-sdk 2.6.2-dev.4163bb9.0 → 2.6.2-dev.4953823.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, IUpdateMovieData } 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,13 +109,14 @@ 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[];
113
116
  chatId?: string;
114
117
  joinLink?: string;
115
118
  observedIds?: ExternalUserId[];
119
+ payload?: string;
116
120
  }): Promise<ConversationData>;
117
121
  private _onJoinPart2;
118
122
  onPush(conversationId: string, type?: UserType, peerId?: number): Promise<void>;
@@ -151,10 +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
- private _getClientType;
162
+ /** Установим состояние локальных мьютов */
163
+ private _registerParticipantLocalMuteState;
158
164
  private _getStatusByTransportState;
159
165
  private _registerParticipantInCache;
160
166
  private _getExistedParticipantByIdOrCreate;
@@ -188,7 +194,7 @@ export default class Conversation extends EventEmitter {
188
194
  private _onAddParticipant;
189
195
  private _onRemoveParticipant;
190
196
  changeDevice(kind: MediaDeviceKind): Promise<void>;
191
- toggleScreenCapturing(enabled: boolean): Promise<void>;
197
+ toggleScreenCapturing(screenEnabled: boolean, audioShareEnabled: boolean): Promise<void>;
192
198
  setVideoStream(stream: MediaStream, isScreen?: boolean): Promise<void>;
193
199
  setAudioStream(stream: MediaStream): Promise<void>;
194
200
  toggleLocalVideo(enabled: boolean): Promise<void>;
@@ -200,12 +206,19 @@ export default class Conversation extends EventEmitter {
200
206
  requestKeyFrame(participantStreamDescription: ParticipantStreamDescription): Promise<void | SignalingMessage>;
201
207
  requestTestMode(consumerCommand: string, producerCommand: string): Promise<void>;
202
208
  updateDisplayLayout(layouts: ParticipantLayout[]): Promise<void>;
209
+ /** @async */
210
+ feedback(key: string): Promise<SignalingMessage>;
203
211
  private _stopStreaming;
204
212
  private _sendUpdateDisplayLayout;
205
213
  private _cleanupCooldownQueue;
206
214
  private _onParticipantSourcesUpdate;
207
215
  private _onParticipantPromoted;
208
216
  private _onChatRoomUpdated;
217
+ private _onSharedMovieUpdate;
218
+ private _onSharedMovieInfoStarted;
219
+ private _processSharedMovieInfo;
220
+ private _processConnectionSharedMovieInfo;
221
+ private _onSharedMovieInfoStopped;
209
222
  private _waitForStreamIfNeeded;
210
223
  private _matchStreamDescription;
211
224
  private _getWaitingTime;
@@ -213,6 +226,7 @@ export default class Conversation extends EventEmitter {
213
226
  private _checkAdminRole;
214
227
  grantRoles(participantId: CompositeUserId, roles: UserRole[], revoke: boolean): Promise<void>;
215
228
  muteParticipant(participantId: ParticipantId | null, muteStates: MuteStates, requestedMedia?: MediaOption[]): Promise<void>;
229
+ enableFeatureForRoles(feature: ConversationFeature, roles: UserRole[]): Promise<void>;
216
230
  pinParticipant(participantId: ParticipantId, unpin: boolean): Promise<void>;
217
231
  updateMediaModifiers(mediaModifiers: MediaModifiers): Promise<void>;
218
232
  changeOptions(changes: {
@@ -229,11 +243,11 @@ export default class Conversation extends EventEmitter {
229
243
  customData(data: JSONObject, participantId?: ParticipantId | null): Promise<void>;
230
244
  createJoinLink(): Promise<string>;
231
245
  removeJoinLink(): Promise<never>;
232
- addMovie(movieId: string): Promise<{
246
+ addMovie({ movieId, gain, metadata }: IAddMovieParams): Promise<{
233
247
  movieId: string;
234
248
  streamType: string;
235
249
  }>;
236
- updateMovie(movieId: string, gain?: number, offset?: string, pause?: boolean): Promise<void>;
250
+ updateMovie(params: IUpdateMovieData): Promise<void>;
237
251
  removeMovie(movieId: string): Promise<void>;
238
252
  startStream(isRecord?: boolean, name?: string | null, movieId?: string | null, privacy?: 'PUBLIC' | 'FRIENDS' | 'DIRECT_LINK', groupId?: string | null): Promise<SignalingMessage>;
239
253
  stopStream(): Promise<SignalingMessage>;
@@ -305,6 +319,9 @@ export default class Conversation extends EventEmitter {
305
319
  private _updateDisplayLayoutFromCache;
306
320
  private _setParticipantsStatus;
307
321
  private _onJoinLinkChanged;
322
+ /** получили из сингналинга сообщение о реакции пользователей */
323
+ private _onFeedback;
324
+ private _isMe;
308
325
  }
309
326
  export declare class UpdateDisplayLayoutError extends Error {
310
327
  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;
@@ -26,7 +31,7 @@ export default class Api extends BaseApi {
26
31
  success: boolean;
27
32
  }>;
28
33
  getAnonymTokenByLink(joinLink: string, username?: string): Promise<string>;
29
- joinConversationByLink(joinLink: string, isVideo?: boolean, observedIds?: ExternalUserId[]): Promise<ConversationResponse>;
34
+ joinConversationByLink(joinLink: string, isVideo?: boolean, observedIds?: ExternalUserId[], payload?: string): Promise<ConversationResponse>;
30
35
  /**
31
36
  * NB: Не сохраняет порядок возвращаемых ID
32
37
  * @hidden
@@ -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,11 @@ 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"
39
44
  }
40
45
  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.4163bb9.0",
3
+ "version": "2.6.2-dev.4953823.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",
@@ -8,8 +8,10 @@ import FatalError from '../enums/FatalError';
8
8
  import MediaOption from '../enums/MediaOption';
9
9
  import UserRole from '../enums/UserRole';
10
10
  import { ExternalId, ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk, ExternalParticipantListMarkers } from '../types/ExternalId';
11
+ import { IFeedbackExternal } from '../types/Feedback';
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';
15
17
  import { DebugMessageType } from './Debug';
@@ -72,10 +74,31 @@ declare namespace External {
72
74
  * Если сервер закончил стримить собеседника, вместо стрима будет передан null
73
75
  *
74
76
  * @param userId
75
- * @param streamName
76
- * @param stream
77
+ * @param data
77
78
  */
78
- function onRemoteLive(userId: ExternalParticipantId, streamName: string, stream: MediaStream | null): void;
79
+ function onRemoteLive(userId: ExternalParticipantId, data: IOnRemoteMovieData): void;
80
+ /**
81
+ * Получен собственный стрим лайв.
82
+ * Если сервер закончил стримить собеседника, вместо стрима будет передан null
83
+ *
84
+ * @param userId
85
+ * @param data
86
+ */
87
+ function onLocalLive(userId: ExternalParticipantId, data: IOnRemoteMovieData): void;
88
+ /**
89
+ * Получено обновление стрима или лайва от собеседника.
90
+ *
91
+ * @param userId
92
+ * @param data
93
+ */
94
+ function onRemoteLiveUpdate(userId: ExternalParticipantId, data: ISharedMovieState): void;
95
+ /**
96
+ * Получено обновление собственного стрима или лайва.
97
+ *
98
+ * @param userId
99
+ * @param data
100
+ */
101
+ function onLocalLiveUpdate(userId: ExternalParticipantId, data: ISharedMovieState): void;
79
102
  /**
80
103
  * Получен стрим с экрана собеседника.
81
104
  * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
@@ -106,6 +129,41 @@ declare namespace External {
106
129
  * @param markers
107
130
  */
108
131
  function onRemoteMediaSettings(userId: ExternalParticipantId, mediaSettings: MediaSettings, markers?: ExternalParticipantListMarkers): void;
132
+ /**
133
+ * Изменились данные собственного стрима
134
+ *
135
+ * @param userId
136
+ * @param mediaSettings
137
+ */
138
+ function onLocalMediaSettings(userId: ExternalParticipantId, mediaSettings: MediaSettings): void;
139
+ /**
140
+ * Полученны данные по стримам (лайв/мувик) от собеседника
141
+ *
142
+ * @param userId
143
+ * @param sharedMovieInfo
144
+ */
145
+ function onRemoteSharedMovieInfo(userId: ExternalParticipantId, sharedMovieInfo: ISharedMovieInfo): void;
146
+ /**
147
+ * Полученны данные по остановленным стримам (лайв/мувик) от собеседника
148
+ *
149
+ * @param userId
150
+ * @param sharedMovieStoppedInfo
151
+ */
152
+ function onRemoteSharedMovieStoppedInfo(userId: ExternalParticipantId, sharedMovieStoppedInfo: ISharedMovieStoppedInfo): void;
153
+ /**
154
+ * Полученны данные по собственным стримам (лайв/мувик)
155
+ *
156
+ * @param userId
157
+ * @param sharedMovieInfo
158
+ */
159
+ function onLocalSharedMovieInfo(userId: ExternalParticipantId, sharedMovieInfo: ISharedMovieInfo): void;
160
+ /**
161
+ * Полученны данные по собственным остановленным стримам (лайв/мувик)
162
+ *
163
+ * @param userId
164
+ * @param sharedMovieStoppedInfo
165
+ */
166
+ function onLocalSharedMovieStoppedInfo(userId: ExternalParticipantId, sharedMovieStoppedInfo: ISharedMovieStoppedInfo): void;
109
167
  /**
110
168
  * Добавили участника
111
169
  *
@@ -355,5 +413,9 @@ declare namespace External {
355
413
  * @param joinLink токен присоединения к звонку
356
414
  */
357
415
  function onJoinLinkChanged(joinLink: string): void;
416
+ /**
417
+ * Получена новая реакция
418
+ */
419
+ function onFeedback(feedback: IFeedbackExternal[]): void;
358
420
  }
359
421
  export default External;
@@ -8,9 +8,11 @@ import FatalError from '../enums/FatalError';
8
8
  import MediaOption from '../enums/MediaOption';
9
9
  import UserRole from '../enums/UserRole';
10
10
  import { ExternalId, ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk, ExternalParticipantListMarkers } from '../types/ExternalId';
11
+ import { IFeedbackExternal } from '../types/Feedback';
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';
16
18
  import AuthData from './AuthData';
@@ -24,6 +26,7 @@ import { FacingMode } from './WebRTCUtils';
24
26
  export declare type ParamsObject = {
25
27
  platform: string;
26
28
  clientType: string;
29
+ externalUserType: string;
27
30
  device: string;
28
31
  /**
29
32
  * API ключ приложения
@@ -43,6 +46,11 @@ export declare type ParamsObject = {
43
46
  * Домен, чтобы попасть в тестовую группу. Для тестирования экспериментальных улучшений существуют отдельные сервера, чтобы собирать фидбек и уже потом раскатывать на всех юзеров. Если передать сюда специальный ключ, то конверсейшн будет обрабатываться на таком сервере.
44
47
  */
45
48
  domain: string;
49
+ /**
50
+ * Домен, куда будет ходить Ok api за данными
51
+ * @hidden
52
+ */
53
+ externalDomain: string;
46
54
  iceServers: IceServer[];
47
55
  wssBase: string;
48
56
  wssToken: string;
@@ -247,6 +255,11 @@ export declare type ParamsObject = {
247
255
  * Включать RED-extension (redundancy) для p2p звонков
248
256
  */
249
257
  p2pAudioRed: boolean;
258
+ /**
259
+ * Добавлять флаг spsPpsIdrInKeyframe для h264 кодека. В результате ключевые фреймы без sps и pps
260
+ * не используются как ключевые. Решает проблему с артефактами на видео в случае потерь пакетов.
261
+ */
262
+ h264spsPpsIdrInKeyframe: boolean;
250
263
  /**
251
264
  * Получать список участников звонка третьим аргументом в `onConversation`
252
265
  * @hidden
@@ -300,7 +313,20 @@ export declare type ParamsObject = {
300
313
  * Получен стрим трансляция или мувик от собеседника.
301
314
  * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
302
315
  */
303
- onRemoteLive?: (userId: ExternalParticipantId, streamId: string, stream: MediaStream | null) => void;
316
+ onRemoteLive?: (userId: ExternalParticipantId, data: IOnRemoteMovieData) => void;
317
+ /**
318
+ * Получен собственный стрим трансляция или мувик.
319
+ * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
320
+ */
321
+ onLocalLive?: (userId: ExternalParticipantId, data: IOnRemoteMovieData) => void;
322
+ /**
323
+ * Получено обновление стрима или лайва от собеседника.
324
+ */
325
+ onRemoteLiveUpdate?: (userId: ExternalParticipantId, data: ISharedMovieState) => void;
326
+ /**
327
+ * Получено обновление собственного стрима или лайва.
328
+ */
329
+ onLocalLiveUpdate?: (userId: ExternalParticipantId, data: ISharedMovieState) => void;
304
330
  /**
305
331
  * Начат звонок
306
332
  */
@@ -313,6 +339,26 @@ export declare type ParamsObject = {
313
339
  * Изменились данные стрима собеседника
314
340
  */
315
341
  onRemoteMediaSettings?: (userId: ExternalParticipantId, mediaSettings: MediaSettings, markers?: ExternalParticipantListMarkers) => void;
342
+ /**
343
+ * Изменились данные стрима собеседника
344
+ */
345
+ onLocalMediaSettings?: (userId: ExternalParticipantId, mediaSettings: MediaSettings) => void;
346
+ /**
347
+ * Полученны данные по стримам (лайв/мувик) от собеседника
348
+ */
349
+ onRemoteSharedMovieInfo?: (userId: ExternalParticipantId, sharedMovieInfo: ISharedMovieInfo) => void;
350
+ /**
351
+ * Полученны данные по остановленным стримам (лайв/мувик) от собеседника
352
+ */
353
+ onRemoteSharedMovieStoppedInfo?: (userId: ExternalParticipantId, sharedMovieStoppedInfo: ISharedMovieStoppedInfo) => void;
354
+ /**
355
+ * Полученны данные по собственным стримам (лайв/мувик)
356
+ */
357
+ onLocalSharedMovieInfo?: (userId: ExternalParticipantId, sharedMovieInfo: ISharedMovieInfo) => void;
358
+ /**
359
+ * Полученны данные по собственным остановленным стримам (лайв/мувик)
360
+ */
361
+ onLocalSharedMovieStoppedInfo?: (userId: ExternalParticipantId, sharedMovieStoppedInfo: ISharedMovieStoppedInfo) => void;
316
362
  /**
317
363
  * Добавили участника
318
364
  */
@@ -478,6 +524,15 @@ export declare type ParamsObject = {
478
524
  * @param joinLink токен присоединения к звонку
479
525
  */
480
526
  onJoinLinkChanged?: (joinLink: string) => void;
527
+ /**
528
+ * Получены новые реакции в звонке
529
+ * @param feedback массив с реакциями
530
+ */
531
+ onFeedback?: (feedback: IFeedbackExternal[]) => void;
532
+ /**
533
+ * Включать capability c аудио шарой
534
+ */
535
+ audioShareCapabilityEnabled: boolean;
481
536
  };
482
537
  export default abstract class Params {
483
538
  private static _params;
@@ -494,6 +549,8 @@ export default abstract class Params {
494
549
  static set platform(value: string);
495
550
  static get clientType(): string;
496
551
  static set clientType(value: string);
552
+ static get externalUserType(): string;
553
+ static set externalUserType(value: string);
497
554
  static get device(): string;
498
555
  static get apiKey(): string;
499
556
  static get apiEnv(): string;
@@ -503,6 +560,7 @@ export default abstract class Params {
503
560
  static get anonymToken(): string;
504
561
  static set anonymToken(value: string);
505
562
  static get domain(): string;
563
+ static get externalDomain(): string;
506
564
  static get iceServers(): IceServer[];
507
565
  static set iceServers(value: IceServer[]);
508
566
  static get wssBase(): string;
@@ -571,8 +629,10 @@ export default abstract class Params {
571
629
  static get participantListChunkInitCount(): number;
572
630
  static get serverAudioRed(): boolean;
573
631
  static get p2pAudioRed(): boolean;
632
+ static get h264spsPpsIdrInKeyframe(): boolean;
574
633
  static get batchParticipantsOnStart(): boolean;
575
634
  static get filterObservers(): boolean;
576
635
  static get muteMode(): boolean;
577
636
  static get preserveAudioTracks(): boolean;
637
+ static get audioShareCapabilityEnabled(): boolean;
578
638
  }
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;
@@ -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,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[];