@fonoster/apiserver 0.7.22 → 0.7.23

package/dist/core/filesServer.d.ts

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

package/dist/core/filesServer.js

@@ -4,50 +4,46 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.filesServer = filesServer;
-/*
- * 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 fs_1 = __importDefault(require("fs"));
-const path_1 = require("path");
 const logger_1 = require("@fonoster/logger");
 const express_1 = __importDefault(require("express"));
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 const CONTENT_TYPE = "audio/L16;rate=16000;channels=1";
 function filesServer(params) {
-    const { pathToFiles, port } = params;
+    const { port } = params;
     const app = (0, express_1.default)();
-    app.get("/sounds/:file", (req, res) => {
-        const filePath = (0, path_1.join)(pathToFiles, req.params.file);
-        fs_1.default.access(filePath, fs_1.default.constants.F_OK, (err) => {
-            if (err) {
-                res.status(404).send("File not found!");
-                return;
-            }
-            res.setHeader("content-type", CONTENT_TYPE);
-            const readStream = fs_1.default.createReadStream(filePath);
-            readStream.on("error", (error) => {
-                logger.error(`Error reading file: ${error.message}`);
-                res.status(500).send("Error reading file!");
-            });
-            readStream.pipe(res);
+    const streamMap = new Map();
+    app.get("/sounds/:id", (req, res) => {
+        const idWithoutExtension = req.params.id.split(".")[0];
+        const stream = streamMap.get(idWithoutExtension);
+        if (!stream) {
+            res.status(404).send(`Stream not found for id: ${req.params.id}`);
+            return;
+        }
+        res.setHeader("content-type", CONTENT_TYPE);
+        stream.on("error", (error) => {
+            logger.error(`Error reading file: ${error.message}`);
+            res.status(500).send("Error reading file!");
         });
+        stream.on("end", () => {
+            res.end();
+        });
+        stream.on("close", () => {
+            res.end();
+        });
+        stream.pipe(res);
     });
     app.listen(port, () => {
         logger.info(`Files server is running on port ${port}`);
     });
+    return {
+        addStream: (id, stream) => {
+            streamMap.set(id, stream);
+        },
+        removeStream: (id) => {
+            streamMap.delete(id);
+        },
+        getStream: (id) => {
+            return streamMap.get(id);
+        }
+    };
 }

package/dist/core/runServices.js

@@ -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)();
+        yield (0, connectToAri_1.connectToAri)((0, filesServer_1.filesServer)({ port: envs_1.FILES_SERVER_PORT }));
         // Additional Call Managers subscriber may be added here to handle call events
         yield (0, runCallManager_1.createCreateCallSubscriber)({
             natsUrl: envs_1.NATS_URL,
@@ -87,7 +87,6 @@ function runServices() {
             ariUsername: envs_1.ASTERISK_ARI_USERNAME,
             ariPassword: envs_1.ASTERISK_ARI_SECRET
         });
-        (0, filesServer_1.filesServer)({ pathToFiles: envs_1.TTS_PATH_TO_FILES, port: envs_1.FILES_SERVER_PORT });
         server.bindAsync(envs_1.APISERVER_BIND_ADDR, credentials, () => __awaiter(this, void 0, void 0, function* () {
             healthImpl.setStatus("", common_1.GRPC_SERVING_STATUS);
             logger.info(`apiserver running at ${envs_1.APISERVER_BIND_ADDR}`);

package/dist/envs.d.ts

@@ -41,4 +41,3 @@ 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 TTS_PATH_TO_FILES: 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.TTS_PATH_TO_FILES = 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.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;
 /*
  * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/fonoster
@@ -24,7 +24,6 @@ exports.TTS_PATH_TO_FILES = exports.SMTP_SENDER = exports.SMTP_SECURE = exports.
  * limitations under the License.
  */
 const fs_1 = __importDefault(require("fs"));
-const os_1 = __importDefault(require("os"));
 const path_1 = require("path");
 const common_1 = require("@fonoster/common");
 const dotenv_1 = __importDefault(require("dotenv"));
