@onereach/step-voice 6.0.19 → 6.1.0

package/dst/Choice.js

@@ -255,7 +255,7 @@ class Choice extends voice_1.default {
                 actionFromBot: true
             });
             command.params.sections = speechSections;
-            command.params.timeout = this.rptsTimeout({ noReplyDelay, repromptsList });
+            command.params.timeout = this.rptsTimeout({ noReplyDelay, repromptsList, initial: true });
             await this.pauseRecording(call, command, sensitiveData);
             return this.exitFlow();
         });

package/dst/Custom Voice Input.js

@@ -202,7 +202,7 @@ class CustomVoiceInput extends voice_1.default {
                 actionFromBot: true
             });
             command.params.sections = speechSections;
-            command.params.timeout = this.rptsTimeout({ noReplyDelay, repromptsList });
+            command.params.timeout = this.rptsTimeout({ noReplyDelay, repromptsList, initial: true });
             await this.pauseRecording(call, command, sensitiveData);
             return this.exitFlow();
         });

package/dst/Join Conference.d.ts

@@ -1,9 +1,12 @@
-import VoiceStep from './voice';
+import VoiceStep, { TODO, VoiceEvent } from './voice';
 interface INPUT {
     conferenceName: string;
     stayInConference: boolean;
 }
-export default class JoinConference extends VoiceStep<INPUT> {
+export default class JoinConference extends VoiceStep<INPUT, TODO, VoiceEvent & {
+    user: string;
+    room: string;
+}> {
     runStep(): Promise<void>;
 }
 export {};

package/dst/Join Conference.js

@@ -13,6 +13,10 @@ class JoinConference extends voice_1.default {
                     await this.handleHangup(call);
                     return await this.waitConvEnd();
                 case 'conference-start':
+                    call.conference = {
+                        room: event.params.room,
+                        user: event.params.user
+                    };
                     await this.transcript(call, {
                         conferenceId: conferenceName,
                         reportingSettingsKey: 'transcript',
@@ -26,6 +30,7 @@ class JoinConference extends voice_1.default {
                         return this.exitStep('next', lodash_1.default.omit(event.params, ['type']));
                     }
                 case 'conference-end':
+                    call.conference = undefined;
                     await this.transcript(call, {
                         conferenceId: conferenceName,
                         reportingSettingsKey: 'transcript',

package/dst/Keypad Input.js

@@ -170,7 +170,7 @@ class KeypadInput extends voice_1.default {
                 action: 'Call Prompt',
                 actionFromBot: true
             });
-            command.params.firstDigitTimeout = this.rptsTimeout({ noReplyDelay, repromptsList });
+            command.params.firstDigitTimeout = this.rptsTimeout({ noReplyDelay, repromptsList, initial: true });
             command.params.sections = speechSections;
             await this.pauseRecording(call, command, sensitiveData);
             return this.exitFlow();

package/dst/{Kick From Conference.js → Leave Conference.js }

@@ -6,13 +6,18 @@ const voice_1 = tslib_1.__importDefault(require("./voice"));
 class KickFromConference extends voice_1.default {
     async runStep() {
         const call = await this.fetchData();
-        const { room, user } = this.data;
+        if (call.conference == null) {
+            this.log.debug('already not in conference');
+            return this.exitStep('next');
+        }
+        const { room, user } = call.conference;
         this.triggers.local(`in/voice/${call.id}`, async (event) => {
             switch (event.params.type) {
                 case 'hangup':
                     await this.handleHangup(call);
                     return await this.waitConvEnd();
                 case 'conference-end':
+                    call.conference = undefined;
                     await this.transcript(call, {
                         conferenceId: room,
                         reportingSettingsKey: 'transcript',

package/dst/voice.d.ts

@@ -25,6 +25,10 @@ export interface IVoiceCall extends IConversationData {
     to?: string;
     from?: string;
     headers?: Record<string, string>;
+    conference?: {
+        room: string;
+        user: string;
+    };
 }
 export type EventType = 'hangup' | 'ack' | 'error' | 'cancel' | 'background' | 'avm-detected' | 'recognition' | 'digit' | 'digits' | 'conference-start' | 'conference-end' | 'playback' | 'timeout' | 'record' | 'bridge' | 'bridge/ended' | 'is_flow_ready' | 'call' | 'dtmf-sent';
 export declare class VoiceStepError extends BasicError {
@@ -56,8 +60,6 @@ export default class VoiceStep<TIn = unknown, TOut = unknown, TParams extends Vo
     exitStepByThread(exitId: string, result: any): any;
     exitToThread(): void;
     sendCommands({ id, type, callback }: IVoiceCall, commands: TODO[]): Promise<void>;
-    handleDataThreadStart(): void;
-    handleDataThreadEnd(): void;
     handleHeartbeat(call: IVoiceCall): Promise<void>;
     handleCancel(): void;
     extractSectionMessages(sections: IPromtpSection[]): string;
@@ -76,12 +78,11 @@ export default class VoiceStep<TIn = unknown, TOut = unknown, TParams extends Vo
     buildChoice(choice: TODO): TODO;
     exitChoiceData(type: string, params?: TODO): TODO;
     rptsSend(call: IVoiceCall, { command, reporting, repromptsList, noReplyDelay, speechSections, textType, ttsSettings, sensitiveData }: TODO): Promise<void>;
-    rptsTimeout({ noReplyDelay, repromptsList }: TODO): number;
+    rptsTimeout({ noReplyDelay, repromptsList, initial }: TODO): number;
     rptsRestart(): void;
     rptsHasMore({ repromptsList }: TODO): boolean;
     get rptsIndex(): number;
     get rptsStarted(): boolean;
-    sleepUntilHangup(): Promise<void>;
     canVoicerHearbeat(call: IVoiceCall): boolean;
     canVoicerAck(call: IVoiceCall): boolean;
 }

package/dst/voice.js

@@ -5,7 +5,6 @@ exports.VoiceStepError = void 0;
 const tslib_1 = require("tslib");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const nanoid_1 = require("nanoid");
-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"));
@@ -18,7 +17,8 @@ class VoiceStep extends step_1.default {
     async runBefore() {
         await super.runBefore();
         if (this.cache != null) {
-            this.handleDataThreadStart();
+            if (this.thread.id !== this.dataThreadId)
+                this.thread.refThread(this.dataThreadId);
             if (!this.state.direct)
                 await this.handleHeartbeat(this.cache);
         }
@@ -26,9 +26,6 @@ class VoiceStep extends step_1.default {
     exitStep(exitId, data, byThread = false) {
         if (byThread)
             return this.exitStepByThread(exitId, data);
-        if (this.cache != null) {
-            this.handleDataThreadEnd();
-        }
         return super.exitStep(exitId, data);
     }
     exitStepByThread(exitId, result) {
@@ -75,50 +72,6 @@ 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) {
-            this.log.debug('attach to sleep data thread', { thread: this.thread.id });
-            dataThread.waits[`thread/end/${this.thread.id}`] = {};
-            return;
-        }
-        this.triggers.hook({ name: "ending" /* ACTION.ending */, thread: this.dataThreadId, sync: true, times: 1 }, async () => {
-            // TODO:  this is not required in newer versions, delete in v6.1+
-            delete this.waits['@ending'];
-            delete this.waits.ending;
-            if (dataThread.state.name === this.sleepUntilHangup.name) {
-                this.log.debug('hook attach to sleep data thread', { thread: this.thread.id });
-                dataThread.waits[`thread/end/${this.thread.id}`] = {};
-                return;
-            }
-            this.log.debug('hook create sleep data thread', { thread: this.thread.id });
-            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) {
-            this.log.debug('remove sleep data thread', { thread: this.thread.id });
-            // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-            delete dataThread.waits[`thread/end/${this.thread.id}`];
-            this.process.enqueue({ name: 'activate', thread: this.dataThreadId });
-        }
-    }
     async handleHeartbeat(call) {
         const allowHeartbeat = this.canVoicerHearbeat(call);
         if (allowHeartbeat) {
@@ -254,13 +207,13 @@ class VoiceStep extends step_1.default {
         if (call.ended)
             return;
         const isHangedUpByBot = call.sessionEndedBy === 'Bot';
+        call.conference = undefined;
+        call.ended = true;
         await this.transcript(call, {
             action: 'Call End',
             reportingSettingsKey: 'transcriptHangup',
             actionFromBot: isHangedUpByBot
         });
-        call.ended = true;
-        await this.updateData();
     }
     buildSections({ sections, textType, ttsSettings, allowKeypadBargeIn }) {
         return lodash_1.default.map(sections, section => ({
@@ -376,9 +329,9 @@ class VoiceStep extends step_1.default {
         else
             await this.sendCommands(call, [command]);
     }
-    rptsTimeout({ noReplyDelay, repromptsList }) {
-        const current = repromptsList[this.rptsIndex];
-        return Number(lodash_1.default.get(current, 'time', noReplyDelay)) * 1000 || 60000;
+    rptsTimeout({ noReplyDelay, repromptsList, initial = false }) {
+        const next = repromptsList[initial ? 0 : this.rptsIndex + 1];
+        return Number(lodash_1.default.get(next, 'time', noReplyDelay)) * 1000 || 60000;
     }
     rptsRestart() {
         this.state.repIdx = undefined;
@@ -392,14 +345,6 @@ 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];
-        }
-    }
     canVoicerHearbeat(call) {
         return call.vv >= 1;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onereach/step-voice",
-  "version": "6.0.19",
+  "version": "6.1.0",
   "author": "Roman Zolotarov <roman.zolotarov@onereach.com>",
   "contributors": [
     "Roman Zolotarov",
@@ -19,7 +19,8 @@
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@onereach/flow-sdk": "^3.2.45",
+    "@onereach/flow-sdk": "^3.2.50",
+    "@onereach/orbes": "^3.1.57",
     "@onereach/step-voice": "./test",
     "@swc/cli": "^0.1.62",
     "@swc/core": "^1.3.57",
@@ -80,4 +81,4 @@
       "node_modules"
     ]
   }
-}
+}