// Big thanks to: https://github.com/kmoskwiak/videojs-resolution-switcher
-import { VideoService } from '@app/shared/video/video.service'
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'
type PeertubePluginOptions = {
videoFiles: VideoFile[]
playerElement: HTMLVideoElement
- peerTubeLink: boolean
videoViewUrl: string
+ videoDuration: number
}
// https://github.com/danrevah/ngx-pipes/blob/master/src/pipes/math/bytes.ts
// videojs typings don't have some method we need
const videojsUntyped = videojs as any
-const webtorrent = new WebTorrent({ dht: false })
+const webtorrent = new WebTorrent({
+ tracker: {
+ rtcConfig: {
+ iceServers: [
+ {
+ urls: 'stun:stun.stunprotocol.org'
+ },
+ {
+ urls: 'stun:stun.framasoft.org'
+ }
+ ]
+ }
+ },
+ dht: false
+})
const MenuItem: VideoJSComponentInterface = videojsUntyped.getComponent('MenuItem')
class ResolutionMenuItem extends MenuItem {
options.selectable = true
super(player, options)
- const currentResolution = this.player_.peertube().getCurrentResolution()
- this.selected(this.options_.id === currentResolution)
+ const currentResolutionId = this.player_.peertube().getCurrentResolutionId()
+ this.selected(this.options_.id === currentResolutionId)
}
handleClick (event) {
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
})
)
}
buildCSSClass () {
return super.buildCSSClass() + ' vjs-resolution-button'
}
-
- dispose () {
- this.parentNode.removeChild(this)
- }
}
MenuButton.registerComponent('ResolutionMenuButton', ResolutionMenuButton)
const Button: VideoJSComponentInterface = videojsUntyped.getComponent('Button')
-class PeertubeLinkButton extends Button {
+class PeerTubeLinkButton extends Button {
createEl () {
const link = document.createElement('a')
handleClick () {
this.player_.pause()
}
-
- dispose () {
- this.parentNode.removeChild(this)
- }
}
-Button.registerComponent('PeerTubeLinkButton', PeertubeLinkButton)
+Button.registerComponent('PeerTubeLinkButton', PeerTubeLinkButton)
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')
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')
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
+ }
+
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
}
-
- dispose () {
- this.parentNode.removeChild(this)
- }
}
Button.registerComponent('WebTorrentButton', WebTorrentButton)
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)
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 = function () {
- return true
- }
+ this.player.src = () => true
this.playerElement = options.playerElement
this.player.ready(() => {
- this.initializePlayer(options)
+ this.initializePlayer()
this.runTorrentInfoScheduler()
- this.prepareRunViewAdd()
+ this.runViewAdd()
})
}
dispose () {
+ clearInterval(this.videoViewInterval)
+ clearInterval(this.torrentInfoInterval)
+
// Don't need to destroy renderer, video player will be destroyed
this.flushVideoFile(this.currentVideoFile, false)
}
- getCurrentResolution () {
- return this.currentVideoFile ? this.currentVideoFile.resolution : -1
+ getCurrentResolutionId () {
+ return this.currentVideoFile ? this.currentVideoFile.resolution.id : -1
}
getCurrentResolutionLabel () {
- return this.currentVideoFile ? this.currentVideoFile.resolutionLabel : ''
+ return this.currentVideoFile ? this.currentVideoFile.resolution.label : ''
}
updateVideoFile (videoFile?: VideoFile, done?: () => void) {
return
}
+ // 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
- console.log('Adding ' + videoFile.magnetUri + '.')
- this.torrent = webtorrent.add(videoFile.magnetUri, torrent => {
- console.log('Added ' + videoFile.magnetUri + '.')
+ this.addTorrent(this.currentVideoFile.magnetUri, previousVideoFile, done)
+
+ 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], this.playerElement, options,(err, renderer) => {
- if (err) return this.handleError(err)
-
this.renderer = renderer
- if (!this.player.paused()) this.player.play().then(done)
- else done()
+
+ if (err) return this.fallbackToHttp()
+
+ if (!this.player.paused()) {
+ const playPromise = this.player.play()
+ if (playPromise !== undefined) return playPromise.then(done)
+
+ return done()
+ }
+
+ return done()
})
})
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') !== -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
}
+ // 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 this.handleError(err)
})
-
- this.trigger('videoFileUpdate')
}
- updateResolution (resolution) {
+ updateResolution (resolutionId: number) {
// Remember player state
const currentTime = this.player.currentTime()
const isPaused = this.player.paused()
this.player.bigPlayButton.hide()
}
- const newVideoFile = this.videoFiles.find(f => f.resolution === resolution)
+ const newVideoFile = this.videoFiles.find(f => f.resolution.id === resolutionId)
this.updateVideoFile(newVideoFile, () => {
this.player.currentTime(currentTime)
this.player.handleTechSeeked_()
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)
}
}
- setVideoFiles (files: VideoFile[], videoViewUrl: string) {
+ setVideoFiles (files: VideoFile[], videoViewUrl: string, videoDuration: number) {
this.videoViewUrl = videoViewUrl
+ this.videoDuration = videoDuration
this.videoFiles = files
// Re run view add for the new video
- this.prepareRunViewAdd()
+ this.runViewAdd()
this.updateVideoFile(undefined, () => this.player.play())
}
- private initializePlayer (options: PeertubePluginOptions) {
- const controlBar = this.player.controlBar
-
- const menuButton = new ResolutionMenuButton(this.player, options)
- const fullscreenElement = controlBar.fullscreenToggle.el()
- controlBar.resolutionSwitcher = controlBar.el().insertBefore(menuButton.el(), fullscreenElement)
-
- if (options.peerTubeLink === true) {
- const peerTubeLinkButton = new PeertubeLinkButton(this.player)
- controlBar.peerTubeLink = controlBar.el().insertBefore(peerTubeLinkButton.el(), fullscreenElement)
- }
-
- const webTorrentButton = new WebTorrentButton(this.player)
- controlBar.webTorrent = controlBar.el().insertBefore(webTorrentButton.el(), controlBar.progressControl.el())
+ private initializePlayer () {
+ this.initSmoothProgressBar()
if (this.autoplay === true) {
this.updateVideoFile(undefined, () => this.player.play())
}
private runTorrentInfoScheduler () {
- setInterval(() => {
- if (this.torrent !== undefined) {
- this.trigger('torrentInfo', {
- downloadSpeed: this.torrent.downloadSpeed,
- numPeers: this.torrent.numPeers,
- uploadSpeed: this.torrent.uploadSpeed
- })
- }
- }, 1000)
- }
+ this.torrentInfoInterval = setInterval(() => {
+ // Not initialized yet
+ if (this.torrent === undefined) return
- private prepareRunViewAdd () {
- if (this.player.readyState() < 1) {
- return this.player.one('loadedmetadata', () => this.runViewAdd())
- }
+ // Http fallback
+ if (this.torrent === null) return this.trigger('torrentInfo', false)
- this.runViewAdd()
+ return this.trigger('torrentInfo', {
+ downloadSpeed: this.torrent.downloadSpeed,
+ numPeers: this.torrent.numPeers,
+ uploadSpeed: this.torrent.uploadSpeed
+ })
+ }, 1000)
}
private runViewAdd () {
// After 30 seconds (or 3/4 of the video), add a view to the video
let minSecondsToView = 30
- const duration = this.player.duration()
- if (duration < minSecondsToView) minSecondsToView = (duration * 3) / 4
+ if (this.videoDuration < minSecondsToView) minSecondsToView = (this.videoDuration * 3) / 4
let secondsViewed = 0
this.videoViewInterval = setInterval(() => {
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')
+ }
+
+ // 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)
projects / github / Chocobozzz / PeerTube.git / blobdiff