@tiledesk/tiledesk-whatsapp-connector 0.1.56 → 0.1.58

package/index.js

@@ -19,7 +19,7 @@ const api = require('./routes/api');
 const apiRoute = api.router;
 
 // tiledesk clients
-//const { TiledeskClient } = require('@tiledesk/tiledesk-client');
+const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const { TiledeskWhatsappTranslator } = require('./tiledesk/TiledeskWhatsappTranslator');
 const { TiledeskSubscriptionClient } = require('./tiledesk/TiledeskSubscriptionClient');
 const { TiledeskWhatsapp } = require('./tiledesk/TiledeskWhatsapp');
@@ -1061,9 +1061,21 @@ router.post("/webhook/:project_id", async (req, res) => {
       }
       winston.verbose("(wab) update status in " + status+ " for message_id " + message_id);
 
-      const wl = new WhatsappLogger();
-      wl.updateMessageStatus(message_id, status, error);
+      let CONTENT_KEY = "whatsapp-" + project_id;
+      let settings = await db.get(CONTENT_KEY);
+      winston.debug("(wab) settings: ", settings);
+
+      const tdClient = new TiledeskClient({
+        projectId: project_id,
+        token: settings.token,
+        APIURL: API_URL,
+        APIKEY: "___",
+        log: false
+      });
 
+      const wl = new WhatsappLogger({ tdClient: tdClient});
+      wl.updateMessageStatus(message_id, status, error);
+    
     }
     
     res.sendStatus(200);
@@ -1366,8 +1378,15 @@ async function startApp(settings, callback) {
     JOB_TOPIC_EXCHANGE = settings.JOB_TOPIC_EXCHANGE;
     winston.info("(wab) JOB_TOPIC_EXCHANGE is present");
   }
+
+  let LOG_MONGODB_URL;
+  if (!settings.LOG_MONGODB_URL) {
+    LOG_MONGODB_URL = settings.MONGODB_URL;
+  } else {
+    LOG_MONGODB_URL = settings.LOG_MONGODB_URL;
+  }
   
-  mongoose.connect(settings.MONGODB_URL)
+  mongoose.connect(LOG_MONGODB_URL)
           .then(() => { winston.info("Mongoose DB Connected") })
           .catch((err) => { winston.error("(Mongoose) Unable to connect with MongoDB ", err)
   })

package/models/Transaction.js

@@ -0,0 +1,37 @@
+const mongoose = require('mongoose');
+
+const TransactionSchema = mongoose.Schema({
+  transaction_id: {
+    type: String,
+    required: true
+  },
+  id_project: {
+    type: String,
+    required: true
+  },
+  template_name: {
+    type: String,
+    required: true
+  },
+  status: {
+    type: String,
+    required: false
+  },
+  channel: {
+    type: String,
+    required: false
+  },
+  createdAt: {
+    type: Date,
+    default: Date.now
+  },
+  updatedAt: {
+    type: Date,
+    default: Date.now,
+  }
+})
+
+
+const Transaction = mongoose.model("Transactions", TransactionSchema);
+
+module.exports = { Transaction };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-whatsapp-connector",
-  "version": "0.1.56",
+  "version": "0.1.58",
   "description": "Tiledesk Whatsapp connector",
   "main": "index.js",
   "scripts": {
@@ -11,7 +11,7 @@
   "author": "Giovanni Troisi",
   "license": "MIT",
   "dependencies": {
-    "@tiledesk/tiledesk-client": "^0.8.29",
+    "@tiledesk/tiledesk-client": "^0.10.4",
     "app-root-path": "^3.0.0",
     "axios": "^0.27.2",
     "body-parser": "^1.20.0",

package/template/detail.html

@@ -214,6 +214,14 @@
 
     <p style="font-size: 18px;"><b>What's new?</b></p>
 
+    <div style="width: 100%; display: flex; flex-direction: row; justify-content: space-between; margin-bottom: 15px;">
+      <div>
+        <p style="margin-bottom: 0px">Bug fixes and minor improvements</p>
+      </div>
+      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.58</b></p>
+    </div>
+
+
     <div style="width: 100%; display: flex; flex-direction: row; justify-content: space-between; margin-bottom: 15px;">
       <div>
         <p>Added Messages Logs for WhatsApp broadcast</p>
@@ -237,14 +245,6 @@
       <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.52</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">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.50</b></p>
-    </div>
-
     
     <hr style="margin-top: 50px; margin-bottom: 20px">
 

package/tiledesk/WhatsappLogger.js

@@ -3,15 +3,24 @@ const { MessageLog } = require("../models/WhatsappLog");
 
 class WhatsappLogger {
 
-  constructor() {}
+  constructor(config) {
+    
+    this.tdClient = config.tdClient;
+    
+  }
 
   async updateMessageStatus(message_id, status, error) {
     let status_code = this.getCodeFromStatus(status);
     winston.debug("(wab) getCodeFromStatus result " + status_code);
 
     MessageLog.findOneAndUpdate({ message_id: message_id }, { $set: {status: status, status_code: status_code, error: error }}, { new: true }).then((messageLog) => {
-      winston.verbose("(wab) status of message_id " + message_id + " updated to " + status);
-      winston.debug("(wab) messageLog updated ", messageLog);
+
+      if (messageLog) {
+        winston.verbose("(wab) status of message_id " + message_id + " updated to " + status);
+        winston.debug("(wab) messageLog updated ", messageLog);
+        this.sendLogWebhook(messageLog);
+      }
+
     }).catch((err) => {
       winston.error("(wab) findOneAndUpdate error: ", err);
     })
@@ -43,6 +52,36 @@ class WhatsappLogger {
     return code;
   }
 
+  sendLogWebhook(messageLog) {
+    let event = {
+      name: "tiledesk.whatsapplog",
+      attributes: {
+        messageLog: messageLog,
+      },
+    };
+    this.tdClient.fireEvent(event, (err, result) => {
+      if (err) {
+        winston.error("(wab) An error occurred invoking an event:", err);
+      }
+      winston.verbose("(wab) Real time log event fired");
+      winston.debug("(wab) Real time log event fired: ", result);
+    });
+  }
+
+  /*
+  sendLogWebhook(project_id, messageLog) {
+    this.tdClient.sendSupportMessage(
+      "support-group-" + project_id + "-whatsapplog-hidden",
+      { text: "Whatsapp Log", attributes: { messageLog: messageLog} },
+      (err) => {
+        if (err) {
+          console.error("Error sending reply:", err);
+        }
+        winston.verbose("(wab-worker) Log webhook sent successfully"); 
+    });
+  }
+  */
+
 }
 
 module.exports = { WhatsappLogger };