@onereach/step-voice 6.0.19-repromptstimeout.2 → 6.0.20-refdata.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, initial: true });
+            command.params.timeout = this.rptsTimeout({ noReplyDelay, repromptsList });
             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, initial: true });
+            command.params.timeout = this.rptsTimeout({ noReplyDelay, repromptsList });
             await this.pauseRecording(call, command, sensitiveData);
             return this.exitFlow();
         });

package/dst/Global Command.js

@@ -1,8 +1,7 @@
 "use strict";
+/* eslint-disable @typescript-eslint/strict-boolean-expressions, @typescript-eslint/explicit-function-return-type */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-/* eslint-disable @typescript-eslint/strict-boolean-expressions, @typescript-eslint/explicit-function-return-type */
-//@ts-nocheck
 const types_1 = require("@onereach/flow-sdk/dst/types");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const voice_1 = tslib_1.__importDefault(require("./voice"));

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, initial: true });
+            command.params.firstDigitTimeout = this.rptsTimeout({ noReplyDelay, repromptsList });
             command.params.sections = speechSections;
             await this.pauseRecording(call, command, sensitiveData);
             return this.exitFlow();

package/dst/step.js

@@ -1,6 +1,5 @@
 "use strict";
 /* eslint-disable @typescript-eslint/strict-boolean-expressions */
-//@ts-nocheck
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const step_1 = tslib_1.__importDefault(require("@onereach/flow-sdk/dst/step"));

package/dst/voice.d.ts

@@ -56,8 +56,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 +74,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, initial }: TODO): number;
+    rptsTimeout({ noReplyDelay, repromptsList }: 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

@@ -1,12 +1,10 @@
 "use strict";
 /* eslint-disable @typescript-eslint/strict-boolean-expressions */
-//@ts-nocheck
 Object.defineProperty(exports, "__esModule", { value: true });
 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"));
@@ -19,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);
         }
@@ -27,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) {
@@ -76,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) {
@@ -172,20 +124,19 @@ class VoiceStep extends step_1.default {
     }
     async pauseRecording(call, command, sensitiveData) {
         const commands = [command];
-        if (call.recordCall && sensitiveData?.muteStep) {
-            if (call.vv >= 2) {
-                // newer voicer version automaically should stop/resume session recording
-                command.params.sensitiveData = sensitiveData;
-            }
-            else {
-                commands.unshift({
-                    name: 'stop-record-session',
-                    params: {
-                        muteUser: sensitiveData.muteUser,
-                        muteBot: sensitiveData.muteBot
-                    }
-                });
-            }
+        const stopRecording = (call.recordCall && sensitiveData?.muteStep);
+        if (call.vv >= 2) {
+            // newer voicer version automaically should stop/resume session recording
+            command.params.sensitiveData = stopRecording ? sensitiveData : {};
+        }
+        else if (stopRecording) {
+            commands.unshift({
+                name: 'stop-record-session',
+                params: {
+                    muteUser: sensitiveData.muteUser,
+                    muteBot: sensitiveData.muteBot
+                }
+            });
         }
         await this.sendCommands(call, commands);
     }
@@ -378,9 +329,9 @@ class VoiceStep extends step_1.default {
         else
             await this.sendCommands(call, [command]);
     }
-    rptsTimeout({ noReplyDelay, repromptsList, initial = false }) {
-        const next = repromptsList[initial ? 0 : this.rptsIndex + 1];
-        return Number(lodash_1.default.get(next, 'time', noReplyDelay)) * 1000 || 60000;
+    rptsTimeout({ noReplyDelay, repromptsList }) {
+        const current = repromptsList[this.rptsIndex];
+        return Number(lodash_1.default.get(current, 'time', noReplyDelay)) * 1000 || 60000;
     }
     rptsRestart() {
         this.state.repIdx = undefined;
@@ -394,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-repromptstimeout.2",
+  "version": "6.0.20-refdata.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.46",
+    "@onereach/orbes": "^3.1.51",
     "@onereach/step-voice": "./test",
     "@swc/cli": "^0.1.62",
     "@swc/core": "^1.3.57",