shaka-player 4.10.13 → 4.11.0

package/lib/ads/interstitial_ad_manager.js

@@ -15,6 +15,7 @@ goog.require('shaka.log');
 goog.require('shaka.media.PreloadManager');
 goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.Dom');
+goog.require('shaka.util.Error');
 goog.require('shaka.util.EventManager');
 goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.IReleasable');
@@ -22,6 +23,7 @@ goog.require('shaka.util.Platform');
 goog.require('shaka.util.PublicPromise');
 goog.require('shaka.util.StringUtils');
 goog.require('shaka.util.Timer');
+goog.require('shaka.util.TXml');
 
 
 /**
@@ -61,11 +63,11 @@ shaka.ads.InterstitialAdManager = class {
     /** @private {!Set.<string>} */
     this.interstitialIds_ = new Set();
 
-    /** @private {!Set.<shaka.ads.InterstitialAdManager.Interstitial>} */
+    /** @private {!Set.<shaka.extern.AdInterstitial>} */
     this.interstitials_ = new Set();
 
     /**
-     * @private {!Map.<shaka.ads.InterstitialAdManager.Interstitial,
+     * @private {!Map.<shaka.extern.AdInterstitial,
      *                 Promise<?shaka.media.PreloadManager>>}
      */
     this.preloadManagerInterstitials_ = new Map();
