@tiledesk/tiledesk-server 2.3.36 → 2.3.37

package/.github/workflows/docker-community-worker-push-latest.yml

@@ -0,0 +1,23 @@
+name: Docker Image Community latest CI
+
+on:	
+  push:	 
+    branches: [ master ]
+  pull_request:	
+    branches: [ master ]	
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2	     
+      name: Check out the repo
+    - uses: docker/build-push-action@v1
+      with:	    
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+        repository: tiledesk/tiledesk-server-worker
+        dockerfile: Dockerfile-jobs
+        tags: latest

package/.github/workflows/docker-image-tag-worker-community-tag-push.yml

@@ -0,0 +1,22 @@
+name: Publish Docker Community image tags
+
+on:
+  push:
+    tags:
+      - '**'           # Push events to every tag including hierarchical tags like
+jobs:
+
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+     - name: Check out the repo
+       uses: actions/checkout@v2
+     - name: Push to Docker Hub
+       uses: docker/build-push-action@v1
+       with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+        dockerfile: Dockerfile-jobs
+        repository: tiledesk/tiledesk-server-worker
+        tag_with_ref: true

package/CHANGELOG.md

@@ -4,6 +4,12 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.35) 
 
+# Untagged
+- Created a job worker for geo db, activities and email notification
+
+# 2.3.36
+- BugFix email secure with false value. https://tiledesk.discourse.group/t/error-sending-email/180
+
 # 2.3.35
 - Added user util endpoint for contact lookup from chat21
 

package/Dockerfile-jobs

@@ -0,0 +1,31 @@
+FROM node:12
+
+RUN apt-get update
+
+# Create app directory
+WORKDIR /usr/src/app
+
+ARG NPM_TOKEN
+
+RUN if [ "$NPM_TOKEN" ]; \
+    then RUN COPY .npmrc_ .npmrc \
+    else export SOMEVAR=world; \
+    fi
+
+
+# Install app dependencies
+# A wildcard is used to ensure both package.json AND package-lock.json are copied
+# where available (npm@5+)
+COPY package*.json ./
+
+RUN npm install --production
+
+RUN rm -f .npmrc
+
+# Bundle app source
+COPY . .
+
+EXPOSE 3000
+
+CMD [ "node", "jobs.js" ]
+

package/app.js

@@ -144,8 +144,18 @@ botSubscriptionNotifier.start();
 
 
 var geoService = require('./services/geoService');
-geoService.listen();
+// geoService.listen();
 
+let JobsManager = require('./jobsManager');
+
+let jobWorkerEnabled = false;
+if (process.env.JOB_WORKER_ENABLED=="true" || process.env.JOB_WORKER_ENABLED == true) {
+    jobWorkerEnabled = true;
+}
+winston.info("JobsManager jobWorkerEnabled: "+ jobWorkerEnabled);  
+
+let jobsManager = new JobsManager(jobWorkerEnabled,geoService);
+jobsManager.listen();
 
 
 
@@ -153,7 +163,7 @@ var faqBotHandler = require('./services/faqBotHandler');
 faqBotHandler.listen();
 
 var pubModulesManager = require('./pubmodules/pubModulesManager');
-pubModulesManager.init({express:express, mongoose:mongoose, passport:passport, databaseUri:databaseUri, routes:{}});
+pubModulesManager.init({express:express, mongoose:mongoose, passport:passport, databaseUri:databaseUri, routes:{}, jobsManager:jobsManager});
   
 var channelManager = require('./channels/channelManager');
 channelManager.listen(); 

package/channels/chat21/chat21Handler.js

