@onereach/step-voice 5.0.5 → 5.0.6

package/dst/Custom Voice Input.js

@@ -53,7 +53,7 @@ const alterRecognitionPhrases = (phrases, interpretation) => {
 class CustomVoiceInput extends voice_1.default {
     async runStep() {
         const call = await this.fetchData();
-        const { textType, asr, tts, sensitiveData, noReplyDelay, usePromptsTriggers, recognitionModel } = this.data;
+        const { textType, tts, sensitiveData, noReplyDelay, usePromptsTriggers, recognitionModel } = this.data;
         const exitExists = (exitId) => {
             return lodash_1.default.some(choices, (choice) => choice.exitId === exitId);
         };

package/dst/Global Command.js

@@ -7,21 +7,26 @@ const nanoid_1 = require("nanoid");
 const voice_1 = tslib_1.__importDefault(require("./voice"));
 class GlobalCommand extends voice_1.default {
     get isGlobal() {
-        return this.thread.id === `G:${this.conversationName}`;
+        return this.thread.id === this.globalThreadId;
     }
     get useQueue() {
         return this.isGlobal;
     }
     async runStep() {
-        const gcThreadId = `G:${this.conversationName}`;
-        await this.process.runThread({
-            id: gcThreadId,
-            state: {
+        const globThread = this.process.newThread(this.globalThreadId, thread => {
+            thread.state = {
                 name: 'globThread',
                 step: this.step.id,
                 thread: this.dataThreadId
-            }
+            };
         });
+        if (globThread.isNewThread) {
+            globThread.activate();
+            await globThread.run();
+        }
+        else {
+            globThread.state.step = this.step.id;
+        }
         // refresh cache after global thread was started
         this._clearCache();
         await this.initGrammar();
@@ -71,6 +76,10 @@ class GlobalCommand extends voice_1.default {
                 }
                 this.end();
             });
+            // TODO remove this hack that prevents this.triggers.once execution below
+            // currently it skips logic to override triggers (is there better way to do it?)
+            if (this.event.name.startsWith('@end'))
+                return;
         }
         this.triggers.once(`in/voice/${call.id}/event`, async (event) => {
             event.processed = undefined;

package/dst/Initiate Call.d.ts

@@ -2,6 +2,8 @@ import VoiceStep, { CallStartEvent, TODO } from './voice';
 interface INPUT {
     callId?: string;
     sessionTimeout?: number | string;
+    otherCallRef?: string;
+    otherCallRefThread?: string;
     asr: TODO;
     tts: TODO;
     from: string;

package/dst/Initiate Call.js

@@ -47,7 +47,7 @@ class InitiateCall extends voice_1.default {
         this.exitStep('cancel');
     }
     async waitForCall() {
-        const { asr, tts, from: botNumber, endUserNumber, sipHost, sipUser, sipPassword, timeout, headers, enableSpoofCallerId, spoofCallerId, isAMD } = this.data;
+        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) => {
             switch (event.params.type) {
@@ -140,55 +140,48 @@ class InitiateCall extends voice_1.default {
                 memo[header.name] = `${header.value}`;
                 return memo;
             }, {});
-            if (endUserNumber.startsWith('user:')) {
+            const params = {
+                id: call.id,
+                from: botNumber,
+                to: endUserNumber,
+                headers: customHeaders,
+                spoofCallerId: {
+                    enableSpoofCallerId,
+                    spoofCallerId
+                },
+                gateway: sipHost
+                    ? {
+                        host: sipHost,
+                        username: sipUser,
+                        password: sipPassword
+                    }
+                    : undefined,
+                timeout: originateTimeout,
+                version: 2,
+                sessionExpireTime: this.session.expireTime
+            };
+            if (otherCallRef) {
+                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+                const otherThread = this.process.getSafeThread(otherCallRefThread || this.thread.id);
+                const otherCall = await otherThread.get(otherCallRef);
+                if (otherCall == null)
+                    throw new Error(`otherCall not found: ${otherCallRef}`);
+                await this.sendCommands(otherCall, [
+                    { name: 'originate', params }
+                ]);
+            }
+            else if (endUserNumber.startsWith('user:')) {
                 await this.thread.emitAsync({
                     target: 'provider',
                     name: 'out/voice/originate',
-                    params: {
-                        id: call.id,
-                        from: botNumber,
-                        to: endUserNumber,
-                        headers: customHeaders,
-                        spoofCallerId: {
-                            enableSpoofCallerId,
-                            spoofCallerId
-                        },
-                        gateway: sipHost
-                            ? {
-                                host: sipHost,
-                                username: sipUser,
-                                password: sipPassword
-                            }
-                            : undefined,
-                        timeout: originateTimeout,
-                        version: 2
-                    }
+                    params
                 });
             }
             else {
                 await this.thread.emitAsync({
                     target: 'provider',
                     name: 'out/voice/originate/v2',
-                    params: {
-                        id: call.id,
-                        from: botNumber,
-                        to: endUserNumber,
-                        headers: customHeaders,
-                        spoofCallerId: {
-                            enableSpoofCallerId,
-                            spoofCallerId
-                        },
-                        gateway: sipHost
-                            ? {
-                                host: sipHost,
-                                username: sipUser,
-                                password: sipPassword
-                            }
-                            : undefined,
-                        timeout: originateTimeout,
-                        version: 2,
-                        sessionExpireTime: this.session.expireTime
-                    }
+                    params
                 });
             }
         });

package/dst/Transfer.d.ts

@@ -1,4 +1,4 @@
-import VoiceStep, { EventType } from './voice';
+import VoiceStep, { VoiceEvent } from './voice';
 interface INPUT {
     destination: string;
     phoneNumber: string;
@@ -14,9 +14,7 @@ interface INPUT {
     sipUser?: string;
     sipPassword?: string;
 }
-interface EVENT {
-    type: EventType;
-    error?: string | Error;
+interface EVENT extends VoiceEvent {
     originateDisposition?: string;
 }
 export default class Transfer extends VoiceStep<INPUT, {}, EVENT> {

package/dst/Transfer.js

@@ -23,8 +23,8 @@ class Transfer extends voice_1.default {
                 }
                 case 'bridge/ended': {
                     const { error, originateDisposition } = event.params;
-                    const isSuccess = error === 'NORMAL_CLEARING'
-                        && (lodash_1.default.isUndefined(originateDisposition) || originateDisposition === 'SUCCESS');
+                    const isSuccess = error === 'NORMAL_CLEARING' &&
+                        (lodash_1.default.isUndefined(originateDisposition) || originateDisposition === 'SUCCESS');
                     if (isSuccess) {
                         await this.transcript(call, {
                             action: 'Transfer Ended - Answered',

package/dst/step.d.ts

@@ -16,7 +16,8 @@ export default class ConvStep<TData = unknown, TIn = unknown, TOut = unknown, TP
     private convDataCache?;
     get cache(): TData & IConversationData | undefined;
     get conversation(): string | IMergeField;
-    get conversationName(): string;
+    get conversationId(): string;
+    get globalThreadId(): string;
     /** id of the thread where conversation data is stored */
     get dataThreadId(): IThreadId;
     get isGlobal(): boolean;
@@ -28,7 +29,6 @@ export default class ConvStep<TData = unknown, TIn = unknown, TOut = unknown, TP
     runBefore(): Promise<void>;
     runAfter(): Promise<void>;
     hasActiveGlobal(): Promise<boolean>;
-    setLocalTriggers(): Promise<void>;
     waitForConversation(): Promise<void>;
     protected onSkipEvent(): Promise<void>;
     cancel(): Promise<void>;

package/dst/step.js

@@ -12,7 +12,7 @@ class ConvStep extends step_1.default {
             throw new Error('missing data.conversation');
         return this.data.conversation;
     }
-    get conversationName() {
+    get conversationId() {
         const convOrName = this.conversation;
         const conv = (typeof convOrName === 'string')
             ? this.config.mergeFields[convOrName] ?? convOrName
@@ -25,6 +25,9 @@ class ConvStep extends step_1.default {
             return convOrName;
         throw new Error(`invalid conversation ${JSON.stringify(conv)}`);
     }
+    get globalThreadId() {
+        return `G:${this.conversationId}`;
+    }
     /** id of the thread where conversation data is stored */
     get dataThreadId() {
         const dataThreadId = this.state.thread ?? this.data.conversationThread;
@@ -76,21 +79,19 @@ class ConvStep extends step_1.default {
         if (this.useQueue && !await this.pushConvStep()) {
             return await this.waitForConversation();
         }
-        if (this.event.action == null && !this.event.processed) {
-            if (this.isGlobal)
-                return;
-            const hasGlobal = await this.sendEventToStep({ event: { ...this.event, action: 'global' }, toGlobal: true }); // redirect to global (1)
-            if (hasGlobal != null) {
-                this.log.debug('conv.sendEventToStep toGlobal', { hasGlobal });
-                this.state.prevSkipName = this.state.name;
-                this.state.name = 'onSkipEvent';
-                return;
-            }
-        }
-        if (this.isGlobal && this.event.action === 'global') {
-            return; // it was redirected from (1)
-        }
-        await this.setLocalTriggers();
+        // if (this.event.action == null && !this.event.processed) {
+        //   if (this.isGlobal) return
+        //   const hasGlobal = await this.sendEventToStep({ event: { ...this.event, action: 'global' }, toGlobal: true }) // redirect to global (1)
+        //   if (hasGlobal != null) {
+        //     this.log.debug('conv.sendEventToStep toGlobal', { hasGlobal })
+        //     this.state.prevSkipName = this.state.name
+        //     this.state.name = 'onSkipEvent'
+        //   }
+        // }
+        // if (this.isGlobal && this.event.action === 'global') {
+        //   // it was redirected from (1)
+        // }
+        // await this.setLocalTriggers()
     }
     async runAfter() {
         if (this.thread.ending)
@@ -112,11 +113,11 @@ class ConvStep extends step_1.default {
         const globalLength = (await this.getConversation())?.glb?.length ?? 0;
         return globalLength > 0;
     }
-    async setLocalTriggers() {
-        if (!this.isGlobal && await this.hasActiveGlobal()) {
-            this.triggers.config({ target: 'session' });
-        }
-    }
+    // 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');
@@ -200,9 +201,9 @@ class ConvStep extends step_1.default {
         }
     }
     async waitGlobEnd() {
-        const gcThreadId = `G:${this.thread.id}`;
+        const gcThreadId = this.globalThreadId;
         // wait for glob thread end (if exists)
-        this.triggers.local(`thread/end/${gcThreadId}`, async () => await this.onConvEnd());
+        this.triggers.hook({ name: 'end', thread: gcThreadId }, async () => await this.onConvEnd());
         if (!this.process.getThread(gcThreadId))
             await this.onConvEnd();
     }

package/dst/voice.d.ts

@@ -28,19 +28,24 @@ export interface IVoiceCall {
 export type EventType = 'hangup' | 'error' | 'cancel' | 'avm-detected' | 'recognition' | 'digit' | 'digits' | 'conference-start' | 'conference-end' | 'playback' | 'timeout' | 'record' | 'bridge' | 'bridge/ended' | 'is_flow_ready' | 'call' | 'dtmf-sent';
 export declare class VoiceStepError extends BasicError {
 }
+export type VoicerError = Error | string & {
+    message?: never;
+    name?: never;
+};
 export interface VoiceEvent {
     type: EventType;
-    error?: Error;
+    global?: boolean;
+    error?: VoicerError;
 }
 export interface CallStartEvent extends VoiceEvent {
     channel: IVoiceCall;
     headers?: Record<string, string>;
 }
-export default class VoiceStep<TIn = unknown, TOut = unknown, TParams = VoiceEvent> extends ConvStep<IVoiceCall, TIn & {
+export default class VoiceStep<TIn = unknown, TOut = unknown, TParams extends VoiceEvent = VoiceEvent> extends ConvStep<IVoiceCall, TIn & {
     handleCancel?: boolean;
 }, TOut, TParams> {
     runBefore(): Promise<void>;
-    sendCommands({ id, type, callback }: IVoiceCall, commands: TODO[]): Promise<unknown>;
+    sendCommands({ id, type, callback }: IVoiceCall, commands: TODO[]): Promise<void>;
     handleHeartbeat(call: IVoiceCall): Promise<void>;
     extractSectionMessages(sections: IPromtpSection[]): string;
     extractSectionFiles(sections: IPromtpSection[]): Array<{
@@ -50,10 +55,7 @@ export default class VoiceStep<TIn = unknown, TOut = unknown, TParams = VoiceEve
     pauseRecording(call: IVoiceCall, command: any, sensitiveData?: SensitiveData): Promise<void>;
     resumeRecording(call: IVoiceCall, sensitiveData?: SensitiveData): Promise<void>;
     transcript(call: IVoiceCall, data?: Partial<IVoiceReporterTranscriptEventArgs>): Promise<string>;
-    throwError(error?: {
-        name: string;
-        message: string;
-    }): never;
+    throwError(error?: VoicerError): never;
     handleHangup(call: IVoiceCall): Promise<void>;
     buildSections({ sections, textType, ttsSettings, allowKeypadBargeIn }: TODO): TODO;
     buildReprompts({ prompts, allowKeypadBargeIn }: TODO): TODO;

package/dst/voice.js

@@ -15,13 +15,22 @@ class VoiceStep extends step_1.default {
     // static Error = VoiceStepError
     async runBefore() {
         await super.runBefore();
-        if (this.cache != null)
+        if (this.cache != null) {
+            if (!this.isGlobal && this.event.params.global && this.event.action == null) {
+                const hasGlobal = await this.sendEventToStep({ event: { ...this.event, action: 'global' }, toGlobal: true }); // redirect to global (1)
+                if (hasGlobal != null) {
+                    this.log.debug('conv.sendEventToStep toGlobal', { hasGlobal });
+                    this.state.prevSkipName = this.state.name;
+                    this.state.name = 'onSkipEvent';
+                }
+            }
             await this.handleHeartbeat(this.cache);
+        }
     }
     async sendCommands({ id, type, callback }, commands) {
         if (lodash_1.default.isEmpty(commands))
             return;
-        return await this.thread.eventManager.emit({
+        const result = await this.thread.eventManager.emit({
             target: 'provider',
             name: `out/voice/${type}`,
             params: {
@@ -37,6 +46,8 @@ class VoiceStep extends step_1.default {
             invocationType: 'async',
             timeout: 5000
         });
+        if (result == null)
+            throw new Error(`failed to send command to call: ${id}`);
     }
     async handleHeartbeat(call) {
         if (call.vv >= 1) {
@@ -146,7 +157,7 @@ class VoiceStep extends step_1.default {
         return eventId;
     }
     throwError(error = new Error('unknown')) {
-        throw new VoiceStepError(error.message, null, { name: error.name });
+        throw new VoiceStepError(error.message ?? error, null, { name: error?.name });
     }
     async handleHangup(call) {
         if (call.ended)
@@ -166,6 +177,7 @@ class VoiceStep extends step_1.default {
             textType,
             bargeInVoice: section.allowVoiceBargeIn,
             bargeInKeypad: section.allowKeypadBargeIn ?? allowKeypadBargeIn,
+            bargeInBeforeSpeechEndTime: section.bargeInBeforeSpeechEndTime,
             ...ttsSettings
         }));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onereach/step-voice",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "author": "Roman Zolotarov <roman.zolotarov@onereach.com>",
   "contributors": [
     "Roman Zolotarov",
@@ -19,20 +19,22 @@
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@onereach/flow-sdk": "^3.1.101",
-    "@swc/cli": "^0.1.60",
-    "@swc/core": "^1.3.32",
+    "@onereach/flow-sdk": "^3.1.114",
+    "@swc/cli": "^0.1.62",
+    "@swc/core": "^1.3.36",
+    "@swc/helpers": "^0.4.14",
     "@swc/jest": "^0.2.24",
     "@types/jest": "^29.4.0",
     "@types/lodash": "^4.14.191",
     "@types/timestring": "^6.0.2",
-    "@types/uuid": "^9.0.0",
-    "aws-sdk": "^2.1306.0",
+    "@types/uuid": "^9.0.1",
+    "aws-sdk": "^2.1320.0",
     "babel-runtime": "^6.26.0",
     "docdash": "^2.0.1",
     "husky": "^8.0.3",
-    "jest": "^29.4.1",
+    "jest": "^29.4.3",
     "pinst": "^3.0.0",
+    "source-map-support": "^0.5.21",
     "ts-standard": "^12.0.2",
     "typescript": "^4.9.5"
   },