wingbot 3.46.2 → 3.46.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.46.2",
+  "version": "3.46.4",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {
@@ -55,7 +55,7 @@
   "dependencies": {
     "form-data": "^4.0.0",
     "graphql": "^15.8.0",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.0",
     "node-fetch": "^2.6.7",
     "path-to-regexp": "^6.2.1",
     "uuid": "^8.3.2",

package/src/Processor.js

@@ -63,6 +63,7 @@ const { mergeState, isUserInteraction } = require('./utils/stateVariables');
  * @prop {ResponseFlag|null} flag
  * @prop {boolean} nonInteractive
  * @prop {string[]} responseTexts
+ * @prop {boolean} doNotTrack
  */
 
 /**
@@ -421,12 +422,7 @@ class Processor extends EventEmitter {
      * @returns {Promise}
      */
     _emitInteractionEvent (req, res, messageSender, state, data) {
-        const shouldNotTrack = data._initialEventShouldNotBeTracked === true;
-
-        if (shouldNotTrack) {
-            return Promise.resolve();
-        }
-
+        const doNotTrack = data._initialEventShouldNotBeTracked === true;
         const { _lastAction: lastAction = null } = req.state;
         const actions = messageSender.visitedInteractions;
         const skill = typeof res.newState._trackAsSkill === 'undefined'
@@ -435,6 +431,7 @@ class Processor extends EventEmitter {
         const { events = [] } = messageSender.tracking;
 
         const event = {
+            doNotTrack,
             responseTexts: messageSender.responseTexts,
             req,
             actions,
@@ -445,7 +442,7 @@ class Processor extends EventEmitter {
             tracking: messageSender.tracking,
             events,
             flag: res.senderMeta.flag,
-            nonInteractive: !isUserInteraction(req)
+            nonInteractive: !isUserInteraction(req) || doNotTrack
         };
 
         return Promise.allSettled([
@@ -610,10 +607,10 @@ class Processor extends EventEmitter {
 
                 const interactive = isUserInteraction(req);
 
-                if ((isUserInteraction(req)
-                    && (sessionTs + this.options.sessionDuration) < Date.now())
-                        || !sessionId) {
+                const sessionExpired = interactive
+                    && (sessionTs + this.options.sessionDuration) < Date.now();
 
+                if (sessionExpired || !sessionId) {
                     sessionStart = timestamp;
                     sessionTs = timestamp;
                     sessionId = Processor._createSessionId(req.pageId, req.senderId, timestamp);

package/src/analytics/onInteractionHandler.js

@@ -239,7 +239,8 @@ function onInteractionHandler (
         events,
         flag,
         nonInteractive,
-        responseTexts
+        responseTexts,
+        doNotTrack = false
     }) {
         if (!enabled) {
             return;
@@ -321,7 +322,7 @@ function onInteractionHandler (
                 score = 0
             } = {}] = req.intents;
 
-            const text = req.isConfidentInput()
+            const text = req.isConfidentInput() || doNotTrack
                 ? '*****'
                 : anonymize(
                     replaceDiacritics(req.text()).replace(/\s+/g, ' ').toLowerCase().trim()
@@ -396,47 +397,49 @@ function onInteractionHandler (
             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: useSkill,
-                isGoto: false,
-                withUser,
-                ...langsExtension,
-                ...(hasExtendedEvents ? {} : actionMeta)
-            });
-
-            let prevAction = action;
-
-            trackEvents.push(
-                ...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: useSkill,
-                        isGoto: true,
-                        withUser,
-                        ...langsExtension
-                    };
+            if (!doNotTrack) {
+                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: useSkill,
+                    isGoto: false,
+                    withUser,
+                    ...langsExtension,
+                    ...(hasExtendedEvents ? {} : actionMeta)
+                });
 
-                    prevAction = a;
-                    return r;
-                })
-            );
+                let prevAction = action;
+
+                trackEvents.push(
+                    ...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: useSkill,
+                            isGoto: true,
+                            withUser,
+                            ...langsExtension
+                        };
+
+                        prevAction = a;
+                        return r;
+                    })
+                );
+            }
 
             trackEvents.push(
                 ...events.map(({
@@ -453,7 +456,6 @@ function onInteractionHandler (
             );
 
             if (!nonInteractive) {
-
                 if (req.isText()) {
                     trackEvents.push({
                         type: TrackingType.TRAINING,