@fonoster/apiserver 0.7.5 → 0.7.9

package/dist/applications/deleteApplication.js

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

package/dist/applications/getApplication.js

@@ -29,10 +29,10 @@ exports.getApplication = getApplication;
  * 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 applicationWithEncodedStruct_1 = require("./utils/applicationWithEncodedStruct");
+const withErrorHandlingAndValidationAndAccess_1 = require("../utils/withErrorHandlingAndValidationAndAccess");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 function getApplication(prisma) {
     const getFn = (0, createGetFnUtil_1.createGetFnUtil)(prisma);
@@ -42,5 +42,5 @@ function getApplication(prisma) {
         const result = yield getFn(ref);
         return result ? (0, applicationWithEncodedStruct_1.applicationWithEncodedStruct)(result) : null;
     });
-    return (0, common_1.withErrorHandling)((0, identity_1.withAccess)(fn, (ref) => getFn(ref)));
+    return (0, withErrorHandlingAndValidationAndAccess_1.withErrorHandlingAndValidationAndAccess)(fn, (ref) => getFn(ref), common_1.Validators.baseApiObjectSchema);
 }

package/dist/applications/listApplications.d.ts

@@ -2,5 +2,5 @@ import { GrpcErrorMessage } from "@fonoster/common";
 import { Prisma } from "../core/db";
 declare function listApplications(prisma: Prisma): (call: {
     request: unknown;
-}, callback: (error?: GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
+}, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
 export { listApplications };

package/dist/applications/listApplications.js

@@ -60,5 +60,5 @@ function listApplications(prisma) {
             nextPageToken: (_a = result[result.length - 1]) === null || _a === void 0 ? void 0 : _a.ref
         });
     });
-    return (0, common_1.withErrorHandling)(fn);
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.listRequestSchema);
 }

package/dist/applications/updateApplication.js

