3 files changed, 8 insertions, 9 deletions

diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
index 25eb6454a..3b38da66c 100644
--- a/server/helpers/core-utils.ts
+++ b/server/helpers/core-utils.ts
@@ -5,7 +5,7 @@
 
 import * as bcrypt from 'bcrypt'
 import * as createTorrent from 'create-torrent'
-import { pseudoRandomBytes } from 'crypto'
+import { createHash, pseudoRandomBytes } from 'crypto'
 import { copyFile, readdir, readFile, rename, stat, Stats, unlink, writeFile } from 'fs'
 import * as mkdirp from 'mkdirp'
 import { isAbsolute, join } from 'path'
@@ -13,7 +13,6 @@ import * as pem from 'pem'
 import * as rimraf from 'rimraf'
 import { URL } from 'url'
 import { truncate } from 'lodash'
-import * as crypto from 'crypto'
 
 function sanitizeUrl (url: string) {
   const urlObject = new URL(url)
@@ -97,7 +96,7 @@ function peertubeTruncate (str: string, maxLength: number) {
 }
 
 function sha256 (str: string) {
-  return crypto.createHash('sha256').update(str).digest('hex')
+  return createHash('sha256').update(str).digest('hex')
 }
 
 function promisify0<A> (func: (cb: (err: any, result: A) => void) => void): () => Promise<A> {
diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts
index 2ad87951e..eaad55555 100644
--- a/server/helpers/utils.ts
+++ b/server/helpers/utils.ts
@@ -9,8 +9,7 @@ import { ApplicationModel } from '../models/application/application'
 import { pseudoRandomBytesPromise, sha256, unlinkPromise } from './core-utils'
 import { logger } from './logger'
 import { isArray } from './custom-validators/misc'
-import * as crypto from "crypto"
-import { join } from "path"
+import { join } from 'path'
 import { Instance as ParseTorrent } from 'parse-torrent'
 
 const isCidr = require('is-cidr')
diff --git a/server/helpers/webtorrent.ts b/server/helpers/webtorrent.ts
index 04b3ac71b..121cd0b41 100644
--- a/server/helpers/webtorrent.ts
+++ b/server/helpers/webtorrent.ts
@@ -2,7 +2,6 @@ import { logger } from './logger'
 import { generateVideoTmpPath } from './utils'
 import * as WebTorrent from 'webtorrent'
 import { createWriteStream } from 'fs'
-import { Instance as ParseTorrent } from 'parse-torrent'
 import { CONFIG } from '../initializers'
 import { join } from 'path'
 
@@ -20,10 +19,12 @@ function downloadWebTorrentVideo (target: { magnetUri: string, torrentName: stri
       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', () => res(path))
+
+      file.createReadStream().pipe(writeStream)
+    })
 
     torrent.on('error', err => rej(err))
   })