X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fassets%2Fplayer%2Fpeertube-videojs-plugin.ts;h=f4064c4b26e345047a01a505f091a3b957be38a1;hb=a216c6233d46689f73a7c542e6170555b7f287b6;hp=d9dc2615b7d0f00dc013e84e4e353d8992a27fc0;hpb=b682782093a22a729eea8862476ff1c8aac4ef0c;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 d9dc2615b..f4064c4b2 100644 --- a/client/src/assets/player/peertube-videojs-plugin.ts +++ b/client/src/assets/player/peertube-videojs-plugin.ts @@ -2,10 +2,31 @@ import * as videojs from 'video.js' import * as WebTorrent from 'webtorrent' +import { VideoConstant, VideoResolution } from '../../../../shared/models/videos' import { VideoFile } from '../../../../shared/models/videos/video.model' - import { renderVideo } from './video-renderer' +declare module 'video.js' { + interface Player { + peertube (): PeerTubePlugin + } +} + +interface VideoJSComponentInterface { + _player: videojs.Player + + new (player: videojs.Player, options?: any) + + registerComponent (name: string, obj: any) +} + +type PeertubePluginOptions = { + videoFiles: VideoFile[] + playerElement: HTMLVideoElement + videoViewUrl: string + videoDuration: number +} + // 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}> = [ @@ -25,75 +46,79 @@ function bytes (value) { const videojsUntyped = videojs as any const webtorrent = new WebTorrent({ dht: false }) -const MenuItem = videojsUntyped.getComponent('MenuItem') -const ResolutionMenuItem = videojsUntyped.extend(MenuItem, { - constructor: function (player: videojs.Player, options) { +const MenuItem: VideoJSComponentInterface = videojsUntyped.getComponent('MenuItem') +class ResolutionMenuItem extends MenuItem { + + constructor (player: videojs.Player, options) { options.selectable = true - MenuItem.call(this, player, options) + super(player, options) - const currentResolution = this.player_.getCurrentResolution() - this.selected(this.options_.id === currentResolution) - }, + const currentResolutionId = this.player_.peertube().getCurrentResolutionId() + this.selected(this.options_.id === currentResolutionId) + } + + handleClick (event) { + super.handleClick(event) - handleClick: function (event) { - MenuItem.prototype.handleClick.call(this, event) - this.player_.updateResolution(this.options_.id) + this.player_.peertube().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') +const MenuButton: VideoJSComponentInterface = videojsUntyped.getComponent('MenuButton') +class ResolutionMenuButton extends MenuButton { + label: HTMLElement + + constructor (player: videojs.Player, options) { options.label = 'Quality' + super(player, options) + + this.label = document.createElement('span') - 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)) - }, + player.peertube().on('videoFileUpdate', () => this.update()) + } - createItems: function () { + createItems () { const menuItems = [] - for (const videoFile of this.player_.videoFiles) { + for (const videoFile of this.player_.peertube().videoFiles) { menuItems.push(new ResolutionMenuItem( this.player_, { - id: videoFile.resolution, - label: videoFile.resolutionLabel, + id: videoFile.resolution.id, + label: videoFile.resolution.label, src: videoFile.magnetUri, - selected: videoFile.resolution === this.currentSelection + selected: videoFile.resolution.id === this.currentSelectionId }) ) } return menuItems - }, + } + + update () { + if (!this.label) return - update: function () { - this.label.innerHTML = this.player_.getCurrentResolutionLabel() + this.label.innerHTML = this.player_.peertube().getCurrentResolutionLabel() this.hide() - return MenuButton.prototype.update.call(this) - }, + return super.update() + } - buildCSSClass: function () { - return MenuButton.prototype.buildCSSClass.call(this) + ' vjs-resolution-button' + buildCSSClass () { + return super.buildCSSClass() + ' vjs-resolution-button' } -}) +} MenuButton.registerComponent('ResolutionMenuButton', ResolutionMenuButton) -const Button = videojsUntyped.getComponent('Button') -const PeertubeLinkButton = videojsUntyped.extend(Button, { - constructor: function (player) { - Button.call(this, player) - }, +const Button: VideoJSComponentInterface = videojsUntyped.getComponent('Button') +class PeerTubeLinkButton extends Button { - createEl: function () { + createEl () { const link = document.createElement('a') link.href = window.location.href.replace('embed', 'watch') link.innerHTML = 'PeerTube' @@ -102,27 +127,23 @@ const PeertubeLinkButton = videojsUntyped.extend(Button, { link.target = '_blank' return link - }, + } - handleClick: function () { + handleClick () { this.player_.pause() } -}) -Button.registerComponent('PeerTubeLinkButton', PeertubeLinkButton) - -const WebTorrentButton = videojsUntyped.extend(Button, { - constructor: function (player) { - Button.call(this, player) - }, +} +Button.registerComponent('PeerTubeLinkButton', PeerTubeLinkButton) - createEl: function () { +class WebTorrentButton extends Button { + createEl () { const div = document.createElement('div') - const subDiv = document.createElement('div') - div.appendChild(subDiv) + const subDivWebtorrent = document.createElement('div') + div.appendChild(subDivWebtorrent) const downloadIcon = document.createElement('span') downloadIcon.classList.add('icon', 'icon-download') - subDiv.appendChild(downloadIcon) + subDivWebtorrent.appendChild(downloadIcon) const downloadSpeedText = document.createElement('span') downloadSpeedText.classList.add('download-speed-text') @@ -131,11 +152,11 @@ const WebTorrentButton = videojsUntyped.extend(Button, { const downloadSpeedUnit = document.createElement('span') downloadSpeedText.appendChild(downloadSpeedNumber) downloadSpeedText.appendChild(downloadSpeedUnit) - subDiv.appendChild(downloadSpeedText) + subDivWebtorrent.appendChild(downloadSpeedText) const uploadIcon = document.createElement('span') uploadIcon.classList.add('icon', 'icon-upload') - subDiv.appendChild(uploadIcon) + subDivWebtorrent.appendChild(uploadIcon) const uploadSpeedText = document.createElement('span') uploadSpeedText.classList.add('upload-speed-text') @@ -144,206 +165,316 @@ const WebTorrentButton = videojsUntyped.extend(Button, { const uploadSpeedUnit = document.createElement('span') uploadSpeedText.appendChild(uploadSpeedNumber) uploadSpeedText.appendChild(uploadSpeedUnit) - subDiv.appendChild(uploadSpeedText) + subDivWebtorrent.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) + subDivWebtorrent.appendChild(peersNumber) + subDivWebtorrent.appendChild(peersText) - div.className = 'vjs-webtorrent' + div.className = 'vjs-peertube' // Hide the stats before we get the info - subDiv.className = 'vjs-webtorrent-hidden' + subDivWebtorrent.className = 'vjs-peertube-hidden' + + const subDivHttp = document.createElement('div') + subDivHttp.className = 'vjs-peertube-hidden' + const subDivHttpText = document.createElement('span') + subDivHttpText.classList.add('peers-number') + subDivHttpText.textContent = 'HTTP' + const subDivFallbackText = document.createElement('span') + subDivFallbackText.classList.add('peers-text') + subDivFallbackText.textContent = ' fallback' + + subDivHttp.appendChild(subDivHttpText) + subDivHttp.appendChild(subDivFallbackText) + div.appendChild(subDivHttp) + + this.player_.peertube().on('torrentInfo', (event, data) => { + // We are in HTTP fallback + if (!data) { + subDivHttp.className = 'vjs-peertube-displayed' + subDivWebtorrent.className = 'vjs-peertube-hidden' + + return + } - 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] + downloadSpeedNumber.textContent = downloadSpeed[ 0 ] + downloadSpeedUnit.textContent = ' ' + downloadSpeed[ 1 ] - uploadSpeedNumber.textContent = uploadSpeed[0] - uploadSpeedUnit.textContent = ' ' + uploadSpeed[1] + uploadSpeedNumber.textContent = uploadSpeed[ 0 ] + uploadSpeedUnit.textContent = ' ' + uploadSpeed[ 1 ] peersNumber.textContent = numPeers + peersText.textContent = ' peers' - subDiv.className = 'vjs-webtorrent-displayed' + subDivHttp.className = 'vjs-peertube-hidden' + subDivWebtorrent.className = 'vjs-peertube-displayed' }) return div } -}) +} 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 +const Plugin: VideoJSComponentInterface = videojsUntyped.getPlugin('plugin') +class PeerTubePlugin extends Plugin { + private player: any + private currentVideoFile: VideoFile + private playerElement: HTMLVideoElement + private videoFiles: VideoFile[] + private torrent: WebTorrent.Torrent + private autoplay = false + private videoViewUrl: string + private videoDuration: number + private videoViewInterval + private torrentInfoInterval + private savePlayerSrcFunction: Function + + 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.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(() => { + this.initializePlayer(options) + this.runTorrentInfoScheduler() + this.runViewAdd() + }) } - player.getCurrentResolution = function () { - return currentVideoFile ? currentVideoFile.resolution : -1 + dispose () { + clearInterval(this.videoViewInterval) + clearInterval(this.torrentInfoInterval) + + // Don't need to destroy renderer, video player will be destroyed + this.flushVideoFile(this.currentVideoFile, false) } - player.getCurrentResolutionLabel = function () { - return currentVideoFile ? currentVideoFile.resolutionLabel : '' + getCurrentResolutionId () { + return this.currentVideoFile ? this.currentVideoFile.resolution.id : -1 } - player.updateVideoFile = function (videoFile: VideoFile, done: () => void) { + getCurrentResolutionLabel () { + return this.currentVideoFile ? this.currentVideoFile.resolution.label : '' + } + + updateVideoFile (videoFile?: VideoFile, done?: () => void) { if (done === undefined) { done = () => { /* empty */ } } // Pick the first one if (videoFile === undefined) { - videoFile = player.videoFiles[0] + videoFile = 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 fallbacks + this.disableErrorDisplay() + + this.player.src = () => true + this.player.playbackRate(1) + + const previousVideoFile = this.currentVideoFile + this.currentVideoFile = videoFile + + this.addTorrent(this.currentVideoFile.magnetUri, previousVideoFile, done) - console.log('Adding ' + videoFile.magnetUri + '.') - player.torrent = webtorrent.add(videoFile.magnetUri, torrent => { - console.log('Added ' + videoFile.magnetUri + '.') + this.trigger('videoFileUpdate') + } + + addTorrent (magnetOrTorrentUrl: string, previousVideoFile: VideoFile, done: Function) { + console.log('Adding ' + magnetOrTorrentUrl + '.') + + this.torrent = webtorrent.add(magnetOrTorrentUrl, torrent => { + console.log('Added ' + magnetOrTorrentUrl + '.') this.flushVideoFile(previousVideoFile) const options = { autoplay: true, controls: true } - renderVideo(torrent.files[0], playerElement, options,(err, renderer) => { - if (err) return handleError(err) + renderVideo(torrent.files[0], this.playerElement, options,(err, renderer) => { + if (err) return this.fallbackToHttp() this.renderer = renderer - player.play() + if (!this.player.paused()) { + const playPromise = this.player.play() + if (playPromise !== undefined) return playPromise.then(done) + + return done() + } return done() }) }) - 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, done) + } - return player + return this.handleError(err) + }) } - player.updateResolution = function (resolution) { + updateResolution (resolutionId: number) { // 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, () => { + this.player.currentTime(currentTime) + this.player.handleTechSeeked_() }) } - 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 + setVideoFiles (files: VideoFile[], videoViewUrl: string, videoDuration: number) { + this.videoViewUrl = videoViewUrl + this.videoDuration = videoDuration + this.videoFiles = files - player.updateVideoFile(undefined, () => player.play()) + // Re run view add for the new video + this.runViewAdd() + this.updateVideoFile(undefined, () => this.player.play()) } - player.ready(function () { - const controlBar = player.controlBar - - 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 initializePlayer (options: PeertubePluginOptions) { + if (this.autoplay === true) { + this.updateVideoFile(undefined, () => this.player.play()) + } else { + this.player.one('play', () => { + this.player.pause() + this.updateVideoFile(undefined, () => this.player.play()) + }) } + } - player.dispose = function () { - // Don't need to destroy renderer, video player will be destroyed - player.flushVideoFile(currentVideoFile, false) - } + private runTorrentInfoScheduler () { + this.torrentInfoInterval = setInterval(() => { + // Not initialized yet + if (this.torrent === undefined) return - if (options.peerTubeLink === true) { - const peerTubeLinkButton = new PeertubeLinkButton(player) - controlBar.peerTubeLink = controlBar.el().insertBefore(peerTubeLinkButton.el(), fullscreenElement) + // Http fallback + if (this.torrent === null) return this.trigger('torrentInfo', false) - controlBar.peerTubeLink.dispose = function () { - this.parentNode.removeChild(this) - } - } + return this.trigger('torrentInfo', { + downloadSpeed: this.torrent.downloadSpeed, + numPeers: this.torrent.numPeers, + uploadSpeed: this.torrent.uploadSpeed + }) + }, 1000) + } - const webTorrentButton = new WebTorrentButton(player) - controlBar.webTorrent = controlBar.el().insertBefore(webTorrentButton.el(), controlBar.progressControl.el()) - controlBar.webTorrent.dispose = function () { - this.parentNode.removeChild(this) - } + private runViewAdd () { + this.clearVideoViewInterval() - if (options.autoplay === true) { - player.updateVideoFile() - } else { - player.one('play', () => { - // Pause, we wait the video to load before - player.pause() + // After 30 seconds (or 3/4 of the video), add a view to the video + let minSecondsToView = 30 - player.updateVideoFile(undefined, () => player.play()) - }) - } + if (this.videoDuration < minSecondsToView) minSecondsToView = (this.videoDuration * 3) / 4 - setInterval(() => { - if (player.torrent !== undefined) { - player.trigger('torrentInfo', { - downloadSpeed: player.torrent.downloadSpeed, - numPeers: player.torrent.numPeers, - uploadSpeed: player.torrent.uploadSpeed - }) + 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) - }) + } - function handleError (err: Error | string) { - return player.trigger('customError', { err }) + private clearVideoViewInterval () { + if (this.videoViewInterval !== undefined) { + clearInterval(this.videoViewInterval) + this.videoViewInterval = undefined + } } -} -videojsUntyped.registerPlugin('peertube', peertubePlugin) + private addViewToVideo () { + return fetch(this.videoViewUrl, { method: 'POST' }) + } + + private fallbackToHttp () { + 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() + } + + 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') + } +} +videojsUntyped.registerPlugin('peertube', PeerTubePlugin)