wingbot 3.61.5 → 3.62.1

package/package.json

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

package/src/analytics/onInteractionHandler.js

@@ -536,69 +536,68 @@ function onInteractionHandler (
                 }))
             );
 
-            if (!nonInteractive) {
-                if (req.isText()) {
-                    trackEvents.push({
-                        type: TrackingType.TRAINING,
-                        // @ts-ignore
-                        lastAction,
-                        category: asCategory(TrackingCategory.INTENT_DETECTION),
-                        intent,
-                        action,
-                        label: text,
-                        value: score >= ai.confidence ? 0 : 1,
-                        ...langsExtension
-                    });
-                }
-
-                let actionCategory;
-                let label = noneAction;
-
-                if (isPassThread) {
-                    actionCategory = TrackingCategory.HANDOVER_TO_BOT;
-                } else if (req.isSticker()) {
-                    actionCategory = TrackingCategory.STICKER;
-                    label = req.attachmentUrl(0);
-                } else if (req.isImage()) {
-                    actionCategory = TrackingCategory.IMAGE;
-                    label = req.attachmentUrl(0);
-                } else if (req.hasLocation()) {
-                    actionCategory = TrackingCategory.LOCATION;
-                    const { lat, long } = req.getLocation();
-                    label = `${lat}, ${long}`;
-                } else if (isAttachment) {
-                    actionCategory = TrackingCategory.ATTACHMENT;
-                    label = req.attachment(0).type;
-                } else if (isText) {
-                    actionCategory = TrackingCategory.TEXT;
-                    label = text;
-                } else if (isQuickReply) {
-                    actionCategory = TrackingCategory.QUICK_REPLY;
-                    label = text;
-                } else if (req.isOptin()) {
-                    actionCategory = TrackingCategory.OPT_IN;
-                } else if (req.isReferral()) {
-                    actionCategory = TrackingCategory.REFERRAL;
-                } else if (isPostback) {
-                    actionCategory = TrackingCategory.POSTBACK_BUTTON;
-                    label = req.event.postback.title || (useExtendedScalars ? null : '(unknown)');
-                } else {
-                    actionCategory = TrackingCategory.OTHER;
-                }
-
+            if (req.isText()) {
                 trackEvents.push({
-                    ...(analyticsStorage.hasExtendedEvents ? actionMeta : {}),
-                    type: TrackingType.CONVERSATION_EVENT,
+                    type: TrackingType.TRAINING,
+                    // @ts-ignore
                     lastAction,
-                    category: asCategory(actionCategory),
+                    category: asCategory(TrackingCategory.INTENT_DETECTION),
+                    intent,
                     action,
-                    label,
-                    value,
-                    pageCategory,
+                    label: text,
+                    value: score >= ai.confidence ? 0 : 1,
                     ...langsExtension
                 });
             }
 
+            let actionCategory;
+            let label = noneAction;
+
+            if (isPassThread) {
+                actionCategory = TrackingCategory.HANDOVER_TO_BOT;
+            } else if (req.isSticker()) {
+                actionCategory = TrackingCategory.STICKER;
+                label = req.attachmentUrl(0);
+            } else if (req.isImage()) {
+                actionCategory = TrackingCategory.IMAGE;
+                label = req.attachmentUrl(0);
+            } else if (req.hasLocation()) {
+                actionCategory = TrackingCategory.LOCATION;
+                const { lat, long } = req.getLocation();
+                label = `${lat}, ${long}`;
+            } else if (isAttachment) {
+                actionCategory = TrackingCategory.ATTACHMENT;
+                label = req.attachment(0).type;
+            } else if (isText) {
+                actionCategory = TrackingCategory.TEXT;
+                label = text;
+            } else if (isQuickReply) {
+                actionCategory = TrackingCategory.QUICK_REPLY;
+                label = text;
+            } else if (req.isOptin()) {
+                actionCategory = TrackingCategory.OPT_IN;
+            } else if (req.isReferral()) {
+                actionCategory = TrackingCategory.REFERRAL;
+            } else if (isPostback) {
+                actionCategory = TrackingCategory.POSTBACK_BUTTON;
+                label = req.event.postback.title || (useExtendedScalars ? null : '(unknown)');
+            } else {
+                actionCategory = TrackingCategory.OTHER;
+            }
+
+            trackEvents.push({
+                ...(analyticsStorage.hasExtendedEvents ? actionMeta : {}),
+                type: TrackingType.CONVERSATION_EVENT,
+                lastAction,
+                category: asCategory(actionCategory),
+                action,
+                label,
+                value,
+                pageCategory,
+                nonInteractive,
+                ...langsExtension
+            });
+
             await Promise.all([
                 analyticsStorage.storeEvents(
                     pageId,

package/src/notifications/Notifications.js

@@ -151,7 +151,13 @@ class Notifications extends EventEmitter {
 
         this._storage = notificationStorage;
         this._log = options.log || console;
+
+        /** @type {number} */
         this.limit = DEFAULT_LIMIT;
+
+        /** @type {number} */
+        this.sendLimit = DEFAULT_LIMIT;
+
         this._default24Clearance = options.default24Clearance || DEFAULT_24_CLEARANCE;
         this._allAudienceTag = typeof options.allAudienceTag !== 'undefined'
             ? options.allAudienceTag
@@ -824,7 +830,7 @@ class Notifications extends EventEmitter {
 
         while (run) {
             const now = timeStart + (Date.now() - begin);
-            const pop = await this._storage.popTasks(this.limit, now);
+            const pop = await this._storage.popTasks(this.sendLimit, now);
             await this._processPoppedTasks(pop, processor);
 
             run = pop.length !== 0 && (timeStart + timeLimit) > Date.now();