masq
/
glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch DOMException

This commit is contained in:
Tor Hveem 2014-05-06 21:48:40 +02:00
parent 9f6f598f40
commit d2f11ad89d
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
index.html
View File

@ -45,6 +45,9 @@
<div class="alert alert-danger" ng-show="sslError"> <div class="alert alert-danger" ng-show="sslError">
<strong>Secure connection error</strong> A secure connection with the WeeChat relay could not be initiated. This is most likely because your browser does not trust your relay's certificate. Please read the encryption instructions below! <strong>Secure connection error</strong> A secure connection with the WeeChat relay could not be initiated. This is most likely because your browser does not trust your relay's certificate. Please read the encryption instructions below!
</div> </div>
<div class="alert alert-danger" ng-show="securityError">
<strong>Secure connection error</strong> Unable to connect to unencrypted relay when your are connecting to Glowing Bear over HTTPS. Please use an encrypted relay or load the page without using HTTPS.
</div>
<div class="panel-group" id="accordion"> <div class="panel-group" id="accordion">
<div class="panel"> <div class="panel">
<div class="panel-heading"> <div class="panel-heading">

11
js/glowingbear.js
View File

@ -242,6 +242,7 @@ function($rootScope,
var connect = function (host, port, passwd, ssl, noCompression) { var connect = function (host, port, passwd, ssl, noCompression) {
var proto = ssl ? 'wss' : 'ws'; var proto = ssl ? 'wss' : 'ws';
var url = proto + "://" + host + ":" + port + "/weechat"; var url = proto + "://" + host + ":" + port + "/weechat";
$log.debug('Connecting to URL: ', url);
var onopen = function () { var onopen = function () {
@ -375,7 +376,8 @@ function($rootScope,
}; };
ngWebsockets.connect(url, try {
ngWebsockets.connect(url,
protocol, protocol,
{ {
'binaryType': "arraybuffer", 'binaryType': "arraybuffer",
@ -384,6 +386,12 @@ function($rootScope,
'onmessage': onmessage, 'onmessage': onmessage,
'onerror': onerror 'onerror': onerror
}); });
}catch(e) {
$log.debug("Websocket caught DOMException:", e);
$rootScope.lastError = Date.now();
$rootScope.errorMessage = true;
$rootScope.securityError = true;
}
}; };
@ -959,6 +967,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
$scope.connect = function() { $scope.connect = function() {
$scope.requestNotificationPermission(); $scope.requestNotificationPermission();
$rootScope.sslError = false; $rootScope.sslError = false;
$rootScope.securityError = false;
$rootScope.errorMessage = false; $rootScope.errorMessage = false;
connection.connect($scope.host, $scope.port, $scope.password, $scope.ssl); connection.connect($scope.host, $scope.port, $scope.password, $scope.ssl);
}; };