kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-18 09:32:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request in FS/freeswitch from ~MARCELL-G/freeswitch:bugfix/FS-11262-vertojs-undefined-wsfallback to master

Browse Source 
* commit 'ee1418a5cab7568b7d61c7c844f7b1fcf075fcc3':
  FS-11262 [verto_communicator] prevent vertojs from stop retrying socket connection by undefined socketfallbackurl
This commit is contained in:
Anthony Minessale II 2018-07-19 18:32:22 +00:00
commit 84a3de1495
4 changed files with 6 additions and 6 deletions
html5/verto
js/src
jquery.jsonrpcclient.jsjquery.verto.js
verto_communicator/src
config.json.sample
vertoService/services
vertoService.js

4
html5/verto/js/src/jquery.jsonrpcclient.js

@ -322,8 +322,8 @@
self.options.onWSClose(self);
}
if (self.ws_cnt > 10) {
self.options.socketUrl = self.options.socketFallbackUrl;
if (self.ws_cnt > 10 && self.options.wsFallbackURL) {
self.options.socketUrl = self.options.wsFallbackURL;
}
console.error("Websocket Lost " + self.ws_cnt + " sleep: " + self.ws_sleep + "msec");

2
html5/verto/js/src/jquery.verto.js

@ -110,7 +110,7 @@
login: verto.options.login,
passwd: verto.options.passwd,
socketUrl: verto.options.socketUrl,
socketFallbackUrl: verto.options.socketFallbackUrl,
wsFallbackURL: verto.options.wsFallbackURL,
turnServer: verto.options.turnServer,
loginParams: verto.options.loginParams,
userVariables: verto.options.userVariables,

2
html5/verto/verto_communicator/src/config.json.sample

@ -10,7 +10,7 @@
"autocall": "3500",
"googlelogin": "true",
"wsURL": "wss://gamma.tollfreegateway.com/wss2",
"socketFallbackUrl": "wss://gamma.tollfreegateway.com/wss2",
"wsFallbackURL": "wss://gamma.tollfreegateway.com/wss2",
"turnServer": {
"urls": "turn:someturnserver.com:443?transport=tcp",
"credential": "1234",

4
html5/verto/verto_communicator/src/vertoService/services/vertoService.js

@ -175,7 +175,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
password: $cookieStore.get('verto_demo_passwd') || "1234",
hostname: window.location.hostname,
wsURL: ("wss://" + window.location.hostname + ":8082"),
socketFallbackUrl: null,
wsFallbackURL: null,
turnServer: null,
resCheckEnded: false
};
@ -735,7 +735,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
login: data.login + '@' + data.hostname,
passwd: data.password,
socketUrl: data.wsURL,
socketFallbackUrl: data.socketFallbackUrl,
wsFallbackURL: data.wsFallbackURL,
turnServer: data.turnServer,
tag: "webcam",
ringFile: "sounds/bell_ring2.wav",