Emulate some of the old behavior of the original videojs.xhr in the videojs.Hls.xhr wrapper

Add a default timeout of 45 seconds for all requests
Create a boolean `timedout` property on request in response to the ETIMEOUT error
Create an error code for non-200 responses

@@ -5,12 +5,34 @@
    * A wrapper for videojs.xhr that tracks bandwidth.
    * A wrapper for videojs.xhr that tracks bandwidth.
    */
    */
   videojs.Hls.xhr = function(options, callback) {
   videojs.Hls.xhr = function(options, callback) {
-    var request = videojs.xhr(options, function(error, request) {
-      if (request.response) {
+    // Add a default timeout for all hls requests
+    options = videojs.mergeOptions({
+       timeout: 45e3
+     }, options);
+
+    var request = videojs.xhr(options, function(error, response) {
+      if (!error && request.response) {
         request.responseTime = (new Date()).getTime();
         request.responseTime = (new Date()).getTime();
         request.roundTripTime = request.responseTime - request.requestTime;
         request.roundTripTime = request.responseTime - request.requestTime;
         request.bytesReceived = request.response.byteLength || request.response.length;
         request.bytesReceived = request.response.byteLength || request.response.length;
-        request.bandwidth = Math.floor((request.bytesReceived / request.roundTripTime) * 8 * 1000);
+        if (!request.bandwidth) {
+          request.bandwidth = Math.floor((request.bytesReceived / request.roundTripTime) * 8 * 1000);
+        }
+      }
+
+      // videojs.xhr now uses a specific code on the error object to signal that a request has
+      // timed out errors of setting a boolean on the request object
+      if (error || request.timedout) {
+        request.timedout = request.timedout || (error.code === 'ETIMEDOUT');
+      } else {
+        request.timedout = false;
+      }
+
+      // videojs.xhr no longer consider status codes outside of 200 and 0 (for file uris) to be
+      // errors but the old XHR did so emulate that behavior
+      if (!error && response.statusCode !== 200 && response.statusCode !== 0) {
+        error = new Error('XHR Failed with a response of: ' +
+          (request && (request.response || request.responseText)));
       }
       }
 
 
       callback(error, request);
       callback(error, request);