@fonoster/apiserver 0.7.4 → 0.7.7

package/README.md

@@ -1,3 +1,3 @@
-<a href="https://gitpod.io/#https://github.com/fonoster/fonoster"> <img src="https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod" alt="Contribute with Gitpod" />
+[![Discord](https://img.shields.io/discord/1016419835455996076?color=5865F2&label=Discord&logo=discord&logoColor=white)](https://discord.gg/4QWgSz4hTC) ![GitHub](https://img.shields.io/github/license/fonoster/fonoster?color=%2347b96d) ![Twitter Follow](https://img.shields.io/twitter/follow/fonoster?style=social)
 
-This module is part of the [Fonoster](https://fonoster.com) project. By itself, it does not do much. It is intended to be used as a dependency for other modules. For more information about the project, please visit [https://github.com/fonoster/fonoster](https://github.com/fonoster/fonoster).
+This module is part of the [Fonoster](https://fonoster.com) open-source. By itself, it does not do much. It is intended to be used as a dependency for other modules. For more information about the project, please visit [https://github.com/fonoster/fonoster](https://github.com/fonoster/fonoster).

package/dist/applications/buildService.d.ts

@@ -8,22 +8,20 @@ declare function buildService(prisma: Prisma): {
     };
     handlers: {
         createApplication: (call: {
-            request: import("@fonoster/types").CreateApplicationRequest;
-        }, 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>;
         getApplication: (call: {
-            request: import("@fonoster/types").BaseApiObject;
-        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").Application) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         listApplications: (call: {
-            request: import("@fonoster/types").ListApplicationsRequest;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").ListApplicationsResponse) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         deleteApplication: (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>;
         updateApplication: (call: {
-            request: import("@fonoster/types").UpdateApplicationRequest;
-        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: {
-            ref: string;
-        }) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
     };
 };
 export { buildService };

package/dist/applications/createApplication.d.ts

@@ -1,7 +1,6 @@
 import { GrpcErrorMessage } from "@fonoster/common";
-import { BaseApiObject, CreateApplicationRequest } from "@fonoster/types";
 import { Prisma } from "../core/db";
 declare function createApplication(prisma: Prisma): (call: {
-    request: CreateApplicationRequest;
-}, callback: (error: GrpcErrorMessage, response?: BaseApiObject) => void) => Promise<void>;
+    request: unknown;
+}, callback: (error?: GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
 export { createApplication };

package/dist/applications/createApplication.js

@@ -35,22 +35,19 @@ const convertToApplicationData_1 = require("./utils/convertToApplicationData");
 const validOrThrow_1 = require("./utils/validOrThrow");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 function createApplication(prisma) {
-    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
-        const { type } = call.request;
+    const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
+        const { request } = call;
+        const { type } = request;
         const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
-        try {
-            logger.verbose("call to createApplication", {
-                accessKeyId,
-                type
-            });
-            (0, validOrThrow_1.validOrThrow)(call.request);
-            const result = yield prisma.application.create({
-                data: Object.assign(Object.assign({}, (0, convertToApplicationData_1.convertToApplicationData)(call.request)), { accessKeyId })
-            });
-            return callback(null, { ref: result.ref });
-        }
-        catch (error) {
-            (0, common_1.handleError)(error, callback);
-        }
+        logger.verbose("call to createApplication", {
+            accessKeyId,
+            type
+        });
+        (0, validOrThrow_1.validOrThrow)(request);
+        const result = yield prisma.application.create({
+            data: Object.assign(Object.assign({}, (0, convertToApplicationData_1.convertToApplicationData)(request)), { accessKeyId })
+        });
+        callback(null, { ref: result.ref });
     });
+    return (0, common_1.withErrorHandling)(fn);
 }

package/dist/applications/createGetFnUtil.d.ts

@@ -5,20 +5,20 @@ declare function createGetFnUtil(prisma: Prisma): (ref: string) => Promise<{
     };
     textToSpeech: {
         ref: string;
-        config: import(".prisma/client").Prisma.JsonValue;
+        config: import("@prisma/client/runtime/library").JsonValue;
         applicationRef: string;
         productRef: string;
     };
     speechToText: {
         ref: string;
-        config: import(".prisma/client").Prisma.JsonValue;
+        config: import("@prisma/client/runtime/library").JsonValue;
         applicationRef: string;
         productRef: string;
     };
     intelligence: {
         ref: string;
         credentials: string;
-        config: import(".prisma/client").Prisma.JsonValue;
+        config: import("@prisma/client/runtime/library").JsonValue;
         applicationRef: string;
         productRef: string;
     };

package/dist/applications/deleteApplication.d.ts

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

package/dist/applications/deleteApplication.js

@@ -28,16 +28,18 @@ exports.deleteApplication = deleteApplication;
  * 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");
 const logger_1 = require("@fonoster/logger");
 const createGetFnUtil_1 = require("./createGetFnUtil");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 function deleteApplication(prisma) {
     const getFn = (0, createGetFnUtil_1.createGetFnUtil)(prisma);
-    return (0, identity_1.withAccess)((call) => __awaiter(this, void 0, void 0, function* () {
+    const fn = (call) => __awaiter(this, void 0, void 0, function* () {
         const { ref } = call.request;
         logger.verbose("call to deleteApplication", { ref });
         yield prisma.application.delete({ where: { ref } });
         return { ref };
-    }), (ref) => getFn(ref));
+    });
+    return (0, common_1.withErrorHandlingAndValidation)((0, identity_1.withAccess)(fn, (ref) => getFn(ref)), common_1.Validators.baseApiObjectSchema);
 }

package/dist/applications/getApplication.d.ts

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

package/dist/applications/getApplication.js

@@ -28,17 +28,19 @@ exports.getApplication = getApplication;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const identity_1 = require("@fonoster/identity");
+const common_1 = require("@fonoster/common");
 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);
-    return (0, identity_1.withAccess)((call) => __awaiter(this, void 0, void 0, function* () {
+    const fn = (call) => __awaiter(this, void 0, void 0, function* () {
         const { ref } = call.request;
         logger.verbose("call to getApplication", { ref });
         const result = yield getFn(ref);
         return result ? (0, applicationWithEncodedStruct_1.applicationWithEncodedStruct)(result) : null;
-    }), (ref) => getFn(ref));
+    });
+    return (0, withErrorHandlingAndValidationAndAccess_1.withErrorHandlingAndValidationAndAccess)(fn, (ref) => getFn(ref), common_1.Validators.baseApiObjectSchema);
 }

package/dist/applications/listApplications.d.ts

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

package/dist/applications/listApplications.js

@@ -34,7 +34,7 @@ const logger_1 = require("@fonoster/logger");
 const applicationWithEncodedStruct_1 = require("./utils/applicationWithEncodedStruct");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 function listApplications(prisma) {
-    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
+    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);
@@ -43,26 +43,22 @@ function listApplications(prisma) {
             pageSize,
             pageToken
         });
-        try {
-            const result = yield prisma.application.findMany({
-                where: { accessKeyId },
-                include: {
-                    textToSpeech: true,
-                    speechToText: true,
-                    intelligence: true
-                },
-                take: pageSize,
-                skip: pageToken ? 1 : 0,
-                cursor: pageToken ? { ref: pageToken } : undefined
-            });
-            const items = result.map(applicationWithEncodedStruct_1.applicationWithEncodedStruct);
-            callback(null, {
-                items,
-                nextPageToken: (_a = result[result.length - 1]) === null || _a === void 0 ? void 0 : _a.ref
-            });
-        }
-        catch (error) {
-            (0, common_1.handleError)(error, callback);
-        }
+        const result = yield prisma.application.findMany({
+            where: { accessKeyId },
+            include: {
+                textToSpeech: true,
+                speechToText: true,
+                intelligence: true
+            },
+            take: pageSize,
+            skip: pageToken ? 1 : 0,
+            cursor: pageToken ? { ref: pageToken } : undefined
+        });
+        const items = result.map(applicationWithEncodedStruct_1.applicationWithEncodedStruct);
+        callback(null, {
+            items,
+            nextPageToken: (_a = result[result.length - 1]) === null || _a === void 0 ? void 0 : _a.ref
+        });
     });
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.listRequestSchema);
 }

