From 5dbb4e28dab7ac455db152d4c5105923563666af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josip=20Jan=C5=BEi=C4=87?= Date: Sat, 4 Mar 2017 14:43:21 +0100 Subject: [PATCH 1/5] Use ssl for pusher websocket if using https port --- src/js/services/pusher/middleware.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/services/pusher/middleware.js b/src/js/services/pusher/middleware.js index 8a66ff5f..680cd398 100755 --- a/src/js/services/pusher/middleware.js +++ b/src/js/services/pusher/middleware.js @@ -78,7 +78,7 @@ const PusherMiddleware = (function(){ connection.username = connection.username.replace(/\W/g, '') socket = new WebSocket( - 'ws://'+state.mopidy.host+':'+state.mopidy.port+'/iris/ws', + 'ws'+(state.mopidy.port === '443' ? 's' : '')+'://'+state.mopidy.host+':'+state.mopidy.port+'/iris/ws', [ connection.clientid, connection.connection_id, connection.username ] ); @@ -316,4 +316,4 @@ const PusherMiddleware = (function(){ })(); -export default PusherMiddleware \ No newline at end of file +export default PusherMiddleware From d85f3012f45cfe03e0aa9097de2e1d1385fdd1d5 Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Mon, 27 Mar 2017 21:36:33 +1300 Subject: [PATCH 2/5] If HTTPS then WSS --- src/js/services/mopidy/middleware.js | 7 ++++++- src/js/services/mopidy/reducer.js | 3 ++- src/js/services/pusher/middleware.js | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js index 5dc8a0c9..5426815d 100755 --- a/src/js/services/mopidy/middleware.js +++ b/src/js/services/mopidy/middleware.js @@ -152,8 +152,13 @@ const MopidyMiddleware = (function(){ var state = store.getState(); + if (window.location.protocol == 'https'){ + var protocol = 'wss' + } else { + var protocol = 'ws' + } socket = new Mopidy({ - webSocketUrl: 'ws://'+state.mopidy.host+':'+state.mopidy.port+'/mopidy/ws', + webSocketUrl: protocol+'://'+state.mopidy.host+':'+state.mopidy.port+'/mopidy/ws', callingConvention: 'by-position-or-by-name' }); diff --git a/src/js/services/mopidy/reducer.js b/src/js/services/mopidy/reducer.js index 339a3b6f..34485cf1 100755 --- a/src/js/services/mopidy/reducer.js +++ b/src/js/services/mopidy/reducer.js @@ -15,7 +15,8 @@ export default function reducer(mopidy = {}, action){ case 'MOPIDY_SET_CONFIG': return Object.assign({}, mopidy, { host: action.host, - port: action.port + port: action.port, + ssl: action.ssl }); case 'MOPIDY_CHANGE_TRACK': diff --git a/src/js/services/pusher/middleware.js b/src/js/services/pusher/middleware.js index 64990a5b..12c3c5d1 100755 --- a/src/js/services/pusher/middleware.js +++ b/src/js/services/pusher/middleware.js @@ -72,8 +72,14 @@ const PusherMiddleware = (function(){ if( state.pusher.username ) connection.username = state.pusher.username; connection.username = connection.username.replace(/\W/g, '') + if (window.location.protocol == 'https'){ + var protocol = 'wss' + } else { + var protocol = 'ws' + } + socket = new WebSocket( - 'ws://'+state.mopidy.host+':'+state.mopidy.port+'/iris/ws', + protocol+'://'+state.mopidy.host+':'+state.mopidy.port+'/iris/ws', [ connection.clientid, connection.connection_id, connection.username ] ); From 7452c743ba4493f42cb80549710aaf9119e1606d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josip=20Jan=C5=BEi=C4=87?= Date: Mon, 27 Mar 2017 15:16:24 +0200 Subject: [PATCH 3/5] Correct check for HTTPS protocol --- src/js/services/pusher/middleware.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/services/pusher/middleware.js b/src/js/services/pusher/middleware.js index 680cd398..a093332f 100755 --- a/src/js/services/pusher/middleware.js +++ b/src/js/services/pusher/middleware.js @@ -78,7 +78,7 @@ const PusherMiddleware = (function(){ connection.username = connection.username.replace(/\W/g, '') socket = new WebSocket( - 'ws'+(state.mopidy.port === '443' ? 's' : '')+'://'+state.mopidy.host+':'+state.mopidy.port+'/iris/ws', + 'ws'+(window.location.protocol === 'https:' ? 's' : '')+'://'+state.mopidy.host+':'+state.mopidy.port+'/iris/ws', [ connection.clientid, connection.connection_id, connection.username ] ); From 889501332ce861a1517d9caa9b91d0cc3d26e9f7 Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Tue, 28 Mar 2017 05:46:22 +1300 Subject: [PATCH 4/5] Rebasing middleware pre-merge --- src/js/services/mopidy/middleware.js | 7 +------ src/js/services/pusher/middleware.js | 8 +------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js index 5426815d..5dc8a0c9 100755 --- a/src/js/services/mopidy/middleware.js +++ b/src/js/services/mopidy/middleware.js @@ -152,13 +152,8 @@ const MopidyMiddleware = (function(){ var state = store.getState(); - if (window.location.protocol == 'https'){ - var protocol = 'wss' - } else { - var protocol = 'ws' - } socket = new Mopidy({ - webSocketUrl: protocol+'://'+state.mopidy.host+':'+state.mopidy.port+'/mopidy/ws', + webSocketUrl: 'ws://'+state.mopidy.host+':'+state.mopidy.port+'/mopidy/ws', callingConvention: 'by-position-or-by-name' }); diff --git a/src/js/services/pusher/middleware.js b/src/js/services/pusher/middleware.js index 12c3c5d1..64990a5b 100755 --- a/src/js/services/pusher/middleware.js +++ b/src/js/services/pusher/middleware.js @@ -72,14 +72,8 @@ const PusherMiddleware = (function(){ if( state.pusher.username ) connection.username = state.pusher.username; connection.username = connection.username.replace(/\W/g, '') - if (window.location.protocol == 'https'){ - var protocol = 'wss' - } else { - var protocol = 'ws' - } - socket = new WebSocket( - protocol+'://'+state.mopidy.host+':'+state.mopidy.port+'/iris/ws', + 'ws://'+state.mopidy.host+':'+state.mopidy.port+'/iris/ws', [ connection.clientid, connection.connection_id, connection.username ] ); From d7bcefa3b497c3f16b1a134083030ac3c986c49b Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Tue, 28 Mar 2017 08:06:04 +1300 Subject: [PATCH 5/5] WSS for mopidy also --- src/js/services/mopidy/middleware.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js index 5dc8a0c9..d5b99658 100755 --- a/src/js/services/mopidy/middleware.js +++ b/src/js/services/mopidy/middleware.js @@ -153,7 +153,7 @@ const MopidyMiddleware = (function(){ var state = store.getState(); socket = new Mopidy({ - webSocketUrl: 'ws://'+state.mopidy.host+':'+state.mopidy.port+'/mopidy/ws', + webSocketUrl: 'ws'+(window.location.protocol === 'https:' ? 's' : '')+'://'+state.mopidy.host+':'+state.mopidy.port+'/mopidy/ws', callingConvention: 'by-position-or-by-name' });