@vkontakte/calls-sdk 2.8.13-dev.9394b771.0 → 2.8.13-dev.939924e7.0

package/classes/AudioOutput.d.ts

@@ -15,6 +15,7 @@ export default class AudioOutput {
     private readonly _features;
     private readonly _statFirstMediaReceived;
     private readonly _logger;
+    private _autoplayRecoveryController;
     constructor(statFirstMediaReceived: StatFirstMediaReceived, allowMultipleTracks?: boolean, debug?: DebugLogger, logger?: StatEventCollector | null);
     add(participantId: ParticipantId, track: MediaStreamTrack): void;
     remove(participantId: ParticipantId, track: MediaStreamTrack): void;
@@ -26,6 +27,7 @@ export default class AudioOutput {
     protected _getTracks(): MediaStreamTrack[];
     protected _initAudioElement(): void;
     protected _stopAudioElement(): void;
+    private _stopAutoplayRecovery;
     private _createAudioElement;
     private _prepareAudioElement;
     private _addTrackToAudioElement;

package/classes/CallRegistry.d.ts

@@ -6,18 +6,31 @@ export interface HoldableConversation extends Conversation {
 }
 export declare class CallRegistry {
     private _conversations;
-    private _reserved;
+    private _pending;
+    private _initialIds;
+    private _hangups;
     private _activeId;
+    private _selected;
     private _mutex;
     private _pendingRemovals;
-    reserve(id: string): void;
+    addPending(conversation: HoldableConversation): void;
+    selectPending(conversation: HoldableConversation): HoldableConversation | null;
+    isSelected(conversation: HoldableConversation): boolean;
+    releaseSelection(conversation: HoldableConversation, previous?: HoldableConversation | null): void;
+    selectIfNone(conversation: HoldableConversation): void;
     add(conversation: HoldableConversation): void;
-    remove(id: string | null): void;
+    remove(conversation: HoldableConversation): void;
     get(id: string): HoldableConversation | undefined;
+    getPending(id?: string): HoldableConversation | null;
+    isPending(conversation: HoldableConversation): boolean;
+    getLocal(id?: string): HoldableConversation | null;
+    trackHangup(conversation: HoldableConversation, promise: Promise<void>): void;
+    getHangup(id?: string): Promise<void> | undefined;
+    removeHangup(promise: Promise<void>): void;
     getActive(): HoldableConversation | null;
     getFirst(): HoldableConversation | null;
     getActiveId(): string | null;
-    has(id: string): boolean;
+    has(id: string, except?: HoldableConversation): boolean;
     getAll(): HoldableConversation[];
     get callsLength(): number;
     setActive(id: string): Promise<void>;

package/classes/MediaSource.d.ts

@@ -1,5 +1,6 @@
 import type { IEffect } from '@vkontakte/calls-video-effects';
 import EventEmitter from '../classes/EventEmitter';
+import ActiveFeature from '../enums/ActiveFeature';
 import MediaOption from '../enums/MediaOption';
 import { type DebugLogger } from '../static/Debug';
 import MediaSettings, { IVideoDimentions } from '../types/MediaSettings';
@@ -38,6 +39,8 @@ export declare class MediaSource extends EventEmitter {
     private _screenTrack;
     private _audioShareTrack;
     private _screenShareTrack;
+    private _screenCaptureRequest;
+    private _destroyed;
     /** Трек для отправки в медиа-канал. Может отличаться при скриншаринге в дата-канал */
     private _sendVideoTrack;
     /** Трек с камеры. В стриме будет другой трек при включенных видео эффектах */
@@ -77,6 +80,8 @@ export declare class MediaSource extends EventEmitter {
      */
     getMediaSettings(): MediaSettings;
     get mediaSettings(): MediaSettings;
+    /** Что сейчас включено у пользователя — для метрики active_features */
+    get activeFeatures(): ActiveFeature[];
     changeDevice(kind: MediaDeviceKind): Promise<void>;
     /**
      * Установка кастомного стрима для видео, например внешний шаринг экрана

package/classes/SignalingErrors.d.ts

@@ -0,0 +1,6 @@
+export declare class SignalingDisposedError extends Error {
+    constructor(command?: string);
+}
+export declare class ProducerConnectionClosedError extends Error {
+    constructor(command?: string);
+}

package/classes/StatsLogger.d.ts

@@ -2,7 +2,7 @@ import BaseApi from '../abstract/BaseApi';
 import BaseLogger from '../abstract/BaseLogger';
 import StatLog from '../enums/StatLog';
 import TransportTopology from '../enums/TransportTopology';
-type ClientStatsPayload = Record<string, string | number | boolean | undefined | null>;
+type ClientStatsPayload = Record<string, string | string[] | number | boolean | undefined | null>;
 export type LogClientStatsOptions = {
     immediately?: boolean;
     occurredAt?: number;

package/classes/conversation/Conversation.d.ts

@@ -2,7 +2,7 @@ import type { IEffect } from '@vkontakte/calls-video-effects';
 import type { RGBTuple } from '@vkontakte/calls-vmoji';
 import BaseApi from '../../abstract/BaseApi';
 import BaseLogger from '../../abstract/BaseLogger';
-import { AddParticipantParams } from '../../abstract/BaseSignaling';
+import type { AddParticipantParams } from '../../types/AddParticipantParams';
 import ConversationFeature from '../../enums/ConversationFeature';
 import ConversationOption from '../../enums/ConversationOption';
 import MediaOption from '../../enums/MediaOption';
@@ -15,7 +15,7 @@ import { IAsrStartParams, IAsrStopParams } from '../../types/Asr';
 import { AudienceModeHandsResponse } from '../../types/AudienceMode';
 import { ConversationData, ConversationOnJoinParams, ConversationOnStartParams } from '../../types/Conversation';
 import { ExternalId, ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk } from '../../types/ExternalId';
-import type { FastHangupHandler, HangupParams } from '../../types/FastHangup';
+import type { HangupParams } from '../../types/FastHangup';
 import MediaModifiers from '../../types/MediaModifiers';
 import MediaSettings, { IVideoDimentions } from '../../types/MediaSettings';
 import { IAddMovieParams, IUpdateMovieData } from '../../types/MovieShare';
@@ -35,6 +35,9 @@ export default class Conversation extends EventEmitter {
     private readonly _signalingActor;
     private readonly _displayLayoutRequester;
     private _mediaSource;
+    private _requestingLocalMedia;
+    private _requestedLocalAudio?;
+    private _requestedLocalVideo?;
     private _conversation;
     private _myLastRequestedLayouts;
     private _state;
@@ -56,14 +59,17 @@ export default class Conversation extends EventEmitter {
     private _isRealTimeAsrRequested;
     private _serverSettings;
     private _serverTimeOffset;
-    private _delayedHangup;
+    private _serverConversationId;
     private _onFastHangup?;
     private _hangupEmitted;
     private _hangupPromise;
+    private _hangupReason;
     private _abortController;
     private _registeredPeerReceived;
     private _calleeUnavailableTimer;
-    private _reservedId;
+    private _pendingId;
+    private _resolveSignalingInitialization;
+    private readonly _signalingInitialization;
     private readonly _onUnload;
     private readonly _onRestore;
     private readonly _onVisibilityChange;
@@ -81,7 +87,6 @@ export default class Conversation extends EventEmitter {
     private readonly _statFirstMediaReceived;
     constructor(api: BaseApi, externalLogger: BaseLogger | null);
     static current(): Conversation | null;
-    static hangupAfterInit(onFastHangup?: FastHangupHandler): void;
     static id(): string | null;
     get id(): string;
     get externalId(): ExternalParticipantId | undefined;
@@ -117,7 +122,8 @@ export default class Conversation extends EventEmitter {
     accept(mediaOptions: MediaOption[]): Promise<ConversationData>;
     decline(params?: HangupParams): Promise<void>;
     hangup(params?: HangupParams): Promise<void>;
-    addParticipant(participantIds: ExternalId[], params?: AddParticipantParams): Promise<void>;
+    private _waitForHangup;
+    addParticipant(participantIds: ExternalId[], params?: AddParticipantParams): Promise<ExternalParticipant[] | undefined>;
     addParticipantLegacy(participantIds: CompositeUserId[], params?: AddParticipantParams): Promise<void>;
     removeParticipant(participantId: CompositeUserId, ban?: boolean): Promise<void>;
     setVolume(volume: number): void;
@@ -125,11 +131,15 @@ export default class Conversation extends EventEmitter {
     private _openTransport;
     private _allocateParticipantTransport;
     private _closeParticipantTransport;
+    private _registerPending;
     private _cleanupRegistry;
+    private _applyInitialActiveSelection;
     private _emitHangupOnce;
     private _sendHangupApi;
     private _close;
     private _sendHangup;
+    private _throwIfClosed;
+    private _applyServerConversation;
     destroy(): void;
     private _destroy;
     private _getConversationParams;
@@ -153,12 +163,15 @@ export default class Conversation extends EventEmitter {
     private _cacheParticipantExternalIds;
     private _setConversation;
     private _updateConversation;
+    private _requestLocalMedia;
     private _createMediaSource;
     private _connectSignaling;
+    private _completeSignalingInitialization;
     private _processConnection;
     private _onConversationParticipantListChunk;
     private _createParticipantListChunk;
     private _participantListChunkToExternalChunk;
+    private _participantsToExternal;
     private _registerConnectionParticipants;
     private _registerParticipants;
     /** Установим состояние локальных мьютов */
@@ -251,8 +264,8 @@ export default class Conversation extends EventEmitter {
     private _isWaitingForPromotion;
     private _getWaitingForPromotionStatus;
     putHandsDown(): Promise<void>;
-    requestKeyFrame(participantStreamDescription: ParticipantStreamDescription): Promise<void | SignalingMessage>;
-    requestTestMode(consumerCommand: string, producerCommand: string): Promise<void | SignalingMessage>;
+    requestKeyFrame(participantStreamDescription: ParticipantStreamDescription): Promise<SignalingMessage>;
+    requestTestMode(consumerCommand: string, producerCommand: string): Promise<SignalingMessage>;
     updateDisplayLayout(layouts: ParticipantLayout[]): Promise<void>;
     requestDisplayLayout(requests: DisplayLayoutRequest[]): Promise<void>;
     feedback(key: string): Promise<SignalingMessage>;
@@ -453,6 +466,11 @@ export default class Conversation extends EventEmitter {
     private _onVideoSuspendSuggest;
     private _onParticipantHold;
     private _isMe;
+    /**
+     * Сколько человек сейчас в звонке. Считаем только принявших: приглашенные,
+     * у которых еще идет вызов, ресурсы не потребляют.
+     */
+    private _getParticipantsCount;
     private _getMuteStatesForRoomId;
     private _getMuteStatesForCurrentRoom;
     private _setMuteStatesForRoomId;
@@ -460,8 +478,6 @@ export default class Conversation extends EventEmitter {
     private _registerParticipant;
     private _getParticipant;
 }
-declare function _resetPendingInstance(): void;
-export { _resetPendingInstance };
 export declare class UpdateDisplayLayoutError extends Error {
     readonly participantErrors: {
         externalId: ExternalParticipantId;

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

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

package/classes/screenshare/ScreenCaptureSender.d.ts

@@ -1,4 +1,4 @@
-import BaseSignaling from '../../abstract/BaseSignaling';
+import type Signaling from '../../default/Signaling';
 import { type DebugLogger } from '../../static/Debug';
 import StatEventCollector from '../stat/StatEventCollector';
 export default class ScreenCaptureSender {
@@ -25,7 +25,7 @@ export default class ScreenCaptureSender {
     private readonly _maxFrameDelay;
     private readonly _debug;
     private readonly _logger;
-    constructor(track: MediaStreamTrack, datachannel: RTCDataChannel, signaling: BaseSignaling, fastSharing: boolean, debug?: DebugLogger, logger?: StatEventCollector | null);
+    constructor(track: MediaStreamTrack, datachannel: RTCDataChannel, signaling: Signaling, fastSharing: boolean, debug?: DebugLogger, logger?: StatEventCollector | null);
     private _handleQueue;
     /**
      * Очищает очередь до опорного кадра

package/classes/stat/BatteryStats.d.ts

@@ -0,0 +1,25 @@
+import StatEventCollector from './StatEventCollector';
+export interface BatteryClock {
+    monotonicNow(): number;
+}
+/**
+ * Метрика battery_level_change: на каждое изменение уровня заряда отправляется
+ * само изменение в процентных пунктах и время, за которое оно произошло.
+ * Пока устройство на зарядке, замеры не ведутся: зарядка сбрасывает точку отсчёта,
+ * и первое изменение после неё только задаёт новую.
+ *
+ * Battery Status API есть только в Chromium, в Safari и Firefox его нет —
+ * там класс молча ничего не делает.
+ */
+export declare class BatteryStats {
+    private readonly _logger;
+    private readonly _clock;
+    private _battery;
+    private _previous;
+    private _destroyed;
+    constructor(logger: StatEventCollector, clock?: BatteryClock);
+    destroy(): void;
+    private _subscribe;
+    private _handleChargingChange;
+    private _handleLevelChange;
+}

package/classes/stat/ClientResourceStats.d.ts

@@ -0,0 +1,41 @@
+import ActiveFeature from '../../enums/ActiveFeature';
+import { type DebugLogger } from '../../static/Debug';
+/** Метрики ресурсов клиента за интервал между отправками callStat */
+export type ClientResourceReport = {
+    /** Максимум участников за интервал */
+    participants_max?: number;
+    /** Фичи, включенные в любой момент интервала */
+    active_features?: string[];
+    /** Максимальная площадь окна за интервал, в мегапикселях */
+    app_total_area_mpx_max?: number;
+};
+export type ClientResourceSources = {
+    getParticipantsCount: () => number;
+    getActiveFeatures: () => ActiveFeature[];
+};
+/**
+ * Копит ресурсные метрики между отправками callStat: репортер забирает накопленное
+ * через takeReport() и начинает копить заново.
+ *
+ * Замеряем чаще, чем отправляем, потому что нас интересует не состояние в момент отправки,
+ * а что происходило за интервал: пик участников и все фичи, которые успели поработать.
+ */
+export declare class ClientResourceStats {
+    private readonly _sources;
+    private readonly _debug;
+    private _timer;
+    private _participantsMax;
+    private _areaMpxMax;
+    private _features;
+    constructor(sources: ClientResourceSources, debug?: DebugLogger);
+    /** Забрать накопленное за интервал и начать копить заново */
+    takeReport(): ClientResourceReport;
+    destroy(): void;
+    private _sample;
+    /**
+     * Площадь окна в физических пикселях: CSS-пиксели умножаем на devicePixelRatio,
+     * иначе одно и то же окно на экране с ретиной и без давало бы одинаковую цифру.
+     * Приложение в вебе — это одна вкладка, суммировать нечего.
+     */
+    private _measureAreaMpx;
+}

package/classes/stat/ConversationStats.d.ts

@@ -4,7 +4,9 @@ import TransportTopology from '../../enums/TransportTopology';
 import HangupReason from '../HangupReason';
 import StatEventCollector from './StatEventCollector';
 import { ApiCallStats } from './ApiCallStats';
+import { BatteryStats } from './BatteryStats';
 import { CallLifecycleStats } from './CallLifecycleStats';
+import { ClientResourceSources, ClientResourceStats } from './ClientResourceStats';
 import { CodecStatsAggregator } from './CodecStatsAggregator';
 import { StatAggregator } from './StatAggregator';
 import { StatPings } from './StatPings';
@@ -17,9 +19,11 @@ export declare class ConversationStats {
     readonly pings: StatPings;
     readonly signalingCommands: StatSignalingCommands;
     readonly apiCalls: ApiCallStats;
+    readonly resources: ClientResourceStats;
+    readonly battery: BatteryStats;
     private readonly _api;
     private _unloading;
-    constructor(api: BaseApi, externalLogger: BaseLogger | null, getConversationId: () => string | null, getTopology: () => TransportTopology | undefined);
+    constructor(api: BaseApi, externalLogger: BaseLogger | null, getConversationId: () => string | null, getTopology: () => TransportTopology | undefined, resourceSources: ClientResourceSources);
     /**
      * Вызывается из pagehide-обработчика: события финиша должны пережить смерть
      * вкладки. Сводки пингов и команд сбрасываем здесь же — destroy() их только

package/classes/stat/SdpStats.d.ts

@@ -32,8 +32,9 @@ export declare class SdpStats {
     /** Не смогли применить SDP собеседника */
     logSetRemoteFailed(sdp: SdpDescription, error: unknown): void;
     destroy(): void;
-    private _intervalSince;
     private _logFailure;
     private _log;
 }
+/** Браузер может спрятать локальный адрес за именем вида <uuid>.local, такой кандидат в стату не шлём */
+export declare function isIpAddress(address: string): boolean;
 export {};

package/classes/stat/StatAggregator.d.ts

@@ -1,11 +1,13 @@
 import { ICallStatLog } from '../../types/PerfStatReporter';
 import { IEventualStatLog } from '../../types/IEventualStatLog';
 import StatEventCollector from './StatEventCollector';
+import { ClientResourceStats } from './ClientResourceStats';
 export declare class StatAggregator {
     private readonly _logger;
+    private readonly _resources;
     private readonly _eventualLogs;
     private _lastCallStatContext;
-    constructor(logger: StatEventCollector);
+    constructor(logger: StatEventCollector, resources?: ClientResourceStats | null);
     logCallStat(params: ICallStatLog): void;
     /**
      * Событие уходит с теми полями, что переданы. Без value — уходит без value.

package/classes/stat/StatEventCollector.d.ts

@@ -2,7 +2,7 @@ import BaseApi from '../../abstract/BaseApi';
 import BaseLogger from '../../abstract/BaseLogger';
 import StatLog from '../../enums/StatLog';
 import TransportTopology from '../../enums/TransportTopology';
-type ClientStatsPayload = Record<string, string | number | boolean | undefined | null>;
+type ClientStatsPayload = Record<string, string | string[] | number | boolean | undefined | null>;
 export type LogClientStatsOptions = {
     /** Время наступления события. По умолчанию — момент записи. */
     occurredAt?: number;

package/classes/stat/StatQueue.d.ts

@@ -2,8 +2,8 @@
 export declare const RECORD_LIMIT = 5000;
 /** Срок жизни события в очереди. */
 export declare const MAX_AGE_MS: number;
-/** Произвольный набор скалярных полей события. */
-export type StatPayload = Record<string, string | number | boolean | null>;
+/** Произвольный набор полей события: скаляры и списки строк. */
+export type StatPayload = Record<string, string | string[] | number | boolean | null>;
 /** Запись очереди без сгенерированного ключа. */
 export type StatQueueEntry = {
     /** userId владельца события. Не может быть неизвестным. */

package/classes/transport/BaseTransport.d.ts

@@ -1,16 +1,16 @@
-import BaseSignaling from '../../abstract/BaseSignaling';
+import type Signaling from '../../default/Signaling';
 import TransportState from '../../enums/TransportState';
 import EventEmitter from '../EventEmitter';
 import { MediaSource } from '../MediaSource';
 export default abstract class BaseTransport extends EventEmitter {
-    protected readonly _signaling: BaseSignaling;
+    protected readonly _signaling: Signaling;
     protected readonly _mediaSource: MediaSource;
     protected _state: TransportState;
     protected _pc: RTCPeerConnection | null;
     private readonly _onFirstMediaSent;
     private _firstMediaSentProbe;
     private _firstMediaSentProbeStopped;
-    protected constructor(signaling: BaseSignaling, mediaSource: MediaSource, onFirstMediaSent?: (() => void) | null);
+    protected constructor(signaling: Signaling, mediaSource: MediaSource, onFirstMediaSent?: (() => void) | null);
     getState(): TransportState;
     stopFirstMediaSentProbe(): void;
     abstract close(error?: Error): void;

package/classes/transport/DirectStatReporter.d.ts

@@ -1,4 +1,4 @@
-import BaseSignaling from '../../abstract/BaseSignaling';
+import type Signaling from '../../default/Signaling';
 import { type DebugLogger } from '../../static/Debug';
 import { StatResult } from '../../types/Statistics';
 import EventEmitter from '../EventEmitter';
@@ -32,7 +32,7 @@ export default class DirectStatReporter extends EventEmitter {
     private _lastStatSentTimestamp;
     private _currentState;
     private readonly _debug;
-    constructor(signaling: BaseSignaling, debug?: DebugLogger);
+    constructor(signaling: Signaling, debug?: DebugLogger);
     private _calcRttRating;
     private _calcLossRating;
     private _calcBitrateRating;

package/classes/transport/DirectTransport.d.ts

@@ -1,5 +1,5 @@
 import type { AnimojiReceiver, AnimojiSender } from '@vkontakte/calls-vmoji';
-import BaseSignaling from '../../abstract/BaseSignaling';
+import type Signaling from '../../default/Signaling';
 import { type DebugLogger } from '../../static/Debug';
 import { ParticipantId } from '../../types/Participant';
 import ServerSettings from '../../types/ServerSettings';
@@ -50,7 +50,7 @@ export default class DirectTransport extends BaseTransport {
     private readonly _logger;
     private readonly _statAggregator;
     private readonly _codecStatsAggregator;
-    constructor(participantId: ParticipantId, isMaster: boolean, signaling: BaseSignaling, mediaSource: MediaSource, serverSettings: ServerSettings, debug?: DebugLogger, logger?: StatEventCollector | null, statAggregator?: StatAggregator | null, codecStatsAggregator?: CodecStatsAggregator | null, onFirstMediaSent?: (() => void) | null);
+    constructor(participantId: ParticipantId, isMaster: boolean, signaling: Signaling, mediaSource: MediaSource, serverSettings: ServerSettings, debug?: DebugLogger, logger?: StatEventCollector | null, statAggregator?: StatAggregator | null, codecStatsAggregator?: CodecStatsAggregator | null, onFirstMediaSent?: (() => void) | null);
     get participantId(): ParticipantId;
     updateStatisticsInterval(): void;
     private _isDeadConnection;

package/classes/transport/PerfStatReporter.d.ts

@@ -1,4 +1,4 @@
-import BaseSignaling from '../../abstract/BaseSignaling';
+import type Signaling from '../../default/Signaling';
 import { type DebugLogger } from '../../static/Debug';
 import EventEmitter from '../EventEmitter';
 import { StatAggregator } from '../stat/StatAggregator';
@@ -8,15 +8,17 @@ export default class PerfStatReporter extends EventEmitter {
     private _previousPerfStatReportTimestamp;
     private _previousNetworkStatReportTimestamp;
     private _previousCallStatReportTimestamp;
-    private _previousCallStatReport;
+    private _previousCounters;
     private _previousRemoteInboundRtps;
+    private _previousInboundRtps;
+    private _previousOutboundRtps;
     private _previousCandidatePair;
     private _screenShareStats;
     private _signaling;
     private readonly _directTopology;
     private readonly _debug;
     private readonly _statAggregator;
-    constructor(transport: ServerTransport | DirectTransport, signaling: BaseSignaling, statAggregator?: StatAggregator | null, directTopology?: boolean, debug?: DebugLogger);
+    constructor(transport: ServerTransport | DirectTransport, signaling: Signaling, statAggregator?: StatAggregator | null, directTopology?: boolean, debug?: DebugLogger);
     destroy(): void;
     static getEstimatedPerformanceIndex(): number;
     private _handleStats;
@@ -24,7 +26,9 @@ export default class PerfStatReporter extends EventEmitter {
     private reportNetworkStats;
     private _reportCallStats;
     private _reportCandidatePair;
+    private _calculateRemotePacketLoss;
     private _calculatePacketLoss;
+    private _calculateOutboundDeltas;
     private _handleScreenSharingStat;
     private _handleTransportStateChanged;
 }

package/classes/transport/ServerTransport.d.ts

@@ -1,5 +1,5 @@
 import type { AnimojiReceiver, AnimojiSender } from '@vkontakte/calls-vmoji';
-import BaseSignaling from '../../abstract/BaseSignaling';
+import type Signaling from '../../default/Signaling';
 import { type DebugLogger } from '../../static/Debug';
 import { ParticipantId } from '../../types/Participant';
 import ServerSettings from '../../types/ServerSettings';
@@ -49,7 +49,7 @@ export default class ServerTransport extends BaseTransport {
     private readonly _peerConnectionStats;
     private readonly _codecStatsAggregator;
     private readonly _simulcast;
-    constructor(signaling: BaseSignaling, mediaSource: MediaSource, serverSettings: ServerSettings, debug?: DebugLogger, logger?: StatEventCollector | null, statAggregator?: StatAggregator | null, codecStatsAggregator?: CodecStatsAggregator | null, onFirstMediaSent?: (() => void) | null);
+    constructor(signaling: Signaling, mediaSource: MediaSource, serverSettings: ServerSettings, debug?: DebugLogger, logger?: StatEventCollector | null, statAggregator?: StatAggregator | null, codecStatsAggregator?: CodecStatsAggregator | null, onFirstMediaSent?: (() => void) | null);
     updateStatisticsInterval(): void;
     open(observer?: boolean): void;
     close(error?: Error): void;
@@ -83,6 +83,8 @@ export default class ServerTransport extends BaseTransport {
     private _startSettingsInterval;
     private _stopSettingsInterval;
     private _collectStat;
+    /** mid потока быстрой шары, чтобы отделить его от камеры в статистике */
+    private _getScreenShareMid;
     private _reportStats;
     private _detectStaleTracks;
     private _allocateConsumer;

package/classes/transport/SimulcastSender.d.ts

@@ -1,4 +1,4 @@
-import BaseSignaling from '../../abstract/BaseSignaling';
+import type Signaling from '../../default/Signaling';
 import { type DebugLogger } from '../../static/Debug';
 import type VideoSettings from '../../types/VideoSettings';
 import { MediaSource } from '../MediaSource';
@@ -12,7 +12,7 @@ export default class SimulcastSender {
     private readonly _getCameraSettings;
     private readonly _debug;
     private readonly _logger;
-    constructor(signaling: BaseSignaling, mediaSource: MediaSource, getCameraSettings: () => VideoSettings | null, debug?: DebugLogger, logger?: StatEventCollector | null);
+    constructor(signaling: Signaling, mediaSource: MediaSource, getCameraSettings: () => VideoSettings | null, debug?: DebugLogger, logger?: StatEventCollector | null);
     configureFromRemoteOffer(pc: RTCPeerConnection): Promise<void>;
     finalizeAnswer(sdp: string): string;
     sync({ force }?: {

package/classes/transport/Transport.d.ts

@@ -1,5 +1,5 @@
 import type { AnimojiSvgData, RGBTuple } from '@vkontakte/calls-vmoji';
-import BaseSignaling from '../../abstract/BaseSignaling';
+import type Signaling from '../../default/Signaling';
 import TransportState from '../../enums/TransportState';
 import TransportTopology from '../../enums/TransportTopology';
 import { type DebugLogger } from '../../static/Debug';
@@ -51,7 +51,7 @@ export declare class Transport extends EventEmitter {
     private readonly _onFirstMediaSent;
     private _firstMediaSentProbeStopped;
     private _vadController;
-    constructor(topology: TransportTopology, signaling: BaseSignaling, mediaSource: MediaSource, serverSettings: ServerSettings, debug?: DebugLogger, logger?: StatEventCollector | null, statAggregator?: StatAggregator | null, codecStatsAggregator?: CodecStatsAggregator | null, onFirstMediaSent?: (() => void) | null);
+    constructor(topology: TransportTopology, signaling: Signaling, mediaSource: MediaSource, serverSettings: ServerSettings, debug?: DebugLogger, logger?: StatEventCollector | null, statAggregator?: StatAggregator | null, codecStatsAggregator?: CodecStatsAggregator | null, onFirstMediaSent?: (() => void) | null);
     updateSettings(settings: ServerSettings): void;
     updateStatisticsInterval(): void;
     allocate(participantId: ParticipantId, isMaster?: boolean): void;

package/default/Api.d.ts

@@ -10,6 +10,7 @@ import PushData from '../types/PushData';
 export default class Api extends BaseApi {
     private _uuid;
     private _idCache;
+    constructor();
     private _callUnsafe;
     protected _call(method: string, data?: any, noSession?: boolean, allowReauthorize?: boolean): Promise<any>;
     userId(participantId: ParticipantId): ExternalParticipantId | null;
@@ -22,6 +23,8 @@ export default class Api extends BaseApi {
     private _removeCachedAnonymLogin;
     private _reauthorize;
     private _applyAnonymLogin;
+    /** Кладёт в кеш id соответствие своего участника из auth.anonymLogin */
+    private _cacheSelfExternalId;
     private _buildClientStatsData;
     /** Ошибки по отдельным событиям логируются, но батч трактуется целиком. */
     private _reportClientStatsItemErrors;

package/default/Signaling.d.ts

@@ -1,4 +1,5 @@
-import BaseSignaling, { AddParticipantParams } from '../abstract/BaseSignaling';
+import EventEmitter from '../classes/EventEmitter';
+import type { AddParticipantParams } from '../types/AddParticipantParams';
 import { ParticipantIdRegistry } from '../classes/ParticipantIdRegistry';
 import { SharingStatReport } from '../classes/screenshare/SharingStatReport';
 import { StatAggregator } from '../classes/stat/StatAggregator';
@@ -15,6 +16,7 @@ import { type DebugLogger } from '../static/Debug';
 import { JSONObject } from '../static/Json';
 import { IAsrStartParams, IAsrStopParams } from '../types/Asr';
 import { ChangeSimulcast } from '../types/ChangeSimulcast';
+import ConversationResponse from '../types/ConversationResponse';
 import MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
 import { IAddMovieParams, IUpdateMovieData } from '../types/MovieShare';
@@ -27,10 +29,9 @@ import { StreamDescriptionString } from '../types/ParticipantStreamDescription';
 import { PerfStatReport } from '../types/PerfStatReporter';
 import SignalingMessage, { GetParticipantsSignalingResponse, GetRoomsSignalingResponse } from '../types/SignalingMessage';
 import { IPublishStreamData, IStartStreamData, IStopStreamData } from '../types/Streams';
-export default class Signaling extends BaseSignaling {
-    private transport;
+export default class Signaling extends EventEmitter {
+    private session;
     private sequence;
-    private lastStamp;
     private websocketCommandsQueue;
     private datachannelCommandsQueue;
     private incomingCache;
@@ -39,12 +40,9 @@ export default class Signaling extends BaseSignaling {
     private connectionType;
     private conversationResolve;
     private conversationReject;
-    private connected;
     private listenersReady;
-    private peerId;
     /** Когда началась череда падений соединения, от неё считаем *_timeout */
     private reconnectStartedAt;
-    private connectionMessageWaitTimer;
     private participantIdRegistry;
     private producerNotificationDataChannel;
     private producerCommandDataChannel;
@@ -55,13 +53,10 @@ export default class Signaling extends BaseSignaling {
     private readonly _statAggregator;
     private readonly _statPings;
     private readonly _statSignalingCommands;
-    private static get WAIT_CONNECTION_DELAY();
     private static get WAIT_RESPONSE_DELAY();
     get ready(): boolean;
     constructor(debug?: DebugLogger, logger?: StatEventCollector | null, statAggregator?: StatAggregator | null, statPings?: StatPings | null, statSignalingCommands?: StatSignalingCommands | null);
     setAbortSignal(signal: AbortSignal | undefined): void;
-    setEndpoint(endpoint: string): void;
-    setWebTransportEndpoint(endpoint: string | null): void;
     setParticipantIdRegistry(participantIdRegistry: ParticipantIdRegistry): void;
     setProducerNotificationDataChannel(dataChannel: RTCDataChannel): void;
     setProducerCommandDataChannel(dataChannel: RTCDataChannel): void;
@@ -70,7 +65,7 @@ export default class Signaling extends BaseSignaling {
     /**
      * Open a connection with a signaling server
      */
-    connect(connectionType: SignalingConnectionType): Promise<SignalingMessage.Connection>;
+    connect(connectionType: SignalingConnectionType, conversation: ConversationResponse): Promise<SignalingMessage.Connection>;
     getNextCommandSequenceNumber(): number;
     hangup(reason: string): Promise<SignalingMessage>;
     sendCandidate(participantId: ParticipantId, candidate: RTCIceCandidateInit): Promise<SignalingMessage>;
@@ -180,14 +175,12 @@ export default class Signaling extends BaseSignaling {
     private _serializeBinary;
     private _serializeJson;
     private _convertDisplayLayout;
-    private _waitConnectionMessage;
-    private _stopWaitConnectionMessage;
     private _onTransportConnecting;
-    private _onTransportFailed;
-    private _onTransportReconnectScheduled;
+    private _onSessionFailed;
+    private _onSessionReconnectScheduled;
     /** Попыток восстановить соединение больше не будет: отправляем, сколько длилась череда падений */
     private _logReconnectTimeout;
-    private _onTransportConnectionDead;
+    private _onSessionInactive;
     private _attachNotificationCallError;
     private _createSignalingCallError;
     private _getSocketType;