@vkontakte/calls-sdk 2.8.13-dev.8e54394d.0 → 2.8.13-dev.90f6da61.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CallsSDK.d.ts +33 -14
- package/abstract/BaseApi.d.ts +1 -1
- package/calls-sdk.cjs.js +7 -7
- package/calls-sdk.esm.js +2687 -2168
- package/classes/AudioOutput.d.ts +2 -0
- package/classes/CallRegistry.d.ts +17 -4
- package/classes/MediaSource.d.ts +5 -0
- package/classes/StatsLogger.d.ts +1 -1
- package/classes/conversation/Conversation.d.ts +23 -7
- package/classes/conversation/Conversation.testUtils.d.ts +1 -0
- package/classes/stat/BatteryStats.d.ts +25 -0
- package/classes/stat/ClientResourceStats.d.ts +41 -0
- package/classes/stat/ConversationStats.d.ts +5 -1
- package/classes/stat/NetworkAdaptationStats.d.ts +35 -0
- package/classes/stat/SdpStats.d.ts +2 -1
- package/classes/stat/StatAggregator.d.ts +3 -1
- package/classes/stat/StatEventCollector.d.ts +1 -1
- package/classes/stat/StatQueue.d.ts +2 -2
- package/classes/transport/DirectTransport.d.ts +5 -0
- package/classes/transport/PerfStatReporter.d.ts +5 -1
- package/classes/transport/ServerTransport.d.ts +2 -0
- package/classes/transport/Transport.d.ts +4 -3
- package/classes/transport/VadGate.d.ts +37 -0
- package/default/Api.d.ts +3 -0
- package/enums/ActiveFeature.d.ts +19 -0
- package/enums/Stat.d.ts +2 -0
- package/package.json +1 -1
- package/static/AuthData.d.ts +11 -1
- package/static/BrowserEnvironment.d.ts +90 -0
- package/static/External.d.ts +5 -3
- package/static/Params.d.ts +13 -5
- package/static/WebRTCUtils.d.ts +0 -71
- package/types/ClientStatsEvent.d.ts +2 -6
- package/types/FastHangup.d.ts +7 -5
- package/types/PerfStatReporter.d.ts +26 -1
- package/types/SignalingMessage.d.ts +1 -0
- package/types/Statistics.d.ts +22 -7
package/classes/AudioOutput.d.ts
CHANGED
|
@@ -15,6 +15,7 @@ export default class AudioOutput {
|
|
|
15
15
|
private readonly _features;
|
|
16
16
|
private readonly _statFirstMediaReceived;
|
|
17
17
|
private readonly _logger;
|
|
18
|
+
private _autoplayRecoveryController;
|
|
18
19
|
constructor(statFirstMediaReceived: StatFirstMediaReceived, allowMultipleTracks?: boolean, debug?: DebugLogger, logger?: StatEventCollector | null);
|
|
19
20
|
add(participantId: ParticipantId, track: MediaStreamTrack): void;
|
|
20
21
|
remove(participantId: ParticipantId, track: MediaStreamTrack): void;
|
|
@@ -26,6 +27,7 @@ export default class AudioOutput {
|
|
|
26
27
|
protected _getTracks(): MediaStreamTrack[];
|
|
27
28
|
protected _initAudioElement(): void;
|
|
28
29
|
protected _stopAudioElement(): void;
|
|
30
|
+
private _stopAutoplayRecovery;
|
|
29
31
|
private _createAudioElement;
|
|
30
32
|
private _prepareAudioElement;
|
|
31
33
|
private _addTrackToAudioElement;
|
|
@@ -6,18 +6,31 @@ export interface HoldableConversation extends Conversation {
|
|
|
6
6
|
}
|
|
7
7
|
export declare class CallRegistry {
|
|
8
8
|
private _conversations;
|
|
9
|
-
private
|
|
9
|
+
private _pending;
|
|
10
|
+
private _initialIds;
|
|
11
|
+
private _hangups;
|
|
10
12
|
private _activeId;
|
|
13
|
+
private _selected;
|
|
11
14
|
private _mutex;
|
|
12
15
|
private _pendingRemovals;
|
|
13
|
-
|
|
16
|
+
addPending(conversation: HoldableConversation): void;
|
|
17
|
+
selectPending(conversation: HoldableConversation): HoldableConversation | null;
|
|
18
|
+
isSelected(conversation: HoldableConversation): boolean;
|
|
19
|
+
releaseSelection(conversation: HoldableConversation, previous?: HoldableConversation | null): void;
|
|
20
|
+
selectIfNone(conversation: HoldableConversation): void;
|
|
14
21
|
add(conversation: HoldableConversation): void;
|
|
15
|
-
remove(
|
|
22
|
+
remove(conversation: HoldableConversation): void;
|
|
16
23
|
get(id: string): HoldableConversation | undefined;
|
|
24
|
+
getPending(id?: string): HoldableConversation | null;
|
|
25
|
+
isPending(conversation: HoldableConversation): boolean;
|
|
26
|
+
getLocal(id?: string): HoldableConversation | null;
|
|
27
|
+
trackHangup(conversation: HoldableConversation, promise: Promise<void>): void;
|
|
28
|
+
getHangup(id?: string): Promise<void> | undefined;
|
|
29
|
+
removeHangup(promise: Promise<void>): void;
|
|
17
30
|
getActive(): HoldableConversation | null;
|
|
18
31
|
getFirst(): HoldableConversation | null;
|
|
19
32
|
getActiveId(): string | null;
|
|
20
|
-
has(id: string): boolean;
|
|
33
|
+
has(id: string, except?: HoldableConversation): boolean;
|
|
21
34
|
getAll(): HoldableConversation[];
|
|
22
35
|
get callsLength(): number;
|
|
23
36
|
setActive(id: string): Promise<void>;
|
package/classes/MediaSource.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { IEffect } from '@vkontakte/calls-video-effects';
|
|
2
2
|
import EventEmitter from '../classes/EventEmitter';
|
|
3
|
+
import ActiveFeature from '../enums/ActiveFeature';
|
|
3
4
|
import MediaOption from '../enums/MediaOption';
|
|
4
5
|
import { type DebugLogger } from '../static/Debug';
|
|
5
6
|
import MediaSettings, { IVideoDimentions } from '../types/MediaSettings';
|
|
@@ -38,6 +39,8 @@ export declare class MediaSource extends EventEmitter {
|
|
|
38
39
|
private _screenTrack;
|
|
39
40
|
private _audioShareTrack;
|
|
40
41
|
private _screenShareTrack;
|
|
42
|
+
private _screenCaptureRequest;
|
|
43
|
+
private _destroyed;
|
|
41
44
|
/** Трек для отправки в медиа-канал. Может отличаться при скриншаринге в дата-канал */
|
|
42
45
|
private _sendVideoTrack;
|
|
43
46
|
/** Трек с камеры. В стриме будет другой трек при включенных видео эффектах */
|
|
@@ -77,6 +80,8 @@ export declare class MediaSource extends EventEmitter {
|
|
|
77
80
|
*/
|
|
78
81
|
getMediaSettings(): MediaSettings;
|
|
79
82
|
get mediaSettings(): MediaSettings;
|
|
83
|
+
/** Что сейчас включено у пользователя — для метрики active_features */
|
|
84
|
+
get activeFeatures(): ActiveFeature[];
|
|
80
85
|
changeDevice(kind: MediaDeviceKind): Promise<void>;
|
|
81
86
|
/**
|
|
82
87
|
* Установка кастомного стрима для видео, например внешний шаринг экрана
|
package/classes/StatsLogger.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import BaseApi from '../abstract/BaseApi';
|
|
|
2
2
|
import BaseLogger from '../abstract/BaseLogger';
|
|
3
3
|
import StatLog from '../enums/StatLog';
|
|
4
4
|
import TransportTopology from '../enums/TransportTopology';
|
|
5
|
-
type ClientStatsPayload = Record<string, string | number | boolean | undefined | null>;
|
|
5
|
+
type ClientStatsPayload = Record<string, string | string[] | number | boolean | undefined | null>;
|
|
6
6
|
export type LogClientStatsOptions = {
|
|
7
7
|
immediately?: boolean;
|
|
8
8
|
occurredAt?: number;
|
|
@@ -15,7 +15,7 @@ import { IAsrStartParams, IAsrStopParams } from '../../types/Asr';
|
|
|
15
15
|
import { AudienceModeHandsResponse } from '../../types/AudienceMode';
|
|
16
16
|
import { ConversationData, ConversationOnJoinParams, ConversationOnStartParams } from '../../types/Conversation';
|
|
17
17
|
import { ExternalId, ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk } from '../../types/ExternalId';
|
|
18
|
-
import type {
|
|
18
|
+
import type { HangupParams } from '../../types/FastHangup';
|
|
19
19
|
import MediaModifiers from '../../types/MediaModifiers';
|
|
20
20
|
import MediaSettings, { IVideoDimentions } from '../../types/MediaSettings';
|
|
21
21
|
import { IAddMovieParams, IUpdateMovieData } from '../../types/MovieShare';
|
|
@@ -35,6 +35,9 @@ export default class Conversation extends EventEmitter {
|
|
|
35
35
|
private readonly _signalingActor;
|
|
36
36
|
private readonly _displayLayoutRequester;
|
|
37
37
|
private _mediaSource;
|
|
38
|
+
private _requestingLocalMedia;
|
|
39
|
+
private _requestedLocalAudio?;
|
|
40
|
+
private _requestedLocalVideo?;
|
|
38
41
|
private _conversation;
|
|
39
42
|
private _myLastRequestedLayouts;
|
|
40
43
|
private _state;
|
|
@@ -56,14 +59,17 @@ export default class Conversation extends EventEmitter {
|
|
|
56
59
|
private _isRealTimeAsrRequested;
|
|
57
60
|
private _serverSettings;
|
|
58
61
|
private _serverTimeOffset;
|
|
59
|
-
private
|
|
62
|
+
private _serverConversationId;
|
|
60
63
|
private _onFastHangup?;
|
|
61
64
|
private _hangupEmitted;
|
|
62
65
|
private _hangupPromise;
|
|
66
|
+
private _hangupReason;
|
|
63
67
|
private _abortController;
|
|
64
68
|
private _registeredPeerReceived;
|
|
65
69
|
private _calleeUnavailableTimer;
|
|
66
|
-
private
|
|
70
|
+
private _pendingId;
|
|
71
|
+
private _resolveSignalingInitialization;
|
|
72
|
+
private readonly _signalingInitialization;
|
|
67
73
|
private readonly _onUnload;
|
|
68
74
|
private readonly _onRestore;
|
|
69
75
|
private readonly _onVisibilityChange;
|
|
@@ -81,7 +87,6 @@ export default class Conversation extends EventEmitter {
|
|
|
81
87
|
private readonly _statFirstMediaReceived;
|
|
82
88
|
constructor(api: BaseApi, externalLogger: BaseLogger | null);
|
|
83
89
|
static current(): Conversation | null;
|
|
84
|
-
static hangupAfterInit(onFastHangup?: FastHangupHandler): void;
|
|
85
90
|
static id(): string | null;
|
|
86
91
|
get id(): string;
|
|
87
92
|
get externalId(): ExternalParticipantId | undefined;
|
|
@@ -117,7 +122,8 @@ export default class Conversation extends EventEmitter {
|
|
|
117
122
|
accept(mediaOptions: MediaOption[]): Promise<ConversationData>;
|
|
118
123
|
decline(params?: HangupParams): Promise<void>;
|
|
119
124
|
hangup(params?: HangupParams): Promise<void>;
|
|
120
|
-
|
|
125
|
+
private _waitForHangup;
|
|
126
|
+
addParticipant(participantIds: ExternalId[], params?: AddParticipantParams): Promise<ExternalParticipant[] | undefined>;
|
|
121
127
|
addParticipantLegacy(participantIds: CompositeUserId[], params?: AddParticipantParams): Promise<void>;
|
|
122
128
|
removeParticipant(participantId: CompositeUserId, ban?: boolean): Promise<void>;
|
|
123
129
|
setVolume(volume: number): void;
|
|
@@ -125,11 +131,15 @@ export default class Conversation extends EventEmitter {
|
|
|
125
131
|
private _openTransport;
|
|
126
132
|
private _allocateParticipantTransport;
|
|
127
133
|
private _closeParticipantTransport;
|
|
134
|
+
private _registerPending;
|
|
128
135
|
private _cleanupRegistry;
|
|
136
|
+
private _applyInitialActiveSelection;
|
|
129
137
|
private _emitHangupOnce;
|
|
130
138
|
private _sendHangupApi;
|
|
131
139
|
private _close;
|
|
132
140
|
private _sendHangup;
|
|
141
|
+
private _throwIfClosed;
|
|
142
|
+
private _applyServerConversation;
|
|
133
143
|
destroy(): void;
|
|
134
144
|
private _destroy;
|
|
135
145
|
private _getConversationParams;
|
|
@@ -153,12 +163,15 @@ export default class Conversation extends EventEmitter {
|
|
|
153
163
|
private _cacheParticipantExternalIds;
|
|
154
164
|
private _setConversation;
|
|
155
165
|
private _updateConversation;
|
|
166
|
+
private _requestLocalMedia;
|
|
156
167
|
private _createMediaSource;
|
|
157
168
|
private _connectSignaling;
|
|
169
|
+
private _completeSignalingInitialization;
|
|
158
170
|
private _processConnection;
|
|
159
171
|
private _onConversationParticipantListChunk;
|
|
160
172
|
private _createParticipantListChunk;
|
|
161
173
|
private _participantListChunkToExternalChunk;
|
|
174
|
+
private _participantsToExternal;
|
|
162
175
|
private _registerConnectionParticipants;
|
|
163
176
|
private _registerParticipants;
|
|
164
177
|
/** Установим состояние локальных мьютов */
|
|
@@ -453,6 +466,11 @@ export default class Conversation extends EventEmitter {
|
|
|
453
466
|
private _onVideoSuspendSuggest;
|
|
454
467
|
private _onParticipantHold;
|
|
455
468
|
private _isMe;
|
|
469
|
+
/**
|
|
470
|
+
* Сколько человек сейчас в звонке. Считаем только принявших: приглашенные,
|
|
471
|
+
* у которых еще идет вызов, ресурсы не потребляют.
|
|
472
|
+
*/
|
|
473
|
+
private _getParticipantsCount;
|
|
456
474
|
private _getMuteStatesForRoomId;
|
|
457
475
|
private _getMuteStatesForCurrentRoom;
|
|
458
476
|
private _setMuteStatesForRoomId;
|
|
@@ -460,8 +478,6 @@ export default class Conversation extends EventEmitter {
|
|
|
460
478
|
private _registerParticipant;
|
|
461
479
|
private _getParticipant;
|
|
462
480
|
}
|
|
463
|
-
declare function _resetPendingInstance(): void;
|
|
464
|
-
export { _resetPendingInstance };
|
|
465
481
|
export declare class UpdateDisplayLayoutError extends Error {
|
|
466
482
|
readonly participantErrors: {
|
|
467
483
|
externalId: ExternalParticipantId;
|
|
@@ -37,6 +37,7 @@ declare function createParams(): {
|
|
|
37
37
|
onSpeakerChanged: Mock<import("@vitest/spy").Procedure>;
|
|
38
38
|
onAcceptedCall: Mock<import("@vitest/spy").Procedure>;
|
|
39
39
|
onNonFatalError: Mock<import("@vitest/spy").Procedure>;
|
|
40
|
+
onSignalingConnected: Mock<import("@vitest/spy").Procedure>;
|
|
40
41
|
};
|
|
41
42
|
export type ConversationTestParams = ReturnType<typeof createParams>;
|
|
42
43
|
export type ConversationTestTools = {
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import StatEventCollector from './StatEventCollector';
|
|
2
|
+
export interface BatteryClock {
|
|
3
|
+
monotonicNow(): number;
|
|
4
|
+
}
|
|
5
|
+
/**
|
|
6
|
+
* Метрика battery_level_change: на каждое изменение уровня заряда отправляется
|
|
7
|
+
* само изменение в процентных пунктах и время, за которое оно произошло.
|
|
8
|
+
* Пока устройство на зарядке, замеры не ведутся: зарядка сбрасывает точку отсчёта,
|
|
9
|
+
* и первое изменение после неё только задаёт новую.
|
|
10
|
+
*
|
|
11
|
+
* Battery Status API есть только в Chromium, в Safari и Firefox его нет —
|
|
12
|
+
* там класс молча ничего не делает.
|
|
13
|
+
*/
|
|
14
|
+
export declare class BatteryStats {
|
|
15
|
+
private readonly _logger;
|
|
16
|
+
private readonly _clock;
|
|
17
|
+
private _battery;
|
|
18
|
+
private _previous;
|
|
19
|
+
private _destroyed;
|
|
20
|
+
constructor(logger: StatEventCollector, clock?: BatteryClock);
|
|
21
|
+
destroy(): void;
|
|
22
|
+
private _subscribe;
|
|
23
|
+
private _handleChargingChange;
|
|
24
|
+
private _handleLevelChange;
|
|
25
|
+
}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import ActiveFeature from '../../enums/ActiveFeature';
|
|
2
|
+
import { type DebugLogger } from '../../static/Debug';
|
|
3
|
+
/** Метрики ресурсов клиента за интервал между отправками callStat */
|
|
4
|
+
export type ClientResourceReport = {
|
|
5
|
+
/** Максимум участников за интервал */
|
|
6
|
+
participants_max?: number;
|
|
7
|
+
/** Фичи, включенные в любой момент интервала */
|
|
8
|
+
active_features?: string[];
|
|
9
|
+
/** Максимальная площадь окна за интервал, в мегапикселях */
|
|
10
|
+
app_total_area_mpx_max?: number;
|
|
11
|
+
};
|
|
12
|
+
export type ClientResourceSources = {
|
|
13
|
+
getParticipantsCount: () => number;
|
|
14
|
+
getActiveFeatures: () => ActiveFeature[];
|
|
15
|
+
};
|
|
16
|
+
/**
|
|
17
|
+
* Копит ресурсные метрики между отправками callStat: репортер забирает накопленное
|
|
18
|
+
* через takeReport() и начинает копить заново.
|
|
19
|
+
*
|
|
20
|
+
* Замеряем чаще, чем отправляем, потому что нас интересует не состояние в момент отправки,
|
|
21
|
+
* а что происходило за интервал: пик участников и все фичи, которые успели поработать.
|
|
22
|
+
*/
|
|
23
|
+
export declare class ClientResourceStats {
|
|
24
|
+
private readonly _sources;
|
|
25
|
+
private readonly _debug;
|
|
26
|
+
private _timer;
|
|
27
|
+
private _participantsMax;
|
|
28
|
+
private _areaMpxMax;
|
|
29
|
+
private _features;
|
|
30
|
+
constructor(sources: ClientResourceSources, debug?: DebugLogger);
|
|
31
|
+
/** Забрать накопленное за интервал и начать копить заново */
|
|
32
|
+
takeReport(): ClientResourceReport;
|
|
33
|
+
destroy(): void;
|
|
34
|
+
private _sample;
|
|
35
|
+
/**
|
|
36
|
+
* Площадь окна в физических пикселях: CSS-пиксели умножаем на devicePixelRatio,
|
|
37
|
+
* иначе одно и то же окно на экране с ретиной и без давало бы одинаковую цифру.
|
|
38
|
+
* Приложение в вебе — это одна вкладка, суммировать нечего.
|
|
39
|
+
*/
|
|
40
|
+
private _measureAreaMpx;
|
|
41
|
+
}
|
|
@@ -4,7 +4,9 @@ import TransportTopology from '../../enums/TransportTopology';
|
|
|
4
4
|
import HangupReason from '../HangupReason';
|
|
5
5
|
import StatEventCollector from './StatEventCollector';
|
|
6
6
|
import { ApiCallStats } from './ApiCallStats';
|
|
7
|
+
import { BatteryStats } from './BatteryStats';
|
|
7
8
|
import { CallLifecycleStats } from './CallLifecycleStats';
|
|
9
|
+
import { ClientResourceSources, ClientResourceStats } from './ClientResourceStats';
|
|
8
10
|
import { CodecStatsAggregator } from './CodecStatsAggregator';
|
|
9
11
|
import { StatAggregator } from './StatAggregator';
|
|
10
12
|
import { StatPings } from './StatPings';
|
|
@@ -17,9 +19,11 @@ export declare class ConversationStats {
|
|
|
17
19
|
readonly pings: StatPings;
|
|
18
20
|
readonly signalingCommands: StatSignalingCommands;
|
|
19
21
|
readonly apiCalls: ApiCallStats;
|
|
22
|
+
readonly resources: ClientResourceStats;
|
|
23
|
+
readonly battery: BatteryStats;
|
|
20
24
|
private readonly _api;
|
|
21
25
|
private _unloading;
|
|
22
|
-
constructor(api: BaseApi, externalLogger: BaseLogger | null, getConversationId: () => string | null, getTopology: () => TransportTopology | undefined);
|
|
26
|
+
constructor(api: BaseApi, externalLogger: BaseLogger | null, getConversationId: () => string | null, getTopology: () => TransportTopology | undefined, resourceSources: ClientResourceSources);
|
|
23
27
|
/**
|
|
24
28
|
* Вызывается из pagehide-обработчика: события финиша должны пережить смерть
|
|
25
29
|
* вкладки. Сводки пингов и команд сбрасываем здесь же — destroy() их только
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { StatAggregator } from './StatAggregator';
|
|
2
|
+
/** Причина события client_requested_server_topology */
|
|
3
|
+
export declare const enum ServerTopologyReason {
|
|
4
|
+
NO_CONNECTION_TIMEOUT = "no_connection_timeout",
|
|
5
|
+
CONNECTION_FAILED = "connection_failed",
|
|
6
|
+
SUCCESS_CONNECTION = "success_connection",
|
|
7
|
+
/** Возможна на бэке, в вебе пока не поддержана */
|
|
8
|
+
NO_DATA_TIMEOUT = "no_data_timeout",
|
|
9
|
+
/** Возможна на бэке, в вебе пока не поддержана */
|
|
10
|
+
SUCCESS_AUDIO = "success_audio",
|
|
11
|
+
/** Возможна на бэке, в вебе пока не поддержана */
|
|
12
|
+
CONNECTION_ACCEPTED_FAILED = "connection_accepted_failed"
|
|
13
|
+
}
|
|
14
|
+
export declare const enum NetworkQuality {
|
|
15
|
+
GOOD = "good",
|
|
16
|
+
BAD_1 = "bad_1",
|
|
17
|
+
BAD_2 = "bad_2"
|
|
18
|
+
}
|
|
19
|
+
export type VideoEncoderChange = {
|
|
20
|
+
/** Круговая задержка, мс */
|
|
21
|
+
rtt: number;
|
|
22
|
+
/** Потери, проценты */
|
|
23
|
+
loss: number;
|
|
24
|
+
networkQuality: NetworkQuality;
|
|
25
|
+
/** mimeType исходящего видео, например video/VP8 */
|
|
26
|
+
mimeType: string | undefined;
|
|
27
|
+
source: 'camera' | 'screencast' | 'all';
|
|
28
|
+
};
|
|
29
|
+
/** Отправляет в стату решения клиента по смене топологии и настроек видеоэнкодера */
|
|
30
|
+
export declare class NetworkAdaptationStats {
|
|
31
|
+
private readonly _statAggregator;
|
|
32
|
+
constructor(statAggregator: StatAggregator | null);
|
|
33
|
+
logServerTopologyRequested(reason: ServerTopologyReason, elapsed: number): void;
|
|
34
|
+
logVideoEncoderChanged(change: VideoEncoderChange): void;
|
|
35
|
+
}
|
|
@@ -32,8 +32,9 @@ export declare class SdpStats {
|
|
|
32
32
|
/** Не смогли применить SDP собеседника */
|
|
33
33
|
logSetRemoteFailed(sdp: SdpDescription, error: unknown): void;
|
|
34
34
|
destroy(): void;
|
|
35
|
-
private _intervalSince;
|
|
36
35
|
private _logFailure;
|
|
37
36
|
private _log;
|
|
38
37
|
}
|
|
38
|
+
/** Браузер может спрятать локальный адрес за именем вида <uuid>.local, такой кандидат в стату не шлём */
|
|
39
|
+
export declare function isIpAddress(address: string): boolean;
|
|
39
40
|
export {};
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { ICallStatLog } from '../../types/PerfStatReporter';
|
|
2
2
|
import { IEventualStatLog } from '../../types/IEventualStatLog';
|
|
3
3
|
import StatEventCollector from './StatEventCollector';
|
|
4
|
+
import { ClientResourceStats } from './ClientResourceStats';
|
|
4
5
|
export declare class StatAggregator {
|
|
5
6
|
private readonly _logger;
|
|
7
|
+
private readonly _resources;
|
|
6
8
|
private readonly _eventualLogs;
|
|
7
9
|
private _lastCallStatContext;
|
|
8
|
-
constructor(logger: StatEventCollector);
|
|
10
|
+
constructor(logger: StatEventCollector, resources?: ClientResourceStats | null);
|
|
9
11
|
logCallStat(params: ICallStatLog): void;
|
|
10
12
|
/**
|
|
11
13
|
* Событие уходит с теми полями, что переданы. Без value — уходит без value.
|
|
@@ -2,7 +2,7 @@ import BaseApi from '../../abstract/BaseApi';
|
|
|
2
2
|
import BaseLogger from '../../abstract/BaseLogger';
|
|
3
3
|
import StatLog from '../../enums/StatLog';
|
|
4
4
|
import TransportTopology from '../../enums/TransportTopology';
|
|
5
|
-
type ClientStatsPayload = Record<string, string | number | boolean | undefined | null>;
|
|
5
|
+
type ClientStatsPayload = Record<string, string | string[] | number | boolean | undefined | null>;
|
|
6
6
|
export type LogClientStatsOptions = {
|
|
7
7
|
/** Время наступления события. По умолчанию — момент записи. */
|
|
8
8
|
occurredAt?: number;
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
export declare const RECORD_LIMIT = 5000;
|
|
3
3
|
/** Срок жизни события в очереди. */
|
|
4
4
|
export declare const MAX_AGE_MS: number;
|
|
5
|
-
/** Произвольный набор
|
|
6
|
-
export type StatPayload = Record<string, string | number | boolean | null>;
|
|
5
|
+
/** Произвольный набор полей события: скаляры и списки строк. */
|
|
6
|
+
export type StatPayload = Record<string, string | string[] | number | boolean | null>;
|
|
7
7
|
/** Запись очереди без сгенерированного ключа. */
|
|
8
8
|
export type StatQueueEntry = {
|
|
9
9
|
/** userId владельца события. Не может быть неизвестным. */
|
|
@@ -31,6 +31,10 @@ export default class DirectTransport extends BaseTransport {
|
|
|
31
31
|
private _lastStat;
|
|
32
32
|
private _fingerprint;
|
|
33
33
|
private _neverConnected;
|
|
34
|
+
private _connectionStartedAt;
|
|
35
|
+
private _connectionLostAt;
|
|
36
|
+
/** Запросили переход на серверную топологию, не дождавшись первого подключения p2p */
|
|
37
|
+
private _serverRequestedOnNoConnection;
|
|
34
38
|
private _serverSettings;
|
|
35
39
|
private _prevConsumerSettings;
|
|
36
40
|
private _networkLimitsForVideo;
|
|
@@ -41,6 +45,7 @@ export default class DirectTransport extends BaseTransport {
|
|
|
41
45
|
private _directStatReporter;
|
|
42
46
|
private readonly _sdpStats;
|
|
43
47
|
private readonly _peerConnectionStats;
|
|
48
|
+
private readonly _networkAdaptationStats;
|
|
44
49
|
private readonly _debug;
|
|
45
50
|
private readonly _logger;
|
|
46
51
|
private readonly _statAggregator;
|
|
@@ -8,8 +8,10 @@ export default class PerfStatReporter extends EventEmitter {
|
|
|
8
8
|
private _previousPerfStatReportTimestamp;
|
|
9
9
|
private _previousNetworkStatReportTimestamp;
|
|
10
10
|
private _previousCallStatReportTimestamp;
|
|
11
|
-
private
|
|
11
|
+
private _previousCounters;
|
|
12
12
|
private _previousRemoteInboundRtps;
|
|
13
|
+
private _previousInboundRtps;
|
|
14
|
+
private _previousOutboundRtps;
|
|
13
15
|
private _previousCandidatePair;
|
|
14
16
|
private _screenShareStats;
|
|
15
17
|
private _signaling;
|
|
@@ -24,7 +26,9 @@ export default class PerfStatReporter extends EventEmitter {
|
|
|
24
26
|
private reportNetworkStats;
|
|
25
27
|
private _reportCallStats;
|
|
26
28
|
private _reportCandidatePair;
|
|
29
|
+
private _calculateRemotePacketLoss;
|
|
27
30
|
private _calculatePacketLoss;
|
|
31
|
+
private _calculateOutboundDeltas;
|
|
28
32
|
private _handleScreenSharingStat;
|
|
29
33
|
private _handleTransportStateChanged;
|
|
30
34
|
}
|
|
@@ -83,6 +83,8 @@ export default class ServerTransport extends BaseTransport {
|
|
|
83
83
|
private _startSettingsInterval;
|
|
84
84
|
private _stopSettingsInterval;
|
|
85
85
|
private _collectStat;
|
|
86
|
+
/** mid потока быстрой шары, чтобы отделить его от камеры в статистике */
|
|
87
|
+
private _getScreenShareMid;
|
|
86
88
|
private _reportStats;
|
|
87
89
|
private _detectStaleTracks;
|
|
88
90
|
private _allocateConsumer;
|
|
@@ -50,8 +50,9 @@ export declare class Transport extends EventEmitter {
|
|
|
50
50
|
private readonly _codecStatsAggregator;
|
|
51
51
|
private readonly _onFirstMediaSent;
|
|
52
52
|
private _firstMediaSentProbeStopped;
|
|
53
|
-
private
|
|
54
|
-
|
|
53
|
+
private readonly _isParticipantAccepted;
|
|
54
|
+
private readonly _vadGate;
|
|
55
|
+
constructor(topology: TransportTopology, signaling: BaseSignaling, mediaSource: MediaSource, serverSettings: ServerSettings, debug?: DebugLogger, logger?: StatEventCollector | null, statAggregator?: StatAggregator | null, codecStatsAggregator?: CodecStatsAggregator | null, onFirstMediaSent?: (() => void) | null, isParticipantAccepted?: (participantId: ParticipantId) => boolean);
|
|
55
56
|
updateSettings(settings: ServerSettings): void;
|
|
56
57
|
updateStatisticsInterval(): void;
|
|
57
58
|
allocate(participantId: ParticipantId, isMaster?: boolean): void;
|
|
@@ -97,8 +98,8 @@ export declare class Transport extends EventEmitter {
|
|
|
97
98
|
private _onAnimojiStream;
|
|
98
99
|
/** Обработчик, досылающий MediaSourceEvent.SOURCE_CHANGED событие до аллокации транспортов */
|
|
99
100
|
private _onAnimojiStatus;
|
|
100
|
-
private _createVad;
|
|
101
101
|
private _updateVadTrack;
|
|
102
|
+
private _updateVadParticipants;
|
|
102
103
|
private _createAnimojiTransport;
|
|
103
104
|
private _removeAnimojiTransport;
|
|
104
105
|
getStreamWaitingTimeMs(streamId: string, targetRtpTimestamp: number): number;
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import TransportTopology from '../../enums/TransportTopology';
|
|
2
|
+
import { type DebugLogger } from '../../static/Debug';
|
|
3
|
+
/**
|
|
4
|
+
* Включает VAD только в серверном звонке с transparent audio, когда собеседников больше,
|
|
5
|
+
* чем треков transparent audio. Тогда сервер отдаёт треки самым громким участникам,
|
|
6
|
+
* и VAD не даёт шуму молчащего занять трек. Себя не считаем: сервер выбирает из остальных.
|
|
7
|
+
*
|
|
8
|
+
* Модель загружается при первом включении. Дальше VAD только ставится на паузу,
|
|
9
|
+
* чтобы не загружать модель заново при каждом входе и выходе участника.
|
|
10
|
+
*/
|
|
11
|
+
export declare class VadGate {
|
|
12
|
+
private _topology;
|
|
13
|
+
private _participantsCount;
|
|
14
|
+
private readonly _taTrackIds;
|
|
15
|
+
private _sendTrack;
|
|
16
|
+
private _controller;
|
|
17
|
+
private _enabled;
|
|
18
|
+
private _updateTimer;
|
|
19
|
+
private _initFailed;
|
|
20
|
+
private _destroyed;
|
|
21
|
+
private readonly _debug;
|
|
22
|
+
constructor(topology: TransportTopology, debug?: DebugLogger);
|
|
23
|
+
setTopology(topology: TransportTopology): void;
|
|
24
|
+
/** Число собеседников в звонке без локального участника */
|
|
25
|
+
setParticipantsCount(count: number): void;
|
|
26
|
+
addRemoteTrack(trackId: string): void;
|
|
27
|
+
removeRemoteTrack(trackId: string): void;
|
|
28
|
+
/** При закрытии серверного транспорта события об удалении треков не приходят */
|
|
29
|
+
resetRemoteTracks(): void;
|
|
30
|
+
setSendTrack(track: MediaStreamTrack | null): void;
|
|
31
|
+
destroy(): void;
|
|
32
|
+
private _isAllowed;
|
|
33
|
+
private _update;
|
|
34
|
+
private _applyConditions;
|
|
35
|
+
private _createController;
|
|
36
|
+
private _applyState;
|
|
37
|
+
}
|
package/default/Api.d.ts
CHANGED
|
@@ -10,6 +10,7 @@ import PushData from '../types/PushData';
|
|
|
10
10
|
export default class Api extends BaseApi {
|
|
11
11
|
private _uuid;
|
|
12
12
|
private _idCache;
|
|
13
|
+
constructor();
|
|
13
14
|
private _callUnsafe;
|
|
14
15
|
protected _call(method: string, data?: any, noSession?: boolean, allowReauthorize?: boolean): Promise<any>;
|
|
15
16
|
userId(participantId: ParticipantId): ExternalParticipantId | null;
|
|
@@ -22,6 +23,8 @@ export default class Api extends BaseApi {
|
|
|
22
23
|
private _removeCachedAnonymLogin;
|
|
23
24
|
private _reauthorize;
|
|
24
25
|
private _applyAnonymLogin;
|
|
26
|
+
/** Кладёт в кеш id соответствие своего участника из auth.anonymLogin */
|
|
27
|
+
private _cacheSelfExternalId;
|
|
25
28
|
private _buildClientStatsData;
|
|
26
29
|
/** Ошибки по отдельным событиям логируются, но батч трактуется целиком. */
|
|
27
30
|
private _reportClientStatsItemErrors;
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Фичи, активные во время звонка. Уходят в метрику active_features,
|
|
3
|
+
* чтобы по ним разрезать остальную статистику: сколько фризов при включённой камере,
|
|
4
|
+
* какой битрейт при шаре и так далее.
|
|
5
|
+
*
|
|
6
|
+
* Здесь только то, что реально включено прямо сейчас, а не то, что разрешено настройками:
|
|
7
|
+
* иначе фича попадала бы в метрику у всех, кому ее просто не запретили.
|
|
8
|
+
*
|
|
9
|
+
* Сервер принимает только имена из своего списка, незнакомые отбрасывает с ошибкой.
|
|
10
|
+
* Новое имя добавляем сюда после того, как его добавят на сервере.
|
|
11
|
+
*/
|
|
12
|
+
declare enum ActiveFeature {
|
|
13
|
+
MICROPHONE = "MICROPHONE",
|
|
14
|
+
CAMERA = "CAMERA",
|
|
15
|
+
/** Любая шара экрана, в том числе быстрая */
|
|
16
|
+
SCREEN = "SCREEN",
|
|
17
|
+
ANIMOJI = "ANIMOJI"
|
|
18
|
+
}
|
|
19
|
+
export default ActiveFeature;
|
package/enums/Stat.d.ts
CHANGED
|
@@ -37,6 +37,8 @@ declare enum Stat {
|
|
|
37
37
|
SDP_SET_REMOTE_ROLLBACK = "sdp_set_remote_rollback",
|
|
38
38
|
SDP_GENERATED = "sdp_generated",
|
|
39
39
|
SDP_RECEIVED = "sdp_received",
|
|
40
|
+
CLIENT_REQUESTED_SERVER_TOPOLOGY = "client_requested_server_topology",
|
|
41
|
+
VIDEO_ENCODER_CHANGED_BY_NETWORK_ADAPTER = "video_encoder_changed_by_network_adapter",
|
|
40
42
|
WEBSOCKET_CONNECTED = "websocket_connected",
|
|
41
43
|
WEBSOCKET_RECONNECTED = "websocket_reconnected",
|
|
42
44
|
WEBSOCKET_FAILED_PINGS = "websocket_failed_pings",
|
package/package.json
CHANGED
package/static/AuthData.d.ts
CHANGED
|
@@ -1,9 +1,16 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ExternalParticipantId } from '../types/ExternalId';
|
|
2
|
+
import type { OkUserId, ParticipantId } from '../types/Participant';
|
|
3
|
+
/** Свой участник и его внешний id */
|
|
4
|
+
export type SelfExternalId = {
|
|
5
|
+
participantId: ParticipantId;
|
|
6
|
+
externalId: ExternalParticipantId;
|
|
7
|
+
};
|
|
2
8
|
export default abstract class AuthData {
|
|
3
9
|
private static _sessionKey;
|
|
4
10
|
private static _sessionSecretKey;
|
|
5
11
|
private static _accessToken;
|
|
6
12
|
private static _userId;
|
|
13
|
+
private static _selfExternalId;
|
|
7
14
|
private static _reauthorizePromise;
|
|
8
15
|
static get sessionKey(): string | undefined;
|
|
9
16
|
static set sessionKey(value: string | undefined);
|
|
@@ -13,6 +20,9 @@ export default abstract class AuthData {
|
|
|
13
20
|
static set accessToken(value: string | undefined);
|
|
14
21
|
static get userId(): OkUserId | null;
|
|
15
22
|
static set userId(value: OkUserId | null);
|
|
23
|
+
/** Свой участник и его внешний id из ответа auth.anonymLogin */
|
|
24
|
+
static get selfExternalId(): SelfExternalId | null;
|
|
25
|
+
static set selfExternalId(value: SelfExternalId | null);
|
|
16
26
|
static isEmpty(): boolean;
|
|
17
27
|
/**
|
|
18
28
|
* Дедуплицирует одновременные попытки реавторизации из разных инстансов Api.
|