@fonoster/apiserver 0.7.24 → 0.7.25

package/dist/applications/createGetFnUtil.d.ts

@@ -6,28 +6,28 @@ declare function createGetFnUtil(prisma: Prisma): (ref: string) => Promise<{
     textToSpeech: {
         ref: string;
         config: import("@prisma/client/runtime/library").JsonValue;
-        applicationRef: string;
         productRef: string;
+        applicationRef: string;
     };
     speechToText: {
         ref: string;
         config: import("@prisma/client/runtime/library").JsonValue;
-        applicationRef: string;
         productRef: string;
+        applicationRef: string;
     };
     intelligence: {
         ref: string;
-        credentials: string;
         config: import("@prisma/client/runtime/library").JsonValue;
-        applicationRef: string;
+        credentials: string;
         productRef: string;
+        applicationRef: string;
     };
     name: string;
     type: "EXTERNAL";
+    endpoint: string;
     ref: string;
+    accessKeyId: string;
     createdAt: Date;
     updatedAt: Date;
-    endpoint: string;
-    accessKeyId: string;
 }>;
 export { createGetFnUtil };

package/dist/applications/deleteApplication.js

@@ -41,5 +41,5 @@ function deleteApplication(prisma) {
         yield prisma.application.delete({ where: { ref } });
         return { ref };
     });
-    return (0, common_1.withErrorHandlingAndValidation)((0, identity_1.withAccess)(fn, (ref) => getFn(ref)), common_1.Validators.baseApiObjectSchema);
+    return (0, common_1.withErrorHandlingAndValidation)((0, identity_1.withAccess)(fn, (ref) => getFn(ref)), common_1.Validators.emptySchema);
 }

package/dist/applications/getApplication.js

@@ -42,5 +42,5 @@ function getApplication(prisma) {
         const result = yield getFn(ref);
         return result ? (0, applicationWithEncodedStruct_1.applicationWithEncodedStruct)(result) : null;
     });
-    return (0, withErrorHandlingAndValidationAndAccess_1.withErrorHandlingAndValidationAndAccess)(fn, (ref) => getFn(ref), common_1.Validators.baseApiObjectSchema);
+    return (0, withErrorHandlingAndValidationAndAccess_1.withErrorHandlingAndValidationAndAccess)(fn, (ref) => getFn(ref), common_1.Validators.emptySchema);
 }

package/dist/applications/utils/getApplicationValidationSchema.d.ts

