@tiledesk/tiledesk-server 2.3.78 → 2.3.80

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.78",
+  "version": "2.3.80",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -44,7 +44,7 @@
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.6",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-tybot-connector": "^0.1.55",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.30",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.31",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",

package/pubmodules/whatsapp/listener.js

@@ -14,13 +14,13 @@ class Listener {
         }
 
         var port = process.env.CACHE_REDIS_PORT || 6379;
-        winston.debug("-Redis port: "+ port);
+        winston.debug("Redis port: "+ port);
 
         var host = process.env.CACHE_REDIS_HOST || "127.0.0.1"
-        winston.debug("-Redis host: "+ host);
+        winston.debug("Redis host: "+ host);
 
-        var password = process.env.REDIS_PASSWORD;
-        winston.debug("-Redis password: "+ password);
+        var password = process.env.CACHE_REDIS_PASSWORD;
+        winston.debug("Redis password: "+ password);
 
 
         let graph_url = process.env.META_GRAPH_URL || config.graphUrl || "https://graph.facebook.com/v14.0/"

package/routes/faq_kb.js

@@ -212,6 +212,60 @@ router.post('/askbot', function (req, res) {
 
 
 
+router.put('/:faq_kbid/publish', async (req, res) => {
+
+  let id_faq_kb = req.params.faq_kbid;
+  winston.debug('id_faq_kb: ' + id_faq_kb);
+
+  const api_url = process.env.API_URL || configGlobal.apiUrl;
+  winston.debug("fork --> base_url: " + api_url); // check if correct
+
+  let current_project_id = req.projectid;
+  winston.debug("current project id: " + current_project_id);
+
+  let token = req.headers.authorization;
+
+  let cs = req.app.get('chatbot_service')
+
+  try {
+      //  fork(id_faq_kb, api_url, token, project_id)
+    let forked = await cs.fork(id_faq_kb, api_url, token, current_project_id);
+  // winston.debug("forked: ", forked)
+
+    let forkedChatBotId = forked.bot_id;
+    winston.debug("forkedChatBotId: "+forkedChatBotId);
+
+
+    let updatedForkedChabot = await Faq_kb.findByIdAndUpdate(forkedChatBotId, {trashed: true}, { new: true, upsert: true }).exec();
+    winston.debug("updatedForkedChabot: ",updatedForkedChabot);
+    botEvent.emit('faqbot.update', updatedForkedChabot);
+
+
+    const port = process.env.PORT || '3000';
+    const TILEBOT_ENDPOINT = process.env.TILEBOT_ENDPOINT || "http://localhost:" + port+ "/modules/tilebot/ext/";
+    winston.debug("TILEBOT_ENDPOINT: " + TILEBOT_ENDPOINT);
+
+    let updatedOriginalChabot = await Faq_kb.findByIdAndUpdate(id_faq_kb,  {url:TILEBOT_ENDPOINT+forkedChatBotId}, { new: true, upsert: true }).exec();
+    winston.debug("updatedOriginalChabot: ",updatedOriginalChabot);
+
+    botEvent.emit('faqbot.update', updatedOriginalChabot);
+
+
+    return res.status(200).send({ message: "Chatbot published successfully", bot_id: forkedChatBotId });
+
+  } catch(e) {
+    winston.error("Error Unable publish chatbot: ", e);
+    return res.status(500).send({ success: false, message: "Unable publish chatbot" });
+  }
+
+     
+
+
+});
+
+
+
+
 router.put('/:faq_kbid', function (req, res) {
 
   winston.debug(req.body);
@@ -255,7 +309,7 @@ router.put('/:faq_kbid', function (req, res) {
     update.tags = req.body.tags;
   }
 
- 
+
   Faq_kb.findByIdAndUpdate(req.params.faq_kbid, update, { new: true, upsert: true }, function (err, updatedFaq_kb) {
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error updating object.' });
@@ -267,8 +321,6 @@ router.put('/:faq_kbid', function (req, res) {
 });
 
 
-
-
 router.patch('/:faq_kbid/attributes', function (req, res) {
   var data = req.body;
 
@@ -320,7 +372,7 @@ router.delete('/:faq_kbid', function (req, res) {
 
   winston.debug(req.body);
 
-  
+   
   Faq_kb.remove({ _id: req.params.faq_kbid }, function (err, faq_kb) {
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error deleting object.' });

package/services/BotSubscriptionNotifier.js

@@ -19,10 +19,16 @@ class BotSubscriptionNotifier {
   
   notify(bot,botWithSecret, payload) {
   
-      winston.verbose("BotSubscriptionNotifier bot", bot.toObject(), 'payload', payload );
+      winston.verbose("BotSubscriptionNotifier bot", bot.toObject());
+      winston.debug("BotSubscriptionNotifier payload", payload );
 
       var url = bot.url;
 
+      if (bot.type == "tilebot" && payload.request && payload.request.attributes && payload.request.attributes.sourcePage  && payload.request.attributes.sourcePage.indexOf("/assets/twp/index.html")>-1) {
+        url = url + "?forced_bot_id="+bot.id;   
+        winston.verbose("BotSubscriptionNotifier it is a tilebot test page. Switch to current chabot id: "+ url);              
+      }
+
       // if (url.startsWith("$ext_url")) {
       //   // url = url.replace ("$res_bot_url", prendi da env)
       // }

package/services/chatbotService.js

@@ -8,6 +8,26 @@ class ChatbotService {
     
   }
 
+  async fork(id_faq_kb, api_url, token, project_id) {
+    winston.debug("[CHATBOT SERVICE] fork");
+
+    return await axios({
+      url: api_url + '/' + project_id + '/faq_kb/fork/'+id_faq_kb+"?projectid="+project_id+"&public=false",
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': token
+      },
+      // data: chatbot,
+      method: 'POST'
+    }).then((resbody) => {
+      winston.debug("(CHATBOT SERVICE) fork resbody: ", resbody.data);
+      return resbody.data;
+    }).catch((err) => {
+      winston.error("(CHATBOT SERVICE) fork error " + err);
+      return err;
+    })
+
+  }
 
   async getBotById(id_faq_kb, published, api_url, chatbot_templates_api_url, token, project_id) {