Fix linting errors for "no-multi-space" (#4177)

.eslintrc

@@ -21,6 +21,7 @@
         "no-use-before-define": 0,
         "strict": 0,
         "no-loop-func": 0,
+        "no-multi-spaces": "error",
         "quotes": [
             "error",
             "single",

src/core/errors/Errors.js

@@ -29,12 +29,13 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 import ErrorsBase from './ErrorsBase';
+
 /**
  * Errors declaration
  * @class
  */
 class Errors extends ErrorsBase {
-    constructor () {
+    constructor() {
         super();
 
         /**
@@ -100,53 +101,53 @@ class Errors extends ErrorsBase {
         /**
          * Error code returned when Protected contents are not supported
          */
-        this.CAPABILITY_MEDIAKEYS_ERROR_CODE   = 24;
+        this.CAPABILITY_MEDIAKEYS_ERROR_CODE = 24;
 
         /**
          * Error code returned when loading the manifest failed
          */
-        this.DOWNLOAD_ERROR_ID_MANIFEST_CODE   = 25;
+        this.DOWNLOAD_ERROR_ID_MANIFEST_CODE = 25;
 
         /**
          * Error code returned when loading the sidx failed
          */
-        this.DOWNLOAD_ERROR_ID_SIDX_CODE            = 26;
+        this.DOWNLOAD_ERROR_ID_SIDX_CODE = 26;
 
         /**
          * Error code returned when loading the media content failed
          */
-        this.DOWNLOAD_ERROR_ID_CONTENT_CODE         = 27;
+        this.DOWNLOAD_ERROR_ID_CONTENT_CODE = 27;
 
         /**
          * Error code returned when loading the init segment failed
          */
-        this.DOWNLOAD_ERROR_ID_INITIALIZATION_CODE  = 28;
+        this.DOWNLOAD_ERROR_ID_INITIALIZATION_CODE = 28;
 
         /**
          * Error code returned when loading the XLink content failed
          */
-        this.DOWNLOAD_ERROR_ID_XLINK_CODE           = 29;
+        this.DOWNLOAD_ERROR_ID_XLINK_CODE = 29;
 
         /**
          * Error code returned when parsing the MPD resulted in a logical error
          */
-        this.MANIFEST_ERROR_ID_PARSE_CODE           = 31;
+        this.MANIFEST_ERROR_ID_PARSE_CODE = 31;
 
         /**
          * Error code returned when no stream (period) has been detected in the manifest
          */
-        this.MANIFEST_ERROR_ID_NOSTREAMS_CODE       = 32;
+        this.MANIFEST_ERROR_ID_NOSTREAMS_CODE = 32;
 
         /**
          * Error code returned when something wrong has happened during parsing and appending subtitles (TTML or VTT)
          */
-        this.TIMED_TEXT_ERROR_ID_PARSE_CODE         = 33;
+        this.TIMED_TEXT_ERROR_ID_PARSE_CODE = 33;
 
         /**
          * Error code returned when a 'muxed' media type has been detected in the manifest. This type is not supported
          */
 
-        this.MANIFEST_ERROR_ID_MULTIPLEXED_CODE     = 34;
+        this.MANIFEST_ERROR_ID_MULTIPLEXED_CODE = 34;
 
         /**
          * Error code returned when a media source type is not supported

src/dash/parser/DashParser.js

@@ -58,18 +58,18 @@ function DashParser(config) {
             new DateTimeMatcher(),
             new NumericMatcher(),
             new LangMatcher(),
-            new StringMatcher()   // last in list to take precedence over NumericMatcher
+            new StringMatcher()// last in list to take precedence over NumericMatcher
         ];
 
         converter = new X2JS({
-            escapeMode:         false,
-            attributePrefix:    '',
-            arrayAccessForm:    'property',
-            emptyNodeForm:      'object',
-            stripWhitespaces:   false,
+            escapeMode: false,
+            attributePrefix: '',
+            arrayAccessForm: 'property',
+            emptyNodeForm: 'object',
+            stripWhitespaces: false,
             enableToStringFunc: true,
-            ignoreRoot:         false,
-            matchers:           matchers
+            ignoreRoot: false,
+            matchers: matchers
         });
 
         objectIron = ObjectIron(context).create({

src/mss/MssFragmentMoofProcessor.js

@@ -151,8 +151,7 @@ function MssFragmentMoofProcessor(config) {
                 }
             }
             return;
-        }
-        else {
+        } else {
             // In case of live streams, update segment timeline according to DVR window
             if (manifest.timeShiftBufferDepth && manifest.timeShiftBufferDepth > 0) {
                 // Get timestamp of the last segment
@@ -173,7 +172,7 @@ function MssFragmentMoofProcessor(config) {
                     // logger.debug('Remove segment  - t = ' + (segment.t / timescale));
                     segments.splice(0, 1);
                     segment = segments[0];
-                    endTime =  (segment.t + segment.d) / timescale;
+                    endTime = (segment.t + segment.d) / timescale;
                 }
             }
 

src/streaming/XlinkLoader.js

@@ -42,7 +42,7 @@ function XlinkLoader(config) {
     config = config || {};
     const RESOLVE_TO_ZERO = 'urn:mpeg:dash:resolve-to-zero:2013';
 
-    const context  = this.context;
+    const context = this.context;
     const eventBus = EventBus(context).getInstance();
 
     let urlLoader = URLLoader(context).create({

src/streaming/controllers/CatchupController.js

@@ -179,10 +179,10 @@ function CatchupController() {
      */
     function _onPlaybackProgression() {
         if (
-            playbackController.getIsDynamic() && 
-            mediaPlayerModel.getCatchupModeEnabled() && 
-            ((mediaPlayerModel.getCatchupPlaybackRates().max > 0) || (mediaPlayerModel.getCatchupPlaybackRates().min < 0)) && 
-            !playbackController.isPaused() && 
+            playbackController.getIsDynamic() &&
+            mediaPlayerModel.getCatchupModeEnabled() &&
+            ((mediaPlayerModel.getCatchupPlaybackRates().max > 0) || (mediaPlayerModel.getCatchupPlaybackRates().min < 0)) &&
+            !playbackController.isPaused() &&
             !playbackController.isSeeking() && _shouldStartCatchUp()
         ) {
             _startPlaybackCatchUp();
@@ -234,7 +234,7 @@ function CatchupController() {
                 const minPlaybackRateChange = isSafari ? 0.25 : 0.02 / (0.5 / liveCatchupPlaybackRates.max);
 
                 // Obtain newRate and apply to video model.  Don't change playbackrate for small variations (don't overload element with playbackrate changes)
-                if (newRate && Math.abs(currentPlaybackRate - newRate) >= minPlaybackRateChange) {  // non-null
+                if (newRate && Math.abs(currentPlaybackRate - newRate) >= minPlaybackRateChange) { // non-null
                     logger.debug(`[CatchupController]: Setting playback rate to ${newRate}`);
                     videoModel.setPlaybackRate(newRate);
                 }
@@ -382,7 +382,7 @@ function CatchupController() {
         if (bufferLevel < playbackBufferMin) {
             // Buffer in danger, slow down
             const cpr = Math.abs(liveCatchUpPlaybackRates.min); // Absolute value as negative delta value will be used.
-            const deltaBuffer = bufferLevel - playbackBufferMin;  // -ve value
+            const deltaBuffer = bufferLevel - playbackBufferMin; // -ve value
             const d = deltaBuffer * 5;
 
             // Playback rate must be between (1 - cpr) - (1 + cpr)

src/streaming/metrics/utils/DVBErrorsTranslator.js

@@ -89,10 +89,10 @@ function DVBErrorsTranslator(config) {
     }
 
     function handleHttpMetric(vo) {
-        if ((vo.responsecode === 0) ||      // connection failure - unknown
+        if ((vo.responsecode === 0) || // connection failure - unknown
             (vo.responsecode == null) || // Generated on .catch() and when uninitialized
             (vo.responsecode >= 400) || // HTTP error status code
-            (vo.responsecode < 100) ||  // unknown status codes
+            (vo.responsecode < 100) || // unknown status codes
             (vo.responsecode >= 600)) { // unknown status codes
             report({
                 errorcode: vo.responsecode || DVBErrors.CONNECTION_ERROR,

src/streaming/metrics/vo/DVBErrors.js

@@ -85,13 +85,13 @@ class DVBErrors {
 }
 
 DVBErrors.SSL_CONNECTION_FAILED_PREFIX = 'SSL';
-DVBErrors.DNS_RESOLUTION_FAILED =        'C00';
-DVBErrors.HOST_UNREACHABLE =             'C01';
-DVBErrors.CONNECTION_REFUSED =           'C02';
-DVBErrors.CONNECTION_ERROR =             'C03';
-DVBErrors.CORRUPT_MEDIA_ISOBMFF =        'M00';
-DVBErrors.CORRUPT_MEDIA_OTHER =          'M01';
-DVBErrors.BASE_URL_CHANGED =             'F00';
-DVBErrors.BECAME_REPORTER =              'S00';
+DVBErrors.DNS_RESOLUTION_FAILED = 'C00';
+DVBErrors.HOST_UNREACHABLE = 'C01';
+DVBErrors.CONNECTION_REFUSED = 'C02';
+DVBErrors.CONNECTION_ERROR = 'C03';
+DVBErrors.CORRUPT_MEDIA_ISOBMFF = 'M00';
+DVBErrors.CORRUPT_MEDIA_OTHER = 'M01';
+DVBErrors.BASE_URL_CHANGED = 'F00';
+DVBErrors.BECAME_REPORTER = 'S00';
 
 export default DVBErrors;

src/streaming/models/ManifestModel.js

@@ -47,7 +47,7 @@ function ManifestModel() {
     function setValue(value) {
         manifest = value;
         if (value) {
-            eventBus.trigger(Events.MANIFEST_LOADED,  { data: value });
+            eventBus.trigger(Events.MANIFEST_LOADED, { data: value });
         }
     }
 

src/streaming/protection/Protection.js

@@ -119,7 +119,7 @@ function Protection() {
         protectionKeyController.setConfig({ debug: config.debug, BASE64: config.BASE64, settings: config.settings });
         protectionKeyController.initialize();
 
-        let protectionModel =  _getProtectionModel(config);
+        let protectionModel = _getProtectionModel(config);
 
         if (!controller && protectionModel) {//TODO add ability to set external controller if still needed at all?
             controller = ProtectionController(context).create({
@@ -131,7 +131,7 @@ function Protection() {
                 BASE64: config.BASE64,
                 constants: config.constants,
                 cmcdModel: config.cmcdModel,
-                customParametersModel : config.customParametersModel,
+                customParametersModel: config.customParametersModel,
                 settings: config.settings
             });
             config.capabilities.setEncryptedMediaSupported(true);
@@ -149,13 +149,28 @@ function Protection() {
         if ((!videoElement || videoElement.onencrypted !== undefined) &&
             (!videoElement || videoElement.mediaKeys !== undefined)) {
             logger.info('EME detected on this user agent! (ProtectionModel_21Jan2015)');
-            return ProtectionModel_21Jan2015(context).create({ debug: debug, eventBus: eventBus, events: config.events });
+            return ProtectionModel_21Jan2015(context).create({
+                debug: debug,
+                eventBus: eventBus,
+                events: config.events
+            });
         } else if (_getAPI(videoElement, APIS_ProtectionModel_3Feb2014)) {
             logger.info('EME detected on this user agent! (ProtectionModel_3Feb2014)');
-            return ProtectionModel_3Feb2014(context).create({ debug: debug, eventBus: eventBus, events: config.events, api: _getAPI(videoElement, APIS_ProtectionModel_3Feb2014) });
+            return ProtectionModel_3Feb2014(context).create({
+                debug: debug,
+                eventBus: eventBus,
+                events: config.events,
+                api: _getAPI(videoElement, APIS_ProtectionModel_3Feb2014)
+            });
         } else if (_getAPI(videoElement, APIS_ProtectionModel_01b)) {
             logger.info('EME detected on this user agent! (ProtectionModel_01b)');
-            return ProtectionModel_01b(context).create({ debug: debug, eventBus: eventBus, errHandler: errHandler, events: config.events, api: _getAPI(videoElement, APIS_ProtectionModel_01b) });
+            return ProtectionModel_01b(context).create({
+                debug: debug,
+                eventBus: eventBus,
+                errHandler: errHandler,
+                events: config.events,
+                api: _getAPI(videoElement, APIS_ProtectionModel_01b)
+            });
         } else {
             logger.warn('No supported version of EME detected on this user agent! - Attempts to play encrypted content will fail!');
             return null;

src/streaming/protection/ProtectionEvents.js

@@ -29,16 +29,17 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 import EventsBase from '../../core/events/EventsBase';
+
 /**
  * @class
-  */
+ */
 class ProtectionEvents extends EventsBase {
     /**
      * @description Public facing external events to be used when including protection package.
      * All public events will be aggregated into the MediaPlayerEvents Class and can be accessed
      * via MediaPlayer.events.  public_ is the prefix that we use to move event names to MediaPlayerEvents.
      */
-    constructor () {
+    constructor() {
         super();
 
         /**
@@ -164,7 +165,7 @@ class ProtectionEvents extends EventsBase {
          * a protection set has completed
          * @ignore
          */
-        this.TEARDOWN_COMPLETE =  'protectionTeardownComplete';
+        this.TEARDOWN_COMPLETE = 'protectionTeardownComplete';
 
         /**
          * Event ID for events delivered when a HTMLMediaElement has been

src/streaming/rules/abr/BolaRule.js

@@ -34,7 +34,7 @@
 import MetricsConstants from '../../constants/MetricsConstants';
 import SwitchRequest from '../SwitchRequest';
 import FactoryMaker from '../../../core/FactoryMaker';
-import { HTTPRequest } from '../../vo/metrics/HTTPRequest';
+import {HTTPRequest} from '../../vo/metrics/HTTPRequest';
 import EventBus from '../../../core/EventBus';
 import Events from '../../../core/events/Events';
 import Debug from '../../../core/Debug';
@@ -45,9 +45,9 @@ import Constants from '../../constants/Constants';
 // BOLA_STATE_STARTUP       : Set placeholder buffer such that we download fragments at most recently measured throughput.
 // BOLA_STATE_STEADY        : Buffer primed, we switch to steady operation.
 // TODO: add BOLA_STATE_SEEK and tune BOLA behavior on seeking
-const BOLA_STATE_ONE_BITRATE    = 0;
-const BOLA_STATE_STARTUP        = 1;
-const BOLA_STATE_STEADY         = 2;
+const BOLA_STATE_ONE_BITRATE = 0;
+const BOLA_STATE_STARTUP = 1;
+const BOLA_STATE_STEADY = 2;
 
 const MINIMUM_BUFFER_S = 10; // BOLA should never add artificial delays if buffer is less than MINIMUM_BUFFER_S.
 const MINIMUM_BUFFER_PER_BITRATE_LEVEL_S = 2;
@@ -107,7 +107,7 @@ function BolaRule(config) {
         const Vp = MINIMUM_BUFFER_S / gp;
         // note that expressions for gp and Vp assume utilities[0] === 1, which is true because of normalization
 
-        return {gp: gp, Vp: Vp};
+        return { gp: gp, Vp: Vp };
     }
 
     function getInitialBolaState(rulesContext) {

src/streaming/rules/abr/lolp/LearningAbrController.js

@@ -354,7 +354,7 @@ function LearningAbrController() {
         }
         // Dynamic Weights Selector (step 2/2: find weights)
         let weightVector = dynamicWeightsSelector.findWeightVector(somElements, currentLatency, currentBuffer, rebuffer, currentThroughput, playbackRate);
-        if (weightVector !== null && weightVector !== -1) {   // null: something went wrong, -1: constraints not met
+        if (weightVector !== null && weightVector !== -1) { // null: something went wrong, -1: constraints not met
             weights = weightVector;
         }
     }

src/streaming/rules/abr/lolp/LoLpQoEEvaluator.js

@@ -83,8 +83,7 @@ function LoLpQoeEvaluator() {
         // set some safe value, else consider throwing error
         if (!fragmentDuration) {
             qoeInfo.weights.bitrateReward = 1;
-        }
-        else {
+        } else {
             qoeInfo.weights.bitrateReward = fragmentDuration;
         }
 
@@ -96,8 +95,7 @@ function LoLpQoeEvaluator() {
         // set some safe value, else consider throwing error
         if (!maxBitrateKbps) {
             qoeInfo.weights.rebufferPenalty = 1000;
-        }
-        else {
+        } else {
             qoeInfo.weights.rebufferPenalty = maxBitrateKbps;
         }
 
@@ -107,7 +105,7 @@ function LoLpQoeEvaluator() {
         qoeInfo.weights.latencyPenalty.push({ threshold: 100000000, penalty: (maxBitrateKbps * 0.1) });
 
         // Set weight: playbackSpeedPenalty
-        if (!minBitrateKbps) qoeInfo.weights.playbackSpeedPenalty = 200;   // set some safe value, else consider throwing error
+        if (!minBitrateKbps) qoeInfo.weights.playbackSpeedPenalty = 200; // set some safe value, else consider throwing error
         else qoeInfo.weights.playbackSpeedPenalty = minBitrateKbps;
 
         return qoeInfo;

src/streaming/rules/abr/lolp/LoLpRule.js

@@ -103,11 +103,11 @@ function LoLPRule(config) {
             }
 
             // QoE parameters
-            let bitrateList = mediaInfo.bitrateList;  // [{bandwidth: 200000, width: 640, height: 360}, ...]
+            let bitrateList = mediaInfo.bitrateList; // [{bandwidth: 200000, width: 640, height: 360}, ...]
             let segmentDuration = rulesContext.getRepresentationInfo().fragmentDuration;
-            let minBitrateKbps = bitrateList[0].bandwidth / 1000.0;                         // min bitrate level
-            let maxBitrateKbps = bitrateList[bitrateList.length - 1].bandwidth / 1000.0;    // max bitrate level
-            for (let i = 0; i < bitrateList.length; i++) {  // in case bitrateList is not sorted as expected
+            let minBitrateKbps = bitrateList[0].bandwidth / 1000.0; // min bitrate level
+            let maxBitrateKbps = bitrateList[bitrateList.length - 1].bandwidth / 1000.0; // max bitrate level
+            for (let i = 0; i < bitrateList.length; i++) { // in case bitrateList is not sorted as expected
                 let b = bitrateList[i].bandwidth / 1000.0;
                 if (b > maxBitrateKbps)
                     maxBitrateKbps = b;

src/streaming/rules/abr/lolp/QoeInfo.js

@@ -51,11 +51,11 @@ class QoeInfo {
         this.weights.playbackSpeedPenalty = null;
 
         // Weighted Sum for each Qoe factor
-        this.bitrateWSum = 0;           // kbps
-        this.bitrateSwitchWSum = 0;     // kbps
-        this.rebufferWSum = 0;          // seconds
-        this.latencyWSum = 0;           // seconds
-        this.playbackSpeedWSum = 0;     // e.g. 0.95, 1.0, 1.05
+        this.bitrateWSum = 0;// kbps
+        this.bitrateSwitchWSum = 0;// kbps
+        this.rebufferWSum = 0;// seconds
+        this.latencyWSum = 0;// seconds
+        this.playbackSpeedWSum = 0;// e.g. 0.95, 1.0, 1.05
 
         // Store total Qoe value based on current Weighted Sum values
         this.totalQoe = 0;