@tiledesk/tiledesk-tybot-connector 0.5.0 → 0.5.1-rc1

package/tiledeskChatbotPlugs/directives/DirIfOpenHours.js

@@ -3,6 +3,8 @@ let axios = require('axios');
 const { DirIntent } = require('./DirIntent');
 let https = require("https");
 const ms = require('minimist-string');
+const winston = require('../../utils/winston');
+const httpUtils = require('../../utils/HttpUtils');
 
 class DirIfOpenHours {
 
@@ -18,6 +20,7 @@ class DirIfOpenHours {
   }
 
   execute(directive, callback) {
+    winston.verbose("Execute IfOpenHours directive");
     let action;
     if (directive.action) {
       action = directive.action
@@ -26,9 +29,7 @@ class DirIfOpenHours {
       let params;
       params = this.parseParams(directive.parameter);
       if (!params.trueIntent && !params.falseIntent) {
-        if (this.log) {
-          console.log("missing both params.trueIntent & params.falseIntent");
-        }
+          winston.warn("DirIfOpenHours both params.trueIntent & params.falseIntent");
         callback();
         return;
       }
@@ -38,6 +39,7 @@ class DirIfOpenHours {
       }
     }
     else {
+      winston.warn("DirIfOpenHours Incorrect directive: ", directive);
       callback();
       return;
     }
@@ -47,6 +49,7 @@ class DirIfOpenHours {
   }
 
   go(action, callback) {
+    winston.debug("(DirIfOpenHours) Action: ", action);
 
     const trueIntent = action.trueIntent;
     const falseIntent = action.falseIntent;
@@ -60,9 +63,9 @@ class DirIfOpenHours {
     if (falseIntent && falseIntent.trim() === "") {
       falseIntent = null;
     }
-    if (this.log) {console.log("condition action:", action);}
+
     if (!trueIntent && !falseIntent) {
-      if (this.log) {console.log("Invalid condition, no intents specified");}
+      winston.error("(DirIfOpenHours) Invalid condition, no intents specified");
       callback();
       return;
     }
@@ -85,20 +88,19 @@ class DirIfOpenHours {
       },
       method: 'GET'
     }
-    if (this.log) { console.log("DirIfOpenHours HTTPREQUEST", HTTPREQUEST); }
+    winston.debug("(DirIfOpenHours) HttpRequest ", HTTPREQUEST);
     
-    this.#myrequest(
+    httpUtils.request(
       HTTPREQUEST, async (err, resbody) => {
-        if (this.log && err) {
-          console.log("DirIfOpenHours error: ", err);
-        }
-        if (this.log) { console.log("DirIfOpenHours resbody:", resbody); }
 
+        winston.debug("(DirIfOpenHours) resbody:", resbody);
+        
         if (err) {
+          winston.debug("(DirIfOpenHours) error: ", err);
           if (callback) {
             if (falseIntent) {
               let intentDirective = DirIntent.intentDirectiveFor(falseIntent);
-              if (this.log) {console.log("!agents (openHours) => falseIntent", falseIntent);}
+              winston.debug("(DirIfOpenHours) !agents (openHours) => falseIntent " + falseIntent);
               this.intentDir.execute(intentDirective, () => {
                 callback(stopOnConditionMet);
               });
@@ -108,7 +110,7 @@ class DirIfOpenHours {
           if (resbody.isopen && resbody.isopen === true) {
             if (trueIntent) {
               let intentDirective = DirIntent.intentDirectiveFor(trueIntent);
-              if (this.log) {console.log("agents (openHours) => trueIntent");}
+              winston.debug("(DirIfOpenHours) agents (openHours) => trueIntent");
               this.intentDir.execute(intentDirective, () => {
                 callback(stopOnConditionMet);
               });
@@ -118,7 +120,7 @@ class DirIfOpenHours {
           } else {
             if (falseIntent) {
               let intentDirective = DirIntent.intentDirectiveFor(falseIntent);
-              if (this.log) {console.log("!agents (openHours) => falseIntent", falseIntent);}
+              winston.debug("(DirIfOpenHours) !agents (openHours) => falseIntent", falseIntent);
               this.intentDir.execute(intentDirective, () => {
                 callback(stopOnConditionMet);
               });
@@ -131,17 +133,13 @@ class DirIfOpenHours {
     )
 
     // this.tdClient.openNow(action.slot_id, (err, result) => {
-    //   console.log("openNow():", result);
-    //   if (this.log) {console.log("openNow():", result);}
+
     //   if (err) {
-    //     console.error("*** DirIfOpenHours Error:", err);
     //     callback();
     //   }
     //   else if (result && result.isopen) {
-    //     console.log("yes is open")
     //     if (trueIntent) {
     //       let intentDirective = DirIntent.intentDirectiveFor(trueIntent);
-    //       if (this.log) {console.log("agents (openHours) => trueIntent");}
     //       this.intentDir.execute(intentDirective, () => {
     //         callback(stopOnConditionMet);
     //       });
@@ -153,7 +151,6 @@ class DirIfOpenHours {
     //   }
     //   else if (falseIntent) {
     //     let intentDirective = DirIntent.intentDirectiveFor(falseIntent);
-    //     if (this.log) {console.log("!agents (openHours) => falseIntent", falseIntent);}
     //     this.intentDir.execute(intentDirective, () => {
     //       callback(stopOnConditionMet);
     //     });
@@ -164,54 +161,6 @@ class DirIfOpenHours {
     // });
   }
 
-  #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) => {
-        console.error("(DirIfOpenHours) Axios error: ", JSON.stringify(error));
-        if (callback) {
-          callback(error, null);
-        }
-      });
-  }
-
   parseParams(directive_parameter) {
     let trueIntent = null;
     let falseIntent = null;

package/tiledeskChatbotPlugs/directives/DirIntent.js

@@ -2,6 +2,8 @@ let axios = require('axios');
 let https = require("https");
 const { v4: uuidv4 } = require('uuid');
 const ms = require('minimist-string');
+const winston = require('../../utils/winston');
+const tilebotService = require('../../services/TilebotService');
 
 class DirIntent {
 
@@ -18,10 +20,8 @@ class DirIntent {
   }
 
   execute(directive, callback) {
-    // console.log("exec intent:", JSON.stringify(directive));
     let action;
     if (directive.action) {
-      // console.log("got intent action:", JSON.stringify(directive.action));
       action = directive.action;
     }
     else if (directive.parameter && directive.parameter.trim() !== "") {
@@ -30,7 +30,7 @@ class DirIntent {
       }
     }
     else {
-      console.error("Incorrect directive:", directive);
+      winston.error("DirIntent Incorrect directive:", directive);
       callback();
       return;
     }
@@ -40,10 +40,7 @@ class DirIntent {
   }
 
   go(action, callback) {
-    // console.log("action intent:", action);
     const intentName = action.intentName;
-    // const intentId = action.intentId;
-    //console.log("new_supportRequest", JSON.stringify(this.supportRequest));
     const projectId = this.supportRequest.id_project;
     const requestId = this.supportRequest.request_id;
     const botId = this.supportRequest.bot_id;
@@ -51,17 +48,11 @@ class DirIntent {
     if (intentName) {
       intent_command = "/" + intentName;
     }
-    // else if (intentId) {
-    //   intent_command = "/#" + intentId;
-    // }
     else {
-      // console.error("(DirIntent) No intent name found in action");
       callback();
       return;
     }
 
-    // if (intentName) {
-    //   let intent_command = "/" + intentName;
     let intent_command_request = {
       "payload": {
         "_id": uuidv4(),
@@ -71,26 +62,21 @@ class DirIntent {
         "recipient": requestId,
         "text": intent_command,
         "id_project": projectId,
-        "request": {
-          "request_id": requestId,
-          "id_project": projectId
-          // "bot_id": botId
-        }
+        "request": this.supportRequest,
+        // "request": {
+        //   "request_id": requestId,
+        //   "id_project": projectId
+        //   // "bot_id": botId
+        // }
       },
       "token": this.token
     }
-    if (this.log) {console.log("move to intent message:", intent_command_request);}
+    winston.debug("DirIntent move to intent message: ", intent_command_request);
 
-
-    this.sendMessageToBot(this.TILEBOT_ENDPOINT, intent_command_request, botId, () => {
-      // console.log("sendMessageToBot() req_body sent:", intent_command_request);
+    tilebotService.sendMessageToBot(intent_command_request, botId, () => {
       callback(true);
     });
 
-    // }
-    // else {
-    //   callback();
-    // }
   }
 
   static intentDirectiveFor(intent, json_params) {
@@ -100,7 +86,7 @@ class DirIntent {
         string_params = JSON.stringify(json_params);
       }
       catch (error) {
-        console.error("Error stringigying JSON PARAMS", json_params);
+        winston.error("(DirIfOpenHours) Error stringing JSON PARAMS ", json_params);
       }
     }
     if (string_params != null) {
@@ -124,84 +110,6 @@ class DirIntent {
     return intentDirective;
   }
 
-  /**
-   * A stub to send message to the "ext/botId" endpoint, hosted by tilebot on:
-   * /${TILEBOT_ROUTE}/ext/${botId}
-   *
-   * @param {Object} message. The message to send
-   * @param {string} botId. Tiledesk botId
-   * @param {string} token. User token
-   */
-  sendMessageToBot(TILEBOT_ENDPOINT, message, botId, callback) {
-    const url = `${TILEBOT_ENDPOINT}/ext/${botId}`;
-    // console.log("sendMessageToBot URL", url);
-    const HTTPREQUEST = {
-      url: url,
-      headers: {
-        'Content-Type' : 'application/json'
-      },
-      json: message,
-      method: 'POST'
-    };
-    this.myrequest(
-      HTTPREQUEST,
-      function(err, resbody) {
-        if (err) {
-          if (callback) {
-            callback(err);
-          }
-        }
-        else {
-          if (callback) {
-            callback(null, resbody);
-          }
-        }
-      }, false
-    );
-  }
-
-  myrequest(options, callback, log) {
-    if (this.log) {
-      console.log("API URL:", options.url);
-      console.log("** Options:", JSON.stringify(options));
-    }
-    let axios_options = {
-      url: options.url,
-      method: options.method,
-      data: options.json,
-      params: options.params,
-      headers: options.headers
-    }
-    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(TiledeskClient.getErr({message: "Response status not 200"}, options, res), null, null);
-        }
-      }
-    })
-    .catch( (error) => {
-      console.error("(DirIntent) Axios error: ", JSON.stringify(error));
-      if (callback) {
-        callback(error, null, null);
-      }
-    });
-  }
 }
 
 module.exports = { DirIntent };

package/tiledeskChatbotPlugs/directives/DirJSONCondition.js

@@ -1,6 +1,7 @@
 const { DirIntent } = require('./DirIntent');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { TiledeskExpression } = require('../../TiledeskExpression');
+const winston = require('../../utils/winston');
 
 class DirJSONCondition {
 
@@ -16,12 +17,13 @@ class DirJSONCondition {
   }
 
   execute(directive, callback) {
-    // console.log("Condition...")
+    winston.verbose("Execute JSONCondition directive");
     let action;
     if (directive.action) {
       action = directive.action
     }
     else {
+      winston.warn("DirJSONCondition Incorrect directive: ", directive);
       callback();
       return;
     }
@@ -32,14 +34,15 @@ class DirJSONCondition {
   }
 
   async go(action, callback) {
-    // const groups = action.jsonCondition.groups;
+    winston.debug("(DirJSONCondition) Action: ", action);
+
     const groups = action.groups; // NEXT
     const trueIntent = action.trueIntent;
     const falseIntent = action.falseIntent;
     const trueIntentAttributes = action.trueIntentAttributes;
     const falseIntentAttributes = action.falseIntentAttributes;
     let stopOnConditionMet = true; //action.stopOnConditionMet;
-    if (this.log) {console.log("groups:", JSON.stringify(groups));}
+
     if (trueIntent && trueIntent.trim() === "") {
       trueIntent = null;
     }
@@ -47,15 +50,16 @@ class DirJSONCondition {
       falseIntent = null;
     }
     if (!trueIntent && !falseIntent) {
-      if (this.log) {console.log("Invalid jsonCondition, no intents specified");}
+      winston.warn("(DirJSONCondition) Invalid jsonCondition, no intents specified");
       callback();
       return;
     }
     else if (groups === null) {
-      if (this.log) {console.log("Invalid jsonCondition, no groups.");}
+      winston.warn("(DirJSONCondition) Invalid jsonCondition, no groups.");
       callback();
       return;
     }
+
     let trueIntentDirective = null;
     if (trueIntent) {
       trueIntentDirective = DirIntent.intentDirectiveFor(trueIntent, trueIntentAttributes);
@@ -70,26 +74,24 @@ class DirJSONCondition {
       await TiledeskChatbot.allParametersStatic(
         this.context.tdcache, this.context.requestId
       );
-      if (this.log) {console.log("Variables:", JSON.stringify(variables))}
     }
     else {
-      console.error("(DirJSONCondition) No this.context.tdcache");
+      winston.error("(DirJSONCondition) No this.context.tdcache")
     }
     // const result = await this.evaluateCondition(scriptCondition, variables);
     let result;
     const expression = TiledeskExpression.JSONGroupsToExpression(groups, variables);
-    // console.log("full json condition expression:", expression);
+
     result = new TiledeskExpression().evaluateStaticExpression(expression, variables);
-    if (this.log) {console.log("executed condition:", expression, "result:", result);}
+    winston.debug("(DirJSONCondition) executed condition: ", expression);
     if (result === true) {
       if (trueIntentDirective) {
         this.intentDir.execute(trueIntentDirective, () => {
-          // console.log("result === true. stopOnConditionMet?", stopOnConditionMet);
           callback(stopOnConditionMet);
         });
       }
       else {
-        if (this.log) {console.log("No trueIntentDirective specified");}
+        winston.debug("(DirJSONCondition) No trueIntentDirective specified");
         callback();
         return;
       }
@@ -100,12 +102,11 @@ class DirJSONCondition {
       }
       if (falseIntentDirective) {
         this.intentDir.execute(falseIntentDirective, () => {
-          // console.log("result === false. stopOnConditionMet?", stopOnConditionMet);
           callback(stopOnConditionMet);
         });
       }
       else {
-        if (this.log) {console.log("No falseIntentDirective specified");}
+        winston.debug("(DirJSONCondition) No falseIntentDirective specified");
         callback();
         return;
       }

package/tiledeskChatbotPlugs/directives/DirLockIntent.js

@@ -1,4 +1,5 @@
 const ms = require('minimist-string');
+const winston = require('../../utils/winston');
 
 class DirLockIntent {
 
@@ -15,23 +16,19 @@ class DirLockIntent {
   }
 
   async execute(directive, callback) {
-    if (this.log) {console.log("Locking intent:", JSON.stringify(directive));}
+    winston.verbose("Execute LockIntent directive");
     let action;
     if (directive.action) {
-      // console.log("got intent action:", JSON.stringify(directive.action));
       action = directive.action;
     }
     else if (directive.parameter && directive.parameter.trim() !== "") {
       const params = this.parseParams(directive.parameter);
       action = {
-        // body: {
-        intentName: params.intentName // directive.parameter.trim()
-          // variableName: params.variableName
-        // }
+        intentName: params.intentName 
       }
     }
     else {
-      console.error("Incorrect directive:", directive);
+      winston.warn("DirLockIntent Incorrect directive: ", directive);
       callback();
       return;
     }
@@ -49,11 +46,11 @@ class DirLockIntent {
   }
 
   async go(action, callback) {
-    // let intent_name = action.body.intentName;
+    winston.debug("(DirLockIntent) Action: ", action);
     let intent_name = action.intentName;
     // let variable_name = action.body.variableName;
     await DirLockIntent.lockIntent(this.tdcache, this.context.requestId, intent_name); //, variable_name);
-    if (this.log) {console.log("Locked intent:", action.intentName);}
+    winston.debug("(DirLockIntent) Locked intent:", action.intentName);
     if (callback) {
       callback();
     }
@@ -64,14 +61,12 @@ class DirLockIntent {
       await tdcache.set("tilebot:requests:"  + requestId + ":locked", intent_name);
     }
     else {
-      console.error("lockIntent recoverable error, one of requestId:", requestId, "intent_name:", intent_name, "is not valid");
+      winston.error("(DirLockIntent) lockIntent recoverable error, one of requestId: " + requestId + " intent_name: " + intent_name + " is not valid");
     }
     
     // if (variable_name) {
-    //   console.log("locking intent with variable:", variable_name);
     //   await this.tdcache.set("tilebot:requests:"  + requestId + ":lockedValue", variable_name);
     // }
-    // console.log("locked. Intent name:", intent_name, "intent variable:", variable_name);
   }
   
   parseParams(directive_parameter) {