Merge pull request #568 from videojs/browserify-p5

Browserify p5

 sudo: false
 sudo: false
 language: node_js
 language: node_js
+addons:
+  firefox: "latest"
 node_js:
 node_js:
-  - 'node'
-  - '4.2'
-  - '0.12'
-  - '0.10'
+  - "stable"
 notifications:
 notifications:
   hipchat:
   hipchat:
     rooms:
     rooms:

@@ -46,10 +46,7 @@
   </ul>
   </ul>
 
 
   <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="/src/videojs-contrib-hls.js"></script>
   <script src="/dist/videojs-contrib-hls.js"></script>
   <script src="/dist/videojs-contrib-hls.js"></script>
-  <script src="/src/bin-utils.js"></script>
   <script>
   <script>
     (function(window, videojs) {
     (function(window, videojs) {
       var player = window.player = videojs('videojs-contrib-hls-player');
       var player = window.player = videojs('videojs-contrib-hls-player');

@@ -2,7 +2,7 @@
   "name": "videojs-contrib-hls",
   "name": "videojs-contrib-hls",
   "version": "1.3.5",
   "version": "1.3.5",
   "description": "Play back HLS with video.js, even where it's not natively supported",
   "description": "Play back HLS with video.js, even where it's not natively supported",
-  "main": "es5/stub.js",
+  "main": "es5/videojs-contrib-hls.js",
   "engines": {
   "engines": {
     "node": ">= 0.10.12"
     "node": ">= 0.10.12"
   },
   },
@@ -27,7 +27,7 @@
     "docs": "npm-run-all docs:*",
     "docs": "npm-run-all docs:*",
     "docs:api": "jsdoc src -r -d docs/api",
     "docs:api": "jsdoc src -r -d docs/api",
     "docs:toc": "doctoc README.md",
     "docs:toc": "doctoc README.md",
-    "lint": "vjsstandard :",
+    "lint": "vjsstandard",
     "prestart": "npm-run-all docs build",
     "prestart": "npm-run-all docs build",
     "start": "npm-run-all -p start:* watch:*",
     "start": "npm-run-all -p start:* watch:*",
     "start:serve": "babel-node scripts/server.js",
     "start:serve": "babel-node scripts/server.js",
@@ -40,7 +40,7 @@
     "preversion": "npm test",
     "preversion": "npm test",
     "version": "npm run build",
     "version": "npm run build",
     "watch": "npm-run-all -p watch:*",
     "watch": "npm-run-all -p watch:*",
-    "watch:js": "watchify src/stub.js -t babelify -v -o dist/videojs-contrib-hls.js",
+    "watch:js": "watchify src/videojs-contrib-hls.js -t babelify -v -o dist/videojs-contrib-hls.js",
     "watch:test": "npm-run-all -p watch:test:*",
     "watch:test": "npm-run-all -p watch:test:*",
     "watch:test:js": "node scripts/watch-test.js",
     "watch:test:js": "node scripts/watch-test.js",
     "watch:test:manifest": "node -e \"var b=require('./scripts/manifest-data.js'); b.watch();\"",
     "watch:test:manifest": "node -e \"var b=require('./scripts/manifest-data.js'); b.watch();\"",
@@ -72,7 +72,8 @@
       "scripts",
       "scripts",
       "utils",
       "utils",
       "test/test-manifests.js",
       "test/test-manifests.js",
-      "test/test-expected.js"
+      "test/test-expected.js",
+      "src/playlist-loader.js"
     ]
     ]
   },
   },
   "files": [
   "files": [
@@ -88,10 +89,10 @@
     "utils/"
     "utils/"
   ],
   ],
   "dependencies": {
   "dependencies": {
-    "pkcs7": "^0.2.3",
-    "video.js": "^5.0.0",
-    "videojs-contrib-media-sources": "^2.4.4",
-    "videojs-swf": "^5.0.1"
+    "pkcs7": "^0.2.2",
+    "video.js": "^5.2.1",
+    "videojs-contrib-media-sources": "^3.0.0",
+    "videojs-swf": "^5.0.0"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "babel": "^5.8.0",
     "babel": "^5.8.0",
@@ -117,12 +118,13 @@
     "minimist": "^1.2.0",
     "minimist": "^1.2.0",
     "npm-run-all": "^1.2.0",
     "npm-run-all": "^1.2.0",
     "portscanner": "^1.0.0",
     "portscanner": "^1.0.0",
-    "qunitjs": "^1.0.0",
+    "qunitjs": "^1.18.0",
     "serve-static": "^1.10.0",
     "serve-static": "^1.10.0",
     "shelljs": "^0.5.3",
     "shelljs": "^0.5.3",
     "sinon": "1.10.2",
     "sinon": "1.10.2",
     "uglify-js": "^2.5.0",
     "uglify-js": "^2.5.0",
     "videojs-standard": "^4.0.0",
     "videojs-standard": "^4.0.0",
-    "watchify": "^3.6.0"
+    "watchify": "^3.6.0",
+    "webworkify": "^1.1.0"
   }
   }
 }
 }

