@fonoster/voice 0.3.6-alpha.8 → 0.3.7

package/dist/gather/gather.js

@@ -6,12 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const deepmerge_1 = __importDefault(require("deepmerge"));
 const asserts_1 = require("../asserts");
 const verb_1 = require("../verb");
-const asserts_2 = require("./asserts");
 const source_dtmf_1 = __importDefault(require("./source_dtmf"));
 const source_speech_1 = __importDefault(require("./source_speech"));
 const logger_1 = __importDefault(require("@fonoster/logger"));
 const defaultOptions = {
-    timeout: 4000,
     finishOnKey: "#",
     source: "dtmf"
 };
@@ -22,12 +20,14 @@ class GatherVerb extends verb_1.Verb {
     }
     async run(opts) {
         const options = (0, deepmerge_1.default)(defaultOptions, opts);
-        (0, asserts_2.assertsHasNumDigitsOrTimeout)(options);
+        // assertsHasNumDigitsOrTimeout(options);
         // assertsValuesIsZeroOrGreater("timeout", options.timeout);
         (0, asserts_1.assertsValueIsPositive)("numDigits", options.numDigits);
         (0, asserts_1.assertsFinishOnKeyIsChar)(options.finishOnKey);
-        if (options.source.includes("speech"))
-            options.timeout = 10000;
+        options.timeout =
+            !options.timeout && options.source.includes("speech")
+                ? 10000
+                : options.timeout || 4000;
         return new Promise(async (resolve, reject) => {
             logger_1.default.verbose(`@fonoster/voice started gather [source = ${options.source}]`);
             if (options.source.includes("dtmf")) {

package/dist/gather/source_speech.js

@@ -37,27 +37,29 @@ const waitForSpeech = async (sessionId, options, verb, speechProvider) => new Pr
     token = pubsub_js_1.default.subscribe(`ReceivingMedia.${sessionId}`, (type, data) => {
         readable.push(data);
     });
+    await (0, utils_1.startMediaTransfer)(verb, sessionId);
+    let enabledMedia = true;
+    if (options.timeout > 0) {
+        timer = setTimeout(() => {
+            if (enabledMedia)
+                (0, utils_1.stopMediaTransfer)(verb, sessionId);
+            pubsub_js_1.default.unsubscribe(token);
+            speechTracker.client.close();
+            resolve("");
+            enabledMedia = false;
+        }, options.timeout);
+    }
     speechTracker
         .transcribe(readable)
-        .then((result) => {
+        .then((result) => resolve(result.transcript))
+        .catch(reject)
+        .finally(() => {
+        if (enabledMedia)
+            (0, utils_1.stopMediaTransfer)(verb, sessionId);
         if (timer)
             clearTimeout(timer);
-        resolve(result.transcript);
-    })
-        .catch(reject)
-        .finally(async () => {
         pubsub_js_1.default.unsubscribe(token);
-        await (0, utils_1.stopMediaTransfer)(verb, sessionId);
+        enabledMedia = false;
     });
-    await (0, utils_1.startMediaTransfer)(verb, sessionId);
-    if (options.timeout > 0) {
-        timer = setTimeout(async () => {
-            // Simply resolve an empty string
-            resolve("");
-            pubsub_js_1.default.unsubscribe(token);
-            await (0, utils_1.stopMediaTransfer)(verb, sessionId);
-            return;
-        }, options.timeout);
-    }
 });
 exports.default = waitForSpeech;

package/dist/server.js

@@ -3,14 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = require("path");
+const tracer_1 = require("./tracer");
+const utils_1 = require("./utils");
 const voice_1 = __importDefault(require("./voice"));
 const logger_1 = __importDefault(require("@fonoster/logger"));
 const express_1 = __importDefault(require("express"));
-const path_1 = require("path");
-const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const pubsub_js_1 = __importDefault(require("pubsub-js"));
-const tracer_1 = require("./tracer");
 const merge = require("deepmerge");
 const app = (0, express_1.default)();
 app.use(express_1.default.json());
@@ -38,20 +38,9 @@ class VoiceServer {
         this.plugins[plugin.getType()] = plugin;
     }
     listen(handler, port = this.config.port) {
-        app.get(path_1.posix.join(this.config.base, "/tts/:file"), (req, res) => {
-            // TODO: Update to use a stream instead of fs.readFile
-            fs_1.default.readFile((0, path_1.join)(this.config.pathToFiles, req.params.file), function (err, data) {
-                if (err) {
-                    res.send("unable to find or open file");
-                }
-                else {
-                    // TODO: Set this value according to file extension
-                    res.setHeader("content-type", "audio/x-wav");
-                    res.send(data);
-                }
-                res.end();
-            });
-        });
+        app.get(path_1.posix.join(this.config.base, "/sounds/:file"), (req, res) => (0, utils_1.serveFiles)(this.config)(req, res));
+        // Alias path for sounds
+        app.get(path_1.posix.join(this.config.base, "/tts/:file"), (req, res) => (0, utils_1.serveFiles)(this.config)(req, res));
         app.get("/ping", (req, res) => {
             res.send("pong");
         });

package/dist/utils.d.ts

@@ -1,3 +1,4 @@
+import { ServerConfig } from "./types";
 import { Verb } from "./verb";
 /**
  * Takes a json object and creates a query formatted string
@@ -8,3 +9,4 @@ import { Verb } from "./verb";
 export declare const objectToQString: (obj?: any) => string;
 export declare function startMediaTransfer(verb: Verb, sessionId: string): Promise<void>;
 export declare function stopMediaTransfer(verb: Verb, sessionId: string): Promise<void>;
+export declare const serveFiles: (config: ServerConfig) => (req: any, res: any) => void;

package/dist/utils.js

@@ -1,6 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stopMediaTransfer = exports.startMediaTransfer = exports.objectToQString = void 0;
+exports.serveFiles = exports.stopMediaTransfer = exports.startMediaTransfer = exports.objectToQString = void 0;
+const path_1 = require("path");
+const fs_1 = __importDefault(require("fs"));
 /**
  * Takes a json object and creates a query formatted string
  *
@@ -33,3 +38,20 @@ async function stopMediaTransfer(verb, sessionId) {
     await sendMediaTransferEvent(verb, sessionId, "StopExternalMedia");
 }
 exports.stopMediaTransfer = stopMediaTransfer;
+const serveFiles = (config) => {
+    return (req, res) => {
+        // TODO: Update to use a stream instead of fs.readFile
+        fs_1.default.readFile((0, path_1.join)(config.pathToFiles, req.params.file), function (err, data) {
+            if (err) {
+                res.send("unable to find or open file");
+            }
+            else {
+                // TODO: Set this value according to file extension
+                res.setHeader("content-type", "audio/x-wav");
+                res.send(data);
+            }
+            res.end();
+        });
+    };
+};
+exports.serveFiles = serveFiles;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/voice",
-  "version": "0.3.6-alpha.8",
+  "version": "0.3.7",
   "description": "Voice verbs",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/fonoster#readme",
@@ -29,18 +29,17 @@
     "url": "https://github.com/fonoster/fonoster/issues"
   },
   "dependencies": {
-    "@fonoster/common": "^0.3.6-alpha.8",
-    "@fonoster/logger": "^0.3.6-alpha.8",
-    "@opentelemetry/api": "^1.0.2",
-    "@opentelemetry/node": "^0.24.0",
-    "@opentelemetry/plugin-express": "^0.15.0",
-    "@opentelemetry/plugin-http": "^0.18.2",
-    "@opentelemetry/plugin-https": "^0.18.2",
-    "@opentelemetry/resources": "0.25.0",
-    "@opentelemetry/sdk-metrics-base": "0.25.0",
-    "@opentelemetry/sdk-trace-base": "0.25.0",
-    "@opentelemetry/semantic-conventions": "0.25.0",
-    "@opentelemetry/tracing": "^0.24.0",
+    "@fonoster/common": "^0.3.7",
+    "@fonoster/logger": "^0.3.7",
+    "@opentelemetry/api": "^1.0.4",
+    "@opentelemetry/instrumentation": "^0.27.0",
+    "@opentelemetry/instrumentation-express": "^0.27.0",
+    "@opentelemetry/instrumentation-http": "^0.27.0",
+    "@opentelemetry/resources": "^1.0.4",
+    "@opentelemetry/sdk-metrics-base": "0.27.0",
+    "@opentelemetry/sdk-trace-base": "^1.0.4",
+    "@opentelemetry/sdk-trace-node": "^1.0.4",
+    "@opentelemetry/semantic-conventions": "^1.0.4",
     "bson-objectid": "^2.0.2",
     "deepmerge": "^4.2.2",
     "express": "^4.17.1",
@@ -48,8 +47,9 @@
     "pubsub-js": "^1.9.3",
     "sync": "^0.2.5"
   },
-  "gitHead": "1f3bcd51a2b3ac340eed21c5f95563bf840d3c78",
+  "gitHead": "dff0cd491b55e7d9ccc05fc51468a7c0b92bff07",
   "devDependencies": {
+    "@types/express": "^4.17.13",
     "@types/pubsub-js": "^1.8.2"
   }
 }