Bump eslint from 3.19.0 to 4.19.1 (#1504)

lynckia · Nov 25, 2019 · d546d84 · d546d84
1 parent 27749a4
commit d546d84
Show file tree

Hide file tree

Showing 43 changed files with 407 additions and 422 deletions.
diff --git a/erizo_controller/ROV/rovClient.js b/erizo_controller/ROV/rovClient.js
@@ -6,7 +6,6 @@ const logger = require('./../common/logger').logger;
 const log = logger.getLogger('RovClient');
 
 class NuveProxy {
-
   constructor(amqper) {
     this.amqper = amqper;
   }
@@ -31,7 +30,6 @@ class NuveProxy {
   getErizoControllers() {
     return this.callNuve('getErizoControllers', [], undefined);
   }
-
 }
 
 class RovConnection {

diff --git a/erizo_controller/ROV/rovMetricsServer.js b/erizo_controller/ROV/rovMetricsServer.js
@@ -74,9 +74,9 @@ amqper.connect(() => {
     rovMetricsGatherer.gatherMetrics().then(() => {
       log.debug('Gathered licode metrics');
     })
-    .catch((error) => {
-      log.error('Error gathering metrics', error);
-    });
+      .catch((error) => {
+        log.error('Error gathering metrics', error);
+      });
   }, config.rov.statsPeriod);
   server.get('/metrics', (req, res) => {
     res.set('Content-Type', register.contentType);

diff --git a/erizo_controller/common/amqper.js b/erizo_controller/common/amqper.js
@@ -17,7 +17,7 @@ const TIMEOUT = 5000;
 // This timeout shouldn't be too low because it won't listen to onReady responses from ErizoJS
 const REMOVAL_TIMEOUT = 300000;
 
-const map = {};   // {corrID: {fn: callback, to: timeout}}
+const map = {}; // {corrID: {fn: callback, to: timeout}}
 let connection;
 let rpcExc;
 let broadcastExc;
@@ -43,30 +43,27 @@ exports.setPublicRPC = (methods) => {
 };
 
 exports.connect = (callback) => {
-    // Create the amqp connection to rabbitMQ server
+  // Create the amqp connection to rabbitMQ server
   connection = amqp.createConnection(addr);
   connection.on('ready', () => {
-        // Create a direct exchange
+    // Create a direct exchange
     rpcExc = connection.exchange('rpcExchange', { type: 'direct' }, (exchange) => {
       try {
         log.info(`message: rpcExchange open, exchangeName: ${exchange.name}`);
 
-                // Create the queue for receiving messages
+        // Create the queue for receiving messages
         clientQueue = connection.queue('', (q) => {
           log.info(`message: clientqueue open, queuename: ${q.name}`);
 
           clientQueue.bind('rpcExchange', clientQueue.name, callback);
 
           clientQueue.subscribe((message) => {
             try {
-              log.debug('message: message received, ' +
-                `queueName: ${clientQueue.name}`,
+              log.debug(`message: message received, queueName: ${clientQueue.name}`,
                 logger.objectToLog(message));
 
               if (map[message.corrID] !== undefined) {
-                log.debug('message: Callback, ' +
-                  `queueName: ${clientQueue.name}, ` +
-                  `messageType: ${message.type}`,
+                log.debug(`message: Callback, queueName: ${clientQueue.name}, messageType: ${message.type}`,
                   logger.objectToLog(message.data));
 
                 clearTimeout(map[message.corrID].to);
@@ -93,12 +90,12 @@ exports.connect = (callback) => {
       }
     });
 
-        // Create a fanout exchange
+    // Create a fanout exchange
     broadcastExc = connection.exchange('broadcastExchange',
-                                          { type: 'topic', autoDelete: false },
-                                          (exchange) => {
-                                            log.info(`message: exchange open, exchangeName: ${exchange.name}`);
-                                          });
+      { type: 'topic', autoDelete: false },
+      (exchange) => {
+        log.info(`message: exchange open, exchangeName: ${exchange.name}`);
+      });
   });
 
   connection.on('error', (e) => {
@@ -109,21 +106,20 @@ exports.connect = (callback) => {
 };
 
 exports.bind = (id, callback) => {
-    // Create the queue for receive messages
+  // Create the queue for receive messages
   const q = connection.queue(id, () => {
     try {
       log.info(`message: queue open, queueName: ${q.name}`);
 
       q.bind('rpcExchange', id, callback);
       q.subscribe((message) => {
         try {
-          log.debug('message: message received, ' +
-            `queueName: ${q.name}, `,
+          log.debug(`message: message received, queueName: ${q.name}, `,
             logger.objectToLog(message));
           message.args = message.args || [];
           message.args.push((type, result) => {
             rpcExc.publish(message.replyTo,
-                                       { data: result, corrID: message.corrID, type });
+              { data: result, corrID: message.corrID, type });
           });
           rpcPublic[message.method](...message.args);
         } catch (error) {
@@ -140,7 +136,7 @@ exports.bind = (id, callback) => {
 
 // Subscribe to 'topic'
 exports.bindBroadcast = (id, callback) => {
-    // Create the queue for receive messages
+  // Create the queue for receive messages
   const q = connection.queue('', () => {
     try {
       log.info(`message: broadcast queue open, queueName: ${q.name}`);

diff --git a/erizo_controller/common/logger.js b/erizo_controller/common/logger.js
@@ -34,7 +34,7 @@ exports.logger.objectToLog = (jsonInput) => {
   }
   const jsonString = JSON.stringify(jsonInput, logJsonReplacer);
   return jsonString.replace(/['"]+/g, '')
-                     .replace(/[:]+/g, ': ')
-                     .replace(/[,]+/g, ', ')
-                     .slice(1, -1);
+    .replace(/[:]+/g, ': ')
+    .replace(/[,]+/g, ', ')
+    .slice(1, -1);
 };
diff --git a/erizo_controller/common/semanticSdp/CandidateInfo.js b/erizo_controller/common/semanticSdp/CandidateInfo.js
@@ -15,7 +15,7 @@ class CandidateInfo {
 
   clone() {
     return new CandidateInfo(this.foundation, this.componentId, this.transport, this.priority,
-              this.address, this.port, this.type, this.generation, this.relAddr, this.relPort);
+      this.address, this.port, this.type, this.generation, this.relAddr, this.relPort);
   }
 
   plain() {
@@ -73,7 +73,6 @@ class CandidateInfo {
   getRelPort() {
     return this.relPort;
   }
-
 }
 
 module.exports = CandidateInfo;
diff --git a/erizo_controller/common/semanticSdp/CodecInfo.js b/erizo_controller/common/semanticSdp/CodecInfo.js
@@ -1,5 +1,4 @@
 class CodecInfo {
-
   constructor(codec, type, rate, encoding, params, feedback) {
     this.codec = codec;
     this.type = type;

diff --git a/erizo_controller/common/semanticSdp/ICEInfo.js b/erizo_controller/common/semanticSdp/ICEInfo.js
@@ -73,7 +73,6 @@ class ICEInfo {
   setEndOfCandidates(endOfCandidates) {
     this.endOfCandidates = endOfCandidates;
   }
-
 }
 
 ICEInfo.generate = () => {

diff --git a/erizo_controller/common/semanticSdp/SDPInfo.js b/erizo_controller/common/semanticSdp/SDPInfo.js
@@ -324,8 +324,8 @@ class SDPInfo {
           md.fmtp.push({
             payload: codec.getType(),
             config: Object.keys(params)
-                          .map(item => item + (params[item] ? `=${params[item]}` : ''))
-                          .join(';'),
+              .map(item => item + (params[item] ? `=${params[item]}` : ''))
+              .join(';'),
           });
         }
 

diff --git a/erizo_controller/erizoAgent/erizoAgent.js b/erizo_controller/erizoAgent/erizoAgent.js
@@ -164,7 +164,7 @@ const launchErizoJS = (erizo) => {
       fs.close(out, (message) => {
         if (message) {
           log.error('message: error closing log file, ',
-                              `erizoId: ${id}`, 'error:', message);
+            `erizoId: ${id}`, 'error:', message);
         }
       });
     }
@@ -173,7 +173,7 @@ const launchErizoJS = (erizo) => {
       fs.close(err, (message) => {
         if (message) {
           log.error('message: error closing log file, ',
-                              `erizoId: ${id}`, 'error:', message);
+            `erizoId: ${id}`, 'error:', message);
         }
       });
     }

diff --git a/erizo_controller/erizoController/ecCloudHandler.js b/erizo_controller/erizoController/ecCloudHandler.js
@@ -67,7 +67,7 @@ exports.EcCloudHandler = (spec) => {
   if (global.config.erizoController.cloudHandlerPolicy) {
     // eslint-disable-next-line global-require, import/no-dynamic-require
     getErizoAgent = require(`./ch_policies/${
-                      global.config.erizoController.cloudHandlerPolicy}`).getErizoAgent;
+      global.config.erizoController.cloudHandlerPolicy}`).getErizoAgent;
   }
 
   const tryAgain = (count, callback) => {

diff --git a/erizo_controller/erizoController/erizoController.js b/erizo_controller/erizoController/erizoController.js
@@ -138,7 +138,7 @@ if (global.config.erizoController.listen_ssl) {
 }
 
 server.listen(global.config.erizoController.listen_port);
-  // eslint-disable-next-line global-require, import/no-extraneous-dependencies
+// eslint-disable-next-line global-require, import/no-extraneous-dependencies
 const io = require('socket.io').listen(server, { log: false });
 
 io.set('transports', ['websocket']);
@@ -193,8 +193,8 @@ const addToCloudHandler = (callback) => {
         .then(() => true)
         .catch((result) => {
           if (result === 'whoareyou') {
-              // TODO: It should try to register again in Cloud Handler.
-              // But taking into account current rooms, users, ...
+            // TODO: It should try to register again in Cloud Handler.
+            // But taking into account current rooms, users, ...
             log.error('message: This ErizoController does not exist in cloudHandler ' +
                         'to avoid unexpected behavior this ErizoController will die');
             clearInterval(intervalId);
@@ -242,7 +242,7 @@ const addToCloudHandler = (callback) => {
         log.warn('message: addECToCloudHandler cloudHandler does not respond, ' +
                      `attemptsLeft: ${attempt}`);
 
-            // We'll try it more!
+        // We'll try it more!
         setTimeout(() => {
           attempt -= 1;
           addECToCloudHandler(attempt);

diff --git a/erizo_controller/erizoController/models/Channel.js b/erizo_controller/erizoController/models/Channel.js
@@ -143,7 +143,7 @@ class Channel extends events.EventEmitter {
       return;
     }
     log.debug('message: sending buffered messages, number:', buffer.length,
-              ', channelId:', this.id);
+      ', channelId:', this.id);
     buffer.forEach((message) => {
       log.debug('message: sending buffered message, message:', message, ', channelId:', this.id);
       this.sendMessage(...message);
@@ -155,7 +155,6 @@ class Channel extends events.EventEmitter {
     clearTimeout(this.disconnecting);
     this.socket.disconnect();
   }
-
 }
 
 exports.Channel = Channel;
diff --git a/erizo_controller/erizoController/models/Client.js b/erizo_controller/erizoController/models/Client.js
@@ -425,7 +425,7 @@ class Client extends events.EventEmitter {
   _publishErizo(id, options, sdp, callback) {
     options.mediaConfiguration = this.token.mediaConfiguration;
     options.singlePC = this.options.singlePC || false;
-    log.info('message: addPublisher requested, ' +
+    log.info('message: addPublisher requested, ',
       `streamId: ${id}, clientId: ${this.id}`,
       logger.objectToLog(options),
       logger.objectToLog(options.attributes));
@@ -552,9 +552,9 @@ class Client extends events.EventEmitter {
 
     const stream = this.room.streamManager.getPublishedStreamById(options.streamId);
     if (stream === undefined) {
-      log.warn('message: addSubscriber can not be requested, ' +
-        'reason: publisher not found' +
-        `streamId: ${options.streamId}, ` +
+      log.warn('message: addSubscriber can not be requested, ',
+        'reason: publisher not found',
+        `streamId: ${options.streamId}, `,
         `clientId: ${this.id},`,
         logger.objectToLog(options),
         logger.objectToLog(options.metadata));
@@ -573,9 +573,9 @@ class Client extends events.EventEmitter {
         client.sendMessage('publish_me', { streamId: options.streamId, peerSocket: this.id });
       } else {
         if (stream.hasAvSubscriber(this.id)) {
-          log.warn('message: addSubscriber can not be requested, ' +
-            'reason: this client is already subscribed' +
-            `streamId: ${options.streamId}, ` +
+          log.warn('message: addSubscriber can not be requested, ',
+            'reason: this client is already subscribed',
+            `streamId: ${options.streamId}, `,
             `clientId: ${this.id},`,
             logger.objectToLog(options),
             logger.objectToLog(options.metadata));
@@ -607,7 +607,7 @@ class Client extends events.EventEmitter {
             }
             return;
           } else if (signMess.type === 'failed') {
-                    // TODO: Add Stats event
+            // TODO: Add Stats event
             log.warn('message: addSubscriber ICE Failed, ' +
                              'state: SUBSCRIBER_FAILED, ' +
                              `streamId: ${options.streamId}, ` +
@@ -927,7 +927,6 @@ class Client extends events.EventEmitter {
       });
     }
   }
-
 }
 
 exports.Client = Client;
diff --git a/erizo_controller/erizoController/models/Room.js b/erizo_controller/erizoController/models/Room.js
@@ -67,13 +67,13 @@ class Room extends events.EventEmitter {
 
   onRoomControllerEvent(type, evt) {
     if (type === 'unpublish') {
-        // It's supposed to be an integer.
+      // It's supposed to be an integer.
       const streamId = parseInt(evt, 10);
       log.warn('message: Triggering removal of stream ' +
                  'because of ErizoJS timeout, ' +
                  `streamId: ${streamId}`);
       this.sendMessage('onRemoveStream', { id: streamId });
-        // remove clients and streams?
+      // remove clients and streams?
     }
   }
 
@@ -87,9 +87,9 @@ class Room extends events.EventEmitter {
   sendMessage(method, args) {
     this.forEachClient((client) => {
       log.debug('message: sendMsgToRoom,',
-                'clientId:', client.id, ',',
-                'roomId:', this.id, ', ',
-                logger.objectToLog(method));
+        'clientId:', client.id, ',',
+        'roomId:', this.id, ', ',
+        logger.objectToLog(method));
       client.sendMessage(method, args);
     });
   }