chat-platform 1.2.3 → 1.3.2

package/chat-platform.js

@@ -44,6 +44,7 @@ const ChatExpress = function(options) {
     transportDescription: null,
     chatIdKey: null,
     userIdKey: null,
+    messageIdKey: null,
     tsKey: null,
     debug: true,
     onStart: null,
@@ -84,7 +85,7 @@ const ChatExpress = function(options) {
   }
 
   function evaluateParam(payload, newKey, optionKey, chatServer) {
-    var options = _this.options;
+    const options = _this.options;
     if (options[optionKey] != null) {
       if (_.isString(options[optionKey]) && newKey != options[optionKey]) {
         payload[newKey] = payload[options[optionKey]];
@@ -111,6 +112,7 @@ const ChatExpress = function(options) {
 
     evaluateParam(payload, 'chatId', 'chatIdKey', chatServer);
     evaluateParam(payload, 'userId', 'userIdKey', chatServer);
+    evaluateParam(payload, 'messageId', 'messageIdKey', chatServer);
     evaluateParam(payload, 'ts', 'tsKey', chatServer);
     evaluateParam(payload, 'type', 'type', chatServer);
     evaluateParam(payload, 'language', 'language', chatServer);
@@ -118,7 +120,7 @@ const ChatExpress = function(options) {
     // on removing this constraint (some chat context may be lost)
     payload.userId = !_.isEmpty(payload.userId) ? payload.userId : payload.chatId;
     // evaluate callbacks
-    var callbacks = chatServer.getCallbacks();
+    const callbacks = chatServer.getCallbacks();
     _(['chatId', 'userId', 'ts', 'type', 'language', 'messageId']).each(function(callbackName) {
       if (_.isFunction(callbacks[callbackName])) {
         payload[callbackName] = callbacks[callbackName].call(chatServer, payload)
@@ -213,7 +215,8 @@ const ChatExpress = function(options) {
   }
 
   function inboundMessage(payload, chatServer) {
-    var contextProvider = chatServer.getOptions().contextProvider;
+    const options = chatServer.getOptions();
+    const contextProvider = options.contextProvider;
     if (chatServer.isDebug()) {
       // eslint-disable-next-line no-console
       console.log(orange('-- INBOUND MESSAGE --'));
@@ -243,7 +246,8 @@ const ChatExpress = function(options) {
         messageId: parsedMessage.messageId,
         transport: parsedMessage.transport,
         language: parsedMessage.language,
-        ts: parsedMessage.ts
+        ts: parsedMessage.ts,
+        chatbotId: options.chatbotId
       }),
       payload: {
         type: parsedMessage.type,
@@ -424,9 +428,7 @@ const ChatExpress = function(options) {
     }
 
     // create empty promise
-    let stack = new Promise(function(resolve) {
-      resolve(message);
-    });
+    let stack = new Promise(resolve => resolve(message));
     // check for chatId, if not present check for userId-chatId translator, otherwise fail
     stack = stack.then(message => {
       const { transport } = instanceOptions;
@@ -533,6 +535,13 @@ const ChatExpress = function(options) {
     });
     // finally
     return stack
+      .then(function(message) {
+        // move the sent payload to the conventional key "sentMessage", it's up to middleware to
+        // update there the messageId
+        message.sentMessage = message.payload;
+        delete message.payload;
+        return message;
+      })
       .catch(function(error) {
         // eslint-disable-next-line no-console
         console.log(red(error));
@@ -541,9 +550,6 @@ const ChatExpress = function(options) {
         }
         // rethrow error so it can be caught by the sender node
         throw error;
-      })
-      .then(function(message) {
-        return message;
       });
   }
 
@@ -592,7 +598,7 @@ const ChatExpress = function(options) {
         }
         if (RED.httpNode._router.stack.length >= routesCount) {
           // eslint-disable-next-line no-console
-          chatServer.warning(`Improperly removed some routes from Express. This is normal when multiple bots are running in the same server.`);
+          chatServer.warning('Improperly removed some routes from Express. This is normal when multiple bots are running in the same server.');
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chat-platform",
-  "version": "1.2.3",
+  "version": "1.3.2",
   "description": "Universal Chat Platform",
   "main": "index.js",
   "scripts": {