@fonoster/autopilot 0.5.3 → 0.5.5

package/dist/pilot.js

@@ -27,12 +27,10 @@ const types_1 = require("./events/types");
 const voice_1 = require("@fonoster/voice");
 const cerebro_1 = require("./cerebro");
 const server_1 = require("./events/server");
-const nanoid_1 = require("nanoid");
 const engines_1 = require("./intents/engines");
 const util_1 = require("./util");
 const googleasr_1 = __importDefault(require("@fonoster/googleasr"));
 const logger_1 = require("@fonoster/logger");
-const googletts_1 = __importDefault(require("@fonoster/googletts"));
 const apps_1 = __importDefault(require("@fonoster/apps"));
 const secrets_1 = __importDefault(require("@fonoster/secrets"));
 const envs_1 = require("./envs");
@@ -64,21 +62,24 @@ function pilot(config) {
             const ieSecret = await secrets.getSecret(app.intentsEngineConfig.secretName);
             const intentsEngine = (0, engines_1.getIntentsEngine)(app)(JSON.parse(ieSecret.secret));
             intentsEngine?.setProjectId(app.intentsEngineConfig.projectId);
-            const voiceConfig = {
-                name: app.speechConfig.voice,
-                playbackId: (0, nanoid_1.nanoid)(),
-                cachingFields: ["name"]
-            };
             const speechSecret = await secrets.getSecret(app.speechConfig.secretName);
             const speechCredentials = {
                 private_key: JSON.parse(speechSecret.secret).private_key,
                 client_email: JSON.parse(speechSecret.secret).client_email
             };
-            voiceResponse.use(new googletts_1.default({
-                credentials: speechCredentials,
-                languageCode: config.defaultLanguageCode,
+            const voiceConfig = (0, util_1.getVoiceConfig)({
+                secretString: speechSecret.secret,
+                app,
+                config
+            });
+            logger.verbose("voice config", { voiceConfig });
+            const ttsPlugin = (0, util_1.getTTSPlugin)({
+                languageCode: voiceConfig.languageCode,
+                vendor: voiceConfig.vendor,
+                secretString: speechSecret.secret,
                 path: config.fileRetentionPolicyDirectory
-            }));
+            });
+            voiceResponse.use(ttsPlugin);
             voiceResponse.use(new googleasr_1.default({
                 credentials: speechCredentials,
                 languageCode: config.defaultLanguageCode

package/dist/types.d.ts

@@ -34,3 +34,8 @@ export interface ServerConfig {
      */
     fileRetentionPolicyExtension?: string;
 }
+export declare enum TTSVendor {
+    GOOGLE = "google",
+    AMAZON = "amazon",
+    MICROSOFT = "microsoft"
+}

package/dist/types.js

@@ -1,2 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.TTSVendor = void 0;
+var TTSVendor;
+(function (TTSVendor) {
+    TTSVendor["GOOGLE"] = "google";
+    TTSVendor["AMAZON"] = "amazon";
+    TTSVendor["MICROSOFT"] = "microsoft";
+})(TTSVendor || (exports.TTSVendor = TTSVendor = {}));

package/dist/util.d.ts

@@ -1,6 +1,44 @@
+import GoogleTTS from "@fonoster/googletts";
+import PollyTTS from "@fonoster/pollytts";
+import AzureTTS from "@fonoster/azuretts";
 import { EventsClient } from "./events/emitter";
 import { ClientEvent } from "./events/types";
+import { TTSVendor } from "./types";
 export declare const getEnvOrDefault: (envName: string, def: number) => number;
 export declare const getEnvOrBool: (envName: string) => boolean;
 export declare const removeEmpty: (obj: any) => {};
 export declare const sendClientEvent: (eventsClient: EventsClient | null, event: ClientEvent) => void;
+export declare const getTTSPlugin: (params: {
+    languageCode: string;
+    vendor: TTSVendor;
+    path: string;
+    secretString: string;
+}) => PollyTTS | AzureTTS | GoogleTTS;
+export declare const getVoiceConfig: (params: {
+    secretString: string;
+    app: {
+        speechConfig: {
+            voice: string;
+            languageCode: string;
+        };
+    };
+    config: {
+        defaultLanguageCode: string;
+    };
+}) => {
+    voice: string;
+    languageCode: string;
+    region: string;
+    vendor: TTSVendor;
+    cachingFields: string[];
+    playbackId: string;
+    name?: undefined;
+} | {
+    name: string;
+    languageCode: string;
+    cachingFields: string[];
+    playbackId: string;
+    vendor: TTSVendor;
+    voice?: undefined;
+    region?: undefined;
+};

package/dist/util.js

@@ -1,6 +1,32 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendClientEvent = exports.removeEmpty = exports.getEnvOrBool = exports.getEnvOrDefault = void 0;
+exports.getVoiceConfig = exports.getTTSPlugin = exports.sendClientEvent = exports.removeEmpty = exports.getEnvOrBool = exports.getEnvOrDefault = void 0;
+/*
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster/rox
+ *
+ * This file is part of Rox AI
+ *
+ * Licensed under the MIT License (the "License")
+ * you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *    https://opensource.org/licenses/MIT
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const googletts_1 = __importDefault(require("@fonoster/googletts"));
+const pollytts_1 = __importDefault(require("@fonoster/pollytts"));
+const azuretts_1 = __importDefault(require("@fonoster/azuretts"));
+const types_1 = require("./types");
+const nanoid_1 = require("nanoid");
 const getEnvOrDefault = (envName, def) => process.env[envName] ? parseInt(process.env[envName] || "") : def;
 exports.getEnvOrDefault = getEnvOrDefault;
 const getEnvOrBool = (envName) => process.env[envName]
@@ -24,3 +50,56 @@ const sendClientEvent = (eventsClient, event) => {
     }
 };
 exports.sendClientEvent = sendClientEvent;
+const getTTSPlugin = (params) => {
+    const { path, languageCode, vendor, secretString } = params;
+    if (vendor === types_1.TTSVendor.AMAZON) {
+        const config = JSON.parse(secretString);
+        return new pollytts_1.default({
+            accessKeyId: config.tts?.credentials?.accessKeyId,
+            secretAccessKey: config.tts?.credentials?.secretAccessKey,
+            path
+        });
+    }
+    if (vendor === types_1.TTSVendor.MICROSOFT) {
+        const config = JSON.parse(secretString);
+        return new azuretts_1.default({
+            subscriptionKey: config.tts?.subscriptionKey,
+            serviceRegion: config.tts?.serviceRegion,
+            path
+        });
+    }
+    // Default to Google
+    const credentials = JSON.parse(secretString);
+    return new googletts_1.default({
+        credentials: {
+            privateKey: credentials.private_key,
+            clientEmail: credentials.client_email
+        },
+        languageCode,
+        path
+    });
+};
+exports.getTTSPlugin = getTTSPlugin;
+const getVoiceConfig = (params) => {
+    const { secretString, app } = params;
+    const speechSecret = JSON.parse(secretString);
+    if ("tts" in speechSecret) {
+        const ttsConfig = speechSecret.tts;
+        return {
+            voice: ttsConfig.voice,
+            languageCode: ttsConfig.languageCode,
+            region: ttsConfig.region,
+            vendor: ttsConfig.vendor,
+            cachingFields: ttsConfig.cachingFields,
+            playbackId: (0, nanoid_1.nanoid)()
+        };
+    }
+    return {
+        name: app.speechConfig.voice,
+        languageCode: app.speechConfig.languageCode || params.config.defaultLanguageCode,
+        cachingFields: ["name"],
+        playbackId: (0, nanoid_1.nanoid)(),
+        vendor: types_1.TTSVendor.GOOGLE
+    };
+};
+exports.getVoiceConfig = getVoiceConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/autopilot",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "license": "MIT",
   "main": "dist/index",
   "types": "dist/index",
@@ -12,12 +12,14 @@
     "build": "tsc --build ./tsconfig.json"
   },
   "dependencies": {
-    "@fonoster/apps": "^0.5.1",
-    "@fonoster/googleasr": "^0.5.1",
-    "@fonoster/googletts": "^0.5.3",
-    "@fonoster/logger": "^0.5.1",
-    "@fonoster/secrets": "^0.5.1",
-    "@fonoster/voice": "^0.5.1",
+    "@fonoster/apps": "^0.5.5",
+    "@fonoster/azuretts": "^0.5.5",
+    "@fonoster/googleasr": "^0.5.5",
+    "@fonoster/googletts": "^0.5.5",
+    "@fonoster/logger": "^0.5.5",
+    "@fonoster/pollytts": "^0.5.5",
+    "@fonoster/secrets": "^0.5.5",
+    "@fonoster/voice": "^0.5.5",
     "@google-cloud/dialogflow": "^4.3.1",
     "@google-cloud/dialogflow-cx": "^2.13.0",
     "date-fns": "^2.29.3",
@@ -37,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a75f426e647949f536417951e0956439856d5ae9"
+  "gitHead": "4a1438d9dedeaf7b2a5b6a50d5e233f994e2b2cf"
 }