wingbot 3.68.5 → 3.68.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.68.5",
+  "version": "3.68.8",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "type": "commonjs",
@@ -10,7 +10,7 @@
     "doc": "npm run doc:gql && node ./bin/makeApiDoc.js && cpy ./CHANGELOG.md ./doc && gitbook install ./doc && gitbook build ./doc && rimraf -rf ./docs && rimraf --rf ./doc/CHANGELOG.md && move-cli ./doc/_book ./docs",
     "test": "npm run test:lint && npm run test:coverage && npm run test:coverage:threshold",
     "test:coverage": "nyc --reporter=html mocha ./test && nyc report",
-    "test:coverage:threshold": "nyc check-coverage --lines 89 --functions 88 --branches 80",
+    "test:coverage:threshold": "nyc check-coverage --lines 89 --functions 88 --branches 79",
     "test:backend": "mocha ./test",
     "test:lint": "eslint --ext .js src test *.js plugins"
   },

package/src/BuildRouter.js

@@ -19,6 +19,7 @@ const defaultResourceMap = require('./defaultResourceMap');
 const { shouldExecuteResolver } = require('./resolvers/resolverTags');
 
 const MESSAGE_RESOLVER_NAME = 'botbuild.message';
+const PLUGIN_RESOLVER_NAME = 'botbuild.plugin';
 
 /** @typedef {import('./Router').BaseConfiguration} BaseConfiguration */
 /**
@@ -41,6 +42,7 @@ const MESSAGE_RESOLVER_NAME = 'botbuild.message';
  * @prop {string} type
  * @prop {object} params
  * @prop {string} [params.staticBlockId]
+ * @prop {object} [params.items]
  * @prop {string} [tag]
  */
 
@@ -865,7 +867,10 @@ class BuildRouter extends Router {
      */
     _lastMessageIndex (resolvers) {
         for (let i = resolvers.length - 1; i >= 0; i--) {
-            if (resolvers[i].type === MESSAGE_RESOLVER_NAME) {
+            const { type, params = {} } = resolvers[i];
+            if (MESSAGE_RESOLVER_NAME === type
+                || (type === PLUGIN_RESOLVER_NAME
+                    && params && params.items && Object.keys(params.items).length)) {
                 return i;
             }
         }

package/src/Responder.js

@@ -251,7 +251,7 @@ class Responder {
      * @returns {Promise<Transcript[]>}
      */
     async getTranscript (limit = 10, onlyFlag = null, skipThisTurnaround = false) {
-        const { chatLogStorage } = this._messageSender;
+        const { chatLogStorage, timestamp } = this._messageSender;
         if (!chatLogStorage) {
             return [];
         }
@@ -265,10 +265,10 @@ class Responder {
         if (!skipThisTurnaround) {
             const { responseTexts = [], requestTexts = [] } = this._messageSender;
             transcript.push(...requestTexts.map((text) => ({
-                fromBot: false, text
+                fromBot: false, text, timestamp
             })));
             transcript.push(...responseTexts.map((text) => ({
-                fromBot: true, text
+                fromBot: true, text, timestamp
             })));
         }
         return transcript;

package/src/ReturnSender.js

@@ -103,6 +103,8 @@ class ReturnSender {
 
         this._features = Array.isArray(incommingMessage.features) ? incommingMessage.features : ['text'];
 
+        this.timestamp = incommingMessage.timestamp;
+
         this._sendLastMessageWithFinish = this._features.includes(FEATURE_PHRASES)
             || this._features.includes(FEATURE_TRACKING);
 

package/src/transcript/htmlBodyFromTranscript.js

@@ -5,16 +5,52 @@
 
 /** @typedef {import('./transcriptFromHistory').Transcript} Transcript */
 
+/**
+ * @typedef {object} Options
+ * @prop {string} [timezone]
+ * @prop {string} [locale]
+ */
+
 /**
  * @param {Transcript[]} transcript
  * @param {string} [userSide]
  * @param {string} [botSide]
+ * @param {Options} [options]
  * @returns {string}
  */
-function htmlBodyFromTranscript (transcript, userSide = 'User', botSide = 'Bot') {
+function htmlBodyFromTranscript (transcript, userSide = 'User', botSide = 'Bot', options = {}) {
+
+    let lastDate = null;
+    let lastTime = null;
+    const showDate = options.locale && options.timezone;
 
     return transcript
-        .map((msg) => `<b>${msg.fromBot ? botSide : userSide}:</b> ${msg.text}`)
+        .flatMap((msg) => {
+            const line = `<b>${msg.fromBot ? botSide : userSide}:</b> ${msg.text}`;
+
+            if (!showDate || !msg.timestamp) {
+                return [line];
+            }
+
+            const d = new Date(msg.timestamp);
+
+            const date = d.toLocaleDateString(options.locale, {
+                year: 'numeric', month: 'numeric', day: 'numeric', timeZone: options.timezone
+            });
+            const time = d.toLocaleTimeString(options.locale, {
+                hour: 'numeric', minute: 'numeric', timeZone: options.timezone
+            });
+
+            if (lastTime === time && lastDate === time) {
+                return [line];
+            }
+
+            const timeLine = `<i>(${lastDate === date ? '' : `${date} `}${time})</i></small>`;
+            lastDate = date;
+            lastTime = time;
+
+            return [timeLine, line];
+        })
         .join('<br />');
 }
 

package/src/transcript/transcriptFromHistory.js

@@ -22,6 +22,7 @@ const extractText = require('./extractText');
  * @typedef {object} Transcript
  * @prop {string} text
  * @prop {boolean} fromBot
+ * @prop {number} [timestamp]
  */
 
 /**
@@ -51,12 +52,17 @@ async function transcriptFromHistory (
 
     return data
         .map((turn) => {
+            let { timestamp } = turn;
             const { request, responses = [] } = turn;
 
+            if (!timestamp) {
+                timestamp = request.timestamp || null;
+            }
+
             return [
-                { fromBot: false, text: extractText(request) },
+                { fromBot: false, text: extractText(request), timestamp },
                 ...responses
-                    .map((response) => ({ fromBot: true, text: extractText(response) }))
+                    .map((response) => ({ fromBot: true, text: extractText(response), timestamp }))
             ];
         })
         .reduce((ret, arr) => [...ret, ...arr], [])