From 92a3003b4c884442d8bc6e7894e090ebce14858e Mon Sep 17 00:00:00 2001 From: wseymour15 Date: Mon, 13 Nov 2023 16:48:34 -0600 Subject: [PATCH] feat: public function for updating VHS options --- src/videojs-http-streaming.js | 14 +++++++++++++- test/videojs-http-streaming.test.js | 23 +++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/videojs-http-streaming.js b/src/videojs-http-streaming.js index a1f62bc20..799e62a2d 100644 --- a/src/videojs-http-streaming.js +++ b/src/videojs-http-streaming.js @@ -678,7 +678,15 @@ class VhsHandler extends Component { this.on(this.tech_, 'play', this.play); } - setOptions_() { + /** + * Set VHS options based on options from configuration, as well as partial + * options to be passed at a later time. + * + * @param {Object} options A partial chunk of config options + */ + setOptions_(options = {}) { + this.options_ = merge(this.options_, options); + // defaults this.options_.withCredentials = this.options_.withCredentials || false; this.options_.limitRenditionByPlayerDimensions = this.options_.limitRenditionByPlayerDimensions === false ? false : true; @@ -756,6 +764,10 @@ class VhsHandler extends Component { this.limitRenditionByPlayerDimensions = this.options_.limitRenditionByPlayerDimensions; this.useDevicePixelRatio = this.options_.useDevicePixelRatio; } + // alias for public method to set options + setOptions(options = {}) { + this.setOptions_(options); + } /** * called when player.src gets called, handle a new source * diff --git a/test/videojs-http-streaming.test.js b/test/videojs-http-streaming.test.js index 7be0ad38e..1c5ae92f1 100644 --- a/test/videojs-http-streaming.test.js +++ b/test/videojs-http-streaming.test.js @@ -257,6 +257,29 @@ QUnit.test('VhsHandler is referenced by player.tech().vhs', function(assert) { ); }); +QUnit.test.only('options are updated when setOptions is called', function(assert) { + this.player.src({ + src: 'manifest/playlist.m3u8', + type: 'application/vnd.apple.mpegurl' + }); + this.clock.tick(1); + + const vhs = this.player.tech().vhs; + + assert.equal(this.env.log.warn.calls, 1, 'warning logged'); + assert.equal( + this.env.log.warn.args[0][0], + 'Using the tech directly can be dangerous. I hope you know what you\'re doing.\n' + + 'See https://github.com/videojs/video.js/issues/2617 for more info.\n', + 'logged warning' + ); + assert.equal(vhs.options_.withCredentials, false); + + vhs.setOptions({ withCredentials: true }); + + assert.equal(vhs.options_.withCredentials, true, 'options are updated'); +}); + QUnit.test('starts playing if autoplay is specified', function(assert) { this.player.autoplay(true); this.player.src({