chore: update the aes-decrypter (#71)

videojs · Apr 2, 2018 · 27ed914 · 27ed914
1 parent 5c6868d
commit 27ed914
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
     "dist/"
   ],
   "dependencies": {
-    "aes-decrypter": "1.0.3",
+    "aes-decrypter": "3.0.0",
     "global": "^4.3.0",
     "m3u8-parser": "4.2.0",
     "mpd-parser": "0.6.0",

diff --git a/src/decrypter-worker.js b/src/decrypter-worker.js
@@ -1,9 +1,7 @@
 import window from 'global/window';
-import aesDecrypter from 'aes-decrypter';
+import { Decrypter } from 'aes-decrypter';
 import { createTransferableMessage } from './bin-utils';
 
-const { Decrypter } = aesDecrypter;
-
 /**
  * Our web worker interface so that things can talk to aes-decrypter
  * that will be running in a web worker. the scope is passed to this by

diff --git a/src/videojs-http-streaming.js b/src/videojs-http-streaming.js
@@ -8,7 +8,7 @@ import document from 'global/document';
 import PlaylistLoader from './playlist-loader';
 import Playlist from './playlist';
 import xhrFactory from './xhr';
-import aesDecrypter from 'aes-decrypter';
+import { Decrypter, AsyncStream, decrypt } from 'aes-decrypter';
 import * as utils from './bin-utils';
 import { timeRangesToArray } from './ranges';
 import { MediaSource, URL } from './mse/index';
@@ -26,8 +26,6 @@ import {
 } from './playlist-selectors.js';
 import { version } from '../package.json';
 
-const { Decrypter, AsyncStream, decrypt } = aesDecrypter;
-
 const Hls = {
   PlaylistLoader,
   Playlist,

diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -16,7 +16,7 @@ module.exports = function(config) {
       clearContext: false,
       qunit: {
         showUI: true,
-        testTimeout: 5000
+        testTimeout: 30000
       }
     },
     files: [