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

Catching DOMException, caused when non-SSL websocket attempted from SSL browser session

Browse Source
This commit is contained in:
James Barnsley
2021-10-23 12:45:02 +13:00
parent c0475ee067
commit 319471154c
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -402,21 +402,23 @@ const MopidyMiddleware = (function () {
* */
return (store) => (next) => (action) => {
switch (action.type) {
case 'MOPIDY_CONNECT':
if (socket != null) {
socket.close();
}
case 'MOPIDY_CONNECT': {
if (socket != null) socket.close();
store.dispatch({ type: 'MOPIDY_CONNECTING' });
var state = store.getState();
const { ssl, host, port } = store.getState().mopidy;
try {
socket = new Mopidy({
webSocketUrl: `ws${ssl ? 's' : ''}://${host}:${port}/mopidy/ws/`,
callingConvention: 'by-position-or-by-name',
});
socket.on((type, data) => handleMessage(socket, store, type, data));
} catch (exception) {
console.error(exception);
}
socket = new Mopidy({
webSocketUrl: `ws${state.mopidy.ssl ? 's' : ''}://${state.mopidy.host}:${state.mopidy.port}/mopidy/ws/`,
callingConvention: 'by-position-or-by-name',
});
socket.on((type, data) => handleMessage(socket, store, type, data));
break;
}
case 'MOPIDY_CONNECTED':
if (store.getState().ui.allow_reporting) {