package/dist/applications/updateApplication.d.ts

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

package/dist/applications/updateApplication.js

@@ -28,6 +28,7 @@ exports.updateApplication = updateApplication;
  * 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");
 const logger_1 = require("@fonoster/logger");
 const createGetFnUtil_1 = require("./createGetFnUtil");
@@ -36,15 +37,15 @@ const validOrThrow_1 = require("./utils/validOrThrow");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 function updateApplication(prisma) {
     const getFn = (0, createGetFnUtil_1.createGetFnUtil)(prisma);
-    return (0, identity_1.withAccess)((call) => __awaiter(this, void 0, void 0, function* () {
-        const { type, ref: applicationRef } = call.request;
+    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);
-        (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: {
@@ -66,9 +67,10 @@ function updateApplication(prisma) {
                     ref: applicationRef,
                     accessKeyId
                 },
-                data: (0, convertToApplicationData_1.convertToApplicationData)(call.request)
+                data: (0, convertToApplicationData_1.convertToApplicationData)(request)
             })
         ]);
         return { ref: applicationRef };
-    }), (ref) => getFn(ref));
+    });
+    return (0, common_1.withErrorHandling)((0, identity_1.withAccess)(fn, (ref) => getFn(ref)));
 }

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

@@ -19,6 +19,7 @@ exports.getApplicationValidationSchema = getApplicationValidationSchema;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const common_1 = require("@fonoster/common");
 const client_1 = require("@prisma/client");
 const zod_1 = require("zod");
 const Deepgram_1 = require("../../voice/stt/Deepgram");
