wingbot 3.46.0-alpha.2 → 3.46.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.46.0-alpha.2",
+  "version": "3.46.0-alpha.4",
   "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/onInteractionHandler.js

@@ -122,6 +122,7 @@ const {
  * @prop {boolean} [supportsArrays]
  * @prop {boolean} [useDescriptiveCategories]
  * @prop {boolean} [useExtendedScalars]
+ * @prop {boolean} [parallelSessionInsert]
  */
 
 /**
@@ -200,7 +201,8 @@ function onInteractionHandler (
         supportsArrays = false,
         useExtendedScalars = false,
         hasExtendedEvents = false,
-        useDescriptiveCategories = true
+        useDescriptiveCategories = true,
+        parallelSessionInsert = false
     } = analyticsStorage;
 
     const asArray = (data = []) => (supportsArrays ? data : data.join(','));
@@ -243,6 +245,7 @@ function onInteractionHandler (
 
             const [action = noneAction, ...otherActions] = actions;
 
+            let sessionPromise;
             if (createSession) {
                 const metadata = {
                     sessionCount,
@@ -252,7 +255,7 @@ function onInteractionHandler (
                     botId
                 };
 
-                await analyticsStorage.createUserSession(
+                sessionPromise = analyticsStorage.createUserSession(
                     pageId,
                     senderId,
                     sessionId,
@@ -261,6 +264,11 @@ function onInteractionHandler (
                     nonInteractive,
                     timeZone
                 );
+
+                if (!parallelSessionInsert) {
+                    await sessionPromise;
+                    sessionPromise = null;
+                }
             }
 
             const [{
@@ -351,10 +359,15 @@ 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,
@@ -373,6 +386,7 @@ function onInteractionHandler (
                         type: TrackingType.PAGE_VIEW,
                         category: asCategory(TrackingCategory.PAGE_VIEW_SUBSEQUENT),
                         action: a,
+                        value: 0,
                         allActions,
                         nonInteractive: false,
                         lastAction,
@@ -389,14 +403,14 @@ function onInteractionHandler (
 
             trackEvents.push(
                 ...events.map(({
-                    type, category, action: eventAction, label, value
+                    type, category, action: eventAction, label, value: eVal
                 }) => ({
                     lastAction,
                     type,
                     category,
                     action: eventAction,
                     label,
-                    value,
+                    value: eVal,
                     ...langsExtension
                 }))
             );
@@ -417,11 +431,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;
@@ -450,7 +461,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;
                 }
@@ -468,18 +479,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,
+                    timeZone
+                ),
+                sessionPromise
+            ]);
         } catch (e) {
             if (throwException) {
                 throw e;