refactoring code

Author: nicosang

src/streaming/metrics/reporting/reporters/DVBReporting.js

@@ -37,19 +37,26 @@ function DVBReporting(config) {
     let instance;
 
     let context = this.context;
-    let metricSerialiser = MetricSerialiser(context).getInstance();
-    let randomNumberGenerator = RNG(context).getInstance();
+    let metricSerialiser,
+        randomNumberGenerator,
+        reportingPlayerStatusDecided,
+        isReportingPlayer,
+        reportingUrl,
+        rangeController;
 
     let USE_DRAFT_DVB_SPEC = true;
-    let isReportingPlayer = false;
-    let reportingPlayerStatusDecided = false;
-    let reportingUrl = null;
-    let rangeController = null;
     let allowPendingRequestsToCompleteOnReset = true;
     let pendingRequests = [];
 
     const metricsConstants = config.metricsConstants;
 
+    function setup() {
+        metricSerialiser = MetricSerialiser(context).getInstance();
+        randomNumberGenerator = RNG(context).getInstance();
+
+        resetInitialSettings();
+    }
+
     function doGetRequest(url, successCB, failureCB) {
         let req = new XMLHttpRequest();
         const oncomplete = function () {
@@ -159,16 +166,20 @@ function DVBReporting(config) {
         }
     }
 
+    function resetInitialSettings() {
+        reportingPlayerStatusDecided = false;
+        isReportingPlayer = false;
+        reportingUrl = null;
+        rangeController = null;
+    }
+
     function reset() {
         if (!allowPendingRequestsToCompleteOnReset) {
             pendingRequests.forEach(req => req.abort());
             pendingRequests = [];
         }
 
-        reportingPlayerStatusDecided = false;
-        isReportingPlayer = false;
-        reportingUrl = null;
-        rangeController = null;
+        resetInitialSettings();
     }
 
     instance = {
@@ -177,6 +188,8 @@ function DVBReporting(config) {
         reset:      reset
     };
 
+    setup();
+
     return instance;
 }
 

src/streaming/metrics/utils/DVBErrorsTranslator.js

@@ -35,11 +35,10 @@ import MetricsReportingEvents from '../MetricsReportingEvents';
 function DVBErrorsTranslator(config) {
 
     config = config || {};
-    let instance;
-    let eventBus = config.eventBus;
-    let metricModel = config.metricsModel;
-    let mpd;
-
+    let instance,
+        mpd;
+    const eventBus = config.eventBus;
+    const metricModel = config.metricsModel;
     const metricsConstants = config.metricsConstants;
     //MediaPlayerEvents have been added to Events in MediaPlayer class
     const Events = config.events;