@fonoster/apiserver 0.6.2 → 0.7.0

package/dist/voice/VoiceClientImpl.js

@@ -67,26 +67,27 @@ class VoiceClientImpl {
     constructor(params) {
         const { config, tts, stt, ari } = params;
         this.config = config;
-        this.stream = new stream_1.Stream();
+        this.verbsStream = new stream_1.Stream();
+        this.transcriptionsStream = new stream_1.Stream();
         this.tts = tts;
         this.stt = stt;
         this.ari = ari;
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.grpcClient = new VoiceServiceClientConst_1.VoiceServiceClient(this.config.appEndpoint, grpc.credentials.createInsecure());
+            this.grpcClient = new VoiceServiceClientConst_1.VoiceServiceClient(this.config.endpoint, grpc.credentials.createInsecure());
             const metadata = new grpc.Metadata();
             metadata.add("accessKeyId", this.config.accessKeyId);
             metadata.add("token", this.config.sessionToken);
             this.voice = this.grpcClient.createSession(metadata);
             this.voice.on(common_1.StreamEvent.DATA, (data) => {
-                this.stream.emit(data.content, data);
+                this.verbsStream.emit(data.content, data);
             });
             this.voice.write({ request: this.config });
             this.voice.on(common_1.StreamEvent.ERROR, (error) => {
                 if (error.code === grpc.status.UNAVAILABLE) {
                     // FIXME: This error should be sent back to the user
-                    logger.error(`voice server not available at "${this.config.appEndpoint}"`);
+                    logger.error(`voice server not available at "${this.config.endpoint}"`);
                     return;
                 }
                 logger.error(error.message);
@@ -98,7 +99,7 @@ class VoiceClientImpl {
     }
     setupAudioSocket(port) {
         this.audioSocket = new streams_1.AudioSocket();
-        this.audioSocket.onConnection((0, transcribeOnConnection_1.transcribeOnConnection)(this.stream));
+        this.audioSocket.onConnection((0, transcribeOnConnection_1.transcribeOnConnection)(this.transcriptionsStream));
         this.audioSocket.listen(port, () => {
             logger.verbose("starting audio socket for voice client", {
                 port,
@@ -118,10 +119,22 @@ class VoiceClientImpl {
                 });
                 yield channel.answer();
             }));
+            channel.once("ChannelLeftBridge", () => __awaiter(this, void 0, void 0, function* () {
+                // TODO: Evaluate a better way to handle this
+                // We should keep track of the channels and bridges and destroy them
+                // even if the apiserver crashes. Otherwise we risk having a lot of
+                // unused channels and bridges.
+                try {
+                    yield bridge.destroy();
+                }
+                catch (e) {
+                    // We can only try
+                }
+            }));
         });
     }
     on(type, callback) {
-        this.stream.on(type.toString(), (data) => {
+        this.verbsStream.on(type.toString(), (data) => {
             callback(data[type]);
         });
     }
@@ -136,7 +149,7 @@ class VoiceClientImpl {
     transcribe() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                return yield this.stt.transcribe(this.stream);
+                return yield this.stt.transcribe(this.transcriptionsStream);
             }
             catch (e) {
                 logger.warn("transcription error", e);
@@ -144,6 +157,32 @@ class VoiceClientImpl {
             }
         });
     }
+    startSpeechGather(callback) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const out = this.stt.streamTranscribe(this.transcriptionsStream);
+                out.on("data", callback);
+            }
+            catch (e) {
+                logger.error(e);
+            }
+        });
+    }
+    startDtmfGather(sessionRef, callback) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const channel = yield this.ari.channels.get({ channelId: sessionRef });
+            channel.on(types_1.AriEvent.CHANNEL_DTMF_RECEIVED, (event) => {
+                const { digit } = event;
+                callback({ digit });
+            });
+        });
+    }
+    // Stops both speech and dtmf gather
+    stopStreamGather() {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error("Method 'stopStreamGather' not implemented.");
+        });
+    }
     waitForDtmf(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const { onDigitReceived, sessionRef, finishOnKey, maxDigits, timeout } = params;
@@ -181,6 +220,7 @@ class VoiceClientImpl {
     }
     close() {
         try {
+            this.voice.end();
             this.grpcClient.close();
             this.audioSocket.close();
         }

package/dist/voice/VoiceDispatcher.d.ts

@@ -1,4 +1,5 @@
-import { Channel, Client, StasisStart } from "ari-client";
+import { Channel, Client, Dial, StasisStart } from "ari-client";
+import { NatsConnection } from "nats";
 import { VoiceClient } from "./types";
 type CreateVoiceClient = (params: {
     ari: Client;
@@ -8,10 +9,13 @@ type CreateVoiceClient = (params: {
 declare class VoiceDispatcher {
     voiceClients: Map<string, VoiceClient>;
     ari: Client;
+    nc: NatsConnection;
     createVoiceClient: CreateVoiceClient;
-    constructor(ari: Client, createVoiceClient: CreateVoiceClient);
+    constructor(ari: Client, nc: NatsConnection, createVoiceClient: CreateVoiceClient);
     start(): void;
     handleStasisStart(event: StasisStart, channel: Channel): Promise<void>;
     handleStasisEnd(_: undefined, channel: Channel): void;
+    handleDial(event: Dial, channel: Channel): Promise<void>;
+    isHandledElsewhere(channel: Channel): Promise<boolean>;
 }
 export { VoiceDispatcher };

package/dist/voice/VoiceDispatcher.js

@@ -30,58 +30,59 @@ exports.VoiceDispatcher = void 0;
  */
 const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
-const Answer_1 = require("./handlers/Answer");
-const Dial_1 = require("./handlers/dial/Dial");
-const Gather_1 = require("./handlers/gather/Gather");
-const Hangup_1 = require("./handlers/Hangup");
-const Mute_1 = require("./handlers/Mute");
-const Play_1 = require("./handlers/Play");
-const PlaybackControl_1 = require("./handlers/PlaybackControl");
-const PlayDtmf_1 = require("./handlers/PlayDtmf");
-const Say_1 = require("./handlers/Say");
-const Unmute_1 = require("./handlers/Unmute");
+const handlers_1 = require("./handlers");
+const makeGetChannelVar_1 = require("./makeGetChannelVar");
 const types_1 = require("./types");
+const utils_1 = require("../utils");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 class VoiceDispatcher {
-    constructor(ari, createVoiceClient) {
+    constructor(ari, nc, createVoiceClient) {
         this.ari = ari;
+        this.nc = nc;
         this.voiceClients = new Map();
         this.createVoiceClient = createVoiceClient;
     }
     start() {
         // Initialize the ARI client
-        this.ari.start(common_1.STASIS_APP_NAME);
-        this.ari.on(types_1.AriEvent.STASIS_START, this.handleStasisStart.bind(this));
-        this.ari.on(types_1.AriEvent.STASIS_END, this.handleStasisEnd.bind(this));
+        const { ari, handleStasisStart, handleStasisEnd, handleDial } = this;
+        ari.start(common_1.STASIS_APP_NAME);
+        ari.on(types_1.AriEvent.STASIS_START, handleStasisStart.bind(this));
+        ari.on(types_1.AriEvent.STASIS_END, handleStasisEnd.bind(this));
+        ari.on(types_1.AriEvent.DIAL, handleDial.bind(this));
     }
     handleStasisStart(event, channel) {
         return __awaiter(this, void 0, void 0, function* () {
-            // TODO: This is a temporary fix. We need to find a better way to handle external media channels
-            if (channel.id.length > 15) {
-                logger.verbose("skipping statis start for external media channel", {
-                    channel: channel.id
-                });
+            var _a;
+            const { ari, voiceClients, createVoiceClient, isHandledElsewhere } = this;
+            const getChannelVar = (0, makeGetChannelVar_1.makeGetChannelVarWithoutThrow)(channel);
+            const appRef = (_a = (yield getChannelVar(types_1.ChannelVar.APP_REF))) === null || _a === void 0 ? void 0 : _a.value;
+            // This check feels strange but is necessary as ARI calls this event twice
+            if (!appRef) {
+                logger.silly("no appRef found, ignoring handleStasisStart event");
+                return;
+            }
+            if (yield isHandledElsewhere(channel)) {
                 return;
             }
             try {
-                const vc = yield this.createVoiceClient({
-                    ari: this.ari,
-                    event,
-                    channel
-                });
+                const vc = yield createVoiceClient({ ari, event, channel });
                 // Connect to voice server
                 vc.connect();
-                this.voiceClients.set(channel.id, vc);
-                vc.on(common_1.StreamContent.ANSWER_REQUEST, (0, Answer_1.answerHandler)(this.ari, vc).bind(this));
-                vc.on(common_1.StreamContent.HANGUP_REQUEST, (0, Hangup_1.hangupHandler)(this.ari, vc).bind(this));
-                vc.on(common_1.StreamContent.MUTE_REQUEST, (0, Mute_1.muteHandler)(this.ari, vc).bind(this));
-                vc.on(common_1.StreamContent.UNMUTE_REQUEST, (0, Unmute_1.unmuteHandler)(this.ari, vc).bind(this));
-                vc.on(common_1.StreamContent.PLAY_REQUEST, (0, Play_1.playHandler)(this.ari, vc).bind(this));
-                vc.on(common_1.StreamContent.PLAY_DTMF_REQUEST, (0, PlayDtmf_1.playDtmfHandler)(this.ari, vc).bind(this));
-                vc.on(common_1.StreamContent.PLAYBACK_CONTROL_REQUEST, (0, PlaybackControl_1.playbackControlHandler)(this.ari, vc).bind(this));
-                vc.on(common_1.StreamContent.SAY_REQUEST, (0, Say_1.sayHandler)(this.ari, vc).bind(this));
-                vc.on(common_1.StreamContent.GATHER_REQUEST, (0, Gather_1.gatherHandler)(vc).bind(this));
-                vc.on(common_1.StreamContent.DIAL_REQUEST, (0, Dial_1.dialHandler)(this.ari, vc).bind(this));
+                voiceClients.set(channel.id, vc);
+                vc.on(common_1.StreamContent.ANSWER_REQUEST, (0, handlers_1.answerHandler)(ari, vc).bind(this));
+                vc.on(common_1.StreamContent.HANGUP_REQUEST, (0, handlers_1.hangupHandler)(ari, vc).bind(this));
+                vc.on(common_1.StreamContent.MUTE_REQUEST, (0, handlers_1.muteHandler)(ari, vc).bind(this));
+                vc.on(common_1.StreamContent.UNMUTE_REQUEST, (0, handlers_1.unmuteHandler)(ari, vc).bind(this));
+                vc.on(common_1.StreamContent.PLAY_REQUEST, (0, handlers_1.playHandler)(ari, vc).bind(this));
+                vc.on(common_1.StreamContent.PLAY_DTMF_REQUEST, (0, handlers_1.playDtmfHandler)(ari, vc).bind(this));
+                vc.on(common_1.StreamContent.SAY_REQUEST, (0, handlers_1.sayHandler)(ari, vc).bind(this));
+                vc.on(common_1.StreamContent.GATHER_REQUEST, (0, handlers_1.gatherHandler)(vc).bind(this));
+                vc.on(common_1.StreamContent.DIAL_REQUEST, (0, handlers_1.dialHandler)(ari, vc).bind(this));
+                vc.on(common_1.StreamContent.PLAYBACK_CONTROL_REQUEST, (0, handlers_1.playbackControlHandler)(ari, vc).bind(this));
+                vc.on(common_1.StreamContent.START_STREAM_GATHER_REQUEST, (0, handlers_1.streamGatherHandler)(vc).bind(this));
+                vc.on(common_1.StreamContent.STOP_STREAM_GATHER_REQUEST, () => {
+                    vc.stopStreamGather();
+                });
             }
             catch (err) {
                 logger.error("error handling stasis start", { error: err.message });
@@ -89,11 +90,23 @@ class VoiceDispatcher {
         });
     }
     handleStasisEnd(_, channel) {
-        const voiceClient = this.voiceClients.get(channel.id);
+        const { voiceClients } = this;
+        const voiceClient = voiceClients.get(channel.id);
         if (voiceClient) {
             voiceClient.close();
-            this.voiceClients.delete(channel.id);
+            voiceClients.delete(channel.id);
         }
     }
+    handleDial(event, channel) {
+        return __awaiter(this, void 0, void 0, function* () {
+            (0, utils_1.makeHandleDialEventsWithNats)(this.nc)(channel.id, event);
+        });
+    }
+    isHandledElsewhere(channel) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            return (((_a = (yield (0, makeGetChannelVar_1.makeGetChannelVarWithoutThrow)(channel)(types_1.ChannelVar.FROM_EXTERNAL_MEDIA))) === null || _a === void 0 ? void 0 : _a.value) === "true");
+        });
+    }
 }
 exports.VoiceDispatcher = VoiceDispatcher;

package/dist/voice/connectToAri.js

@@ -33,6 +33,7 @@ exports.connectToAri = connectToAri;
  */
 const logger_1 = require("@fonoster/logger");
 const ari_client_1 = __importDefault(require("ari-client"));
+const nats_1 = require("nats");
 const wait_port_1 = __importDefault(require("wait-port"));
 const integrations_1 = require("./integrations");
 const makeCreateVoiceClient_1 = require("./makeCreateVoiceClient");
@@ -62,7 +63,8 @@ function connectToAri() {
             });
             logger.info("asterisk is ready");
             const createContainer = (0, integrations_1.makeCreateContainer)(db_1.prisma, envs_1.INTEGRATIONS_FILE);
-            const dispatcher = new VoiceDispatcher_1.VoiceDispatcher(ari, (0, makeCreateVoiceClient_1.makeCreateVoiceClient)(createContainer));
+            const nats = yield (0, nats_1.connect)({ servers: envs_1.NATS_URL });
+            const dispatcher = new VoiceDispatcher_1.VoiceDispatcher(ari, nats, (0, makeCreateVoiceClient_1.makeCreateVoiceClient)(createContainer));
             dispatcher.start();
         }
         else {

package/dist/voice/createExternalMediaConfig.d.ts

@@ -5,5 +5,8 @@ declare function createExternalMediaConfig(port: number): {
     transport: string;
     data: string;
     encapsulation: string;
+    variables: {
+        FROM_EXTERNAL_MEDIA: string;
+    };
 };
 export { createExternalMediaConfig };

package/dist/voice/createExternalMediaConfig.js

@@ -29,6 +29,9 @@ function createExternalMediaConfig(port) {
         format: "slin16",
         transport: "tcp",
         data: (0, uuid_1.v4)(),
-        encapsulation: "audiosocket"
+        encapsulation: "audiosocket",
+        variables: {
+            FROM_EXTERNAL_MEDIA: "true"
+        }
     };
 }

package/dist/voice/handlers/Answer.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.answerHandler = answerHandler;
-const withErrorHandling_1 = require("./withErrorHandling");
+const withErrorHandling_1 = require("./utils/withErrorHandling");
 function answerHandler(ari, voiceClient) {
     return (0, withErrorHandling_1.withErrorHandling)((request) => __awaiter(this, void 0, void 0, function* () {
         const { sessionRef } = request;

package/dist/voice/handlers/Hangup.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hangupHandler = hangupHandler;
-const withErrorHandling_1 = require("./withErrorHandling");
+const withErrorHandling_1 = require("./utils/withErrorHandling");
 function hangupHandler(ari, voiceClient) {
     return (0, withErrorHandling_1.withErrorHandling)((request) => __awaiter(this, void 0, void 0, function* () {
         const { sessionRef } = request;

package/dist/voice/handlers/Mute.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.muteHandler = muteHandler;
-const withErrorHandling_1 = require("./withErrorHandling");
+const withErrorHandling_1 = require("./utils/withErrorHandling");
 function muteHandler(ari, voiceClient) {
     return (0, withErrorHandling_1.withErrorHandling)((request) => __awaiter(this, void 0, void 0, function* () {
         const { sessionRef, direction } = request;

package/dist/voice/handlers/Play.js

@@ -11,8 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.playHandler = playHandler;
 const nanoid_1 = require("nanoid");
-const awaitForPlaybackFinished_1 = require("./awaitForPlaybackFinished");
-const withErrorHandling_1 = require("./withErrorHandling");
+const awaitForPlaybackFinished_1 = require("./utils/awaitForPlaybackFinished");
+const withErrorHandling_1 = require("./utils/withErrorHandling");
 function playHandler(ari, voiceClient) {
     return (0, withErrorHandling_1.withErrorHandling)((request) => __awaiter(this, void 0, void 0, function* () {
         const { sessionRef } = request;

package/dist/voice/handlers/PlayDtmf.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.playDtmfHandler = playDtmfHandler;
-const withErrorHandling_1 = require("./withErrorHandling");
+const withErrorHandling_1 = require("./utils/withErrorHandling");
 function playDtmfHandler(ari, voiceClient) {
     return (0, withErrorHandling_1.withErrorHandling)((request) => __awaiter(this, void 0, void 0, function* () {
         const { sessionRef, digits } = request;

package/dist/voice/handlers/PlaybackControl.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.playbackControlHandler = playbackControlHandler;
-const withErrorHandling_1 = require("./withErrorHandling");
+const withErrorHandling_1 = require("./utils/withErrorHandling");
 function playbackControlHandler(ari, voiceClient) {
     return (0, withErrorHandling_1.withErrorHandling)((playbackControlReq) => __awaiter(this, void 0, void 0, function* () {
         const { sessionRef, playbackRef, action } = playbackControlReq;

package/dist/voice/handlers/Record.js

@@ -30,8 +30,8 @@ exports.recordHandler = recordHandler;
  */
 const common_1 = require("@fonoster/common");
 const nanoid_1 = require("nanoid");
-const awaitForRecordingFinished_1 = require("./awaitForRecordingFinished");
-const withErrorHandling_1 = require("./withErrorHandling");
+const awaitForRecordingFinished_1 = require("./utils/awaitForRecordingFinished");
+const withErrorHandling_1 = require("./utils/withErrorHandling");
 function recordHandler(ari, voiceClient) {
     return (0, withErrorHandling_1.withErrorHandling)((request) => __awaiter(this, void 0, void 0, function* () {
         const { sessionRef, maxDuration, maxSilence, beep, finishOnKey } = request;

package/dist/voice/handlers/Say.js

@@ -13,8 +13,8 @@ exports.sayHandler = sayHandler;
 const nanoid_1 = require("nanoid");
 const pb_util_1 = require("pb-util");
 const zod_1 = require("zod");
-const awaitForPlaybackFinished_1 = require("./awaitForPlaybackFinished");
-const withErrorHandling_1 = require("./withErrorHandling");
+const awaitForPlaybackFinished_1 = require("./utils/awaitForPlaybackFinished");
+const withErrorHandling_1 = require("./utils/withErrorHandling");
 const envs_1 = require("../../envs");
 const sayRequestSchema = zod_1.z.object({
     text: zod_1.z.string(),

package/dist/voice/handlers/StreamGather.d.ts

@@ -0,0 +1,3 @@
+import { VoiceClient } from "../types";
+declare function streamGatherHandler(voiceClient: VoiceClient): (request: import("@fonoster/common").VerbRequest) => Promise<void>;
+export { streamGatherHandler };

package/dist/voice/handlers/StreamGather.js

@@ -0,0 +1,66 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.streamGatherHandler = streamGatherHandler;
+/*
+ * 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");
+const zod_1 = require("zod");
+const withErrorHandling_1 = require("./utils/withErrorHandling");
+const gatherRequestSchema = zod_1.z.object({
+    source: zod_1.z.optional(zod_1.z.nativeEnum(common_1.StreamGatherSource))
+});
+function streamGatherHandler(voiceClient) {
+    return (0, withErrorHandling_1.withErrorHandling)((request) => __awaiter(this, void 0, void 0, function* () {
+        const { sessionRef, source } = request;
+        // Error handled by withErrorHandling
+        gatherRequestSchema.parse(request);
+        const effectiveSource = source || common_1.StreamGatherSource.SPEECH_AND_DTMF;
+        if (effectiveSource.includes(common_1.StreamGatherSource.DTMF)) {
+            voiceClient.startDtmfGather(sessionRef, (event) => {
+                const { digit } = event;
+                voiceClient.sendResponse({
+                    streamGatherPayload: {
+                        sessionRef,
+                        digit
+                    }
+                });
+            });
+        }
+        if (effectiveSource.includes(common_1.StreamGatherSource.SPEECH)) {
+            voiceClient.startSpeechGather((event) => {
+                const { speech } = event;
+                voiceClient.sendResponse({
+                    streamGatherPayload: {
+                        sessionRef,
+                        speech
+                    }
+                });
+            });
+        }
+    }));
+}

package/dist/voice/handlers/Unmute.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unmuteHandler = unmuteHandler;
-const withErrorHandling_1 = require("./withErrorHandling");
+const withErrorHandling_1 = require("./utils/withErrorHandling");
 function unmuteHandler(ari, voiceClient) {
     return (0, withErrorHandling_1.withErrorHandling)((request) => __awaiter(this, void 0, void 0, function* () {
         const { sessionRef, direction } = request;

package/dist/voice/handlers/dial/Dial.js

@@ -29,11 +29,12 @@ exports.dialHandler = dialHandler;
  * limitations under the License.
  */
 const common_1 = require("@fonoster/common");
+const uuid_1 = require("uuid");
 const handleChannelLeftBridge_1 = require("./handleChannelLeftBridge");
-const handleDialEvents_1 = require("./handleDialEvents");
 const handleStasisEnd_1 = require("./handleStasisEnd");
 const handleStasisStart_1 = require("./handleStasisStart");
 const envs_1 = require("../../../envs");
+const utils_1 = require("../../../utils");
 const makeGetChannelVar_1 = require("../../makeGetChannelVar");
 const types_1 = require("../../types");
 // TODO: Needs request validation
@@ -50,18 +51,21 @@ function dialHandler(ari, voiceClient) {
         const getChannelVar = (0, makeGetChannelVar_1.makeGetChannelVar)(callerChannel);
         const ingressNumber = (yield getChannelVar(types_1.ChannelVar.INGRESS_NUMBER))
             .value;
+        const ref = (0, uuid_1.v4)();
         yield dialed.originate({
             app: common_1.STASIS_APP_NAME,
             endpoint: `PJSIP/${envs_1.ASTERISK_TRUNK}/sip:${destination}@${envs_1.ASTERISK_SYSTEM_DOMAIN}`,
             timeout,
             variables: {
-                "PJSIP_HEADER(add,X-DOD-Number)": ingressNumber
+                "PJSIP_HEADER(add,X-Call-Ref)": ref,
+                "PJSIP_HEADER(add,X-Dod-Number)": ingressNumber,
+                "PJSIP_HEADER(add,X-Is-Api-Originated-Type)": "true"
             }
         });
-        dialed.on(types_1.AriEvent.STASIS_START, (0, handleStasisStart_1.handleStasisStart)({ ari, request, bridge, dialed }));
-        dialed.on(types_1.AriEvent.CHANNEL_LEFT_BRIDGE, (0, handleChannelLeftBridge_1.handleChannelLeftBridge)({ bridge, dialed }));
-        dialed.on(types_1.AriEvent.STASIS_END, (0, handleStasisEnd_1.handleStasisEnd)(request));
-        dialed.on(types_1.AriEvent.DIAL, (0, handleDialEvents_1.handleDialEvents)(voiceClient));
+        dialed.once(types_1.AriEvent.STASIS_START, (0, handleStasisStart_1.handleStasisStart)({ ari, request, bridge, dialed }));
+        dialed.once(types_1.AriEvent.CHANNEL_LEFT_BRIDGE, (0, handleChannelLeftBridge_1.handleChannelLeftBridge)({ bridge, dialed }));
+        dialed.once(types_1.AriEvent.STASIS_END, (0, handleStasisEnd_1.handleStasisEnd)(request));
+        dialed.on(types_1.AriEvent.DIAL, (0, utils_1.makeHandleDialEventsWithVoiceClient)(voiceClient));
         voiceClient.sendResponse({
             dialResponse: {
                 status: common_1.DialStatus.TRYING

package/dist/voice/handlers/gather/Gather.js

@@ -31,9 +31,10 @@ exports.gatherHandler = gatherHandler;
 const common_1 = require("@fonoster/common");
 const zod_1 = require("zod");
 const getTimeoutPromise_1 = require("./getTimeoutPromise");
-const withErrorHandling_1 = require("../withErrorHandling");
-const isDtmf = (digit) => /^[0-9*#]+$/.test(digit);
+const utils_1 = require("../utils");
+const withErrorHandling_1 = require("../utils/withErrorHandling");
 const gatherRequestSchema = zod_1.z.object({
+    source: zod_1.z.optional(zod_1.z.nativeEnum(common_1.GatherSource)),
     maxDigits: zod_1.z.number().optional().nullable(),
     // TODO: Ensure it is a dtmf character
     finishOnKey: zod_1.z.string().max(1).optional().nullable()
@@ -64,8 +65,8 @@ function gatherHandler(voiceClient) {
         voiceClient.sendResponse({
             gatherResponse: {
                 sessionRef,
-                speech: isDtmf(result) ? null : result,
-                digits: isDtmf(result) ? result : null
+                speech: (0, utils_1.isDtmf)(result) ? null : result,
+                digits: (0, utils_1.isDtmf)(result) ? result : null
             }
         });
     }));

package/dist/voice/handlers/index.d.ts

@@ -0,0 +1,12 @@
+export * from "./Answer";
+export * from "./Hangup";
+export * from "./Mute";
+export * from "./Unmute";
+export * from "./dial/Dial";
+export * from "./gather/Gather";
+export * from "./StreamGather";
+export * from "./Play";
+export * from "./PlaybackControl";
+export * from "./PlayDtmf";
+export * from "./Record";
+export * from "./Say";

package/dist/voice/handlers/index.js

@@ -0,0 +1,46 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/*
+ * 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.
+ */
+__exportStar(require("./Answer"), exports);
+__exportStar(require("./Hangup"), exports);
+__exportStar(require("./Mute"), exports);
+__exportStar(require("./Unmute"), exports);
+__exportStar(require("./dial/Dial"), exports);
+__exportStar(require("./gather/Gather"), exports);
+__exportStar(require("./StreamGather"), exports);
+__exportStar(require("./Play"), exports);
+__exportStar(require("./PlaybackControl"), exports);
+__exportStar(require("./PlayDtmf"), exports);
+__exportStar(require("./Record"), exports);
+__exportStar(require("./Say"), exports);

package/dist/voice/handlers/{awaitForPlaybackFinished.js → utils/awaitForPlaybackFinished.js}

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.awaitForPlaybackFinished = void 0;
-const types_1 = require("../types");
+const types_1 = require("../../types");
 const awaitForPlaybackFinished = (ari, playbackRef) => __awaiter(void 0, void 0, void 0, function* () {
     return new Promise((resolve) => {
         const listener = (_, playback) => {

package/dist/voice/handlers/{awaitForRecordingFinished.js → utils/awaitForRecordingFinished.js}

@@ -30,7 +30,7 @@ exports.awaitForRecordingFinished = awaitForRecordingFinished;
  */
 const common_1 = require("@fonoster/common");
 const grpc_js_1 = require("@grpc/grpc-js");
-const types_1 = require("../types");
+const types_1 = require("../../types");
 function awaitForRecordingFinished(ari, name) {
     return __awaiter(this, void 0, void 0, function* () {
         return new Promise((resolve, reject) => {

package/dist/voice/handlers/utils/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./awaitForPlaybackFinished";
+export * from "./awaitForRecordingFinished";
+export * from "./isDtmf";