wingbot 3.49.1 → 3.50.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.49.1",
+  "version": "3.50.1",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {
@@ -53,6 +53,7 @@
     "tsd-jsdoc": "^2.5.0"
   },
   "dependencies": {
+    "@amplitude/ua-parser-js": "^0.7.31",
     "form-data": "^4.0.0",
     "graphql": "^15.8.0",
     "jsonwebtoken": "^9.0.0",

package/src/Processor.js

@@ -608,7 +608,7 @@ class Processor extends EventEmitter {
                 const interactive = isUserInteraction(req);
 
                 const sessionExpired = interactive
-                    && (sessionTs + this.options.sessionDuration) < Date.now();
+                    && (sessionTs + this.options.sessionDuration) < timestamp;
 
                 if (sessionExpired || !sessionId) {
                     sessionStart = timestamp;

package/src/analytics/onInteractionHandler.js

@@ -3,6 +3,7 @@
  */
 'use strict';
 
+const uaParserJs = require('@amplitude/ua-parser-js');
 const { replaceDiacritics, webalize } = require('webalize');
 const Ai = require('../Ai');
 const {
@@ -101,6 +102,9 @@ const {
  * @prop {string[]} [responseTexts]
  * @prop {string|null} [pagePath]
  * @prop {string|null} [pageCategory]
+ * @prop {string} [browserName]
+ * @prop {string} [deviceType]
+ * @prop {string} [osName]
  */
 
 /**
@@ -177,6 +181,7 @@ const {
 /**
  * @typedef {object} HandlerConfig
  * @prop {string} [pagePathVar]
+ * @prop {string} [userAgentVar]
  * @prop {string} [snapshot]
  * @prop {string} [botId]
  * @prop {string} [timeZone] - default UTC
@@ -232,6 +237,7 @@ function onInteractionHandler (
         botId,
         timeZone = 'UTC',
         pagePathVar = '§pathname',
+        userAgentVar = '§ua',
         pathCategoryExtractor = defaultPathExtractor,
         anonymize = (x) => x,
         userExtractor = (state) => null // eslint-disable-line no-unused-vars
@@ -259,7 +265,7 @@ function onInteractionHandler (
         req,
         actions,
         lastAction,
-        state,
+        // state,
         // data,
         skill,
         events,
@@ -285,8 +291,11 @@ function onInteractionHandler (
                 _sst: sessionStart,
                 _sts: sessionTs,
                 lang,
-                [pagePathVar]: pagePath
-            } = state;
+                [pagePathVar]: pagePath,
+                [userAgentVar]: userAgent
+            } = req.state;
+
+            const ua = uaParserJs(userAgent);
 
             const pageCategory = pathCategoryExtractor(pagePath);
 
@@ -328,7 +337,10 @@ function onInteractionHandler (
                 responseTexts,
                 sessionDuration: sessionTs - sessionStart,
                 pagePath,
-                pageCategory
+                pageCategory,
+                browserName: ua.browser.name || null,
+                deviceType: ua.device.type || null,
+                osName: ua.os.name || null
             };
 
             let sessionPromise;

package/src/resolvers/utils.js

@@ -72,6 +72,7 @@ function getLanguageText (translations, lang = null, disableDefaulting = false)
             // @ts-ignore
             foundText = translations.find((t) => t.l === lang);
         } else if (disableDefaulting) {
+            // @ts-ignore
             [foundText] = translations;
         }
         if (isTextObjectEmpty(foundText) && !disableDefaulting) {