@npo/player 1.9.3 → 1.10.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.
Files changed (92) hide show
  1. package/lib/js/api/getstreamobject.js +1 -2
  2. package/lib/js/api/getstreamobject.js.map +1 -1
  3. package/lib/js/fragments/setfragments.d.ts +3 -2
  4. package/lib/js/fragments/setfragments.js +6 -7
  5. package/lib/js/fragments/setfragments.js.map +1 -1
  6. package/lib/js/playeractions/handlers/error.js.map +1 -1
  7. package/lib/js/playeractions/handlers/processplayerconfig.d.ts +11 -0
  8. package/lib/js/playeractions/handlers/processplayerconfig.js +40 -0
  9. package/lib/js/playeractions/handlers/processplayerconfig.js.map +1 -0
  10. package/lib/js/playeractions/playeractions.d.ts +1 -0
  11. package/lib/js/playeractions/playeractions.js +1 -0
  12. package/lib/js/playeractions/playeractions.js.map +1 -1
  13. package/lib/js/ui/components/controlbar.d.ts +1 -1
  14. package/lib/js/ui/components/controlbar.js +19 -8
  15. package/lib/js/ui/components/controlbar.js.map +1 -1
  16. package/lib/js/ui/components/ctabar.js.map +1 -1
  17. package/lib/js/ui/components/nativemobile/addFragments.d.ts +1 -0
  18. package/lib/js/ui/components/nativemobile/addFragments.js +8 -0
  19. package/lib/js/ui/components/nativemobile/addFragments.js.map +1 -0
  20. package/lib/js/ui/components/nativemobile/buttons.js +1 -1
  21. package/lib/js/ui/components/nativemobile/buttons.js.map +1 -1
  22. package/lib/js/ui/components/nativemobile/controlbar.d.ts +2 -1
  23. package/lib/js/ui/components/nativemobile/controlbar.js +33 -4
  24. package/lib/js/ui/components/nativemobile/controlbar.js.map +1 -1
  25. package/lib/js/ui/components/nativemobile/titlebar.d.ts +2 -0
  26. package/lib/js/ui/components/nativemobile/titlebar.js +8 -0
  27. package/lib/js/ui/components/nativemobile/titlebar.js.map +1 -0
  28. package/lib/js/ui/components/topbar.js +5 -2
  29. package/lib/js/ui/components/topbar.js.map +1 -1
  30. package/lib/js/ui/handlers/listboxhandlers.js +9 -9
  31. package/lib/js/ui/handlers/listboxhandlers.js.map +1 -1
  32. package/lib/js/ui/handlers/nicamhandler.d.ts +1 -1
  33. package/lib/js/ui/handlers/nicamhandler.js +4 -4
  34. package/lib/js/ui/handlers/nicamhandler.js.map +1 -1
  35. package/lib/js/ui/{nativemobileui.js → nativemobileuicontainer.js} +6 -7
  36. package/lib/js/ui/nativemobileuicontainer.js.map +1 -0
  37. package/lib/js/ui/nativemobileuifactory.d.ts +3 -0
  38. package/lib/js/ui/nativemobileuifactory.js +43 -0
  39. package/lib/js/ui/nativemobileuifactory.js.map +1 -0
  40. package/lib/js/ui/uicontainer.js +4 -7
  41. package/lib/js/ui/uicontainer.js.map +1 -1
  42. package/lib/js/utilities/utilities.js +0 -1
  43. package/lib/js/utilities/utilities.js.map +1 -1
  44. package/lib/npoplayer.d.ts +1 -1
  45. package/lib/npoplayer.js +26 -42
  46. package/lib/npoplayer.js.map +1 -1
  47. package/lib/package.json +19 -10
  48. package/lib/src/js/fragments/setfragments.d.ts +3 -2
  49. package/lib/src/js/playeractions/handlers/processplayerconfig.d.ts +11 -0
  50. package/lib/src/js/playeractions/playeractions.d.ts +1 -0
  51. package/lib/src/js/ui/components/controlbar.d.ts +1 -1
  52. package/lib/src/js/ui/components/nativemobile/addFragments.d.ts +1 -0
  53. package/lib/src/js/ui/components/nativemobile/controlbar.d.ts +2 -1
  54. package/lib/src/js/ui/components/nativemobile/titlebar.d.ts +2 -0
  55. package/lib/src/js/ui/handlers/nicamhandler.d.ts +1 -1
  56. package/lib/src/js/ui/nativemobileuifactory.d.ts +3 -0
  57. package/lib/src/npoplayer.d.ts +1 -1
  58. package/lib/src/types/interfaces.d.ts +2 -1
  59. package/lib/types/interfaces.d.ts +2 -1
  60. package/lib/types/interfaces.js.map +1 -1
  61. package/package.json +19 -10
  62. package/src/scss/components/_advert.scss +28 -31
  63. package/src/scss/components/_buffering.scss +35 -4
  64. package/src/scss/components/_controlbars.scss +5 -15
  65. package/src/scss/components/_error.scss +6 -4
  66. package/src/scss/components/_hugeplaybacktogglebutton.scss +71 -0
  67. package/src/scss/components/_icons.scss +53 -154
  68. package/src/scss/components/_metadata.scss +22 -0
  69. package/src/scss/components/_nicam.scss +2 -1
  70. package/src/scss/components/_playnext.scss +1 -1
  71. package/src/scss/components/_replay.scss +35 -0
  72. package/src/scss/components/_seekbar.scss +51 -76
  73. package/src/scss/components/_seekbarthumbnail.scss +56 -0
  74. package/src/scss/components/_settingspanel.scss +47 -54
  75. package/src/scss/components/_textbuttons.scss +1 -1
  76. package/src/scss/components/_volumeslider.scss +78 -13
  77. package/src/scss/npoplayer.css +2 -1237
  78. package/src/scss/npoplayer.scss +7 -3
  79. package/src/scss/variants/_player-base.scss +10 -36
  80. package/src/scss/variants/_player-debug.scss +14 -0
  81. package/src/scss/variants/_player-large.scss +18 -40
  82. package/src/scss/variants/_player-medium.scss +11 -43
  83. package/src/scss/variants/_player-native-mobile.scss +5 -0
  84. package/src/scss/variants/_player-small.scss +36 -197
  85. package/src/scss/vars/_colors.scss +7 -12
  86. package/src/scss/vars/_fonts.scss +2 -2
  87. package/src/scss/vars/_icons.scss +21 -33
  88. package/lib/js/ui/nativemobileui.js.map +0 -1
  89. package/src/scss/components/_container.scss +0 -8
  90. package/src/scss/components/_fonts.scss +0 -19
  91. /package/lib/js/ui/{nativemobileui.d.ts → nativemobileuicontainer.d.ts} +0 -0
  92. /package/lib/src/js/ui/{nativemobileui.d.ts → nativemobileuicontainer.d.ts} +0 -0
