@vkontakte/calls-sdk 2.8.12-dev.c60cf16f.0 → 2.8.12-dev.c8b26761.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.
@@ -1,4 +1,4 @@
1
- import Conversation from './Conversation';
1
+ import type Conversation from './conversation';
2
2
  import MediaSettings from '../types/MediaSettings';
3
3
  export interface HoldableConversation extends Conversation {
4
4
  id: string;
@@ -6,8 +6,11 @@ export interface HoldableConversation extends Conversation {
6
6
  }
7
7
  export declare class CallRegistry {
8
8
  private _conversations;
9
+ private _reserved;
9
10
  private _activeId;
10
11
  private _mutex;
12
+ private _pendingRemovals;
13
+ reserve(id: string): void;
11
14
  add(conversation: HoldableConversation): void;
12
15
  remove(id: string | null): void;
13
16
  get(id: string): HoldableConversation | undefined;
@@ -21,6 +24,7 @@ export declare class CallRegistry {
21
24
  setHold(id: string): Promise<void>;
22
25
  switchCall(id: string): Promise<void>;
23
26
  clear(): void;
27
+ private _flushPendingRemovals;
24
28
  }
25
29
  declare const callRegistry: CallRegistry;
26
30
  export { callRegistry };
@@ -1,6 +1,7 @@
1
1
  import { ExternalId, ExternalParticipantId } from '../types/ExternalId';
2
2
  import { CompositeUserId, OkUserId, ParticipantId } from '../types/Participant';
3
3
  export declare class ExternalIdCache {
4
+ private static _normalizeType;
4
5
  private _okIdToExternalId;
5
6
  private _externalIdToOkId;
6
7
  private _decorativeIdToInitialId;
@@ -1,33 +1,34 @@
1
1
  import type { IEffect } from '@vkontakte/calls-video-effects';
2
2
  import type { RGBTuple } from '@vkontakte/calls-vmoji';
3
- import BaseApi from '../abstract/BaseApi';
4
- import BaseLogger from '../abstract/BaseLogger';
5
- import { AddParticipantParams } from '../abstract/BaseSignaling';
6
- import ConversationFeature from '../enums/ConversationFeature';
7
- import ConversationOption from '../enums/ConversationOption';
8
- import MediaOption from '../enums/MediaOption';
9
- import UpdateDisplayLayoutErrorReason from '../enums/UpdateDisplayLayoutErrorReason';
10
- import UserRole from '../enums/UserRole';
11
- import UserType from '../enums/UserType';
12
- import { DebugMessageType } from '../static/Debug';
13
- import { JSONObject } from '../static/Json';
14
- import { IAsrStartParams, IAsrStopParams } from '../types/Asr';
15
- import { AudienceModeHandsResponse } from '../types/AudienceMode';
16
- import { ConversationData, ConversationOnJoinParams, ConversationOnStartParams } from '../types/Conversation';
17
- import { ExternalId, ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk } from '../types/ExternalId';
18
- import MediaModifiers from '../types/MediaModifiers';
19
- import MediaSettings, { IVideoDimentions } from '../types/MediaSettings';
20
- import { IAddMovieParams, IUpdateMovieData } from '../types/MovieShare';
21
- import MuteStates from '../types/MuteStates';
22
- import { CompositeUserId, IGetParticipantsParameters, ParticipantId, ParticipantStateData } from '../types/Participant';
23
- import { DisplayLayoutRequest, ParticipantLayout } from '../types/ParticipantLayout';
24
- import { ParticipantListChunkParameters } from '../types/ParticipantListChunk';
25
- import ParticipantPriority from '../types/ParticipantPriority';
26
- import { ParticipantStreamDescription } from '../types/ParticipantStreamDescription';
27
- import { ScreenCaptureSettings } from '../types/ScreenCaptureSettings';
28
- import SignalingMessage from '../types/SignalingMessage';
29
- import { WaitingHallResponse } from '../types/WaitingHall';
30
- import EventEmitter from './EventEmitter';
3
+ import BaseApi from '../../abstract/BaseApi';
4
+ import BaseLogger from '../../abstract/BaseLogger';
5
+ import { AddParticipantParams } from '../../abstract/BaseSignaling';
6
+ import ConversationFeature from '../../enums/ConversationFeature';
7
+ import ConversationOption from '../../enums/ConversationOption';
8
+ import MediaOption from '../../enums/MediaOption';
9
+ import UpdateDisplayLayoutErrorReason from '../../enums/UpdateDisplayLayoutErrorReason';
10
+ import UserRole from '../../enums/UserRole';
11
+ import UserType from '../../enums/UserType';
12
+ import { DebugMessageType } from '../../static/Debug';
13
+ import { JSONObject } from '../../static/Json';
14
+ import { IAsrStartParams, IAsrStopParams } from '../../types/Asr';
15
+ import { AudienceModeHandsResponse } from '../../types/AudienceMode';
16
+ import { ConversationData, ConversationOnJoinParams, ConversationOnStartParams } from '../../types/Conversation';
17
+ import { ExternalId, ExternalParticipant, ExternalParticipantId, ExternalParticipantListChunk } from '../../types/ExternalId';
18
+ import type { FastHangupHandler, HangupParams } from '../../types/FastHangup';
19
+ import MediaModifiers from '../../types/MediaModifiers';
20
+ import MediaSettings, { IVideoDimentions } from '../../types/MediaSettings';
21
+ import { IAddMovieParams, IUpdateMovieData } from '../../types/MovieShare';
22
+ import MuteStates from '../../types/MuteStates';
23
+ import { CompositeUserId, IGetParticipantsParameters, OkUserId, ParticipantId, ParticipantStateData } from '../../types/Participant';
24
+ import { DisplayLayoutRequest, ParticipantLayout } from '../../types/ParticipantLayout';
25
+ import { ParticipantListChunkParameters } from '../../types/ParticipantListChunk';
26
+ import ParticipantPriority from '../../types/ParticipantPriority';
27
+ import { ParticipantStreamDescription } from '../../types/ParticipantStreamDescription';
28
+ import { ScreenCaptureSettings } from '../../types/ScreenCaptureSettings';
29
+ import SignalingMessage from '../../types/SignalingMessage';
30
+ import { WaitingHallResponse } from '../../types/WaitingHall';
31
+ import EventEmitter from '../EventEmitter';
31
32
  export default class Conversation extends EventEmitter {
32
33
  private readonly _api;
33
34
  private readonly _signaling;
@@ -42,7 +43,6 @@ export default class Conversation extends EventEmitter {
42
43
  private _waitingHallHoldPending;
43
44
  private _participantState;
44
45
  private _participants;
45
- private _pendingParticipants;
46
46
  private _directTransportIsMaster?;
47
47
  private _transport;
48
48
  private _debugInfo;
@@ -57,9 +57,13 @@ export default class Conversation extends EventEmitter {
57
57
  private _serverSettings;
58
58
  private _serverTimeOffset;
59
59
  private _delayedHangup;
60
+ private _onFastHangup?;
61
+ private _hangupEmitted;
62
+ private _hangupPromise;
60
63
  private _abortController;
61
64
  private _registeredPeerReceived;
62
65
  private _calleeUnavailableTimer;
66
+ private _reservedId;
63
67
  private readonly _onUnload;
64
68
  private readonly _audioOutput;
65
69
  private readonly _stats;
@@ -75,7 +79,7 @@ export default class Conversation extends EventEmitter {
75
79
  private readonly _statFirstMediaReceived;
76
80
  constructor(api: BaseApi, externalLogger: BaseLogger | null);
77
81
  static current(): Conversation | null;
78
- static hangupAfterInit(): void;
82
+ static hangupAfterInit(onFastHangup?: FastHangupHandler): void;
79
83
  static id(): string | null;
80
84
  get id(): string;
81
85
  get externalId(): ExternalParticipantId | undefined;
@@ -86,12 +90,14 @@ export default class Conversation extends EventEmitter {
86
90
  static debugMessageWithContext(type: DebugMessageType, conversationId: string, ...args: any[]): boolean;
87
91
  static getSyncedTime(): number;
88
92
  get debugSessionId(): string | null;
93
+ getCachedRawOkIdByExternalId(externalId: ExternalId): OkUserId | null;
94
+ private _buildInternalParams;
89
95
  onStart({ opponentIds, opponentType, mediaOptions, payload, joiningAllowed, requireAuthToJoin, onlyAdminCanShareMovie, externalIds, onFastStart, conversationId, }: ConversationOnStartParams): Promise<ConversationData>;
90
96
  onJoin(joinArgs: ConversationOnJoinParams): Promise<ConversationData>;
91
97
  private _onJoinPart2;
92
98
  private _extractExternalRooms;
93
99
  private _extractExternalRoomsData;
94
- onPush(conversationId: string, type?: UserType, peerId?: number, conversationParams?: string, wsEndpoint?: string): Promise<void>;
100
+ onPush(conversationId: string, type?: UserType, peerId?: number, conversationParams?: string, wsEndpoint?: string, userId?: number): Promise<void>;
95
101
  private _isInWaitingHall;
96
102
  private _isWaitForAdmin;
97
103
  private _isRestricted;
@@ -101,8 +107,8 @@ export default class Conversation extends EventEmitter {
101
107
  private _getMainRoomParticipants;
102
108
  private _decodeExternalConversationParams;
103
109
  accept(mediaOptions: MediaOption[]): Promise<ConversationData>;
104
- decline(): Promise<void>;
105
- hangup(): Promise<void>;
110
+ decline(params?: HangupParams): Promise<void>;
111
+ hangup(params?: HangupParams): Promise<void>;
106
112
  addParticipant(participantIds: ExternalId[], params?: AddParticipantParams): Promise<void>;
107
113
  addParticipantLegacy(participantIds: CompositeUserId[], params?: AddParticipantParams): Promise<void>;
108
114
  removeParticipant(participantId: CompositeUserId, ban?: boolean): Promise<void>;
@@ -110,8 +116,12 @@ export default class Conversation extends EventEmitter {
110
116
  updateStatisticsInterval(): void;
111
117
  private _openTransport;
112
118
  private _allocateParticipantTransport;
119
+ private _cleanupRegistry;
120
+ private _emitHangupOnce;
113
121
  private _close;
114
- destroy(): Promise<void>;
122
+ private _sendHangup;
123
+ destroy(): void;
124
+ private _destroy;
115
125
  private _getConversationParams;
116
126
  private _setConversationParams;
117
127
  private _buildSignalingEndpoint;
@@ -153,6 +163,7 @@ export default class Conversation extends EventEmitter {
153
163
  private _getExistedParticipantByIdOrCreate;
154
164
  private _getExternalIdByParticipantId;
155
165
  private _getExternalIdsByOkIdsFromCache;
166
+ private _getOrCacheExternalIdByCompositeId;
156
167
  private _registerParticipantAndSetMarkersIfChunkEnabled;
157
168
  private _warnParticipantNotInConversation;
158
169
  private _denormalizeMarkers;
@@ -195,7 +206,7 @@ export default class Conversation extends EventEmitter {
195
206
  private _cleanupTransportForHold;
196
207
  private _cleanupSpeakerDetector;
197
208
  private _cleanupSpecListener;
198
- private _cleanupSignaling;
209
+ private _disposeSignaling;
199
210
  private _onAddParticipant;
200
211
  private _onRemoveParticipant;
201
212
  changeDevice(kind: MediaDeviceKind): Promise<void>;
@@ -228,7 +239,7 @@ export default class Conversation extends EventEmitter {
228
239
  private _getWaitingForPromotionStatus;
229
240
  putHandsDown(): Promise<void>;
230
241
  requestKeyFrame(participantStreamDescription: ParticipantStreamDescription): Promise<void | SignalingMessage>;
231
- requestTestMode(consumerCommand: string, producerCommand: string): Promise<void>;
242
+ requestTestMode(consumerCommand: string, producerCommand: string): Promise<void | SignalingMessage>;
232
243
  updateDisplayLayout(layouts: ParticipantLayout[]): Promise<void>;
233
244
  requestDisplayLayout(requests: DisplayLayoutRequest[]): Promise<void>;
234
245
  feedback(key: string): Promise<SignalingMessage>;
@@ -357,7 +368,7 @@ export default class Conversation extends EventEmitter {
357
368
  private _onRecordInfo;
358
369
  private _onStopRecordInfo;
359
370
  private _changePinnedParticipantForRoom;
360
- _changeRecordInfoForRoom(): Promise<void>;
371
+ _changeRecordInfoForRoom(): void;
361
372
  private _changeAsrInfoForRoom;
362
373
  private _changeUrlSharingInfoForRoom;
363
374
  private _onParticipantAnimojiChanged;
@@ -432,7 +443,6 @@ export default class Conversation extends EventEmitter {
432
443
  private _setMuteStatesForRoomId;
433
444
  private _forceOpenTransportForAloneInCall;
434
445
  private _registerParticipant;
435
- private _getParticipants;
436
446
  private _getParticipant;
437
447
  }
438
448
  declare function _resetPendingInstance(): void;
@@ -0,0 +1,148 @@
1
+ import { FetchMock } from 'vitest-fetch-mock';
2
+ import { Mock } from 'vitest';
3
+ import { Client, Server } from 'mock-socket';
4
+ import { ISharedMovieInfo, OkUserId } from '../../CallsSDK';
5
+ import Api from '../../default/Api';
6
+ import CallDirection from '../../enums/CallDirection';
7
+ import ConversationOption from '../../enums/ConversationOption';
8
+ import TransportState from '../../enums/TransportState';
9
+ import TransportTopology from '../../enums/TransportTopology';
10
+ import { ParticipantStatus } from '../../static/External';
11
+ import { ExternalParticipantId } from '../../types/ExternalId';
12
+ import { ParticipantListMarkers } from '../../types/Participant';
13
+ import SignalingMessage from '../../types/SignalingMessage';
14
+ import Conversation from './Conversation';
15
+ declare function createParams(): {
16
+ apiKey: string;
17
+ apiEnv: string;
18
+ onLocalStream: Mock<import("@vitest/spy").Procedure>;
19
+ onLocalStatus: Mock<import("@vitest/spy").Procedure>;
20
+ onConversation: Mock<import("@vitest/spy").Procedure>;
21
+ onLocalSharedMovieInfo: Mock<import("@vitest/spy").Procedure>;
22
+ onRemoteSharedMovieInfo: Mock<import("@vitest/spy").Procedure>;
23
+ onRemoteSharedUrl: Mock<import("@vitest/spy").Procedure>;
24
+ onCallState: Mock<import("@vitest/spy").Procedure>;
25
+ onOptionsChanged: Mock<import("@vitest/spy").Procedure>;
26
+ onPinnedParticipant: Mock<import("@vitest/spy").Procedure>;
27
+ onRemoteMediaSettings: Mock<import("@vitest/spy").Procedure>;
28
+ onRemoteParticipantState: Mock<import("@vitest/spy").Procedure>;
29
+ onLocalPin: Mock<import("@vitest/spy").Procedure>;
30
+ onDebugMessage: Mock<import("@vitest/spy").Procedure>;
31
+ onHangup: Mock<import("@vitest/spy").Procedure>;
32
+ onRemoteRemoved: Mock<import("@vitest/spy").Procedure>;
33
+ onConversationParticipantListChunk: Mock<import("@vitest/spy").Procedure>;
34
+ onRoomParticipantsUpdated: Mock<import("@vitest/spy").Procedure>;
35
+ onChatRoomUpdated: Mock<import("@vitest/spy").Procedure>;
36
+ onRemoteStatus: Mock<import("@vitest/spy").Procedure>;
37
+ onSpeakerChanged: Mock<import("@vitest/spy").Procedure>;
38
+ };
39
+ export type ConversationTestParams = ReturnType<typeof createParams>;
40
+ export type ConversationTestTools = {
41
+ readonly endpointURL: string;
42
+ readonly fetchMocker: FetchMock;
43
+ readonly params: ConversationTestParams;
44
+ readonly server: Server;
45
+ readonly wsBaseURL: string;
46
+ createConnectionMessage(data?: Partial<SignalingMessage.Connection>): SignalingMessage.Connection;
47
+ createConversation(options?: {
48
+ api?: Api;
49
+ }): Conversation;
50
+ createExternalIdMock(id: string, data?: Partial<ExternalParticipantId>): ExternalParticipantId;
51
+ createMarkers(data?: Partial<ParticipantListMarkers>): ParticipantListMarkers;
52
+ createMovieShareInfo(initiatorId: string, data?: Partial<ISharedMovieInfo> | null): ISharedMovieInfo;
53
+ createParticipant(id: number, data?: Partial<SignalingMessage.Participant>): SignalingMessage.Participant & Required<Pick<SignalingMessage.Participant, 'markers'>>;
54
+ createParticipantWithMarkers(id: number, data?: Partial<SignalingMessage.Participant>): SignalingMessage.Participant & Required<Pick<SignalingMessage.Participant, 'markers'>>;
55
+ createPromoteParticipantMessage(): SignalingMessage.PromoteParticipant;
56
+ createSignallingConversation(okUserId: OkUserId, peerId: SignalingMessage.PeerId, data?: Partial<SignalingMessage.Conversation>): SignalingMessage.Conversation;
57
+ createWaitingHallConversationData(): ReturnType<typeof createWaitingHallConversationData>;
58
+ emitMessageOnConnection(wsServer: Server, message?: SignalingMessage.Connection): void;
59
+ enableParticipantListChunk(): void;
60
+ expectRemoteStatus(status: ParticipantStatus, participantId?: string): Promise<void>;
61
+ expectRemoteStatusCall(status: ParticipantStatus, participantId?: string): void;
62
+ forgetConversation(conversation: Conversation): void;
63
+ getActiveSocket(wsServer: Server): Client;
64
+ hasRemoteStatusCall(status: ParticipantStatus, participantId?: string): boolean;
65
+ isCapabilityEnabled(predicateIndex: number, wsServer: Server): boolean;
66
+ parseUrlSearch(search: string): Record<string, string>;
67
+ resetRemoteStatusCallbacks(): void;
68
+ respondOnGetParticipantListChunkWith(data: Partial<SignalingMessage.ParticipantListChunk>): void;
69
+ sendAcceptedCall(participant: SignalingMessage.Participant): void;
70
+ sendHungup(participant: SignalingMessage.Participant): void;
71
+ sendSessionState(participant: SignalingMessage.Participant | number, connected: boolean, data?: Partial<SignalingMessage.SessionState>): void;
72
+ setApiAuth(data?: {
73
+ sessionKey?: string;
74
+ sessionSecretKey?: string;
75
+ }): void;
76
+ setTransportState(conversation: Conversation, state: TransportState): void;
77
+ socketRespondWith(socket: Client, command: string, response: SignalingMessage): void;
78
+ socketSendNotification(socket: Client, notification: string, response?: SignalingMessage): void;
79
+ startConversation(message?: SignalingMessage.Connection): Promise<Conversation>;
80
+ startConversationWithParticipants(participants: SignalingMessage.Participant[], peerId?: SignalingMessage.PeerId): Promise<Conversation>;
81
+ startConversationWithRemoteParticipant(remoteParticipantData?: Partial<SignalingMessage.Participant>): Promise<{
82
+ conversation: Conversation;
83
+ meParticipant: SignalingMessage.Participant;
84
+ remoteParticipant: SignalingMessage.Participant;
85
+ }>;
86
+ stubApiRequest(endpoint: string, method: string, data: object): void;
87
+ waitFor(fn: () => Promise<boolean> | boolean, message?: string, timeout?: number): Promise<true>;
88
+ flushSdkCallbacks(): Promise<null>;
89
+ };
90
+ export declare function defineConversationTests(name: string, defineTests: (tools: ConversationTestTools) => void): void;
91
+ export declare function createExternalIdMock(id: string, data?: Partial<ExternalParticipantId>): ExternalParticipantId;
92
+ export declare function enableParticipantListChunk(): void;
93
+ export declare function setApiAuth(data?: {
94
+ sessionKey?: string;
95
+ sessionSecretKey?: string;
96
+ }): void;
97
+ export declare function setTransportState(conversation: Conversation, state: TransportState): void;
98
+ export declare function socketRespondWith(socket: Client, command: string, response: SignalingMessage): void;
99
+ export declare function socketSendNotification(socket: Client, notification: string, response?: SignalingMessage): void;
100
+ export declare function createWaitingHallConversationData(): {
101
+ acceptTime: null;
102
+ asrInfo: null;
103
+ asrInfoByRoom: Map<any, any>;
104
+ audienceMode: boolean;
105
+ chatId: null;
106
+ compositeUserId: string;
107
+ concurrent: boolean;
108
+ direction: CallDirection;
109
+ externalId: ExternalParticipantId;
110
+ features: never[];
111
+ featuresPerRole: null;
112
+ id: string;
113
+ mediaModifiers: {
114
+ denoise: boolean;
115
+ denoiseAnn: boolean;
116
+ };
117
+ muteStates: Map<any, any>;
118
+ muteStatesPersonal: {};
119
+ needRate: boolean;
120
+ networkRating: number;
121
+ observer: boolean;
122
+ options: ConversationOption[];
123
+ participantsLimit: number;
124
+ pinnedParticipantIdByRoom: Map<any, any>;
125
+ recordsInfoByRoom: Map<any, any>;
126
+ restricted: boolean;
127
+ roles: never[];
128
+ roomId: number | null;
129
+ topology: TransportTopology;
130
+ urlSharingInfoByRoom: Map<any, any>;
131
+ userId: number;
132
+ waitForAdmin: boolean;
133
+ waitingHall: boolean;
134
+ };
135
+ export declare function createPromoteParticipantMessage(): SignalingMessage.PromoteParticipant;
136
+ export declare function emitMessageOnConnection(wsServer: Server, message?: SignalingMessage.Connection): void;
137
+ export declare function getActiveSocket(wsServer: Server): Client;
138
+ export declare function isCapabilityEnabled(predicateIndex: number, wsServer: Server): boolean;
139
+ export declare function parseUrlSearch(search: string): Record<string, string>;
140
+ export declare function flushSdkCallbacks(): Promise<null>;
141
+ export declare function waitFor(fn: () => Promise<boolean> | boolean, message?: string, timeout?: number): Promise<true>;
142
+ export declare function createSignallingConversation(okUserId: OkUserId, peerId: SignalingMessage.PeerId, data?: Partial<SignalingMessage.Conversation>): SignalingMessage.Conversation;
143
+ export declare function createConnectionMessage(data?: Partial<SignalingMessage.Connection>): SignalingMessage.Connection;
144
+ export declare function createParticipant(id: number, data?: Partial<SignalingMessage.Participant>): SignalingMessage.Participant & Required<Pick<SignalingMessage.Participant, 'markers'>>;
145
+ export declare function createParticipantWithMarkers(id: number, data?: Partial<SignalingMessage.Participant>): SignalingMessage.Participant & Required<Pick<SignalingMessage.Participant, 'markers'>>;
146
+ export declare function createMarkers(data?: Partial<ParticipantListMarkers>): ParticipantListMarkers;
147
+ export declare function createMovieShareInfo(initiatorId: string, data?: Partial<ISharedMovieInfo> | null): ISharedMovieInfo;
148
+ export {};
@@ -1,3 +1,3 @@
1
- import ConversationResponse from '../types/ConversationResponse';
1
+ import ConversationResponse from '../../types/ConversationResponse';
2
2
  export type ConversationResponseSource = 'startConversation' | 'joinConversation' | 'joinConversationByLink' | 'fastStart' | 'fastJoin';
3
3
  export declare function assertValidConversationResponse(response: ConversationResponse | null | undefined, source: ConversationResponseSource): void;
@@ -1,11 +1,11 @@
1
- import BaseApi from '../abstract/BaseApi';
2
- import type { DebugLogger } from '../static/Debug';
3
- import { DisplayLayoutRequest, ParticipantLayout } from '../types/ParticipantLayout';
4
- import { Participant, ParticipantId } from '../types/Participant';
1
+ import BaseApi from '../../abstract/BaseApi';
2
+ import type { DebugLogger } from '../../static/Debug';
3
+ import { DisplayLayoutRequest, ParticipantLayout } from '../../types/ParticipantLayout';
4
+ import { Participant, ParticipantId } from '../../types/Participant';
5
5
  type DisplayLayoutRequesterParams = {
6
6
  api: BaseApi;
7
7
  debug: DebugLogger;
8
- getParticipants: () => Promise<Record<ParticipantId, Participant>>;
8
+ getParticipants: () => Record<ParticipantId, Participant>;
9
9
  isMe: (participantId: ParticipantId) => boolean;
10
10
  updateDisplayLayout: (layouts: ParticipantLayout[]) => Promise<void>;
11
11
  };
@@ -0,0 +1 @@
1
+ export { default } from './Conversation';
@@ -0,0 +1,11 @@
1
+ export type SemanticCallFinishReason = 'hangup' | 'canceled' | 'rejected' | 'busy' | 'missed' | 'timeout' | 'another_device' | 'removed' | 'banned' | 'initially_closed' | 'call_timeout' | 'socket_closed' | 'killed' | 'killed_without_delete' | 'obsolete_client' | 'unavailable';
2
+ export type ClassifiedCallFinish = {
3
+ reason: SemanticCallFinishReason;
4
+ string_value?: string;
5
+ } | {
6
+ reason: 'error';
7
+ string_value: string;
8
+ } | {
9
+ reason: 'failed';
10
+ };
11
+ export declare function classifyCallFinish(error: unknown): ClassifiedCallFinish;
@@ -1,4 +1,3 @@
1
- import HangupReason from '../HangupReason';
2
1
  import StatsLogger from '../StatsLogger';
3
2
  export type CallLifecycleSource = 'outgoing' | 'incoming' | 'join' | 'anonym_join';
4
3
  export interface CallLifecycleInitializationParams {
@@ -15,9 +14,7 @@ export declare class CallLifecycleStats {
15
14
  private _conversationId;
16
15
  private _callStartLabel;
17
16
  private _lifecycleStartedAtMonotonic;
18
- private _warmupStartedAtMonotonic;
19
17
  private _pendingEvents;
20
- private _warmupCompleted;
21
18
  private _callStarted;
22
19
  private _accepted;
23
20
  private _firstMediaSent;
@@ -28,13 +25,11 @@ export declare class CallLifecycleStats {
28
25
  get terminated(): boolean;
29
26
  markInitializationStarted({ source, conversationId }: CallLifecycleInitializationParams): void;
30
27
  bindConversationId(conversationId: string): void;
31
- markWarmupStarted(): void;
32
- markWarmupCompleted(): void;
33
28
  markCallStarted(): void;
34
29
  markOutgoingAccepted(): void;
35
30
  markIncomingAccepted(concurrent: boolean): void;
36
31
  markFirstMediaSent(): void;
37
- markFinished(reason: HangupReason): void;
32
+ markFinished(reason: unknown): void;
38
33
  markTerminated(): void;
39
34
  destroy(): void;
40
35
  private _canRecord;
@@ -57,6 +57,7 @@ export default class DirectTransport extends BaseTransport {
57
57
  private _disposePeerConnection;
58
58
  setAnimojiTransport(receiver: AnimojiReceiver, sender: AnimojiSender): void;
59
59
  close(error?: Error): void;
60
+ private _finishClose;
60
61
  private _setState;
61
62
  private _onSignalingNotification;
62
63
  private _handleTransmittedData;
@@ -43,6 +43,7 @@ export default class ServerTransport extends BaseTransport {
43
43
  private _producerSessionId;
44
44
  private _newAudioShareTrack;
45
45
  private _simulcastInfo;
46
+ private _isSimulcastNegotiated;
46
47
  private readonly _debug;
47
48
  private readonly _logger;
48
49
  private readonly _statAggregator;
package/default/Api.d.ts CHANGED
@@ -7,12 +7,11 @@ import { ExternalId, ExternalParticipantId, ExternalUserId } from '../types/Exte
7
7
  import { CompositeUserId, OkUserId, ParticipantId } from '../types/Participant';
8
8
  import PushData from '../types/PushData';
9
9
  export default class Api extends BaseApi {
10
- private _userId;
11
10
  private _uuid;
12
11
  private _idCache;
13
12
  private _callUnsafe;
14
- protected _call(method: string, data?: any, noSession?: boolean): Promise<any>;
15
- userId(participantId: ParticipantId): Promise<ExternalParticipantId>;
13
+ protected _call(method: string, data?: any, noSession?: boolean, allowReauthorize?: boolean): Promise<any>;
14
+ userId(participantId: ParticipantId): ExternalParticipantId;
16
15
  authorize(): Promise<void>;
17
16
  private _getAnonymLoginCacheKey;
18
17
  private _getCachedAnonymLogin;
@@ -1,15 +1,15 @@
1
1
  import BaseSignaling, { AddParticipantParams } from '../abstract/BaseSignaling';
2
- import StatsLogger from '../classes/StatsLogger';
3
2
  import { ParticipantIdRegistry } from '../classes/ParticipantIdRegistry';
4
3
  import { SharingStatReport } from '../classes/screenshare/SharingStatReport';
5
4
  import { StatAggregator } from '../classes/stat/StatAggregator';
6
5
  import { StatPings } from '../classes/stat/StatPings';
7
6
  import { StatSignalingCommands } from '../classes/stat/StatSignalingCommands';
8
- import TransportTopology from '../enums/TransportTopology';
7
+ import StatsLogger from '../classes/StatsLogger';
9
8
  import ConversationFeature from '../enums/ConversationFeature';
10
9
  import ConversationOption from '../enums/ConversationOption';
11
10
  import MediaOption from '../enums/MediaOption';
12
11
  import SignalingConnectionType from '../enums/SignalingConnectionType';
12
+ import TransportTopology from '../enums/TransportTopology';
13
13
  import UserRole from '../enums/UserRole';
14
14
  import { type DebugLogger } from '../static/Debug';
15
15
  import { JSONObject } from '../static/Json';
@@ -35,13 +35,13 @@ export default class Signaling extends BaseSignaling {
35
35
  private datachannelCommandsQueue;
36
36
  private incomingCache;
37
37
  private responseHandlers;
38
+ private disposed;
38
39
  private connectionType;
39
40
  private conversationResolve;
40
41
  private conversationReject;
41
42
  private connected;
42
43
  private listenersReady;
43
44
  private peerId;
44
- private conversationId;
45
45
  private connectionMessageWaitTimer;
46
46
  private participantIdRegistry;
47
47
  private producerNotificationDataChannel;
@@ -60,21 +60,16 @@ export default class Signaling extends BaseSignaling {
60
60
  setAbortSignal(signal: AbortSignal | undefined): void;
61
61
  setEndpoint(endpoint: string): void;
62
62
  setWebTransportEndpoint(endpoint: string | null): void;
63
- setConversationId(conversationId: string): void;
64
63
  setParticipantIdRegistry(participantIdRegistry: ParticipantIdRegistry): void;
65
64
  setProducerNotificationDataChannel(dataChannel: RTCDataChannel): void;
66
65
  setProducerCommandDataChannel(dataChannel: RTCDataChannel): void;
67
66
  useCommandDataChannel(status: boolean): void;
68
- /**
69
- * Free used resources
70
- */
71
- cleanup(): void;
72
67
  /**
73
68
  * Open a connection with a signaling server
74
69
  */
75
70
  connect(connectionType: SignalingConnectionType): Promise<SignalingMessage.Connection>;
76
71
  getNextCommandSequenceNumber(): number;
77
- hangup(reason: string): Promise<SignalingMessage | void>;
72
+ hangup(reason: string): Promise<SignalingMessage>;
78
73
  sendCandidate(participantId: ParticipantId, candidate: RTCIceCandidate): Promise<SignalingMessage>;
79
74
  requestTestMode(consumerCommand: string, producerCommand: string | null): Promise<SignalingMessage>;
80
75
  sendSdp(participantId: ParticipantId, sdp: RTCSessionDescriptionInit, extraPayload?: Record<string, any>): Promise<SignalingMessage>;
@@ -138,10 +133,7 @@ export default class Signaling extends BaseSignaling {
138
133
  acceptPromotion(reject?: boolean): Promise<SignalingMessage>;
139
134
  feedback(key: string): Promise<SignalingMessage>;
140
135
  getHandQueue(): Promise<SignalingMessage>;
141
- /**
142
- * Close a connection with a signaling server
143
- */
144
- close(): void;
136
+ dispose(cause?: Error): void;
145
137
  /**
146
138
  * Этот метод нужен т.к. после получения сообщения "connected" устанавливается транспорт
147
139
  * и подписывается на сигналинг. Данные приходят очень быстро и транспорт пропускает
@@ -173,20 +165,25 @@ export default class Signaling extends BaseSignaling {
173
165
  private _onError;
174
166
  private _serializeErrorEvent;
175
167
  private _onClose;
176
- private _closeSocket;
168
+ private _terminate;
169
+ private _fail;
177
170
  private _isRecordCommand;
178
171
  private _resolvePendingRecordCommands;
179
172
  private _handleCommandResponse;
180
173
  private _handleCommandsQueue;
181
174
  private _startResponseTimer;
175
+ private _resolveCommandWithoutResponse;
182
176
  private _serializeBinary;
183
177
  private _serializeJson;
184
178
  private _convertDisplayLayout;
185
179
  private _waitConnectionMessage;
186
180
  private _stopWaitConnectionMessage;
181
+ private _onTransportConnecting;
187
182
  private _onTransportFailed;
188
183
  private _onTransportReconnectScheduled;
189
184
  private _onTransportConnectionDead;
185
+ private _attachNotificationCallError;
186
+ private _createSignalingCallError;
190
187
  private _getSocketType;
191
188
  private _markTransportStat;
192
189
  private _logTransportStat;
@@ -9,13 +9,19 @@ export declare enum SignalingTransportFailure {
9
9
  export type SignalingTransportFailedEvent = {
10
10
  failure: SignalingTransportFailure;
11
11
  message: string;
12
+ source: SignalingTransportType;
12
13
  remote?: boolean;
13
14
  };
14
15
  export type SignalingTransportReconnectEvent = {
15
16
  count: number;
16
17
  delay: number;
17
18
  };
19
+ export type SignalingTransportConnectingEvent = {
20
+ connectionType: SignalingConnectionType;
21
+ source: SignalingTransportType;
22
+ };
18
23
  export type SignalingTransportHandlers = {
24
+ onConnecting: (event: SignalingTransportConnectingEvent) => void;
19
25
  onOpen: () => void;
20
26
  onMessage: (event: MessageEvent) => void;
21
27
  onError: (event: Event) => void;
@@ -51,7 +57,7 @@ export default class SignalingTransport {
51
57
  resetReconnectCount(): void;
52
58
  connect(connectionType: SignalingConnectionType): void;
53
59
  close(code?: number): void;
54
- send(data: string | ArrayBuffer): void;
60
+ send(data: string | ArrayBuffer): Promise<void>;
55
61
  private _connect;
56
62
  private _connectWebTransport;
57
63
  private _connectWebSocket;
@@ -0,0 +1,7 @@
1
+ import HangupType from './HangupType';
2
+ /**
3
+ * Причины завершения звонка, которые клиент может передать в {@link hangup}/{@link declineCall}
4
+ * и пробросить в сигналинг без маппинга.
5
+ */
6
+ export type ClientHangupReason = HangupType.HUNGUP | HangupType.CANCELED | HangupType.REJECTED | HangupType.BUSY | HangupType.MISSED | HangupType.CALL_TIMEOUT;
7
+ export default ClientHangupReason;
@@ -20,7 +20,6 @@ declare enum HangupType {
20
20
  CALLER_IS_REJECTED = "CALLER_IS_REJECTED",
21
21
  UNKNOWN_ERROR = "UNKNOWN_ERROR",
22
22
  UNSUPPORTED = "UNSUPPORTED",
23
- OLD_VERSION = "OLD_VERSION",
24
23
  SERVICE_DISABLED = "SERVICE_DISABLED",
25
24
  SERVICE_UNAVAILABLE = "SERVICE_UNAVAILABLE",
26
25
  EXTERNAL_API_ERROR = "EXTERNAL_API_ERROR",
package/enums/Stat.d.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  declare const enum Stat {
2
2
  CALL_INIT = "call_init",
3
- CALL_WARMUP = "call_warmup",
4
3
  CALL_START = "call_start",
5
4
  CALL_ACCEPTED_OUTGOING = "call_accepted_outgoing",
6
5
  CALL_ACCEPTED_INCOMING = "call_accepted_incoming",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vkontakte/calls-sdk",
3
- "version": "2.8.12-dev.c60cf16f.0",
3
+ "version": "2.8.12-dev.c8b26761.0",
4
4
  "author": "vk.com",
5
5
  "description": "Library for video calls based on the vk.com platform",
6
6
  "homepage": "https://vk.com",