wingbot 3.46.0-alpha.7 → 3.46.0-alpha.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.46.0-alpha.7",
+  "version": "3.46.0-alpha.9",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {

package/src/analytics/onInteractionHandler.js

@@ -32,7 +32,6 @@ const {
  * @prop {string} [label]
  * @prop {number} [value]
  * @prop {string} [lang]
- * @prop {number} [sessionStart]
  */
 
 /**
@@ -53,7 +52,6 @@ const {
  * @prop {boolean} withUser
  * @prop {string} [userId]
  * @prop {number} [feedback]
- * @prop {number} sessionDuration
  * @prop {string} [winnerAction]
  * @prop {string} [winnerIntent]
  * @prop {string[]|string} [winnerEntities]
@@ -64,8 +62,6 @@ const {
  * @prop {string[]|string} [entities]
  * @prop {string[]|string} allActions
  * @prop {boolean} nonInteractive
- * @prop {string} [snapshot]
- * @prop {string} [botId]
  *
  * @typedef {Event & ConversationEventExtension} ConversationEvent
  */
@@ -75,7 +71,6 @@ const {
  * @prop {string} [lastAction]
  * @prop {string} [prevAction]
  * @prop {string} [skill]
- * @prop {number} sessionDuration
  * @prop {string[]|string} allActions
  * @prop {boolean} nonInteractive
  * @prop {boolean} isGoto
@@ -97,6 +92,10 @@ const {
  * @prop {string} [action]
  * @prop {string} [snapshot]
  * @prop {string} [botId]
+ * @prop {boolean} [didHandover]
+ * @prop {number|null} [feedback]
+ * @prop {string} [timeZone]
+ * @prop {number} [sessionStart]
  */
 
 /**
@@ -107,7 +106,6 @@ const {
  * @param {SessionMetadata} [metadata]
  * @param {number} [ts]
  * @param {boolean} [nonInteractive]
- * @param {string} [timeZone]
  * @returns {Promise}
  */
 
@@ -121,7 +119,7 @@ const {
  * @param {number} [ts]
  * @param {boolean} [nonInteractive]
  * @param {boolean} [sessionStarted]
- * @param {string} [timeZone]
+ * @param {SessionMetadata} [metadata]
  * @returns {Promise}
  */
 
@@ -285,26 +283,28 @@ function onInteractionHandler (
                 didHandover = true;
             }
 
+            const metadata = {
+                sessionCount,
+                lang,
+                action,
+                snapshot,
+                botId,
+                didHandover,
+                feedback,
+                timeZone,
+                sessionStart,
+                sessionDuration: sessionTs - sessionStart
+            };
+
             let sessionPromise;
             if (createSession) {
-                const metadata = {
-                    sessionCount,
-                    lang,
-                    action,
-                    snapshot,
-                    botId,
-                    didHandover,
-                    feedback
-                };
-
                 sessionPromise = analyticsStorage.createUserSession(
                     pageId,
                     senderId,
                     sessionId,
                     metadata,
                     timestamp,
-                    nonInteractive,
-                    timeZone
+                    nonInteractive
                 );
 
                 if (!parallelSessionInsert) {
@@ -376,12 +376,8 @@ function onInteractionHandler (
                 isPostback,
                 didHandover,
                 withUser,
-                sessionStart,
-                sessionDuration: sessionTs - sessionStart,
                 feedback,
                 skill: useSkill,
-                snapshot,
-                botId,
                 winnerAction,
                 winnerIntent,
                 winnerEntities: asArray(winnerEntities.map((e) => e.entity)),
@@ -410,11 +406,7 @@ function onInteractionHandler (
                 prevAction: lastAction,
                 skill: useSkill,
                 isGoto: false,
-                sessionStart,
-                sessionDuration: timestamp - sessionStart,
                 withUser,
-                snapshot,
-                botId,
                 ...langsExtension,
                 ...(hasExtendedEvents ? {} : actionMeta)
             });
@@ -434,10 +426,6 @@ function onInteractionHandler (
                         prevAction,
                         skill: useSkill,
                         isGoto: true,
-                        sessionStart,
-                        sessionDuration: timestamp - sessionStart,
-                        snapshot,
-                        botId,
                         ...langsExtension
                     };
 
@@ -456,7 +444,6 @@ function onInteractionHandler (
                     action: eventAction,
                     label,
                     value: eVal,
-                    sessionStart,
                     ...langsExtension
                 }))
             );
@@ -473,7 +460,6 @@ function onInteractionHandler (
                         action,
                         label: text,
                         value: score >= ai.confidence ? 0 : 1,
-                        sessionStart,
                         ...langsExtension
                     });
                 }
@@ -521,7 +507,6 @@ function onInteractionHandler (
                     action,
                     label,
                     value,
-                    sessionStart,
                     ...langsExtension
                 });
             }
@@ -537,7 +522,7 @@ function onInteractionHandler (
                     timestamp,
                     nonInteractive,
                     createSession,
-                    timeZone
+                    metadata
                 ),
                 sessionPromise
             ]);