@oddin-gg/havik-player 2.3.1 → 2.5.0

package/dist/index.js

@@ -142,7 +142,7 @@ function ae(e, t) {
 		t?.addEventListener("abort", a, { once: !0 });
 	});
 }
-async function v(e, t, r) {
+async function oe(e, t, r) {
 	let i = ee(t), a = Date.now(), s = i.timeoutMs == null ? Infinity : a + i.timeoutMs, c = 0, l;
 	for (;;) {
 		if (r?.aborted) throw new n("ABORTED", 0, "wait-for-live aborted");
@@ -168,21 +168,21 @@ async function v(e, t, r) {
 }
 //#endregion
 //#region src/core/resolve.ts
-async function y(e) {
+async function v(e) {
 	if (!e.matchUrn || typeof e.matchUrn != "string") throw new n("INVALID_URN", 0, "resolveStream: a non-empty matchUrn is required");
 	let t = await u(c(e.baseUrl, `/v1/playback/${encodeURIComponent(e.matchUrn)}`), {
 		credential: e.credential,
 		signal: e.signal,
 		apiHeaders: e.apiHeaders
 	});
-	if (!t.ok) throw await oe(t);
-	return ce(await t.json(), e.matchUrn);
+	if (!t.ok) throw await se(t);
+	return le(await t.json(), e.matchUrn);
 }
-function b(e) {
-	let t = () => y(e);
-	return e.waitForLive ? v(t, e.waitForLive, e.signal) : t();
+function y(e) {
+	let t = () => v(e);
+	return e.waitForLive ? oe(t, e.waitForLive, e.signal) : t();
 }
-async function oe(e) {
+async function se(e) {
 	let t = l(e.headers.get("retry-after")), i = e.headers.get("x-request-id") ?? e.headers.get("x-amzn-requestid") ?? void 0, a = e.statusText || `HTTP ${e.status}`, o, s;
 	try {
 		let t = await e.json();
@@ -198,7 +198,7 @@ async function oe(e) {
 		liveStartsAtMs: s
 	});
 }
-var se = /* @__PURE__ */ new Set([
+var ce = /* @__PURE__ */ new Set([
 	"matchUrn",
 	"protocol",
 	"drmEnabled",
@@ -209,7 +209,7 @@ var se = /* @__PURE__ */ new Set([
 	"expiresAt",
 	"analytics"
 ]);
-function x(e, t) {
+function b(e, t) {
 	let r;
 	try {
 		r = new URL(t);
@@ -219,57 +219,57 @@ function x(e, t) {
 	if (r.protocol !== "https:" && r.protocol !== "http:") throw new n("INTERNAL", 0, `playback ${e} has a disallowed scheme: ${r.protocol}`);
 	return t;
 }
-function ce(e, t) {
+function le(e, t) {
 	if (!e.manifestUrl) throw new n("INTERNAL", 0, "playback response is missing manifestUrl");
 	let r = e.drmEnabled ?? !!e.drm, i = {
 		matchUrn: e.matchUrn ?? t,
 		protocol: "hls",
 		drmEnabled: r,
-		manifestUrl: x("manifestUrl", e.manifestUrl),
+		manifestUrl: b("manifestUrl", e.manifestUrl),
 		serverTime: e.serverTime ?? ""
 	};
 	if (e.liveStartsAt && (i.liveStartsAt = e.liveStartsAt), typeof e.analytics?.sid == "string" && e.analytics.sid && (i.analytics = { sid: e.analytics.sid }), r && e.drm) {
 		let t = {};
-		e.drm.widevine?.licenseUrl && (t.widevine = { licenseUrl: x("widevine licenseUrl", e.drm.widevine.licenseUrl) }), e.drm.fairplay?.licenseUrl && e.drm.fairplay.certificateUrl && (t.fairplay = {
-			licenseUrl: x("fairplay licenseUrl", e.drm.fairplay.licenseUrl),
-			certificateUrl: x("fairplay certificateUrl", e.drm.fairplay.certificateUrl)
+		e.drm.widevine?.licenseUrl && (t.widevine = { licenseUrl: b("widevine licenseUrl", e.drm.widevine.licenseUrl) }), e.drm.fairplay?.licenseUrl && e.drm.fairplay.certificateUrl && (t.fairplay = {
+			licenseUrl: b("fairplay licenseUrl", e.drm.fairplay.licenseUrl),
+			certificateUrl: b("fairplay certificateUrl", e.drm.fairplay.certificateUrl)
 		}), (t.widevine || t.fairplay) && (i.drm = t);
 	}
 	let a = {};
-	for (let [t, n] of Object.entries(e)) se.has(t) || (a[t] = n);
+	for (let [t, n] of Object.entries(e)) ce.has(t) || (a[t] = n);
 	return Object.keys(a).length > 0 && (i.extensions = a), i;
 }
 //#endregion
 //#region src/core/fullscreen.ts
-function le(e) {
+function x(e) {
 	return e.ownerDocument ?? document;
 }
-function ue(e) {
+function S(e) {
 	return e.fullscreenElement ?? e.webkitFullscreenElement ?? null;
 }
-function S(e, t) {
-	let n = ue(le(e));
+function C(e, t) {
+	let n = S(x(e));
 	return n != null && (n === e || t != null && n === t) || e.webkitDisplayingFullscreen === !0;
 }
-async function C(e, t) {
+async function w(e, t) {
 	let n = t ?? e;
 	if (typeof n.requestFullscreen == "function") return await n.requestFullscreen(), !0;
 	if (typeof n.webkitRequestFullscreen == "function") return n.webkitRequestFullscreen(), !0;
 	let r = e;
 	return r.webkitSupportsFullscreen && typeof r.webkitEnterFullscreen == "function" ? (r.webkitEnterFullscreen(), !0) : !1;
 }
-async function w(e, t) {
+async function T(e, t) {
 	let n = e;
 	if (n.webkitDisplayingFullscreen) {
 		n.webkitExitFullscreen?.();
 		return;
 	}
-	let r = le(e), i = ue(r);
+	let r = x(e), i = S(r);
 	i != null && (i === e || t != null && i === t) && (typeof r.exitFullscreen == "function" ? await r.exitFullscreen() : r.webkitExitFullscreen?.());
 }
 //#endregion
 //#region src/core/catalog.ts
-async function de(e) {
+async function ue(e) {
 	let t = new URLSearchParams();
 	e.status && t.set("status", Array.isArray(e.status) ? e.status.join(",") : e.status), e.sport && t.set("sport", e.sport);
 	let i = t.toString(), a = c(e.baseUrl, "/v1/catalog" + (i ? `?${i}` : "")), o = new Headers();
@@ -287,12 +287,12 @@ async function de(e) {
 	};
 	if (!s.ok) throw new n(r(s.status), s.status, `catalog request failed (HTTP ${s.status})`);
 	return {
-		tournaments: fe(await s.json()),
+		tournaments: de(await s.json()),
 		etag: s.headers.get("etag") ?? void 0,
 		notModified: !1
 	};
 }
-function fe(e) {
+function de(e) {
 	return (e.tournaments ?? []).map((e) => {
 		let t = e.urn ?? "", n = e.name ?? "", r = e.sport ?? "";
 		return {
@@ -312,7 +312,7 @@ function fe(e) {
 		};
 	});
 }
-async function pe(e) {
+async function fe(e) {
 	let t = c(e.baseUrl, `/v1/tournaments/${encodeURIComponent(e.urn)}`), i = new Headers();
 	e.etag && i.set("If-None-Match", e.etag);
 	let a = await u(t, {
@@ -332,13 +332,13 @@ async function pe(e) {
 	};
 	if (!a.ok) throw new n(r(a.status), a.status, `tournament request failed (HTTP ${a.status})`);
 	return {
-		tournament: me(await a.json()),
+		tournament: pe(await a.json()),
 		etag: a.headers.get("etag") ?? void 0,
 		notModified: !1,
 		notFound: !1
 	};
 }
-function me(e) {
+function pe(e) {
 	let t = e.urn ?? "", n = e.name ?? "", r = e.sport ?? "";
 	return {
 		urn: t,
@@ -356,12 +356,12 @@ function me(e) {
 		}))
 	};
 }
-function he(e) {
+function me(e) {
 	return e.tournaments.flatMap((e) => e.matches);
 }
 //#endregion
 //#region src/core/poll.ts
-function ge(e) {
+function he(e) {
 	let t = Math.max(2e3, e.intervalMs ?? 1e4), i = new AbortController(), a, o, s, l = !1, d = () => {
 		l || (a = setTimeout(f, t));
 	}, f = async () => {
@@ -397,7 +397,7 @@ function ge(e) {
 }
 //#endregion
 //#region src/core/events.ts
-function T(e) {
+function E(e) {
 	let t = Math.max(250, e.minBackoffMs ?? 1e3), n = Math.max(t, e.maxBackoffMs ?? 15e3), r = new AbortController(), i = !1, a = (e) => new Promise((t) => {
 		if (r.signal.aborted) return t();
 		let n = setTimeout(t, e);
@@ -464,7 +464,7 @@ function T(e) {
 		i || (i = !0, r.abort());
 	} };
 }
-function E(e) {
+function D(e) {
 	try {
 		let t = new URL(e);
 		return t.hostname = `events.${t.hostname}`, t.pathname = "", t.search = "", t.origin;
@@ -474,27 +474,27 @@ function E(e) {
 }
 //#endregion
 //#region src/core/drm/deviceId.ts
-var D = "havik.player.deviceId", O;
-function k() {
-	if (O) return O;
+var O = "havik.player.deviceId", k;
+function A() {
+	if (k) return k;
 	try {
-		let e = globalThis.localStorage?.getItem(D);
-		if (e) return O = e, e;
+		let e = globalThis.localStorage?.getItem(O);
+		if (e) return k = e, e;
 	} catch {}
-	let e = ve();
-	O = e;
+	let e = _e();
+	k = e;
 	try {
-		globalThis.localStorage?.setItem(D, e);
+		globalThis.localStorage?.setItem(O, e);
 	} catch {}
 	return e;
 }
-function _e() {
-	O = void 0;
+function ge() {
+	k = void 0;
 	try {
-		globalThis.localStorage?.removeItem(D);
+		globalThis.localStorage?.removeItem(O);
 	} catch {}
 }
-function ve() {
+function _e() {
 	let e = globalThis.crypto;
 	if (e && typeof e.randomUUID == "function") return e.randomUUID();
 	let t = /* @__PURE__ */ new Uint8Array(16);
@@ -506,21 +506,21 @@ function ve() {
 }
 //#endregion
 //#region src/core/drm/headers.ts
-function ye(e, t, n = {}) {
+function ve(e, t, n = {}) {
 	let r = {
 		"x-api-key": t.apiKey,
 		"X-Match-Urn": e.matchUrn,
-		"X-Device-Id": n.deviceId ?? k(),
+		"X-Device-Id": n.deviceId ?? A(),
 		"Content-Type": "application/octet-stream"
 	};
 	return n.userId && (r["X-User-Id"] = n.userId), r;
 }
 //#endregion
 //#region src/core/drm/cdm.ts
-var A = /* @__PURE__ */ new WeakMap();
-function be(e, t) {
-	let n = A.get(e);
-	n || (n = /* @__PURE__ */ new Map(), A.set(e, n));
+var j = /* @__PURE__ */ new WeakMap();
+function ye(e, t) {
+	let n = j.get(e);
+	n || (n = /* @__PURE__ */ new Map(), j.set(e, n));
 	let r = n.get(t.keySystem);
 	if (r) return r;
 	let i = t.createMediaKeys().catch((e) => {
@@ -528,22 +528,22 @@ function be(e, t) {
 	});
 	return n.set(t.keySystem, i), i;
 }
-function j() {
+function M() {
 	return typeof navigator < "u" && typeof navigator.requestMediaKeySystemAccess == "function";
 }
-var M = ["SW_SECURE_DECODE", "SW_SECURE_CRYPTO"];
-function xe(e) {
+var N = ["SW_SECURE_DECODE", "SW_SECURE_CRYPTO"];
+function be(e) {
 	return e.startsWith("com.widevine");
 }
-function N(e, t) {
-	if (!xe(e)) return t;
+function xe(e, t) {
+	if (!be(e)) return t;
 	let n = (e, t) => {
 		let n = e.videoCapabilities;
 		return !n?.length || !n.some((e) => e.robustness) ? !1 : n.every((e) => {
-			let n = M.indexOf(e.robustness);
-			return n === -1 || M.indexOf(t) > n;
+			let n = N.indexOf(e.robustness);
+			return n === -1 || N.indexOf(t) > n;
 		});
-	}, r = M.flatMap((e) => t.filter((t) => n(t, e)).map((t) => ({
+	}, r = N.flatMap((e) => t.filter((t) => n(t, e)).map((t) => ({
 		...t,
 		videoCapabilities: t.videoCapabilities?.map((t) => ({
 			...t,
@@ -553,10 +553,10 @@ function N(e, t) {
 	return [...t, ...r];
 }
 function Se(e) {
-	return (t, n) => j() ? navigator.requestMediaKeySystemAccess(t, N(t, n)).then((t) => ({
+	return (t, n) => M() ? navigator.requestMediaKeySystemAccess(t, xe(t, n)).then((t) => ({
 		keySystem: t.keySystem,
 		getConfiguration: () => t.getConfiguration(),
-		createMediaKeys: () => be(e, t)
+		createMediaKeys: () => ye(e, t)
 	})) : Promise.reject(/* @__PURE__ */ Error("navigator.requestMediaKeySystemAccess is unavailable — EME needs a secure context (https, or localhost)"));
 }
 //#endregion
@@ -582,7 +582,7 @@ function Ee(e) {
 			robustness: "",
 			encryptionScheme: "cbcs"
 		}]
-	}] : N("com.widevine.alpha", [{
+	}] : xe("com.widevine.alpha", [{
 		initDataTypes: ["cenc"],
 		videoCapabilities: [{
 			contentType: we,
@@ -672,7 +672,7 @@ var Ae = /\.(m3u8|ts|m4s|mp4|cmfv|cmfa)(\?|$)/i;
 function je(e) {
 	if (typeof performance > "u" || typeof performance.getEntriesByType != "function") return "";
 	let t = "", n = -1, r = performance.getEntriesByType("resource");
-	for (let i of r) if (!(i.startTime < e) && !(i.initiatorType !== "video" && i.initiatorType !== "audio" && !Ae.test(i.name)) && i.startTime >= n) {
+	for (let i of r) if (!(i.startTime < e) && (i.initiatorType === "video" || i.initiatorType === "audio" || Ae.test(i.name)) && i.startTime >= n) {
 		let e = L(i.name);
 		e && (t = e, n = i.startTime);
 	}
@@ -776,7 +776,7 @@ var V = class {
 		});
 		this.onEncrypted = (n) => {
 			let i = n;
-			!i.initData || this.fairplayArmed || (this.fairplayArmed = !0, this.fairplayKeyIV = Ne(i.initData), (async () => {
+			i.initData && !this.fairplayArmed && (this.fairplayArmed = !0, this.fairplayKeyIV = Ne(i.initData), (async () => {
 				try {
 					let n = await (await navigator.requestMediaKeySystemAccess("com.apple.fps", [{
 						initDataTypes: [i.initDataType],
@@ -1034,7 +1034,7 @@ var U = class {
 					videoEncryptionScheme: "cbcs",
 					audioEncryptionScheme: "cbcs"
 				},
-				...j() ? { requestMediaKeySystemAccessFunc: Se(t) } : {},
+				...M() ? { requestMediaKeySystemAccessFunc: Se(t) } : {},
 				licenseXhrSetup: (e, t) => {
 					e.open("POST", this.licenseUrl ?? t, !0), e.setRequestHeader("x-api-key", r.apiKey), e.setRequestHeader("X-Match-Urn", n.matchUrn), e.setRequestHeader("X-Device-Id", i), a && e.setRequestHeader("X-User-Id", a), this.licenseRequested = !0;
 					let o = performance.now();
@@ -1435,6 +1435,9 @@ var lt = class {
 	hiddenTotalMs = 0;
 	lastHbPlayingMs = 0;
 	lastHbHiddenMs = 0;
+	lastHbRebufferMs = 0;
+	lastHbRebufferCount = 0;
+	lastHbActiveMs = 0;
 	rebufferCount = 0;
 	rebufferTotalMs = 0;
 	bufferingSinceMs = null;
@@ -1602,31 +1605,35 @@ var lt = class {
 		this.playingSinceMs !== null && (n += t - this.playingSinceMs);
 		let r = this.hiddenTotalMs;
 		this.hiddenSinceMs !== null && (r += t - this.hiddenSinceMs);
-		let i = {}, a = e.bytesLoaded ?? 0;
-		a > this.lastBytes && (i.bytesDownloadedDelta = a - this.lastBytes), this.lastBytes = a;
-		let o = e.playlistBytesLoaded ?? 0;
-		o > this.lastPlaylistBytes && (i.playlistBytesDelta = o - this.lastPlaylistBytes), this.lastPlaylistBytes = o;
-		let s = e.droppedFrames ?? 0;
-		s > this.lastDropped && (i.droppedFramesDelta = s - this.lastDropped), this.lastDropped = s;
-		let c = e.renditionSwitches ?? 0;
-		c > this.lastSwitches && (i.renditionSwitchesDelta = c - this.lastSwitches), this.lastSwitches = c, n > this.lastHbPlayingMs && (i.playingMsDelta = Math.round(n - this.lastHbPlayingMs)), this.lastHbPlayingMs = n, r > this.lastHbHiddenMs && (i.hiddenMsDelta = Math.round(r - this.lastHbHiddenMs)), this.lastHbHiddenMs = r, typeof e.latencySeconds == "number" && (i.latencyMs = Math.round(e.latencySeconds * 1e3)), typeof e.targetLatencySeconds == "number" && (i.targetLatencyMs = Math.round(e.targetLatencySeconds * 1e3)), typeof e.bandwidthKbps == "number" && (i.bandwidthEstKbps = e.bandwidthKbps), typeof e.levelHeight == "number" && (i.renditionHeight = e.levelHeight), typeof e.renditionBitrateKbps == "number" && (i.renditionBitrateKbps = e.renditionBitrateKbps), e.atLiveEdge === !0 && (i.atLiveEdge = !0), typeof e.bufferedMs == "number" && e.bufferedMs > 0 && (i.bufferedMs = Math.round(e.bufferedMs)), i.playerState = q[e.state] ?? "PLAYER_STATE_UNSPECIFIED";
-		let l = this.mutedTotalMs;
-		this.mutedSinceMs !== null && (l += t - this.mutedSinceMs), l > this.lastHbMutedMs && (i.mutedMsDelta = Math.round(l - this.lastHbMutedMs)), this.lastHbMutedMs = l;
-		let u = e.upshifts ?? 0;
-		u > this.lastUpshifts && (i.upshiftsDelta = u - this.lastUpshifts), this.lastUpshifts = u;
-		let d = e.downshifts ?? 0;
-		d > this.lastDownshifts && (i.downshiftsDelta = d - this.lastDownshifts), this.lastDownshifts = d;
-		let f = e.decodedFrames ?? 0;
-		f > this.lastDecoded && (i.decodedFramesDelta = f - this.lastDecoded), this.lastDecoded = f;
-		let p = e.requestErrors ?? 0;
-		p > this.lastRequestErrors && (i.requestErrorsDelta = p - this.lastRequestErrors), this.lastRequestErrors = p;
-		let m = e.requestCount ?? 0, h = m - this.lastRequestCount;
-		if (this.lastRequestCount = m, h > 0) {
-			i.requestCountDelta = h;
-			let t = e.requestTimesMs ?? [], n = t.slice(Math.max(0, t.length - h)).sort((e, t) => e - t);
-			n.length > 0 && (i.requestTimeP50Ms = K(n, 50), i.requestTimeP95Ms = K(n, 95));
+		let i = this.rebufferTotalMs;
+		this.bufferingSinceMs !== null && (i += t - this.bufferingSinceMs);
+		let a = this.activeTotalMs;
+		this.activeSinceMs !== null && (a += t - this.activeSinceMs);
+		let o = {}, s = e.bytesLoaded ?? 0;
+		s > this.lastBytes && (o.bytesDownloadedDelta = s - this.lastBytes), this.lastBytes = s;
+		let c = e.playlistBytesLoaded ?? 0;
+		c > this.lastPlaylistBytes && (o.playlistBytesDelta = c - this.lastPlaylistBytes), this.lastPlaylistBytes = c;
+		let l = e.droppedFrames ?? 0;
+		l > this.lastDropped && (o.droppedFramesDelta = l - this.lastDropped), this.lastDropped = l;
+		let u = e.renditionSwitches ?? 0;
+		u > this.lastSwitches && (o.renditionSwitchesDelta = u - this.lastSwitches), this.lastSwitches = u, n > this.lastHbPlayingMs && (o.playingMsDelta = Math.round(n - this.lastHbPlayingMs)), this.lastHbPlayingMs = n, r > this.lastHbHiddenMs && (o.hiddenMsDelta = Math.round(r - this.lastHbHiddenMs)), this.lastHbHiddenMs = r, i > this.lastHbRebufferMs && (o.rebufferMsDelta = Math.round(i - this.lastHbRebufferMs)), this.lastHbRebufferMs = i, this.rebufferCount > this.lastHbRebufferCount && (o.rebufferCountDelta = this.rebufferCount - this.lastHbRebufferCount), this.lastHbRebufferCount = this.rebufferCount, a > this.lastHbActiveMs && (o.activeMsDelta = Math.round(a - this.lastHbActiveMs)), this.lastHbActiveMs = a, typeof e.latencySeconds == "number" && (o.latencyMs = Math.round(e.latencySeconds * 1e3)), typeof e.targetLatencySeconds == "number" && (o.targetLatencyMs = Math.round(e.targetLatencySeconds * 1e3)), typeof e.bandwidthKbps == "number" && (o.bandwidthEstKbps = e.bandwidthKbps), typeof e.levelHeight == "number" && (o.renditionHeight = e.levelHeight), typeof e.renditionBitrateKbps == "number" && (o.renditionBitrateKbps = e.renditionBitrateKbps), e.atLiveEdge === !0 && (o.atLiveEdge = !0), typeof e.bufferedMs == "number" && e.bufferedMs > 0 && (o.bufferedMs = Math.round(e.bufferedMs)), o.playerState = q[e.state] ?? "PLAYER_STATE_UNSPECIFIED";
+		let d = this.mutedTotalMs;
+		this.mutedSinceMs !== null && (d += t - this.mutedSinceMs), d > this.lastHbMutedMs && (o.mutedMsDelta = Math.round(d - this.lastHbMutedMs)), this.lastHbMutedMs = d;
+		let f = e.upshifts ?? 0;
+		f > this.lastUpshifts && (o.upshiftsDelta = f - this.lastUpshifts), this.lastUpshifts = f;
+		let p = e.downshifts ?? 0;
+		p > this.lastDownshifts && (o.downshiftsDelta = p - this.lastDownshifts), this.lastDownshifts = p;
+		let m = e.decodedFrames ?? 0;
+		m > this.lastDecoded && (o.decodedFramesDelta = m - this.lastDecoded), this.lastDecoded = m;
+		let h = e.requestErrors ?? 0;
+		h > this.lastRequestErrors && (o.requestErrorsDelta = h - this.lastRequestErrors), this.lastRequestErrors = h;
+		let g = e.requestCount ?? 0, _ = g - this.lastRequestCount;
+		if (this.lastRequestCount = g, _ > 0) {
+			o.requestCountDelta = _;
+			let t = e.requestTimesMs ?? [], n = t.slice(Math.max(0, t.length - _)).sort((e, t) => e - t);
+			n.length > 0 && (o.requestTimeP50Ms = K(n, 50), o.requestTimeP95Ms = K(n, 95));
 		}
-		typeof e.latencySeconds == "number" && typeof e.targetLatencySeconds == "number" && (i.driftMs = Math.round((e.latencySeconds - e.targetLatencySeconds) * 1e3)), typeof e.playbackRate == "number" && e.playbackRate > 0 && (i.playbackRate = e.playbackRate), e.qualityPinned === !0 && (i.qualityPinned = !0), e.cdnHost && (i.cdnHost = e.cdnHost), this.maybeEmitMediaInfo(e), this.enqueue({ heartbeat: i }), this.flush(), a > 0 && this.noteFirstBytes();
+		typeof e.latencySeconds == "number" && typeof e.targetLatencySeconds == "number" && (o.driftMs = Math.round((e.latencySeconds - e.targetLatencySeconds) * 1e3)), typeof e.playbackRate == "number" && e.playbackRate > 0 && (o.playbackRate = e.playbackRate), e.qualityPinned === !0 && (o.qualityPinned = !0), e.cdnHost && (o.cdnHost = e.cdnHost), this.maybeEmitMediaInfo(e), this.enqueue({ heartbeat: o }), this.flush(), s > 0 && this.noteFirstBytes();
 	}
 	maybeEmitMediaInfo(e) {
 		if (!(e.videoCodec ?? e.keySystem ?? e.ladderHeights)) return;
@@ -1760,7 +1767,7 @@ async function mt() {
 }
 //#endregion
 //#region src/core/version.ts
-var ht = "2.3.1", J = {
+var ht = "2.5.0", J = {
 	accent: "#E1B600",
 	accentText: "#1B1C23",
 	background: "#0e0f13",
@@ -2082,11 +2089,11 @@ var St = class {
 	}
 	async toggleFullscreen() {
 		try {
-			S(this.video, this.root) ? await w(this.video, this.root) : await C(this.video, this.root);
+			C(this.video, this.root) ? await T(this.video, this.root) : await w(this.video, this.root);
 		} catch {}
 	}
 	syncFullscreen() {
-		let e = S(this.video, this.root);
+		let e = C(this.video, this.root);
 		this.setIcon(this.fsBtn, e ? "fullscreenExit" : "fullscreen"), this.fsBtn.setAttribute("aria-label", e ? "Exit fullscreen" : "Fullscreen");
 	}
 	poke() {
@@ -2230,7 +2237,7 @@ var Pt = class {
 		this.opts.muted && (this.opts.video.muted = !0), this.opts.poster && (this.opts.video.poster = this.opts.poster), this.mountControls(), this.attachPipListeners(), this.setState("loading");
 		let e = ++this.loadGen, t = this.resolveOptions();
 		try {
-			let n = await y(t);
+			let n = await v(t);
 			if (await this.onResolved(n, e), e === this.loadGen && this._state === "error" && this._lastError) {
 				let e = this._lastError;
 				throw this.destroy(), e;
@@ -2253,11 +2260,11 @@ var Pt = class {
 		};
 	}
 	beginArming(e, t, n = !1) {
-		let r = this.opts.liveStateEvents === !1 ? void 0 : this.opts.eventsBaseUrl ?? E(this.opts.baseUrl);
+		let r = this.opts.liveStateEvents === !1 ? void 0 : this.opts.eventsBaseUrl ?? D(this.opts.baseUrl);
 		r ? this.armWithSse(e, r, t, n) : this.beginArmingByPolling(e);
 	}
 	beginArmingByPolling(e) {
-		b({
+		y({
 			...this.resolveOptions(),
 			signal: this.abort.signal,
 			waitForLive: this.buildWaitConfig(e)
@@ -2291,7 +2298,7 @@ var Pt = class {
 				}
 			}
 		}, h = () => {
-			a || s || p() || (s = !0, b({
+			a || s || p() || (s = !0, y({
 				...this.resolveOptions(),
 				signal: c.signal,
 				waitForLive: this.buildWaitConfig(e)
@@ -2299,7 +2306,7 @@ var Pt = class {
 				a || p() || c.signal.aborted || (a = !0, this.closeArming(), this.fail(e instanceof n ? e : new n("INTERNAL", 0, String(e))));
 			}));
 		}, g = () => {
-			a || p() || y(this.resolveOptions()).then((e) => m(e)).catch((e) => {
+			a || p() || v(this.resolveOptions()).then((e) => m(e)).catch((e) => {
 				if (!(a || p())) {
 					if (e instanceof n && o(e.code)) {
 						h();
@@ -2313,7 +2320,7 @@ var Pt = class {
 				!a && !p() && h();
 			}, e);
 		};
-		_(Dt), this.armingSub = T({
+		_(Dt), this.armingSub = E({
 			eventsBaseUrl: t,
 			matchUrn: this.opts.matchUrn,
 			credential: this.opts.credential,
@@ -2400,7 +2407,7 @@ var Pt = class {
 			video: this.opts.video,
 			descriptor: e,
 			credential: t,
-			deviceId: k(),
+			deviceId: A(),
 			userId: this.opts.userId,
 			lowLatency: this.opts.lowLatency === void 0 || this.opts.lowLatency === "auto" || this.opts.lowLatency,
 			snapToLiveOnRefocus: this.opts.snapToLiveOnRefocus,
@@ -2441,11 +2448,11 @@ var Pt = class {
 	}
 	startLiveState(e) {
 		if (this.opts.liveStateEvents === !1) return;
-		let t = this.opts.eventsBaseUrl ?? E(this.opts.baseUrl);
+		let t = this.opts.eventsBaseUrl ?? D(this.opts.baseUrl);
 		if (!t) return;
 		this.closeLiveState();
 		let r = 0, i = !1;
-		this.liveStateSub = T({
+		this.liveStateSub = E({
 			eventsBaseUrl: t,
 			matchUrn: this.opts.matchUrn,
 			credential: this.opts.credential,
@@ -2476,7 +2483,7 @@ var Pt = class {
 		return this.opts.rejoinOnLive !== !1 && this.opts.liveStateEvents !== !1;
 	}
 	scheduleRejoin(e) {
-		!this.rejoinEnabled() || this.rejoinTimer || (this.rejoinTimer = setTimeout(() => {
+		this.rejoinEnabled() && !this.rejoinTimer && (this.rejoinTimer = setTimeout(() => {
 			this.rejoinTimer = null, !(this.destroyed || e !== this.loadGen || this._state !== "ended") && this.rejoin();
 		}, Math.random() * kt));
 	}
@@ -2545,15 +2552,15 @@ var Pt = class {
 	scheduleLicenseRefresh() {
 		this.stopRefresh();
 		let e = this.opts.licenseRefreshMs ?? Mt;
-		!e || !this._descriptor?.drmEnabled || (this.refreshTimer = setInterval(() => void this.refreshLicense(), e));
+		e && this._descriptor?.drmEnabled && (this.refreshTimer = setInterval(() => void this.refreshLicense(), e));
 	}
 	stopRefresh() {
 		this.refreshTimer && clearInterval(this.refreshTimer), this.refreshTimer = void 0;
 	}
 	async refreshLicense() {
 		let e = this.engine;
-		if (!(this.destroyed || !e)) try {
-			let t = await y(this.resolveOptions());
+		if (!this.destroyed && e) try {
+			let t = await v(this.resolveOptions());
 			if (this.destroyed || this.engine !== e) return;
 			let n = t.drm?.widevine?.licenseUrl, r = t.drm?.fairplay?.licenseUrl;
 			(n || r) && (e.setLicenseUrls({
@@ -2625,10 +2632,10 @@ var Pt = class {
 		e.pictureInPictureElement === this.opts.video && typeof e.exitPictureInPicture == "function" && await e.exitPictureInPicture();
 	}
 	async enterFullscreen() {
-		return !this.destroyed && C(this.opts.video, this.container ?? void 0);
+		return !this.destroyed && w(this.opts.video, this.container ?? void 0);
 	}
 	async exitFullscreen() {
-		await w(this.opts.video, this.container ?? void 0);
+		await T(this.opts.video, this.container ?? void 0);
 	}
 	retry() {
 		return this.reload();
@@ -2638,7 +2645,7 @@ var Pt = class {
 		let e = ++this.loadGen;
 		this.teardownPlayback();
 		try {
-			let t = await b({
+			let t = await y({
 				...this.resolveOptions(),
 				waitForLive: this.opts.waitForLive ? this.buildWaitConfig(e) : void 0
 			});
@@ -2906,7 +2913,7 @@ async function Rt() {
 			case "oddin:destroy": c();
 		}
 	}, u = (e) => {
-		!r || e.origin !== r || $(e.data) && l(e.data);
+		r && e.origin === r && $(e.data) && l(e.data);
 	};
 	r && window.addEventListener("message", u), window.addEventListener("pagehide", c, { once: !0 }), await s(e.matchUrn), i({
 		type: "oddin:ready",
@@ -2925,6 +2932,6 @@ function Bt() {
 	e.textContent = "html,body{margin:0;height:100%;background:#000;overflow:hidden}body{display:flex}", document.head.appendChild(e);
 }
 //#endregion
-export { J as ODDIN_THEME, n as PlaybackError, X as applyTheme, Rt as bootEmbed, _e as clearDeviceId, Nt as createPlayer, E as deriveEventsBaseUrl, De as detectDrmSupport, C as enterVideoFullscreen, w as exitVideoFullscreen, de as fetchCatalog, pe as fetchTournament, he as flattenMatches, k as getDeviceId, ke as isLowLatencyManifest, $ as isOddinMessage, ye as licenseRequestHeaders, Ft as mountEmbed, v as pollToLive, b as resolveStream, T as subscribeLiveState, S as videoFullscreenActive, ge as watchStatus };
+export { J as ODDIN_THEME, n as PlaybackError, X as applyTheme, Rt as bootEmbed, ge as clearDeviceId, Nt as createPlayer, D as deriveEventsBaseUrl, De as detectDrmSupport, w as enterVideoFullscreen, T as exitVideoFullscreen, ue as fetchCatalog, fe as fetchTournament, me as flattenMatches, A as getDeviceId, ke as isLowLatencyManifest, $ as isOddinMessage, ve as licenseRequestHeaders, Ft as mountEmbed, oe as pollToLive, y as resolveStream, E as subscribeLiveState, C as videoFullscreenActive, he as watchStatus };
 
 //# sourceMappingURL=index.js.map