From a0f60a6e47dd5254107effb8cf975c29fa9bbd21 Mon Sep 17 00:00:00 2001 From: Joe Turki Date: Tue, 11 Feb 2025 05:29:54 -0600 Subject: [PATCH 1/4] chore(deps): relax video.js version constraint from 8.7.0 to ^8.20.0 and bump minor version --- package-lock.json | 188 ++++++++++++---------------------------------- package.json | 2 +- 2 files changed, 51 insertions(+), 139 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7cdde63..92cd86b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "eslint-config-videojs": "^6.1.0", "eslint-plugin-jsdoc": "^46.9.0", "global": "^4.4.0", - "video.js": "8.7.0" + "video.js": "^8.20.0" }, "devDependencies": { "@commitlint/cli": "^19.5.0", @@ -4160,17 +4160,18 @@ } }, "node_modules/@videojs/http-streaming": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-3.8.0.tgz", - "integrity": "sha512-sZ5xM6XQdAPSxXKm767J28OLCJKY5mMxu7LVAqlyEJommECylm5D/RtzqAyIWM6u4V85qsJR4Zn9k6yzAhEDOw==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-3.17.0.tgz", + "integrity": "sha512-Ch1P3tvvIEezeZXyK11UfWgp4cWKX4vIhZ30baN/lRinqdbakZ5hiAI3pGjRy3d+q/Epyc8Csz5xMdKNNGYpcw==", + "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.12.5", - "@videojs/vhs-utils": "4.0.0", - "aes-decrypter": "4.0.1", + "@videojs/vhs-utils": "^4.1.1", + "aes-decrypter": "^4.0.2", "global": "^4.4.0", - "m3u8-parser": "^7.1.0", - "mpd-parser": "^1.2.2", - "mux.js": "7.0.2", + "m3u8-parser": "^7.2.0", + "mpd-parser": "^1.3.1", + "mux.js": "7.1.0", "video.js": "^7 || ^8" }, "engines": { @@ -4178,48 +4179,7 @@ "npm": ">=5" }, "peerDependencies": { - "video.js": "^7 || ^8" - } - }, - "node_modules/@videojs/http-streaming/node_modules/aes-decrypter": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-4.0.1.tgz", - "integrity": "sha512-H1nh/P9VZXUf17AA5NQfJML88CFjVBDuGkp5zDHa7oEhYN9TTpNLJknRY1ie0iSKWlDf6JRnJKaZVDSQdPy6Cg==", - "dependencies": { - "@babel/runtime": "^7.12.5", - "@videojs/vhs-utils": "^3.0.5", - "global": "^4.4.0", - "pkcs7": "^1.0.4" - } - }, - "node_modules/@videojs/http-streaming/node_modules/aes-decrypter/node_modules/@videojs/vhs-utils": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz", - "integrity": "sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==", - "dependencies": { - "@babel/runtime": "^7.12.5", - "global": "^4.4.0", - "url-toolkit": "^2.2.1" - }, - "engines": { - "node": ">=8", - "npm": ">=5" - } - }, - "node_modules/@videojs/http-streaming/node_modules/mux.js": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-7.0.2.tgz", - "integrity": "sha512-CM6+QuyDbc0qW1OfEjkd2+jVKzTXF+z5VOKH0eZxtZtnrG/ilkW/U7l7IXGtBNLASF9sKZMcK1u669cq50Qq0A==", - "dependencies": { - "@babel/runtime": "^7.11.2", - "global": "^4.4.0" - }, - "bin": { - "muxjs-transmux": "bin/transmux.js" - }, - "engines": { - "node": ">=8", - "npm": ">=5" + "video.js": "^8.19.0" } }, "node_modules/@videojs/update-changelog": { @@ -4242,13 +4202,13 @@ } }, "node_modules/@videojs/vhs-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-4.0.0.tgz", - "integrity": "sha512-xJp7Yd4jMLwje2vHCUmi8MOUU76nxiwII3z4Eg3Ucb+6rrkFVGosrXlMgGnaLjq724j3wzNElRZ71D/CKrTtxg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-4.1.1.tgz", + "integrity": "sha512-5iLX6sR2ownbv4Mtejw6Ax+naosGvoT9kY+gcuHzANyUZZ+4NpeNdKMUhb6ag0acYej1Y7cmr/F2+4PrggMiVA==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.12.5", - "global": "^4.4.0", - "url-toolkit": "^2.2.1" + "global": "^4.4.0" }, "engines": { "node": ">=8", @@ -4256,9 +4216,10 @@ } }, "node_modules/@videojs/xhr": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@videojs/xhr/-/xhr-2.6.0.tgz", - "integrity": "sha512-7J361GiN1tXpm+gd0xz2QWr3xNWBE+rytvo8J3KuggFaLg+U37gZQ2BuPLcnkfGffy2e+ozY70RHC8jt7zjA6Q==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@videojs/xhr/-/xhr-2.7.0.tgz", + "integrity": "sha512-giab+EVRanChIupZK7gXjHy90y3nncA2phIOyG3Ne5fvpiMJzvqYwiTOnEVW2S4CoYcuKJkomat7bMXA/UoUZQ==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.5.5", "global": "~4.4.0", @@ -4269,6 +4230,7 @@ "version": "0.8.10", "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==", + "license": "MIT", "engines": { "node": ">=10.0.0" } @@ -4315,6 +4277,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-4.0.2.tgz", "integrity": "sha512-lc+/9s6iJvuaRe5qDlMTpCFjnwpkeOXp8qP3oiZ5jsj1MRg+SBVUmmICrhxHvc8OELSmc+fEyyxAuppY6hrWzw==", + "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.12.5", "@videojs/vhs-utils": "^4.1.1", @@ -4322,19 +4285,6 @@ "pkcs7": "^1.0.4" } }, - "node_modules/aes-decrypter/node_modules/@videojs/vhs-utils": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-4.1.1.tgz", - "integrity": "sha512-5iLX6sR2ownbv4Mtejw6Ax+naosGvoT9kY+gcuHzANyUZZ+4NpeNdKMUhb6ag0acYej1Y7cmr/F2+4PrggMiVA==", - "dependencies": { - "@babel/runtime": "^7.12.5", - "global": "^4.4.0" - }, - "engines": { - "node": ">=8", - "npm": ">=5" - } - }, "node_modules/agent-base": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", @@ -9308,11 +9258,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/individual": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/individual/-/individual-2.0.0.tgz", - "integrity": "sha512-pWt8hBCqJsUWI/HtcfWod7+N9SgAqyPEaF7JQjwzjn5vGrpg6aQ5qeAFQ7dx//UH4J1O+7xqew+gCeeFt6xN/g==" - }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -9729,7 +9674,8 @@ "node_modules/is-function": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz", - "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==" + "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==", + "license": "MIT" }, "node_modules/is-generator-function": { "version": "1.1.0", @@ -10647,11 +10593,6 @@ "node": ">=10" } }, - "node_modules/keycode": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz", - "integrity": "sha512-ps3I9jAdNtRpJrbBvQjpzyFbss/skHqzS+eu4RxKLaEAtFqkjZaB6TZMSivPbLxf4K7VI4SjR0P5mRCX5+Q25A==" - }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -11511,25 +11452,13 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-7.2.0.tgz", "integrity": "sha512-CRatFqpjVtMiMaKXxNvuI3I++vUumIXVVT/JpCpdU/FynV/ceVw1qpPyyBNindL+JlPMSesx+WX1QJaZEJSaMQ==", + "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.12.5", "@videojs/vhs-utils": "^4.1.1", "global": "^4.4.0" } }, - "node_modules/m3u8-parser/node_modules/@videojs/vhs-utils": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-4.1.1.tgz", - "integrity": "sha512-5iLX6sR2ownbv4Mtejw6Ax+naosGvoT9kY+gcuHzANyUZZ+4NpeNdKMUhb6ag0acYej1Y7cmr/F2+4PrggMiVA==", - "dependencies": { - "@babel/runtime": "^7.12.5", - "global": "^4.4.0" - }, - "engines": { - "node": ">=8", - "npm": ">=5" - } - }, "node_modules/magic-string": { "version": "0.30.17", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", @@ -12369,6 +12298,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-1.3.1.tgz", "integrity": "sha512-1FuyEWI5k2HcmhS1HkKnUAQV7yFPfXPht2DnRRGtoiiAAW+ESTbtEXIDpRkwdU+XyrQuwrIym7UkoPKsZ0SyFw==", + "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.12.5", "@videojs/vhs-utils": "^4.0.0", @@ -12394,6 +12324,7 @@ "version": "7.1.0", "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-7.1.0.tgz", "integrity": "sha512-NTxawK/BBELJrYsZThEulyUMDVlLizKdxyAsMuzoCD1eFj97BVaA8D/CvKsKu6FOLYkFojN5CbM9h++ZTZtknA==", + "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", "global": "^4.4.0" @@ -16075,6 +16006,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/pkcs7/-/pkcs7-1.0.4.tgz", "integrity": "sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==", + "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.5.5" }, @@ -17810,14 +17742,6 @@ "queue-microtask": "^1.2.2" } }, - "node_modules/rust-result": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/rust-result/-/rust-result-1.0.0.tgz", - "integrity": "sha512-6cJzSBU+J/RJCF063onnQf0cDUOHs9uZI1oroSGnHOph+CQTIJ5Pp2hK5kEQq1+7yE/EEWfulSNXAQ2jikPthA==", - "dependencies": { - "individual": "^2.0.0" - } - }, "node_modules/rxjs": { "version": "7.8.1", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", @@ -17866,14 +17790,6 @@ } ] }, - "node_modules/safe-json-parse": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-4.0.0.tgz", - "integrity": "sha512-RjZPPHugjK0TOzFrLZ8inw44s9bKox99/0AZW9o/BEQVrJfhI+fIHMErnPyRa89/yRXUUr93q+tiN6zhoVV4wQ==", - "dependencies": { - "rust-result": "^1.0.0" - } - }, "node_modules/safe-push-apply": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", @@ -20166,11 +20082,6 @@ "node": "^12.20.0 || ^14.13.1 || >=16.0.0" } }, - "node_modules/url-toolkit": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.5.tgz", - "integrity": "sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg==" - }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -20262,45 +20173,46 @@ } }, "node_modules/video.js": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/video.js/-/video.js-8.7.0.tgz", - "integrity": "sha512-QAYQKsqyO/jxDed1AYdD4cEYQIuxGuqzMmfyyL3ZTgbCjo+f/XF+1Hw9aC1SZN6Wx3qDVLWKF7oB22uWST0N9w==", + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/video.js/-/video.js-8.20.0.tgz", + "integrity": "sha512-VyXY/DbtfaI22gpWJdo8bmTcpPRfKg0SeQJBusRdIJF1RMI+er1BHpRreg67s5Qfd9ZeSbfKShUOwaxRft/tBw==", + "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.12.5", - "@videojs/http-streaming": "3.8.0", - "@videojs/vhs-utils": "^4.0.0", - "@videojs/xhr": "2.6.0", - "aes-decrypter": "^4.0.1", + "@videojs/http-streaming": "^3.16.0", + "@videojs/vhs-utils": "^4.1.1", + "@videojs/xhr": "2.7.0", + "aes-decrypter": "^4.0.2", "global": "4.4.0", - "keycode": "2.2.0", - "m3u8-parser": "^7.1.0", - "mpd-parser": "^1.2.2", + "m3u8-parser": "^7.2.0", + "mpd-parser": "^1.3.1", "mux.js": "^7.0.1", - "safe-json-parse": "4.0.0", - "videojs-contrib-quality-levels": "4.0.0", - "videojs-font": "4.1.0", + "videojs-contrib-quality-levels": "4.1.0", + "videojs-font": "4.2.0", "videojs-vtt.js": "0.15.5" } }, "node_modules/videojs-contrib-quality-levels": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-4.0.0.tgz", - "integrity": "sha512-u5rmd8BjLwANp7XwuQ0Q/me34bMe6zg9PQdHfTS7aXgiVRbNTb4djcmfG7aeSrkpZjg+XCLezFNenlJaCjBHKw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-4.1.0.tgz", + "integrity": "sha512-TfrXJJg1Bv4t6TOCMEVMwF/CoS8iENYsWNKip8zfhB5kTcegiFYezEA0eHAJPU64ZC8NQbxQgOwAsYU8VXbOWA==", + "license": "Apache-2.0", "dependencies": { "global": "^4.4.0" }, "engines": { - "node": ">=14", - "npm": ">=6" + "node": ">=16", + "npm": ">=8" }, "peerDependencies": { "video.js": "^8" } }, "node_modules/videojs-font": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-4.1.0.tgz", - "integrity": "sha512-X1LuPfLZPisPLrANIAKCknZbZu5obVM/ylfd1CN+SsCmPZQ3UMDPcvLTpPBJxcBuTpHQq2MO1QCFt7p8spnZ/w==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-4.2.0.tgz", + "integrity": "sha512-YPq+wiKoGy2/M7ccjmlvwi58z2xsykkkfNMyIg4xb7EZQQNwB71hcSsB3o75CqQV7/y5lXkXhI/rsGAS7jfEmQ==", + "license": "Apache-2.0" }, "node_modules/videojs-generate-karma-config": { "version": "8.1.0", diff --git a/package.json b/package.json index 08b579c..1de8ce5 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "eslint-config-videojs": "^6.1.0", "eslint-plugin-jsdoc": "^46.9.0", "global": "^4.4.0", - "video.js": "8.7.0" + "video.js": "^8.20.0" }, "devDependencies": { "@commitlint/cli": "^19.5.0", From e4175fdcecfee47ee4050be9694903e27f84d3f3 Mon Sep 17 00:00:00 2001 From: Joe Turki Date: Tue, 11 Feb 2025 10:14:45 -0600 Subject: [PATCH 2/4] chore(examples): update video.js to 8.20.0, update code --- README.md | 2 +- examples/player.html | 38 ++++++++++++++++++------------------- examples/simple-player.html | 10 +++++----- examples/webrtc-player.html | 20 +++++++++---------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index d726a90..f01ddc6 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Include [@ceeblue/videojs-plugins][npm-url] in your HTML code as usual with the Example: ```html - + ``` diff --git a/examples/player.html b/examples/player.html index 5a3d01f..cc34f1f 100644 --- a/examples/player.html +++ b/examples/player.html @@ -1,5 +1,5 @@ - @@ -19,9 +19,9 @@ integrity="sha384-TbilV5Lbhlwdyc4RuIV/JhD8NR+BfMrvz4BL5QFa2we1hQu6wvREr3v6XSRfCTRp" rel="stylesheet"> - + - + + [v-cloak] { + display: none; + } + -
-
-
- CEEBLUE Media Services -
-
- -
-
+
+
+
+ CEEBLUE Media Services +
+
+ +
+
-
-
- -
+
+
+ +
-
-
- -
-
+
+
+ +
+
-
-
-
Timed Metadatas
-
-
{{ dataMessages }}
-
+
+
+
Timed Metadatas
+
+
{{ dataMessages }}
+
-
-
- -
-
- -
-
- -
-
+
+
+ +
+
+ +
+
+ +
+
-
-
- -
+
+
+ +
-
- -
-
+
+ +
+
-
- -
-
-
+
+ +
+
+
- + playButtonCaption() { + if (this.isStopped()) + return 'Play'; + if (this.isStarting()) + return 'Starting... '; + if (this.isPlaying()) + return 'Stop'; + }, + isPlaying() { + return this.playState === PlayState.PLAYING; + }, + isStarting() { + return this.playState === PlayState.STARTING; + }, + isStopped() { + return this.playState === PlayState.STOPPED; + } + }, + }).mount('#main'); + diff --git a/examples/simple-player.html b/examples/simple-player.html index e2c60e7..6b79dd6 100644 --- a/examples/simple-player.html +++ b/examples/simple-player.html @@ -6,26 +6,26 @@ - - - + + + -
+
-
- - - - -
+ + + +
-
- + // Initialize the video player + const player = videojs("video-player"); + player.qualityButton(); +