@@ -26,8 +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");
-const hostOrHostPortSchema_1 = require("../hostOrHostPortSchema");
-// 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,9 +51,9 @@ 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: hostOrHostPortSchema_1.hostOrHostPortSchema,
+        endpoint: common_1.hostOrHostPortSchema,
         textToSpeech: ttsEngineName
             ? zod_1.z.object({
                 productRef: zod_1.z.string(),

package/dist/calls/buildService.d.ts

@@ -8,19 +8,17 @@ declare function buildService(influxdb: InfluxDBClient): Promise<{
     };
     handlers: {
         createCall: (call: {
-            request: import("@fonoster/types").CreateCallRequest;
-        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/common").BaseApiObject) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         listCalls: (call: {
-            request: import("./types").ListCallsRequest;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("./types").ListCallsResponse) => void) => Promise<void>;
+            request: unknown;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
         getCall: (call: {
-            request: import("./types").GetCallRequest;
-        }, callback: (error: import("@fonoster/common").GrpcErrorMessage, response?: import("./types").CallDetailRecord) => void) => Promise<void>;
+            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

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

package/dist/calls/createCall.js

@@ -32,42 +32,30 @@ 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) {
-    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const { from, to, appRef, timeout } = call.request;
-            const ref = (0, uuid_1.v4)();
-            logger.verbose("call to createCall", Object.assign(Object.assign({}, call.request), { ref }));
-            CreateCallRequestSchema.parse(call.request);
-            const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
-            const app = yield prisma.application.findUnique({
-                where: { ref: appRef, accessKeyId }
-            });
-            if (!app) {
-                throw (0, notFoundError_1.notFoundError)(`Application with ref ${appRef} not found`);
-            }
-            // TODO: Must validate that the from number exists and is owned by the user
-            publisher.publishCall({
-                ref,
-                from,
-                to,
-                appRef,
-                accessKeyId,
-                timeout: timeout || 60
-            });
-            callback(null, { ref });
-        }
-        catch (error) {
-            (0, common_1.handleError)(error, callback);
+    const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
+        const { request } = call;
+        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 app = yield prisma.application.findUnique({
+            where: { ref: appRef, accessKeyId }
+        });
+        if (!app) {
+            throw (0, notFoundError_1.notFoundError)(`Application with ref ${appRef} not found`);
         }
+        publisher.publishCall({
+            ref,
+            from,
+            to,
+            appRef,
+            accessKeyId,
+            timeout: timeout || 60
+        });
+        callback(null, { ref });
     });
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.createCallRequestSchema);
 }

