@onereach/step-voice 4.0.29 → 4.0.32

package/dst/Cancel.d.ts

@@ -1,5 +1,4 @@
 import VoiceStep from './voice';
 export default class VoiceCancel extends VoiceStep {
-    get useQueue(): boolean;
     runStep(): Promise<void>;
 }

package/dst/Cancel.js

@@ -3,14 +3,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const voice_1 = tslib_1.__importDefault(require("./voice"));
 class VoiceCancel extends voice_1.default {
-    get useQueue() {
-        return false;
-    }
     async runStep() {
+        const conv = await this.getConversation();
+        if (conv.lcl.length <= 1) {
+            this.log.debug('nothing to cancel');
+            this.exitStep('next');
+            return;
+        }
         const channel = await this.fetchData();
-        await this.cancel();
-        await this.sendCommands(channel, [{ name: 'cancel' }]);
-        this.exitStep('next');
+        this.triggers.once(`in/voice/${channel.id}/event`, async (event) => {
+            switch (event.params.type) {
+                case 'hangup':
+                    await this.handleHangup(channel);
+                    return await this.waitConvEnd();
+                case 'error':
+                    return this.throwError(event.params.error);
+                case 'cancel': {
+                    await this.popConvStep(); // pop current command (cancel)
+                    await this.cancel(); // cancel previous command
+                    return this.exitStep('next');
+                }
+                default:
+                    return this.exitFlow();
+            }
+        });
+        this.triggers.otherwise(async () => {
+            await this.sendCommands(channel, [{ name: 'cancel' }]);
+        });
     }
 }
 exports.default = VoiceCancel;

package/dst/Choice.js

@@ -230,11 +230,11 @@ class Choice extends voice_1.default {
                 }
                 case 'hangup': {
                     await this.handleHangup(channel);
-                    return this.end();
-                }
-                case 'cancel': {
-                    return this.exitStep('cancel');
+                    return await this.waitConvEnd();
                 }
+                // case 'cancel': {
+                //   return this.data.handleCancel === true && this.exitStep('cancel')
+                // }
                 case 'error':
                     return this.throwError(event.params.error);
                 default:

package/dst/Conference Dial.js

