@tiledesk/tiledesk-server 2.4.23 → 2.4.25

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.23",
+  "version": "2.4.25",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -44,8 +44,8 @@
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
     "@tiledesk/tiledesk-messenger-connector": "0.1.9",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
-    "@tiledesk/tiledesk-tybot-connector": "^0.1.80",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.48",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.81",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.49",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",

package/pubmodules/cache/mongoose-cachegoose-fn.js

@@ -324,7 +324,7 @@
     function invalidatRequestSimple(client, project_id, rid, request_id) {
         var key = project_id+":requests:id:"+rid+":simple";
         winston.verbose("Deleting cache for widgets with key: " + key);
-        
+
         // found del
         winston.debug("Deleted4545");
         del(client._cache._engine.client, key, function (err, reply) {  //tested
@@ -729,12 +729,14 @@
 
 
     if (subscriptionEvent) {
-        subscriptionEvent.on('subscription.create', function(trigger) {   
+        subscriptionEvent.on('subscription.create', function(subscription) {   
             setImmediate(() => {    
                 
                 //TODO i think you must clone trigger and remove .secret before caching
-                // elimina delete con * e fai cancellazione puntuale
-                var key =trigger.id_project+":subscriptions:*";        
+                // q.cache(cacheUtil.longTTL, id_project+":subscriptions:event:"+event);  //CACHE_SUBSCRIPTION
+                var key =subscription.id_project+":subscriptions:event:"+subscription.event;    
+
+                // var key =trigger.id_project+":subscriptions:*";        //wildcardcache //tested
                 winston.verbose("Deleting cache for subscription.create with key: " + key);
                 // found del
                 del(client._cache._engine.client, key, function (err, reply) {  //tested
@@ -745,10 +747,11 @@
             });
         });
     
-        subscriptionEvent.on('subscription.update', function(trigger) {   
+        subscriptionEvent.on('subscription.update', function(subscription) {   
             setImmediate(() => {         
-                // elimina delete con * e fai cancellazione puntuale
-                var key =trigger.id_project+":subscriptions:*";        
+                var key =subscription.id_project+":subscriptions:event:"+subscription.event;    
+
+                // var key =subscription.id_project+":subscriptions:*";         //wildcardcache //tested
                 winston.verbose("Deleting cache for subscription.update with key: " + key);
                 // found del
                 del(client._cache._engine.client, key, function (err, reply) {  //tested
@@ -759,10 +762,11 @@
             });
         });
     
-        subscriptionEvent.on("subscription.delete", function(trigger) {     
+        subscriptionEvent.on("subscription.delete", function(subscription) {     
             setImmediate(() => {         
-                // elimina delete con * e fai cancellazione puntuale
-                var key =trigger.id_project+":subscriptions:*";         
+                var key =subscription.id_project+":subscriptions:event:"+subscription.event;    
+
+                // var key =subscription.id_project+":subscriptions:*";          //wildcardcache //tested
                 winston.verbose("Deleting cache for subscription.delete with key: " + key);
                 // found del
                 del(client._cache._engine.client, key, function (err, reply) {  //tested
@@ -779,8 +783,9 @@
     if (triggerEventEmitter) {
         triggerEventEmitter.on('trigger.create', function(trigger) {   
             setImmediate(() => {    
-                // elimina delete con * e fai cancellazione puntuale
-                var key =trigger.id_project+":triggers:*";        
+                var key =trigger.id_project+":triggers:trigger.key:"+trigger.trigger.key;
+
+                // var key =trigger.id_project+":triggers:*";         //wildcardcache //tested
                 winston.verbose("Deleting cache for trigger.create with key: " + key);
                 // found del
                 del(client._cache._engine.client, key, function (err, reply) {  //tested
@@ -793,8 +798,9 @@
     
         triggerEventEmitter.on('trigger.update', function(trigger) {   
             setImmediate(() => {         
-                // elimina delete con * e fai cancellazione puntuale
-                var key =trigger.id_project+":triggers:*";        
+                var key =trigger.id_project+":triggers:trigger.key:"+trigger.trigger.key;
+                // var key =trigger.id_project+":triggers:*";         //wildcardcache //tested
+
                 winston.verbose("Deleting cache for trigger.update with key: " + key);
                 // found del
                 del(client._cache._engine.client, key, function (err, reply) {  //tested
@@ -806,9 +812,10 @@
         });
     
         triggerEventEmitter.on("trigger.delete", function(trigger) {     
-            setImmediate(() => {       
-                // elimina delete con * e fai cancellazione puntuale  
-                var key =trigger.id_project+":triggers:*";         
+            setImmediate(() => {      
+                var key =trigger.id_project+":triggers:trigger.key:"+trigger.trigger.key;
+
+                // var key =trigger.id_project+":triggers:*";          //wildcardcache
                 winston.verbose("Deleting cache for trigger.delete with key: " + key);
                 // found del
                 del(client._cache._engine.client, key, function (err, reply) {  //tested
@@ -823,7 +830,12 @@
     
 
     function invalidateFaq(client, faq) {
-        key = "faqs:botid:"+faq.id_faq_kb+":faq:id:*";
+
+        // let faqCacheKey = "cacheman:cachegoose-cache:faqs:botid:"+ botId + ":faq:id:" + key;
+                            //cacheman:cachegoose-cache:faqs:botid:647dc3e8da041c001396f764:faq:id:647dc3ea61ad510014ca0b46
+        key = "faqs:botid:"+faq.id_faq_kb+":faq:id:"+faq.intent_display_name;
+        // key = "faqs:botid:"+faq.id_faq_kb+":faq:id:"+faq._id;
+        // key = "faqs:botid:"+faq.id_faq_kb+":faq:id:*";
         winston.verbose("Deleting cache for faq with key: " + key);
         // found del
         del(client._cache._engine.client, key, function (err, reply) {  //tested

package/pubmodules/trigger/triggerRoute.js

@@ -108,8 +108,8 @@ router.put('/:triggercode/reset', function (req, res) {
 router.delete('/:triggerid', function (req, res) {
 
   winston.debug(req.body);
-
-  Trigger.remove({ _id: req.params.triggerid }, function (err, trigger) {
+  Trigger.findByIdAndRemove(req.params.triggerid, { new: false}, function (err, trigger) {
+  // Trigger.remove({ _id: req.params.triggerid }, function (err, trigger) {
     if (err) {
       winston.error('--- > ERROR ', err);
       return res.status(500).send({ success: false, msg: 'Error deleting object.' });

package/pubmodules/whatsapp/listener.js

@@ -22,16 +22,18 @@ class Listener {
         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/"
         winston.debug("Whatsapp graph_url: "+ password);
 
+        let baseFileUrl = process.env.BASE_FILE_URL
+
         let log = process.env.WHATSAPP_LOG || false
         winston.debug("Whatsapp log: "+ log);
 
         whatsapp.startApp({
             MONGODB_URL: config.databaseUri,          
             API_URL: apiUrl,
+            BASE_FILE_URL: baseFileUrl,
             GRAPH_URL: graph_url,
             BASE_URL: apiUrl + "/modules/whatsapp",                     
             APPS_API_URL: apiUrl + "/modules/apps",

package/routes/subscription.js

@@ -66,7 +66,8 @@ router.delete('/:subscriptionid', function (req, res) {
 
   winston.debug(req.body);
 
-  Subscription.remove({ _id: req.params.subscriptionid }, function (err, subscriptionUpd) {
+  Subscription.findByIdAndRemove(req.params.subscriptionid, { new: false}, function (err, subscriptionUpd) {
+    // Subscription.remove({ _id: req.params.subscriptionid }, function (err, subscriptionUpd) {
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error deleting object.' });
     }