@onereach/step-voice 5.0.9-fixsubflow.5 → 5.0.9-fixsubflow.7

package/dst/Cancel.js

@@ -11,7 +11,7 @@ class VoiceCancel extends voice_1.default {
         //   return
         // }
         const call = await this.fetchData();
-        this.triggers.once(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}/event`, async (event) => {
             switch (event.params.type) {
                 case 'hangup':
                     await this.handleHangup(call);

package/dst/Choice.js

@@ -93,7 +93,7 @@ class Choice extends voice_1.default {
             }
         };
         // There's a specific need to do so. There might be ${variable} section
-        this.triggers.once(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}/event`, async (event) => {
             const reportingSettingsKey = this.rptsStarted ? 'transcriptRepromptResponse' : 'transcriptResponse';
             switch (event.params.type) {
                 case 'digit':

package/dst/Custom Voice Input.js

@@ -84,7 +84,7 @@ class CustomVoiceInput extends voice_1.default {
             }
         };
         // There's a specific need to do so. There might be ${variable} section
-        this.triggers.once(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}/event`, async (event) => {
             const reportingSettingsKey = this.rptsStarted ? 'transcriptRepromptResponse' : 'transcriptResponse';
             switch (event.params.type) {
                 // digit recognition removed

package/dst/Global Command.js

@@ -49,16 +49,7 @@ class GlobalCommand extends voice_1.default {
     async _worker() {
         const call = await this.fetchData();
         if (call.vv >= 1 && lodash_1.default.isFunction(this.triggers.hook)) {
-            this.triggers.hook({ name: 'waitEnd', thread: 'main', sync: true }, async () => {
-                this.thread.background = call._conv.glb.length > 1;
-                if (this.thread.background)
-                    this.end();
-            });
             this.triggers.hook({ name: 'end', thread: 'main' }, async () => {
-                this.log.debug('gc terminate', { bg: this.thread.background });
-                // if (await this.popConvStep()) {
-                //   await this.sendEventToStep({ toWorker: this.isWorker, action: 'onAwake' })
-                // }
                 await this.sendCommands(call, [{ name: 'grammar', params: {} }]);
                 if (!this.thread.ending)
                     this.end();
@@ -68,7 +59,7 @@ class GlobalCommand extends voice_1.default {
             if (this.event.name.startsWith('@'))
                 return;
         }
-        this.triggers.once(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}/event`, async (event) => {
             event.processed = undefined;
             switch (event.params.type) {
                 case 'hangup': {
@@ -131,6 +122,10 @@ class GlobalCommand extends voice_1.default {
                     this.event.processed = true;
                     break;
                 }
+                case 'cancel': {
+                    this.event.processed = true;
+                    return this.end();
+                }
                 default:
                     return {};
             }

package/dst/Hangup.js

@@ -5,7 +5,7 @@ const voice_1 = tslib_1.__importDefault(require("./voice"));
 class Hangup extends voice_1.default {
     async runStep() {
         const call = await this.fetchData();
-        this.triggers.once(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}/event`, async (event) => {
             switch (event.params.type) {
                 case 'hangup':
                     await this.handleHangup(call);

package/dst/Initiate Call.js

@@ -49,7 +49,7 @@ class InitiateCall extends voice_1.default {
     async waitForCall() {
         const { asr, tts, from: botNumber, endUserNumber, sipHost, sipUser, sipPassword, timeout, headers, enableSpoofCallerId, spoofCallerId, isAMD, otherCallRef, otherCallRefThread } = this.data;
         const call = await this.fetchData();
-        this.triggers.once(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}/event`, async (event) => {
             switch (event.params.type) {
                 case 'is_flow_ready': {
                     // TODO this.exitFlow({is_ready : true}) should be enough

package/dst/Join Conference.js

@@ -7,7 +7,7 @@ class JoinConference extends voice_1.default {
     async runStep() {
         const call = await this.fetchData();
         const { conferenceName, stayInConference } = this.data;
-        this.triggers.once(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}/event`, async (event) => {
             switch (event.params.type) {
                 case 'hangup':
                     await this.handleHangup(call);

package/dst/Keypad Input.js

@@ -66,7 +66,7 @@ class KeypadInput extends voice_1.default {
         }
         const repromptsList = this.buildReprompts({ prompts: this.data.prompts, allowKeypadBargeIn: keypadBargeIn });
         const speechSections = this.buildSections({ sections: this.data.audio, textType, ttsSettings, allowKeypadBargeIn: keypadBargeIn });
-        this.triggers.once(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}/event`, async (event) => {
             const reportingSettingsKey = this.rptsStarted ? 'transcriptRepromptResponse' : 'transcriptResponse';
             switch (event.params.type) {
                 case 'digits': {

package/dst/Kick From Conference.js

@@ -7,7 +7,7 @@ class KickFromConference extends voice_1.default {
     async runStep() {
         const call = await this.fetchData();
         const { room, user } = this.data;
-        this.triggers.once(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}/event`, async (event) => {
             switch (event.params.type) {
                 case 'hangup':
                     await this.handleHangup(call);

package/dst/Say Message.js

@@ -8,7 +8,7 @@ class SayMessage extends voice_1.default {
     async runStep() {
         const { audio, textType, tts, sensitiveData } = this.data;
         const call = await this.fetchData();
-        this.triggers.once(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}/event`, async (event) => {
             switch (event.params.type) {
                 case 'hangup':
                     await this.handleHangup(call);

package/dst/Send DTMF.js

@@ -46,7 +46,7 @@ class SendDTMF extends voice_1.default {
                 afterDelay: +afterDelay
             }
         };
-        this.triggers.once(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}/event`, async (event) => {
             // if (channel.callback.id)
             //   await this.mergeFields[_conversation].set(
             //     this.takeCallback(),

package/dst/Transfer.js

@@ -6,7 +6,7 @@ const voice_1 = tslib_1.__importDefault(require("./voice"));
 class Transfer extends voice_1.default {
     async runStep() {
         const call = await this.fetchData();
-        this.triggers.once(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}/event`, async (event) => {
             switch (event.params.type) {
                 case 'bridge': {
                     await this.transcript(call, {

package/dst/Voice Recording.js

@@ -23,7 +23,7 @@ class Recording extends voice_1.default {
                 sections
             }
         };
-        this.triggers.once(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}/event`, async (event) => {
             const url = event.params.mediaPath;
             switch (event.params.type) {
                 case 'hangup':

package/dst/step.d.ts

@@ -5,8 +5,7 @@ export interface ConvStepDataIn {
     conversationThread?: IThreadId;
 }
 export interface IConversation {
-    lcl: IConversationStep[];
-    glb: IConversationStep[];
+    dummy?: never;
 }
 export interface IConversationData {
     _conv: IConversation;
@@ -16,17 +15,9 @@ export declare const enum ConvThreadType {
     glb = "glb",
     wrk = "wrk"
 }
-interface IConversationStep {
-    key: string;
-    trd: string;
-    typ?: string;
-    name?: string;
-    label?: string;
-    step?: string;
-}
-export default abstract class ConvStep<TData extends IConversationData, TIn = unknown, TOut = unknown, TParams = any> extends Step<TIn & ConvStepDataIn, TOut, TParams> {
+export default class ConvStep<TData extends IConversationData, TIn = unknown, TOut = unknown, TParams = any> extends Step<TIn & ConvStepDataIn, TOut, TParams> {
     private convDataCache?;
-    abstract _worker(data: IConversationData): Promise<void>;
+    _worker(_data: IConversationData): Promise<void>;
     get cache(): TData | undefined;
     get conversation(): string | IMergeField;
     get conversationId(): string;
@@ -69,4 +60,3 @@ export default abstract class ConvStep<TData extends IConversationData, TIn = un
     protected _clearCache(): void;
     protected _refreshCache(): Promise<void>;
 }
-export {};

package/dst/step.js

@@ -3,7 +3,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const step_1 = tslib_1.__importDefault(require("@onereach/flow-sdk/dst/step"));
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+// interface IConversationStep {
+//   key: string
+//   trd: string
+//   typ?: string
+//   name?: string // for debug
+//   label?: string // for debug
+//   step?: string // for debug
+// }
 class ConvStep extends step_1.default {
+    async _worker(_data) { }
     get cache() {
         return this.convDataCache;
     }
@@ -107,6 +117,7 @@ class ConvStep extends step_1.default {
             return;
         if (this.thread.id !== this.workerThreadId) {
             const worker = this.process.newThread(this.workerThreadId, thread => {
+                thread.background = true;
                 thread.state = {
                     name: 'worker',
                     step: this.step.id,
@@ -203,11 +214,11 @@ class ConvStep extends step_1.default {
     async onAwake() {
         this.state.name = this.state.resumeState;
         this.state.resumeState = undefined;
-        const conv = await this.getConversation();
-        if (this.isWorker && conv.glb.length === 1) {
-            this.log.debug('make global thread foreground');
-            this.thread.background = false;
-        }
+        // const conv = await this.getConversation()
+        // if (this.isWorker && conv.glb.length === 1) {
+        //   this.log.debug('make global thread foreground')
+        //   this.thread.background = false
+        // }
     }
     async onPause() {
         this.state.resumeState = this.state.prevName;
@@ -218,18 +229,19 @@ class ConvStep extends step_1.default {
         this.state.resumeState = undefined;
     }
     async notifyConvEnd({ onlyLocal } = {}) {
-        const conv = await this.getConversation();
-        const lcl = conv.lcl.splice(0);
-        const wrk = onlyLocal ? [] : conv.glb.splice(0);
-        if (lcl.length > 0 || wrk.length > 0) {
-            await this.updateData();
-            // for (const step of lcl) {
-            //   await this.sendEventToStep({ toStep: step, action: 'onConvEnd' })
-            // }
-            // for (const step of wrk) {
-            //   await this.sendEventToStep({ toStep: step, action: 'onConvEnd' })
-            // }
-        }
+        this.log.debug('notifyConvEnd', { onlyLocal });
+        // const conv = await this.getConversation()
+        // const lcl = conv.lcl.splice(0)
+        // const wrk = onlyLocal ? [] : conv.glb.splice(0)
+        // if (lcl.length > 0 || wrk.length > 0) {
+        // await this.updateData()
+        // for (const step of lcl) {
+        //   await this.sendEventToStep({ toStep: step, action: 'onConvEnd' })
+        // }
+        // for (const step of wrk) {
+        //   await this.sendEventToStep({ toStep: step, action: 'onConvEnd' })
+        // }
+        // }
     }
     async waitConvEnd() {
         const workerThread = this.process.getThread(this.workerThreadId);

package/dst/voice.d.ts

@@ -44,7 +44,6 @@ export interface CallStartEvent extends VoiceEvent {
 export default class VoiceStep<TIn = unknown, TOut = unknown, TParams extends VoiceEvent = VoiceEvent> extends ConvStep<IVoiceCall, TIn & {
     handleCancel?: boolean;
 }, TOut, TParams> {
-    _worker(call: IVoiceCall): Promise<void>;
     runBefore(): Promise<void>;
     sendCommands({ id, type, callback }: IVoiceCall, commands: TODO[]): Promise<void>;
     handleHeartbeat(call: IVoiceCall): Promise<void>;

package/dst/voice.js

@@ -13,15 +13,6 @@ class VoiceStepError extends base_1.default {
 exports.VoiceStepError = VoiceStepError;
 class VoiceStep extends step_1.default {
     // static Error = VoiceStepError
-    async _worker(call) {
-        this.triggers.once(`in/voice/${call.id}/event`, async (event) => {
-            console.log('EVENT', {
-                name: this.constructor.name,
-                thread: this.thread.id,
-                event
-            });
-        });
-    }
     async runBefore() {
         await super.runBefore();
         if (this.cache != null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onereach/step-voice",
-  "version": "5.0.9-fixsubflow.5",
+  "version": "5.0.9-fixsubflow.7",
   "author": "Roman Zolotarov <roman.zolotarov@onereach.com>",
   "contributors": [
     "Roman Zolotarov",