Fixing Soundcloud music service, anonymous service adding, removing s…

…ervices
pascalopitz · Jun 2, 2020 · 974cb60 · 974cb60
1 parent fba10a7
commit 974cb60
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 37 deletions.
diff --git a/app/main.js b/app/main.js
@@ -10,6 +10,8 @@ const maskJson = require('mask-json')(blacklist);
 
 const wakeEvent = require('wake-event');
 
+const deviceProviderName = 'unofficial-sonos-controller-for-linux';
+
 let win;
 
 function createWindow() {
@@ -128,6 +130,10 @@ function createWindow() {
 
     Menu.setApplicationMenu(menu);
 
+    win.webContents.setUserAgent(
+        // Thanks SoCo: https://github.com/SoCo/SoCo/blob/18ee1ec11bba8463c4536aa7c2a25f5c20a051a4/soco/music_services/music_service.py#L55
+        `Linux UPnP/1.0 Sonos/36.4-41270 (ACR_:${deviceProviderName})`
+    );
     win.loadURL(
         url.format({
             pathname: path.join(__dirname, 'window.html'),

diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sonos-controller-unofficial",
   "description": "Unoffical sonos controller for linux.",
-  "version": "0.2.0-beta2",
+  "version": "0.2.0-beta2.1",
   "author": "Pascal Opitz <[email protected]>",
   "main": "main.js",
   "dependencies": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sonos-controller-unofficial",
-  "version": "0.2.0-beta2",
+  "version": "0.2.0-beta2.1",
   "description": "Unoffical sonos controller for linux",
   "main": "app/main.js",
   "homepage": "http://pascalopitz.github.io/unoffical-sonos-controller-for-linux/",

diff --git a/src/ui/components/BrowserListItem.jsx b/src/ui/components/BrowserListItem.jsx
@@ -102,7 +102,7 @@ class InlineMenu extends PureComponent {
                 item.metadata.class === 'object.item.audioItem.audioBroadcast');
 
         const isService = item.action === 'service';
-        const isSonosPlaylist = item._raw.parentID === 'SQ:';
+        const isSonosPlaylist = item._raw && item._raw.parentID === 'SQ:';
 
         const scrollContainerNode = getClosest(
             containerRef.current,

diff --git a/src/ui/helpers/sonos.js b/src/ui/helpers/sonos.js
@@ -42,14 +42,14 @@ class SonosEnhanced extends Sonos {
         return new ContentDirectoryEnhanced(this.host, this.port);
     }
 
-    async getHouseholdId() {
+    async getZPInfo() {
         const data = await request(
             'http://' + this.host + ':' + this.port + '/status/zp'
         )
             .then((response) => response.data)
             .then(Helpers.ParseXml);
 
-        return data.ZPSupportInfo.ZPInfo.HouseholdControlID;
+        return data.ZPSupportInfo.ZPInfo;
     }
 
     async getAvailableServices() {

diff --git a/src/ui/reducers/BrowserListReducer.js b/src/ui/reducers/BrowserListReducer.js
@@ -18,6 +18,12 @@ const initialState = {
     ],
 };
 
+const resetState = () => {
+    return {
+        ...initialState,
+    };
+};
+
 export default handleActions(
     {
         [Constants.BROWSER_SEARCH]: (state, action) => {
@@ -102,23 +108,10 @@ export default handleActions(
             };
         },
 
-        [Constants.BROWSER_HOME]: () => {
-            return {
-                ...initialState,
-            };
-        },
-
-        [Constants.MUSICSERVICE_AUTH_TOKEN_RECEIVED]: () => {
-            return {
-                ...initialState,
-            };
-        },
-
-        [Constants.MUSICSERVICE_SESSION_ID_RECEIVED]: () => {
-            return {
-                ...initialState,
-            };
-        },
+        [Constants.BROWSER_HOME]: resetState,
+        [Constants.MUSICSERVICE_AUTH_TOKEN_RECEIVED]: resetState,
+        [Constants.MUSICSERVICE_ANONYMOUS]: resetState,
+        [Constants.MUSICSERVICE_SESSION_ID_RECEIVED]: resetState,
 
         [Constants.BROWSER_BACK]: (state) => {
             const { history } = state;

diff --git a/src/ui/reducers/MusicServicesReducer.js b/src/ui/reducers/MusicServicesReducer.js
@@ -48,6 +48,7 @@ export default handleActions(
         [Constants.MUSICSERVICE_ADD_CANCEL]: closeDialogue,
         [Constants.MUSICSERVICE_AUTH_TOKEN_RECEIVED]: closeDialogue,
         [Constants.MUSICSERVICE_SESSION_ID_RECEIVED]: closeDialogue,
+        [Constants.MUSICSERVICE_ANONYMOUS]: closeDialogue,
     },
     initialState
 );
diff --git a/src/ui/reduxActions/BrowserListActions.js b/src/ui/reduxActions/BrowserListActions.js
@@ -339,8 +339,11 @@ const selectBrowseServices = async (item) => {
 
 const selectService = async (item) => {
     const client = new MusicServiceClient(item.service.service);
-    client.setAuthToken(item.service.authToken.authToken);
-    client.setKey(item.service.authToken.privateKey);
+
+    if (client.auth !== 'Anonymous') {
+        client.setAuthToken(item.service.authToken.authToken);
+        client.setKey(item.service.authToken.privateKey);
+    }
 
     const res = await client.getMetadata('root', 0, 100);
     const searchTermMap = await client.getSearchTermMap();

diff --git a/src/ui/reduxActions/MusicServicesActions.js b/src/ui/reduxActions/MusicServicesActions.js
@@ -84,5 +84,12 @@ export const getLink = createAction(
 );
 
 export const addAnonymousService = createAction(
-    Constants.MUSICSERVICE_ANONYMOUS
+    Constants.MUSICSERVICE_ANONYMOUS,
+    async (client) => {
+        // TODO: fix this
+        await SonosService.rememberMusicService(
+            client._serviceDefinition,
+            null
+        );
+    }
 );
diff --git a/src/ui/services/MusicServiceClient.js b/src/ui/services/MusicServiceClient.js
@@ -6,8 +6,7 @@ import { Helpers } from 'sonos';
 import SonosService from '../services/SonosService';
 
 const NS = 'http://www.sonos.com/Services/1.1';
-const deviceProviderName = 'unofficial-sonos-controller-for-linux';
-const RUNTIME_ID = 'unofficial-sonos-controller-for-linux';
+const deviceProviderName = 'Sonos';
 
 function withinEnvelope(body, headers = '') {
     return [
@@ -43,8 +42,7 @@ class MusicServiceClient {
             headers: {
                 SOAPAction: `"${NS}#${action}"`,
                 'Content-type': 'text/xml; charset=utf8',
-                // Thanks SoCo: https://github.com/SoCo/SoCo/blob/18ee1ec11bba8463c4536aa7c2a25f5c20a051a4/soco/music_services/music_service.py#L55
-                'User-Agent': `Linux UPnP/1.0 Sonos/36.4-41270 (ACR_:${deviceProviderName})`,
+                'Accept-Language': 'en,en-AU;q=0.9,en-US;q=0.5',
             },
             body: soapBody,
         });
@@ -235,7 +233,7 @@ class MusicServiceClient {
         const headers = [
             '<ns:credentials>',
             '<ns:deviceId>',
-            RUNTIME_ID,
+            SonosService.deviceId,
             '</ns:deviceId>',
             '<ns:deviceProvider>',
             deviceProviderName,
@@ -296,7 +294,7 @@ class MusicServiceClient {
         const headers = [
             '<ns:credentials>',
             '<ns:deviceId>',
-            RUNTIME_ID,
+            SonosService.deviceId,
             '</ns:deviceId>',
             '<ns:deviceProvider>',
             deviceProviderName,
@@ -353,6 +351,7 @@ class MusicServiceClient {
             '<ns:count>',
             count,
             '</ns:count>',
+            '<ns:recursive>false</ns:recursive>',
             '</ns:getMetadata>',
         ].join('');
 
@@ -480,7 +479,7 @@ class MusicServiceClient {
         const headers = [
             '<ns:credentials>',
             '<ns:deviceId>',
-            RUNTIME_ID,
+            SonosService.deviceId,
             '</ns:deviceId>',
             '<ns:deviceProvider>',
             deviceProviderName,
@@ -519,7 +518,7 @@ class MusicServiceClient {
             return [
                 '<ns:credentials>',
                 '<ns:deviceId>',
-                RUNTIME_ID,
+                SonosService.deviceId,
                 '</ns:deviceId>',
                 '<ns:deviceProvider>',
                 deviceProviderName,
@@ -535,7 +534,7 @@ class MusicServiceClient {
             return [
                 '<ns:credentials>',
                 '<ns:deviceId>',
-                RUNTIME_ID,
+                SonosService.deviceId,
                 '</ns:deviceId>',
                 '<ns:deviceProvider>',
                 deviceProviderName,
@@ -548,7 +547,7 @@ class MusicServiceClient {
                 this.key,
                 '</ns:key>',
                 '<ns:householdId>',
-                SonosService.householdId,
+                SonosService.householdId.split('.')[0],
                 '</ns:householdId>',
                 '</ns:loginToken>',
                 '</ns:credentials>',
@@ -558,7 +557,7 @@ class MusicServiceClient {
         return [
             '<ns:credentials>',
             '<ns:deviceId>',
-            RUNTIME_ID,
+            SonosService.deviceId,
             '</ns:deviceId>',
             '<ns:deviceProvider>',
             deviceProviderName,

diff --git a/src/ui/services/SonosService.js b/src/ui/services/SonosService.js
@@ -74,7 +74,10 @@ const SonosService = {
         const [first] = devices;
         const groups = await first.getAllGroups();
 
-        this.householdId = await first.getHouseholdId().catch(() => null);
+        const zpInfo = await first.getZPInfo().catch(() => {});
+
+        this.householdId = zpInfo.HouseholdControlID;
+        this.deviceId = zpInfo.SerialNumber;
 
         Listener.on('ZonesChanged', (...args) =>
             this.onZoneGroupTopologyEvent(first, ...args)