@onereach/step-voice 5.0.9-fixsubflow.9 → 6.0.0

package/dst/Cancel.js

@@ -11,7 +11,7 @@ class VoiceCancel extends voice_1.default {
         //   return
         // }
         const call = await this.fetchData();
-        this.triggers.local(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}`, 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.local(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}`, async (event) => {
             const reportingSettingsKey = this.rptsStarted ? 'transcriptRepromptResponse' : 'transcriptResponse';
             switch (event.params.type) {
                 case 'digit':
@@ -232,7 +232,7 @@ class Choice extends voice_1.default {
                     return await this.waitConvEnd();
                 }
                 case 'cancel': {
-                    return this.data.handleCancel === true && this.exitStep('cancel');
+                    return this.handleCancel();
                 }
                 case 'error':
                     return this.throwError(event.params.error);

package/dst/Conference Dial.js

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

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.local(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}`, async (event) => {
             const reportingSettingsKey = this.rptsStarted ? 'transcriptRepromptResponse' : 'transcriptResponse';
             switch (event.params.type) {
                 // digit recognition removed
@@ -178,7 +178,7 @@ class CustomVoiceInput extends voice_1.default {
                     return await this.waitConvEnd();
                 }
                 case 'cancel': {
-                    return this.data.handleCancel === true && this.exitStep('cancel');
+                    return this.handleCancel();
                 }
                 case 'error':
                     return this.throwError(event.params.error);

package/dst/Global Command.d.ts

@@ -32,7 +32,7 @@ export default class GlobalCommand extends VoiceStep<Partial<INPUT>, OUTPUT, EVE
     get useQueue(): boolean;
     runStep(): Promise<void>;
     initGrammar(): Promise<void>;
-    _worker(): Promise<void>;
+    worker(): Promise<void>;
     hangup(call: IVoiceCall): Promise<unknown>;
     exitThread(event: ITypedEvent<EVENT>, type: string, stepExit: string): Promise<void>;
     onAwake(): Promise<void>;

package/dst/Global Command.js

@@ -13,7 +13,22 @@ class GlobalCommand extends voice_1.default {
         return this.isWorker;
     }
     async runStep() {
-        await this.initGrammar();
+        const worker = this.process.newThread(this.workerThreadId, thread => {
+            thread.state = {
+                name: 'worker',
+                step: this.step.id,
+                thread: this.dataThreadId
+            };
+        });
+        if (worker.isNewThread) {
+            worker.activate();
+            await worker.run();
+            await this._refreshCache();
+        }
+        else {
+            worker.state.step = this.step.id;
+            await this.initGrammar();
+        }
         this.exitStep('no commands');
     }
     async initGrammar() {
@@ -46,14 +61,18 @@ class GlobalCommand extends voice_1.default {
             }
         ]);
     }
-    async _worker() {
+    async worker() {
         const call = await this.fetchData();
-        this.triggers.hook({ name: 'end', thread: 'main' }, async () => {
+        this.triggers.otherwise(async () => {
+            await this.initGrammar();
+        });
+        this.triggers.hook({ name: 'waitEnd', thread: 'main', sync: true }, async () => {
+            delete this.waits['@waitEnd']; // TODO is there beter way to unsubscribe?
             await this.sendCommands(call, [{ name: 'grammar', params: {} }]);
-            if (!this.thread.ending)
+            if (this.thread.background)
                 this.end();
         });
-        this.triggers.local(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}`, async (event) => {
             event.processed = undefined;
             switch (event.params.type) {
                 case 'hangup': {
@@ -118,8 +137,7 @@ class GlobalCommand extends voice_1.default {
                 }
                 case 'cancel': {
                     this.event.processed = true;
-                    this.end();
-                    break;
+                    return this.handleCancel();
                 }
                 case 'background': {
                     this.event.processed = true;

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.local(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}`, async (event) => {
             switch (event.params.type) {
                 case 'hangup':
                     await this.handleHangup(call);
@@ -13,7 +13,7 @@ class Hangup extends voice_1.default {
                 case 'error':
                     return this.throwError(event.params.error);
                 case 'cancel': {
-                    return this.data.handleCancel === true && this.exitStep('cancel');
+                    return this.handleCancel();
                 }
                 default:
                     return this.exitFlow();

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.local(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.once(`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.local(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}`, 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.local(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}`, async (event) => {
             const reportingSettingsKey = this.rptsStarted ? 'transcriptRepromptResponse' : 'transcriptResponse';
             switch (event.params.type) {
                 case 'digits': {
@@ -149,7 +149,7 @@ class KeypadInput extends voice_1.default {
                     return await this.waitConvEnd();
                 }
                 case 'cancel': {
-                    return this.data.handleCancel === true && this.exitStep('cancel');
+                    return this.handleCancel();
                 }
                 case 'error':
                     return this.throwError(event.params.error);

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.local(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}`, 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.local(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}`, async (event) => {
             switch (event.params.type) {
                 case 'hangup':
                     await this.handleHangup(call);
@@ -19,7 +19,7 @@ class SayMessage extends voice_1.default {
                 case 'error':
                     return this.throwError(event.params.error);
                 case 'cancel': {
-                    return this.data.handleCancel === true && this.exitStep('cancel');
+                    return this.handleCancel();
                 }
                 default:
                     return this.exitFlow();

package/dst/Send DTMF.js

@@ -46,7 +46,7 @@ class SendDTMF extends voice_1.default {
                 afterDelay: +afterDelay
             }
         };
-        this.triggers.local(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}`, 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.local(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}`, 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.local(`in/voice/${call.id}/event`, async (event) => {
+        this.triggers.local(`in/voice/${call.id}`, async (event) => {
             const url = event.params.mediaPath;
             switch (event.params.type) {
                 case 'hangup':

package/dst/step.d.ts

@@ -17,7 +17,6 @@ export declare const enum ConvThreadType {
 }
 export default class ConvStep<TData extends IConversationData, TIn = unknown, TOut = unknown, TParams = any> extends Step<TIn & ConvStepDataIn, TOut, TParams> {
     private convDataCache?;
-    _worker(_data: IConversationData): Promise<void>;
     get cache(): TData | undefined;
     get conversation(): string | IMergeField;
     get conversationId(): string;
@@ -32,9 +31,7 @@ export default class ConvStep<TData extends IConversationData, TIn = unknown, TO
     getConversation(): Promise<IConversation>;
     updateData(): Promise<void>;
     hasConversation(): Promise<boolean>;
-    protected worker(): Promise<void>;
     runBefore(): Promise<void>;
-    runAfter(): Promise<void>;
     waitForConversation(): Promise<void>;
     protected onSkipEvent(): Promise<void>;
     cancel(): Promise<void>;
@@ -51,8 +48,6 @@ export default class ConvStep<TData extends IConversationData, TIn = unknown, TO
     onConvEnd(): Promise<void>;
     pause(): Promise<void>;
     resume(): Promise<void>;
-    /** @returns true if current conv is active */
-    /** @returns true if current conv was active */
     startConversation(data: TData, { thread }?: {
         thread?: IThreadId;
     }): Promise<void>;

package/dst/step.js

@@ -13,7 +13,6 @@ const step_1 = tslib_1.__importDefault(require("@onereach/flow-sdk/dst/step"));
 //   step?: string // for debug
 // }
 class ConvStep extends step_1.default {
-    async _worker(_data) { }
     get cache() {
         return this.convDataCache;
     }
@@ -76,16 +75,11 @@ class ConvStep extends step_1.default {
     async hasConversation() {
         return (await this._fetchCache())?._conv != null;
     }
-    async worker() {
-        this.triggers.local('_conv');
-        if (this.cache == null)
-            return;
-        await this._worker(this.cache);
-    }
     async runBefore() {
         await super.runBefore();
         if (this.thread.ending)
             return;
+        this.triggers.local('_conv');
         // ensure cache is reset between step runs, just in case
         this._clearCache();
         if (!await this.hasConversation())
@@ -97,79 +91,8 @@ class ConvStep extends step_1.default {
             this.event.processed = true;
             this.state.prevName = this.state.name;
             this.state.name = this.event.action;
-            return;
         }
-        console.log('BEFORE', {
-            event: this.event,
-            state: this.state,
-            name: this.constructor.name,
-            thread: this.thread.id,
-            ...this.cache?._conv
-        });
-        // if (this.useQueue && !await this.pushConvStep()) {
-        //   return await this.waitForConversation()
-        // }
-        if (this.cache == null)
-            return;
-        // const glb = this.cache._conv.glb
-        // if (!this.isGlobal && glb.length > 0 && glb[glb.length - 1].typ !== ConvThreadType.wrk) return
-        if (!this.isGlobal)
-            return;
-        if (this.thread.id !== this.workerThreadId) {
-            const worker = this.process.newThread(this.workerThreadId, thread => {
-                thread.state = {
-                    name: 'worker',
-                    step: this.step.id,
-                    thread: this.dataThreadId
-                };
-            });
-            if (worker.isNewThread) {
-                worker.activate();
-                await worker.run();
-                await this._refreshCache();
-            }
-            else {
-                worker.state.step = this.step.id;
-            }
-        }
-    }
-    // public async runHandle (): Promise<unknown> {
-    //   if (this.thread.ending || this.state.name === 'onConvEnd') {
-    //     return await super.runHandle()
-    //   }
-    //   // const sid = this.cache?._conv.sid
-    //   // if (sid != null && sid !== this.session.sessionId) {
-    //   //   this.triggers.refreshAll()
-    //   // }
-    //   return await super.runHandle()
-    // }
-    async runAfter() {
-        console.log('AFTER', {
-            name: this.constructor.name,
-            thread: this.thread.id,
-            ...this.cache?._conv
-        });
-        // if (this.thread.ending || this.state.name === 'onConvEnd') {
-        //   return await super.runAfter()
-        // }
-        // if (!await this.hasConversation()) return await super.runAfter()
-        // if (this.thread.hasControlAction()) {
-        //   // await this.popConvStep()
-        //   if (await this.popConvStep()) {
-        //     // TODO: this seems not to be necessary now or not?
-        //     await this.sendEventToStep({ toGlobal: this.isGlobal, action: 'onAwake' })
-        //   }
-        // }
-        // if (this.isGlobal && !this.event.processed) {
-        //   await this.sendEventToStep({ toGlobal: false, event: { ...this.event, processed: undefined, action: 'lcl' } })
-        // }
-        await super.runAfter();
     }
-    // public async setLocalTriggers (): Promise<void> {
-    //   if (!this.isGlobal && await this.hasActiveGlobal()) {
-    //     this.triggers.config({ target: 'session' })
-    //   }
-    // }
     async waitForConversation() {
         if (this.state.name !== 'waitForConversation') {
             this.log.debug(this.state, 'conv.begin waitForConversation');
@@ -286,92 +209,6 @@ class ConvStep extends step_1.default {
         //   this.log.debug('conv.nothing to resume')
         // }
     }
-    // protected async sendEventToStep ({
-    //   toGlobal = false,
-    //   toStep,
-    //   action,
-    //   event = { name: '_conv', action }
-    // }: {
-    //   action?: string
-    //   event?: IEvent
-    //   toStep?: IConversationStep
-    //   toGlobal?: boolean
-    // }): Promise<IStepResult | undefined> {
-    //   toStep ||= await this.activeStep(toGlobal)
-    //   if (toStep != null) {
-    //     const target = { type: 'session' as any, name: toStep.key, id: toStep.trd }
-    //     return await this.thread.eventManager.emit(
-    //       event,
-    //       { invocationType: 'async', target }
-    //     )
-    //   }
-    //   return undefined
-    // }
-    // async activeStep (toGlobal: boolean): Promise<IConversationStep | undefined> {
-    //   const conv = await this.getConversation()
-    //   const que = toGlobal ? conv.glb : conv.lcl
-    //   if (que == null) return
-    //   const lastItem = que[que.length - 1]
-    //   if (toGlobal && lastItem?.typ === ConvThreadType.wrk) return undefined
-    //   return que[que.length - 1]
-    // }
-    /** @returns true if current conv is active */
-    // protected async pushConvStep (): Promise<boolean> {
-    //   const conv = await this.getConversation()
-    //   const sessionKey = this.session.key
-    //   if (sessionKey == null) throw new Error('session is required')
-    //   const que = this.isWorker ? conv.glb : conv.lcl
-    //   const lastItem = que[que.length - 1]
-    //   const lastItemType = lastItem?.typ
-    //   if (lastItemType === ConvThreadType.wrk) {
-    //     console.log('POP', lastItem)
-    //     que.pop() // remove last item, since it's temporary
-    //     // TODO triggers.refreshAll!
-    //   }
-    //   const queIndex = que.findIndex(stp => stp.key === sessionKey && this.thread.id === stp.trd)
-    //   if (queIndex < 0) {
-    //     if (que.length > 0) {
-    //       await this.sendEventToStep({ toGlobal: this.isGlobal, event: { name: '_conv', action: 'onPause', params: { byStep: this.step.label } } })
-    //     }
-    //     const type = this.threadType === ConvThreadType.wrk ? this.threadType : undefined
-    //     que.push({ key: sessionKey, trd: this.thread.id, typ: type, name: this.constructor.name, label: this.label, step: this.id })
-    //     console.log('PUSH', que[que.length - 1])
-    //     await this.updateData()
-    //     return true
-    //   }
-    //   // refresh data on step change
-    //   que[queIndex].name = this.constructor.name
-    //   que[queIndex].label = this.label
-    //   que[queIndex].step = this.id
-    //   return queIndex === que.length - 1
-    // }
-    /** @returns true if current conv was active */
-    // protected async popConvStep (popStep?: IConversationStep): Promise<boolean> {
-    //   const conv = await this.getConversation()
-    //   const sessionKey = this.session.key
-    //   if (sessionKey == null) throw new Error('session is required')
-    //   popStep ||= { key: sessionKey, trd: this.thread.id }
-    //   const que = this.isWorker ? conv.glb : conv.lcl
-    //   const queIndex = que.findIndex(stp => stp.key === popStep?.key && stp.trd === popStep.trd)
-    //   if (queIndex >= 0) {
-    //     // console.log('SPLICE1', this.thread.id, this.step.label, que)
-    //     que.splice(queIndex, 1)
-    //     // conv.sid = this.session.sessionId
-    //     await this.updateData()
-    //     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()
-    //   return false
-    // }
     async startConversation(data, { thread: _thread } = {}) {
         this.convDataCache = {
             ...data,

package/dst/voice.d.ts

@@ -47,6 +47,7 @@ export default class VoiceStep<TIn = unknown, TOut = unknown, TParams extends Vo
     runBefore(): Promise<void>;
     sendCommands({ id, type, callback }: IVoiceCall, commands: TODO[]): Promise<void>;
     handleHeartbeat(call: IVoiceCall): Promise<void>;
+    handleCancel(): void;
     extractSectionMessages(sections: IPromtpSection[]): string;
     extractSectionFiles(sections: IPromtpSection[]): Array<{
         fileUrl: string;

package/dst/voice.js

@@ -65,6 +65,12 @@ class VoiceStep extends step_1.default {
             await this.updateData();
         }
     }
+    handleCancel() {
+        if (this.data.handleCancel === true)
+            this.exitStep('cancel');
+        else
+            this.end();
+    }
     extractSectionMessages(sections) {
         return lodash_1.default.chain(sections)
             .filter(s => Boolean(s.text))

package/package.json

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