@@ -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/{playlist*,decryper,m3u8,stub}.test.js', function(err, files) {
+glob('test/**/*.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/{playlist*,decrypter,m3u8,stub}.test.js', function(err, files) {
+glob('test/**/*.test.js', function(err, files) {
   var b = browserify(files, {
   var b = browserify(files, {
     cache: {},
     cache: {},
     packageCache: {},
     packageCache: {},

-(function(window) {
-  var textRange = function(range, i) {
+const textRange = function(range, i) {
   return range.start(i) + '-' + range.end(i);
   return range.start(i) + '-' + range.end(i);
-  };
-  var module = {
-    hexDump: function(data) {
-      var
-        bytes = Array.prototype.slice.call(data),
-        step = 16,
-        formatHexString = function(e, i) {
-          var value = e.toString(16);
-          return "00".substring(0, 2 - value.length) + value + (i % 2 ? ' ' : '');
-        },
-        formatAsciiString = function(e) {
+};
+
+const formatHexString = function(e, i) {
+  let value = e.toString(16);
+
+  return '00'.substring(0, 2 - value.length) + value + (i % 2 ? ' ' : '');
+};
+const formatAsciiString = function(e) {
   if (e >= 0x20 && e < 0x7e) {
   if (e >= 0x20 && e < 0x7e) {
     return String.fromCharCode(e);
     return String.fromCharCode(e);
   }
   }
   return '.';
   return '.';
-        },
-        result = '',
-        hex,
-        ascii;
-      for (var j = 0; j < bytes.length / step; j++) {
+};
+
+const utils = {
+  hexDump(data) {
+    let bytes = Array.prototype.slice.call(data);
+    let step = 16;
+    let result = '';
+    let hex;
+    let ascii;
+
+    for (let j = 0; j < bytes.length / step; j++) {
       hex = bytes.slice(j * step, j * step + step).map(formatHexString).join('');
       hex = bytes.slice(j * step, j * step + step).map(formatHexString).join('');
       ascii = bytes.slice(j * step, j * step + step).map(formatAsciiString).join('');
       ascii = bytes.slice(j * step, j * step + step).map(formatAsciiString).join('');
       result += hex + ' ' + ascii + '\n';
       result += hex + ' ' + ascii + '\n';
     }
     }
     return result;
     return result;
   },
   },
-    tagDump: function(tag) {
-      return module.hexDump(tag.bytes);
+  tagDump(tag) {
+    return utils.hexDump(tag.bytes);
   },
   },
-    textRanges: function(ranges) {
-      var result = '', i;
+  textRanges(ranges) {
+    let result = '';
+    let i;
+
     for (i = 0; i < ranges.length; i++) {
     for (i = 0; i < ranges.length; i++) {
       result += textRange(ranges, i) + ' ';
       result += textRange(ranges, i) + ' ';
     }
     }
     return result;
     return result;
   }
   }
-  };
+};
 
 
-  window.videojs.Hls.utils = module;
-})(this);
+export default utils;

@@ -89,10 +89,9 @@ const precompute = function() {
     decTable[i] = decTable[i].slice(0);
     decTable[i] = decTable[i].slice(0);
   }
   }
   return tables;
   return tables;
-}
-
-
+};
 let aesTables = null;
 let aesTables = null;
+
 /**
 /**
  * Schedule out an AES key for both encryption and decryption. This
  * Schedule out an AES key for both encryption and decryption. This
  * is a low-level class. Use a cipher mode to do bulk encryption.
  * is a low-level class. Use a cipher mode to do bulk encryption.
@@ -116,7 +115,7 @@ export default class AES {
     */
     */
     // if we have yet to precompute the S-box tables
     // if we have yet to precompute the S-box tables
     // do so now
     // do so now
-    if(!aesTables) {
+    if (!aesTables) {
       aesTables = precompute();
       aesTables = precompute();
     }
     }
     // then make a copy of that object for use
     // then make a copy of that object for use

 /**
 /**
  * A lightweight readable stream implemention that handles event dispatching.
  * A lightweight readable stream implemention that handles event dispatching.
- * Objects that inherit from streams should call init in their constructors.
  */
  */
 export default class Stream {
 export default class Stream {
   constructor() {
   constructor() {
-    this.init();
-  }
-
-  init() {
     this.listeners = {};
     this.listeners = {};
   }
   }
 
 

-import m3u8 from './m3u8';
-import Stream from './stream';
-import videojs from 'video.js';
-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') {
-  videojs.Hls = {};
-}
-videojs.Hls.Stream = Stream;
-videojs.m3u8 = m3u8;
-videojs.Hls.decrypt = decrypt;
-videojs.Hls.Decrypter = Decrypter;
-videojs.Hls.AsyncStream = AsyncStream;
-videojs.Hls.xhr = xhr;
-videojs.Hls.Playlist = Playlist;
-videojs.Hls.PlaylistLoader = PlaylistLoader;

@@ -90,7 +90,6 @@ function() {
 
 
 });
 });
 
 
-
 QUnit.module('Incremental Processing', {
 QUnit.module('Incremental Processing', {
   beforeEach() {
   beforeEach() {
     this.clock = sinon.useFakeTimers();
     this.clock = sinon.useFakeTimers();

@@ -13,13 +13,6 @@
   <script src="/node_modules/sinon/pkg/sinon.js"></script>
   <script src="/node_modules/sinon/pkg/sinon.js"></script>
   <script src="/node_modules/qunitjs/qunit/qunit.js"></script>
   <script src="/node_modules/qunitjs/qunit/qunit.js"></script>
   <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/src/videojs-media-sources.js"></script>
-
-  <script src="/src/videojs-contrib-hls.js"></script>
-  <script src="/dist/videojs-contrib-hls.js"></script>
-  <script src="/src/bin-utils.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>
 
 
 </body>
 </body>

@@ -11,29 +11,11 @@ var DEFAULTS = {
     'node_modules/video.js/dist/video.js',
     'node_modules/video.js/dist/video.js',
     'node_modules/video.js/dist/video-js.css',
     'node_modules/video.js/dist/video-js.css',
 
 
-    // REMOVE ME WHEN BROWSERIFIED
-    'node_modules/videojs-contrib-media-sources/src/videojs-media-sources.js',
-
-    // these two stub old functionality
-    'src/videojs-contrib-hls.js',
-    'dist/videojs-contrib-hls.js',
-
-    'src/bin-utils.js',
-
-    'test/stub.test.js',
-
-    'test/videojs-contrib-hls.test.js',
-    'test/m3u8.test.js',
-    'test/playlist.test.js',
-    'test/playlist-loader.test.js',
-    'test/decrypter.test.js',
-    // END REMOVE ME
-    // 'test/**/*.js'
+    'test/**/*.test.js'
   ],
   ],
 
 
   exclude: [
   exclude: [
-    'test/bundle.js',
-//    'test/data/**'
+    'test/data/**'
   ],
   ],
 
 
   plugins: [
   plugins: [
@@ -42,7 +24,7 @@ var DEFAULTS = {
   ],
   ],
 
 
   preprocessors: {
   preprocessors: {
-    'test/{playlist*,decrypter,stub,m3u8}.test.js': ['browserify']
+    'test/**/*.test.js': ['browserify']
   },
   },
 
 
   reporters: ['dots'],
   reporters: ['dots'],

@@ -29,9 +29,11 @@ QUnit.test('the environment is sane', function(assert) {
   assert.strictEqual(typeof Array.isArray, 'function', 'es5 exists');
   assert.strictEqual(typeof Array.isArray, 'function', 'es5 exists');
   assert.strictEqual(typeof sinon, 'object', 'sinon exists');
   assert.strictEqual(typeof sinon, 'object', 'sinon exists');
   assert.strictEqual(typeof videojs, 'function', 'videojs exists');
   assert.strictEqual(typeof videojs, 'function', 'videojs exists');
-  assert.strictEqual(typeof videojs.MediaSource, 'object', 'MediaSource is an object');
+  assert.strictEqual(typeof videojs.MediaSource, 'function', 'MediaSource is an object');
   assert.strictEqual(typeof videojs.URL, 'object', 'URL is an object');
   assert.strictEqual(typeof videojs.URL, 'object', 'URL is an object');
   assert.strictEqual(typeof videojs.Hls, 'object', 'Hls is an object');
   assert.strictEqual(typeof videojs.Hls, 'object', 'Hls is an object');
-  assert.strictEqual(typeof videojs.HlsSourceHandler,'function', 'HlsSourceHandler is a function');
+  assert.strictEqual(typeof videojs.HlsSourceHandler,
+                     'function',
+                     'HlsSourceHandler is a function');
   assert.strictEqual(typeof videojs.HlsHandler, 'function', 'HlsHandler is a function');
   assert.strictEqual(typeof videojs.HlsHandler, 'function', 'HlsHandler is a function');
 });
 });

-import manifests from './test-manifests';
-import expected from './test-expected';
-window.manifests = manifests;
-window.expected = expected;
-