Merge pull request #117 from heff/reorg-w-114

Reorg and endOfStream fix

@@ -16,6 +16,7 @@
   <script src="src/videojs-hls.js"></script>
   <script src="src/videojs-hls.js"></script>
 
 
   <!-- segment handling -->
   <!-- segment handling -->
+  <script src="src/xhr.js"></script>
   <script src="src/flv-tag.js"></script>
   <script src="src/flv-tag.js"></script>
   <script src="src/exp-golomb.js"></script>
   <script src="src/exp-golomb.js"></script>
   <script src="src/h264-stream.js"></script>
   <script src="src/h264-stream.js"></script>

+(function(videojs){
+  /**
+   * Creates and sends an XMLHttpRequest.
+   * TODO - expose video.js core's XHR and use that instead
+   * 
+   * @param options {string | object} if this argument is a string, it
+   * is intrepreted as a URL and a simple GET request is
+   * inititated. If it is an object, it should contain a `url`
+   * property that indicates the URL to request and optionally a
+   * `method` which is the type of HTTP request to send.
+   * @param callback (optional) {function} a function to call when the
+   * request completes. If the request was not successful, the first
+   * argument will be falsey.
+   * @return {object} the XMLHttpRequest that was initiated.
+   */
+   videojs.Hls.xhr = function(url, callback) {
+    var
+      options = {
+        method: 'GET',
+        timeout: 45 * 1000
+      },
+      request,
+      abortTimeout;
+
+    if (typeof callback !== 'function') {
+      callback = function() {};
+    }
+
+    if (typeof url === 'object') {
+      options = videojs.util.mergeOptions(options, url);
+      url = options.url;
+    }
+
+    request = new window.XMLHttpRequest();
+    request.open(options.method, url);
+    request.url = url;
+
+    if (options.responseType) {
+      request.responseType = options.responseType;
+    }
+    if (options.withCredentials) {
+      request.withCredentials = true;
+    }
+    if (options.timeout) {
+      if (request.timeout === 0) {
+        request.timeout = options.timeout;
+        request.ontimeout = function() {
+          request.timedout = true;
+        };
+      } else {
+        // polyfill XHR2 by aborting after the timeout
+        abortTimeout = window.setTimeout(function() {
+          if (request.readyState !== 4) {
+            request.timedout = true;
+            request.abort();
+          }
+        }, options.timeout);
+      }
+    }
+
+    request.onreadystatechange = function() {
+      // wait until the request completes
+      if (this.readyState !== 4) {
+        return;
+      }
+
+      // clear outstanding timeouts
+      window.clearTimeout(abortTimeout);
+
+      // request timeout
+      if (request.timedout) {
+        return callback.call(this, 'timeout', url);
+      }
+
+      // request aborted or errored
+      if (this.status >= 400 || this.status === 0) {
+        return callback.call(this, true, url);
+      }
+
+      return callback.call(this, false, url);
+    };
+    request.send(null);
+    return request;
+  };
+
+})(window.videojs);
\ No newline at end of file

@@ -79,6 +79,7 @@ module.exports = function(config) {
       '../node_modules/videojs-contrib-media-sources/src/videojs-media-sources.js',
       '../node_modules/videojs-contrib-media-sources/src/videojs-media-sources.js',
       '../test/karma-qunit-shim.js',
       '../test/karma-qunit-shim.js',
       '../src/videojs-hls.js',
       '../src/videojs-hls.js',
+      '../src/xhr.js',
       '../src/flv-tag.js',
       '../src/flv-tag.js',
       '../src/exp-golomb.js',
       '../src/exp-golomb.js',
       '../src/h264-stream.js',
       '../src/h264-stream.js',

@@ -43,6 +43,7 @@ module.exports = function(config) {
       '../node_modules/videojs-contrib-media-sources/src/videojs-media-sources.js',
       '../node_modules/videojs-contrib-media-sources/src/videojs-media-sources.js',
       '../test/karma-qunit-shim.js',
       '../test/karma-qunit-shim.js',
       '../src/videojs-hls.js',
       '../src/videojs-hls.js',
+      '../src/xhr.js',
       '../src/flv-tag.js',
       '../src/flv-tag.js',
       '../src/exp-golomb.js',
       '../src/exp-golomb.js',
       '../src/h264-stream.js',
       '../src/h264-stream.js',

@@ -123,6 +123,7 @@
   <script src="../../node_modules/video.js/dist/video-js/video.js"></script>
   <script src="../../node_modules/video.js/dist/video-js/video.js"></script>
   <script src="../../node_modules/videojs-contrib-media-sources/src/videojs-media-sources.js"></script>
   <script src="../../node_modules/videojs-contrib-media-sources/src/videojs-media-sources.js"></script>
   <script src="../../src/videojs-hls.js"></script>
   <script src="../../src/videojs-hls.js"></script>
+  <script src="../../src/xhr.js"></script>
   <script src="../../src/stream.js"></script>
   <script src="../../src/stream.js"></script>
   <script src="../../src/m3u8/m3u8-parser.js"></script>
   <script src="../../src/m3u8/m3u8-parser.js"></script>
   <script src="../../src/playlist-loader.js"></script>
   <script src="../../src/playlist-loader.js"></script>

@@ -20,6 +20,7 @@
 
 
   <!-- HLS plugin -->
   <!-- HLS plugin -->
   <script src="../src/videojs-hls.js"></script>
   <script src="../src/videojs-hls.js"></script>
+  <script src="../src/xhr.js"></script>
   <script src="../src/flv-tag.js"></script>
   <script src="../src/flv-tag.js"></script>
   <script src="../src/exp-golomb.js"></script>
   <script src="../src/exp-golomb.js"></script>
   <script src="../src/h264-stream.js"></script>
   <script src="../src/h264-stream.js"></script>