@@ -266,7 +266,8 @@ class Chat21Handler {
                 // TODO perche nn c'è setImmedite? per performace
 
 
-                    winston.verbose("Chat21Sender on message.sending ",  message);
+                    winston.verbose("Chat21Sender on message.sending: "+  message.text);
+                    winston.debug("Chat21Sender on message.sending ",  message);
                    
                    if (message && 
                     message.status === MessageConstants.CHAT_MESSAGE_STATUS.SENDING &&
@@ -293,7 +294,8 @@ class Chat21Handler {
                        
 
 
-                        winston.verbose("Chat21Sender sending message.sending ",  message);
+                        winston.verbose("Chat21Sender sending message.sending: "+  message.text);
+                        winston.debug("Chat21Sender sending message.sending ",  message);
 
                         // chat21Util.getParsedMessage().then(function(messageData) {
                         //     message = messageData;
@@ -344,6 +346,8 @@ class Chat21Handler {
                             }    
                             */   
                          
+                            // performance console log
+                            // console.log("************* send message chat21: "+new Date().toISOString(), message.text );
 
                            return  chat21.messages.sendToGroup(message.senderFullname,     message.recipient, 
                                 recipient_fullname, message.text, message.sender, attributes, message.type, message.metadata, timestamp)
@@ -352,6 +356,10 @@ class Chat21Handler {
                                     
 
                                             // chat21.conversations.stopTyping(message.recipient,message.sender);
+                                            
+                                            
+                                            // performance console log
+                                            // console.log("************* senttt message chat21: "+new Date().toISOString(), message.text );
 
                                             chat21Event.emit('message.sent', data);
     
@@ -379,6 +387,7 @@ class Chat21Handler {
 
                             chat21.auth.setAdminToken(adminToken);
 
+                            winston.debug("Chat21Sender");
                             // send: function(sender_fullname, recipient_id, recipient_fullname, text, sender_id, attributes, type, metadata){
                            return  chat21.messages.send(message.senderFullname,     message.recipient, 
                             message.recipientFullname, message.text, message.sender, message.attributes, message.type, message.metadata)
@@ -584,10 +593,17 @@ class Chat21Handler {
                         if (request.subject) {
                             group_name = request.subject;
                         }
+                        
+                        // performance console log
+                        // console.log("************* before request.support_group.created: "+new Date().toISOString());
 
                         //TODO racecondition?
                         return chat21.groups.create(group_name, members, gAttributes, groupId).then(function(data) {
-                                winston.verbose("Chat21 group created: " + JSON.stringify(data));      
+                                winston.verbose("Chat21 group created: " + JSON.stringify(data));     
+
+                                // performance console log
+                                // console.log("************* after request.support_group.created: "+new Date().toISOString()); 
+
                                 requestEvent.emit('request.support_group.created', request);
 
                                 chat21Event.emit('group.create', data);      

package/jobs.js

@@ -0,0 +1,80 @@
+
+var dotenvPath = undefined;
+
+if (process.env.DOTENV_PATH) {
+  dotenvPath = process.env.DOTENV_PATH;
+  console.log("load dotenv form DOTENV_PATH", dotenvPath);
+}
+
+if (process.env.LOAD_DOTENV_SUBFOLDER ) {
+  console.log("load dotenv form LOAD_DOTENV_SUBFOLDER");
+  dotenvPath = __dirname+'/confenv/.env';
+}
+
+require('dotenv').config({ path: dotenvPath});
+
+
+var mongoose = require('mongoose');
+
+let winston = require('./config/winston');
+let JobsManager = require('./JobsManager');
+
+
+let geoService = require('./services/geoService');
+var config = require('./config/database');
+
+
+//override JOB_WORKER_ENABLED to false when you start jobs.js
+process.env.JOB_WORKER_ENABLED=false
+
+var databaseUri = process.env.DATABASE_URI || process.env.MONGODB_URI || config.database;
+var autoIndex = true;
+
+if (!databaseUri) { //TODO??
+  winston.warn('DATABASE_URI not specified, falling back to localhost.');
+}
+
+var connection = mongoose.connect(databaseUri, { "useNewUrlParser": true, "autoIndex": autoIndex }, function(err) {
+  if (err) { 
+    winston.error('Failed to connect to MongoDB on ' + databaseUri + " ", err);
+    process.exit(1);
+  }
+});
+
+// winston.info("mongoose.connection",mongoose.connection);
+// module.exports = jobsManager;
+
+
+
+async function main()
+{
+
+    require('./pubmodules/queue');     
+    // require('@tiledesk-ent/tiledesk-server-queue');     
+
+    let jobsManager = new JobsManager(undefined, geoService);
+
+    jobsManager.listen();
+
+
+    let emailNotification = require('./pubmodules/emailNotification');
+    jobsManager.listenEmailNotification(emailNotification);
+
+   
+    let activityArchiver = require('./pubmodules/activities').activityArchiver;    
+    jobsManager.listenActivityArchiver(activityArchiver);
+
+    winston.info("Jobs started"); 
+
+    await new Promise(function () {});
+    console.log('This text will never be printed');
+}
+
+function panic(error)
+{
+    console.error(error);
+    process.exit(1);
+}
+
+// https://stackoverflow.com/a/46916601/1478566
+main().catch(panic).finally(clearInterval.bind(null, setInterval(a=>a, 1E9)));

package/jobsManager.js

@@ -0,0 +1,47 @@
+
+var winston = require('./config/winston');
+
+class JobsManager {
+    constructor(jobWorkerEnabled, geoService) {
+        this.geoService = geoService;
+        this.emailNotificatio = undefined;
+        this.activityArchiver = undefined;
+
+        this.jobWorkerEnabled = jobWorkerEnabled;
+        // this.jobWorkerEnabled = false;
+        // if (process.env.JOB_WORKER_ENABLED=="true" || process.env.JOB_WORKER_ENABLED == true) {
+        //     this.jobWorkerEnabled = true;
+        // }
+        // winston.info("JobsManager jobWorkerEnabled: "+ this.jobWorkerEnabled);  
+    }
+
+
+    listen() {      
+        winston.info("JobsManager listener started");  
+        if ( this.jobWorkerEnabled == true) {
+           return winston.info("JobsManager jobWorkerEnabled is enabled. Skipping listeners");  
+        }
+        this.geoService.listen();
+    }
+
+    listenEmailNotification(emailNotification) {      
+        winston.info("JobsManager listenEmailNotification started");  
+        if ( this.jobWorkerEnabled == true) {
+            return winston.info("JobsManager jobWorkerEnabled is enabled. Skipping listener for Email Notification");  
+        }
+        this.emailNotification = emailNotification;
+        this.emailNotification.requestNotification.listen();
+    }
+
+    listenActivityArchiver(activityArchiver) {
+        winston.info("JobsManager listenActivityArchiver started"); 
+        if ( this.jobWorkerEnabled == true) {
+            return winston.info("JobsManager jobWorkerEnabled is enabled. Skipping listener for Activity Archiver");  
+        } 
+        this.activityArchiver = activityArchiver;
+        this.activityArchiver.listen();
+    }
+}
+
+
+module.exports = JobsManager;

package/models/faq.js

@@ -29,7 +29,7 @@ var FaqSchema = new Schema({
   },
   question: {
     type: String,
-    required: true 
+    required: false
   },
 
   webhook_enabled: { //usa questo
@@ -83,6 +83,10 @@ var FaqSchema = new Schema({
   createdBy: {
     type: String,
     required: true
+  },
+  form: {
+    type: Object,
+    required: false
   }
 },{
   timestamps: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.36",
+  "version": "2.3.37",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",