@vkontakte/calls-sdk 2.8.13-dev.ab19d582.0 → 2.8.13-dev.f163e503.0

package/classes/ExternalIdCache.d.ts

@@ -1,20 +1,16 @@
 import { ExternalId, ExternalParticipantId } from '../types/ExternalId';
-import { CompositeUserId, OkUserId, ParticipantId } from '../types/Participant';
+import { ParticipantId } from '../types/Participant';
 export declare class ExternalIdCache {
     private static _normalizeType;
-    private _okIdToExternalId;
-    private _externalIdToOkId;
+    private _participantIdToExternalId;
+    private _externalIdToParticipantId;
     private _decorativeIdToInitialId;
     private _initialIdToDecorativeId;
-    getOkId(externalId: ExternalId): OkUserId | null;
-    getExternalId(okId: OkUserId): ExternalParticipantId | null;
-    hasByExternalId(externalId: ExternalId): boolean;
-    hasByOkId(okId: OkUserId): boolean;
-    cache(participantId: OkUserId | CompositeUserId | ParticipantId, externalId: ExternalParticipantId): void;
-    mapDecorativeId(decorativeId: OkUserId | CompositeUserId | ParticipantId, initialId: OkUserId | CompositeUserId | ParticipantId): void;
-    unmapDecorativeId(initialId: OkUserId | CompositeUserId | ParticipantId): void;
-    getDecorativeIdByInitialId(initialId: OkUserId | CompositeUserId | ParticipantId): OkUserId | undefined;
-    replaceByInitialIdIdIfExists(id: OkUserId | CompositeUserId | ParticipantId): OkUserId;
-    getParticipantIdByExternalId(externalId: ExternalId): ParticipantId | null;
+    getExternalId(participantId: ParticipantId): ExternalParticipantId | null;
+    getParticipantId(externalId: ExternalId): ParticipantId | null;
+    cache(participantId: ParticipantId, externalId: ExternalParticipantId): void;
+    mapDecorativeId(decorativeId: ParticipantId, initialId: ParticipantId): void;
+    unmapDecorativeId(initialId: ParticipantId): void;
+    getDecorativeIdByInitialId(initialId: ParticipantId): ParticipantId | undefined;
     clear(): void;
 }

package/classes/conversation/Conversation.d.ts

@@ -20,7 +20,7 @@ import MediaModifiers from '../../types/MediaModifiers';
 import MediaSettings, { IVideoDimentions } from '../../types/MediaSettings';
 import { IAddMovieParams, IUpdateMovieData } from '../../types/MovieShare';
 import MuteStates from '../../types/MuteStates';
-import { CompositeUserId, IGetParticipantsParameters, OkUserId, ParticipantId, ParticipantStateData } from '../../types/Participant';
+import { CompositeUserId, IGetParticipantsParameters, ParticipantId, ParticipantStateData } from '../../types/Participant';
 import { DisplayLayoutRequest, ParticipantLayout } from '../../types/ParticipantLayout';
 import { ParticipantListChunkParameters } from '../../types/ParticipantListChunk';
 import ParticipantPriority from '../../types/ParticipantPriority';
