ben.carrasco/jambonz-feature-server
1
0
Fork 0
mirror of https://github.com/jambonz/jambonz-feature-server.git synced 2025-12-21 00:58:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

kill play task if bot responds verbs while actionHook delay is enabled (#712)

Browse Source 
* kill play task if bot responds verbs while actionHook delay is enabled

* fix actionHook delay continues even the bot already responded verbs

* wip

* wip

* wip
This commit is contained in:
Hoan Luu Huu
2024-04-11 20:46:08 +07:00
committed by GitHub
parent 938854c4b3
commit cd3b1ec905
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/session/call-session.js
View File

@@ -2269,6 +2269,7 @@ Duration=${duration} `
_startActionHookNoResponseTimer(options) { _startActionHookNoResponseTimer(options) {
this._clearActionHookNoResponseTimer(); this._clearActionHookNoResponseTimer();
this._actionHookDelayResolved = false;
if (options.noResponseTimeoutMs) { if (options.noResponseTimeoutMs) {
this.logger.debug(`CallSession:_startActionHookNoResponseTimer ${options.noResponseTimeoutMs}`); this.logger.debug(`CallSession:_startActionHookNoResponseTimer ${options.noResponseTimeoutMs}`);
this._actionHookNoResponseTimer = setTimeout(() => { this._actionHookNoResponseTimer = setTimeout(() => {
@@ -2282,7 +2283,9 @@ Duration=${duration} `
if (t.length) { if (t.length) {
t[0].on('playDone', (err) => { t[0].on('playDone', (err) => {
if (err) this.logger.error({err}, `Call-Session:exec Error delay action, play ${verb}`); if (err) this.logger.error({err}, `Call-Session:exec Error delay action, play ${verb}`);
if (!this._actionHookDelayResolved) {
this._startActionHookNoResponseTimer(options); this._startActionHookNoResponseTimer(options);
}
}); });
} }
this.tasks.push(...t); this.tasks.push(...t);
@@ -2300,7 +2303,16 @@ Duration=${duration} `
_clearActionHookNoResponseTimer() { _clearActionHookNoResponseTimer() {
if (this._actionHookNoResponseTimer) { if (this._actionHookNoResponseTimer) {
// Action Hook delay is solved.
this._actionHookDelayResolved = true;
clearTimeout(this._actionHookNoResponseTimer); clearTimeout(this._actionHookNoResponseTimer);
// if delay action is enabled
// and bot has responded with list of new verbs
// Only kill current running play task.
//https://github.com/jambonz/jambonz-feature-server/issues/710
if (this.currentTask?.name === TaskName.Play) {
this.currentTask.kill(this);
}
} }
this._actionHookNoResponseTimer = null; this._actionHookNoResponseTimer = null;
} }

3
lib/tasks/config.js
View File

@@ -250,8 +250,7 @@ class TaskConfig extends Task {
cs.stopBackgroundTask('transcribe'); cs.stopBackgroundTask('transcribe');
} }
} }
if (Object.keys(this.actionHookDelayAction).length !== 0) {
if (this.actionHookDelayAction) {
cs.actionHookDelayEnabled = this.actionHookDelayAction.enabled || false; cs.actionHookDelayEnabled = this.actionHookDelayAction.enabled || false;
cs.actionHookNoResponseTimeout = this.actionHookDelayAction.noResponseTimeout || 0; cs.actionHookNoResponseTimeout = this.actionHookDelayAction.noResponseTimeout || 0;
cs.actionHookNoResponseGiveUpTimeout = this.actionHookDelayAction.noResponseGiveUpTimeout || 0; cs.actionHookNoResponseGiveUpTimeout = this.actionHookDelayAction.noResponseGiveUpTimeout || 0;