@onereach/step-voice 5.0.4-lcltrd.3 → 5.0.4

package/dst/Global Command.js

@@ -7,14 +7,15 @@ 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 === this.globalThreadId;
+        return this.thread.id === `G:${this.conversationName}`;
     }
     get useQueue() {
         return this.isGlobal;
     }
     async runStep() {
+        const gcThreadId = `G:${this.conversationName}`;
         await this.process.runThread({
-            id: this.globalThreadId,
+            id: gcThreadId,
             state: {
                 name: 'globThread',
                 step: this.step.id,
@@ -70,10 +71,6 @@ 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/Transfer.d.ts

@@ -1,4 +1,4 @@
-import VoiceStep, { VoiceEvent } from './voice';
+import VoiceStep, { EventType } from './voice';
 interface INPUT {
     destination: string;
     phoneNumber: string;
@@ -14,7 +14,9 @@ interface INPUT {
     sipUser?: string;
     sipPassword?: string;
 }
-interface EVENT extends VoiceEvent {
+interface EVENT {
+    type: EventType;
+    error?: string | Error;
     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,8 +16,7 @@ export default class ConvStep<TData = unknown, TIn = unknown, TOut = unknown, TP
     private convDataCache?;
     get cache(): TData & IConversationData | undefined;
     get conversation(): string | IMergeField;
-    get conversationId(): string;
-    get globalThreadId(): string;
+    get conversationName(): string;
     /** id of the thread where conversation data is stored */
     get dataThreadId(): IThreadId;
     get isGlobal(): boolean;
@@ -29,6 +28,7 @@ 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 conversationId() {
+    get conversationName() {
         const convOrName = this.conversation;
         const conv = (typeof convOrName === 'string')
             ? this.config.mergeFields[convOrName] ?? convOrName
@@ -25,9 +25,6 @@ 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;
@@ -79,19 +76,21 @@ 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'
-        //   }
-        // }
-        // if (this.isGlobal && this.event.action === 'global') {
-        //   // 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';
+                return;
+            }
+        }
+        if (this.isGlobal && this.event.action === 'global') {
+            return; // it was redirected from (1)
+        }
+        await this.setLocalTriggers();
     }
     async runAfter() {
         if (this.thread.ending)
@@ -113,11 +112,11 @@ class ConvStep extends step_1.default {
         const globalLength = (await this.getConversation())?.glb?.length ?? 0;
         return globalLength > 0;
     }
-    // public async setLocalTriggers (): Promise<void> {
-    //   if (!this.isGlobal && await this.hasActiveGlobal()) {
-    //     this.triggers.config({ target: 'session' })
-    //   }
-    // }
+    async setLocalTriggers() {
+        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');
@@ -201,9 +200,9 @@ class ConvStep extends step_1.default {
         }
     }
     async waitGlobEnd() {
-        const gcThreadId = this.globalThreadId;
+        const gcThreadId = `G:${this.thread.id}`;
         // wait for glob thread end (if exists)
-        this.triggers.hook({ name: 'end', thread: gcThreadId }, async () => await this.onConvEnd());
+        this.triggers.local(`thread/end/${gcThreadId}`, async () => await this.onConvEnd());
         if (!this.process.getThread(gcThreadId))
             await this.onConvEnd();
     }

package/dst/voice.d.ts

@@ -28,20 +28,15 @@ 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';
 export declare class VoiceStepError extends BasicError {
 }
-export type VoicerError = Error | string & {
-    message?: never;
-    name?: never;
-};
 export interface VoiceEvent {
     type: EventType;
-    global?: boolean;
-    error?: VoicerError;
+    error?: Error;
 }
 export interface CallStartEvent extends VoiceEvent {
     channel: IVoiceCall;
     headers?: Record<string, string>;
 }
-export default class VoiceStep<TIn = unknown, TOut = unknown, TParams extends VoiceEvent = VoiceEvent> extends ConvStep<IVoiceCall, TIn & {
+export default class VoiceStep<TIn = unknown, TOut = unknown, TParams = VoiceEvent> extends ConvStep<IVoiceCall, TIn & {
     handleCancel?: boolean;
 }, TOut, TParams> {
     runBefore(): Promise<void>;
@@ -55,7 +50,10 @@ export default class VoiceStep<TIn = unknown, TOut = unknown, TParams extends Vo
     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?: VoicerError): never;
+    throwError(error?: {
+        name: string;
+        message: string;
+    }): never;
     handleHangup(call: IVoiceCall): Promise<void>;
     buildSections({ sections, textType, ttsSettings, allowKeypadBargeIn }: TODO): TODO;
     buildReprompts({ prompts, allowKeypadBargeIn }: TODO): TODO;

package/dst/voice.js

@@ -15,17 +15,8 @@ class VoiceStep extends step_1.default {
     // static Error = VoiceStepError
     async runBefore() {
         await super.runBefore();
-        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';
-                }
-            }
+        if (this.cache != null)
             await this.handleHeartbeat(this.cache);
-        }
     }
     async sendCommands({ id, type, callback }, commands) {
         if (lodash_1.default.isEmpty(commands))
@@ -155,7 +146,7 @@ class VoiceStep extends step_1.default {
         return eventId;
     }
     throwError(error = new Error('unknown')) {
-        throw new VoiceStepError(error.message ?? error, null, { name: error?.name });
+        throw new VoiceStepError(error.message, null, { name: error.name });
     }
     async handleHangup(call) {
         if (call.ended)
@@ -174,7 +165,7 @@ class VoiceStep extends step_1.default {
             url: section.audioUrl,
             textType,
             bargeInVoice: section.allowVoiceBargeIn,
-            bargeInKeypad: section.allowKeypadBargeIn || allowKeypadBargeIn,
+            bargeInKeypad: section.allowKeypadBargeIn ?? allowKeypadBargeIn,
             ...ttsSettings
         }));
     }
@@ -185,7 +176,7 @@ class VoiceStep extends step_1.default {
             repeatMsg: prompt.item.repeat,
             fileName: prompt.item.audioUrl || '',
             allowVoiceBargeIn: prompt.item.allowVoiceBargeIn,
-            allowKeypadBargeIn: prompt.item.allowKeypadBargeIn || allowKeypadBargeIn
+            allowKeypadBargeIn: prompt.item.allowKeypadBargeIn ?? allowKeypadBargeIn
         }));
     }
     buildChoices({ choices }) {
@@ -233,8 +224,9 @@ class VoiceStep extends step_1.default {
         }
         if (!lodash_1.default.isEmpty(params.phrases)) {
             const phrases = params.phrases;
+            const other = params.other ?? [];
             data.value = phrases[0].text;
-            data.interpretation = phrases;
+            data.interpretation = [...phrases, ...other];
         }
         return data;
     }

package/package.json

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