@@ -85,12 +85,18 @@ export default class Conversation extends EventEmitter {
     get externalId(): ExternalParticipantId | undefined;
     get mediaSettings(): MediaSettings | undefined;
     get isCallHeld(): boolean;
+    get isIncomingRinging(): boolean;
     static debugSessionId(): string | null;
     static debugMessage(type: DebugMessageType, ...args: any[]): boolean;
     static debugMessageWithContext(type: DebugMessageType, conversationId: string, ...args: any[]): boolean;
     static getSyncedTime(): number;
     get debugSessionId(): string | null;
-    getCachedRawOkIdByExternalId(externalId: ExternalId): OkUserId | null;
+    getCachedParticipantIdByExternalId(externalId: ExternalId): ParticipantId | null;
+    private _onNonFatalError;
+    /**
+     * Внешний id звонящего во входящем звонке, либо null, если звонящий не найден.
+     */
+    getIncomingCallerExternalId(): ExternalParticipantId | null;
     private _buildInternalParams;
     onStart({ opponentIds, opponentType, mediaOptions, payload, joiningAllowed, requireAuthToJoin, onlyAdminCanShareMovie, externalIds, onFastStart, conversationId, }: ConversationOnStartParams): Promise<ConversationData>;
     onJoin(joinArgs: ConversationOnJoinParams): Promise<ConversationData>;
@@ -164,8 +170,9 @@ export default class Conversation extends EventEmitter {
     private _registerParticipantInCache;
     private _getExistedParticipantByIdOrCreate;
     private _getExternalIdByParticipantId;
-    private _getExternalIdsByOkIdsFromCache;
-    private _getOrCacheExternalIdByCompositeId;
+    private _getExternalIdsByParticipantIds;
+    private _reportMissingExternalIds;
+    private _reportMissingExternalIdsById;
     private _registerParticipantAndSetMarkersIfChunkEnabled;
     private _warnParticipantNotInConversation;
     private _denormalizeMarkers;

package/classes/conversation/Conversation.testUtils.d.ts

@@ -35,6 +35,8 @@ declare function createParams(): {
     onChatRoomUpdated: Mock<import("@vitest/spy").Procedure>;
     onRemoteStatus: Mock<import("@vitest/spy").Procedure>;
     onSpeakerChanged: Mock<import("@vitest/spy").Procedure>;
+    onAcceptedCall: Mock<import("@vitest/spy").Procedure>;
+    onNonFatalError: Mock<import("@vitest/spy").Procedure>;
 };
 export type ConversationTestParams = ReturnType<typeof createParams>;
 export type ConversationTestTools = {

package/classes/conversation/DisplayLayoutRequester.d.ts

@@ -8,6 +8,7 @@ type DisplayLayoutRequesterParams = {
     getParticipants: () => Record<ParticipantId, Participant>;
     isMe: (participantId: ParticipantId) => boolean;
     updateDisplayLayout: (layouts: ParticipantLayout[]) => Promise<void>;
+    onNonFatalError: (message: string) => void;
 };
 export default class DisplayLayoutRequester {
     private readonly _api;
@@ -15,6 +16,7 @@ export default class DisplayLayoutRequester {
     private readonly _getParticipants;
     private readonly _isMe;
     private readonly _updateDisplayLayout;
+    private readonly _onNonFatalError;
     private _requestedLayouts;
     private _uncertainLayouts;
     private _pendingRequests;
@@ -25,7 +27,7 @@ export default class DisplayLayoutRequester {
     private _lastFlushAt;
     private _generation;
     private _forceNextFlush;
-    constructor({ api, debug, getParticipants, isMe, updateDisplayLayout }: DisplayLayoutRequesterParams);
+    constructor({ api, debug, getParticipants, isMe, updateDisplayLayout, onNonFatalError }: DisplayLayoutRequesterParams);
     request(requests: DisplayLayoutRequest[]): Promise<void>;
     resend(): void;
     cleanupParticipant(participantId: ParticipantId): void;

package/classes/screenshare/StreamBuilder.d.ts

@@ -9,6 +9,7 @@ export default class StreamBuilder extends BaseStreamBuilder {
     private _decoderReady;
     private _decoderBusy;
     private _decoderQueue;
+    private _webCodecsRetryAttempted;
     private _fpsMeter;
     private readonly _logger;
     constructor(participantId: ParticipantId, onStream: IOnStream, onStat: IOnStat, statAggregator: StatAggregator | null, onKeyFrameRequested: VoidFunction, debug?: DebugLogger, logger?: StatsLogger | null);

package/classes/stat/SdpStats.d.ts

@@ -0,0 +1,38 @@
+import { StatAggregator } from './StatAggregator';
+type SdpDescription = {
+    type: RTCSdpType;
+    sdp?: string;
+};
+/**
+ * Отправляет в стату согласование SDP: что сгенерировали, что получили от собеседника
+ * и на какой операции сломались.
+ */
+export declare class SdpStats {
+    private readonly _statAggregator;
+    private _pc;
+    private _gatheringStartedAt;
+    private _remoteSdpReceivedAt;
+    private readonly _handleGatheringStateChange;
+    constructor(statAggregator: StatAggregator | null);
+    /** Начинает следить за сбором кандидатов, предыдущее соединение перестает слушать */
+    observe(pc: RTCPeerConnection): void;
+    stop(): void;
+    /** Сгенерировали свой SDP */
+    logSdpGenerated(type: RTCSdpType): void;
+    /** Собрали свой ICE-кандидат */
+    logCandidateGenerated(candidate: RTCIceCandidate): void;
+    /** Получили SDP от собеседника */
+    logSdpReceived(type: RTCSdpType): void;
+    /** Получили ICE-кандидата от собеседника */
+    logCandidateReceived(candidate: RTCIceCandidateInit): void;
+    /** Не смогли сгенерировать SDP */
+    logCreateFailed(type: RTCSdpType, error: unknown): void;
+    /** Не смогли применить свой SDP */
+    logSetLocalFailed(sdp: SdpDescription, error: unknown): void;
+    /** Не смогли применить SDP собеседника */
+    logSetRemoteFailed(sdp: SdpDescription, error: unknown): void;
+    destroy(): void;
+    private _logFailure;
+    private _log;
+}
+export {};

package/classes/transport/DirectTransport.d.ts

@@ -39,6 +39,7 @@ export default class DirectTransport extends BaseTransport {
     private _lastBadConnection;
     private _perfStatReporter;
     private _directStatReporter;
+    private readonly _sdpStats;
     private readonly _debug;
     private readonly _logger;
     private readonly _statAggregator;

package/classes/transport/ServerTransport.d.ts

@@ -45,6 +45,7 @@ export default class ServerTransport extends BaseTransport {
     private readonly _debug;
     private readonly _logger;
     private readonly _statAggregator;
+    private readonly _sdpStats;
     private readonly _codecStatsAggregator;
     private readonly _simulcast;
     constructor(signaling: BaseSignaling, mediaSource: MediaSource, serverSettings: ServerSettings, debug?: DebugLogger, logger?: StatsLogger | null, statAggregator?: StatAggregator | null, codecStatsAggregator?: CodecStatsAggregator | null, onFirstMediaSent?: (() => void) | null);

package/default/Api.d.ts

@@ -5,14 +5,14 @@ import { IHangupParams } from '../types/Api';
 import ConversationParams from '../types/ConversationParams';
 import ConversationResponse from '../types/ConversationResponse';
 import { ExternalId, ExternalParticipantId, ExternalUserId } from '../types/ExternalId';
-import { CompositeUserId, OkUserId, ParticipantId } from '../types/Participant';
+import { OkUserId, ParticipantId } from '../types/Participant';
 import PushData from '../types/PushData';
 export default class Api extends BaseApi {
     private _uuid;
     private _idCache;
     private _callUnsafe;
     protected _call(method: string, data?: any, noSession?: boolean, allowReauthorize?: boolean): Promise<any>;
-    userId(participantId: ParticipantId): ExternalParticipantId;
+    userId(participantId: ParticipantId): ExternalParticipantId | null;
     authorize(): Promise<void>;
     private _getAnonymLoginCacheKey;
     private _getCachedAnonymLogin;
@@ -47,14 +47,12 @@ export default class Api extends BaseApi {
     }>;
     getAnonymTokenByLink(joinLink: string, username?: string): Promise<string>;
     joinConversationByLink(joinLink: string, isVideo?: boolean, observedIds?: ExternalUserId[], payload?: string): Promise<ConversationResponse>;
-    getCachedOkIdByExternalId(externalId: ExternalId): ParticipantId | null;
-    getCachedRawOkIdByExternalId(externalId: ExternalId): OkUserId | null;
-    getCachedExternalIdByOkId(okId: OkUserId): ExternalParticipantId | null;
-    cacheExternalId(participantId: OkUserId | CompositeUserId | ParticipantId, externalId: ExternalParticipantId): void;
-    mapDecorativeId(decorativeId: OkUserId | CompositeUserId | ParticipantId, initialId: OkUserId | CompositeUserId | ParticipantId): void;
-    unmapDecorativeId(initialId: OkUserId | CompositeUserId | ParticipantId): void;
-    getDecorativeIdByInitialId(initialId: OkUserId | CompositeUserId | ParticipantId): OkUserId | undefined;
-    replaceByInitialIdIdIfExists(id: OkUserId | CompositeUserId | ParticipantId): OkUserId;
+    getCachedParticipantIdByExternalId(externalId: ExternalId): ParticipantId | null;
+    getCachedExternalIdByParticipantId(participantId: ParticipantId): ExternalParticipantId | null;
+    cacheExternalId(participantId: ParticipantId, externalId: ExternalParticipantId): void;
+    mapDecorativeId(decorativeId: ParticipantId, initialId: ParticipantId): void;
+    unmapDecorativeId(initialId: ParticipantId): void;
+    getDecorativeIdByInitialId(initialId: ParticipantId): ParticipantId | undefined;
     getConversationParams(conversationId?: string): Promise<ConversationParams>;
     getUserId(): OkUserId | null;
     setUserId(userId: OkUserId): void;

package/enums/Stat.d.ts

@@ -14,6 +14,18 @@ declare const enum Stat {
     USER_FEEDBACK_RECEIVED = "UserFeedbackReceived",
     SIGNALING_PING_SUMMARY = "signaling_ping_summary",
     SIGNALING_COMMAND_SUMMARY = "signaling_command_summary",
+    SDP_CREATE_OFFER = "sdp_create_offer",
+    SDP_CREATE_ANSWER = "sdp_create_answer",
+    SDP_SET_LOCAL_OFFER = "sdp_set_local_offer",
+    SDP_SET_LOCAL_PRANSWER = "sdp_set_local_pranswer",
+    SDP_SET_LOCAL_ANSWER = "sdp_set_local_answer",
+    SDP_SET_LOCAL_ROLLBACK = "sdp_set_local_rollback",
+    SDP_SET_REMOTE_OFFER = "sdp_set_remote_offer",
+    SDP_SET_REMOTE_PRANSWER = "sdp_set_remote_pranswer",
+    SDP_SET_REMOTE_ANSWER = "sdp_set_remote_answer",
+    SDP_SET_REMOTE_ROLLBACK = "sdp_set_remote_rollback",
+    SDP_GENERATED = "sdp_generated",
+    SDP_RECEIVED = "sdp_received",
     WEBSOCKET_CONNECTED = "websocket_connected",
     WEBSOCKET_RECONNECTED = "websocket_reconnected",
     WEBSOCKET_FAILED_PINGS = "websocket_failed_pings",

package/package.json

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

package/static/External.d.ts

@@ -638,5 +638,15 @@ declare namespace External {
      * Собеседник подключился к сигналлингу
      */
     function onPeerRegistered(conversationId?: string, externalIds?: ExternalId[]): void;
+    /**
+     * SDK обнаружил ошибку, после которой звонок может продолжаться.
+     *
+     * Callback предназначен для отправки ошибки в клиентский мониторинг.
+     * Его вызов не означает завершение звонка.
+     *
+     * @param error
+     * @param conversationId ID звонка
+     */
+    function onNonFatalError(error: Error, conversationId: string | null): void;
 }
 export default External;

package/static/Params.d.ts

@@ -37,6 +37,11 @@ export type ParamsObject = {
     platform: string;
     /** @hidden */
     clientStatsPlatform: string;
+    /**
+     * Версия приложения-хоста, уходит в статистику и сигналинг, например `'26.31.0:6822'`.
+     * По умолчанию `'0.0.0'`
+     */
+    appVersion: string;
     /** @hidden */
     clientType: string;
     /** @hidden */
@@ -911,6 +916,13 @@ export type ParamsObject = {
      * Собеседник подключился к сигналлингу
      */
     onPeerRegistered?: (conversationId?: string, externalIds?: ExternalId[]) => void;
+    /**
+     * SDK обнаружил ошибку, после которой звонок может продолжаться.
+     *
+     * Callback предназначен для отправки ошибки в клиентский мониторинг.
+     * Его вызов не означает завершение звонка.
+     */
+    onNonFatalError?: (error: Error, conversationId: string | null) => void;
 };
 export default abstract class Params {
     private static _params;
@@ -920,7 +932,13 @@ export default abstract class Params {
     static getScreenFrameRate(fastScreenShare: boolean): number;
     static get<N extends keyof ParamsObject>(name: N): ParamsObject[N];
     static get appName(): string;
-    static get appVersion(): number;
+    static get appVersion(): string;
+    /**
+     * Версия клиента для `client_version` в `auth.anonymLogin`. Бэкенд валидирует формат,
+     * поэтому это фиксированное значение, а не версия приложения-хоста (см. {@link Params.appVersion}).
+     * @hidden
+     */
+    static get apiClientVersion(): number;
     static get sdkVersion(): string;
     static get debug(): boolean;
     static get protocolVersion(): 5 | 6;
@@ -1080,6 +1098,7 @@ export default abstract class Params {
         movieShare: boolean;
         clientType: string;
         clientStatsPlatform: string;
+        appVersion: string;
         consumerScreenDataChannelPacketSize: number;
         switchVideoAtBadNetwork: boolean;
         simulcast: boolean;