Allow changing global xhr beforeRequest at runtime

src/videojs-contrib-hls.js

@@ -688,10 +688,6 @@ const HlsSourceHandler = function(mode) {
         // The player had a beforeRequest set prior to the source change.
         // Use it for the new source.
         tech.hls.xhr.beforeRequest = previousBeforeRequest;
-      } else if (videojs.Hls.xhr.beforeRequest) {
-        // Use a global `before` function if specified on videojs.Hls.xhr
-        // but still allow for a per-player override
-        tech.hls.xhr.beforeRequest = videojs.Hls.xhr.beforeRequest;
       }
 
       tech.hls.src(source.src);

src/xhr.js

@@ -9,7 +9,11 @@
  * @param {Function} callback the callback to call when done
  * @return {Request} the xhr request that is going to be made
  */
-import {xhr as videojsXHR, mergeOptions} from 'video.js';
+import {
+  xhr as videojsXHR,
+  mergeOptions,
+  default as videojs
+} from 'video.js';
 
 const xhrFactory = function() {
   const xhr = function XhrFunction(options, callback) {
@@ -20,9 +24,10 @@ const xhrFactory = function() {
 
     // Allow an optional user-specified function to modify the option
     // object before we construct the xhr request
-    if (XhrFunction.beforeRequest &&
-        typeof XhrFunction.beforeRequest === 'function') {
-      let newOptions = XhrFunction.beforeRequest(options);
+    let beforeRequest = XhrFunction.beforeRequest || videojs.Hls.xhr.beforeRequest;
+
+    if (beforeRequest && typeof beforeRequest === 'function') {
+      let newOptions = beforeRequest(options);
 
       if (newOptions) {
         options = newOptions;

test/xhr.test.js

@@ -0,0 +1,46 @@
+import QUnit from 'qunit';
+import xhrFactory from '../src/xhr';
+import { useFakeEnvironment } from './test-helpers.js';
+import videojs from 'video.js';
+
+QUnit.module('xhr', {
+  beforeEach(assert) {
+    this.env = useFakeEnvironment(assert);
+    this.clock = this.env.clock;
+    this.requests = this.env.requests;
+    this.xhr = xhrFactory();
+  },
+  afterEach() {
+    this.env.restore();
+  }
+});
+
+QUnit.test('xhr respects beforeRequest', function(assert) {
+  let defaultOptions = {
+    url: 'default'
+  };
+
+  this.xhr(defaultOptions);
+  assert.equal(this.requests.shift().url, 'default', 'url the same without override');
+
+  this.xhr.beforeRequest = (options) => {
+    options.url = 'player';
+    return options;
+  };
+
+  this.xhr(defaultOptions);
+  assert.equal(this.requests.shift().url, 'player', 'url changed with player override');
+
+  videojs.Hls.xhr.beforeRequest = (options) => {
+    options.url = 'global';
+    return options;
+  };
+
+  this.xhr(defaultOptions);
+  assert.equal(this.requests.shift().url, 'player', 'prioritizes player override');
+
+  delete this.xhr.beforeRequest;
+
+  this.xhr(defaultOptions);
+  assert.equal(this.requests.shift().url, 'global', 'url changed with global override');
+});