Fixed vulnerabilities and ES-Lint

lib/actions/getService.js

@@ -0,0 +1,20 @@
+const appleDef = require('../music_services/appleDef');
+const spotifyDef = require('../music_services/spotifyDef');
+const deezerDef = require('../music_services/deezerDef');
+const libraryDef = require('../music_services/libraryDef');
+const { eliteDef } = require('./musicSearch');
+
+function getService(service) {
+  if (service === 'apple') {
+    return appleDef;
+  } else if (service === 'spotify') {
+    return spotifyDef;
+  } else if (service === 'deezer') {
+    return deezerDef;
+  } else if (service === 'elite') {
+    return eliteDef;
+  } else if (service === 'library') {
+    return libraryDef;
+  }
+}
+exports.getService = getService;

lib/actions/musicSearch.js

@@ -1,61 +1,65 @@
+/* eslint-disable no-extend-native */
 'use strict';
-const request = require('request-promise');
-const fs = require("fs");
+
+const request = require('request-promise-native');
+const fs = require('fs');
 const isRadioOrLineIn = require('../helpers/is-radio-or-line-in');
 
 const appleDef = require('../music_services/appleDef');
 const spotifyDef = require('../music_services/spotifyDef');
 const deezerDef = require('../music_services/deezerDef');
+
 const eliteDef = deezerDef.init(true);
 const libraryDef = require('../music_services/libraryDef');
 
-const musicServices = ['apple','spotify','deezer','elite','library'];
-const serviceNames = {apple:'Apple Music',spotify:'Spotify',deezer:'Deezer',elite:'Deezer',library:'Library'};
-const musicTypes = ['album','song','station','load','playlist'];
+const musicServices = ['apple', 'spotify', 'deezer', 'elite', 'library'];
+const serviceNames = {
+  apple: 'Apple Music', spotify: 'Spotify', deezer: 'Deezer', elite: 'Deezer', library: 'Library'
+};
+const musicTypes = ['album', 'song', 'station', 'load', 'playlist'];
 
