@tiledesk/tiledesk-server 2.4.23 → 2.4.25
Sign up to get free protection for your applications and to get access to all the features.
package/package.json
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
{
|
2
2
|
"name": "@tiledesk/tiledesk-server",
|
3
3
|
"description": "The Tiledesk server module",
|
4
|
-
"version": "2.4.
|
4
|
+
"version": "2.4.25",
|
5
5
|
"scripts": {
|
6
6
|
"start": "node ./bin/www",
|
7
7
|
"pretest": "mongodb-runner start",
|
@@ -44,8 +44,8 @@
|
|
44
44
|
"@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
|
45
45
|
"@tiledesk/tiledesk-messenger-connector": "0.1.9",
|
46
46
|
"@tiledesk/tiledesk-rasa-connector": "^1.0.10",
|
47
|
-
"@tiledesk/tiledesk-tybot-connector": "^0.1.
|
48
|
-
"@tiledesk/tiledesk-whatsapp-connector": "^0.1.
|
47
|
+
"@tiledesk/tiledesk-tybot-connector": "^0.1.81",
|
48
|
+
"@tiledesk/tiledesk-whatsapp-connector": "^0.1.49",
|
49
49
|
"amqplib": "^0.5.5",
|
50
50
|
"app-root-path": "^3.0.0",
|
51
51
|
"bcrypt-nodejs": "0.0.3",
|
@@ -324,7 +324,7 @@
|
|
324
324
|
function invalidatRequestSimple(client, project_id, rid, request_id) {
|
325
325
|
var key = project_id+":requests:id:"+rid+":simple";
|
326
326
|
winston.verbose("Deleting cache for widgets with key: " + key);
|
327
|
-
|
327
|
+
|
328
328
|
// found del
|
329
329
|
winston.debug("Deleted4545");
|
330
330
|
del(client._cache._engine.client, key, function (err, reply) { //tested
|
@@ -729,12 +729,14 @@
|
|
729
729
|
|
730
730
|
|
731
731
|
if (subscriptionEvent) {
|
732
|
-
subscriptionEvent.on('subscription.create', function(
|
732
|
+
subscriptionEvent.on('subscription.create', function(subscription) {
|
733
733
|
setImmediate(() => {
|
734
734
|
|
735
735
|
//TODO i think you must clone trigger and remove .secret before caching
|
736
|
-
//
|
737
|
-
var key =
|
736
|
+
// q.cache(cacheUtil.longTTL, id_project+":subscriptions:event:"+event); //CACHE_SUBSCRIPTION
|
737
|
+
var key =subscription.id_project+":subscriptions:event:"+subscription.event;
|
738
|
+
|
739
|
+
// var key =trigger.id_project+":subscriptions:*"; //wildcardcache //tested
|
738
740
|
winston.verbose("Deleting cache for subscription.create with key: " + key);
|
739
741
|
// found del
|
740
742
|
del(client._cache._engine.client, key, function (err, reply) { //tested
|
@@ -745,10 +747,11 @@
|
|
745
747
|
});
|
746
748
|
});
|
747
749
|
|
748
|
-
subscriptionEvent.on('subscription.update', function(
|
750
|
+
subscriptionEvent.on('subscription.update', function(subscription) {
|
749
751
|
setImmediate(() => {
|
750
|
-
|
751
|
-
|
752
|
+
var key =subscription.id_project+":subscriptions:event:"+subscription.event;
|
753
|
+
|
754
|
+
// var key =subscription.id_project+":subscriptions:*"; //wildcardcache //tested
|
752
755
|
winston.verbose("Deleting cache for subscription.update with key: " + key);
|
753
756
|
// found del
|
754
757
|
del(client._cache._engine.client, key, function (err, reply) { //tested
|
@@ -759,10 +762,11 @@
|
|
759
762
|
});
|
760
763
|
});
|
761
764
|
|
762
|
-
subscriptionEvent.on("subscription.delete", function(
|
765
|
+
subscriptionEvent.on("subscription.delete", function(subscription) {
|
763
766
|
setImmediate(() => {
|
764
|
-
|
765
|
-
|
767
|
+
var key =subscription.id_project+":subscriptions:event:"+subscription.event;
|
768
|
+
|
769
|
+
// var key =subscription.id_project+":subscriptions:*"; //wildcardcache //tested
|
766
770
|
winston.verbose("Deleting cache for subscription.delete with key: " + key);
|
767
771
|
// found del
|
768
772
|
del(client._cache._engine.client, key, function (err, reply) { //tested
|
@@ -779,8 +783,9 @@
|
|
779
783
|
if (triggerEventEmitter) {
|
780
784
|
triggerEventEmitter.on('trigger.create', function(trigger) {
|
781
785
|
setImmediate(() => {
|
782
|
-
|
783
|
-
|
786
|
+
var key =trigger.id_project+":triggers:trigger.key:"+trigger.trigger.key;
|
787
|
+
|
788
|
+
// var key =trigger.id_project+":triggers:*"; //wildcardcache //tested
|
784
789
|
winston.verbose("Deleting cache for trigger.create with key: " + key);
|
785
790
|
// found del
|
786
791
|
del(client._cache._engine.client, key, function (err, reply) { //tested
|
@@ -793,8 +798,9 @@
|
|
793
798
|
|
794
799
|
triggerEventEmitter.on('trigger.update', function(trigger) {
|
795
800
|
setImmediate(() => {
|
796
|
-
|
797
|
-
var key =trigger.id_project+":triggers:*";
|
801
|
+
var key =trigger.id_project+":triggers:trigger.key:"+trigger.trigger.key;
|
802
|
+
// var key =trigger.id_project+":triggers:*"; //wildcardcache //tested
|
803
|
+
|
798
804
|
winston.verbose("Deleting cache for trigger.update with key: " + key);
|
799
805
|
// found del
|
800
806
|
del(client._cache._engine.client, key, function (err, reply) { //tested
|
@@ -806,9 +812,10 @@
|
|
806
812
|
});
|
807
813
|
|
808
814
|
triggerEventEmitter.on("trigger.delete", function(trigger) {
|
809
|
-
setImmediate(() => {
|
810
|
-
|
811
|
-
|
815
|
+
setImmediate(() => {
|
816
|
+
var key =trigger.id_project+":triggers:trigger.key:"+trigger.trigger.key;
|
817
|
+
|
818
|
+
// var key =trigger.id_project+":triggers:*"; //wildcardcache
|
812
819
|
winston.verbose("Deleting cache for trigger.delete with key: " + key);
|
813
820
|
// found del
|
814
821
|
del(client._cache._engine.client, key, function (err, reply) { //tested
|
@@ -823,7 +830,12 @@
|
|
823
830
|
|
824
831
|
|
825
832
|
function invalidateFaq(client, faq) {
|
826
|
-
|
833
|
+
|
834
|
+
// let faqCacheKey = "cacheman:cachegoose-cache:faqs:botid:"+ botId + ":faq:id:" + key;
|
835
|
+
//cacheman:cachegoose-cache:faqs:botid:647dc3e8da041c001396f764:faq:id:647dc3ea61ad510014ca0b46
|
836
|
+
key = "faqs:botid:"+faq.id_faq_kb+":faq:id:"+faq.intent_display_name;
|
837
|
+
// key = "faqs:botid:"+faq.id_faq_kb+":faq:id:"+faq._id;
|
838
|
+
// key = "faqs:botid:"+faq.id_faq_kb+":faq:id:*";
|
827
839
|
winston.verbose("Deleting cache for faq with key: " + key);
|
828
840
|
// found del
|
829
841
|
del(client._cache._engine.client, key, function (err, reply) { //tested
|
@@ -108,8 +108,8 @@ router.put('/:triggercode/reset', function (req, res) {
|
|
108
108
|
router.delete('/:triggerid', function (req, res) {
|
109
109
|
|
110
110
|
winston.debug(req.body);
|
111
|
-
|
112
|
-
Trigger.remove({ _id: req.params.triggerid }, function (err, trigger) {
|
111
|
+
Trigger.findByIdAndRemove(req.params.triggerid, { new: false}, function (err, trigger) {
|
112
|
+
// Trigger.remove({ _id: req.params.triggerid }, function (err, trigger) {
|
113
113
|
if (err) {
|
114
114
|
winston.error('--- > ERROR ', err);
|
115
115
|
return res.status(500).send({ success: false, msg: 'Error deleting object.' });
|
@@ -22,16 +22,18 @@ class Listener {
|
|
22
22
|
var password = process.env.CACHE_REDIS_PASSWORD;
|
23
23
|
winston.debug("Redis password: "+ password);
|
24
24
|
|
25
|
-
|
26
25
|
let graph_url = process.env.META_GRAPH_URL || config.graphUrl || "https://graph.facebook.com/v14.0/"
|
27
26
|
winston.debug("Whatsapp graph_url: "+ password);
|
28
27
|
|
28
|
+
let baseFileUrl = process.env.BASE_FILE_URL
|
29
|
+
|
29
30
|
let log = process.env.WHATSAPP_LOG || false
|
30
31
|
winston.debug("Whatsapp log: "+ log);
|
31
32
|
|
32
33
|
whatsapp.startApp({
|
33
34
|
MONGODB_URL: config.databaseUri,
|
34
35
|
API_URL: apiUrl,
|
36
|
+
BASE_FILE_URL: baseFileUrl,
|
35
37
|
GRAPH_URL: graph_url,
|
36
38
|
BASE_URL: apiUrl + "/modules/whatsapp",
|
37
39
|
APPS_API_URL: apiUrl + "/modules/apps",
|
package/routes/subscription.js
CHANGED
@@ -66,7 +66,8 @@ router.delete('/:subscriptionid', function (req, res) {
|
|
66
66
|
|
67
67
|
winston.debug(req.body);
|
68
68
|
|
69
|
-
Subscription.
|
69
|
+
Subscription.findByIdAndRemove(req.params.subscriptionid, { new: false}, function (err, subscriptionUpd) {
|
70
|
+
// Subscription.remove({ _id: req.params.subscriptionid }, function (err, subscriptionUpd) {
|
70
71
|
if (err) {
|
71
72
|
return res.status(500).send({ success: false, msg: 'Error deleting object.' });
|
72
73
|
}
|