@npo/player 1.11.3 → 1.12.0
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/lib/js/ads/ster.js.map +1 -1
- package/lib/js/ads/ster.test.js.map +1 -1
- package/lib/js/api/getstreamobject.js +34 -13
- package/lib/js/api/getstreamobject.js.map +1 -1
- package/lib/js/api/getstreamobject.test.d.ts +1 -0
- package/lib/js/api/getstreamobject.test.js +46 -0
- package/lib/js/api/getstreamobject.test.js.map +1 -0
- package/lib/js/checks/safari.test.js.map +1 -1
- package/lib/js/drm/verifydrm.js +1 -1
- package/lib/js/drm/verifydrm.js.map +1 -1
- package/lib/js/drm/verifydrm.test.js.map +1 -1
- package/lib/js/fragments/removefragments.d.ts +3 -0
- package/lib/js/fragments/removefragments.js +10 -0
- package/lib/js/fragments/removefragments.js.map +1 -0
- package/lib/js/fragments/setfragments.d.ts +2 -0
- package/lib/js/fragments/setfragments.js +42 -39
- package/lib/js/fragments/setfragments.js.map +1 -1
- package/lib/js/playeractions/customerrors.test.js.map +1 -1
- package/lib/js/playeractions/handlers/customerrors.js.map +1 -1
- package/lib/js/playeractions/handlers/error.js.map +1 -1
- package/lib/js/playeractions/handlers/error.test.js.map +1 -1
- package/lib/js/playeractions/handlers/handleoffsets.test.js.map +1 -1
- package/lib/js/playeractions/handlers/processplayerconfig.js +21 -7
- package/lib/js/playeractions/handlers/processplayerconfig.js.map +1 -1
- package/lib/js/playeractions/handlers/resolvekeypress.js +6 -0
- package/lib/js/playeractions/handlers/resolvekeypress.js.map +1 -1
- package/lib/js/playeractions/playeractions.js.map +1 -1
- package/lib/js/tracking/handlers/eventbinding.js +45 -22
- package/lib/js/tracking/handlers/eventbinding.js.map +1 -1
- package/lib/js/tracking/handlers/eventlogging.js.map +1 -1
- package/lib/js/tracking/handlers/playertrackerinit.js +7 -5
- package/lib/js/tracking/handlers/playertrackerinit.js.map +1 -1
- package/lib/js/tracking/handlers/playertrackerstart.d.ts +1 -1
- package/lib/js/tracking/handlers/playertrackerstart.js +6 -4
- package/lib/js/tracking/handlers/playertrackerstart.js.map +1 -1
- package/lib/js/ui/components/buttons.d.ts +6 -0
- package/lib/js/ui/components/buttons.js +8 -2
- package/lib/js/ui/components/buttons.js.map +1 -1
- package/lib/js/ui/components/controlbar.js +0 -1
- package/lib/js/ui/components/controlbar.js.map +1 -1
- package/lib/js/ui/components/nativemobile/buttons.d.ts +17 -3
- package/lib/js/ui/components/nativemobile/buttons.js +156 -15
- package/lib/js/ui/components/nativemobile/buttons.js.map +1 -1
- package/lib/js/ui/components/nativemobile/controlbar.js +9 -9
- package/lib/js/ui/components/nativemobile/controlbar.js.map +1 -1
- package/lib/js/ui/components/nativemobile/ctabar.d.ts +1 -0
- package/lib/js/ui/components/nativemobile/ctabar.js +1 -2
- package/lib/js/ui/components/nativemobile/ctabar.js.map +1 -1
- package/lib/js/ui/components/nativemobile/playnext.d.ts +2 -2
- package/lib/js/ui/components/nativemobile/playnext.js +2 -2
- package/lib/js/ui/components/nativemobile/playnext.js.map +1 -1
- package/lib/js/ui/components/nativemobile/topbar.js +4 -4
- package/lib/js/ui/components/nativemobile/topbar.js.map +1 -1
- package/lib/js/ui/components/playnext.d.ts +1 -0
- package/lib/js/ui/components/settingspanel.js +4 -1
- package/lib/js/ui/components/settingspanel.js.map +1 -1
- package/lib/js/ui/components/shared/playnextscreen.js +1 -1
- package/lib/js/ui/components/shared/playnextscreen.js.map +1 -1
- package/lib/js/ui/handlers/accessibilityhandler.d.ts +2 -0
- package/lib/js/ui/handlers/accessibilityhandler.js +10 -0
- package/lib/js/ui/handlers/accessibilityhandler.js.map +1 -0
- package/lib/js/ui/handlers/listboxhandlers.js.map +1 -1
- package/lib/js/ui/handlers/nicamhandler.d.ts +3 -2
- package/lib/js/ui/handlers/nicamhandler.js +17 -4
- package/lib/js/ui/handlers/nicamhandler.js.map +1 -1
- package/lib/js/ui/handlers/nicamhandler.test.js +12 -6
- package/lib/js/ui/handlers/nicamhandler.test.js.map +1 -1
- package/lib/js/ui/nativemobileuicontainer.d.ts +2 -3
- package/lib/js/ui/nativemobileuicontainer.js +7 -12
- package/lib/js/ui/nativemobileuicontainer.js.map +1 -1
- package/lib/js/ui/nativemobileuifactory.js +68 -26
- package/lib/js/ui/nativemobileuifactory.js.map +1 -1
- package/lib/js/ui/uicontainer.js +6 -1
- package/lib/js/ui/uicontainer.js.map +1 -1
- package/lib/js/utilities/utilities.d.ts +3 -1
- package/lib/js/utilities/utilities.js +19 -2
- package/lib/js/utilities/utilities.js.map +1 -1
- package/lib/lang/nl.json +8 -7
- package/lib/npoplayer.d.ts +3 -2
- package/lib/npoplayer.js +80 -57
- package/lib/npoplayer.js.map +1 -1
- package/lib/npoplayer.test.js.map +1 -1
- package/lib/package.json +2 -1
- package/lib/src/js/api/getstreamobject.test.d.ts +1 -0
- package/lib/src/js/fragments/removefragments.d.ts +3 -0
- package/lib/src/js/fragments/setfragments.d.ts +2 -0
- package/lib/src/js/tracking/handlers/playertrackerstart.d.ts +1 -1
- package/lib/src/js/ui/components/buttons.d.ts +6 -0
- package/lib/src/js/ui/components/nativemobile/buttons.d.ts +17 -3
- package/lib/src/js/ui/components/nativemobile/ctabar.d.ts +1 -0
- package/lib/src/js/ui/components/nativemobile/playnext.d.ts +2 -2
- package/lib/src/js/ui/components/playnext.d.ts +1 -0
- package/lib/src/js/ui/handlers/accessibilityhandler.d.ts +2 -0
- package/lib/src/js/ui/handlers/nicamhandler.d.ts +3 -2
- package/lib/src/js/ui/nativemobileuicontainer.d.ts +2 -3
- package/lib/src/js/utilities/utilities.d.ts +3 -1
- package/lib/src/npoplayer.d.ts +3 -2
- package/lib/src/types/interfaces.d.ts +26 -6
- package/lib/types/interfaces.d.ts +26 -6
- package/lib/types/interfaces.js +13 -1
- package/lib/types/interfaces.js.map +1 -1
- package/package.json +2 -1
- package/src/scss/components/_advert.scss +1 -1
- package/src/scss/components/_buffering.scss +1 -0
- package/src/scss/components/_hugeplaybacktogglebutton.scss +15 -4
- package/src/scss/components/_metadata.scss +7 -0
- package/src/scss/components/_nicam.scss +19 -16
- package/src/scss/npoplayer.css +30 -23
- package/src/scss/variants/_player-base.scss +14 -5
- package/src/scss/variants/_player-small.scss +6 -1
package/lib/js/ads/ster.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ster.js","sourceRoot":"","sources":["../../../../src/js/ads/ster.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,SAAS,EAAa,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAalF,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,SAAoB,EAAE,YAA0B,EAAE,SAAoB;IACvG,IAAI,YAAY,CAAC,QAAQ,CAAC,UAAU,IAAI,OAAO,IAAI,YAAY,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI;QAAE,OAAM;IAE9F,IAAI,UAAU,GAAG,YAAY,CAAC,MAAM,CAAC,OAAO,CAAA;IAC5C,IAAI,OAAO,GAAU,CAAC,CAAA;IACtB,IAAI,QAAQ,GAAW,CAAC,CAAA;IACxB,IAAI,oBAAoB,GAAwB,IAAI,CAAA;IACpD,IAAI,OAAO,GAAW,KAAK,CAAA;IAO3B,KAAK,UAAU,kBAAkB;QAC7B,MAAM,YAAY,GAAkB;YAChC,GAAG,EAAE;gBACD,GAAG,EAAE,UAAU;gBACf,IAAI,EAAE,SAAS,CAAC,IAAI;aACvB;YACD,EAAE,EAAE,IAAI;YACR,QAAQ,EAAE,KAAK;SAClB,
|
|
1
|
+
{"version":3,"file":"ster.js","sourceRoot":"","sources":["../../../../src/js/ads/ster.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ster.test.js","sourceRoot":"","sources":["../../../../src/js/ads/ster.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"ster.test.js","sourceRoot":"","sources":["../../../../src/js/ads/ster.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,39 @@
|
|
|
1
1
|
import { noTrailingSlash } from '../utilities/utilities';
|
|
2
2
|
export async function getStreamObject(npoplayer, payload) {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
3
|
+
try {
|
|
4
|
+
const controller = new AbortController();
|
|
5
|
+
const { signal } = controller;
|
|
6
|
+
const timeout = setTimeout(() => {
|
|
7
|
+
controller.abort();
|
|
8
|
+
}, 5000);
|
|
9
|
+
const response = await fetch(noTrailingSlash(payload.baseURL) + '/stream-link', {
|
|
10
|
+
method: 'post',
|
|
11
|
+
headers: {
|
|
12
|
+
Accept: '*/*',
|
|
13
|
+
Authorization: payload.jwt,
|
|
14
|
+
'Content-Type': 'application/json'
|
|
15
|
+
},
|
|
16
|
+
body: JSON.stringify(payload.data),
|
|
17
|
+
signal
|
|
18
|
+
});
|
|
19
|
+
clearTimeout(timeout);
|
|
20
|
+
const streamApiResponse = await response.json();
|
|
21
|
+
if (!response.ok) {
|
|
22
|
+
npoplayer.doError(`Het is niet gelukt de stream op te halen: \n ${streamApiResponse.body}`, response.status);
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
return streamApiResponse;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
catch (error) {
|
|
29
|
+
if (error instanceof Error) {
|
|
30
|
+
if (error.message === 'AbortError') {
|
|
31
|
+
npoplayer.doError('Het is niet gelukt de stream op te halen: \n Request timed out', 408);
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
npoplayer.doError(`Het is niet gelukt de stream op te halen: \n ${error.message}`, 500);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
15
37
|
}
|
|
16
|
-
return streamApiResponse;
|
|
17
38
|
}
|
|
18
39
|
//# sourceMappingURL=getstreamobject.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getstreamobject.js","sourceRoot":"","sources":["../../../../src/js/api/getstreamobject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAIxD,MAAM,CAAC,KAAK,UAAU,eAAe,CAAE,SAAoB,EAAE,OAAmB;IAC5E,MAAM,QAAQ,GAAG,MAAM,KAAK,CACxB,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,cAAc,EACjD;
|
|
1
|
+
{"version":3,"file":"getstreamobject.js","sourceRoot":"","sources":["../../../../src/js/api/getstreamobject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAIxD,MAAM,CAAC,KAAK,UAAU,eAAe,CAAE,SAAoB,EAAE,OAAmB;IAC5E,IAAI;QACA,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;QACxC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAA;QAE7B,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,UAAU,CAAC,KAAK,EAAE,CAAA;QACtB,CAAC,EAAE,IAAI,CAAC,CAAA;QAER,MAAM,QAAQ,GAAG,MAAM,KAAK,CACxB,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,cAAc,EACjD;YACI,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACL,MAAM,EAAE,KAAK;gBACb,aAAa,EAAE,OAAO,CAAC,GAAG;gBAC1B,cAAc,EAAE,kBAAkB;aACrC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;YAClC,MAAM;SACT,CACJ,CAAA;QAED,YAAY,CAAC,OAAO,CAAC,CAAA;QAErB,MAAM,iBAAiB,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QAE/C,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;YACd,SAAS,CAAC,OAAO,CAAC,gDAAgD,iBAAiB,CAAC,IAAI,EAAE,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAA;SAC/G;aAAM;YACH,OAAO,iBAAiB,CAAA;SAC3B;KAEJ;IAAC,OAAO,KAAc,EAAE;QACrB,IAAI,KAAK,YAAY,KAAK,EAAE;YACxB,IAAI,KAAK,CAAC,OAAO,KAAK,YAAY,EAAE;gBAChC,SAAS,CAAC,OAAO,CAAC,gEAAgE,EAAE,GAAG,CAAC,CAAA;aAC3F;iBAAM;gBACH,SAAS,CAAC,OAAO,CAAC,gDAAgD,KAAK,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,CAAA;aAC1F;SACJ;KACJ;AAEL,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import { getStreamObject } from './getstreamobject';
|
|
2
|
+
import NpoPlayer from '../../npoplayer';
|
|
3
|
+
import fetchMock from 'jest-fetch-mock';
|
|
4
|
+
fetchMock.enableMocks();
|
|
5
|
+
describe('getStreamObject', () => {
|
|
6
|
+
let npoplayer;
|
|
7
|
+
let apiPayload;
|
|
8
|
+
const testPlayerConfig = {
|
|
9
|
+
key: "D634EA2C-BFE7-4BB6-9EAA-CDCC7B1EDFFA",
|
|
10
|
+
};
|
|
11
|
+
const div = document.createElement("div");
|
|
12
|
+
beforeEach(() => {
|
|
13
|
+
npoplayer = new NpoPlayer(div, testPlayerConfig);
|
|
14
|
+
apiPayload = {
|
|
15
|
+
baseURL: 'http://example.com',
|
|
16
|
+
jwt: 'someToken',
|
|
17
|
+
data: {}
|
|
18
|
+
};
|
|
19
|
+
fetchMock.resetMocks();
|
|
20
|
+
jest.clearAllMocks();
|
|
21
|
+
});
|
|
22
|
+
it('should handle successful fetch', async () => {
|
|
23
|
+
fetchMock.mockResponseOnce(JSON.stringify({ foo: 'bar' }));
|
|
24
|
+
const result = await getStreamObject(npoplayer, apiPayload);
|
|
25
|
+
expect(result).toEqual({ foo: 'bar' });
|
|
26
|
+
});
|
|
27
|
+
it('should handle fetch with bad response', async () => {
|
|
28
|
+
fetchMock.mockResponseOnce(JSON.stringify({ body: 'Bad Request' }), { status: 400 });
|
|
29
|
+
const doErrorSpy = jest.spyOn(npoplayer, 'doError');
|
|
30
|
+
await getStreamObject(npoplayer, apiPayload);
|
|
31
|
+
expect(doErrorSpy).toHaveBeenCalledWith(expect.stringContaining('Het is niet gelukt de stream op te halen'), 400);
|
|
32
|
+
});
|
|
33
|
+
it('should handle fetch timeout', async () => {
|
|
34
|
+
fetchMock.mockRejectOnce(new Error('AbortError'));
|
|
35
|
+
const doErrorSpy = jest.spyOn(npoplayer, 'doError');
|
|
36
|
+
await getStreamObject(npoplayer, apiPayload);
|
|
37
|
+
expect(doErrorSpy).toHaveBeenCalledWith(expect.stringContaining('Request timed out'), 408);
|
|
38
|
+
});
|
|
39
|
+
it('should handle fetch with other errors', async () => {
|
|
40
|
+
fetchMock.mockRejectOnce(new Error('SomeError'));
|
|
41
|
+
const doErrorSpy = jest.spyOn(npoplayer, 'doError');
|
|
42
|
+
await getStreamObject(npoplayer, apiPayload);
|
|
43
|
+
expect(doErrorSpy).toHaveBeenCalledWith(expect.stringContaining('SomeError'), 500);
|
|
44
|
+
});
|
|
45
|
+
});
|
|
46
|
+
//# sourceMappingURL=getstreamobject.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getstreamobject.test.js","sourceRoot":"","sources":["../../../../src/js/api/getstreamobject.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,SAAS,MAAM,iBAAiB,CAAA;AAGvC,OAAO,SAAS,MAAM,iBAAiB,CAAA;AAEvC,SAAS,CAAC,WAAW,EAAE,CAAA;AAEvB,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,IAAI,SAAoB,CAAA;IACxB,IAAI,UAAsB,CAAA;IAC1B,MAAM,gBAAgB,GAAiB;QACnC,GAAG,EAAE,sCAAsC;KAC9C,CAAA;IACD,MAAM,GAAG,GAAgB,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;IAEtD,UAAU,CAAC,GAAG,EAAE;QACZ,SAAS,GAAG,IAAI,SAAS,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAA;QAChD,UAAU,GAAG;YACT,OAAO,EAAE,oBAAoB;YAC7B,GAAG,EAAE,WAAW;YAChB,IAAI,EAAE,EAAE;SACX,CAAA;QACD,SAAS,CAAC,UAAU,EAAE,CAAA;QACtB,IAAI,CAAC,aAAa,EAAE,CAAA;IACxB,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAC5C,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;QAE1D,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;QAE3D,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;IAC1C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACnD,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;QACpF,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;QAEnD,MAAM,eAAe,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;QAE5C,MAAM,CAAC,UAAU,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,gBAAgB,CAAC,0CAA0C,CAAC,EAAE,GAAG,CAAC,CAAA;IACrH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QACzC,SAAS,CAAC,cAAc,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAA;QAEjD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;QAEnD,MAAM,eAAe,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;QAE5C,MAAM,CAAC,UAAU,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,EAAE,GAAG,CAAC,CAAA;IAC9F,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACnD,SAAS,CAAC,cAAc,CAAC,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,CAAA;QAEhD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;QAEnD,MAAM,eAAe,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;QAE5C,MAAM,CAAC,UAAU,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,GAAG,CAAC,CAAA;IACtF,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safari.test.js","sourceRoot":"","sources":["../../../../src/js/checks/safari.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"safari.test.js","sourceRoot":"","sources":["../../../../src/js/checks/safari.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAEnC,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAE1E,MAAM,sBAAsB,GAAG,KAAK,CAAA;QAEpC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,UAAU,EAAE,CAAA;IACzD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACrD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAE1E,MAAM,sBAAsB,GAAG,IAAI,CAAA;QAEnC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,UAAU,EAAE,CAAA;IACzD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QACzD,IAAI;aACC,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,EAAE,KAAK,CAAC;aAC3C,eAAe,CAAC,8CAA8C,CAAC,CAAA;QAEpE,MAAM,sBAAsB,GAAG,KAAK,CAAA;QAEpC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,SAAS,EAAE,CAAA;IACxD,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
|
package/lib/js/drm/verifydrm.js
CHANGED
|
@@ -9,7 +9,7 @@ export async function verifyDRM(npoplayer, player, payload) {
|
|
|
9
9
|
void player.load(npoplayer.sourceConfig);
|
|
10
10
|
}
|
|
11
11
|
else {
|
|
12
|
-
console.
|
|
12
|
+
console.warn('DRM token window verstreken; item wordt herladen met een nieuwe token.');
|
|
13
13
|
const backupStreamObject = await getStreamObject(npoplayer, payload);
|
|
14
14
|
const newDrmToken = backupStreamObject.stream.drmToken;
|
|
15
15
|
const clonedStreamObject = JSON.parse(JSON.stringify(npoplayer.streamObject));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifydrm.js","sourceRoot":"","sources":["../../../../src/js/drm/verifydrm.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAKxD,MAAM,CAAC,KAAK,UAAU,SAAS,CAAE,SAAoB,EAAE,MAAiB,EAAE,OAAmB;IACzF,IAAI,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,IAAI,IAAI,EAAE;QAChD,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACrE,MAAM,gBAAgB,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,GAAG,CAAA;QACtD,MAAM,WAAW,GAAW,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;QAEnD,IAAI,gBAAgB,IAAI,WAAW,EAAE;YACjC,KAAK,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;SAC3C;aAAM;YAEH,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"verifydrm.js","sourceRoot":"","sources":["../../../../src/js/drm/verifydrm.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAKxD,MAAM,CAAC,KAAK,UAAU,SAAS,CAAE,SAAoB,EAAE,MAAiB,EAAE,OAAmB;IACzF,IAAI,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,IAAI,IAAI,EAAE;QAChD,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACrE,MAAM,gBAAgB,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,GAAG,CAAA;QACtD,MAAM,WAAW,GAAW,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;QAEnD,IAAI,gBAAgB,IAAI,WAAW,EAAE;YACjC,KAAK,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;SAC3C;aAAM;YAEH,OAAO,CAAC,IAAI,CAAC,wEAAwE,CAAC,CAAA;YAEtF,MAAM,kBAAkB,GAAG,MAAM,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;YACpE,MAAM,WAAW,GAAG,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAA;YAGtD,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CACjC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,YAAY,CAAC,CACzC,CAAA;YACD,kBAAkB,CAAC,MAAM,CAAC,QAAQ,GAAG,WAAW,CAAA;YAEhD,SAAS,CAAC,YAAY,GAAG,kBAAkB,CAAA;YAC3C,KAAK,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;SAC3C;KACJ;SAAM;QACH,KAAK,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;KAC3C;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifydrm.test.js","sourceRoot":"","sources":["../../../../src/js/drm/verifydrm.test.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"verifydrm.test.js","sourceRoot":"","sources":["../../../../src/js/drm/verifydrm.test.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA;AAEtB,MAAM,SAAS,GAAG;IACd,YAAY,EAAE,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE;CACvC,CAAA;AAEd,MAAM,MAAM,GAAG,EAAE,IAAI,EAA0B,CAAA;AAE/C,MAAM,OAAO,GAAe;IACxB,OAAO,EAAE,KAAK;IACd,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;CACzB,CAAA;AAED,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACnC,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;QAC/D,MAAM,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAE3C,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAA;IAC7B,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { PlayerEvent } from 'bitmovin-player';
|
|
2
|
+
import { checkFunction, seekFunction } from './setfragments';
|
|
3
|
+
export async function removeFragments(player, uiManager) {
|
|
4
|
+
uiManager.getTimelineMarkers().forEach(marker => {
|
|
5
|
+
uiManager.removeTimelineMarker(marker);
|
|
6
|
+
});
|
|
7
|
+
player.off(PlayerEvent.TimeChanged, checkFunction());
|
|
8
|
+
player.off(PlayerEvent.Seek, seekFunction());
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=removefragments.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"removefragments.js","sourceRoot":"","sources":["../../../../src/js/fragments/removefragments.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAExD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE5D,MAAM,CAAC,KAAK,UAAU,eAAe,CAAE,MAAiB,EAAE,SAAoB;IAC1E,SAAS,CAAC,kBAAkB,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAC5C,SAAS,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAA;IAC1C,CAAC,CAAC,CAAA;IAEF,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC,CAAA;IACpD,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,YAAY,EAAE,CAAC,CAAA;AAChD,CAAC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { PlayerAPI } from 'bitmovin-player';
|
|
2
2
|
import { type Fragments } from '../../types/interfaces';
|
|
3
3
|
import { UIManager } from 'bitmovin-player-ui';
|
|
4
|
+
export declare const checkFunction: () => (e: any) => void;
|
|
5
|
+
export declare const seekFunction: () => (e: any) => void;
|
|
4
6
|
export declare function setFragments(player: PlayerAPI, uiManager: UIManager, fragments: Fragments): Promise<void>;
|
|
@@ -1,13 +1,48 @@
|
|
|
1
1
|
import { PlayerEvent } from 'bitmovin-player';
|
|
2
|
+
import { removeFragments } from './removefragments';
|
|
3
|
+
let fragment = null;
|
|
4
|
+
let playerInstance = null;
|
|
5
|
+
const setTitle = () => {
|
|
6
|
+
const element = document.querySelector('.bmpui-npo-player .bmpui-seekbar-label-title');
|
|
7
|
+
if (element !== null && element.textContent === '') {
|
|
8
|
+
element.textContent = fragment?.title || '';
|
|
9
|
+
}
|
|
10
|
+
};
|
|
11
|
+
export const checkFunction = () => (e) => {
|
|
12
|
+
if (!fragment || !playerInstance)
|
|
13
|
+
return;
|
|
14
|
+
if (e.time > fragment.end) {
|
|
15
|
+
playerInstance.seek(Math.max(fragment.start, fragment.end));
|
|
16
|
+
playerInstance.pause();
|
|
17
|
+
}
|
|
18
|
+
else if (e.time < fragment.start) {
|
|
19
|
+
playerInstance.seek(fragment.start);
|
|
20
|
+
}
|
|
21
|
+
setTitle();
|
|
22
|
+
};
|
|
23
|
+
export const seekFunction = () => (e) => {
|
|
24
|
+
if (!fragment || !playerInstance)
|
|
25
|
+
return;
|
|
26
|
+
const seekTarget = e.seekTarget ? e.seekTarget : e.to.time;
|
|
27
|
+
if (seekTarget > fragment.end || seekTarget < fragment.start) {
|
|
28
|
+
playerInstance.seek(Math.max(fragment.start, Math.min(fragment.end, seekTarget)));
|
|
29
|
+
}
|
|
30
|
+
setTitle();
|
|
31
|
+
};
|
|
2
32
|
export async function setFragments(player, uiManager, fragments) {
|
|
3
|
-
|
|
33
|
+
fragment = fragments.sections[0] || null;
|
|
34
|
+
playerInstance = player;
|
|
35
|
+
const unplayableClass = 'seekbar-marker-unplayable';
|
|
4
36
|
const playFragmentFromStart = () => {
|
|
37
|
+
if (!fragment)
|
|
38
|
+
return;
|
|
5
39
|
player.seek(fragment.start);
|
|
6
40
|
if (player.isPaused())
|
|
7
41
|
void player.play();
|
|
8
42
|
};
|
|
9
|
-
const unplayableClass = 'seekbar-marker-unplayable';
|
|
10
43
|
const addMarkers = () => {
|
|
44
|
+
if (!fragment)
|
|
45
|
+
return;
|
|
11
46
|
const timelineMarkers = [
|
|
12
47
|
{
|
|
13
48
|
time: 0,
|
|
@@ -26,44 +61,12 @@ export async function setFragments(player, uiManager, fragments) {
|
|
|
26
61
|
uiManager.addTimelineMarker(marker);
|
|
27
62
|
});
|
|
28
63
|
playFragmentFromStart();
|
|
64
|
+
player.off(PlayerEvent.TimeChanged, checkFunction());
|
|
65
|
+
player.off(PlayerEvent.Seek, seekFunction());
|
|
66
|
+
player.on(PlayerEvent.TimeChanged, checkFunction());
|
|
67
|
+
player.on(PlayerEvent.Seek, seekFunction());
|
|
29
68
|
};
|
|
30
|
-
|
|
31
|
-
uiManager.getTimelineMarkers().forEach(marker => {
|
|
32
|
-
uiManager.removeTimelineMarker(marker);
|
|
33
|
-
});
|
|
34
|
-
};
|
|
35
|
-
const setTitle = () => {
|
|
36
|
-
const element = document.querySelector('.bmpui-npo-player .bmpui-seekbar-label-title');
|
|
37
|
-
if (element !== null && element.textContent === '') {
|
|
38
|
-
element.textContent = fragment.title || '';
|
|
39
|
-
}
|
|
40
|
-
};
|
|
41
|
-
const checkFunction = (e) => {
|
|
42
|
-
if (fragment == null)
|
|
43
|
-
return;
|
|
44
|
-
if (e.time > fragment.end) {
|
|
45
|
-
player.seek(Math.max(fragment.start, fragment.end));
|
|
46
|
-
player.pause();
|
|
47
|
-
}
|
|
48
|
-
else if (e.time < fragment.start) {
|
|
49
|
-
player.seek(fragment.start);
|
|
50
|
-
}
|
|
51
|
-
setTitle();
|
|
52
|
-
};
|
|
53
|
-
const seekFunction = (e) => {
|
|
54
|
-
if (fragment == null)
|
|
55
|
-
return;
|
|
56
|
-
const seekTarget = e.seekTarget ? e.seekTarget : e.to.time;
|
|
57
|
-
if (seekTarget > fragment.end || seekTarget < fragment.start) {
|
|
58
|
-
player.seek(Math.max(fragment.start, Math.min(fragment.end, seekTarget)));
|
|
59
|
-
}
|
|
60
|
-
setTitle();
|
|
61
|
-
};
|
|
62
|
-
player.off(PlayerEvent.TimeChanged, checkFunction);
|
|
63
|
-
player.off(PlayerEvent.Seek, seekFunction);
|
|
64
|
-
player.on(PlayerEvent.TimeChanged, checkFunction);
|
|
65
|
-
player.on(PlayerEvent.Seek, seekFunction);
|
|
66
|
-
removeMarkers();
|
|
69
|
+
await removeFragments(player, uiManager);
|
|
67
70
|
addMarkers();
|
|
68
71
|
}
|
|
69
72
|
//# sourceMappingURL=setfragments.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setfragments.js","sourceRoot":"","sources":["../../../../src/js/fragments/setfragments.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,WAAW,
|
|
1
|
+
{"version":3,"file":"setfragments.js","sourceRoot":"","sources":["../../../../src/js/fragments/setfragments.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customerrors.test.js","sourceRoot":"","sources":["../../../../src/js/playeractions/customerrors.test.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,uCAAuC,EAAE,MAAM,yBAAyB,
|
|
1
|
+
{"version":3,"file":"customerrors.test.js","sourceRoot":"","sources":["../../../../src/js/playeractions/customerrors.test.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customerrors.js","sourceRoot":"","sources":["../../../../../src/js/playeractions/handlers/customerrors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,
|
|
1
|
+
{"version":3,"file":"customerrors.js","sourceRoot":"","sources":["../../../../../src/js/playeractions/handlers/customerrors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAG/C,MAAM,CAAC,MAAM,uCAAuC,GAAG;IAEnD,IAAI,EAAE,wBAAwB;IAI9B,IAAI,EAAE,wBAAwB;IAI9B,IAAI,EAAE,8BAA8B;IAIpC,IAAI,EAAE,sCAAsC;IAI5C,IAAI,EAAE,6CAA6C;IAInD,IAAI,EAAE,mDAAmD;IAIzD,IAAI,EAAE,sDAAsD;IAI5D,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,uDAAuD;IAI7D,IAAI,EAAE,2CAA2C;IAGjD,IAAI,EAAE,CAAC,KAAU,EAAE,EAAE;QACjB,OAAO,UAAU,CAAC,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACtD,CAAC;IAID,IAAI,EAAE,yCAAyC;IAK/C,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAKR,IAAI,EAAE,CAAC,KAAU,EAAE,EAAE;QACjB,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAA;QACxC,OAAO,uCAAuC,GAAG,UAAU,CAAA;IAC/D,CAAC;IAID,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAKR,IAAI,EAAE,EAAE;IAKR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,2CAA2C;IAIjD,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,kDAAkD;IAExD,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,iCAAiC;IAIvC,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;IAIR,IAAI,EAAE,EAAE;CACX,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../../src/js/playeractions/handlers/error.ts"],"names":[],"mappings":"AAYA,MAAM,UAAU,iBAAiB,CAC7B,MAAiB,EACjB,YAA0B,EAC1B,KAAU;IAEV,IAAI,OAAO,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../../src/js/playeractions/handlers/error.ts"],"names":[],"mappings":"AAYA,MAAM,UAAU,iBAAiB,CAC7B,MAAiB,EACjB,YAA0B,EAC1B,KAAU;IAEV,IAAI,OAAO,GAAG,EAAE,CAAA;IAEhB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC3B,OAAO,GAAG,KAAK,CAAA;KAClB;IAED,OAAO,CAAC,KAAK,CAAC,+CAA+C,EAAE,KAAK,CAAC,CAAA;IAErE,MAAM,CAAC,MAAM,EAAE,CAAA;IAEf,IAAI,YAAY,CAAC,UAAU;QAAE,YAAY,CAAC,UAAU,CAAC,IAAI,EAAE,CAAA;IAE3D,IAAI,YAAY,CAAC,mBAAmB,IAAI,IAAI;QAAE,OAAM;IACpD,YAAY,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;IACvC,YAAY,CAAC,mBAA2B,CAAC,UAAU,CAAC,OAAO,CACxD,OAAO,IAAI,kCAAkC,CAChD,CAAA;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/js/playeractions/handlers/error.test.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/js/playeractions/handlers/error.test.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAG3C,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA;AACtB,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA;AACxB,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA;AACzB,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA;AAEtB,MAAM,KAAK,GAAG,QAAQ,CAAA;AACtB,MAAM,MAAM,GAAG,EAAE,MAAM,EAA0B,CAAA;AAEjD,MAAM,YAAY,GAAiB;IAC/B,UAAU,EAAE,EAAE,IAAI,EAA2B;IAC7C,mBAAmB,EAAE;QACjB,UAAU,EAAE,EAAE,OAAO,EAAE;QACvB,IAAI;KAC2B;CACtC,CAAA;AAED,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACnC,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,aAAa,EAAE,CAAA;IACxB,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACjC,iBAAiB,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;QAE9C,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAA;IAC/B,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAClC,iBAAiB,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;QAE9C,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAA;IAC7B,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,MAAM,UAAU,GAAG;YACf,GAAG,YAAY;YACf,UAAU,EAAE,SAAS;SACxB,CAAA;QAED,iBAAiB,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,CAAA;QAE5C,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,CAAA;IACjC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACvC,iBAAiB,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;QAE9C,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAA;QACzB,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAA;IAChC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC3C,iBAAiB,CACb,MAAM,EACN,EAAE,GAAG,YAAY,EAAE,mBAAmB,EAAE,SAAS,EAAE,EACnD,KAAK,CACR,CAAA;QAED,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,CAAA;IACjC,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleoffsets.test.js","sourceRoot":"","sources":["../../../../../src/js/playeractions/handlers/handleoffsets.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"handleoffsets.test.js","sourceRoot":"","sources":["../../../../../src/js/playeractions/handlers/handleoffsets.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAExE,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,IAAI,CAAA;AACzB,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA;AACzB,MAAM,SAAS,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA;AAE3B,MAAM,MAAM,GAAG,EAAE,CAAA;AACjB,MAAM,SAAS,GAAG,EAAE,CAAA;AAEpB,MAAM,MAAM,GAAG;IACX,MAAM;IACN,EAAE,EAAE,OAAO;IACX,SAAS;CACY,CAAA;AAEzB,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IAClC,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,aAAa,EAAE,CAAA;IACxB,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC3C,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QAEjC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,CAAA;IACpC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAChD,iBAAiB,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC,CAAA;QAErD,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,CAAA;IACpC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACjE,iBAAiB,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,CAAA;QAE7D,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAA;IAChC,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACrC,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,aAAa,EAAE,CAAA;IACxB,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACrD,mBAAmB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAEpC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,CAAA;IACtC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC7D,mBAAmB,CAAC,MAAM,CAAC,CAAA;QAE3B,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,CAAA;IACtC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QACzD,mBAAmB,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,SAAS,CAAC,CAAA;QAElE,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,CAAA;IACtC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC1E,mBAAmB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;QAEtC,MAAM,CAAC,SAAS,CAAC,CAAC,UAAU,EAAE,CAAA;IAClC,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
|
|
@@ -11,13 +11,27 @@ export function processPlayerConfig(npoplayer, playerConfig) {
|
|
|
11
11
|
};
|
|
12
12
|
}
|
|
13
13
|
processedConfig.ui = false;
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
14
|
+
const defaultRemoteControlConfig = {
|
|
15
|
+
type: 'googlecast',
|
|
16
|
+
receiverApplicationId: 'CC38EB17',
|
|
17
|
+
receiverVersion: 'v3',
|
|
18
|
+
messageNamespace: 'urn:x-cast:com.bitmovin.player.caf',
|
|
19
|
+
customReceiverConfig: {
|
|
20
|
+
drm: npoplayer.drmProfile.drm,
|
|
21
|
+
profileName: npoplayer.drmProfile.profileName,
|
|
22
|
+
jwt: npoplayer.jwt
|
|
23
|
+
}
|
|
24
|
+
};
|
|
25
|
+
const userRemoteControlConfig = processedConfig.remotecontrol || defaultRemoteControlConfig;
|
|
26
|
+
const mergedRemoteControlConfig = {
|
|
27
|
+
...defaultRemoteControlConfig,
|
|
28
|
+
...userRemoteControlConfig,
|
|
29
|
+
customReceiverConfig: {
|
|
30
|
+
...defaultRemoteControlConfig.customReceiverConfig,
|
|
31
|
+
...userRemoteControlConfig.customReceiverConfig
|
|
32
|
+
}
|
|
33
|
+
};
|
|
34
|
+
processedConfig.remotecontrol = mergedRemoteControlConfig;
|
|
21
35
|
if (!processedConfig.logs)
|
|
22
36
|
processedConfig.logs = {
|
|
23
37
|
level: LogLevel.ERROR
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processplayerconfig.js","sourceRoot":"","sources":["../../../../../src/js/playeractions/handlers/processplayerconfig.ts"],"names":[],"mappings":"AASA,OAAO,EAAqB,QAAQ,
|
|
1
|
+
{"version":3,"file":"processplayerconfig.js","sourceRoot":"","sources":["../../../../../src/js/playeractions/handlers/processplayerconfig.ts"],"names":[],"mappings":"AASA,OAAO,EAAqB,QAAQ,EAAiC,MAAM,iBAAiB,CAAA;AAE5F,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE9C,MAAM,UAAU,mBAAmB,CAAC,SAAmB,EAAE,YAAyB;IAE9E,IAAI,eAAe,GAAG,YAAY,CAAA;IAElC,IAAI,QAAQ,CAAC,SAAS,CAAC,sBAAsB,EAAE,CAAC,EAAE;QAE9C,eAAe,CAAC,QAAQ,GAAG;YACvB,QAAQ,EAAE,KAAK;SAClB,CAAA;QAGD,eAAe,CAAC,MAAM,GAAG;YACrB,8CAA8C,EAAE,IAAI;SACvD,CAAA;KACJ;IAED,eAAe,CAAC,EAAE,GAAG,KAAK,CAAA;IAE1B,MAAM,0BAA0B,GAAG;QAC/B,IAAI,EAAE,YAAY;QAClB,qBAAqB,EAAE,UAAU;QACjC,eAAe,EAAE,IAAI;QACrB,gBAAgB,EAAE,oCAAoC;QACtD,oBAAoB,EAAE;YAClB,GAAG,EAAE,SAAS,CAAC,UAAU,CAAC,GAAG;YAC7B,WAAW,EAAE,SAAS,CAAC,UAAU,CAAC,WAAW;YAC7C,GAAG,EAAE,SAAS,CAAC,GAAG;SACrB;KACJ,CAAA;IAED,MAAM,uBAAuB,GAAG,eAAe,CAAC,aAAa,IAAI,0BAA0B,CAAA;IAG3F,MAAM,yBAAyB,GAAG;QAC9B,GAAG,0BAA0B;QAC7B,GAAG,uBAAuB;QAC1B,oBAAoB,EAAE;YAClB,GAAG,0BAA0B,CAAC,oBAAoB;YAClD,GAAG,uBAAuB,CAAC,oBAAoB;SAClD;KACJ,CAAA;IAED,eAAe,CAAC,aAAa,GAAG,yBAA0D,CAAA;IAE1F,IAAG,CAAC,eAAe,CAAC,IAAI;QAAE,eAAe,CAAC,IAAI,GAAG;YAC7C,KAAK,EAAE,QAAQ,CAAC,KAAK;SACxB,CAAA;IAGD,eAAe,CAAC,WAAW,GAAG,EAAE,CAAA;IAEhC,OAAO,eAAe,CAAA;AAC1B,CAAC"}
|
|
@@ -42,6 +42,12 @@ export function resolveKeyPress(player, npoplayer, e) {
|
|
|
42
42
|
npoplayer.goForward(10);
|
|
43
43
|
break;
|
|
44
44
|
}
|
|
45
|
+
case 'Escape': {
|
|
46
|
+
if (npoplayer.uiComponents.settingsPanel && npoplayer.uiComponents.settingsPanel.isShown()) {
|
|
47
|
+
npoplayer.uiComponents.settingsPanel?.hide();
|
|
48
|
+
}
|
|
49
|
+
break;
|
|
50
|
+
}
|
|
45
51
|
}
|
|
46
52
|
}
|
|
47
53
|
//# sourceMappingURL=resolvekeypress.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolvekeypress.js","sourceRoot":"","sources":["../../../../../src/js/playeractions/handlers/resolvekeypress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,QAAQ,EAAE,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"resolvekeypress.js","sourceRoot":"","sources":["../../../../../src/js/playeractions/handlers/resolvekeypress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAY1D,MAAM,UAAU,eAAe,CAAC,MAAiB,EAAE,SAAoB,EAAE,CAAgB;IACrF,QAAQ,CAAC,CAAC,IAAI,EAAE;QACZ,KAAK,MAAM,CAAC,CAAC;YACT,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,KAAK,CAAA;YACzC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;YACzC,MAAK;SACR;QACD,KAAK,MAAM,CAAC,CAAC;YACT,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,UAAU,EAAE;gBAC9C,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;aAC1C;iBAAM;gBACH,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;aACtC;YACD,MAAK;SACR;QACD,KAAK,OAAO,CAAC,CAAC;YACV,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,EAAE,IAAI,KAAK,CAAA;YAC3C,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;YACzC,MAAK;SACR;QACD,KAAK,SAAS,CAAC,CAAC;YACZ,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,KAAK,CAAA;YACzC,IAAI,OAAO;gBAAE,MAAM,CAAC,MAAM,EAAE,CAAA;YAC5B,SAAS,CAAC,cAAc,EAAE,CAAA;YAC1B,MAAK;SACR;QACD,KAAK,WAAW,CAAC,CAAC;YACd,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,KAAK,CAAA;YACzC,IAAI,OAAO;gBAAE,MAAM,CAAC,MAAM,EAAE,CAAA;YAC5B,SAAS,CAAC,cAAc,EAAE,CAAA;YAC1B,MAAK;SACR;QACD,KAAK,WAAW,CAAC,CAAC;YACd,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;YACzB,MAAK;SACR;QACD,KAAK,YAAY,CAAC,CAAC;YACf,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;YACvB,MAAK;SACR;QACD,KAAK,QAAQ,CAAC,CAAC;YACX,IAAI,SAAS,CAAC,YAAY,CAAC,aAAa,IAAI,SAAS,CAAC,YAAY,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE;gBACxF,SAAS,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,EAAE,CAAA;aAC/C;YACD,MAAK;SACR;KACJ;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playeractions.js","sourceRoot":"","sources":["../../../../src/js/playeractions/playeractions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,
|
|
1
|
+
{"version":3,"file":"playeractions.js","sourceRoot":"","sources":["../../../../src/js/playeractions/playeractions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AACxG,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAA"}
|
|
@@ -12,59 +12,82 @@ export function bindPlayerEvents(npoplayer, player) {
|
|
|
12
12
|
{ event: PlayerEvent.StallEnded, name: 'buffering_complete' },
|
|
13
13
|
{ event: PlayerEvent.PlaybackFinished, name: 'complete' },
|
|
14
14
|
{ event: PlayerEvent.TimeChanged, name: 'time' },
|
|
15
|
-
{
|
|
16
|
-
event: PlayerEvent.ViewModeChanged,
|
|
17
|
-
name: player.getViewMode() === ViewMode.Fullscreen
|
|
18
|
-
? 'fullscreen'
|
|
19
|
-
: 'windowed'
|
|
20
|
-
},
|
|
21
15
|
{ event: PlayerEvent.SourceUnloaded, name: 'stop' },
|
|
22
16
|
{ event: PlayerEvent.Destroy, name: 'stop' },
|
|
23
17
|
];
|
|
24
|
-
const logEventHandler = (npoplayer, eventName) => {
|
|
18
|
+
const logEventHandler = (npoplayer, eventName, event) => {
|
|
25
19
|
return () => {
|
|
26
|
-
|
|
20
|
+
const timeDifference = npoplayer.streamObject.stream.isLiveStream
|
|
21
|
+
? event.position - Date.now() / 1000
|
|
22
|
+
: event.position;
|
|
23
|
+
logEvent(npoplayer, eventName, timeDifference);
|
|
27
24
|
};
|
|
28
25
|
};
|
|
29
26
|
const seekHandler = (e) => {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
27
|
+
let data = {};
|
|
28
|
+
if (e.type === 'timeshift') {
|
|
29
|
+
const timeDifferencePosition = -1 * (Date.now() / 1000 - e.position);
|
|
30
|
+
const timeDifferenceTarget = -1 * (Date.now() / 1000 - e.target);
|
|
31
|
+
data = {
|
|
32
|
+
seek_from: parseFloat(timeDifferencePosition.toFixed(3)),
|
|
33
|
+
stream_position: parseFloat(timeDifferenceTarget.toFixed(3)),
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
else if (e.type === 'seek') {
|
|
37
|
+
data = {
|
|
38
|
+
seek_from: e.position,
|
|
39
|
+
stream_position: e.seekTarget,
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
logEvent(npoplayer, e.type, data);
|
|
35
43
|
};
|
|
36
|
-
const handleSourceLoaded = () => {
|
|
44
|
+
const handleSourceLoaded = (e) => {
|
|
37
45
|
isNewSource = true;
|
|
46
|
+
if (npoplayer.streamObject.stream.isLiveStream) {
|
|
47
|
+
logEvent(npoplayer, 'stop', e.position);
|
|
48
|
+
}
|
|
38
49
|
};
|
|
39
|
-
const handlePlay = () => {
|
|
50
|
+
const handlePlay = (e) => {
|
|
40
51
|
if (!isNewSource) {
|
|
41
|
-
logEvent(npoplayer, 'resume');
|
|
52
|
+
logEvent(npoplayer, 'resume', e.position);
|
|
42
53
|
}
|
|
43
54
|
};
|
|
44
|
-
const handlePlaying = () => {
|
|
55
|
+
const handlePlaying = (e) => {
|
|
45
56
|
if (isNewSource) {
|
|
46
|
-
logEvent(npoplayer, 'start');
|
|
57
|
+
logEvent(npoplayer, 'start', e.position);
|
|
47
58
|
isNewSource = false;
|
|
48
59
|
}
|
|
49
60
|
};
|
|
50
|
-
|
|
51
|
-
|
|
61
|
+
const handleViewModeChange = (e) => {
|
|
62
|
+
const newViewMode = player.getViewMode();
|
|
63
|
+
if (newViewMode === ViewMode.Fullscreen) {
|
|
64
|
+
logEvent(npoplayer, 'fullscreen', e.position);
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
logEvent(npoplayer, 'windowed', e.position);
|
|
68
|
+
}
|
|
69
|
+
};
|
|
70
|
+
function stopBeforeUnload(e) {
|
|
71
|
+
logEvent(npoplayer, 'stop', e.position);
|
|
52
72
|
}
|
|
53
73
|
player.off(PlayerEvent.SourceLoaded, handleSourceLoaded);
|
|
54
74
|
player.off(PlayerEvent.Seek, seekHandler);
|
|
55
75
|
player.off(PlayerEvent.Play, handlePlay);
|
|
56
76
|
player.off(PlayerEvent.Playing, handlePlaying);
|
|
77
|
+
player.off(PlayerEvent.ViewModeChanged, handleViewModeChange);
|
|
57
78
|
playerEvents.forEach(({ event, name }) => {
|
|
58
|
-
const handler = logEventHandler(npoplayer, name);
|
|
79
|
+
const handler = logEventHandler(npoplayer, name, event);
|
|
59
80
|
player.off(event, handler);
|
|
60
81
|
});
|
|
61
82
|
window.removeEventListener('beforeunload', stopBeforeUnload);
|
|
62
83
|
player.on(PlayerEvent.SourceLoaded, handleSourceLoaded);
|
|
63
84
|
player.on(PlayerEvent.Seek, seekHandler);
|
|
85
|
+
player.on(PlayerEvent.TimeShift, seekHandler);
|
|
64
86
|
player.on(PlayerEvent.Play, handlePlay);
|
|
65
87
|
player.on(PlayerEvent.Playing, handlePlaying);
|
|
88
|
+
player.on(PlayerEvent.ViewModeChanged, handleViewModeChange);
|
|
66
89
|
playerEvents.forEach(({ event, name }) => {
|
|
67
|
-
const handler = logEventHandler(npoplayer, name);
|
|
90
|
+
const handler = logEventHandler(npoplayer, name, event);
|
|
68
91
|
player.on(event, handler);
|
|
69
92
|
});
|
|
70
93
|
window.addEventListener('beforeunload', stopBeforeUnload);
|