X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fassets%2Fplayer%2Fpeertube-videojs-plugin.ts;h=ddb73d074d7085d764321f21b564ea7a36de2790;hb=f37bad639b36d35c29a464dc52123a1e7c9cd28a;hp=4898c1efe29dcac6d32da4cb3affb6fb5af1c221;hpb=ed9f9f5fb04437b8dcf164fd0ae9c29b90826096;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/assets/player/peertube-videojs-plugin.ts b/client/src/assets/player/peertube-videojs-plugin.ts index 4898c1efe..ddb73d074 100644 --- a/client/src/assets/player/peertube-videojs-plugin.ts +++ b/client/src/assets/player/peertube-videojs-plugin.ts @@ -1,349 +1,495 @@ -// Big thanks to: https://github.com/kmoskwiak/videojs-resolution-switcher - -import videojs, { Player } from 'video.js' +import * as videojs from 'video.js' import * as WebTorrent from 'webtorrent' -import { VideoFile } from '../../../../shared' - +import { VideoFile } from '../../../../shared/models/videos/video.model' import { renderVideo } from './video-renderer' - -// https://github.com/danrevah/ngx-pipes/blob/master/src/pipes/math/bytes.ts -// Don't import all Angular stuff, just copy the code with shame -const dictionaryBytes: Array<{max: number, type: string}> = [ - { max: 1024, type: 'B' }, - { max: 1048576, type: 'KB' }, - { max: 1073741824, type: 'MB' }, - { max: 1.0995116e12, type: 'GB' } -] -function bytes (value) { - const format = dictionaryBytes.find(d => value < d.max) || dictionaryBytes[dictionaryBytes.length - 1] - const calc = Math.floor(value / (format.max / 1024)).toString() - - return [ calc, format.type ] -} - -// videojs typings don't have some method we need -const videojsUntyped = videojs as any -const webtorrent = new WebTorrent({ dht: false }) - -const MenuItem = videojsUntyped.getComponent('MenuItem') -const ResolutionMenuItem = videojsUntyped.extend(MenuItem, { - constructor: function (player: Player, options) { - options.selectable = true - MenuItem.call(this, player, options) - - const currentResolution = this.player_.getCurrentResolution() - this.selected(this.options_.id === currentResolution) - }, - - handleClick: function (event) { - MenuItem.prototype.handleClick.call(this, event) - this.player_.updateResolution(this.options_.id) - } -}) -MenuItem.registerComponent('ResolutionMenuItem', ResolutionMenuItem) - -const MenuButton = videojsUntyped.getComponent('MenuButton') -const ResolutionMenuButton = videojsUntyped.extend(MenuButton, { - constructor: function (player, options) { - this.label = document.createElement('span') - options.label = 'Quality' - - MenuButton.call(this, player, options) - this.el().setAttribute('aria-label', 'Quality') - this.controlText('Quality') - - videojsUntyped.dom.addClass(this.label, 'vjs-resolution-button-label') - this.el().appendChild(this.label) - - player.on('videoFileUpdate', videojs.bind(this, this.update)) - }, - - createItems: function () { - const menuItems = [] - for (const videoFile of this.player_.videoFiles) { - menuItems.push(new ResolutionMenuItem( - this.player_, +import './settings-menu-button' +import { PeertubePluginOptions, VideoJSComponentInterface, videojsUntyped } from './peertube-videojs-typings' +import { + getAverageBandwidth, + getStoredMute, + getStoredVolume, + saveAverageBandwidth, + saveMuteInStore, + saveVolumeInStore +} from './utils' +import minBy from 'lodash-es/minBy' +import maxBy from 'lodash-es/maxBy' + +const webtorrent = new WebTorrent({ + tracker: { + rtcConfig: { + iceServers: [ { - id: videoFile.resolution, - label: videoFile.resolutionLabel, - src: videoFile.magnetUri, - selected: videoFile.resolution === this.currentSelection - }) - ) + urls: 'stun:stun.stunprotocol.org' + }, + { + urls: 'stun:stun.framasoft.org' + } + ] } - - return menuItems - }, - - update: function () { - this.label.innerHTML = this.player_.getCurrentResolutionLabel() - this.hide() - return MenuButton.prototype.update.call(this) }, - - buildCSSClass: function () { - return MenuButton.prototype.buildCSSClass.call(this) + ' vjs-resolution-button' - } + dht: false }) -MenuButton.registerComponent('ResolutionMenuButton', ResolutionMenuButton) - -const Button = videojsUntyped.getComponent('Button') -const PeertubeLinkButton = videojsUntyped.extend(Button, { - constructor: function (player) { - Button.call(this, player) - }, - - createEl: function () { - const link = document.createElement('a') - link.href = window.location.href.replace('embed', 'watch') - link.innerHTML = 'PeerTube' - link.title = 'Go to the video page' - link.className = 'vjs-peertube-link' - link.target = '_blank' - - return link - }, - handleClick: function () { - this.player_.pause() +const Plugin: VideoJSComponentInterface = videojsUntyped.getPlugin('plugin') +class PeerTubePlugin extends Plugin { + private readonly playerElement: HTMLVideoElement + + private readonly autoplay: boolean = false + private readonly startTime: number = 0 + private readonly savePlayerSrcFunction: Function + private readonly videoFiles: VideoFile[] + private readonly videoViewUrl: string + private readonly videoDuration: number + private readonly CONSTANTS = { + INFO_SCHEDULER: 1000, // Don't change this + AUTO_QUALITY_SCHEDULER: 3000, // Check quality every 3 seconds + AUTO_QUALITY_THRESHOLD_PERCENT: 30, // Bandwidth should be 30% more important than a resolution bitrate to change to it + AUTO_QUALITY_OBSERVATION_TIME: 10000, // Wait 10 seconds after having change the resolution before another check + AUTO_QUALITY_HIGHER_RESOLUTION_DELAY: 5000, // Buffering higher resolution during 5 seconds + BANDWIDTH_AVERAGE_NUMBER_OF_VALUES: 5 // Last 5 seconds to build average bandwidth } -}) -Button.registerComponent('PeerTubeLinkButton', PeertubeLinkButton) - -const WebTorrentButton = videojsUntyped.extend(Button, { - constructor: function (player) { - Button.call(this, player) - }, - createEl: function () { - const div = document.createElement('div') - const subDiv = document.createElement('div') - div.appendChild(subDiv) - - const downloadIcon = document.createElement('span') - downloadIcon.classList.add('icon', 'icon-download') - subDiv.appendChild(downloadIcon) - - const downloadSpeedText = document.createElement('span') - downloadSpeedText.classList.add('download-speed-text') - const downloadSpeedNumber = document.createElement('span') - downloadSpeedNumber.classList.add('download-speed-number') - const downloadSpeedUnit = document.createElement('span') - downloadSpeedText.appendChild(downloadSpeedNumber) - downloadSpeedText.appendChild(downloadSpeedUnit) - subDiv.appendChild(downloadSpeedText) - - const uploadIcon = document.createElement('span') - uploadIcon.classList.add('icon', 'icon-upload') - subDiv.appendChild(uploadIcon) - - const uploadSpeedText = document.createElement('span') - uploadSpeedText.classList.add('upload-speed-text') - const uploadSpeedNumber = document.createElement('span') - uploadSpeedNumber.classList.add('upload-speed-number') - const uploadSpeedUnit = document.createElement('span') - uploadSpeedText.appendChild(uploadSpeedNumber) - uploadSpeedText.appendChild(uploadSpeedUnit) - subDiv.appendChild(uploadSpeedText) - - const peersText = document.createElement('span') - peersText.textContent = ' peers' - peersText.classList.add('peers-text') - const peersNumber = document.createElement('span') - peersNumber.classList.add('peers-number') - subDiv.appendChild(peersNumber) - subDiv.appendChild(peersText) - - div.className = 'vjs-webtorrent' - // Hide the stats before we get the info - subDiv.className = 'vjs-webtorrent-hidden' - - this.player_.on('torrentInfo', (event, data) => { - const downloadSpeed = bytes(data.downloadSpeed) - const uploadSpeed = bytes(data.uploadSpeed) - const numPeers = data.numPeers - - downloadSpeedNumber.textContent = downloadSpeed[0] - downloadSpeedUnit.textContent = ' ' + downloadSpeed[1] - - uploadSpeedNumber.textContent = uploadSpeed[0] - uploadSpeedUnit.textContent = ' ' + uploadSpeed[1] - - peersNumber.textContent = numPeers - - subDiv.className = 'vjs-webtorrent-displayed' + private player: any + private currentVideoFile: VideoFile + private torrent: WebTorrent.Torrent + private autoResolution = true + private isAutoResolutionObservation = false + + private videoViewInterval + private torrentInfoInterval + private autoQualityInterval + private addTorrentDelay + private qualityObservationTimer + private runAutoQualitySchedulerTimer + + private downloadSpeeds: number[] = [] + + constructor (player: videojs.Player, options: PeertubePluginOptions) { + super(player, options) + + // Fix canplay event on google chrome by disabling default videojs autoplay + this.autoplay = this.player.options_.autoplay + this.player.options_.autoplay = false + + this.startTime = options.startTime + this.videoFiles = options.videoFiles + this.videoViewUrl = options.videoViewUrl + this.videoDuration = options.videoDuration + + this.savePlayerSrcFunction = this.player.src + // Hack to "simulate" src link in video.js >= 6 + // Without this, we can't play the video after pausing it + // https://github.com/videojs/video.js/blob/master/src/js/player.js#L1633 + this.player.src = () => true + + this.playerElement = options.playerElement + + this.player.ready(() => { + const volume = getStoredVolume() + if (volume !== undefined) this.player.volume(volume) + const muted = getStoredMute() + if (muted !== undefined) this.player.muted(muted) + + this.initializePlayer() + this.runTorrentInfoScheduler() + this.runViewAdd() + + this.player.one('play', () => { + // Don't run immediately scheduler, wait some seconds the TCP connections are made + this.runAutoQualitySchedulerTimer = setTimeout(() => { + this.runAutoQualityScheduler() + }, this.CONSTANTS.AUTO_QUALITY_SCHEDULER) + }) }) - return div + this.player.on('volumechange', () => { + saveVolumeInStore(this.player.volume()) + saveMuteInStore(this.player.muted()) + }) } -}) -Button.registerComponent('WebTorrentButton', WebTorrentButton) -type PeertubePluginOptions = { - videoFiles: VideoFile[] - playerElement: HTMLVideoElement - autoplay: boolean - peerTubeLink: boolean -} -const peertubePlugin = function (options: PeertubePluginOptions) { - const player = this - let currentVideoFile: VideoFile = undefined - const playerElement = options.playerElement - player.videoFiles = options.videoFiles - - // Hack to "simulate" src link in video.js >= 6 - // Without this, we can't play the video after pausing it - // https://github.com/videojs/video.js/blob/master/src/js/player.js#L1633 - player.src = function () { - return true + dispose () { + clearTimeout(this.addTorrentDelay) + clearTimeout(this.qualityObservationTimer) + clearTimeout(this.runAutoQualitySchedulerTimer) + + clearInterval(this.videoViewInterval) + clearInterval(this.torrentInfoInterval) + clearInterval(this.autoQualityInterval) + + // Don't need to destroy renderer, video player will be destroyed + this.flushVideoFile(this.currentVideoFile, false) } - player.getCurrentResolution = function () { - return currentVideoFile ? currentVideoFile.resolution : -1 + getCurrentResolutionId () { + return this.currentVideoFile ? this.currentVideoFile.resolution.id : -1 } - player.getCurrentResolutionLabel = function () { - return currentVideoFile ? currentVideoFile.resolutionLabel : '' + getCurrentResolutionLabel () { + return this.currentVideoFile ? this.currentVideoFile.resolution.label : '' } - player.updateVideoFile = function (videoFile: VideoFile, done: () => void) { + updateVideoFile (videoFile?: VideoFile, delay = 0, done?: () => void) { if (done === undefined) { done = () => { /* empty */ } } - // Pick the first one + // Automatically choose the adapted video file if (videoFile === undefined) { - videoFile = player.videoFiles[0] + const savedAverageBandwidth = getAverageBandwidth() + videoFile = savedAverageBandwidth + ? this.getAppropriateFile(savedAverageBandwidth) + : this.videoFiles[0] } // Don't add the same video file once again - if (currentVideoFile !== undefined && currentVideoFile.magnetUri === videoFile.magnetUri) { + if (this.currentVideoFile !== undefined && this.currentVideoFile.magnetUri === videoFile.magnetUri) { return } - const previousVideoFile = currentVideoFile - currentVideoFile = videoFile + // Do not display error to user because we will have multiple fallback + this.disableErrorDisplay() - console.log('Adding ' + videoFile.magnetUri + '.') - player.torrent = webtorrent.add(videoFile.magnetUri, torrent => { - console.log('Added ' + videoFile.magnetUri + '.') + this.player.src = () => true + const oldPlaybackRate = this.player.playbackRate() - this.flushVideoFile(previousVideoFile) + const previousVideoFile = this.currentVideoFile + this.currentVideoFile = videoFile - const options = { autoplay: true, controls: true } - renderVideo(torrent.files[0], playerElement, options,(err, renderer) => { - if (err) return handleError(err) + this.addTorrent(this.currentVideoFile.magnetUri, previousVideoFile, delay, () => { + this.player.playbackRate(oldPlaybackRate) + return done() + }) + + this.trigger('videoFileUpdate') + } - this.renderer = renderer - player.play() + addTorrent (magnetOrTorrentUrl: string, previousVideoFile: VideoFile, delay = 0, done: Function) { + console.log('Adding ' + magnetOrTorrentUrl + '.') - return done() - }) + const oldTorrent = this.torrent + this.torrent = webtorrent.add(magnetOrTorrentUrl, torrent => { + console.log('Added ' + magnetOrTorrentUrl + '.') + + // Pause the old torrent + if (oldTorrent) { + oldTorrent.pause() + // Pause does not remove actual peers (in particular the webseed peer) + oldTorrent.removePeer(oldTorrent['ws']) + } + + this.addTorrentDelay = setTimeout(() => { + this.flushVideoFile(previousVideoFile) + + const options = { autoplay: true, controls: true } + renderVideo(torrent.files[0], this.playerElement, options,(err, renderer) => { + this.renderer = renderer + + if (err) return this.fallbackToHttp(done) + + if (!this.player.paused()) { + const playPromise = this.player.play() + if (playPromise !== undefined) return playPromise.then(done) + + return done() + } + + return done() + }) + }, delay) }) - player.torrent.on('error', err => handleError(err)) - player.torrent.on('warning', err => { + this.torrent.on('error', err => this.handleError(err)) + + this.torrent.on('warning', (err: any) => { // We don't support HTTP tracker but we don't care -> we use the web socket tracker - if (err.message.indexOf('Unsupported tracker protocol: http') !== -1) return + if (err.message.indexOf('Unsupported tracker protocol') !== -1) return + // Users don't care about issues with WebRTC, but developers do so log it in the console if (err.message.indexOf('Ice connection failed') !== -1) { console.error(err) return } - return handleError(err) - }) - - player.trigger('videoFileUpdate') + // Magnet hash is not up to date with the torrent file, add directly the torrent file + if (err.message.indexOf('incorrect info hash') !== -1) { + console.error('Incorrect info hash detected, falling back to torrent file.') + return this.addTorrent(this.torrent['xs'], previousVideoFile, 0, done) + } - return player + return this.handleError(err) + }) } - player.updateResolution = function (resolution) { + updateResolution (resolutionId: number, delay = 0) { // Remember player state - const currentTime = player.currentTime() - const isPaused = player.paused() + const currentTime = this.player.currentTime() + const isPaused = this.player.paused() + + // Remove poster to have black background + this.playerElement.poster = '' // Hide bigPlayButton - if (!isPaused && this.player_.options_.bigPlayButton) { - this.player_.bigPlayButton.hide() + if (!isPaused) { + this.player.bigPlayButton.hide() } - const newVideoFile = player.videoFiles.find(f => f.resolution === resolution) - player.updateVideoFile(newVideoFile, () => { - player.currentTime(currentTime) - player.handleTechSeeked_() - }) + const newVideoFile = this.videoFiles.find(f => f.resolution.id === resolutionId) + this.updateVideoFile(newVideoFile, delay, () => this.seek(currentTime)) } - player.flushVideoFile = function (videoFile: VideoFile, destroyRenderer = true) { + flushVideoFile (videoFile: VideoFile, destroyRenderer = true) { if (videoFile !== undefined && webtorrent.get(videoFile.magnetUri)) { - if (destroyRenderer === true) this.renderer.destroy() + if (destroyRenderer === true && this.renderer && this.renderer.destroy) this.renderer.destroy() + webtorrent.remove(videoFile.magnetUri) + console.log('Removed ' + videoFile.magnetUri) } } - player.setVideoFiles = function (files: VideoFile[]) { - player.videoFiles = files + isAutoResolutionOn () { + return this.autoResolution + } + + enableAutoResolution () { + this.autoResolution = true + this.trigger('autoResolutionUpdate') + } - player.updateVideoFile(undefined, () => player.play()) + disableAutoResolution () { + this.autoResolution = false + this.trigger('autoResolutionUpdate') } - player.ready(function () { - const controlBar = player.controlBar + private seek (time: number) { + this.player.currentTime(time) + this.player.handleTechSeeked_() + } - const menuButton = new ResolutionMenuButton(player, options) - const fullscreenElement = controlBar.fullscreenToggle.el() - controlBar.resolutionSwitcher = controlBar.el().insertBefore(menuButton.el(), fullscreenElement) - controlBar.resolutionSwitcher.dispose = function () { - this.parentNode.removeChild(this) - } + private getAppropriateFile (averageDownloadSpeed?: number): VideoFile { + if (this.videoFiles === undefined || this.videoFiles.length === 0) return undefined + if (this.videoFiles.length === 1) return this.videoFiles[0] + if (this.torrent && this.torrent.progress === 1) return this.currentVideoFile - player.dispose = function () { - // Don't need to destroy renderer, video player will be destroyed - player.flushVideoFile(currentVideoFile, false) - } + if (!averageDownloadSpeed) averageDownloadSpeed = this.getActualDownloadSpeed() - if (options.peerTubeLink === true) { - const peerTubeLinkButton = new PeertubeLinkButton(player) - controlBar.peerTubeLink = controlBar.el().insertBefore(peerTubeLinkButton.el(), fullscreenElement) + // Filter videos we can play according to our bandwidth + const filteredFiles = this.videoFiles.filter(f => { + const fileBitrate = (f.size / this.videoDuration) + let threshold = fileBitrate - controlBar.peerTubeLink.dispose = function () { - this.parentNode.removeChild(this) + // If this is for a higher resolution or an initial load: add a margin + if (!this.currentVideoFile || f.resolution.id > this.currentVideoFile.resolution.id) { + threshold += ((fileBitrate * this.CONSTANTS.AUTO_QUALITY_THRESHOLD_PERCENT) / 100) } - } - const webTorrentButton = new WebTorrentButton(player) - controlBar.webTorrent = controlBar.el().insertBefore(webTorrentButton.el(), controlBar.progressControl.el()) - controlBar.webTorrent.dispose = function () { - this.parentNode.removeChild(this) - } + return averageDownloadSpeed > threshold + }) - if (options.autoplay === true) { - player.updateVideoFile() - } else { - player.one('play', () => { - // Pause, we wait the video to load before - player.pause() + // If the download speed is too bad, return the lowest resolution we have + if (filteredFiles.length === 0) return minBy(this.videoFiles, 'resolution.id') + + return maxBy(filteredFiles, 'resolution.id') + } + + private getActualDownloadSpeed () { + const start = Math.max(this.downloadSpeeds.length - this.CONSTANTS.BANDWIDTH_AVERAGE_NUMBER_OF_VALUES, 0) + const lastDownloadSpeeds = this.downloadSpeeds.slice(start, this.downloadSpeeds.length) + if (lastDownloadSpeeds.length === 0) return -1 + + const sum = lastDownloadSpeeds.reduce((a, b) => a + b) + const averageBandwidth = Math.round(sum / lastDownloadSpeeds.length) + + // Save the average bandwidth for future use + saveAverageBandwidth(averageBandwidth) - player.updateVideoFile(undefined, () => player.play()) + return averageBandwidth + } + + private initializePlayer () { + this.initSmoothProgressBar() + + this.alterInactivity() + + if (this.autoplay === true) { + this.player.posterImage.hide() + this.updateVideoFile(undefined, 0, () => { + this.seek(this.startTime) + this.player.play() }) + } else { + // Proxy first play + const oldPlay = this.player.play.bind(this.player) + this.player.play = () => { + this.updateVideoFile(undefined, 0, () => { + this.seek(this.startTime) + oldPlay() + }) + this.player.play = oldPlay + } } + } - setInterval(() => { - if (player.torrent !== undefined) { - player.trigger('torrentInfo', { - downloadSpeed: player.torrent.downloadSpeed, - numPeers: player.torrent.numPeers, - uploadSpeed: player.torrent.uploadSpeed - }) + private runAutoQualityScheduler () { + this.autoQualityInterval = setInterval(() => { + + // Not initialized or in HTTP fallback + if (this.torrent === undefined || this.torrent === null) return + if (this.isAutoResolutionOn() === false) return + if (this.isAutoResolutionObservation === true) return + + const file = this.getAppropriateFile() + let changeResolution = false + let changeResolutionDelay = 0 + + // Lower resolution + if (this.isPlayerWaiting() && file.resolution.id < this.currentVideoFile.resolution.id) { + console.log('Downgrading automatically the resolution to: %s', file.resolution.label) + changeResolution = true + } else if (file.resolution.id > this.currentVideoFile.resolution.id) { // Higher resolution + console.log('Upgrading automatically the resolution to: %s', file.resolution.label) + changeResolution = true + changeResolutionDelay = this.CONSTANTS.AUTO_QUALITY_HIGHER_RESOLUTION_DELAY + } + + if (changeResolution === true) { + this.updateResolution(file.resolution.id, changeResolutionDelay) + + // Wait some seconds in observation of our new resolution + this.isAutoResolutionObservation = true + + this.qualityObservationTimer = setTimeout(() => { + this.isAutoResolutionObservation = false + }, this.CONSTANTS.AUTO_QUALITY_OBSERVATION_TIME) + } + }, this.CONSTANTS.AUTO_QUALITY_SCHEDULER) + } + + private isPlayerWaiting () { + return this.player && this.player.hasClass('vjs-waiting') + } + + private runTorrentInfoScheduler () { + this.torrentInfoInterval = setInterval(() => { + // Not initialized yet + if (this.torrent === undefined) return + + // Http fallback + if (this.torrent === null) return this.trigger('torrentInfo', false) + + // webtorrent.downloadSpeed because we need to take into account the potential old torrent too + if (webtorrent.downloadSpeed !== 0) this.downloadSpeeds.push(webtorrent.downloadSpeed) + + return this.trigger('torrentInfo', { + downloadSpeed: this.torrent.downloadSpeed, + numPeers: this.torrent.numPeers, + uploadSpeed: this.torrent.uploadSpeed + }) + }, this.CONSTANTS.INFO_SCHEDULER) + } + + private runViewAdd () { + this.clearVideoViewInterval() + + // After 30 seconds (or 3/4 of the video), add a view to the video + let minSecondsToView = 30 + + if (this.videoDuration < minSecondsToView) minSecondsToView = (this.videoDuration * 3) / 4 + + let secondsViewed = 0 + this.videoViewInterval = setInterval(() => { + if (this.player && !this.player.paused()) { + secondsViewed += 1 + + if (secondsViewed > minSecondsToView) { + this.clearVideoViewInterval() + + this.addViewToVideo().catch(err => console.error(err)) + } } }, 1000) - }) + } + + private clearVideoViewInterval () { + if (this.videoViewInterval !== undefined) { + clearInterval(this.videoViewInterval) + this.videoViewInterval = undefined + } + } + + private addViewToVideo () { + return fetch(this.videoViewUrl, { method: 'POST' }) + } + + private fallbackToHttp (done: Function) { + this.flushVideoFile(this.currentVideoFile, true) + this.torrent = null + + // Enable error display now this is our last fallback + this.player.one('error', () => this.enableErrorDisplay()) + + const httpUrl = this.currentVideoFile.fileUrl + this.player.src = this.savePlayerSrcFunction + this.player.src(httpUrl) + this.player.play() + + return done() + } - function handleError (err: Error | string) { - return player.trigger('customError', { err }) + private handleError (err: Error | string) { + return this.player.trigger('customError', { err }) + } + + private enableErrorDisplay () { + this.player.addClass('vjs-error-display-enabled') + } + + private disableErrorDisplay () { + this.player.removeClass('vjs-error-display-enabled') + } + + private alterInactivity () { + let saveInactivityTimeout: number + + const disableInactivity = () => { + saveInactivityTimeout = this.player.options_.inactivityTimeout + this.player.options_.inactivityTimeout = 0 + } + const enableInactivity = () => { + this.player.options_.inactivityTimeout = saveInactivityTimeout + } + + const settingsDialog = this.player.children_.find(c => c.name_ === 'SettingsDialog') + + this.player.controlBar.on('mouseenter', () => disableInactivity()) + settingsDialog.on('mouseenter', () => disableInactivity()) + this.player.controlBar.on('mouseleave', () => enableInactivity()) + settingsDialog.on('mouseleave', () => enableInactivity()) + } + + // Thanks: https://github.com/videojs/video.js/issues/4460#issuecomment-312861657 + private initSmoothProgressBar () { + const SeekBar = videojsUntyped.getComponent('SeekBar') + SeekBar.prototype.getPercent = function getPercent () { + // Allows for smooth scrubbing, when player can't keep up. + // const time = (this.player_.scrubbing()) ? + // this.player_.getCache().currentTime : + // this.player_.currentTime() + const time = this.player_.currentTime() + const percent = time / this.player_.duration() + return percent >= 1 ? 1 : percent + } + SeekBar.prototype.handleMouseMove = function handleMouseMove (event) { + let newTime = this.calculateDistance(event) * this.player_.duration() + if (newTime === this.player_.duration()) { + newTime = newTime - 0.1 + } + this.player_.currentTime(newTime) + this.update() + } } } -videojsUntyped.registerPlugin('peertube', peertubePlugin) +videojsUntyped.registerPlugin('peertube', PeerTubePlugin) +export { PeerTubePlugin }