@@ -8,7 +8,7 @@ declare function getApplicationValidationSchema(request: {
         EXTERNAL: "EXTERNAL";
     }>;
     endpoint: z.ZodEffects<z.ZodOptional<z.ZodString>, string, string>;
-    textToSpeech: z.ZodUndefined | z.ZodObject<{
+    textToSpeech: z.ZodObject<{
         productRef: z.ZodString;
         config: any;
     }, "strip", z.ZodTypeAny, {
@@ -19,7 +19,7 @@ declare function getApplicationValidationSchema(request: {
         [x: string]: any;
         productRef?: unknown;
         config?: unknown;
-    }>;
+    }> | z.ZodUndefined;
     speechToText: z.ZodUndefined | z.ZodObject<{
         productRef: z.ZodString;
         config: any;
@@ -33,9 +33,6 @@ declare function getApplicationValidationSchema(request: {
         config?: unknown;
     }>;
 }, "strip", z.ZodTypeAny, {
-    name?: string;
-    type?: "EXTERNAL";
-    endpoint?: string;
     textToSpeech?: {
         [x: string]: any;
         productRef?: unknown;
@@ -46,10 +43,10 @@ declare function getApplicationValidationSchema(request: {
         productRef?: unknown;
         config?: unknown;
     };
-}, {
     name?: string;
     type?: "EXTERNAL";
     endpoint?: string;
+}, {
     textToSpeech?: {
         [x: string]: any;
         productRef?: unknown;
@@ -60,5 +57,8 @@ declare function getApplicationValidationSchema(request: {
         productRef?: unknown;
         config?: unknown;
     };
+    name?: string;
+    type?: "EXTERNAL";
+    endpoint?: string;
 }>;
 export { getApplicationValidationSchema };

package/dist/applications/utils/getApplicationValidationSchema.js

@@ -55,7 +55,9 @@ function getApplicationValidationSchema(request) {
     const { ttsEngineName, sttEngineName } = request;
     return zod_1.z.object({
         name: zod_1.z.string().max(255, MAX_NAME_MESSAGE),
-        type: zod_1.z.nativeEnum(client_1.ApplicationType),
+        type: zod_1.z.nativeEnum(client_1.ApplicationType, {
+            message: "Invalid application type."
+        }),
         endpoint: common_1.hostOrHostPortSchema,
         textToSpeech: ttsEngineName
             ? zod_1.z.object({

package/dist/core/allowList.js

@@ -25,7 +25,10 @@ const allowList = [
     "/fonoster.identity.v1beta2.Identity/CreateWorkspace",
     "/fonoster.identity.v1beta2.Identity/ExchangeApiKey",
     "/fonoster.identity.v1beta2.Identity/ExchangeCredentials",
+    "/fonoster.identity.v1beta2.Identity/ExchangeOauth2Code",
     "/fonoster.identity.v1beta2.Identity/ExchangeRefreshToken",
+    "/fonoster.identity.v1beta2.Identity/SendVerificationCode",
+    "/fonoster.identity.v1beta2.Identity/VerifyCode",
     "/fonoster.identity.v1beta2.Identity/GetPublicKey"
 ];
 exports.allowList = allowList;

package/dist/core/{filesServer.d.ts → httpBridge.d.ts}

@@ -1,9 +1,9 @@
 import { Readable } from "stream";
-declare function filesServer(params: {
+declare function httpBridge(params: {
     port: number;
 }): {
     addStream: (id: string, stream: Readable) => void;
     removeStream: (id: string) => void;
     getStream: (id: string) => Readable;
 };
-export { filesServer };
+export { httpBridge };

package/dist/core/{filesServer.js → httpBridge.js}

@@ -1,18 +1,30 @@
 "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());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.filesServer = filesServer;
+exports.httpBridge = httpBridge;
+const identity_1 = require("@fonoster/identity");
 const logger_1 = require("@fonoster/logger");
 const express_1 = __importDefault(require("express"));
+const identityConfig_1 = require("./identityConfig");
+const envs_1 = require("../envs");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 const CONTENT_TYPE = "audio/L16;rate=16000;channels=1";
-function filesServer(params) {
+function httpBridge(params) {
     const { port } = params;
     const app = (0, express_1.default)();
     const streamMap = new Map();
-    app.get("/sounds/:id", (req, res) => {
+    app.get("/api/sounds/:id", (req, res) => {
         const idWithoutExtension = req.params.id.split(".")[0];
         const stream = streamMap.get(idWithoutExtension);
         if (!stream) {
@@ -32,8 +44,18 @@ function filesServer(params) {
         });
         stream.pipe(res);
     });
+    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);
+            res.redirect(envs_1.APP_URL);
+        }
+        catch (error) {
+            logger.verbose("error updating membership status", error);
+            res.redirect(envs_1.IDENTITY_WORKSPACE_INVITATION_FAIL_URL);
+        }
+    }));
     app.listen(port, () => {
-        logger.info(`Files server is running on port ${port}`);
+        logger.info(`HTTP bridge is running on port ${port}`);
     });
     return {
         addStream: (id, stream) => {

package/dist/core/identityConfig.d.ts

@@ -17,5 +17,14 @@ declare const identityConfig: {
             pass: string;
         };
     };
+    twilioSmsConfig: {
+        accountSid: string;
+        authToken: string;
+        sender: string;
+    };
+    githubOauth2Config: {
+        clientId: string;
+        clientSecret: string;
+    };
 };
 export { identityConfig };

package/dist/core/identityConfig.js

@@ -38,6 +38,15 @@ const identityConfig = {
             user: envs_1.SMTP_AUTH_USER,
             pass: envs_1.SMTP_AUTH_PASS
         }
+    },
+    twilioSmsConfig: {
+        accountSid: envs_1.TWILIO_ACCOUNT_SID,
+        authToken: envs_1.TWILIO_AUTH_TOKEN,
+        sender: envs_1.TWILIO_PHONE_NUMBER
+    },
+    githubOauth2Config: {
+        clientId: envs_1.IDENTITY_OAUTH2_GITHUB_CLIENT_ID,
+        clientSecret: envs_1.IDENTITY_OAUTH2_GITHUB_CLIENT_SECRET
     }
 };
 exports.identityConfig = identityConfig;

package/dist/core/runServices.js

@@ -59,7 +59,7 @@ const logger_1 = require("@fonoster/logger");
 const grpc = __importStar(require("@grpc/grpc-js"));
 const grpc_health_check_1 = require("grpc-health-check");
 const allowList_1 = require("./allowList");
-const filesServer_1 = require("./filesServer");
+const httpBridge_1 = require("./httpBridge");
 const loadServices_1 = __importDefault(require("./loadServices"));
 const services_1 = __importDefault(require("./services"));
 const runCallManager_1 = require("../calls/runCallManager");
@@ -79,7 +79,7 @@ function runServices() {
         // Load the remaining services
         (0, loadServices_1.default)(server, yield services_1.default);
         // Connecting to Asterisk ARI
-        yield (0, connectToAri_1.connectToAri)((0, filesServer_1.filesServer)({ port: envs_1.FILES_SERVER_PORT }));
+        yield (0, connectToAri_1.connectToAri)((0, httpBridge_1.httpBridge)({ port: envs_1.HTTP_BRIDGE_PORT }));
         // Additional Call Managers subscriber may be added here to handle call events
         yield (0, runCallManager_1.createCreateCallSubscriber)({
             natsUrl: envs_1.NATS_URL,

package/dist/core/services.d.ts

@@ -129,12 +129,21 @@ declare const services: Promise<[{
         exchangeCredentials: (call: {
             request: unknown;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
+        exchangeOauth2Code: (call: {
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         exchangeRefreshToken: (call: {
             request: unknown;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         getPublicKey: (_: unknown, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: {
             publicKey: string;
         }) => void) => Promise<void>;
+        sendVerificationCode: (call: {
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
+        verifyCode: (call: {
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
     };
 }, {
     definition: {

package/dist/envs.d.ts

@@ -10,15 +10,17 @@ export declare const CALLS_CREATE_SUBJECT = "calls.create";
 export declare const CALLS_TRACK_CALL_SUBJECT = "calls.track";
 export declare const CLOAK_ENCRYPTION_KEY: string;
 export declare const DEFAULT_NATS_QUEUE_GROUP = "apiserver";
-export declare const EMAIL_TEMPLATES_DIR: string;
-export declare const FILES_SERVER_PORT: number;
+export declare const HTTP_BRIDGE_PORT: number;
 export declare const IDENTITY_ACCESS_TOKEN_EXPIRES_IN: string;
 export declare const IDENTITY_AUDIENCE: string;
 export declare const IDENTITY_ID_TOKEN_EXPIRES_IN: string;
 export declare const IDENTITY_ISSUER: string;
+export declare const IDENTITY_OAUTH2_GITHUB_CLIENT_ID: string;
+export declare const IDENTITY_OAUTH2_GITHUB_CLIENT_SECRET: string;
 export declare const IDENTITY_PRIVATE_KEY: string;
 export declare const IDENTITY_PUBLIC_KEY: string;
 export declare const IDENTITY_REFRESH_TOKEN_EXPIRES_IN: string;
+export declare const IDENTITY_WORKSPACE_INVITATION_FAIL_URL: string;
 export declare const INFLUXDB_BUCKET: string;
 export declare const INFLUXDB_ORG: string;
 export declare const INFLUXDB_PASSWORD: string;
@@ -41,3 +43,7 @@ export declare const SMTP_HOST: string;
 export declare const SMTP_PORT: number;
 export declare const SMTP_SECURE: boolean;
 export declare const SMTP_SENDER: string;
+export declare const TEMPLATES_DIR: string;
+export declare const TWILIO_ACCOUNT_SID: string;
+export declare const TWILIO_AUTH_TOKEN: string;
+export declare const TWILIO_PHONE_NUMBER: string;

package/dist/envs.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SMTP_SENDER = exports.SMTP_SECURE = exports.SMTP_PORT = exports.SMTP_HOST = exports.SMTP_AUTH_USER = exports.SMTP_AUTH_PASS = exports.ROUTR_DEFAULT_PEER_USERNAME = exports.ROUTR_DEFAULT_PEER_PASSWORD = exports.ROUTR_DEFAULT_PEER_NAME = exports.ROUTR_DEFAULT_PEER_AOR = exports.ROUTR_API_ENDPOINT = exports.OWNER_PASSWORD = exports.OWNER_NAME = exports.OWNER_EMAIL = exports.NATS_URL = exports.INTEGRATIONS_FILE = exports.INFLUXDB_USERNAME = exports.INFLUXDB_URL = exports.INFLUXDB_TOKEN = exports.INFLUXDB_PASSWORD = exports.INFLUXDB_ORG = exports.INFLUXDB_BUCKET = exports.IDENTITY_REFRESH_TOKEN_EXPIRES_IN = exports.IDENTITY_PUBLIC_KEY = exports.IDENTITY_PRIVATE_KEY = exports.IDENTITY_ISSUER = exports.IDENTITY_ID_TOKEN_EXPIRES_IN = exports.IDENTITY_AUDIENCE = exports.IDENTITY_ACCESS_TOKEN_EXPIRES_IN = exports.FILES_SERVER_PORT = exports.EMAIL_TEMPLATES_DIR = exports.DEFAULT_NATS_QUEUE_GROUP = exports.CLOAK_ENCRYPTION_KEY = exports.CALLS_TRACK_CALL_SUBJECT = exports.CALLS_CREATE_SUBJECT = exports.ASTERISK_TRUNK = exports.ASTERISK_SYSTEM_DOMAIN = exports.ASTERISK_ARI_USERNAME = exports.ASTERISK_ARI_SECRET = exports.ASTERISK_ARI_PROXY_URL = exports.APP_URL = exports.APISERVER_HOST = exports.APISERVER_BIND_ADDR = void 0;
+exports.TWILIO_PHONE_NUMBER = exports.TWILIO_AUTH_TOKEN = exports.TWILIO_ACCOUNT_SID = exports.TEMPLATES_DIR = exports.SMTP_SENDER = exports.SMTP_SECURE = exports.SMTP_PORT = exports.SMTP_HOST = exports.SMTP_AUTH_USER = exports.SMTP_AUTH_PASS = exports.ROUTR_DEFAULT_PEER_USERNAME = exports.ROUTR_DEFAULT_PEER_PASSWORD = exports.ROUTR_DEFAULT_PEER_NAME = exports.ROUTR_DEFAULT_PEER_AOR = exports.ROUTR_API_ENDPOINT = exports.OWNER_PASSWORD = exports.OWNER_NAME = exports.OWNER_EMAIL = exports.NATS_URL = exports.INTEGRATIONS_FILE = exports.INFLUXDB_USERNAME = exports.INFLUXDB_URL = exports.INFLUXDB_TOKEN = exports.INFLUXDB_PASSWORD = exports.INFLUXDB_ORG = exports.INFLUXDB_BUCKET = exports.IDENTITY_WORKSPACE_INVITATION_FAIL_URL = exports.IDENTITY_REFRESH_TOKEN_EXPIRES_IN = exports.IDENTITY_PUBLIC_KEY = exports.IDENTITY_PRIVATE_KEY = exports.IDENTITY_OAUTH2_GITHUB_CLIENT_SECRET = exports.IDENTITY_OAUTH2_GITHUB_CLIENT_ID = exports.IDENTITY_ISSUER = exports.IDENTITY_ID_TOKEN_EXPIRES_IN = exports.IDENTITY_AUDIENCE = exports.IDENTITY_ACCESS_TOKEN_EXPIRES_IN = exports.HTTP_BRIDGE_PORT = exports.DEFAULT_NATS_QUEUE_GROUP = exports.CLOAK_ENCRYPTION_KEY = exports.CALLS_TRACK_CALL_SUBJECT = exports.CALLS_CREATE_SUBJECT = exports.ASTERISK_TRUNK = exports.ASTERISK_SYSTEM_DOMAIN = exports.ASTERISK_ARI_USERNAME = exports.ASTERISK_ARI_SECRET = exports.ASTERISK_ARI_PROXY_URL = exports.APP_URL = exports.APISERVER_HOST = exports.APISERVER_BIND_ADDR = void 0;
 /*
  * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/fonoster
@@ -39,6 +39,7 @@ const e = process.env;
     "SMTP_AUTH_USER",
     "SMTP_AUTH_PASS",
     "IDENTITY_DATABASE_URL",
+    "IDENTITY_WORKSPACE_INVITATION_FAIL_URL",
     "DATABASE_URL",
     "INFLUXDB_URL",
     "INFLUXDB_INIT_USERNAME",
@@ -53,8 +54,6 @@ const e = process.env;
 ]);
 const IDENTITY_PRIVATE_KEY_PATH = e.IDENTITY_PRIVATE_KEY_PATH || "/opt/fonoster/keys/private.pem";
 const IDENTITY_PUBLIC_KEY_PATH = e.IDENTITY_PUBLIC_KEY_PATH || "/opt/fonoster/keys/public.pem";
-(0, common_1.assertFileExists)(IDENTITY_PRIVATE_KEY_PATH);
-(0, common_1.assertFileExists)(IDENTITY_PUBLIC_KEY_PATH);
 exports.APISERVER_BIND_ADDR = e.APISERVER_BIND_ADDR || "0.0.0.0:50051";
 exports.APISERVER_HOST = e.APISERVER_HOST || "apiserver";
 // Frontend configurations
@@ -69,24 +68,31 @@ exports.CALLS_TRACK_CALL_SUBJECT = "calls.track";
 // Other configurations
 exports.CLOAK_ENCRYPTION_KEY = e.CLOAK_ENCRYPTION_KEY;
 exports.DEFAULT_NATS_QUEUE_GROUP = "apiserver";
-// Custom email templates
-exports.EMAIL_TEMPLATES_DIR = e.EMAIL_TEMPLATES_DIR;
-exports.FILES_SERVER_PORT = e.FILES_SERVER_PORT
-    ? parseInt(e.FILES_SERVER_PORT)
+exports.HTTP_BRIDGE_PORT = e.HTTP_BRIDGE_PORT
+    ? parseInt(e.HTTP_BRIDGE_PORT)
     : 9876;
+// Identity configurations
 exports.IDENTITY_ACCESS_TOKEN_EXPIRES_IN = e.IDENTITY_ACCESS_TOKEN_EXPIRES_IN || "15m";
 exports.IDENTITY_AUDIENCE = e.IDENTITY_AUDIENCE || "api";
 exports.IDENTITY_ID_TOKEN_EXPIRES_IN = e.IDENTITY_ID_TOKEN_EXPIRES_IN || "15m";
-// Identity configurations
 exports.IDENTITY_ISSUER = e.IDENTITY_ISSUER || "https://fonoster.local";
+exports.IDENTITY_OAUTH2_GITHUB_CLIENT_ID = e.IDENTITY_OAUTH2_GITHUB_CLIENT_ID;
+exports.IDENTITY_OAUTH2_GITHUB_CLIENT_SECRET = e.IDENTITY_OAUTH2_GITHUB_CLIENT_SECRET;
 exports.IDENTITY_PRIVATE_KEY = fs_1.default.readFileSync(IDENTITY_PRIVATE_KEY_PATH, "utf8");
 exports.IDENTITY_PUBLIC_KEY = fs_1.default.readFileSync(IDENTITY_PUBLIC_KEY_PATH, "utf8");
 exports.IDENTITY_REFRESH_TOKEN_EXPIRES_IN = e.IDENTITY_REFRESH_TOKEN_EXPIRES_IN || "24h";
+exports.IDENTITY_WORKSPACE_INVITATION_FAIL_URL = e.IDENTITY_WORKSPACE_INVITATION_FAIL_URL;
+if (e.IDENTITY_OAUTH2_GITHUB_ENABLED === "true") {
+    (0, common_1.assertEnvsAreSet)([
+        "IDENTITY_OAUTH2_GITHUB_CLIENT_ID",
+        "IDENTITY_OAUTH2_GITHUB_CLIENT_SECRET"
+    ]);
+}
+// InfluxDB configurations
 exports.INFLUXDB_BUCKET = e.INFLUXDB_INIT_BUCKET;
 exports.INFLUXDB_ORG = e.INFLUXDB_INIT_ORG;
 exports.INFLUXDB_PASSWORD = e.INFLUXDB_INIT_PASSWORD;
 exports.INFLUXDB_TOKEN = e.INFLUXDB_INIT_TOKEN;
-// InfluxDB configurations
 exports.INFLUXDB_URL = e.INFLUXDB_URL;
 exports.INFLUXDB_USERNAME = e.INFLUXDB_INIT_USERNAME;
 exports.INTEGRATIONS_FILE = e.INTEGRATIONS_FILE || "/opt/fonoster/integrations.json";
@@ -107,3 +113,9 @@ exports.SMTP_HOST = e.SMTP_HOST;
 exports.SMTP_PORT = e.SMTP_PORT ? parseInt(e.SMTP_PORT) : 587;
 exports.SMTP_SECURE = ((_a = e.SMTP_SECURE) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true";
 exports.SMTP_SENDER = e.SMTP_SENDER;
+// Custom templates
+exports.TEMPLATES_DIR = e.TEMPLATES_DIR;
+// Twilio configurations
+exports.TWILIO_ACCOUNT_SID = e.TWILIO_ACCOUNT_SID;
+exports.TWILIO_AUTH_TOKEN = e.TWILIO_AUTH_TOKEN;
+exports.TWILIO_PHONE_NUMBER = e.TWILIO_PHONE_NUMBER;

package/dist/secrets/createGetFnUtil.d.ts

@@ -3,12 +3,12 @@ declare function createGetFnUtil(prisma: Prisma): (ref: string) => Promise<{
     extended: {
         accessKeyId: string;
     };
-    name: string;
     secret: string;
+    name: string;
     ref: string;
+    accessKeyId: string;
     createdAt: Date;
     updatedAt: Date;
-    accessKeyId: string;
 } & {
     createdAt: number;
     updatedAt: number;

package/dist/secrets/createGetFnUtil.js

@@ -36,7 +36,7 @@ function createGetFnUtil(prisma) {
             where: { ref }
         });
         if (!response) {
-            throw (0, notFoundError_1.notFoundError)(`Secret not found: ${ref}`);
+            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/deleteSecret.js

@@ -41,5 +41,5 @@ function deleteSecret(prisma) {
         yield prisma.secret.delete({ where: { ref } });
         return { ref };
     });
-    return (0, withErrorHandlingAndValidationAndAccess_1.withErrorHandlingAndValidationAndAccess)(fn, (ref) => getFn(ref), common_1.Validators.baseApiObjectSchema);
+    return (0, withErrorHandlingAndValidationAndAccess_1.withErrorHandlingAndValidationAndAccess)(fn, (ref) => getFn(ref), common_1.Validators.emptySchema);
 }

package/dist/secrets/getSecret.js

@@ -40,5 +40,5 @@ function getSecret(prisma) {
         logger.verbose("call to getSecret", { ref });
         return yield getFn(ref);
     });
-    return (0, withErrorHandlingAndValidationAndAccess_1.withErrorHandlingAndValidationAndAccess)(fn, (ref) => getFn(ref), common_1.Validators.baseApiObjectSchema);
+    return (0, withErrorHandlingAndValidationAndAccess_1.withErrorHandlingAndValidationAndAccess)(fn, (ref) => getFn(ref), common_1.Validators.emptySchema);
 }

package/dist/voice/handlers/PlaybackControl.js

@@ -33,8 +33,10 @@ const zod_1 = require("zod");
 const withErrorHandling_1 = require("./utils/withErrorHandling");
 const requestSchema = zod_1.z.object({
     sessionRef: zod_1.z.string(),
-    playbackRef: zod_1.z.string().optional().nullable(),
-    action: zod_1.z.nativeEnum(common_1.PlaybackControlAction)
+    playbackRef: zod_1.z.string().optional(),
+    action: zod_1.z.nativeEnum(common_1.PlaybackControlAction, {
+        message: "Invalid playback control action."
+    })
 });
 function playbackControlHandler(ari, voiceClient) {
     return (0, withErrorHandling_1.withErrorHandling)((playbackControlReq) => __awaiter(this, void 0, void 0, function* () {

package/dist/voice/handlers/Say.js

@@ -19,10 +19,10 @@ const envs_1 = require("../../envs");
 const sayRequestSchema = zod_1.z.object({
     text: zod_1.z.string(),
     sessionRef: zod_1.z.string(),
-    playbackRef: zod_1.z.string().optional().nullable(),
-    options: zod_1.z.record(zod_1.z.unknown()).optional().nullable()
+    playbackRef: zod_1.z.string().optional(),
+    options: zod_1.z.record(zod_1.z.unknown()).optional()
 });
-const getMediaUrl = (filename) => `sound:http://${envs_1.APISERVER_HOST}:${envs_1.FILES_SERVER_PORT}/sounds/${filename}.sln16`;
+const getMediaUrl = (filename) => `sound:http://${envs_1.APISERVER_HOST}:${envs_1.HTTP_BRIDGE_PORT}/api/sounds/${filename}.sln16`;
 function sayHandler(ari, voiceClient) {
     return (0, withErrorHandling_1.withErrorHandling)((request) => __awaiter(this, void 0, void 0, function* () {
         const { sessionRef: channelId } = request;

package/dist/voice/handlers/Stream.js

@@ -32,8 +32,12 @@ const common_1 = require("@fonoster/common");
 const zod_1 = require("zod");
 const withErrorHandling_1 = require("./utils/withErrorHandling");
 const streamRequestSchema = zod_1.z.object({
-    direction: zod_1.z.nativeEnum(common_1.StreamDirection).optional(),
-    format: zod_1.z.nativeEnum(common_1.StreamAudioFormat).optional()
+    direction: zod_1.z
+        .nativeEnum(common_1.StreamDirection, { message: "Invalid stream direction" })
+        .optional(),
+    format: zod_1.z
+        .nativeEnum(common_1.StreamAudioFormat, { message: "Invalid stream audio format" })
+        .optional()
 });
 function streamHandler(voiceClient) {
     return (0, withErrorHandling_1.withErrorHandling)((request) => __awaiter(this, void 0, void 0, function* () {

package/dist/voice/handlers/StreamGather.js

@@ -32,7 +32,9 @@ 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))
+    source: zod_1.z.optional(zod_1.z.nativeEnum(common_1.StreamGatherSource, {
+        message: "Invalid stream gather source."
+    }))
 });
 function streamGatherHandler(voiceClient) {
     return (0, withErrorHandling_1.withErrorHandling)((request) => __awaiter(this, void 0, void 0, function* () {

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

@@ -40,14 +40,14 @@ const makeGetChannelVar_1 = require("../../utils/makeGetChannelVar");
 // TODO: Needs request validation
 function dialHandler(ari, voiceClient) {
     return (request) => __awaiter(this, void 0, void 0, function* () {
-        const { sessionRef, destination, timeout } = request;
+        const { sessionRef: channelId, destination, timeout } = request;
         const bridge = yield ari.bridges.create({
             type: "mixing"
         });
         // eslint-disable-next-line new-cap
         const dialed = ari.Channel();
-        yield bridge.addChannel({ channel: sessionRef });
-        const callerChannel = yield ari.channels.get({ channelId: sessionRef });
+        yield bridge.addChannel({ channel: channelId });
+        const callerChannel = yield ari.channels.get({ channelId });
         const getChannelVar = (0, makeGetChannelVar_1.makeGetChannelVar)(callerChannel);
         const ingressNumber = (yield getChannelVar(types_1.ChannelVar.INGRESS_NUMBER))
             .value;
@@ -62,6 +62,7 @@ function dialHandler(ari, voiceClient) {
                 "PJSIP_HEADER(add,X-Is-Api-Originated-Type)": "true"
             }
         });
+        yield ari.channels.ring({ channelId });
         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));

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

@@ -36,6 +36,7 @@ function handleStasisStart(params) {
     return (_, channel) => __awaiter(this, void 0, void 0, function* () {
         try {
             yield bridge.addChannel({ channel: dialed.id });
+            yield ari.channels.ringStop({ channelId: channel.id });
             if ([common_1.DialRecordDirection.IN, common_1.DialRecordDirection.BOTH].includes(recordDirection)) {
                 (0, recordChannel_1.recordChannel)(ari, common_1.DialRecordDirection.IN, channel.id);
             }

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

@@ -29,17 +29,28 @@ exports.gatherHandler = gatherHandler;
  * limitations under the License.
  */
 const common_1 = require("@fonoster/common");
+const messages_1 = require("@fonoster/common/src/messages");
 const zod_1 = require("zod");
 const getTimeoutPromise_1 = require("./getTimeoutPromise");
 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(),
+    source: zod_1.z
+        .optional(zod_1.z.nativeEnum(common_1.GatherSource, { message: "Invalid gather source" }))
+        .optional(),
+    maxDigits: zod_1.z
+        .number()
+        .int({
+        message: messages_1.POSITIVE_INTEGER_MESSAGE
+    })
+        .positive({
+        message: messages_1.POSITIVE_INTEGER_MESSAGE
+    })
+        .optional(),
     finishOnKey: zod_1.z
         .string()
-        .regex(/^[0-9*#]$/) // Ensure it's a valid DTMF character
-        .max(1)
+        .regex(/^[0-9*#]$/)
+        .max(1, { message: messages_1.MUST_BE_A_SINGLE_CHARACTER })
         .optional()
 });
 function gatherHandler(voiceClient) {

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

@@ -0,0 +1,2 @@
+declare function textChunkTextByClause(text: string): any[];
+export { textChunkTextByClause };

package/dist/voice/handlers/utils/textChunksByClause.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.textChunkTextByClause = textChunkTextByClause;
+/* eslint-disable no-loops/no-loops */
+/*
+ * 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 CLAUSE_BOUNDARIES = /[.?!;]+/g;
+function textChunkTextByClause(text) {
+    const boundaries = [...text.matchAll(CLAUSE_BOUNDARIES)];
+    const chunks = [];
+    let start = 0;
+    for (let i = 0; i < boundaries.length; i++) {
+        if (chunks.length >= 2) {
+            break;
+        }
+        const boundary = boundaries[i];
+        const end = boundary.index + boundary[0].length;
+        chunks.push(text.slice(start, end).trim());
+        start = end;
+    }
+    const remainingText = text.slice(start).trim();
+    if (remainingText.length > 0) {
+        chunks.push(remainingText);
+    }
+    return chunks;
+}

package/dist/voice/handlers/utils/withErrorHandling.js

@@ -21,8 +21,10 @@ function withErrorHandling(fn) {
         }
         catch (err) {
             if (err instanceof zod_1.z.ZodError) {
-                const validationError = (0, zod_validation_error_1.fromError)(err);
-                logger.error("Validation error:", {
+                const validationError = (0, zod_validation_error_1.fromError)(err, {
+                    prefix: null
+                });
+                logger.error("Error:", {
                     message: validationError.toString()
                 });
             }

package/dist/voice/integrations/makeCreateContainer.js

@@ -56,7 +56,7 @@ function makeCreateContainer(prisma, pathToIntegrations) {
     }
     catch (e) {
         // fatal error
-        const message = (0, zod_validation_error_1.fromError)(e);
+        const message = (0, zod_validation_error_1.fromError)(e, { prefix: null }).toString();
         logger.error("integrations config is invalid", { message });
         process.exit(1);
     }

package/dist/voice/stt/Deepgram.js

@@ -126,8 +126,14 @@ class Deepgram extends AbstractSpeechToText_1.AbstractSpeechToText {
     }
     static getConfigValidationSchema() {
         return z.object({
-            languageCode: z.nativeEnum(common_1.VoiceLanguage).optional().nullable(),
-            model: z.nativeEnum(types_1.DeepgramModel).optional().nullable()
+            languageCode: z
+                .nativeEnum(common_1.VoiceLanguage, {
+                message: common_1.Messages.VALID_LANGUAGE_CODE
+            })
+                .optional(),
+            model: z
+                .nativeEnum(types_1.DeepgramModel, { message: "Invalid Deepgram model" })
+                .optional()
         });
     }
     static getCredentialsValidationSchema() {

package/dist/voice/stt/Google.js

@@ -86,7 +86,9 @@ class Google extends AbstractSpeechToText_1.AbstractSpeechToText {
     }
     static getConfigValidationSchema() {
         return z.object({
-            languageCode: z.nativeEnum(common_1.VoiceLanguage).optional().nullable()
+            languageCode: z
+                .nativeEnum(common_1.VoiceLanguage, { message: common_1.Messages.VALID_LANGUAGE_CODE })
+                .optional()
         });
     }
     static getCredentialsValidationSchema() {

package/dist/voice/tts/Azure.js

@@ -103,7 +103,7 @@ class Azure extends AbstractTextToSpeech_1.AbstractTextToSpeech {
     }
     static getConfigValidationSchema() {
         return z.object({
-            voice: z.nativeEnum(common_1.AzureVoice)
+            voice: z.nativeEnum(common_1.AzureVoice, { message: "Invalid Azure voice" })
         });
     }
     static getCredentialsValidationSchema() {

package/dist/voice/tts/Deepgram.d.ts

@@ -1,8 +1,8 @@
 import { Readable } from "stream";
+import { DeepgramClient } from "@deepgram/sdk";
 import * as z from "zod";
 import { AbstractTextToSpeech } from "./AbstractTextToSpeech";
 import { SynthOptions } from "./types";
-declare const DeepgramClient: any;
 declare const ENGINE_NAME = "tts.deepgram";
 type DeepgramTtsConfig = {
     [key: string]: Record<string, string>;
@@ -11,7 +11,7 @@ type DeepgramTtsConfig = {
     };
 };
 declare class Deepgram extends AbstractTextToSpeech<typeof ENGINE_NAME> {
-    client: typeof DeepgramClient;
+    client: DeepgramClient;
     engineConfig: DeepgramTtsConfig;
     readonly engineName = "tts.deepgram";
     protected readonly OUTPUT_FORMAT = "sln16";
@@ -23,6 +23,7 @@ declare class Deepgram extends AbstractTextToSpeech<typeof ENGINE_NAME> {
         ref: string;
         stream: Readable;
     }>;
+    private doSynthesize;
     static getConfigValidationSchema(): z.Schema;
     static getCredentialsValidationSchema(): z.Schema;
 }

package/dist/voice/tts/Deepgram.js

@@ -33,6 +33,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ENGINE_NAME = exports.Deepgram = void 0;
+/* eslint-disable no-loops/no-loops */
 /*
  * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/fonoster
@@ -52,13 +53,14 @@ exports.ENGINE_NAME = exports.Deepgram = void 0;
  * limitations under the License.
  */
 const stream_1 = require("stream");
+const sdk_1 = require("@deepgram/sdk");
 const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
 const z = __importStar(require("zod"));
 const AbstractTextToSpeech_1 = require("./AbstractTextToSpeech");
 const isSsml_1 = require("./isSsml");
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const { DeepgramClient, createClient } = require("@deepgram/sdk");
+const streamToBuffer_1 = require("./streamToBuffer");
+const textChunksByClause_1 = require("../handlers/utils/textChunksByClause");
 const ENGINE_NAME = "tts.deepgram";
 exports.ENGINE_NAME = ENGINE_NAME;
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
@@ -70,26 +72,59 @@ class Deepgram extends AbstractTextToSpeech_1.AbstractTextToSpeech {
         this.CACHING_FIELDS = ["voice"];
         this.AUDIO_ENCODING = "linear16";
         this.SAMPLE_RATE_HERTZ = 16000;
-        this.client = createClient(config.credentials.apiKey);
+        this.client = (0, sdk_1.createClient)(config.credentials.apiKey);
         this.engineConfig = config;
     }
     synthesize(text, options) {
         return __awaiter(this, void 0, void 0, function* () {
             logger.verbose(`synthesize [input: ${text}, isSsml=${(0, isSsml_1.isSsml)(text)} options: ${JSON.stringify(options)}]`);
             const { voice } = this.engineConfig.config;
+            const ref = this.createMediaReference();
+            const chunks = (0, textChunksByClause_1.textChunkTextByClause)(text);
+            const stream = new stream_1.Readable({ read() { } });
+            const results = new Array(chunks.length);
+            let nextIndexToPush = 0;
+            function observeQueue() {
+                if (nextIndexToPush < results.length &&
+                    results[nextIndexToPush] !== undefined) {
+                    stream.push(results[nextIndexToPush]);
+                    nextIndexToPush++;
+                    setImmediate(observeQueue);
+                }
+                else if (nextIndexToPush < results.length) {
+                    setTimeout(observeQueue, 10);
+                }
+                else {
+                    stream.push(null);
+                }
+            }
+            observeQueue();
+            chunks.forEach((text, index) => {
+                this.doSynthesize(text, voice)
+                    .then((synthesizedText) => {
+                    results[index] = synthesizedText;
+                })
+                    .catch((error) => {
+                    stream.emit("error", error);
+                });
+            });
+            return { ref, stream };
+        });
+    }
+    doSynthesize(text, voice) {
+        return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.client.speak.request({ text }, {
                 model: voice || common_1.DeepgramVoice.AURA_ASTERIA_EN,
                 encoding: this.AUDIO_ENCODING,
                 sample_rate: this.SAMPLE_RATE_HERTZ,
                 container: "none"
             });
-            const ref = this.createMediaReference();
-            return { ref, stream: stream_1.Readable.from(yield response.getStream()) };
+            return (yield (0, streamToBuffer_1.streamToBuffer)(yield response.getStream()));
         });
     }
     static getConfigValidationSchema() {
         return z.object({
-            voice: z.nativeEnum(common_1.DeepgramVoice)
+            voice: z.nativeEnum(common_1.DeepgramVoice, { message: "Invalid Deepgram voice" })
         });
     }
     static getCredentialsValidationSchema() {

package/dist/voice/tts/ElevenLabs.js

@@ -72,7 +72,9 @@ class ElevenLabs extends AbstractTextToSpeech_1.AbstractTextToSpeech {
     }
     static getConfigValidationSchema() {
         return z.object({
-            voice: z.nativeEnum(common_1.ElevenLabsVoice)
+            voice: z.nativeEnum(common_1.ElevenLabsVoice, {
+                message: "Invalid ElevenLabs voice."
+            })
         });
     }
     static getCredentialsValidationSchema() {

package/dist/voice/tts/Google.js

@@ -95,7 +95,9 @@ class Google extends AbstractTextToSpeech_1.AbstractTextToSpeech {
     }
     static getConfigValidationSchema() {
         return z.object({
-            voice: z.nativeEnum(common_1.GoogleVoice)
+            voice: z
+                .nativeEnum(common_1.GoogleVoice, { message: "Invalid Google voice" })
+                .optional()
         });
     }
     static getCredentialsValidationSchema() {

package/dist/voice/tts/streamToBuffer.d.ts

@@ -0,0 +1,2 @@
+declare function streamToBuffer(readableStream: any): Promise<Buffer>;
+export { streamToBuffer };

package/dist/voice/tts/streamToBuffer.js

@@ -0,0 +1,61 @@
+"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());
+    });
+};
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.streamToBuffer = streamToBuffer;
+/* eslint-disable no-loops/no-loops */
+/*
+ * 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.
+ */
+function streamToBuffer(readableStream) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, readableStream_1, readableStream_1_1;
+        var _b, e_1, _c, _d;
+        const chunks = [];
+        try {
+            for (_a = true, readableStream_1 = __asyncValues(readableStream); readableStream_1_1 = yield readableStream_1.next(), _b = readableStream_1_1.done, !_b; _a = true) {
+                _d = readableStream_1_1.value;
+                _a = false;
+                const chunk = _d;
+                chunks.push(chunk);
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (!_a && !_b && (_c = readableStream_1.return)) yield _c.call(readableStream_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        return Buffer.concat(chunks);
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/apiserver",
-  "version": "0.7.24",
+  "version": "0.7.25",
   "description": "APIServer for Fonoster",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/fonoster#readme",
@@ -21,12 +21,12 @@
   },
   "dependencies": {
     "@deepgram/sdk": "^3.5.1",
-    "@fonoster/common": "^0.7.22",
-    "@fonoster/identity": "^0.7.22",
+    "@fonoster/common": "^0.7.25",
+    "@fonoster/identity": "^0.7.25",
     "@fonoster/logger": "^0.7.22",
-    "@fonoster/sipnet": "^0.7.22",
+    "@fonoster/sipnet": "^0.7.25",
     "@fonoster/streams": "^0.7.22",
-    "@fonoster/types": "^0.7.22",
+    "@fonoster/types": "^0.7.25",
     "@google-cloud/speech": "^6.6.0",
     "@google-cloud/text-to-speech": "^5.3.0",
     "@grpc/grpc-js": "~1.10.6",
@@ -72,5 +72,5 @@
     "@types/uuid": "^9.0.8",
     "@types/validator": "^13.12.0"
   },
-  "gitHead": "58b141dc01f99f0aa903cad5497d12cd474f79df"
+  "gitHead": "f5dbfe479bd50b105ce3eb4b3c260503ef718f57"
 }