@fonoster/voice 0.4.8 → 0.4.10

package/dist/dial/status_stream.js

@@ -20,6 +20,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const stream_1 = require("stream");
 class StatusStream {
+    stream;
     constructor() {
         this.stream = new stream_1.Stream();
     }

package/dist/gather/gather.js

@@ -14,6 +14,7 @@ const defaultOptions = {
     source: "dtmf"
 };
 class GatherVerb extends verb_1.Verb {
+    speechProvider;
     constructor(request, speechProvider) {
         super(request);
         this.speechProvider = speechProvider;

package/dist/playback/playback.js

@@ -25,6 +25,7 @@ exports.PlaybackControl = void 0;
 const verb_1 = require("../verb");
 const logger_1 = __importDefault(require("@fonoster/logger"));
 class PlaybackControl extends verb_1.Verb {
+    playbackId;
     constructor(request, playbackId) {
         super(request);
         this.playbackId = playbackId;

package/dist/server.d.ts

@@ -1,10 +1,8 @@
 import { ServerConfig } from "./types";
 import { Plugin } from "@fonoster/common";
-import { VoiceTracer } from "./tracer";
 export default class VoiceServer {
     config: ServerConfig;
     plugins: {};
-    voiceTracer: VoiceTracer;
     constructor(config?: ServerConfig);
     /**
      * Add tts or asr plugin.

package/dist/server.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
-const tracer_1 = require("./tracer");
 const utils_1 = require("./utils");
 const voice_1 = __importDefault(require("./voice"));
 const logger_1 = __importDefault(require("@fonoster/logger"));
@@ -19,10 +18,11 @@ const defaultServerConfig = {
     base: "/",
     port: 3000,
     bind: "0.0.0.0",
-    pathToFiles: os_1.default.tmpdir(),
-    otlSpanExporters: []
+    pathToFiles: os_1.default.tmpdir()
 };
 class VoiceServer {
+    config;
+    plugins;
     constructor(config = defaultServerConfig) {
         this.config = merge(defaultServerConfig, config);
         this.init();
@@ -45,9 +45,7 @@ class VoiceServer {
             res.send("pong");
         });
         app.post(path_1.posix.join(this.config.base), async (req, res) => {
-            this.voiceTracer = new tracer_1.VoiceTracer(this.config.otlSpanExporters);
-            this.voiceTracer.init();
-            const response = new voice_1.default(req.body, this.voiceTracer);
+            const response = new voice_1.default(req.body);
             response.plugins = this.plugins;
             handler(req.body, response);
             res.end();

package/dist/sgather/gather.js

@@ -13,6 +13,7 @@ const defaultOptions = {
     source: "speech,dtmf"
 };
 class SGatherVerb extends verb_1.Verb {
+    speechProvider;
     constructor(request, speechProvider) {
         super(request);
         this.speechProvider = speechProvider;

package/dist/sgather/stream_data.js

@@ -24,6 +24,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const stream_1 = require("stream");
 const pubsub_js_1 = __importDefault(require("pubsub-js"));
 class StreamData {
+    stream;
+    dtmfSubscribeToken;
+    speechSubscribeToken;
     constructor() {
         this.stream = new stream_1.Stream();
     }

package/dist/types.d.ts

@@ -1,4 +1,3 @@
-import { MeterProvider } from "@opentelemetry/sdk-metrics-base";
 export interface VoiceRequest {
     accessKeyId: string;
     sessionToken: string;
@@ -15,8 +14,6 @@ export interface ServerConfig {
     port?: number;
     base?: string;
     pathToFiles?: string;
-    otlSpanExporters?: Array<any>;
-    meterProvider?: MeterProvider;
 }
 export interface VoiceEventData {
     type: string;

package/dist/verb.js

@@ -4,33 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Verb = void 0;
-/*
- * Copyright (C) 2023 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 axios_1 = __importDefault(require("axios"));
 const logger_1 = __importDefault(require("@fonoster/logger"));
-const auth = process.env.NODE_ENV != "production"
-    ? {
-        username: "admin",
-        password: "changeit"
-    }
-    : null;
 class Verb {
+    request;
     constructor(request) {
         this.request = request;
     }
@@ -46,7 +23,6 @@ class Verb {
         return await (0, axios_1.default)({
             method: "post",
             url,
-            auth,
             headers: {
                 "X-Session-Token": this.request.sessionToken,
                 "Content-Type": "application/json"
@@ -60,7 +36,6 @@ class Verb {
         return await (0, axios_1.default)({
             method: "delete",
             url,
-            auth,
             headers: {
                 "X-Session-Token": this.request.sessionToken
             }

package/dist/voice.d.ts

@@ -1,17 +1,16 @@
-import { GatherOptions } from "./gather/gather";
-import { MuteOptions } from "./mute/mute";
-import { PlayOptions } from "./play/play";
-import { RecordOptions, RecordResult } from "./record/record";
 import { PlaybackControl } from "./playback/playback";
 import { SayOptions } from "./say/types";
 import { VoiceRequest } from "./types";
 import { Plugin } from "@fonoster/common";
-import { SGatherOptions } from "./sgather/gather";
+import { DialOptions } from "./dial/types";
 import { SGatherStream } from "./sgather/types";
 import { DtmfOptions } from "./dtmf/types";
-import { DialOptions } from "./dial/types";
+import { SGatherOptions } from "./sgather/gather";
 import StreamStatus from "./dial/status_stream";
-import { VoiceTracer } from "./tracer";
+import { GatherOptions } from "./gather/gather";
+import { MuteOptions } from "./mute/mute";
+import { PlayOptions } from "./play/play";
+import { RecordOptions, RecordResult } from "./record/record";
 /**
  * @classdesc Use the VoiceResponse object, to construct advance Interactive
  * Voice Response (IVR) applications.
@@ -32,14 +31,13 @@ import { VoiceTracer } from "./tracer";
 export default class VoiceResponse {
     request: VoiceRequest;
     plugins: {};
-    voiceTracer: VoiceTracer;
     /**
      * Constructs a new VoiceResponse object.
      *
      * @param {VoiceRequest} request - Options to indicate the objects endpoint
      * @see module:core:APIClient
      */
-    constructor(request: VoiceRequest, voiceTracer: VoiceTracer);
+    constructor(request: VoiceRequest);
     /**
      * Adds a tts or asr plugin. Only one type of plugin can be attached.
      *
@@ -68,7 +66,7 @@ export default class VoiceResponse {
     play(media: string, options?: PlayOptions): Promise<void>;
     /**
      * Converts a text into a sound and sends sound to media server. To use this verb, you must
-     * first setup a TTS plugin such as MaryTTS, GoogleTTS, or AWS PollyTTS
+     * first setup a TTS plugin such as GoogleTTS, or AWS PollyTTS
      *
      * @param {string} text - Converts a text into a sound and sends sound to media server
      * @param {SayOptions} options - Optional parameters to alter the command's normal

package/dist/voice.js

@@ -21,21 +21,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const answer_1 = __importDefault(require("./answer/answer"));
-const hangup_1 = __importDefault(require("./hangup/hangup"));
-const unmute_1 = __importDefault(require("./unmute/unmute"));
-const gather_1 = __importDefault(require("./gather/gather"));
-const mute_1 = __importDefault(require("./mute/mute"));
-const play_1 = __importDefault(require("./play/play"));
-const record_1 = __importDefault(require("./record/record"));
 const playback_1 = require("./playback/playback");
 const asserts_1 = require("./asserts");
-const pubsub_js_1 = __importDefault(require("pubsub-js"));
 const verb_1 = require("./verb");
 const utils_1 = require("./utils");
-const gather_2 = __importDefault(require("./sgather/gather"));
+const gather_1 = __importDefault(require("./sgather/gather"));
 const dtmf_1 = __importDefault(require("./dtmf/dtmf"));
 const dial_1 = __importDefault(require("./dial/dial"));
+const pubsub_js_1 = __importDefault(require("pubsub-js"));
+const answer_1 = __importDefault(require("./answer/answer"));
+const hangup_1 = __importDefault(require("./hangup/hangup"));
+const unmute_1 = __importDefault(require("./unmute/unmute"));
+const gather_2 = __importDefault(require("./gather/gather"));
+const mute_1 = __importDefault(require("./mute/mute"));
+const play_1 = __importDefault(require("./play/play"));
+const record_1 = __importDefault(require("./record/record"));
 /**
  * @classdesc Use the VoiceResponse object, to construct advance Interactive
  * Voice Response (IVR) applications.
@@ -54,15 +54,16 @@ const dial_1 = __importDefault(require("./dial/dial"));
  * voiceServer.listen(handler, { port: 3000 })
  */
 class VoiceResponse {
+    request;
+    plugins;
     /**
      * Constructs a new VoiceResponse object.
      *
      * @param {VoiceRequest} request - Options to indicate the objects endpoint
      * @see module:core:APIClient
      */
-    constructor(request, voiceTracer) {
+    constructor(request) {
         this.request = request;
-        this.voiceTracer = voiceTracer;
         this.plugins = {};
     }
     /**
@@ -93,13 +94,11 @@ class VoiceResponse {
      * }
      */
     async play(media, options = {}) {
-        const span = this.voiceTracer.createSpan("play");
         await new play_1.default(this.request).run(media, options);
-        span.end();
     }
     /**
      * Converts a text into a sound and sends sound to media server. To use this verb, you must
-     * first setup a TTS plugin such as MaryTTS, GoogleTTS, or AWS PollyTTS
+     * first setup a TTS plugin such as GoogleTTS, or AWS PollyTTS
      *
      * @param {string} text - Converts a text into a sound and sends sound to media server
      * @param {SayOptions} options - Optional parameters to alter the command's normal
@@ -121,17 +120,9 @@ class VoiceResponse {
         (0, asserts_1.assertPluginExist)(this, "tts");
         const tts = this.plugins["tts"];
         // It should return the filename and the generated file location
-        const main = this.voiceTracer.createSpan("play");
-        const span = this.voiceTracer.createSpan("synthesize");
         const result = await tts.synthesize(text, options);
-        span.setAttribute("text", text);
-        span.setAttribute("options", JSON.stringify(options));
-        span.end();
         const media = `sound:${this.request.selfEndpoint}/tts/${result.filename}`;
         await new play_1.default(this.request).run(media, options);
-        main.setAttribute("media", media);
-        main.setAttribute("options", JSON.stringify(options));
-        main.end();
     }
     /**
      * Waits for data entry from the user's keypad or from a speech provider.
@@ -158,10 +149,7 @@ class VoiceResponse {
             (0, asserts_1.assertPluginExist)(this, "asr");
             asr = this.plugins["asr"];
         }
-        const span = this.voiceTracer.createSpan("gather");
-        const result = await new gather_1.default(this.request, asr).run(options);
-        span.setAttribute("options", JSON.stringify(options));
-        span.end();
+        const result = await new gather_2.default(this.request, asr).run(options);
         return result;
     }
     /**
@@ -196,7 +184,7 @@ class VoiceResponse {
             (0, asserts_1.assertPluginExist)(this, "asr");
             asr = this.plugins["asr"];
         }
-        return await new gather_2.default(this.request, asr).run(options);
+        return await new gather_1.default(this.request, asr).run(options);
     }
     /**
      * Sends dtmf tones to the current session.
@@ -212,11 +200,7 @@ class VoiceResponse {
      * }
      */
     async dtmf(options) {
-        const span = this.voiceTracer.createSpan("dtmf");
-        const result = await new dtmf_1.default(this.request).run(options);
-        span.setAttribute("options", JSON.stringify(options));
-        span.end();
-        return result;
+        return await new dtmf_1.default(this.request).run(options);
     }
     /**
      * Forwards the call to an Agent or the PSTN.
@@ -238,12 +222,7 @@ class VoiceResponse {
      * }
      */
     async dial(destination, options) {
-        const span = this.voiceTracer.createSpan("dial");
-        const result = await new dial_1.default(this.request).run(destination, options);
-        span.setAttribute("destination", destination);
-        span.setAttribute("options", JSON.stringify(options));
-        span.end();
-        return result;
+        return await new dial_1.default(this.request).run(destination, options);
     }
     /**
      * Returns a PlaybackControl control object.
@@ -267,11 +246,7 @@ class VoiceResponse {
      * }
      */
     playback(playbackId) {
-        const span = this.voiceTracer.createSpan("playback");
-        const result = new playback_1.PlaybackControl(this.request, playbackId);
-        span.setAttribute("playbackId", playbackId);
-        span.end();
-        return result;
+        return new playback_1.PlaybackControl(this.request, playbackId);
     }
     /**
      * Listens event publication.
@@ -312,11 +287,7 @@ class VoiceResponse {
      * }
      */
     async mute(options) {
-        const span = this.voiceTracer.createSpan("mute");
-        const result = new mute_1.default(this.request).run(options);
-        span.setAttribute("options", JSON.stringify(options));
-        span.end();
-        await result;
+        return new mute_1.default(this.request).run(options);
     }
     /**
      * Unmutes a channel.
@@ -332,11 +303,7 @@ class VoiceResponse {
      * }
      */
     async unmute(options) {
-        const span = this.voiceTracer.createSpan("unmute");
-        const result = new unmute_1.default(this.request).run(options);
-        span.setAttribute("options", JSON.stringify(options));
-        span.end();
-        await result;
+        return new unmute_1.default(this.request).run(options);
     }
     /**
      * Answer the communication channel. Before running any other verb you
@@ -350,10 +317,7 @@ class VoiceResponse {
      * }
      */
     async answer() {
-        const span = this.voiceTracer.createSpan("answer");
-        const result = new answer_1.default(this.request).run();
-        span.end();
-        await result;
+        return new answer_1.default(this.request).run();
     }
     /**
      * Terminates the communication channel.
@@ -366,12 +330,7 @@ class VoiceResponse {
      * }
      */
     async hangup() {
-        const span = this.voiceTracer.createSpan("hangup");
-        const result = new hangup_1.default(this.request).run();
-        span.end();
-        // Need to close or the span will be lost
-        this.voiceTracer.close();
-        await result;
+        return new hangup_1.default(this.request).run();
     }
     /**
      * Records the current channel and uploads the file to the storage subsystem.
@@ -392,24 +351,17 @@ class VoiceResponse {
      * }
      */
     async record(options) {
-        const span = this.voiceTracer.createSpan("record");
-        const result = await new record_1.default(this.request).run(options);
-        span.end();
-        return result;
+        return await new record_1.default(this.request).run(options);
     }
     // Requests media from Media server
     async openMediaPipe() {
-        const span = this.voiceTracer.createSpan("openMediaPipe");
         const genericVerb = new verb_1.Verb(this.request);
         await (0, utils_1.startMediaTransfer)(genericVerb, this.request.sessionId);
-        span.end();
     }
     // Requests media stop from Media server
     async closeMediaPipe() {
-        const span = this.voiceTracer.createSpan("stopMediaTransfer");
         const genericVerb = new verb_1.Verb(this.request);
         await (0, utils_1.stopMediaTransfer)(genericVerb, this.request.sessionId);
-        span.end();
     }
 }
 exports.default = VoiceResponse;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/voice",
-  "version": "0.4.8",
+  "version": "0.4.10",
   "description": "Voice verbs",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/fonoster#readme",
@@ -29,25 +29,16 @@
     "url": "https://github.com/fonoster/fonoster/issues"
   },
   "dependencies": {
-    "@fonoster/common": "^0.4.8",
-    "@fonoster/logger": "^0.4.7",
-    "@opentelemetry/api": "^1.0.4",
-    "@opentelemetry/instrumentation": "^0.27.0",
-    "@opentelemetry/instrumentation-express": "^0.27.0",
-    "@opentelemetry/instrumentation-http": "^0.27.0",
-    "@opentelemetry/resources": "^1.0.4",
-    "@opentelemetry/sdk-metrics-base": "0.27.0",
-    "@opentelemetry/sdk-trace-base": "^1.0.4",
-    "@opentelemetry/sdk-trace-node": "^1.0.4",
-    "@opentelemetry/semantic-conventions": "^1.0.4",
+    "@fonoster/common": "^0.4.10",
+    "@fonoster/logger": "^0.4.10",
+    "axios": "^1.6.2",
     "bson-objectid": "^2.0.2",
     "deepmerge": "^4.2.2",
     "express": "^4.17.1",
     "express-ws": "^4.0.0",
-    "pubsub-js": "^1.9.3",
-    "sync": "^0.2.5"
+    "pubsub-js": "^1.9.3"
   },
-  "gitHead": "e594d9c289ce814090b8133d3efb03561cfa7598",
+  "gitHead": "5803a7dc72afe7bf454896ae4c60c7565d27eb49",
   "devDependencies": {
     "@types/express": "^4.17.13",
     "@types/pubsub-js": "^1.8.2"

package/dist/tracer.d.ts

@@ -1,10 +0,0 @@
-import { Context, Span, Tracer } from "@opentelemetry/api";
-export declare class VoiceTracer {
-    callTracer: Tracer;
-    parentSpan: Span;
-    ctx: Context;
-    constructor(otlSpanExporters: Array<any>);
-    init(): void;
-    close(): void;
-    createSpan(name: string): Span;
-}

package/dist/tracer.js

@@ -1,56 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VoiceTracer = void 0;
-/*
- * Copyright (C) 2023 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 api_1 = __importDefault(require("@opentelemetry/api"));
-const resources_1 = require("@opentelemetry/resources");
-const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
-const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
-const { NodeTracerProvider } = require("@opentelemetry/sdk-trace-node");
-class VoiceTracer {
-    constructor(otlSpanExporters) {
-        // Configure span processor to send spans to the exporter
-        const provider = new NodeTracerProvider({
-            resource: new resources_1.Resource({
-                [semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]: "voice-service"
-            })
-        });
-        for (const exp of otlSpanExporters) {
-            const exporter = new exp.exporter(exp.config);
-            provider.addSpanProcessor(new sdk_trace_base_1.BatchSpanProcessor(exporter));
-        }
-        provider.register();
-        this.callTracer = api_1.default.trace.getTracer("call_tracer");
-    }
-    init() {
-        this.parentSpan = this.callTracer.startSpan("call");
-        this.ctx = api_1.default.trace.setSpan(api_1.default.context.active(), this.parentSpan);
-    }
-    close() {
-        this.parentSpan.end();
-    }
-    createSpan(name) {
-        return this.callTracer.startSpan(name, undefined, this.ctx);
-    }
-}
-exports.VoiceTracer = VoiceTracer;