unified-video-framework 1.4.430 → 1.4.432
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -326
- package/package.json +1 -1
- package/packages/core/dist/BasePlayer.d.ts.map +1 -1
- package/packages/core/dist/BasePlayer.js +7 -0
- package/packages/core/dist/BasePlayer.js.map +1 -1
- package/packages/core/dist/VideoPlayerFactory.d.ts.map +1 -1
- package/packages/core/dist/VideoPlayerFactory.js +9 -7
- package/packages/core/dist/VideoPlayerFactory.js.map +1 -1
- package/packages/core/dist/index.d.ts +1 -1
- package/packages/core/dist/index.d.ts.map +1 -1
- package/packages/core/dist/index.js +1 -1
- package/packages/core/dist/index.js.map +1 -1
- package/packages/core/dist/telemetry/TelemetryManager.d.ts +1 -0
- package/packages/core/dist/telemetry/TelemetryManager.d.ts.map +1 -1
- package/packages/core/dist/telemetry/TelemetryManager.js +18 -10
- package/packages/core/dist/telemetry/TelemetryManager.js.map +1 -1
- package/packages/core/dist/version.d.ts +2 -0
- package/packages/core/dist/version.d.ts.map +1 -0
- package/packages/core/dist/version.js +2 -0
- package/packages/core/dist/version.js.map +1 -0
- package/packages/core/src/BasePlayer.ts +16 -7
- package/packages/core/src/VideoPlayerFactory.ts +12 -10
- package/packages/core/src/index.ts +1 -1
- package/packages/core/src/telemetry/TelemetryManager.ts +26 -11
- package/packages/core/src/version.ts +1 -0
- package/packages/web/dist/WebPlayer.d.ts +4 -0
- package/packages/web/dist/WebPlayer.d.ts.map +1 -1
- package/packages/web/dist/WebPlayer.js +95 -0
- package/packages/web/dist/WebPlayer.js.map +1 -1
- package/packages/web/src/WebPlayer.ts +125 -0
|
@@ -2,17 +2,19 @@
|
|
|
2
2
|
* Abstract base player class that provides common functionality
|
|
3
3
|
*/
|
|
4
4
|
|
|
5
|
-
import {
|
|
6
|
-
IVideoPlayer,
|
|
7
|
-
VideoSource,
|
|
8
|
-
PlayerConfig,
|
|
9
|
-
PlayerState,
|
|
5
|
+
import {
|
|
6
|
+
IVideoPlayer,
|
|
7
|
+
VideoSource,
|
|
8
|
+
PlayerConfig,
|
|
9
|
+
PlayerState,
|
|
10
10
|
PlayerError,
|
|
11
11
|
Quality,
|
|
12
|
-
SubtitleTrack
|
|
12
|
+
SubtitleTrack
|
|
13
13
|
} from './interfaces/IVideoPlayer';
|
|
14
14
|
import { PlayerEvent } from './interfaces';
|
|
15
15
|
import { EventEmitter } from './utils/EventEmitter';
|
|
16
|
+
import { TelemetryManager } from './telemetry/TelemetryManager';
|
|
17
|
+
import { VERSION } from './version';
|
|
16
18
|
|
|
17
19
|
export abstract class BasePlayer implements IVideoPlayer {
|
|
18
20
|
protected container: HTMLElement | null = null;
|
|
@@ -76,6 +78,13 @@ export abstract class BasePlayer implements IVideoPlayer {
|
|
|
76
78
|
this.state.volume = this.config.volume || 1.0;
|
|
77
79
|
this.state.isMuted = this.config.muted || false;
|
|
78
80
|
|
|
81
|
+
// Safety net: ensure telemetry is initialized even if factory was bypassed
|
|
82
|
+
try {
|
|
83
|
+
TelemetryManager.getInstance().initialize('web', VERSION);
|
|
84
|
+
} catch (e) {
|
|
85
|
+
// Ignore
|
|
86
|
+
}
|
|
87
|
+
|
|
79
88
|
await this.setupPlayer();
|
|
80
89
|
}
|
|
81
90
|
|
|
@@ -227,7 +236,7 @@ export abstract class BasePlayer implements IVideoPlayer {
|
|
|
227
236
|
this.state.isError = true;
|
|
228
237
|
this.state.isPlaying = false;
|
|
229
238
|
this.emit('onError', error);
|
|
230
|
-
|
|
239
|
+
|
|
231
240
|
if (this.config.debug) {
|
|
232
241
|
console.error('[VideoPlayer Error]', error);
|
|
233
242
|
}
|
|
@@ -15,6 +15,9 @@ export type Platform =
|
|
|
15
15
|
| 'appletv'
|
|
16
16
|
| 'windows';
|
|
17
17
|
|
|
18
|
+
import { TelemetryManager } from './telemetry/TelemetryManager';
|
|
19
|
+
import { VERSION } from './version';
|
|
20
|
+
|
|
18
21
|
export class VideoPlayerFactory {
|
|
19
22
|
/**
|
|
20
23
|
* Create a video player instance for the specified platform
|
|
@@ -27,24 +30,23 @@ export class VideoPlayerFactory {
|
|
|
27
30
|
// Dynamic imports will be resolved at runtime
|
|
28
31
|
// This allows the factory to work even if not all platform packages are installed
|
|
29
32
|
|
|
33
|
+
// Initialize telemetry tracking for all platforms
|
|
34
|
+
try {
|
|
35
|
+
TelemetryManager.getInstance().initialize(platform, VERSION);
|
|
36
|
+
} catch (telemetryError) {
|
|
37
|
+
// Silently fail telemetry to not affect player
|
|
38
|
+
console.warn('Telemetry init failed', telemetryError);
|
|
39
|
+
}
|
|
40
|
+
|
|
30
41
|
switch (platform) {
|
|
31
42
|
case 'web':
|
|
43
|
+
case 'windows': // Fallback windows to web
|
|
32
44
|
// Dynamic imports will be resolved at runtime when the package is available
|
|
33
45
|
try {
|
|
34
46
|
const WebModule = await (eval('import("@unified-video/web")') as Promise<any>);
|
|
35
47
|
if (WebModule?.WebPlayer) {
|
|
36
48
|
const player = new WebModule.WebPlayer();
|
|
37
49
|
await player.initialize(container, config);
|
|
38
|
-
|
|
39
|
-
// Initialize telemetry tracking
|
|
40
|
-
try {
|
|
41
|
-
const { TelemetryManager } = await import('./telemetry/TelemetryManager');
|
|
42
|
-
const { VERSION } = await import('./index');
|
|
43
|
-
TelemetryManager.getInstance().initialize('web', VERSION);
|
|
44
|
-
} catch (telemetryError) {
|
|
45
|
-
// Silently fail telemetry to not affect player
|
|
46
|
-
}
|
|
47
|
-
|
|
48
50
|
return player;
|
|
49
51
|
}
|
|
50
52
|
} catch (e) {
|
|
@@ -16,6 +16,7 @@ export interface TelemetryData {
|
|
|
16
16
|
export class TelemetryManager {
|
|
17
17
|
private static instance: TelemetryManager;
|
|
18
18
|
private readonly endpoint = 'https://videonexs-player.flicknexs.com/ping';
|
|
19
|
+
private initialized = false;
|
|
19
20
|
|
|
20
21
|
private constructor() { }
|
|
21
22
|
|
|
@@ -27,13 +28,19 @@ export class TelemetryManager {
|
|
|
27
28
|
}
|
|
28
29
|
|
|
29
30
|
async initialize(platform: Platform, version: string): Promise<void> {
|
|
30
|
-
|
|
31
|
+
if (this.initialized) return;
|
|
32
|
+
this.initialized = true;
|
|
31
33
|
|
|
32
|
-
//
|
|
34
|
+
// const domain = typeof window !== 'undefined' ? window.location.hostname : 'node-server';
|
|
35
|
+
|
|
36
|
+
// Temporary: disable filter to verify connectivity on ALL domains
|
|
37
|
+
/*
|
|
33
38
|
if (domain.includes('flicknexs.com')) {
|
|
34
39
|
return;
|
|
35
40
|
}
|
|
41
|
+
*/
|
|
36
42
|
|
|
43
|
+
console.log(`[Telemetry] Initializing for ${platform} v${version}`);
|
|
37
44
|
const data = this.collectData(platform, version);
|
|
38
45
|
await this.sendPing(data);
|
|
39
46
|
}
|
|
@@ -53,16 +60,11 @@ export class TelemetryManager {
|
|
|
53
60
|
try {
|
|
54
61
|
const body = JSON.stringify(data);
|
|
55
62
|
|
|
56
|
-
|
|
57
|
-
if (typeof navigator !== 'undefined' && navigator.sendBeacon) {
|
|
58
|
-
const blob = new Blob([body], { type: 'application/json' });
|
|
59
|
-
const success = navigator.sendBeacon(this.endpoint, blob);
|
|
60
|
-
if (success) return;
|
|
61
|
-
}
|
|
63
|
+
console.log('[Telemetry] Sending ping...', data);
|
|
62
64
|
|
|
63
|
-
//
|
|
65
|
+
// Use fetch for reliable delivery during init
|
|
64
66
|
if (typeof fetch !== 'undefined') {
|
|
65
|
-
await fetch(this.endpoint, {
|
|
67
|
+
const response = await fetch(this.endpoint, {
|
|
66
68
|
method: 'POST',
|
|
67
69
|
mode: 'cors',
|
|
68
70
|
headers: {
|
|
@@ -70,9 +72,22 @@ export class TelemetryManager {
|
|
|
70
72
|
},
|
|
71
73
|
body
|
|
72
74
|
});
|
|
75
|
+
|
|
76
|
+
if (response.ok) {
|
|
77
|
+
console.log('[Telemetry] Ping sent successfully');
|
|
78
|
+
return;
|
|
79
|
+
} else {
|
|
80
|
+
console.warn(`[Telemetry] Ping failed with status: ${response.status}`);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
// Fallback to sendBeacon if fetch fails or is unavailable
|
|
85
|
+
if (typeof navigator !== 'undefined' && navigator.sendBeacon) {
|
|
86
|
+
const blob = new Blob([body], { type: 'application/json' });
|
|
87
|
+
navigator.sendBeacon(this.endpoint, blob);
|
|
73
88
|
}
|
|
74
89
|
} catch (e) {
|
|
75
|
-
|
|
90
|
+
console.error('[Telemetry] Error sending ping:', e);
|
|
76
91
|
}
|
|
77
92
|
}
|
|
78
93
|
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export const VERSION = '1.4.432';
|
|
@@ -79,6 +79,8 @@ export declare class WebPlayer extends BasePlayer {
|
|
|
79
79
|
private autoplayRetryAttempts;
|
|
80
80
|
private maxAutoplayRetries;
|
|
81
81
|
private chapterManager;
|
|
82
|
+
private drmManager;
|
|
83
|
+
private isDRMProtected;
|
|
82
84
|
private hasAppliedStartTime;
|
|
83
85
|
private coreChapterManager;
|
|
84
86
|
private chapterConfig;
|
|
@@ -105,6 +107,8 @@ export declare class WebPlayer extends BasePlayer {
|
|
|
105
107
|
private updateBufferProgress;
|
|
106
108
|
load(source: any): Promise<void>;
|
|
107
109
|
private loadVideoSource;
|
|
110
|
+
private initializeDRM;
|
|
111
|
+
private handleDRMError;
|
|
108
112
|
private tryFallbackSource;
|
|
109
113
|
private showFallbackPoster;
|
|
110
114
|
private detectSourceType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebPlayer.d.ts","sourceRoot":"","sources":["../src/WebPlayer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAOL,OAAO,EACP,cAAc,EACf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,aAAa,EACb,aAAa,EACb,YAAY,EAEb,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"WebPlayer.d.ts","sourceRoot":"","sources":["../src/WebPlayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { BasePlayer } from "../../core/dist/BasePlayer.js";
|
|
|
2
2
|
import { ChapterManager as CoreChapterManager } from "../../core/dist/index.js";
|
|
3
3
|
import { ChapterManager } from "./chapters/ChapterManager.js";
|
|
4
4
|
import YouTubeExtractor from "./utils/YouTubeExtractor.js";
|
|
5
|
+
import { DRMManager, DRMErrorHandler } from "../dist/drm.js";
|
|
5
6
|
export class WebPlayer extends BasePlayer {
|
|
6
7
|
constructor() {
|
|
7
8
|
super(...arguments);
|
|
@@ -81,6 +82,8 @@ export class WebPlayer extends BasePlayer {
|
|
|
81
82
|
this.autoplayRetryAttempts = 0;
|
|
82
83
|
this.maxAutoplayRetries = 3;
|
|
83
84
|
this.chapterManager = null;
|
|
85
|
+
this.drmManager = null;
|
|
86
|
+
this.isDRMProtected = false;
|
|
84
87
|
this.hasAppliedStartTime = false;
|
|
85
88
|
this.coreChapterManager = null;
|
|
86
89
|
this.chapterConfig = { enabled: false };
|
|
@@ -515,6 +518,8 @@ export class WebPlayer extends BasePlayer {
|
|
|
515
518
|
async load(source) {
|
|
516
519
|
this.source = source;
|
|
517
520
|
this.subtitles = (source.subtitles || []);
|
|
521
|
+
this.isDRMProtected = !!(source.drm && source.drm.licenseUrl);
|
|
522
|
+
this.debugLog('DRM config provided:', source.drm);
|
|
518
523
|
this.debugLog('Loading video source:', source.url);
|
|
519
524
|
this.debugLog('Fallback sources provided:', source.fallbackSources);
|
|
520
525
|
this.debugLog('Fallback poster provided:', source.fallbackPoster);
|
|
@@ -549,6 +554,15 @@ export class WebPlayer extends BasePlayer {
|
|
|
549
554
|
}
|
|
550
555
|
}
|
|
551
556
|
async loadVideoSource(url, sourceType, source) {
|
|
557
|
+
if (this.isDRMProtected && source.drm) {
|
|
558
|
+
try {
|
|
559
|
+
await this.initializeDRM(source.drm);
|
|
560
|
+
}
|
|
561
|
+
catch (drmError) {
|
|
562
|
+
this.handleDRMError(drmError);
|
|
563
|
+
throw drmError;
|
|
564
|
+
}
|
|
565
|
+
}
|
|
552
566
|
switch (sourceType) {
|
|
553
567
|
case 'hls':
|
|
554
568
|
await this.loadHLS(url);
|
|
@@ -575,6 +589,54 @@ export class WebPlayer extends BasePlayer {
|
|
|
575
589
|
this.updateMetadataUI();
|
|
576
590
|
}
|
|
577
591
|
}
|
|
592
|
+
async initializeDRM(drmConfig) {
|
|
593
|
+
if (!this.video) {
|
|
594
|
+
throw new Error('Video element not initialized');
|
|
595
|
+
}
|
|
596
|
+
this.debugLog('Initializing DRM protection...');
|
|
597
|
+
this.debugLog('DRM Config:', {
|
|
598
|
+
type: drmConfig.type,
|
|
599
|
+
licenseUrl: drmConfig.licenseUrl,
|
|
600
|
+
certificateUrl: drmConfig.certificateUrl
|
|
601
|
+
});
|
|
602
|
+
try {
|
|
603
|
+
this.drmManager = new DRMManager(this.video, drmConfig, this.config.debug);
|
|
604
|
+
const initResult = await this.drmManager.initialize();
|
|
605
|
+
if (!initResult.success) {
|
|
606
|
+
const error = initResult.error;
|
|
607
|
+
this.debugError('DRM initialization failed:', error);
|
|
608
|
+
throw error;
|
|
609
|
+
}
|
|
610
|
+
this.debugLog('DRM initialized successfully:', {
|
|
611
|
+
drmType: initResult.drmType,
|
|
612
|
+
keySystem: initResult.keySystem
|
|
613
|
+
});
|
|
614
|
+
}
|
|
615
|
+
catch (error) {
|
|
616
|
+
this.debugError('DRM initialization error:', error);
|
|
617
|
+
if (this.drmManager) {
|
|
618
|
+
await this.drmManager.destroy();
|
|
619
|
+
this.drmManager = null;
|
|
620
|
+
}
|
|
621
|
+
throw error;
|
|
622
|
+
}
|
|
623
|
+
}
|
|
624
|
+
handleDRMError(error) {
|
|
625
|
+
const userMessage = DRMErrorHandler.getUserFriendlyMessage(error);
|
|
626
|
+
const technicalMessage = DRMErrorHandler.getTechnicalMessage(error);
|
|
627
|
+
this.showNotification(userMessage);
|
|
628
|
+
this.debugError('DRM Error:', technicalMessage);
|
|
629
|
+
this.handleError({
|
|
630
|
+
code: error.code || 'DRM_ERROR',
|
|
631
|
+
message: userMessage,
|
|
632
|
+
type: 'drm',
|
|
633
|
+
fatal: true,
|
|
634
|
+
details: {
|
|
635
|
+
technical: technicalMessage,
|
|
636
|
+
original: error
|
|
637
|
+
}
|
|
638
|
+
});
|
|
639
|
+
}
|
|
578
640
|
async tryFallbackSource(error) {
|
|
579
641
|
this.debugLog('🔄 tryFallbackSource called');
|
|
580
642
|
this.debugLog('🔄 isLoadingFallback:', this.isLoadingFallback);
|
|
@@ -751,6 +813,17 @@ export class WebPlayer extends BasePlayer {
|
|
|
751
813
|
hlsConfig.startPosition = this.config.startTime;
|
|
752
814
|
this.debugLog(`⏩ HLS startPosition set to: ${this.config.startTime}s (continue watching)`);
|
|
753
815
|
}
|
|
816
|
+
if (this.isDRMProtected && this.drmManager) {
|
|
817
|
+
try {
|
|
818
|
+
const drmHlsConfig = this.drmManager.getHLSConfig();
|
|
819
|
+
Object.assign(hlsConfig, drmHlsConfig);
|
|
820
|
+
this.debugLog('Applied DRM config to HLS.js');
|
|
821
|
+
}
|
|
822
|
+
catch (error) {
|
|
823
|
+
this.debugError('Failed to get HLS DRM config:', error);
|
|
824
|
+
throw error;
|
|
825
|
+
}
|
|
826
|
+
}
|
|
754
827
|
this.hls = new window.Hls(hlsConfig);
|
|
755
828
|
this.hls.loadSource(url);
|
|
756
829
|
this.hls.attachMedia(this.video);
|
|
@@ -821,6 +894,17 @@ export class WebPlayer extends BasePlayer {
|
|
|
821
894
|
this.debugLog(`⏩ DASH will seek to: ${this.config.startTime}s on ready (continue watching)`);
|
|
822
895
|
}
|
|
823
896
|
this.dash.initialize(this.video, url, this.config.autoPlay);
|
|
897
|
+
if (this.isDRMProtected && this.drmManager) {
|
|
898
|
+
try {
|
|
899
|
+
const protectionData = this.drmManager.getDashProtectionData();
|
|
900
|
+
this.dash.setProtectionData(protectionData);
|
|
901
|
+
this.debugLog('Applied DRM protection data to dash.js');
|
|
902
|
+
}
|
|
903
|
+
catch (error) {
|
|
904
|
+
this.debugError('Failed to apply DASH DRM protection:', error);
|
|
905
|
+
throw error;
|
|
906
|
+
}
|
|
907
|
+
}
|
|
824
908
|
this.dash.updateSettings({
|
|
825
909
|
streaming: {
|
|
826
910
|
abr: {
|
|
@@ -9650,6 +9734,17 @@ export class WebPlayer extends BasePlayer {
|
|
|
9650
9734
|
return epgBtn ? epgBtn.style.display !== 'none' : false;
|
|
9651
9735
|
}
|
|
9652
9736
|
async cleanup() {
|
|
9737
|
+
if (this.drmManager) {
|
|
9738
|
+
try {
|
|
9739
|
+
await this.drmManager.destroy();
|
|
9740
|
+
this.debugLog('DRM manager destroyed');
|
|
9741
|
+
}
|
|
9742
|
+
catch (error) {
|
|
9743
|
+
this.debugError('Error destroying DRM manager:', error);
|
|
9744
|
+
}
|
|
9745
|
+
this.drmManager = null;
|
|
9746
|
+
}
|
|
9747
|
+
this.isDRMProtected = false;
|
|
9653
9748
|
if (this.hls) {
|
|
9654
9749
|
this.hls.destroy();
|
|
9655
9750
|
this.hls = null;
|