1 files changed, 126 insertions, 128 deletions

diff --git a/lib/webtorrent.js b/lib/webtorrent.js
index 083e5b77a..5f10322a5 100644
--- a/lib/webtorrent.js
+++ b/lib/webtorrent.js
@@ -1,161 +1,159 @@
-;(function () {
-  'use strict'
-
-  var config = require('config')
-  var ipc = require('node-ipc')
-  var pathUtils = require('path')
-  var spawn = require('electron-spawn')
-
-  var logger = require('../helpers/logger')
-
-  var host = config.get('webserver.host')
-  var port = config.get('webserver.port')
-  var nodeKey = 'webtorrentnode' + port
-  var processKey = 'webtorrentprocess' + port
-  ipc.config.silent = true
-  ipc.config.id = nodeKey
-
-  var webtorrent = {
-    add: add,
-    app: null, // Pid of the app
-    create: create,
-    remove: remove,
-    seed: seed,
-    silent: false // Useful for beautiful tests
+'use strict'
+
+var config = require('config')
+var ipc = require('node-ipc')
+var pathUtils = require('path')
+var spawn = require('electron-spawn')
+
+var logger = require('../helpers/logger')
+
+var host = config.get('webserver.host')
+var port = config.get('webserver.port')
+var nodeKey = 'webtorrentnode' + port
+var processKey = 'webtorrentprocess' + port
+ipc.config.silent = true
+ipc.config.id = nodeKey
+
+var webtorrent = {
+  add: add,
+  app: null, // Pid of the app
+  create: create,
+  remove: remove,
+  seed: seed,
+  silent: false // Useful for beautiful tests
+}
+
+function create (options, callback) {
+  if (typeof options === 'function') {
+    callback = options
+    options = {}
   }
 
-  function create (options, callback) {
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-
-    // Override options
-    if (options.host) host = options.host
-    if (options.port) {
-      port = options.port
-      nodeKey = 'webtorrentnode' + port
-      processKey = 'webtorrentprocess' + port
-      ipc.config.id = nodeKey
-    }
-
-    ipc.serve(function () {
-      if (!webtorrent.silent) logger.info('IPC server ready.')
+  // Override options
+  if (options.host) host = options.host
+  if (options.port) {
+    port = options.port
+    nodeKey = 'webtorrentnode' + port
+    processKey = 'webtorrentprocess' + port
+    ipc.config.id = nodeKey
+  }
 
-      // 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.serve(function () {
+    if (!webtorrent.silent) logger.info('IPC server ready.')
 
-      ipc.server.on(processKey + '.ready', function () {
-        if (!webtorrent.silent) logger.info('Webtorrent process ready.')
-        clearTimeout(timeout_webtorrent_process)
-        callback()
-      })
+    // 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 + '.exception', function (data) {
-        logger.error('Received exception error from webtorrent process.', { exception: data.exception })
-        process.exit()
-      })
+    ipc.server.on(processKey + '.ready', function () {
+      if (!webtorrent.silent) logger.info('Webtorrent process ready.')
+      clearTimeout(timeout_webtorrent_process)
+      callback()
+    })
 
-      var webtorrent_process = spawn(pathUtils.join(__dirname, 'webtorrentProcess.js'), host, port, { detached: true })
-      webtorrent_process.stderr.on('data', function (data) {
-        // logger.debug('Webtorrent process stderr: ', data.toString())
-      })
+    ipc.server.on(processKey + '.exception', function (data) {
+      logger.error('Received exception error from webtorrent process.', { exception: data.exception })
+      process.exit()
+    })
 
-      webtorrent_process.stdout.on('data', function (data) {
-        // logger.debug('Webtorrent process:', data.toString())
-      })
+    var webtorrent_process = spawn(pathUtils.join(__dirname, 'webtorrentProcess.js'), host, port, { detached: true })
+    webtorrent_process.stderr.on('data', function (data) {
+      // logger.debug('Webtorrent process stderr: ', data.toString())
+    })
 
-      webtorrent.app = webtorrent_process
+    webtorrent_process.stdout.on('data', function (data) {
+      // logger.debug('Webtorrent process:', data.toString())
     })
 
-    ipc.server.start()
-  }
+    webtorrent.app = webtorrent_process
+  })
 
-  function seed (path, callback) {
-    var extension = pathUtils.extname(path)
-    var basename = pathUtils.basename(path, extension)
-    var data = {
-      _id: basename,
-      args: {
-        path: path
-      }
+  ipc.server.start()
+}
+
+function seed (path, callback) {
+  var extension = pathUtils.extname(path)
+  var basename = pathUtils.basename(path, extension)
+  var data = {
+    _id: basename,
+    args: {
+      path: path
     }
+  }
 
-    if (!webtorrent.silent) logger.debug('Node wants to seed %s.', data._id)
+  if (!webtorrent.silent) logger.debug('Node wants to seed %s.', data._id)
 
-    // Finish signal
-    var event_key = nodeKey + '.seedDone.' + data._id
-    ipc.server.on(event_key, function listener (received) {
-      if (!webtorrent.silent) logger.debug('Process seeded torrent %s.', received.magnetUri)
+  // Finish signal
+  var event_key = nodeKey + '.seedDone.' + data._id
+  ipc.server.on(event_key, function listener (received) {
+    if (!webtorrent.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
-      }
+    // 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)
-    })
+    ipc.server.off(event_key)
+    callback(torrent)
+  })
 
-    ipc.server.broadcast(processKey + '.seed', data)
-  }
+  ipc.server.broadcast(processKey + '.seed', data)
+}
 
-  function add (magnetUri, callback) {
-    var data = {
-      _id: magnetUri,
-      args: {
-        magnetUri: magnetUri
-      }
+function add (magnetUri, callback) {
+  var data = {
+    _id: magnetUri,
+    args: {
+      magnetUri: magnetUri
     }
+  }
 
-    if (!webtorrent.silent) logger.debug('Node wants to add ' + data._id)
+  if (!webtorrent.silent) logger.debug('Node wants to add ' + data._id)
 
-    // Finish signal
-    var event_key = nodeKey + '.addDone.' + data._id
-    ipc.server.on(event_key, function (received) {
-      if (!webtorrent.silent) logger.debug('Process added torrent.')
+  // Finish signal
+  var event_key = nodeKey + '.addDone.' + data._id
+  ipc.server.on(event_key, function (received) {
+    if (!webtorrent.silent) logger.debug('Process added torrent.')
 
-      // This is a fake object, we just use the magnetUri in this project
-      var torrent = {
-        files: received.files
-      }
+    // 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)
-    })
+    ipc.server.off(event_key)
+    callback(torrent)
+  })
 
-    ipc.server.broadcast(processKey + '.add', data)
-  }
+  ipc.server.broadcast(processKey + '.add', data)
+}
 
-  function remove (magnetUri, callback) {
-    var data = {
-      _id: magnetUri,
-      args: {
-        magnetUri: magnetUri
-      }
+function remove (magnetUri, callback) {
+  var data = {
+    _id: magnetUri,
+    args: {
+      magnetUri: magnetUri
     }
+  }
 
-    if (!webtorrent.silent) logger.debug('Node wants to stop seeding %s.', data._id)
+  if (!webtorrent.silent) logger.debug('Node wants to stop seeding %s.', data._id)
 
-    // Finish signal
-    var event_key = nodeKey + '.removeDone.' + data._id
-    ipc.server.on(event_key, function (received) {
-      if (!webtorrent.silent) logger.debug('Process removed torrent %s.', data._id)
+  // Finish signal
+  var event_key = nodeKey + '.removeDone.' + data._id
+  ipc.server.on(event_key, function (received) {
+    if (!webtorrent.silent) logger.debug('Process removed torrent %s.', data._id)
 
-      var err = null
-      if (received.err) err = received.err
+    var err = null
+    if (received.err) err = received.err
 
-      ipc.server.off(event_key)
-      callback(err)
-    })
+    ipc.server.off(event_key)
+    callback(err)
+  })
 
-    ipc.server.broadcast(processKey + '.remove', data)
-  }
+  ipc.server.broadcast(processKey + '.remove', data)
+}
 
-  // ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
-  module.exports = webtorrent
-})()
+module.exports = webtorrent