From f0f5567b6918fc60c8cab15e13aec03a89a91dfb Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 16 Mar 2016 22:29:27 +0100 Subject: Use const/let now we use node 4.2 --- server/lib/friends.js | 62 ++++++++++++++++++++--------------------- server/lib/poolRequests.js | 36 ++++++++++++------------ server/lib/videos.js | 21 +++++++------- server/lib/webtorrent.js | 46 +++++++++++++++--------------- server/lib/webtorrentProcess.js | 38 ++++++++++++------------- 5 files changed, 101 insertions(+), 102 deletions(-) (limited to 'server/lib') diff --git a/server/lib/friends.js b/server/lib/friends.js index 006a64404..c3c231604 100644 --- a/server/lib/friends.js +++ b/server/lib/friends.js @@ -1,23 +1,23 @@ 'use strict' -var async = require('async') -var config = require('config') -var fs = require('fs') -var request = require('request') - -var constants = require('../initializers/constants') -var logger = require('../helpers/logger') -var peertubeCrypto = require('../helpers/peertubeCrypto') -var Pods = require('../models/pods') -var poolRequests = require('../lib/poolRequests') -var requests = require('../helpers/requests') -var Videos = require('../models/videos') - -var http = config.get('webserver.https') ? 'https' : 'http' -var host = config.get('webserver.host') -var port = config.get('webserver.port') - -var pods = { +const async = require('async') +const config = require('config') +const fs = require('fs') +const request = require('request') + +const constants = require('../initializers/constants') +const logger = require('../helpers/logger') +const peertubeCrypto = require('../helpers/peertubeCrypto') +const Pods = require('../models/pods') +const poolRequests = require('../lib/poolRequests') +const requests = require('../helpers/requests') +const Videos = require('../models/videos') + +const http = config.get('webserver.https') ? 'https' : 'http' +const host = config.get('webserver.host') +const port = config.get('webserver.port') + +const pods = { addVideoToFriends: addVideoToFriends, hasFriends: hasFriends, makeFriends: makeFriends, @@ -27,7 +27,7 @@ var pods = { function addVideoToFriends (video) { // To avoid duplicates - var id = video.name + video.magnetUri + const id = video.name + video.magnetUri // ensure namePath is null video.namePath = null poolRequests.addRequest(id, 'add', video) @@ -37,13 +37,13 @@ function hasFriends (callback) { Pods.count(function (err, count) { if (err) return callback(err) - var has_friends = (count !== 0) + const has_friends = (count !== 0) callback(null, has_friends) }) } function makeFriends (callback) { - var pods_score = {} + const pods_score = {} logger.info('Make friends!') fs.readFile(peertubeCrypto.getCertDir() + 'peertube.pub', 'utf8', function (err, cert) { @@ -52,7 +52,7 @@ function makeFriends (callback) { return callback(err) } - var urls = config.get('network.friends') + const urls = config.get('network.friends') async.each(urls, function (url, callback) { computeForeignPodsList(url, pods_score, callback) @@ -60,8 +60,8 @@ function makeFriends (callback) { if (err) return callback(err) logger.debug('Pods scores computed.', { pods_score: pods_score }) - var pods_list = computeWinningPods(urls, pods_score) - logger.debug('Pods that we keep computed.', { pods_to_keep: pods_list }) + const pods_list = computeWinningPods(urls, pods_score) + logger.debug('Pods that we keep.', { pods_to_keep: pods_list }) makeRequestsToWinningPods(cert, pods_list, callback) }) @@ -77,7 +77,7 @@ function quitFriends (callback) { Pods.list(function (err, pods) { if (err) return callback(err) - var request = { + const request = { method: 'POST', path: '/api/' + constants.API_VERSION + '/pods/remove', sign: true, @@ -109,7 +109,7 @@ function quitFriends (callback) { function removeVideoToFriends (video) { // To avoid duplicates - var id = video.name + video.magnetUri + const id = video.name + video.magnetUri poolRequests.addRequest(id, 'remove', video) } @@ -128,7 +128,7 @@ function computeForeignPodsList (url, pods_score, callback) { if (foreign_pods_list.length === 0) return callback() async.each(foreign_pods_list, function (foreign_pod, callback_each) { - var foreign_url = foreign_pod.url + const foreign_url = foreign_pod.url if (pods_score[foreign_url]) pods_score[foreign_url]++ else pods_score[foreign_url] = 1 @@ -143,8 +143,8 @@ function computeForeignPodsList (url, pods_score, callback) { function computeWinningPods (urls, pods_score) { // Build the list of pods to add // Only add a pod if it exists in more than a half base pods - var pods_list = [] - var base_score = urls.length / 2 + const pods_list = [] + const base_score = urls.length / 2 Object.keys(pods_score).forEach(function (pod) { if (pods_score[pod] > base_score) pods_list.push({ url: pod }) }) @@ -153,7 +153,7 @@ function computeWinningPods (urls, pods_score) { } function getForeignPodsList (url, callback) { - var path = '/api/' + constants.API_VERSION + '/pods' + const path = '/api/' + constants.API_VERSION + '/pods' request.get(url + path, function (err, response, body) { if (err) return callback(err) @@ -175,7 +175,7 @@ function makeRequestsToWinningPods (cert, pods_list, callback) { return callback(err) } - var data = { + const data = { url: http + '://' + host + ':' + port, publicKey: cert, videos: videos_list diff --git a/server/lib/poolRequests.js b/server/lib/poolRequests.js index f786c3c7a..2eb501311 100644 --- a/server/lib/poolRequests.js +++ b/server/lib/poolRequests.js @@ -1,18 +1,18 @@ 'use strict' -var async = require('async') -var pluck = require('lodash-node/compat/collection/pluck') +const async = require('async') +const pluck = require('lodash-node/compat/collection/pluck') -var constants = require('../initializers/constants') -var logger = require('../helpers/logger') -var Pods = require('../models/pods') -var PoolRequests = require('../models/poolRequests') -var requests = require('../helpers/requests') -var Videos = require('../models/videos') +const constants = require('../initializers/constants') +const logger = require('../helpers/logger') +const Pods = require('../models/pods') +const PoolRequests = require('../models/poolRequests') +const requests = require('../helpers/requests') +const Videos = require('../models/videos') -var timer = null +let timer = null -var poolRequests = { +const poolRequests = { activate: activate, addRequest: addRequest, deactivate: deactivate, @@ -77,7 +77,7 @@ function makePoolRequest (type, requests_to_make, callback) { Pods.list(function (err, pods) { if (err) return callback(err) - var params = { + const params = { encrypt: true, sign: true, method: 'POST', @@ -93,8 +93,8 @@ function makePoolRequest (type, requests_to_make, callback) { return callback(new Error('Unkown pool request type.')) } - var bad_pods = [] - var good_pods = [] + const bad_pods = [] + const good_pods = [] requests.makeMultipleRetryRequest(params, pods, callbackEachPodFinished, callbackAllPodsFinished) @@ -129,7 +129,7 @@ function makePoolRequests () { if (pool_requests.length === 0) return - var requests_to_make = { + const requests_to_make = { add: { ids: [], requests: [] @@ -184,14 +184,14 @@ function removeBadPods () { if (pods.length === 0) return - var urls = pluck(pods, 'url') - var ids = pluck(pods, '_id') + const urls = pluck(pods, 'url') + const ids = pluck(pods, '_id') Videos.removeAllRemotesOf(urls, function (err, r) { if (err) { logger.error('Cannot remove videos from a pod that we removing.', { error: err }) } else { - var videos_removed = r.result.n + const videos_removed = r.result.n logger.info('Removed %d videos.', videos_removed) } @@ -199,7 +199,7 @@ function removeBadPods () { if (err) { logger.error('Cannot remove bad pods.', { error: err }) } else { - var pods_removed = r.result.n + const pods_removed = r.result.n logger.info('Removed %d pods.', pods_removed) } }) diff --git a/server/lib/videos.js b/server/lib/videos.js index a5fe7b0c4..eb3a0125a 100644 --- a/server/lib/videos.js +++ b/server/lib/videos.js @@ -1,25 +1,24 @@ 'use strict' -var async = require('async') -var config = require('config') -// TODO -var path = require('path') -var webtorrent = require('../lib/webtorrent') +const async = require('async') +const config = require('config') +const pathUtils = require('path') +const webtorrent = require('../lib/webtorrent') -var logger = require('../helpers/logger') -var Videos = require('../models/videos') +const logger = require('../helpers/logger') +const Videos = require('../models/videos') -var uploadDir = path.join(__dirname, '..', '..', config.get('storage.uploads')) +const uploadDir = pathUtils.join(__dirname, '..', '..', config.get('storage.uploads')) -var videos = { +const videos = { getVideoState: getVideoState, seed: seed, seedAllExisting: seedAllExisting } function getVideoState (video, callback) { - var exist = (video !== null) - var owned = false + const exist = (video !== null) + let owned = false if (exist === true) { owned = (video.namePath !== null) } diff --git a/server/lib/webtorrent.js b/server/lib/webtorrent.js index cb641fead..455b086a3 100644 --- a/server/lib/webtorrent.js +++ b/server/lib/webtorrent.js @@ -1,20 +1,20 @@ 'use strict' -var config = require('config') -var ipc = require('node-ipc') -var pathUtils = require('path') -var spawn = require('electron-spawn') +const config = require('config') +const ipc = require('node-ipc') +const pathUtils = require('path') +const spawn = require('electron-spawn') -var logger = require('../helpers/logger') +const logger = require('../helpers/logger') -var host = config.get('webserver.host') -var port = config.get('webserver.port') -var nodeKey = 'webtorrentnode' + port -var processKey = 'webtorrentprocess' + port +let host = config.get('webserver.host') +let port = config.get('webserver.port') +let nodeKey = 'webtorrentnode' + port +let processKey = 'webtorrentprocess' + port ipc.config.silent = true ipc.config.id = nodeKey -var webtorrent = { +const webtorrent = { add: add, app: null, // Pid of the app create: create, @@ -42,7 +42,7 @@ function create (options, callback) { if (!webtorrent.silent) logger.info('IPC server ready.') // Run a timeout of 30s after which we exit the process - var timeout_webtorrent_process = setTimeout(function () { + const timeout_webtorrent_process = setTimeout(function () { throw new Error('Timeout : cannot run the webtorrent process. Please ensure you have electron-prebuilt npm package installed with xvfb-run.') }, 30000) @@ -56,7 +56,7 @@ function create (options, callback) { throw new Error('Received exception error from webtorrent process.' + data.exception) }) - var webtorrent_process = spawn(pathUtils.join(__dirname, 'webtorrentProcess.js'), host, port, { detached: true }) + const 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()) }) @@ -72,9 +72,9 @@ function create (options, callback) { } function seed (path, callback) { - var extension = pathUtils.extname(path) - var basename = pathUtils.basename(path, extension) - var data = { + const extension = pathUtils.extname(path) + const basename = pathUtils.basename(path, extension) + const data = { _id: basename, args: { path: path @@ -84,12 +84,12 @@ function seed (path, callback) { if (!webtorrent.silent) logger.debug('Node wants to seed %s.', data._id) // Finish signal - var event_key = nodeKey + '.seedDone.' + data._id + const 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 = { + const torrent = { magnetURI: received.magnetUri } @@ -101,7 +101,7 @@ function seed (path, callback) { } function add (magnetUri, callback) { - var data = { + const data = { _id: magnetUri, args: { magnetUri: magnetUri @@ -111,12 +111,12 @@ function add (magnetUri, callback) { if (!webtorrent.silent) logger.debug('Node wants to add ' + data._id) // Finish signal - var event_key = nodeKey + '.addDone.' + data._id + const 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 = { + const torrent = { files: received.files } @@ -128,7 +128,7 @@ function add (magnetUri, callback) { } function remove (magnetUri, callback) { - var data = { + const data = { _id: magnetUri, args: { magnetUri: magnetUri @@ -138,11 +138,11 @@ function remove (magnetUri, callback) { if (!webtorrent.silent) logger.debug('Node wants to stop seeding %s.', data._id) // Finish signal - var event_key = nodeKey + '.removeDone.' + data._id + const 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 + let err = null if (received.err) err = received.err ipc.server.off(event_key) diff --git a/server/lib/webtorrentProcess.js b/server/lib/webtorrentProcess.js index 7da52523a..c68e97ee4 100644 --- a/server/lib/webtorrentProcess.js +++ b/server/lib/webtorrentProcess.js @@ -1,32 +1,32 @@ 'use strict' -var WebTorrent = require('webtorrent') -var ipc = require('node-ipc') +const WebTorrent = require('webtorrent') +const ipc = require('node-ipc') function webtorrent (args) { if (args.length !== 3) { throw new Error('Wrong arguments number: ' + args.length + '/3') } - var host = args[1] - var port = args[2] - var nodeKey = 'webtorrentnode' + port - var processKey = 'webtorrentprocess' + port + const host = args[1] + const port = args[2] + const nodeKey = 'webtorrentnode' + port + const processKey = 'webtorrentprocess' + port ipc.config.silent = true ipc.config.id = processKey if (host === 'client' && port === '1') global.WEBTORRENT_ANNOUNCE = [] else global.WEBTORRENT_ANNOUNCE = 'ws://' + host + ':' + port + '/tracker/socket' - var wt = new WebTorrent({ dht: false }) + const wt = new WebTorrent({ dht: false }) function seed (data) { - var args = data.args - var path = args.path - var _id = data._id + const args = data.args + const path = args.path + const _id = data._id wt.seed(path, { announceList: '' }, function (torrent) { - var to_send = { + const to_send = { magnetUri: torrent.magnetURI } @@ -35,12 +35,12 @@ function webtorrent (args) { } function add (data) { - var args = data.args - var magnetUri = args.magnetUri - var _id = data._id + const args = data.args + const magnetUri = args.magnetUri + const _id = data._id wt.add(magnetUri, function (torrent) { - var to_send = { + const to_send = { files: [] } @@ -53,9 +53,9 @@ function webtorrent (args) { } function remove (data) { - var args = data.args - var magnetUri = args.magnetUri - var _id = data._id + const args = data.args + const magnetUri = args.magnetUri + const _id = data._id try { wt.remove(magnetUri, callback) @@ -65,7 +65,7 @@ function webtorrent (args) { } function callback () { - var to_send = {} + const to_send = {} ipc.of[nodeKey].emit(nodeKey + '.removeDone.' + _id, to_send) } } -- cgit v1.2.3