@onereach/step-voice 6.0.2 → 6.0.3

package/dst/Global Command.d.ts

@@ -35,9 +35,9 @@ export default class GlobalCommand extends VoiceStep<Partial<INPUT>, OUTPUT, EVE
     worker(): Promise<void>;
     hangup(call: IVoiceCall): Promise<unknown>;
     exitThread(event: ITypedEvent<EVENT>, type: string, stepExit: string): Promise<void>;
-    onAwake(): Promise<void>;
     exitToThread(): void;
     buildGrammar(call: IVoiceCall, choices: TODO[]): Promise<any>;
     exitFlow(): unknown;
+    sleepUntilHangup(): void;
 }
 export {};

package/dst/Global Command.js

@@ -2,9 +2,14 @@
 /* eslint-disable @typescript-eslint/strict-boolean-expressions, @typescript-eslint/explicit-function-return-type */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const types_1 = require("@onereach/flow-sdk/dst/types");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const nanoid_1 = require("nanoid");
 const voice_1 = tslib_1.__importDefault(require("./voice"));
+var LocalEvents;
+(function (LocalEvents) {
+    LocalEvents["hangup"] = "hangup";
+})(LocalEvents || (LocalEvents = {}));
 class GlobalCommand extends voice_1.default {
     get isGlobal() {
         return true;
@@ -15,7 +20,7 @@ class GlobalCommand extends voice_1.default {
     async runStep() {
         const worker = this.process.newThread(this.workerThreadId, thread => {
             thread.state = {
-                name: 'worker',
+                name: this.worker.name,
                 step: this.step.id,
                 thread: this.dataThreadId
             };
@@ -66,7 +71,19 @@ class GlobalCommand extends voice_1.default {
         this.triggers.otherwise(async () => {
             await this.initGrammar();
         });
-        this.triggers.hook({ name: 'waitEnd', thread: 'main', sync: true }, async () => {
+        if (this.dataThreadId !== types_1.MAIN_THREAD_ID) {
+            this.triggers.hook({ name: "ending" /* ACTION.ending */, thread: this.dataThreadId, sync: true }, async () => {
+                this.log.debug('sleep data thread', { thread: this.dataThreadId });
+                delete this.waits['@ending'];
+                const dataThread = this.process.getThread(this.dataThreadId);
+                dataThread?.gotoState({
+                    direct: true,
+                    step: this.currentStepId,
+                    name: this.sleepUntilHangup.name
+                });
+            });
+        }
+        this.triggers.hook({ name: "waitEnd" /* ACTION.waitEnd */, thread: types_1.MAIN_THREAD_ID, sync: true }, async () => {
             delete this.waits['@waitEnd']; // TODO is there beter way to unsubscribe?
             await this.sendCommands(call, [{ name: 'grammar', params: {} }]);
             if (this.thread.background)
@@ -77,12 +94,14 @@ class GlobalCommand extends voice_1.default {
             switch (event.params.type) {
                 case 'hangup': {
                     await this.hangup(call);
-                    // await this.popConvStep()
-                    await this.notifyConvEnd();
-                    return this.end();
+                    this.log.debug('wake data thread', { thread: this.dataThreadId });
+                    this.process.enqueue({
+                        thread: this.dataThreadId,
+                        name: LocalEvents.hangup
+                    });
+                    return;
                 }
                 case 'avm-detected':
-                    // this.event = {};
                     return await this.exitThread(event, 'AMD', 'AMD');
                 case 'digit':
                 case 'digits': {
@@ -128,10 +147,10 @@ class GlobalCommand extends voice_1.default {
                     return {};
                 }
                 case 'error': {
-                    // const localHandler = await this.sendEventToStep({ toWorker: false, event: { ...this.event, processed: undefined, action: 'lcl' } })
-                    // if (!localHandler) {
-                    //   this.throwError(event.params.error)
-                    // }
+                    if (event.params.error) {
+                        this.log.error('gc.error', event.params.error);
+                        // TODO throw it?
+                    }
                     this.event.processed = true;
                     break;
                 }
@@ -154,25 +173,32 @@ class GlobalCommand extends voice_1.default {
         await this.handleHangup(call);
         const isHangedUpByBot = call.sessionEndedBy === 'Bot';
         const hangUpType = isHangedUpByBot ? 'bot hang up' : 'user hang up';
+        let processHangUp = this.data.processHangUp;
         // process call recording in hangup event
         if (call.recordCall && this.event.params.callRecording != null) {
-            return await this.exitThread(this.event, hangUpType, 'hang up');
+            processHangUp = 'both';
         }
-        switch (this.data.processHangUp) {
+        switch (processHangUp) {
             case 'user':
-                return isHangedUpByBot
-                    ? this.end()
-                    : await this.exitThread(this.event, hangUpType, 'hang up');
+                if (isHangedUpByBot)
+                    return this.end();
+                break;
             case 'bot':
-                return isHangedUpByBot
-                    ? await this.exitThread(this.event, hangUpType, 'hang up')
-                    : this.end();
+                if (!isHangedUpByBot)
+                    return this.end();
+                break;
             case 'both':
-                return await this.exitThread(this.event, hangUpType, 'hang up');
-            case 'none':
+                break;
+            // case 'none':
             default:
                 return this.end();
         }
+        return this.exitStep('hangup', {
+            type: hangUpType,
+            callRecording: this.event.params?.callRecording,
+            conversation: this.conversation,
+            conversationThreadId: this.dataThreadId
+        });
     }
     async exitThread(event, type, stepExit) {
         this.log.debug('exitThread', type, stepExit);
@@ -198,15 +224,11 @@ class GlobalCommand extends voice_1.default {
         if (!lodash_1.default.isEmpty(params.callRecording)) {
             result.callRecording = params.callRecording;
         }
-        if (!this.data.autoPause) {
-            await this.notifyConvEnd({ onlyLocal: true });
-            await this._refreshCache();
-        }
         const exitLabel = lodash_1.default.replace(this.getExitStepLabel(stepExit) ?? stepExit, /\W+/g, '');
         await this.process.runThread({
             id: `${exitLabel}_${(0, nanoid_1.nanoid)(8)}`,
             state: {
-                name: 'exitToThread',
+                name: this.exitToThread.name,
                 direct: true,
                 result: {
                     conversation: this.conversation,
@@ -218,14 +240,6 @@ class GlobalCommand extends voice_1.default {
             }
         });
         event.processed = true;
-        // this is required to mark event as handled
-        // this.gotoState(this.state, { name: 'exiting' })
-    }
-    async onAwake() {
-        await super.onAwake();
-        await this.initGrammar();
-        await this.worker();
-        this.triggers.refreshAll();
     }
     exitToThread() {
         this.thread.exitStep(this.state.exitStep, this.state.result);
@@ -242,5 +256,10 @@ class GlobalCommand extends voice_1.default {
         this.event.processed = false;
         return super.exitFlow();
     }
+    sleepUntilHangup() {
+        this.triggers.local(LocalEvents.hangup, () => {
+            this.end();
+        });
+    }
 }
 exports.default = GlobalCommand;

package/dst/step.d.ts

@@ -34,9 +34,6 @@ export default class ConvStep<TData extends IConversationData, TIn = unknown, TO
     onAwake(): Promise<void>;
     onPause(): Promise<void>;
     onResume(): Promise<void>;
-    notifyConvEnd({ onlyLocal }?: {
-        onlyLocal?: boolean;
-    }): Promise<void>;
     waitConvEnd(): Promise<void>;
     waitGlobEnd(): Promise<void>;
     onConvEnd(): Promise<void>;

package/dst/step.js

@@ -80,10 +80,10 @@ class ConvStep extends step_1.default {
         }
     }
     async waitForConversation() {
-        if (this.state.name !== 'waitForConversation') {
+        if (this.state.name !== this.waitForConversation.name) {
             this.log.debug(this.state, 'conv.begin waitForConversation');
             this.state.prevWaitName = this.state.name;
-            this.state.name = 'waitForConversation';
+            this.state.name = this.waitForConversation.name;
         }
         else if (this.event.name === '_conv') {
             this.log.debug(this.state, 'conv.end waitForConversation');
@@ -128,15 +128,12 @@ class ConvStep extends step_1.default {
         this.state.name = this.state.resumeState;
         this.state.resumeState = undefined;
     }
-    async notifyConvEnd({ onlyLocal } = {}) {
-        this.log.debug('notifyConvEnd', { onlyLocal });
-    }
     async waitConvEnd() {
         const workerThread = this.process.getThread(this.workerThreadId);
-        const workerState = await workerThread?.state;
+        const workerState = workerThread?.state;
         if (!this.isGlobal && this.thread.id !== 'main' && this.thread.id === workerState?.thread) {
             this.log.debug('conv.wait for end', this.conversation);
-            this.gotoState({ ...this.state, name: 'waitGlobEnd', direct: true });
+            this.gotoState({ ...this.state, name: this.waitGlobEnd.name, direct: true });
         }
         else {
             this.log.debug('conv.end', this.conversation);
@@ -146,7 +143,7 @@ class ConvStep extends step_1.default {
     async waitGlobEnd() {
         const gcThreadId = this.workerThreadId;
         // wait for glob thread end (if exists)
-        this.triggers.hook({ name: 'end', thread: gcThreadId }, async () => await this.onConvEnd());
+        this.triggers.hook({ name: "end" /* ACTION.end */, thread: gcThreadId }, async () => await this.onConvEnd());
         if (!this.process.getThread(gcThreadId))
             await this.onConvEnd();
     }

package/package.json

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