unified-video-framework 1.4.421 → 1.4.423
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/package.json +1 -1
- package/packages/web/dist/drm/systems/FairPlayDRM.d.ts.map +1 -1
- package/packages/web/dist/drm/systems/FairPlayDRM.js +10 -0
- package/packages/web/dist/drm/systems/FairPlayDRM.js.map +1 -1
- package/packages/web/dist/drm/systems/PlayReadyDRM.d.ts.map +1 -1
- package/packages/web/dist/drm/systems/PlayReadyDRM.js +23 -4
- package/packages/web/dist/drm/systems/PlayReadyDRM.js.map +1 -1
- package/packages/web/dist/drm/systems/WidevineDRM.d.ts.map +1 -1
- package/packages/web/dist/drm/systems/WidevineDRM.js +18 -15
- package/packages/web/dist/drm/systems/WidevineDRM.js.map +1 -1
- package/packages/web/src/drm/systems/FairPlayDRM.ts +11 -0
- package/packages/web/src/drm/systems/PlayReadyDRM.ts +25 -5
- package/packages/web/src/drm/systems/WidevineDRM.ts +20 -17
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "unified-video-framework",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.423",
|
|
4
4
|
"description": "Cross-platform video player framework supporting iOS, Android, Web, Smart TVs (Samsung/LG), Roku, and more",
|
|
5
5
|
"main": "packages/core/dist/index.js",
|
|
6
6
|
"types": "packages/core/dist/index.d.ts",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FairPlayDRM.d.ts","sourceRoot":"","sources":["../../../src/drm/systems/FairPlayDRM.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,gBAAgB;QACxB,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,KAAK,IAAI,CAAC;QAC9C,UAAU,CAAC,EAAE,GAAG,CAAC;KAClB;IAED,UAAU,MAAM;QACd,eAAe,CAAC,EAAE,GAAG,CAAC;KACvB;CACF;AAED,qBAAa,WAAY,SAAQ,OAAO;IACtC,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,iBAAiB,CAA4B;IACrD,OAAO,CAAC,qBAAqB,CAAgD;IAC7E,OAAO,CAAC,mBAAmB,CAAgD;gBAE/D,YAAY,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,GAAE,OAAe;IAKzE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAYjC,YAAY,IAAI,MAAM;IAItB,YAAY,IAAI,GAAG;
|
|
1
|
+
{"version":3,"file":"FairPlayDRM.d.ts","sourceRoot":"","sources":["../../../src/drm/systems/FairPlayDRM.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,gBAAgB;QACxB,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,KAAK,IAAI,CAAC;QAC9C,UAAU,CAAC,EAAE,GAAG,CAAC;KAClB;IAED,UAAU,MAAM;QACd,eAAe,CAAC,EAAE,GAAG,CAAC;KACvB;CACF;AAED,qBAAa,WAAY,SAAQ,OAAO;IACtC,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,iBAAiB,CAA4B;IACrD,OAAO,CAAC,qBAAqB,CAAgD;IAC7E,OAAO,CAAC,mBAAmB,CAAgD;gBAE/D,YAAY,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,GAAE,OAAe;IAKzE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAYjC,YAAY,IAAI,MAAM;IAItB,YAAY,IAAI,GAAG;IA8BnB,qBAAqB,IAAI,GAAG;IAatB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAehB,eAAe;IA4C7B,OAAO,CAAC,4BAA4B;YAYtB,WAAW;YAcX,eAAe;YAYf,aAAa;YA4Cb,SAAS;IA4CvB,OAAO,CAAC,yBAAyB;YAsBnB,0BAA0B;IAOxC,OAAO,CAAC,mBAAmB;CAQ5B"}
|
|
@@ -34,6 +34,16 @@ export class FairPlayDRM extends BaseDRM {
|
|
|
34
34
|
},
|
|
35
35
|
},
|
|
36
36
|
requestMediaKeySystemAccessFunc: this.createMediaKeySystemAccess.bind(this),
|
|
37
|
+
xhrSetup: (xhr, url) => {
|
|
38
|
+
if (url === licenseUrl || url === certificateUrl) {
|
|
39
|
+
this.log(`[LicenseXHR] (FairPlay) Requesting resource from: ${url}`);
|
|
40
|
+
if (this.config.headers) {
|
|
41
|
+
Object.keys(this.config.headers).forEach(key => {
|
|
42
|
+
xhr.setRequestHeader(key, this.config.headers[key]);
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
|
37
47
|
};
|
|
38
48
|
}
|
|
39
49
|
getDashProtectionData() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FairPlayDRM.js","sourceRoot":"","sources":["../../../src/drm/systems/FairPlayDRM.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAc7D,MAAM,OAAO,WAAY,SAAQ,OAAO;IAMtC,YAAY,YAA8B,EAAE,MAAW,EAAE,QAAiB,KAAK;QAC7E,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAL7B,sBAAiB,GAAuB,IAAI,CAAC;QAC7C,0BAAqB,GAA2C,IAAI,CAAC;QACrE,wBAAmB,GAA2C,IAAI,CAAC;QAIzE,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;QAGzC,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAG7B,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAEpC,IAAI,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IACvC,CAAC;IAED,YAAY;QACV,OAAO,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,YAAY;QACV,IAAI,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;QAElD,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,cAAc,CAAC;QACjG,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,CAAC;QAErF,OAAO;YACL,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE;gBACV,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,EAAE;oBACrB,UAAU,EAAE,UAAU;oBACtB,oBAAoB,EAAE,cAAc;oBACpC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;iBAC1C;aACF;YACD,+BAA+B,EAAE,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"FairPlayDRM.js","sourceRoot":"","sources":["../../../src/drm/systems/FairPlayDRM.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlayReadyDRM.d.ts","sourceRoot":"","sources":["../../../src/drm/systems/PlayReadyDRM.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,qBAAa,YAAa,SAAQ,OAAO;IACjC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA0CjC,YAAY,IAAI,MAAM;IAItB,YAAY,IAAI,GAAG;
|
|
1
|
+
{"version":3,"file":"PlayReadyDRM.d.ts","sourceRoot":"","sources":["../../../src/drm/systems/PlayReadyDRM.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,qBAAa,YAAa,SAAQ,OAAO;IACjC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA0CjC,YAAY,IAAI,MAAM;IAItB,YAAY,IAAI,GAAG;IAwCnB,qBAAqB,IAAI,GAAG;IA+B5B,OAAO,CAAC,yBAAyB;CAsBlC"}
|
|
@@ -29,19 +29,38 @@ export class PlayReadyDRM extends BaseDRM {
|
|
|
29
29
|
}
|
|
30
30
|
getHLSConfig() {
|
|
31
31
|
this.log('Generating HLS.js config for PlayReady');
|
|
32
|
+
const licenseUrl = this.config.licenseUrl || this.config.playreadyOptions?.licenseUrl;
|
|
32
33
|
return {
|
|
33
34
|
emeEnabled: true,
|
|
34
35
|
drmSystems: {
|
|
35
36
|
[this.getKeySystem()]: {
|
|
36
|
-
licenseUrl:
|
|
37
|
-
customData: this.config.customData || this.config.playreadyOptions?.customData,
|
|
37
|
+
licenseUrl: licenseUrl,
|
|
38
38
|
},
|
|
39
39
|
[KEY_SYSTEMS[DRMTypeEnum.PLAYREADY][1]]: {
|
|
40
|
-
licenseUrl:
|
|
41
|
-
customData: this.config.customData || this.config.playreadyOptions?.customData,
|
|
40
|
+
licenseUrl: licenseUrl,
|
|
42
41
|
},
|
|
43
42
|
},
|
|
44
43
|
requestMediaKeySystemAccessFunc: navigator.requestMediaKeySystemAccess.bind(navigator),
|
|
44
|
+
xhrSetup: (xhr, url) => {
|
|
45
|
+
if (url === licenseUrl) {
|
|
46
|
+
this.log(`[LicenseXHR] (PlayReady) Requesting license from: ${url}`);
|
|
47
|
+
if (this.config.headers) {
|
|
48
|
+
Object.keys(this.config.headers).forEach(key => {
|
|
49
|
+
xhr.setRequestHeader(key, this.config.headers[key]);
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
xhr.addEventListener('readystatechange', () => {
|
|
53
|
+
if (xhr.readyState === 4) {
|
|
54
|
+
if (xhr.status >= 200 && xhr.status < 300) {
|
|
55
|
+
this.log(`[LicenseXHR] PlayReady license received (Status: ${xhr.status}, Size: ${xhr.response?.byteLength || 0} bytes)`);
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
this.log(`[LicenseXHR] PlayReady license request failed (Status: ${xhr.status}, Error: ${xhr.statusText})`);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
}
|
|
45
64
|
};
|
|
46
65
|
}
|
|
47
66
|
getDashProtectionData() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlayReadyDRM.js","sourceRoot":"","sources":["../../../src/drm/systems/PlayReadyDRM.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAE7D,MAAM,OAAO,YAAa,SAAQ,OAAO;IACvC,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;QAI1C,IAAI;YACF,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,2BAA2B,CACjE,IAAI,CAAC,YAAY,EAAE,EACnB,IAAI,CAAC,yBAAyB,EAAE,CACjC,CAAC;YAEF,IAAI,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;YAChD,IAAI,CAAC,SAAS,GAAG,MAAM,eAAe,CAAC,eAAe,EAAE,CAAC;SAK1D;QAAC,OAAO,KAAU,EAAE;YAEnB,IAAI;gBACF,MAAM,iBAAiB,GAAG,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;gBAChE,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,2BAA2B,CACjE,iBAAiB,EACjB,IAAI,CAAC,yBAAyB,EAAE,CACjC,CAAC;gBAEF,IAAI,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;gBACzD,IAAI,CAAC,SAAS,GAAG,MAAM,eAAe,CAAC,eAAe,EAAE,CAAC;aAC1D;YAAC,OAAO,aAAkB,EAAE;gBAC3B,IAAI,CAAC,GAAG,CAAC,kCAAkC,EAAE,aAAa,CAAC,CAAC;gBAC5D,MAAM,eAAe,CAAC,WAAW,CAC/B,YAAY,CAAC,wBAAwB,EACrC,uCAAuC,EACvC,IAAI,EACJ,aAAa,CACd,CAAC;aACH;SACF;QAED,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;IACxC,CAAC;IAED,YAAY;QACV,OAAO,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,YAAY;QACV,IAAI,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;QAEnD,OAAO;YACL,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE;gBACV,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,EAAE;oBACrB,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"PlayReadyDRM.js","sourceRoot":"","sources":["../../../src/drm/systems/PlayReadyDRM.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WidevineDRM.d.ts","sourceRoot":"","sources":["../../../src/drm/systems/WidevineDRM.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,qBAAa,WAAY,SAAQ,OAAO;IAChC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BjC,YAAY,IAAI,MAAM;IAItB,YAAY,IAAI,GAAG;
|
|
1
|
+
{"version":3,"file":"WidevineDRM.d.ts","sourceRoot":"","sources":["../../../src/drm/systems/WidevineDRM.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,qBAAa,WAAY,SAAQ,OAAO;IAChC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BjC,YAAY,IAAI,MAAM;IAItB,YAAY,IAAI,GAAG;IAsCnB,qBAAqB,IAAI,GAAG;IAsB5B,OAAO,CAAC,yBAAyB;CAsBlC"}
|
|
@@ -27,25 +27,28 @@ export class WidevineDRM extends BaseDRM {
|
|
|
27
27
|
drmSystems: {
|
|
28
28
|
[this.getKeySystem()]: {
|
|
29
29
|
licenseUrl: licenseUrl,
|
|
30
|
-
serverCertificate: this.config.widevineOptions?.serverCertificate,
|
|
31
30
|
},
|
|
32
31
|
},
|
|
33
32
|
requestMediaKeySystemAccessFunc: navigator.requestMediaKeySystemAccess.bind(navigator),
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
33
|
+
xhrSetup: (xhr, url) => {
|
|
34
|
+
if (url === licenseUrl) {
|
|
35
|
+
this.log(`[LicenseXHR] Requesting license from: ${url}`);
|
|
36
|
+
if (this.config.headers) {
|
|
37
|
+
Object.keys(this.config.headers).forEach(key => {
|
|
38
|
+
xhr.setRequestHeader(key, this.config.headers[key]);
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
xhr.addEventListener('readystatechange', () => {
|
|
42
|
+
if (xhr.readyState === 4) {
|
|
43
|
+
if (xhr.status >= 200 && xhr.status < 300) {
|
|
44
|
+
this.log(`[LicenseXHR] License received successfully (Status: ${xhr.status}, Size: ${xhr.response?.byteLength || 0} bytes)`);
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
this.log(`[LicenseXHR] License request failed (Status: ${xhr.status}, Error: ${xhr.statusText})`);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
});
|
|
38
51
|
}
|
|
39
|
-
return this.licenseHandler.requestLicense({
|
|
40
|
-
url: licenseUrl,
|
|
41
|
-
method: 'POST',
|
|
42
|
-
headers: {
|
|
43
|
-
'Content-Type': 'application/octet-stream',
|
|
44
|
-
...this.config.headers,
|
|
45
|
-
},
|
|
46
|
-
body: data,
|
|
47
|
-
responseType: 'arraybuffer',
|
|
48
|
-
}).then(response => response.license);
|
|
49
52
|
}
|
|
50
53
|
};
|
|
51
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WidevineDRM.js","sourceRoot":"","sources":["../../../src/drm/systems/WidevineDRM.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAE7D,MAAM,OAAO,WAAY,SAAQ,OAAO;IACtC,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;QAIzC,IAAI;YACF,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,2BAA2B,CACjE,IAAI,CAAC,YAAY,EAAE,EACnB,IAAI,CAAC,yBAAyB,EAAE,CACjC,CAAC;YAEF,IAAI,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;YAC/C,IAAI,CAAC,SAAS,GAAG,MAAM,eAAe,CAAC,eAAe,EAAE,CAAC;SAK1D;QAAC,OAAO,KAAU,EAAE;YACnB,IAAI,CAAC,GAAG,CAAC,iCAAiC,EAAE,KAAK,CAAC,CAAC;YACnD,MAAM,eAAe,CAAC,WAAW,CAC/B,YAAY,CAAC,wBAAwB,EACrC,sCAAsC,EACtC,IAAI,EACJ,KAAK,CACN,CAAC;SACH;QAED,IAAI,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IACvC,CAAC;IAED,YAAY;QACV,OAAO,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,YAAY;QACV,IAAI,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;QAElD,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,CAAC;QAErF,OAAO;YACL,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE;gBACV,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,EAAE;oBACrB,UAAU,EAAE,UAAU;
|
|
1
|
+
{"version":3,"file":"WidevineDRM.js","sourceRoot":"","sources":["../../../src/drm/systems/WidevineDRM.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,6 +65,17 @@ export class FairPlayDRM extends BaseDRM {
|
|
|
65
65
|
},
|
|
66
66
|
},
|
|
67
67
|
requestMediaKeySystemAccessFunc: this.createMediaKeySystemAccess.bind(this),
|
|
68
|
+
xhrSetup: (xhr: XMLHttpRequest, url: string) => {
|
|
69
|
+
if (url === licenseUrl || url === certificateUrl) {
|
|
70
|
+
this.log(`[LicenseXHR] (FairPlay) Requesting resource from: ${url}`);
|
|
71
|
+
|
|
72
|
+
if (this.config.headers) {
|
|
73
|
+
Object.keys(this.config.headers).forEach(key => {
|
|
74
|
+
xhr.setRequestHeader(key, this.config.headers![key]);
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
68
79
|
};
|
|
69
80
|
}
|
|
70
81
|
|
|
@@ -59,20 +59,40 @@ export class PlayReadyDRM extends BaseDRM {
|
|
|
59
59
|
getHLSConfig(): any {
|
|
60
60
|
this.log('Generating HLS.js config for PlayReady');
|
|
61
61
|
|
|
62
|
+
const licenseUrl = this.config.licenseUrl || this.config.playreadyOptions?.licenseUrl;
|
|
63
|
+
|
|
62
64
|
return {
|
|
63
65
|
emeEnabled: true,
|
|
64
66
|
drmSystems: {
|
|
65
67
|
[this.getKeySystem()]: {
|
|
66
|
-
licenseUrl:
|
|
67
|
-
customData: this.config.customData || this.config.playreadyOptions?.customData,
|
|
68
|
+
licenseUrl: licenseUrl,
|
|
68
69
|
},
|
|
69
|
-
// Add fallback key system
|
|
70
70
|
[KEY_SYSTEMS[DRMTypeEnum.PLAYREADY][1]]: {
|
|
71
|
-
licenseUrl:
|
|
72
|
-
customData: this.config.customData || this.config.playreadyOptions?.customData,
|
|
71
|
+
licenseUrl: licenseUrl,
|
|
73
72
|
},
|
|
74
73
|
},
|
|
75
74
|
requestMediaKeySystemAccessFunc: navigator.requestMediaKeySystemAccess.bind(navigator),
|
|
75
|
+
xhrSetup: (xhr: XMLHttpRequest, url: string) => {
|
|
76
|
+
if (url === licenseUrl) {
|
|
77
|
+
this.log(`[LicenseXHR] (PlayReady) Requesting license from: ${url}`);
|
|
78
|
+
|
|
79
|
+
if (this.config.headers) {
|
|
80
|
+
Object.keys(this.config.headers).forEach(key => {
|
|
81
|
+
xhr.setRequestHeader(key, this.config.headers![key]);
|
|
82
|
+
});
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
xhr.addEventListener('readystatechange', () => {
|
|
86
|
+
if (xhr.readyState === 4) {
|
|
87
|
+
if (xhr.status >= 200 && xhr.status < 300) {
|
|
88
|
+
this.log(`[LicenseXHR] PlayReady license received (Status: ${xhr.status}, Size: ${xhr.response?.byteLength || 0} bytes)`);
|
|
89
|
+
} else {
|
|
90
|
+
this.log(`[LicenseXHR] PlayReady license request failed (Status: ${xhr.status}, Error: ${xhr.statusText})`);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
}
|
|
76
96
|
};
|
|
77
97
|
}
|
|
78
98
|
|
|
@@ -54,27 +54,30 @@ export class WidevineDRM extends BaseDRM {
|
|
|
54
54
|
drmSystems: {
|
|
55
55
|
[this.getKeySystem()]: {
|
|
56
56
|
licenseUrl: licenseUrl,
|
|
57
|
-
serverCertificate: this.config.widevineOptions?.serverCertificate,
|
|
58
57
|
},
|
|
59
58
|
},
|
|
60
59
|
requestMediaKeySystemAccessFunc: navigator.requestMediaKeySystemAccess.bind(navigator),
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
60
|
+
xhrSetup: (xhr: XMLHttpRequest, url: string) => {
|
|
61
|
+
if (url === licenseUrl) {
|
|
62
|
+
this.log(`[LicenseXHR] Requesting license from: ${url}`);
|
|
63
|
+
|
|
64
|
+
// Add custom headers if provided
|
|
65
|
+
if (this.config.headers) {
|
|
66
|
+
Object.keys(this.config.headers).forEach(key => {
|
|
67
|
+
xhr.setRequestHeader(key, this.config.headers![key]);
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
xhr.addEventListener('readystatechange', () => {
|
|
72
|
+
if (xhr.readyState === 4) {
|
|
73
|
+
if (xhr.status >= 200 && xhr.status < 300) {
|
|
74
|
+
this.log(`[LicenseXHR] License received successfully (Status: ${xhr.status}, Size: ${xhr.response?.byteLength || 0} bytes)`);
|
|
75
|
+
} else {
|
|
76
|
+
this.log(`[LicenseXHR] License request failed (Status: ${xhr.status}, Error: ${xhr.statusText})`);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
});
|
|
66
80
|
}
|
|
67
|
-
|
|
68
|
-
return this.licenseHandler.requestLicense({
|
|
69
|
-
url: licenseUrl,
|
|
70
|
-
method: 'POST',
|
|
71
|
-
headers: {
|
|
72
|
-
'Content-Type': 'application/octet-stream',
|
|
73
|
-
...this.config.headers,
|
|
74
|
-
},
|
|
75
|
-
body: data,
|
|
76
|
-
responseType: 'arraybuffer',
|
|
77
|
-
}).then(response => response.license);
|
|
78
81
|
}
|
|
79
82
|
};
|
|
80
83
|
}
|