@tiledesk/tiledesk-voice-twilio-connector 0.1.26 → 0.1.27

package/index.js

@@ -195,16 +195,8 @@ router.post('/webhook/:id_project', async (req, res) => {
     conversation_id: conversation_id,
     integrations: integrations
   }
-  if (!redis_client) {
-    return res.status(500).send({ message: "Redis not ready. Check redis connection..." })
-  }
-  //for (const [key, value] of Object.entries(redis_data)){
-  //  await redis_client.hSet('tiledesk:voice:'+callId, key, JSON.stringify(value))
-  //}
-  //await redis_client.expire('tiledesk:voice:'+callId, 86400)
-  
-  await redis_client.set('tiledesk:voice:'+callSid+':session', JSON.stringify(session_data), {'EX': 86400});
-  
+  voiceChannel.setSessionForCallId(callSid, session_data)
+
   let tiledeskMessage= {
     text:'/start',
     senderFullname: from,
@@ -262,8 +254,7 @@ router.post('/nextblock_old/:callSid/', async(req, res) => {
   let project_id, conversation_id, user;
   let from, to;
 
-  let redis_data = await redis_client.get('tiledesk:voice:'+callSid+':session');
-  //let redis_data = await redis_client.hGetAll('tiledesk:voice:'+callId);
+  let redis_data = await voiceChannel.getSessionForCallId(callSid)
   if (!redis_data) {
     return res.status(500).send({ success: "false", message: "Can't retrive data for callSid ->" + callSid });
   }
@@ -345,16 +336,13 @@ router.post('/nextblock/:callSid/', async(req, res) => {
   let confidence = req.body.Confidence
   let callSid = req.params.callSid;
   
-  let sessionInfo;
   let project_id, conversation_id, user;
   let from, to;
 
-  let redis_data = await redis_client.get('tiledesk:voice:'+callSid+':session');
-  //let redis_data = await redis_client.hGetAll('tiledesk:voice:'+callId);
-  if (!redis_data) {
+  let sessionInfo = await voiceChannel.getSessionForCallId(callSid)
+  if (!sessionInfo) {
     return res.status(500).send({ success: "false", message: "Can't retrive data for callSid ->" + callSid });
   }
-  sessionInfo = JSON.parse(redis_data)
   project_id = sessionInfo.project_id;
   from = sessionInfo.from;
   to = sessionInfo.to;
@@ -465,7 +453,7 @@ async function getMessage(callSid, ani, project_id, conversation_id){
       if (queue && queue.length > 0) {
         //CASE: queue has at least one message to reproduce --> get message from tiledesk queue and reset delayTime
         message = queue[0]
-        winston.debug('[getMessage] QUEUE --> '+ queue[0].text, queue[0])
+        winston.verbose('[getMessage] QUEUE --> '+ queue[0].text)
 
         // remove message from queue and reset delayIndex
         await tdChannel.removeMessageFromQueue(conversation_id, message._id)
@@ -486,7 +474,7 @@ async function getMessage(callSid, ani, project_id, conversation_id){
           }
 
           message = queue[0]
-          winston.debug(`[getMessage] Message received from subscription: ${message.text}`, message);
+          winston.verbose(`[getMessage] Message received from subscription: ${message.text}`);
 
           // remove message from queue and reset delayIndex
           await tdChannel.removeMessageFromQueue(conversation_id, message._id)
@@ -528,16 +516,13 @@ router.post('/speechresult/:callSid', async (req, res) => {
   let confidence = req.body.Confidence
   let callSid = req.params.callSid;
   
-  let sessionInfo;
   let project_id, conversation_id, user;
   let from, to;
 
-  let redis_data = await redis_client.get('tiledesk:voice:'+callSid+':session');
-  //let redis_data = await redis_client.hGetAll('tiledesk:voice:'+callId);
-  if (!redis_data) {
+  let sessionInfo = await voiceChannel.getSessionForCallId(callSid)
+  if (!sessionInfo) {
     return res.status(500).send({ success: "false", message: "Can't retrive data for callSid ->" + callSid });
   }
-  sessionInfo = JSON.parse(redis_data)
   project_id = sessionInfo.project_id;
   from = sessionInfo.from;
   to = sessionInfo.to;
@@ -623,15 +608,13 @@ router.post('/record/action/:callSid/',async (req, res) => {
   let start_call = new Date();
 
   let callSid = req.body.CallSid;
-  let sessionInfo;
   let project_id, conversation_id, user;
   let from, to;
 
-  let redis_data = await redis_client.get('tiledesk:voice:'+callSid+':session');
-  if (!redis_data) {
+  let sessionInfo = await voiceChannel.getSessionForCallId(callSid)
+  if (!sessionInfo) {
     return res.status(500).send({ success: "false", message: "Can't retrive data for callSid ->" + callSid });
   }
-  sessionInfo = JSON.parse(redis_data)
   project_id = sessionInfo.project_id;
   from = sessionInfo.from;
   to = sessionInfo.to;
@@ -692,16 +675,13 @@ router.post('/record/callback/:callSid/',async (req, res) => {
   let button_action = req.query.button_action ? '#' + req.query.button_action : '';
   let previousIntentName = req.query.intentName || '';
 
-  
-  let sessionInfo;
   let project_id, conversation_id, user;
   let from, to;
   
-  let redis_data = await redis_client.get('tiledesk:voice:'+callSid+':session');
-  if (!redis_data) {
+  let sessionInfo = await voiceChannel.getSessionForCallId(callSid)
+  if (!sessionInfo) {
     return res.status(500).send({ success: "false", message: "Can't retrive data for callSid ->" + callSid });
   }
-  sessionInfo = JSON.parse(redis_data)
   project_id = sessionInfo.project_id;
   from = sessionInfo.from;
   to = sessionInfo.to;
@@ -799,16 +779,13 @@ router.post('/menublock/:callSid', async (req, res) => {
   winston.debug("(voice) button menu: ", button);
   winston.debug("(voice) message_text menu: "+ message_text);
   
-  
-  let sessionInfo;
   let project_id, conversation_id, user;
   let from, to;
 
-  let redis_data = await redis_client.get('tiledesk:voice:'+callSid+':session');
-  if (!redis_data) {
+  let sessionInfo = await voiceChannel.getSessionForCallId(callSid)
+  if (!sessionInfo) {
     return res.status(500).send({ success: "false", message: "Can't retrive data for callSid ->" + callSid });
   }
-  sessionInfo = JSON.parse(redis_data)
   project_id = sessionInfo.project_id;
   from = sessionInfo.from;
   to = sessionInfo.to;
@@ -878,15 +855,13 @@ router.post('/handle/:callSid/:event', async (req, res) => {
   let button_action = '#' + req.query.button_action;
   let previousIntentName = req.query.intentName;
   
-  let sessionInfo;
   let project_id, conversation_id, user;
   let from, to;
 
-  let redis_data = await redis_client.get('tiledesk:voice:'+callSid+':session');
-  if (!redis_data) {
+  let sessionInfo = await voiceChannel.getSessionForCallId(callSid)
+  if (!sessionInfo) {
     return res.status(500).send({ success: "false", message: "Can't retrive data for callSid ->" + callSid });
   }
-  sessionInfo = JSON.parse(redis_data)
   project_id = sessionInfo.project_id;
   from = sessionInfo.from;
   to = sessionInfo.to;
@@ -962,16 +937,13 @@ router.post('/event/:callSid/:event', async(req, res)=> {
   let currentIntentName = req.query.intentName;
   let currentIntentTimestamp  = req.query.previousIntentTimestamp;
   
-  
-  let sessionInfo;
   let project_id, conversation_id, user;
   let from, to;
   
-  let redis_data = await redis_client.get('tiledesk:voice:'+callSid+':session');
-  if (!redis_data) {
+  let sessionInfo = await voiceChannel.getSessionForCallId(callSid)
+  if (!sessionInfo) {
     return res.status(500).send({ success: "false", message: "Can't retrive data for callSid ->" + callSid });
   }
-  sessionInfo = JSON.parse(redis_data)
   project_id = sessionInfo.project_id;
   from = sessionInfo.from;
   to = sessionInfo.to;
@@ -1062,15 +1034,13 @@ router.post('/twilio/status',async (req, res) => {
     clearTimeout(messageTimeout)
   }
   
-  let sessionInfo;
   let project_id, conversation_id, user;
   let from, to;
   
-  let redis_data = await redis_client.get('tiledesk:voice:'+callSid+':session');
-  if (!redis_data) {
+  let sessionInfo = await voiceChannel.getSessionForCallId(callSid)
+  if (!sessionInfo) {
     return res.status(500).send({ success: "false", message: "Can't retrive data for callSid ->" + callSid });
   }
-  sessionInfo = JSON.parse(redis_data)
   project_id = sessionInfo.project_id;
   from = sessionInfo.from;
   to = sessionInfo.to;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-voice-twilio-connector",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "description": "Tiledesk VOICE Twilio connector",
   "license": "MIT",
   "author": "Gabriele Panico",
@@ -36,6 +36,7 @@
     "redis": "^4.6.13",
     "redis-lock": "^1.0.0",
     "redlock": "^4.2.0",
+    "remove-markdown": "^0.6.2",
     "twilio": "^5.2.1",
     "uuid": "^8.3.2",
     "winston": "^3.3.3",

package/tiledesk/TiledeskTwilioTranslator.js

@@ -3,7 +3,8 @@ const winston = require("../winston");
 const xmlbuilder = require("xmlbuilder");
 const querystring = require("querystring");
 
-const utils = require("./utils-message.js");
+const utils = require("./utils.js");
+const utils_message = require("./utils-message.js");
 const MENU_CHOICE = require("./constants.js").MENU_CHOICE;
 const WAIT_MESSAGE = require("./constants.js").WAIT_MESSAGE; 
 const TEXT_MESSAGE = require("./constants.js").TEXT_MESSAGE;
@@ -123,9 +124,9 @@ class TiledeskTwilioTranslator {
     
     
     //MANAGE CLOSE info message
-    const isInfoSupport = utils.messageType(TYPE_MESSAGE.INFO_SUPPORT, msg)
+    const isInfoSupport = utils_message.messageType(TYPE_MESSAGE.INFO_SUPPORT, msg)
     winston.debug("[TiledeskVXMLTranslator] isInfoSupport:"+ isInfoSupport);
-    if(isInfoSupport && utils.infoMessageType(msg) === INFO_MESSAGE_TYPE.CHAT_CLOSED){
+    if(isInfoSupport && utils_message.infoMessageType(msg) === INFO_MESSAGE_TYPE.CHAT_CLOSED){
       const hangUp = this.hangupCall(xml)
       return hangUp;
     }
@@ -319,7 +320,6 @@ class TiledeskTwilioTranslator {
   async speechFormVXMLConverter(rootEle, message, xmlAttributes) {
     
     if(this.voiceProvider === VOICE_PROVIDER.TWILIO){
-      
       const gather = rootEle.ele("Gather", { input: "speech"})
 
       const queryUrl = '?intentName='+ querystring.encode(xmlAttributes.intentName) + "&previousIntentTimestamp="+Date.now();
@@ -328,6 +328,7 @@ class TiledeskTwilioTranslator {
             .att("method", "POST")
             .att("language", xmlAttributes.TTS_VOICE_LANGUAGE)
             .att('speechTimeout', "auto")
+            .att("enhanced", "true") // enable enhanced recognition
 
       //if(xmlAttributes && xmlAttributes.noInputTimeout){
       //  gather.att("timeout", Math.round(xmlAttributes.noInputTimeout/1000) ).up();
@@ -552,19 +553,19 @@ class TiledeskTwilioTranslator {
           if (command.type === "message") {
             //case type: TEXT
             if(command.message.type === 'text'){
+              let text = utils.markdownToTwilioSpeech(command.message.text);
               if(that.voiceProvider !== VOICE_PROVIDER.TWILIO){
-                let voiceMessageUrl = await that.generateTTS(command.message.text, attributes)
+                let voiceMessageUrl = await that.generateTTS(text, attributes)
                 rootEle.ele('Play', {}, voiceMessageUrl )
               }else{
-                rootEle.ele("Say", { voice: attributes.TTS_VOICE_NAME, language: attributes.TTS_VOICE_LANGUAGE }, command.message.text);
+                rootEle.ele("Say", { voice: attributes.TTS_VOICE_NAME, language: attributes.TTS_VOICE_LANGUAGE }, text);
               }
               
-              
             }
             //case type: FRAME
             if(command.message.type === 'frame' && command.message.metadata.src !== ""){
               if(command.message.text != ''){
-                rootEle.ele("Say", { voice: attributes.TTS_VOICE_NAME, language: attributes.TTS_VOICE_LANGUAGE }, command.message.text);
+                rootEle.ele("Say", { voice: attributes.TTS_VOICE_NAME, language: attributes.TTS_VOICE_LANGUAGE }, text);
               }
               rootEle.ele('Play', {},  command.message.metadata.src )
             }

package/tiledesk/VoiceChannel.js

@@ -75,11 +75,11 @@ class VoiceChannel {
       //increment 
       const delayIndex = (+index) +1
       //save new index to redis
-      await this.redis_client.set('tiledesk:voice:'+callId + ':delayIndex', delayIndex, 'EX', 86400);
+      await this.redis_client.set('tiledesk:voice:'+callId + ':delayIndex', delayIndex, {'EX': 86400});
       return;
     }
     //if index is not present: set to default (0)
-    await this.redis_client.set('tiledesk:voice:'+callId + ':delayIndex', 0, 'EX', 86400);
+    await this.redis_client.set('tiledesk:voice:'+callId + ':delayIndex', 0, {'EX': 86400});
   }
   
   /** RESET INDEX INTO REDIS DATA FOR CURRENT CALLID **/
@@ -106,11 +106,11 @@ class VoiceChannel {
     winston.debug('[VoiceChannel] saveSettingsForCallId: attributes found -->'+index)
     if(index){
       //set index to default (0)
-      await this.redis_client.set('tiledesk:voice:'+callId + ':attributes', JSON.stringify(attributes), 'EX', 86400);
+      await this.redis_client.set('tiledesk:voice:'+callId + ':attributes', JSON.stringify(attributes), {'EX': 86400});
       return;
     }
     //if index is not present: set to default (0)
-    await this.redis_client.set('tiledesk:voice:'+callId + ':attributes', JSON.stringify(attributes), 'EX', 86400);
+    await this.redis_client.set('tiledesk:voice:'+callId + ':attributes', JSON.stringify(attributes), {'EX': 86400});
   
   }
   
@@ -125,6 +125,25 @@ class VoiceChannel {
   }
 
 
+  async setSessionForCallId(callSid, session) {
+    await this.redis_client.set(`tiledesk:voice:${callSid}:session`, JSON.stringify(session), { 'EX': 86400 });
+      //for (const [key, value] of Object.entries(redis_data)){
+    //  await redis_client.hSet('tiledesk:voice:'+callId, key, JSON.stringify(value))
+    //}
+    //await redis_client.expire('tiledesk:voice:'+callId, 86400)
+  }
+
+  async getSessionForCallId(callSid) {
+    const sessionData = await this.redis_client.get(`tiledesk:voice:${callSid}:session`);
+    //let redis_data = await redis_client.hGetAll('tiledesk:voice:'+callId);
+    if (sessionData) {
+      return JSON.parse(sessionData);
+    }
+    return null;
+
+  }
+
+
   async deleteCallKeys(callSid) {
     const pattern = `tiledesk:voice:${callSid}:*`;
     let cursor = 0;

package/tiledesk/utils.js

@@ -1,4 +1,5 @@
 const NON_SPEECH_TOKENS = require('./constants').NON_SPEECH_TOKENS
+const removeMarkdown = require('remove-markdown');
 
 function getNumber(phoneNumber){
   if(phoneNumber.startsWith('+')){
@@ -31,5 +32,13 @@ function normalizeSTT(text) {
   return cleaned;
 }
 
+function markdownToTwilioSpeech(text) {
+  return removeMarkdown(text)
+    .replace(/:/g, ': ')
+    .replace(/\n+/g, '. ')
+    .replace(/\s+/g, ' ')
+    .trim();
+}
+
 
-module.exports = {getNumber, buildQueryString, normalizeSTT}
+module.exports = {getNumber, buildQueryString, normalizeSTT, markdownToTwilioSpeech}