@onereach/step-voice 7.0.5 → 7.0.7

package/dst/Global Command.d.ts

@@ -1,4 +1,4 @@
-import { ITypedEvent } from '@onereach/flow-sdk/dst/types';
+import { IEvent } from '@onereach/flow-sdk/dst/types/event';
 import VoiceStep, { IVoiceCall, TODO, VoiceEvent } from './voice';
 interface INPUT {
     asr: TODO;
@@ -59,7 +59,7 @@ export default class GlobalCommand extends VoiceStep<Partial<INPUT>, OUTPUT, EVE
         } | undefined;
     } | undefined;
     hangup(call: IVoiceCall): Promise<unknown>;
-    exitThread(event: ITypedEvent<EVENT>, type: string, stepExit: string): Promise<void>;
+    exitThread(event: IEvent<EVENT>, type: string, stepExit: string): Promise<void>;
     buildGrammar(call: IVoiceCall, choices: TODO[]): Promise<any>;
     acceptAck(eventParams: any): void;
 }

package/dst/Global Command.js

@@ -2,7 +2,7 @@
 /* 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 process_1 = require("@onereach/flow-sdk/dst/types/process");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const voice_1 = tslib_1.__importDefault(require("./voice"));
 const CALL_QUALITY_RATINGS = {
@@ -92,9 +92,7 @@ class GlobalCommand extends voice_1.default {
             await this.initGrammar(call);
         }
         if (allowAck) {
-            this.log.debug('subscribing gc to ack');
             this.triggers.local('ack', ({ params: { ack } }) => {
-                this.log.debug('gc ack received', { ack });
                 delete worker.state.acktrd;
                 if (ack)
                     this.exitStep('no commands');
@@ -153,7 +151,7 @@ class GlobalCommand extends voice_1.default {
         this.triggers.otherwise(async () => {
             await this.initGrammar(call);
         });
-        this.triggers.hook({ name: "waitEnd" /* ACTION.waitEnd */, thread: types_1.MAIN_THREAD_ID, sync: true, times: 1 }, async () => {
+        this.triggers.hook({ name: "waitEnd" /* ACTION.waitEnd */, thread: process_1.MAIN_THREAD_ID, sync: true, times: 1 }, async () => {
             // TODO:  this is not required in newer versions, delete in v6.1+
             const allowAck = this.canVoicerAck(call);
             if (!allowAck) {
@@ -168,7 +166,6 @@ class GlobalCommand extends voice_1.default {
                 this.end();
         });
         this.triggers.local(`in/voice/${call.id}`, async (event) => {
-            this.log.debug('gc in/voice event', event.params);
             switch (event.params.type) {
                 case 'ack': {
                     this.acceptAck({ ack: true });
@@ -339,7 +336,6 @@ class GlobalCommand extends voice_1.default {
     }
     acceptAck(eventParams) {
         if (this.state.acktrd) {
-            this.log.debug('accepting ack', eventParams);
             this.process.enqueue({
                 thread: this.state.acktrd,
                 name: 'ack',

package/dst/Initiate Call.d.ts

@@ -21,7 +21,7 @@ interface INPUT {
     isAMD?: boolean;
 }
 export default class InitiateCall extends VoiceStep<INPUT, TODO, CallStartEvent> {
-    get conversation(): string | import("@onereach/flow-sdk/dst/types").IMergeField;
+    get conversation(): string | import("@onereach/flow-sdk/types").IMergeField;
     runStep(): Promise<void>;
     onAwake(): Promise<void>;
     waitForCall(): Promise<void>;

package/dst/Wait For Call.d.ts

@@ -1,7 +1,7 @@
 import VoiceStep, { CallStartEvent, TODO } from './voice';
-import { ITypedEvent } from '@onereach/flow-sdk/dst/types';
+import { IEvent } from '@onereach/flow-sdk/dst/types/event';
 export default class WaitForCall extends VoiceStep<TODO, TODO, TODO> {
-    get conversation(): string | import("@onereach/flow-sdk/dst/types").IMergeField;
+    get conversation(): string | import("@onereach/flow-sdk/types").IMergeField;
     runStep(): Promise<void>;
-    onCall(event: ITypedEvent<CallStartEvent>): Promise<any>;
+    onCall(event: IEvent<CallStartEvent>): Promise<any>;
 }

package/dst/Wait For Call.js

@@ -36,13 +36,20 @@ class WaitForCall extends voice_1.default {
         delete call.from;
         delete call.to;
         const presetTime = (Number(endOfInputTimeout) || 0) * 60 * 1000;
+        const { sessionId: previousSessionId = '', beginningSessionId = '', } = event?.reporting ?? {};
         await this.session.start({
             timeout: presetTime || defaultSessionTimeout,
             reporting: {
                 settingsKey: 'session',
                 startedBy: 'Visitor',
-                sessionType: 'Phone'
-            }
+                sessionType: 'Phone',
+                previousSessionId,
+                beginningSessionId
+            },
+            reportingSessions: [{
+                    previousSessionId,
+                    beginningSessionId
+                }]
         });
         await this.startConversation(call);
         await this.transcript(call, {

package/dst/step.d.ts

@@ -1,5 +1,7 @@
 import Step from '@onereach/flow-sdk/dst/step';
-import { IThreadId, IMergeField } from '@onereach/flow-sdk/dst/types';
+import { CONFIG, IThreadId } from '@onereach/flow-sdk/dst/types/thread';
+import { IMergeField } from '@onereach/flow-sdk/dst/types/mergeFields';
+import { IEvent } from "@onereach/flow-sdk/types/event";
 export interface ConvStepDataIn {
     conversation?: string | IMergeField;
     conversationThread?: IThreadId;
@@ -10,7 +12,7 @@ export interface IConversation {
 export interface IConversationData {
     _conv: IConversation;
 }
-export default class ConvStep<TData extends IConversationData, TIn = unknown, TOut = unknown, TParams = any> extends Step<TIn & ConvStepDataIn, TOut, TParams> {
+export default class ConvStep<TData extends IConversationData, TIn = unknown, TOut = unknown, TEvents extends IEvent<any> = IEvent<any>> extends Step<CONFIG<TIn & ConvStepDataIn, TOut, TEvents, any, any, any>> {
     private convDataCache?;
     get cache(): TData | undefined;
     get conversation(): string | IMergeField;

package/dst/voice.d.ts

@@ -1,6 +1,9 @@
-import { ICallback, IVoiceReporterTranscriptEventArgs, IPromtpSection, ITypedEvent } from '@onereach/flow-sdk/dst/types';
+import { ICallback } from '@onereach/flow-sdk/dst/types/eventManager';
+import { IPromtpSection, IVoiceReporterTranscriptEventArgs } from '@onereach/flow-sdk/dst/types/reporter';
+import { IEvent } from '@onereach/flow-sdk/dst/types/event';
 import ConvStep, { IConversationData } from './step';
 import BasicError from '@onereach/flow-sdk/dst/errors/base';
+import { WITH_VAR } from "@onereach/flow-sdk/types/thread";
 export type TODO = any;
 export interface SensitiveData {
     muteStep: boolean;
@@ -65,7 +68,7 @@ export interface CallStartEvent extends VoiceEvent {
 }
 export interface HandleInterruptionParams<TParams extends VoiceEvent = VoiceEvent> {
     call: IVoiceCall;
-    event: ITypedEvent<TParams>;
+    event: IEvent<TParams>;
     speechSections: IPromtpSection[];
     repromptsList?: {
         message?: string;
@@ -73,9 +76,10 @@ export interface HandleInterruptionParams<TParams extends VoiceEvent = VoiceEven
     }[];
     reportingSettingsKey?: string;
 }
+export type VoiceEvents<TParams> = IEvent<TParams, WITH_VAR<'in/voice/'>> | IEvent<TParams, WITH_VAR<'in/voice/', '/event'>>;
 export default class VoiceStep<TIn = unknown, TOut = unknown, TParams extends VoiceEvent = VoiceEvent> extends ConvStep<IVoiceCall, TIn & {
     handleCancel?: boolean;
-}, TOut, TParams> {
+}, TOut, VoiceEvents<TParams>> {
     runBefore(): Promise<void>;
     exitStep(exitId: string, data?: any, byThread?: boolean): any;
     exitStepByThread(exitId: string, result: any): any;
@@ -107,6 +111,6 @@ export default class VoiceStep<TIn = unknown, TOut = unknown, TParams extends Vo
     get rptsStarted(): boolean;
     canVoicerHearbeat(call: IVoiceCall): boolean;
     canVoicerAck(call: IVoiceCall): boolean;
-    getInterruptionMetadata(event: ITypedEvent<TParams>): VoiceInterruptionMetadata | null;
+    getInterruptionMetadata(event: IEvent<TParams>): VoiceInterruptionMetadata | null;
     handleInterruption(params: HandleInterruptionParams<TParams>): Promise<void>;
 }

package/dst/voice.js

@@ -13,7 +13,6 @@ class VoiceStepError extends base_1.default {
 }
 exports.VoiceStepError = VoiceStepError;
 class VoiceStep extends step_1.default {
-    // static Error = VoiceStepError
     async runBefore() {
         await super.runBefore();
         if (this.cache != null) {
@@ -52,7 +51,7 @@ class VoiceStep extends step_1.default {
     async sendCommands({ id, type, callback }, commands) {
         if (lodash_1.default.isEmpty(commands))
             return;
-        const result = await this.thread.eventManager.emit({
+        const event = {
             target: this.helpers.providersAccountId,
             name: `out/voice/${type}`,
             params: {
@@ -63,8 +62,11 @@ class VoiceStep extends step_1.default {
                 commands,
                 step: { key: this.session.key, trd: this.isGlobal ? this.workerThreadId : this.thread.id } // response should be sent to this session
             },
-            reporting: this.session.getSessionRef()
-        }, {
+            reporting: {
+                ...this.session.getSessionRef(),
+            }
+        };
+        const result = await this.thread.eventManager.emit(event, {
             target: callback,
             invocationType: 'async',
             timeout: 5000
@@ -251,7 +253,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 ?? error, { name: error?.name });
     }
     async handleHangup(call) {
         if (call.ended)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onereach/step-voice",
-  "version": "7.0.5",
+  "version": "7.0.7",
   "author": "Roman Zolotarov <roman.zolotarov@onereach.com>",
   "contributors": [
     "Roman Zolotarov",
@@ -19,8 +19,8 @@
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@onereach/flow-sdk": "^3.2.50",
-    "@onereach/orbes": "^3.1.57",
+    "@onereach/flow-sdk": "^8.0.5",
+    "@onereach/orbes": "^7.2.9",
     "@onereach/step-voice": "./test",
     "@swc/cli": "^0.1.62",
     "@swc/core": "^1.3.57",