From e33ba38f7b1f359de9478ccdd6118831ec342d30 Mon Sep 17 00:00:00 2001 From: jforbes Date: Thu, 29 Mar 2018 17:29:17 -0400 Subject: [PATCH 1/3] chore: update the aes-decrypter --- package-lock.json | 27 ++++++++++++++++++++------- package.json | 2 +- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 842ec324c..9b2808686 100644 --- a/package-lock.json +++ b/package-lock.json @@ -73,11 +73,13 @@ "dev": true }, "aes-decrypter": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-1.0.3.tgz", - "integrity": "sha1-nAa4pUNaWtCduTP4oBSvzxhMw04=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.0.0.tgz", + "integrity": "sha1-eEihwUW5/b9Xrj4rWxvHzwZEqPs=", "requires": { - "pkcs7": "0.2.3" + "commander": "2.11.0", + "global": "4.3.2", + "pkcs7": "1.0.2" } }, "after": { @@ -1378,6 +1380,17 @@ "dot-prop": "3.0.0" } }, + "commander": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" + }, + "commondir": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz", + "integrity": "sha1-ifAP3NUbUZxXhzP+xWPmptp/W+I=", + "dev": true + }, "component-bind": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", @@ -6910,9 +6923,9 @@ } }, "pkcs7": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/pkcs7/-/pkcs7-0.2.3.tgz", - "integrity": "sha1-ItYGZtAQZcXyRDkJjkpIMEUic74=" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pkcs7/-/pkcs7-1.0.2.tgz", + "integrity": "sha1-ttulJ1KMKUK/wSLOLa/NteWQdOc=" }, "pkg-config": { "version": "1.1.1", diff --git a/package.json b/package.json index a81070013..68620aa77 100644 --- 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", From 1e522ed8d48b03643747ee98c736814e6d987824 Mon Sep 17 00:00:00 2001 From: jforbes Date: Mon, 2 Apr 2018 14:58:38 -0400 Subject: [PATCH 2/3] update import --- package-lock.json | 19 +++---------------- src/decrypter-worker.js | 4 +--- src/videojs-http-streaming.js | 4 +--- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9b2808686..029ecf9ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1365,10 +1365,9 @@ } }, "commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", - "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", - "dev": true + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" }, "compare-func": { "version": "1.3.2", @@ -1380,17 +1379,6 @@ "dot-prop": "3.0.0" } }, - "commander": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" - }, - "commondir": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz", - "integrity": "sha1-ifAP3NUbUZxXhzP+xWPmptp/W+I=", - "dev": true - }, "component-bind": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", @@ -8332,7 +8320,6 @@ "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", "dev": true, "requires": { - "commander": "2.13.0", "source-map": "0.6.1" }, "dependencies": { diff --git a/src/decrypter-worker.js b/src/decrypter-worker.js index 21756a270..a22d202eb 100644 --- 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 index e1c2e8b1e..620305e65 100644 --- 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, From 5607a5fa16755e1fc39ef730571a275a53a5c847 Mon Sep 17 00:00:00 2001 From: jforbes Date: Mon, 2 Apr 2018 16:55:06 -0400 Subject: [PATCH 3/3] bump test timeout --- test/karma.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/karma.conf.js b/test/karma.conf.js index 8e6f44d3e..63edf81f9 100644 --- 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: [