@onereach/step-voice 6.0.20-refdata.0 → 6.1.1

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/Global Command.d.ts

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

package/dst/Global Command.js

@@ -15,6 +15,9 @@ class GlobalCommand extends voice_1.default {
     async runStep() {
         const call = await this.fetchData();
         const allowAck = this.canVoicerAck(call);
+        if (this.thread.id === this.workerThreadId) {
+            throw new Error('gc worker should not use runStep, is another gc on hangup leg?');
+        }
         const worker = this.process.newThread(this.workerThreadId, thread => {
             thread.state = {
                 name: this.worker.name,
@@ -35,6 +38,7 @@ class GlobalCommand extends voice_1.default {
         }
         if (allowAck) {
             this.triggers.local('ack', ({ params: { ack } }) => {
+                delete worker.state.acktrd;
                 if (ack)
                     this.exitStep('no commands');
                 else
@@ -97,14 +101,16 @@ class GlobalCommand extends voice_1.default {
         this.triggers.local(`in/voice/${call.id}`, async (event) => {
             switch (event.params.type) {
                 case 'ack': {
-                    this.replyAck({ ack: true });
+                    this.acceptAck({ ack: true });
                     return;
                 }
                 case 'hangup':
-                    this.replyAck({ ack: false });
-                    return await this.hangup(call);
+                    this.acceptAck({ ack: false });
+                    await this.hangup(call);
+                    return;
                 case 'avm-detected':
-                    return await this.exitThread(event, 'AMD', 'AMD');
+                    await this.exitThread(event, 'AMD', 'AMD');
+                    return;
                 case 'digit':
                 case 'digits': {
                     const params = event.params;
@@ -245,14 +251,13 @@ class GlobalCommand extends voice_1.default {
             asr: asr.getSettings(call.asr)
         };
     }
-    replyAck(eventParams) {
+    acceptAck(eventParams) {
         if (this.state.acktrd) {
             this.process.enqueue({
                 thread: this.state.acktrd,
                 name: 'ack',
                 params: eventParams
             });
-            delete this.state.acktrd;
         }
     }
 }

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 {
@@ -74,7 +78,7 @@ 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;

package/dst/voice.js

@@ -207,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 => ({
@@ -329,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onereach/step-voice",
-  "version": "6.0.20-refdata.0",
+  "version": "6.1.1",
   "author": "Roman Zolotarov <roman.zolotarov@onereach.com>",
   "contributors": [
     "Roman Zolotarov",
@@ -19,8 +19,8 @@
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@onereach/flow-sdk": "^3.2.46",
-    "@onereach/orbes": "^3.1.51",
+    "@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",