@vkontakte/calls-sdk 2.8.12-dev.fd0aff08.0 → 2.8.13-beta.0

package/calls-sdk.esm.js

@@ -1,6 +1,6 @@
 /*!
- * @vkontakte/calls-sdk v2.8.12-dev.fd0aff08.0
- * Fri, 04 Sep 2026 08:25:26 GMT
+ * @vkontakte/calls-sdk v2.8.13-beta.0
+ * Fri, 11 Sep 2026 06:36:40 GMT
  * https://calls-sdk.cdn-vk.ru/doc/latest/index.html
  */
 
@@ -1029,7 +1029,7 @@ var w;
 	function g() {
 		if (!yt || yt.readyState === "ended") {
 			let e = w.getAudioContext(), t = e.createMediaStreamDestination(), n = e.createGain();
-			n.gain.value = 1e-5, n.connect(t), n.connect(e.destination);
+			n.gain.value = 1e-5, n.connect(t), w.browserName() === "Safari" && n.connect(e.destination);
 			let r = e.createOscillator();
 			r.type = "sine", r.frequency.value = 0, r.connect(n), r.start(), yt = t.stream.getAudioTracks()[0];
 		}
@@ -2155,7 +2155,7 @@ var yn = vn.getInstance(), M = class e {
 		return 1.1;
 	}
 	static get sdkVersion() {
-		return "2.8.12-dev.fd0aff08.0";
+		return "2.8.13-beta.0";
 	}
 	static get debug() {
 		return e._params.debug;
@@ -2700,7 +2700,7 @@ h(M, "_params", {
 	waitForRecordResponse: !1,
 	transparentAudio: !1,
 	enableSessionStateUpdates: !1,
-	safariAudioElement: !1,
+	safariAudioElement: !0,
 	forwardEmptyIceCandidate: !1
 });
 //#endregion
@@ -3065,6 +3065,10 @@ var xn;
 		P("onPeerRegistered", e, t);
 	}
 	e.onPeerRegistered = ot;
+	function st(e, t) {
+		P("onNonFatalError", e, t);
+	}
+	e.onNonFatalError = st;
 })(xn || (xn = {}));
 var L = xn, Sn = /* @__PURE__ */ function(e) {
 	return e.DEBUG = "DEBUG", e.LOG = "LOG", e.WARN = "WARN", e.ERROR = "ERROR", e;
@@ -5842,7 +5846,7 @@ var wi = 2 ** 15 - 1, Ti = 1, Ei = 5, Di = 5, Oi = class e {
 		this._perfStatReporter?.destroy(), this._perfStatReporter = new pa(this, this._signaling, this._statAggregator, !1, this._debug);
 	}
 	_closeConnection() {
-		this._signaling.resetProducerConnection(), this._disposeFirstMediaSentProbe(), this._stopStatInterval(), this._stopSettingsInterval(), this._stopMonitorRtpShareInterval(), this._removeAsrTrack(), this._removeCaptureSender(), this._removeCaptureReceiver(), this._simulcast.reset(), this._pc && (this._rtpReceiversByStreamId = {}, this._disabledSenders.forEach((e) => e.track?.stop()), this._disabledSenders.clear(), this._pc.ontrack = null, this._pc.onconnectionstatechange = null, this._pc.onsignalingstatechange = null, this._participantIdRegistry = null, e._closeDataChannel(this._producerNotification), e._closeDataChannel(this._producerCommand), e._closeDataChannel(this._producerScreen), e._closeDataChannel(this._consumerScreen), e._closeDataChannel(this._asr), e._closeDataChannel(this._animojiDataChannel), this._pc.close(), this._pc = null, this._producerOfferIsProcessing = !1, this._producerNextOffer = null), this._triggerEvent(X.PEER_CONNECTION_CLOSED);
+		this._signaling.resetProducerConnection(), this._ssrcMap = {}, this._ssrcMapUpdated = !0, this._disposeFirstMediaSentProbe(), this._stopStatInterval(), this._stopSettingsInterval(), this._stopMonitorRtpShareInterval(), this._removeAsrTrack(), this._removeCaptureSender(), this._removeCaptureReceiver(), this._simulcast.reset(), this._pc && (this._rtpReceiversByStreamId = {}, this._disabledSenders.forEach((e) => e.track?.stop()), this._disabledSenders.clear(), this._pc.ontrack = null, this._pc.onconnectionstatechange = null, this._pc.onsignalingstatechange = null, this._participantIdRegistry = null, e._closeDataChannel(this._producerNotification), e._closeDataChannel(this._producerCommand), e._closeDataChannel(this._producerScreen), e._closeDataChannel(this._consumerScreen), e._closeDataChannel(this._asr), e._closeDataChannel(this._animojiDataChannel), this._pc.close(), this._pc = null, this._producerOfferIsProcessing = !1, this._producerNextOffer = null), this._triggerEvent(X.PEER_CONNECTION_CLOSED);
 	}
 	static _closeDataChannel(e) {
 		e && (e.onopen = null, e.onmessage = null, e.onerror = null, e.close());
@@ -5912,10 +5916,10 @@ var wi = 2 ** 15 - 1, Ti = 1, Ei = 5, Di = 5, Oi = class e {
 		this._triggerEvent(X.NETWORK_STATUS, e);
 	}
 	_updateSSRCMap(e) {
-		e && ln(e.sdp).forEach((e) => {
+		e && (this._ssrcMap = {}, this._ssrcMapUpdated = !0, ln(e.sdp).forEach((e) => {
 			let t = `a=ssrc:([0-9]+) label:(audio|video)-((?:[ug]?[\\d]+)|(?:mix)|(?:${qr.PARTICIPANT_AGNOSTIC_TRACK_PREFIX}-[0-9]+)|(?:${qr.TRANSPARENT_AUDIO_TRACK_PREFIX}-[0-9]+))`, n = new RegExp(t).exec(e);
-			n && (this._ssrcMap[n[1]] = n[3], this._ssrcMapUpdated = !0);
-		});
+			n && (this._ssrcMap[n[1]] = n[3]);
+		}));
 	}
 	_createCaptureSender(e) {
 		let t = this._mediaSource.mediaSettings;
@@ -8112,7 +8116,7 @@ var ho = class {
 	}
 }, go = class {
 	constructor(e, t = !1, n = R, r = null) {
-		h(this, "_audioElement", null), h(this, "_audioTracks", /* @__PURE__ */ new Map()), h(this, "_allowMultipleTracks", void 0), h(this, "_volume", 1), h(this, "_features", { setSinkId: !!Audio.prototype.setSinkId }), h(this, "_statFirstMediaReceived", void 0), h(this, "_debug", void 0), h(this, "_logger", void 0), this._statFirstMediaReceived = e, this._allowMultipleTracks = t, this._debug = n, this._logger = r;
+		h(this, "_audioElement", null), h(this, "_debug", void 0), h(this, "_preparedAudioElement", void 0), h(this, "_audioTracks", /* @__PURE__ */ new Map()), h(this, "_allowMultipleTracks", void 0), h(this, "_volume", 1), h(this, "_features", { setSinkId: !!Audio.prototype.setSinkId }), h(this, "_statFirstMediaReceived", void 0), h(this, "_logger", void 0), this._statFirstMediaReceived = e, this._allowMultipleTracks = t, this._debug = n, this._logger = r, this._preparedAudioElement = this._prepareAudioElement();
 	}
 	add(e, t) {
 		this._allowMultipleTracks || this._clearTracks();
@@ -8161,31 +8165,40 @@ var ho = class {
 		if (M.muteMode) return;
 		let e = this._getTracks();
 		if (!e.length) return;
-		let t = T.browserName() !== "Safari" || T.isMobile() || M.safariAudioElement, n = document.createElement(t ? "audio" : "video");
-		n.muted = !1, n.volume = this._volume, n.preload = "auto";
-		let r = () => {
+		let t = this._preparedAudioElement ?? this._createAudioElement();
+		t.muted = !1, t.volume = this._volume, t.preload = "auto";
+		let n = () => {
 			this._debug.warn("[audio] Error on play audio"), L.onAutoplayError();
-		}, i = (e) => {
-			this._debug.debug("[audio] Play audio"), n.srcObject = null, n.srcObject = new MediaStream(e), n.load();
-			let t = n.play();
-			t && t.catch(r);
-		}, a = () => {
+		}, r = (e) => {
+			this._debug.debug("[audio] Play audio"), t.srcObject = null, t.srcObject = new MediaStream(e), t.load();
+			let r = t.play();
+			r && r.catch(n);
+		}, i = () => {
 			this._debug.debug("[audio] Recover audio playback");
 			let e = this._getTracks();
-			e.length ? i(e) : this._debug.warn("[audio] Broken audio tracks");
+			e.length ? r(e) : this._debug.warn("[audio] Broken audio tracks");
 		};
-		n.onpause = a, n.onstalled = a, n.onerror = a, n.onloadeddata = () => {
+		t.onpause = i, t.onstalled = i, t.onerror = i, t.onloadeddata = () => {
 			this._statFirstMediaReceived.measure();
-		}, i(e), this._audioElement = n;
-		let o = T.getSavedOutput()?.deviceId;
-		o && n.setSinkId?.(o).catch((e) => {
-			this._debug.warn(`[audio] Failed to set output device '${o}'`, e);
+		}, r(e), this._audioElement = t;
+		let a = T.getSavedOutput()?.deviceId;
+		a && t.setSinkId?.(a).catch((e) => {
+			this._debug.warn(`[audio] Failed to set output device '${a}'`, e);
 		});
 	}
 	_stopAudioElement() {
-		this._audioElement && (this._audioElement.pause(), this._audioElement.srcObject = null);
+		this._audioElement && (this._audioElement.onpause = null, this._audioElement.onstalled = null, this._audioElement.onerror = null, this._audioElement.onloadeddata = null, this._audioElement.pause(), this._audioElement.srcObject = null);
 		for (let e of this._audioTracks.values()) e.stop();
 	}
+	_createAudioElement() {
+		let e = T.browserName() !== "Safari" || T.isMobile() || M.safariAudioElement;
+		return document.createElement(e ? "audio" : "video");
+	}
+	_prepareAudioElement() {
+		if (M.muteMode || T.browserName() !== "Safari" || T.isMobile()) return null;
+		let e = this._createAudioElement();
+		return e.load(), e;
+	}
 	_addTrackToAudioElement(e) {
 		if (!this._audioElement) return;
 		this._debug.debug(`[audio] Adding track ${e}`);
@@ -8246,8 +8259,8 @@ var bo = 90, xo = 3, So = class extends b {
 		t > bo ? this._debug.warn(`High memory usage: ${t}% (${n} MiB)`) : (!this._lastMemoryStat.percent || Math.abs(t - this._lastMemoryStat.percent) >= xo) && (this._debug.debug(`Memory usage: ${t}% (${n} MiB)`), this._lastMemoryStat.percent = t, this._lastMemoryStat.bytes = e.usedJSHeapSize);
 	}
 }, Co = class {
-	constructor({ api: e, debug: t, getParticipants: n, isMe: r, updateDisplayLayout: i }) {
-		h(this, "_api", void 0), h(this, "_debug", void 0), h(this, "_getParticipants", void 0), h(this, "_isMe", void 0), h(this, "_updateDisplayLayout", void 0), h(this, "_requestedLayouts", {}), h(this, "_uncertainLayouts", {}), h(this, "_pendingRequests", null), h(this, "_pendingPromises", []), h(this, "_lastRequests", null), h(this, "_timer", null), h(this, "_inFlight", !1), h(this, "_lastFlushAt", null), h(this, "_generation", 0), h(this, "_forceNextFlush", !1), this._api = e, this._debug = t, this._getParticipants = n, this._isMe = r, this._updateDisplayLayout = i;
+	constructor({ api: e, debug: t, getParticipants: n, isMe: r, updateDisplayLayout: i, onNonFatalError: a }) {
+		h(this, "_api", void 0), h(this, "_debug", void 0), h(this, "_getParticipants", void 0), h(this, "_isMe", void 0), h(this, "_updateDisplayLayout", void 0), h(this, "_onNonFatalError", void 0), h(this, "_requestedLayouts", {}), h(this, "_uncertainLayouts", {}), h(this, "_pendingRequests", null), h(this, "_pendingPromises", []), h(this, "_lastRequests", null), h(this, "_timer", null), h(this, "_inFlight", !1), h(this, "_lastFlushAt", null), h(this, "_generation", 0), h(this, "_forceNextFlush", !1), this._api = e, this._debug = t, this._getParticipants = n, this._isMe = r, this._updateDisplayLayout = i, this._onNonFatalError = a;
 	}
 	request(e) {
 		this._pendingRequests = e.slice(), this._lastRequests = e.slice();
@@ -8283,11 +8296,16 @@ var bo = 90, xo = 3, So = class extends b {
 		this._pendingRequests = null, this._pendingPromises = [];
 		let r = {};
 		try {
-			r = this._getRequestLayouts(t);
-			let i = this._forceNextFlush || Object.keys(this._uncertainLayouts).length > 0;
+			let i = this._getRequestLayouts(t);
+			if (!i) {
+				n.forEach(({ resolve: e }) => e());
+				return;
+			}
+			r = i;
+			let a = this._forceNextFlush || Object.keys(this._uncertainLayouts).length > 0;
 			this._forceNextFlush = !1;
-			let a = this._getDiff(r, i);
-			a.length && await this._updateDisplayLayout(a), e === this._generation && (this._requestedLayouts = r, this._uncertainLayouts = {}), n.forEach(({ resolve: e }) => e());
+			let o = this._getDiff(r, a);
+			o.length && await this._updateDisplayLayout(o), e === this._generation && (this._requestedLayouts = r, this._uncertainLayouts = {}), n.forEach(({ resolve: e }) => e());
 		} catch (t) {
 			e === this._generation ? (this._uncertainLayouts = {
 				...this._uncertainLayouts,
@@ -8298,30 +8316,30 @@ var bo = 90, xo = 3, So = class extends b {
 		}
 	}
 	_getRequestLayouts(e) {
-		let t = {}, n = this._getParticipants();
-		for (let r of e) {
-			let e = typeof r.uid == "object" ? r.uid : Q.fromId(r.uid), i = this._api.getCachedOkIdByExternalId(e);
-			if (!i) {
-				this._debug.log(`Unknown participant external ID ${typeof r.uid == "object" ? Q.toString(r.uid) : r.uid}`);
+		let t = {}, n = [], r = this._getParticipants();
+		for (let i of e) {
+			let e = typeof i.uid == "object" ? i.uid : Q.fromId(i.uid), a = this._api.getCachedParticipantIdByExternalId(e);
+			if (!a) {
+				this._debug.log(`Unknown participant external ID ${typeof i.uid == "object" ? Q.toString(i.uid) : i.uid}`), n.push(e.id);
 				continue;
 			}
-			if (!n[i] && !this._isMe(i)) continue;
-			let a = Mn({
-				participantId: i,
-				mediaType: r.mediaType,
-				streamName: r.streamName
+			if (!r[a] && !this._isMe(a)) continue;
+			let o = Mn({
+				participantId: a,
+				mediaType: i.mediaType,
+				streamName: i.streamName
 			});
-			t[a] = {
-				uid: r.uid,
-				mediaType: r.mediaType,
-				width: r.width,
-				height: r.height,
-				fit: r.cover ? "cv" : "cn",
-				...r.priority === void 0 ? {} : { priority: r.priority },
-				...r.streamName === void 0 ? {} : { streamName: r.streamName }
+			t[o] = {
+				uid: i.uid,
+				mediaType: i.mediaType,
+				width: i.width,
+				height: i.height,
+				fit: i.cover ? "cv" : "cn",
+				...i.priority === void 0 ? {} : { priority: i.priority },
+				...i.streamName === void 0 ? {} : { streamName: i.streamName }
 			};
 		}
-		return t;
+		return n.length ? (this._onNonFatalError(`Participant ID mapping not found for external IDs "${Array.from(new Set(n)).join("\", \"")}" while handling requestDisplayLayout`), null) : t;
 	}
 	_getDiff(e, t = !1) {
 		let n = [];
@@ -8360,7 +8378,7 @@ var bo = 90, xo = 3, So = class extends b {
 		h(this, "_analyser", null), h(this, "_gainNode", null), h(this, "_fftBins", null), h(this, "_mediaStreamSource", null), h(this, "_lastSmoothedLevel", 0), h(this, "_trackId", void 0), h(this, "_track", void 0), h(this, "_stream", void 0), this._trackId = e, this._track = t, this._stream = new MediaStream([t]);
 		try {
 			let e = T.getAudioContext();
-			this._gainNode = e.createGain(), this._gainNode.gain.value = 1e-5, this._gainNode.connect(e.destination), this._analyser = e.createAnalyser(), this._analyser.fftSize = 1024, this._analyser.smoothingTimeConstant = 0, this._analyser.connect(this._gainNode), this._fftBins = new Uint8Array(this._analyser.frequencyBinCount), this._mediaStreamSource = e.createMediaStreamSource(this._stream), this._mediaStreamSource.connect(this._analyser);
+			this._analyser = e.createAnalyser(), this._analyser.fftSize = 1024, this._analyser.smoothingTimeConstant = 0, T.browserName() === "Safari" && (this._gainNode = e.createGain(), this._gainNode.gain.value = 1e-5, this._gainNode.connect(e.destination), this._analyser.connect(this._gainNode)), this._fftBins = new Uint8Array(this._analyser.frequencyBinCount), this._mediaStreamSource = e.createMediaStreamSource(this._stream), this._mediaStreamSource.connect(this._analyser);
 		} catch {}
 	}
 	get track() {
@@ -9343,7 +9361,8 @@ var ls = 15, $ = class e extends b {
 			debug: this._debug,
 			getParticipants: () => this._participants,
 			isMe: (e) => this._isMe(e),
-			updateDisplayLayout: (e) => this.updateDisplayLayout(e)
+			updateDisplayLayout: (e) => this.updateDisplayLayout(e),
+			onNonFatalError: (e) => this._onNonFatalError(e)
 		}), this._onUnload = () => {
 			this._stopFirstMediaSentProbe(), this._conversation && this._api && this._sendHangupApi(this._conversation.id, this._state === "IDLE" ? D.CANCELED : D.HUNGUP), this._stats.destroy();
 		}, window.addEventListener("pagehide", this._onUnload), this._statFirstMediaReceived = new as(this._stats.statAggregator), this._audioOutput = new go(this._statFirstMediaReceived, M.transparentAudio, this._debug, this._stats.logger), M.videoTracksCount > 0 && (this._cooldownQueueCleanupTimer = window.setInterval(this._cleanupCooldownQueue.bind(this), os));
@@ -9379,6 +9398,9 @@ var ls = 15, $ = class e extends b {
 	get isCallHeld() {
 		return this._state === "HELD";
 	}
+	get isIncomingRinging() {
+		return this._conversation?.direction === Ba.INCOMING && this._state === "IDLE";
+	}
 	static debugSessionId() {
 		return e.current()?.debugSessionId ?? null;
 	}
@@ -9396,8 +9418,14 @@ var ls = 15, $ = class e extends b {
 	get debugSessionId() {
 		return this._debug.sessionId;
 	}
-	getCachedRawOkIdByExternalId(e) {
-		return this._api.getCachedRawOkIdByExternalId(e);
+	getCachedParticipantIdByExternalId(e) {
+		return this._api.getCachedParticipantIdByExternalId(e);
+	}
+	_onNonFatalError(e) {
+		L.onNonFatalError(Error(e), this.id);
+	}
+	getIncomingCallerExternalId() {
+		return this._conversation?.direction === Ba.INCOMING ? Object.values(this._participants).find((e) => !this._isMe(e.id))?.externalId ?? null : null;
 	}
 	_buildInternalParams() {
 		let e = {
@@ -9440,11 +9468,15 @@ var ls = 15, $ = class e extends b {
 				description: "not-initialized-after-start"
 			} });
 			if (this._participantState = Z.ACCEPTED, this._changeMediaSettings(l), await this._processConnection(d), this._allocateTransport(), this._createSpeakerDetector(), this._createSpecListener(), this._signaling.readyToSend(), this._delayedHangup) throw new O(D.CANCELED);
-			return this._debug.debug("Outgoing call", {
+			if (this._debug.debug("Outgoing call", {
 				opponentIds: e,
 				opponentType: t,
 				mediaOptions: n
-			}), this._processConnectionSharedMovieInfo(d), this._processConversationUrlSharingInfo(d), L.onLocalStream(this._mediaSource.getStream(), this._mediaSource.mediaSettings, this.id), L.onConversation(this._conversation.externalId, this._conversation.mediaModifiers, this._getMuteStatesForCurrentRoom(), this._getMainRoomParticipants(), void 0, this.id), this._onConversationParticipantListChunk(d), this._processPinnedParticipants(d), L.onLocalStatus(N.WAITING, this.id), this._toggleJoinAvailability(), this._changeFeatureSet(), this._changeNeedRate(), z.add(this), await z.setActive(this.id), us = null, this._conversation.concurrent && await this._acceptConcurrent(), f && !this._registeredPeerReceived && this._state !== "CLOSE" && (this._calleeUnavailableTimer = window.setTimeout(() => {
+			}), this._processConnectionSharedMovieInfo(d), this._processConversationUrlSharingInfo(d), L.onLocalStream(this._mediaSource.getStream(), this._mediaSource.mediaSettings, this.id), L.onConversation(this._conversation.externalId, this._conversation.mediaModifiers, this._getMuteStatesForCurrentRoom(), this._getMainRoomParticipants(), void 0, this.id), this._onConversationParticipantListChunk(d), this._processPinnedParticipants(d), L.onLocalStatus(N.WAITING, this.id), this._toggleJoinAvailability(), this._changeFeatureSet(), this._changeNeedRate(), this._conversation?.concurrent) {
+				let e = z.get(this._conversation.id);
+				e && e !== this && e._close(new O(D.HUNGUP, { remote: !0 }));
+			}
+			return z.add(this), await z.setActive(this.id), us = null, this._conversation.concurrent && await this._acceptConcurrent(), f && !this._registeredPeerReceived && this._state !== "CLOSE" && (this._calleeUnavailableTimer = window.setTimeout(() => {
 				this._calleeUnavailableTimer = null, this._close(new O(D.CALLEE_UNAVAILABLE), { signalingReason: D.CANCELED });
 			}, f)), this._conversation;
 		} catch (e) {
@@ -9501,7 +9533,11 @@ var ls = 15, $ = class e extends b {
 		}
 	}
 	_extractExternalRooms(e) {
-		return e.map(this._convertRoomToExternal.bind(this)).filter((e) => !!e);
+		let t = [], n = [];
+		return e.forEach((e) => {
+			let { room: r, missingParticipantIds: i } = this._convertRoomToExternal(e);
+			r && n.push(r), t.push(...i);
+		}), this._reportMissingExternalIds(t, "EXTRACT_EXTERNAL_ROOMS"), n.filter((e) => !!e);
 	}
 	_extractExternalRoomsData(e, t) {
 		if (!e || !e.length) return;
@@ -9726,7 +9762,8 @@ var ls = 15, $ = class e extends b {
 			D.CALLEE_IS_OFFLINE,
 			D.CALLEE_UNAVAILABLE,
 			D.CALLER_IS_BLOCKED,
-			D.CALLER_IS_REJECTED
+			D.CALLER_IS_REJECTED,
+			D.HAS_ACTIVE_CALL
 		].indexOf(e.hangup) !== -1 || e.hangup === D.REJECTED && !e.remote) {
 			this._emitHangupOnce(e, i), this._destroy(r);
 			return;
@@ -9983,19 +10020,17 @@ var ls = 15, $ = class e extends b {
 			isInRoom: !1,
 			markers: null
 		}, e), i = !!r.externalId;
-		return i || (r.externalId = this._getParticipantId(t ?? r.id)), n && i && this._api.cacheExternalId(t ?? r.id, r.externalId), t && this._api.mapDecorativeId(t, r.id), r.observedIds?.length && (r.externalId.observer = !0), e.markers && (r.markers = this._denormalizeMarkers(r.id, e.markers)), r.connectionStatus = eo.create(r.connectionStatus), r;
+		if (!i) {
+			let e = this._getParticipantId(t ?? r.id);
+			e && (r.externalId = e);
+		}
+		return n && i && this._api.cacheExternalId(t ?? r.id, r.externalId), t && this._api.mapDecorativeId(t, r.id), r.observedIds?.length && r.externalId && (r.externalId.observer = !0), e.markers && (r.markers = this._denormalizeMarkers(r.id, e.markers)), r.connectionStatus = eo.create(r.connectionStatus), r;
 	}
 	_getParticipantId(e) {
-		try {
-			return this._api.userId(e);
-		} catch (e) {
-			throw this._close(e instanceof O ? e : new O(D.NETWORK_ERROR, { callError: {
-				scope: "network",
-				source: "api",
-				code: "fetch-failed",
-				description: "request-failed"
-			} }), { errorText: e }), e;
-		}
+		let t = this._api.userId(e);
+		if (t) return t;
+		let { compositeUserId: n, deviceIdx: r } = j.decomposeParticipantId(e), { id: i, type: a } = j.decomposeId(n);
+		return a === A.GROUP ? Q.fromId(String(i), void 0, r) : null;
 	}
 	_cacheParticipantExternalIds(e) {
 		e.forEach((e) => {
@@ -10003,7 +10038,7 @@ var ls = 15, $ = class e extends b {
 			if (n) {
 				this._api.cacheExternalId(t, n);
 				let r = j.composeDecorativeId(e), i = Q.fromSignalingParticipant(e);
-				r && i && (this._api.cacheExternalId(r, i), this._api.mapDecorativeId(e.decorativeUserId, e.id));
+				r && i && (this._api.cacheExternalId(r, i), this._api.mapDecorativeId(r, t));
 			}
 		});
 	}
@@ -10052,7 +10087,11 @@ var ls = 15, $ = class e extends b {
 			audienceMode: this._isAudienceMode(t),
 			restricted: this._isRestricted(t),
 			urlSharingInfoByRoom: /* @__PURE__ */ new Map()
-		}, this._debug.setConversationId(t.conversation.id || e.id), e.p2p_forbidden && (M.forceRelayPolicy = e.p2p_forbidden), this._stats.logger.log(C.RELAY_POLICY, M.forceRelayPolicy ? "1" : "0"), this._changeFeatureSet(), this._changeFeaturesPerRole(), this._logDevices();
+		}, this._debug.setConversationId(t.conversation.id || e.id), e.p2p_forbidden && (M.forceRelayPolicy = e.p2p_forbidden), this._stats.logger.log(C.RELAY_POLICY, M.forceRelayPolicy ? "1" : "0");
+		let l = z.get(this._conversation.id);
+		if (l && l !== this) this._conversation.concurrent = !0;
+		else if (!M.hold && z.callsLength > 0) throw new O(D.HAS_ACTIVE_CALL);
+		this._changeFeatureSet(), this._changeFeaturesPerRole(), this._logDevices();
 	}
 	_updateConversation(e) {
 		if (!this._conversation) throw new O(D.UNKNOWN_ERROR, { callError: {
@@ -10182,33 +10221,40 @@ var ls = 15, $ = class e extends b {
 	_getExistedParticipantByIdOrCreate(e) {
 		let t = this._participants[e];
 		if (t) return t;
-		let n = this._api.getDecorativeIdByInitialId(j.decomposeId(e).id), r = n ? j.composeUserId(n) : void 0, i = this._getParticipantId(e), { deviceIdx: a } = j.decomposeParticipantId(e);
+		let n = this._api.getDecorativeIdByInitialId(e), r = this._getParticipantId(e), { deviceIdx: i } = j.decomposeParticipantId(e);
 		return this._createParticipant({
 			id: e,
-			externalId: {
-				...i,
-				deviceIdx: a
-			}
-		}, r, !1);
+			externalId: r ? {
+				...r,
+				deviceIdx: i
+			} : void 0
+		}, n, !1);
 	}
 	_getExternalIdByParticipantId(e) {
-		if (this._isMe(e)) return this._conversation?.externalId;
+		if (this._isMe(e)) return this._conversation?.externalId ?? null;
 		if (M.useParticipantListChunk) return this._getExistedParticipantByIdOrCreate(e).externalId;
 		let t = this._participants;
 		if (t[e]?.externalId) return t[e].externalId;
-		{
-			let t = this._getParticipantId(e);
-			return this._api.cacheExternalId(e, t), t;
-		}
+		let n = this._api.getCachedExternalIdByParticipantId(e);
+		if (n) return n;
+		let r = this._getParticipantId(e);
+		return r && this._api.cacheExternalId(e, r), r;
+	}
+	_getExternalIdsByParticipantIds(e) {
+		let t = [], n = [];
+		return e.forEach((e) => {
+			let r = this._getExternalIdByParticipantId(e);
+			r ? t.push(r) : n.push(e);
+		}), {
+			externalIds: t,
+			missingIds: n
+		};
 	}
-	_getExternalIdsByOkIdsFromCache(e) {
-		return e.map((e) => this._api.getCachedExternalIdByOkId(e) ?? Q.fromId(String(e)));
+	_reportMissingExternalIds(e, t) {
+		e.length && this._onNonFatalError(`External ID mapping not found for participants "${Array.from(new Set(e)).join("\", \"")}" while handling ${t}`);
 	}
-	_getOrCacheExternalIdByCompositeId(e) {
-		let t = j.extractOkId(e), n = this._api.getCachedExternalIdByOkId(t);
-		if (n) return n;
-		let r = Q.fromId(String(t));
-		return this._api.cacheExternalId(e, r), r;
+	_reportMissingExternalIdsById(e, t) {
+		e.length && this._onNonFatalError(`Participant ID mapping not found for external IDs "${Array.from(new Set(e)).join("\", \"")}" while handling ${t}`);
 	}
 	_registerParticipantAndSetMarkersIfChunkEnabled(e, t) {
 		if (M.useParticipantListChunk) {
@@ -10493,30 +10539,34 @@ var ls = 15, $ = class e extends b {
 	async updateDisplayLayout(e) {
 		if (e.length < 1 || !this._signaling.ready) return;
 		this._debug.log(`Update display layout request [${this._signaling.getNextCommandSequenceNumber()}]`, e);
-		let t = {}, n = [], r = this._participants;
-		for (let i of e) {
-			let e = typeof i.uid == "object" ? i.uid : Q.fromId(i.uid), a = this._api.getCachedOkIdByExternalId(e);
-			if (!a) {
+		let t = {}, n = [], r = [], i = this._participants;
+		for (let a of e) {
+			let e = typeof a.uid == "object" ? a.uid : Q.fromId(a.uid), o = this._api.getCachedParticipantIdByExternalId(e);
+			if (!o) {
 				let t = Q.toString(e);
-				this._debug.log(`Unknown participant external ID ${t}`);
+				this._debug.log(`Unknown participant external ID ${t}`), r.push(e.id);
 				continue;
 			}
-			let o = Mn({
-				participantId: a,
-				mediaType: i.mediaType,
-				streamName: i.streamName
-			}), s = r[a];
-			s ? n.push(() => {
-				s.lastRequestedLayouts[o] = i;
-			}) : this._isMe(a) && n.push(() => {
-				this._myLastRequestedLayouts[o] = i;
-			}), Dn(i) ? (this._isMe(a) && n.push(() => {
-				delete this._myLastRequestedLayouts[o];
-			}), this._streamIdByStreamDescription.has(o) && !this._cooldownTimestampByStreamDescription.has(o) && this._cooldownTimestampByStreamDescription.set(o, Date.now())) : (this._cooldownTimestampByStreamDescription.delete(o), !this._streamIdByStreamDescription.has(o) && M.videoTracksCount > 0 && this._streamIdByStreamDescription.set(o, null), t[o] = i), i.mediaType === V.SCREEN && !Dn(i) && W.setMark(W.getMarkNameScreenshareFirstFrame(a));
-		}
-		let i = this._cooldownTimestampByStreamDescription.keys();
+			let s = Mn({
+				participantId: o,
+				mediaType: a.mediaType,
+				streamName: a.streamName
+			}), c = i[o];
+			c ? n.push(() => {
+				c.lastRequestedLayouts[s] = a;
+			}) : this._isMe(o) && n.push(() => {
+				this._myLastRequestedLayouts[s] = a;
+			}), Dn(a) ? (this._isMe(o) && n.push(() => {
+				delete this._myLastRequestedLayouts[s];
+			}), this._streamIdByStreamDescription.has(s) && !this._cooldownTimestampByStreamDescription.has(s) && this._cooldownTimestampByStreamDescription.set(s, Date.now())) : (this._cooldownTimestampByStreamDescription.delete(s), !this._streamIdByStreamDescription.has(s) && M.videoTracksCount > 0 && this._streamIdByStreamDescription.set(s, null), t[s] = a), a.mediaType === V.SCREEN && !Dn(a) && W.setMark(W.getMarkNameScreenshareFirstFrame(o));
+		}
+		if (r.length) {
+			this._reportMissingExternalIdsById(r, "updateDisplayLayout");
+			return;
+		}
+		let a = this._cooldownTimestampByStreamDescription.keys();
 		for (; this._streamIdByStreamDescription.size > M.videoTracksCount;) {
-			let e = i.next();
+			let e = a.next();
 			if (e.done) {
 				this._debug.error("Cannot accommodate all streaming requests: tracks available " + M.videoTracksCount + "; requested streams: " + Array.from(this._streamIdByStreamDescription.keys()));
 				break;
@@ -10608,17 +10658,22 @@ var ls = 15, $ = class e extends b {
 	async _onParticipantPromoted(e) {
 		this._conversation && this._conversation.audienceMode ? (this._debug.log("Promoted in audience mode", !e.demote), this._conversation.restricted = e.demote, this._processRecordInfos(e), !e.demote && this._mediaSource && this._changeMediaSettings(this._mediaSource.mediaSettings)) : (this._debug.log("Promoted in waiting hall", !e.demote), e.demote ? (this._debug.log("Kicked from waiting hall"), this._close(new O(D.REMOVED))) : (this._updateConversation(e), this._waitingHallHoldPending ? (await this._signaling.hold(!0), await this._onJoinPart2(e, !1), this._waitingHallHoldPending = !1) : z.getActive() && M.hold ? (await this._signaling.hold(!0), await this._onJoinPart2(e, !0, !0), this._waitingHallHoldPending = !1) : await this._onJoinPart2(e))), L.onPromoted(e.demote, this.id);
 	}
-	async _onChatRoomUpdated(e, t = 0, n = [], r, i) {
+	_onChatRoomUpdated(e, t = 0, n = [], r, i) {
 		this._debug.log(`Chat room updated: ${e}`);
-		let a = [];
+		let a = [], o = [];
 		n.length && n.forEach((e) => {
 			if (e.externalId) {
 				let t = Q.fromSignaling(e.externalId);
 				a.push(t), this._api.cacheExternalId(e.id.id, t);
-			} else a.push(this._getOrCacheExternalIdByCompositeId(e.id.id));
+			} else {
+				let t = this._getExternalIdByParticipantId(e.id.id);
+				t ? a.push(t) : o.push(e.id.id);
+			}
 		});
-		let o = r?.map((e) => this._getOrCacheExternalIdByCompositeId(e)) ?? [], s = i?.map((e) => this._getOrCacheExternalIdByCompositeId(e)) ?? [];
-		L.onChatRoomUpdated(e, t, a, o, s, this.id);
+		let { externalIds: s, missingIds: c } = this._getExternalIdsByParticipantIds(r ?? []);
+		o.push(...c);
+		let { externalIds: l, missingIds: u } = this._getExternalIdsByParticipantIds(i ?? []);
+		o.push(...u), this._reportMissingExternalIds(o, "CHAT_ROOM_UPDATED"), L.onChatRoomUpdated(e, t, a, s, l, this.id);
 	}
 	_onSharedMovieUpdate(e) {
 		let t = this._conversation?.externalId;
@@ -10841,34 +10896,37 @@ var ls = 15, $ = class e extends b {
 		let r = null;
 		if (e && (r = ro(e), r)) {
 			let e = this._api.getDecorativeIdByInitialId(r.id);
-			r.id = e ? j.composeUserId(e) : r.id;
+			r.id = e ?? r.id;
 		}
 		let i = await this._signaling.getWaitingHall(r, t, n);
 		if (i.error) return Promise.reject(i.message);
-		let a = i.participants || [], { externalIds: o } = await this._resolveWaitingHallExternalIds(a), s = null;
+		let a = i.participants || [], { externalIds: o } = this._resolveWaitingHallExternalIds(a, "getWaitingHall"), s = null;
 		return a.length && i.hasMore && (s = no(a[a.length - 1].id)), {
 			participants: o,
 			pageMarker: s,
 			totalCount: i.totalCount || 0
 		};
 	}
-	async _resolveWaitingHallExternalIds(e) {
-		let t = [], n = [];
+	_resolveWaitingHallExternalIds(e, t) {
+		let n = [], r = [], i = [];
 		return e.length && e.forEach((e) => {
 			if (e.externalId) {
-				let r = Q.fromSignaling(e.externalId);
-				t.push(e.id.addedTs), n.push(r), this._api.cacheExternalId(e.id.id, r);
-			} else n.push(this._getOrCacheExternalIdByCompositeId(e.id.id)), t.push(e.id.addedTs);
-		}), {
-			externalIds: n,
-			timestamps: t
+				let t = Q.fromSignaling(e.externalId);
+				n.push(e.id.addedTs), r.push(t), this._api.cacheExternalId(e.id.id, t);
+			} else {
+				let t = this._getExternalIdByParticipantId(e.id.id);
+				t ? (r.push(t), n.push(e.id.addedTs)) : i.push(e.id.id);
+			}
+		}), this._reportMissingExternalIds(i, t), {
+			externalIds: r,
+			timestamps: n
 		};
 	}
 	async getAudienceModeHands() {
 		if (!this._signaling.ready) throw Error("Signaling is not ready");
 		let e = await this._signaling.getHandQueue();
 		if (e.error) return Promise.reject(e.message);
-		let t = e.participants || [], { externalIds: n, timestamps: r } = await this._resolveWaitingHallExternalIds(t);
+		let t = e.participants || [], { externalIds: n, timestamps: r } = this._resolveWaitingHallExternalIds(t, "getAudienceModeHands");
 		return {
 			timestamps: r,
 			participants: n,
@@ -11037,7 +11095,7 @@ var ls = 15, $ = class e extends b {
 				unmuteOptions: e.unmuteOptions || [],
 				observedIds: e.observedIds || [],
 				markers: this._denormalizeMarkers(t, e.markers)
-			}, e.decorativeUserId);
+			}, j.composeDecorativeId(e));
 		}));
 	}
 	async getParticipantListChunk(e) {
@@ -11083,7 +11141,7 @@ var ls = 15, $ = class e extends b {
 			this._warnParticipantNotInConversation(e);
 			return;
 		}
-		r.mediaSettings = t, ["ACTIVE", "HELD"].includes(this._state) && L.onRemoteMediaSettings(r.externalId, t, r.markers, this.id), this._specListener && this._specListener.onChangeRemoteMediaSettings(e, t);
+		r.mediaSettings = t, ["ACTIVE", "HELD"].includes(this._state) && (r.externalId ? L.onRemoteMediaSettings(r.externalId, t, r.markers, this.id) : this._reportMissingExternalIds([e], "REMOTE_MEDIA_SETTINGS")), this._specListener && this._specListener.onChangeRemoteMediaSettings(e, t);
 	}
 	_extractLocalParticipantFromConnection(e) {
 		let t = this._api.getUserId();
@@ -11099,7 +11157,7 @@ var ls = 15, $ = class e extends b {
 			this._warnParticipantNotInConversation(e);
 			return;
 		}
-		n.participantState = t || {}, ["ACTIVE", "HELD"].includes(this._state) && L.onRemoteParticipantState(n.externalId, n.participantState, n.markers, this.id);
+		n.participantState = t || {}, ["ACTIVE", "HELD"].includes(this._state) && (n.externalId ? L.onRemoteParticipantState(n.externalId, n.participantState, n.markers, this.id) : this._reportMissingExternalIds([e], "REMOTE_PARTICIPANT_STATE"));
 	}
 	_changeMultipleParticipantState(e, t) {
 		this._debug.debug("Multiple participants state changed", e);
@@ -11234,30 +11292,37 @@ var ls = 15, $ = class e extends b {
 	async _onAcceptedCall(e) {
 		let t = j.composeMessageId(e), n = j.getPeerIdString(e.peerId);
 		if (this._debug.debug(`Participant accepted call [${t}]`), this._statFirstMediaReceived.markAcceptedCall(this._transport?.getTopology()), this._conversation && this._isMe(t)) {
+			if (this._conversation.concurrent) return;
 			this._close(new O(D.MISSED), { errorText: "Call accepted on other device" });
 			return;
 		}
 		this._conversation?.direction === Ba.OUTGOING && !this._conversation.concurrent && this._stats.lifecycle.markOutgoingAccepted();
 		let r = this._getParticipant(t);
 		if (!r) {
-			let n = this._api.getDecorativeIdByInitialId(t), i = n ? j.composeUserId(n, e.participantType) : void 0;
+			let n = this._api.getDecorativeIdByInitialId(t);
 			r = this._registerParticipantInCache(this._createParticipant({
 				id: t,
 				externalId: e.externalId ? Q.fromSignaling(e.externalId, e.deviceIdx) : void 0,
 				mediaSettings: E(e.mediaSettings)
-			}, i));
+			}, n));
 		} else if (e.externalId) {
 			let t = Q.fromSignaling(e.externalId, e.deviceIdx);
 			r.externalId = t, this._api.cacheExternalId(r.id, t);
 		}
 		r.state = Z.ACCEPTED, r.mediaSettings = E(e.mediaSettings), this._logWithMediaSettings(C.ACCEPTED_OUTGOING, r.mediaSettings), this._conversation && this._conversation.direction === Ba.OUTGOING && (this._state === "IDLE" || this._state === "PROCESSING") && (this._state = "ACTIVE", this._changeFeatureSet()), this._state === "ACTIVE" && this._transport && this._transport.open([r.id], n), this._changeRemoteMediaSettings(t, r.mediaSettings), await this._changeRemoteParticipantState(t);
 		let i = Object.keys(r.muteStates);
-		i.length && this._onMuteParticipant({
+		if (i.length && this._onMuteParticipant({
 			muteStates: r.muteStates,
 			mediaOptions: i,
 			stateUpdated: !0,
 			participantId: t
-		}), ["ACTIVE", "HELD"].includes(this._state) && L.onAcceptedCall(r.externalId, xa.parseCapabilities(e.capabilities), this.id);
+		}), ["ACTIVE", "HELD"].includes(this._state)) {
+			if (!r.externalId) {
+				this._reportMissingExternalIds([t], "ACCEPTED_CALL");
+				return;
+			}
+			L.onAcceptedCall(r.externalId, xa.parseCapabilities(e.capabilities), this.id);
+		}
 	}
 	async _onHungup(e) {
 		this._debug.debug(`Participant hungup [${e.participantId}]`, { reason: e.reason });
@@ -11326,7 +11391,7 @@ var ls = 15, $ = class e extends b {
 			return;
 		}
 		if (!n) {
-			let { participant: r } = e, i = r.decorativeUserId;
+			let { participant: r } = e, i = j.composeDecorativeId(r);
 			this._registerParticipant({
 				id: t,
 				externalId: Q.fromSignalingParticipant(r, !0, !0),
@@ -11353,7 +11418,7 @@ var ls = 15, $ = class e extends b {
 			return;
 		}
 		if (!n) {
-			let { participant: r } = e, i = r.decorativeUserId;
+			let { participant: r } = e, i = j.composeDecorativeId(r);
 			this._registerParticipant({
 				id: t,
 				externalId: Q.fromSignalingParticipant(r, !0, !0),
@@ -11396,7 +11461,7 @@ var ls = 15, $ = class e extends b {
 	_onParticipantsStateChanged(e) {
 		let { participants: t, roomId: n } = e;
 		t.map(({ id: e, markers: t }) => this._registerParticipantAndSetMarkersIfChunkEnabled(e, t));
-		let r = /* @__PURE__ */ new Map(), i = t.map(({ id: e, participantState: t }) => [e, this._getExternalIdByParticipantId(e) && j.mapParticipantState({ participantState: t })]);
+		let r = /* @__PURE__ */ new Map(), i = t.map(({ id: e, participantState: t }) => [e, this._getExternalIdByParticipantId(e) ? j.mapParticipantState({ participantState: t }) : void 0]);
 		try {
 			i.forEach(([e, t]) => {
 				t && r.set(e, t);
@@ -11795,8 +11860,8 @@ var ls = 15, $ = class e extends b {
 			this._debug.debug(`Remote track added on the participant [${e}]`, { kind: n.kind });
 			let r = this._getParticipant(e);
 			if (!r) {
-				let t = this._api.getDecorativeIdByInitialId(e), n = t ? j.composeUserId(t) : void 0;
-				this._debug.warn(`Conversation: track added before participant [id: ${e}, decorativeId: ${n}]`), this._registerParticipant({ id: e }, n), r = this._getParticipant(e), this._setParticipantsStatus([r], N.WAITING), this._activeSpeakerId === e && this._lastSignalledActiveSpeakerId !== e && (L.onSpeakerChanged(r.externalId, this.id), this._lastSignalledActiveSpeakerId = e);
+				let t = this._api.getDecorativeIdByInitialId(e);
+				this._debug.warn(`Conversation: track added before participant [id: ${e}, decorativeId: ${t}]`), this._registerParticipant({ id: e }, t), r = this._getParticipant(e), this._setParticipantsStatus([r], N.WAITING), this._activeSpeakerId === e && this._lastSignalledActiveSpeakerId !== e && (L.onSpeakerChanged(r.externalId, this.id), this._lastSignalledActiveSpeakerId = e);
 			}
 			if (this._transport && !this._transport.isAllocated(r.id) && this._allocateParticipantTransport(r.id, !1), n.kind === k.audio && (this._audioOutput.add(e, n), M.preserveAudioTracks || (r.remoteAudioTrack = n, t.removeTrack(n))), r.remoteStream !== t && t.getTracks().length) {
 				if (r.remoteStream = t, r.secondStream) return;
@@ -11906,46 +11971,63 @@ var ls = 15, $ = class e extends b {
 	}
 	_onRoomsUpdated(e) {
 		if (this._isCalledState()) return;
-		let t = {};
-		for (let n of Object.keys(Ja)) {
-			let r = e.updates[n];
-			r && (t[n] = {
-				rooms: r?.rooms?.map(this._convertRoomToExternal.bind(this)) || [],
-				roomIds: r?.roomIds,
-				deactivated: r?.deactivated
+		let t = {}, n = [], r = [];
+		for (let i of Object.keys(Ja)) {
+			let a = e.updates[i];
+			a && (a?.rooms?.forEach((e) => {
+				let { room: t, missingParticipantIds: i } = this._convertRoomToExternal(e);
+				t && n.push(t), r.push(...i);
+			}), t[i] = {
+				rooms: n,
+				roomIds: a?.roomIds,
+				deactivated: a?.deactivated
 			});
 		}
-		L.onRoomsUpdated(t, this.id);
+		this._reportMissingExternalIds(r, "ROOMS_UPDATED"), L.onRoomsUpdated(t, this.id);
 	}
 	_onRoomUpdated(e) {
-		let t = this._convertRoomToExternal(e.room || null);
-		e.events.some((e) => e === Ja.UPDATE) && (e.muteStates !== void 0 && this._setMuteStatesForRoomId(e.muteStates, e.roomId), e.recordInfo !== void 0 && this._conversation?.recordsInfoByRoom.set(e.roomId, e.recordInfo), e.asrInfo !== void 0 && this._conversation?.asrInfoByRoom.set(e.roomId, e.asrInfo)), this._isCalledState() || L.onRoomUpdated(e.events, e.roomId, t, e.deactivate || null, this.id);
+		let { room: t, missingParticipantIds: n } = this._convertRoomToExternal(e.room || null);
+		e.events.some((e) => e === Ja.UPDATE) && (e.muteStates !== void 0 && this._setMuteStatesForRoomId(e.muteStates, e.roomId), e.recordInfo !== void 0 && this._conversation?.recordsInfoByRoom.set(e.roomId, e.recordInfo), e.asrInfo !== void 0 && this._conversation?.asrInfoByRoom.set(e.roomId, e.asrInfo)), this._isCalledState() || (this._reportMissingExternalIds(n, "ROOM_UPDATED"), L.onRoomUpdated(e.events, e.roomId, t, e.deactivate || null, this.id));
 	}
 	_convertRoomToExternal(e) {
-		if (!e) return null;
-		let t = e.participantIds?.map((e) => this._getExternalIdByParticipantId(e)) || [], n = e.addParticipantIds?.map((e) => this._getExternalIdByParticipantId(e)) || [], r = e.removeParticipantIds?.map?.((e) => this._getExternalIdByParticipantId(e)) || [], i = e.pinnedParticipantId ? this._getExternalIdByParticipantId(e.pinnedParticipantId) : void 0;
+		if (!e) return {
+			room: null,
+			missingParticipantIds: []
+		};
+		let t = [], { externalIds: n, missingIds: r } = this._getExternalIdsByParticipantIds(e.participantIds ?? []), { externalIds: i, missingIds: a } = this._getExternalIdsByParticipantIds(e.addParticipantIds ?? []), { externalIds: o, missingIds: s } = this._getExternalIdsByParticipantIds(e.removeParticipantIds ?? []);
+		t.push(...r, ...a, ...s);
+		let c;
+		if (e.pinnedParticipantId) {
+			let n = this._getExternalIdByParticipantId(e.pinnedParticipantId);
+			n ? c = n : t.push(e.pinnedParticipantId);
+		}
 		return {
-			id: e.id,
-			name: e.name,
-			participantCount: e.participantCount,
-			participantIds: t,
-			addParticipantIds: n,
-			removeParticipantIds: r,
-			participants: e.participants?.participants ? this._participantListChunkToExternalChunk(e.participants) : void 0,
-			active: e.active,
-			muteStates: e.muteStates,
-			pinnedParticipantId: i,
-			countdownSec: e.countdownSec,
-			timeoutMs: e.timeoutMs
+			room: {
+				id: e.id,
+				name: e.name,
+				participantCount: e.participantCount,
+				participantIds: n,
+				addParticipantIds: i,
+				removeParticipantIds: o,
+				participants: e.participants?.participants ? this._participantListChunkToExternalChunk(e.participants) : void 0,
+				active: e.active,
+				muteStates: e.muteStates,
+				pinnedParticipantId: c,
+				countdownSec: e.countdownSec,
+				timeoutMs: e.timeoutMs
+			},
+			missingParticipantIds: t
 		};
 	}
 	async _onRoomParticipantsUpdated(e) {
-		let t = this._transport?.getState(), n = e.roomId ?? null, r = e.addedParticipantIds?.map((e) => j.decomposeId(e).id) || [], i = this._getExternalIdsByOkIdsFromCache(r), a = e.addedParticipants;
-		if (i.length && a?.length !== i.length && !this._isCalledState()) {
+		let t = this._transport?.getState(), n = e.roomId ?? null, r = [], { externalIds: i, missingIds: a } = this._getExternalIdsByParticipantIds(e.addedParticipantIds ?? []);
+		r.push(...a);
+		let o = e.addedParticipants;
+		if (i.length && o?.length !== i.length && !this._isCalledState()) {
 			let e = this._convertExternalIdsToServerExternalIds(i);
-			a = (await this._signaling.getParticipants(e)).participants;
+			o = (await this._signaling.getParticipants(e)).participants;
 		}
-		let o = a?.map((e) => {
+		let s = o?.map((e) => {
 			let r = j.composeId(e);
 			return this._createParticipant({
 				id: r,
@@ -11961,38 +12043,38 @@ var ls = 15, $ = class e extends b {
 				observedIds: e.observedIds || [],
 				markers: this._denormalizeMarkers(r, e.markers),
 				isInRoom: n !== null
-			}, e.decorativeUserId);
-		}) || [], s = !1;
-		for (let e of o) e.id === this._conversation?.compositeUserId && (s = !0), this._registerParticipantInCache(e);
-		this._transport?.getState() === q.IDLE && !this._isCalledState() && this._openTransport(o, !0);
-		let c = [];
+			}, j.composeDecorativeId(e));
+		}) || [], c = !1;
+		for (let e of s) e.id === this._conversation?.compositeUserId && (c = !0), this._registerParticipantInCache(e);
+		this._transport?.getState() === q.IDLE && !this._isCalledState() && this._openTransport(s, !0);
+		let l = [];
 		if (e?.removedParticipantMarkers) {
 			for (let t of e.removedParticipantMarkers) if (t.GRID?.id) {
 				let e = this._getExternalIdByParticipantId(t.GRID.id);
-				c.push(e);
+				e ? l.push(e) : r.push(t.GRID.id);
 			}
 		}
-		if (s && await this._onRoomSwitched(n), c) {
+		if (this._reportMissingExternalIds(r, "ROOM_PARTICIPANTS_UPDATED"), c && await this._onRoomSwitched(n), l) {
 			let e = this._conversation?.pinnedParticipantIdByRoom.get(n);
 			if (e) {
 				let t = this._getExternalIdByParticipantId(e);
 				if (t) {
-					for (let e of c) if (Q.compare(t, e)) {
+					for (let e of l) if (Q.compare(t, e)) {
 						this._conversation?.pinnedParticipantIdByRoom.delete(n);
 						break;
 					}
 				}
 			}
 		}
-		let l = {
+		let u = {
 			roomId: n,
 			participantCount: e.participantCount,
 			addedParticipantIds: i,
-			addedParticipants: j.mapSharedParticipants(o),
+			addedParticipants: j.mapSharedParticipants(s),
 			removedParticipantMarkers: e?.removedParticipantMarkers,
-			removedParticipantIds: c
+			removedParticipantIds: l
 		};
-		this._isCalledState() || L.onRoomParticipantsUpdated(l, this.id);
+		this._isCalledState() || L.onRoomParticipantsUpdated(u, this.id);
 	}
 	async _onRoomSwitched(e, t = !1) {
 		if (!this._conversation || this._conversation.roomId === e) return;
@@ -12012,7 +12094,7 @@ var ls = 15, $ = class e extends b {
 			if (this._setMuteStatesForRoomId(t.muteStates, n), this._conversation?.recordsInfoByRoom.set(n, t.recordInfo ?? null), this._conversation?.pinnedParticipantIdByRoom.set(n, t.pinnedParticipantId ?? null), t.asrInfo && this._conversation?.asrInfoByRoom.set(n, t.asrInfo), t.urlSharingInfo ? this._conversation?.urlSharingInfoByRoom.set(n, t.urlSharingInfo) : this._conversation?.urlSharingInfoByRoom.delete(n), e) {
 				let e = this._participants;
 				await this._registerParticipants(t?.participants?.participants?.filter((t) => !e[j.composeId(t)]) || [], !0);
-				let n = this._convertRoomToExternal(t);
+				let { room: n } = this._convertRoomToExternal(t);
 				n && r.push(n);
 			}
 		}
@@ -12046,7 +12128,9 @@ var ls = 15, $ = class e extends b {
 			return;
 		}
 		let o = Q.fromSignaling(r, a.deviceIdx);
-		if (L.onParticipantIdChanged(a, o, this.id), this._api.cacheExternalId(n, o), this._api.mapDecorativeId(n, t), i) this._conversation.externalId = o;
+		L.onParticipantIdChanged(a, o, this.id);
+		let s = j.compose(n, a.deviceIdx), c = j.compose(t, a.deviceIdx);
+		if (this._api.cacheExternalId(s, o), this._api.mapDecorativeId(s, c), i) this._conversation.externalId = o;
 		else {
 			let e = this._participants;
 			e[t].externalId = o;
@@ -12218,22 +12302,16 @@ var Es = class {
 	}
 	log(e) {}
 	logClientStats(e) {}
-	getCachedOkIdByExternalId(e) {
+	getCachedParticipantIdByExternalId(e) {
 		return null;
 	}
-	getCachedRawOkIdByExternalId(e) {
-		return null;
-	}
-	getCachedExternalIdByOkId(e) {
+	getCachedExternalIdByParticipantId(e) {
 		return null;
 	}
 	cacheExternalId(e, t) {}
 	mapDecorativeId(e, t) {}
 	unmapDecorativeId(e) {}
 	getDecorativeIdByInitialId(e) {}
-	replaceByInitialIdIdIfExists(e) {
-		return typeof e == "string" ? parseInt(e, 10) : e;
-	}
 	hangupConversation(e, t = D.HUNGUP, n) {}
 	async removeHistoryRecords(e) {}
 	async getServerTime() {
@@ -12245,7 +12323,7 @@ var Es = class {
 	}
 }, Ds = class e {
 	constructor() {
-		h(this, "_okIdToExternalId", /* @__PURE__ */ new Map()), h(this, "_externalIdToOkId", /* @__PURE__ */ new Map()), h(this, "_decorativeIdToInitialId", /* @__PURE__ */ new Map()), h(this, "_initialIdToDecorativeId", /* @__PURE__ */ new Map());
+		h(this, "_participantIdToExternalId", /* @__PURE__ */ new Map()), h(this, "_externalIdToParticipantId", /* @__PURE__ */ new Map()), h(this, "_decorativeIdToInitialId", /* @__PURE__ */ new Map()), h(this, "_initialIdToDecorativeId", /* @__PURE__ */ new Map());
 	}
 	static _normalizeType(e) {
 		return e.type === to.GROUP ? {
@@ -12253,46 +12331,30 @@ var Es = class {
 			type: to.USER
 		} : e;
 	}
-	getOkId(t) {
-		let n = Q.toString(e._normalizeType(t)), r = this._externalIdToOkId.get(n);
-		return r == null ? null : this.replaceByInitialIdIdIfExists(r);
-	}
 	getExternalId(e) {
-		let t = this.getDecorativeIdByInitialId(e) ?? e, n = this._okIdToExternalId.get(t);
+		let t = this._initialIdToDecorativeId.get(e) ?? e, n = this._participantIdToExternalId.get(t);
 		return n == null ? null : Q.fromString(n);
 	}
-	hasByExternalId(t) {
-		return this._externalIdToOkId.has(Q.toString(e._normalizeType(t)));
-	}
-	hasByOkId(e) {
-		return this._okIdToExternalId.has(e);
+	getParticipantId(t) {
+		let n = Q.toString(e._normalizeType(t)), r = this._externalIdToParticipantId.get(n);
+		return r == null ? null : this._decorativeIdToInitialId.get(r) ?? r;
 	}
 	cache(t, n) {
-		let r = j.extractOkId(t), i = e._normalizeType(n), a = Q.toString(i);
-		this._okIdToExternalId.set(r, a), this._externalIdToOkId.set(a, r);
+		let r = e._normalizeType(n), i = Q.toString(r);
+		this._participantIdToExternalId.set(t, i), this._externalIdToParticipantId.set(i, t);
 	}
 	mapDecorativeId(e, t) {
-		let n = j.extractOkId(e), r = j.extractOkId(t);
-		this._decorativeIdToInitialId.set(n, r), this._initialIdToDecorativeId.set(r, n);
+		this._decorativeIdToInitialId.set(e, t), this._initialIdToDecorativeId.set(t, e);
 	}
 	unmapDecorativeId(e) {
-		let t = j.extractOkId(e), n = this.getDecorativeIdByInitialId(t);
-		n && this._decorativeIdToInitialId.delete(n), this._initialIdToDecorativeId.delete(t);
+		let t = this._initialIdToDecorativeId.get(e);
+		t && this._decorativeIdToInitialId.delete(t), this._initialIdToDecorativeId.delete(e);
 	}
 	getDecorativeIdByInitialId(e) {
-		let t = j.extractOkId(e);
-		return this._initialIdToDecorativeId.get(t);
-	}
-	replaceByInitialIdIdIfExists(e) {
-		let t = j.extractOkId(e);
-		return this._decorativeIdToInitialId.get(t) ?? t;
-	}
-	getParticipantIdByExternalId(e) {
-		let t = this.getOkId(e);
-		return t == null ? null : j.composeParticipantId(t, A.USER, e.deviceIdx ?? 0);
+		return this._initialIdToDecorativeId.get(e);
 	}
 	clear() {
-		this._okIdToExternalId.clear(), this._externalIdToOkId.clear(), this._decorativeIdToInitialId.clear(), this._initialIdToDecorativeId.clear();
+		this._participantIdToExternalId.clear(), this._externalIdToParticipantId.clear(), this._decorativeIdToInitialId.clear(), this._initialIdToDecorativeId.clear();
 	}
 }, Os = "anonymLogin:", ks = 700, As = 3e3;
 function js(e) {
@@ -12380,8 +12442,11 @@ var Ps = class extends Es {
 		}
 	}
 	userId(e) {
-		let { compositeUserId: t } = j.decomposeParticipantId(e), { id: n } = j.decomposeId(t);
-		return y.isEmpty() ? Q.fromId(String(n)) : this._idCache.getExternalId(n) || Q.fromId(String(n));
+		if (y.isEmpty()) {
+			let { compositeUserId: t } = j.decomposeParticipantId(e), { id: n } = j.decomposeId(t);
+			return Q.fromId(String(n));
+		}
+		return this._idCache.getExternalId(e);
 	}
 	async authorize() {
 		if (this._ensureUuid(), !M.apiKey) throw new O(x.API, {
@@ -12569,13 +12634,10 @@ var Ps = class extends Es {
 		};
 		return n?.length && (i.observedIds = n.join(",")), M.anonymToken && (i.anonymToken = M.anonymToken), r && (i.payload = r), this._call("vchat.joinConversationByLink", i);
 	}
-	getCachedOkIdByExternalId(e) {
-		return this._idCache.getParticipantIdByExternalId(e);
+	getCachedParticipantIdByExternalId(e) {
+		return this._idCache.getParticipantId(e);
 	}
-	getCachedRawOkIdByExternalId(e) {
-		return this._idCache.getOkId(e);
-	}
-	getCachedExternalIdByOkId(e) {
+	getCachedExternalIdByParticipantId(e) {
 		return this._idCache.getExternalId(e);
 	}
 	cacheExternalId(e, t) {
@@ -12590,9 +12652,6 @@ var Ps = class extends Es {
 	getDecorativeIdByInitialId(e) {
 		return this._idCache.getDecorativeIdByInitialId(e);
 	}
-	replaceByInitialIdIdIfExists(e) {
-		return this._idCache.replaceByInitialIdIdIfExists(e);
-	}
 	async getConversationParams(e) {
 		let t = {};
 		return M.anonymToken && (t.anonymToken = M.anonymToken), e && (t.conversationId = e), this._call("vchat.getConversationParams", t);
@@ -12742,10 +12801,16 @@ async function Xs(t) {
 }
 async function Zs(e, t = [S.AUDIO], n = "", r = !1, i = !1, a, o, s) {
 	let c = [];
-	return Array.isArray(e) ? c = e.length ? e : [] : e && (c = [e]), Qs([], Va.USER, t, n, r, i, a, c, o, s);
+	return Array.isArray(e) ? c = e.length ? e : [] : e && (c = [e]), $s([], Va.USER, t, n, r, i, a, c, o, s);
 }
-async function Qs(e, t = Va.USER, n, r = "", i = !1, a = !1, o, s, c, l) {
-	if (!M.hold && z.callsLength > 0) throw R.error("There is already active call"), new O(D.HAS_ACTIVE_CALL);
+function Qs(e, t = []) {
+	let n = e.getIncomingCallerExternalId();
+	return n ? t.length === 1 && t[0].id === n.id && t[0].type === n.type : !1;
+}
+async function $s(e, t = Va.USER, n, r = "", i = !1, a = !1, o, s, c, l) {
+	if (!M.hold && z.getActive()) throw R.error("There is already active call"), new O(D.HAS_ACTIVE_CALL);
+	let u = z.getAll().find((e) => e.isIncomingRinging);
+	if (!M.hold && u && !Qs(u, s)) throw R.error("There is already incoming call"), new O(D.HAS_ACTIVE_CALL);
 	return new $(new Ps(), Hs).onStart({
 		opponentIds: e,
 		opponentType: t,
@@ -12759,30 +12824,30 @@ async function Qs(e, t = Va.USER, n, r = "", i = !1, a = !1, o, s, c, l) {
 		conversationId: l
 	});
 }
-async function $s(e, t) {
-	return ec(e, A.USER, void 0, t);
+async function ec(e, t) {
+	return tc(e, A.USER, void 0, t);
 }
-async function ec(e, t = A.USER, n, r, i, a) {
+async function tc(e, t = A.USER, n, r, i, a) {
 	if (e === $.id()) throw Error("Push has already been processed");
 	return new $(new Ps(), Hs).onPush(e, t, n, r, i, a);
 }
-async function tc() {
+async function nc() {
 	return Vs.getInbounds();
 }
-async function nc(e, t) {
+async function rc(e, t) {
 	return e && (M.authToken = e), t !== void 0 && M.apiBaseUrl !== t && (M.apiBaseUrl = t, hs()), Vs.authorize();
 }
-async function rc(e = [S.AUDIO], t) {
-	return El(t).accept(e);
+async function ic(e = [S.AUDIO], t) {
+	return kl(t).accept(e);
 }
-async function ic(e) {
-	let t = Tl(e?.conversationId);
+async function ac(e) {
+	let t = El(e?.conversationId);
 	if (t) return t.decline(e);
 }
-async function ac(e, t = [S.AUDIO]) {
-	return oc(e, t);
+async function oc(e, t = [S.AUDIO]) {
+	return sc(e, t);
 }
-async function oc(e, t, n) {
+async function sc(e, t, n) {
 	if (!M.hold && z.callsLength > 0) throw R.error("There is already active call"), new O(D.HAS_ACTIVE_CALL);
 	return new $(new Ps(), Hs).onJoin({
 		conversationId: e,
@@ -12790,7 +12855,7 @@ async function oc(e, t, n) {
 		chatId: n
 	});
 }
-async function sc(e, t = [S.AUDIO], n, r, i, a) {
+async function cc(e, t = [S.AUDIO], n, r, i, a) {
 	if (!M.hold && z.callsLength > 0) throw R.error("There is already active call"), new O(D.HAS_ACTIVE_CALL);
 	return n && (M.anonymToken = n), new $(new Ps(), Hs).onJoin({
 		joinLink: e,
@@ -12801,30 +12866,30 @@ async function sc(e, t = [S.AUDIO], n, r, i, a) {
 		anonymous: !!M.anonymToken
 	});
 }
-function cc(e) {
-	let t = Tl(e?.conversationId);
+function lc(e) {
+	let t = El(e?.conversationId);
 	return t ? t.hangup(e) : ($.hangupAfterInit(e?.onFastHangup), Promise.resolve());
 }
-async function lc(e, t) {
+async function uc(e, t) {
 	let n = Array.isArray(e) ? e : [e], r = $.current();
 	r && await r.addParticipant(n, t);
 }
-async function uc(e, t) {
+async function dc(e, t) {
 	let n = $.current();
 	if (n) {
 		let r = e.map((e) => j.composeUserId(e));
 		await n.addParticipantLegacy(r, t);
 	}
 }
-async function dc(e, t = !1) {
-	let n = $.current()?.getCachedRawOkIdByExternalId(e) ?? null;
-	if (!n) {
-		R.warn("removeParticipant: externalId not found in cache", e);
-		return;
+async function fc(e, t = !1) {
+	let n = Al(e, "removeParticipant");
+	if (n) try {
+		await n.conversation.removeParticipant(j.decomposeParticipantId(n.participantId).compositeUserId, t);
+	} catch (e) {
+		R.warn(`Failed to remove participant ${n.participantId}. Perhaps he is no longer on the call. ${e}`);
 	}
-	return fc(n, t);
 }
-async function fc(e, t = !1) {
+async function pc(e, t = !1) {
 	let n = $.current();
 	if (n) try {
 		await n.removeParticipant(j.composeUserId(e), t);
@@ -12832,13 +12897,13 @@ async function fc(e, t = !1) {
 		R.warn(`Failed to remove participant ${e}. Perhaps he is no longer on the call. ${t}`);
 	}
 }
-async function pc(e, t) {
+async function mc(e, t) {
 	let n = $.current();
 	if (e === "videoinput" && jt.contains(t)) return M.videoFacingMode = t, n ? (T.isMobile() && n.stopVideoTrack(), n.changeDevice(e)) : void 0;
 	if (!await T._saveDeviceId(e, t)) throw Error(`Device not found: ${t}`);
 	if (n) return n.changeDevice(e);
 }
-async function mc(e, t) {
+async function hc(e, t) {
 	let n = typeof e == "object" ? {
 		...e,
 		fastScreenSharing: e.captureScreen && e.fastScreenSharing,
@@ -12847,151 +12912,149 @@ async function mc(e, t) {
 		captureScreen: e,
 		fastScreenSharing: !1,
 		captureAudio: !1
-	}, r = Tl(t);
+	}, r = El(t);
 	return r ? r.toggleScreenCapturing(n) : Promise.reject();
 }
-function hc(e) {
+function gc(e) {
 	let t = $.current();
 	t && t.toggleAnimojiCapturing(e);
 }
-async function gc(e, t = !1) {
+async function _c(e, t = !1) {
 	let n = $.current();
 	n && await n.setVideoStream(e, t);
 }
-async function _c(e, t) {
-	let n = Tl(t);
+async function vc(e, t) {
+	let n = El(t);
 	n && await n.toggleLocalVideo(e);
 }
-async function vc(e, t) {
-	let n = Tl(t);
+async function yc(e, t) {
+	let n = El(t);
 	n && await n.toggleLocalAudio(e);
 }
-async function yc(e) {
+async function bc(e) {
 	let t = $.current();
 	if (t) return t.setLocalResolution(e);
 }
-async function bc(e) {
+async function xc(e) {
 	let t = $.current();
 	t && await t.changePriorities(e);
 }
-async function xc(e, t) {
+async function Sc(e, t) {
 	let n = $.current();
 	if (n) {
-		let r;
 		if (t) {
-			let e = n.getCachedRawOkIdByExternalId(t);
-			if (!e) {
-				R.warn("changeParticipantState: externalId not found in cache", t);
+			let r = n.getCachedParticipantIdByExternalId(t);
+			if (!r) {
+				Dl(t, "changeParticipantState", n);
 				return;
 			}
-			r = j.composeParticipantId(e, A.USER, t.deviceIdx);
+			await n.changeParticipantState(e, r);
+			return;
 		}
-		await n.changeParticipantState(e, r);
+		await n.changeParticipantState(e);
 	}
 }
-async function Sc() {
+async function Cc() {
 	let e = $.current();
 	e && await e.putHandsDown();
 }
-async function Cc(e) {
+async function wc(e) {
 	let t = $.current();
 	t && await t.updateDisplayLayout(e);
 }
-async function wc(e) {
+async function Tc(e) {
 	let t = $.current();
 	t && await t.requestDisplayLayout(e);
 }
-async function Tc(e, t, n = !1) {
-	let r = $.current()?.getCachedRawOkIdByExternalId(e) ?? null;
-	if (!r) {
-		R.warn("grantRoles: externalId not found in cache", e);
-		return;
-	}
-	return Ec(r, Q.getDeviceIdx(e), t, n);
+async function Ec(e, t, n = !1) {
+	let r = Al(e, "grantRoles");
+	r && await r.conversation.grantRoles(r.participantId, t, n);
 }
-async function Ec(e, t, n, r = !1) {
+async function Dc(e, t, n, r = !1) {
 	let i = $.current();
 	i && await i.grantRoles(j.composeParticipantId(e, A.USER, t), n, r);
 }
-async function Dc({ externalId: e = null, muteStates: t, requestedMedia: n = [], roomId: r = null }) {
-	let i = null;
-	return e && (i = $.current()?.getCachedRawOkIdByExternalId(e) ?? null, i || R.warn("muteParticipant: externalId not found in cache", e)), Oc({
-		uid: i,
-		muteStates: t,
-		requestedMedia: n,
-		deviceIdx: Q.getDeviceIdx(e),
-		roomId: r
-	});
+async function Oc({ externalId: e = null, muteStates: t, requestedMedia: n = [], roomId: r = null }) {
+	if (e) {
+		let i = Al(e, "muteParticipant");
+		return i ? i.conversation.muteParticipant(i.participantId, t, n, r) : void 0;
+	}
+	let i = $.current();
+	i && await i.muteParticipant(null, t, n, r);
 }
-async function Oc({ uid: e = null, muteStates: t, requestedMedia: n = [], deviceIdx: r = 0, roomId: i = null }) {
+async function kc({ uid: e = null, muteStates: t, requestedMedia: n = [], deviceIdx: r = 0, roomId: i = null }) {
 	let a = $.current();
 	if (a) {
 		let o = e ? j.composeParticipantId(e, A.USER, r) : null;
 		await a.muteParticipant(o, t, n, i);
 	}
 }
-async function kc(e, t = !1, n = null) {
-	let r = $.current()?.getCachedRawOkIdByExternalId(e) ?? null;
-	if (!r) {
-		R.warn("pinParticipant: externalId not found in cache", e);
-		return;
-	}
-	return Ac(r, t, Q.getDeviceIdx(e), n);
+async function Ac(e, t = !1, n = null) {
+	let r = Al(e, "pinParticipant");
+	r && await r.conversation.pinParticipant(r.participantId, t, n);
 }
-async function Ac(e, t = !1, n = 0, r = null) {
+async function jc(e, t = !1, n = 0, r = null) {
 	let i = $.current();
 	i && await i.pinParticipant(j.composeParticipantId(e, A.USER, n), t, r);
 }
-async function jc(e) {
+async function Mc(e) {
 	let t = $.current();
 	t && await t.updateMediaModifiers(e);
 }
-async function Mc(e) {
+async function Nc(e) {
 	let t = $.current();
 	t && await t.enableVideoSuspend(e);
 }
-async function Nc(e) {
+async function Pc(e) {
 	let t = $.current();
 	t && await t.enableVideoSuspendSuggest(e);
 }
-async function Pc(e) {
+async function Fc(e) {
 	let t = $.current();
 	t && await t.changeOptions(e);
 }
-async function Fc(e, t = null) {
-	let n = null;
-	return t && (n = $.current()?.getCachedRawOkIdByExternalId(t) ?? null, n || R.warn("chatMessage: externalId not found in cache", t)), Ic(e, n);
-}
 async function Ic(e, t = null) {
+	if (t) {
+		let n = Al(t, "chatMessage");
+		return n ? n.conversation.chatMessage(e, j.decomposeParticipantId(n.participantId).compositeUserId) : void 0;
+	}
+	let n = $.current();
+	n && await n.chatMessage(e, null);
+}
+async function Lc(e, t = null) {
 	let n = $.current();
 	if (n) {
 		let r = t ? j.composeUserId(t) : null;
 		await n.chatMessage(e, r);
 	}
 }
-async function Lc(e = 10) {
+async function Rc(e = 10) {
 	let t = $.current();
 	if (t) return t.chatHistory(e);
 }
-async function Rc(e, t = null) {
-	let n = null;
-	return t && (n = $.current()?.getCachedRawOkIdByExternalId(t) ?? null, n || R.warn("customData: externalId not found in cache", t)), zc(e, n, Q.getDeviceIdx(t));
+async function zc(e, t = null) {
+	if (t) {
+		let n = Al(t, "customData");
+		return n ? n.conversation.customData(e, n.participantId) : void 0;
+	}
+	let n = $.current();
+	n && await n.customData(e, null);
 }
-async function zc(e, t = null, n = 0) {
+async function Bc(e, t = null, n = 0) {
 	let r = $.current();
 	if (r) {
 		let i = t ? j.composeParticipantId(t, A.USER, n) : null;
 		await r.customData(e, i);
 	}
 }
-async function Bc(e = "", t = !1, { onlyAdminCanShareMovie: n = !1, waitForAdmin: r = !1, closedConversation: i = !1 } = {}, a) {
+async function Vc(e = "", t = !1, { onlyAdminCanShareMovie: n = !1, waitForAdmin: r = !1, closedConversation: i = !1 } = {}, a) {
 	return (await Vs.createConversation(a ?? j.uuid(), e, t, {
 		onlyAdminCanShareMovie: n,
 		waitForAdmin: r,
 		closedConversation: i
 	})).join_link;
 }
-async function Vc(e = "", t = !1, { onlyAdminCanShareMovie: n = !1, audioOnly: r = !1 } = {}, i) {
+async function Hc(e = "", t = !1, { onlyAdminCanShareMovie: n = !1, audioOnly: r = !1 } = {}, i) {
 	let a = i.map((e) => Q.fromId(e));
 	return (await Vs.createConversation(j.uuid(), e, t, {
 		onlyAdminCanShareMovie: n,
@@ -12999,115 +13062,114 @@ async function Vc(e = "", t = !1, { onlyAdminCanShareMovie: n = !1, audioOnly: r
 		audioOnly: r
 	}, a)).join_link;
 }
-async function Hc() {
+async function Uc() {
 	let e = $.current();
 	return e ? e.createJoinLink() : Promise.reject();
 }
-async function Uc() {
+async function Wc() {
 	let e = $.current();
 	return e ? e.removeJoinLink() : Promise.reject();
 }
-async function Wc(e, t) {
+async function Gc(e, t) {
 	return Vs.getAnonymTokenByLink(e, t);
 }
-function Gc(e) {
+function Kc(e) {
 	let t = $.current();
 	t && t.setVolume(e);
 }
-function Kc(e) {
+function qc(e) {
 	M.forceRelayPolicy = e;
 }
-async function qc(e = !1, t = null, n = null, r = "DIRECT_LINK", i = null, a = null) {
+async function Jc(e = !1, t = null, n = null, r = "DIRECT_LINK", i = null, a = null) {
 	let o = $.current();
 	return o ? o.startStream(e, t, n, r, i, a) : Promise.reject();
 }
-async function Jc(e = null, t) {
+async function Yc(e = null, t) {
 	let n = $.current();
 	return n ? n.stopStream(e, t) : Promise.reject();
 }
-async function Yc(e = null) {
+async function Xc(e = null) {
 	let t = $.current();
 	return t ? t.publishStream(e) : Promise.reject();
 }
-async function Xc() {
+async function Zc() {
 	let e = $.current();
 	return e ? e.getStreamInfo() : Promise.reject();
 }
-async function Zc(e) {
+async function Qc(e) {
 	let t = $.current();
 	return t ? t.addMovie(e) : Promise.reject();
 }
-async function Qc(e) {
+async function $c(e) {
 	let t = $.current();
 	return t ? t.updateMovie(e) : Promise.reject();
 }
-async function $c(e) {
+async function el(e) {
 	let t = $.current();
 	return t ? t.removeMovie(e) : Promise.reject();
 }
-async function el(e, t) {
+async function tl(e, t) {
 	let n = $.current();
 	if (n) {
-		let r = [];
+		let r = [], i = [];
 		for (let t of e) {
-			let e, i;
+			let e, a;
 			t.addParticipantIds && (e = [], t.addParticipantIds.forEach((t) => {
-				let r = n.getCachedRawOkIdByExternalId(t);
-				r ? e.push(j.composeUserId(r)) : R.warn("updateRooms addParticipant: externalId not found in cache", t);
-			})), t.removeParticipantIds && (i = [], t.removeParticipantIds.forEach((e) => {
-				let t = n.getCachedRawOkIdByExternalId(e);
-				t ? i.push(j.composeUserId(t)) : R.warn("updateRooms removeParticipant: externalId not found in cache", e);
+				let r = n.getCachedParticipantIdByExternalId(t);
+				r ? e.push(j.decomposeParticipantId(r).compositeUserId) : i.push(t.id);
+			})), t.removeParticipantIds && (a = [], t.removeParticipantIds.forEach((e) => {
+				let t = n.getCachedParticipantIdByExternalId(e);
+				t ? a.push(j.decomposeParticipantId(t).compositeUserId) : i.push(e.id);
 			})), r.push({
 				id: t.id,
 				name: t.name,
 				participantCount: t.participantCount,
 				addParticipantIds: e,
-				removeParticipantIds: i,
+				removeParticipantIds: a,
 				countdownSec: t.countdownSec
 			});
 		}
+		if (i.length) {
+			Ol(i, "updateRooms", n);
+			return;
+		}
 		return n.updateRooms(r, t);
 	}
 	return Promise.reject();
 }
-async function tl(e, t) {
+async function nl(e, t) {
 	let n = $.current();
 	return n ? n.activateRooms(e, t) : Promise.reject();
 }
-async function nl(e = null, t = null) {
+async function rl(e = null, t = null) {
 	let n = $.current();
 	if (!n) return Promise.reject();
 	let r;
-	if (t) {
-		let e = n.getCachedRawOkIdByExternalId(t);
-		if (!e) {
-			R.warn("switchRoom: externalId not found in cache", t);
-			return;
-		}
-		let i = Q.getDeviceIdx(t);
-		r = j.composeParticipantId(e, A.USER, i);
+	if (t && (r = n.getCachedParticipantIdByExternalId(t) ?? void 0, !r)) {
+		Dl(t, "switchRoom", n);
+		return;
 	}
 	return n.switchRoom(e, r);
 }
-async function rl(e) {
+async function il(e) {
 	let t = $.current();
 	return t ? t.removeRooms(e) : Promise.reject();
 }
-function il(e) {
+function al(e) {
 	M.statisticsInterval = e;
 	let t = $.current();
 	if (t) return t.updateStatisticsInterval();
 }
-function al(t) {
+function ol(t) {
 	e.disableLog(!t), R.toggle(t);
 }
-function ol(e, ...t) {
+function sl(e, ...t) {
 	M.debugLog && ($.debugMessage(e, "[external]", ...t) || R.send(e, "[external]", ...t));
 }
-function sl(e, t, ...n) {
+function cl(e, t, ...n) {
 	M.debugLog && ($.debugMessageWithContext(e, t, "[external]", ...n) || R.send(e, "[external]", ...n));
 }
-var cl = {
+var ll = {
 	list: Ne,
 	get: Pe,
 	getJson: Fe,
@@ -13115,7 +13177,7 @@ var cl = {
 	clear: Le,
 	stats: Re
 };
-function ll() {
+function ul() {
 	let e = [
 		[`Calls SDK ${M.sdkVersion}`, M.toJSON()],
 		["UserAgent:", navigator.userAgent],
@@ -13132,124 +13194,139 @@ function ll() {
 		d: e
 	}));
 }
-async function ul() {
+async function dl() {
 	let e = $.id(), t = $.debugSessionId();
 	if (!t || !e) throw R.error("[uploadDebugLogs]", "No conversation id found"), Error("No conversation id found");
 	let n = await Pe({ sessionId: t });
 	if (n.length === 0) throw R.error("[uploadDebugLogs]", "No logs found"), Error("No logs found");
 	let r = n[0].t, i = n[n.length - 1].t;
 	try {
-		return Vs?.uploadDebugLogs(e, r, i, JSON.stringify([...ll(), ...n]));
+		return Vs?.uploadDebugLogs(e, r, i, JSON.stringify([...ul(), ...n]));
 	} catch (e) {
 		throw R.error("[uploadDebugLogs]", "Error while uploading logs", e), Error("Error while uploading logs", { cause: e });
 	}
 }
-async function dl(e) {
+async function fl(e) {
 	let t = $.current();
 	if (t) return t.videoEffect(e);
 }
-async function fl(e, t) {
+async function pl(e, t) {
 	let n = $.current();
 	if (n) return n.audioEffect(e.length > 0 ? e : null, t);
 }
-async function pl(e) {
+async function ml(e) {
 	let t = $.current();
 	t && await t.setAudioStream(e);
 }
-async function ml(e, t = null, n = null) {
+async function hl(e, t = null, n = null) {
 	let r = $.current();
 	if (!r) return;
 	let i = n ?? t?.id, a = null;
-	if (t) {
-		let e = r.getCachedRawOkIdByExternalId(t);
-		if (!e) throw Error("Could not get user id to set animoji svg");
-		a = j.composeParticipantId(e, A.USER, Q.getDeviceIdx(t));
+	if (t && (a = r.getCachedParticipantIdByExternalId(t), !a)) {
+		Dl(t, "setVmojiSvg", r);
+		return;
 	}
 	r.setAnimojiSvg(e, a, i);
 }
-function hl(e) {
+function gl(e) {
 	let t = $.current();
 	t && t.setAnimojiFill(e);
 }
-async function gl(e = null, t, n = !1) {
-	return El().getWaitingHall(e, t, n);
+async function _l(e = null, t, n = !1) {
+	return kl().getWaitingHall(e, t, n);
 }
-async function _l() {
-	return El().getAudienceModeHands();
+async function vl() {
+	return kl().getAudienceModeHands();
 }
-async function vl(e, t = !1) {
-	let n = El(), r;
+async function yl(e, t = !1) {
+	let n = kl(), r;
 	if (e) {
-		let t = n.getCachedRawOkIdByExternalId(e);
+		let t = n.getCachedParticipantIdByExternalId(e);
 		if (!t) {
-			R.warn("promoteParticipant: externalId not found in cache", e);
+			Dl(e, "promoteParticipant", n);
 			return;
 		}
-		r = j.composeUserId(t);
+		r = j.decomposeParticipantId(t).compositeUserId;
 	}
 	return n.promoteParticipant(r, t);
 }
-async function yl(e = !1) {
-	return El().requestPromotion(e);
-}
 async function bl(e = !1) {
-	return El().acceptPromotion(e);
+	return kl().requestPromotion(e);
 }
-async function xl(e) {
-	return El().getParticipantListChunk(e);
+async function xl(e = !1) {
+	return kl().acceptPromotion(e);
 }
 async function Sl(e) {
-	return El().getParticipants(e);
+	return kl().getParticipantListChunk(e);
 }
 async function Cl(e) {
-	return El().feedback(e);
+	return kl().getParticipants(e);
 }
-async function wl(e, t, n) {
-	return El(n).enableFeatureForRoles(e, t);
+async function wl(e) {
+	return kl().feedback(e);
 }
-function Tl(e) {
-	return e ? z.get(e) ?? null : $.current() ?? z.getFirst();
+async function Tl(e, t, n) {
+	return kl(n).enableFeatureForRoles(e, t);
 }
 function El(e) {
-	let t = Tl(e);
+	return e ? z.get(e) ?? null : $.current() ?? z.getFirst();
+}
+function Dl(e, t, n) {
+	L.onNonFatalError(/* @__PURE__ */ Error(`Participant ID mapping not found for external ID "${e.id}" while handling ${t}`), n.id);
+}
+function Ol(e, t, n) {
+	let r = Array.from(new Set(e));
+	L.onNonFatalError(/* @__PURE__ */ Error(`Participant ID mapping not found for external IDs "${r.join("\", \"")}" while handling ${t}`), n.id);
+}
+function kl(e) {
+	let t = El(e);
 	if (!t) throw Error("Conversation not found");
 	return t;
 }
-async function Dl(e) {
+function Al(e, t) {
+	let n = $.current();
+	if (!n) return null;
+	let r = n.getCachedParticipantIdByExternalId(e);
+	return r ? {
+		conversation: n,
+		participantId: r
+	} : (Dl(e, t, n), null);
+}
+async function jl(e) {
 	await Vs.removeHistoryRecords(e);
 }
-async function Ol(e) {
+async function Ml(e) {
 	let t = $.current() ?? z.getFirst();
 	t && await t.startAsr(e);
 }
-async function kl(e) {
+async function Nl(e) {
 	let t = $.current() ?? z.getFirst();
 	t && await t.stopAsr(e);
 }
-async function Al(e) {
+async function Pl(e) {
 	let t = $.current() ?? z.getFirst();
 	t && await t.requestAsr(e);
 }
-async function jl(e) {
+async function Fl(e) {
 	let t = $.current();
 	return t ? t.startUrlSharing(e) : Promise.reject();
 }
-async function Ml() {
+async function Il() {
 	let e = $.current();
 	return e ? e.stopUrlSharing() : Promise.reject();
 }
-async function Nl(e) {
+async function Ll(e) {
 	await z.switchCall(e);
 }
-function Pl() {
+function Rl() {
 	return z.getActiveId();
 }
-function Fl() {
+function zl() {
 	return $.getSyncedTime();
 }
-function Il() {
+function Bl() {
 	return M.sdkVersion;
 }
 typeof window < "u" && (window.__CALLS_SDK = yn);
 //#endregion
-export { Ps as Api, Bs as ApiExternal, zs as ArrayDequeue, y as AuthData, f as BaseLogger, Ba as CallDirection, Va as CallType, Ha as ChatRoomEventType, Ua as ConversationFeature, Wa as ConversationOption, Sn as DebugMessageType, to as ExternalIdType, jt as FacingMode, x as FatalError, O as HangupReason, D as HangupType, S as MediaOption, k as MediaTrackKind, V as MediaType, qa as MuteState, Z as ParticipantState, Rs as ParticipantStateDataValue, N as ParticipantStatus, Ls as RecordRole, Ja as RoomsEventType, za as Signaling, B as SignalingCommandType, vr as SignalingConnectionType, K as SignalingNotification, J as TransportTopology, Za as UserRole, A as UserType, To as VolumeDetector, rc as acceptCall, bl as acceptPromotion, tl as activateRooms, Zc as addMovie, lc as addParticipant, uc as addParticipantInternal, nc as authorize, Us as browser, Qs as callInternal, Zs as callTo, mc as captureScreen, hc as captureVmoji, fl as changeAudioEffect, Pc as changeConversationOptions, pc as changeDevice, xc as changeParticipantState, bc as changePriorities, dl as changeVideoEffect, Lc as chatHistory, Fc as chatMessage, Ic as chatMessageInternal, Hc as createJoinLink, Rc as customData, zc as customDataInternal, al as debug, cl as debugLogs, ol as debugMessage, sl as debugMessageWithContext, ic as declineCall, wl as enableFeatureForRoles, Mc as enableVideoSuspend, Nc as enableVideoSuspendSuggest, Cl as feedback, Kc as forceRelayPolicy, Pl as getActiveCallId, Wc as getAnonymTokenByLink, _l as getAudienceModeHands, tc as getInbounds, xl as getParticipantListChunk, Sl as getParticipants, Xc as getStreamInfo, Fl as getSyncedTime, gl as getWaitingHall, Tc as grantRoles, Ec as grantRolesInternal, cc as hangup, Xs as init, ac as joinCall, sc as joinCallByLink, oc as joinCallInternal, Dc as muteParticipant, Oc as muteParticipantInternal, kc as pinParticipant, Ac as pinParticipantInternal, $s as processPush, ec as processPushInternal, vl as promoteParticipant, Yc as publishStream, Sc as putHandsDown, Dl as removeHistoryRecords, Uc as removeJoinLink, $c as removeMovie, dc as removeParticipant, fc as removeParticipantInternal, rl as removeRooms, Al as requestAsr, wc as requestDisplayLayout, yl as requestPromotion, qs as setAudioEffects, pl as setAudioStream, yc as setLocalResolution, Gs as setLogger, jc as setMediaModifiers, il as setStatisticsInterval, Js as setVad, Ks as setVideoEffects, gc as setVideoStream, Ys as setVmoji, hl as setVmojiFill, ml as setVmojiSvg, Gc as setVolume, Ol as startAsr, Vc as startAudienceConversation, Bc as startConversation, qc as startStream, jl as startUrlSharing, kl as stopAsr, Jc as stopStream, Ml as stopUrlSharing, Nl as switchCall, nl as switchRoom, vc as toggleLocalAudio, _c as toggleLocalVideo, Cc as updateDisplayLayout, Qc as updateMovie, el as updateRooms, ul as uploadDebugLogs, Ws as utils, Il as version };
+export { Ps as Api, Bs as ApiExternal, zs as ArrayDequeue, y as AuthData, f as BaseLogger, Ba as CallDirection, Va as CallType, Ha as ChatRoomEventType, Ua as ConversationFeature, Wa as ConversationOption, Sn as DebugMessageType, to as ExternalIdType, jt as FacingMode, x as FatalError, O as HangupReason, D as HangupType, S as MediaOption, k as MediaTrackKind, V as MediaType, qa as MuteState, Z as ParticipantState, Rs as ParticipantStateDataValue, N as ParticipantStatus, Ls as RecordRole, Ja as RoomsEventType, za as Signaling, B as SignalingCommandType, vr as SignalingConnectionType, K as SignalingNotification, J as TransportTopology, Za as UserRole, A as UserType, To as VolumeDetector, ic as acceptCall, xl as acceptPromotion, nl as activateRooms, Qc as addMovie, uc as addParticipant, dc as addParticipantInternal, rc as authorize, Us as browser, $s as callInternal, Zs as callTo, hc as captureScreen, gc as captureVmoji, pl as changeAudioEffect, Fc as changeConversationOptions, mc as changeDevice, Sc as changeParticipantState, xc as changePriorities, fl as changeVideoEffect, Rc as chatHistory, Ic as chatMessage, Lc as chatMessageInternal, Uc as createJoinLink, zc as customData, Bc as customDataInternal, ol as debug, ll as debugLogs, sl as debugMessage, cl as debugMessageWithContext, ac as declineCall, Tl as enableFeatureForRoles, Nc as enableVideoSuspend, Pc as enableVideoSuspendSuggest, wl as feedback, qc as forceRelayPolicy, Rl as getActiveCallId, Gc as getAnonymTokenByLink, vl as getAudienceModeHands, nc as getInbounds, Sl as getParticipantListChunk, Cl as getParticipants, Zc as getStreamInfo, zl as getSyncedTime, _l as getWaitingHall, Ec as grantRoles, Dc as grantRolesInternal, lc as hangup, Xs as init, oc as joinCall, cc as joinCallByLink, sc as joinCallInternal, Oc as muteParticipant, kc as muteParticipantInternal, Ac as pinParticipant, jc as pinParticipantInternal, ec as processPush, tc as processPushInternal, yl as promoteParticipant, Xc as publishStream, Cc as putHandsDown, jl as removeHistoryRecords, Wc as removeJoinLink, el as removeMovie, fc as removeParticipant, pc as removeParticipantInternal, il as removeRooms, Pl as requestAsr, Tc as requestDisplayLayout, bl as requestPromotion, qs as setAudioEffects, ml as setAudioStream, bc as setLocalResolution, Gs as setLogger, Mc as setMediaModifiers, al as setStatisticsInterval, Js as setVad, Ks as setVideoEffects, _c as setVideoStream, Ys as setVmoji, gl as setVmojiFill, hl as setVmojiSvg, Kc as setVolume, Ml as startAsr, Hc as startAudienceConversation, Vc as startConversation, Jc as startStream, Fl as startUrlSharing, Nl as stopAsr, Yc as stopStream, Il as stopUrlSharing, Ll as switchCall, rl as switchRoom, yc as toggleLocalAudio, vc as toggleLocalVideo, wc as updateDisplayLayout, $c as updateMovie, tl as updateRooms, dl as uploadDebugLogs, Ws as utils, Bl as version };