@fonoster/autopilot 0.5.1 → 0.5.3

package/dist/cerebro/cerebro.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { EffectsManager } from "./effects";
-import { IntentsEngine } from "../intents/types";
+import { Intent, IntentsEngine } from "../intents/types";
 import { SGatherStream, VoiceRequest, VoiceResponse } from "@fonoster/voice";
 import { CerebroConfig, CerebroStatus } from "./types";
 import Events from "events";
@@ -18,10 +18,11 @@ export declare class Cerebro {
     intentsEngine: IntentsEngine;
     stream: SGatherStream;
     config: CerebroConfig;
-    lastIntent: any;
+    lastIntent: Intent;
     effects: EffectsManager;
     interactionsTimer: NodeJS.Timeout;
     isCallHandover: boolean;
+    isDead: boolean;
     constructor(config: CerebroConfig);
     wake(): Promise<void>;
     sleep(): Promise<void>;
@@ -37,4 +38,5 @@ export declare class Cerebro {
     startInteractionTimer(): void;
     resetInteractionTimer(): void;
     stopPlayback(): Promise<void>;
+    cleanup(): Promise<void>;
 }

package/dist/cerebro/cerebro.js

@@ -47,6 +47,7 @@ class Cerebro {
     effects;
     interactionsTimer;
     isCallHandover = false;
+    isDead = false;
     constructor(config) {
         this.voiceResponse = config.voiceResponse;
         this.voiceRequest = config.voiceRequest;
@@ -128,12 +129,17 @@ class Cerebro {
                             this.startActiveTimer();
                         }
                     }
+                }, () => {
+                    logger.verbose("invokeEffects cleanup callback", {
+                        sessionId: this.voiceRequest.sessionId
+                    });
+                    this.cleanup();
                 });
-                logger.verbose("cerebro finished processing intent effects", {
-                    sessionId: this.voiceRequest.sessionId
-                });
-                if (this.isCallHandover) {
+                if (this.isDead || this.isCallHandover) {
                     try {
+                        logger.verbose("the call was handover or cerebro was cleaned up", {
+                            sessionId: this.voiceRequest.sessionId
+                        });
                         this.voiceResponse.hangup();
                     }
                     catch (e) {
@@ -141,6 +147,9 @@ class Cerebro {
                     }
                     return;
                 }
+                logger.verbose("cerebro finished processing intent effects", {
+                    sessionId: this.voiceRequest.sessionId
+                });
                 // Reset the interactions timer
                 if (!this.config.activationIntentId) {
                     this.resetInteractionTimer();
@@ -190,11 +199,13 @@ class Cerebro {
                 sessionId: this.voiceRequest.sessionId,
                 failedInteractions: this.failedInteractions
             });
+            // Fix hard coded intent
             let intentId = "welcome";
             if (this.failedInteractions >= this.maxIteractionsBeforeHangup) {
                 logger.verbose("there was no interaction so for a long time so we hangup", {
                     sessionId: this.voiceRequest.sessionId
                 });
+                // Fix hard coded intent
                 intentId = "goodbye";
                 clearTimeout(this.interactionsTimer);
             }
@@ -207,6 +218,11 @@ class Cerebro {
                 logger.verbose("invokeEffects callback", {
                     sessionId: this.voiceRequest.sessionId
                 });
+            }, () => {
+                logger.verbose("invokeEffects cleanup callback", {
+                    sessionId: this.voiceRequest.sessionId
+                });
+                this.cleanup();
             });
         }, this.activationTimeout);
     }
@@ -237,5 +253,14 @@ class Cerebro {
             }
         }
     }
+    // Cleanup all timers and events
+    async cleanup() {
+        this.isDead = true;
+        await this.voiceResponse.closeMediaPipe();
+        this.stream.close();
+        this.cerebroEvents.removeAllListeners();
+        clearTimeout(this.activeTimer);
+        clearTimeout(this.interactionsTimer);
+    }
 }
 exports.Cerebro = Cerebro;

