secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

If HTTPS then WSS

Browse Source
This commit is contained in:
James Barnsley
2017-03-27 21:36:33 +13:00
parent 11198f18c7
commit d85f3012f4
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/js/services/mopidy/middleware.js
View File

@ -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'
});

3
src/js/services/mopidy/reducer.js
View File

@ -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':

8
src/js/services/pusher/middleware.js
View File

@ -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 ]
);