wingbot 3.46.0-alpha.1 → 3.46.0-alpha.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.46.0-alpha.1",
+  "version": "3.46.0-alpha.10",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,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 90 --functions 90 --branches 80",
+    "test:coverage:threshold": "nyc check-coverage --lines 90 --functions 89 --branches 80",
     "test:backend": "mocha ./test",
     "test:lint": "eslint --ext .js src test *.js plugins"
   },

package/src/analytics/consts.js

@@ -42,6 +42,10 @@ const TrackingType = { // max length 12
  * @enum {string} TrackingCategory
  */
 const TrackingCategory = { // max length 3
+    // PAGE_VIEW: 'page_view'
+    PAGE_VIEW_FIRST: 'pf',
+    PAGE_VIEW_SUBSEQUENT: 'pp',
+
     // CONVERSATION_EVENT: 'conversation'
     STICKER: 'sti',
     IMAGE: 'img',
@@ -58,18 +62,22 @@ const TrackingCategory = { // max length 3
 
     // TRAINING: 'train'
     INTENT_DETECTION: 'int',
-    HANDOVER_OCCURRED: 'hum',
     DISAMBIGUATION_SELECTED: 'dis',
     DISAMBIGUATION_OFFERED: 'dio',
 
     // REPORT: 'report'
-    REPORT_FEEDBACK: 'fdb'
+    REPORT_FEEDBACK: 'fdb',
+    HANDOVER_OCCURRED: 'hum'
 };
 
 /**
  * @type {Object<TrackingCategory,string>}
  */
 const CATEGORY_LABELS = {
+    // PAGE_VIEW: 'page_view'
+    [TrackingCategory.PAGE_VIEW_FIRST]: 'Bot: Interaction',
+    [TrackingCategory.PAGE_VIEW_SUBSEQUENT]: 'Bot: Sub-interaction',
+
     // CONVERSATION_EVENT: 'conversation'
     [TrackingCategory.STICKER]: 'User: Sticker',
     [TrackingCategory.IMAGE]: 'User: Image',
@@ -86,12 +94,12 @@ const CATEGORY_LABELS = {
 
     // TRAINING: 'train'
     [TrackingCategory.INTENT_DETECTION]: 'Intent: Detection',
-    [TrackingCategory.HANDOVER_OCCURRED]: 'Bot: Handover out',
     [TrackingCategory.DISAMBIGUATION_SELECTED]: 'Disambiguation: selected',
     [TrackingCategory.DISAMBIGUATION_OFFERED]: 'Disambiguation: offered',
 
     // REPORT: 'report'
-    [TrackingCategory.REPORT_FEEDBACK]: 'User: Feedback'
+    [TrackingCategory.REPORT_FEEDBACK]: 'User: Feedback',
+    [TrackingCategory.HANDOVER_OCCURRED]: 'Bot: Handover out'
 };
 
 module.exports = {

package/src/analytics/onInteractionHandler.js

@@ -31,6 +31,56 @@ const {
  * @prop {string} [action]
  * @prop {string} [label]
  * @prop {number} [value]
+ * @prop {string} [lang]
+ */
+
+/**
+ * @typedef {object} ConversationEventExtension
+ * @prop {string} [lastAction]
+ * @prop {string} [skill]
+ * @prop {string} [text]
+ * @prop {string} [expected]
+ * @prop {boolean} expectedTaken
+ * @prop {boolean} isContextUpdate
+ * @prop {boolean} isAttachment
+ * @prop {boolean} isNotification
+ * @prop {boolean} isQuickReply
+ * @prop {boolean} isPassThread
+ * @prop {boolean} isPostback
+ * @prop {boolean} isText
+ * @prop {boolean} didHandover
+ * @prop {boolean} withUser
+ * @prop {string} [userId]
+ * @prop {number} [feedback]
+ * @prop {string} [winnerAction]
+ * @prop {string} [winnerIntent]
+ * @prop {string[]|string} [winnerEntities]
+ * @prop {number} [winnerScore]
+ * @prop {boolean} [winnerTaken]
+ * @prop {string} [intent]
+ * @prop {number} [intentScore]
+ * @prop {string[]|string} [entities]
+ * @prop {string[]|string} allActions
+ * @prop {boolean} nonInteractive
+ *
+ * @typedef {Event & ConversationEventExtension} ConversationEvent
+ */
+
+/**
+ * @typedef {object} PageViewEventExtension
+ * @prop {string} [lastAction]
+ * @prop {string} [prevAction]
+ * @prop {string} [skill]
+ * @prop {string[]|string} allActions
+ * @prop {boolean} nonInteractive
+ * @prop {boolean} isGoto
+ * @prop {boolean} withUser
+ *
+ * @typedef {Event & PageViewEventExtension} PageViewEvent
+ */
+
+/**
+ * @typedef {ConversationEvent | Event | PageViewEvent} TrackingEvent
  */
 
 /**
@@ -40,6 +90,11 @@ const {
  * @prop {string} [action]
  * @prop {string} [snapshot]
  * @prop {string} [botId]
+ * @prop {boolean} [didHandover]
+ * @prop {number|null} [feedback]
+ * @prop {string} [timeZone]
+ * @prop {number} [sessionStart]
+ * @prop {number} [sessionDuration]
  */
 
 /**
@@ -50,7 +105,6 @@ const {
  * @param {SessionMetadata} [metadata]
  * @param {number} [ts]
  * @param {boolean} [nonInteractive]
- * @param {string} [timeZone]
  * @returns {Promise}
  */
 
@@ -59,12 +113,12 @@ const {
  * @param {string} pageId
  * @param {string} senderId
  * @param {string} sessionId
- * @param {Event[]} events
+ * @param {TrackingEvent[]} events
  * @param {GAUser} [user]
  * @param {number} [ts]
  * @param {boolean} [nonInteractive]
  * @param {boolean} [sessionStarted]
- * @param {string} [timeZone]
+ * @param {SessionMetadata} [metadata]
  * @returns {Promise}
  */
 
@@ -82,6 +136,7 @@ const {
  * @prop {boolean} [supportsArrays]
  * @prop {boolean} [useDescriptiveCategories]
  * @prop {boolean} [useExtendedScalars]
+ * @prop {boolean} [parallelSessionInsert]
  */
 
 /**
@@ -98,7 +153,7 @@ const {
 
 /**
  * @typedef {object} TrackingEvents
- * @prop {Event[]} events
+ * @prop {TrackingEvent[]} events
  */
 
 /**
@@ -160,13 +215,14 @@ function onInteractionHandler (
         supportsArrays = false,
         useExtendedScalars = false,
         hasExtendedEvents = false,
-        useDescriptiveCategories = true
+        useDescriptiveCategories = true,
+        parallelSessionInsert = false
     } = analyticsStorage;
 
     const asArray = (data = []) => (supportsArrays ? data : data.join(','));
     const asCategory = (cat) => (useDescriptiveCategories && CATEGORY_LABELS[cat]) || cat;
     const noneAction = useExtendedScalars ? null : '(none)';
-    const noneValue = useExtendedScalars ? -1 : 0;
+    const noneValue = useExtendedScalars ? null : 0;
 
     /**
      * @param {InteractionEvent} params
@@ -201,26 +257,59 @@ function onInteractionHandler (
                 lang
             } = req.state;
 
+            const trackEvents = [];
+
             const [action = noneAction, ...otherActions] = actions;
 
-            if (createSession) {
-                const metadata = {
-                    sessionCount,
-                    lang,
-                    action,
-                    snapshot,
-                    botId
-                };
+            const feedbackEvent = events.find((e) => e.type === TrackingType.REPORT
+                && e.category === TrackingCategory.REPORT_FEEDBACK);
+            const feedback = feedbackEvent
+                ? feedbackEvent.value
+                : noneValue;
+            let didHandover = flag === ResponseFlag.HANDOVER;
+            const hasHandoverEvent = events
+                .some((e) => e.category === TrackingCategory.HANDOVER_OCCURRED);
+
+            if (didHandover && !hasHandoverEvent) {
+                trackEvents.push({
+                    type: TrackingType.REPORT,
+                    category: asCategory(TrackingCategory.HANDOVER_OCCURRED),
+                    action: null,
+                    label: null,
+                    value: noneValue
+                });
+            } else if (hasHandoverEvent) {
+                didHandover = true;
+            }
+
+            const metadata = {
+                sessionCount,
+                lang,
+                action,
+                snapshot,
+                botId,
+                didHandover,
+                feedback,
+                timeZone,
+                sessionStart,
+                sessionDuration: sessionTs - sessionStart
+            };
 
-                await analyticsStorage.createUserSession(
+            let sessionPromise;
+            if (createSession) {
+                sessionPromise = analyticsStorage.createUserSession(
                     pageId,
                     senderId,
                     sessionId,
                     metadata,
                     timestamp,
-                    nonInteractive,
-                    timeZone
+                    nonInteractive
                 );
+
+                if (!parallelSessionInsert) {
+                    await sessionPromise;
+                    sessionPromise = null;
+                }
             }
 
             const [{
@@ -233,6 +322,7 @@ function onInteractionHandler (
                 : anonymize(
                     replaceDiacritics(req.text()).replace(/\s+/g, ' ').toLowerCase().trim()
                 );
+            const useSkill = (skill && webalize(skill)) || noneAction;
 
             let winnerAction = '';
             let winnerScore = 0;
@@ -253,14 +343,6 @@ function onInteractionHandler (
             }
 
             const expected = req.expected() ? req.expected().action : '';
-
-            const feedbackEvent = events.find((e) => e.type === TrackingType.REPORT
-                && e.category === TrackingCategory.REPORT_FEEDBACK);
-            const feedback = feedbackEvent
-                ? feedbackEvent.value
-                : noneValue;
-            const didHandover = flag === ResponseFlag.HANDOVER;
-
             const user = userExtractor(req.state);
 
             const isContextUpdate = req.isSetContext();
@@ -274,12 +356,12 @@ function onInteractionHandler (
             const allActions = asArray(actions);
             const requestAction = req.action();
 
-            const trackEvents = [];
-
             const langsExtension = hasExtendedEvents
                 ? { lang }
                 : { cd1: lang };
 
+            const withUser = user !== null && !!user.id;
+
             const actionMeta = {
                 requestAction: req.action() || noneAction,
                 expected,
@@ -292,13 +374,9 @@ function onInteractionHandler (
                 isText,
                 isPostback,
                 didHandover,
-                withUser: user !== null && !!user.id,
-                sessionStart,
-                sessionDuration: sessionTs - sessionStart,
+                withUser,
                 feedback,
-                skill: webalize(skill),
-                snapshot,
-                botId,
+                skill: useSkill,
                 winnerAction,
                 winnerIntent,
                 winnerEntities: asArray(winnerEntities.map((e) => e.entity)),
@@ -311,16 +389,24 @@ function onInteractionHandler (
                 allActions
             };
 
+            const notHandled = actions.some((a) => a.match(/\*$/)) && !req.isQuickReply();
+            const value = notHandled ? 1 : 0;
+
             trackEvents.push({
                 type: TrackingType.PAGE_VIEW,
+                category: asCategory(TrackingCategory.PAGE_VIEW_FIRST),
                 action,
+                label: (isText || isQuickReply ? text : null),
+                value,
                 allActions,
                 nonInteractive,
                 lastAction,
+                // @ts-ignore
                 prevAction: lastAction,
-                skill,
-                lang,
-                cd1: req.state.lang,
+                skill: useSkill,
+                isGoto: false,
+                withUser,
+                ...langsExtension,
                 ...(hasExtendedEvents ? {} : actionMeta)
             });
 
@@ -330,12 +416,14 @@ function onInteractionHandler (
                 ...otherActions.map((a) => {
                     const r = {
                         type: TrackingType.PAGE_VIEW,
+                        category: asCategory(TrackingCategory.PAGE_VIEW_SUBSEQUENT),
                         action: a,
+                        value: 0,
                         allActions,
                         nonInteractive: false,
                         lastAction,
                         prevAction,
-                        skill,
+                        skill: useSkill,
                         isGoto: true,
                         ...langsExtension
                     };
@@ -347,14 +435,14 @@ function onInteractionHandler (
 
             trackEvents.push(
                 ...events.map(({
-                    type, category, action: eventAction, label, value
+                    type, category, action: eventAction, label, value: eVal
                 }) => ({
                     lastAction,
                     type,
-                    category,
+                    category: asCategory(category),
                     action: eventAction,
                     label,
-                    value,
+                    value: eVal,
                     ...langsExtension
                 }))
             );
@@ -375,11 +463,8 @@ function onInteractionHandler (
                     });
                 }
 
-                const notHandled = actions.some((a) => a.match(/\*$/)) && !req.isQuickReply();
-
                 let actionCategory;
                 let label = noneAction;
-                const value = notHandled ? 1 : 0;
 
                 if (isPassThread) {
                     actionCategory = TrackingCategory.HANDOVER_TO_BOT;
@@ -408,7 +493,7 @@ function onInteractionHandler (
                     actionCategory = TrackingCategory.REFERRAL;
                 } else if (isPostback) {
                     actionCategory = TrackingCategory.POSTBACK_BUTTON;
-                    label = req.data.postback.title || '(unknown)';
+                    label = req.event.postback.title || (useExtendedScalars ? null : '(unknown)');
                 } else {
                     actionCategory = TrackingCategory.OTHER;
                 }
@@ -416,7 +501,6 @@ function onInteractionHandler (
                 trackEvents.push({
                     ...(analyticsStorage.hasExtendedEvents ? actionMeta : {}),
                     type: TrackingType.CONVERSATION_EVENT,
-                    // @ts-ignore
                     lastAction,
                     category: asCategory(actionCategory),
                     action,
@@ -426,18 +510,21 @@ function onInteractionHandler (
                 });
             }
 
-            await analyticsStorage.storeEvents(
-                pageId,
-                senderId,
-                sessionId,
-                // @ts-ignore
-                trackEvents,
-                user,
-                timestamp,
-                nonInteractive,
-                createSession,
-                timeZone
-            );
+            await Promise.all([
+                analyticsStorage.storeEvents(
+                    pageId,
+                    senderId,
+                    sessionId,
+                    // @ts-ignore
+                    trackEvents,
+                    user,
+                    timestamp,
+                    nonInteractive,
+                    createSession,
+                    metadata
+                ),
+                sessionPromise
+            ]);
         } catch (e) {
             if (throwException) {
                 throw e;