@onereach/step-voice 6.0.10 → 6.0.11-suh.1

package/dst/Global Command.d.ts

@@ -37,6 +37,5 @@ export default class GlobalCommand extends VoiceStep<Partial<INPUT>, OUTPUT, EVE
     exitThread(event: ITypedEvent<EVENT>, type: string, stepExit: string): Promise<void>;
     exitToThread(): void;
     buildGrammar(call: IVoiceCall, choices: TODO[]): Promise<any>;
-    sleepUntilHangup(): void;
 }
 export {};

package/dst/Global Command.js

@@ -6,10 +6,6 @@ const types_1 = require("@onereach/flow-sdk/dst/types");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const nanoid_1 = require("nanoid");
 const voice_1 = tslib_1.__importDefault(require("./voice"));
-var LocalEvents;
-(function (LocalEvents) {
-    LocalEvents["hangup"] = "hangup";
-})(LocalEvents || (LocalEvents = {}));
 class GlobalCommand extends voice_1.default {
     get isGlobal() {
         return true;
@@ -71,18 +67,6 @@ class GlobalCommand extends voice_1.default {
         this.triggers.otherwise(async () => {
             await this.initGrammar();
         });
-        const dataThread = this.process.getThread(this.dataThreadId);
-        if (this.dataThreadId !== types_1.MAIN_THREAD_ID && dataThread != null) {
-            this.triggers.hook({ name: "ending" /* ACTION.ending */, thread: this.dataThreadId, sync: true }, async () => {
-                delete this.waits['@ending'];
-                this.log.debug('sleep data thread', { thread: this.dataThreadId });
-                dataThread.gotoState({
-                    direct: true,
-                    step: this.currentStepId,
-                    name: this.sleepUntilHangup.name
-                });
-            });
-        }
         this.triggers.hook({ name: "waitEnd" /* ACTION.waitEnd */, thread: types_1.MAIN_THREAD_ID, sync: true }, async () => {
             delete this.waits['@waitEnd']; // TODO is there beter way to unsubscribe?
             await this.sendCommands(call, [{ name: 'grammar', params: {} }]);
@@ -93,13 +77,6 @@ class GlobalCommand extends voice_1.default {
             switch (event.params.type) {
                 case 'hangup': {
                     await this.hangup(call);
-                    if (dataThread?.state.name === this.sleepUntilHangup.name) {
-                        this.log.debug('wake data thread', { thread: this.dataThreadId });
-                        this.process.enqueue({
-                            thread: this.dataThreadId,
-                            name: LocalEvents.hangup
-                        });
-                    }
                     return;
                 }
                 case 'avm-detected':
@@ -249,10 +226,5 @@ class GlobalCommand extends voice_1.default {
             asr: asr.getSettings(call.asr)
         };
     }
-    sleepUntilHangup() {
-        this.triggers.local(LocalEvents.hangup, () => {
-            this.end();
-        });
-    }
 }
 exports.default = GlobalCommand;

package/dst/Wait For Call.d.ts

@@ -3,5 +3,5 @@ import { ITypedEvent } from '@onereach/flow-sdk/dst/types';
 export default class WaitForCall extends VoiceStep<TODO, TODO, TODO> {
     get conversation(): string | import("@onereach/flow-sdk/dst/types").IMergeField;
     runStep(): Promise<void>;
-    onCall(event: ITypedEvent<CallStartEvent>): Promise<unknown>;
+    onCall(event: ITypedEvent<CallStartEvent>): Promise<any>;
 }

package/dst/step.js

@@ -65,7 +65,6 @@ class ConvStep extends step_1.default {
         await super.runBefore();
         if (this.thread.ending)
             return;
-        this.triggers.local('_conv');
         // ensure cache is reset between step runs, just in case
         this._clearCache();
         if (!await this.hasConversation())
@@ -73,6 +72,7 @@ class ConvStep extends step_1.default {
         this.log.debug('conv.runBefore', { state: this.state, conv: this.convDataCache?._conv });
         if (this.state.direct)
             return;
+        this.triggers.local('_conv');
         if (!this.event.processed && this.event.action && typeof this[this.event.action] === 'function') {
             this.event.processed = true;
             this.state.prevName = this.state.name;

package/dst/voice.d.ts

@@ -50,7 +50,10 @@ export default class VoiceStep<TIn = unknown, TOut = unknown, TParams extends Vo
     handleCancel?: boolean;
 }, TOut, TParams> {
     runBefore(): Promise<void>;
+    exitStep(step: string, data?: any): any;
     sendCommands({ id, type, callback }: IVoiceCall, commands: TODO[]): Promise<void>;
+    handleDataThreadStart(): void;
+    handleDataThreadEnd(): void;
     handleHeartbeat(call: IVoiceCall): Promise<void>;
     handleCancel(): void;
     extractSectionMessages(sections: IPromtpSection[]): string;
@@ -74,4 +77,5 @@ export default class VoiceStep<TIn = unknown, TOut = unknown, TParams extends Vo
     rptsHasMore({ repromptsList }: TODO): boolean;
     get rptsIndex(): number;
     get rptsStarted(): boolean;
+    sleepUntilHangup(): Promise<void>;
 }

package/dst/voice.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VoiceStepError = void 0;
 const tslib_1 = require("tslib");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const types_1 = require("@onereach/flow-sdk/dst/types");
 const uuid_1 = require("uuid");
 // TODO: !!!!! import ConvStep from '@onereach/step-conversation/dst/step' !!!!!
 const step_1 = tslib_1.__importDefault(require("./step"));
@@ -16,9 +17,16 @@ class VoiceStep extends step_1.default {
     async runBefore() {
         await super.runBefore();
         if (this.cache != null) {
+            this.handleDataThreadStart();
             await this.handleHeartbeat(this.cache);
         }
     }
+    exitStep(step, data) {
+        if (this.cache != null) {
+            this.handleDataThreadEnd();
+        }
+        return super.exitStep(step, data);
+    }
     async sendCommands({ id, type, callback }, commands) {
         if (lodash_1.default.isEmpty(commands))
             return;
@@ -42,6 +50,45 @@ class VoiceStep extends step_1.default {
         if (result == null)
             throw new Error(`failed to send command to call: ${id}`);
     }
+    handleDataThreadStart() {
+        if (this.dataThreadId === types_1.MAIN_THREAD_ID || this.thread.id === this.dataThreadId)
+            return;
+        const dataThread = this.process.getThread(this.dataThreadId);
+        if (dataThread == null)
+            return;
+        if (dataThread.state.name === this.sleepUntilHangup.name) {
+            dataThread.waits[`thread/end/${this.thread.id}`] = {};
+            return;
+        }
+        this.triggers.hook({ name: "ending" /* ACTION.ending */, thread: this.dataThreadId, sync: true }, async () => {
+            delete this.waits['@ending'];
+            if (dataThread.state.name === this.sleepUntilHangup.name) {
+                this.log.debug('attach to sleep data thread', { thread: this.dataThreadId });
+                dataThread.waits[`thread/end/${this.thread.id}`] = {};
+                return;
+            }
+            this.log.debug('create sleep data thread', { thread: this.dataThreadId });
+            dataThread.gotoState({
+                direct: true,
+                step: this.currentStepId,
+                name: this.sleepUntilHangup.name,
+                waits: {
+                    [`thread/end/${this.thread.id}`]: {}
+                }
+            });
+        });
+    }
+    handleDataThreadEnd() {
+        if (this.dataThreadId === types_1.MAIN_THREAD_ID || this.thread.id === this.dataThreadId)
+            return;
+        const dataThread = this.process.getThread(this.dataThreadId);
+        if (dataThread == null)
+            return;
+        if (dataThread.state.name === this.sleepUntilHangup.name) {
+            // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+            delete dataThread.waits[`thread/end/${this.thread.id}`];
+        }
+    }
     async handleHeartbeat(call) {
         if (call.vv >= 1) {
             if (this.thread.background) {
@@ -306,6 +353,15 @@ class VoiceStep extends step_1.default {
     get rptsStarted() {
         return this.rptsIndex !== 0;
     }
+    async sleepUntilHangup() {
+        const threadEndPrefix = 'thread/end/';
+        if (this.event.name.startsWith(threadEndPrefix)) {
+            this.event.processed = true;
+            // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+            delete this.waits[this.event.name];
+            this.log.debug('THREAD END', { name: this.event.name, waits: this.waits });
+        }
+    }
 }
 exports.default = VoiceStep;
 module.exports = VoiceStep;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onereach/step-voice",
-  "version": "6.0.10",
+  "version": "6.0.11-suh.1",
   "author": "Roman Zolotarov <roman.zolotarov@onereach.com>",
   "contributors": [
     "Roman Zolotarov",