Fix Node 4 compatibility. Fix Spotify queue bug

Author: jishi

lib/actions/musicSearch.js

@@ -196,7 +196,7 @@ function musicSearch(player, values) {
   const service = values[0];
   const type = values[1];
   const term = values[2];
-  const queueURI = 'x-rincon-queue:' + player.uuid + '#0';
+  const queueURI = 'x-rincon-queue:' + player.coordinator.uuid + '#0';
 
   if (musicServices.indexOf(service) == -1) {
     return Promise.reject('Invalid music service');

lib/music_services/spotifyDef.js

@@ -6,10 +6,9 @@ const settings = require('../../settings');
 var clientId = "";
 var clientSecret = "";
 
-try {
+if (settings.spotify) {
   clientId = settings.spotify.clientId;
   clientSecret = settings.spotify.clientSecret;
-} catch(e) {
 }
 
 var clientToken = null;
@@ -55,13 +54,17 @@ var  toBase64 = (string) => new Buffer(string).toString('base64');
 
 const SPOTIFY_TOKEN_URL = 'https://accounts.spotify.com/api/token';
 
-const mapResponse = ({ access_token, token_type, expires_in }) => ({
-  accessToken: access_token,
-  tokenType: token_type,
-  expiresIn: expires_in,
+const mapResponse = (response) => ({
+  accessToken: response.access_token,
+  tokenType: response.token_type,
+  expiresIn: response.expires_in,
 });
 
 const getHeaders = () => {
+  console.log('spotify', clientId, clientSecret)
+  if (!clientId || !clientSecret) {
+    throw new Error('You are missing spotify clientId and secret in settings.json! Please read the README for instructions on how to generate and add them');
+  }
   const authString = `${clientId}:${clientSecret}`;
   return {
     Authorization: `Basic ${toBase64(authString)}`,
@@ -105,7 +108,7 @@ function getTokenHeaders() {
 function authenticateService() {
   return new Promise((resolve, reject) => {
     auth().then((response) => {
-      const { accessToken } = response;
+      const accessToken = response.accessToken;
       clientToken = accessToken;
       resolve();
     }).catch(reject);

package.json

@@ -18,7 +18,7 @@
     "json5": "^0.5.1",
     "node-static": "~0.7.0",
     "request-promise": "~1.0.2",
-    "sonos-discovery": "https://github.com/jishi/node-sonos-discovery/archive/v1.4.1.tar.gz"
+    "sonos-discovery": "https://github.com/jishi/node-sonos-discovery/archive/v1.5.1.tar.gz"
   },
   "engines": {
     "node": ">=4.0.0",