From 9409ef13bd54fb1d79fd8556b09d5b8e523b0612 Mon Sep 17 00:00:00 2001 From: YuriiYefimenko Date: Fri, 20 Aug 2021 15:39:38 +0300 Subject: [PATCH 1/5] Fix reset timeout for TTS.Speak --- src/js/Controllers/UIController.js | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/js/Controllers/UIController.js b/src/js/Controllers/UIController.js index 2f7bdb54..f3f2e17b 100644 --- a/src/js/Controllers/UIController.js +++ b/src/js/Controllers/UIController.js @@ -64,6 +64,7 @@ class UIController { this.timers = {} this.appsWithTimers = {} this.endTimes = {} + this.onResetTimeoutId = null } addListener(listener) { this.listener = listener @@ -372,8 +373,21 @@ class UIController { const context = state.activeApp this.endTimes[rpc.id] = Date.now() + alertTimeout; - this.timers[rpc.id] = setTimeout(this.onAlertTimeout, alertTimeout, rpc.id, rpc.params.appID, context ? context : rpc.params.appID, false) - + this.timers[rpc.id] = setTimeout( + () => { + if (this.endTimes[rpc.id] - Date.now() <= 0) { + ttsController.onResetTimeout() + this.onResetTimeoutId = setInterval(ttsController.onResetTimeout, 10000) + } + this.onAlertTimeout() + }, + alertTimeout, + rpc.id, + rpc.params.appID, + context ? context : rpc.params.appID, + false + ) + this.appsWithTimers[rpc.id] = rpc.params.appID this.onSystemContext("ALERT", rpc.params.appID) @@ -707,7 +721,7 @@ class UIController { this.listener.send(RpcFactory.OnResetTimeout(msgID,'UI.Alert',1000)); return; } - + clearInterval(this.onResetTimeoutId) let imageValidationSuccess = RemoveImageValidationResult(msgID) store.dispatch(closeAlert( From de24d8ab76c3e6bceaed6c5bcbaa04d31e8cb73f Mon Sep 17 00:00:00 2001 From: YuriiYefimenko Date: Wed, 25 Aug 2021 11:40:49 +0300 Subject: [PATCH 2/5] Add requestID to the onResetTimeout --- src/js/Controllers/UIController.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/js/Controllers/UIController.js b/src/js/Controllers/UIController.js index f3f2e17b..9469c62c 100644 --- a/src/js/Controllers/UIController.js +++ b/src/js/Controllers/UIController.js @@ -376,16 +376,12 @@ class UIController { this.timers[rpc.id] = setTimeout( () => { if (this.endTimes[rpc.id] - Date.now() <= 0) { - ttsController.onResetTimeout() - this.onResetTimeoutId = setInterval(ttsController.onResetTimeout, 10000) + ttsController.onResetTimeout(rpc.id) + this.onResetTimeoutId = setInterval(ttsController.onResetTimeout, 10000, rpc.id) } - this.onAlertTimeout() + this.onAlertTimeout(rpc.id, rpc.params.appID, context ? context : rpc.params.appID, false) }, alertTimeout, - rpc.id, - rpc.params.appID, - context ? context : rpc.params.appID, - false ) this.appsWithTimers[rpc.id] = rpc.params.appID From cf2c7ff0e7791f88f127525b13069d72d1d47996 Mon Sep 17 00:00:00 2001 From: YuriiYefimenko Date: Thu, 26 Aug 2021 16:26:14 +0300 Subject: [PATCH 3/5] Add requestID to the onResetTimeout --- src/js/Controllers/TTSController.js | 3 +-- src/js/Controllers/UIController.js | 14 ++------------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/js/Controllers/TTSController.js b/src/js/Controllers/TTSController.js index ec1dc692..f888f6cc 100644 --- a/src/js/Controllers/TTSController.js +++ b/src/js/Controllers/TTSController.js @@ -174,8 +174,7 @@ class TTSController { this.listener.send(RpcFactory.TTSStartedNotification()); this.playNext(); - if(!rpc.params.speakType.includes('ALERT')) - this.timers[rpc.id] = setInterval(this.onResetTimeout, 9000, rpc.params.appID, "TTS.Speak"); + this.timers[rpc.id] = setInterval(this.onResetTimeout, 9000, rpc.id, "TTS.Speak"); return null; case "StopSpeaking": if (this.currentlyPlaying) { diff --git a/src/js/Controllers/UIController.js b/src/js/Controllers/UIController.js index 9469c62c..b9d3d0e1 100644 --- a/src/js/Controllers/UIController.js +++ b/src/js/Controllers/UIController.js @@ -64,7 +64,6 @@ class UIController { this.timers = {} this.appsWithTimers = {} this.endTimes = {} - this.onResetTimeoutId = null } addListener(listener) { this.listener = listener @@ -373,16 +372,8 @@ class UIController { const context = state.activeApp this.endTimes[rpc.id] = Date.now() + alertTimeout; - this.timers[rpc.id] = setTimeout( - () => { - if (this.endTimes[rpc.id] - Date.now() <= 0) { - ttsController.onResetTimeout(rpc.id) - this.onResetTimeoutId = setInterval(ttsController.onResetTimeout, 10000, rpc.id) - } - this.onAlertTimeout(rpc.id, rpc.params.appID, context ? context : rpc.params.appID, false) - }, - alertTimeout, - ) + this.timers[rpc.id] = setTimeout(this.onAlertTimeout, alertTimeout, rpc.id, rpc.params.appID, context ? context : rpc.params.appID, false) + this.appsWithTimers[rpc.id] = rpc.params.appID @@ -717,7 +708,6 @@ class UIController { this.listener.send(RpcFactory.OnResetTimeout(msgID,'UI.Alert',1000)); return; } - clearInterval(this.onResetTimeoutId) let imageValidationSuccess = RemoveImageValidationResult(msgID) store.dispatch(closeAlert( From beff499b86bad38dfcb14c65465b4e6f81e65a18 Mon Sep 17 00:00:00 2001 From: YuriiYefimenko Date: Thu, 26 Aug 2021 16:28:06 +0300 Subject: [PATCH 4/5] fix indentation --- src/js/Controllers/UIController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/Controllers/UIController.js b/src/js/Controllers/UIController.js index b9d3d0e1..2f7bdb54 100644 --- a/src/js/Controllers/UIController.js +++ b/src/js/Controllers/UIController.js @@ -374,7 +374,6 @@ class UIController { this.endTimes[rpc.id] = Date.now() + alertTimeout; this.timers[rpc.id] = setTimeout(this.onAlertTimeout, alertTimeout, rpc.id, rpc.params.appID, context ? context : rpc.params.appID, false) - this.appsWithTimers[rpc.id] = rpc.params.appID this.onSystemContext("ALERT", rpc.params.appID) @@ -708,6 +707,7 @@ class UIController { this.listener.send(RpcFactory.OnResetTimeout(msgID,'UI.Alert',1000)); return; } + let imageValidationSuccess = RemoveImageValidationResult(msgID) store.dispatch(closeAlert( From a6735e5f50d82397119ebd70d4c693c1c11d5dd6 Mon Sep 17 00:00:00 2001 From: "Yurii Yefimenko (GitHub)" <86713844+YuriiYefimenko@users.noreply.github.com> Date: Mon, 20 Sep 2021 17:47:54 +0300 Subject: [PATCH 5/5] Update src/js/Controllers/TTSController.js Co-authored-by: Collin --- src/js/Controllers/TTSController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/Controllers/TTSController.js b/src/js/Controllers/TTSController.js index f888f6cc..1d0e4141 100644 --- a/src/js/Controllers/TTSController.js +++ b/src/js/Controllers/TTSController.js @@ -174,7 +174,7 @@ class TTSController { this.listener.send(RpcFactory.TTSStartedNotification()); this.playNext(); - this.timers[rpc.id] = setInterval(this.onResetTimeout, 9000, rpc.id, "TTS.Speak"); + this.timers[rpc.id] = setInterval(this.onResetTimeout, 9000, rpc.id); return null; case "StopSpeaking": if (this.currentlyPlaying) {