@tiledesk/tiledesk-tybot-connector 0.2.38 → 0.2.40

package/CHANGELOG.md

@@ -5,6 +5,14 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
+# v0.2.40 
+- refactorized Make action
+- added support for public gptkey for GptTask and AskGPT actions
+- fixes bug: AskGPT action not working
+
+# v0.2.39
+- fixed bug: wrong update of userFullname based on lead.fullname
+
 # v0.2.38
 - improved Qapla' action with condition
 

package/models/TiledeskChatbotUtil.js

@@ -373,207 +373,226 @@ class TiledeskChatbotUtil {
     static async updateRequestAttributes(chatbot, message, projectId, requestId) {
         // update request context
         try {
-        if (chatbot.log) {console.log("Updating request variables. Message:", JSON.stringify(message));}
-        const messageId = message._id;
-        const chat_url = `https://panel.tiledesk.com/v3/dashboard/#/project/${projectId}/wsrequest/${requestId}/messages`
-        // await chatbot.addParameter("chatbot", chatbot);
-        await chatbot.addParameter(TiledeskChatbotConst.REQ_CHAT_URL, chat_url);
-        // console.log("Adding proj_", projectId);
-        await chatbot.addParameter(TiledeskChatbotConst.REQ_PROJECT_ID_KEY, projectId);
-        // TODO add projectName too
-        await chatbot.addParameter(TiledeskChatbotConst.REQ_REQUEST_ID_KEY, requestId);
-        if (chatbot.bot) {
-          await chatbot.addParameter(TiledeskChatbotConst.REQ_CHATBOT_NAME_KEY, chatbot.bot.name);
-        }
-        
-        if (message.text && message.sender !== "_tdinternal") {
-            await chatbot.addParameter(TiledeskChatbotConst.REQ_LAST_USER_TEXT_KEY, message.text); // DEPRECATED
-            await chatbot.addParameter(TiledeskChatbotConst.REQ_LAST_USER_TEXT_v2_KEY, message.text);
-            if (message.channel) {
-                if (message.channel.name === "chat21") {
-                    await chatbot.addParameter(TiledeskChatbotConst.REQ_CHAT_CHANNEL, "web"); // renames the channel in chat21
+            if (chatbot.log) {console.log("Updating request variables. Message:", JSON.stringify(message));}
+            const messageId = message._id;
+            const chat_url = `https://panel.tiledesk.com/v3/dashboard/#/project/${projectId}/wsrequest/${requestId}/messages`
+            // await chatbot.addParameter("chatbot", chatbot);
+            await chatbot.addParameter(TiledeskChatbotConst.REQ_CHAT_URL, chat_url);
+            // console.log("Adding proj_", projectId);
+            await chatbot.addParameter(TiledeskChatbotConst.REQ_PROJECT_ID_KEY, projectId);
+            // TODO add projectName too
+            await chatbot.addParameter(TiledeskChatbotConst.REQ_REQUEST_ID_KEY, requestId);
+            if (chatbot.bot) {
+            await chatbot.addParameter(TiledeskChatbotConst.REQ_CHATBOT_NAME_KEY, chatbot.bot.name);
+            }
+            
+            if (message.text && message.sender !== "_tdinternal") {
+                await chatbot.addParameter(TiledeskChatbotConst.REQ_LAST_USER_TEXT_KEY, message.text); // DEPRECATED
+                await chatbot.addParameter(TiledeskChatbotConst.REQ_LAST_USER_TEXT_v2_KEY, message.text);
+                if (message.channel) {
+                    if (message.channel.name === "chat21") {
+                        await chatbot.addParameter(TiledeskChatbotConst.REQ_CHAT_CHANNEL, "web"); // renames the channel in chat21
+                    }
+                    else {
+                        await chatbot.addParameter(TiledeskChatbotConst.REQ_CHAT_CHANNEL, message.channel.name);
+                    }
+                }
+                await chatbot.addParameter(TiledeskChatbotConst.REQ_LAST_USER_MESSAGE_TYPE_KEY, message.type);
+                await chatbot.addParameter(TiledeskChatbotConst.REQ_LAST_USER_MESSAGE_KEY, TiledeskChatbotUtil.lastUserMessageFrom(message)); // JSON TYPE *NEW
+                // get image
+                if (message.type && message.type === "image" && message.metadata) {
+                    // "text": "\nimage text",
+                    // "id_project": "65203e12f8c0cf002cf4110b",
+                    // "createdBy": "8ac52a30-133f-4ee1-8b4b-96055bb81757",
+                    // "metadata": {
+                    //     "height": 905,
+                    //     "name": "tiledesk_Open graph_general.png",
+                    //     "src": "https://firebasestorage.googleapis.com/v0/b/chat21-pre-01.appspot.com/o/public%2Fimages%2F8ac52a30-133f-4ee1-8b4b-96055bb81757%2Fda5bbc8d-5174-49a8-a041-3d9355242da5%2Ftiledesk_Open%20graph_general.png?alt=media&token=be82fecb-3cd1-45b9-a135-c2c57a932862",
+                    //     "type": "image/png",
+                    //     "uid": "lo68iyq5",
+                    //     "width": 1724
+                    // }
+                    if (message.metadata.src) {
+                    await chatbot.addParameter("lastUserImageURL", message.metadata.src);
+                    await chatbot.addParameter("lastUserImageName", message.metadata.name);
+                    await chatbot.addParameter("lastUserImageWidth", message.metadata.width);
+                    await chatbot.addParameter("lastUserImageHeight", message.metadata.height);
+                    await chatbot.addParameter("lastUserImageType", message.metadata.type);
+                    }
                 }
                 else {
-                    await chatbot.addParameter(TiledeskChatbotConst.REQ_CHAT_CHANNEL, message.channel.name);
+                    await chatbot.addParameter("lastUserImageURL", null);
+                    await chatbot.addParameter("lastUserImageName", null);
+                    await chatbot.addParameter("lastUserImageWidth", null);
+                    await chatbot.addParameter("lastUserImageHeight", null);
+                    await chatbot.addParameter("lastUserImageType", null);
                 }
-            }
-            await chatbot.addParameter(TiledeskChatbotConst.REQ_LAST_USER_MESSAGE_TYPE_KEY, message.type);
-            await chatbot.addParameter(TiledeskChatbotConst.REQ_LAST_USER_MESSAGE_KEY, TiledeskChatbotUtil.lastUserMessageFrom(message)); // JSON TYPE *NEW
-            // get image
-            if (message.type && message.type === "image" && message.metadata) {
-                // "text": "\nimage text",
-                // "id_project": "65203e12f8c0cf002cf4110b",
-                // "createdBy": "8ac52a30-133f-4ee1-8b4b-96055bb81757",
-                // "metadata": {
-                //     "height": 905,
-                //     "name": "tiledesk_Open graph_general.png",
-                //     "src": "https://firebasestorage.googleapis.com/v0/b/chat21-pre-01.appspot.com/o/public%2Fimages%2F8ac52a30-133f-4ee1-8b4b-96055bb81757%2Fda5bbc8d-5174-49a8-a041-3d9355242da5%2Ftiledesk_Open%20graph_general.png?alt=media&token=be82fecb-3cd1-45b9-a135-c2c57a932862",
-                //     "type": "image/png",
-                //     "uid": "lo68iyq5",
-                //     "width": 1724
-                // }
-                if (message.metadata.src) {
-                await chatbot.addParameter("lastUserImageURL", message.metadata.src);
-                await chatbot.addParameter("lastUserImageName", message.metadata.name);
-                await chatbot.addParameter("lastUserImageWidth", message.metadata.width);
-                await chatbot.addParameter("lastUserImageHeight", message.metadata.height);
-                await chatbot.addParameter("lastUserImageType", message.metadata.type);
+                // get document
+                if (message.type && message.type === "file" && message.metadata) {
+                    // "type": "file",
+                    // "text": "[LIBRETTO-WEB-ISTRUZIONI-GENITORI.pdf](https://firebasestorage.googleapis.com/v0/b/chat21-pre-01.appspot.com/o/public%2Fimages%2F8ac52a30-133f-4ee1-8b4b-96055bb81757%2F502265ee-4f4a-47a4-9375-172bb0e6bf39%2FLIBRETTO-WEB-ISTRUZIONI-GENITORI.pdf?alt=media&token=a09d065a-9b56-4507-8960-344cc294e4d1)\nistruzioni",
+                    // "metadata": {
+                    //     "name": "LIBRETTO-WEB-ISTRUZIONI-GENITORI.pdf",
+                    //     "src": "https://firebasestorage.googleapis.com/v0/b/chat21-pre-01.appspot.com/o/public%2Fimages%2F8ac52a30-133f-4ee1-8b4b-96055bb81757%2F502265ee-4f4a-47a4-9375-172bb0e6bf39%2FLIBRETTO-WEB-ISTRUZIONI-GENITORI.pdf?alt=media&token=a09d065a-9b56-4507-8960-344cc294e4d1",
+                    //     "type": "application/pdf",
+                    //     "uid": "lo68oz8i"
+                    // }
+                    if (message.metadata.src) {
+                    await chatbot.addParameter("lastUserDocumentURL", message.metadata.src);
+                    await chatbot.addParameter("lastUserDocumentName", message.metadata.name);
+                    await chatbot.addParameter("lastUserDocumentType", message.metadata.type);
+                    }
+                }
+                else {
+                    await chatbot.addParameter("lastUserDocumentURL", null);
+                    await chatbot.addParameter("lastUserDocumentName", null);
+                    await chatbot.addParameter("lastUserDocumentType", null);
+                }
+                if (message && message.request && message.request.lead) {
+                    if (message.request.lead.email) {
+                        await chatbot.addParameter("userEmail", message.request.lead.email);
+                    }
+                    if (message.request.lead.fullname) {
+                        console.log("got lead.fullname:", message.request.lead.fullname);
+                        try {
+                            const current_userFullname = await chatbot.getParameter("userFullname");
+                            console.log("current_userFullname:", current_userFullname);
+                            if (current_userFullname && current_userFullname.startsWith("guest#")) {
+                                console.log("current_userFullname && current_userFullname.startsWith('guest#')");
+                                await chatbot.addParameter("userFullname", message.request.lead.fullname);
+                            }
+                            else if (!current_userFullname) {
+                                console.log("no current_userFullname");
+                                await chatbot.addParameter("userFullname", message.request.lead.fullname);
+                                console.log("it was null, set to the incoming one");
+                            }
+                        }
+                        catch(error) {
+                            console.error("Error on setting userFullname:", error);
+                        }
+                    }
+                    else {
+                        console.log("!lead.fullname");
+                    }
+                    if (message.request.lead.phone) {
+                        await chatbot.addParameter("userPhone", message.request.lead.phone);
+                    }
+                    if (message.request.lead.lead_id) {
+                        await chatbot.addParameter("userLeadId", message.request.lead.lead_id);
+                    }
+                    if (message.request.lead.company) {
+                        await chatbot.addParameter("userCompany", message.request.lead.company);
+                    }
                 }
             }
-            else {
-                await chatbot.addParameter("lastUserImageURL", null);
-                await chatbot.addParameter("lastUserImageName", null);
-                await chatbot.addParameter("lastUserImageWidth", null);
-                await chatbot.addParameter("lastUserImageHeight", null);
-                await chatbot.addParameter("lastUserImageType", null);
+            
+        
+            await chatbot.addParameter(TiledeskChatbotConst.REQ_LAST_MESSAGE_ID_KEY, messageId);
+            if (message.request && message.request.location && message.request.location.country) {
+            await chatbot.addParameter(TiledeskChatbotConst.REQ_COUNTRY_KEY, message.request.location.country);
+            }
+            if (message.request && message.request.location && message.request.location.city) {
+            await chatbot.addParameter(TiledeskChatbotConst.REQ_CITY_KEY, message.request.location.city);
             }
-            // get document
-            if (message.type && message.type === "file" && message.metadata) {
-                // "type": "file",
-                // "text": "[LIBRETTO-WEB-ISTRUZIONI-GENITORI.pdf](https://firebasestorage.googleapis.com/v0/b/chat21-pre-01.appspot.com/o/public%2Fimages%2F8ac52a30-133f-4ee1-8b4b-96055bb81757%2F502265ee-4f4a-47a4-9375-172bb0e6bf39%2FLIBRETTO-WEB-ISTRUZIONI-GENITORI.pdf?alt=media&token=a09d065a-9b56-4507-8960-344cc294e4d1)\nistruzioni",
-                // "metadata": {
-                //     "name": "LIBRETTO-WEB-ISTRUZIONI-GENITORI.pdf",
-                //     "src": "https://firebasestorage.googleapis.com/v0/b/chat21-pre-01.appspot.com/o/public%2Fimages%2F8ac52a30-133f-4ee1-8b4b-96055bb81757%2F502265ee-4f4a-47a4-9375-172bb0e6bf39%2FLIBRETTO-WEB-ISTRUZIONI-GENITORI.pdf?alt=media&token=a09d065a-9b56-4507-8960-344cc294e4d1",
-                //     "type": "application/pdf",
-                //     "uid": "lo68oz8i"
-                // }
-                if (message.metadata.src) {
-                await chatbot.addParameter("lastUserDocumentURL", message.metadata.src);
-                await chatbot.addParameter("lastUserDocumentName", message.metadata.name);
-                await chatbot.addParameter("lastUserDocumentType", message.metadata.type);
+            // console.log("message.request.language", message.request["language"]);
+            if (message.request) {
+            let user_language = message.request["language"];
+            if (message.request["language"]) {
+                // console.log("HTTP language:", message.request["language"]);
+                var languages = parser.parse(message.request["language"]);
+                // console.log("languages:", languages);
+                if (languages && languages.length > 0 && languages[0].code) {
+                user_language = languages[0].code;
                 }
             }
-            else {
-                await chatbot.addParameter("lastUserDocumentURL", null);
-                await chatbot.addParameter("lastUserDocumentName", null);
-                await chatbot.addParameter("lastUserDocumentType", null);
+            await chatbot.addParameter(TiledeskChatbotConst.REQ_USER_SOURCE_PAGE_KEY, message.request.sourcePage);
+            await chatbot.addParameter(TiledeskChatbotConst.REQ_USER_LANGUAGE_KEY, user_language);
+            await chatbot.addParameter(TiledeskChatbotConst.REQ_USER_AGENT_KEY, message.request.userAgent);
             }
-            if (message && message.request && message.request.lead) {
-                if (message.request.lead.email) {
-                    await chatbot.addParameter("userEmail", message.request.lead.email);
-                }
-                if (message.request.lead.fullname) {
-                    await chatbot.addParameter("userFullname", message.request.lead.fullname);
-                }
-                if (message.request.lead.phone) {
-                    await chatbot.addParameter("userPhone", message.request.lead.phone);
+            // console.log("message.request.language", message.request["language"])
+            if (message.request && message.request.department) {
+            // It was an error when getting this from widget message's attributes
+            // await chatbot.addParameter(TiledeskChatbotConst.REQ_DEPARTMENT_ID_KEY, message.attributes.departmentId);
+            // await chatbot.addParameter(TiledeskChatbotConst.REQ_DEPARTMENT_NAME_KEY, message.attributes.departmentName);
+            // get from request.department instead
+            await chatbot.addParameter(TiledeskChatbotConst.REQ_DEPARTMENT_ID_KEY, message.request.department._id);
+            await chatbot.addParameter(TiledeskChatbotConst.REQ_DEPARTMENT_NAME_KEY, message.request.department.name);
+            }
+        
+            if (projectId === "641864da99c1fb00131ba495") {
+            console.log("641864da99c1fb00131ba495 > for projectId:", JSON.stringify(message))
+            }
+            // for BUG
+            // if (chatbot.log) {console.log("message.request.attributes.payload", JSON.stringify(message.request.attributes.payload))}
+            if (message && message.request && message.request.attributes && message.request.attributes.payload) {
+            if (!message.attributes) {
+                message.attributes = {}
+            }
+            message.attributes.payload = message.request.attributes.payload
+            if (chatbot.log) {console.log("FORCED SET message.attributes.payload:", JSON.stringify(message.attributes.payload))}
+            // if (projectId === "641864da99c1fb00131ba495") {console.log("641864da99c1fb00131ba495 > FORCED SET message.attributes.payload:", JSON.stringify(message.attributes.payload))}
+            }
+        
+            if (message.attributes) {
+            if (chatbot.log) {console.log("Ok message.attributes", JSON.stringify(message.attributes));}
+            if (projectId === "641864da99c1fb00131ba495") {console.log("641864da99c1fb00131ba495 > Ok message.attributes", JSON.stringify(message.attributes));}
+            await chatbot.addParameter(TiledeskChatbotConst.REQ_END_USER_ID_KEY, message.attributes.requester_id);
+            await chatbot.addParameter(TiledeskChatbotConst.REQ_END_USER_IP_ADDRESS_KEY, message.attributes.ipAddress);
+            if (message.attributes.payload) {
+                try {
+                for (const [key, value] of Object.entries(message.attributes.payload)) {
+                    // const value = all_parameters[key];
+                    const value_type = typeof value;
+                    //if (projectId === "641864da99c1fb00131ba495") {console.log("641864da99c1fb00131ba495 > importing payload parameter:", key, "value:", value, "type:", value_type);}
+                    //await chatbot.addParameter(key, String(value));
+                    await chatbot.addParameter(key, value);
                 }
-                if (message.request.lead.lead_id) {
-                    await chatbot.addParameter("userLeadId", message.request.lead.lead_id);
                 }
-                if (message.request.lead.company) {
-                    await chatbot.addParameter("userCompany", message.request.lead.company);
+                catch(err) {
+                console.error("Error importing message payload in request variables:", err);
                 }
             }
-        }
-        
-      
-        await chatbot.addParameter(TiledeskChatbotConst.REQ_LAST_MESSAGE_ID_KEY, messageId);
-        if (message.request && message.request.location && message.request.location.country) {
-          await chatbot.addParameter(TiledeskChatbotConst.REQ_COUNTRY_KEY, message.request.location.country);
-        }
-        if (message.request && message.request.location && message.request.location.city) {
-          await chatbot.addParameter(TiledeskChatbotConst.REQ_CITY_KEY, message.request.location.city);
-        }
-        // console.log("message.request.language", message.request["language"]);
-        if (message.request) {
-          let user_language = message.request["language"];
-          if (message.request["language"]) {
-            // console.log("HTTP language:", message.request["language"]);
-            var languages = parser.parse(message.request["language"]);
-            // console.log("languages:", languages);
-            if (languages && languages.length > 0 && languages[0].code) {
-              user_language = languages[0].code;
             }
-          }
-          await chatbot.addParameter(TiledeskChatbotConst.REQ_USER_SOURCE_PAGE_KEY, message.request.sourcePage);
-          await chatbot.addParameter(TiledeskChatbotConst.REQ_USER_LANGUAGE_KEY, user_language);
-          await chatbot.addParameter(TiledeskChatbotConst.REQ_USER_AGENT_KEY, message.request.userAgent);
-        }
-        // console.log("message.request.language", message.request["language"])
-        if (message.request && message.request.department) {
-          // It was an error when getting this from widget message's attributes
-          // await chatbot.addParameter(TiledeskChatbotConst.REQ_DEPARTMENT_ID_KEY, message.attributes.departmentId);
-          // await chatbot.addParameter(TiledeskChatbotConst.REQ_DEPARTMENT_NAME_KEY, message.attributes.departmentName);
-          // get from request.department instead
-          await chatbot.addParameter(TiledeskChatbotConst.REQ_DEPARTMENT_ID_KEY, message.request.department._id);
-          await chatbot.addParameter(TiledeskChatbotConst.REQ_DEPARTMENT_NAME_KEY, message.request.department.name);
-        }
-      
-        if (projectId === "641864da99c1fb00131ba495") {
-          console.log("641864da99c1fb00131ba495 > for projectId:", JSON.stringify(message))
-        }
-        // for BUG
-        // if (chatbot.log) {console.log("message.request.attributes.payload", JSON.stringify(message.request.attributes.payload))}
-        if (message && message.request && message.request.attributes && message.request.attributes.payload) {
-          if (!message.attributes) {
-            message.attributes = {}
-          }
-          message.attributes.payload = message.request.attributes.payload
-          if (chatbot.log) {console.log("FORCED SET message.attributes.payload:", JSON.stringify(message.attributes.payload))}
-          // if (projectId === "641864da99c1fb00131ba495") {console.log("641864da99c1fb00131ba495 > FORCED SET message.attributes.payload:", JSON.stringify(message.attributes.payload))}
-        }
-      
-        if (message.attributes) {
-          if (chatbot.log) {console.log("Ok message.attributes", JSON.stringify(message.attributes));}
-          if (projectId === "641864da99c1fb00131ba495") {console.log("641864da99c1fb00131ba495 > Ok message.attributes", JSON.stringify(message.attributes));}
-          await chatbot.addParameter(TiledeskChatbotConst.REQ_END_USER_ID_KEY, message.attributes.requester_id);
-          await chatbot.addParameter(TiledeskChatbotConst.REQ_END_USER_IP_ADDRESS_KEY, message.attributes.ipAddress);
-          if (message.attributes.payload) {
-            try {
-              for (const [key, value] of Object.entries(message.attributes.payload)) {
-                // const value = all_parameters[key];
-                const value_type = typeof value;
-                //if (projectId === "641864da99c1fb00131ba495") {console.log("641864da99c1fb00131ba495 > importing payload parameter:", key, "value:", value, "type:", value_type);}
-                //await chatbot.addParameter(key, String(value));
-                await chatbot.addParameter(key, value);
-              }
+            
+            const _bot = chatbot.bot; // aka FaqKB
+            if (chatbot.log) {
+                console.log("Adding Globals to context..., chatbot.attributes?", JSON.stringify(_bot));
             }
-            catch(err) {
-              console.error("Error importing message payload in request variables:", err);
+            
+            if (_bot.attributes && _bot.attributes.globals) {
+                if (chatbot.log) {console.log("Got Globals:", JSON.stringify(_bot.attributes.globals));}
+                _bot.attributes.globals.forEach(async (global_var) => {
+                    if (chatbot.log) {console.log("Adding global:", global_var.key, "value:", global_var.value);}
+                    await chatbot.addParameter(global_var.key, global_var.value);
+                });
             }
-          }
-        }
-        
-        const _bot = chatbot.bot; // aka FaqKB
-        if (chatbot.log) {
-            console.log("Adding Globals to context..., chatbot.attributes?", JSON.stringify(_bot));
-        }
-        
-        if (_bot.attributes && _bot.attributes.globals) {
-            if (chatbot.log) {console.log("Got Globals:", JSON.stringify(_bot.attributes.globals));}
-            _bot.attributes.globals.forEach(async (global_var) => {
-                if (chatbot.log) {console.log("Adding global:", global_var.key, "value:", global_var.value);}
-                await chatbot.addParameter(global_var.key, global_var.value);
-            });
-        }
-        // await chatbot.addParameter("testVar",
-        //     {
-        //         name: "Andrea",
-        //         coords: {
-        //             x: 2, y: 1
-        //         }
-        //     }
-        // );
-        
-        if (chatbot.log) {
-          // console.log("tdcache:", chatbot.tdcache);
-          console.log("requestId:", requestId);
-          console.log("KEY:", TiledeskChatbotConst.REQ_PROJECT_ID_KEY);
-        //   console.log("TiledeskChatbot:", TiledeskChatbot);
-          let proj_ = await chatbot.getParameter(TiledeskChatbotConst.REQ_PROJECT_ID_KEY);
-          console.log("request parameter proj_:", proj_);
-          const all_parameters = await chatbot.allParameters();
-          for (const [key, value] of Object.entries(all_parameters)) {
-            // const value = all_parameters[key];
-            const value_type = typeof value;
-            if (chatbot.log) {console.log("REQUEST ATTRIBUTE:", key, "VALUE:", value, "TYPE:", value_type)}
-          }
+            // await chatbot.addParameter("testVar",
+            //     {
+            //         name: "Andrea",
+            //         coords: {
+            //             x: 2, y: 1
+            //         }
+            //     }
+            // );
+            
+            if (chatbot.log) {
+                // console.log("tdcache:", chatbot.tdcache);
+                console.log("requestId:", requestId);
+                console.log("KEY:", TiledeskChatbotConst.REQ_PROJECT_ID_KEY);
+                //   console.log("TiledeskChatbot:", TiledeskChatbot);
+                let proj_ = await chatbot.getParameter(TiledeskChatbotConst.REQ_PROJECT_ID_KEY);
+                console.log("request parameter proj_:", proj_);
+                const all_parameters = await chatbot.allParameters();
+                for (const [key, value] of Object.entries(all_parameters)) {
+                    // const value = all_parameters[key];
+                    const value_type = typeof value;
+                    if (chatbot.log) {console.log("REQUEST ATTRIBUTE:", key, "VALUE:", value, "TYPE:", value_type)}
+                }
+            }
+        } catch(error) {
+            console.error("Error", error)
+            process.exit(1)
         }
-    } catch(error) {
-        console.error("Error", error)
-        process.exit(1)
-    }
         // message["attributes"]: {
         //   "departmentId": "63c980054f857c00350535bc",
         //   "departmentName": "Default Department",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "0.2.38",
+  "version": "0.2.40",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {
@@ -14,7 +14,7 @@
     "@tiledesk/helpcenter-query-client": "^0.1.8",
     "@tiledesk/tiledesk-chatbot-client": "^0.5.30",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.39",
-    "@tiledesk/tiledesk-client": "^0.10.4",
+    "@tiledesk/tiledesk-client": "^0.10.5",
     "accept-language-parser": "^1.5.0",
     "axios": "^0.27.2",
     "body-parser": "^1.19.0",

package/tiledeskChatbotPlugs/DirectivesChatbotPlug.js

@@ -632,9 +632,16 @@ class DirectivesChatbotPlug {
       })
     }
     else if (directive_name === Directives.MAKE) {
-      new DirMake(context).execute(directive, async () => {
-        let next_dir = await this.nextDirective(this.directives);
-        this.process(next_dir);
+      new DirMake(context).execute(directive, async (stop) => {
+        if (context.log) { console.log("DirMake stop?", stop);}
+        if (stop == true) {
+          if (context.log) { console.log("Stopping Actions on:", JSON.stringify(directive));}
+          this.theend();
+        }
+        else {
+          let next_dir = await this.nextDirective(this.directives);
+          this.process(next_dir);
+        }
       })
     }
     else {

package/tiledeskChatbotPlugs/directives/DirAskGPT.js

@@ -100,6 +100,11 @@ class DirAskGPT {
       key = await this.getKeyFromKbSettings(server_base_url);
     }
 
+    if (!key) {
+      if (this.log) { console.log("DirGptTask - Retrieve public gptkey")}
+      key = process.env.GPTKEY;
+    }
+
     if (!key) {
       console.error("Error: DirAskGPT gptkey is mandatory");
       await this.#assignAttributes(action, answer);
@@ -299,7 +304,7 @@ class DirAskGPT {
       this.#myrequest(
         INTEGRATIONS_HTTPREQUEST, async (err, integration) => {
           if (err) {
-            console.error("DirAskGPT Get integrations error ", JSON.stringify(err));
+            if (this.log) { console.error("DirAskGPT Get integrations error ", err); }
             resolve(null);
           } else {
 
@@ -331,7 +336,7 @@ class DirAskGPT {
       this.#myrequest(
         KB_HTTPREQUEST, async (err, resbody) => {
           if (err) {
-            console.error("DirGptTask Get kb settings error ", JSON.stringify(err));
+            if (this.log) { console.error("DirGptTask Get kb settings error ", err); }
             resolve(null);
           } else {
             if (!resbody.gptkey) {

package/tiledeskChatbotPlugs/directives/DirGptTask.js

@@ -99,6 +99,11 @@ class DirGptTask {
       key = await this.getKeyFromKbSettings(server_base_url);
     }
 
+    if (!key) {
+      if (this.log) { console.log("DirGptTask - Retrieve public gptkey")}
+      key = process.env.GPTKEY;
+    }
+
     if (!key) {
       console.error("DirGptTask gptkey is mandatory");
       await this.#assignAttributes(action, answer);

package/tiledeskChatbotPlugs/directives/DirMake.js

@@ -5,7 +5,6 @@ const { DirIntent } = require("./DirIntent");
 let https = require("https");
 require('dotenv').config();
 
-
 class DirMake {
 
   constructor(context) {
@@ -15,9 +14,8 @@ class DirMake {
     this.context = context;
     this.tdcache = this.context.tdcache;
     this.requestId = this.context.requestId;
-    this.log = context.log;
     this.intentDir = new DirIntent(context);
-    if (this.log) {console.log('LOG: ', this.log)};
+    this.log = context.log;
   }
 
   execute(directive, callback) {
@@ -31,80 +29,97 @@ class DirMake {
       callback();
       return;
     }
-    this.go(action, () => {
-      callback();
+    this.go(action, (stop) => {
+      callback(stop);
     })
   }
 
   async go(action, callback) {
     if (this.log) { console.log("DirMake action:", JSON.stringify(action)); }
-    let trueIntent = action.trueIntent;
-    let falseIntent = action.falseIntent;
-    if (this.log) {console.log('DirMake trueIntent',trueIntent)}
     if (!this.tdcache) {
       console.error("Error: DirMake tdcache is mandatory");
       callback();
       return;
     }
-    //console.log('DirMake work!');
+
+    let trueIntent = action.trueIntent;
+    let falseIntent = action.falseIntent;
+    let trueIntentAttributes = action.trueIntentAttributes;
+    let falseIntentAttributes = action.falseIntentAttributes;
+
+    if (this.log) {
+      console.log("DirAskGPT trueIntent", trueIntent)
+      console.log("DirAskGPT falseIntent", falseIntent)
+      console.log("DirAskGPT trueIntentAttributes", trueIntentAttributes)
+      console.log("DirAskGPT falseIntentAttributes", falseIntentAttributes)
+    }
+
+    // default values?
+    let status = null;
+    let error = null;
+
     let requestVariables = null;
     requestVariables =
       await TiledeskChatbot.allParametersStatic(
         this.tdcache, this.requestId
       )
 
-    if (this.log) {
-      const all_parameters = await TiledeskChatbot.allParametersStatic(this.context.tdcache, this.context.requestId);
-      for (const [key, value] of Object.entries(all_parameters)) {
-        if (this.log) { console.log("DirMake request parameter:", key, "value:", value, "type:", typeof value) }
-      }
-    }
-    
     let webhook_url = action.url;
     let bodyParameters = action.bodyParameters;
+
     if (this.log) {
       console.log("DirMake webhook_url: ", webhook_url);
-      console.log("DirMake bodyParameters: ", bodyParameters);
+      console.log("DirMake bodyParameters: ", JSON.stringify(bodyParameters));
     }
-    if (!bodyParameters || bodyParameters === '') {
-      if (this.log) {console.error("DirMake ERROR - bodyParameters is undefined or null or empty string")};
+
+    if (!bodyParameters) {
+      console.error("Error: DirMake bodyParameters is undefined");
+      error = "Missing body parameters";
+      await this.#assignAttributes(action, status, error);
+      if (falseIntent) {
+        await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+        callback(true);
+        return;
+      }
       callback();
       return;
     }
+
     if (!webhook_url || webhook_url === '') {
-      if (this.log) {console.error("DirMake ERROR - webhook_url is undefined or null or empty string:")};
-      let status = 422;   
+      console.error("Error: DirMake Webhook Url is not defined");
+      let status = 422;
       let error = 'Missing make webhook url';
       await this.#assignAttributes(action, status, error);
-      this.#executeCondition(false, trueIntent, null, falseIntent, null, () => {
-        callback(); // stop the flow
-      });
+      if (falseIntent) {
+        await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+        callback(true);
+        return;
+      }
+      callback();
       return;
     }
-    let url;
-    try {
+
+    /**
+     * process.env.MAKE_ENDPOINT is used for testing purposes only.
+     * This variable must be not defined in Production Env.
+    */
     let make_base_url = process.env.MAKE_ENDPOINT;
-      if (make_base_url) {
-        url = make_base_url + "/make/";
-      } else {
-        url = action.url;
-      }
-      const filler = new Filler();
-      for (const [key, value] of Object.entries(bodyParameters)) {
-        //if (this.log) {console.log("bodyParam:", key, "value:", value)}
-        let filled_value = filler.fill(value, requestVariables);
-        bodyParameters[key] = filled_value;
-      }
-      if (this.log) {console.log('DirMake bodyParameters filler: ',bodyParameters)}
-    
+    let url;
 
-    
-    // Condition branches
-    //let trueIntent = action.trueIntent;
-    //let falseIntent = action.falseIntent;
-    //console.log('DirMake trueIntent',trueIntent)
- 
+    if (make_base_url) {
+      url = make_base_url + "/make/";
+    } else {
+      url = action.url;
+    }
     if (this.log) { console.log("DirMake MakeEndpoint URL: ", url); }
+
+    const filler = new Filler();
+    for (const [key, value] of Object.entries(bodyParameters)) {
+      let filled_value = filler.fill(value, requestVariables);
+      bodyParameters[key] = filled_value;
+    }
+    if (this.log) { console.log('DirMake bodyParameters filler: ', bodyParameters) }
+
     const MAKE_HTTPREQUEST = {
       url: url,
       headers: {
@@ -113,37 +128,46 @@ class DirMake {
       json: bodyParameters,
       method: "POST"
     }
-  
-    if (this.log) { console.log("myrequest/DirMake MAKE_HTTPREQUEST", MAKE_HTTPREQUEST); }
+    if (this.log) { console.log("DirMake MAKE_HTTPREQUEST", MAKE_HTTPREQUEST); }
     this.#myrequest(
-      MAKE_HTTPREQUEST, async (err, resbody) => {
+      MAKE_HTTPREQUEST, async (err, res) => {
         if (err) {
           if (callback) {
-            if (this.log) {console.error("myrequest/(httprequest) DirMake make err:", err)};
-            let status = 404;   
-            let error = 'Make url not found';
+            console.error("(httprequest) DirMake err:", err);
+            // let status = 404;
+            // let error = 'Make url not found';
+            status = res.status;
+            error = res.error;
             await this.#assignAttributes(action, status, error);
-            this.#executeCondition(false, trueIntent, null, falseIntent, null, () => {
-              callback(false); // continue the flow
-            });
+            if (falseIntent) {
+              await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+              callback(true);
+              return;
+            }
             callback();
+            return;
           }
         } else if (callback) {
-          if (this.log) { console.log("myrequest/DirMake Make resbody: ", resbody); }
-          let status = 200;   
-          let error = null;
-          await this.#assignAttributes(action, status, error); 
-          await this.#executeCondition(true, trueIntent, null, falseIntent, null, () => {
-            callback(); // stop the flow
-          });
-          if (this.log) {console.log('myrequest/status: ',status)}
-          //callback();
+          if (this.log) { console.log("(httprequest) DirMake resbody ", res); }
+          // let status = 200;
+          // let error = null;
+          status = res.status;
+          error = null;
+          if (res.error) {
+            error = res.error
+          }
+          await this.#assignAttributes(action, status, error);
+          if (trueIntent) {
+            await this.#executeCondition(true, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
+              callback(true);
+              return;
+          }
+          callback();
+          return;
         }
       }
     );
-  } catch(e) {
-    console.error('error: ', e)
-  }
+
   }
 
   async #assignAttributes(action, status, error) {
@@ -170,6 +194,7 @@ class DirMake {
     }
   }
 
+  // Advanced #myrequest function
   #myrequest(options, callback) {
     if (this.log) {
       console.log("API URL:", options.url);
@@ -179,7 +204,8 @@ class DirMake {
       url: options.url,
       method: options.method,
       params: options.params,
-      headers: options.headers
+      headers: options.headers,
+      timeout: 20000
     }
     if (options.json !== null) {
       axios_options.data = options.json
@@ -197,61 +223,146 @@ class DirMake {
       .then((res) => {
         if (this.log) {
           console.log("Response for url:", options.url);
-          console.log("Response status:", res.status);
           console.log("Response headers:\n", JSON.stringify(res.headers));
         }
-        if (res && res.status == 200 && res.data) {
-          if (callback) {
-            callback(null, res.data);
-          }
-        }
-        else {
-          if (callback) {
-            callback(new Error("Response status is not 200"), null);
-          }
+        if (callback) {
+          callback(null, res);
         }
+
       })
-      .catch((error) => {
-        if (this.log) {console.error("An error occurred:", JSON.stringify(error.message))};
+      .catch((err) => {
+        if (this.log) {
+          // FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - START
+          let cache = [];
+          let error_log = JSON.stringify(err, function (key, value) { // try to use a separate function
+            if (typeof value === 'object' && value != null) {
+              if (cache.indexOf(value) !== -1) {
+                return;
+              }
+              cache.push(value);
+            }
+            return value;
+          });
+          console.error("An error occurred: ", error_log);
+          // FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - END
+          // console.error("An error occurred:", JSON.stringify(err));
+        }
         if (callback) {
-          callback(error, null);
+          let status = 1000;
+          let cache = [];
+          let str_error = JSON.stringify(err, function (key, value) { // try to use a separate function
+            if (typeof value === 'object' && value != null) {
+              if (cache.indexOf(value) !== -1) {
+                return;
+              }
+              cache.push(value);
+            }
+            return value;
+          });
+          let error = JSON.parse(str_error) // "status" disappears without this trick
+          let errorMessage = JSON.stringify(error);
+          if (error.status) {
+            status = error.status;
+          }
+          if (error.message) {
+            errorMessage = error.message;
+          }
+          callback(
+            null, {
+            status: status,
+            data: null,
+            error: errorMessage
+          }
+          );
         }
       });
   }
+
+  // #myrequest(options, callback) {
+  //   if (this.log) {
+  //     console.log("API URL:", options.url);
+  //     console.log("** Options:", JSON.stringify(options));
+  //   }
+  //   let axios_options = {
+  //     url: options.url,
+  //     method: options.method,
+  //     params: options.params,
+  //     headers: options.headers
+  //   }
+  //   if (options.json !== null) {
+  //     axios_options.data = options.json
+  //   }
+  //   if (this.log) {
+  //     console.log("axios_options:", JSON.stringify(axios_options));
+  //   }
+  //   if (options.url.startsWith("https:")) {
+  //     const httpsAgent = new https.Agent({
+  //       rejectUnauthorized: false,
+  //     });
+  //     axios_options.httpsAgent = httpsAgent;
+  //   }
+  //   axios(axios_options)
+  //     .then((res) => {
+  //       if (this.log) {
+  //         console.log("Response for url:", options.url);
+  //         console.log("Response headers:\n", JSON.stringify(res.headers));
+  //       }
+  //       if (res && res.status == 200 && res.data) {
+  //         if (callback) {
+  //           callback(null, res.data);
+  //         }
+  //       }
+  //       else {
+  //         if (callback) {
+  //           callback(new Error("Response status is not 200"), null);
+  //         }
+  //       }
+  //     })
+  //     .catch((error) => {
+  //       if (this.log) { console.error("An error occurred:", JSON.stringify(error.message)) };
+  //       if (callback) {
+  //         callback(error, null);
+  //       }
+  //     });
+  // }
+
   async #executeCondition(result, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, callback) {
     let trueIntentDirective = null;
-   
     if (trueIntent) {
-      //console.log('executeCondition/trueIntent',trueIntent)
       trueIntentDirective = DirIntent.intentDirectiveFor(trueIntent, trueIntentAttributes);
-      //console.log('executeCondition/trueIntentDirective',trueIntentDirective)
-      //console.log('executeCondition/trueIntentAttributes',trueIntentAttributes)
     }
     let falseIntentDirective = null;
     if (falseIntent) {
       falseIntentDirective = DirIntent.intentDirectiveFor(falseIntent, falseIntentAttributes);
     }
-    if (this.log) {console.log('DirMake executeCondition/result',result)}
     if (result === true) {
       if (trueIntentDirective) {
         this.intentDir.execute(trueIntentDirective, () => {
-          callback();
+          if (callback) {
+            callback();
+          }
         });
       }
       else {
-        if (this.log) {console.log("No trueIntentDirective specified");}
-        callback();
+        if (this.log) { console.log("No trueIntentDirective specified"); }
+        if (callback) {
+          callback();
+        }
       }
     }
     else {
       if (falseIntentDirective) {
         this.intentDir.execute(falseIntentDirective, () => {
-          callback();
+          if (callback) {
+            callback();
+          }
         });
       }
       else {
-        if (this.log) {console.log("No falseIntentDirective specified");}
-        callback();
+        if (this.log) { console.log("No falseIntentDirective specified"); }
+        if (callback) {
+          callback();
+        }
       }
     }
   }

package/tiledeskChatbotPlugs/directives/DirQapla.js

@@ -54,7 +54,7 @@ class DirQapla {
       console.log("DirAskGPT falseIntentAttributes", falseIntentAttributes)
     }
 
-    // let default values??
+    // Set default values
     let status = null;
     let result = null;
     let error;

package/tiledeskChatbotPlugs/directives/DirSetConversationTags.js

@@ -0,0 +1,127 @@
+const { Filler } = require('../Filler');
+
+class DirSetConversationTags {
+
+  constructor(context) {
+    if (!context) {
+      throw new Error('context object is mandatory.');
+    }
+    this.context = context;
+    this.log = context.log;
+    this.tdclient = context.tdclient;
+    this.requestId = context.requestId;
+  }
+
+  execute(directive, callback) {
+    let action;
+    if (directive.action) {
+        action = directive.action
+    }
+    else {
+        callback();
+        return;
+    }
+    this.go(action, () => {
+        callback();
+    });
+  }
+
+  async go(action, callback) {
+    if (this.log) {console.log("(DirSetConversationTags) Adding conversation tags:", action.depName);}
+    let tagsString = action.tags;
+    tagsString = tagsString.replace(/ /g,"");
+    if (tagsString.length === 0) {
+      if (this.log) {console.error("(DirSetConversationTags) Invalid action: tags string is empty")};
+      callback();
+      return;
+    }
+    try {
+      if (this.tdcache) {
+        const requestAttributes = 
+            await TiledeskChatbot.allParametersStatic(this.tdcache, this.context.requestId);
+        const filler = new Filler();
+        tags = filler.fill(tags, requestAttributes);
+      }
+    }
+    catch(error) {
+        console.error("Error while filling operands:", error);
+    }
+    this.moveToDepartment(this.requestId, depName, (deps) => {
+      if (!deps) {
+        if (this.log) {console.log("Dep not found");}
+        callback();
+        return
+      }
+      if (this.log) {console.log("Switched to dept:", depName, "action:", JSON.stringify(action));}
+      if (action.triggerBot) {
+        let dep = null;
+        let i;
+        for (i = 0; i < deps.length; i++) {
+          let d = deps[i];
+          if (d.name.toLowerCase() === depName.toLowerCase()) {
+            dep = d;
+            break;
+          }
+        }
+        if (dep && dep.hasBot === true && dep.id_bot) {
+          if (this.log) {console.log("Sending hidden /start message to bot in dept");}
+          const message = {
+            type: "text",
+            text: "/start",
+            attributes : {
+              subtype: "info"
+            }
+          }
+          this.tdclient.sendSupportMessage(
+            this.requestId,
+            message, (err) => {
+              if (err) {
+                console.error("Error sending hidden message:", err.message);
+              }
+              if (this.log) {console.log("Hidden message sent.");}
+              callback();
+          });
+        }
+      }
+      else {
+        if (this.log) {console.log("No action.triggerBot");}
+        callback();
+      }
+    });
+  }
+
+  moveToDepartment(requestId, depName, callback) {
+    this.tdclient.getAllDepartments((err, deps) => {
+      if (this.log) {console.log("deps:", JSON.stringify(deps));}
+      if (err) {
+        console.error("getAllDepartments() error:", err);
+        callback();
+        return;
+      }
+      let dep = null;
+      let i;
+      for (i = 0; i < deps.length; i++) {
+        let d = deps[i];
+        if (d.name.toLowerCase() === depName.toLowerCase()) {
+          dep = d;
+          break;
+        }
+      }
+      if (dep) {
+        this.tdclient.updateRequestDepartment(requestId, dep._id, null, (err, res) => {
+          if (err) {
+            console.error("DirDepartment error:", err);
+            callback();
+          }
+          else {
+            console.log("DirDepartment response:",JSON.stringify(res));
+            callback(deps);
+          }
+        });
+      }
+    });
+  }
+
+}
+
+module.exports = { DirSetConversationTags };