@@ -108,4 +107,3 @@ 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;
-exports.TTS_PATH_TO_FILES = e.TTS_PATH_TO_FILES || os_1.default.tmpdir();

package/dist/voice/VoiceClientImpl.d.ts

@@ -16,17 +16,17 @@ declare class VoiceClientImpl implements VoiceClient {
     asStream: Stream;
     ari: Client;
     bridge: Bridge;
+    filesServer: any;
     constructor(params: {
         ari: Client;
         config: VoiceClientConfig;
         tts: TextToSpeech;
         stt: SpeechToText;
-    });
+    }, filesServer: any);
     connect(): Promise<void>;
     setupAudioSocket(port: number): void;
     on(type: string, callback: (data: VoiceIn) => void): void;
     sendResponse(response: VoiceIn): void;
-    getBridge(): Bridge;
     getTranscriptionsStream(): Stream;
     setupExternalMedia(port: number): Promise<void>;
     synthesize(text: string, options: SayOptions): Promise<string>;

package/dist/voice/VoiceClientImpl.js

@@ -58,13 +58,13 @@ const logger_1 = require("@fonoster/logger");
 const streams_1 = require("@fonoster/streams");
 const grpc = __importStar(require("@grpc/grpc-js"));
 const pick_port_1 = require("pick-port");
-const createExternalMediaConfig_1 = require("./createExternalMediaConfig");
 const transcribeOnConnection_1 = require("./transcribeOnConnection");
 const types_1 = require("./types");
