@codenkay/video-nsgplayer-core 0.1.3 → 1.0.0

package/dist/index.js

@@ -146,7 +146,7 @@ var AuthManager = class {
 
 // src/config/defaults.ts
 var PLAYBACK_RATES = [0.5, 0.75, 1, 1.25, 1.5, 2];
-var PACKAGE_VERSION = "0.1.3";
+var PACKAGE_VERSION = "0.1.8";
 var DEFAULT_PLAYER_BEHAVIOR = {
   autoplay: true,
   startMuted: true,
@@ -239,7 +239,8 @@ var SKIP_DEEP_SCAN_KEYS = /* @__PURE__ */ new Set([
   "gettoken",
   "getsource",
   "refreshsource",
-  "keyproxyurlbuilder"
+  "keyproxyurlbuilder",
+  "getkeyaccesstoken"
 ]);
 var SECRET_SCAN_MAX_DEPTH = 32;
 function isPlainObject(value) {
@@ -323,7 +324,8 @@ function mergePlayerConfig(partial) {
         ...DEFAULT_PLAYER_CONFIG.streaming.hls,
         ...partial?.streaming?.hls
       },
-      keyProxyUrlBuilder: partial?.streaming?.keyProxyUrlBuilder
+      keyProxyUrlBuilder: partial?.streaming?.keyProxyUrlBuilder,
+      getKeyAccessToken: partial?.streaming?.getKeyAccessToken
     },
     logging: { ...DEFAULT_PLAYER_CONFIG.logging, ...partial?.logging },
     debug: { ...DEFAULT_PLAYER_CONFIG.debug, ...partial?.debug },
@@ -404,23 +406,25 @@ function isPlainObject2(value) {
   const proto = Object.getPrototypeOf(value);
   return proto === Object.prototype || proto === null;
 }
-function redactValue(key, value, seen = /* @__PURE__ */ new WeakSet(), depth = 0) {
-  if (SENSITIVE_KEYS.test(key)) return "[REDACTED]";
-  if (typeof value === "string") {
-    if (/^https?:\/\//i.test(value) && /[?&](token|expires)=/i.test(value)) {
-      try {
-        const url = new URL(value);
-        for (const param of ["token", "expires", "signature", "sig"]) {
-          if (url.searchParams.has(param)) {
-            url.searchParams.set(param, "[REDACTED]");
-          }
-        }
-        return url.toString();
-      } catch {
-        return "[REDACTED_URL]";
+function redactStringUrl(value) {
+  if (!/^https?:\/\//i.test(value) || !/[?&](token|expires)=/i.test(value)) {
+    return value;
+  }
+  try {
+    const url = new URL(value);
+    for (const param of ["token", "expires", "signature", "sig"]) {
+      if (url.searchParams.has(param)) {
+        url.searchParams.set(param, "[REDACTED]");
       }
     }
+    return url.toString();
+  } catch {
+    return "[REDACTED_URL]";
   }
+}
+function redactValue(key, value, seen = /* @__PURE__ */ new WeakSet(), depth = 0) {
+  if (SENSITIVE_KEYS.test(key)) return "[REDACTED]";
+  if (typeof value === "string") return redactStringUrl(value);
   if (Array.isArray(value)) {
     if (depth >= REDACT_MAX_DEPTH || seen.has(value)) return "[REDACTED_CYCLE]";
     seen.add(value);
@@ -687,10 +691,11 @@ var RefreshManager = class {
       this.options.logger.debug("Playback source renewed", { reason });
     } catch (error) {
       this.consecutiveFailures += 1;
-      const message = error instanceof Error ? error.message : "Playback refresh failed";
+      const message = refreshErrorMessage(error);
       this.options.logger.warn("Playback refresh failed", {
         reason,
-        failure: this.consecutiveFailures
+        failure: this.consecutiveFailures,
+        message
       });
       if (this.consecutiveFailures >= this.options.renewMaxRetries) {
         this.options.onFatal?.(message);
@@ -710,6 +715,13 @@ var RefreshManager = class {
     }
   }
 };
+function refreshErrorMessage(error) {
+  if (error instanceof Error && error.message) return error.message;
+  if (error && typeof error === "object" && "message" in error && typeof error.message === "string" && error.message) {
+    return error.message;
+  }
+  return "Playback refresh failed";
+}
 
 // src/playback/liveEdge.ts
 var DEFAULT_LIVE_EDGE_TOLERANCE_SECONDS = 3;
@@ -753,7 +765,37 @@ function seekToLiveEdge(media, options) {
 }
 
 // src/streaming/authParamsLoader.ts
-var ENC_KEY_PATH_RE = /\/enc\.key$/i;
+import { XhrLoader as BuiltinXhrLoader } from "hls.js";
+var ENC_KEY_PATH_RE = /enc\.key$/i;
+var BUILTIN_LOADER_NAMES = /* @__PURE__ */ new Set(["XhrLoader", "FetchLoader"]);
+function isEncryptionKeyUrl(rawUrl, baseOrigin = typeof location !== "undefined" ? location.origin : "http://localhost") {
+  try {
+    return ENC_KEY_PATH_RE.test(new URL(rawUrl, baseOrigin).pathname);
+  } catch {
+    return /enc\.key/i.test(rawUrl);
+  }
+}
+function resolveBuiltinHlsLoader(HlsClass) {
+  if (typeof BuiltinXhrLoader === "function") {
+    return BuiltinXhrLoader;
+  }
+  const start = HlsClass.DefaultConfig.loader;
+  let current = start;
+  const seen = /* @__PURE__ */ new Set();
+  while (current && !seen.has(current)) {
+    seen.add(current);
+    const name = typeof current.name === "string" ? current.name : "";
+    if (BUILTIN_LOADER_NAMES.has(name)) {
+      return current;
+    }
+    const parentCtor = Object.getPrototypeOf(current.prototype)?.constructor;
+    if (!parentCtor || parentCtor === Object || parentCtor === Function) {
+      break;
+    }
+    current = parentCtor;
+  }
+  return start;
+}
 function rewriteHlsRequestUrl(rawUrl, store, options = {}, baseOrigin = typeof location !== "undefined" ? location.origin : "http://localhost") {
   if (!rawUrl) return rawUrl;
   const parsed = new URL(rawUrl, baseOrigin);
@@ -764,28 +806,161 @@ function rewriteHlsRequestUrl(rawUrl, store, options = {}, baseOrigin = typeof l
       videoId: options.videoId,
       keyUrl: parsed.toString(),
       token: snapshot.token,
-      expires: snapshot.expires
+      expires: snapshot.expires,
+      username: snapshot.username,
+      mobile: snapshot.mobile
     });
   }
   if (!store.hasParams()) return parsed.toString();
   return store.applyToUrl(rawUrl, baseOrigin);
 }
+function createLoaderStats() {
+  const now = performance.now();
+  return {
+    aborted: false,
+    loaded: 0,
+    retry: 0,
+    total: 0,
+    chunkCount: 0,
+    bwEstimate: 0,
+    loading: { start: now, first: 0, end: 0 },
+    parsing: { start: 0, end: 0 },
+    buffering: { start: 0, first: 0, end: 0 }
+  };
+}
+async function loadEncryptionKeyWithFetch(context, callbacks, accessToken, signal) {
+  const stats = createLoaderStats();
+  stats.loading.first = performance.now();
+  const headers = {
+    Accept: "*/*",
+    ...context.headers
+  };
+  if (accessToken) {
+    headers.Authorization = `Bearer ${accessToken}`;
+  }
+  const response = await fetch(context.url, {
+    method: "GET",
+    headers,
+    credentials: "omit",
+    cache: "no-store",
+    signal
+  });
+  if (!response.ok) {
+    callbacks.onError(
+      {
+        code: response.status,
+        text: response.statusText || `enc.key HTTP ${response.status}`
+      },
+      context,
+      response,
+      stats
+    );
+    return;
+  }
+  const data = await response.arrayBuffer();
+  const end = performance.now();
+  stats.loading.end = end;
+  stats.loaded = data.byteLength;
+  stats.total = data.byteLength;
+  const head = new TextDecoder().decode(data.slice(0, 32));
+  if (/<!DOCTYPE|<html/i.test(head)) {
+    callbacks.onError(
+      {
+        code: 403,
+        text: "enc.key returned HTML (CDN challenge/block), not an AES key"
+      },
+      context,
+      response,
+      stats
+    );
+    return;
+  }
+  callbacks.onSuccess(
+    {
+      url: response.url || context.url,
+      data,
+      code: response.status
+    },
+    stats,
+    context,
+    response
+  );
+}
 function createAuthParamsLoader(HlsClass, store, options = {}) {
-  const BaseLoader = HlsClass.DefaultConfig.loader;
-  return class AuthParamsLoader extends BaseLoader {
+  const BaseLoader = resolveBuiltinHlsLoader(HlsClass);
+  return class AuthParamsLoader {
+    constructor(config) {
+      this.keyAbort = null;
+      this.inner = new BaseLoader(config);
+      this.stats = this.inner.stats;
+    }
+    abort() {
+      this.keyAbort?.abort();
+      this.keyAbort = null;
+      this.inner.abort?.();
+    }
+    destroy() {
+      this.keyAbort?.abort();
+      this.keyAbort = null;
+      this.inner.destroy();
+    }
     load(context, config, callbacks) {
-      if (context.url) {
-        try {
-          context.url = rewriteHlsRequestUrl(context.url, store, options);
-        } catch {
+      if (!context.url) {
+        this.inner.load(context, config, callbacks);
+        return;
+      }
+      try {
+        const originalUrl = context.url;
+        const isKey = isEncryptionKeyUrl(originalUrl);
+        const usingKeyProxy = Boolean(
+          isKey && options.keyProxyUrlBuilder && options.videoId
+        );
+        context.url = rewriteHlsRequestUrl(originalUrl, store, options);
+        if (usingKeyProxy) {
+          this.inner.load(context, config, callbacks);
+          return;
         }
+        if (isKey && typeof options.getKeyAccessToken === "function") {
+          const accessToken = options.getKeyAccessToken() ?? null;
+          if (accessToken) {
+            this.keyAbort?.abort();
+            this.keyAbort = new AbortController();
+            const timeoutMs = typeof config?.timeout === "number" && config.timeout > 0 ? config.timeout : 2e4;
+            const timer = setTimeout(() => this.keyAbort?.abort(), timeoutMs);
+            void loadEncryptionKeyWithFetch(
+              context,
+              callbacks,
+              accessToken,
+              this.keyAbort.signal
+            ).catch((error) => {
+              const stats = createLoaderStats();
+              const aborted = error instanceof DOMException && error.name === "AbortError";
+              callbacks.onError(
+                {
+                  code: 0,
+                  text: aborted ? "enc.key fetch aborted/timeout" : error instanceof Error ? error.message : "enc.key fetch failed"
+                },
+                context,
+                null,
+                stats
+              );
+            }).finally(() => {
+              clearTimeout(timer);
+            });
+            return;
+          }
+        }
+      } catch {
       }
-      super.load(context, config, callbacks);
+      this.inner.load(context, config, callbacks);
     }
   };
 }
 
 // src/streaming/HlsEngine.ts
+function isAuthHttpStatus(code) {
+  return code === 401 || code === 403;
+}
 var HlsEngine = class {
   constructor(options) {
     this.options = options;
@@ -798,49 +973,47 @@ var HlsEngine = class {
     this.qualitySelection = "auto";
   }
   async start() {
-    const { videoEl, playbackUrl, autoplay, startMuted, volume, startPosition } = this.options;
+    const { videoEl, playbackUrl, startMuted, volume } = this.options;
     videoEl.muted = startMuted;
-    if (typeof volume === "number") videoEl.volume = Math.min(1, Math.max(0, volume));
+    if (typeof volume === "number") {
+      videoEl.volume = Math.min(1, Math.max(0, volume));
+    }
     const Hls = (await import("hls.js")).default;
     if (Hls.isSupported()) {
       this.supportMode = "hls.js";
       this.options.callbacks.onSupportMode?.("hls.js");
       await this.startWithHlsJs(Hls, playbackUrl);
-    } else if (videoEl.canPlayType("application/vnd.apple.mpegurl")) {
+      return;
+    }
+    if (videoEl.canPlayType("application/vnd.apple.mpegurl")) {
       this.supportMode = "native";
       this.options.callbacks.onSupportMode?.("native");
       videoEl.src = this.options.authParams.applyToUrl(playbackUrl);
       this.bindMediaEvents();
       this.options.callbacks.onStateChange?.("ready");
-    } else {
-      this.supportMode = "unsupported";
-      this.options.callbacks.onSupportMode?.("unsupported");
-      this.options.callbacks.onFatalError?.("HLS is not supported in this browser");
+      await this.applyStartPositionAndAutoplay();
       return;
     }
-    if (typeof startPosition === "number" && startPosition > 0) {
-      videoEl.currentTime = startPosition;
-    }
-    if (autoplay) {
-      try {
-        await videoEl.play();
-      } catch {
-        if (!videoEl.muted) {
-          videoEl.muted = true;
-          try {
-            await videoEl.play();
-          } catch {
-            this.options.logger.warn("Autoplay blocked");
-          }
-        }
-      }
-    }
+    this.supportMode = "unsupported";
+    this.options.callbacks.onSupportMode?.("unsupported");
+    this.options.callbacks.onFatalError?.(
+      "HLS is not supported in this browser"
+    );
   }
   async startWithHlsJs(Hls, playbackUrl) {
-    const { videoEl, authParams, hlsConfig, callbacks, videoId, keyProxyUrlBuilder } = this.options;
+    const {
+      videoEl,
+      authParams,
+      hlsConfig,
+      callbacks,
+      videoId,
+      keyProxyUrlBuilder,
+      getKeyAccessToken
+    } = this.options;
     const loader = createAuthParamsLoader(Hls, authParams, {
       videoId,
-      keyProxyUrlBuilder
+      keyProxyUrlBuilder,
+      getKeyAccessToken
     });
     this.hls = new Hls({
       enableWorker: hlsConfig.enableWorker,
@@ -851,6 +1024,7 @@ var HlsEngine = class {
     this.hls.attachMedia(videoEl);
     this.hls.loadSource(authParams.applyToUrl(playbackUrl));
     this.hls.on(Hls.Events.MANIFEST_PARSED, (_event, data) => {
+      if (this.destroyed) return;
       this.qualities = (data.levels ?? []).map((level, index) => ({
         index,
         height: level.height ?? 0,
@@ -860,42 +1034,100 @@ var HlsEngine = class {
       }));
       callbacks.onQualitiesChange?.(this.qualities);
       callbacks.onStateChange?.("ready");
+      void this.applyStartPositionAndAutoplay();
     });
     this.hls.on(Hls.Events.ERROR, (_event, data) => {
-      if (!data.fatal) {
-        if (data.type === Hls.ErrorTypes.NETWORK_ERROR && (data.details === Hls.ErrorDetails.FRAG_LOAD_ERROR || data.details === Hls.ErrorDetails.LEVEL_LOAD_ERROR || data.details === Hls.ErrorDetails.KEY_LOAD_ERROR)) {
-          callbacks.onAuthRecoveryNeeded?.(
-            data.details === Hls.ErrorDetails.KEY_LOAD_ERROR ? "key_error" : data.details === Hls.ErrorDetails.LEVEL_LOAD_ERROR ? "level_error" : "frag_error"
-          );
-        }
+      this.handleHlsError(Hls, data);
+    });
+    this.bindMediaEvents();
+  }
+  handleHlsError(Hls, data) {
+    if (this.destroyed) return;
+    const { callbacks, hlsConfig } = this.options;
+    const status = data.response?.code;
+    const authFailure = isAuthHttpStatus(status);
+    if (data.details === Hls.ErrorDetails.KEY_LOAD_ERROR) {
+      if (authFailure) {
+        callbacks.onAuthRecoveryNeeded?.("key_error");
+        if (!data.fatal) return;
+      } else if (!data.fatal) {
+        callbacks.onFatalError?.(
+          status ? `Encryption key load failed (HTTP ${status}).` : "Encryption key load failed (network/CORS). Ensure signed query params are applied, or use keyProxyUrlBuilder / getKeyAccessToken when the key host requires API Bearer."
+        );
         return;
       }
-      if (data.type === Hls.ErrorTypes.NETWORK_ERROR) {
-        this.networkRecoveryCount += 1;
-        if (this.networkRecoveryCount <= hlsConfig.fatalRecoveryLimit) {
+    }
+    if (!data.fatal) {
+      if (authFailure && data.type === Hls.ErrorTypes.NETWORK_ERROR && (data.details === Hls.ErrorDetails.FRAG_LOAD_ERROR || data.details === Hls.ErrorDetails.LEVEL_LOAD_ERROR)) {
+        callbacks.onAuthRecoveryNeeded?.(
+          data.details === Hls.ErrorDetails.LEVEL_LOAD_ERROR ? "level_error" : "frag_error"
+        );
+      }
+      return;
+    }
+    if (data.type === Hls.ErrorTypes.NETWORK_ERROR) {
+      this.networkRecoveryCount += 1;
+      if (this.networkRecoveryCount <= hlsConfig.fatalRecoveryLimit) {
+        if (authFailure) {
           callbacks.onAuthRecoveryNeeded?.("fatal_network");
-          this.hls?.startLoad();
-          return;
         }
+        this.hls?.startLoad();
+        return;
       }
-      if (data.type === Hls.ErrorTypes.MEDIA_ERROR) {
-        this.mediaRecoveryCount += 1;
-        if (this.mediaRecoveryCount <= hlsConfig.fatalRecoveryLimit) {
-          this.hls?.recoverMediaError();
-          return;
+    }
+    if (data.type === Hls.ErrorTypes.MEDIA_ERROR) {
+      this.mediaRecoveryCount += 1;
+      if (this.mediaRecoveryCount <= hlsConfig.fatalRecoveryLimit) {
+        this.hls?.recoverMediaError();
+        return;
+      }
+    }
+    callbacks.onFatalError?.(data.details || "Fatal HLS error");
+  }
+  async applyStartPositionAndAutoplay() {
+    if (this.destroyed) return;
+    const { videoEl, autoplay, startPosition } = this.options;
+    if (typeof startPosition === "number" && startPosition > 0) {
+      const seek = () => {
+        if (this.destroyed) return;
+        try {
+          videoEl.currentTime = startPosition;
+        } catch {
         }
+      };
+      if (videoEl.seekable.length > 0) {
+        seek();
+      } else {
+        videoEl.addEventListener("loadedmetadata", seek, { once: true });
       }
-      callbacks.onFatalError?.(data.details || "Fatal HLS error");
-    });
-    this.bindMediaEvents();
+    }
+    if (!autoplay) return;
+    try {
+      await videoEl.play();
+    } catch {
+      if (!videoEl.muted) {
+        videoEl.muted = true;
+        try {
+          await videoEl.play();
+        } catch {
+          this.options.logger.warn("Autoplay blocked");
+        }
+      }
+    }
   }
   bindMediaEvents() {
     const { videoEl, callbacks } = this.options;
-    videoEl.addEventListener("playing", () => callbacks.onStateChange?.("playing"));
+    videoEl.addEventListener(
+      "playing",
+      () => callbacks.onStateChange?.("playing")
+    );
     videoEl.addEventListener("pause", () => {
       if (!videoEl.ended) callbacks.onStateChange?.("paused");
     });
-    videoEl.addEventListener("waiting", () => callbacks.onStateChange?.("buffering"));
+    videoEl.addEventListener(
+      "waiting",
+      () => callbacks.onStateChange?.("buffering")
+    );
     videoEl.addEventListener("ended", () => {
       callbacks.onStateChange?.("ended");
       callbacks.onEnded?.();
@@ -913,6 +1145,7 @@ var HlsEngine = class {
     }
   }
   resumeAfterAuthRenew() {
+    this.networkRecoveryCount = 0;
     this.hls?.startLoad();
     this.updateAuthParams();
   }
@@ -1055,7 +1288,13 @@ function createVideoPlayer(options) {
         startPosition: config.player.startPosition,
         volume: config.player.volume,
         videoId: options.videoId,
-        keyProxyUrlBuilder: options.streaming?.keyProxyUrlBuilder,
+        keyProxyUrlBuilder: config.streaming.keyProxyUrlBuilder,
+        // Optional: browser Bearer for Video API–origin enc.key (CORS-dependent).
+        // CDN keys use signed query via the auth loader (no Bearer) — same as
+        // segments. Apps can pass getKeyAccessToken or rely on keyProxyUrlBuilder.
+        // When unset, defaults to AuthManager token only if explicitly requested
+        // via streaming.getKeyAccessToken; otherwise query-signed XHR.
+        getKeyAccessToken: config.streaming.getKeyAccessToken,
         hlsConfig: config.streaming.hls,
         logger,
         callbacks: {
@@ -1116,6 +1355,14 @@ function createVideoPlayer(options) {
           onRenewing: () => setState("renewing"),
           onRenewed: (nextExpiresAt) => {
             engine?.resumeAfterAuthRenew();
+            if (!destroyed) {
+              const el2 = videoEl;
+              if (el2 && !el2.paused && !el2.ended) {
+                setState("playing");
+              } else {
+                setState("ready");
+              }
+            }
             events.emit("tokenrefresh", { expiresAt: nextExpiresAt });
             events.emit("sourcechange", { expiresAt: nextExpiresAt });
           },
@@ -1317,7 +1564,8 @@ function createVideoPlayer(options) {
         streaming: {
           engine: "hls",
           hls: { ...config.streaming.hls, ...partial?.streaming?.hls },
-          keyProxyUrlBuilder: partial?.streaming?.keyProxyUrlBuilder ?? config.streaming.keyProxyUrlBuilder
+          keyProxyUrlBuilder: partial?.streaming?.keyProxyUrlBuilder ?? config.streaming.keyProxyUrlBuilder,
+          getKeyAccessToken: partial?.streaming?.getKeyAccessToken ?? config.streaming.getKeyAccessToken
         },
         logging: { ...config.logging, ...partial?.logging },
         debug: { ...config.debug, ...partial?.debug },
@@ -1360,11 +1608,13 @@ export {
   createVideoPlayer,
   getLiveEdgeTime,
   isAtLiveEdge,
+  isEncryptionKeyUrl,
   isPlainObject,
   mergePlayerConfig,
   redactObject,
   redactSensitive,
   redactValue,
+  resolveBuiltinHlsLoader,
   rewriteHlsRequestUrl,
   seekToLiveEdge,
   themeToCssVars