Merge pull request #540 from BrandonOCasey/browserify-p3

browserify-p3: decrypter

@@ -47,13 +47,11 @@
 
   <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/pkcs7/dist/pkcs7.unpad.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="/src/playlist.js"></script>
   <script src="/src/playlist-loader.js"></script>
-  <script src="/src/decrypter.js"></script>
   <script src="/src/bin-utils.js"></script>
   <script>
     (function(window, videojs) {

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

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

 import m3u8 from './m3u8';
 import Stream from './stream';
 import videojs from 'video.js';
+import {Decrypter, decrypt, AsyncStream} from './decrypter';
 
 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;

-(function(window, videojs, unpad, undefined) {
-  'use strict';
-  /*
-    ======== A Handy Little QUnit Reference ========
-    http://api.qunitjs.com/
-
-    Test methods:
-    module(name, {[setup][ ,teardown]})
-    test(name, callback)
-    expect(numberOfAssertions)
-    stop(increment)
-    start(decrement)
-    Test assertions:
-    ok(value, [message])
-    equal(actual, expected, [message])
-    notEqual(actual, expected, [message])
-    deepEqual(actual, expected, [message])
-    notDeepEqual(actual, expected, [message])
-    strictEqual(actual, expected, [message])
-    notStrictEqual(actual, expected, [message])
-    throws(block, [expected], [message])
-  */
-
 // see docs/hlse.md for instructions on how test data was generated
+import QUnit from 'qunit';
+import {unpad} from 'pkcs7';
+import sinon from 'sinon';
+import {decrypt, Decrypter, AsyncStream} from '../src/decrypter';
 
-var stringFromBytes = function(bytes) {
-  var result = '', i;
+// see docs/hlse.md for instructions on how test data was generated
+const stringFromBytes = function(bytes) {
+  let result = '';
 
-  for (i = 0; i < bytes.length; i++) {
+  for (let i = 0; i < bytes.length; i++) {
     result += String.fromCharCode(bytes[i]);
   }
   return result;
 };
 
 QUnit.module('Decryption');
-
-test('decrypts a single AES-128 with PKCS7 block', function() {
-  var
-    key =  new Uint32Array([0, 0, 0, 0]),
-    initVector = key,
+QUnit.test('decrypts a single AES-128 with PKCS7 block', function() {
+  let key = new Uint32Array([0, 0, 0, 0]);
+  let initVector = key;
   // the string "howdy folks" encrypted
-    encrypted = new Uint8Array([
+  let encrypted = new Uint8Array([
     0xce, 0x90, 0x97, 0xd0,
     0x08, 0x46, 0x4d, 0x18,
     0x4f, 0xae, 0x01, 0x1c,
-      0x82, 0xa8, 0xf0, 0x67]);
+    0x82, 0xa8, 0xf0, 0x67
+  ]);
 
-  deepEqual('howdy folks',
-            stringFromBytes(unpad(videojs.Hls.decrypt(encrypted, key, initVector))),
-            'decrypted with a byte array key');
+  QUnit.deepEqual('howdy folks',
+                  stringFromBytes(unpad(decrypt(encrypted, key, initVector))),
+                  'decrypted with a byte array key'
+  );
 });
 
-test('decrypts multiple AES-128 blocks with CBC', function() {
-  var
-    key = new Uint32Array([0, 0, 0, 0]),
-    initVector = key,
+QUnit.test('decrypts multiple AES-128 blocks with CBC', function() {
+  let key = new Uint32Array([0, 0, 0, 0]);
+  let initVector = key;
   // the string "0123456789abcdef01234" encrypted
-    encrypted = new Uint8Array([
+  let encrypted = new Uint8Array([
+    0x14, 0xf5, 0xfe, 0x74,
+    0x69, 0x66, 0xf2, 0x92,
+    0x65, 0x1c, 0x22, 0x88,
+    0xbb, 0xff, 0x46, 0x09,
+
+    0x0b, 0xde, 0x5e, 0x71,
+    0x77, 0x87, 0xeb, 0x84,
+    0xa9, 0x54, 0xc2, 0x45,
+    0xe9, 0x4e, 0x29, 0xb3
+  ]);
+
+  QUnit.deepEqual('0123456789abcdef01234',
+                  stringFromBytes(unpad(decrypt(encrypted, key, initVector))),
+                  'decrypted multiple blocks');
+});
+
+QUnit.test(
+'verify that the deepcopy works by doing two decrypts in the same test',
+function() {
+  let key = new Uint32Array([0, 0, 0, 0]);
+  let initVector = key;
+  // the string "howdy folks" encrypted
+  let pkcs7Block = new Uint8Array([
+    0xce, 0x90, 0x97, 0xd0,
+    0x08, 0x46, 0x4d, 0x18,
+    0x4f, 0xae, 0x01, 0x1c,
+    0x82, 0xa8, 0xf0, 0x67
+  ]);
+
+  QUnit.deepEqual('howdy folks',
+                  stringFromBytes(unpad(decrypt(pkcs7Block, key, initVector))),
+                  'decrypted with a byte array key'
+  );
+
+// the string "0123456789abcdef01234" encrypted
+  let cbcBlocks = new Uint8Array([
     0x14, 0xf5, 0xfe, 0x74,
     0x69, 0x66, 0xf2, 0x92,
     0x65, 0x1c, 0x22, 0x88,
@@ -67,38 +84,40 @@ test('decrypts multiple AES-128 blocks with CBC', function() {
     0xe9, 0x4e, 0x29, 0xb3
   ]);
 
-  deepEqual('0123456789abcdef01234',
-            stringFromBytes(unpad(videojs.Hls.decrypt(encrypted, key, initVector))),
+  QUnit.deepEqual('0123456789abcdef01234',
+                  stringFromBytes(unpad(decrypt(cbcBlocks, key, initVector))),
                   'decrypted multiple blocks');
+
 });
 
-var clock;
 
 QUnit.module('Incremental Processing', {
-  setup: function() {
-    clock = sinon.useFakeTimers();
+  beforeEach() {
+    this.clock = sinon.useFakeTimers();
   },
-  teardown: function() {
-    clock.restore();
+  afterEach() {
+    this.clock.restore();
   }
 });
 
-test('executes a callback after a timeout', function() {
-  var asyncStream = new videojs.Hls.AsyncStream(),
-      calls = '';
+QUnit.test('executes a callback after a timeout', function() {
+  let asyncStream = new AsyncStream();
+  let calls = '';
+
   asyncStream.push(function() {
     calls += 'a';
   });
 
-  clock.tick(asyncStream.delay);
-  equal(calls, 'a', 'invoked the callback once');
-  clock.tick(asyncStream.delay);
-  equal(calls, 'a', 'only invoked the callback once');
+  this.clock.tick(asyncStream.delay);
+  QUnit.equal(calls, 'a', 'invoked the callback once');
+  this.clock.tick(asyncStream.delay);
+  QUnit.equal(calls, 'a', 'only invoked the callback once');
 });
 
-test('executes callback in series', function() {
-  var asyncStream = new videojs.Hls.AsyncStream(),
-      calls = '';
+QUnit.test('executes callback in series', function() {
+  let asyncStream = new AsyncStream();
+  let calls = '';
+
   asyncStream.push(function() {
     calls += 'a';
   });
@@ -106,62 +125,62 @@ test('executes callback in series', function() {
     calls += 'b';
   });
 
-  clock.tick(asyncStream.delay);
-  equal(calls, 'a', 'invoked the first callback');
-  clock.tick(asyncStream.delay);
-  equal(calls, 'ab', 'invoked the second');
+  this.clock.tick(asyncStream.delay);
+  QUnit.equal(calls, 'a', 'invoked the first callback');
+  this.clock.tick(asyncStream.delay);
+  QUnit.equal(calls, 'ab', 'invoked the second');
 });
 
-var decrypter;
-
 QUnit.module('Incremental Decryption', {
-  setup: function() {
-    clock = sinon.useFakeTimers();
+  beforeEach() {
+    this.clock = sinon.useFakeTimers();
   },
-  teardown: function() {
-    clock.restore();
+  afterEach() {
+    this.clock.restore();
   }
 });
 
-test('asynchronously decrypts a 4-word block', function() {
-  var
-    key =  new Uint32Array([0, 0, 0, 0]),
-    initVector = key,
+QUnit.test('asynchronously decrypts a 4-word block', function() {
+  let key = new Uint32Array([0, 0, 0, 0]);
+  let initVector = key;
   // the string "howdy folks" encrypted
-    encrypted = new Uint8Array([
-      0xce, 0x90, 0x97, 0xd0,
+  let encrypted = new Uint8Array([0xce, 0x90, 0x97, 0xd0,
                                   0x08, 0x46, 0x4d, 0x18,
                                   0x4f, 0xae, 0x01, 0x1c,
-      0x82, 0xa8, 0xf0, 0x67]),
-    decrypted;
-
-  decrypter = new videojs.Hls.Decrypter(encrypted, key, initVector, function(error, result) {
+                                  0x82, 0xa8, 0xf0, 0x67]);
+  let decrypted;
+  let decrypter = new Decrypter(encrypted,
+                                key,
+                                initVector,
+                                function(error, result) {
+                                  if (error) {
+                                    throw new Error(error);
+                                  }
                                   decrypted = result;
                                 });
-  ok(!decrypted, 'asynchronously decrypts');
 
-  clock.tick(decrypter.asyncStream_.delay * 2);
+  QUnit.ok(!decrypted, 'asynchronously decrypts');
+  this.clock.tick(decrypter.asyncStream_.delay * 2);
 
-  ok(decrypted, 'completed decryption');
-  deepEqual('howdy folks',
+  QUnit.ok(decrypted, 'completed decryption');
+  QUnit.deepEqual('howdy folks',
                   stringFromBytes(decrypted),
                   'decrypts and unpads the result');
 });
 
-test('breaks up input greater than the step value', function() {
-  var encrypted = new Int32Array(videojs.Hls.Decrypter.STEP + 4),
-      done = false,
-      decrypter = new videojs.Hls.Decrypter(encrypted,
+QUnit.test('breaks up input greater than the step value', function() {
+  let encrypted = new Int32Array(Decrypter.STEP + 4);
+  let done = false;
+  let decrypter = new Decrypter(encrypted,
                                 new Uint32Array(4),
                                 new Uint32Array(4),
                                 function() {
                                   done = true;
                                 });
-  clock.tick(decrypter.asyncStream_.delay * 2);
-  ok(!done, 'not finished after two ticks');
 
-  clock.tick(decrypter.asyncStream_.delay);
-  ok(done, 'finished after the last chunk is decrypted');
-});
+  this.clock.tick(decrypter.asyncStream_.delay * 2);
+  QUnit.ok(!done, 'not finished after two ticks');
 
-})(window, window.videojs, window.pkcs7.unpad);
+  this.clock.tick(decrypter.asyncStream_.delay);
+  QUnit.ok(done, 'finished after the last chunk is decrypted');
+});

@@ -12,7 +12,6 @@
   <!-- NOTE in order for test to pass we require sinon 1.10.2 exactly -->
   <script src="/node_modules/sinon/pkg/sinon.js"></script>
   <script src="/node_modules/qunitjs/qunit/qunit.js"></script>
-  <script src="/node_modules/pkcs7/dist/pkcs7.unpad.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>
 
@@ -21,14 +20,12 @@
   <script src="/dist/videojs-contrib-hls.js"></script>
   <script src="/src/playlist.js"></script>
   <script src="/src/playlist-loader.js"></script>
-  <script src="/src/decrypter.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="/test/playlist.test.js"></script>
   <script src="/test/playlist-loader.test.js"></script>
-  <script src="/test/decrypter.test.js"></script>
 
 </body>
 </html>

@@ -12,7 +12,6 @@ var DEFAULTS = {
     'node_modules/video.js/dist/video-js.css',
 
     // REMOVE ME WHEN BROWSERIFIED
-    'node_modules/pkcs7/dist/pkcs7.unpad.js',
     'node_modules/videojs-contrib-media-sources/src/videojs-media-sources.js',
 
     // these two stub old functionality
@@ -22,7 +21,6 @@ var DEFAULTS = {
 
     'src/playlist.js',
     'src/playlist-loader.js',
-    'src/decrypter.js',
     'src/bin-utils.js',
 
     'test/stub.test.js',
@@ -47,7 +45,7 @@ var DEFAULTS = {
   ],
 
   preprocessors: {
-    'test/{stub,m3u8}.test.js': ['browserify']
+    'test/{decrypter,stub,m3u8}.test.js': ['browserify']
   },
 
   reporters: ['dots'],