@vkontakte/calls-sdk 2.6.2-dev.03b3a46.0 → 2.6.2-dev.07a666d.0

package/classes/Conversation.d.ts

@@ -15,7 +15,7 @@ import { JSONObject } from '../static/Json';
 import { ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk, ExternalUserId } from '../types/ExternalId';
 import MediaModifiers from '../types/MediaModifiers';
 import { IVideoDimentions } from '../types/MediaSettings';
-import { IAddMovieParams } from '../types/MovieShare';
+import { IAddMovieParams, IUpdateMovieData } from '../types/MovieShare';
 import MuteStates from '../types/MuteStates';
 import { CompositeUserId, IGetParticipantsParameters, OkUserId, ParticipantId } from '../types/Participant';
 import { ParticipantLayout } from '../types/ParticipantLayout';
@@ -38,6 +38,7 @@ export declare type ConversationData = {
      */
     acceptTime: number | null;
     features: ConversationFeature[];
+    featuresPerRole?: Partial<Record<ConversationFeature, UserRole[]>> | null;
     /**
      * ID звонка
      */
@@ -77,6 +78,7 @@ export default class Conversation extends EventEmitter {
     private readonly _signaling;
     private _mediaSource;
     private _conversation;
+    private _myLastRequestedLayouts;
     private _state;
     private _participantState;
     private _participants;
@@ -107,7 +109,7 @@ export default class Conversation extends EventEmitter {
     static current(): Conversation | null;
     static hangupAfterInit(): void;
     static id(): string | null;
-    onStart(opponentIds: OkUserId[], opponentType: CallType, mediaOptions: MediaOption[], payload?: string, joiningAllowed?: boolean, requireAuthToJoin?: boolean): Promise<ConversationData>;
+    onStart(opponentIds: OkUserId[], opponentType: CallType, mediaOptions: MediaOption[], payload?: string, joiningAllowed?: boolean, requireAuthToJoin?: boolean, onlyAdminCanShareMovie?: boolean): Promise<ConversationData>;
     onJoin(joinArgs: {
         conversationId?: string;
         mediaOptions: MediaOption[];
@@ -158,7 +160,6 @@ export default class Conversation extends EventEmitter {
     private _registerParticipants;
     /** Установим состояние локальных мьютов */
     private _registerParticipantLocalMuteState;
-    private _getClientType;
     private _getStatusByTransportState;
     private _registerParticipantInCache;
     private _getExistedParticipantByIdOrCreate;
@@ -204,8 +205,6 @@ export default class Conversation extends EventEmitter {
     requestKeyFrame(participantStreamDescription: ParticipantStreamDescription): Promise<void | SignalingMessage>;
     requestTestMode(consumerCommand: string, producerCommand: string): Promise<void>;
     updateDisplayLayout(layouts: ParticipantLayout[]): Promise<void>;
-    /** @async */
-    feedback(key: string): Promise<SignalingMessage>;
     private _stopStreaming;
     private _sendUpdateDisplayLayout;
     private _cleanupCooldownQueue;
@@ -222,6 +221,7 @@ export default class Conversation extends EventEmitter {
     private _checkAdminRole;
     grantRoles(participantId: CompositeUserId, roles: UserRole[], revoke: boolean): Promise<void>;
     muteParticipant(participantId: ParticipantId | null, muteStates: MuteStates, requestedMedia?: MediaOption[]): Promise<void>;
+    enableFeatureForRoles(feature: ConversationFeature, roles: UserRole[]): Promise<void>;
     pinParticipant(participantId: ParticipantId, unpin: boolean): Promise<void>;
     updateMediaModifiers(mediaModifiers: MediaModifiers): Promise<void>;
     changeOptions(changes: {
@@ -242,7 +242,7 @@ export default class Conversation extends EventEmitter {
         movieId: string;
         streamType: string;
     }>;
-    updateMovie(movieId: string, gain?: number, offset?: number, pause?: boolean): Promise<void>;
+    updateMovie(params: IUpdateMovieData): Promise<void>;
     removeMovie(movieId: string): Promise<void>;
     startStream(isRecord?: boolean, name?: string | null, movieId?: string | null, privacy?: 'PUBLIC' | 'FRIENDS' | 'DIRECT_LINK', groupId?: string | null): Promise<SignalingMessage>;
     stopStream(): Promise<SignalingMessage>;
@@ -314,8 +314,7 @@ export default class Conversation extends EventEmitter {
     private _updateDisplayLayoutFromCache;
     private _setParticipantsStatus;
     private _onJoinLinkChanged;
-    /** получили из сингналинга сообщение о реакции пользователей */
-    private _onFeedback;
+    private _isMe;
 }
 export declare class UpdateDisplayLayoutError extends Error {
     readonly participantErrors: {

package/default/Api.d.ts

@@ -16,8 +16,12 @@ export default class Api extends BaseApi {
     log(items: LogItem[]): void;
     init(): void;
     joinConversation(conversationId: string, isVideo?: boolean, chatId?: string): Promise<ConversationResponse>;
-    createConversation(conversationId: string, payload?: string, requireAuthToJoin?: boolean): Promise<ConversationResponse>;
-    startConversation(conversationId: string, ids?: OkUserId[], type?: CallType, isVideo?: boolean, payload?: string, joiningAllowed?: boolean, requireAuthToJoin?: boolean): Promise<ConversationResponse>;
+    createConversation(conversationId: string, payload?: string, requireAuthToJoin?: boolean, { onlyAdminCanShareMovie }?: {
+        onlyAdminCanShareMovie?: boolean;
+    }): Promise<ConversationResponse>;
+    startConversation(conversationId: string, ids?: OkUserId[], type?: CallType, isVideo?: boolean, payload?: string, joiningAllowed?: boolean, requireAuthToJoin?: boolean, { onlyAdminCanShareMovie }?: {
+        onlyAdminCanShareMovie?: boolean;
+    }): Promise<ConversationResponse>;
     private _preareStartConversationData;
     private _startConversation;
     createJoinLink(conversationId: string): Promise<{

package/default/Signaling.d.ts

@@ -2,6 +2,7 @@ import BaseSignaling, { AddParticipantParams } from '../abstract/BaseSignaling';
 import { ParticipantIdRegistry } from '../classes/ParticipantIdRegistry';
 import { PerfStatReport } from '../classes/transport/PerfStatReporter';
 import { TransportTopology } from '../classes/transport/Transport';
+import ConversationFeature from '../enums/ConversationFeature';
 import ConversationOption from '../enums/ConversationOption';
 import MediaOption from '../enums/MediaOption';
 import RecordRole from '../enums/RecordRole';
@@ -11,7 +12,7 @@ import UserRole from '../enums/UserRole';
 import { JSONObject } from '../static/Json';
 import MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
-import { IAddMovieParams, ISharedMovieState } from '../types/MovieShare';
+import { IAddMovieParams, IUpdateMovieData } from '../types/MovieShare';
 import MuteStates from '../types/MuteStates';
 import { CompositeUserId, ParticipantId } from '../types/Participant';
 import ParticipantLayout, { RequestKeyFrame, StopStream } from '../types/ParticipantLayout';
@@ -98,7 +99,7 @@ export default class Signaling extends BaseSignaling {
         [streamDesc: string]: ParticipantLayout | StopStream | RequestKeyFrame;
     }): Promise<SignalingMessage>;
     addMovie(data: IAddMovieParams): Promise<SignalingMessage>;
-    updateMovie(data: ISharedMovieState): Promise<SignalingMessage>;
+    updateMovie(data: IUpdateMovieData): Promise<SignalingMessage>;
     removeMovie(data: any): Promise<SignalingMessage>;
     startStream(data: any): Promise<SignalingMessage>;
     stopStream(): Promise<SignalingMessage>;
@@ -112,6 +113,7 @@ export default class Signaling extends BaseSignaling {
     customData(data: JSONObject, participantId: ParticipantId | null): Promise<SignalingMessage>;
     grantRoles(participantId: CompositeUserId, roles: UserRole[], revoke: boolean): Promise<SignalingMessage>;
     muteParticipant(participantId: ParticipantId | null, muteStates: MuteStates, requestedMedia: MediaOption[]): Promise<SignalingMessage>;
+    enableFeatureForRoles(feature: ConversationFeature, roles: UserRole[]): Promise<SignalingMessage>;
     pinParticipant(participantId: ParticipantId, unpin: boolean): Promise<SignalingMessage>;
     updateMediaModifiers(mediaModifiers: MediaModifiers): Promise<SignalingMessage>;
     changeOptions(changes: {
@@ -119,7 +121,6 @@ export default class Signaling extends BaseSignaling {
     }): Promise<SignalingMessage>;
     getWaitingHall(fromId?: WaitingParticipantId | null, count?: number, backward?: boolean): Promise<SignalingMessage>;
     promoteParticipant(participantId: CompositeUserId, demote?: boolean): Promise<SignalingMessage>;
-    feedback(key: string): Promise<SignalingMessage>;
     /**
      * Close a connection with a signaling server
      */

package/enums/ConversationFeature.d.ts

@@ -1,5 +1,6 @@
 declare const enum ConversationFeature {
     ADD_PARTICIPANT = "ADD_PARTICIPANT",
-    RECORD = "RECORD"
+    RECORD = "RECORD",
+    MOVIE_SHARE = "MOVIE_SHARE"
 }
 export default ConversationFeature;

package/enums/ConversationOption.d.ts

@@ -5,8 +5,7 @@ declare enum ConversationOption {
     REQUIRE_AUTH_TO_JOIN = "REQUIRE_AUTH_TO_JOIN",
     AUDIENCE_MODE = "AUDIENCE_MODE",
     WAITING_HALL = "WAITING_HALL",
-    ASR = "ASR",
-    FEEDBACK = "FEEDBACK"
+    ASR = "ASR"
 }
 export default ConversationOption;
 export declare function compareOptions(oldOptions: ConversationOption[], newOptions: ConversationOption[]): boolean;

package/enums/MediaOption.d.ts

@@ -4,6 +4,7 @@
 declare enum MediaOption {
     AUDIO = "AUDIO",
     VIDEO = "VIDEO",
-    SCREEN_SHARING = "SCREEN_SHARING"
+    SCREEN_SHARING = "SCREEN_SHARING",
+    MOVIE_SHARING = "MOVIE_SHARING"
 }
 export default MediaOption;

package/enums/SignalingCommandType.d.ts

@@ -24,6 +24,7 @@ declare enum SignalingCommandType {
     CUSTOM_DATA = "custom-data",
     GRANT_ROLES = "grant-roles",
     MUTE_PARTICIPANT = "mute-participant",
+    ENABLE_FEATURE_FOR_ROLES = "enable-feature-for-roles",
     PIN_PARTICIPANT = "pin-participant",
     UPDATE_MEDIA_MODIFIERS = "update-media-modifiers",
     CHANGE_OPTIONS = "change-options",
@@ -34,7 +35,6 @@ declare enum SignalingCommandType {
     REQUEST_TEST_MODE = "request-test-mode",
     ADD_MOVIE = "add-movie",
     UPDATE_MOVIE = "update-movie",
-    REMOVE_MOVIE = "remove-movie",
-    FEEDBACK = "feedback"
+    REMOVE_MOVIE = "remove-movie"
 }
 export default SignalingCommandType;

package/enums/SignalingNotification.d.ts

@@ -36,7 +36,6 @@ declare enum SignalingNotification {
     CHAT_ROOM_UPDATED = "chat-room-updated",
     PROMOTION_APPROVED = "promotion-approved",
     JOIN_LINK_CHANGED = "join-link-changed",
-    FEEDBACK = "feedback",
     MOVIE_UPDATE_NOTIFICATION = "movie-update-notification",
     MOVIE_SHARE_INFO = "movie-share-info",
     MOVIE_SHARE_STARTED = "movie-share-started",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/calls-sdk",
-  "version": "2.6.2-dev.03b3a46.0",
+  "version": "2.6.2-dev.07a666d.0",
   "author": "vk.com",
   "description": "Library for video calls based on the vk.com platform",
   "homepage": "https://vk.com",

package/static/External.d.ts

@@ -8,7 +8,6 @@ import FatalError from '../enums/FatalError';
 import MediaOption from '../enums/MediaOption';
 import UserRole from '../enums/UserRole';
 import { ExternalId, ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk, ExternalParticipantListMarkers } from '../types/ExternalId';
-import { IFeedbackExternal } from '../types/Feedback';
 import MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
 import { IOnRemoteMovieData, ISharedMovieInfo, ISharedMovieState, ISharedMovieStoppedInfo } from '../types/MovieShare';
@@ -413,9 +412,5 @@ declare namespace External {
      * @param joinLink токен присоединения к звонку
      */
     function onJoinLinkChanged(joinLink: string): void;
-    /**
-     * Получена новая реакция
-     */
-    function onFeedback(feedback: IFeedbackExternal[]): void;
 }
 export default External;

package/static/Params.d.ts

@@ -8,7 +8,6 @@ import FatalError from '../enums/FatalError';
 import MediaOption from '../enums/MediaOption';
 import UserRole from '../enums/UserRole';
 import { ExternalId, ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk, ExternalParticipantListMarkers } from '../types/ExternalId';
-import { IFeedbackExternal } from '../types/Feedback';
 import IceServer from '../types/IceServer';
 import MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
@@ -26,6 +25,7 @@ import { FacingMode } from './WebRTCUtils';
 export declare type ParamsObject = {
     platform: string;
     clientType: string;
+    externalUserType: string;
     device: string;
     /**
      * API ключ приложения
@@ -523,11 +523,6 @@ export declare type ParamsObject = {
      * @param joinLink токен присоединения к звонку
      */
     onJoinLinkChanged?: (joinLink: string) => void;
-    /**
-     * Получены новые реакции в звонке
-     * @param feedback массив с реакциями
-     */
-    onFeedback?: (feedback: IFeedbackExternal[]) => void;
 };
 export default abstract class Params {
     private static _params;
@@ -544,6 +539,8 @@ export default abstract class Params {
     static set platform(value: string);
     static get clientType(): string;
     static set clientType(value: string);
+    static get externalUserType(): string;
+    static set externalUserType(value: string);
     static get device(): string;
     static get apiKey(): string;
     static get apiEnv(): string;

package/types/ConversationParams.d.ts

@@ -10,5 +10,6 @@ declare type ConversationParams = {
     isp_as_org?: string;
     loc_cc?: string;
     loc_reg?: string;
+    external_user_type: string;
 };
 export default ConversationParams;

package/types/MovieShare.d.ts

@@ -13,13 +13,26 @@ export interface IAddMovieParams {
         thumbnails?: IMoviePreview[];
     };
 }
-export declare type ISharedMovieStateResponse = [number, number, boolean, number, number];
+export declare type ISharedMovieStateResponse = [
+    number,
+    number,
+    boolean,
+    number,
+    boolean
+];
 export interface ISharedMovieState {
     participantId: CompositeUserId;
     gain?: number;
     pause?: boolean;
     offset?: number;
-    duration?: number;
+    mute?: boolean;
+}
+export interface IUpdateMovieData {
+    movieId: string;
+    gain?: number;
+    pause?: boolean;
+    offset?: number;
+    mute?: boolean;
 }
 export interface ISharedMovieInfo {
     movieId: OkUserId;

package/types/SignalingMessage.d.ts

@@ -7,7 +7,6 @@ import MediaOption from '../enums/MediaOption';
 import ParticipantState from '../enums/ParticipantState';
 import UserRole from '../enums/UserRole';
 import UserType from '../enums/UserType';
-import { IFeedback } from './Feedback';
 import MediaModifiers from './MediaModifiers';
 import MediaSettings from './MediaSettings';
 import { ISharedMovieInfo, ISharedMovieState, ISharedMovieStoppedInfo } from './MovieShare';
@@ -75,6 +74,7 @@ declare namespace SignalingMessage {
         multichatId: string | null;
         tamtamMultichatId: string | null;
         recordInfo: RecordInfo | null;
+        featuresPerRole?: Partial<Record<ConversationFeature, UserRole[]>> | null;
         pinnedParticipantId: ParticipantId | null;
         options: ConversationOption[];
         muteStates?: MuteStates;
@@ -189,6 +189,7 @@ declare namespace SignalingMessage {
     }
     export interface FeatureSetChanged extends Notification {
         features: ConversationFeature[];
+        featuresPerRole?: Partial<Record<ConversationFeature, UserRole[]>> | null;
     }
     export interface MultipartyChatCreated extends Notification {
         chatId: string;
@@ -282,9 +283,6 @@ declare namespace SignalingMessage {
     export interface JoinLinkChanged extends Notification {
         joinLink: string;
     }
-    export interface Feedback extends Notification {
-        feedback: IFeedback[];
-    }
     export interface SharedMovieState extends Notification {
         data: ISharedMovieState[];
     }

package/types/WaitingHall.d.ts

@@ -1,7 +1,6 @@
 import { ExternalId } from './ExternalId';
 import { CompositeUserId } from './Participant';
 import SignalingMessage from './SignalingMessage';
-import { IFeedback } from './Feedback';
 export declare type WaitingParticipantId = {
     addedTs: number;
     id: CompositeUserId;
@@ -10,11 +9,18 @@ export declare type WaitingParticipant = {
     id: WaitingParticipantId;
     externalId?: SignalingMessage.ExternalId;
 };
+export declare type Feedback = {
+    key: string;
+    totalCount: number;
+    currentCount: number;
+    timeout: number;
+    participantIds: CompositeUserId[];
+};
 export declare type ChatRoom = {
     totalCount: number;
     firstParticipants?: WaitingParticipant[];
     handCount?: number;
-    feedback?: IFeedback[];
+    feedback?: Feedback[];
 };
 /**
  * Ответ на запрос `getWaitingHall`

package/types/Feedback.d.ts

@@ -1,22 +0,0 @@
-import { CompositeUserId } from './Participant';
-import { ExternalParticipantId } from './ExternalId';
-interface IFeedbackItem {
-    participantId: CompositeUserId;
-    /** event timestamps for this participant, chronologically */
-    times: number[];
-}
-export interface IFeedbackItemExternal extends Omit<IFeedbackItem, 'participantId'> {
-    participantId: ExternalParticipantId;
-}
-export interface IFeedback {
-    /** feedback ID; key values should be negotiated by clients themselves, like in ParticipantState, and have just the same restrictions; on backend the values of these keys are not bound in any way to those in ParticipantState */
-    key: string;
-    /** total amount of reactions of this type from the start of this call */
-    totalCount: number;
-    /** list of items containing initiator & all related data, if any */
-    items: IFeedbackItem[];
-}
-export interface IFeedbackExternal extends Omit<IFeedback, 'items'> {
-    items: IFeedbackItemExternal[];
-}
-export {};