@@ -38,14 +38,14 @@ const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filen
 function updateApplication(prisma) {
     const getFn = (0, createGetFnUtil_1.createGetFnUtil)(prisma);
     const fn = (call) => __awaiter(this, void 0, void 0, function* () {
-        const { type, ref: applicationRef } = call.request;
+        const { request } = call;
+        const { type, ref: applicationRef } = request;
         const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
-        (0, validOrThrow_1.validOrThrow)(call.request);
+        (0, validOrThrow_1.validOrThrow)(request);
         logger.verbose("call to updateApplication", {
             accessKeyId,
             type
         });
-        // TODO: Revisit to see if needs optimization
         yield prisma.$transaction([
             prisma.textToSpeech.deleteMany({
                 where: {
@@ -67,7 +67,7 @@ function updateApplication(prisma) {
                     ref: applicationRef,
                     accessKeyId
                 },
-                data: (0, convertToApplicationData_1.convertToApplicationData)(call.request)
+                data: (0, convertToApplicationData_1.convertToApplicationData)(request)
             })
         ]);
         return { ref: applicationRef };

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

@@ -7,7 +7,7 @@ declare function getApplicationValidationSchema(request: {
     type: z.ZodNativeEnum<{
         EXTERNAL: "EXTERNAL";
     }>;
-    endpoint: z.ZodEffects<z.ZodNullable<z.ZodOptional<z.ZodString>>, string, string>;
+    endpoint: z.ZodEffects<z.ZodOptional<z.ZodString>, string, string>;
     textToSpeech: z.ZodUndefined | z.ZodObject<{
         productRef: z.ZodString;
         config: any;

package/dist/applications/utils/getApplicationValidationSchema.js

@@ -27,7 +27,7 @@ const Google_1 = require("../../voice/stt/Google");
 const Azure_1 = require("../../voice/tts/Azure");
 const Deepgram_2 = require("../../voice/tts/Deepgram");
 const Google_2 = require("../../voice/tts/Google");
-// TODO: We need a way to add this values dynamically
+const MAX_NAME_MESSAGE = "Name must contain at most 255 characters";
 const validators = {
     ttsConfigValidators: {
         "tts.google": Google_2.Google.getConfigValidationSchema,
@@ -51,7 +51,7 @@ const validators = {
 function getApplicationValidationSchema(request) {
     const { ttsEngineName, sttEngineName } = request;
     return zod_1.z.object({
-        name: zod_1.z.string(),
+        name: zod_1.z.string().max(255, MAX_NAME_MESSAGE),
         type: zod_1.z.nativeEnum(client_1.ApplicationType),
         endpoint: common_1.hostOrHostPortSchema,
         textToSpeech: ttsEngineName

package/dist/calls/buildService.d.ts

@@ -17,10 +17,8 @@ declare function buildService(influxdb: InfluxDBClient): Promise<{
             request: unknown;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         trackCall: (call: {
-            request: {
-                ref?: string;
-            };
-        }) => void;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
     };
 }>;
 export { buildService };

package/dist/calls/createCall.d.ts

@@ -3,5 +3,5 @@ import { CallPublisher } from "./types";
 import { Prisma } from "../core/db";
 declare function createCall(prisma: Prisma, publisher: CallPublisher): (call: {
     request: unknown;
-}, callback: (error?: GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
+}, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
 export { createCall };

package/dist/calls/createCall.js

@@ -32,15 +32,8 @@ const common_1 = require("@fonoster/common");
 const identity_1 = require("@fonoster/identity");
 const logger_1 = require("@fonoster/logger");
 const uuid_1 = require("uuid");
-const zod_1 = require("zod");
 const notFoundError_1 = require("../core/notFoundError");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
-const createCallRequestSchema = zod_1.z.object({
-    from: zod_1.z.string(),
-    to: zod_1.z.string(),
-    appRef: zod_1.z.string(),
-    timeout: zod_1.z.number().optional()
-});
 function createCall(prisma, publisher) {
     const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
         const { request } = call;
@@ -64,5 +57,5 @@ function createCall(prisma, publisher) {
         });
         callback(null, { ref });
     });
-    return (0, common_1.withErrorHandling)((0, common_1.withValidation)(fn, createCallRequestSchema));
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.createCallRequestSchema);
 }

package/dist/calls/getCall.d.ts

@@ -2,5 +2,5 @@ import { GrpcErrorMessage } from "@fonoster/common";
 import { InfluxDBClient } from "./types";
 declare function getCall(influx: InfluxDBClient): (call: {
     request: unknown;
-}, callback: (error?: GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
+}, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
 export { getCall };

package/dist/calls/getCall.js

@@ -31,13 +31,9 @@ exports.getCall = getCall;
 const common_1 = require("@fonoster/common");
 const identity_1 = require("@fonoster/identity");
 const logger_1 = require("@fonoster/logger");
-const zod_1 = require("zod");
 const createFetchSingleCall_1 = require("./createFetchSingleCall");
 const notFoundError_1 = require("../core/notFoundError");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
-const getCallRequestSchema = zod_1.z.object({
-    ref: zod_1.z.string({ message: "Invalid call reference" })
-});
 function getCall(influx) {
     const fetchSingleCall = (0, createFetchSingleCall_1.createFetchSingleCall)(influx);
     const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
@@ -50,5 +46,5 @@ function getCall(influx) {
         }
         callback(null, response);
     });
-    return (0, common_1.withErrorHandling)((0, common_1.withValidation)(fn, getCallRequestSchema));
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.getCallRequestSchema);
 }

package/dist/calls/listCalls.d.ts

@@ -2,5 +2,5 @@ import { GrpcErrorMessage } from "@fonoster/common";
 import { InfluxDBClient } from "./types";
 declare function listCalls(influx: InfluxDBClient): (call: {
     request: unknown;
-}, callback: (error?: GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
+}, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
 export { listCalls };

package/dist/calls/listCalls.js

@@ -29,7 +29,6 @@ exports.listCalls = listCalls;
  * limitations under the License.
  */
 const common_1 = require("@fonoster/common");
-const listCallsRequestSchema_1 = require("@fonoster/common/src/validators/listCallsRequestSchema");
 const identity_1 = require("@fonoster/identity");
 const logger_1 = require("@fonoster/logger");
 const createFetchCalls_1 = require("./createFetchCalls");
@@ -43,5 +42,5 @@ function listCalls(influx) {
         const result = yield fetchCalls(accessKeyId, request);
         callback(null, result);
     });
-    return (0, common_1.withErrorHandling)((0, common_1.withValidation)(fn, listCallsRequestSchema_1.listCallsRequestSchema));
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.listCallsRequestSchema);
 }

package/dist/calls/makeTrackCall.d.ts

@@ -1,14 +1,5 @@
 import { NatsConnection } from "nats";
-import { z } from "zod";
-declare const trackCallRequestSchema: z.ZodObject<{
-    ref: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    ref?: string;
-}, {
-    ref?: string;
-}>;
-type TrackCallRequest = z.infer<typeof trackCallRequestSchema>;
 declare function makeTrackCall(nc: NatsConnection): (call: {
-    request: TrackCallRequest;
-}) => void;
+    request: unknown;
+}, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
 export { makeTrackCall };

package/dist/calls/makeTrackCall.js

@@ -21,7 +21,6 @@ exports.makeTrackCall = makeTrackCall;
  */
 const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
-const zod_1 = require("zod");
 const envs_1 = require("../envs");
 const FINAL_STATUSES = [
     common_1.DialStatus.BUSY,
@@ -29,9 +28,6 @@ const FINAL_STATUSES = [
     common_1.DialStatus.NOANSWER
 ];
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
-const trackCallRequestSchema = zod_1.z.object({
-    ref: zod_1.z.string()
-});
 function makeTrackCall(nc) {
     const trackingCallsMap = new Map();
     const subscription = nc.subscribe(envs_1.CALLS_TRACK_CALL_SUBJECT);
@@ -57,10 +53,11 @@ function makeTrackCall(nc) {
             stream.write({ ref, status });
         }
     };
-    return (call) => {
+    const fn = (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);
 }

package/dist/core/seed.js

@@ -74,13 +74,13 @@ function main() {
             }
         });
         yield prisma.product.upsert({
-            where: { ref: "nlu.dialogflowcx" },
+            where: { ref: "llm.openai" },
             update: {},
             create: {
-                ref: "nlu.dialogflowcx",
-                name: "Dialogflow CX",
-                vendor: "GOOGLE",
-                type: "NLU"
+                ref: "llm.openai",
+                name: "OpenAI Language Model",
+                vendor: "OPENAI",
+                type: "ASSISTANT"
             }
         });
     });

package/dist/core/services.d.ts

@@ -64,10 +64,8 @@ declare const services: Promise<[{
             request: unknown;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         trackCall: (call: {
-            request: {
-                ref?: string;
-            };
-        }) => void;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
     };
 }, {
     definition: {
@@ -147,8 +145,8 @@ declare const services: Promise<[{
     };
     handlers: {
         createAgent: (call: {
-            request: import("@fonoster/types").CreateAgentRequestExtended;
-        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").AgentExtended) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         updateAgent: (call: {
             request: unknown;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
@@ -171,8 +169,8 @@ declare const services: Promise<[{
     };
     handlers: {
         createCredentials: (call: {
-            request: import("@fonoster/types").CreateCredentialsRequestExtended;
-        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").CredentialsExtended) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         updateCredentials: (call: {
             request: unknown;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
@@ -195,8 +193,8 @@ declare const services: Promise<[{
     };
     handlers: {
         createAcl: (call: {
-            request: import("@fonoster/types").CreateAclRequest;
-        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").AclExtended) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         updateAcl: (call: {
             request: unknown;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
@@ -219,17 +217,17 @@ declare const services: Promise<[{
     };
     handlers: {
         createNumber: (call: {
-            request: import("@fonoster/types").CreateNumberRequest;
-        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").BaseApiObject) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         updateNumber: (call: {
-            request: import("@fonoster/types").UpdateNumberRequest;
-        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").BaseApiObject) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         getNumber: (call: {
-            request: import("@fonoster/types").BaseApiObject;
-        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").BaseApiObject) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         listNumbers: (call: {
-            request: import("@fonoster/types").ListNumbersRequest;
-        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").ListNumbersResponse) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         deleteNumber: (call: {
             request: unknown;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
@@ -243,8 +241,8 @@ declare const services: Promise<[{
     };
     handlers: {
         createTrunk: (call: {
-            request: import("@fonoster/types").CreateTrunkRequestExtended;
-        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").TrunkExtended) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         updateTrunk: (call: {
             request: unknown;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
@@ -267,8 +265,8 @@ declare const services: Promise<[{
     };
     handlers: {
         createDomain: (call: {
-            request: import("@fonoster/types").CreateDomainRequestExtended;
-        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").DomainExtended) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         updateDomain: (call: {
             request: unknown;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;

package/dist/secrets/createSecret.d.ts

@@ -2,5 +2,5 @@ import { GrpcErrorMessage } from "@fonoster/common";
 import { Prisma } from "../core/db";
 declare function createSecret(prisma: Prisma): (call: {
     request: unknown;
-}, callback: (error?: GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
+}, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
 export { createSecret };

package/dist/secrets/createSecret.js

@@ -48,5 +48,5 @@ function createSecret(prisma) {
         });
         callback(null, { ref: result.ref });
     });
-    return (0, common_1.withErrorHandling)(fn);
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.createSecretRequestSchema);
 }

package/dist/secrets/deleteSecret.js

@@ -29,9 +29,9 @@ exports.deleteSecret = deleteSecret;
  * 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");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 function deleteSecret(prisma) {
     const getFn = (0, createGetFnUtil_1.createGetFnUtil)(prisma);
@@ -41,5 +41,5 @@ function deleteSecret(prisma) {
         yield prisma.secret.delete({ where: { ref } });
         return { ref };
     });
-    return (0, common_1.withErrorHandling)((0, identity_1.withAccess)(fn, (ref) => getFn(ref)));
+    return (0, withErrorHandlingAndValidationAndAccess_1.withErrorHandlingAndValidationAndAccess)(fn, (ref) => getFn(ref), common_1.Validators.baseApiObjectSchema);
 }

package/dist/secrets/getSecret.js

@@ -29,9 +29,9 @@ exports.getSecret = getSecret;
  * 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");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 function getSecret(prisma) {
     const getFn = (0, createGetFnUtil_1.createGetFnUtil)(prisma);
@@ -40,5 +40,5 @@ function getSecret(prisma) {
         logger.verbose("call to getSecret", { ref });
         return yield getFn(ref);
     });
-    return (0, common_1.withErrorHandling)((0, identity_1.withAccess)(fn, (ref) => getFn(ref)));
+    return (0, withErrorHandlingAndValidationAndAccess_1.withErrorHandlingAndValidationAndAccess)(fn, (ref) => getFn(ref), common_1.Validators.baseApiObjectSchema);
 }

package/dist/secrets/listSecrets.d.ts

@@ -2,5 +2,5 @@ import { GrpcErrorMessage } from "@fonoster/common";
 import { Prisma } from "../core/db";
 declare function listSecrets(prisma: Prisma): (call: {
     request: unknown;
-}, callback: (error?: GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
+}, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
 export { listSecrets };

package/dist/secrets/listSecrets.js

@@ -53,5 +53,5 @@ function listSecrets(prisma) {
             nextPageToken: (_a = result[result.length - 1]) === null || _a === void 0 ? void 0 : _a.ref
         });
     });
-    return (0, common_1.withErrorHandling)(fn);
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.listRequestSchema);
 }

package/dist/secrets/updateSecret.js

@@ -32,6 +32,7 @@ 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");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 function updateSecret(prisma) {
     const getFn = (0, createGetFnUtil_1.createGetFnUtil)(prisma);
@@ -50,5 +51,5 @@ function updateSecret(prisma) {
         });
         return { ref: call.request.ref };
     });
-    return (0, common_1.withErrorHandling)((0, identity_1.withAccess)(fn, (ref) => getFn(ref)));
+    return (0, withErrorHandlingAndValidationAndAccess_1.withErrorHandlingAndValidationAndAccess)(fn, (ref) => getFn(ref), common_1.Validators.listRequestSchema);
 }

package/dist/utils/withErrorHandlingAndValidationAndAccess.d.ts

@@ -0,0 +1,5 @@
+import { z } from "zod";
+declare function withErrorHandlingAndValidationAndAccess<T, A>(handler: (call: T) => Promise<A>, getFn: (ref: string) => Promise<unknown>, schema: z.ZodSchema): (call: {
+    request: unknown;
+}, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
+export { withErrorHandlingAndValidationAndAccess };

package/dist/utils/withErrorHandlingAndValidationAndAccess.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withErrorHandlingAndValidationAndAccess = withErrorHandlingAndValidationAndAccess;
+/* eslint-disable @typescript-eslint/ban-types */
+/*
+ * 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 identity_1 = require("@fonoster/identity");
+function withErrorHandlingAndValidationAndAccess(handler, getFn, schema) {
+    // Start by applying access logic, then validation, and finally error handling
+    const withAccessHandler = (0, identity_1.withAccess)(handler, getFn);
+    const withValidationHandler = (0, common_1.withValidation)(withAccessHandler, schema);
+    return (0, common_1.withErrorHandling)(withValidationHandler);
+}

package/dist/voice/VoiceClientImpl.js

@@ -139,10 +139,6 @@ class VoiceClientImpl {
                 bridge.addChannel({ channel: [snoopChannel.id, channel.id] });
             }));
             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();
                 }

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

@@ -36,8 +36,11 @@ 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()
+    finishOnKey: zod_1.z
+        .string()
+        .regex(/^[0-9*#]$/) // Ensure it's a valid DTMF character
+        .max(1)
+        .optional()
 });
 function gatherHandler(voiceClient) {
     return (0, withErrorHandling_1.withErrorHandling)((request) => __awaiter(this, void 0, void 0, function* () {

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

@@ -14,7 +14,6 @@ const logger_1 = require("@fonoster/logger");
 const zod_1 = require("zod");
 const zod_validation_error_1 = require("zod-validation-error");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
-// TODO: Send error to the client and to the log system
 function withErrorHandling(fn) {
     return (request) => __awaiter(this, void 0, void 0, function* () {
         try {

package/dist/voice/stt/SpeechToTextFactory.js

@@ -25,7 +25,7 @@ const Google_1 = require("./Google");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 class SpeechToTextFactory {
     static registerEngine(name, ctor) {
-        logger.info("registering stt engine", { name });
+        logger.verbose("registering stt engine", { name });
         this.engines.set(name, ctor);
     }
     static getEngine(engineName, config) {

package/dist/voice/tts/TextToSpeechFactory.js

@@ -26,7 +26,7 @@ const Google_1 = require("./Google");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 class TextToSpeechFactory {
     static registerEngine(name, ctor) {
-        logger.info("registering tts engine", { name });
+        logger.verbose("registering tts engine", { name });
         this.engines.set(name, ctor);
     }
     static getEngine(engineName, config) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/apiserver",
-  "version": "0.7.5",
+  "version": "0.7.9",
   "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.5",
-    "@fonoster/identity": "^0.7.5",
-    "@fonoster/logger": "^0.7.5",
-    "@fonoster/sipnet": "^0.7.5",
-    "@fonoster/streams": "^0.7.5",
-    "@fonoster/types": "^0.7.5",
+    "@fonoster/common": "^0.7.9",
+    "@fonoster/identity": "^0.7.9",
+    "@fonoster/logger": "^0.7.9",
+    "@fonoster/sipnet": "^0.7.9",
+    "@fonoster/streams": "^0.7.9",
+    "@fonoster/types": "^0.7.9",
     "@google-cloud/speech": "^6.6.0",
     "@google-cloud/text-to-speech": "^5.3.0",
     "@grpc/grpc-js": "~1.10.6",
@@ -71,5 +71,5 @@
     "@types/uuid": "^9.0.8",
     "@types/validator": "^13.12.0"
   },
-  "gitHead": "cf28444503e4e698ccc001e061c7c918a4204757"
+  "gitHead": "3b16a5ed87b84d03534bb20de4d59d5bbb51a742"
 }