Merge pull request #544 from BrandonOCasey/browserify-p4

browserify-p4: playlist*, xhr, and resolve-url

@@ -48,10 +48,7 @@
   <script src="/node_modules/video.js/dist/video.js"></script>
   <script src="/node_modules/video.js/dist/video.js"></script>
   <script src="/node_modules/videojs-contrib-media-sources/dist/videojs-media-sources.js"></script>
   <script src="/node_modules/videojs-contrib-media-sources/dist/videojs-media-sources.js"></script>
   <script src="/src/videojs-contrib-hls.js"></script>
   <script src="/src/videojs-contrib-hls.js"></script>
-  <script src="/src/xhr.js"></script>
   <script src="/dist/videojs-contrib-hls.js"></script>
   <script src="/dist/videojs-contrib-hls.js"></script>
-  <script src="/src/playlist.js"></script>
-  <script src="/src/playlist-loader.js"></script>
   <script src="/src/bin-utils.js"></script>
   <script src="/src/bin-utils.js"></script>
   <script>
   <script>
     (function(window, videojs) {
     (function(window, videojs) {

@@ -2,7 +2,7 @@ var browserify = require('browserify');
 var fs = require('fs');
 var fs = require('fs');
 var glob = require('glob');
 var glob = require('glob');
 
 
-glob('test/{decryper,m3u8,stub}.test.js', function(err, files) {
+glob('test/{playlist*,decryper,m3u8,stub}.test.js', function(err, files) {
   browserify(files)
   browserify(files)
     .transform('babelify')
     .transform('babelify')
     .bundle()
     .bundle()

@@ -3,7 +3,7 @@ var fs = require('fs');
 var glob = require('glob');
 var glob = require('glob');
 var watchify = require('watchify');
 var watchify = require('watchify');
 
 
-glob('test/{decrypter,m3u8,stub}.test.js', function(err, files) {
+glob('test/{playlist*,decrypter,m3u8,stub}.test.js', function(err, files) {
   var b = browserify(files, {
   var b = browserify(files, {
     cache: {},
     cache: {},
     packageCache: {},
     packageCache: {},

+import document from 'global/document';
+/* eslint-disable max-len */
+/**
+ * Constructs a new URI by interpreting a path relative to another
+ * URI.
+ * @param basePath {string} a relative or absolute URI
+ * @param path {string} a path part to combine with the base
+ * @return {string} a URI that is equivalent to composing `base`
+ * with `path`
+ * @see http://stackoverflow.com/questions/470832/getting-an-absolute-url-from-a-relative-one-ie6-issue
+ */
+/* eslint-enable max-len */
+const resolveUrl = function(basePath, path) {
+  // use the base element to get the browser to handle URI resolution
+  let oldBase = document.querySelector('base');
+  let docHead = document.querySelector('head');
+  let a = document.createElement('a');
+  let base = oldBase;
+  let oldHref;
+  let result;
+
+  // prep the document
+  if (oldBase) {
+    oldHref = oldBase.href;
+  } else {
+    base = docHead.appendChild(document.createElement('base'));
+  }
+
+  base.href = basePath;
+  a.href = path;
+  result = a.href;
+
+  // clean up
+  if (oldBase) {
+    oldBase.href = oldHref;
+  } else {
+    docHead.removeChild(base);
+  }
+  return result;
+};
+
+export default resolveUrl;

@@ -2,6 +2,10 @@ import m3u8 from './m3u8';
 import Stream from './stream';
 import Stream from './stream';
 import videojs from 'video.js';
 import videojs from 'video.js';
 import {Decrypter, decrypt, AsyncStream} from './decrypter';
 import {Decrypter, decrypt, AsyncStream} from './decrypter';
+import Playlist from './playlist';
+import PlaylistLoader from './playlist-loader';
+import xhr from './xhr';
+
 
 
 if(typeof window.videojs.Hls === 'undefined') {
 if(typeof window.videojs.Hls === 'undefined') {
   videojs.Hls = {};
   videojs.Hls = {};
@@ -11,3 +15,6 @@ videojs.m3u8 = m3u8;
 videojs.Hls.decrypt = decrypt;
 videojs.Hls.decrypt = decrypt;
 videojs.Hls.Decrypter = Decrypter;
 videojs.Hls.Decrypter = Decrypter;
 videojs.Hls.AsyncStream = AsyncStream;
 videojs.Hls.AsyncStream = AsyncStream;
+videojs.Hls.xhr = xhr;
+videojs.Hls.Playlist = Playlist;
+videojs.Hls.PlaylistLoader = PlaylistLoader;

-(function(videojs) {
-  'use strict';
+/**
+ * A wrapper for videojs.xhr that tracks bandwidth.
+ */
+import {xhr as videojsXHR, mergeOptions} from 'video.js';
+const xhr = function(options, callback) {
+  // Add a default timeout for all hls requests
+  options = mergeOptions({
+    timeout: 45e3
+  }, options);
 
 
-  /**
-   * A wrapper for videojs.xhr that tracks bandwidth.
-   */
-  videojs.Hls.xhr = function(options, callback) {
-    // 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.roundTripTime = request.responseTime - request.requestTime;
-        request.bytesReceived = request.response.byteLength || request.response.length;
-        if (!request.bandwidth) {
-          request.bandwidth = Math.floor((request.bytesReceived / request.roundTripTime) * 8 * 1000);
-        }
+  let request = videojsXHR(options, function(error, response) {
+    if (!error && request.response) {
+      request.responseTime = (new Date()).getTime();
+      request.roundTripTime = request.responseTime - request.requestTime;
+      request.bytesReceived = request.response.byteLength || request.response.length;
+      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 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 considers status codes outside of 200 and 0
-      // (for file uris) to be errors, but the old XHR did, so emulate that
-      // behavior. Status 206 may be used in response to byterange requests.
-      if (!error &&
-           response.statusCode !== 200 &&
-           response.statusCode !== 206 &&
-           response.statusCode !== 0) {
-        error = new Error('XHR Failed with a response of: ' +
-          (request && (request.response || request.responseText)));
-      }
+    // videojs.xhr no longer considers status codes outside of 200 and 0
+    // (for file uris) to be errors, but the old XHR did, so emulate that
+    // behavior. Status 206 may be used in response to byterange requests.
+    if (!error &&
+        response.statusCode !== 200 &&
+        response.statusCode !== 206 &&
+        response.statusCode !== 0) {
+      error = new Error('XHR Failed with a response of: ' +
+                        (request && (request.response || request.responseText)));
+    }
+
+    callback(error, request);
+  });
 
 
-      callback(error, request);
-    });
+  request.requestTime = (new Date()).getTime();
+  return request;
+};
 
 
-    request.requestTime = (new Date()).getTime();
-    return request;
-  };
-})(window.videojs);
+export default xhr;

@@ -16,16 +16,11 @@
   <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-contrib-hls.js"></script>
   <script src="/src/videojs-contrib-hls.js"></script>
-  <script src="/src/xhr.js"></script>
   <script src="/dist/videojs-contrib-hls.js"></script>
   <script src="/dist/videojs-contrib-hls.js"></script>
-  <script src="/src/playlist.js"></script>
-  <script src="/src/playlist-loader.js"></script>
   <script src="/src/bin-utils.js"></script>
   <script src="/src/bin-utils.js"></script>
 
 
   <script src="/test/videojs-contrib-hls.test.js"></script>
   <script src="/test/videojs-contrib-hls.test.js"></script>
   <script src="/dist-test/videojs-contrib-hls.js"></script>
   <script src="/dist-test/videojs-contrib-hls.js"></script>
-  <script src="/test/playlist.test.js"></script>
-  <script src="/test/playlist-loader.test.js"></script>
 
 
 </body>
 </body>
 </html>
 </html>

@@ -16,11 +16,8 @@ var DEFAULTS = {
 
 
     // these two stub old functionality
     // these two stub old functionality
     'src/videojs-contrib-hls.js',
     'src/videojs-contrib-hls.js',
-    'src/xhr.js',
     'dist/videojs-contrib-hls.js',
     'dist/videojs-contrib-hls.js',
 
 
-    'src/playlist.js',
-    'src/playlist-loader.js',
     'src/bin-utils.js',
     'src/bin-utils.js',
 
 
     'test/stub.test.js',
     'test/stub.test.js',
@@ -45,7 +42,7 @@ var DEFAULTS = {
   ],
   ],
 
 
   preprocessors: {
   preprocessors: {
-    'test/{decrypter,stub,m3u8}.test.js': ['browserify']
+    'test/{playlist*,decrypter,stub,m3u8}.test.js': ['browserify']
   },
   },
 
 
   reporters: ['dots'],
   reporters: ['dots'],