@vkontakte/calls-sdk 2.8.11-dev.7ac19827.0 → 2.8.11-dev.c08ac4e9.0

package/classes/Conversation.d.ts

@@ -20,7 +20,7 @@ import { IVideoDimentions } from '../types/MediaSettings';
 import { IAddMovieParams, IUpdateMovieData } from '../types/MovieShare';
 import MuteStates from '../types/MuteStates';
 import { CompositeUserId, IGetParticipantsParameters, ParticipantId, ParticipantStateData } from '../types/Participant';
-import { ParticipantLayout } from '../types/ParticipantLayout';
+import { DisplayLayoutRequest, ParticipantLayout } from '../types/ParticipantLayout';
 import { ParticipantListChunkParameters } from '../types/ParticipantListChunk';
 import ParticipantPriority from '../types/ParticipantPriority';
 import { ParticipantStreamDescription } from '../types/ParticipantStreamDescription';
@@ -32,6 +32,7 @@ export default class Conversation extends EventEmitter {
     private readonly _api;
     private readonly _signaling;
     private readonly _signalingActor;
+    private readonly _displayLayoutRequester;
     private _mediaSource;
     private _conversation;
     private _myLastRequestedLayouts;
@@ -204,6 +205,7 @@ export default class Conversation extends EventEmitter {
     requestKeyFrame(participantStreamDescription: ParticipantStreamDescription): Promise<void | SignalingMessage>;
     requestTestMode(consumerCommand: string, producerCommand: string): Promise<void>;
     updateDisplayLayout(layouts: ParticipantLayout[]): Promise<void>;
+    requestDisplayLayout(requests: DisplayLayoutRequest[]): Promise<void>;
     feedback(key: string): Promise<SignalingMessage>;
     userFeedbackStats(userResponse: number, reason?: string, groupCallUsersCount?: number): void;
     sendClientEvent(eventType: string, eventData?: Record<string, string | number | boolean>, immediately?: boolean): void;

package/classes/DisplayLayoutRequester.d.ts

@@ -0,0 +1,32 @@
+import BaseApi from '../abstract/BaseApi';
+import { DisplayLayoutRequest, ParticipantLayout } from '../types/ParticipantLayout';
+import { Participant, ParticipantId } from '../types/Participant';
+type DisplayLayoutRequesterParams = {
+    api: BaseApi;
+    getParticipants: () => Promise<Record<ParticipantId, Participant>>;
+    isMe: (participantId: ParticipantId) => boolean;
+    updateDisplayLayout: (layouts: ParticipantLayout[]) => Promise<void>;
+};
+export default class DisplayLayoutRequester {
+    private readonly _api;
+    private readonly _getParticipants;
+    private readonly _isMe;
+    private readonly _updateDisplayLayout;
+    private _requestedLayouts;
+    private _pendingRequests;
+    private _pendingPromises;
+    private _timer;
+    private _inFlight;
+    private _lastFlushAt;
+    private _generation;
+    constructor({ api, getParticipants, isMe, updateDisplayLayout }: DisplayLayoutRequesterParams);
+    request(requests: DisplayLayoutRequest[]): Promise<void>;
+    cleanupParticipant(participantId: ParticipantId): void;
+    clear(): void;
+    private _schedule;
+    private _flush;
+    private _getRequestLayouts;
+    private _getDiff;
+    private _isChanged;
+}
+export {};

package/classes/Logger.d.ts

@@ -10,8 +10,8 @@ export default class Logger extends BaseLogger {
     static setConversationIdProvider(provider: () => string | null): void;
     static create(api: BaseApi, externalLogger: BaseLogger | null): void;
     static log(name: StatLog, value?: string, immediately?: boolean): void;
-    static logClientStats(params: Record<string, string | number | undefined | null>, immediately?: boolean): void;
-    static logClientEvent(params: Record<string, string | number | undefined | null>, immediately?: boolean): void;
+    static logClientStats(params: Record<string, string | number | boolean | undefined | null>, immediately?: boolean): void;
+    static logClientEvent(params: Record<string, string | number | boolean | undefined | null>, immediately?: boolean): void;
     static destroy(): void;
     private readonly _externalLogger;
     private readonly _api;
@@ -22,8 +22,8 @@ export default class Logger extends BaseLogger {
     private _serverTimeDelta;
     constructor(api: BaseApi, externalLogger: BaseLogger | null);
     log(name: StatLog, value?: string, immediately?: boolean): void;
-    logClientStats(data: Record<string, string | number | undefined | null>, immediately?: boolean): void;
-    logClientEvent(data: Record<string, string | number | undefined | null>, immediately?: boolean): void;
+    logClientStats(data: Record<string, string | number | boolean | undefined | null>, immediately?: boolean): void;
+    logClientEvent(data: Record<string, string | number | boolean | undefined | null>, immediately?: boolean): void;
     destroy(): void;
     private _getConversationId;
     private _sendBatch;

package/default/Signaling.d.ts

@@ -5,6 +5,7 @@ import { TransportTopology } from '../classes/transport/Transport';
 import ConversationFeature from '../enums/ConversationFeature';
 import ConversationOption from '../enums/ConversationOption';
 import MediaOption from '../enums/MediaOption';
+import SignalingCommandType from '../enums/SignalingCommandType';
 import SignalingConnectionType from '../enums/SignalingConnectionType';
 import UserRole from '../enums/UserRole';
 import { JSONObject } from '../static/Json';
@@ -20,33 +21,41 @@ import ParticipantLayout, { RequestKeyFrame, StopStream } from '../types/Partici
 import { ParticipantListChunkParameters } from '../types/ParticipantListChunk';
 import { StreamDescriptionString } from '../types/ParticipantStreamDescription';
 import { PerfStatReport } from '../types/PerfStatReporter';
-import SignalingMessage, { GetParticipantsSignalingResponse, GetRoomsSignalingResponse } from '../types/SignalingMessage';
+import SignalingMessage, { GetParticipantsSignalingResponse, GetRoomsSignalingResponse, SignalingSuccessResponse } from '../types/SignalingMessage';
 import { IPublishStreamData, IRecordConfData, IStartStreamData, IStopStreamData } from '../types/Streams';
 export default class Signaling extends BaseSignaling {
-    private transport;
-    private sequence;
+    private socket;
+    protected sequence: number;
     private lastStamp;
     private websocketCommandsQueue;
     private datachannelCommandsQueue;
     private incomingCache;
     private responseHandlers;
     private connectionType;
-    private conversationResolve;
-    private conversationReject;
+    private reconnectCount;
+    private endpoint;
+    private wtEndpoint;
+    protected conversationResolve: Function | null;
+    protected conversationReject: Function | null;
     private connected;
     private listenersReady;
-    private peerId;
-    private conversationId;
+    protected peerId: number | null;
+    protected conversationId: string | null;
+    private reconnectTimer;
     private connectionMessageWaitTimer;
+    private doctorTimer;
     private participantIdRegistry;
     private producerNotificationDataChannel;
     private producerCommandDataChannel;
     private producerCommandDataChannelEnabled;
     private producerCommandSerializationService;
+    private static get RECONNECT_DELAY();
+    private static get RECONNECT_MAX_DELAY();
+    private static get RECONNECT_MAX_COUNT();
     private static get WAIT_CONNECTION_DELAY();
     private static get WAIT_RESPONSE_DELAY();
+    private static get WAIT_MESSAGE_DELAY();
     get ready(): boolean;
-    setAbortSignal(signal: AbortSignal | undefined): void;
     setEndpoint(endpoint: string): void;
     setWebTransportEndpoint(endpoint: string | null): void;
     setConversationId(conversationId: string): void;
@@ -62,6 +71,15 @@ export default class Signaling extends BaseSignaling {
      * Open a connection with a signaling server
      */
     connect(connectionType: SignalingConnectionType): Promise<SignalingMessage.Connection>;
+    /**
+     * Send a command to a signaling server
+     */
+    protected _send<T extends SignalingSuccessResponse>(command: SignalingCommandType, params?: any, needResponse?: boolean, retryCount?: number): Promise<T>;
+    /**
+     * Send a raw command to a signaling server
+     */
+    protected _sendRaw<T extends SignalingSuccessResponse>(command: SignalingCommandType, params?: any, needResponse?: boolean, retryCount?: number): Promise<T>;
+    private _isDataChannelCommand;
     getNextCommandSequenceNumber(): number;
     hangup(reason: string): Promise<SignalingMessage | void>;
     sendCandidate(participantId: ParticipantId, candidate: RTCIceCandidate): Promise<SignalingMessage>;
@@ -145,36 +163,34 @@ export default class Signaling extends BaseSignaling {
     startAsr(params: IAsrStartParams): Promise<SignalingMessage>;
     stopAsr(params?: IAsrStopParams): Promise<SignalingMessage>;
     requestAsr(request: boolean): Promise<SignalingMessage>;
-    /**
-     * Send a command to a signaling server
-     */
-    private _send;
-    /**
-     * Send a raw command to a signaling server
-     */
-    private _sendRaw;
-    private _isDataChannelCommand;
+    private _buildUrl;
+    protected _connect(connectionType: SignalingConnectionType, useWebTransport: boolean): void;
+    protected _disconnect(code?: number): void;
     private _onOpen;
     private _onMessage;
-    private _handleMessage;
+    protected _handleMessage(message: SignalingMessage): void;
     private _handleErrorMessage;
-    private _handleCachedMessages;
+    protected _handleCachedMessages(): void;
     private _throwError;
     private _onError;
     private _serializeErrorEvent;
-    private _onClose;
-    private _closeSocket;
+    protected _onClose(event: CloseEvent): void;
+    protected _closeSocket(error?: Error | null): void;
+    protected _reconnect(): void;
     private _handleCommandResponse;
     private _handleCommandsQueue;
     private _startResponseTimer;
     private _serializeBinary;
     private _serializeJson;
     private _convertDisplayLayout;
-    private _waitConnectionMessage;
-    private _stopWaitConnectionMessage;
-    private _onTransportFailed;
-    private _onTransportReconnectScheduled;
-    private _onTransportConnectionDead;
+    protected _waitConnectionMessage(): void;
+    protected _stopWaitConnectionMessage(): void;
+    /**
+     * Отвечает за timeout логику в WebSocket, если неполучаем никаких сообщений в течении WAIT_MESSAGE_DELAY, то запускаем реконнект
+     */
+    private _startDoctor;
+    private _stopDoctor;
+    private isWebTransportAvailable;
     private _getSocketType;
     private _markTransportStat;
     private _logTransportStat;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/calls-sdk",
-  "version": "2.8.11-dev.7ac19827.0",
+  "version": "2.8.11-dev.c08ac4e9.0",
   "author": "vk.com",
   "description": "Library for video calls based on the vk.com platform",
   "homepage": "https://vk.com",

package/static/Debug.d.ts

@@ -8,10 +8,10 @@ export declare enum DebugMessageType {
     ERROR = "ERROR"
 }
 declare namespace Debug {
-    let debug: Function;
-    let log: Function;
-    let warn: Function;
-    let error: Function;
+    function debug(...args: any[]): void;
+    function log(...args: any[]): void;
+    function warn(...args: any[]): void;
+    function error(...args: any[]): void;
     function enabled(): boolean;
     function toggle(enable: boolean): void;
     function send(type: DebugMessageType, ...args: any[]): void;

package/static/Params.d.ts

@@ -306,6 +306,12 @@ export type ParamsObject = {
      * _По умолчанию: `30`_
      */
     videoTracksCount: number;
+    /**
+     * Минимальный интервал отправки diff для requestDisplayLayout в миллисекундах.
+     *
+     * _По умолчанию: `250`_
+     */
+    requestDisplayLayoutThrottleMs: number;
     /** @hidden */
     movieShare: boolean;
     /** @hidden */
@@ -963,6 +969,7 @@ export default abstract class Params {
     static get audioNack(): boolean;
     static get movieShare(): boolean;
     static get videoTracksCount(): number;
+    static get requestDisplayLayoutThrottleMs(): number;
     static get breakVideoPayloadTypes(): boolean;
     static get useCallsToContacts(): boolean;
     static get useParticipantListChunk(): boolean;
@@ -1010,6 +1017,7 @@ export default abstract class Params {
         screenShareCongestionControl: boolean;
         screenShareCongestionControlThreshold: number;
         videoTracksCount: number;
+        requestDisplayLayoutThrottleMs: number;
         asrDataChannel: boolean;
         videoMaxHeight: number;
         videoMaxWidth: number;

package/types/ParticipantLayout.d.ts

@@ -54,4 +54,37 @@ export type ParticipantLayout = (Layout | StopStream | RequestKeyFrame) & {
      */
     streamName?: string;
 };
+/**
+ * Запрос стрима, который клиент хочет получать для отображения.
+ */
+export type DisplayLayoutRequest = {
+    /**
+     * Внешний ID пользователя
+     */
+    uid: ExternalParticipantId | string;
+    /**
+     * Тип медиа (видео с камеры, картинка с экрана, лайв или мувик)
+     */
+    mediaType: MediaType;
+    /**
+     * Ширина окошка в котором отображается видео, в пикселях
+     */
+    width: number;
+    /**
+     * Высота окошка в котором отображается видео, в пикселях
+     */
+    height: number;
+    /**
+     * Отображать видео как CSS object-fit: cover. По умолчанию используется contain.
+     */
+    cover?: boolean;
+    /**
+     * Приоритет
+     */
+    priority?: number;
+    /**
+     * ID лайва или мувика. null для камеры или скрин-шары.
+     */
+    streamName?: string;
+};
 export default ParticipantLayout;

package/types/PerfStatReporter.d.ts

@@ -41,10 +41,11 @@ export interface CallStatReport {
     remote_connection_type?: RTCIceCandidateType;
 }
 export interface ICallStatLog extends Pick<CallStatReport, 'call_topology' | 'nack_sent' | 'nack_received' | 'pli_sent' | 'pli_received' | 'fir_sent' | 'fir_received' | 'frames_dropped' | 'stat_time_delta'>, Pick<Partial<CallStatReport>, 'rtt' | 'jitter_video' | 'jitter_audio' | 'interframe_delay_variance' | 'freeze_count' | 'total_freezes_duration' | 'ss_freeze_count' | 'ss_total_freezes_duration' | 'inserted_audio_samples_for_deceleration' | 'removed_audio_samples_for_acceleration' | 'concealed_audio_samples' | 'total_audio_energy' | 'local_address' | 'local_connection_type' | 'network_type' | 'transport' | 'remote_address' | 'remote_connection_type'> {
+    is_simulcast?: boolean;
     concealed_silent_audio_samples?: number;
     concealment_audio_avg_size?: number;
     video_loss?: number;
     audio_loss?: number;
     cpu_hardware_concurrency?: number;
-    [k: string]: string | number | undefined;
+    [k: string]: string | number | boolean | undefined;
 }

package/types/WebTransport.d.ts

@@ -7,8 +7,6 @@ declare class WebTransportEventual {
     private readonly url;
     private readonly options;
     private readonly compression;
-    private closeRequested;
-    private closeEventEmitted;
     private encoder;
     private decoder;
     onopen: ((this: WebTransportEventual, ev: Event) => any) | null;
@@ -24,8 +22,6 @@ declare class WebTransportEventual {
     send(data: string): Promise<void>;
     private createErrorEvent;
     close(code?: number, reason?: string): void;
-    private closeConnectedTransport;
-    private emitClose;
     static isBrowserSupported(): boolean;
 }
 export { WebTransportEventual as WebTransport };

package/classes/ConversationResponseValidator.d.ts

@@ -1,3 +0,0 @@
-import ConversationResponse from '../types/ConversationResponse';
-export type ConversationResponseSource = 'startConversation' | 'joinConversation' | 'joinConversationByLink' | 'fastStart' | 'fastJoin';
-export declare function assertValidConversationResponse(response: ConversationResponse | null | undefined, source: ConversationResponseSource): void;

package/default/SignalingTransport.d.ts

@@ -1,68 +0,0 @@
-import SignalingConnectionType from '../enums/SignalingConnectionType';
-import { SignalingTransportType } from '../enums/SignalingTransportStat';
-export declare enum SignalingTransportFailure {
-    EMPTY_ENDPOINT = "EMPTY_ENDPOINT",
-    NETWORK_ERROR = "NETWORK_ERROR",
-    ABORTED = "ABORTED"
-}
-export type SignalingTransportFailedEvent = {
-    failure: SignalingTransportFailure;
-    message: string;
-    remote?: boolean;
-};
-export type SignalingTransportReconnectEvent = {
-    count: number;
-    delay: number;
-};
-export type SignalingTransportHandlers = {
-    onOpen: () => void;
-    onMessage: (event: MessageEvent) => void;
-    onError: (event: Event) => void;
-    onClose: (event: CloseEvent) => void;
-    onFailed: (event: SignalingTransportFailedEvent) => void;
-    onReconnectScheduled: (event: SignalingTransportReconnectEvent) => void;
-    onConnectionDead: () => void;
-};
-export default class SignalingTransport {
-    private readonly handlers;
-    private socket;
-    private endpoint;
-    private wtEndpoint;
-    private peerId;
-    private lastStamp;
-    private connectionType;
-    private reconnectCount;
-    private reconnectTimer;
-    private doctorTimer;
-    private forceWebSocket;
-    private abortSignal;
-    private manualClose;
-    private currentType;
-    constructor(handlers: SignalingTransportHandlers);
-    get readyState(): number | null;
-    get type(): SignalingTransportType;
-    setEndpoint(endpoint: string): void;
-    setWebTransportEndpoint(endpoint: string | null): void;
-    setPeerId(peerId: number | null): void;
-    setLastStamp(lastStamp: number): void;
-    setAbortSignal(signal?: AbortSignal): void;
-    resetReconnectCount(): void;
-    connect(connectionType: SignalingConnectionType): void;
-    close(code?: number): void;
-    send(data: string | ArrayBuffer): void;
-    private _connect;
-    private _connectWebTransport;
-    private _connectWebSocket;
-    private _setSocketHandlers;
-    private _buildUrl;
-    private _canUseWebTransport;
-    private _onOpen;
-    private _onMessage;
-    private _onError;
-    private _onClose;
-    private _disconnect;
-    private _scheduleReconnect;
-    private _getReconnectDelay;
-    private _startDoctor;
-    private _stopDoctor;
-}