@fonoster/voice 0.6.6 → 0.7.2

package/dist/VoiceResponse.d.ts

@@ -1,5 +1,5 @@
-import { DialOptions, GatherOptions, GatherResponse, MuteOptions, PlayOptions, PlayResponse, PlaybackControlAction, RecordOptions, RecordResponse, SayOptions, SayResponse, StreamOptions, VerbResponse, VoiceRequest, VoiceSessionStreamServer } from "@fonoster/common";
-import { DialStatusStream, Stream } from "./verbs";
+import { DialOptions, GatherOptions, GatherResponse, MuteOptions, PlayOptions, PlayResponse, PlaybackControlAction, RecordOptions, RecordResponse, SayOptions, SayResponse, StreamGatherOptions, StreamOptions, VerbResponse, VoiceRequest, VoiceSessionStreamServer } from "@fonoster/common";
+import { DialStatusStream, Stream, StreamGatherStream } from "./verbs";
 /**
  * @classdesc Use the VoiceResponse object, to construct advance Interactive
  * Voice Response (IVR) applications.
@@ -11,11 +11,10 @@ import { DialStatusStream, Stream } from "./verbs";
  *
  * async function handler (request, response) {
  *   await response.answer();
- *   await response.play("sound:hello-world");
+ *   await response.play("https://soundsserver:9000/sounds/hello-world.wav");
  * }
  *
- * const voiceServer = new VoiceServer({base: '/voiceapp'})
- * voiceServer.listen(handler, { port: 3000 })
+ * new VoiceServer().listen(handler, { port: 3000 })
  */
 declare class VoiceResponse {
     voice: VoiceSessionStreamServer;
@@ -164,7 +163,6 @@ declare class VoiceResponse {
      * @param {StreamOptions} options - Options to control the stream operation
      * @param {StreamDirection} options.direction - The direction to stream the audio (IN, OUT, BOTH). Default is BOTH
      * @param {StreamAudioFormat} options.format - The audio format to stream (WAV). Default is WAV
-     * @param {boolean} options.enableVad - Enable voice activity detection. Default is false
      * @return {Promise<Stream>} The stream object
      * @example
      *
@@ -172,9 +170,7 @@ declare class VoiceResponse {
      *   await response.answer();
      *
      *   const stream = await response.stream({
-     *     direction: StreamDirection.BOTH,
-     *     format: StreamAudioFormat.WAV,
-     *     enableVad: true
+     *     direction: StreamDirection.BOTH
      *   });
      *
      *   stream.onPayload((payload) => {
@@ -185,7 +181,25 @@ declare class VoiceResponse {
      *   // stream.write({ type: StreamMessageType.AUDIO_OUT, payload: "\x00\x01\x02" });
      * }
      */
-    stream(options: StreamOptions): Promise<Stream>;
+    stream(options?: StreamOptions): Promise<Stream>;
+    /**
+     * Starts a server-side stream gather operation which sends transcription data to the voice server.
+     *
+     * @param {StreamGatherOptions} options - Options to control the stream gather operation
+     * @param {StreamGatherSource} options.source - The source to gather data from (DTMF, SPEECH, SPEECH_AND_DTMF). Default is SPEECH
+     * @return {Promise<StreamGatherStream>} The stream gather object
+     * @see Gather
+     * @example
+     *
+     * async function handler (request, response) {
+     *  await response.answer();
+     *  const sGather = await response.streamGather({ source: StreamGatherSource.SPEECH });
+     *  sGather.onPayload((payload) => {
+     *    console.log("Payload: %s", payload);
+     *  });
+     * }
+     */
+    sgather(options: StreamGatherOptions): Promise<StreamGatherStream>;
     /**
      * Mutes a call.
      *

package/dist/VoiceResponse.js

@@ -42,11 +42,10 @@ const verbs_1 = require("./verbs");
  *
  * async function handler (request, response) {
  *   await response.answer();
- *   await response.play("sound:hello-world");
+ *   await response.play("https://soundsserver:9000/sounds/hello-world.wav");
  * }
  *
- * const voiceServer = new VoiceServer({base: '/voiceapp'})
- * voiceServer.listen(handler, { port: 3000 })
+ * new VoiceServer().listen(handler, { port: 3000 })
  */
 class VoiceResponse {
     /**
@@ -258,7 +257,6 @@ class VoiceResponse {
      * @param {StreamOptions} options - Options to control the stream operation
      * @param {StreamDirection} options.direction - The direction to stream the audio (IN, OUT, BOTH). Default is BOTH
      * @param {StreamAudioFormat} options.format - The audio format to stream (WAV). Default is WAV
-     * @param {boolean} options.enableVad - Enable voice activity detection. Default is false
      * @return {Promise<Stream>} The stream object
      * @example
      *
@@ -266,9 +264,7 @@ class VoiceResponse {
      *   await response.answer();
      *
      *   const stream = await response.stream({
-     *     direction: StreamDirection.BOTH,
-     *     format: StreamAudioFormat.WAV,
-     *     enableVad: true
+     *     direction: StreamDirection.BOTH
      *   });
      *
      *   stream.onPayload((payload) => {
@@ -304,6 +300,42 @@ class VoiceResponse {
             return stream;
         });
     }
+    /**
+     * Starts a server-side stream gather operation which sends transcription data to the voice server.
+     *
+     * @param {StreamGatherOptions} options - Options to control the stream gather operation
+     * @param {StreamGatherSource} options.source - The source to gather data from (DTMF, SPEECH, SPEECH_AND_DTMF). Default is SPEECH
+     * @return {Promise<StreamGatherStream>} The stream gather object
+     * @see Gather
+     * @example
+     *
+     * async function handler (request, response) {
+     *  await response.answer();
+     *  const sGather = await response.streamGather({ source: StreamGatherSource.SPEECH });
+     *  sGather.onPayload((payload) => {
+     *    console.log("Payload: %s", payload);
+     *  });
+     * }
+     */
+    sgather(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const stream = new verbs_1.StreamGatherStream();
+            const startStreamGather = new verbs_1.StartStreamGather(this.request, this.voice);
+            const stopStreamGather = new verbs_1.StopStreamGather(this.request, this.voice);
+            yield startStreamGather.run(Object.assign({ sessionRef: this.request.sessionRef }, options));
+            this.voice.on(common_1.StreamEvent.DATA, (result) => {
+                if (result.streamGatherPayload) {
+                    stream.emit("data", result.streamGatherPayload);
+                }
+            });
+            stream.cleanup(() => {
+                stopStreamGather.run({
+                    sessionRef: this.request.sessionRef
+                });
+            });
+            return stream;
+        });
+    }
     /**
      * Mutes a call.
      *

package/dist/VoiceServer.js

@@ -54,7 +54,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * limitations under the License.
  */
 const common_1 = require("@fonoster/common");
-const identity_1 = require("@fonoster/identity");
 const logger_1 = require("@fonoster/logger");
 const grpc = __importStar(require("@grpc/grpc-js"));
 const deepmerge_1 = __importDefault(require("deepmerge"));
@@ -72,20 +71,20 @@ class VoiceServer {
             try {
                 const healthImpl = new grpc_health_check_1.HealthImplementation(common_1.statusMap);
                 const credentials = yield (0, common_1.getServerCredentials)({});
-                let server;
-                if (this.config.skipIdentity) {
-                    server = new grpc.Server();
-                }
-                else {
-                    // Get the public key from the identity service
-                    const response = yield (0, identity_1.getPublicKeyClient)(this.config.identityAddress);
-                    const authorization = (0, identity_1.createAuthInterceptor)(response.publicKey, [
-                        "/grpc.health.v1.Health/Check"
-                    ]);
-                    server = new grpc.Server({
-                        interceptors: [authorization]
-                    });
-                }
+                const server = new grpc.Server();
+                // FIXME: Must re-implement without dependency on identity package
+                // if (this.config.skipIdentity) {
+                //   server = new grpc.Server();
+                // } else {
+                //   // Get the public key from the identity service
+                //   const response = await getPublicKeyClient(this.config.identityAddress);
+                //   const authorization = createAuthInterceptor(response.publicKey, [
+                //     "/grpc.health.v1.Health/Check"
+                //   ]);
+                //   server = new grpc.Server({
+                //     interceptors: [authorization]
+                //   });
+                // }
                 server.addService(serviceDefinition_1.serviceDefinition, {
                     createSession: (0, createSession_1.createSession)(handler)
                 });

package/dist/createSession.js

@@ -29,16 +29,25 @@ exports.createSession = createSession;
  * limitations under the License.
  */
 const common_1 = require("@fonoster/common");
+const logger_1 = require("@fonoster/logger");
 const VoiceResponse_1 = require("./VoiceResponse");
+const logger = (0, logger_1.getLogger)({ service: "voice", filePath: __filename });
 function createSession(handler) {
     return (voice) => new Promise((resolve) => {
-        voice.on(common_1.StreamEvent.DATA, (params) => __awaiter(this, void 0, void 0, function* () {
+        let sessionRef;
+        voice.once(common_1.StreamEvent.DATA, (params) => __awaiter(this, void 0, void 0, function* () {
             const { request } = params;
             if (params.request) {
+                sessionRef = params.request.sessionRef;
                 const response = new VoiceResponse_1.VoiceResponse(request, voice);
                 yield handler(request, response);
                 resolve();
             }
         }));
+        voice.once(common_1.StreamEvent.END, () => {
+            logger.verbose("session ended", { sessionRef });
+            voice.end();
+            resolve();
+        });
     });
 }

package/dist/demo.js

@@ -34,12 +34,11 @@ const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
 const VoiceServer_1 = __importDefault(require("./VoiceServer"));
 const logger = (0, logger_1.getLogger)({ service: "voice", filePath: __filename });
-const config = {
-    // Only do this for testing
-    skipIdentity: true
-};
-new VoiceServer_1.default(config).listen((req, res) => __awaiter(void 0, void 0, void 0, function* () {
-    logger.verbose("voice request", JSON.stringify(req, null, 2));
+const skipIdentity = process.env.NODE_ENV === "dev";
+// Only skip identity for local development
+new VoiceServer_1.default({ skipIdentity }).listen((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+    const { ingressNumber, sessionRef, appRef } = req;
+    logger.verbose("voice request", { ingressNumber, sessionRef, appRef });
     yield res.answer();
     yield res.say("Hi there! What's your name?");
     const { speech: name } = yield res.gather({

package/dist/index.d.ts

@@ -2,5 +2,6 @@
 import { AzureVoice, AzureVoiceDetails, GoogleVoice, GoogleVoiceDetails } from "@fonoster/common";
 import VoiceServer from "./VoiceServer";
 export default VoiceServer;
+export * from "./VoiceResponse";
 export * from "./types";
 export { GoogleVoice, GoogleVoiceDetails, AzureVoice, AzureVoiceDetails };

package/dist/index.js

@@ -44,4 +44,5 @@ Object.defineProperty(exports, "GoogleVoice", { enumerable: true, get: function
 Object.defineProperty(exports, "GoogleVoiceDetails", { enumerable: true, get: function () { return common_1.GoogleVoiceDetails; } });
 const VoiceServer_1 = __importDefault(require("./VoiceServer"));
 exports.default = VoiceServer_1.default;
+__exportStar(require("./VoiceResponse"), exports);
 __exportStar(require("./types"), exports);

package/dist/verbs/Stream.js

@@ -26,9 +26,8 @@ const Verb_1 = require("./Verb");
 class StartStream extends Verb_1.Verb {
     getValidationSchema() {
         return zod_1.z.object({
-            direction: zod_1.z.nativeEnum(common_1.StreamDirection),
-            format: zod_1.z.nativeEnum(common_1.StreamAudioFormat),
-            enableVad: zod_1.z.boolean()
+            direction: zod_1.z.nativeEnum(common_1.StreamDirection).optional().nullable(),
+            format: zod_1.z.nativeEnum(common_1.StreamAudioFormat).optional().nullable()
         });
     }
 }

package/dist/verbs/StreamGather.d.ts

@@ -0,0 +1,19 @@
+import { Stream as StreamObj } from "stream";
+import { StartStreamGatherRequest, StreamGatherPayload, VerbRequest } from "@fonoster/common";
+import { z } from "zod";
+import { Verb } from "./Verb";
+declare class StartStreamGather extends Verb<StartStreamGatherRequest> {
+    getValidationSchema(): z.Schema;
+}
+declare class StopStreamGather extends Verb<VerbRequest> {
+    getValidationSchema(): z.Schema;
+}
+declare class StreamGatherStream {
+    stream: StreamObj;
+    constructor();
+    close(): void;
+    onPayload(callback: (payload: StreamGatherPayload) => void): void;
+    emit(event: "data", payload: StreamGatherPayload): void;
+    cleanup(callback: () => void): void;
+}
+export { StartStreamGather, StopStreamGather, StreamGatherStream };

package/dist/verbs/StreamGather.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StreamGatherStream = exports.StopStreamGather = exports.StartStreamGather = void 0;
+/*
+ * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster/fonoster
+ *
+ * This file is part of Fonoster
+ *
+ * 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 stream_1 = require("stream");
+const common_1 = require("@fonoster/common");
+const zod_1 = require("zod");
+const Verb_1 = require("./Verb");
+class StartStreamGather extends Verb_1.Verb {
+    getValidationSchema() {
+        return zod_1.z.object({
+            source: zod_1.z.optional(zod_1.z.nativeEnum(common_1.StreamGatherSource))
+        });
+    }
+}
+exports.StartStreamGather = StartStreamGather;
+class StopStreamGather extends Verb_1.Verb {
+    getValidationSchema() {
+        return zod_1.z.object({
+            sessionRef: zod_1.z.string()
+        });
+    }
+}
+exports.StopStreamGather = StopStreamGather;
+class StreamGatherStream {
+    constructor() {
+        this.stream = new stream_1.Stream();
+    }
+    close() {
+        this.stream.removeAllListeners();
+    }
+    // TODO: We should hide this method from the public API
+    // Private API
+    onPayload(callback) {
+        this.stream.on("data", (payload) => {
+            callback(payload);
+        });
+    }
+    // Private API
+    emit(event, payload) {
+        this.stream.emit(event, payload);
+    }
+    // Private API
+    cleanup(callback) {
+        this.stream.on("close", callback);
+    }
+}
+exports.StreamGatherStream = StreamGatherStream;

package/dist/verbs/Verb.js

@@ -30,6 +30,7 @@ exports.Verb = void 0;
  */
 const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
+const getExpectedContent_1 = require("./getExpectedContent");
 const validateRequest_1 = require("./validateRequest");
 const logger = (0, logger_1.getLogger)({ service: "voice", filePath: __filename });
 class Verb {
@@ -52,6 +53,10 @@ class Verb {
                         [`${(0, common_1.toCamelCase)(this.constructor.name)}Request`]: fullRequest
                     });
                     const dataListener = (result) => {
+                        const expectedContent = (0, getExpectedContent_1.getExpectedContent)(this.constructor.name);
+                        if (expectedContent !== result.content) {
+                            return;
+                        }
                         logger.verbose(`received ${this.constructor.name} response`, {
                             sessionRef
                         });

package/dist/verbs/getExpectedContent.d.ts

@@ -0,0 +1,2 @@
+declare function getExpectedContent(name: string): string;
+export { getExpectedContent };

package/dist/verbs/getExpectedContent.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getExpectedContent = getExpectedContent;
+/*
+ * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster/fonoster
+ *
+ * This file is part of Fonoster
+ *
+ * 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 common_1 = require("@fonoster/common");
+function getExpectedContent(name) {
+    switch (name) {
+        case "StartStreamGather":
+            return "startStreamGatherResponse";
+        case "StartStream":
+            return "startStreamResponse";
+        default:
+            return `${(0, common_1.toCamelCase)(name)}Response`;
+    }
+}

package/dist/verbs/index.d.ts

@@ -9,6 +9,7 @@ export * from "./PlaybackControl";
 export * from "./Record";
 export * from "./Say";
 export * from "./Stream";
+export * from "./StreamGather";
 export * from "./Unmute";
 export * from "./validateRequest";
 export * from "./Verb";

package/dist/verbs/index.js

@@ -43,6 +43,7 @@ __exportStar(require("./PlaybackControl"), exports);
 __exportStar(require("./Record"), exports);
 __exportStar(require("./Say"), exports);
 __exportStar(require("./Stream"), exports);
+__exportStar(require("./StreamGather"), exports);
 __exportStar(require("./Unmute"), exports);
 __exportStar(require("./validateRequest"), exports);
 __exportStar(require("./Verb"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/voice",
-  "version": "0.6.6",
+  "version": "0.7.2",
   "description": "Voice Server for Fonoster",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/fonoster#readme",
@@ -20,9 +20,8 @@
     "fonoster": "./dist/index.js"
   },
   "dependencies": {
-    "@fonoster/common": "^0.6.6",
-    "@fonoster/identity": "^0.6.6",
-    "@fonoster/logger": "^0.6.2",
+    "@fonoster/common": "^0.7.2",
+    "@fonoster/logger": "^0.7.2",
     "@grpc/grpc-js": "~1.10.6",
     "deepmerge": "^4.3.1",
     "grpc-health-check": "^2.0.2",
@@ -43,5 +42,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/fonoster/issues"
   },
-  "gitHead": "258137711c4897a4bda49de369db1722da17ec3f"
+  "gitHead": "6d858d9920132dfef0dba8965e5005f44de61563"
 }