@codenkay/video-nsgplayer-core 2.0.0 → 3.0.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 3.0.0
+
+### Major Changes
+
+- Fix minor issues
+
+## 2.0.1
+
+- Auto-wire `AuthManager.getAccessToken()` as default `streaming.getKeyAccessToken` so AES `enc.key` can load with Bearer when no BFF key proxy is configured.
+- When `keyProxyUrlBuilder` returns 401/403/502/CORS (e.g. Cloudflare-blocked BFF), automatically fall back to browser Bearer `enc.key` fetch.
+- On Bearer `enc.key` fetch network/CORS failure, fall back to signed-query XHR (CDN hosts).
+
 ## 2.0.0
 
 ### Minor Changes

package/dist/index.cjs

@@ -212,7 +212,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.8";
+var PACKAGE_VERSION = "2.0.1";
 var DEFAULT_PLAYER_BEHAVIOR = {
   autoplay: true,
   startMuted: true,
@@ -981,9 +981,48 @@ function createAuthParamsLoader(HlsClass, store, options = {}) {
         const usingKeyProxy = Boolean(
           isKey && options.keyProxyUrlBuilder && options.videoId
         );
+        const signedKeyUrl = isKey ? rewriteHlsRequestUrl(originalUrl, store, {
+          ...options,
+          keyProxyUrlBuilder: void 0
+        }) : context.url;
         context.url = rewriteHlsRequestUrl(originalUrl, store, options);
         if (usingKeyProxy) {
-          this.inner.load(context, config, callbacks);
+          const accessToken = options.getKeyAccessToken?.() ?? null;
+          if (!accessToken) {
+            this.inner.load(context, config, callbacks);
+            return;
+          }
+          const proxyCallbacks = {
+            ...callbacks,
+            onError: (error, errContext, networkDetails, stats) => {
+              const code = error?.code;
+              const retryable = code === 0 || code === 502 || code === 403 || code === 401 || /Cloudflare|HTML|DOCTYPE|blocked/i.test(error?.text ?? "");
+              if (!retryable) {
+                callbacks.onError(error, errContext, networkDetails, stats);
+                return;
+              }
+              this.keyAbort?.abort();
+              this.keyAbort = new AbortController();
+              const bearerContext = { ...context, url: signedKeyUrl };
+              void loadEncryptionKeyWithFetch(
+                bearerContext,
+                callbacks,
+                accessToken,
+                this.keyAbort.signal
+              ).catch((fetchError) => {
+                callbacks.onError(
+                  {
+                    code: 0,
+                    text: fetchError instanceof Error ? fetchError.message : error.text || "enc.key proxy and Bearer fetch failed"
+                  },
+                  bearerContext,
+                  null,
+                  stats
+                );
+              });
+            }
+          };
+          this.inner.load(context, config, proxyCallbacks);
           return;
         }
         if (isKey && typeof options.getKeyAccessToken === "function") {
@@ -1001,6 +1040,10 @@ function createAuthParamsLoader(HlsClass, store, options = {}) {
             ).catch((error) => {
               const stats = createLoaderStats();
               const aborted = error instanceof DOMException && error.name === "AbortError";
+              if (!aborted && (error instanceof TypeError || error instanceof Error && /Failed to fetch|NetworkError|CORS/i.test(error.message))) {
+                this.inner.load(context, config, callbacks);
+                return;
+              }
               callbacks.onError(
                 {
                   code: 0,
@@ -1509,12 +1552,11 @@ function createVideoPlayer(options) {
         volume: config.player.volume,
         videoId: options.videoId,
         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,
+        // Enterprise AES key auth:
+        // 1) keyProxyUrlBuilder (same-origin BFF) when configured
+        // 2) else getKeyAccessToken / AuthManager Bearer via browser fetch
+        // 3) else signed query + XHR (CDN hosts)
+        getKeyAccessToken: config.streaming.getKeyAccessToken ?? (() => authManager.getAccessToken()),
         hlsConfig: config.streaming.hls,
         logger,
         callbacks: {
@@ -1832,7 +1874,7 @@ function createVideoPlayer(options) {
           engine: "hls",
           hls: { ...config.streaming.hls, ...partial?.streaming?.hls },
           keyProxyUrlBuilder: partial?.streaming?.keyProxyUrlBuilder ?? config.streaming.keyProxyUrlBuilder,
-          getKeyAccessToken: partial?.streaming?.getKeyAccessToken ?? config.streaming.getKeyAccessToken
+          getKeyAccessToken: partial?.streaming?.getKeyAccessToken ?? config.streaming.getKeyAccessToken ?? (() => authManager.getAccessToken())
         },
         logging: { ...config.logging, ...partial?.logging },
         debug: { ...config.debug, ...partial?.debug },