wingbot 3.44.0 → 3.44.1

package/package.json

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

package/src/analytics/onInteractionHandler.js

@@ -11,7 +11,7 @@ const Ai = require('../Ai');
 
 /**
  * @typedef {object} GAUser
- * @prop {string} id
+ * @prop {string} [id]
  */
 
 /**
@@ -55,6 +55,8 @@ const Ai = require('../Ai');
  * @param {Event[]} events
  * @param {GAUser} [user]
  * @param {number} [ts]
+ * @param {boolean} [nonInteractive]
+ * @param {boolean} [sessionStarted]
  * @returns {Promise}
  */
 
@@ -72,9 +74,9 @@ const Ai = require('../Ai');
  */
 
 /**
- * @callback MetadataExtractor
+ * @callback UserExtractor
  * @param {Request} req
- * @returns {object}
+ * @returns {object & GAUser}
  */
 
 /**
@@ -99,7 +101,7 @@ const Ai = require('../Ai');
  * @prop {boolean} [throwException] - default false
  * @prop {IGALogger} [log] - console like logger
  * @prop {Anonymizer} [anonymize] - text anonymization function
- * @prop {MetadataExtractor} [extractMetadata] - text anonymization function
+ * @prop {UserExtractor} [userExtractor] - text anonymization function
  */
 
 /**
@@ -121,7 +123,7 @@ function onInteractionHandler (
         throwException = false,
         log = console,
         anonymize = (x) => x,
-        extractMetadata = (req) => ({}) // eslint-disable-line no-unused-vars
+        userExtractor = (req) => null // eslint-disable-line no-unused-vars
     },
     analyticsStorage,
     ai = Ai.ai
@@ -163,9 +165,7 @@ function onInteractionHandler (
                 const metadata = {
                     sessionCount,
                     lang,
-                    action,
-                    cd1: (req.state.user && req.state.user.department) || 'unknown',
-                    ...extractMetadata(req)
+                    action
                 };
 
                 await analyticsStorage.createUserSession(
@@ -366,7 +366,7 @@ function onInteractionHandler (
                 });
             }
 
-            const user = null;
+            const user = userExtractor(req);
 
             await analyticsStorage.storeEvents(
                 pageId,
@@ -375,7 +375,9 @@ function onInteractionHandler (
                 // @ts-ignore
                 events,
                 user,
-                timestamp
+                timestamp,
+                nonInteractive,
+                createSession
             );
         } catch (e) {
             if (throwException) {