@onereach/step-voice 4.0.14 → 4.0.17

package/dst/Initiate Call.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const voice_1 = tslib_1.__importDefault(require("./voice"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const timestring_1 = tslib_1.__importDefault(require("timestring"));
-const uuid_1 = tslib_1.__importDefault(require("uuid"));
+const uuid = tslib_1.__importStar(require("uuid"));
 const defaultSessionTimeoutMin = 5;
 class InitiateCall extends voice_1.default {
     get conversation() {
@@ -17,7 +17,7 @@ class InitiateCall extends voice_1.default {
         return undefined;
     }
     async runStep() {
-        const { channelId = uuid_1.default.v4() } = this.data;
+        const { channelId = uuid.v4() } = this.data;
         if (!this.session.key) {
             const sessionTimeoutMs = (0, timestring_1.default)(`${this.data.sessionTimeout ?? defaultSessionTimeoutMin} min`, 'ms');
             await this.session.start({

package/dst/step.d.ts

@@ -24,6 +24,7 @@ export default class ConvStep<TData = unknown, TIn = unknown, TOut = unknown, TP
     onSkipEvent(): Promise<void>;
     cancel(): Promise<void>;
     onCancel(): Promise<void>;
+    waitCancelEnd(): Promise<void>;
     pause(): Promise<void>;
     resume(): Promise<void>;
     sendEventToStep({ toGlobal, toStep, action, event }: {

package/dst/step.js

@@ -1,5 +1,5 @@
 "use strict";
-/* eslint-disable @typescript-eslint/strict-boolean-expressions, @typescript-eslint/explicit-function-return-type */
+/* eslint-disable @typescript-eslint/strict-boolean-expressions */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const step_1 = tslib_1.__importDefault(require("@onereach/flow-sdk/dst/step"));
@@ -12,7 +12,7 @@ class ConvStep extends step_1.default {
     /** id of the thread where conversation data is stored */
     get dataThreadId() {
         const dataThreadId = this.state.thread ?? this.data.conversationThread;
-        return dataThreadId != null && dataThreadId !== '' ? dataThreadId : this.thread.id;
+        return dataThreadId || this.thread.id;
     }
     get autoCancel() {
         return undefined;
@@ -50,7 +50,6 @@ class ConvStep extends step_1.default {
         if (this.state.direct)
             return;
         if (this.event.action === 'cancel') {
-            this.state.prevCancelName = this.state.name;
             this.state.name = 'onCancel';
             return;
         }
@@ -134,16 +133,25 @@ class ConvStep extends step_1.default {
         }
     }
     async onCancel() {
-        if (!this.thread.hasAction()) {
-            this.log.debug('conv.onCancel end', { state: this.state, lcl: this.convDataCache?._conv.lcl });
-            this.end();
+        if (this.getExitStepId('cancel')) {
+            this.log.debug('conv.cancel exit');
+            this.exitStep('cancel');
         }
         else {
-            this.log.debug('conv.onCancel', { state: this.state });
-            this.state.name = this.state.prevCancelName;
-            delete this.state.prevCancelName;
+            const conversationThread = this.state.thread ?? this.thread.id;
+            if (conversationThread === this.thread.id) {
+                this.log.debug('conv.cancel wait for end', this.conversation);
+                this.gotoState({ ...this.state, name: 'waitCancelEnd', direct: true });
+            }
+            else {
+                this.log.debug('conv.cancel end', this.conversation);
+                this.end();
+            }
         }
     }
+    async waitCancelEnd() {
+        this.exitFlow();
+    }
     async pause() {
         const conv = await this._getConversation();
         const activeStep = await this.activeStep(false);
@@ -236,7 +244,7 @@ class ConvStep extends step_1.default {
             }
         };
         await this.updateData();
-        this.state.thread = this.dataThreadId;
+        // this.state.thread = this.dataThreadId
     }
     async _fetchData() {
         if (this.convDataCache != null)

package/dst/voice.d.ts

@@ -35,8 +35,6 @@ export default class VoiceStep<TIn = unknown, TOut = unknown, TParams = VoiceEve
     handleCancel?: boolean;
 }, TOut, TParams> {
     get autoCancel(): boolean | undefined;
-    onCancel(): Promise<void>;
-    waitForEnd(): Promise<void>;
     sendCommands({ id, type, callback }: IVoiceChannel, commands: TODO[]): Promise<unknown>;
     extractSectionMessages(sections: IPromtpSection[]): string;
     extractSectionFiles(sections: IPromtpSection[]): Array<{

package/dst/voice.js

@@ -1,5 +1,5 @@
 "use strict";
-/* eslint-disable @typescript-eslint/strict-boolean-expressions, @typescript-eslint/explicit-function-return-type */
+/* eslint-disable @typescript-eslint/strict-boolean-expressions */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VoiceStepError = void 0;
 const tslib_1 = require("tslib");
@@ -16,25 +16,6 @@ class VoiceStep extends step_1.default {
     get autoCancel() {
         return true;
     }
-    async onCancel() {
-        if (this.data.handleCancel === true) {
-            this.exitStep('cancel');
-        }
-        else {
-            const conversationThread = this.state.thread ?? this.thread.id;
-            if (conversationThread === this.thread.id) {
-                this.log.debug('cancel wait for end', this.conversation);
-                this.gotoState({ name: 'waitForEnd', direct: true });
-            }
-            else {
-                this.log.debug('cancel end', this.conversation);
-                this.end();
-            }
-        }
-    }
-    async waitForEnd() {
-        this.exitFlow();
-    }
     async sendCommands({ id, type, callback }, commands) {
         if (lodash_1.default.isEmpty(commands))
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onereach/step-voice",
-  "version": "4.0.14",
+  "version": "4.0.17",
   "author": "Roman Zolotarov <roman.zolotarov@onereach.com>",
   "contributors": [
     "Roman Zolotarov",
@@ -18,7 +18,7 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@onereach/flow-sdk": "^3.1.1",
+    "@onereach/flow-sdk": "^3.1.3",
     "@swc/cli": "^0.1.57",
     "@swc/core": "^1.2.197",
     "@swc/jest": "^0.2.21",