@vkontakte/calls-sdk 2.4.4-beta.2 → 2.4.4-beta.20

package/classes/Conversation.d.ts

@@ -14,6 +14,7 @@ import UserType from '../enums/UserType';
 import { JSONObject } from '../static/Json';
 import { ExternalId } from '../types/ExternalId';
 import MediaModifiers from '../types/MediaModifiers';
+import { IVideoDimentions } from '../types/MediaSettings';
 import MuteStates from '../types/MuteStates';
 import { CompositeUserId, OkUserId } from '../types/Participant';
 import { ParticipantLayout } from '../types/ParticipantLayout';
@@ -194,7 +195,7 @@ export default class Conversation extends EventEmitter {
     private _isCallAdmin;
     private _checkAdminRole;
     grantRoles(participantId: CompositeUserId, roles: UserRole[], revoke: boolean): Promise<void>;
-    muteParticipant(participantId: CompositeUserId | null, muteStates: MuteStates): Promise<void>;
+    muteParticipant(participantId: CompositeUserId | null, muteStates: MuteStates, requestedMedia?: MediaOption[]): Promise<void>;
     pinParticipant(participantId: CompositeUserId, unpin: boolean): Promise<void>;
     updateMediaModifiers(mediaModifiers: MediaModifiers): Promise<void>;
     changeOptions(changes: {
@@ -215,7 +216,7 @@ export default class Conversation extends EventEmitter {
         movieId: string;
         streamType: string;
     }>;
-    updateMovie(movieId: string, gain?: number): Promise<void>;
+    updateMovie(movieId: string, gain?: number, offset?: string, pause?: boolean): 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>;
@@ -224,7 +225,9 @@ export default class Conversation extends EventEmitter {
         movieId: any;
         preview: any;
     }>;
-    setLocalResolution(width: number, height: number): Promise<void>;
+    setLocalResolution(width: number, height: number, params?: {
+        effect: IVideoDimentions;
+    }): Promise<void>;
     videoEffect(effect: IEffect | null): Promise<void>;
     private _onLocalMediaStreamChanged;
     private _onScreenSharingStatus;

package/classes/MediaSource.d.ts

@@ -16,8 +16,12 @@ export declare const enum MediaTrackKind {
     'screen' = "screen"
 }
 export declare class MediaSource extends EventEmitter {
+    /** Стрим с камеры и микрофона пользователя */
     private _stream;
+    /** Последний сохраненный оригинальный видео трек с камеры */
+    private _trackVideoStreamBackup;
     private _screenTrack;
+    /** Трек для отправки в медиа-канал. Может отличаться при скриншаринге в дата-канал */
     private _sendVideoTrack;
     private _mediaSettings;
     private _videoStatusOnScreenCapturingEnabled;
@@ -39,6 +43,11 @@ export declare class MediaSource extends EventEmitter {
     setVideoStream(stream: MediaStream, isScreen: boolean): Promise<void>;
     private _initDeviceChangeListener;
     private _changeVideoInput;
+    /**
+     * хелпер для получения трека для передаче либе эффектов. нужен для сохранения оригинального трека с камеры.
+     * рассчитываем, что либы при очистке останавливают треки, поэтому передаем копию.
+     */
+    private _getVideoEffectTrack;
     /**
      * Установка кастомного стрима для аудио, например аудио-трек вместо звука с микрофона.
      * Может использоваться для тестирования.
@@ -50,6 +59,8 @@ export declare class MediaSource extends EventEmitter {
     private _replaceLocalTrack;
     private _stopLocalTrack;
     private _videoEffect;
+    /** останавливает и удаляет сохраненный трек с камеры пользователя */
+    private _stopAndRemoveTrackVideoStreamBackup;
     destroy(): void;
     toggleScreenCapturing(enabled: boolean): Promise<void>;
     toggleVideo(enabled: boolean): Promise<void>;

package/classes/screenshare/BaseStreamBuilder.d.ts

@@ -0,0 +1,25 @@
+import { CompositeUserId } from '../../types/Participant';
+import { FrameChunk } from './Utils';
+export declare abstract class BaseStreamBuilder {
+    protected readonly _participantId: CompositeUserId;
+    protected readonly _onStream: (stream: MediaStream) => void;
+    protected _chunks: FrameChunk[];
+    protected constructor(participantId: CompositeUserId, onStream: (stream: MediaStream) => void);
+    appendChunk(chunk: FrameChunk): void;
+    destroy(): void;
+    protected abstract _processFrame(frame: FrameData): void;
+    private _processFrameData;
+    static getFrameSize(frameData: Uint8Array): {
+        width: number;
+        height: number;
+    };
+    static isBrowserSupported(): boolean;
+}
+export interface FrameData {
+    timestamp: number;
+    frameData: Uint8Array;
+    isVP9: boolean;
+    keyframe: boolean;
+    width: number;
+    height: number;
+}

package/classes/screenshare/StreamBuilder.d.ts

@@ -1,13 +1,10 @@
 import { CompositeUserId } from '../../types/Participant';
-import { FrameChunk } from './Utils';
-export default class StreamBuilder {
+import { BaseStreamBuilder, FrameData } from './BaseStreamBuilder';
+export default class StreamBuilder extends BaseStreamBuilder {
     private readonly _decoder;
     private _decoderReady;
     private _decoderQueue;
-    private readonly _participantId;
-    private _chunks;
     private readonly _useImageBitmap;
-    private _onStream;
     private _canvas;
     private _canvasContext;
     private _stream;
@@ -15,11 +12,10 @@ export default class StreamBuilder {
     constructor(participantId: CompositeUserId, onStream: (stream: MediaStream) => void);
     private _createStream;
     private _removeStream;
-    private _processFrameData;
     private _requestCanvasFrame;
     private _drawImage;
-    private _decodeFrame;
+    protected _processFrame(frame: FrameData): void;
     private _decodeQueue;
-    appendChunk(chunk: FrameChunk): void;
     destroy(): void;
+    static isBrowserSupported(): boolean;
 }

package/classes/screenshare/WebmBuilder.d.ts

@@ -0,0 +1,19 @@
+import { CompositeUserId } from '../../types/Participant';
+import { BaseStreamBuilder, FrameData } from './BaseStreamBuilder';
+export default class WebmBuilder extends BaseStreamBuilder {
+    private _mediaBuffer;
+    private _video;
+    private _stream;
+    private _earliestTimestamp;
+    private _clusterStartTime;
+    private _lastFrameTimestamp;
+    constructor(participantId: CompositeUserId, onStream: (stream: MediaStream) => void);
+    private static _intToU16BE;
+    private static _genWebmHeader;
+    private static _genSegmentHeader;
+    private static _genClusterHeader;
+    private _createVideo;
+    protected _processFrame(frame: FrameData): void;
+    destroy(): void;
+    static isBrowserSupported(): boolean;
+}

package/default/Api.d.ts

@@ -39,7 +39,7 @@ export default class Api extends BaseApi {
     getExternalIdsByOkIds(uids: OkUserId[]): Promise<ExternalId[]>;
     getCachedOkIdByExternalId(externalId: ExternalId): CompositeUserId | null;
     cacheExternalId(participantId: CompositeUserId, externalId: ExternalId): void;
-    getConversationParams(): Promise<ConversationParams>;
+    getConversationParams(conversationId?: string): Promise<ConversationParams>;
     getUserId(): OkUserId | null;
     setUserId(userId: OkUserId): void;
     hangupConversation(conversationId: string): void;

package/default/Signaling.d.ts

@@ -3,6 +3,7 @@ import { ParticipantIdRegistry } from '../classes/ParticipantIdRegistry';
 import { PerfStatReport } from '../classes/transport/PerfStatReporter';
 import { TransportTopology } from '../classes/transport/Transport';
 import ConversationOption from '../enums/ConversationOption';
+import MediaOption from '../enums/MediaOption';
 import RecordRole from '../enums/RecordRole';
 import SignalingCommandType from '../enums/SignalingCommandType';
 import SignalingConnectionType from '../enums/SignalingConnectionType';
@@ -104,7 +105,7 @@ export default class Signaling extends BaseSignaling {
     chatHistory(count: number): Promise<SignalingMessage>;
     customData(data: JSONObject, participantId: CompositeUserId | null): Promise<SignalingMessage>;
     grantRoles(participantId: CompositeUserId, roles: UserRole[], revoke: boolean): Promise<SignalingMessage>;
-    muteParticipant(participantId: CompositeUserId | null, muteStates: MuteStates): Promise<SignalingMessage>;
+    muteParticipant(participantId: CompositeUserId | null, muteStates: MuteStates, requestedMedia: MediaOption[]): Promise<SignalingMessage>;
     pinParticipant(participantId: CompositeUserId, unpin: boolean): Promise<SignalingMessage>;
     updateMediaModifiers(mediaModifiers: MediaModifiers): Promise<SignalingMessage>;
     changeOptions(changes: {

package/enums/HangupType.d.ts

@@ -10,6 +10,7 @@ declare enum HangupType {
     BUSY = "BUSY",
     FAILED = "FAILED",
     NETWORK_ERROR = "NETWORK_ERROR",
+    KILLED = "KILLED",
     CALLER_IS_BLOCKED = "CALLER_IS_BLOCKED",
     NOT_FRIENDS = "NOT_FRIENDS",
     CALLEE_IS_OFFLINE = "CALLEE_IS_OFFLINE",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/calls-sdk",
-  "version": "2.4.4-beta.2",
+  "version": "2.4.4-beta.20",
   "author": "vk.com",
   "description": "Library for video calls based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -14,10 +14,12 @@
     "**/*.d.ts"
   ],
   "dependencies": {
-    "@vkontakte/calls-video-effects": "^1.0.6-beta.14",
+    "@vkontakte/calls-video-effects": "^1.0.6-beta.18",
     "@vkontakte/libvpx": "2.0.9",
     "big-integer": "1.6.48",
+    "bit-buffer": "0.2.5",
     "messagepack": "1.1.12",
+    "simple-ebml-builder": "^0.2.2",
     "webrtc-adapter": "7.7.0"
   }
 }

package/static/External.d.ts

@@ -166,8 +166,9 @@ declare namespace External {
      * @param muteAll Команда распространяется на всех участников звонка
      * @param unmute Разрешение включить устройство
      * @param userId Пользователь, для которого изменились разрешения или `null` для текущего пользователя
+     * @param adminId Пользователь, который изменил разрешения
      */
-    function onMuteStates(muteStates: MuteStates, unmuteOptions: MediaOption[], mediaOptions: MediaOption[], muteAll?: boolean, unmute?: boolean, userId?: ExternalId | null): void;
+    function onMuteStates(muteStates: MuteStates, unmuteOptions: MediaOption[], mediaOptions: MediaOption[], muteAll?: boolean, unmute?: boolean, userId?: ExternalId | null, adminId?: ExternalId | null): void;
     /**
      * Изменились роли собеседника в звонке
      *

package/static/Params.d.ts

@@ -196,6 +196,7 @@ export declare type ParamsObject = {
     producerCommandDataChannel: boolean;
     consumerScreenDataChannel: boolean;
     producerScreenDataChannel: boolean;
+    screenShareWebmBuilder: boolean;
     noiseSuppression: boolean;
     /**
      * Количество входящих видео-треков.
@@ -296,7 +297,7 @@ export declare type ParamsObject = {
     /**
      * Изменились состояния устройств пользователя или разрешения включать камеру/микрофон
      */
-    onMuteStates?: (muteStates: MuteStates, unmuteOptions: MediaOption[], mediaOptions: MediaOption[], muteAll: boolean, unmute: boolean, userId: ExternalId | null) => void;
+    onMuteStates?: (muteStates: MuteStates, unmuteOptions: MediaOption[], mediaOptions: MediaOption[], muteAll: boolean, unmute: boolean, userId: ExternalId | null, adminId: ExternalId | null) => void;
     /**
      * Изменились роли собеседника в звонке
      */
@@ -480,9 +481,8 @@ export default abstract class Params {
     static get producerNotificationDataChannel(): boolean;
     static get producerCommandDataChannel(): boolean;
     static get consumerScreenDataChannel(): boolean;
-    static set consumerScreenDataChannel(value: boolean);
     static get producerScreenDataChannel(): boolean;
-    static set producerScreenDataChannel(value: boolean);
+    static get screenShareWebmBuilder(): boolean;
     static get noiseSuppression(): boolean;
     static set noiseSuppression(value: boolean);
     static get preferH264(): boolean;

package/types/MediaSettings.d.ts

@@ -17,9 +17,13 @@ export declare type MediaSettings = {
     videoStreams: VideoStreamInfo[];
 };
 export declare type VideoStreamInfo = {
-    name: string;
+    id: string;
     source: string;
 };
 export default MediaSettings;
 export declare function compareMediaSettings(ms1: MediaSettings, ms2: MediaSettings): boolean;
 export declare function createMediaSettingsWithDefaults(ms?: Partial<MediaSettings>): MediaSettings;
+export interface IVideoDimentions {
+    width: number;
+    height: number;
+}

package/types/SignalingMessage.d.ts

@@ -120,9 +120,11 @@ declare namespace SignalingMessage {
         roles?: UserRole[];
     }
     export interface MuteParticipant extends Notification {
+        adminId?: CompositeUserId;
         participantId?: CompositeUserId;
-        muteStates?: MuteStates;
+        muteStates: MuteStates;
         unmuteOptions?: MediaOption[];
+        mediaOptions: MediaOption[];
         unmute?: boolean;
         muteAll?: boolean;
     }

package/utils/Media.d.ts

@@ -0,0 +1,4 @@
+export declare const stopMediaStreamTrack: (track: MediaStreamTrack) => void;
+export declare const stopMediaStreamTracks: (stream: MediaStream) => void;
+export declare const stopMediaStreamVideoTracks: (stream: MediaStream) => void;
+export declare const cloneVideoTrack: (stream: MediaStream) => MediaStreamTrack;