@@ -204,48 +206,147 @@ shaka.ads.InterstitialAdManager = class {
 
 
   /**
-   * @param {shaka.extern.Interstitial} interstitial
+   * @param {shaka.extern.HLSInterstitial} hlsInterstitial
    */
-  async addMetadata(interstitial) {
+  async addMetadata(hlsInterstitial) {
     if (this.basePlayer_.getLoadMode() == shaka.Player.LoadMode.SRC_EQUALS &&
         this.usingBaseVideo_) {
       shaka.log.alwaysWarn(
-          'Unsupported interstitial when using single media element',
-          interstitial);
+          'Unsupported HLS interstitial when using single media element',
+          hlsInterstitial);
       return;
     }
     this.updatePlayerConfig_();
-    let cuepointsChanged = false;
-    const interstitialsAd = await this.getInterstitialsInfo_(interstitial);
-    if (interstitialsAd.length) {
-      for (const interstitialAd of interstitialsAd) {
-        const interstitialId = JSON.stringify(interstitialAd);
-        if (this.interstitialIds_.has(interstitialId)) {
-          continue;
+    const adInterstitials = await this.getInterstitialsInfo_(hlsInterstitial);
+    if (adInterstitials.length) {
+      this.addInterstitials(adInterstitials);
+    } else {
+      shaka.log.alwaysWarn('Unsupported HLS interstitial', hlsInterstitial);
+    }
+  }
+
+  /**
+   * @param {shaka.extern.TimelineRegionInfo} region
+   */
+  addRegion(region) {
+    let alternativeMPDUri;
+    let alternativeMPDmode;
+    for (const node of region.eventNode.children) {
+      if (node.tagName == 'AlternativeMPD') {
+        const uri = node.attributes['uri'];
+        const mode = node.attributes['mode'];
+        if (uri) {
+          alternativeMPDUri = uri;
+          alternativeMPDmode = mode;
+          break;
         }
-        cuepointsChanged = true;
-        this.interstitialIds_.add(interstitialId);
-        this.interstitials_.add(interstitialAd);
-        let shouldPreload = false;
-        if (interstitial.pre && this.lastTime_ == null) {
-          shouldPreload = true;
-        } else if (interstitialAd.startTime == 0 && !interstitialAd.canJump) {
+      }
+    }
+    if (!alternativeMPDUri) {
+      shaka.log.alwaysWarn('Unsupported MPD alternate', region);
+      return;
+    }
+    const isReplace = alternativeMPDmode == 'replace';
+    const isInsert = alternativeMPDmode == 'insert';
+    if (!isReplace && !isInsert) {
+      shaka.log.warning('Unsupported MPD alternate', region);
+      return;
+    }
+    const interstitial = {
+      id: null,
+      startTime: region.startTime,
+      endTime: isReplace ? region.endTime : null,
+      uri: alternativeMPDUri,
+      isSkippable: false,
+      skipOffset: null,
+      canJump: true,
+      resumeOffset: isInsert ? 0 : null,
+      playoutLimit: null,
+      once: false,
+      pre: false,
+      post: false,
+      timelineRange: isReplace && !isInsert,
+    };
+    this.addInterstitials([interstitial]);
+  }
+
+  /**
+   * @param {string} url
+   * @return {!Promise}
+   */
+  async addAdUrlInterstitial(url) {
+    const NetworkingEngine = shaka.net.NetworkingEngine;
+    const context = {
+      type: NetworkingEngine.AdvancedRequestType.INTERSTITIAL_AD_URL,
+    };
+    const responseData = await this.makeAdRequest_(url, context);
+    const data = shaka.util.TXml.parseXml(responseData, 'VAST,vmap:VMAP');
+    if (!data) {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.ADS,
+          shaka.util.Error.Code.VAST_INVALID_XML);
+    }
+    let interstitials = [];
+    if (data.tagName == 'VAST') {
+      interstitials = shaka.ads.Utils.parseVastToInterstitials(
+          data, this.lastTime_);
+    } else if (data.tagName == 'vmap:VMAP') {
+      for (const ad of shaka.ads.Utils.parseVMAP(data)) {
+        // eslint-disable-next-line no-await-in-loop
+        const vastResponseData = await this.makeAdRequest_(ad.uri, context);
+        const vast = shaka.util.TXml.parseXml(vastResponseData, 'VAST');
+        if (!vast) {
+          throw new shaka.util.Error(
+              shaka.util.Error.Severity.CRITICAL,
+              shaka.util.Error.Category.ADS,
+              shaka.util.Error.Code.VAST_INVALID_XML);
+        }
+        interstitials.push(...shaka.ads.Utils.parseVastToInterstitials(
+            vast, ad.time));
+      }
+    }
+    this.addInterstitials(interstitials);
+  }
+
+
+  /**
+   * @param {!Array.<shaka.extern.AdInterstitial>} interstitials
+   */
+  addInterstitials(interstitials) {
+    if (this.basePlayer_.getLoadMode() == shaka.Player.LoadMode.SRC_EQUALS &&
+        this.usingBaseVideo_) {
+      shaka.log.alwaysWarn(
+          'Unsupported interstitial when using single media element',
+          interstitials);
+      return;
+    }
+    let cuepointsChanged = false;
+    for (const interstitial of interstitials) {
+      const interstitialId = JSON.stringify(interstitial);
+      if (this.interstitialIds_.has(interstitialId)) {
+        continue;
+      }
+      cuepointsChanged = true;
+      this.interstitialIds_.add(interstitialId);
+      this.interstitials_.add(interstitial);
+      let shouldPreload = false;
+      if (interstitial.pre && this.lastTime_ == null) {
+        shouldPreload = true;
+      } else if (interstitial.startTime == 0 && !interstitial.canJump) {
+        shouldPreload = true;
+      } else if (this.lastTime_ != null) {
+        const difference = interstitial.startTime - this.lastTime_;
+        if (difference > 0 && difference <= 10) {
           shouldPreload = true;
-        } else if (this.lastTime_ != null) {
-          const difference = interstitial.startTime - this.lastTime_;
-          if (difference > 0 && difference <= 10) {
-            shouldPreload = true;
-          }
         }
-        if (shouldPreload) {
-          if (!this.preloadManagerInterstitials_.has(interstitialAd)) {
-            this.preloadManagerInterstitials_.set(
-                interstitialAd, this.player_.preload(interstitialAd.uri));
-          }
+      }
+      if (shouldPreload) {
+        if (!this.preloadManagerInterstitials_.has(interstitial)) {
+          this.preloadManagerInterstitials_.set(
+              interstitial, this.player_.preload(interstitial.uri));
         }
       }
-    } else {
-      shaka.log.alwaysWarn('Unsupported interstitial', interstitial);
     }
     if (cuepointsChanged) {
       this.cuepointsChanged_();
@@ -274,7 +375,7 @@ shaka.ads.InterstitialAdManager = class {
   /**
    * @param {boolean} needPreRoll
    * @param {number=} numberToSkip
-   * @return {?shaka.ads.InterstitialAdManager.Interstitial}
+   * @return {?shaka.extern.AdInterstitial}
    * @private
    */
   getCurrentInterstitial_(needPreRoll, numberToSkip = 0) {
@@ -314,7 +415,7 @@ shaka.ads.InterstitialAdManager = class {
 
 
   /**
-   * @param {shaka.ads.InterstitialAdManager.Interstitial} interstitial
+   * @param {shaka.extern.AdInterstitial} interstitial
    * @param {number} sequenceLength
    * @param {number} adPosition
    * @param {number} initialTime the clock time the ad started at
@@ -475,7 +576,8 @@ shaka.ads.InterstitialAdManager = class {
     };
 
     const ad = new shaka.ads.InterstitialAd(this.video_,
-        interstitial.isSkippable, onSkip, sequenceLength, adPosition);
+        interstitial.isSkippable, interstitial.skipOffset,
+        onSkip, sequenceLength, adPosition);
     if (!this.usingBaseVideo_) {
       ad.setMuted(this.baseVideo_.muted);
       ad.setVolume(this.baseVideo_.volume);
@@ -489,21 +591,36 @@ shaka.ads.InterstitialAdManager = class {
       this.onEvent_(new shaka.util.FakeEvent(
           shaka.ads.Utils.AD_SKIP_STATE_CHANGED));
     }
+    const eventsSent = new Set();
     this.adEventManager_.listenOnce(this.player_, 'error', error);
-    this.adEventManager_.listenOnce(this.player_, 'firstquartile', () => {
-      updateBaseVideoTime();
-      this.onEvent_(
-          new shaka.util.FakeEvent(shaka.ads.Utils.AD_FIRST_QUARTILE));
-    });
-    this.adEventManager_.listenOnce(this.player_, 'midpoint', () => {
-      updateBaseVideoTime();
-      this.onEvent_(
-          new shaka.util.FakeEvent(shaka.ads.Utils.AD_MIDPOINT));
-    });
-    this.adEventManager_.listenOnce(this.player_, 'thirdquartile', () => {
-      updateBaseVideoTime();
-      this.onEvent_(
-          new shaka.util.FakeEvent(shaka.ads.Utils.AD_THIRD_QUARTILE));
+    this.adEventManager_.listen(this.video_, 'timeupdate', () => {
+      const duration = this.video_.duration;
+      if (!duration) {
+        return;
+      }
+      if (interstitial.isSkippable && interstitial.skipOffset &&
+          ad.canSkipNow() && ad.getRemainingTime() > 0 &&
+          ad.getDuration() > 0) {
+        this.onEvent_(
+            new shaka.util.FakeEvent(shaka.ads.Utils.AD_SKIP_STATE_CHANGED));
+      }
+      const currentPercent = 100 * this.video_.currentTime / duration;
+      if (currentPercent >= 25 && !eventsSent.has('firstquartile')) {
+        updateBaseVideoTime();
+        this.onEvent_(
+            new shaka.util.FakeEvent(shaka.ads.Utils.AD_FIRST_QUARTILE));
+        eventsSent.add('firstquartile');
+      } else if (currentPercent >= 50 && !eventsSent.has('midpoint')) {
+        updateBaseVideoTime();
+        this.onEvent_(
+            new shaka.util.FakeEvent(shaka.ads.Utils.AD_MIDPOINT));
+        eventsSent.add('midpoint');
+      } else if (currentPercent >= 75 && !eventsSent.has('thirdquartile')) {
+        updateBaseVideoTime();
+        this.onEvent_(
+            new shaka.util.FakeEvent(shaka.ads.Utils.AD_THIRD_QUARTILE));
+        eventsSent.add('thirdquartile');
+      }
     });
     this.adEventManager_.listenOnce(this.player_, 'complete', complete);
     this.adEventManager_.listen(this.video_, 'play', () => {
@@ -556,21 +673,27 @@ shaka.ads.InterstitialAdManager = class {
 
 
   /**
-   * @param {shaka.extern.Interstitial} interstitial
-   * @return {!Promise.<!Array.<shaka.ads.InterstitialAdManager.Interstitial>>}
+   * @param {shaka.extern.HLSInterstitial} hlsInterstitial
+   * @return {!Promise.<!Array.<shaka.extern.AdInterstitial>>}
    * @private
    */
-  async getInterstitialsInfo_(interstitial) {
+  async getInterstitialsInfo_(hlsInterstitial) {
     const interstitialsAd = [];
-    if (!interstitial) {
+    if (!hlsInterstitial) {
       return interstitialsAd;
     }
-    const assetUri = interstitial.values.find((v) => v.key == 'X-ASSET-URI');
-    const assetList = interstitial.values.find((v) => v.key == 'X-ASSET-LIST');
+    const assetUri = hlsInterstitial.values.find((v) => v.key == 'X-ASSET-URI');
+    const assetList =
+        hlsInterstitial.values.find((v) => v.key == 'X-ASSET-LIST');
     if (!assetUri && !assetList) {
       return interstitialsAd;
     }
-    const restrict = interstitial.values.find((v) => v.key == 'X-RESTRICT');
+    let id = null;
+    const hlsInterstitialId = hlsInterstitial.values.find((v) => v.key == 'ID');
+    if (hlsInterstitialId) {
+      id = /** @type {string} */(hlsInterstitialId.data);
+    }
+    const restrict = hlsInterstitial.values.find((v) => v.key == 'X-RESTRICT');
     let isSkippable = true;
     let canJump = true;
     if (restrict && restrict.data) {
@@ -579,7 +702,8 @@ shaka.ads.InterstitialAdManager = class {
       canJump = !data.includes('JUMP');
     }
     let resumeOffset = null;
-    const resume = interstitial.values.find((v) => v.key == 'X-RESUME-OFFSET');
+    const resume =
+        hlsInterstitial.values.find((v) => v.key == 'X-RESUME-OFFSET');
     if (resume) {
       const resumeOffsetString = /** @type {string} */(resume.data);
       resumeOffset = parseFloat(resumeOffsetString);
@@ -588,7 +712,8 @@ shaka.ads.InterstitialAdManager = class {
       }
     }
     let playoutLimit = null;
-    const playout = interstitial.values.find((v) => v.key == 'X-PLAYOUT-LIMIT');
+    const playout =
+        hlsInterstitial.values.find((v) => v.key == 'X-PLAYOUT-LIMIT');
     if (playout) {
       const playoutLimitString = /** @type {string} */(playout.data);
       playoutLimit = parseFloat(playoutLimitString);
@@ -599,7 +724,7 @@ shaka.ads.InterstitialAdManager = class {
     let once = false;
     let pre = false;
     let post = false;
-    const cue = interstitial.values.find((v) => v.key == 'CUE');
+    const cue = hlsInterstitial.values.find((v) => v.key == 'CUE');
     if (cue) {
       const data = /** @type {string} */(cue.data);
       once = data.includes('ONCE');
@@ -608,7 +733,7 @@ shaka.ads.InterstitialAdManager = class {
     }
     let timelineRange = false;
     const timelineOccupies =
-        interstitial.values.find((v) => v.key == 'X-TIMELINE-OCCUPIES');
+        hlsInterstitial.values.find((v) => v.key == 'X-TIMELINE-OCCUPIES');
     if (timelineOccupies) {
       const data = /** @type {string} */(timelineOccupies.data);
       timelineRange = data.includes('RANGE');
@@ -621,10 +746,12 @@ shaka.ads.InterstitialAdManager = class {
         return interstitialsAd;
       }
       interstitialsAd.push({
-        startTime: interstitial.startTime,
-        endTime: interstitial.endTime,
+        id,
+        startTime: hlsInterstitial.startTime,
+        endTime: hlsInterstitial.endTime,
         uri,
         isSkippable,
+        skipOffset: isSkippable ? 0 : null,
         canJump,
         resumeOffset,
         playoutLimit,
@@ -638,24 +765,25 @@ shaka.ads.InterstitialAdManager = class {
       if (!uri) {
         return interstitialsAd;
       }
-      const type = shaka.net.NetworkingEngine.RequestType.ADS;
-      const request = shaka.net.NetworkingEngine.makeRequest(
-          [uri],
-          shaka.net.NetworkingEngine.defaultRetryParameters());
-      const op = this.basePlayer_.getNetworkingEngine().request(type, request);
       try {
-        const response = await op.promise;
-        const data = shaka.util.StringUtils.fromUTF8(response.data);
+        const NetworkingEngine = shaka.net.NetworkingEngine;
+        const context = {
+          type: NetworkingEngine.AdvancedRequestType.INTERSTITIAL_ASSET_LIST,
+        };
+        const responseData = await this.makeAdRequest_(uri, context);
+        const data = shaka.util.StringUtils.fromUTF8(responseData);
         const dataAsJson =
         /** @type {!shaka.ads.InterstitialAdManager.AssetsList} */ (
             JSON.parse(data));
         for (const asset of dataAsJson['ASSETS']) {
           if (asset['URI']) {
             interstitialsAd.push({
-              startTime: interstitial.startTime,
-              endTime: interstitial.endTime,
+              id,
+              startTime: hlsInterstitial.startTime,
+              endTime: hlsInterstitial.endTime,
               uri: asset['URI'],
               isSkippable,
+              skipOffset: isSkippable ? 0 : null,
               canJump,
               resumeOffset,
               playoutLimit,
@@ -722,6 +850,23 @@ shaka.ads.InterstitialAdManager = class {
     netEngine.clearAllResponseFilters();
     this.basePlayer_.getNetworkingEngine().copyFiltersInto(netEngine);
   }
+
+  /**
+   * @param {string} url
+   * @param {shaka.extern.RequestContext=} context
+   * @return {!Promise.<BufferSource>}
+   * @private
+   */
+  async makeAdRequest_(url, context) {
+    const type = shaka.net.NetworkingEngine.RequestType.ADS;
+    const request = shaka.net.NetworkingEngine.makeRequest(
+        [url],
+        shaka.net.NetworkingEngine.defaultRetryParameters());
+    const op = this.basePlayer_.getNetworkingEngine()
+        .request(type, request, context);
+    const response = await op.promise;
+    return response.data;
+  }
 };
 
 
@@ -743,33 +888,3 @@ shaka.ads.InterstitialAdManager.AssetsList;
  * @property {string} URI
  */
 shaka.ads.InterstitialAdManager.Asset;
-
-
-/**
- * @typedef {{
- *   startTime: number,
- *   endTime: ?number,
- *   uri: string,
- *   isSkippable: boolean,
- *   canJump: boolean,
- *   resumeOffset: ?number,
- *   playoutLimit: ?number,
- *   once: boolean,
- *   pre: boolean,
- *   post: boolean,
- *   timelineRange: boolean
- * }}
- *
- * @property {number} startTime
- * @property {?number} endTime
- * @property {string} uri
- * @property {boolean} isSkippable
- * @property {boolean} canJump
- * @property {?number} resumeOffset
- * @property {?number} playoutLimit
- * @property {boolean} once
- * @property {boolean} pre
- * @property {boolean} post
- * @property {boolean} timelineRange
- */
-shaka.ads.InterstitialAdManager.Interstitial;

package/lib/ads/media_tailor_ad.js

@@ -25,7 +25,7 @@ shaka.ads.MediaTailorAd = class {
     this.ad_ = mediaTailorAd;
 
     /** @private {?number} */
-    this.skipOffset_ = this.parseTime_(this.ad_.skipOffset);
+    this.skipOffset_ = shaka.util.TextParser.parseTime(this.ad_.skipOffset);
 
     /** @private {HTMLMediaElement} */
     this.video_ = video;
@@ -318,42 +318,4 @@ shaka.ads.MediaTailorAd = class {
   isSkipped() {
     return this.isSkipped_;
   }
-
-  /**
-   * Parses a time from string.
-   *
-   * @param {?string} time
-   * @return {?number}
-   * @private
-   */
-  parseTime_(time) {
-    if (!time) {
-      return null;
-    }
-    const parser = new shaka.util.TextParser(time);
-    const results = parser.readRegex(shaka.ads.MediaTailorAd.timeFormat_);
-    if (results == null) {
-      return null;
-    }
-    // This capture is optional, but will still be in the array as undefined,
-    // in which case it is 0.
-    const hours = Number(results[1]) || 0;
-    const minutes = Number(results[2]);
-    const seconds = Number(results[3]);
-    const milliseconds = Number(results[4]) || 0;
-    if (minutes > 59 || seconds > 59) {
-      return null;
-    }
-
-    return (milliseconds / 1000) + seconds + (minutes * 60) + (hours * 3600);
-  }
 };
-
-/**
- * @const
- * @private {!RegExp}
- * @example 00:00.000 or 00:00:00.000 or 0:00:00.000 or
- * 00:00.00 or 00:00:00.00 or 0:00:00.00 or 00:00:00
- */
-shaka.ads.MediaTailorAd.timeFormat_ =
-    /(?:(\d{1,}):)?(\d{2}):(\d{2})((\.(\d{1,3})))?/g;

package/lib/ads/media_tailor_ad_manager.js

@@ -202,17 +202,21 @@ shaka.ads.MediaTailorAdManager = class {
    * @private
    */
   async requestSessionInfo_(url, adsParams) {
-    const type = shaka.net.NetworkingEngine.RequestType.ADS;
-    const request = shaka.net.NetworkingEngine.makeRequest(
+    const NetworkingEngine = shaka.net.NetworkingEngine;
+    const type = NetworkingEngine.RequestType.ADS;
+    const context = {
+      type: NetworkingEngine.AdvancedRequestType.MEDIATAILOR_SESSION_INFO,
+    };
+    const request = NetworkingEngine.makeRequest(
         [url],
-        shaka.net.NetworkingEngine.defaultRetryParameters());
+        NetworkingEngine.defaultRetryParameters());
     request.method = 'POST';
     if (adsParams) {
       const body = JSON.stringify(adsParams);
       request.body = shaka.util.StringUtils.toUTF8(body);
     }
 
-    const op = this.networkingEngine_.request(type, request);
+    const op = this.networkingEngine_.request(type, request, context);
     try {
       const response = await op.promise;
       const data = shaka.util.StringUtils.fromUTF8(response.data);
@@ -254,12 +258,16 @@ shaka.ads.MediaTailorAdManager = class {
    * @private
    */
   async requestTrackingInfo_(trackingUrl, firstRequest) {
-    const type = shaka.net.NetworkingEngine.RequestType.ADS;
-    const request = shaka.net.NetworkingEngine.makeRequest(
+    const NetworkingEngine = shaka.net.NetworkingEngine;
+    const type = NetworkingEngine.RequestType.ADS;
+    const context = {
+      type: NetworkingEngine.AdvancedRequestType.MEDIATAILOR_TRACKING_INFO,
+    };
+    const request = NetworkingEngine.makeRequest(
         [trackingUrl],
-        shaka.net.NetworkingEngine.defaultRetryParameters());
+        NetworkingEngine.defaultRetryParameters());
 
-    const op = this.networkingEngine_.request(type, request);
+    const op = this.networkingEngine_.request(type, request, context);
     try {
       const response = await op.promise;
       let cuepoints = [];
@@ -311,12 +319,16 @@ shaka.ads.MediaTailorAdManager = class {
       return;
     }
 
-    const type = shaka.net.NetworkingEngine.RequestType.ADS;
-    const request = shaka.net.NetworkingEngine.makeRequest(
+    const NetworkingEngine = shaka.net.NetworkingEngine;
+    const type = NetworkingEngine.RequestType.ADS;
+    const context = {
+      type: NetworkingEngine.AdvancedRequestType.MEDIATAILOR_STATIC_RESOURCE,
+    };
+    const request = NetworkingEngine.makeRequest(
         [nonLinearAd.staticResource],
-        shaka.net.NetworkingEngine.defaultRetryParameters());
+        NetworkingEngine.defaultRetryParameters());
 
-    const op = this.networkingEngine_.request(type, request);
+    const op = this.networkingEngine_.request(type, request, context);
     try {
       this.staticResources_.set(cacheKey, []);
       const response = await op.promise;
@@ -709,16 +721,20 @@ shaka.ads.MediaTailorAdManager = class {
           (event) => event.eventType == eventType);
     }
     if (trackingEvent) {
-      const type = shaka.net.NetworkingEngine.RequestType.ADS;
+      const NetworkingEngine = shaka.net.NetworkingEngine;
+      const type = NetworkingEngine.RequestType.ADS;
+      const context = {
+        type: NetworkingEngine.AdvancedRequestType.MEDIATAILOR_TRACKING_EVENT,
+      };
       for (const beaconUrl of trackingEvent.beaconUrls) {
         if (!beaconUrl || beaconUrl == '') {
           continue;
         }
-        const request = shaka.net.NetworkingEngine.makeRequest(
+        const request = NetworkingEngine.makeRequest(
             [beaconUrl],
-            shaka.net.NetworkingEngine.defaultRetryParameters());
+            NetworkingEngine.defaultRetryParameters());
         request.method = 'POST';
-        this.networkingEngine_.request(type, request);
+        this.networkingEngine_.request(type, request, context);
       }
     }
     switch (eventType) {