@tiledesk/tiledesk-server 2.8.7 → 2.8.9

package/.github/workflows/docker-image-en-tag-push.yml

@@ -12,12 +12,35 @@ jobs:
     steps:
      - name: Check out the repo
        uses: actions/checkout@v2
-     - name: Push to Docker Hub
-       uses: docker/build-push-action@v1
-       with:
+      
+     - name: Login to Docker Hub
+       uses: docker/login-action@v3
+       with:	    
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
-        build_args: NPM_TOKEN=${{ secrets.NPM_TOKEN }}
-        dockerfile: Dockerfile-en
         repository: tiledeskrepo/tiledesk-server-enterprise
         tag_with_ref: true
+    
+     - name: Log Voice Token
+       run: |
+          echo "Voice token log: ${{ secrets.VOICE_TOKEN }}"
+
+     - name: Generate Docker metadata
+       id: meta
+       uses: docker/metadata-action@v3
+       with:
+        images: tiledeskrepo/tiledesk-server-enterprise
+        tags: |
+          type=ref,event=branch
+          type=semver,pattern={{version}}
+
+     - name: Push to Docker Hub
+       uses: docker/build-push-action@v4
+       with:
+        context: .
+        file: ./Dockerfile-en
+        push: true
+        build-args: |
+          NPM_TOKEN=${{ secrets.NPM_TOKEN }}
+          VOICE_TOKEN=${{ secrets.VOICE_TOKEN }}
+        tags: ${{ steps.meta.outputs.tags }}

package/CHANGELOG.md

@@ -5,6 +5,13 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.9.0
+- Added Twilio SMS route
+- Added VXML Voice route (hidden)
+
+# 2.8.8
+- Changed default prompt for kb q&a
+
 # 2.8.7
 - Update project update endpoint with agent chats only function 
 

package/Dockerfile-en

@@ -7,9 +7,15 @@ RUN apt-get update
 # Create app directory
 WORKDIR /usr/src/app
 
+# Accept build arguments
 ARG NPM_TOKEN
+ARG VOICE_TOKEN
+
 COPY .npmrc_ .npmrc
 
+# Set environment variable based on build argument
+ENV VOICE_TOKEN=${VOICE_TOKEN}
+
 # Install app dependencies
 # A wildcard is used to ensure both package.json AND package-lock.json are copied
 # where available (npm@5+)

package/deploy.sh

@@ -1,5 +1,5 @@
 git pull