package/dist/cerebro/effects.d.ts

@@ -5,7 +5,7 @@ export declare class EffectsManager {
     voice: VoiceResponse;
     config: EffectsManagerConfig;
     constructor(config: EffectsManagerConfig);
-    invokeEffects(intent: Intent, status: CerebroStatus, activateCallback: () => void): Promise<void>;
+    invokeEffects(intent: Intent, status: CerebroStatus, activateCallback: () => void, cleanupCallback: () => void): Promise<void>;
     run(effect: Effect): Promise<void>;
     transferEffect(effect: Effect): Promise<void>;
 }

package/dist/cerebro/effects.js

@@ -15,7 +15,7 @@ class EffectsManager {
         this.voice = config.voice;
         this.config = config;
     }
-    async invokeEffects(intent, status, activateCallback) {
+    async invokeEffects(intent, status, activateCallback, cleanupCallback) {
         activateCallback();
         logger.verbose("intent received", { intentRef: intent.ref });
         if (this.config.activationIntentId === intent.ref) {
@@ -31,8 +31,18 @@ class EffectsManager {
         }
         // eslint-disable-next-line no-loops/no-loops
         for (const e of intent.effects) {
-            logger.verbose("effects running", { type: e.type });
-            await this.run(e);
+            try {
+                logger.verbose("effects running", { type: e.type });
+                await this.run(e);
+            }
+            catch (e) {
+                const axiosError = e;
+                if (axiosError.response?.status !== 404) {
+                    logger.error("error running effect", { error: e });
+                    return;
+                }
+                cleanupCallback();
+            }
         }
     }
     async run(effect) {

package/dist/cerebro/types.d.ts

@@ -13,7 +13,7 @@ export interface CerebroConfig {
     activationTimeout?: number;
     activationIntentId?: string;
     intentsEngine: IntentsEngine;
-    voiceConfig: Record<string, string>;
+    voiceConfig: Record<string, string | string[]>;
     eventsClient: EventsClient | null;
     transfer?: Transfer;
     alternativeLanguageCode?: string;

package/dist/intents/dialogflow_cx.d.ts

@@ -1,8 +1,24 @@
 import { DialogFlowCXConfig, IntentsEngine, Intent } from "./types";
+import { Effect } from "../cerebro/types";
 import { SessionsClient } from "@google-cloud/dialogflow-cx";
+type DetectItemRequest = {
+    session: string;
+    queryParams: Record<string, unknown>;
+    queryInput: {
+        text: {
+            text: string;
+        };
+    } | ({
+        event: {
+            event: string;
+        };
+    } & {
+        languageCode: string;
+    });
+};
 export default class DialogFlowCX implements IntentsEngine {
     sessionClient: SessionsClient;
-    sessionPath: any;
+    sessionPath: string;
     config: DialogFlowCXConfig;
     projectId: string;
     location: string;
@@ -10,6 +26,18 @@ export default class DialogFlowCX implements IntentsEngine {
     sessionId: string;
     constructor(config: DialogFlowCXConfig);
     setProjectId(id: string): void;
-    findIntent(txt: string): Promise<Intent>;
+    findIntent(text: string, payload?: Record<string, unknown>): Promise<Intent>;
+    findIntentWithEvent(name: string, payload?: Record<string, unknown>): Promise<{
+        ref: string;
+        effects: Effect[];
+        confidence: number;
+    }>;
+    detectIntent(request: DetectItemRequest, payload?: Record<string, unknown>): Promise<{
+        ref: string;
+        effects: Effect[];
+        confidence: number;
+    }>;
+    private getSessionPath;
     private getEffects;
 }
+export {};

package/dist/intents/dialogflow_cx.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const df_utils_1 = require("./df_utils");
+const pb_util_1 = require("pb-util");
 const logger_1 = require("@fonoster/logger");
 const dialogflow_cx_1 = __importDefault(require("@google-cloud/dialogflow-cx"));
 const uuid = require("uuid");
@@ -36,46 +37,60 @@ class DialogFlowCX {
     setProjectId(id) {
         this.projectId = id;
     }
-    async findIntent(txt) {
-        const sessionPath = this.sessionClient.projectLocationAgentSessionPath(this.projectId, this.location, this.agent, this.sessionId);
+    async findIntent(text, payload) {
         const request = {
-            session: sessionPath,
+            session: this.getSessionPath(),
+            queryParams: {},
             queryInput: {
                 text: {
-                    text: txt
+                    text
                 },
                 languageCode: this.config.languageCode
             }
         };
-        const responses = await this.sessionClient.detectIntent(request);
-        logger.silly("got speech from api", { text: JSON.stringify(responses[0]) });
-        if (!responses ||
-            !responses[0].queryResult ||
-            !responses[0].queryResult.responseMessages) {
-            throw new Error("got unexpect null intent");
+        return this.detectIntent(request, payload);
+    }
+    async findIntentWithEvent(name, payload) {
+        const request = {
+            session: this.getSessionPath(),
+            queryParams: {},
+            queryInput: {
+                languageCode: this.config.languageCode,
+                event: {
+                    event: name
+                }
+            }
+        };
+        return this.detectIntent(request, payload);
+    }
+    async detectIntent(request, payload) {
+        if (payload) {
+            request.queryParams = { payload: pb_util_1.struct.encode(payload) };
         }
-        const effects = this.getEffects(responses[0].queryResult.responseMessages);
-        const ref = responses[0].queryResult.intent
-            ? responses[0].queryResult.intent.displayName || "unknown"
-            : "unknown";
+        const [response] = await this.sessionClient.detectIntent(request);
+        const effects = this.getEffects(response.queryResult.responseMessages);
+        const params = pb_util_1.struct.decode(response.queryResult.parameters);
+        const ref = params.skillCode?.toString() || "unknown";
         return {
             ref,
             effects,
-            confidence: responses[0].queryResult.intentDetectionConfidence || 0,
-            allRequiredParamsPresent: responses[0].queryResult.text ? true : false
+            confidence: response.queryResult.match?.confidence || 0
         };
     }
+    getSessionPath() {
+        return this.sessionClient.projectLocationAgentSessionPath(this.projectId, this.location, this.agent, this.sessionId);
+    }
     getEffects(responseMessages) {
         const effects = [];
         for (const r of responseMessages) {
             if (r.message === "text") {
+                const res = r.text;
                 effects.push({
                     type: "say",
                     parameters: {
-                        response: r.text.text[0]
+                        response: res.text[0]
                     }
                 });
-                continue;
             }
             else if (r.payload) {
                 effects.push((0, df_utils_1.transformPayloadToEffect)(r.payload));

package/dist/intents/dialogflow_es.d.ts

@@ -2,7 +2,7 @@ import * as dialogflow from "@google-cloud/dialogflow";
 import { IntentsEngine, Intent, DialogFlowESConfig } from "./types";
 export default class DialogFlow implements IntentsEngine {
     sessionClient: dialogflow.v2beta1.SessionsClient;
-    sessionPath: any;
+    sessionPath: string;
     config: DialogFlowESConfig;
     sessionId: string;
     projectId: string;
@@ -10,6 +10,6 @@ export default class DialogFlow implements IntentsEngine {
     setProjectId(projectId: string): void;
     findIntentWithEvent(name: string, payload?: Record<string, unknown>): Promise<Intent>;
     findIntent(txt: string, payload?: Record<string, unknown>): Promise<Intent>;
-    private detect;
+    private detectItent;
     private getEffects;
 }

package/dist/intents/dialogflow_es.js

@@ -80,7 +80,7 @@ class DialogFlow {
                 }
             }
         };
-        return this.detect(request, payload);
+        return this.detectItent(request, payload);
     }
     async findIntent(txt, payload) {
         const request = {
@@ -92,9 +92,9 @@ class DialogFlow {
                 }
             }
         };
-        return this.detect(request, payload);
+        return this.detectItent(request, payload);
     }
-    async detect(request, payload) {
+    async detectItent(request, payload) {
         const sessionPath = this.sessionClient.projectAgentSessionPath(this.projectId, this.sessionId);
         request.session = sessionPath;
         if (payload) {
@@ -102,33 +102,30 @@ class DialogFlow {
                 payload: pb_util_1.struct.encode(payload)
             };
         }
-        const responses = await this.sessionClient.detectIntent(request);
-        logger.silly("got speech from api", { text: JSON.stringify(responses[0]) });
-        if (!responses ||
-            !responses[0].queryResult ||
-            !responses[0].queryResult.intent) {
+        const [response] = await this.sessionClient.detectIntent(request);
+        logger.silly("got speech from api", { text: JSON.stringify(response) });
+        if (!response.queryResult?.intent) {
             throw new Error("got unexpect null intent");
         }
         let effects = [];
-        if (responses[0].queryResult.fulfillmentMessages) {
-            const messages = responses[0].queryResult.fulfillmentMessages.filter((f) => f.platform === this.config.platform);
+        if (response.queryResult.fulfillmentMessages) {
+            const messages = response.queryResult.fulfillmentMessages.filter((f) => f.platform === this.config.platform);
             effects = this.getEffects(messages);
         }
-        else if (responses[0].queryResult.fulfillmentText) {
+        else if (response.queryResult.fulfillmentText) {
             effects = [
                 {
                     type: "say",
                     parameters: {
-                        response: responses[0].queryResult.fulfillmentText
+                        response: response.queryResult.fulfillmentText
                     }
                 }
             ];
         }
         return {
-            ref: responses[0].queryResult.intent.displayName || "unknown",
+            ref: response.queryResult.intent.displayName || "unknown",
             effects,
-            confidence: responses[0].queryResult.intentDetectionConfidence || 0,
-            allRequiredParamsPresent: responses[0].queryResult.allRequiredParamsPresent
+            confidence: response.queryResult.intentDetectionConfidence || 0
         };
     }
     getEffects(fulfillmentMessages) {

package/dist/intents/types.d.ts

@@ -3,7 +3,6 @@ export interface Intent {
     ref: string;
     effects: Effect[];
     confidence: number;
-    allRequiredParamsPresent: boolean;
 }
 export interface IntentsEngine {
     setProjectId: (id: string) => void;

package/dist/pilot.js

@@ -66,7 +66,8 @@ function pilot(config) {
             intentsEngine?.setProjectId(app.intentsEngineConfig.projectId);
             const voiceConfig = {
                 name: app.speechConfig.voice,
-                playbackId: (0, nanoid_1.nanoid)()
+                playbackId: (0, nanoid_1.nanoid)(),
+                cachingFields: ["name"]
             };
             const speechSecret = await secrets.getSecret(app.speechConfig.secretName);
             const speechCredentials = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/autopilot",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "license": "MIT",
   "main": "dist/index",
   "types": "dist/index",
@@ -14,7 +14,7 @@
   "dependencies": {
     "@fonoster/apps": "^0.5.1",
     "@fonoster/googleasr": "^0.5.1",
-    "@fonoster/googletts": "^0.5.1",
+    "@fonoster/googletts": "^0.5.3",
     "@fonoster/logger": "^0.5.1",
     "@fonoster/secrets": "^0.5.1",
     "@fonoster/voice": "^0.5.1",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0f7b0ed84ded17ea6b3aa593fafc97914478f3a6"
+  "gitHead": "a75f426e647949f536417951e0956439856d5ae9"
 }