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

Leaning up the initial connection, will trigger post-connection messages instead

Browse Source
This commit is contained in:
James Barnsley
2019-04-25 14:49:51 +12:00
parent 860b364b76
commit a9dad3e648
7 changed files with 28 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,9 @@ const PusherMiddleware = (function(){
} else {
switch (message.method){
case 'connection_extablished':
store.dispatch(pusherActions.setUsername(store.getState().pusher.username));
break;
case 'connection_added':
store.dispatch(pusherActions.connectionAdded(message.params.connection));
break;
@ -228,27 +231,14 @@ const PusherMiddleware = (function(){
store.dispatch({type: 'PUSHER_CONNECTING'});
var state = store.getState();
var connection = {
client_id: helpers.generateGuid(),
connection_id: helpers.generateGuid(),
username: 'Anonymous'
}
if (state.pusher.username){
connection.username = state.pusher.username;
}
connection.username = connection.username.replace(/\W/g, '');
socket = new WebSocket(
'ws'+(window.location.protocol === 'https:' ? 's' : '')+'://'+state.mopidy.host+':'+state.mopidy.port+'/iris/ws/',
[ connection.client_id, connection.connection_id, connection.username ]
'ws'+(window.location.protocol === 'https:' ? 's' : '')+'://'+state.mopidy.host+':'+state.mopidy.port+'/iris/ws/'
);
socket.onopen = () => {
store.dispatch({
type: 'PUSHER_CONNECTED',
connection_id: connection.connection_id,
client_id: connection.client_id,
username: connection.username
type: 'PUSHER_CONNECTED'
});
};