@@ -11,7 +11,7 @@ class ConferenceDial extends voice_1.default {
             switch (event.params.type) {
                 case 'hangup':
                     await this.handleHangup(channel);
-                    return this.end();
+                    return await this.waitConvEnd();
                 case 'conference-start':
                     if (this.data.stayInConference) {
                         return this.exitFlow();

package/dst/Global Command.d.ts

@@ -2,7 +2,7 @@ import { ITypedEvent } from '@onereach/flow-sdk/dst/types';
 import VoiceStep, { IVoiceChannel, TODO, VoiceEvent } from './voice';
 interface INPUT {
     asr: TODO;
-    processHangUp: 'user' | 'bot' | 'both' | 'none';
+    processHangUp: 'user' | 'bot' | 'both' | 'none' | string;
     recordAfterTransfer: boolean;
     recordCall: boolean;
     choices: TODO[];
@@ -27,7 +27,6 @@ interface EVENT extends VoiceEvent {
 }
 export default class GlobalCommand extends VoiceStep<Partial<INPUT>, OUTPUT, EVENT> {
     get isGlobal(): boolean;
-    get autoCancel(): boolean | undefined;
     runStep(): Promise<void>;
     initThread(): Promise<void>;
     globThread(): Promise<void>;

package/dst/Global Command.js

@@ -9,16 +9,10 @@ class GlobalCommand extends voice_1.default {
     get isGlobal() {
         return true;
     }
-    get autoCancel() {
-        return undefined;
-    }
     async runStep() {
         this._clearCache();
         await this.process.runThread({
             id: `G:${this.dataThreadId}`,
-            local: {
-                background: true
-            },
             state: {
                 name: 'initThread',
                 step: this.step.id,
@@ -30,10 +24,6 @@ class GlobalCommand extends voice_1.default {
     }
     async initThread() {
         const channel = await this.fetchData();
-        // if (recordCall || _.includes(['bot', 'both'], processHangUp)) {
-        //   // prevent delete of session by "End" step
-        //   this.session.set('keepAlive', true);
-        // }
         const choices = this.buildChoices({ choices: this.data.choices });
         const grammar = await this.buildGrammar(channel, choices);
         // set grammar into voice conversation
@@ -65,30 +55,15 @@ class GlobalCommand extends voice_1.default {
     }
     async globThread() {
         const channel = await this.fetchData();
-        const choices = this.buildChoices({ choices: this.data.choices });
-        function exitExists(exitId) {
-            return lodash_1.default.some(choices, (choice) => choice.exitId === exitId);
-        }
-        if (channel.autoHangup) {
-            this.triggers.local('thread/end/main', async () => {
-                delete this.thread.waits['thread/end/main'];
-                const channel = await this.fetchData();
-                if (!channel.hangup) {
-                    channel.autoHangup = false;
-                    await this.updateData();
-                    this.local.background = undefined;
-                    await this.sendCommands(channel, [{ name: 'hangup' }]);
-                    void this.process.main.enqueueAndRun({ name: 'ending' });
-                    this.exitFlow();
-                }
-            });
-        }
+        const findExit = (exitId) => {
+            return lodash_1.default.find(this.step.exits, (exit) => exitId === exit.stepId);
+        };
         this.triggers.once(`in/voice/${channel.id}/event`, async (event) => {
             event.processed = undefined;
             switch (event.params.type) {
                 case 'hangup': {
                     await this.hangup(channel);
-                    await this.sendEventToStep({ toGlobal: false, event: { ...this.event, processed: undefined, action: 'local' } });
+                    await this.notifyConvEnd();
                     return this.end();
                 }
                 case 'avm-detected':
@@ -98,7 +73,7 @@ class GlobalCommand extends voice_1.default {
                 case 'digits': {
                     const params = event.params;
                     const exitId = params.exitId ?? '';
-                    if (exitExists(exitId)) {
+                    if (findExit(exitId)) {
                         await this.transcript(channel, {
                             previousTranscriptId: channel.lastTranscriptId,
                             keyPress: params.digit,
@@ -114,7 +89,7 @@ class GlobalCommand extends voice_1.default {
                 case 'recognition': {
                     const params = event.params;
                     const exitId = params.exitId ?? '';
-                    if (exitExists(exitId)) {
+                    if (findExit(exitId)) {
                         const voiceProcessResult = lodash_1.default.chain(params.phrases)
                             .map((p) => p.lexical)
                             .join(' | ')
@@ -140,10 +115,6 @@ class GlobalCommand extends voice_1.default {
     }
     async hangup(channel) {
         await this.handleHangup(channel);
-        // if (channel.recordCall || _.includes(['bot', 'both'], processHangUp)) {
-        //   // turn off protection of session deletion by "End" step
-        //   this.session.unset('keepAlive');
-        // }
         const isHangedUpByBot = channel.sessionEndedBy === 'Bot';
         const hangUpType = isHangedUpByBot ? 'bot hang up' : 'user hang up';
         // process call recording in hangup event
@@ -163,7 +134,7 @@ class GlobalCommand extends voice_1.default {
                 return await this.exitThread(this.event, hangUpType, 'hang up');
             case 'none':
             default:
-                return this.exitFlow();
+                return this.end();
         }
     }
     async exitThread(event, type, stepExit) {
@@ -195,16 +166,18 @@ class GlobalCommand extends voice_1.default {
         //   params: {}
         // }])
         // channel.global = null;
-        await this.updateData();
+        // await this.updateData()
+        const exitLabel = this.getExitStepLabel(stepExit) ?? stepExit;
         await this.process.runThread({
-            id: `${stepExit}_${(0, nanoid_1.nanoid)(8)}`,
+            id: `${exitLabel}_${(0, nanoid_1.nanoid)(8)}`,
             state: {
                 name: 'exitToThread',
+                direct: true,
                 result: {
                     conversation: this.conversation,
                     conversationThreadId: this.dataThreadId
                 },
-                exitStep: this.getExitStepId(stepExit),
+                exitStep: stepExit,
                 step: this.currentStepId
             }
         });
@@ -213,7 +186,7 @@ class GlobalCommand extends voice_1.default {
         // this.gotoState(this.state, { name: 'exiting' })
     }
     exitToThread() {
-        this.thread.jumpTo(this.state.exitStep, this.state.result);
+        this.thread.exitStep(this.state.exitStep, this.state.result);
     }
     async buildGrammar(channel, choices) {
         const { asr } = this.data;

package/dst/Hangup.d.ts

@@ -1,4 +1,5 @@
 import VoiceStep from './voice';
 export default class Hangup extends VoiceStep {
     runStep(): Promise<void>;
+    onConvEnd(): Promise<void>;
 }

package/dst/Hangup.js

@@ -12,9 +12,9 @@ class Hangup extends voice_1.default {
                     return this.exitStep('next');
                 case 'error':
                     return this.throwError(event.params.error);
-                case 'cancel': {
-                    return this.exitStep('cancel');
-                }
+                // case 'cancel': {
+                //   return this.data.handleCancel === true && this.exitStep('cancel')
+                // }
                 default:
                     return this.exitFlow();
             }
@@ -32,5 +32,8 @@ class Hangup extends voice_1.default {
             return this.exitFlow();
         });
     }
+    async onConvEnd() {
+        this.exitStep('next');
+    }
 }
 exports.default = Hangup;

package/dst/Initiate Call.d.ts

@@ -20,7 +20,6 @@ interface INPUT {
 }
 export default class InitiateCall extends VoiceStep<INPUT, TODO, CallStartEvent> {
     get conversation(): string | import("@onereach/flow-sdk/dst/types").IMergeField;
-    get autoCancel(): undefined;
     runStep(): Promise<void>;
     waitForCall(): Promise<void>;
 }

package/dst/Initiate Call.js

@@ -1,5 +1,9 @@
 "use strict";
-/* eslint-disable @typescript-eslint/strict-boolean-expressions, @typescript-eslint/explicit-function-return-type */
+/* eslint-disable
+  @typescript-eslint/strict-boolean-expressions,
+  @typescript-eslint/explicit-function-return-type,
+  @typescript-eslint/no-misused-promises
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const voice_1 = tslib_1.__importDefault(require("./voice"));
@@ -13,9 +17,6 @@ class InitiateCall extends voice_1.default {
             throw new Error('missing conversation');
         return this.step.dataOut;
     }
-    get autoCancel() {
-        return undefined;
-    }
     async runStep() {
         const { channelId = uuid.v4() } = this.data;
         if (!this.session.key) {

package/dst/Join Conference.js

@@ -11,7 +11,7 @@ class JoinConference extends voice_1.default {
             switch (event.params.type) {
                 case 'hangup':
                     await this.handleHangup(channel);
-                    return this.end();
+                    return await this.waitConvEnd();
                 case 'conference-start':
                     await this.transcript(channel, {
                         conferenceId: conferenceName,

package/dst/Keypad Input.js

@@ -152,11 +152,11 @@ class KeypadInput extends voice_1.default {
                 }
                 case 'hangup': {
                     await this.handleHangup(channel);
-                    return this.end();
-                }
-                case 'cancel': {
-                    return this.exitStep('cancel');
+                    return await this.waitConvEnd();
                 }
+                // case 'cancel': {
+                //   return this.data.handleCancel === true && this.exitStep('cancel')
+                // }
                 case 'error':
                     return this.throwError(event.params.error);
                 default:

package/dst/Kick From Conference.js

@@ -11,7 +11,7 @@ class KickFromConference extends voice_1.default {
             switch (event.params.type) {
                 case 'hangup':
                     await this.handleHangup(channel);
-                    return this.end();
+                    return await this.waitConvEnd();
                 case 'conference-end':
                     await this.transcript(channel, {
                         conferenceId: room,

package/dst/Say Message.js

@@ -21,14 +21,15 @@ class SayMessage extends voice_1.default {
             switch (event.params.type) {
                 case 'hangup':
                     await this.handleHangup(channel);
-                    return this.end();
+                    return await this.waitConvEnd();
                 case 'playback':
                     return this.exitStep('next');
                 case 'error':
                     return this.throwError(event.params.error);
-                case 'cancel': {
-                    return this.exitStep('cancel');
-                }
+                //
+                // case 'cancel': {
+                //   return this.data.handleCancel === true && this.exitStep('cancel')
+                // }
                 default:
                     return this.exitFlow();
             }

package/dst/Transfer.js

@@ -40,7 +40,7 @@ class Transfer extends voice_1.default {
                 }
                 case 'hangup': {
                     await this.handleHangup(channel);
-                    return this.end();
+                    return await this.waitConvEnd();
                 }
                 case 'error':
                     return this.throwError(event.params.error);

package/dst/Voice Recording.js

@@ -39,7 +39,7 @@ class Recording extends voice_1.default {
                     // TODO do we need zombie?
                     this.state.zombie = true;
                     await this.handleHangup(channel);
-                    return this.exitFlow();
+                    return await this.waitConvEnd();
                 case 'record':
                     if (!lodash_1.default.isEmpty(url)) {
                         await this.transcript(channel, {

package/dst/Wait For Call.d.ts

@@ -2,7 +2,6 @@ import VoiceStep, { CallStartEvent, TODO } from './voice';
 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;
-    get autoCancel(): boolean;
     runStep(): Promise<void>;
     onCall(event: ITypedEvent<CallStartEvent>): Promise<unknown>;
 }

package/dst/Wait For Call.js

@@ -1,5 +1,9 @@
 "use strict";
-/* eslint-disable @typescript-eslint/strict-boolean-expressions, @typescript-eslint/explicit-function-return-type */
+/* eslint-disable
+  @typescript-eslint/strict-boolean-expressions,
+  @typescript-eslint/explicit-function-return-type,
+  @typescript-eslint/no-misused-promises
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const voice_1 = tslib_1.__importDefault(require("./voice"));
@@ -11,21 +15,17 @@ class WaitForCall extends voice_1.default {
             throw new Error('missing conversation');
         return this.step.dataOut;
     }
-    get autoCancel() {
-        return false;
-    }
     async runStep() {
         const selectedNumbers = this.data.selectedNumbers;
         lodash_1.default.forEach(selectedNumbers, number => {
-            this.triggers.on(`in/voice/${number.value}/call`, async (event) => await this.onCall(event));
+            this.triggers.on(`in/voice/${number.value}/call`, this.onCall);
         });
     }
     async onCall(event) {
-        const { autoHangup, asr, tts, endOfInputTimeout } = this.data;
+        const { asr, tts, endOfInputTimeout } = this.data;
         const channel = {
             headers: event.params.headers,
             ...event.params.channel,
-            autoHangup,
             asr: asr.getSettings(),
             tts: tts.getVoice(),
             botNumber: event.params.channel.to ?? 'unknown',

package/dst/step.d.ts

@@ -10,10 +10,10 @@ export default class ConvStep<TData = unknown, TIn = unknown, TOut = unknown, TP
     get conversation(): IMergeFieldKey | IMergeField;
     /** id of the thread where conversation data is stored */
     get dataThreadId(): IThreadId;
-    get autoCancel(): boolean | undefined;
     get isGlobal(): boolean;
     get useQueue(): boolean;
     fetchData(): Promise<TData & IConversationData>;
+    getConversation(): Promise<IConversation>;
     updateData(): Promise<void>;
     hasConversation(): Promise<boolean>;
     runBefore(): Promise<void>;
@@ -24,7 +24,14 @@ export default class ConvStep<TData = unknown, TIn = unknown, TOut = unknown, TP
     onSkipEvent(): Promise<void>;
     cancel(): Promise<void>;
     onCancel(): Promise<void>;
-    waitCancelEnd(): Promise<void>;
+    onSleep(): Promise<void>;
+    onAwake(): Promise<void>;
+    onPause(): Promise<void>;
+    onResume(): Promise<void>;
+    notifyConvEnd(): Promise<void>;
+    waitConvEnd(): Promise<void>;
+    waitGlobEnd(): Promise<void>;
+    onConvEnd(): Promise<void>;
     pause(): Promise<void>;
     resume(): Promise<void>;
     sendEventToStep({ toGlobal, toStep, action, event }: {
@@ -37,13 +44,11 @@ export default class ConvStep<TData = unknown, TIn = unknown, TOut = unknown, TP
     /** @returns true if current conv is active */
     pushConvStep(): Promise<boolean>;
     /** @returns true if current conv was active */
-    popConvStep(): Promise<boolean>;
-    startConversation(data: TData, { autoCancel, events }: {
-        autoCancel?: boolean;
+    popConvStep(popStep?: IConversationStep): Promise<boolean>;
+    startConversation(data: TData, { events }: {
         events: Record<string, {}>;
         thread?: IThreadId;
     }): Promise<void>;
     _fetchData(): Promise<(TData & IConversationData) | undefined>;
-    _getConversation(): Promise<IConversation>;
     _clearCache(): void;
 }

package/dst/step.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const step_1 = tslib_1.__importDefault(require("@onereach/flow-sdk/dst/step"));
-const event_1 = tslib_1.__importDefault(require("@onereach/flow-sdk/dst/event"));
 class ConvStep extends step_1.default {
     get conversation() {
         if (this.data.conversation == null)
@@ -15,9 +14,6 @@ class ConvStep extends step_1.default {
         const dataThreadId = this.state.thread ?? this.data.conversationThread;
         return dataThreadId || this.thread.id;
     }
-    get autoCancel() {
-        return undefined;
-    }
     get isGlobal() {
         return false;
     }
@@ -30,6 +26,9 @@ class ConvStep extends step_1.default {
             throw new Error(`missing conversation data in state ${this.state.name}`);
         return data;
     }
+    async getConversation() {
+        return (await this.fetchData())._conv;
+    }
     async updateData() {
         if (this.convDataCache == null)
             throw new Error(`missing conversation cache in state ${this.state.name}`);
@@ -42,6 +41,8 @@ class ConvStep extends step_1.default {
     }
     async runBefore() {
         await super.runBefore();
+        if (this.state.ending)
+            return;
         // ensure cache is reset between step runs, just in case
         this._clearCache();
         this.triggers.local('_conv');
@@ -50,14 +51,15 @@ class ConvStep extends step_1.default {
         this.log.debug('conv.runBefore', { state: this.state, conv: this.convDataCache?._conv });
         if (this.state.direct)
             return;
-        if (this.event.action === 'cancel') {
-            this.state.name = 'onCancel';
+        if (!this.event.processed && this.event.action && typeof this[this.event.action] === 'function') {
+            this.event.processed = true;
+            this.state.name = this.event.action;
             return;
         }
         if (this.useQueue && !await this.pushConvStep()) {
             return await this.waitForConversation();
         }
-        if (this.event.action == null && this.event.processed !== true && this.convDataCache?._conv?.trg?.[this.event.name] != null) {
+        if (this.event.action == null && !this.event.processed && this.convDataCache?._conv?.trg?.[this.event.name] != null) {
             if (this.isGlobal)
                 return;
             const hasGlobal = await this.sendEventToStep({ event: { ...this.event, action: 'global' }, toGlobal: true }); // redirect to global (1)
@@ -77,17 +79,18 @@ class ConvStep extends step_1.default {
         if (!await this.hasConversation())
             return await super.runAfter();
         if (this.thread.hasControlAction()) {
-            if (await this.popConvStep()) {
-                await this.sendEventToStep({ toGlobal: this.isGlobal, action: 'activate' });
-            }
+            await this.popConvStep();
+            // if (await this.popConvStep()) {
+            //   await this.sendEventToStep({ toGlobal: this.isGlobal, action: 'onAwake' })
+            // }
         }
-        if (this.isGlobal && !event_1.default.isProcessed(this.event)) {
+        if (this.isGlobal && !this.event.processed) {
             await this.sendEventToStep({ toGlobal: false, event: { ...this.event, processed: undefined, action: 'local' } });
         }
         await super.runAfter();
     }
     async hasActiveGlobal() {
-        const globalLength = (await this._getConversation())?.glb?.length ?? 0;
+        const globalLength = (await this.getConversation())?.glb?.length ?? 0;
         return globalLength > 0;
     }
     async setLocalTriggers() {
@@ -119,59 +122,88 @@ class ConvStep extends step_1.default {
             this.log.debug('conv.cannot cancel global');
             return;
         }
-        const conv = await this._getConversation();
-        const activeStep = await this.activeStep(false);
-        if (activeStep != null) {
-            this.log.debug('conv.cancel', activeStep);
-            conv.lcl.splice(0);
-            await this.updateData();
-            await this.sendEventToStep({ toGlobal: false, action: 'cancel', toStep: activeStep });
-        }
-        else {
-            this.log.debug('conv.nothing to cancel');
-        }
+        const activeStep = await this.activeStep();
+        await this.sendEventToStep({ event: { name: '_conv', action: 'onCancel', params: { byStep: this.step.label } }, toStep: activeStep });
     }
     async onCancel() {
+        await this.popConvStep();
         if (this.getExitStepId('cancel')) {
             this.log.debug('conv.cancel exit');
             this.exitStep('cancel');
         }
         else {
-            const conversationThread = this.state.thread ?? this.thread.id;
-            if (conversationThread === this.thread.id) {
-                this.log.debug('conv.cancel wait for end', this.conversation);
-                this.gotoState({ ...this.state, name: 'waitCancelEnd', direct: true });
+            return await this.waitConvEnd();
+        }
+    }
+    async onSleep() {
+        // sleep
+    }
+    async onAwake() {
+        // wakeup
+    }
+    async onPause() {
+        // return await this.waitConvEnd()
+    }
+    async onResume() {
+        // resume
+    }
+    async notifyConvEnd() {
+        await this.popConvStep();
+        const conv = await this.getConversation();
+        const lcl = conv.lcl.splice(0);
+        const glb = conv.glb.splice(0);
+        if (lcl.length > 0 || glb.length > 0) {
+            await this.updateData();
+            for (const step of lcl) {
+                await this.sendEventToStep({ toStep: step, action: 'onConvEnd' });
             }
-            else {
-                this.log.debug('conv.cancel end', this.conversation);
-                this.end();
+            for (const step of glb) {
+                await this.sendEventToStep({ toStep: step, action: 'onConvEnd' });
             }
         }
     }
-    async waitCancelEnd() {
-        this.exitFlow();
-    }
-    async pause() {
-        const conv = await this._getConversation();
-        const activeStep = await this.activeStep(false);
-        if (activeStep != null) {
-            this.log.debug('conv.pause', activeStep);
-            conv.stk.push(conv.lcl.splice(0)); // save que to stk
-            await this.sendEventToStep({ toGlobal: false, action: 'pause', toStep: activeStep });
+    async waitConvEnd() {
+        const conversationThread = this.state.thread ?? this.thread.id;
+        if (!this.isGlobal && conversationThread === this.thread.id && this.thread.id !== 'main') {
+            this.log.debug('conv.wait for end', this.conversation);
+            this.gotoState({ ...this.state, name: 'waitGlobEnd', direct: true });
         }
         else {
-            this.log.debug('conv.nothing to pause');
+            this.log.debug('conv.end', this.conversation);
+            await this.onConvEnd();
         }
     }
+    async waitGlobEnd() {
+        const gcThreadId = `G:${this.thread.id}`;
+        // wait for glob thread end (if exists)
+        this.triggers.local(`thread/end/${gcThreadId}`, async () => await this.onConvEnd());
+        if (!this.process.getThread(gcThreadId))
+            await this.onConvEnd();
+    }
+    async onConvEnd() {
+        this.end();
+    }
+    async pause() {
+        // const conv = await this._getConversation()
+        // const activeStep = await this.activeStep(false)
+        // if (activeStep != null) {
+        //   this.log.debug('conv.pause', activeStep)
+        //   conv.stk.push(conv.lcl.splice(0)) // save que to stk
+        //   await this.updateData()
+        //   await this.sendEventToStep({ action: 'onPause', toStep: activeStep })
+        // } else {
+        //   this.log.debug('conv.nothing to pause')
+        // }
+    }
     async resume() {
-        const conv = await this._getConversation();
-        if (conv.stk.length > 0) {
-            conv.lcl.unshift(...(conv.stk.pop() ?? [])); // restore que from stk
-            await this.sendEventToStep({ toGlobal: false, action: 'resume' });
-        }
-        else {
-            this.log.debug('conv.nothing to resume');
-        }
+        // const conv = await this._getConversation()
+        // if (conv.stk.length > 0) {
+        //   conv.lcl.unshift(...(conv.stk.pop() ?? [])) // restore que from stk
+        //   await this.updateData()
+        //   await this.sendEventToStep({ toGlobal: false, action: 'onResume' })
+        // } else {
+        //   this.log.debug('conv.nothing to resume')
+        // }
     }
     async sendEventToStep({ toGlobal, toStep, action, event = { name: '_conv', action } }) {
         toStep || (toStep = await this.activeStep(toGlobal));
@@ -182,63 +214,59 @@ class ConvStep extends step_1.default {
         return undefined;
     }
     async activeStep(isGlobal = this.isGlobal) {
-        const conv = await this._getConversation();
-        return isGlobal ? conv.glb[conv.glb.length - 1] : conv.lcl[0];
+        const conv = await this.getConversation();
+        return isGlobal ? conv.glb[conv.glb.length - 1] : conv.lcl[conv.lcl.length - 1];
     }
     /** @returns true if current conv is active */
     async pushConvStep() {
-        const conv = await this._getConversation();
+        const conv = await this.getConversation();
         const sessionKey = this.session.key;
         if (sessionKey == null)
             throw new Error('session is required');
         const que = this.isGlobal ? conv.glb : conv.lcl;
         const queIndex = que.findIndex(stp => stp.key === sessionKey && this.thread.id === stp.thread);
         if (queIndex < 0) {
-            if (que.length > 0 && !this.isGlobal && (this.autoCancel ?? conv.acl ?? false))
-                await this.cancel();
-            que.push({ key: sessionKey, thread: this.thread.id });
+            await this.sendEventToStep({ toGlobal: false, event: { name: '_conv', action: 'onPause', params: { byStep: this.step.label } } });
+            que.push({ key: sessionKey, thread: this.thread.id, name: this.constructor.name, label: this.label, step: this.id });
             await this.updateData();
-            return this.isGlobal ? true : que.length === 1;
+            return true;
         }
-        return queIndex === (this.isGlobal ? que.length - 1 : 0);
+        return queIndex === que.length - 1;
     }
     /** @returns true if current conv was active */
-    async popConvStep() {
-        const conv = await this._getConversation();
+    async popConvStep(popStep) {
+        const conv = await this.getConversation();
         const sessionKey = this.session.key;
         if (sessionKey == null)
             throw new Error('session is required');
+        popStep || (popStep = { key: sessionKey, thread: this.thread.id });
         const que = this.isGlobal ? conv.glb : conv.lcl;
-        const queIndex = que.findIndex(stp => stp.key === sessionKey && this.thread.id === stp.thread);
+        const queIndex = que.findIndex(stp => stp.key === popStep?.key && stp.thread === popStep.thread);
         if (queIndex >= 0) {
             // console.log('SPLICE1', this.thread.id, this.step.label, que)
             que.splice(queIndex, 1);
             await this.updateData();
-            return this.isGlobal ? queIndex === que.length : queIndex === 0;
+            return queIndex === que.length;
         }
-        let updated = false;
-        conv.stk.forEach((steps, stepsIdx) => {
-            const stpIdx = steps.findIndex(stp => stp.key === sessionKey && this.thread.id === stp.thread);
-            if (stpIdx >= 0) {
-                if (steps.length > 1)
-                    steps.splice(stpIdx, 1);
-                else
-                    conv.stk.splice(stepsIdx, 1);
-                updated = true;
-            }
-        });
-        if (updated)
-            await this.updateData();
+        // let updated = false
+        // conv.stk.forEach((steps, stepsIdx) => {
+        //   const stpIdx = steps.findIndex(stp => stp.key === sessionKey && this.thread.id === stp.thread)
+        //   if (stpIdx >= 0) {
+        //     if (steps.length > 1) steps.splice(stpIdx, 1)
+        //     else conv.stk.splice(stepsIdx, 1)
+        //     updated = true
+        //   }
+        // })
+        // if (updated) await this.updateData()
         return false;
     }
-    async startConversation(data, { autoCancel = false, events }) {
+    async startConversation(data, { events }) {
         this.convDataCache = {
             ...data,
             _conv: {
-                acl: (autoCancel ? 1 : undefined),
                 trg: events,
                 glb: [],
-                stk: [],
+                // stk: [],
                 lcl: []
             }
         };
@@ -253,9 +281,6 @@ class ConvStep extends step_1.default {
         // console.log('FETCH', this.conversation, this.thread.id, this.step.label, this.convDataCache?._conv.que)
         return this.convDataCache;
     }
-    async _getConversation() {
-        return (await this.fetchData())._conv;
-    }
     _clearCache() {
         this.convDataCache = undefined;
     }

package/dst/voice.d.ts

@@ -4,7 +4,6 @@ import BasicError from '@onereach/flow-sdk/dst/errors/base';
 export declare type TODO = any;
 export interface IVoiceChannel {
     id: string;
-    autoHangup: boolean;
     hangup: boolean;
     endUserNumber: string;
     botNumber: string;
@@ -34,7 +33,6 @@ export interface CallStartEvent extends VoiceEvent {
 export default class VoiceStep<TIn = unknown, TOut = unknown, TParams = VoiceEvent> extends ConvStep<IVoiceChannel, TIn & {
     handleCancel?: boolean;
 }, TOut, TParams> {
-    get autoCancel(): boolean | undefined;
     sendCommands({ id, type, callback }: IVoiceChannel, commands: TODO[]): Promise<unknown>;
     extractSectionMessages(sections: IPromtpSection[]): string;
     extractSectionFiles(sections: IPromtpSection[]): Array<{

package/dst/voice.js

@@ -13,9 +13,6 @@ class VoiceStepError extends base_1.default {
 exports.VoiceStepError = VoiceStepError;
 class VoiceStep extends step_1.default {
     // static Error = VoiceStepError
-    get autoCancel() {
-        return true;
-    }
     async sendCommands({ id, type, callback }, commands) {
         if (lodash_1.default.isEmpty(commands))
             return;
@@ -24,7 +21,7 @@ class VoiceStep extends step_1.default {
             name: `out/voice/${type}`,
             params: {
                 id,
-                cancel: this.autoCancel,
+                cancel: this.isGlobal ? undefined : true,
                 commands
             },
             reporting: this.session.getSessionRef()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onereach/step-voice",
-  "version": "4.0.29",
+  "version": "4.0.32",
   "author": "Roman Zolotarov <roman.zolotarov@onereach.com>",
   "contributors": [
     "Roman Zolotarov",
@@ -18,19 +18,19 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@onereach/flow-sdk": "^3.1.36",
+    "@onereach/flow-sdk": "^3.1.54",
     "@swc/cli": "^0.1.57",
-    "@swc/core": "^1.2.205",
+    "@swc/core": "^1.2.210",
     "@swc/jest": "^0.2.21",
-    "@types/jest": "^28.1.3",
+    "@types/jest": "^28.1.4",
     "@types/lodash": "^4.14.182",
     "@types/timestring": "^6.0.2",
     "@types/uuid": "^8.3.4",
-    "aws-sdk": "^2.1164.0",
+    "aws-sdk": "^2.1168.0",
     "babel-runtime": "^6.26.0",
     "docdash": "^1.2.0",
     "husky": "^8.0.1",
-    "jest": "^28.1.1",
+    "jest": "^28.1.2",
     "pinst": "^3.0.0",
     "ts-standard": "^11.0.0",
     "typescript": "^4.7.4"
@@ -75,4 +75,4 @@
       "node_modules"
     ]
   }
-}
+}