wingbot 3.32.0-alpha.1 → 3.32.0

package/src/resolvers/message.js

@@ -44,10 +44,10 @@ function getVoiceControlFromParams (params, lang = null) {
     return Object.keys(voiceControl).length > 0 ? voiceControl : null;
 }
 
-function parseReplies (replies, linksMap, context) {
+function parseReplies (replies, linksMap, allowForbiddenSnippetWords) {
     return replies.map((reply) => {
 
-        const condition = getCondition(reply, context, 'Quick reply condition');
+        const condition = getCondition(reply, 'Quick reply condition', allowForbiddenSnippetWords);
 
         if (reply.isLocation) {
             return {
@@ -78,10 +78,6 @@ function parseReplies (replies, linksMap, context) {
             }
         }
 
-        if (!action) {
-            return null;
-        }
-
         const ret = {
             action,
             condition,
@@ -108,8 +104,7 @@ function parseReplies (replies, linksMap, context) {
         }
 
         return ret;
-    })
-        .filter((r) => r !== null);
+    });
 }
 
 /**
@@ -159,20 +154,11 @@ function findSupportedMessages (text, features, lang = null) {
     };
 }
 
-/** @typedef {import('../BuildRouter').BotContext} BotContext */
-/** @typedef {import('../Router').Resolver} Resolver */
+function message (params, {
+    // @ts-ignore
+    isLastIndex, isLastMessage, linksMap, allowForbiddenSnippetWords
+} = {}) {
 
-/**
- *
- * @param {object} params
- * @param {BotContext} context
- * @returns {Resolver}
- */
-function message (params, context = {}) {
-    const {
-        // @ts-ignore
-        isLastIndex, isLastMessage, linksMap, configuration
-    } = context;
     if (typeof params.text !== 'string' && !Array.isArray(params.text)) {
         throw new Error('Message should be a text!');
     }
@@ -182,11 +168,11 @@ function message (params, context = {}) {
     if (params.replies && !Array.isArray(params.replies)) {
         throw new Error('Replies should be an array');
     } else if (params.replies && params.replies.length > 0) {
-        quickReplies = parseReplies(params.replies, linksMap, context);
+        quickReplies = parseReplies(params.replies, linksMap, allowForbiddenSnippetWords);
     }
 
     // compile condition
-    const condition = getCondition(params, context, 'Message condition');
+    const condition = getCondition(params, 'Message condition', allowForbiddenSnippetWords);
 
     const ret = isLastIndex ? Router.END : Router.CONTINUE;
 
@@ -198,7 +184,7 @@ function message (params, context = {}) {
         if (condition && !condition(req, res)) {
             return ret;
         }
-        const data = stateData(req, res, configuration);
+        const data = stateData(req, res);
 
         // filter supported messages
         const supportedText = findSupportedMessages(

package/src/resolvers/postback.js

@@ -7,17 +7,7 @@ const Router = require('../Router');
 const getCondition = require('../utils/getCondition');
 const { shouldExecuteResolver } = require('./resolverTags');
 
-/** @typedef {import('../BuildRouter').BotContext} BotContext */
-/** @typedef {import('../Router').Resolver} Resolver */
-
-/**
- *
- * @param {object} params
- * @param {BotContext} context
- * @returns {Resolver}
- */
-function postback (params, context) {
-    const { linksMap, isLastIndex } = context;
+function postback (params, { linksMap, isLastIndex, allowForbiddenSnippetWords }) {
     const {
         routeId,
         postBack: staticAction
@@ -32,12 +22,12 @@ function postback (params, context) {
         }
     }
 
-    const condition = getCondition(params, context, 'postback');
+    const condition = getCondition(params, '', allowForbiddenSnippetWords);
 
     const ret = isLastIndex ? Router.END : Router.CONTINUE;
 
     return (req, res, postBack) => {
-        if (!action || !shouldExecuteResolver(req, params)) {
+        if (!shouldExecuteResolver(req, params)) {
             return ret;
         }
 

package/src/resolvers/setState.js

@@ -8,20 +8,11 @@ const Ai = require('../Ai');
 const { getSetState } = require('../utils/getUpdate');
 const getCondition = require('../utils/getCondition');
 
-/** @typedef {import('../BuildRouter').BotContext} BotContext */
-/** @typedef {import('../Router').Resolver} Resolver */
-
-/**
- *
- * @param {object} params
- * @param {BotContext} context
- * @returns {Resolver}
- */
-function setState (params, context) {
+function setState (params, { isLastIndex, allowForbiddenSnippetWords }) {
 
-    const condition = getCondition(params, context, 'setState');
+    const condition = getCondition(params, '', allowForbiddenSnippetWords);
 
-    const ret = context.isLastIndex ? Router.END : Router.CONTINUE;
+    const ret = isLastIndex ? Router.END : Router.CONTINUE;
 
     return async (req, res) => {
         if (condition !== null) {

package/src/resolvers/subscribtions.js

@@ -6,24 +6,15 @@
 const Router = require('../Router');
 const getCondition = require('../utils/getCondition');
 
-/** @typedef {import('../BuildRouter').BotContext} BotContext */
-/** @typedef {import('../Router').Resolver} Resolver */
-
-/**
- *
- * @param {object} params
- * @param {BotContext} context
- * @returns {Resolver}
- */
-function subscribtions (params, context) {
+function subscribtions (params, { isLastIndex, allowForbiddenSnippetWords }) {
     const {
         tags = [],
         unsetTag = false
     } = params;
 
-    const condition = getCondition(params, context, 'subscribtions');
+    const condition = getCondition(params, '', allowForbiddenSnippetWords);
 
-    const ret = context.isLastIndex ? Router.END : Router.CONTINUE;
+    const ret = isLastIndex ? Router.END : Router.CONTINUE;
     const method = unsetTag ? 'unsubscribe' : 'subscribe';
 
     return async (req, res) => {
@@ -44,7 +35,6 @@ function subscribtions (params, context) {
         }
 
         if (tags.length === 0 && unsetTag) {
-            // @ts-ignore
             res.unsubscribe();
         }
 

package/src/resolvers/utils.js

@@ -205,18 +205,18 @@ function getText (text, state) {
 // eslint-disable-next-line no-unused-vars
 const DEFAULT_LINK_TRANSLATOR = (senderId, defaultText, urlText, isExtUrl, reqState) => urlText;
 
-/** @typedef {import('../BuildRouter').BotContext} BotContext */
-
 function processButtons (
     buttons,
     state,
     elem,
+    linksMap,
     senderId,
-    context,
+    linksTranslator,
+    allowForbiddenSnippetWords,
     req,
     res
 ) {
-    const translateLinks = context.linksTranslator || DEFAULT_LINK_TRANSLATOR;
+    const translateLinks = linksTranslator || DEFAULT_LINK_TRANSLATOR;
 
     buttons.forEach(({
         title: btnTitle,
@@ -230,7 +230,7 @@ function processButtons (
         if (hasCondition) {
             const condition = getCondition({
                 hasCondition, conditionFn, hasEditableCondition, editableCondition
-            }, context, 'Quick reply condition');
+            }, 'Quick reply condition', allowForbiddenSnippetWords);
 
             if (!condition(req, res)) {
                 return;
@@ -259,7 +259,7 @@ function processButtons (
                 break;
             }
             case TYPE_POSTBACK: {
-                let postbackAction = context.linksMap.get(targetRouteId) || action;
+                let postbackAction = linksMap.get(targetRouteId) || action;
 
                 if (postbackAction === '/') {
                     postbackAction = './';

package/src/utils/customCondition.js

@@ -148,16 +148,15 @@ const compare = (variable, operator, value = undefined) => {
 /**
  *
  * @param {{value:string, operator:string, variable:string}[][]} condition
- * @param {object} configuration
  * @param {string} description
  */
-function customCondition (condition, configuration, description = '') {
+function customCondition (condition, description = '') {
     if (typeof condition !== 'object' || !Array.isArray(condition)) {
         throw new Error(`Invalid condition (${description}) type`);
     }
 
     const resolver = (req, res) => condition.some((condList) => condList.every((cond) => {
-        const data = stateData(req, res, configuration);
+        const data = stateData(req, res);
         const variableValue = getValue(cond.variable, data);
         const isRegExp = [
             ConditionOperators['matches regexp'],

package/src/utils/customFn.js

@@ -6,14 +6,6 @@
 const Router = require('../Router'); // eslint-disable-line
 const ai = require('../Ai'); // eslint-disable-line
 const fetch = require('node-fetch'); // eslint-disable-line
-let request;
-try {
-    // @ts-ignore
-    request = module.require('request-promise-native');
-} catch (e) {
-    // eslint-disable-next-line no-unused-vars
-    request = () => { throw new Error('To use request, you have to manually install request-promise-native into your bot.'); };
-}
 let axios;
 try {
     // @ts-ignore

package/src/utils/getCondition.js

@@ -6,20 +6,7 @@
 const customCondition = require('./customCondition');
 const customFn = require('./customFn');
 
-/** @typedef {import('../BuildRouter').BotContext} BotContext */
-
-/**
- *
- * @param {object} params
- * @param {BotContext} context
- * @param {string} description
- * @returns {Function}
- */
-module.exports = function getCondition (params, context, description = '') {
-    const {
-        allowForbiddenSnippetWords = false,
-        configuration
-    } = context;
+module.exports = (params, description = '', allowForbiddenSnippetWords = false) => {
     const {
         hasCondition = false,
         conditionFn = '() => true',
@@ -31,7 +18,7 @@ module.exports = function getCondition (params, context, description = '') {
 
     if (hasCondition) {
         if (hasEditableCondition) {
-            condition = customCondition(editableCondition, configuration, description);
+            condition = customCondition(editableCondition);
         } else {
             condition = customFn(conditionFn, description, allowForbiddenSnippetWords);
         }

package/src/utils/getUpdate.js

@@ -88,7 +88,7 @@ function toArray (previousValue) {
 const ENTITY_HBS_REGEXP = /^\s*\{\{\[?@([^@[\]{}\s]+)(\])?\}\}\s*$/;
 const VARIABLE_HBS_REGEXP = /^\s*\{\{\[?([^@[\]{}\s]+)\]?\}\}\s*$/;
 
-function getSetState (setState, req, res = null, useState = null, configuration = null) {
+function getSetState (setState, req, res = null, useState = null) {
     if (!setState) {
         return {};
     }
@@ -179,7 +179,7 @@ function getSetState (setState, req, res = null, useState = null, configuration
                         values = [];
                     } else {
                         const useValue = typeof value === 'string'
-                            ? handlebars.compile(value)(stateData(req, res, configuration))
+                            ? handlebars.compile(value)(stateData(req, res))
                                 .split(/(?<!\\),/g)
                                 .map((v) => v.replace(/\\,/g, ',').trim())
                             : value;
@@ -205,7 +205,7 @@ function getSetState (setState, req, res = null, useState = null, configuration
                 set = val;
             }
         } else if (typeof val === 'string') {
-            set = handlebars.compile(val)(stateData(req, res, configuration));
+            set = handlebars.compile(val)(stateData(req, res));
         } else if (val === null
             || SCALAR_TYPES.includes(typeof val)) {
             set = val;

package/src/utils/quickReplies.js

@@ -133,7 +133,8 @@ function makeQuickReplies (replies, path = '', translate = (w) => w, quickReplyC
                 data = {},
                 isLocation = false,
                 isEmail = false,
-                isPhone = false
+                isPhone = false,
+                useCa = currentAction
             } = reply;
             let {
                 setState = null
@@ -219,7 +220,7 @@ function makeQuickReplies (replies, path = '', translate = (w) => w, quickReplyC
                 payload = {
                     action: absoluteAction,
                     data: {
-                        _ca: currentAction,
+                        _ca: useCa,
                         ...data
                     }
                 };

package/src/utils/stateData.js

@@ -3,14 +3,11 @@
  */
 'use strict';
 
-module.exports = function stateData (req, res = null, configuration = null) {
-    const c = configuration || req.configuration;
+module.exports = function stateData (req, res = null) {
     return {
         ...req.state,
         ...(res ? res.newState : {}),
         ...req.actionData(),
-        ...(res ? res.data : {}),
-        c,
-        configuration: c
+        ...(res ? res.data : {})
     };
 };

package/src/utils/wrapPluginFunction.js

@@ -41,7 +41,7 @@ function wrapPluginFunction (
                     return true;
                 }
                 const reducers = preprocessedItems.get(codeBlockName);
-                return router.processReducers(reducers, req, res, postBack, path, action, true);
+                return router.processReducers(reducers, req, res, postBack, action, true);
             }
         });