diff --git a/package.json b/package.json index 2c079814d..d4e9d7135 100644 --- a/package.json +++ b/package.json @@ -63,8 +63,6 @@ "rss": "^1.2.2", "source-map-explorer": "^2.5.2", "tempy": "^0.6.0", - "videojs-contrib-ads": "^6.9.0", - "videojs-ima": "^1.11.0", "videojs-logo": "^2.1.4" }, "devDependencies": { diff --git a/ui/component/viewers/videoViewer/internal/plugins/videojs-aniview/plugin.js b/ui/component/viewers/videoViewer/internal/plugins/videojs-aniview/plugin.js deleted file mode 100644 index 0dcdc20be..000000000 --- a/ui/component/viewers/videoViewer/internal/plugins/videojs-aniview/plugin.js +++ /dev/null @@ -1,130 +0,0 @@ -// Created by xander on 6/21/2021 -import videojs from 'video.js'; -import 'videojs-contrib-ads'; -import 'videojs-ima'; -const VERSION = '0.0.1'; - -/* Macro provided by aniview -* const macroUrl = - `https://vast.aniview.com/api/adserver61/vast/` + - `?AV_PUBLISHERID=60afcbc58cfdb065440d2426` + - `&AV_CHANNELID=60b354389c7adb506d0bd9a4` + - `&AV_URL=[URL_MACRO]` + - `&cb=[TIMESTAMP_MACRO]` + - `&AV_WIDTH=[WIDTH_MACRO]` + - `&AV_HEIGHT=[HEIGHT_MACRO]` + - `&AV_SCHAIN=[SCHAIN_MACRO]` + - `&AV_CCPA=[CCPA_MACRO]` + - `&AV_GDPR=[GDPR_MACRO]` + - `&AV_CONSENT=[CONSENT_MACRO]` + - `&skip=true` + - `&skiptimer=5` + - `&logo=false` + - `&usevslot=true` + - `&vastretry=3` + - `&hidecontrols=false`; -* */ - -// TEST PRE-ROLL WITH THIS TAG: -// https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/ad_rule_samples&ciu_szs=300x250&ad_rule=1&impl=s&gdfp_req=1&env=vp&output=vmap&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ar%3Dpreonly&cmsid=496&vid=short_onecue&correlator= - -// Modified to work with IMA -const macroUrl = - `https://vast.aniview.com/api/adserver61/vast/` + - `?AV_PUBLISHERID=60afcbc58cfdb065440d2426` + - `&AV_CHANNELID=60b354389c7adb506d0bd9a4` + - `&AV_URL=[URL]` + - `&cb=[CACHEBUSTING]` + - `&AV_WIDTH=[WIDTH]` + - `&AV_HEIGHT=[HEIGHT]` + - // `&AV_SCHAIN=[SCHAIN_MACRO]` + - // `&AV_CCPA=[CCPA_MACRO]` + - // `&AV_GDPR=[GDPR_MACRO]` + - // `&AV_CONSENT=[CONSENT_MACRO]` + - `&skip=true` + - `&skiptimer=5` + - `&logo=true` + - `&usevslot=true` + - `&vastretry=5` + - `&hidecontrols=false`; - -const defaults = { - adTagUrl: macroUrl, - debug: false, -}; - -const Component = videojs.getComponent('Component'); -const registerPlugin = videojs.registerPlugin || videojs.plugin; - -class AniviewPlugin extends Component { - constructor(player, options) { - super(player, options); - - // Plugin started - if (options.debug) this.log(`Created aniview plugin.`); - - // To help with debugging, we'll add a global vjs object with the video js player - window.aniview = player; - - this.player = player; - - // request ads whenever there's new video content - /* player.on('contentchanged', () => { - // in a real plugin, you might fetch your ad inventory here - player.trigger('adsready'); - }); */ - - // Plugin event listeners - // player.on('readyforpreroll', (event) => this.onReadyForPreroll(event)); - } - - /* onReadyForPreroll(event) { - // send event when ad is playing to remove loading spinner - this.player.one('adplaying', () => { - this.player.trigger('ads-ad-started'); - }); - - // resume content when all your linear ads have finished - this.player.one('adended', () => { - this.player.ads.endLinearAdMode(); - }); - } */ - - log(...args) { - if (this.options_.debug) { - console.log(`Aniview Debug:`, JSON.stringify(args)); - } - } -} - -videojs.registerComponent('aniview', AniviewPlugin); - -const onPlayerReady = (player, options) => { - player.aniview = new AniviewPlugin(player, options); -}; - -/** - * Initialize the plugin. - * - * @function plugin - * @param {Object} [options={}] - */ -const plugin = function (options) { - const google = window.google; - - this.ima({ - // $FlowFixMe - vpaidMode: google.ima.ImaSdkSettings.VpaidMode.INSECURE, - adTagUrl: macroUrl, - }); - - this.ready(() => { - onPlayerReady(this, videojs.mergeOptions(defaults, options)); - }); -}; - -plugin.VERSION = VERSION; - -registerPlugin('aniview', plugin); - -export default plugin; diff --git a/yarn.lock b/yarn.lock index ae81219da..447a0b9fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1293,25 +1293,6 @@ tough-cookie "^2.2.2" tough-cookie-web-storage-store "^1.0.0" -"@hapi/boom@9.x.x": - version "9.1.2" - resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.2.tgz#48bd41d67437164a2d636e3b5bc954f8c8dc5e38" - integrity sha512-uJEJtiNHzKw80JpngDGBCGAmWjBtzxDCz17A9NO2zCi8LLBlb5Frpq4pXwyN+2JQMod4pKz5BALwyneCgDg89Q== - dependencies: - "@hapi/hoek" "9.x.x" - -"@hapi/cryptiles@^5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@hapi/cryptiles/-/cryptiles-5.1.0.tgz#655de4cbbc052c947f696148c83b187fc2be8f43" - integrity sha512-fo9+d1Ba5/FIoMySfMqPBR/7Pa29J2RsiPrl7bkwo5W5o+AN1dAYQRi4SPrPwwVxVGKjgLOEWrsvt1BonJSfLA== - dependencies: - "@hapi/boom" "9.x.x" - -"@hapi/hoek@9.x.x": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.0.tgz#f3933a44e365864f4dad5db94158106d511e8131" - integrity sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug== - "@hot-loader/react-dom@^16.13": version "16.13.0" resolved "https://registry.yarnpkg.com/@hot-loader/react-dom/-/react-dom-16.13.0.tgz#de245b42358110baf80aaf47a0592153d4047997" @@ -3038,11 +3019,6 @@ camelcase@^5.0.0, camelcase@^5.2.0, camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" -can-autoplay@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/can-autoplay/-/can-autoplay-3.0.0.tgz#fc2de8f1d41b36f6d860d9336b66841d30f8b62d" - integrity sha512-qQXGGYPWgF8nPjEt305o3TJ/BkN15l6/wG+VU4N93YYXD3OtYkBBx+l5un7ihIk2UU1OLytAVJjW7ZR39j/CAQ== - caniuse-api@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" @@ -5207,7 +5183,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: assign-symbols "^1.0.0" is-extendable "^1.0.1" -extend@>=3.0.2, extend@^3.0.0, extend@~3.0.1: +extend@^3.0.0, extend@~3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== @@ -7486,11 +7462,6 @@ lodash-es@^4.17.14, lodash-es@^4.2.1: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78" -lodash._reinterpolate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" - integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= - lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" @@ -7540,21 +7511,6 @@ lodash.snakecase@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d" -lodash.template@>=4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" - integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.templatesettings "^4.0.0" - -lodash.templatesettings@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" - integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.toarray@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561" @@ -7567,7 +7523,7 @@ lodash.unset@^4.5.2: version "4.5.2" resolved "https://registry.yarnpkg.com/lodash.unset/-/lodash.unset-4.5.2.tgz#370d1d3e85b72a7e1b0cdf2d272121306f23e4ed" -lodash@>=4.17.19, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.6.1: +lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.6.1: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -12235,14 +12191,6 @@ vfile@^2.0.0: videojs-font "3.2.0" videojs-vtt.js "^0.15.3" -videojs-contrib-ads@^6.6.5, videojs-contrib-ads@^6.9.0: - version "6.9.0" - resolved "https://registry.yarnpkg.com/videojs-contrib-ads/-/videojs-contrib-ads-6.9.0.tgz#c792d6fda77254b277545cc3222352fc653b5833" - integrity sha512-nzKz+jhCGMTYffSNVYrmp9p70s05v6jUMOY3Z7DpVk3iFrWK4Zi/BIkokDWrMoHpKjdmCdKzfJVBT+CrUj6Spw== - dependencies: - global "^4.3.2" - video.js "^6 || ^7" - videojs-contrib-quality-levels@^2.0.9: version "2.0.9" resolved "https://registry.yarnpkg.com/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-2.0.9.tgz#b5d533d5092a6fc7d29eae1b43e4597d89bd527b" @@ -12263,18 +12211,6 @@ videojs-font@3.2.0: resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-3.2.0.tgz#212c9d3f4e4ec3fa7345167d64316add35e92232" integrity sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA== -videojs-ima@^1.11.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/videojs-ima/-/videojs-ima-1.11.0.tgz#26ad385e388c3da72372298d7d755b001d05a91d" - integrity sha512-ZRoWuGyJ75zamwZgpr0i/gZ6q7Evda/Q6R46gpW88WN7u0ORU7apw/lM1MSG4c3YDXW8LDENgzMAvMZUdifWhg== - dependencies: - "@hapi/cryptiles" "^5.1.0" - can-autoplay "^3.0.0" - extend ">=3.0.2" - lodash ">=4.17.19" - lodash.template ">=4.5.0" - videojs-contrib-ads "^6.6.5" - videojs-logo@^2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/videojs-logo/-/videojs-logo-2.1.4.tgz#56675b3f95949910bad3c217835ea57aa6fdf212"