@vkontakte/calls-sdk 2.5.3-dev.d006735.0 → 2.5.3-dev.fe8ad1c.0

package/classes/Conversation.d.ts

@@ -15,6 +15,7 @@ import { JSONObject } from '../static/Json';
 import { ExternalParticipantId, ExternalUserId } from '../types/ExternalId';
 import MediaModifiers from '../types/MediaModifiers';
 import { IVideoDimentions } from '../types/MediaSettings';
+import { IAddMovieParams } from '../types/MovieShare';
 import MuteStates from '../types/MuteStates';
 import { CompositeUserId, OkUserId, ParticipantId } from '../types/Participant';
 import { ParticipantLayout } from '../types/ParticipantLayout';
@@ -191,6 +192,7 @@ export default class Conversation extends EventEmitter {
     private _onParticipantSourcesUpdate;
     private _onParticipantPromoted;
     private _onChatRoomUpdated;
+    private _onSharedMovieUpdate;
     private _waitForStreamIfNeeded;
     private _matchStreamDescription;
     private _getWaitingTime;
@@ -214,7 +216,7 @@ export default class Conversation extends EventEmitter {
     customData(data: JSONObject, participantId?: ParticipantId | null): Promise<void>;
     createJoinLink(): Promise<string>;
     removeJoinLink(): Promise<never>;
-    addMovie(movieId: string): Promise<{
+    addMovie({ movieId, gain }: IAddMovieParams): Promise<{
         movieId: string;
         streamType: string;
     }>;
@@ -278,7 +280,6 @@ export default class Conversation extends EventEmitter {
     private _onRemoteTrackRemoved;
     private _removeAudioTrack;
     private _removeVideoTrack;
-    private _onRemoteActivityNoSignal;
     private _onTopologyChanged;
     private _onRemoteAllStall;
     private _onRemoteSignalledStall;

package/classes/SpeakerDetector.d.ts

@@ -1,6 +1,6 @@
 import { ParticipantId } from '../types/Participant';
 import EventEmitter from './EventEmitter';
-import { Transport } from './transport/Transport';
+import { Transport, TransportTopology } from './transport/Transport';
 import { VolumeLevel } from './VolumeDetector';
 import { VolumesDetector } from './VolumesDetector';
 export declare const enum SpeakerDetectorEvent {
@@ -8,13 +8,12 @@ export declare const enum SpeakerDetectorEvent {
 }
 export declare class SpeakerDetector extends EventEmitter {
     private _speakerId;
-    private _serverAudioActivityAvailable;
-    constructor(volumesDetector: VolumesDetector, transport: Transport);
+    private _serverSideSpeakerDetection;
+    constructor(volumesDetector: VolumesDetector, transport: Transport, topology: TransportTopology);
     destroy(): void;
     _onVolumesDetected(volumes: {
         [key: string]: VolumeLevel;
     }): void;
     _onServerSpeakerChanged(speakerId: ParticipantId): void;
-    _onReceivedServerAudioActivity(): void;
-    _onStoppedReceivingServerAudioActivity(): void;
+    private _onTopologyChanged;
 }

package/classes/VolumesDetector.d.ts

@@ -13,5 +13,5 @@ export declare class VolumesDetector extends EventEmitter {
     private _onRemoteTrackRemoved;
     private _collectVolumes;
     private _onSignalledActiveParticipants;
-    private _onActiveParticipantsNoSignal;
+    private _onTopologyChanged;
 }

package/classes/codec/IDecoder.d.ts

@@ -1,5 +1,5 @@
 export default interface IDecoder {
-    init(onFrameImage: (image: ImageBitmap | ImageData) => void): Promise<void>;
+    init(onFrameImage: (image: VideoFrame | ImageBitmap | ImageData) => void): Promise<void>;
     decodeFrame(timestamp: number, data: Uint8Array, isVP9: boolean, keyFrame?: boolean): void;
     destroy(): void;
 }

package/classes/codec/WebCodecsDecoder.d.ts

@@ -1,7 +1,7 @@
 import IDecoder from './IDecoder';
 import WorkerBase from './WorkerBase';
 export default class WebCodecsDecoder extends WorkerBase implements IDecoder {
-    init(onFrameImage: (image: ImageBitmap) => void): Promise<void>;
+    init(onFrameImage: (frame: VideoFrame) => void): Promise<void>;
     decodeFrame(timestamp: number, data: Uint8Array, isVP9: boolean, keyFrame?: boolean): void;
     destroy(): void;
     static isBrowserSupported(): boolean;

package/classes/screenshare/BaseRenderer.d.ts

@@ -0,0 +1,8 @@
+export default abstract class BaseRenderer {
+    protected readonly _onStream: (stream: MediaStream) => void;
+    protected constructor(onStream: (stream: MediaStream) => void);
+    drawFrame(frame: VideoFrame): Promise<void>;
+    drawImage(image: ImageBitmap | ImageData): void;
+    abstract destroy(): void;
+    static isBrowserSupported(): boolean;
+}

package/classes/screenshare/CanvasRenderer.d.ts

@@ -0,0 +1,16 @@
+import BaseRenderer from './BaseRenderer';
+export default class CanvasRenderer extends BaseRenderer {
+    private readonly _useImageBitmap;
+    private _canvas;
+    private _canvasContext;
+    private _stream;
+    private _track;
+    constructor(onStream: (stream: MediaStream) => void);
+    private _createStream;
+    private _removeStream;
+    private _requestCanvasFrame;
+    drawFrame(frame: VideoFrame): Promise<void>;
+    drawImage(image: ImageBitmap | ImageData): void;
+    destroy(): void;
+    static isBrowserSupported(): boolean;
+}

package/classes/screenshare/StreamBuilder.d.ts

@@ -1,19 +1,11 @@
 import { ParticipantId } from '../../types/Participant';
 import { BaseStreamBuilder, FrameData } from './BaseStreamBuilder';
 export default class StreamBuilder extends BaseStreamBuilder {
+    private readonly _renderer;
     private readonly _decoder;
     private _decoderReady;
     private _decoderQueue;
-    private readonly _useImageBitmap;
-    private _canvas;
-    private _canvasContext;
-    private _stream;
-    private _track;
     constructor(participantId: ParticipantId, onStream: (stream: MediaStream) => void);
-    private _createStream;
-    private _removeStream;
-    private _requestCanvasFrame;
-    private _drawImage;
     protected _processFrame(frame: FrameData): void;
     private _decodeQueue;
     destroy(): void;

package/classes/screenshare/TrackGeneratorRenderer.d.ts

@@ -0,0 +1,10 @@
+import BaseRenderer from './BaseRenderer';
+export default class TrackGeneratorRenderer extends BaseRenderer {
+    private readonly _generator;
+    private readonly _writer;
+    private readonly _stream;
+    constructor(onStream: (stream: MediaStream) => void);
+    drawFrame(frame: VideoFrame): Promise<void>;
+    destroy(): void;
+    static isBrowserSupported(): boolean;
+}

package/classes/transport/Transport.d.ts

@@ -12,7 +12,6 @@ export declare const enum TransportEvent {
     STATE_CHANGED = "STATE_CHANGED",
     LOCAL_STATE_CHANGED = "LOCAL_STATE_CHANGED",
     SIGNALLED_ACTIVE_PARTICIPANTS = "SIGNALLED_ACTIVE_PARTICIPANTS",
-    ACTIVE_PARTICIPANTS_NO_SIGNAL = "ACTIVE_PARTICIPANTS_NO_SIGNAL",
     SIGNALLED_SPEAKER_CHANGED = "SIGNALLED_SPEAKER_CHANGED",
     SIGNALLED_STALLED_PARTICIPANTS = "SIGNALLED_STALLED_PARTICIPANTS",
     TOPOLOGY_CHANGED = "TOPOLOGY_CHANGED",
@@ -69,7 +68,6 @@ export declare class Transport extends EventEmitter {
     private _setLocalNoiseSuppression;
     private _onDirectTransportChanged;
     private _onServerTransportChanged;
-    private _onTransportActiveParticipantsNoSignal;
     private _onTransportActiveParticipants;
     private _onTransportStalledParticipants;
     private _onTransportSpeakerChanged;

package/enums/CallDirection.d.ts

@@ -1,4 +1,4 @@
-declare const enum CallDirection {
+declare enum CallDirection {
     INCOMING = "INCOMING",
     OUTGOING = "OUTGOING",
     JOINING = "JOINING"

package/enums/MuteState.d.ts

@@ -1,7 +1,7 @@
 /**
  * Разрешение на включение устройства
  */
-declare const enum MuteState {
+declare enum MuteState {
     UNMUTE = "UNMUTE",
     MUTE = "MUTE",
     MUTE_PERMANENT = "MUTE_PERMANENT"

package/enums/ParticipantState.d.ts

@@ -1,4 +1,4 @@
-declare const enum ParticipantState {
+declare enum ParticipantState {
     CALLED = "CALLED",
     ACCEPTED = "ACCEPTED",
     REJECTED = "REJECTED",

package/enums/SignalingNotification.d.ts

@@ -1,4 +1,4 @@
-declare const enum SignalingNotification {
+declare enum SignalingNotification {
     TRANSMITTED_DATA = "transmitted-data",
     ACCEPTED_CALL = "accepted-call",
     HUNGUP = "hungup",
@@ -35,6 +35,7 @@ declare const enum SignalingNotification {
     PROMOTE_PARTICIPANT = "promote-participant",
     CHAT_ROOM_UPDATED = "chat-room-updated",
     PROMOTION_APPROVED = "promotion-approved",
-    JOIN_LINK_CHANGED = "join-link-changed"
+    JOIN_LINK_CHANGED = "join-link-changed",
+    MOVIE_UPDATE_NOTIFICATION = "movie-update-notification"
 }
 export default SignalingNotification;

package/enums/UserType.d.ts

@@ -1,4 +1,4 @@
-declare const enum UserType {
+declare enum UserType {
     USER = "USER",
     GROUP = "GROUP"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/calls-sdk",
-  "version": "2.5.3-dev.d006735.0",
+  "version": "2.5.3-dev.fe8ad1c.0",
   "author": "vk.com",
   "description": "Library for video calls based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -16,7 +16,6 @@
   "dependencies": {
     "@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",

package/static/External.d.ts

@@ -10,6 +10,7 @@ import UserRole from '../enums/UserRole';
 import { ExternalId, ExternalParticipant, ExternalParticipantId } from '../types/ExternalId';
 import MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
+import { ISharedMovieState } from '../types/MovieShare';
 import MuteStates from '../types/MuteStates';
 import { ParticipantStateMapped } from '../types/Participant';
 import { DebugMessageType } from './Debug';
@@ -76,6 +77,29 @@ declare namespace External {
      * @param stream
      */
     function onRemoteLive(userId: ExternalParticipantId, streamName: string, stream: MediaStream | null): void;
+    /**
+     * Получен собственный стрим лайв.
+     * Если сервер закончил стримить собеседника, вместо стрима будет передан null
+     *
+     * @param userId
+     * @param streamName
+     * @param stream
+     */
+    function onLocalLive(userId: ExternalParticipantId, streamName: string, stream: MediaStream | null): void;
+    /**
+     * Получено обновление стрима или лайва от собеседника.
+     *
+     * @param userId
+     * @param data
+     */
+    function onRemoteLiveUpdate(userId: ExternalParticipantId, data: ISharedMovieState): void;
+    /**
+     * Получено обновление собственного стрима или лайва.
+     *
+     * @param userId
+     * @param data
+     */
+    function onLocalLiveUpdate(userId: ExternalParticipantId, data: ISharedMovieState): void;
     /**
      * Получен стрим с экрана собеседника.
      * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
@@ -106,9 +130,7 @@ declare namespace External {
      * @param userId
      * @param participantState
      */
-    function onRemoteParticipantState(userId: ExternalParticipantId, participantState: {
-        [key: string]: string;
-    } | ParticipantStateMapped): void;
+    function onRemoteParticipantState(userId: ExternalParticipantId, participantState: ParticipantStateMapped): void;
     /**
      * Изменился статус соединения собеседников
      *
@@ -321,5 +343,11 @@ declare namespace External {
      * @param firstParticipants Первые несколько ожидающих в зале
      */
     function onChatRoomUpdated(eventType: ChatRoomEventType, totalCount: number, firstParticipants: ExternalId[]): void;
+    /**
+     * Получен микшированный аудио стрим.
+     *
+     * @param stream стрим от WebRTC
+     */
+    function onRemoteMixedAudioStream(stream: MediaStream): void;
 }
 export default External;

package/static/Params.d.ts

@@ -12,6 +12,7 @@ import IceServer from '../types/IceServer';
 import MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
 import MuteStates from '../types/MuteStates';
+import { ParticipantStateMapped } from '../types/Participant';
 import AuthData from './AuthData';
 import { DebugMessageType } from './Debug';
 import { ParticipantStatus } from './External';
@@ -230,8 +231,24 @@ export declare type ParamsObject = {
      * @hidden
      */
     batchParticipantsOnStart: boolean;
-    participantStateMapped: boolean;
     joinFromMultipleDevices: boolean;
+    /**
+     * Фильтровать наблюдателей во всех колбэках
+     * @hidden
+     */
+    filterObservers: boolean;
+    /**
+     * Отключить звук собеседников
+     * @hidden
+     */
+    muteMode: boolean;
+    /**
+     * Сохранять (не удалять) аудио дорожки в стримах, поступающих клиенту
+     * Позволяет клиенту получать и сохранять аудио данные
+     * Внимание: может привести к "двойному" звуку при проигрывании
+     * @hidden
+     */
+    preserveAudioTracks: boolean;
     /**
      * Получен локальный стрим с камеры/микрофона
      */
@@ -263,6 +280,11 @@ export declare type ParamsObject = {
      * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
      */
     onRemoteLive?: (userId: ExternalParticipantId, streamId: string, stream: MediaStream | null) => void;
+    /**
+     * Получен собственный стрим трансляция или мувик.
+     * Если сервер закончил стримить экран собеседника, вместо стрима будет передан null
+     */
+    onLocalLive?: (userId: ExternalParticipantId, streamId: string, stream: MediaStream | null) => void;
     /**
      * Начат звонок
      */
@@ -274,9 +296,7 @@ export declare type ParamsObject = {
     /**
      * Изменились данные состояний собеседника
      */
-    onRemoteParticipantState?: (userId: ExternalParticipantId, participantState: {
-        [key: string]: string;
-    }) => void;
+    onRemoteParticipantState?: (userId: ExternalParticipantId, participantState: ParticipantStateMapped) => void;
     /**
      * Изменился статус соединения собеседников
      */
@@ -419,6 +439,12 @@ export declare type ParamsObject = {
      * @param firstParticipants Первые несколько ожидающих в зале
      */
     onChatRoomUpdated?: (eventType: ChatRoomEventType, totalCount: number, firstParticipants: ExternalId[]) => void;
+    /**
+     * Получен микшированный аудио стрим.
+     * @hidden
+     * @param stream стрим от WebRTC
+     */
+    onRemoteMixedAudioStream?: (stream: MediaStream) => void;
 };
 export default abstract class Params {
     private static _params;
@@ -509,5 +535,7 @@ export default abstract class Params {
     static get serverAudioRed(): boolean;
     static get p2pAudioRed(): boolean;
     static get batchParticipantsOnStart(): boolean;
-    static get participantStateMapped(): boolean;
+    static get filterObservers(): boolean;
+    static get muteMode(): boolean;
+    static get preserveAudioTracks(): boolean;
 }

package/static/Utils.d.ts

@@ -1,4 +1,3 @@
-import { BigInteger } from 'big-integer';
 import UserType from '../enums/UserType';
 import { ExternalParticipant } from '../types/ExternalId';
 import { CompositeUserId, OkUserId, Participant, ParticipantId, ParticipantStateMapped } from '../types/Participant';
@@ -26,7 +25,7 @@ declare namespace Utils {
     };
     function uuid(): string;
     function throttle(func: Function, ms: number): (this: any) => void;
-    function sdpFingerprint(sdp: string): BigInteger;
+    function sdpFingerprint(sdp: string): bigint | null;
     function delay(time: number): Promise<unknown>;
     function applySettings(pc: RTCPeerConnection, videoSettings: VideoSettings, prevSettings: any): any;
     function applyVideoTrackSettings(videoSettings: VideoSettings, s: RTCRtpSender, track: MediaStreamTrack | null, prevSettings: any, retSettings: any): void;
@@ -41,13 +40,6 @@ declare namespace Utils {
      * @param participant список участников звонка
      */
     function mapParticipantState(participant: Pick<SignalingMessage.Participant, 'participantState'>): ParticipantStateMapped;
-    /**
-     * Legacy маппер клиентского состояния участника звонка (когда `state` вида `{ [key: string]: string }`)
-     * @param participantState состояние участника
-     */
-    function mapLegacyParticipantState(participantState: ParticipantStateMapped): {
-        [key: string]: string;
-    };
     /**
      * мапает данные `participants` перед передачей клиенту
      */

package/types/ConversationParams.d.ts

@@ -6,5 +6,9 @@ declare type ConversationParams = {
     stun_server?: IceServer;
     client_type?: string;
     device_idx?: number;
+    isp_as_no?: number;
+    isp_as_org?: string;
+    loc_cc?: string;
+    loc_reg?: string;
 };
 export default ConversationParams;

package/types/ExternalId.d.ts

@@ -42,6 +42,11 @@ export interface ExternalId {
      * Тип пользователя
      */
     type: ExternalIdType;
+    /**
+     * Пользователь является наблюдателем звонка
+     * @hidden
+     */
+    observer?: boolean;
 }
 /**
  * Идентификатор участника звонка

package/types/MovieShare.d.ts

@@ -0,0 +1,16 @@
+import { ParticipantId } from './Participant';
+export interface IAddMovieParams {
+    movieId: string;
+    gain?: number;
+}
+declare type Gain = number | null;
+declare type Offset = number | null;
+export declare type ISharedMovieStateResponse = [number, Gain, boolean, Offset, number];
+export interface ISharedMovieState {
+    participantId: ParticipantId;
+    gain: Gain;
+    pause: boolean;
+    offset: Offset;
+    duration: number;
+}
+export {};

package/types/Participant.d.ts

@@ -46,4 +46,5 @@ export interface Participant {
     };
     muteStates: MuteStates;
     unmuteOptions: MediaOption[];
+    observedIds: CompositeUserId[];
 }

package/types/SignalingMessage.d.ts

@@ -9,8 +9,9 @@ import UserRole from '../enums/UserRole';
 import UserType from '../enums/UserType';
 import MediaModifiers from './MediaModifiers';
 import MediaSettings from './MediaSettings';
+import { ISharedMovieState } from './MovieShare';
 import MuteStates from './MuteStates';
-import { OkUserId, ParticipantId } from './Participant';
+import { CompositeUserId, OkUserId, ParticipantId } from './Participant';
 import VideoSettings from './VideoSettings';
 import { WaitingParticipant } from './WaitingHall';
 declare type SignalingMessage = Record<string, any>;
@@ -31,6 +32,12 @@ declare namespace SignalingMessage {
         id: number;
         type?: string;
     }
+    export type ParticipantListType = 'GRID' | 'SIDE' | 'ADMIN';
+    export interface ParticipantListMarker {
+        rank: number;
+        ts: number;
+        id?: CompositeUserId;
+    }
     export interface Participant {
         id: OkUserId;
         idType?: UserType;
@@ -50,6 +57,8 @@ declare namespace SignalingMessage {
         restricted?: boolean;
         muteStates?: MuteStates;
         unmuteOptions?: MediaOption[];
+        markers?: Record<ParticipantListType, ParticipantListMarker>;
+        observedIds?: CompositeUserId[];
     }
     interface Conversation {
         id: string;
@@ -255,6 +264,9 @@ declare namespace SignalingMessage {
         peerId: PeerId;
         mediaModifiers: MediaModifiers;
     }
+    export interface SharedMovieState extends Notification {
+        data: ISharedMovieState[];
+    }
     export {};
 }
 export default SignalingMessage;