@@ -1,5 +1,5 @@
1
- import { UIContainer, PlaybackToggleOverlay, BufferingOverlay, CastStatusOverlay, Watermark, SubtitleOverlay, ErrorMessageOverlay } from 'bitmovin-player-ui';
2
- import { createMiddleButtons, createForwardButton, createRewindButton } from './components/buttons';
1
+ import { UIContainer, PlaybackToggleOverlay, BufferingOverlay, CastStatusOverlay, SubtitleOverlay, ErrorMessageOverlay } from 'bitmovin-player-ui';
2
+ import { createMiddleButtons } from './components/buttons';
3
3
  import { createPlayNextScreen } from './components/playnext';
4
4
  import { createSettingsPanel } from './components/settingspanel';
5
5
  import { createCTABar } from './components/ctabar';
@@ -18,13 +18,11 @@ export function createUIContainer(npoplayer, variant) {
18
18
  }
19
19
  const player = npoplayer.player;
20
20
  const middleButtons = createMiddleButtons(player);
21
- const rewindButton = createRewindButton(player);
22
- const forwardButton = createForwardButton(player);
23
21
  const playNextScreen = createPlayNextScreen(player, npoplayer);
24
22
  const settingsPanel = createSettingsPanel(npoplayer);
25
23
  const ctaBar = createCTABar(player, npoplayer, variant);
26
24
  const topBar = createTopBar(settingsPanel);
27
- const controlBar = createControlBar(npoplayer, settingsPanel, forwardButton, rewindButton);
25
+ const controlBar = createControlBar(npoplayer, settingsPanel);
28
26
  const titleBar = createTitleBar(npoplayer);
29
27
  const errorMessageOverlay = new ErrorMessageOverlay();
30
28
  npoplayer.uiComponents.errorMessageOverlay = errorMessageOverlay;
@@ -37,11 +35,10 @@ export function createUIContainer(npoplayer, variant) {
37
35
  middleButtons,
38
36
  ];
39
37
  const baseComponentsAfter = [
40
- new Watermark(),
41
38
  errorMessageOverlay
42
39
  ];
43
40
  let conditionalComponents = [];
