wingbot 3.62.0 → 3.63.0

package/package.json

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

package/plugins/ai.wingbot.upload/plugin.js

@@ -1,4 +1,5 @@
 const Router = require('../../src/Router');
+const { compileWithState } = require('../../src/utils');
 
 /**
  *
@@ -6,6 +7,7 @@ const Router = require('../../src/Router');
  * @param {'any'|'image'|'audio'|'video'|'file'} params.type
  * @param {string} params.variable
  * @param {'array'|'string'} params.datatype
+ * @param {string} params.allowSuffixes
  * @returns {import('../../src/Router').Middleware}
  */
 module.exports = (params) => {
@@ -15,10 +17,21 @@ module.exports = (params) => {
      * @param {import('../../src/Responder')} res
      */
     const uploadPlugin = async (req, res) => {
+
+        const allowSuffixes = compileWithState(req, res, params.allowSuffixes)
+            .split(',')
+            .map((s) => s.toLowerCase().trim())
+            .filter((s) => !!s);
+
         if (req.isAttachment()) {
+            const suffixOk = allowSuffixes.length === 0
+                || req.attachments.every((a) => {
+                    const [, suffix = ''] = a.payload.url.match(/\.([a-z0-9]+)(\?.+)?$/i) || [];
+                    return allowSuffixes.includes(suffix.toLowerCase());
+                });
 
             const typeOk = (!params.type || params.type === 'any')
-                || req.attachments.every((a) => a.type === params.type);
+                || (req.attachments.every((a) => a.type === params.type) && suffixOk);
 
             if (!typeOk) {
                 await res.run('badType');

package/plugins/plugins.json

@@ -644,6 +644,11 @@
                         { "value": "string", "label": "string" },
                         { "value": "array", "label": "array of strings" }
                     ]
+                },
+                {
+                    "name": "allowSuffixes",
+                    "label": "Allowed attachment suffixes (comma separated)",
+                    "type": "text"
                 }
             ],
             "items": [

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,