X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fwebtorrent.ts;h=a3c93e6fe101c1abf4bd693ebd29505f2464b38a;hb=e65ef81cf51746616182a822bd6933bf0d16717a;hp=5fe4c1165c24fdd37f183f4a23a601e48fc4b083;hpb=0bae66632a8767f3d5aca080af314bcab56e1889;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/webtorrent.ts b/server/helpers/webtorrent.ts index 5fe4c1165..a3c93e6fe 100644 --- a/server/helpers/webtorrent.ts +++ b/server/helpers/webtorrent.ts @@ -1,10 +1,11 @@ -import * as bencode from 'bencode' -import * as createTorrent from 'create-torrent' -import { createWriteStream, ensureDir, readFile, remove, writeFile } from 'fs-extra' -import * as magnetUtil from 'magnet-uri' -import * as parseTorrent from 'parse-torrent' +import { decode, encode } from 'bencode' +import createTorrent from 'create-torrent' +import { createWriteStream, ensureDir, pathExists, readFile, remove, writeFile } from 'fs-extra' +import magnetUtil from 'magnet-uri' +import parseTorrent from 'parse-torrent' import { dirname, join } from 'path' -import * as WebTorrent from 'webtorrent' +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' @@ -12,17 +13,17 @@ 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 { MStreamingPlaylistVideo } from '@server/types/models/video/video-streaming-playlist' +import { sha1 } from '@shared/extra-utils' import { CONFIG } from '../initializers/config' import { promisify2 } from './core-utils' import { logger } from './logger' import { generateVideoImportTmpPath } from './utils' import { extractVideo } from './video' -import { pipeline } from 'stream' 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) @@ -33,9 +34,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 => { @@ -50,7 +51,7 @@ 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, files: torrent.files }) + logger.debug('Got torrent from webtorrent %s.', id, { infoHash: torrent.infoHash }) file = torrent.files[0] @@ -67,7 +68,9 @@ async function downloadWebTorrentVideo (target: { magnetUri: string, torrentName pipeline( file.createReadStream(), writeStream, - err => rej(err) + err => { + if (err) rej(err) + } ) }) @@ -88,58 +91,75 @@ async function downloadWebTorrentVideo (target: { magnetUri: string, torrentName } function createTorrentAndSetInfoHash (videoOrPlaylist: MVideo | MStreamingPlaylistVideo, videoFile: MVideoFile) { + return VideoPathManager.Instance.makeAvailableVideoFile(videoFile.withVideoOrPlaylist(videoOrPlaylist), videoPath => { + return createTorrentAndSetInfoHashFromPath(videoOrPlaylist, videoFile, videoPath) + }) +} + +async function createTorrentAndSetInfoHashFromPath ( + videoOrPlaylist: MVideo | MStreamingPlaylistVideo, + videoFile: MVideoFile, + filePath: string +) { const video = extractVideo(videoOrPlaylist) 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}`, + name: buildInfoName(video, videoFile), createdBy: 'PeerTube', announceList: buildAnnounceList(), urlList: buildUrlList(video, videoFile) } - return VideoPathManager.Instance.makeAvailableVideoFile(videoOrPlaylist, videoFile, async videoPath => { - const torrentContent = await createTorrentPromise(videoPath, options) + const torrentContent = await createTorrentPromise(filePath, options) - const torrentFilename = generateTorrentFileName(videoOrPlaylist, videoFile.resolution) - const torrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, torrentFilename) - logger.info('Creating torrent %s.', torrentPath) + const torrentFilename = generateTorrentFileName(videoOrPlaylist, videoFile.resolution) + const torrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, torrentFilename) + logger.info('Creating torrent %s.', torrentPath) - await writeFile(torrentPath, torrentContent) + await writeFile(torrentPath, torrentContent) - // Remove old torrent file if it existed - if (videoFile.hasTorrent()) { - await remove(join(CONFIG.STORAGE.TORRENTS_DIR, videoFile.torrentFilename)) - } + // Remove old torrent file if it existed + if (videoFile.hasTorrent()) { + await remove(join(CONFIG.STORAGE.TORRENTS_DIR, videoFile.torrentFilename)) + } - const parsedTorrent = parseTorrent(torrentContent) - videoFile.infoHash = parsedTorrent.infoHash - videoFile.torrentFilename = torrentFilename - }) + const parsedTorrent = parseTorrent(torrentContent) + videoFile.infoHash = parsedTorrent.infoHash + videoFile.torrentFilename = torrentFilename } -async function updateTorrentUrls (videoOrPlaylist: MVideo | MStreamingPlaylistVideo, videoFile: MVideoFile) { +async function updateTorrentMetadata (videoOrPlaylist: MVideo | MStreamingPlaylistVideo, videoFile: MVideoFile) { const video = extractVideo(videoOrPlaylist) const oldTorrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, videoFile.torrentFilename) + if (!await pathExists(oldTorrentPath)) { + logger.info('Do not update torrent metadata %s of video %s because the file does not exist anymore.', video.uuid, oldTorrentPath) + return + } + const torrentContent = await readFile(oldTorrentPath) - const decoded = bencode.decode(torrentContent) + const decoded = decode(torrentContent) decoded['announce-list'] = buildAnnounceList() decoded.announce = decoded['announce-list'][0][0] decoded['url-list'] = buildUrlList(video, videoFile) + decoded.info.name = buildInfoName(video, videoFile) + decoded['creation date'] = Math.ceil(Date.now() / 1000) + const newTorrentFilename = generateTorrentFileName(videoOrPlaylist, videoFile.resolution) const newTorrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, newTorrentFilename) - logger.info('Updating torrent URLs %s -> %s.', oldTorrentPath, newTorrentPath) + logger.info('Updating torrent metadata %s -> %s.', oldTorrentPath, newTorrentPath) - await writeFile(newTorrentPath, bencode.encode(decoded)) - await remove(join(CONFIG.STORAGE.TORRENTS_DIR, videoFile.torrentFilename)) + await writeFile(newTorrentPath, encode(decoded)) + await remove(oldTorrentPath) videoFile.torrentFilename = newTorrentFilename + videoFile.infoHash = sha1(encode(decoded.info)) } function generateMagnetUri ( @@ -149,7 +169,10 @@ function generateMagnetUri ( ) { const xs = videoFile.getTorrentUrl() const announce = trackerUrls - let urlList = [ videoFile.getFileUrl(video) ] + + let urlList = video.hasPrivateStaticPath() + ? [] + : [ videoFile.getFileUrl(video) ] const redundancies = videoFile.RedundancyVideos if (isArray(redundancies)) urlList = urlList.concat(redundancies.map(r => r.fileUrl)) @@ -169,8 +192,11 @@ function generateMagnetUri ( export { createTorrentPromise, - updateTorrentUrls, + updateTorrentMetadata, + createTorrentAndSetInfoHash, + createTorrentAndSetInfoHashFromPath, + generateMagnetUri, downloadWebTorrentVideo } @@ -178,7 +204,7 @@ export { // --------------------------------------------------------------------------- function safeWebtorrentDestroy ( - webtorrent: WebTorrent.Instance, + webtorrent: Instance, torrentId: string, downloadedFile?: { directoryPath: string, filepath: string }, torrentName?: string @@ -222,5 +248,11 @@ function buildAnnounceList () { } function buildUrlList (video: MVideo, videoFile: MVideoFile) { + if (video.hasPrivateStaticPath()) return [] + return [ videoFile.getFileUrl(video) ] } + +function buildInfoName (video: MVideo, videoFile: MVideoFile) { + return `${video.name} ${videoFile.resolution}p${videoFile.extname}` +}