@vindral/web-sdk 4.3.0-7-ga7804427 → 4.3.0-9-g13d8cb8f

package/{CH6V1aJ7.js → BWe37SYR.js}

@@ -7740,45 +7740,35 @@ function Eg() {
 var Dg = (e, t) => {
 	var n, r;
 	let i = new URL("/subscribe", e);
-	return i.searchParams.append("channelId", t.channelId), i.searchParams.append("sessionId", t.sessionId), i.searchParams.append("clientId", t.clientId), (n = t.audio) != null && n.codec && (i.searchParams.append("audio.bitRate", Math.round(t.audio.bitRate).toString()), i.searchParams.append("audio.codec", t.audio.codec), t.audio.language && i.searchParams.append("audio.language", t.audio.language)), (r = t.video) != null && r.codec && (i.searchParams.append("video.width", t.video.width.toString()), i.searchParams.append("video.height", t.video.height.toString()), i.searchParams.append("video.bitRate", Math.round(t.video.bitRate).toString()), i.searchParams.append("video.codec", t.video.codec)), t.expectAdditionalConnection && i.searchParams.append("expectAdditionalConnection", t.expectAdditionalConnection.toString()), t.burstMs && i.searchParams.append("burstMs", t.burstMs.toString()), t.channelGroupId && i.searchParams.append("channelGroupId", t.channelGroupId), t.authToken && (i.searchParams.append("auth.token", t.authToken), i.searchParams.append("auth.type", "jwt")), i.toString();
+	return i.searchParams.append("channelId", t.channelId), i.searchParams.append("sessionId", t.sessionId), i.searchParams.append("clientId", t.clientId), (n = t.audio) != null && n.codec && (i.searchParams.append("audio.bitRate", Math.round(t.audio.bitRate).toString()), i.searchParams.append("audio.codec", t.audio.codec), t.audio.language && i.searchParams.append("audio.language", t.audio.language)), (r = t.video) != null && r.codec && (i.searchParams.append("video.width", t.video.width.toString()), i.searchParams.append("video.height", t.video.height.toString()), i.searchParams.append("video.bitRate", Math.round(t.video.bitRate).toString()), i.searchParams.append("video.codec", t.video.codec)), t.burstMs && i.searchParams.append("burstMs", t.burstMs.toString()), t.channelGroupId && i.searchParams.append("channelGroupId", t.channelGroupId), t.authToken && (i.searchParams.append("auth.token", t.authToken), i.searchParams.append("auth.type", "jwt")), i.toString();
 }, Og = /* @__PURE__ */ function(e) {
 	return e[e.AuthenticationFailed = 4e3] = "AuthenticationFailed", e[e.AuthenticationRefreshFailed = 4001] = "AuthenticationRefreshFailed", e[e.AuthenticationExpired = 4002] = "AuthenticationExpired", e[e.ChannelNotFound = 4003] = "ChannelNotFound", e[e.Inactivity = 4010] = "Inactivity", e;
 }({}), kg = class extends ge {
 	constructor(n, r) {
 		var i;
-		super(), i = this, e(this, "options", void 0), e(this, "websockets", []), e(this, "logger", void 0), e(this, "reconnectState", { reconnectRetries: 0 }), e(this, "isSuspended", !1), e(this, "_connectionAttemptCount", 0), e(this, "connectStartTime", 0), e(this, "_connectTime", void 0), e(this, "connectTimeout", void 0), e(this, "shouldContinueConnecting", !1), e(this, "_isConnectInProgress", !1), e(this, "readyState", () => {
-			if (this.websockets.length === 0) return WebSocket.CLOSED;
-			let e = this.websockets.map((e) => e.readyState);
-			for (let t of e) switch (t) {
-				case WebSocket.OPEN: continue;
-				default: return t;
-			}
-			return WebSocket.OPEN;
+		super(), i = this, e(this, "options", void 0), e(this, "websocket", void 0), e(this, "logger", void 0), e(this, "reconnectState", { reconnectRetries: 0 }), e(this, "isSuspended", !1), e(this, "_connectionAttemptCount", 0), e(this, "connectStartTime", 0), e(this, "_connectTime", void 0), e(this, "connectTimeout", void 0), e(this, "shouldContinueConnecting", !1), e(this, "_isConnectInProgress", !1), e(this, "readyState", () => {
+			var e, t;
+			return (e = (t = this.websocket) == null ? void 0 : t.readyState) == null ? WebSocket.CLOSED : e;
 		}), e(this, "url", () => {
 			var e;
-			return (e = this.websockets[0]) == null ? void 0 : e.url;
+			return (e = this.websocket) == null ? void 0 : e.url;
 		}), e(this, "send", (e) => {
-			if (this.websockets.length) {
-				var t;
-				(t = this.websockets[0]) == null || t.send(e);
-			}
-		}), e(this, "closeSockets", (e, t) => {
-			let n = !1;
-			return e.forEach((e) => {
-				e.onmessage = o, e.removeEventListener("error", this.onError), e.removeEventListener("close", this.onClose), e.removeEventListener("open", this.onOpen), e.close(1e3, t), n = !0;
-			}), n;
+			var t;
+			(t = this.websocket) == null || t.send(e);
+		}), e(this, "closeSocket", (e, t) => {
+			e.onmessage = o, e.removeEventListener("error", this.onError), e.removeEventListener("close", this.onClose), e.removeEventListener("open", this.onOpen), e.close(1e3, t);
 		}), e(this, "close", (e) => {
 			this.clearConnectTimeout();
-			let t = this.closeSockets(this.websockets, e);
-			return this.websockets = [], this.shouldContinueConnecting = !1, this._isConnectInProgress = !1, this.logger.info("Closed websocket", { reason: e }), t;
+			let t = this.websocket;
+			return t && this.closeSocket(t, e), this.websocket = void 0, this.shouldContinueConnecting = !1, this._isConnectInProgress = !1, this.logger.info("Closed websocket", { reason: e }), !!t;
 		}), e(this, "suspend", () => {
 			this.isSuspended = !0;
 		}), e(this, "unsuspend", () => {
 			this.isSuspended = !1, this.readyState() !== WebSocket.OPEN && !this.isConnectInProgress && this.connect();
-		}), e(this, "onMessage", (e, t) => {
-			this.websockets.length !== 0 && this.options.onMessage(e, t.data);
+		}), e(this, "onMessage", (e) => {
+			this.options.onMessage(e.data);
 		}), e(this, "onError", () => {
-			this.logger.warn("On error", w({}, this.options)), this.close("one websocket had an error"), this.emit("error", new g("WebSocket error", {
+			this.logger.warn("On error", w({}, this.options)), this.close("websocket had an error"), this.emit("error", new g("WebSocket error", {
 				code: "websocket_error",
 				isFatal: !1
 			}));
@@ -7788,7 +7778,7 @@ var Dg = (e, t) => {
 				reason: e.reason,
 				code: e.code,
 				isSuspended: this.isSuspended
-			})), this.close("one websocket was closed");
+			})), this.close("websocket was closed");
 			let n;
 			switch (e.code) {
 				case Og.AuthenticationFailed:
@@ -7826,20 +7816,17 @@ var Dg = (e, t) => {
 				if (i.reconnectState.reconnectRetries++, !e) return i._isConnectInProgress = !1, i.emit("error", s()), !1;
 			}
 			i._connectionAttemptCount++;
-			let t = [];
+			let t;
 			try {
 				if (!i.shouldContinueConnecting) return i._isConnectInProgress = !1, i.logger.info("Connection aborted"), !1;
-				let { url: e, connectionCount: n } = yield i.options.connectHandler();
+				let e = yield i.options.connectHandler();
 				if (i.connectStartTime = Date.now(), !i.shouldContinueConnecting) return i._isConnectInProgress = !1, i.logger.info("Connection aborted"), !1;
-				i.logger.info("Connecting websockets", w(w({}, i.options), {}, { url: e }));
-				for (let r = 0; r < n; r++) {
-					let n = new WebSocket(e);
-					n.binaryType = "arraybuffer", n.onmessage = (e) => i.onMessage(r, e), n.addEventListener("error", i.onError), n.addEventListener("close", i.onClose), n.addEventListener("open", i.onOpen), t.push(n);
-				}
-				return i.websockets = t, i.startConnectTimeout(), !0;
+				i.logger.info("Connecting websocket", w(w({}, i.options), {}, { url: e }));
+				let n = new WebSocket(e);
+				return t = n, n.binaryType = "arraybuffer", n.onmessage = i.onMessage, n.addEventListener("error", i.onError), n.addEventListener("close", i.onClose), n.addEventListener("open", i.onOpen), i.websocket = n, i.startConnectTimeout(), !0;
 			} catch (e) {
 				let n = i.shouldContinueConnecting;
-				return i.clearConnectTimeout(), i.closeSockets(t.length > 0 ? t : i.websockets, "failed to create websocket"), i.websockets = [], i.shouldContinueConnecting = !1, i._isConnectInProgress = !1, e instanceof g && (i.logger.error("Failed to connect", e.toStringifiable()), e.isFatal()) ? !1 : n ? (i.logger.info("Connection aborted", { error: e }), i.emit("error", new g("Failed to connect", {
+				return i.clearConnectTimeout(), t && i.closeSocket(t, "failed to create websocket"), i.websocket = void 0, i.shouldContinueConnecting = !1, i._isConnectInProgress = !1, e instanceof g && (i.logger.error("Failed to connect", e.toStringifiable()), e.isFatal()) ? !1 : n ? (i.logger.info("Connection aborted", { error: e }), i.emit("error", new g("Failed to connect", {
 					code: "failed_to_connect",
 					isFatal: !1,
 					source: e,
@@ -7851,9 +7838,6 @@ var Dg = (e, t) => {
 	get isConnectInProgress() {
 		return this._isConnectInProgress;
 	}
-	get connectionCount() {
-		return this.websockets.length;
-	}
 	get connectionAttemptCount() {
 		return this._connectionAttemptCount;
 	}
@@ -7866,7 +7850,7 @@ var Dg = (e, t) => {
 }, Fg = class n {
 	constructor(r, i, a, s) {
 		var c = this;
-		e(this, "emitter", void 0), e(this, "transport", void 0), e(this, "logger", void 0), e(this, "config", void 0), e(this, "rtts", void 0), e(this, "lastPingSentTime", Date.now()), e(this, "isPingInFlight", !1), e(this, "connectCount", 0), e(this, "missedPings", 0), e(this, "contextSwitchesInProgress", /* @__PURE__ */ new Set()), e(this, "contextSwitchesCompleted", /* @__PURE__ */ new Set()), e(this, "buffer", []), e(this, "disconnected", new T()), e(this, "unload", () => {
+		e(this, "emitter", void 0), e(this, "transport", void 0), e(this, "logger", void 0), e(this, "config", void 0), e(this, "rtts", void 0), e(this, "lastPingSentTime", Date.now()), e(this, "isPingInFlight", !1), e(this, "connectCount", 0), e(this, "missedPings", 0), e(this, "isContextSwitchInProgress", !1), e(this, "signalBuffer", []), e(this, "dataBuffer", []), e(this, "disconnected", new T()), e(this, "unload", () => {
 			this.logger.debug("Unloading module..."), this.close("Unloading"), this.emitter.off("send signal", this.sendSignal), this.emitter.off("disconnect", this.close), this.emitter.off("reconnect", this.reconnect), this.logger.debug("Unloaded module");
 		}), e(this, "suspend", () => {
 			this.resetPingState(), this.transport.suspend();
@@ -7884,36 +7868,33 @@ var Dg = (e, t) => {
 				return;
 			}
 			this.transport.send(JSON.stringify(e));
-		}), e(this, "getStatistics", () => {
-			var e;
-			return {
-				edgeUrl: (e = this.transport) == null ? void 0 : e.url(),
-				connectionProtocol: "vindral_ws",
-				transportSelectionReason: void 0
-			};
-		}), e(this, "onMessage", (e, t) => {
-			var n;
-			if (this.pingCooldownExpired() && this.sendPing(), this.contextSwitchesCompleted.size === ((n = this.transport) == null ? void 0 : n.connectionCount)) {
-				this.logger.info("Completing context switch"), this.contextSwitchesInProgress.clear(), this.contextSwitchesCompleted.clear();
-				let e = this.buffer.filter(([e, t]) => !(t instanceof ArrayBuffer)), t = this.buffer.filter(([e, t]) => t instanceof ArrayBuffer);
-				e.map((e) => this.handleMessage(e[0], e[1])), t.map((e) => this.handleMessage(e[0], e[1])), this.buffer = [];
-			}
-			if (this.contextSwitchesInProgress.has(e)) {
-				if (!(t instanceof ArrayBuffer)) {
-					let n = JSON.parse(t);
-					if (Sn(n) && n.type === "context switch complete") {
-						this.logger.info("context switch completed", { socketId: e }), this.emitter.emit("context switch complete"), this.contextSwitchesCompleted.add(e);
+		}), e(this, "getStatistics", () => ({
+			edgeUrl: this.transport.url(),
+			connectionProtocol: "vindral_ws",
+			transportSelectionReason: void 0
+		})), e(this, "onMessage", (e) => {
+			if (this.pingCooldownExpired() && this.sendPing(), this.isContextSwitchInProgress) {
+				if (e instanceof ArrayBuffer) {
+					this.dataBuffer.push(e);
+					return;
+				}
+				let t = JSON.parse(e);
+				if (Sn(t)) {
+					if (t.type === "pong") {
+						this.handleMessage(e);
+						return;
+					}
+					if (t.type === "context switch complete") {
+						this.logger.info("context switch completed"), this.emitter.emit("context switch complete"), this.isContextSwitchInProgress = !1, this.flushContextSwitchBuffer();
 						return;
 					}
 				}
-				this.buffer.push([e, t]);
+				this.signalBuffer.push(e);
 				return;
 			}
-			this.handleMessage(e, t);
+			this.handleMessage(e);
 		}), e(this, "resolveEdgeUrl", t(function* () {
-			let e = c.config.connectInfo, t = yield c.config.onConnectInfo(e), n = c.config.options.getOverride("separateVideoSocketEnabled", t.channelId), r = c.config.options.get("media") === "audio+video", i = 1;
-			r && (i = n === !1 ? 1 : 2);
-			let a = Dg(c.config.edgeUrl, {
+			let e = c.config.connectInfo, t = yield c.config.onConnectInfo(e), n = Dg(c.config.edgeUrl, {
 				video: t.video,
 				audio: t.audio,
 				burstMs: t.burstMs,
@@ -7921,27 +7902,31 @@ var Dg = (e, t) => {
 				clientId: t.clientId,
 				channelId: t.channelId,
 				channelGroupId: t.channelGroupId,
-				expectAdditionalConnection: i > 1,
 				authToken: c.config.options.get("authenticationToken")
 			});
-			return c.logger.debug("Resolved edge url", { edgeUrl: a }), {
-				url: a,
-				connectionCount: i
-			};
-		})), e(this, "handleMessage", (e, t) => {
-			if (t instanceof ArrayBuffer) this.emitter.emit("received data", t);
+			return c.logger.debug("Resolved edge url", { edgeUrl: n }), n;
+		})), e(this, "flushContextSwitchBuffer", () => {
+			this.logger.info("Flushing context switch buffer");
+			let e = this.signalBuffer, t = this.dataBuffer;
+			this.signalBuffer = [], this.dataBuffer = [], e.forEach((e) => {
+				this.handleMessage(e);
+			}), t.forEach((e) => {
+				this.handleMessage(e);
+			});
+		}), e(this, "handleMessage", (e) => {
+			if (e instanceof ArrayBuffer) this.emitter.emit("received data", e);
 			else {
-				let n = JSON.parse(t);
-				if (!Sn(n)) return;
-				switch (n.type) {
+				let t = JSON.parse(e);
+				if (!Sn(t)) return;
+				switch (t.type) {
 					case "pong":
 						this.lastPingSentTime && (this.rtts.push(Date.now() - this.lastPingSentTime), this.isPingInFlight = !1, this.emitter.emit("rtt", Ot(this.rtts.items())));
 						break;
 					case "context switch":
-						this.logger.info("Starting context switch", { socketId: e }), this.emitter.emit("context switch started"), this.contextSwitchesInProgress.add(e);
+						this.logger.info("Starting context switch"), this.emitter.emit("context switch started"), this.isContextSwitchInProgress = !0;
 						break;
 					default:
-						this.emitter.emit("received signal", n);
+						this.emitter.emit("received signal", t);
 						break;
 				}
 			}
@@ -7954,16 +7939,14 @@ var Dg = (e, t) => {
 			}, this.logger.createContext("Transport"));
 			return e.on("open", this.onTransportChange), e.on("close", this.onTransportChange), e.on("error", (e) => this.disconnected.reject(e)), e.connect(), e;
 		}), e(this, "close", (e = "Disconnect Requested") => {
-			var t;
-			this.contextSwitchesCompleted.clear(), this.contextSwitchesInProgress.clear(), this.buffer = [], this.resetPingState(), this.disconnected.resolve(), (t = this.transport) == null || t.close(e);
+			this.isContextSwitchInProgress = !1, this.signalBuffer = [], this.dataBuffer = [], this.resetPingState(), this.disconnected.resolve(), this.transport.close(e);
 		}), e(this, "onTransportChange", () => {
 			switch (this.getState()) {
 				case "connected":
-					var e;
-					(e = this.transport) != null && e.connectTime && (this.rtts.push(this.transport.connectTime / n.TLS_ROUNDTRIPS / (this.transport.connectionCount || 1)), this.emitter.emit("rtt", Ot(this.rtts.items()))), this.connectCount++, this.resetPingState();
+					this.transport.connectTime && (this.rtts.push(this.transport.connectTime / n.TLS_ROUNDTRIPS), this.emitter.emit("rtt", Ot(this.rtts.items()))), this.connectCount++, this.resetPingState();
 					break;
 				default:
-					this.contextSwitchesCompleted.clear(), this.contextSwitchesInProgress.clear(), this.buffer = [], this.resetPingState(), this.disconnected.resolve();
+					this.isContextSwitchInProgress = !1, this.signalBuffer = [], this.dataBuffer = [], this.resetPingState(), this.disconnected.resolve();
 					break;
 			}
 			this.emitter.emit("connection state", this.getState());
@@ -10562,7 +10545,6 @@ var Vv = [
 	"maxBufferTime",
 	"burstEnabled",
 	"sizeBasedResolutionCapEnabled",
-	"separateVideoSocketEnabled",
 	"webcodecsHardwareAcceleration",
 	"offscreenCanvasEnabled",
 	"videoCodecs"
@@ -11026,7 +11008,7 @@ var Uv = class {
 			let e = this.modules.canvasModule instanceof J_ ? !0 : void 0;
 			return w({
 				uptime: Date.now() - this.createdAt,
-				version: "4.3.0-7-ga7804427",
+				version: "4.3.0-9-g13d8cb8f",
 				clientId: this.clientId,
 				sessionId: this.sessionId,
 				channelId: this.channelId,

package/{CHh416pp.js → CnyY6hCE.js}

@@ -1,5 +1,5 @@
 import { n as e, t } from "./BsfwXDui.js";
-import { _ as n, a as r, c as i, d as a, f as o, g as s, h as c, i as ee, l, m as te, n as u, o as ne, p as re, r as ie, s as ae, t as oe, u as se, v as ce } from "./CH6V1aJ7.js";
+import { _ as n, a as r, c as i, d as a, f as o, g as s, h as c, i as ee, l, m as te, n as u, o as ne, p as re, r as ie, s as ae, t as oe, u as se, v as ce } from "./BWe37SYR.js";
 import { M as le } from "./C01DcfYu.js";
 import { a as d, i as f, n as p, r as m, t as h } from "./B7hT-BKr.js";
 import { n as ue, t as de } from "./DeYmk5AL.js";

package/api-client.d.ts

@@ -38,7 +38,6 @@ interface ClientOverrides {
 	maxBufferTime?: number;
 	burstEnabled?: boolean;
 	sizeBasedResolutionCapEnabled?: boolean;
-	separateVideoSocketEnabled?: boolean;
 	webcodecsHardwareAcceleration?: WebCodecsHardwareAccelerationPreference;
 	offscreenCanvasEnabled?: boolean;
 	videoCodecs?: string[];

package/core.d.ts

@@ -449,7 +449,6 @@ interface ClientOverrides {
 	maxBufferTime?: number;
 	burstEnabled?: boolean;
 	sizeBasedResolutionCapEnabled?: boolean;
-	separateVideoSocketEnabled?: boolean;
 	webcodecsHardwareAcceleration?: WebCodecsHardwareAccelerationPreference;
 	offscreenCanvasEnabled?: boolean;
 	videoCodecs?: string[];

package/core.js

@@ -1,3 +1,3 @@
-import { t as e } from "./CH6V1aJ7.js";
+import { t as e } from "./BWe37SYR.js";
 import { a as t, c as n, i as r, l as i, n as a, o, r as s, s as c, u as l } from "./C01DcfYu.js";
 export { a as AUTHENTICATION_EXPIRED_CODE, s as AUTHENTICATION_FAILED_CODE, r as CHANNEL_NOT_FOUND_CODE, t as CONNECTION_FAILED_AFTER_RETRIES_CODE, o as CONNECTION_FAILED_CODE, c as DISCONNECTED_BY_EDGE, n as INACTIVITY_CODE, i as NO_INCOMING_DATA, e as Vindral, l as VindralError };

package/legacy.d.ts

@@ -452,7 +452,6 @@ interface ClientOverrides {
 	maxBufferTime?: number;
 	burstEnabled?: boolean;
 	sizeBasedResolutionCapEnabled?: boolean;
-	separateVideoSocketEnabled?: boolean;
 	webcodecsHardwareAcceleration?: WebCodecsHardwareAccelerationPreference;
 	offscreenCanvasEnabled?: boolean;
 	videoCodecs?: string[];

package/legacy.es.js

@@ -8650,7 +8650,7 @@ function Vv() {
 var Hv = (e, t) => {
 	var n, r;
 	let i = new URL("/subscribe", e);
-	return i.searchParams.append("channelId", t.channelId), i.searchParams.append("sessionId", t.sessionId), i.searchParams.append("clientId", t.clientId), (n = t.audio) != null && n.codec && (i.searchParams.append("audio.bitRate", Math.round(t.audio.bitRate).toString()), i.searchParams.append("audio.codec", t.audio.codec), t.audio.language && i.searchParams.append("audio.language", t.audio.language)), (r = t.video) != null && r.codec && (i.searchParams.append("video.width", t.video.width.toString()), i.searchParams.append("video.height", t.video.height.toString()), i.searchParams.append("video.bitRate", Math.round(t.video.bitRate).toString()), i.searchParams.append("video.codec", t.video.codec)), t.expectAdditionalConnection && i.searchParams.append("expectAdditionalConnection", t.expectAdditionalConnection.toString()), t.burstMs && i.searchParams.append("burstMs", t.burstMs.toString()), t.channelGroupId && i.searchParams.append("channelGroupId", t.channelGroupId), t.authToken && (i.searchParams.append("auth.token", t.authToken), i.searchParams.append("auth.type", "jwt")), i.toString();
+	return i.searchParams.append("channelId", t.channelId), i.searchParams.append("sessionId", t.sessionId), i.searchParams.append("clientId", t.clientId), (n = t.audio) != null && n.codec && (i.searchParams.append("audio.bitRate", Math.round(t.audio.bitRate).toString()), i.searchParams.append("audio.codec", t.audio.codec), t.audio.language && i.searchParams.append("audio.language", t.audio.language)), (r = t.video) != null && r.codec && (i.searchParams.append("video.width", t.video.width.toString()), i.searchParams.append("video.height", t.video.height.toString()), i.searchParams.append("video.bitRate", Math.round(t.video.bitRate).toString()), i.searchParams.append("video.codec", t.video.codec)), t.burstMs && i.searchParams.append("burstMs", t.burstMs.toString()), t.channelGroupId && i.searchParams.append("channelGroupId", t.channelGroupId), t.authToken && (i.searchParams.append("auth.token", t.authToken), i.searchParams.append("auth.type", "jwt")), i.toString();
 };
 Ei(), V(), m(), z(), N();
 var Uv = /* @__PURE__ */ function(e) {
@@ -8658,39 +8658,29 @@ var Uv = /* @__PURE__ */ function(e) {
 }({}), Wv = class extends Ut {
 	constructor(e, t) {
 		var n;
-		super(), n = this, p(this, "options", void 0), p(this, "websockets", []), p(this, "logger", void 0), p(this, "reconnectState", { reconnectRetries: 0 }), p(this, "isSuspended", !1), p(this, "_connectionAttemptCount", 0), p(this, "connectStartTime", 0), p(this, "_connectTime", void 0), p(this, "connectTimeout", void 0), p(this, "shouldContinueConnecting", !1), p(this, "_isConnectInProgress", !1), p(this, "readyState", () => {
-			if (this.websockets.length === 0) return WebSocket.CLOSED;
-			let e = this.websockets.map((e) => e.readyState);
-			for (let t of e) switch (t) {
-				case WebSocket.OPEN: continue;
-				default: return t;
-			}
-			return WebSocket.OPEN;
+		super(), n = this, p(this, "options", void 0), p(this, "websocket", void 0), p(this, "logger", void 0), p(this, "reconnectState", { reconnectRetries: 0 }), p(this, "isSuspended", !1), p(this, "_connectionAttemptCount", 0), p(this, "connectStartTime", 0), p(this, "_connectTime", void 0), p(this, "connectTimeout", void 0), p(this, "shouldContinueConnecting", !1), p(this, "_isConnectInProgress", !1), p(this, "readyState", () => {
+			var e, t;
+			return (e = (t = this.websocket) == null ? void 0 : t.readyState) == null ? WebSocket.CLOSED : e;
 		}), p(this, "url", () => {
 			var e;
-			return (e = this.websockets[0]) == null ? void 0 : e.url;
+			return (e = this.websocket) == null ? void 0 : e.url;
 		}), p(this, "send", (e) => {
-			if (this.websockets.length) {
-				var t;
-				(t = this.websockets[0]) == null || t.send(e);
-			}
-		}), p(this, "closeSockets", (e, t) => {
-			let n = !1;
-			return e.forEach((e) => {
-				e.onmessage = x, e.removeEventListener("error", this.onError), e.removeEventListener("close", this.onClose), e.removeEventListener("open", this.onOpen), e.close(1e3, t), n = !0;
-			}), n;
+			var t;
+			(t = this.websocket) == null || t.send(e);
+		}), p(this, "closeSocket", (e, t) => {
+			e.onmessage = x, e.removeEventListener("error", this.onError), e.removeEventListener("close", this.onClose), e.removeEventListener("open", this.onOpen), e.close(1e3, t);
 		}), p(this, "close", (e) => {
 			this.clearConnectTimeout();
-			let t = this.closeSockets(this.websockets, e);
-			return this.websockets = [], this.shouldContinueConnecting = !1, this._isConnectInProgress = !1, this.logger.info("Closed websocket", { reason: e }), t;
+			let t = this.websocket;
+			return t && this.closeSocket(t, e), this.websocket = void 0, this.shouldContinueConnecting = !1, this._isConnectInProgress = !1, this.logger.info("Closed websocket", { reason: e }), !!t;
 		}), p(this, "suspend", () => {
 			this.isSuspended = !0;
 		}), p(this, "unsuspend", () => {
 			this.isSuspended = !1, this.readyState() !== WebSocket.OPEN && !this.isConnectInProgress && this.connect();
-		}), p(this, "onMessage", (e, t) => {
-			this.websockets.length !== 0 && this.options.onMessage(e, t.data);
+		}), p(this, "onMessage", (e) => {
+			this.options.onMessage(e.data);
 		}), p(this, "onError", () => {
-			this.logger.warn("On error", R({}, this.options)), this.close("one websocket had an error"), this.emit("error", new H("WebSocket error", {
+			this.logger.warn("On error", R({}, this.options)), this.close("websocket had an error"), this.emit("error", new H("WebSocket error", {
 				code: "websocket_error",
 				isFatal: !1
 			}));
@@ -8700,7 +8690,7 @@ var Uv = /* @__PURE__ */ function(e) {
 				reason: e.reason,
 				code: e.code,
 				isSuspended: this.isSuspended
-			})), this.close("one websocket was closed");
+			})), this.close("websocket was closed");
 			let n;
 			switch (e.code) {
 				case Uv.AuthenticationFailed:
@@ -8738,20 +8728,17 @@ var Uv = /* @__PURE__ */ function(e) {
 				if (n.reconnectState.reconnectRetries++, !e) return n._isConnectInProgress = !1, n.emit("error", xi()), !1;
 			}
 			n._connectionAttemptCount++;
-			let t = [];
+			let t;
 			try {
 				if (!n.shouldContinueConnecting) return n._isConnectInProgress = !1, n.logger.info("Connection aborted"), !1;
-				let { url: e, connectionCount: r } = yield n.options.connectHandler();
+				let e = yield n.options.connectHandler();
 				if (n.connectStartTime = Date.now(), !n.shouldContinueConnecting) return n._isConnectInProgress = !1, n.logger.info("Connection aborted"), !1;
-				n.logger.info("Connecting websockets", R(R({}, n.options), {}, { url: e }));
-				for (let i = 0; i < r; i++) {
-					let r = new WebSocket(e);
-					r.binaryType = "arraybuffer", r.onmessage = (e) => n.onMessage(i, e), r.addEventListener("error", n.onError), r.addEventListener("close", n.onClose), r.addEventListener("open", n.onOpen), t.push(r);
-				}
-				return n.websockets = t, n.startConnectTimeout(), !0;
+				n.logger.info("Connecting websocket", R(R({}, n.options), {}, { url: e }));
+				let r = new WebSocket(e);
+				return t = r, r.binaryType = "arraybuffer", r.onmessage = n.onMessage, r.addEventListener("error", n.onError), r.addEventListener("close", n.onClose), r.addEventListener("open", n.onOpen), n.websocket = r, n.startConnectTimeout(), !0;
 			} catch (e) {
 				let r = n.shouldContinueConnecting;
-				return n.clearConnectTimeout(), n.closeSockets(t.length > 0 ? t : n.websockets, "failed to create websocket"), n.websockets = [], n.shouldContinueConnecting = !1, n._isConnectInProgress = !1, e instanceof H && (n.logger.error("Failed to connect", e.toStringifiable()), e.isFatal()) ? !1 : r ? (n.logger.info("Connection aborted", { error: e }), n.emit("error", new H("Failed to connect", {
+				return n.clearConnectTimeout(), t && n.closeSocket(t, "failed to create websocket"), n.websocket = void 0, n.shouldContinueConnecting = !1, n._isConnectInProgress = !1, e instanceof H && (n.logger.error("Failed to connect", e.toStringifiable()), e.isFatal()) ? !1 : r ? (n.logger.info("Connection aborted", { error: e }), n.emit("error", new H("Failed to connect", {
 					code: "failed_to_connect",
 					isFatal: !1,
 					source: e,
@@ -8763,9 +8750,6 @@ var Uv = /* @__PURE__ */ function(e) {
 	get isConnectInProgress() {
 		return this._isConnectInProgress;
 	}
-	get connectionCount() {
-		return this.websockets.length;
-	}
 	get connectionAttemptCount() {
 		return this._connectionAttemptCount;
 	}
@@ -8780,7 +8764,7 @@ var Gv, Kv = 65536 * 8, qv = .9, Jv = 40, Yv = (e) => {
 }, Xv = class e {
 	constructor(t, n, r, i) {
 		var a = this;
-		p(this, "emitter", void 0), p(this, "transport", void 0), p(this, "logger", void 0), p(this, "config", void 0), p(this, "rtts", void 0), p(this, "lastPingSentTime", Date.now()), p(this, "isPingInFlight", !1), p(this, "connectCount", 0), p(this, "missedPings", 0), p(this, "contextSwitchesInProgress", /* @__PURE__ */ new Set()), p(this, "contextSwitchesCompleted", /* @__PURE__ */ new Set()), p(this, "buffer", []), p(this, "disconnected", new S()), p(this, "unload", () => {
+		p(this, "emitter", void 0), p(this, "transport", void 0), p(this, "logger", void 0), p(this, "config", void 0), p(this, "rtts", void 0), p(this, "lastPingSentTime", Date.now()), p(this, "isPingInFlight", !1), p(this, "connectCount", 0), p(this, "missedPings", 0), p(this, "isContextSwitchInProgress", !1), p(this, "signalBuffer", []), p(this, "dataBuffer", []), p(this, "disconnected", new S()), p(this, "unload", () => {
 			this.logger.debug("Unloading module..."), this.close("Unloading"), this.emitter.off("send signal", this.sendSignal), this.emitter.off("disconnect", this.close), this.emitter.off("reconnect", this.reconnect), this.logger.debug("Unloaded module");
 		}), p(this, "suspend", () => {
 			this.resetPingState(), this.transport.suspend();
@@ -8798,36 +8782,33 @@ var Gv, Kv = 65536 * 8, qv = .9, Jv = 40, Yv = (e) => {
 				return;
 			}
 			this.transport.send(JSON.stringify(e));
-		}), p(this, "getStatistics", () => {
-			var e;
-			return {
-				edgeUrl: (e = this.transport) == null ? void 0 : e.url(),
-				connectionProtocol: "vindral_ws",
-				transportSelectionReason: void 0
-			};
-		}), p(this, "onMessage", (e, t) => {
-			var n;
-			if (this.pingCooldownExpired() && this.sendPing(), this.contextSwitchesCompleted.size === ((n = this.transport) == null ? void 0 : n.connectionCount)) {
-				this.logger.info("Completing context switch"), this.contextSwitchesInProgress.clear(), this.contextSwitchesCompleted.clear();
-				let e = this.buffer.filter(([e, t]) => !(t instanceof ArrayBuffer)), t = this.buffer.filter(([e, t]) => t instanceof ArrayBuffer);
-				e.map((e) => this.handleMessage(e[0], e[1])), t.map((e) => this.handleMessage(e[0], e[1])), this.buffer = [];
-			}
-			if (this.contextSwitchesInProgress.has(e)) {
-				if (!(t instanceof ArrayBuffer)) {
-					let n = JSON.parse(t);
-					if (vr(n) && n.type === "context switch complete") {
-						this.logger.info("context switch completed", { socketId: e }), this.emitter.emit("context switch complete"), this.contextSwitchesCompleted.add(e);
+		}), p(this, "getStatistics", () => ({
+			edgeUrl: this.transport.url(),
+			connectionProtocol: "vindral_ws",
+			transportSelectionReason: void 0
+		})), p(this, "onMessage", (e) => {
+			if (this.pingCooldownExpired() && this.sendPing(), this.isContextSwitchInProgress) {
+				if (e instanceof ArrayBuffer) {
+					this.dataBuffer.push(e);
+					return;
+				}
+				let t = JSON.parse(e);
+				if (vr(t)) {
+					if (t.type === "pong") {
+						this.handleMessage(e);
+						return;
+					}
+					if (t.type === "context switch complete") {
+						this.logger.info("context switch completed"), this.emitter.emit("context switch complete"), this.isContextSwitchInProgress = !1, this.flushContextSwitchBuffer();
 						return;
 					}
 				}
-				this.buffer.push([e, t]);
+				this.signalBuffer.push(e);
 				return;
 			}
-			this.handleMessage(e, t);
+			this.handleMessage(e);
 		}), p(this, "resolveEdgeUrl", M(function* () {
-			let e = a.config.connectInfo, t = yield a.config.onConnectInfo(e), n = a.config.options.getOverride("separateVideoSocketEnabled", t.channelId), r = a.config.options.get("media") === "audio+video", i = 1;
-			r && (i = n === !1 ? 1 : 2);
-			let o = Hv(a.config.edgeUrl, {
+			let e = a.config.connectInfo, t = yield a.config.onConnectInfo(e), n = Hv(a.config.edgeUrl, {
 				video: t.video,
 				audio: t.audio,
 				burstMs: t.burstMs,
@@ -8835,27 +8816,31 @@ var Gv, Kv = 65536 * 8, qv = .9, Jv = 40, Yv = (e) => {
 				clientId: t.clientId,
 				channelId: t.channelId,
 				channelGroupId: t.channelGroupId,
-				expectAdditionalConnection: i > 1,
 				authToken: a.config.options.get("authenticationToken")
 			});
-			return a.logger.debug("Resolved edge url", { edgeUrl: o }), {
-				url: o,
-				connectionCount: i
-			};
-		})), p(this, "handleMessage", (e, t) => {
-			if (t instanceof ArrayBuffer) this.emitter.emit("received data", t);
+			return a.logger.debug("Resolved edge url", { edgeUrl: n }), n;
+		})), p(this, "flushContextSwitchBuffer", () => {
+			this.logger.info("Flushing context switch buffer");
+			let e = this.signalBuffer, t = this.dataBuffer;
+			this.signalBuffer = [], this.dataBuffer = [], e.forEach((e) => {
+				this.handleMessage(e);
+			}), t.forEach((e) => {
+				this.handleMessage(e);
+			});
+		}), p(this, "handleMessage", (e) => {
+			if (e instanceof ArrayBuffer) this.emitter.emit("received data", e);
 			else {
-				let n = JSON.parse(t);
-				if (!vr(n)) return;
-				switch (n.type) {
+				let t = JSON.parse(e);
+				if (!vr(t)) return;
+				switch (t.type) {
 					case "pong":
 						this.lastPingSentTime && (this.rtts.push(Date.now() - this.lastPingSentTime), this.isPingInFlight = !1, this.emitter.emit("rtt", At(this.rtts.items())));
 						break;
 					case "context switch":
-						this.logger.info("Starting context switch", { socketId: e }), this.emitter.emit("context switch started"), this.contextSwitchesInProgress.add(e);
+						this.logger.info("Starting context switch"), this.emitter.emit("context switch started"), this.isContextSwitchInProgress = !0;
 						break;
 					default:
-						this.emitter.emit("received signal", n);
+						this.emitter.emit("received signal", t);
 						break;
 				}
 			}
@@ -8868,16 +8853,14 @@ var Gv, Kv = 65536 * 8, qv = .9, Jv = 40, Yv = (e) => {
 			}, this.logger.createContext("Transport"));
 			return e.on("open", this.onTransportChange), e.on("close", this.onTransportChange), e.on("error", (e) => this.disconnected.reject(e)), e.connect(), e;
 		}), p(this, "close", (e = "Disconnect Requested") => {
-			var t;
-			this.contextSwitchesCompleted.clear(), this.contextSwitchesInProgress.clear(), this.buffer = [], this.resetPingState(), this.disconnected.resolve(), (t = this.transport) == null || t.close(e);
+			this.isContextSwitchInProgress = !1, this.signalBuffer = [], this.dataBuffer = [], this.resetPingState(), this.disconnected.resolve(), this.transport.close(e);
 		}), p(this, "onTransportChange", () => {
 			switch (this.getState()) {
 				case "connected":
-					var t;
-					(t = this.transport) != null && t.connectTime && (this.rtts.push(this.transport.connectTime / e.TLS_ROUNDTRIPS / (this.transport.connectionCount || 1)), this.emitter.emit("rtt", At(this.rtts.items()))), this.connectCount++, this.resetPingState();
+					this.transport.connectTime && (this.rtts.push(this.transport.connectTime / e.TLS_ROUNDTRIPS), this.emitter.emit("rtt", At(this.rtts.items()))), this.connectCount++, this.resetPingState();
 					break;
 				default:
-					this.contextSwitchesCompleted.clear(), this.contextSwitchesInProgress.clear(), this.buffer = [], this.resetPingState(), this.disconnected.resolve();
+					this.isContextSwitchInProgress = !1, this.signalBuffer = [], this.dataBuffer = [], this.resetPingState(), this.disconnected.resolve();
 					break;
 			}
 			this.emitter.emit("connection state", this.getState());
@@ -12043,7 +12026,6 @@ var Ax = [
 	"maxBufferTime",
 	"burstEnabled",
 	"sizeBasedResolutionCapEnabled",
-	"separateVideoSocketEnabled",
 	"webcodecsHardwareAcceleration",
 	"offscreenCanvasEnabled",
 	"videoCodecs"
@@ -12521,7 +12503,7 @@ var Gx = /* @__PURE__ */ new WeakMap(), Kx = /* @__PURE__ */ new WeakMap(), qx =
 			let e = this.modules.canvasModule instanceof Lb ? !0 : void 0;
 			return R({
 				uptime: Date.now() - this.createdAt,
-				version: "4.3.0-7-ga7804427",
+				version: "4.3.0-9-g13d8cb8f",
 				clientId: this.clientId,
 				sessionId: this.sessionId,
 				channelId: this.channelId,