package/dist/calls/getCall.d.ts

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

package/dist/calls/getCall.js

@@ -31,29 +31,20 @@ 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);
-    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const { ref } = call.request;
-            GetCallRequestSchema.parse({ ref });
-            const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
-            logger.verbose("call to getCall", { accessKeyId, ref });
-            const response = yield fetchSingleCall(accessKeyId, ref);
-            if (!response) {
-                throw (0, notFoundError_1.notFoundError)(`Call not found: ${ref}`);
-            }
-            callback(null, response);
-        }
-        catch (error) {
-            (0, common_1.handleError)(error, callback);
+    const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
+        const { ref } = call.request;
+        const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
+        logger.verbose("call to getCall", { accessKeyId, ref });
+        const response = yield fetchSingleCall(accessKeyId, ref);
+        if (!response) {
+            throw (0, notFoundError_1.notFoundError)(`Call not found: ${ref}`);
         }
+        callback(null, response);
     });
+    return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.getCallRequestSchema);
 }

package/dist/calls/listCalls.d.ts

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

package/dist/calls/listCalls.js

@@ -32,20 +32,15 @@ const common_1 = require("@fonoster/common");
 const identity_1 = require("@fonoster/identity");
 const logger_1 = require("@fonoster/logger");
 const createFetchCalls_1 = require("./createFetchCalls");
-const ListCallsRequestSchema_1 = require("./ListCallsRequestSchema");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 function listCalls(influx) {
     const fetchCalls = (0, createFetchCalls_1.createFetchCalls)(influx);
-    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const parsedRequest = ListCallsRequestSchema_1.ListCallsRequestSchema.parse(call.request);
-            const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
-            logger.verbose("call to listCalls", { parsedRequest, accessKeyId });
-            const result = yield fetchCalls(accessKeyId, parsedRequest);
-            callback(null, result);
-        }
-        catch (error) {
-            (0, common_1.handleError)(error, callback);
-        }
+    const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
+        const { request } = call;
+        const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
+        logger.verbose("call to listCalls", { request, accessKeyId });
+        const result = yield fetchCalls(accessKeyId, request);
+        callback(null, result);
     });
+    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,18 +21,13 @@ 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.ANSWER,
     common_1.DialStatus.BUSY,
     common_1.DialStatus.FAILED,
     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);
@@ -58,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/calls/types.d.ts

@@ -59,4 +59,4 @@ type TrackCallSubscriber = {
         on: (event: string, cb: (data: TrackCallResponse | Error) => void) => void;
     };
 };
-export { CALL_DETAIL_RECORD_MEASUREMENT, CallDetailRecord, ListCallsRequest, ListCallsResponse, GetCallRequest, CallType, CallStatus, CallDirection, InfluxDBClient, CreateCallRequest, CallPublisher, TrackCallResponse, CallStream, TrackCallSubscriber };
+export { CALL_DETAIL_RECORD_MEASUREMENT, CallDetailRecord, CallDirection, CallPublisher, CallStatus, CallStream, CallType, CreateCallRequest, GetCallRequest, InfluxDBClient, ListCallsRequest, ListCallsResponse, TrackCallResponse, TrackCallSubscriber };

package/dist/calls/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CallDirection = exports.CallStatus = exports.CallType = exports.CALL_DETAIL_RECORD_MEASUREMENT = void 0;
+exports.CallType = exports.CallStatus = exports.CallDirection = exports.CALL_DETAIL_RECORD_MEASUREMENT = void 0;
 const types_1 = require("@fonoster/types");
 Object.defineProperty(exports, "CallDirection", { enumerable: true, get: function () { return types_1.CallDirection; } });
 Object.defineProperty(exports, "CallStatus", { enumerable: true, get: function () { return types_1.CallStatus; } });

package/dist/core/db.d.ts

@@ -10,4 +10,4 @@ declare const prisma: import("@prisma/client/runtime/library").DynamicClientExte
     client: {};
 }, {}>;
 type Prisma = typeof prisma;
-export { prisma, Prisma };
+export { Prisma, prisma };