@fonoster/apiserver 0.8.24 → 0.8.26

package/dist/applications/createApplication.js

@@ -29,7 +29,6 @@ exports.createApplication = createApplication;
  * limitations under the License.
  */
 const common_1 = require("@fonoster/common");
-const identity_1 = require("@fonoster/identity");
 const logger_1 = require("@fonoster/logger");
 const convertToApplicationData_1 = require("./utils/convertToApplicationData");
 const validOrThrow_1 = require("./utils/validOrThrow");
@@ -38,7 +37,7 @@ function createApplication(prisma) {
     const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
         const { request } = call;
         const { type } = request;
-        const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
+        const accessKeyId = (0, common_1.getAccessKeyIdFromCall)(call);
         logger.verbose("call to createApplication", {
             accessKeyId,
             type

package/dist/applications/listApplications.js

@@ -29,7 +29,6 @@ exports.listApplications = listApplications;
  * limitations under the License.
  */
 const common_1 = require("@fonoster/common");
-const identity_1 = require("@fonoster/identity");
 const logger_1 = require("@fonoster/logger");
 const applicationWithEncodedStruct_1 = require("./utils/applicationWithEncodedStruct");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
@@ -37,7 +36,7 @@ function listApplications(prisma) {
     const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const { pageSize, pageToken } = call.request;
-        const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
+        const accessKeyId = (0, common_1.getAccessKeyIdFromCall)(call);
         logger.verbose("call to getApplication", {
             accessKeyId,
             pageSize,

package/dist/applications/updateApplication.js

@@ -29,18 +29,18 @@ exports.updateApplication = updateApplication;
  * limitations under the License.
  */
 const common_1 = require("@fonoster/common");
-const identity_1 = require("@fonoster/identity");
 const logger_1 = require("@fonoster/logger");
 const createGetFnUtil_1 = require("./createGetFnUtil");
 const convertToApplicationData_1 = require("./utils/convertToApplicationData");
 const validOrThrow_1 = require("./utils/validOrThrow");
+const identity_1 = require("@fonoster/identity");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 function updateApplication(prisma) {
     const getFn = (0, createGetFnUtil_1.createGetFnUtil)(prisma);
     const fn = (call) => __awaiter(this, void 0, void 0, function* () {
         const { request } = call;
         const { type, ref: applicationRef } = request;
-        const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
+        const accessKeyId = (0, common_1.getAccessKeyIdFromCall)(call);
         (0, validOrThrow_1.validOrThrow)(request);
         logger.verbose("call to updateApplication", {
             accessKeyId,

package/dist/calls/buildService.js

@@ -33,7 +33,7 @@ const createCall_1 = require("./createCall");
 const createCallPublisher_1 = require("./createCallPublisher");
 const getCall_1 = require("./getCall");
 const listCalls_1 = require("./listCalls");
-const makeTrackCall_1 = require("./makeTrackCall");
+const createTrackCall_1 = require("./createTrackCall");
 const db_1 = require("../core/db");
 const envs_1 = require("../envs");
 function buildService(influxdb) {
@@ -51,7 +51,7 @@ function buildService(influxdb) {
                 createCall: (0, createCall_1.createCall)(db_1.prisma, callPublisher),
                 listCalls: (0, listCalls_1.listCalls)(influxdb),
                 getCall: (0, getCall_1.getCall)(influxdb),
-                trackCall: (0, makeTrackCall_1.makeTrackCall)(nc)
+                trackCall: (0, createTrackCall_1.createTrackCall)(nc)
             }
         };
     });

package/dist/calls/createCall.js

@@ -29,7 +29,6 @@ exports.createCall = createCall;
  * limitations under the License.
  */
 const common_1 = require("@fonoster/common");
-const identity_1 = require("@fonoster/identity");
 const logger_1 = require("@fonoster/logger");
 const uuid_1 = require("uuid");
 const notFoundError_1 = require("../core/notFoundError");
@@ -40,7 +39,7 @@ function createCall(prisma, publisher) {
         const { from, to, appRef, timeout } = request;
         const ref = (0, uuid_1.v4)();
         logger.verbose("call to createCall", Object.assign(Object.assign({}, request), { ref }));
-        const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
+        const accessKeyId = (0, common_1.getAccessKeyIdFromCall)(call);
         const app = yield prisma.application.findUnique({
             where: { ref: appRef, accessKeyId }
         });

package/dist/calls/{makeTrackCall.d.ts → createTrackCall.d.ts}

@@ -1,5 +1,5 @@
 import { NatsConnection } from "nats";
-declare function makeTrackCall(nc: NatsConnection): (call: {
+declare function createTrackCall(nc: NatsConnection): (call: {
     request: unknown;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
-export { makeTrackCall };
+export { createTrackCall };

package/dist/calls/{makeTrackCall.js → createTrackCall.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeTrackCall = makeTrackCall;
+exports.createTrackCall = createTrackCall;
 /*
  * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/fonoster
@@ -28,7 +28,7 @@ const FINAL_STATUSES = [
     common_1.DialStatus.NOANSWER
 ];
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
-function makeTrackCall(nc) {
+function createTrackCall(nc) {
     const trackingCallsMap = new Map();
     const subscription = nc.subscribe(envs_1.CALLS_TRACK_CALL_SUBJECT);
     subscription.callback = (err, msg) => {
@@ -53,11 +53,11 @@ function makeTrackCall(nc) {
             stream.write({ ref, status });
         }
     };
-    const fn = (call) => {
+    const trackCall = (call) => {
         const stream = call;
         const { ref } = call.request;
         logger.verbose("call to trackCall", { ref });
         trackingCallsMap.set(ref, stream);
     };
-    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.baseApiObjectSchema);
+    return (0, common_1.withErrorHandlingAndValidation)(trackCall, common_1.Validators.baseApiObjectSchema);
 }

package/dist/calls/getCall.js

@@ -29,7 +29,6 @@ exports.getCall = getCall;
  * limitations under the License.
  */
 const common_1 = require("@fonoster/common");
-const identity_1 = require("@fonoster/identity");
 const logger_1 = require("@fonoster/logger");
 const createFetchSingleCall_1 = require("./createFetchSingleCall");
 const notFoundError_1 = require("../core/notFoundError");
@@ -38,7 +37,7 @@ function getCall(influx) {
     const fetchSingleCall = (0, createFetchSingleCall_1.createFetchSingleCall)(influx);
     const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
         const { ref } = call.request;
-        const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
+        const accessKeyId = (0, common_1.getAccessKeyIdFromCall)(call);
         logger.verbose("call to getCall", { accessKeyId, ref });
         const response = yield fetchSingleCall(accessKeyId, ref);
         if (!response) {

package/dist/calls/listCalls.js

@@ -29,7 +29,6 @@ exports.listCalls = listCalls;
  * limitations under the License.
  */
 const common_1 = require("@fonoster/common");
-const identity_1 = require("@fonoster/identity");
 const logger_1 = require("@fonoster/logger");
 const createFetchCalls_1 = require("./createFetchCalls");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
@@ -37,7 +36,7 @@ function listCalls(influx) {
     const fetchCalls = (0, createFetchCalls_1.createFetchCalls)(influx);
     const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
         const { request } = call;
-        const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
+        const accessKeyId = (0, common_1.getAccessKeyIdFromCall)(call);
         logger.verbose("call to listCalls", { request, accessKeyId });
         const result = yield fetchCalls(accessKeyId, request);
         callback(null, result);

package/dist/core/httpBridge.js

@@ -46,7 +46,7 @@ function httpBridge(params) {
     });
     app.get("/api/identity/accept-invite", (req, res) => __awaiter(this, void 0, void 0, function* () {
         try {
-            yield (0, identity_1.updateMembershipStatus)(identityConfig_1.identityConfig)(req.query.token);
+            yield (0, identity_1.createUpdateMembershipStatus)(identityConfig_1.identityConfig)(req.query.token);
             res.redirect(envs_1.APP_URL);
         }
         catch (error) {

package/dist/core/runServices.js

@@ -64,7 +64,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 grpc_health_check_1 = require("grpc-health-check");
@@ -77,8 +76,8 @@ const envs_1 = require("../envs");
 const connectToAri_1 = require("../voice/connectToAri");
 const authz_1 = require("@fonoster/authz");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
-const authorization = (0, identity_1.createAuthInterceptor)(envs_1.IDENTITY_PUBLIC_KEY, allowList_1.allowList);
-const checkMethodAuthorized = (0, authz_1.makeCheckMethodAuthorized)(`${envs_1.AUTHZ_SERVICE_HOST}:${envs_1.AUTHZ_SERVICE_PORT}`, envs_1.AUTHZ_SERVICE_METHODS);
+const authorization = (0, common_1.createAuthInterceptor)(envs_1.IDENTITY_PUBLIC_KEY, allowList_1.allowList);
+const checkMethodAuthorized = (0, authz_1.createCheckMethodAuthorized)(`${envs_1.AUTHZ_SERVICE_HOST}:${envs_1.AUTHZ_SERVICE_PORT}`, envs_1.AUTHZ_SERVICE_METHODS);
 function runServices() {
     return __awaiter(this, void 0, void 0, function* () {
         const healthImpl = new grpc_health_check_1.HealthImplementation(common_1.statusMap);

package/dist/core/services.js

@@ -36,7 +36,7 @@ const agentsService = (0, sipnet_1.buildAgentsService)(routrConfig_1.routrConfig
 const domainsService = (0, sipnet_1.buildDomainsService)(routrConfig_1.routrConfig);
 const credentialsService = (0, sipnet_1.buildCredentialsService)(routrConfig_1.routrConfig);
 const trunksService = (0, sipnet_1.buildTrunksService)(routrConfig_1.routrConfig);
-const numbersService = (0, sipnet_1.buildNumbersService)(routrConfig_1.routrConfig, (0, utils_1.makeCheckNumberPreconditions)(db_1.prisma));
+const numbersService = (0, sipnet_1.buildNumbersService)(routrConfig_1.routrConfig, (0, utils_1.createCheckNumberPreconditions)(db_1.prisma));
 const aclsService = (0, sipnet_1.buildAclsService)(routrConfig_1.routrConfig);
 const services = Promise.all([
     applicationsService,

package/dist/secrets/createGetFnUtil.js

@@ -31,15 +31,17 @@ exports.createGetFnUtil = createGetFnUtil;
 const common_1 = require("@fonoster/common");
 const notFoundError_1 = require("../core/notFoundError");
 function createGetFnUtil(prisma) {
-    return (ref) => __awaiter(this, void 0, void 0, function* () {
-        const response = yield prisma.secret.findUnique({
-            where: { ref }
+    return function getFnUtil(ref) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield prisma.secret.findUnique({
+                where: { ref }
+            });
+            if (!response) {
+                throw (0, notFoundError_1.notFoundError)(`Resource not found: ${ref}`);
+            }
+            return (0, common_1.datesMapper)(Object.assign(Object.assign({}, response), { extended: {
+                    accessKeyId: response.accessKeyId
+                } }));
         });
-        if (!response) {
-            throw (0, notFoundError_1.notFoundError)(`Resource not found: ${ref}`);
-        }
-        return (0, common_1.datesMapper)(Object.assign(Object.assign({}, response), { extended: {
-                accessKeyId: response.accessKeyId
-            } }));
-    });
+    };
 }

package/dist/secrets/createSecret.js

@@ -29,13 +29,12 @@ exports.createSecret = createSecret;
  * limitations under the License.
  */
 const common_1 = require("@fonoster/common");
-const identity_1 = require("@fonoster/identity");
 const logger_1 = require("@fonoster/logger");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 function createSecret(prisma) {
     const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
         const { name, secret } = call.request;
-        const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
+        const accessKeyId = (0, common_1.getAccessKeyIdFromCall)(call);
         logger.verbose("call to createSecret", {
             accessKeyId
         });

package/dist/secrets/listSecrets.js

@@ -29,14 +29,13 @@ exports.listSecrets = listSecrets;
  * limitations under the License.
  */
 const common_1 = require("@fonoster/common");
-const identity_1 = require("@fonoster/identity");
 const logger_1 = require("@fonoster/logger");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 function listSecrets(prisma) {
     const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const { pageSize, pageToken } = call.request;
-        const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
+        const accessKeyId = (0, common_1.getAccessKeyIdFromCall)(call);
         logger.verbose("call to getSecret", {
             accessKeyId,
             pageSize,

package/dist/secrets/updateSecret.js

@@ -29,7 +29,6 @@ exports.updateSecret = updateSecret;
  * limitations under the License.
  */
 const common_1 = require("@fonoster/common");
-const identity_1 = require("@fonoster/identity");
 const logger_1 = require("@fonoster/logger");
 const createGetFnUtil_1 = require("./createGetFnUtil");
 const withErrorHandlingAndValidationAndAccess_1 = require("../utils/withErrorHandlingAndValidationAndAccess");
@@ -38,7 +37,7 @@ function updateSecret(prisma) {
     const getFn = (0, createGetFnUtil_1.createGetFnUtil)(prisma);
     const fn = (call) => __awaiter(this, void 0, void 0, function* () {
         const { name, secret } = call.request;
-        const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
+        const accessKeyId = (0, common_1.getAccessKeyIdFromCall)(call);
         logger.verbose("call to updateSecret", {
             accessKeyId
         });

package/dist/utils/createCheckNumberPreconditions.d.ts

@@ -0,0 +1,6 @@
+import { Prisma } from "../core/db";
+declare function createCheckNumberPreconditions(prisma: Prisma): ({ appRef, accessKeyId }: {
+    appRef: any;
+    accessKeyId: any;
+}) => Promise<void>;
+export { createCheckNumberPreconditions };

package/dist/utils/{makeCheckNumberPreconditions.js → createCheckNumberPreconditions.js}

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeCheckNumberPreconditions = makeCheckNumberPreconditions;
+exports.createCheckNumberPreconditions = createCheckNumberPreconditions;
 /*
  * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/fonoster
@@ -30,7 +30,7 @@ exports.makeCheckNumberPreconditions = makeCheckNumberPreconditions;
  */
 const common_1 = require("@fonoster/common");
 const grpc_js_1 = require("@grpc/grpc-js");
-function makeCheckNumberPreconditions(prisma) {
+function createCheckNumberPreconditions(prisma) {
     return function checkNumberPreconditions(_a) {
         return __awaiter(this, arguments, void 0, function* ({ appRef, accessKeyId }) {
             if (!appRef) {

package/dist/utils/createHandleDialEventsWithNats.d.ts

@@ -0,0 +1,5 @@
+import { NatsConnection } from "nats";
+declare function createHandleDialEventsWithNats(nc: NatsConnection): (callRef: string, event: {
+    dialstatus: string;
+}) => Promise<void>;
+export { createHandleDialEventsWithNats };

package/dist/utils/{makeHandleDialEventsWithNats.js → createHandleDialEventsWithNats.js}

@@ -9,14 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeHandleDialEventsWithNats = makeHandleDialEventsWithNats;
+exports.createHandleDialEventsWithNats = createHandleDialEventsWithNats;
 const mapDialStatus_1 = require("./mapDialStatus");
 const envs_1 = require("../envs");
-function makeHandleDialEventsWithNats(nc) {
-    return (callRef, event) => __awaiter(this, void 0, void 0, function* () {
-        const mappedStatus = (0, mapDialStatus_1.mapDialStatus)(event.dialstatus);
-        if (!mappedStatus)
-            return; // Ignore the event if status is not mapped
-        nc.publish(envs_1.CALLS_TRACK_CALL_SUBJECT, JSON.stringify({ ref: callRef, status: mappedStatus }));
-    });
+function createHandleDialEventsWithNats(nc) {
+    return function handleDialEventsWithNats(callRef, event) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const mappedStatus = (0, mapDialStatus_1.mapDialStatus)(event.dialstatus);
+            if (!mappedStatus)
+                return; // Ignore the event if status is not mapped
+            nc.publish(envs_1.CALLS_TRACK_CALL_SUBJECT, JSON.stringify({ ref: callRef, status: mappedStatus }));
+        });
+    };
 }

package/dist/utils/createHandleDialEventsWithVoiceClient.d.ts

@@ -0,0 +1,5 @@
+import { VoiceClient } from "../voice/types";
+declare function createHandleDialEventsWithVoiceClient(voiceClient: VoiceClient): (event: {
+    dialstatus: string;
+}) => Promise<void>;
+export { createHandleDialEventsWithVoiceClient };

package/dist/utils/{makeHandleDialEventsWithVoiceClient.js → createHandleDialEventsWithVoiceClient.js}

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeHandleDialEventsWithVoiceClient = makeHandleDialEventsWithVoiceClient;
+exports.createHandleDialEventsWithVoiceClient = createHandleDialEventsWithVoiceClient;
 /*
  * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/fonoster
@@ -29,15 +29,17 @@ exports.makeHandleDialEventsWithVoiceClient = makeHandleDialEventsWithVoiceClien
  * limitations under the License.
  */
 const mapDialStatus_1 = require("./mapDialStatus");
-function makeHandleDialEventsWithVoiceClient(voiceClient) {
-    return (event) => __awaiter(this, void 0, void 0, function* () {
-        const mappedStatus = (0, mapDialStatus_1.mapDialStatus)(event.dialstatus);
-        if (!mappedStatus)
-            return; // Ignore the event if status is not mapped
-        voiceClient.sendResponse({
-            dialResponse: {
-                status: mappedStatus
-            }
+function createHandleDialEventsWithVoiceClient(voiceClient) {
+    return function handleDialEventsWithVoiceClient(event) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const mappedStatus = (0, mapDialStatus_1.mapDialStatus)(event.dialstatus);
+            if (!mappedStatus)
+                return; // Ignore the event if status is not mapped
+            voiceClient.sendResponse({
+                dialResponse: {
+                    status: mappedStatus
+                }
+            });
         });
-    });
+    };
 }

package/dist/utils/index.d.ts

@@ -1,3 +1,3 @@
-export * from "./makeCheckNumberPreconditions";
-export * from "./makeHandleDialEventsWithNats";
-export * from "./makeHandleDialEventsWithVoiceClient";
+export * from "./createCheckNumberPreconditions";
+export * from "./createHandleDialEventsWithNats";
+export * from "./createHandleDialEventsWithVoiceClient";

package/dist/utils/index.js

@@ -32,6 +32,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-__exportStar(require("./makeCheckNumberPreconditions"), exports);
-__exportStar(require("./makeHandleDialEventsWithNats"), exports);
-__exportStar(require("./makeHandleDialEventsWithVoiceClient"), exports);
+__exportStar(require("./createCheckNumberPreconditions"), exports);
+__exportStar(require("./createHandleDialEventsWithNats"), exports);
+__exportStar(require("./createHandleDialEventsWithVoiceClient"), exports);

package/dist/voice/VoiceDispatcher.js

@@ -31,10 +31,9 @@ exports.VoiceDispatcher = void 0;
 const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
 const handlers_1 = require("./handlers");
-const Stream_1 = require("./handlers/Stream");
 const types_1 = require("./types");
 const utils_1 = require("../utils");
-const makeGetChannelVarWithoutThrow_1 = require("./utils/makeGetChannelVarWithoutThrow");
+const utils_2 = require("./utils");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 class VoiceDispatcher {
     constructor(ari, nc, createVoiceClient) {
@@ -55,7 +54,7 @@ class VoiceDispatcher {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             const { ari, voiceClients, createVoiceClient, isHandledElsewhere } = this;
-            const getChannelVar = (0, makeGetChannelVarWithoutThrow_1.makeGetChannelVarWithoutThrow)(channel);
+            const getChannelVar = (0, utils_2.createGetChannelVarWithoutThrow)(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) {
@@ -70,21 +69,21 @@ class VoiceDispatcher {
                 // Connect to voice server
                 vc.connect();
                 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.ANSWER_REQUEST, (0, handlers_1.createAnswerHandler)(ari, vc).bind(this));
+                vc.on(common_1.StreamContent.HANGUP_REQUEST, (0, handlers_1.createHangupHandler)(ari, vc).bind(this));
+                vc.on(common_1.StreamContent.MUTE_REQUEST, (0, handlers_1.createMuteHandler)(ari, vc).bind(this));
+                vc.on(common_1.StreamContent.UNMUTE_REQUEST, (0, handlers_1.createUnmuteHandler)(ari, vc).bind(this));
+                vc.on(common_1.StreamContent.PLAY_REQUEST, (0, handlers_1.createPlayHandler)(ari, vc).bind(this));
+                vc.on(common_1.StreamContent.PLAY_DTMF_REQUEST, (0, handlers_1.createPlayDtmfHandler)(ari, vc).bind(this));
+                vc.on(common_1.StreamContent.SAY_REQUEST, (0, handlers_1.createSayHandler)(ari, vc).bind(this));
+                vc.on(common_1.StreamContent.GATHER_REQUEST, (0, handlers_1.createGatherHandler)(vc).bind(this));
+                vc.on(common_1.StreamContent.DIAL_REQUEST, (0, handlers_1.createDialHandler)(ari, vc).bind(this));
+                vc.on(common_1.StreamContent.PLAYBACK_CONTROL_REQUEST, (0, handlers_1.createPlaybackControlHandler)(ari, vc).bind(this));
+                vc.on(common_1.StreamContent.START_STREAM_GATHER_REQUEST, (0, handlers_1.createStreamGatherHandler)(vc).bind(this));
                 vc.on(common_1.StreamContent.STOP_STREAM_GATHER_REQUEST, () => {
                     vc.stopStreamGather();
                 });
-                vc.on(common_1.StreamContent.START_STREAM_REQUEST, (0, Stream_1.streamHandler)(vc).bind(this));
+                vc.on(common_1.StreamContent.START_STREAM_REQUEST, (0, handlers_1.createStreamHandler)(vc).bind(this));
             }
             catch (err) {
                 logger.error("error handling stasis start", { error: err.message });
@@ -101,13 +100,13 @@ class VoiceDispatcher {
     }
     handleDial(event, channel) {
         return __awaiter(this, void 0, void 0, function* () {
-            (0, utils_1.makeHandleDialEventsWithNats)(this.nc)(channel.id, event);
+            (0, utils_1.createHandleDialEventsWithNats)(this.nc)(channel.id, event);
         });
     }
     isHandledElsewhere(channel) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            return (((_a = (yield (0, makeGetChannelVarWithoutThrow_1.makeGetChannelVarWithoutThrow)(channel)(types_1.ChannelVar.FROM_EXTERNAL_MEDIA))) === null || _a === void 0 ? void 0 : _a.value) === "true");
+            return (((_a = (yield (0, utils_2.createGetChannelVarWithoutThrow)(channel)(types_1.ChannelVar.FROM_EXTERNAL_MEDIA))) === null || _a === void 0 ? void 0 : _a.value) === "true");
         });
     }
 }

package/dist/voice/connectToAri.js

@@ -36,7 +36,7 @@ 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");
+const createCreateVoiceClient_1 = require("./createCreateVoiceClient");
 const types_1 = require("./types");
 const VoiceDispatcher_1 = require("./VoiceDispatcher");
 const db_1 = require("../core/db");
@@ -62,9 +62,9 @@ function connectToAri(filesServer) {
                 attemptReconnection(filesServer);
             });
             logger.info("asterisk is ready");
-            const createContainer = (0, integrations_1.makeCreateContainer)(db_1.prisma, envs_1.INTEGRATIONS_FILE);
+            const createContainer = (0, integrations_1.createCreateContainer)(db_1.prisma, envs_1.INTEGRATIONS_FILE);
             const nats = yield (0, nats_1.connect)({ servers: envs_1.NATS_URL, maxReconnectAttempts: -1 });
-            const dispatcher = new VoiceDispatcher_1.VoiceDispatcher(ari, nats, (0, makeCreateVoiceClient_1.makeCreateVoiceClient)(createContainer, filesServer));
+            const dispatcher = new VoiceDispatcher_1.VoiceDispatcher(ari, nats, (0, createCreateVoiceClient_1.createCreateVoiceClient)(createContainer, filesServer));
             dispatcher.start();
         }
         else {

package/dist/voice/{makeCreateVoiceClient.d.ts → createCreateVoiceClient.d.ts}

@@ -1,9 +1,9 @@
 import { Channel, Client, StasisStart } from "ari-client";
 import { CreateContainer } from "./integrations/types";
 import { VoiceClient } from "./types";
-declare function makeCreateVoiceClient(createContainer: CreateContainer, filesServer: any): (params: {
+declare function createCreateVoiceClient(createContainer: CreateContainer, filesServer: any): (params: {
     ari: Client;
     event: StasisStart;
     channel: Channel;
 }) => Promise<VoiceClient>;
-export { makeCreateVoiceClient };
+export { createCreateVoiceClient };

package/dist/voice/createCreateVoiceClient.js

@@ -0,0 +1,76 @@
+"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.createCreateVoiceClient = createCreateVoiceClient;
+/*
+ * 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 identity_1 = require("@fonoster/identity");
+const logger_1 = require("@fonoster/logger");
+const types_1 = require("./types");
+const createGetChannelVarWithoutThrow_1 = require("./utils/createGetChannelVarWithoutThrow");
+const VoiceClientImpl_1 = require("./VoiceClientImpl");
+const identityConfig_1 = require("../core/identityConfig");
+const mapCallDirectionToEnum_1 = require("../events/mapCallDirectionToEnum");
+const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
+const generateCallAccessToken = (0, identity_1.createGenerateCallAccessToken)(identityConfig_1.identityConfig);
+// Note: By the time the call arrives here the owner of the app MUST be authenticated
+function createCreateVoiceClient(createContainer, filesServer) {
+    return function createVoiceClient(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d;
+            const { ari, event, channel } = params;
+            const { id: sessionRef, caller } = event.channel;
+            const { name: callerName, number: callerNumber } = caller;
+            const getChannelVar = (0, createGetChannelVarWithoutThrow_1.createGetChannelVarWithoutThrow)(channel);
+            // Variables set by Asterisk's dialplan
+            const callDirection = (_a = (yield getChannelVar(types_1.ChannelVar.CALL_DIRECTION))) === null || _a === void 0 ? void 0 : _a.value;
+            const appRef = (_b = (yield getChannelVar(types_1.ChannelVar.APP_REF))) === null || _b === void 0 ? void 0 : _b.value;
+            const ingressNumber = ((_c = (yield getChannelVar(types_1.ChannelVar.INGRESS_NUMBER))) === null || _c === void 0 ? void 0 : _c.value) || "";
+            const { accessKeyId, endpoint, tts, stt } = yield createContainer(appRef);
+            const sessionToken = yield generateCallAccessToken({ accessKeyId, appRef });
+            const metadataStr = (_d = (yield getChannelVar(types_1.ChannelVar.METADATA))) === null || _d === void 0 ? void 0 : _d.value;
+            const config = {
+                appRef,
+                sessionRef,
+                accessKeyId,
+                endpoint,
+                callerName,
+                callerNumber,
+                ingressNumber,
+                sessionToken,
+                callDirection: (0, mapCallDirectionToEnum_1.mapCallDirectionToEnum)(callDirection),
+                metadata: metadataStr ? JSON.parse(metadataStr) : {}
+            };
+            logger.verbose("creating voice client with config: ", {
+                appRef,
+                callerNumber,
+                ingressNumber
+            });
+            return new VoiceClientImpl_1.VoiceClientImpl({ ari, config, tts, stt }, filesServer);
+        });
+    };
+}

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

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

package/dist/voice/handlers/{Answer.js → createAnswerHandler.js}

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

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

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