-var country = '';
-var accountId = '';
-var accountSN = '';
-var searchType = 0;
+let country = '';
+let accountId = '';
+let accountSN = '';
+let searchType = 0;
 
 function getService(service) {
-  if (service == 'apple') {
+  if (service === 'apple') {
     return appleDef;
   } else
-  if (service == 'spotify') {
+  if (service === 'spotify') {
     return spotifyDef;
   } else
-  if (service == 'deezer') {
+  if (service === 'deezer') {
     return deezerDef;
   } else
-  if (service == 'elite') {
+  if (service === 'elite') {
     return eliteDef;
   } else
-  if (service == 'library') {
+  if (service === 'library') {
     return libraryDef;
   }
 }
 
-function getAccountId(player, service)
-{
+function getAccountId(player, service) {
   accountId = '';
-  
-  if (service != 'library') {
-    return request({url: player.baseUrl + '/status/accounts',json: false})
+
+  if (service !== 'library') {
+    return request({ url: `${player.baseUrl}/status/accounts`, json: false })
       .then((res) => {
-        var actLoc = res.indexOf(player.system.getServiceType(serviceNames[service]));
-       
-        if (actLoc != -1) {
-          var idLoc = res.indexOf('<UN>', actLoc)+4;
-          var snLoc = res.indexOf('SerialNum="', actLoc)+11;
-  
-          accountId = res.substring(idLoc,res.indexOf('</UN>',idLoc));
-          accountSN = res.substring(snLoc,res.indexOf('"',snLoc));
+        const actLoc = res.indexOf(player.system.getServiceType(serviceNames[service]));
+
+        if (actLoc !== -1) {
+          const idLoc = res.indexOf('<UN>', actLoc) + 4;
+          const snLoc = res.indexOf('SerialNum="', actLoc) + 11;
+
+          accountId = res.substring(idLoc, res.indexOf('</UN>', idLoc));
+          accountSN = res.substring(snLoc, res.indexOf('"', snLoc));
         }
-        
+
         return Promise.resolve();
       });
-  
+
     return promise;
   } else {
     return Promise.resolve();
@@ -71,123 +75,125 @@ function getRequestOptions(serviceDef, url) {
   }
 };
 
-function doSearch(service, type, term)
-{
-  var serviceDef = getService(service);
-  var url = serviceDef.search[type];
-  var authenticate = serviceDef.authenticate;
+function doSearch(service, type, term) {
+  const serviceDef = getService(service);
+  let url = serviceDef.search[type];
+  const authenticate = serviceDef.authenticate;
 
   term = decodeURIComponent(term);
-
-  // Check for search type specifiers 
+  let newTerm = '';
+  const artistPos = term.indexOf('artist:');
+  const trackPos = term.indexOf('track:');
+  // Check for search type specifiers
   if (term.indexOf(':') > -1) {
-    var newTerm = '';
-    var artistPos = term.indexOf('artist:');
-    var albumPos  = term.indexOf('album:');
-    var trackPos  = term.indexOf('track:');
-    var nextPos = -1;
-    var artist = '';
-    var album = '';
-    var track  = '';
-
+    const albumPos = term.indexOf('album:');
+    let nextPos = -1;
+    let artist = '';
+    let album = '';
+    let track = '';
+
     if (artistPos > -1) {
-      nextPos = (albumPos < trackPos)?albumPos:trackPos; 
-      artist = term.substring(artistPos+7,(artistPos < nextPos)?nextPos:term.length);
+      nextPos = (albumPos < trackPos) ? albumPos : trackPos;
+      artist = term.substring(artistPos + 7, (artistPos < nextPos) ? nextPos : term.length);
     }
     if (albumPos > -1) {
-      nextPos = (trackPos < artistPos)?trackPos:artistPos; 
-      album = term.substring(albumPos+6,(albumPos < nextPos)?nextPos:term.length);
+      nextPos = (trackPos < artistPos) ? trackPos : artistPos;
+      album = term.substring(albumPos + 6, (albumPos < nextPos) ? nextPos : term.length);
     }
     if (trackPos > -1) {
-      nextPos = (albumPos < artistPos)?albumPos:artistPos; 
-      track = term.substring(trackPos+6,(trackPos < nextPos)?nextPos:term.length);
+      nextPos = (albumPos < artistPos) ? albumPos : artistPos;
+      track = term.substring(trackPos + 6, (trackPos < nextPos) ? nextPos : term.length);
     }
-      
+
     newTerm = serviceDef.term(type, term, artist, album, track);
-
   } else {
-    newTerm = (service == 'library')?term:encodeURIComponent(term);
+    newTerm = (service === 'library') ? term : encodeURIComponent(term);
+  }
+
+  if (type === 'song') {
+    searchType = (trackPos > -1) ? 1 : ((artistPos > -1) ? 2 : 0);
   }
-
-  if (type == 'song') {
-    searchType = (trackPos > -1)?1:((artistPos > -1)?2:0);
-  }  
   url += newTerm;
-  
-  if (service == 'library') {
+
+  if (service === 'library') {
     return Promise.resolve(libraryDef.searchlib(type, newTerm));
   } else
-  if ((serviceDef.country != '') && (country == '')) {
-    return request({url: 'http://ipinfo.io',
-                   json: true})
-           .then((res) => {
-             country = res.country;
-             url += serviceDef.country + country;
-             return authenticate().then(() => request(getRequestOptions(serviceDef, url)));
-           });
+  if ((serviceDef.country !== '') && (country === '')) {
+    return request({
+      url: 'http://ipinfo.io',
+      json: true
+    })
+      .then((res) => {
+        country = res.country;
+        url += serviceDef.country + country;
+        return authenticate().then(() => request(getRequestOptions(serviceDef, url)));
+      });
   } else {
     if (serviceDef.country != '') {
       url += serviceDef.country + country;
     }
-      
+
     return authenticate().then(() => request(getRequestOptions(serviceDef, url)));
   }
 }
 
-Array.prototype.shuffle=function(){
-  var len = this.length,temp,i
-  while(len){
-    i=Math.random()*len-- >>> 0;
-    temp=this[len],this[len]=this[i],this[i]=temp;
+
+// eslint-disable-next-line func-names
+Array.prototype.shuffle = function () {
+  let len = this.length;
+  let temp;
+  let i;
+  while (len) {
+    i = Math.random() * len-- >>> 0;
+    temp = this[len], this[len] = this[i], this[i] = temp;
   }
   return this;
-}
+};
 
-function loadTracks(player, service, type, tracksJson)
-{
-  var tracks = getService(service).tracks(type, tracksJson);
-
-  if ((service == 'library') && (type == 'album')) {
+function loadTracks(player, service, type, tracksJson) {
+  const tracks = getService(service).tracks(type, tracksJson);
+
+  if ((service === 'library') && (type === 'album')) {
     tracks.isArtist = true;
-  } else 
-  if (type != 'album') {
-    if (searchType == 0) {
+  } else
+  if (type !== 'album') {
+    if (searchType === 0) {
       // Determine if the request was for a specific song or for many songs by a specific artist
       if (tracks.count > 1) {
-        var artistCount = 1;
-        var trackCount = 1;
-        var artists = tracks.queueTracks.map(function(track) {
-              return track.artistName.toLowerCase();
-            }).sort();
-        var songs = tracks.queueTracks.map(function(track) {
-              return track.trackName.toLowerCase();
-            }).sort();
-
-        var prevArtist=artists[0];
-        var prevTrack=songs[0];
-
-        for (var i=1; i < tracks.count;i++) {
-          if (artists[i] != prevArtist) {
+        let artistCount = 1;
+        let trackCount = 1;
+        const artists = tracks.queueTracks.map((track) => {
+          return track.artistName.toLowerCase();
+        }).sort();
+        const songs = tracks.queueTracks.map((track) => {
+          return track.trackName.toLowerCase();
+        }).sort();
+
+        let prevArtist = artists[0];
+        let prevTrack = songs[0];
+
+        for (let i = 1; i < tracks.count; i++) {
+          if (artists[i] !== prevArtist) {
             artistCount++;
             prevArtist = artists[i];
           }
-          if (songs[i] != prevTrack) {
+          if (songs[i] !== prevTrack) {
             trackCount++;
             prevTrack = songs[i];
-          }  
+          }
         }
-        tracks.isArtist = (trackCount/artistCount > 2);
+        tracks.isArtist = (trackCount / artistCount > 2);
       }
     } else {
-      tracks.isArtist = (searchType == 2);
+      tracks.isArtist = (searchType === 2);
     }
   }
- 
+
   //To avoid playing the same song first in a list of artist tracks when shuffle is on
   if (tracks.isArtist && player.coordinator.state.playMode.shuffle) {
-    tracks.queueTracks.shuffle();  
+    tracks.queueTracks.shuffle();
   }
- 
+
   return tracks;
 }
 
@@ -197,17 +203,17 @@ function musicSearch(player, values) {
   const type = values[1];
   const term = values[2];
   const queueURI = 'x-rincon-queue:' + player.coordinator.uuid + '#0';
- 
-  if (musicServices.indexOf(service) == -1) {
+
+  if (musicServices.indexOf(service) === -1) {
     return Promise.reject('Invalid music service');
-  } 
+  }
 
-  if (musicTypes.indexOf(type) == -1) {
+  if (musicTypes.indexOf(type) === -1) {
     return Promise.reject('Invalid type ' + type);
   }
-  
-  if ((service == 'library') && ((type == 'load') || libraryDef.nolib())) {
-    return libraryDef.load(player, (type == 'load'));
+
+  if ((service === 'library') && ((type === 'load') || libraryDef.nolib())) {
+    return libraryDef.load(player, (type === 'load'));
   }
 
   return getAccountId(player, service)
@@ -220,28 +226,28 @@ function musicSearch(player, values) {
       if (serviceDef.empty(type, resList)) {
         return Promise.reject('No matches were found');
       } else {
-        var UaM = null; 
-      
-        if (type == 'station') {
+        let UaM = null;
+
+        if (type === 'station') {
           UaM = serviceDef.urimeta(type, resList);
 
-          return player.coordinator.setAVTransport(UaM.uri, UaM.metadata) 
+          return player.coordinator.setAVTransport(UaM.uri, UaM.metadata)
             .then(() => player.coordinator.play());
-        } else 
-        if ((type == 'album' || type =='playlist') && (service != 'library')) {
+        } else
+        if ((type === 'album' || type === 'playlist') && (service !== 'library')) {
           UaM = serviceDef.urimeta(type, resList);
 
           return player.coordinator.clearQueue()
             .then(() => player.coordinator.setAVTransport(queueURI, ''))
             .then(() => player.coordinator.addURIToQueue(UaM.uri, UaM.metadata, true, 1))
             .then(() => player.coordinator.play());
         } else { // Play songs
-          var tracks = loadTracks(player, service, type, resList);
-      
+          const tracks = loadTracks(player, service, type, resList);
+
           if (tracks.count == 0) {
             return Promise.reject('No matches were found');
           } else {
-            if (tracks.isArtist) {  // Play numerous songs by the specified artist
+            if (tracks.isArtist) { // Play numerous songs by the specified artist
               return player.coordinator.clearQueue()
                 .then(() => player.coordinator.setAVTransport(queueURI, ''))
                 .then(() => player.coordinator.addURIToQueue(tracks.queueTracks[0].uri, tracks.queueTracks[0].metadata, true, 1))
@@ -253,12 +259,12 @@ function musicSearch(player, values) {
                   }, Promise.resolve());
                 });
             } else { // Play the one specified song
-              var empty = false;
-              var nextTrackNo = 0;
+              let empty = false;
+              let nextTrackNo = 0;
 
               return player.coordinator.getQueue(0, 1)
                 .then((queue) => {
-                  empty = (queue.length == 0);
+                  empty = (queue.length === 0);
                   nextTrackNo = (empty) ? 1 : player.coordinator.state.trackNo + 1;
                 })
                 .then(() => player.coordinator.addURIToQueue(tracks.queueTracks[0].uri, tracks.queueTracks[0].metadata, true, nextTrackNo))