X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fwebtorrent.ts;h=c75c058e4cb0628636383ef32327cd4779e479da;hb=ad5db1044c8599eaaaa2a578b350777ae996b068;hp=9c5df20830ca37421a1492e4906b03e77762b1c6;hpb=ba5a8d89bbf049e4afc41543bcc072cccdb02669;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/webtorrent.ts b/server/helpers/webtorrent.ts index 9c5df2083..c75c058e4 100644 --- a/server/helpers/webtorrent.ts +++ b/server/helpers/webtorrent.ts @@ -1,25 +1,28 @@ -import { logger } from './logger' -import { generateVideoImportTmpPath } from './utils' -import * as WebTorrent from 'webtorrent' -import { createWriteStream, ensureDir, remove, writeFile } from 'fs-extra' -import { CONFIG } from '../initializers/config' +import { decode, encode } from 'bencode' +import createTorrent from 'create-torrent' +import { createWriteStream, ensureDir, readFile, remove, writeFile } from 'fs-extra' +import magnetUtil from 'magnet-uri' +import parseTorrent from 'parse-torrent' import { dirname, join } from 'path' -import * as createTorrent from 'create-torrent' -import { promisify2 } from './core-utils' +import { pipeline } from 'stream' +import WebTorrent, { Instance, TorrentFile } from 'webtorrent' +import { isArray } from '@server/helpers/custom-validators/misc' +import { WEBSERVER } from '@server/initializers/constants' +import { generateTorrentFileName } from '@server/lib/paths' +import { VideoPathManager } from '@server/lib/video-path-manager' import { MVideo } from '@server/types/models/video/video' import { MVideoFile, MVideoFileRedundanciesOpt } from '@server/types/models/video/video-file' -import { isStreamingPlaylist, MStreamingPlaylistVideo } from '@server/types/models/video/video-streaming-playlist' -import { WEBSERVER } from '@server/initializers/constants' -import * as parseTorrent from 'parse-torrent' -import * as magnetUtil from 'magnet-uri' -import { isArray } from '@server/helpers/custom-validators/misc' -import { getTorrentFileName, getVideoFilePath } from '@server/lib/video-paths' -import { extractVideo } from '@server/helpers/video' +import { MStreamingPlaylistVideo } from '@server/types/models/video/video-streaming-playlist' +import { CONFIG } from '../initializers/config' +import { promisify2 } from './core-utils' +import { logger } from './logger' +import { generateVideoImportTmpPath } from './utils' +import { extractVideo } from './video' const createTorrentPromise = promisify2(createTorrent) -async function downloadWebTorrentVideo (target: { magnetUri: string, torrentName?: string }, timeout: number) { - const id = target.magnetUri || target.torrentName +async function downloadWebTorrentVideo (target: { uri: string, torrentName?: string }, timeout: number) { + const id = target.uri || target.torrentName let timer const path = generateVideoImportTmpPath(id) @@ -30,9 +33,9 @@ async function downloadWebTorrentVideo (target: { magnetUri: string, torrentName return new Promise((res, rej) => { const webtorrent = new WebTorrent() - let file: WebTorrent.TorrentFile + let file: TorrentFile - const torrentId = target.magnetUri || join(CONFIG.STORAGE.TORRENTS_DIR, target.torrentName) + const torrentId = target.uri || join(CONFIG.STORAGE.TORRENTS_DIR, target.torrentName) const options = { path: directoryPath } const torrent = webtorrent.add(torrentId, options, torrent => { @@ -47,6 +50,8 @@ async function downloadWebTorrentVideo (target: { magnetUri: string, torrentName .then(() => rej(new Error('Cannot import torrent ' + torrentId + ': there are multiple files in it'))) } + logger.debug('Got torrent from webtorrent %s.', id, { infoHash: torrent.infoHash }) + file = torrent.files[0] // FIXME: avoid creating another stream when https://github.com/webtorrent/webtorrent/issues/1517 is fixed @@ -59,7 +64,13 @@ async function downloadWebTorrentVideo (target: { magnetUri: string, torrentName .catch(err => logger.error('Cannot destroy webtorrent.', { err })) }) - file.createReadStream().pipe(writeStream) + pipeline( + file.createReadStream(), + writeStream, + err => { + if (err) rej(err) + } + ) }) torrent.on('error', err => rej(err)) @@ -78,45 +89,69 @@ async function downloadWebTorrentVideo (target: { magnetUri: string, torrentName }) } -async function createTorrentAndSetInfoHash (videoOrPlaylist: MVideo | MStreamingPlaylistVideo, videoFile: MVideoFile) { +function createTorrentAndSetInfoHash (videoOrPlaylist: MVideo | MStreamingPlaylistVideo, videoFile: MVideoFile) { const video = extractVideo(videoOrPlaylist) - const { baseUrlHttp } = video.getBaseUrls() const options = { // Keep the extname, it's used by the client to stream the file inside a web browser name: `${video.name} ${videoFile.resolution}p${videoFile.extname}`, createdBy: 'PeerTube', - announceList: [ - [ WEBSERVER.WS + '://' + WEBSERVER.HOSTNAME + ':' + WEBSERVER.PORT + '/tracker/socket' ], - [ WEBSERVER.URL + '/tracker/announce' ] - ], - urlList: [ videoOrPlaylist.getVideoFileUrl(videoFile, baseUrlHttp) ] + announceList: buildAnnounceList(), + urlList: buildUrlList(video, videoFile) } - const torrent = await createTorrentPromise(getVideoFilePath(videoOrPlaylist, videoFile), options) + return VideoPathManager.Instance.makeAvailableVideoFile(videoFile.withVideoOrPlaylist(videoOrPlaylist), async videoPath => { + const torrentContent = await createTorrentPromise(videoPath, options) + + const torrentFilename = generateTorrentFileName(videoOrPlaylist, videoFile.resolution) + const torrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, torrentFilename) + logger.info('Creating torrent %s.', torrentPath) + + await writeFile(torrentPath, torrentContent) - const filePath = join(CONFIG.STORAGE.TORRENTS_DIR, getTorrentFileName(videoOrPlaylist, videoFile)) - logger.info('Creating torrent %s.', filePath) + // Remove old torrent file if it existed + if (videoFile.hasTorrent()) { + await remove(join(CONFIG.STORAGE.TORRENTS_DIR, videoFile.torrentFilename)) + } - await writeFile(filePath, torrent) + const parsedTorrent = parseTorrent(torrentContent) + videoFile.infoHash = parsedTorrent.infoHash + videoFile.torrentFilename = torrentFilename + }) +} + +async function updateTorrentUrls (videoOrPlaylist: MVideo | MStreamingPlaylistVideo, videoFile: MVideoFile) { + const video = extractVideo(videoOrPlaylist) + + const oldTorrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, videoFile.torrentFilename) + + const torrentContent = await readFile(oldTorrentPath) + const decoded = decode(torrentContent) + + decoded['announce-list'] = buildAnnounceList() + decoded.announce = decoded['announce-list'][0][0] + + decoded['url-list'] = buildUrlList(video, videoFile) - const parsedTorrent = parseTorrent(torrent) - videoFile.infoHash = parsedTorrent.infoHash + const newTorrentFilename = generateTorrentFileName(videoOrPlaylist, videoFile.resolution) + const newTorrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, newTorrentFilename) + + logger.info('Updating torrent URLs %s -> %s.', oldTorrentPath, newTorrentPath) + + await writeFile(newTorrentPath, encode(decoded)) + await remove(join(CONFIG.STORAGE.TORRENTS_DIR, videoFile.torrentFilename)) + + videoFile.torrentFilename = newTorrentFilename } function generateMagnetUri ( - videoOrPlaylist: MVideo | MStreamingPlaylistVideo, + video: MVideo, videoFile: MVideoFileRedundanciesOpt, - baseUrlHttp: string, - baseUrlWs: string + trackerUrls: string[] ) { - const video = isStreamingPlaylist(videoOrPlaylist) - ? videoOrPlaylist.Video - : videoOrPlaylist - - const xs = videoOrPlaylist.getTorrentUrl(videoFile, baseUrlHttp) - const announce = videoOrPlaylist.getTrackerUrls(baseUrlHttp, baseUrlWs) - let urlList = [ videoOrPlaylist.getVideoFileUrl(videoFile, baseUrlHttp) ] + const xs = videoFile.getTorrentUrl() + const announce = trackerUrls + let urlList = [ videoFile.getFileUrl(video) ] const redundancies = videoFile.RedundancyVideos if (isArray(redundancies)) urlList = urlList.concat(redundancies.map(r => r.fileUrl)) @@ -136,6 +171,7 @@ function generateMagnetUri ( export { createTorrentPromise, + updateTorrentUrls, createTorrentAndSetInfoHash, generateMagnetUri, downloadWebTorrentVideo @@ -144,7 +180,7 @@ export { // --------------------------------------------------------------------------- function safeWebtorrentDestroy ( - webtorrent: WebTorrent.Instance, + webtorrent: Instance, torrentId: string, downloadedFile?: { directoryPath: string, filepath: string }, torrentName?: string @@ -179,3 +215,14 @@ function deleteDownloadedFile (downloadedFile: { directoryPath: string, filepath remove(toRemovePath) .catch(err => logger.error('Cannot remove torrent file %s in webtorrent download.', toRemovePath, { err })) } + +function buildAnnounceList () { + return [ + [ WEBSERVER.WS + '://' + WEBSERVER.HOSTNAME + ':' + WEBSERVER.PORT + '/tracker/socket' ], + [ WEBSERVER.URL + '/tracker/announce' ] + ] +} + +function buildUrlList (video: MVideo, videoFile: MVideoFile) { + return [ videoFile.getFileUrl(video) ] +}