-const VoiceServiceClientConst_1 = require("./VoiceServiceClientConst");
+const createExternalMediaConfig_1 = require("./utils/createExternalMediaConfig");
+const VoiceServiceClientConstructor_1 = require("./utils/VoiceServiceClientConstructor");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 class VoiceClientImpl {
-    constructor(params) {
+    constructor(params, filesServer) {
         const { config, tts, stt, ari } = params;
         this.config = config;
         this.verbsStream = new stream_1.Stream();
@@ -72,10 +72,11 @@ class VoiceClientImpl {
         this.tts = tts;
         this.stt = stt;
         this.ari = ari;
+        this.filesServer = filesServer;
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.grpcClient = new VoiceServiceClientConst_1.VoiceServiceClient(this.config.endpoint, grpc.credentials.createInsecure());
+            this.grpcClient = new VoiceServiceClientConstructor_1.VoiceServiceClientConstructor(this.config.endpoint, grpc.credentials.createInsecure());
             const metadata = new grpc.Metadata();
             metadata.add("accessKeyId", this.config.accessKeyId);
             metadata.add("token", this.config.sessionToken);
@@ -115,9 +116,6 @@ class VoiceClientImpl {
     sendResponse(response) {
         this.voice.write(response);
     }
-    getBridge() {
-        return this.bridge;
-    }
     getTranscriptionsStream() {
         return this.transcriptionsStream;
     }
@@ -150,7 +148,9 @@ class VoiceClientImpl {
     }
     synthesize(text, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.tts.synthesize(text, options);
+            const { ref, stream } = yield this.tts.synthesize(text, options);
+            this.filesServer.addStream(ref, stream);
+            return ref;
         });
     }
     transcribe() {

package/dist/voice/VoiceDispatcher.js

@@ -32,8 +32,8 @@ const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
 const handlers_1 = require("./handlers");
 const Stream_1 = require("./handlers/Stream");
-const makeGetChannelVar_1 = require("./makeGetChannelVar");
 const types_1 = require("./types");
+const makeGetChannelVarWithoutThrow_1 = require("./utils/makeGetChannelVarWithoutThrow");
 const utils_1 = require("../utils");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 class VoiceDispatcher {
@@ -55,7 +55,7 @@ class VoiceDispatcher {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             const { ari, voiceClients, createVoiceClient, isHandledElsewhere } = this;
-            const getChannelVar = (0, makeGetChannelVar_1.makeGetChannelVarWithoutThrow)(channel);
+            const getChannelVar = (0, makeGetChannelVarWithoutThrow_1.makeGetChannelVarWithoutThrow)(channel);
             const appRef = (_a = (yield getChannelVar(types_1.ChannelVar.APP_REF))) === null || _a === void 0 ? void 0 : _a.value;
             // This check feels strange but is necessary as ARI calls this event twice
             if (!appRef) {
@@ -107,7 +107,7 @@ class VoiceDispatcher {
     isHandledElsewhere(channel) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            return (((_a = (yield (0, makeGetChannelVar_1.makeGetChannelVarWithoutThrow)(channel)(types_1.ChannelVar.FROM_EXTERNAL_MEDIA))) === null || _a === void 0 ? void 0 : _a.value) === "true");
+            return (((_a = (yield (0, makeGetChannelVarWithoutThrow_1.makeGetChannelVarWithoutThrow)(channel)(types_1.ChannelVar.FROM_EXTERNAL_MEDIA))) === null || _a === void 0 ? void 0 : _a.value) === "true");
         });
     }
 }

package/dist/voice/connectToAri.d.ts

@@ -1,2 +1,2 @@
-declare function connectToAri(): Promise<void>;
+declare function connectToAri(filesServer: any): Promise<void>;
 export { connectToAri };

package/dist/voice/connectToAri.js

@@ -48,7 +48,7 @@ const connection = {
     timeout: 5000,
     output: "silent"
 };
-function connectToAri() {
+function connectToAri(filesServer) {
     return __awaiter(this, void 0, void 0, function* () {
         logger.info("waiting for asterisk server");
         const open = yield (0, wait_port_1.default)(connection);
@@ -59,12 +59,12 @@ function connectToAri() {
             });
             ari.on(types_1.AriEvent.WEB_SOCKET_MAX_RETRIES, () => {
                 logger.error("max retries reconnecting to asterisk");
-                attemptReconnection();
+                attemptReconnection(filesServer);
             });
             logger.info("asterisk is ready");
             const createContainer = (0, integrations_1.makeCreateContainer)(db_1.prisma, envs_1.INTEGRATIONS_FILE);
             const nats = yield (0, nats_1.connect)({ servers: envs_1.NATS_URL });
-            const dispatcher = new VoiceDispatcher_1.VoiceDispatcher(ari, nats, (0, makeCreateVoiceClient_1.makeCreateVoiceClient)(createContainer));
+            const dispatcher = new VoiceDispatcher_1.VoiceDispatcher(ari, nats, (0, makeCreateVoiceClient_1.makeCreateVoiceClient)(createContainer, filesServer));
             dispatcher.start();
         }
         else {
@@ -73,9 +73,9 @@ function connectToAri() {
         }
     });
 }
-function attemptReconnection() {
+function attemptReconnection(filesServer) {
     logger.info("attempting to reconnect in 5 seconds...");
     setTimeout(() => {
-        connectToAri();
+        connectToAri(filesServer);
     }, 5000); // Reconnect after 5 seconds
 }

package/dist/voice/{ChannelVarNotFoundError.d.ts → errors/ChannelVarNotFoundError.d.ts}

@@ -1,4 +1,4 @@
-import { ChannelVar } from "./types";
+import { ChannelVar } from "../types";
 declare class ChannelVarNotFoundError extends Error {
     constructor(variable: ChannelVar);
 }

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

@@ -0,0 +1,2 @@
+export * from "./ChannelVarNotFoundError";
+export * from "./MethodNotImplementedError";

package/dist/voice/errors/index.js

@@ -0,0 +1,36 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/*
+ * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster/fonoster
+ *
+ * This file is part of Fonoster
+ *
+ * Licensed under the MIT License (the "License");
+ * you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *    https://opensource.org/licenses/MIT
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+__exportStar(require("./ChannelVarNotFoundError"), exports);
+__exportStar(require("./MethodNotImplementedError"), exports);

package/dist/voice/handlers/Say.js

@@ -28,10 +28,10 @@ function sayHandler(ari, voiceClient) {
         const { sessionRef: channelId } = request;
         sayRequestSchema.parse(request);
         const playbackRef = request.playbackRef || (0, nanoid_1.nanoid)(10);
-        const filename = yield voiceClient.synthesize(request.text, request.options ? pb_util_1.struct.decode(request.options) : {});
+        const mediaId = yield voiceClient.synthesize(request.text, request.options ? pb_util_1.struct.decode(request.options) : {});
         yield ari.channels.play({
             channelId,
-            media: getMediaUrl(filename),
+            media: getMediaUrl(mediaId),
             playbackId: playbackRef
         });
         yield (0, awaitForPlaybackFinished_1.awaitForPlaybackFinished)(ari, playbackRef);

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

@@ -35,8 +35,8 @@ const handleStasisEnd_1 = require("./handleStasisEnd");
 const handleStasisStart_1 = require("./handleStasisStart");
 const envs_1 = require("../../../envs");
 const utils_1 = require("../../../utils");
-const makeGetChannelVar_1 = require("../../makeGetChannelVar");
 const types_1 = require("../../types");
+const makeGetChannelVar_1 = require("../../utils/makeGetChannelVar");
 // TODO: Needs request validation
 function dialHandler(ari, voiceClient) {
     return (request) => __awaiter(this, void 0, void 0, function* () {

package/dist/voice/integrations/getTtsConfig.d.ts

@@ -3,6 +3,5 @@ import { IntegrationConfig } from "./types";
 declare function getTtsConfig(integrations: IntegrationConfig[], app: Application): {
     config: Record<string, unknown>;
     credentials: Record<string, unknown>;
-    pathToFiles: string;
 };
 export { getTtsConfig };

package/dist/voice/integrations/getTtsConfig.js

@@ -2,13 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTtsConfig = getTtsConfig;
 const findIntegrationsCredentials_1 = require("./findIntegrationsCredentials");
-const envs_1 = require("../../envs");
 function getTtsConfig(integrations, app) {
     const config = app.textToSpeech.config;
     const credentials = (0, findIntegrationsCredentials_1.findIntegrationsCredentials)(integrations, app.textToSpeech.productRef);
     return {
         config,
-        credentials,
-        pathToFiles: envs_1.TTS_PATH_TO_FILES
+        credentials
     };
 }

package/dist/voice/makeCreateVoiceClient.d.ts

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

package/dist/voice/makeCreateVoiceClient.js

@@ -30,21 +30,21 @@ exports.makeCreateVoiceClient = makeCreateVoiceClient;
  */
 const identity_1 = require("@fonoster/identity");
 const logger_1 = require("@fonoster/logger");
-const makeGetChannelVar_1 = require("./makeGetChannelVar");
 const types_1 = require("./types");
+const makeGetChannelVarWithoutThrow_1 = require("./utils/makeGetChannelVarWithoutThrow");
 const VoiceClientImpl_1 = require("./VoiceClientImpl");
 const identityConfig_1 = require("../core/identityConfig");
 const mapCallDirectionToEnum_1 = require("../events/mapCallDirectionToEnum");
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
 const createToken = (0, identity_1.createCallAccessToken)(identityConfig_1.identityConfig);
 // Note: By the time the call arrives here the owner of the app MUST be authenticated
-function makeCreateVoiceClient(createContainer) {
+function makeCreateVoiceClient(createContainer, filesServer) {
     return (params) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         const { ari, event, channel } = params;
         const { id: sessionRef, caller } = event.channel;
         const { name: callerName, number: callerNumber } = caller;
-        const getChannelVar = (0, makeGetChannelVar_1.makeGetChannelVarWithoutThrow)(channel);
+        const getChannelVar = (0, makeGetChannelVarWithoutThrow_1.makeGetChannelVarWithoutThrow)(channel);
         // Variables set by Asterisk's dialplan
         const callDirection = (_a = (yield getChannelVar(types_1.ChannelVar.CALL_DIRECTION))) === null || _a === void 0 ? void 0 : _a.value;
         const appRef = (_b = (yield getChannelVar(types_1.ChannelVar.APP_REF))) === null || _b === void 0 ? void 0 : _b.value;
@@ -69,6 +69,6 @@ function makeCreateVoiceClient(createContainer) {
             callerNumber,
             ingressNumber
         });
-        return new VoiceClientImpl_1.VoiceClientImpl({ ari, config, tts, stt });
+        return new VoiceClientImpl_1.VoiceClientImpl({ ari, config, tts, stt }, filesServer);
     });
 }

package/dist/voice/stt/AbstractSpeechToText.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractSpeechToText = void 0;
-const MethodNotImplementedError_1 = require("../MethodNotImplementedError");
+const MethodNotImplementedError_1 = require("../errors/MethodNotImplementedError");
 class AbstractSpeechToText {
     constructor(config) {
         this.config = config;

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

@@ -1,18 +1,17 @@
+import { Readable } from "stream";
 import * as z from "zod";
-import { SynthOptions, TtsConfig } from "./types";
-declare abstract class AbstractTextToSpeech<E, T extends TtsConfig = TtsConfig, S extends SynthOptions = SynthOptions> {
+import { SynthOptions } from "./types";
+declare abstract class AbstractTextToSpeech<E, S extends SynthOptions = SynthOptions> {
     abstract readonly engineName: E;
     protected abstract OUTPUT_FORMAT: "wav" | "sln16";
     protected abstract CACHING_FIELDS: string[];
-    config: T;
-    constructor(config: T);
-    protected createFilename(text: string, options: SynthOptions): string;
-    protected fileExists(filename: string): boolean;
-    protected getFilenameWithoutExtension(filename: string): string;
-    protected getFullPathToFile(filename: string): string;
-    abstract synthesize(text: string, options: S): Promise<string>;
+    abstract synthesize(text: string, options: S): Promise<{
+        ref: string;
+        stream: Readable;
+    }>;
     static getConfigValidationSchema(): z.Schema;
     static getCredentialsValidationSchema(): z.Schema;
+    protected createMediaReference(): string;
     getName(): E;
 }
 export { AbstractTextToSpeech };

package/dist/voice/tts/AbstractTextToSpeech.js

@@ -1,80 +1,18 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractTextToSpeech = void 0;
-/*
- * 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 fs = __importStar(require("fs"));
-const logger_1 = require("@fonoster/logger");
-const computeFilename_1 = require("./computeFilename");
-const MethodNotImplementedError_1 = require("../MethodNotImplementedError");
-const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
+const uuid_1 = require("uuid");
+const MethodNotImplementedError_1 = require("../errors/MethodNotImplementedError");
 class AbstractTextToSpeech {
-    constructor(config) {
-        logger.silly("tts pathToFiles", { engine: config.pathToFiles });
-        this.config = config;
-    }
-    createFilename(text, options) {
-        return (0, computeFilename_1.computeFilename)({
-            text,
-            options,
-            cachingFields: this.CACHING_FIELDS,
-            format: this.OUTPUT_FORMAT
-        });
-    }
-    fileExists(filename) {
-        return fs.existsSync(filename);
-    }
-    getFilenameWithoutExtension(filename) {
-        return filename.replace(`.${this.OUTPUT_FORMAT}`, "");
-    }
-    getFullPathToFile(filename) {
-        return `${this.config.pathToFiles}/${filename}`;
-    }
     static getConfigValidationSchema() {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
     static getCredentialsValidationSchema() {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
+    createMediaReference() {
+        return (0, uuid_1.v4)();
+    }
     getName() {
         return this.engineName;
     }

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

@@ -1,9 +1,10 @@
+import { Readable } from "stream";
 import * as sdk from "microsoft-cognitiveservices-speech-sdk";
 import * as z from "zod";
 import { AbstractTextToSpeech } from "./AbstractTextToSpeech";
-import { SynthOptions, TtsConfig } from "./types";
+import { SynthOptions } from "./types";
 declare const ENGINE_NAME = "tts.azure";
-type AzureTTSConfig = TtsConfig & {
+type AzureTTSConfig = {
     [key: string]: Record<string, string>;
     credentials: {
         subscriptionKey: string;
@@ -12,15 +13,16 @@ type AzureTTSConfig = TtsConfig & {
 };
 declare class Azure extends AbstractTextToSpeech<typeof ENGINE_NAME> {
     config: AzureTTSConfig;
-    pathToFiles: string;
     readonly engineName = "tts.azure";
     protected readonly OUTPUT_FORMAT = "sln16";
     protected readonly CACHING_FIELDS: string[];
     constructor(config: AzureTTSConfig);
-    synthesize(text: string, options: SynthOptions): Promise<string>;
+    synthesize(text: string, options: SynthOptions): Promise<{
+        ref: string;
+        stream: Readable;
+    }>;
     doSynthesize(params: {
         text: string;
-        filename: string;
         speechConfig: sdk.SpeechConfig;
         isSSML?: boolean;
     }): Promise<unknown>;

package/dist/voice/tts/Azure.js

@@ -51,6 +51,7 @@ exports.ENGINE_NAME = exports.Azure = void 0;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const stream_1 = require("stream");
 const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
 const sdk = __importStar(require("microsoft-cognitiveservices-speech-sdk"));
@@ -60,9 +61,10 @@ const isSsml_1 = require("./isSsml");
 const ENGINE_NAME = "tts.azure";
 exports.ENGINE_NAME = ENGINE_NAME;
 const logger = (0, logger_1.getLogger)({ service: "apiserver", filePath: __filename });
+// XXX: Must re-implement to provide an id an a Readable stream
 class Azure extends AbstractTextToSpeech_1.AbstractTextToSpeech {
     constructor(config) {
-        super(config);
+        super();
         this.engineName = ENGINE_NAME;
         this.OUTPUT_FORMAT = "sln16";
         this.CACHING_FIELDS = ["voice"];
@@ -71,11 +73,6 @@ class Azure extends AbstractTextToSpeech_1.AbstractTextToSpeech {
     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 effectiveOptions = Object.assign(Object.assign({}, this.config), options);
-            const filename = this.createFilename(text, effectiveOptions);
-            if (this.fileExists(this.getFullPathToFile(filename))) {
-                return this.getFilenameWithoutExtension(filename);
-            }
             const { subscriptionKey, serviceRegion } = this.config.credentials;
             const speechConfig = sdk.SpeechConfig.fromSubscription(subscriptionKey, serviceRegion);
             speechConfig.speechSynthesisVoiceName = options.voice;
@@ -83,24 +80,24 @@ class Azure extends AbstractTextToSpeech_1.AbstractTextToSpeech {
                 sdk.SpeechSynthesisOutputFormat.Riff16Khz16BitMonoPcm;
             yield this.doSynthesize({
                 text,
-                filename: this.getFullPathToFile(filename),
                 speechConfig,
                 isSSML: (0, isSsml_1.isSsml)(text)
             });
-            return this.getFilenameWithoutExtension(filename);
+            const ref = this.createMediaReference();
+            // TODO: Fix this placeholder
+            return { ref, stream: new stream_1.Readable() };
         });
     }
     doSynthesize(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { text, filename, speechConfig } = params;
-            const audioConfig = sdk.AudioConfig.fromAudioFileOutput(filename);
-            const synthesizer = new sdk.SpeechSynthesizer(speechConfig, audioConfig);
+            const { text, speechConfig } = params;
+            const synthesizer = new sdk.SpeechSynthesizer(speechConfig);
             // FIXME: Let's turn this into constants
             const func = params.isSSML ? "speakSsmlAsync" : "speakTextAsync";
             return new Promise((resolve, reject) => {
                 synthesizer[func](text, function (result) {
                     if (result.reason === sdk.ResultReason.SynthesizingAudioCompleted) {
-                        resolve(filename);
+                        resolve("");
                     }
                     else {
                         reject(new Error("speech synthesis canceled: " + result.errorDetails));