wingbot 3.69.7 → 3.70.0-alpha.4

package/src/resolvers/include.js

@@ -4,8 +4,9 @@
 'use strict';
 
 function include (params, context, plugins) {
-    const includedRouter = context.blocks
-        .find((block) => block.staticBlockId === params.staticBlockId);
+    const includedRouter = context.nestedBlocksByStaticId
+        ? context.nestedBlocksByStaticId.get(params.staticBlockId)
+        : context.blocks.find((block) => block.staticBlockId === params.staticBlockId);
 
     if (!includedRouter) {
         throw new Error(`Block ${params.staticBlockId} not found!`);

package/src/resolvers/index.js

@@ -17,10 +17,12 @@ const subscribtions = require('./subscribtions');
 const setState = require('./setState');
 const expectedInput = require('./expectedInput');
 const skip = require('./skip');
+const contextMessage = require('./contextMessage');
 
 module.exports = {
     path,
     message,
+    contextMessage,
     include,
     postback,
     expected,

package/src/resolvers/message.js

@@ -270,12 +270,23 @@ function selectTranslation (resolverId, params, texts, data) {
     ];
 }
 
-/** @typedef {import('../BuildRouter').BotContext} BotContext */
-/** @typedef {import('../Router').Resolver} Resolver */
+/** @typedef {import('../BuildRouter').BotContext<any>} BotContext */
+/** @typedef {import('../Router').Resolver<any>} Resolver */
 
 /**
  *
  * @param {object} params
+ * @param {any} params.text
+ * @param {boolean} [params.hasCondition]
+ * @param {string} [params.conditionFn]
+ * @param {string} [params.conditionDesc]
+ * @param {boolean} [params.hasEditableCondition]
+ * @param {any} [params.editableCondition]
+ * @param {string} [params.mode]
+ * @param {string} [params.persist]
+ * @param {any[]} [params.replies]
+ * @param {"message" | "prompt"} [params.type]
+ * @param {string} [params.llmContextType]
  * @param {BotContext} context
  * @returns {Resolver}
  */
@@ -284,20 +295,18 @@ function message (params, context = {}) {
         // @ts-ignore
         isLastIndex, isLastMessage, linksMap, configuration, resolverId
     } = context;
+
     if (typeof params.text !== 'string' && !Array.isArray(params.text)) {
         throw new Error('Message should be a text!');
     }
 
     // parse quick replies
-    let quickReplies = null;
+    let quickReplies;
     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);
     }
 
-    // compile condition
-    const condition = getCondition(params, context, 'Message condition');
+    let condition;
 
     const ret = isLastIndex ? Router.END : Router.CONTINUE;
 
@@ -305,7 +314,19 @@ function message (params, context = {}) {
      * @param {Request} req
      * @param {Responder} res
      */
-    return (req, res) => {
+    return async (req, res) => {
+        if (condition === undefined) {
+            condition = getCondition(params, context, 'Message condition');
+        }
+
+        if (quickReplies === undefined) {
+            if (params.replies && params.replies.length > 0) {
+                quickReplies = parseReplies(params.replies, linksMap, context);
+            } else {
+                quickReplies = null;
+            }
+        }
+
         const data = stateData(req, res, configuration);
 
         // filter supported messages
@@ -315,7 +336,8 @@ function message (params, context = {}) {
             data.lang
         );
 
-        const [text, seqState] = selectTranslation(
+        // eslint-disable-next-line prefer-const
+        let [text, seqState] = selectTranslation(
             resolverId,
             params,
             supportedText.translations,
@@ -394,6 +416,20 @@ function message (params, context = {}) {
             };
         }
 
+        if (params.type === 'prompt') {
+            const session = await res.llmSessionWithHistory(params.llmContextType);
+
+            const response = await session.systemPrompt(text)
+                .debug()
+                .generate();
+
+            // if (!response.content) {
+            //    // no response?
+            // }
+
+            text = response.content;
+        }
+
         res.text(text, sendReplies, voiceControl);
 
         if (isLastMessage && !req.actionData()._resolverTag) {

package/src/resolvers/postback.js

@@ -32,11 +32,15 @@ function postback (params, context) {
         }
     }
 
-    const condition = getCondition(params, context, 'postback');
+    let condition;
 
     const ret = isLastIndex ? Router.END : Router.CONTINUE;
 
     return (req, res, postBack) => {
+        if (condition === undefined) {
+            condition = getCondition(params, context, 'postback');
+        }
+
         if (!action || !shouldExecuteResolver(req, params)) {
             return ret;
         }

package/src/resolvers/utils.js

@@ -62,7 +62,7 @@ function isTextObjectEmpty (text) {
  * @param {Translations} translations
  * @param {string} [lang]
  * @param {boolean} [disableDefaulting] - it will try to find translation for other language
- * @returns {null|string}
+ * @returns {null|string|string[]}
  */
 function getLanguageText (translations, lang = null, disableDefaulting = false) {
     let foundText;

package/src/utils/stateData.js

@@ -20,16 +20,21 @@ const { dateToISO8601String, zeroHourDate } = require('./datetime');
 
 /**
  *
- * @param {IStateRequest} req
- * @param {Responder} res
- * @param {object} configuration
+ * @param {IStateRequest} [req]
+ * @param {Responder} [res]
+ * @param {object} [configuration]
  * @param {object} [stateOverride]
  * @returns {object}
  */
-module.exports = function stateData (req, res = null, configuration = null, stateOverride = {}) {
-    const c = configuration || req.configuration;
+module.exports = function stateData (
+    req = null,
+    res = null,
+    configuration = null,
+    stateOverride = {}
+) {
+    const c = configuration || (req && req.configuration) || (res && res._configuration);
 
-    const $this = req.text();
+    const $this = req ? req.text() : '';
 
     const now = new Date();
 
@@ -42,15 +47,20 @@ module.exports = function stateData (req, res = null, configuration = null, stat
 
     const {
         senderId,
-        pageId
-    } = req;
+        pageId,
+        state
+    } = req || {
+        senderId: res._senderId,
+        pageId: res._pageId,
+        state: res.options.state
+    };
 
     return {
         senderId,
         pageId,
         c,
         configuration: c,
-        ...req.state,
+        ...state,
         ...(res ? res.newState : {}),
         ...stateOverride,
         $this,
@@ -59,7 +69,7 @@ module.exports = function stateData (req, res = null, configuration = null, stat
         $tomorrow,
         $yesterday,
         // yes - res because of circular dependency
-        ...(res && req.actionData()),
+        ...(res && req && req.actionData()),
         ...(res ? res.data : {}),
         $input: $this
     };