From 1fee94846d3c26a53b81f538974872b0ddaac76f Mon Sep 17 00:00:00 2001 From: kPherox Date: Fri, 22 Mar 2019 03:48:51 +0900 Subject: [PATCH 1/4] Fix typo --- app/js/tl/tl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/js/tl/tl.js b/app/js/tl/tl.js index 9357895c..87fa6580 100644 --- a/app/js/tl/tl.js +++ b/app/js/tl/tl.js @@ -801,7 +801,7 @@ function reconnector(tlid,type,acct_id,data,mode){ } var wssh=localStorage.getItem("wssH_" + tlid); websocketHome[wssh].close(); - var wssh=localStorage.getItem("wssL_" + tlid); + var wssl=localStorage.getItem("wssL_" + tlid); websocketLocal[wssl].close(); mixre(acct_id, tlid, type, mute,"",voice,mode); }else if(type=="notf"){ From a09c031dbe3ce9b5101afb2c43afb416c4762d83 Mon Sep 17 00:00:00 2001 From: kPherox Date: Mon, 22 Apr 2019 03:26:57 +0900 Subject: [PATCH 2/4] Add type integrated to reconnector --- app/js/tl/tl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/js/tl/tl.js b/app/js/tl/tl.js index 87fa6580..9d03a338 100644 --- a/app/js/tl/tl.js +++ b/app/js/tl/tl.js @@ -788,7 +788,7 @@ function strAliveInt(){ } function reconnector(tlid,type,acct_id,data,mode){ console.log("Reconnector:"+mode) - if(type=="mix" || type=="plus"){ + if(type=="mix" || type=="integrated" || type=="plus"){ if(localStorage.getItem("voice_" + tlid)){ var voice=true; }else{ From bd8d480e071c9571a5899bcb512892b467ac82c1 Mon Sep 17 00:00:00 2001 From: kPherox Date: Mon, 22 Apr 2019 03:30:25 +0900 Subject: [PATCH 3/4] Check error count on integrated tl --- app/js/tl/mix.js | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/app/js/tl/mix.js b/app/js/tl/mix.js index 06e23787..5f01d6fe 100644 --- a/app/js/tl/mix.js +++ b/app/js/tl/mix.js @@ -200,7 +200,11 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) { $("#notice_icon_" + tlid).addClass("red-text"); todo('WebSocket Error ' + error); }else{ - reconnector(tlid,TLtype,acct_id,"","error"); + var errorct=localStorage.getItem("wserror_" + tlid)*1+1; + localStorage.setItem("wserror_" + tlid,errorct); + if(errorct<3){ + reconnector(tlid,TLtype,acct_id,"","error"); + } } }; websocketLocal[wslid].onclose = function() { @@ -209,7 +213,11 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) { $("#notice_icon_" + tlid).addClass("red-text"); todo('WebSocket Closed'); }else{ - reconnector(tlid,TLtype,acct_id,"","error"); + var errorct=localStorage.getItem("wserror_" + tlid)*1+1; + localStorage.setItem("wserror_" + tlid,errorct); + if(errorct<3){ + reconnector(tlid,TLtype,acct_id,"","error"); + } } }; websocketHome[wshid].onerror = function(error) { @@ -218,7 +226,11 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) { $("#notice_icon_" + tlid).addClass("red-text"); todo('WebSocket Error ' + error); }else{ - reconnector(tlid,TLtype,acct_id,"","error"); + var errorct=localStorage.getItem("wserror_" + tlid)*1+1; + localStorage.setItem("wserror_" + tlid,errorct); + if(errorct<3){ + reconnector(tlid,TLtype,acct_id,"","error"); + } } }; websocketHome[wshid].onclose = function() { @@ -227,7 +239,11 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) { $("#notice_icon_" + tlid).addClass("red-text"); todo('WebSocket Closed'); }else{ - reconnector(tlid,TLtype,acct_id,"","error"); + var errorct=localStorage.getItem("wserror_" + tlid)*1+1; + localStorage.setItem("wserror_" + tlid,errorct); + if(errorct<3){ + reconnector(tlid,TLtype,acct_id,"","error"); + } } }; From 4f3a7c47e38b4dc153d5800872e8961532bcf8c2 Mon Sep 17 00:00:00 2001 From: kPherox Date: Mon, 22 Apr 2019 03:33:56 +0900 Subject: [PATCH 4/4] Change console log level --- app/js/tl/mix.js | 16 ++++++++++------ app/js/tl/tl.js | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/js/tl/mix.js b/app/js/tl/mix.js index 5f01d6fe..7b2ea0e0 100644 --- a/app/js/tl/mix.js +++ b/app/js/tl/mix.js @@ -94,12 +94,14 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) { websocketLocal[wslid] = new WebSocket(startLocal); websocketHome[wshid].onopen = function(mess) { localStorage.setItem("wssH_" + tlid, wshid); - console.log("Connect Streaming API(Integrated:Home)"); + console.log(tlid + ":Connect Streaming API(Integrated:Home)"); + console.log(mess); $("#notice_icon_" + tlid).removeClass("red-text"); } websocketLocal[wslid].onopen = function(mess) { localStorage.setItem("wssL_" + tlid, wslid); - console.log("Connect Streaming API(Integrated:Local)"); + console.log(tlid + ":Connect Streaming API(Integrated:Local)"); + console.log(mess); $("#notice_icon_" + tlid).removeClass("red-text"); } websocketLocal[wslid].onmessage = function(mess) { @@ -195,7 +197,8 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) { } } websocketLocal[wslid].onerror = function(error) { - console.error('WebSocket Error ' + error); + console.error('WebSocketLocal Error') + console.error(error); if(mode=="error"){ $("#notice_icon_" + tlid).addClass("red-text"); todo('WebSocket Error ' + error); @@ -208,7 +211,7 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) { } }; websocketLocal[wslid].onclose = function() { - console.error('WebSocketLocal Closing by error:' + tlid); + console.log('WebSocketLocal Closing:' + tlid); if(mode=="error"){ $("#notice_icon_" + tlid).addClass("red-text"); todo('WebSocket Closed'); @@ -221,7 +224,8 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) { } }; websocketHome[wshid].onerror = function(error) { - console.error('WebSocket Error ' + error); + console.error('WebSocketHome Error') + console.error(error); if(mode=="error"){ $("#notice_icon_" + tlid).addClass("red-text"); todo('WebSocket Error ' + error); @@ -234,7 +238,7 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) { } }; websocketHome[wshid].onclose = function() { - console.error('WebSocketHome Closing by error:' + tlid); + console.log('WebSocketHome Closing:' + tlid); if(mode=="error"){ $("#notice_icon_" + tlid).addClass("red-text"); todo('WebSocket Closed'); diff --git a/app/js/tl/tl.js b/app/js/tl/tl.js index 9d03a338..b141e791 100644 --- a/app/js/tl/tl.js +++ b/app/js/tl/tl.js @@ -337,8 +337,8 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) { return false; }; websocket[wsid].onclose = function() { - console.error("Closing"); - console.error(tlid); + console.log("Closing"); + console.log(tlid); if(mode=="error"){ $("#notice_icon_" + tlid).addClass("red-text"); todo('WebSocket Closed');