-npm version patch
+npm version minor
 version=`node -e 'console.log(require("./package.json").version)'`
 echo "version $version"
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.8.7",
+  "version": "2.8.9",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -36,7 +36,7 @@
     "@tiledesk-ent/tiledesk-server-visitorcounter": "^1.1.1"
   },
   "dependencies": {
-    "@tiledesk/tiledesk-apps": "^1.0.17",
+    "@tiledesk/tiledesk-apps": "^1.0.22",
     "@tiledesk/tiledesk-chat21-app": "^1.1.8",
     "@tiledesk/tiledesk-chatbot-templates": "^0.1.2",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
@@ -51,6 +51,8 @@
     "@tiledesk/tiledesk-tybot-connector": "^0.2.83",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.72",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.8",
+    "@tiledesk/tiledesk-sms-connector": "^0.1.6",
+    "@tiledesk/tiledesk-vxml-connector": "^0.1.37",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",

package/pubmodules/apps/listener.js

@@ -28,7 +28,8 @@ class Listener {
         apps.startApp({
             ACCESS_TOKEN_SECRET: process.env.APPS_ACCESS_TOKEN_SECRET || configSecretOrPubicKay,
             MONGODB_URI: process.env.APPS_MONGODB_URI || config.databaseUri,
-            KALEYRA_ENABLED: process.env.KALEYRA_ENABLED || config.kaleyra_enabled
+            KALEYRA_ENABLED: process.env.KALEYRA_ENABLED || config.kaleyra_enabled,
+            VOICE_ENABLED: process.env.VOICE_ENABLED || false
         }, () => {
             winston.info("Tiledesk Apps proxy server succesfully started.")
         })

package/pubmodules/pubModulesManager.js

@@ -33,6 +33,12 @@ class PubModulesManager {
         this.telegram = undefined;
         this.telegramRoute = undefined;
 
+        this.sms = undefined;
+        this.smsRoute = undefined;
+        
+        this.voice = undefined;
+        this.voiceRoute = undefined;
+
         this.mqttTest = undefined;
         this.mqttTestRoute = undefined;
 
@@ -91,6 +97,14 @@ class PubModulesManager {
             app.use('/modules/telegram', this.telegramRoute);
             winston.info("PubModulesManager telegramRoute controller loaded");
         }
+        if (this.smsRoute) {
+            app.use('/modules/sms', this.smsRoute);
+            winston.info("PubModulesManager smsRoute controller loaded");
+        }
+        if (this.voiceRoute) {
+            app.use('/modules/voice', this.voiceRoute);
+            winston.info("PubModulesManager voiceRoute controller loaded");
+        }
         if (this.mqttTestRoute) {
             app.use('/modules/mqttTest', this.mqttTestRoute);
             winston.info("PubModulesManager mqttTestRoute controller loaded");
@@ -331,6 +345,41 @@ class PubModulesManager {
             }
         }
 
+        if (process.env.VOICE_TOKEN === process.env.VOICE_SECRET) {
+            try {
+                this.voice = require('./voice');
+                winston.info("this.voice: " + this.voice);
+                this.voice.listener.listen(config);
+    
+                this.voiceRoute = this.voice.voiceRoute;
+    
+                winston.info("PubModulesManager initialized apps (voice).")
+            } catch(err) {
+                console.log("\n Unable to start voice connector: ", err);
+                if (err.code == 'MODULE_NOT_FOUND') {
+                    winston.info("PubModulesManager init apps module not found ");
+                } else {
+                    winston.info("PubModulesManager error initializing init apps module", err);
+                }
+            }
+        }
+
+        try {
+            this.sms = require('./sms');
+            winston.info("this.sms: " + this.sms);
+            this.sms.listener.listen(config);
+
+            this.smsRoute = this.sms.smsRoute;
+
+            winston.info("PubModulesManager initialized apps (sms).")
+        } catch(err) {
+            if (err.code == 'MODULE_NOT_FOUND') {
+                winston.info("PubModulesManager init apps module not found ");
+            } else {
+                winston.info("PubModulesManager error initializing init apps module", err);
+            }
+        }
+
         try {
             this.mqttTest = require('./mqttTest');
             winston.info("this.mqttTest: " + this.mqttTest);

package/pubmodules/sms/index.js

@@ -0,0 +1,7 @@
+const listener = require("./listener");
+
+const sms = require("@tiledesk/tiledesk-sms-connector");
+const smsRoute = sms.router;
+
+
+module.exports = { listener: listener, smsRoute: smsRoute }

package/pubmodules/sms/listener.js

@@ -0,0 +1,55 @@
+const sms = require("@tiledesk/tiledesk-sms-connector");
+var winston = require('../../config/winston');
+var configGlobal = require('../../config/global');
+const mongoose = require("mongoose");
+
+const apiUrl = process.env.API_URL || configGlobal.apiUrl;
+winston.info('SMS apiUrl: ' + apiUrl);
+
+const dbConnection = mongoose.connection;
+
+class Listener {
+
+    listen(config) {
+        winston.info("SMS Listener listen");
+        if (config.databaseUri) {
+            winston.debug("SMS config databaseUri: " + config.databaseUri);
+        }
+
+        var port = process.env.CACHE_REDIS_PORT || 6379;
+        winston.debug("Redis port: "+ port);
+
+        var host = process.env.CACHE_REDIS_HOST || "127.0.0.1"
+        winston.debug("Redis host: "+ host);
+
+        var password = process.env.CACHE_REDIS_PASSWORD;
+        winston.debug("Redis password: "+ password);
+
+        let brand_name = null;
+        if (process.env.BRAND_NAME) {
+            brand_name = process.env.BRAND_NAME
+        }
+
+        let log = process.env.SMS_LOG || false
+        winston.debug("SMS log: " + log);
+
+
+        sms.startApp({
+            MONGODB_URI: config.databaseUri,          
+            dbconnection: dbConnection,
+            API_URL: apiUrl,
+            BASE_URL: apiUrl + "/modules/sms",
+            BRAND_NAME: brand_name,
+            REDIS_HOST: host,
+            REDIS_PORT: port,
+            REDIS_PASSWORD: password,
+            log: log
+        })
+        
+    }
+}
+
+var listener = new Listener();
+
+module.exports = listener;
+

package/pubmodules/voice/index.js

@@ -0,0 +1,7 @@
+const listener = require("./listener");
+
+const voice = require("@tiledesk/tiledesk-vxml-connector");
+const voiceRoute = voice.router;
+
+
+module.exports = { listener: listener, voiceRoute: voiceRoute }

package/pubmodules/voice/listener.js

@@ -0,0 +1,63 @@
+const voice = require("@tiledesk/tiledesk-vxml-connector");
+var winston = require('../../config/winston');
+var configGlobal = require('../../config/global');
+const mongoose = require("mongoose");
+
+const apiUrl = process.env.API_URL || configGlobal.apiUrl;
+winston.info('Voice apiUrl: ' + apiUrl);
+
+const dbConnection = mongoose.connection;
+
+class Listener {
+
+    listen(config) {
+        winston.info("Voice Listener listen");
+        if (config.databaseUri) {
+            winston.debug("Voice config databaseUri: " + config.databaseUri);
+        }
+
+        var pooling_delay = process.env.BASE_POOLING_DELAY || 250;
+        winston.debug("Pooling_delay: "+ pooling_delay);
+
+        var port = process.env.CACHE_REDIS_PORT || 6379;
+        winston.debug("Redis port: "+ port);
+
+        var host = process.env.CACHE_REDIS_HOST || "127.0.0.1"
+        winston.debug("Redis host: "+ host);
+
+        var password = process.env.CACHE_REDIS_PASSWORD;
+        winston.debug("Redis password: "+ password);
+
+        let brand_name = null;
+        if (process.env.BRAND_NAME) {
+            brand_name = process.env.BRAND_NAME
+        }
+
+        let log = process.env.VXML_LOG || false
+        winston.debug("Voice log: "+ log);
+
+        voice.startApp({
+            MONGODB_URI: config.databaseUri,          
+            dbconnection: dbConnection,
+            API_URL: apiUrl,
+            BASE_URL: apiUrl + "/modules/voice",                     
+            REDIS_HOST: host,
+            REDIS_PORT: port,
+            REDIS_PASSWORD: password,
+            BRAND_NAME: brand_name,
+            BASE_POOLING_DELAY: pooling_delay,
+            log: log
+        }, (err) => {
+            if (!err) {
+                winston.info("Tiledesk Voice Connector proxy server succesfully started.");
+            } else {
+                winston.info("unable to start Tiledesk Voice Connector. " + err);
+            }
+        })
+
+    }
+}
+
+var listener = new Listener();
+
+module.exports = listener;

package/routes/kb.js

@@ -41,7 +41,8 @@ let default_preview_settings = {
   context: null
 }
 
-let default_context = "Answer if and ONLY if the answer is contained in the context provided. If the answer is not contained in the context provided ALWAYS answer with <NOANS>\n{context}"
+//let default_context = "Answer if and ONLY if the answer is contained in the context provided. If the answer is not contained in the context provided ALWAYS answer with <NOANS>\n{context}"
+let default_context = "You are an helpful assistant for question-answering tasks.\nUse ONLY the following pieces of retrieved context to answer the question.\nIf you don't know the answer, just say that you don't know.\nIf none of the retrieved context answer the question, add this word to the end <NOANS>\n\n{context}";
 
 /**
 * ****************************************