Update node modules

[github/Chocobozzz/PeerTube.git] / src / webTorrentNode.js

diff --git a/src/webTorrentNode.js b/src/webTorrentNode.js
index ebe8d5d81026217a36cdcc7fab47955369093115..d6801d0fb32a958e49bbbc0dfedea145874cf8e6 100644 (file)
--- a/src/webTorrentNode.js
+++ b/src/webTorrentNode.js
@@ -1,10 +1,10 @@
 ;(function () {
   'use strict'
 
-  var spawn = require('electron-spawn')
   var config = require('config')
   var ipc = require('node-ipc')
   var pathUtils = require('path')
+  var spawn = require('electron-spawn')
 
   var logger = require('./logger')
 
@@ -43,11 +43,23 @@
     ipc.serve(function () {
       if (!webtorrentnode.silent) logger.info('IPC server ready.')
 
+      // Run a timeout of 30s after which we exit the process
+      var timeout_webtorrent_process = setTimeout(function () {
+        logger.error('Timeout : cannot run the webtorrent process. Please ensure you have electron-prebuilt npm package installed with xvfb-run.')
+        process.exit()
+      }, 30000)
+
       ipc.server.on(processKey + '.ready', function () {
         if (!webtorrentnode.silent) logger.info('Webtorrent process ready.')
+        clearTimeout(timeout_webtorrent_process)
         callback()
       })
 
+      ipc.server.on(processKey + '.exception', function (data) {
+        logger.error('Received exception error from webtorrent process.', { exception: data.exception })
+        process.exit()
+      })
+
       var webtorrent_process = spawn(__dirname + '/webtorrent.js', host, port, { detached: true })
       webtorrent_process.stderr.on('data', function (data) {
         // logger.debug('Webtorrent process stderr: ', data.toString())
@@ -57,15 +69,6 @@
         // logger.debug('Webtorrent process:', data.toString())
       })
 
-      function exitChildProcess () {
-        if (!webtorrentnode.silent) logger.info('Gracefully exit child')
-        process.kill(-webtorrent_process.pid)
-        process.exit(0)
-      }
-
-      process.on('SIGINT', exitChildProcess)
-      process.on('SIGTERM', exitChildProcess)
-
       webtorrentnode.app = webtorrent_process
     })
 
@@ -82,17 +85,19 @@
       }
     }
 
-    if (!webtorrentnode.silent) logger.debug('Node wants to seed ' + data._id)
+    if (!webtorrentnode.silent) logger.debug('Node wants to seed %s.', data._id)
 
     // Finish signal
-    ipc.server.on(nodeKey + '.seedDone.' + data._id, function (received) {
-      if (!webtorrentnode.silent) logger.debug('Process seeded torrent ' + received.magnetUri)
+    var event_key = nodeKey + '.seedDone.' + data._id
+    ipc.server.on(event_key, function listener (received) {
+      if (!webtorrentnode.silent) logger.debug('Process seeded torrent %s.', received.magnetUri)
 
       // This is a fake object, we just use the magnetUri in this project
       var torrent = {
         magnetURI: received.magnetUri
       }
 
+      ipc.server.off(event_key)
       callback(torrent)
     })
 
@@ -110,14 +115,16 @@
     if (!webtorrentnode.silent) logger.debug('Node wants to add ' + data._id)
 
     // Finish signal
-    ipc.server.on(nodeKey + '.addDone.' + data._id, function (received) {
-      if (!webtorrentnode.silent) logger.debug('Process added torrent')
+    var event_key = nodeKey + '.addDone.' + data._id
+    ipc.server.on(event_key, function (received) {
+      if (!webtorrentnode.silent) logger.debug('Process added torrent.')
 
       // This is a fake object, we just use the magnetUri in this project
       var torrent = {
         files: received.files
       }
 
+      ipc.server.off(event_key)
       callback(torrent)
     })
 
@@ -132,15 +139,17 @@
       }
     }
 
-    if (!webtorrentnode.silent) logger.debug('Node wants to stop seeding ' + data._id)
+    if (!webtorrentnode.silent) logger.debug('Node wants to stop seeding %s.', data._id)
 
     // Finish signal
-    ipc.server.on(nodeKey + '.removeDone.' + data._id, function (received) {
-      if (!webtorrentnode.silent) logger.debug('Process removed torrent ' + data._id)
+    var event_key = nodeKey + '.removeDone.' + data._id
+    ipc.server.on(event_key, function (received) {
+      if (!webtorrentnode.silent) logger.debug('Process removed torrent %s.', data._id)
 
       var err = null
       if (received.err) err = received.err
 
+      ipc.server.off(event_key)
       callback(err)
     })