@tiledesk/tiledesk-whatsapp-connector 0.1.23 → 0.1.25

package/index.js

@@ -7,6 +7,8 @@ const handlebars = require('handlebars');
 const fs = require('fs');
 const path = require('path');
 const pjson = require('./package.json');
+const { v4: uuidv4 } = require('uuid');
+const cors = require('cors');
 
 // tiledesk clients
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
@@ -15,25 +17,34 @@ const { TiledeskSubscriptionClient } = require('./tiledesk/TiledeskSubscriptionC
 const { TiledeskWhatsapp } = require('./tiledesk/TiledeskWhatsapp');
 const { TiledeskChannel } = require('./tiledesk/TiledeskChannel');
 const { TiledeskAppsClient } = require('./tiledesk/TiledeskAppsClient');
+const { MessageHandler } = require('./tiledesk/MessageHandler');
 
 // mongo
 const { KVBaseMongo } = require('@tiledesk/tiledesk-kvbasemongo');
 const kvbase_collection = 'kvstore';
+const db = new KVBaseMongo(kvbase_collection);
+
+// redis
+var redis = require('redis')
+var redis_client;
 
 router.use(bodyParser.json());
 router.use(bodyParser.urlencoded({ extended: true }));
 router.use(express.static(path.join(__dirname, 'template')));
+router.use(cors());
 
-var API_URL = null;
-var GRAPH_URL = null;
-var BASE_URL = null;
-var APPS_API_URL = null;
-var log = false;
+let API_URL = null;
+let GRAPH_URL = null;
+let BASE_URL = null;
+let APPS_API_URL = null;
+let REDIS_HOST = null;
+let REDIS_PORT = null;
+let REDIS_PASSWORD = null;
+let log = false;
 
-const db = new KVBaseMongo(kvbase_collection);
 
 router.get('/', async (req, res) => {
-  res.send('Home works!')
+  res.send('Welcome to Tiledesk-WhatsApp Business connector!')
 })
 
 router.get('/detail', async (req, res) => {
@@ -175,14 +186,13 @@ router.get('/configure', async (req, res) => {
   projectId = req.query.project_id;
   token = req.query.token;
 
-  let CONTENT_KEY = "whatsapp-" + projectId;
+  let proxy_url = BASE_URL + "/webhook/" + projectId;
 
+  let CONTENT_KEY = "whatsapp-" + projectId;
+  
   let settings = await db.get(CONTENT_KEY);
   console.log("[KVDB] settings: ", settings);
 
-  let proxy_url = BASE_URL + "/webhook/" + projectId;
-  console.log("proxy_url: ", proxy_url);
-
   if (settings) {
 
     readHTMLFile('/configure.html', (err, html) => {
@@ -424,14 +434,13 @@ router.post('/disconnect', async (req, res) => {
 })
 
 router.post('/tiledesk', async (req, res) => {
-
   console.log("\n/tiledesk")
   //if (log) {
   //console.log("/tiledesk ---> tiledeskChannelMessage: " + JSON.stringify(req.body.payload));
   //}
 
   var tiledeskChannelMessage = req.body.payload;
-  //console.log("(TILEDESK) Payload: ", JSON.stringify(req.body.payload));
+  console.log("(TILEDESK) Payload: ", JSON.stringify(req.body.payload));
 
   var projectId = req.body.payload.id_project;
   console.log("(TILEDESK) PROJECT ID: ", projectId);
@@ -444,9 +453,15 @@ router.post('/tiledesk', async (req, res) => {
   var text = req.body.payload.text;
   console.log("(TILEDESK) TEXT: ", text);
 
-  var attributes = req.body.payload.attributes;
+  let attributes = req.body.payload.attributes;
+  console.log("(TILEDESK) ATTRIBUTES: ", JSON.stringify(attributes, null, 2))
   if (log) {
-    console.log("(TILEDESK) ATTRIBUTES: ", attributes)
+  }
+
+  let commands;
+  if (attributes && attributes.commands) {
+    commands = attributes.commands;
+    console.log("commands: ", JSON.stringify(commands, null, 2));
   }
 
   var sender_id = req.body.payload.sender;
@@ -467,7 +482,12 @@ router.post('/tiledesk', async (req, res) => {
     return res.send(200);
   }
 
-  console.log("/tiledesk ---> tiledeskChannelMessage: " + JSON.stringify(req.body.payload));
+  // Redirect for testing bots
+  //if (text.startsWith("#td")) {
+  //  return res.redirect('/testitout');
+  //}
+
+  //console.log("/tiledesk ---> tiledeskChannelMessage: " + JSON.stringify(req.body.payload));
 
   let recipient_id = tiledeskChannelMessage.recipient;
   console.log("(Tiledesk) Recipient_id: ", recipient_id);
@@ -482,10 +502,134 @@ router.post('/tiledesk', async (req, res) => {
   let phone_number_id = recipient_id.substring(recipient_id.lastIndexOf("wab-") + 4, recipient_id.lastIndexOf("-"));
   console.log("(Tiledesk) phone_number_id: ", phone_number_id)
 
+  console.log("-----> (Tiledesk) ANSWER: ", tiledeskChannelMessage.answer)
+
+  const messageHandler = new MessageHandler({ tiledeskChannelMessage: tiledeskChannelMessage });
   const tlr = new TiledeskWhatsappTranslator();
 
+  if (commands) {
+    const that = this;
+    let i = 0;
+    async function execute(command) {
+      // message
+      console.log/("----> next command: ", command);
+      if (command.type === "message") {
+        let tiledeskCommandMessage = await messageHandler.generateMessageObject(command);
+        console.log("message generated!\ntiledeskCommandMessage: ", tiledeskCommandMessage)
+
+        let whatsappJsonMessage = await tlr.toWhatsapp(tiledeskCommandMessage, whatsapp_receiver);
+        console.log('\x1b[34m%s\x1b[0m', 'whatsappJsonMessage', whatsappJsonMessage)
+
+        
+        if (whatsappJsonMessage) {
+        const twClient = new TiledeskWhatsapp({ token: settings.wab_token, GRAPH_URL: GRAPH_URL });
+        twClient.sendMessage(phone_number_id, whatsappJsonMessage).then((response) => {
+            //console.log("Send message response: ", response.status, response.statusText);
+            i += 1;
+            if (i < commands.length) {
+              execute(commands[i]);
+            } else {
+              console.log("End of commands")
+            }
+          }).catch((err) => {
+            console.error("ERROR Send message: ", err);
+          })
+        } else {
+          console.error("Whatsapp Json Message is undefined!")
+        }
+        
+      }
+
+      //wait
+      if (command.type === "wait") {
+        setTimeout(() => {
+          console.log("wait for " + command.time + " s")
+          i += 1;
+          if (i < commands.length) {
+            execute(commands[i]);
+          } else {
+            console.log("End of commands")
+          }
+        }, command.time)
+      }
+    }
+    execute(commands[0]);
+  }
+
+  else if (tiledeskChannelMessage.text) {
+
+    console.log("tiledeskChannelMessage.text: ", tiledeskChannelMessage.text)
+
+    let whatsappJsonMessage = await tlr.toWhatsapp(tiledeskChannelMessage, whatsapp_receiver);
+    console.log('\x1b[34m%s\x1b[0m', 'whatsappJsonMessage', whatsappJsonMessage)
+    //console.log("whatsappJsonMessage: ", whatsappJsonMessage);
+
+    if (whatsappJsonMessage) {
+      const twClient = new TiledeskWhatsapp({ token: settings.wab_token, GRAPH_URL: GRAPH_URL });
+  
+      twClient.sendMessage(phone_number_id, whatsappJsonMessage).then((response) => {
+        console.log("Send message response: ", response.status, response.statusText);
+      }).catch((err) => {
+        console.error("ERROR Send message: ", err);
+      })
+  
+      /*
+      sendMessage(phone_number_id, whatsappJsonMessage, wab_token).then((response) => {
+        console.log("sendMessage() response: ", response);
+      }).catch((err) => {
+        console.log("ERROR sendMessage(): ", err);
+      })
+      */
+    } else {
+      console.error("Whatsapp Json Message is undefined!")
+    }
+    
+  } else {
+    console.log("no command, no text --> skip")
+  }
+
+
+    
+
+  /*
+  if (commands) {
+    commands.forEach( async (command) => {
+      console.log("\ncommand: ", command);
+      if (command.type === "message") {
+        let tiledeskCommandMessage = await messageHandler.generateMessageObject(command);
+        console.log("message generated!\ntiledeskCommandMessage: ", tiledeskCommandMessage)
+
+        let whatsappJsonMessage = await tlr.toWhatsapp(tiledeskCommandMessage, whatsapp_receiver);
+        console.log('\x1b[34m%s\x1b[0m', 'whatsappJsonMessage', whatsappJsonMessage)
+
+        
+        if (whatsappJsonMessage) {
+        const twClient = new TiledeskWhatsapp({ token: settings.wab_token, GRAPH_URL: GRAPH_URL });
+          twClient.sendMessage(phone_number_id, whatsappJsonMessage).then((response) => {
+            console.log("Send message response: ", response.status, response.statusText);
+          }).catch((err) => {
+            console.error("ERROR Send message: ", err);
+          })
+        } else {
+          console.error("Whatsapp Json Message is undefined!")
+        }
+        
+      }
+      if (command.type === "wait") {
+        setTimeout(() => {
+          console.log("wait for " + command.time + " s")
+          console.log("Next command")
+        }, command.time)
+      }
+    })
+  }
+    */
+  //new_tiledesk_message = addCommandmessage(commands[0]);
+
+  /*
   let whatsappJsonMessage = await tlr.toWhatsapp(tiledeskChannelMessage, whatsapp_receiver);
-  console.log("whatsappJsonMessage: ", whatsappJsonMessage);
+  console.log('\x1b[34m%s\x1b[0m', 'whatsappJsonMessage', whatsappJsonMessage)
+  //console.log("whatsappJsonMessage: ", whatsappJsonMessage);
 
   if (whatsappJsonMessage) {
     const twClient = new TiledeskWhatsapp({ token: settings.wab_token, GRAPH_URL: GRAPH_URL });
@@ -503,9 +647,12 @@ router.post('/tiledesk', async (req, res) => {
       console.log("ERROR sendMessage(): ", err);
     })
     */
+
+  /*
   } else {
     console.error("Whatsapp Json Message is undefined!")
   }
+  */
   // richiamo toWhatsapp;
   // sendMessage
   //callSendAPI(project_id, phone_number_id, to, payload);
@@ -515,6 +662,7 @@ router.post('/tiledesk', async (req, res) => {
 // Endpoint for Whatsapp Business
 // Accepts POST requests at /webhook endpoint
 router.post("/webhook/:project_id", async (req, res) => {
+  
   // Parse the request body from the POST
   let body = req.body;
   let projectId = req.params.project_id;
@@ -542,6 +690,9 @@ router.post("/webhook/:project_id", async (req, res) => {
       //let originalWhatsappMessage = req.body;
       let whatsappChannelMessage = req.body.entry[0].changes[0].value.messages[0];
 
+      if (whatsappChannelMessage.text && whatsappChannelMessage.text.body.startsWith("#td")) { 
+        return res.redirect(307, '/testitout/' + projectId);
+      }
 
       let firstname = req.body.entry[0].changes[0].value.contacts[0].profile.name;
       console.log("(WAB) firstname: ", firstname)
@@ -581,7 +732,6 @@ router.post("/webhook/:project_id", async (req, res) => {
       else if (whatsappChannelMessage.type == 'interactive') {
         console.log("message type interactive")
         tiledeskJsonMessage = tlr.toTiledesk(whatsappChannelMessage, firstname);
-
       }
       else if ((whatsappChannelMessage.type == 'image') || (whatsappChannelMessage.type == 'video') || (whatsappChannelMessage.type == 'document')) {
         let media;
@@ -720,12 +870,108 @@ router.get("/webhook/:project_id", async (req, res) => {
 
 });
 
+function getRandomName() {
+
+  let hexString = uuidv4();
+  console.log("hex: ", hexString);
+  
+  // remove decoration
+  hexString = hexString.replace(/-/g, '');
+  
+  let base64String = Buffer.from(hexString, 'hex').toString('base64')
+  console.log("base64: ", base64String);
+  
+  return base64String;
+}
+
+
+router.post("/newtest", async (req, res) => {
+  //bottest:bot_id:code
+  console.log("/newtest body: ", JSON.stringify(req.body, null, 2));
+  let project_id = req.body.project_id;
+  let bot_id = req.body.bot_id;
+
+  let info = {
+    project_id: project_id,
+    bot_id: bot_id
+  }
+
+  //let short_uid = getRandomName();
+  let short_uid = uuidv4().substring(0, 8)
+  let TEST_KEY = "bottest:" + short_uid;
+
+  await redis_client.json.set(TEST_KEY, '.', info);
+  const value = await redis_client.json.get(TEST_KEY)
+  console.log("get --> value: ", value)
+  /*
+  const value = await redis_client.json.get(TEST_KEY, {
+    // JSON Path: .node = the element called 'node' at root level.
+    path: '.nodell',
+  });
+  */
+  res.status(200).send({short_uid: short_uid});
+})
+
+router.post("/testitout/:project_id", async (req, res) => {
+
+  //console.log("\n/(testitout): ", JSON.stringify(req.body, null, 2));
+  console.log("\n/(testitout)");
+  let projectId = req.params.project_id;
+  console.log("(testitout) projectId: ", projectId)
+
+  let whatsappChannelMessage = req.body.entry[0].changes[0].value.messages[0];
+  console.log("(testitout) whatsappChannelMessage: ", whatsappChannelMessage);
+
+  let whatsappContact = req.body.entry[0].changes[0].value.contacts[0];
+
+  let REDIS_KEY = "bottest:" + whatsappChannelMessage.text.body.substring(3);
+  console.log("(testitout) key: ", REDIS_KEY);
+
+  const info = await redis_client.json.get(REDIS_KEY);
+  console.log("(testitout) info: ", info);
+  
+  let message_info = {
+    channel: "whatsapp",
+    whatsapp: {
+      phone_number_id: req.body.entry[0].changes[0].value.metadata.phone_number_id,
+      from: whatsappChannelMessage.from,
+      firstname: whatsappContact.profile.name,
+      lastname: " "
+    }
+  }
+  console.log("(testitout) message_info: ", message_info)
+  
+  let CONTENT_KEY = "whatsapp-" + projectId;
+  let settings = await db.get(CONTENT_KEY);
+  if (log) {
+    console.log("[KVDB] settings: ", settings);
+  }
+
+  if (!settings) {
+    console.log("No settings found. Exit..");
+    res.sendStatus(200);
+    return;
+  }
+  
+  const tlr = new TiledeskWhatsappTranslator();
+
+  whatsappChannelMessage.text.body = "/start";
+  let tiledeskJsonMessage = tlr.toTiledesk(whatsappChannelMessage, whatsappContact.profile.name);
+  console.log("(testitout) tiledeskJsonMessage: ", tiledeskJsonMessage)
+  
+  const tdChannel = new TiledeskChannel({ settings: settings, API_URL: API_URL })
+  const response = await tdChannel.sendAndAddBot(tiledeskJsonMessage, message_info, info.bot_id)
+  console.log("testitout --> send response: ", response)
+  
+  res.status(200).send("testitout")
+})
+
 
 // *****************************
 // ********* FUNCTIONS *********
 // *****************************
 
-function startApp(settings, callback) {
+async function startApp(settings, callback) {
   console.log("Starting Whatsapp App");
 
   if (!settings.MONGODB_URL) {
@@ -760,13 +1006,50 @@ function startApp(settings, callback) {
     console.log("APPS_API_URL: ", APPS_API_URL);
   }
 
+  if (!settings.REDIS_HOST) {
+    throw new Error("!settings.REDIS_HOST is mandatory");
+  } else {
+    REDIS_HOST = settings.REDIS_HOST;
+    console.log("REDIS_HOST: ", REDIS_HOST);
+  }
+
+  if (!settings.REDIS_PORT) {
+    throw new Error("!settings.REDIS_PORT is mandatory");
+  } else {
+    REDIS_PORT = settings.REDIS_PORT;
+    console.log("REDIS_PORT: ", REDIS_PORT);
+  }
+
+  if (!settings.REDIS_PASSWORD) {
+    throw new Error("!settings.REDIS_PASSWORD is mandatory");
+  } else {
+    REDIS_PASSWORD = settings.REDIS_PASSWORD;
+    console.log("REDIS_PASSWORD: *************");
+  }
+
   if (settings.log) {
     log = settings.log;
   }
 
+  console.log("try to create client")
+  redis_client = redis.createClient({
+    socket: {
+        host: REDIS_HOST,
+        port: REDIS_PORT,
+    },
+    password: REDIS_PASSWORD
+  });
+  redis_client.on('connect', () => {
+    console.log('Redis Connected!'); // Connected!
+  });
+  await redis_client.connect();
+  redis_client.on('error', err => {
+    console.log('Error ' + err);
+  })
+
   db.connect(settings.MONGODB_URL, () => {
     console.log("KVBaseMongo successfully connected.");
-
+    
     if (callback) {
       callback();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-whatsapp-connector",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "Tiledesk Whatsapp connector",
   "main": "index.js",
   "scripts": {
@@ -23,9 +23,10 @@
     "jsonwebtoken": "^8.5.1",
     "mongoose": "^6.5.0",
     "multer": "^1.4.5-lts.1",
+    "redis": "^4.5.1",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
     "mocha": "^8.2.1"
   }
-}
+}

package/template/detail.html

@@ -54,10 +54,6 @@
       <div style="display: flex; flex-direction: row; justify-content: space-between; margin-left: 40px; width: 100%;">
         <div>
           <p style="font-size: 26px; font-weight: 500; margin-bottom: 0px;">WhatsApp Business</p>
-          <p style="color: #676767; font-size: 16px; margin-bottom: 5px;">Connect your WhatsApp number with Tiledesk</p>
-          <a style="font-size: 18px;" href="https://tiledesk.com/" target="_blank">Tiledesk</a>
-
-          <p style="font-size: 15px; color: #676767; font-style: italic; margin-bottom: 0px; margin-top: 20px;">Free</p>
         </div>
 
         <div style="display: flex; flex-direction: column; justify-content: flex-end; align-items: flex-end;">
@@ -98,13 +94,6 @@
             </div>
             
           {{else}}
-            <!-- Install button 
-            <form action="./install" method="post">
-              <input type="hidden" name="project_id" value="{{ project_id }}" />
-              <input type="hidden" name="app_id" value="{{ app_id }}" />
-              <input type="hidden" name="token" value="{{ token }}" />
-              <input type="submit" class="btn install-button" value="Install">
-            </form>-->
             <button class="btn install-button" onclick="document.getElementById('install-modal').style.display='flex'">Install</button>
             <!-- Install modal -->
             <div id="install-modal" class="modal">
@@ -129,7 +118,6 @@
               </div>
             </div>
           {{/if}}
-
         </div>
       </div>
     </div>
@@ -137,26 +125,14 @@
     <hr style="margin-top: 20px; margin-bottom: 20px">
 
     <p style="font-size: 18px;"><b>Screenshot from the application</b></p>
-    <!--<img src="https://media.discordapp.net/attachments/998542078587973734/1018841949534429184/2211.jpg?width=1055&height=686" style="width: 100%; height: 50%;"/>
-    <img src="https://images-ext-2.discordapp.net/external/iKwvEo-ovnWVU0wvDgOwYZXdI9jfL-kKVsTZE2-ha5M/%3Fcrop%3D1/https/tiledesk.com/wp-content/uploads/2022/08/banner-adaptive-part2-1200x480.png" style="width: 100%; height: auto;"/>-->
 
     <div class="scrollmenu">
 
       <img src="https://user-images.githubusercontent.com/45603238/195042381-995ff805-359d-4d97-af67-f86f937c175a.jpg" class="screenshot" />
-
-      <img src="https://user-images.githubusercontent.com/45603238/195042391-6560424b-6a20-48ef-a5b3-981f9cbda5db.jpg" class="screenshot" />
-
-      <img src=" https://user-images.githubusercontent.com/45603238/195042354-e8ce2b8b-4a82-45b6-8ac1-c1d1bcf77e40.jpg" class="screenshot"/>
-      
-      <img src="https://user-images.githubusercontent.com/45603238/196982373-6b17cf76-6608-45bf-86da-551c14c46e0f.png" class="screenshot" />
-
      
     </div>
-    
-    
+  
     <hr style="margin-top: 20px; margin-bottom: 20px">
-
-
     <div>
       <h7>Receive Whatsapp conversations in your Tiledesk dashboard. Seamlessly Chat with your targeted audience on Whatsapp right from the Tiledesk dashboard.</h7>
 
@@ -175,22 +151,12 @@
         </div>
       </ul>
 
-      <!--
-      <ul style="padding: 10px 20px;">
-        <li><h7>Integrate your Whatsapp number with Tiledesk.</h7></li>
-        <li><h7>Once a chat is initiated on your Whatsapp number, receive an alert on your Tiledesk account.</h7></li>
-        <li><h7>Enable instant messaging and answer multiple conversations - everything from Tiledesk account.</h7></li>
-      </ul>-->
-
       <div style="padding: 20px; background-color: aliceblue; border-radius: 8px;">
         <div style="display: flex; flex-direction: row; align-items: baseline;">
           <div>
             <img src="https://freeiconshop.com/wp-content/uploads/edd/arrow-flat.png" width="20px" height="auto" style="margin-right: 10px;"> 
           </div>
-          <div>
-            <a href="https://gethelp.tiledesk.com/articles/connect-tiledesk-with-whatsapp-business/" target="_blank">Connect Tiledesk with WhatsApp Business</a>
-            <p style="color: grey; margin-bottom: 0px;">A small but very useful guide on how to connect your WhatsApp Business number with Tiledesk</p>
-          </div>
+          
         </div>
 
         <hr style="margin-top: 10px; margin-bottom: 10px;">
@@ -199,12 +165,7 @@
           <div>
             <img src="https://freeiconshop.com/wp-content/uploads/edd/arrow-flat.png" width="20px" height="auto" style="margin-right: 10px;"> 
           </div>
-          <div>
-            <a href="https://gethelp.tiledesk.com/articles/configure-a-whatsapp-business-account/" target="_blank">Configure a WhatsApp Business account</a>
-            <p style="color: grey; margin-bottom: 0px;">Not sure how to set up a business account? Take a look here.</p>
-          </div>
         </div>
-        
       </div>
     </div>
 
@@ -215,74 +176,31 @@
 
     <div style="width: 100%; display: flex; flex-direction: row; justify-content: space-between; margin-bottom: 15px;">
       <div>
-        <p style="margin-bottom: 0px">Bug Fixes</p>
+        <p style="margin-bottom: 0px">Added support for Test-it-out</p>
+        <p style="margin-bottom: 0px">Minor improvements</p>
         <!--<p>Bug fixes and performance improvements</p>-->
       </div>
-      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.23</b></p>
+      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.24</b></p>
     </div>
 
     <div style="width: 100%; display: flex; flex-direction: row; justify-content: space-between; margin-bottom: 15px;">
       <div>
-        <p style="margin-bottom: 0px;">New User Interface!</p>
-        <p style="margin-bottom: 0px">Added support for tdImage</p>
         <p style="margin-bottom: 0px">Bug Fixes</p>
         <!--<p>Bug fixes and performance improvements</p>-->
       </div>
-      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.18</b></p>
+      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.23</b></p>
     </div>
 
     <div style="width: 100%; display: flex; flex-direction: row; justify-content: space-between; margin-bottom: 15px;">
       <div>
-        <p style="margin-bottom: 0px;">Graphics improvements</p>
+        <p style="margin-bottom: 0px;">New User Interface!</p>
+        <p style="margin-bottom: 0px">Added support for tdImage</p>
+        <p style="margin-bottom: 0px">Bug Fixes</p>
+        <!--<p>Bug fixes and performance improvements</p>-->
       </div>
-      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.16</b></p>
-    </div>
-
-    <!--
-
-    <hr style="margin-top: 20px; margin-bottom: 20px">
-
-    
-    <p style="font-size: 18px;"><b>Other from Tiledesk</b> <a onclick="getParent()" target="_blank" style="font-size: 13px; margin-left: 15px;">View all</a></p>
-
-    <div>
-      <p>Visit our store and discovery all the available apps!</p>
+      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.18</b></p>
     </div>
 
-    
-    <div style="display: flex;">
-      <div class="app-summary-div">
-        <img src="https://cdn3.iconfinder.com/data/icons/social-media-chamfered-corner/154/telegram-512.png" width="110" height="auto">
-        <p class="app-summary-name">Telegram</p>
-      </div>
-      
-      <div class="app-summary-div">
-        <img src="https://cdn.jim-nielsen.com/ios/512/messenger-2020-11-17.png" width="110" height="auto">
-        <p class="app-summary-name">Facebook Messenger</p>
-      </div>
-      
-      <div class="app-summary-div">
-        <img src="https://i.ibb.co/yWz3bZ5/2022-04-21-11-28-20.jpg" width="110" height="auto">
-        <p class="app-summary-name">Help Center</p>
-      </div>
-      
-      <div class="app-summary-div">
-        <img src="https://i.pinimg.com/474x/f4/07/55/f407552380549b7ce1b508c5a6639b38.jpg" width="110" height="auto">
-        <p class="app-summary-name">Github</p>
-      </div>
-    </div>   
-    -->
-
     <hr style="margin-top: 50px; margin-bottom: 20px">
-
-  <!--
-  <script>
-    function getParent() {
-      let parent_base = document.referrer;
-      let app_store_url = parent_base + "dashboard/#/project/"+ {{project_id}} +"/app-store/"
-    }
-  </script>
-  -->
-
   
 </body>

package/test/test_translate_whatsapp.js

@@ -15,7 +15,7 @@ describe('Test Translator\n', function() {
         userFullname: 'John Doe'
       }
     }
-    let whatsapp_receiver = tiledeskChannelMessage.recipient.substring(tiledeskChannelMessage.recipient.lastIndexOf("tel") + 1)
+    let whatsapp_receiver = tiledeskChannelMessage.recipient.substring(tiledeskChannelMessage.recipient.lastIndexOf("-") + 1)
 
     const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);
@@ -45,7 +45,7 @@ describe('Test Translator\n', function() {
         userFullname: 'John Doe'
       }
     }
-    let whatsapp_receiver = tiledeskChannelMessage.recipient.substring(tiledeskChannelMessage.recipient.lastIndexOf("tel") + 3)
+    let whatsapp_receiver = tiledeskChannelMessage.recipient.substring(tiledeskChannelMessage.recipient.lastIndexOf("-") + 1)
 
     const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);
@@ -57,8 +57,8 @@ describe('Test Translator\n', function() {
     assert(whatsappJsonMessage.image);
     assert(whatsappJsonMessage.image.link === tiledeskChannelMessage.metadata.src);
     assert(whatsappJsonMessage.image.caption === tiledeskChannelMessage.text);
+    console.log("(test) whatsappJsonMessage: ", whatsappJsonMessage);
     if (log) {
-      console.log("(test) whatsappJsonMessage: ", whatsappJsonMessage);
     }
   })
 
@@ -78,7 +78,7 @@ describe('Test Translator\n', function() {
         userFullname: 'John Doe'
       }
     }
-    let whatsapp_receiver = tiledeskChannelMessage.recipient.substring(tiledeskChannelMessage.recipient.lastIndexOf("tel") + 3)
+    let whatsapp_receiver = tiledeskChannelMessage.recipient.substring(tiledeskChannelMessage.recipient.lastIndexOf("-") + 1)
 
     const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);
@@ -111,7 +111,7 @@ describe('Test Translator\n', function() {
         userFullname: 'John Doe'
       }
     }
-    let whatsapp_receiver = tiledeskChannelMessage.recipient.substring(tiledeskChannelMessage.recipient.lastIndexOf("tel") + 3)
+    let whatsapp_receiver = tiledeskChannelMessage.recipient.substring(tiledeskChannelMessage.recipient.lastIndexOf("-") + 1)
 
     const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);
@@ -144,7 +144,7 @@ describe('Test Translator\n', function() {
         }
       }
     }
-    let whatsapp_receiver = tiledeskChannelMessage.recipient.substring(tiledeskChannelMessage.recipient.lastIndexOf("tel") + 3)
+    let whatsapp_receiver = tiledeskChannelMessage.recipient.substring(tiledeskChannelMessage.recipient.lastIndexOf("-") + 1)
 
     const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);

package/tiledesk/MessageHandler.js

@@ -0,0 +1,74 @@
+const axios = require("axios").default;
+const jwt = require('jsonwebtoken');
+const { v4: uuidv4 } = require('uuid');
+
+class MessageHandler {
+
+  /**
+    * Constructor for TiledeskChannel
+    *
+    * @example
+    * const { TiledeskChannel } = require('tiledesk-channel');
+    * const tdChannel = new TiledeskChannel({tiledeskJsonMessage: replyFromWhatsapp, settings: appSettings, whatsappJsonMessage: originalWhatsappMessage, API_URL: tiledeskApiUrl });
+    * 
+    * @param {Object} config JSON configuration.
+    * @param {string} config.tiledeskJsonMessage Mandatory. Message translated from Whatsapp to Tiledesk
+    * @param {string} config.whatsappJsonMessage Mandatory. Original whatsapp message.
+    * @param {string} config.settings Mandatory. Installation settings.
+    * @param {string} config.API_URL Mandatory. Tiledesk api url.
+    * @param {boolean} options.log Optional. If true HTTP requests are logged.
+    */
+  
+  constructor(config) {
+
+    if (!config) {
+      throw new Error('config is mandatory');
+    }
+
+    if (!config.tiledeskChannelMessage) {
+      throw new Error('config.tiledeskChannelMessage is mandatory');
+    }
+
+    this.tiledeskChannelMessage = config.tiledeskChannelMessage;
+    this.log = true;
+
+  }
+
+  async generateMessageObject(command) {
+    console.log("[MessageHandler] command: ", command);
+    console.log("[MessageHandler] tiledeskChannelMessage: ", this.tiledeskChannelMessage);
+    let tiledeskCommandMessage = command.message;
+
+    tiledeskCommandMessage.recipient = this.tiledeskChannelMessage.recipient;
+    
+    return tiledeskCommandMessage;
+  }
+
+  generateMessageObjectOriginal(command_message) {
+      let parentUid = this.tiledeskChannelMessage.uid
+      //command_message.uid = this.tiledeskChannelMessage.uid + "_" + index;
+      command_message.uid = this.tiledeskChannelMessage.uid;
+      if(command_message.text) command_message.text = command_message.text.trim()//remove black msg with only spaces
+      command_message.language = message.language;
+      command_message.recipient = message.recipient;
+      command_message.recipient_fullname = message.recipient_fullname;
+      command_message.sender = message.sender;
+      command_message.sender_fullname = message.sender_fullname;
+      command_message.channel_type = message.channel_type;
+      command_message.status = message.status;
+      command_message.isSender = message.isSender;
+      command_message.attributes? command_message.attributes.commands = true : command_message.attributes = {commands : true}
+      command_message.attributes.parentUid = parentUid //added to manage message STATUS UPDATES
+      command_message.attributes = {...message.attributes, ...command_message.attributes}
+      //this.addedNew(command_message)
+      //callback();
+
+    return command_message
+  }
+
+  
+
+}
+
+module.exports = { MessageHandler }
+

package/tiledesk/TiledeskChannel.js

@@ -32,7 +32,7 @@ class TiledeskChannel {
       throw new Error('config.API_URL is mandatory');
     }
 
-    this.log = true;
+    this.log = false;
     if (config.log) {
       this.log = config.log;
     }
@@ -143,6 +143,80 @@ class TiledeskChannel {
     })
   }
 
+  async sendAndAddBot(tiledeskMessage, messageInfo, bot_id) {
+    
+    let channel;
+    let new_request_id;
+    tiledeskMessage.participants = ["bot_" + bot_id]
+
+    if (messageInfo.channel == "whatsapp") {
+      channel = messageInfo.whatsapp;
+      new_request_id = "support-group-" + this.settings.project_id + "-" + uuidv4().substring(0, 8) + "-wab-" + channel.phone_number_id + "-" + channel.from;
+    } else {
+      console.log("[Tiledesk Channel] Channel not supported")
+      return null;
+    }
+
+    var payload = {
+      _id: 'wab-' + channel.from,
+      first_name: channel.firstname,
+      last_name: channel.lastname,
+      email: 'na@whatsapp.com',
+      sub: 'userexternal',
+      aud: 'https://tiledesk.com/subscriptions/' + this.settings.subscriptionId
+    }
+
+    var customToken = jwt.sign(payload, this.settings.secret);
+
+    return await axios({
+      url: this.API_URL + "/auth/signinWithCustomToken",
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': 'JWT ' + customToken
+      },
+      data: {},
+      method: 'POST'
+    }).then((response) => {
+      let token = response.data.token;
+
+      return axios({
+        url: this.API_URL + `/${this.settings.project_id}/requests/${new_request_id}/messages`,
+        //url: this.API_URL + `/${this.settings.project_id}/requests/${new_request_id}/participants`,
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': token
+        },
+        data: tiledeskMessage,
+        method: 'POST'
+      }).then((response) => {
+        console.log(response)
+        return response.data
+
+        /*
+        return axios({
+          url: this.API_URL + `/${this.settings.project_id}/requests/${new_request_id}/participants`,
+          headers: {
+            'Content-Type': 'application/json',
+            'Authorization': token
+          },
+          data: { member: bot_id },
+          method: 'POST'
+        }).then((response) => {
+          console.log("response: ", response.data)
+          return response.data
+        }).catch((err) => {
+          console.error("[Tiledesk Channel ERROR] add participant: ", err);
+        })
+        */
+      }).catch((err) => {
+        console.error("[Tiledesk Channel ERROR] send message (open conversation): " + err);
+      })
+    }).catch((err) => {
+      console.error("[Tiledesk Channel ERROR] sign in error: " + err);
+    })
+  }
+  
+
 }
 
 module.exports = { TiledeskChannel }

package/tiledesk/TiledeskWhatsappTranslator.js

@@ -29,7 +29,7 @@ const path = require('path');
     console.log("this.tiledeskChannelMessage: ", this.tiledeskChannelMessage);
     */
 
-    this.log = true;
+    this.log = false;
 
 
   }