bigscreen-player 5.6.2 → 5.6.5

package/dist/esm/{imscsubtitles-1012091b.js → imscsubtitles-ed9d9bd6.js}

@@ -1,7 +1,7 @@
 import { fromXML, generateISD, renderHTML } from 'smp-imsc';
-import { b as TimeUtils, L as LoadUrl, a as DebugTool, P as Plugins, U as Utils, D as DOMHelpers } from './main-61b49de6.js';
+import { b as TimeUtils, L as LoadUrl, a as DebugTool, P as Plugins, U as Utils, D as DOMHelpers } from './main-ba52ef8f.js';
 
-function IMSCSubtitles (mediaPlayer, autoStart, parentElement, mediaSources, defaultStyleOpts) {
+function IMSCSubtitles(mediaPlayer, autoStart, parentElement, mediaSources, defaultStyleOpts) {
   const SEGMENTS_TO_KEEP = 3;
   const liveSubtitles = !!mediaSources.currentSubtitlesSegmentLength();
   const LOAD_ERROR_COUNT_MAX = 3;
@@ -20,11 +20,14 @@ function IMSCSubtitles (mediaPlayer, autoStart, parentElement, mediaSources, def
     start();
   }
 
-  function loadAllRequiredSegments () {
+  function loadAllRequiredSegments() {
     const segmentsToLoad = [];
-    const currentSegment = TimeUtils.calculateSegmentNumber(windowStartEpochSeconds + mediaPlayer.getCurrentTime(), mediaSources.currentSubtitlesSegmentLength());
-    for (let i = 0; i < SEGMENTS_TO_KEEP; i++) {
-      const segmentNumber = currentSegment + i;
+    const currentSegment = TimeUtils.calculateSegmentNumber(
+      windowStartEpochSeconds + mediaPlayer.getCurrentTime(),
+      mediaSources.currentSubtitlesSegmentLength()
+    );
+    for (let index = 0; index < SEGMENTS_TO_KEEP; index++) {
+      const segmentNumber = currentSegment + index;
       const alreadyLoaded = segments.some((segment) => segment.number === segmentNumber);
 
       if (!alreadyLoaded) {
@@ -43,56 +46,56 @@ function IMSCSubtitles (mediaPlayer, autoStart, parentElement, mediaSources, def
     });
   }
 
-  function loadSegment (url, segmentNumber) {
-    url = url.replace('$segment$', segmentNumber);
-    LoadUrl(url, {
+  function loadSegment(url, segmentNumber) {
+    const segmentUrl = url.replace("$segment$", segmentNumber);
+    LoadUrl(segmentUrl, {
       timeout: mediaSources.subtitlesRequestTimeout(),
-      onLoad: (responseXML, responseText, status) => {
+      onLoad: (responseXML, responseText) => {
         resetLoadErrorCount();
         if (!responseXML && !liveSubtitles) {
-          DebugTool.info('Error: responseXML is invalid.');
+          DebugTool.info("Error: responseXML is invalid.");
           Plugins.interface.onSubtitlesXMLError({ cdn: mediaSources.currentSubtitlesCdn() });
           stop();
           return
         }
 
         try {
-          const xml = fromXML(responseText.split(/<\?xml[^\?]+\?>/i)[1] || responseText);
+          const xml = fromXML(responseText.split(/<\?xml[^?]+\?>/i)[1] || responseText);
           const times = xml.getMediaTimeEvents();
 
           segments.push({
             xml: modifyStyling(xml),
             times: times || [0],
             previousSubtitleIndex: null,
-            number: segmentNumber
+            number: segmentNumber,
           });
 
           if (segments.length > SEGMENTS_TO_KEEP) {
             pruneSegments();
           }
-        } catch (e) {
-          DebugTool.info('Error transforming subtitles: ' + e);
+        } catch (error) {
+          DebugTool.info(`Error transforming subtitles: ${error}`);
           Plugins.interface.onSubtitlesTransformError();
           stop();
         }
       },
       onError: ({ statusCode, ...rest } = {}) => {
-        DebugTool.info('Error loading subtitles data: ' + statusCode);
+        DebugTool.info(`Error loading subtitles data: ${statusCode}`);
         loadErrorFailover({ statusCode, ...rest });
       },
       onTimeout: () => {
-        DebugTool.info('Request timeout loading subtitles');
+        DebugTool.info("Request timeout loading subtitles");
         Plugins.interface.onSubtitlesTimeout({ cdn: mediaSources.currentSubtitlesCdn() });
         stop();
-      }
+      },
     });
   }
 
-  function resetLoadErrorCount () {
+  function resetLoadErrorCount() {
     loadErrorCount = 0;
   }
 
-  function loadErrorLimit () {
+  function loadErrorLimit() {
     loadErrorCount++;
     if (loadErrorCount >= LOAD_ERROR_COUNT_MAX) {
       resetLoadErrorCount();
@@ -100,8 +103,10 @@ function IMSCSubtitles (mediaPlayer, autoStart, parentElement, mediaSources, def
     }
   }
 
-  function loadErrorFailover (opts) {
-    const errorCase = () => { DebugTool.info('No more CDNs available for subtitle failover'); };
+  function loadErrorFailover(opts) {
+    const errorCase = () => {
+      DebugTool.info("No more CDNs available for subtitle failover");
+    };
 
     if ((liveSubtitles && loadErrorLimit()) || !liveSubtitles) {
       stop();
@@ -110,11 +115,11 @@ function IMSCSubtitles (mediaPlayer, autoStart, parentElement, mediaSources, def
     }
   }
 
-  function pruneSegments () {
+  function pruneSegments() {
     // Before sorting, check if we've gone back in time, so we know whether to prune from front or back of array
     const seekedBack = segments[SEGMENTS_TO_KEEP].number < segments[SEGMENTS_TO_KEEP - 1].number;
 
-    segments.sort((a, b) => a.number - b.number);
+    segments.sort((someSegment, otherSegment) => someSegment.number - otherSegment.number);
 
     if (seekedBack) {
       segments.pop();
@@ -124,7 +129,7 @@ function IMSCSubtitles (mediaPlayer, autoStart, parentElement, mediaSources, def
   }
 
   // Opts: { backgroundColour: string (css colour, hex), fontFamily: string , size: number, lineHeight: number }
-  function transformStyleOptions (opts) {
+  function transformStyleOptions(opts) {
     if (opts === undefined) return
 
     const customStyles = {};
@@ -137,7 +142,7 @@ function IMSCSubtitles (mediaPlayer, autoStart, parentElement, mediaSources, def
       customStyles.fontFamily = opts.fontFamily;
     }
 
-    if (opts.size) {
+    if (opts.size > 0) {
       customStyles.sizeAdjust = opts.size;
     }
 
@@ -148,21 +153,25 @@ function IMSCSubtitles (mediaPlayer, autoStart, parentElement, mediaSources, def
     return customStyles
   }
 
-  function removeCurrentSubtitlesElement () {
+  function isCurrentTimeBehindCurrentSubtitles(currentTime, segments, segmentIndex) {
+    return currentTime < segments[segmentIndex].times[currentSegmentRendered.previousSubtitleIndex]
+  }
+
+  function removeCurrentSubtitlesElement() {
     if (currentSubtitlesElement) {
       DOMHelpers.safeRemoveElement(currentSubtitlesElement);
       currentSubtitlesElement = undefined;
     }
   }
 
-  function removeExampleSubtitlesElement () {
+  function removeExampleSubtitlesElement() {
     if (exampleSubtitlesElement) {
       DOMHelpers.safeRemoveElement(exampleSubtitlesElement);
       exampleSubtitlesElement = undefined;
     }
   }
 
-  function update (currentTime) {
+  function update(currentTime) {
     const segment = getSegmentToRender(currentTime);
 
     if (segment) {
@@ -170,17 +179,26 @@ function IMSCSubtitles (mediaPlayer, autoStart, parentElement, mediaSources, def
     }
   }
 
-  function getSegmentToRender (currentTime) {
+  function getSegmentToRender(currentTime) {
     let segment;
 
-    for (let i = 0; i < segments.length; i++) {
-      for (let j = 0; j < segments[i].times.length; j++) {
-        const lastOne = segments[i].times.length === j + 1;
+    for (let segmentIndex = 0; segmentIndex < segments.length; segmentIndex++) {
+      if (isCurrentTimeBehindCurrentSubtitles(currentTime, segments, segmentIndex)) {
+        removeCurrentSubtitlesElement();
+      }
 
-        if (currentTime >= segments[i].times[j] && (lastOne || currentTime < segments[i].times[j + 1]) && segments[i].previousSubtitleIndex !== j && segments[i].times[j] !== 0) {
-          segment = segments[i];
-          currentSegmentRendered = segments[i];
-          segments[i].previousSubtitleIndex = j;
+      for (let timesIndex = 0; timesIndex < segments[segmentIndex].times.length; timesIndex++) {
+        const lastOne = segments[segmentIndex].times.length === timesIndex + 1;
+
+        if (
+          currentTime >= segments[segmentIndex].times[timesIndex] &&
+          (lastOne || currentTime < segments[segmentIndex].times[timesIndex + 1]) &&
+          segments[segmentIndex].previousSubtitleIndex !== timesIndex &&
+          segments[segmentIndex].times[timesIndex] !== 0
+        ) {
+          segment = segments[segmentIndex];
+          currentSegmentRendered = segments[segmentIndex];
+          segments[segmentIndex].previousSubtitleIndex = timesIndex;
           break
         }
       }
@@ -189,28 +207,34 @@ function IMSCSubtitles (mediaPlayer, autoStart, parentElement, mediaSources, def
     return segment
   }
 
-  function render (currentTime, xml) {
+  function render(currentTime, xml) {
     removeCurrentSubtitlesElement();
 
-    currentSubtitlesElement = document.createElement('div');
-    currentSubtitlesElement.id = 'bsp_subtitles';
-    currentSubtitlesElement.style.position = 'absolute';
+    currentSubtitlesElement = document.createElement("div");
+    currentSubtitlesElement.id = "bsp_subtitles";
+    currentSubtitlesElement.style.position = "absolute";
     parentElement.appendChild(currentSubtitlesElement);
 
-    renderSubtitle(xml, currentTime, currentSubtitlesElement, imscRenderOpts, parentElement.clientHeight, parentElement.clientWidth);
+    renderSubtitle(
+      xml,
+      currentTime,
+      currentSubtitlesElement,
+      imscRenderOpts,
+      parentElement.clientHeight,
+      parentElement.clientWidth
+    );
   }
 
-  function renderExample (exampleXmlString, styleOpts, safePosition) {
-    safePosition = safePosition || {};
+  function renderExample(exampleXmlString, styleOpts, safePosition = {}) {
     const exampleXml = fromXML(exampleXmlString);
     removeExampleSubtitlesElement();
 
     const customStyleOptions = transformStyleOptions(styleOpts);
     const exampleStyle = Utils.merge(imscRenderOpts, customStyleOptions);
 
-    exampleSubtitlesElement = document.createElement('div');
-    exampleSubtitlesElement.id = 'subtitlesPreview';
-    exampleSubtitlesElement.style.position = 'absolute';
+    exampleSubtitlesElement = document.createElement("div");
+    exampleSubtitlesElement.id = "subtitlesPreview";
+    exampleSubtitlesElement.style.position = "absolute";
 
     const elementWidth = parentElement.clientWidth;
     const elementHeight = parentElement.clientHeight;
@@ -222,48 +246,48 @@ function IMSCSubtitles (mediaPlayer, autoStart, parentElement, mediaSources, def
     const renderWidth = elementWidth - leftPixels - rightPixels;
     const renderHeight = elementHeight - topPixels - bottomPixels;
 
-    exampleSubtitlesElement.style.top = (topPixels) + 'px';
-    exampleSubtitlesElement.style.right = (rightPixels) + 'px';
-    exampleSubtitlesElement.style.bottom = (bottomPixels) + 'px';
-    exampleSubtitlesElement.style.left = (leftPixels) + 'px';
+    exampleSubtitlesElement.style.top = `${topPixels}px`;
+    exampleSubtitlesElement.style.right = `${rightPixels}px`;
+    exampleSubtitlesElement.style.bottom = `${bottomPixels}px`;
+    exampleSubtitlesElement.style.left = `${leftPixels}px`;
     parentElement.appendChild(exampleSubtitlesElement);
 
     renderSubtitle(exampleXml, 1, exampleSubtitlesElement, exampleStyle, renderHeight, renderWidth);
   }
 
-  function renderSubtitle (xml, currentTime, subsElement, styleOpts, renderHeight, renderWidth) {
+  function renderSubtitle(xml, currentTime, subsElement, styleOpts, renderHeight, renderWidth) {
     try {
       const isd = generateISD(xml, currentTime);
       renderHTML(isd, subsElement, null, renderHeight, renderWidth, false, null, null, false, styleOpts);
-    } catch (e) {
-      DebugTool.info('Exception while rendering subtitles: ' + e);
+    } catch (error) {
+      DebugTool.info(`Exception while rendering subtitles: ${error}`);
       Plugins.interface.onSubtitlesRenderError();
     }
   }
 
-  function modifyStyling (xml) {
+  function modifyStyling(xml) {
     if (liveSubtitles && xml && xml.head && xml.head.styling) {
       xml.head.styling.initials = defaultStyleOpts.initials;
     }
     return xml
   }
 
-  function timeIsValid (time) {
+  function timeIsValid(time) {
     return time > windowStartEpochSeconds
   }
 
-  function getCurrentTime () {
+  function getCurrentTime() {
     return liveSubtitles ? windowStartEpochSeconds + mediaPlayer.getCurrentTime() : mediaPlayer.getCurrentTime()
   }
 
-  function getWindowStartTime () {
+  function getWindowStartTime() {
     return mediaSources && mediaSources.time().windowStartTime
   }
 
-  function start () {
+  function start() {
     stop();
     const url = mediaSources.currentSubtitlesSource();
-    if (url && url !== '') {
+    if (url && url !== "") {
       if (!liveSubtitles && segments.length === 0) {
         loadSegment(url);
       }
@@ -278,12 +302,12 @@ function IMSCSubtitles (mediaPlayer, autoStart, parentElement, mediaSources, def
     }
   }
 
-  function stop () {
+  function stop() {
     clearInterval(updateInterval);
     removeCurrentSubtitlesElement();
   }
 
-  function customise (styleOpts, enabled) {
+  function customise(styleOpts, enabled) {
     const customStyleOptions = transformStyleOptions(styleOpts);
     imscRenderOpts = Utils.merge(imscRenderOpts, customStyleOptions);
     if (enabled) {
@@ -292,17 +316,17 @@ function IMSCSubtitles (mediaPlayer, autoStart, parentElement, mediaSources, def
   }
 
   return {
-    start: start,
-    stop: stop,
+    start,
+    stop,
     updatePosition: () => {},
-    customise: customise,
-    renderExample: renderExample,
+    customise,
+    renderExample,
     clearExample: removeExampleSubtitlesElement,
     tearDown: () => {
       stop();
       resetLoadErrorCount();
       segments = undefined;
-    }
+    },
   }
 }
 

package/dist/esm/{legacysubtitles-48008e22.js → legacysubtitles-42fed2a6.js}

@@ -1,4 +1,4 @@
-import { D as DOMHelpers, a as DebugTool, P as Plugins, L as LoadUrl, T as TransportControlPosition } from './main-61b49de6.js';
+import { D as DOMHelpers, a as DebugTool, P as Plugins, L as LoadUrl, T as TransportControlPosition } from './main-ba52ef8f.js';
 
 /**
 * Safely checks if an attribute exists on an element.

package/dist/esm/{main-61b49de6.js → main-ba52ef8f.js}

@@ -5732,12 +5732,12 @@ function StrategyPicker (windowType, isUHD) {
         return resolve(NativeStrategy)
       }
 
-      return import('./msestrategy-112ba6b7.js').then(({ default: MSEStrategy }) => resolve(MSEStrategy))
+      return import('./msestrategy-8219ff78.js').then(({ default: MSEStrategy }) => resolve(MSEStrategy))
         .catch(() => {
           reject({ error: 'strategyDynamicLoadError' });
         })
     } else if (window.bigscreenPlayer.playbackStrategy === PlaybackStrategy.MSE) {
-      return import('./msestrategy-112ba6b7.js').then(({ default: MSEStrategy }) => resolve(MSEStrategy))
+      return import('./msestrategy-8219ff78.js').then(({ default: MSEStrategy }) => resolve(MSEStrategy))
         .catch(() => {
           reject({ error: 'strategyDynamicLoadError' });
         })
@@ -6141,7 +6141,7 @@ function CallCallbacks (callbacks, data) {
   }
 }
 
-var version = "5.6.2";
+var version = "5.6.5";
 
 var sourceList;
 var source;
@@ -7341,14 +7341,14 @@ function Subtitles (mediaPlayer, autoStart, playbackElement, defaultStyleOpts, m
   let subtitlesContainer;
 
   if (useLegacySubs) {
-    import('./legacysubtitles-48008e22.js').then(({ default: LegacySubtitles }) => {
+    import('./legacysubtitles-42fed2a6.js').then(({ default: LegacySubtitles }) => {
       subtitlesContainer = LegacySubtitles(mediaPlayer, autoStart, playbackElement, mediaSources, defaultStyleOpts);
       callback(subtitlesEnabled);
     }).catch(() => {
       Plugins.interface.onSubtitlesDynamicLoadError();
     });
   } else {
-    import('./imscsubtitles-1012091b.js').then(({ default: IMSCSubtitles }) => {
+    import('./imscsubtitles-ed9d9bd6.js').then(({ default: IMSCSubtitles }) => {
       subtitlesContainer = IMSCSubtitles(mediaPlayer, autoStart, playbackElement, mediaSources, defaultStyleOpts);
       callback(subtitlesEnabled);
     }).catch(() => {

package/dist/esm/main.js

@@ -1 +1 @@
-export { B as BigscreenPlayer, c as LiveSupport, d as MediaKinds, M as MediaState, f as MockBigscreenPlayer, g as PauseTriggers, h as PlaybackStrategy, i as TransferFormat, T as TransportControlPosition, W as WindowTypes } from './main-61b49de6.js';
+export { B as BigscreenPlayer, c as LiveSupport, d as MediaKinds, M as MediaState, f as MockBigscreenPlayer, g as PauseTriggers, h as PlaybackStrategy, i as TransferFormat, T as TransportControlPosition, W as WindowTypes } from './main-ba52ef8f.js';

package/dist/esm/{msestrategy-112ba6b7.js → msestrategy-8219ff78.js}

@@ -1,4 +1,4 @@
-import { U as Utils, D as DOMHelpers, W as WindowTypes, c as LiveSupport, M as MediaState, a as DebugTool, P as Plugins, d as MediaKinds, b as TimeUtils, e as DynamicWindowUtils } from './main-61b49de6.js';
+import { U as Utils, D as DOMHelpers, W as WindowTypes, c as LiveSupport, M as MediaState, a as DebugTool, P as Plugins, d as MediaKinds, b as TimeUtils, e as DynamicWindowUtils } from './main-ba52ef8f.js';
 import { MediaPlayer } from 'dashjs/index_mediaplayerOnly';
 
 function filter (manifest, representationOptions) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bigscreen-player",
-  "version": "5.6.2",
+  "version": "5.6.5",
   "description": "Simplified media playback for bigscreen devices.",
   "main": "dist/esm/main.js",
   "browser": "dist/esm/main.js",
@@ -16,15 +16,18 @@
   "scripts": {
     "prepare": "[ ! -d dist/ ] && npm run build || exit 0",
     "docs": "npx jsdoc -c jsdoc.conf.json",
-    "build": "rollup -c rollup.config.js",
+    "build": "npm run build:clean && npm run build:bundle",
+    "build:clean": "rm -rf dist",
+    "build:bundle": "rollup -c rollup.config.js",
     "watch": "rollup -c rollup.config.js -w",
     "start": "rollup -c rollup.dev.config.js -w",
     "test": "jest",
     "coverage": "jest --coverage",
-    "lint": "npx eslint ."
+    "lint": "eslint ."
   },
   "husky": {
     "hooks": {
+      "pre-commit": "./scripts/lint-staged.sh && ./scripts/format-staged.sh",
       "pre-push": "npm test"
     }
   },
@@ -40,15 +43,16 @@
     "@rollup/plugin-node-resolve": "^13.0.4",
     "babel-jest": "^27.0.6",
     "clean-jsdoc-theme": "^3.2.7",
-    "eslint": "^7.2.0",
-    "eslint-plugin-es5": "1.3.1",
-    "eslint-plugin-jest": "^24.4.0",
-    "eslint-plugin-node": "^7.0.1",
-    "eslint-plugin-promise": "4.0.1",
-    "eslint-plugin-standard": "4.0.0",
+    "eslint": "^8.27.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jest": "^27.1.4",
+    "eslint-plugin-json": "^3.1.0",
+    "eslint-plugin-sonarjs": "^0.16.0",
+    "eslint-plugin-unicorn": "^44.0.2",
     "husky": "^4.2.5",
     "jest": "^27.0.6",
     "jsdoc": "^3.6.4",
+    "prettier": "^2.7.1",
     "rollup": "^2.54.0",
     "rollup-plugin-livereload": "^2.0.5",
     "rollup-plugin-polyfill-node": "^0.7.0",