@oddin-gg/havik-player 2.4.0 → 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,36 +219,36 @@ 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 S(e) {
+function x(e) {
 	return e.ownerDocument ?? document;
 }
-function le(e) {
+function S(e) {
 	return e.fullscreenElement ?? e.webkitFullscreenElement ?? null;
 }
 function C(e, t) {
-	let n = le(S(e));
+	let n = S(x(e));
 	return n != null && (n === e || t != null && n === t) || e.webkitDisplayingFullscreen === !0;
 }
 async function w(e, t) {
@@ -264,7 +264,7 @@ async function T(e, t) {
 		n.webkitExitFullscreen?.();
 		return;
 	}
-	let r = S(e), i = le(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
@@ -535,7 +535,7 @@ var N = ["SW_SECURE_DECODE", "SW_SECURE_CRYPTO"];
 function be(e) {
 	return e.startsWith("com.widevine");
 }
-function P(e, t) {
+function xe(e, t) {
 	if (!be(e)) return t;
 	let n = (e, t) => {
 		let n = e.videoCapabilities;
@@ -552,8 +552,8 @@ function P(e, t) {
 	})));
 	return [...t, ...r];
 }
-function xe(e) {
-	return (t, n) => M() ? navigator.requestMediaKeySystemAccess(t, P(t, n)).then((t) => ({
+function Se(e) {
+	return (t, n) => M() ? navigator.requestMediaKeySystemAccess(t, xe(t, n)).then((t) => ({
 		keySystem: t.keySystem,
 		getConfiguration: () => t.getConfiguration(),
 		createMediaKeys: () => ye(e, t)
@@ -561,7 +561,7 @@ function xe(e) {
 }
 //#endregion
 //#region src/core/drm/support.ts
-var Se = 5e3, Ce = "video/mp4; codecs=\"avc1.42E01E\"", we = "audio/mp4; codecs=\"mp4a.40.2\"", Te = {
+var Ce = 5e3, we = "video/mp4; codecs=\"avc1.42E01E\"", P = "audio/mp4; codecs=\"mp4a.40.2\"", Te = {
 	widevine: ["com.widevine.alpha"],
 	fairplay: ["com.apple.fps"]
 };
@@ -573,24 +573,24 @@ function Ee(e) {
 			"cenc"
 		],
 		videoCapabilities: [{
-			contentType: Ce,
+			contentType: we,
 			robustness: "",
 			encryptionScheme: "cbcs"
 		}],
 		audioCapabilities: [{
-			contentType: we,
+			contentType: P,
 			robustness: "",
 			encryptionScheme: "cbcs"
 		}]
-	}] : P("com.widevine.alpha", [{
+	}] : xe("com.widevine.alpha", [{
 		initDataTypes: ["cenc"],
 		videoCapabilities: [{
-			contentType: Ce,
+			contentType: we,
 			robustness: "SW_SECURE_DECODE",
 			encryptionScheme: "cbcs"
 		}],
 		audioCapabilities: [{
-			contentType: we,
+			contentType: P,
 			robustness: "SW_SECURE_CRYPTO",
 			encryptionScheme: "cbcs"
 		}]
@@ -607,7 +607,7 @@ function F(e, t) {
 	});
 }
 async function De(e = {}) {
-	let t = e.systems ?? ["widevine", "fairplay"], n = e.timeoutMs ?? Se, r = {};
+	let t = e.systems ?? ["widevine", "fairplay"], n = e.timeoutMs ?? Ce, r = {};
 	if (typeof window < "u" && window.isSecureContext === !1) return {
 		verdict: "insecure-context",
 		detail: r
@@ -1034,7 +1034,7 @@ var U = class {
 					videoEncryptionScheme: "cbcs",
 					audioEncryptionScheme: "cbcs"
 				},
-				...M() ? { requestMediaKeySystemAccessFunc: xe(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();
@@ -1437,6 +1437,7 @@ var lt = class {
 	lastHbHiddenMs = 0;
 	lastHbRebufferMs = 0;
 	lastHbRebufferCount = 0;
+	lastHbActiveMs = 0;
 	rebufferCount = 0;
 	rebufferTotalMs = 0;
 	bufferingSinceMs = null;
@@ -1606,31 +1607,33 @@ var lt = class {
 		this.hiddenSinceMs !== null && (r += t - this.hiddenSinceMs);
 		let i = this.rebufferTotalMs;
 		this.bufferingSinceMs !== null && (i += t - this.bufferingSinceMs);
-		let a = {}, o = e.bytesLoaded ?? 0;
-		o > this.lastBytes && (a.bytesDownloadedDelta = o - this.lastBytes), this.lastBytes = o;
-		let s = e.playlistBytesLoaded ?? 0;
-		s > this.lastPlaylistBytes && (a.playlistBytesDelta = s - this.lastPlaylistBytes), this.lastPlaylistBytes = s;
-		let c = e.droppedFrames ?? 0;
-		c > this.lastDropped && (a.droppedFramesDelta = c - this.lastDropped), this.lastDropped = c;
-		let l = e.renditionSwitches ?? 0;
-		l > this.lastSwitches && (a.renditionSwitchesDelta = l - this.lastSwitches), this.lastSwitches = l, n > this.lastHbPlayingMs && (a.playingMsDelta = Math.round(n - this.lastHbPlayingMs)), this.lastHbPlayingMs = n, r > this.lastHbHiddenMs && (a.hiddenMsDelta = Math.round(r - this.lastHbHiddenMs)), this.lastHbHiddenMs = r, i > this.lastHbRebufferMs && (a.rebufferMsDelta = Math.round(i - this.lastHbRebufferMs)), this.lastHbRebufferMs = i, this.rebufferCount > this.lastHbRebufferCount && (a.rebufferCountDelta = this.rebufferCount - this.lastHbRebufferCount), this.lastHbRebufferCount = this.rebufferCount, typeof e.latencySeconds == "number" && (a.latencyMs = Math.round(e.latencySeconds * 1e3)), typeof e.targetLatencySeconds == "number" && (a.targetLatencyMs = Math.round(e.targetLatencySeconds * 1e3)), typeof e.bandwidthKbps == "number" && (a.bandwidthEstKbps = e.bandwidthKbps), typeof e.levelHeight == "number" && (a.renditionHeight = e.levelHeight), typeof e.renditionBitrateKbps == "number" && (a.renditionBitrateKbps = e.renditionBitrateKbps), e.atLiveEdge === !0 && (a.atLiveEdge = !0), typeof e.bufferedMs == "number" && e.bufferedMs > 0 && (a.bufferedMs = Math.round(e.bufferedMs)), a.playerState = q[e.state] ?? "PLAYER_STATE_UNSPECIFIED";
-		let u = this.mutedTotalMs;
-		this.mutedSinceMs !== null && (u += t - this.mutedSinceMs), u > this.lastHbMutedMs && (a.mutedMsDelta = Math.round(u - this.lastHbMutedMs)), this.lastHbMutedMs = u;
-		let d = e.upshifts ?? 0;
-		d > this.lastUpshifts && (a.upshiftsDelta = d - this.lastUpshifts), this.lastUpshifts = d;
-		let f = e.downshifts ?? 0;
-		f > this.lastDownshifts && (a.downshiftsDelta = f - this.lastDownshifts), this.lastDownshifts = f;
-		let p = e.decodedFrames ?? 0;
-		p > this.lastDecoded && (a.decodedFramesDelta = p - this.lastDecoded), this.lastDecoded = p;
-		let m = e.requestErrors ?? 0;
-		m > this.lastRequestErrors && (a.requestErrorsDelta = m - this.lastRequestErrors), this.lastRequestErrors = m;
-		let h = e.requestCount ?? 0, g = h - this.lastRequestCount;
-		if (this.lastRequestCount = h, g > 0) {
-			a.requestCountDelta = g;
-			let t = e.requestTimesMs ?? [], n = t.slice(Math.max(0, t.length - g)).sort((e, t) => e - t);
-			n.length > 0 && (a.requestTimeP50Ms = K(n, 50), a.requestTimeP95Ms = K(n, 95));
+		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" && (a.driftMs = Math.round((e.latencySeconds - e.targetLatencySeconds) * 1e3)), typeof e.playbackRate == "number" && e.playbackRate > 0 && (a.playbackRate = e.playbackRate), e.qualityPinned === !0 && (a.qualityPinned = !0), e.cdnHost && (a.cdnHost = e.cdnHost), this.maybeEmitMediaInfo(e), this.enqueue({ heartbeat: a }), this.flush(), o > 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;
@@ -1764,7 +1767,7 @@ async function mt() {
 }
 //#endregion
 //#region src/core/version.ts
-var ht = "2.4.0", J = {
+var ht = "2.5.0", J = {
 	accent: "#E1B600",
 	accentText: "#1B1C23",
 	background: "#0e0f13",
@@ -2234,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;
@@ -2261,7 +2264,7 @@ var Pt = class {
 		r ? this.armWithSse(e, r, t, n) : this.beginArmingByPolling(e);
 	}
 	beginArmingByPolling(e) {
-		b({
+		y({
 			...this.resolveOptions(),
 			signal: this.abort.signal,
 			waitForLive: this.buildWaitConfig(e)
@@ -2295,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)
@@ -2303,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();
@@ -2557,7 +2560,7 @@ var Pt = class {
 	async refreshLicense() {
 		let e = this.engine;
 		if (!this.destroyed && e) try {
-			let t = await y(this.resolveOptions());
+			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({
@@ -2642,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
 			});
@@ -2929,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, 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, v as pollToLive, b as resolveStream, E as subscribeLiveState, C as videoFullscreenActive, he 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