Correct webtorrent download cleanup

[github/Chocobozzz/PeerTube.git] / server / helpers / webtorrent.ts

diff --git a/server/helpers/webtorrent.ts b/server/helpers/webtorrent.ts
index fce88a1f64f5356e736516d4fa13a7ed7225ae95..6f2adb3cb447d9eb74bfbffbc2821b493eccc84f 100644 (file)
--- a/server/helpers/webtorrent.ts
+++ b/server/helpers/webtorrent.ts
@@ -2,23 +2,46 @@ import { logger } from './logger'
 import { generateVideoTmpPath } from './utils'
 import * as WebTorrent from 'webtorrent'
 import { createWriteStream } from 'fs'
+import { CONFIG } from '../initializers'
+import { join } from 'path'
+import { unlinkPromise } from './core-utils'
 
-function downloadWebTorrentVideo (target: string) {
-  const path = generateVideoTmpPath(target)
+function downloadWebTorrentVideo (target: { magnetUri: string, torrentName: string }) {
+  const id = target.magnetUri || target.torrentName
 
-  logger.info('Importing torrent video %s', target)
+  const path = generateVideoTmpPath(id)
+  logger.info('Importing torrent video %s', id)
 
   return new Promise<string>((res, rej) => {
     const webtorrent = new WebTorrent()
 
-    const torrent = webtorrent.add(target, torrent => {
-      if (torrent.files.length !== 1) throw new Error('The number of files is not equal to 1 for ' + target)
+    const torrentId = target.magnetUri || join(CONFIG.STORAGE.TORRENTS_DIR, target.torrentName)
+
+    const options = { path: CONFIG.STORAGE.VIDEOS_DIR }
+    const torrent = webtorrent.add(torrentId, options, torrent => {
+      if (torrent.files.length !== 1) return rej(new Error('The number of files is not equal to 1 for ' + torrentId))
 
       const file = torrent.files[ 0 ]
-      file.createReadStream().pipe(createWriteStream(path))
-    })
 
-    torrent.on('done', () => res(path))
+      const writeStream = createWriteStream(path)
+      writeStream.on('finish', () => {
+        webtorrent.destroy(async err => {
+          if (err) return rej(err)
+
+          if (target.torrentName) {
+            unlinkPromise(torrentId)
+              .catch(err => logger.error('Cannot remove torrent %s in webtorrent download.', torrentId, { err }))
+          }
+
+          unlinkPromise(join(CONFIG.STORAGE.VIDEOS_DIR, file.name))
+            .catch(err => logger.error('Cannot remove torrent file %s in webtorrent download.', file.name, { err }))
+
+          res(path)
+        })
+      })
+
+      file.createReadStream().pipe(writeStream)
+    })
 
     torrent.on('error', err => rej(err))
   })