@onereach/step-voice 6.0.0 → 6.0.1

package/dst/Global Command.js

@@ -142,6 +142,7 @@ class GlobalCommand extends voice_1.default {
                 case 'background': {
                     this.event.processed = true;
                     this.thread.background = event.params.background ?? false;
+                    await this.handleHeartbeat(call);
                     break;
                 }
                 default:

package/dst/step.d.ts

@@ -10,11 +10,6 @@ export interface IConversation {
 export interface IConversationData {
     _conv: IConversation;
 }
-export declare const enum ConvThreadType {
-    lcl = "lcl",
-    glb = "glb",
-    wrk = "wrk"
-}
 export default class ConvStep<TData extends IConversationData, TIn = unknown, TOut = unknown, TParams = any> extends Step<TIn & ConvStepDataIn, TOut, TParams> {
     private convDataCache?;
     get cache(): TData | undefined;
@@ -24,7 +19,6 @@ export default class ConvStep<TData extends IConversationData, TIn = unknown, TO
     /** id of the thread where conversation data is stored */
     get dataThreadId(): IThreadId;
     get isGlobal(): boolean;
-    get threadType(): ConvThreadType;
     get isWorker(): boolean;
     get useQueue(): boolean;
     fetchData(): Promise<TData>;

package/dst/step.js

@@ -3,15 +3,6 @@
 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 {
     get cache() {
         return this.convDataCache;
@@ -45,13 +36,8 @@ class ConvStep extends step_1.default {
     get isGlobal() {
         return false;
     }
-    get threadType() {
-        return this.thread.id === this.workerThreadId
-            ? (this.isGlobal ? "glb" /* ConvThreadType.glb */ : "wrk" /* ConvThreadType.wrk */)
-            : "lcl" /* ConvThreadType.lcl */;
-    }
     get isWorker() {
-        return this.threadType !== "lcl" /* ConvThreadType.lcl */;
+        return this.thread.id === this.workerThreadId;
     }
     get useQueue() {
         return true;
@@ -113,12 +99,9 @@ class ConvStep extends step_1.default {
         delete this.state.prevSkipName;
     }
     async cancel() {
-        if (this.isWorker) {
+        if (this.isGlobal) {
             this.log.debug('conv.cannot cancel global');
-            // return
         }
-        // const activeStep = await this.activeStep(this.isWorker)
-        // await this.sendEventToStep({ event: { name: '_conv', action: 'onCancel', params: { byStep: this.step.label } }, toStep: activeStep })
     }
     async onCancel() {
         // await this.popConvStep()
@@ -136,11 +119,6 @@ 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
-        // }
     }
     async onPause() {
         this.state.resumeState = this.state.prevName;
@@ -152,18 +130,6 @@ class ConvStep extends step_1.default {
     }
     async notifyConvEnd({ onlyLocal } = {}) {
         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);
@@ -188,26 +154,8 @@ class ConvStep extends step_1.default {
         this.end();
     }
     async pause() {
-        // const conv = await this._getConversation()
-        // const activeStep = await this.activeStep(false)
-        // if (activeStep != null) {
-        //   this.log.debug('conv.pause', activeStep)
-        //   conv.stk.push(conv.lcl.splice(0)) // save que to stk
-        //   await this.updateData()
-        //   await this.sendEventToStep({ action: 'onPause', toStep: activeStep })
-        // } else {
-        //   this.log.debug('conv.nothing to pause')
-        // }
     }
     async resume() {
-        // const conv = await this._getConversation()
-        // if (conv.stk.length> 0) {
-        //   conv.lcl.unshift(...(conv.stk.pop() ?? [])) // restore que from stk
-        //   await this.updateData()
-        //   await this.sendEventToStep({ toGlobal: false, action: 'onResume' })
-        // } else {
-        //   this.log.debug('conv.nothing to resume')
-        // }
     }
     async startConversation(data, { thread: _thread } = {}) {
         this.convDataCache = {

package/dst/voice.js

@@ -16,15 +16,6 @@ class VoiceStep extends step_1.default {
     async runBefore() {
         await super.runBefore();
         if (this.cache != null) {
-            // if (!this.event.processed && this.event.action == null) {
-            //   const toWorker = this.event.params.global
-            //   const hasHandler = await this.sendEventToStep({ event: { ...this.event, action: toWorker ? 'wrk' : 'lcl' }, toWorker }) // redirect to global (1)
-            //   if (hasHandler != null) {
-            //     this.log.debug('hasWorker', { hasGlobal: hasHandler })
-            //     this.state.prevSkipName = this.state.name
-            //     this.state.name = 'onSkipEvent'
-            //   }
-            // }
             await this.handleHeartbeat(this.cache);
         }
     }
@@ -53,10 +44,20 @@ class VoiceStep extends step_1.default {
     }
     async handleHeartbeat(call) {
         if (call.vv >= 1) {
+            if (this.thread.background) {
+                delete this.waits.timeout;
+                return;
+            }
             const expectHearbeatBefore = Date.now() + 290000;
             this.triggers.deadline(expectHearbeatBefore, () => {
-                this.end();
-                this.throwError(new Error('missing heartbeat, call is probably already hangup'));
+                this.thread.background = true;
+                if (call.ended) {
+                    this.log.warn('missing heartbeat, call is ended');
+                    this.end();
+                }
+                else {
+                    this.log.error('missing heartbeat, call is probably already hangup');
+                }
             });
         }
         else if (call.vv !== 0) {

package/package.json

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