unified-video-framework 1.4.412 → 1.4.414

package/packages/web/dist/WebPlayer.js

@@ -2,7 +2,6 @@ import { BasePlayer } from "../../core/dist/BasePlayer.js";
 import { ChapterManager as CoreChapterManager } from "../../core/dist/index.js";
 import { ChapterManager } from "./chapters/ChapterManager.js";
 import YouTubeExtractor from "./utils/YouTubeExtractor.js";
-import { DRMManager } from "./drm/DRMManager.js";
 export class WebPlayer extends BasePlayer {
     constructor() {
         super(...arguments);
@@ -50,8 +49,6 @@ export class WebPlayer extends BasePlayer {
         this.selectedSubtitleKey = 'off';
         this._kiTo = null;
         this.paywallController = null;
-        this.drmManager = null;
-        this.drmConfig = null;
         this._playPromise = null;
         this._deferredPause = false;
         this._lastToggleAt = 0;
@@ -533,10 +530,6 @@ export class WebPlayer extends BasePlayer {
         if (!this.video) {
             throw new Error('Video element not initialized');
         }
-        if (source.drm) {
-            this.debugLog('[WebPlayer] DRM configuration detected, initializing...');
-            await this.initializeDRM(source);
-        }
         const sourceType = this.detectSourceType(source);
         try {
             await this.loadVideoSource(source.url, sourceType, source);
@@ -555,45 +548,6 @@ export class WebPlayer extends BasePlayer {
             }
         }
     }
-    async initializeDRM(source) {
-        if (!source.drm)
-            return;
-        try {
-            const webDRMConfig = this.convertDRMConfig(source.drm);
-            this.drmManager = new DRMManager(webDRMConfig);
-            await this.drmManager.initialize();
-            this.debugLog('[WebPlayer] DRM initialized successfully');
-            this.drmConfig = webDRMConfig;
-        }
-        catch (error) {
-            console.error('[WebPlayer] Failed to initialize DRM:', error);
-            this.handleError({
-                code: 'DRM_INIT_ERROR',
-                message: 'Failed to initialize DRM protection',
-                type: 'drm',
-                fatal: true,
-                details: error
-            });
-            throw error;
-        }
-    }
-    convertDRMConfig(drmConfig) {
-        if (drmConfig.bunny) {
-            return {
-                provider: 'bunny',
-                bunny: drmConfig.bunny
-            };
-        }
-        return {
-            provider: 'generic',
-            generic: {
-                type: drmConfig.type === 'fairplay' ? 'fairplay' : 'widevine',
-                licenseUrl: drmConfig.licenseUrl,
-                certificateUrl: drmConfig.certificateUrl,
-                headers: drmConfig.headers
-            }
-        };
-    }
     async loadVideoSource(url, sourceType, source) {
         switch (sourceType) {
             case 'hls':
@@ -797,12 +751,32 @@ export class WebPlayer extends BasePlayer {
                 hlsConfig.startPosition = this.config.startTime;
                 this.debugLog(`⏩ HLS startPosition set to: ${this.config.startTime}s (continue watching)`);
             }
-            this.hls = new window.Hls(hlsConfig);
-            if (this.drmManager && this.drmConfig) {
-                this.debugLog('[WebPlayer] Setting up DRM for HLS playback...');
-                await this.drmManager.setupDRM(this.video, url);
-                this.debugLog('[WebPlayer] DRM setup complete');
+            if (this.source?.drm) {
+                try {
+                    const { DRMManager } = await import('./drm/DRMManager');
+                    const drmManager = new DRMManager(this.video, this.source.drm, this.config.debug);
+                    this.debugLog('Initializing DRM for HLS...');
+                    const initResult = await drmManager.initialize();
+                    if (!initResult.success) {
+                        throw initResult.error || new Error('DRM initialization failed');
+                    }
+                    const drmConfig = drmManager.getHLSConfig();
+                    Object.assign(hlsConfig, drmConfig);
+                    this.debugLog(`✅ HLS DRM configured: ${initResult.drmType} (${initResult.keySystem})`);
+                    this._drmManager = drmManager;
+                }
+                catch (error) {
+                    this.handleError({
+                        code: 'DRM_ERROR',
+                        message: `Failed to initialize DRM: ${error.message || error}`,
+                        type: 'drm',
+                        fatal: true,
+                        details: error
+                    });
+                    throw error;
+                }
             }
+            this.hls = new window.Hls(hlsConfig);
             this.hls.loadSource(url);
             this.hls.attachMedia(this.video);
             this.hls.on(window.Hls.Events.MANIFEST_PARSED, (event, data) => {
@@ -833,11 +807,6 @@ export class WebPlayer extends BasePlayer {
             });
         }
         else if (this.video.canPlayType('application/vnd.apple.mpegurl')) {
-            if (this.drmManager && this.drmConfig) {
-                this.debugLog('[WebPlayer] Setting up DRM for native Safari HLS playback...');
-                await this.drmManager.setupDRM(this.video, url);
-                this.debugLog('[WebPlayer] DRM setup complete');
-            }
             this.video.src = url;
         }
         else {
@@ -873,14 +842,34 @@ export class WebPlayer extends BasePlayer {
             await this.loadScript('https://cdn.dashjs.org/latest/dash.all.min.js');
         }
         this.dash = window.dashjs.MediaPlayer().create();
-        if (this.drmManager && this.drmConfig) {
-            this.debugLog('[WebPlayer] Setting up DRM for DASH playback...');
-            await this.drmManager.setupDRM(this.video, url);
-            this.debugLog('[WebPlayer] DRM setup complete');
-        }
         if (this.config.startTime !== undefined && this.config.startTime > 0) {
             this.debugLog(`⏩ DASH will seek to: ${this.config.startTime}s on ready (continue watching)`);
         }
+        if (this.source?.drm) {
+            try {
+                const { DRMManager } = await import('./drm/DRMManager');
+                const drmManager = new DRMManager(this.video, this.source.drm, this.config.debug);
+                this.debugLog('Initializing DRM for DASH...');
+                const initResult = await drmManager.initialize();
+                if (!initResult.success) {
+                    throw initResult.error || new Error('DRM initialization failed');
+                }
+                const protectionData = drmManager.getDashProtectionData();
+                this.dash.setProtectionData(protectionData);
+                this.debugLog(`✅ DASH DRM configured: ${initResult.drmType} (${initResult.keySystem})`);
+                this._drmManager = drmManager;
+            }
+            catch (error) {
+                this.handleError({
+                    code: 'DRM_ERROR',
+                    message: `Failed to initialize DRM: ${error.message || error}`,
+                    type: 'drm',
+                    fatal: true,
+                    details: error
+                });
+                throw error;
+            }
+        }
         this.dash.initialize(this.video, url, this.config.autoPlay);
         this.dash.updateSettings({
             streaming: {
@@ -7524,14 +7513,10 @@ export class WebPlayer extends BasePlayer {
             this.isDetectedAsLive = true;
         }
         this.lastDuration = duration;
-        const isLiveStream = this.config.isLive === true ||
-            !isFinite(duration) ||
-            this.isDetectedAsLive ||
-            (duration > 0 && (duration - current) < 15);
-        if (isLiveStream) {
+        if (this.config.isLive === true) {
             timeDisplay.innerHTML = '<span class="uvf-live-dot"></span><span class="uvf-live-text">LIVE</span>';
             timeDisplay.classList.add('uvf-is-live');
-            this.debugLog('Time display: LIVE stream detected (isLive=' + this.config.isLive + ', wasDetected=' + this.isDetectedAsLive + ', duration=' + duration + ')');
+            this.debugLog('Time display: LIVE stream (isLive=true)');
         }
         else {
             const currentFormatted = this.formatTime(current);
@@ -9715,6 +9700,16 @@ export class WebPlayer extends BasePlayer {
         return epgBtn ? epgBtn.style.display !== 'none' : false;
     }
     async cleanup() {
+        if (this._drmManager) {
+            try {
+                this.debugLog('Cleaning up DRM resources');
+                await this._drmManager.destroy();
+                this._drmManager = null;
+            }
+            catch (error) {
+                this.debugLog('Error cleaning up DRM:', error);
+            }
+        }
         if (this.hls) {
             this.hls.destroy();
             this.hls = null;
@@ -9729,12 +9724,6 @@ export class WebPlayer extends BasePlayer {
     }
     async destroy() {
         await this.cleanup();
-        if (this.drmManager) {
-            this.debugLog('[WebPlayer] Cleaning up DRM resources...');
-            this.drmManager.destroy();
-            this.drmManager = null;
-            this.drmConfig = null;
-        }
         if (this.hideControlsTimeout) {
             clearTimeout(this.hideControlsTimeout);
             this.hideControlsTimeout = null;