wingbot 3.59.0 → 3.59.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.59.0",
+  "version": "3.59.2",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {

package/plugins/ai.wingbot.openai/plugin.js

@@ -123,6 +123,28 @@ function chatgptPlugin (params, configuration = {}) {
                         .forEach((t) => {
                             let trim = t.trim();
 
+                            if (annotation) {
+                                // replace the annotation first
+
+                                const replacements = annotation.split(MSG_REPLACE);
+                                const last = replacements.length > 1
+                                    ? replacements.length - 1
+                                    : replacements.length;
+                                replacements.forEach((r, i) => {
+                                    const foundI = trim.indexOf(r.trim(), i === last
+                                        ? trim.length - r.trim().length
+                                        : 0);
+
+                                    if (foundI === -1
+                                        || (i === 0 && foundI > 0)
+                                        || (i === last && (trim.length - foundI - r.length) > 0)) {
+                                        return;
+                                    }
+
+                                    trim = trim.replace(r.trim(), '').trim();
+                                });
+                            }
+
                             if (annotation && annotation.includes(MSG_REPLACE)) {
                                 trim = annotation.replace(MSG_REPLACE, trim);
                             } else if (annotation) {

package/src/Processor.js

@@ -527,7 +527,14 @@ class Processor extends EventEmitter {
         }
     }
 
-    async _processMessage (message, pageId, messageSender, responderData, preloadPromise = null) {
+    async _processMessage (
+        message,
+        pageId,
+        messageSender,
+        responderData,
+        preloadPromise = null,
+        senderMeta = null
+    ) {
         let senderId = message.sender && message.sender.id;
         const fromEvent = !!preloadPromise;
 
@@ -663,7 +670,8 @@ class Processor extends EventEmitter {
                 token,
                 options,
                 responderData,
-                configuration
+                configuration,
+                senderMeta
             );
             const postBack = this._createPostBack(postbackAcumulator, req, res, features);
 
@@ -815,7 +823,8 @@ class Processor extends EventEmitter {
                 senderId,
                 pageId,
                 messageSender,
-                responderData
+                responderData,
+                res.senderMeta
             );
 
             await emitPromise; // probably has been resolved this time
@@ -906,7 +915,14 @@ class Processor extends EventEmitter {
         });
     }
 
-    _processPostbacks (postbackAcumulator, senderId, pageId, messageSender, responderData) {
+    _processPostbacks (
+        postbackAcumulator,
+        senderId,
+        pageId,
+        messageSender,
+        responderData,
+        senderMeta
+    ) {
         return postbackAcumulator.reduce((promise, postback) => promise
             .then(() => postback)
             .then(({ action, data = {}, features }) => {
@@ -917,7 +933,14 @@ class Processor extends EventEmitter {
                     request = Request.postBack(senderId, action, data);
                 }
                 Object.assign(request, { features });
-                return this._processMessage(request, pageId, messageSender, responderData);
+                return this._processMessage(
+                    request,
+                    pageId,
+                    messageSender,
+                    responderData,
+                    null,
+                    senderMeta
+                );
             }), Promise.resolve({}));
     }
 

package/src/Responder.js

@@ -102,7 +102,8 @@ class Responder {
         token = null,
         options = {},
         data = {},
-        configuration = {}
+        configuration = {},
+        senderMeta = null
     ) {
         this._messageSender = messageSender;
         this._senderId = senderId;
@@ -190,7 +191,7 @@ class Responder {
         this._trackAsAction = null;
 
         // both vars are package protected
-        this._senderMeta = { flag: null };
+        this._senderMeta = senderMeta || { flag: null };
 
         this._persona = null;