44
- //only add top bar if variant = default
41
+ // only add top bar if variant = default
45
42
  if (variant === 'default') {
46
43
  conditionalComponents.push(controlBar);
47
44
  conditionalComponents.push(ctaBar);
@@ -1 +1 @@
1
- {"version":3,"file":"uicontainer.js","sourceRoot":"","sources":["../../../../src/js/ui/uicontainer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"uicontainer.js","sourceRoot":"","sources":["../../../../src/js/ui/uicontainer.ts"],"names":[],"mappings":"AACA,OAAO,EACH,WAAW,EACX,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,EACf,mBAAmB,EACtB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD,MAAM,UAAU,iBAAiB,CAAE,SAAoB,EAAE,OAAe;IACpE,IAAI,aAAa,GAAG,CAAC,YAAY,CAAC,CAAA;IAClC,IAAI,OAAO,GAAU,IAAI,CAAA;IAEzB,IAAG,OAAO,KAAK,SAAS,EAAE;QACtB,OAAO,GAAG,IAAI,CAAA;KACjB;SAAM,IAAG,OAAO,KAAK,IAAI,EAAC;QACvB,OAAO,GAAG,CAAC,CAAC,CAAA;QACZ,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;KAChC;IAED,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAA;IAC/B,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAA;IACjD,MAAM,cAAc,GAAG,oBAAoB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IAC9D,MAAM,aAAa,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAA;IACpD,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;IACvD,MAAM,MAAM,GAAG,YAAY,CAAC,aAAa,CAAC,CAAA;IAC1C,MAAM,UAAU,GAAG,gBAAgB,CAC/B,SAAS,EACT,aAAa,CAChB,CAAA;IACD,MAAM,QAAQ,GAAG,cAAc,CAAC,SAAS,CAAC,CAAA;IAE1C,MAAM,mBAAmB,GAAG,IAAI,mBAAmB,EAAE,CAAA;IACrD,SAAS,CAAC,YAAY,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;IAEhE,MAAM,oBAAoB,GAAG;QACzB,IAAI,eAAe,EAAE;QACrB,IAAI,gBAAgB,EAAE;QACtB,IAAI,qBAAqB,EAAE;QAC3B,IAAI,iBAAiB,EAAE;QACvB,cAAc;QACd,aAAa;KAChB,CAAA;IAED,MAAM,mBAAmB,GAAG;QACxB,mBAAmB;KACtB,CAAA;IAED,IAAI,qBAAqB,GAAG,EAAE,CAAC;IAE/B,wCAAwC;IACxC,IAAI,OAAO,KAAK,SAAS,EAAE;QACvB,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACvC,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnC,qBAAqB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrC,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KACtC;IAED,IAAI,OAAO,KAAK,IAAI,EAAE;QAClB,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACvC,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KACtC;IAED,OAAO,IAAI,WAAW,CAAC;QACnB,UAAU,EAAE,CAAC,GAAG,oBAAoB,EAAE,GAAG,qBAAqB,EAAE,GAAG,mBAAmB,CAAC;QACvF,UAAU,EAAE,aAAa;QACzB,SAAS,EAAE,OAAO;KACrB,CAAC,CAAA;AACN,CAAC"}
@@ -91,7 +91,6 @@ export function airPlaySupported() {
91
91
  return false;
92
92
  }
93
93
  window.addEventListener('webkitplaybacktargetavailabilitychanged', function (event) {
94
- console.log('event', event);
95
94
  switch (event.availability) {
96
95
  case "available":
97
96
  hasAirPlay = true;
@@ -1 +1 @@
1
- {"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../../src/js/utilities/utilities.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../../src/js/utilities/utilities.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACH,IAAI,EAEP,MAAM,wDAAwD,CAAA;AAE/D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,EAAE;IACvC,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;AAC3E,CAAC,CAAA;AAED;;;;;GAKG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAc,EAAE,EAAE;IAC7C,OAAO,IAAI,CAAC,KAAK,CACb,kBAAkB,CACd,MAAM;SACD,IAAI,CAAC,MAAM,CAAC;SACZ,KAAK,CAAC,EAAE,CAAC;SACT,GAAG,CAAC,UAAU,CAAC;QACZ,OAAO,CACH,GAAG,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CACxD,CAAA;IACL,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,CAChB,CACJ,CAAA;AACL,CAAC,CAAA;AAED;;;;;GAKG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,GAAW,EAAE,EAAE;IAC3C,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;AACjE,CAAC,CAAA;AAED;;;;;GAKG;AACH,MAAM,UAAU,QAAQ,CAAE,GAAW;IACjC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;AACjC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAE,QAAqC;IACvE,OAAO,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AACjE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CAAE,EAAU;IACnC,OAAO,EAAE,GAAG,IAAI,CAAA;AACpB,CAAC;AAED;;;;;EAKE;AACF,MAAM,UAAU,YAAY,CAAE,IAAmB;IAC7C,OAAO,IAAI,KAAK,EAAE,IAAI,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;AAC1D,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAAC,MAAe;IAC3C,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,SAAS,IAAI,MAAM,EAAE;QACtE,OAAO,MAAM,CAAC,OAAO,CAAC;KACzB;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC5B,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,IAAK,MAAc,CAAC,qCAAqC,IAAI,IAAI,IAAI,SAAS,EAAE;QAC5E,OAAO,KAAK,CAAC;KAChB;IACD,MAAM,CAAC,gBAAgB,CAAC,yCAAyC,EAAE,UAAS,KAAU;QAClF,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,KAAK,WAAW;gBACZ,UAAU,GAAG,IAAI,CAAC;gBAClB,MAAM;YACV,KAAK,eAAe;gBAChB,UAAU,GAAG,KAAK,CAAC;gBACnB,MAAM;SACb;IACL,CAAC,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACtB,CAAC"}
@@ -28,7 +28,7 @@ export default class NpoPlayer {
28
28
  setFragments(fragments: Fragments): Promise<void>;
29
29
  decideProfile(preferredDRM?: string): Promise<Profile>;
30
30
  processSourceConfig(_sourceConfig: SourceConfig | undefined, _streamObject: StreamObject, drm?: string | null): SourceConfig;
31
- doError(input: any): void;
31
+ doError(input: any, status?: number): void;
32
32
  keyPress(e: KeyboardEvent): void;
33
33
  setVolume(volume: number): void;
34
34
  increaseVolume(): void;
package/lib/npoplayer.js CHANGED
@@ -1,13 +1,11 @@
1
1
  import { HttpResponseType, Player, PlayerEvent, } from 'bitmovin-player';
2
2
  import AdsModuleBM from 'bitmovin-player/modules/bitmovinplayer-advertising-bitmovin';
3
3
  import { logEvent, initPlayerTracker, startPlayerTracker } from './js/tracking/playertracker';
4
- import { nativeMobileUIContainer } from './js/ui/nativemobileui';
5
4
  import { hidePlayNextScreen, showPlayNextScreen } from './js/ui/components/shared/playnextscreen';
6
5
  import { validateStreamLength, getModuleExport } from './js/utilities/utilities';
7
6
  import { verifyDRM } from './js/drm/verifydrm';
8
7
  import { setFragments } from './js/fragments/setfragments';
9
8
  import * as playerAction from './js/playeractions/playeractions';
10
- import { isSafari } from './js/checks/safari';
11
9
  import { getStreamObject } from './js/api/getstreamobject';
12
10
  import { printVersion } from './js/utilities/printversion';
13
11
  import { UIManager } from 'bitmovin-player-ui';
@@ -19,6 +17,7 @@ import { npoCdnProviders } from './js/cdnproviders';
19
17
  import { LogEmitter } from './types/classes';
20
18
  import { handlePreRolls } from './js/ads/ster';
21
19
  import pkg from '../package.json';
20
+ import { nativeMobileUiFactory } from './js/ui/nativemobileuifactory';
22
21
  export default class NpoPlayer {
23
22
  constructor(_container, _playerConfig, _npotag, _npotaginstance) {
24
23
  this.playerConfig = _playerConfig;
@@ -46,29 +45,11 @@ export default class NpoPlayer {
46
45
  initPlayer(_container, playerConfig) {
47
46
  // Upon initiation print player version in console
48
47
  printVersion(this.version);
49
- if (isSafari(this.isFairPlayDrmSupported())) {
50
- // Disable autoplay on safari
51
- playerConfig.playback = {
52
- autoplay: false
53
- };
54
- // Potential fix for DRM issues on safari
55
- playerConfig.tweaks = {
56
- fairplay_ignore_duplicate_init_data_key_errors: true
57
- };
58
- }
59
- playerConfig.ui = false;
60
- // Chromecast configuration
61
- playerConfig.remotecontrol = {
62
- type: 'googlecast',
63
- receiverApplicationId: 'CC38EB17',
64
- receiverVersion: 'v3',
65
- messageNamespace: 'urn:x-cast:com.bitmovin.player.caf'
66
- };
67
- //creating this node enables the PlayerAdvertisingAPI
68
- playerConfig.advertising = {};
48
+ // Process player config to add conditional properties depending on initialization options
49
+ const processedPlayerConfig = playerAction.processPlayerConfig(this, playerConfig);
69
50
  //add the bitmovin ads module for more flexibility in ad handling
70
51
  Player.addModule(getModuleExport(AdsModuleBM));
71
- this.player = new Player(_container, playerConfig);
52
+ this.player = new Player(_container, processedPlayerConfig);
72
53
  this.createUIManager(this.player, 'default');
73
54
  this.container.addEventListener('keydown', e => {
74
55
  this.keyPress(e);
@@ -85,6 +66,9 @@ export default class NpoPlayer {
85
66
  }
86
67
  // Set jwt on class to make it accesible for DRM fallback logic
87
68
  this.jwt = _jwt;
69
+ this.player.on(PlayerEvent.CastStarted, () => {
70
+ console.log('cast started using', this.playerConfig.cast?.application_id);
71
+ });
88
72
  //StreamAPI logic
89
73
  const profile = await this.decideProfile(options?.preferredDRM ?? '');
90
74
  const defaultEndpoint = 'https://prod.npoplayer.nl/';
@@ -145,7 +129,7 @@ export default class NpoPlayer {
145
129
  const section = {
146
130
  start: seg.inpoint,
147
131
  end: seg.outpoint,
148
- title: 'Test'
132
+ title: this.sourceConfig.title || '',
149
133
  };
150
134
  this.player.off(PlayerEvent.Ready, () => addFragments(section));
151
135
  this.player.on(PlayerEvent.Ready, () => addFragments(section));
@@ -153,7 +137,7 @@ export default class NpoPlayer {
153
137
  // Timeshift to offset if offset is present in streamoptions
154
138
  if (options?.startOffset != null)
155
139
  playerAction.handleStartOffset(this.player, options.startOffset);
156
- // set listeners for live offset and timestamps
140
+ // Set listeners for live offset and timestamps
157
141
  const setLiveOffsetListener = function () {
158
142
  if (this.player !== null)
159
143
  this.player.off(PlayerEvent.SourceLoaded, setLiveOffsetListener);
@@ -163,20 +147,20 @@ export default class NpoPlayer {
163
147
  // Load fragments through options
164
148
  if (options?.fragments != null) {
165
149
  const fragments = options.fragments;
166
- this.player.off(PlayerEvent.Ready, () => {
167
- void this.setFragments(fragments);
168
- });
169
- this.player.on(PlayerEvent.Ready, () => {
170
- void this.setFragments(fragments);
171
- });
150
+ this.player.off(PlayerEvent.Ready, () => { void this.setFragments(fragments); });
151
+ this.player.on(PlayerEvent.Ready, () => { void this.setFragments(fragments); });
172
152
  }
173
- // set title in seekbar thumbnail
153
+ // Set title in seekbar thumbnail
174
154
  if (this.sourceConfig.thumbnailTrack && _streamObject.segment === undefined && options?.fragments === undefined) {
175
- const element = document.querySelector('.bmpui-seekbar-label-title');
155
+ const element = document.querySelector('.bmpui-npo-player .bmpui-seekbar-label-title');
176
156
  if (element !== null) {
177
157
  element.textContent = this.sourceConfig.title || '';
178
158
  }
179
159
  }
160
+ // Remove finished class when you start seeking again
161
+ this.player.on(PlayerEvent.Seeked, () => {
162
+ document.querySelector('.bmpui-npo-player.bmpui-player-state-finished')?.classList.remove('bmpui-player-state-finished');
163
+ });
180
164
  // If the stream options contain a PRID for the next episode show the playnext screen once playback is finished
181
165
  // Test this behaviour by uncommenting the following line, mind that the api does not support this feature yet:
182
166
  // options.prid = 'POW_04922615'
@@ -199,7 +183,9 @@ export default class NpoPlayer {
199
183
  UIManager.setLocalizationConfig(localizationConfig);
200
184
  }
201
185
  async setFragments(fragments) {
202
- void setFragments(this, fragments);
186
+ if (this.player && this.uiManager) {
187
+ void setFragments(this.player, this.uiManager, fragments);
188
+ }
203
189
  }
204
190
  async decideProfile(preferredDRM = '') {
205
191
  let bestWithDRM = '';
@@ -407,9 +393,12 @@ export default class NpoPlayer {
407
393
  }
408
394
  return sourceConfig;
409
395
  }
410
- doError(input) {
396
+ doError(input, status) {
411
397
  if (this.player == null)
412
398
  return;
399
+ if (status) {
400
+ this.logEmitter.emit('logError', status);
401
+ }
413
402
  playerAction.handlePlayerError(this.player, this.uiComponents, input);
414
403
  }
415
404
  // Hotkeys
@@ -503,16 +492,11 @@ export default class NpoPlayer {
503
492
  return isSupported;
504
493
  }
505
494
  }
495
+ // overwrite default bitmovin function in native mobile to load our own UI
506
496
  window.bitmovin.playerui = function () { };
507
497
  window.bitmovin.playerui.UIFactory = {
508
498
  buildDefaultSmallScreenUI: function (player, config = {}) {
509
- const uiConfig = {
510
- ...config,
511
- errorMessages: customSpecificErrorMessageOverlayConfig,
512
- disableAutoHideWhenHovered: true
513
- };
514
- UIManager.setLocalizationConfig(localizationConfig);
515
- return new UIManager(player, nativeMobileUIContainer(player), uiConfig);
499
+ return nativeMobileUiFactory(player, config);
516
500
  }
517
501
  };
518
502
  //# sourceMappingURL=npoplayer.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"npoplayer.js","sourceRoot":"","sources":["../../src/npoplayer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"npoplayer.js","sourceRoot":"","sources":["../../src/npoplayer.ts"],"names":[],"mappings":"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"}
package/lib/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@npo/player",
3
- "version": "1.9.3",
3
+ "version": "1.10.0-dev.6",
4
4
  "description": "NPO Player",
5
5
  "author": "Publieke Omroep <player@npo.nl>",
6
6
  "contributors": [
@@ -12,18 +12,17 @@
12
12
  "node": "^18.16.0"
13
13
  },
14
14
  "license": "ISC",
15
- "main": "npoplayer",
16
- "types": "npoplayer.d.ts",
15
+ "main": "./lib/npoplayer",
16
+ "types": "./lib/npoplayer.d.ts",
17
17
  "scripts": {
18
18
  "build": "webpack --hot",
19
- "build:scss": "npm run build:web-styles && npm run build:web-styles && npm run build:mobile-styles-min && npm run build:mobile-styles && cp src/scss/*.css dist",
20
- "build:web-styles": "sass --no-source-map src/scss/npoplayer.scss src/scss/npoplayer.css",
21
- "build:web-styles-min": "sass --no-source-map --style=compressed src/scss/npoplayer.scss src/scss/npoplayer.min.css",
22
- "build:mobile-styles": "node-sass --no-source-map src/scss/npoplayer-mobile.scss src/scss/npoplayer-mobile.css",
23
- "build:mobile-styles-min": "sass --no-source-map --style=compressed src/scss/npoplayer-mobile.scss src/scss/npoplayer-mobile.min.css",
19
+ "build:scss": "npm run build:web-styles && npm run build:mobile-styles && cp src/scss/*.css dist && cp src/scss/*.css.map dist",
20
+ "build:web-styles": "sass src/scss/npoplayer.scss --style=compressed src/scss/npoplayer.css | postcss --use autoprefixer -r src/scss/npoplayer.css",
21
+ "build:mobile-styles": "sass src/scss/npoplayer-mobile.scss --style=compressed src/scss/npoplayer-mobile.css | postcss --use autoprefixer -r src/scss/npoplayer-mobile.css",
22
+ "build:cdn": "bash build-cdn.sh",
24
23
  "lint": "eslint src --fix",
25
- "bundle": "npm run lint && ts-node build.ts && webpack && npm run build:scss",
26
- "build:ts": "ts-node build.ts",
24
+ "bundle": "npm run lint && bash build-lib.sh && webpack && npm run build:scss",
25
+ "build:ts": "bash build-lib.sh",
27
26
  "test": "jest",
28
27
  "test:ci": "node_modules/.bin/jest",
29
28
  "version:dev": "npm version prerelease --preid=dev --no-git-tag-version"
@@ -47,6 +46,7 @@
47
46
  "@types/jest": "^29.4.0",
48
47
  "@typescript-eslint/eslint-plugin": "^5.58.0",
49
48
  "@typescript-eslint/parser": "^5.58.0",
49
+ "autoprefixer": "^10.4.15",
50
50
  "babel-jest": "^28.1.3",
51
51
  "babel-loader": "^8.3.0",
52
52
  "css-loader": "^6.7.3",
@@ -64,6 +64,9 @@
64
64
  "mini-css-extract-plugin": "^2.7.2",
65
65
  "node-fetch": "^3.3.0",
66
66
  "node-sass": "^7.0.3",
67
+ "postcss-cli": "^10.1.0",
68
+ "postcss-loader": "^7.3.3",
69
+ "postcss-scss": "^4.0.7",
67
70
  "sass": "^1.58.0",
68
71
  "sass-loader": "^12.6.0",
69
72
  "style-loader": "^3.3.1",
@@ -80,6 +83,12 @@
80
83
  "bitmovin-player": "^8.125.0",
81
84
  "bitmovin-player-ui": "^3.48.0"
82
85
  },
86
+ "browserslist": [
87
+ "defaults",
88
+ "not ie < 11",
89
+ "last 2 versions",
90
+ "> 1%"
91
+ ],
83
92
  "keywords": [
84
93
  "video",
85
94
  "player",
@@ -1,3 +1,4 @@
1
- import type NpoPlayer from '../../npoplayer';
1
+ import { PlayerAPI } from 'bitmovin-player';
2
2
  import { type Fragments } from '../../types/interfaces';
3
- export declare function setFragments(npoplayer: NpoPlayer, fragments: Fragments): Promise<void>;
3
+ import { UIManager } from 'bitmovin-player-ui';
4
+ export declare function setFragments(player: PlayerAPI, uiManager: UIManager, fragments: Fragments): Promise<void>;
@@ -0,0 +1,11 @@
1
+ /**
2
+ * @function processPlayerConfig
3
+ * @description This function is called by the NpoPlayer constructor to enrich the player configuration object
4
+ * with default values where none were set by the user.
5
+ * @param {NpoPlayer} npoplayer - The NpoPlayer instance
6
+ * @param {PlayerConfig} playerConfig - The player configuration object that was created by the user
7
+ * @returns The processed player configuration object
8
+ */
9
+ import { type PlayerConfig } from "bitmovin-player";
10
+ import NpoPlayer from "npoplayer";
11
+ export declare function processPlayerConfig(npoplayer: NpoPlayer, playerConfig: PlayerConfig): PlayerConfig;
@@ -1,3 +1,4 @@
1
1
  export { resolveKeyPress } from "./handlers/resolvekeypress";
2
2
  export { handleStartOffset, handleLiveOffsetLogic, shiftToProgramStart } from "./handlers/handleoffsets";
3
3
  export { handlePlayerError } from "./handlers/error";
4
+ export { processPlayerConfig } from "./handlers/processplayerconfig";
@@ -1,3 +1,3 @@
1
1
  import { ControlBar, type SettingsPanel } from 'bitmovin-player-ui';
2
2
  import type NpoPlayer from '../../../npoplayer';
3
- export declare function createControlBar(npoplayer: NpoPlayer, settingsPanel: SettingsPanel, forwardButton: any, rewindButton: any): ControlBar;
3
+ export declare function createControlBar(npoplayer: NpoPlayer, settingsPanel: SettingsPanel): ControlBar;
@@ -0,0 +1 @@
1
+ export declare const addFragments: any;
@@ -1,2 +1,3 @@
1
+ import { PlayerAPI } from 'bitmovin-player';
1
2
  import { ControlBar, type SettingsPanel } from 'bitmovin-player-ui';
2
- export declare function createControlBar(settingsPanel: SettingsPanel): ControlBar;
3
+ export declare function createControlBar(player: PlayerAPI, settingsPanel: SettingsPanel): ControlBar;
@@ -0,0 +1,2 @@
1
+ import { TitleBar } from 'bitmovin-player-ui';
2
+ export declare function createTitleBar(): TitleBar;
@@ -1,2 +1,2 @@
1
- import { StreamObject } from "types/interfaces";
1
+ import { StreamObject } from 'types/interfaces';
2
2
  export declare function processNicam(streamObject: StreamObject, containerId: string): void;
@@ -0,0 +1,3 @@
1
+ import { PlayerAPI, UIConfig } from 'bitmovin-player';
2
+ import { UIManager } from 'bitmovin-player-ui';
3
+ export declare function nativeMobileUiFactory(player: PlayerAPI, config?: UIConfig): UIManager;
@@ -28,7 +28,7 @@ export default class NpoPlayer {
28
28
  setFragments(fragments: Fragments): Promise<void>;
29
29
  decideProfile(preferredDRM?: string): Promise<Profile>;
30
30
  processSourceConfig(_sourceConfig: SourceConfig | undefined, _streamObject: StreamObject, drm?: string | null): SourceConfig;
31
- doError(input: any): void;
31
+ doError(input: any, status?: number): void;
32
32
  keyPress(e: KeyboardEvent): void;
33
33
  setVolume(volume: number): void;
34
34
  increaseVolume(): void;
@@ -1,5 +1,5 @@
1
1
  import { type SourceConfig } from 'bitmovin-player';
2
- import { type ErrorMessageOverlay, type Label, ControlBar, SettingsPanelItem, Button, SeekBar } from 'bitmovin-player-ui';
2
+ import { type ErrorMessageOverlay, type Label, ControlBar, SettingsPanelItem, Button, SeekBar, CastToggleButton } from 'bitmovin-player-ui';
3
3
  import { type NPOTag, type PageTracker } from '@npotag/tag';
4
4
  import { ButtonConfig } from 'bitmovin-player-ui/dist/js/framework/components/button';
5
5
  export interface Profile {
@@ -94,6 +94,7 @@ export interface UIComponents {
94
94
  cssClass: string;
95
95
  }> | undefined;
96
96
  seekBar?: SeekBar | undefined;
97
+ chromeCastButton?: CastToggleButton | undefined;
97
98
  }
98
99
  export interface CustomMessageHandlerResult {
99
100
  defaultActionRequired?: boolean;
@@ -1,5 +1,5 @@
1
1
  import { type SourceConfig } from 'bitmovin-player';
2
- import { type ErrorMessageOverlay, type Label, ControlBar, SettingsPanelItem, Button, SeekBar } from 'bitmovin-player-ui';
2
+ import { type ErrorMessageOverlay, type Label, ControlBar, SettingsPanelItem, Button, SeekBar, CastToggleButton } from 'bitmovin-player-ui';
3
3
  import { type NPOTag, type PageTracker } from '@npotag/tag';
4
4
  import { ButtonConfig } from 'bitmovin-player-ui/dist/js/framework/components/button';
5
5
  export interface Profile {
@@ -94,6 +94,7 @@ export interface UIComponents {
94
94
  cssClass: string;
95
95
  }> | undefined;
96
96
  seekBar?: SeekBar | undefined;
97
+ chromeCastButton?: CastToggleButton | undefined;
97
98
  }
98
99
  export interface CustomMessageHandlerResult {
99
100
  defaultActionRequired?: boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/types/interfaces.ts"],"names":[],"mappings":"AAuHA,MAAM,CAAN,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,+DAA6C,CAAA;IAC7C,6CAA2B,CAAA;AAC/B,CAAC,EAHW,cAAc,KAAd,cAAc,QAGzB"}
1
+ {"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/types/interfaces.ts"],"names":[],"mappings":"AAwHA,MAAM,CAAN,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,+DAA6C,CAAA;IAC7C,6CAA2B,CAAA;AAC/B,CAAC,EAHW,cAAc,KAAd,cAAc,QAGzB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@npo/player",
3
- "version": "1.9.3",
3
+ "version": "1.10.0",
4
4
  "description": "NPO Player",
5
5
  "author": "Publieke Omroep <player@npo.nl>",
6
6
  "contributors": [
@@ -12,18 +12,17 @@
12
12
  "node": "^18.16.0"
13
13
  },
14
14
  "license": "ISC",
15
- "main": "npoplayer",
16
- "types": "npoplayer.d.ts",
15
+ "main": "./lib/npoplayer",
16
+ "types": "./lib/npoplayer.d.ts",
17
17
  "scripts": {
18
18
  "build": "webpack --hot",
19
- "build:scss": "npm run build:web-styles && npm run build:web-styles && npm run build:mobile-styles-min && npm run build:mobile-styles && cp src/scss/*.css dist",
20
- "build:web-styles": "sass --no-source-map src/scss/npoplayer.scss src/scss/npoplayer.css",
21
- "build:web-styles-min": "sass --no-source-map --style=compressed src/scss/npoplayer.scss src/scss/npoplayer.min.css",
22
- "build:mobile-styles": "node-sass --no-source-map src/scss/npoplayer-mobile.scss src/scss/npoplayer-mobile.css",
23
- "build:mobile-styles-min": "sass --no-source-map --style=compressed src/scss/npoplayer-mobile.scss src/scss/npoplayer-mobile.min.css",
19
+ "build:scss": "npm run build:web-styles && npm run build:mobile-styles && cp src/scss/*.css dist && cp src/scss/*.css.map dist",
20
+ "build:web-styles": "sass src/scss/npoplayer.scss --style=compressed src/scss/npoplayer.css | postcss --use autoprefixer -r src/scss/npoplayer.css",
21
+ "build:mobile-styles": "sass src/scss/npoplayer-mobile.scss --style=compressed src/scss/npoplayer-mobile.css | postcss --use autoprefixer -r src/scss/npoplayer-mobile.css",
22
+ "build:cdn": "bash build-cdn.sh",
24
23
  "lint": "eslint src --fix",
25
- "bundle": "npm run lint && ts-node build.ts && webpack && npm run build:scss",
26
- "build:ts": "ts-node build.ts",
24
+ "bundle": "npm run lint && bash build-lib.sh && webpack && npm run build:scss",
25
+ "build:ts": "bash build-lib.sh",
27
26
  "test": "jest",
28
27
  "test:ci": "node_modules/.bin/jest",
29
28
  "version:dev": "npm version prerelease --preid=dev --no-git-tag-version"
@@ -47,6 +46,7 @@
47
46
  "@types/jest": "^29.4.0",
48
47
  "@typescript-eslint/eslint-plugin": "^5.58.0",
49
48
  "@typescript-eslint/parser": "^5.58.0",
49
+ "autoprefixer": "^10.4.15",
50
50
  "babel-jest": "^28.1.3",
51
51
  "babel-loader": "^8.3.0",
52
52
  "css-loader": "^6.7.3",
@@ -64,6 +64,9 @@
64
64
  "mini-css-extract-plugin": "^2.7.2",
65
65
  "node-fetch": "^3.3.0",
66
66
  "node-sass": "^7.0.3",
67
+ "postcss-cli": "^10.1.0",
68
+ "postcss-loader": "^7.3.3",
69
+ "postcss-scss": "^4.0.7",
67
70
  "sass": "^1.58.0",
68
71
  "sass-loader": "^12.6.0",
69
72
  "style-loader": "^3.3.1",
@@ -80,6 +83,12 @@
80
83
  "bitmovin-player": "^8.125.0",
81
84
  "bitmovin-player-ui": "^3.48.0"
82
85
  },
86
+ "browserslist": [
87
+ "defaults",
88
+ "not ie < 11",
89
+ "last 2 versions",
90
+ "> 1%"
91
+ ],
83
92
  "keywords": [
84
93
  "video",
85
94
  "player",