npm - @tiledesk/tiledesk-server - Versions diffs - 2.3.71 → 2.3.72 - Mend

@tiledesk/tiledesk-server 2.3.71 → 2.3.72

Files changed (8) hide show

package/package.json +3 -3
package/pubmodules/apps/listener.js +1 -0
package/pubmodules/kaleyra/index.js +6 -0
package/pubmodules/kaleyra/listener.js +32 -0
package/pubmodules/pubModulesManager.js +23 -1
package/docker-compose.yml +0 -166
package/version +0 -69
package/versions +0 -69

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.71",
+  "version": "2.3.72",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -36,8 +36,9 @@
     "@tiledesk-ent/tiledesk-server-enterprise": "^1.0.0"
   },
   "dependencies": {
-    "@tiledesk/tiledesk-apps": "^1.0.9",
+    "@tiledesk/tiledesk-apps": "^1.0.12",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.19",
+    "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.6",
     "@tiledesk/tiledesk-chat21-app": "^1.1.7",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
@@ -76,7 +77,6 @@
     "moment": "^2.29.3",
     "moment-timezone": "^0.5.33",
     "mongoose": "^5.13.14",
-    "mongoose-auto-increment": "^5.0.1",
     "mongoose-sequence": "^5.3.1",
     "morgan": "^1.10.0",
     "multer": "^1.4.4",

package/pubmodules/apps/listener.js CHANGED Viewed

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

package/pubmodules/kaleyra/index.js ADDED Viewed

@@ -0,0 +1,6 @@
+const listener = require('./listener');
+const kaleyra = require('@tiledesk/tiledesk-kaleyra-proxy');
+const kaleyraRoute = kaleyra.router;
+module.exports = { listener: listener, kaleyraRoute: kaleyraRoute }

package/pubmodules/kaleyra/listener.js ADDED Viewed

@@ -0,0 +1,32 @@
+const kaleyra = require("@tiledesk/tiledesk-kaleyra-proxy");
+var winston = require('../../config/winston');
+var configGlobal = require('../../config/global');
+const apiUrl = process.env.API_URL || configGlobal.apiUrl;
+winston.info("Kaleyra apiUrl: " + apiUrl);
+class Listener {
+    listen(config) {
+        winston.info("Kaleyra Listener listen");
+        if (config.databaseUri) {
+            winston.debug("kaleyra config databaseUri: " + config.databaseUri);
+        }
+        kaleyra.startApp({
+            MONGODB_URL: config.databaseUri,
+            API_URL: apiUrl,
+            BASE_URL: apiUrl + "/modules/kaleyra",
+            APPS_API_URL: apiUrl + "/modules/apps",
+            KALEYRA_API_URL: process.env.KALEYRA_API_URL,
+            API_KEY: process.env.API_KEY,
+            log: process.env.KALEYRA_LOG
+        }, () => {
+            winston.info("Tiledesk Kaleyra proxy server succesfully started.");
+        })
+    }
+}
+var listener = new Listener();
+module.exports = listener;

package/pubmodules/pubModulesManager.js CHANGED Viewed

@@ -27,6 +27,9 @@ class PubModulesManager {
         this.whatsapp = undefined;
         this.whatsappRoute = undefined;
+        this.kaleyra = undefined;
+        this.kaleyraRoute = undefined;
         this.activityArchiver = undefined;
         this.activityRoute = undefined;
@@ -67,11 +70,15 @@ class PubModulesManager {
             app.use('/modules/whatsapp', this.whatsappRoute);
             winston.info("ModulesManager whatsappRoute controller loaded");
         }
+        if (this.kaleyraRoute) {
+            app.use('/modules/kaleyra', this.kaleyraRoute);
+            winston.info("ModulesManager kaleyraRoute controller loaded");
+        }
         if (this.tilebotRoute) {
             app.use('/modules/tilebot', this.tilebotRoute);
             winston.info("ModulesManager tilebot controller loaded");
         }
         if (this.dialogFlow) {
             app.use("/modules/dialogFlow", this.dialogFlow.dialogflowRoute);
             winston.info("ModulesManager dialogFlow controller loaded");
@@ -263,6 +270,21 @@ class PubModulesManager {
             }
         }
+        try {
+            this.kaleyra = require('./kaleyra');
+            winston.debug("this.kaleyra: " + this.kaleyra);
+            this.kaleyra.listener.listen(config);
+            this.kaleyraRoute = this.kaleyra.kaleyraRoute;
+            winston.info("PubModulesManager initialized apps.");
+        } 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.activityArchiver = require('./activities').activityArchiver;

package/docker-compose.yml DELETED Viewed

@@ -1,166 +0,0 @@
-version: "3.7"
-# networks:
-#    backend:
-#    frontend:
-volumes:
-   tiledesk-datadb:
-   chat21-cf:
-   tiledesk-server-config2:
-services:
-  dashboard:
-   image: tiledesk/tiledesk-dashboard
-   container_name: tiledesk-dashboard
-   #required for old docker version
-   env_file:
-      - .env
-   environment:
-      - FEATURES_TOKEN=PAY:F-ANA:F-ACT:F-TRI:F-GRO:F-DEP:F-OPH:F-MTL:F-DGF:F-NAT:T
-      - SERVER_BASE_URL=/api/
-      - CHAT_BASE_URL=/chat/
-      - WS_URL
-      - WS_URL_RELATIVE=/ws/
-      - WIDGET_LOCATION=/widget/launch.js
-      - WIDGET_TEST_LOCATION=/widget/assets/twp/index.html
-      - FIREBASE_APIKEY
-      - FIREBASE_AUTHDOMAIN
-      - FIREBASE_DATABASEURL
-      - FIREBASE_PROJECT_ID
-      - FIREBASE_STORAGEBUCKET
-      - FIREBASE_MESSAGINGSENDERID
-   ports:
-      - "4500:80" #use expose if you want to block external access
-  #  networks:
-  #        frontend:
-  #           aliases:
-  #               - dashboard
-  webwidget:
-   image: chat21/chat21-web-widget:latest
-   container_name: chat21-web-widget
-   ports:
-      - "4200:80" # specify port forewarding
-   env_file:
-      - .env
-   environment:
-      - FIREBASE_APIKEY
-      - FIREBASE_AUTHDOMAIN
-      - FIREBASE_DATABASEURL
-      - FIREBASE_PROJECT_ID
-      - FIREBASE_STORAGEBUCKET
-      - FIREBASE_MESSAGINGSENDERID
-      - API_URL=/api/
-   #links:
-    # - proxy
-  #  networks:
-  #       frontend:
-  #           aliases:
-  #               - web-widget
-  ionic:
-   image: chat21/chat21-ionic
-   container_name: chat21-ionic
-   ports:
-      - "8080:80" #use expose if you want to block external access
-   env_file:
-      - .env
-   environment:
-      - DASHBOARD_URL=/dashboard/
-      - CHAT_SEND_BY_EMAIL_LINK=mailto:?subject=Transcript Chat Conversation&body=Hi,%0D%0A%0D%0Ahere the transcript:%0D%0A%0D%0Ahttps://api.tiledesk.com/v1/public/requests/
-      - FIREBASESTORAGE_BASE_URL_IMAGE=https://firebasestorage.googleapis.com/v0/b/
-      - SERVER_BASE_URL=/api/
-      - FIREBASE_APIKEY
-      - FIREBASE_AUTHDOMAIN
-      - FIREBASE_DATABASEURL
-      - FIREBASE_PROJECT_ID
-      - FIREBASE_STORAGEBUCKET
-      - FIREBASE_MESSAGINGSENDERID
-      - FIREBASE_APP_ID
-  #  networks:
-  #     frontend:
-  #           aliases:
-  #               - ionic
-  proxy:
-    image: tiledesk/tiledesk-docker-proxy
-    container_name: tiledesk-docker-proxy
-    #image: nginx
-    #container_name: proxy
-    #volumes:
-     # - ./nginx-proxy.conf:/etc/nginx/nginx.conf:ro
-    ports:
-      - "80:80" # specify port forewarding
-    depends_on:
-      - server
-      - dashboard
-      - webwidget
-    # networks:
-    #     frontend:
-    #         aliases:
-    #             - proxy
-    #     backend:
-    command: [nginx-debug, '-g', 'daemon off;']
-  cloud-functions:
-   image: chat21/chat21-cloud-functions
-   container_name: chat21-cloud-functions
-   volumes:
-     - chat21-cf:/home #persist firebase login
-   ports:
-     - "9005:9005" # specify port forewarding
-     - "5000:5000"
-  server:
-    image: tiledesk/tiledesk-server
-    container_name: tiledesk-server
-    restart: always
-    # networks:
-    #       backend:
-    #         aliases:
-    #             - server
-    volumes:
-        #  - type: bind
-        #    source: ./
-        #    target: /usr/src/app/
-        - tiledesk-server-config2:/usr/src/app/confenv
-      # - ./:/usr/src/app/
-    #required for old docker version
-    env_file:
-      - .env
-    environment:
-      - FIREBASE_PRIVATE_KEY
-      - FIREBASE_CONFIG_FILE
-      - FIREBASE_CLIENT_EMAIL
-      - FIREBASE_PROJECT_ID
-      - CHAT21_ENABLED
-      - CHAT21_ENGINE
-      - CHAT21_URL
-      - CHAT21_APPID
-      - CHAT21_ADMIN_TOKEN
-      - MONGODB_URI=mongodb://mongo/tiledesk
-      #- LOAD_DOTENV_SUBFOLDER=true
-#    build: .
-    depends_on:
-      - mongo
-    ports:
-      - "3000:3000"
-  mongo:
-    container_name: mongo
-    image: mongo
-    command: --bind_ip_all
-    volumes:
-      - tiledesk-datadb:/data/db
-    # networks:
-    #       backend:
-    #         aliases:
-    #             - mongo
-      ### Uncoment below if you want to map mongodb port
-      #ports:
-      #   - "27017:27017"
-  ngrok:
-    container_name: ngrok
-    image: wernight/ngrok
-    command: ngrok http server:3000
-    # networks:
-    #       backend:
-    #         aliases:
-    #             - ngrok
-    ports:
-     -  '4040:4040'

package/version DELETED Viewed

@@ -1,69 +0,0 @@
-{ name: '@tiledesk/tiledesk-api-nodejs',
-  'dist-tags': { latest: '1.0.0' },
-  versions: [ '1.0.0' ],
-  time:
-   { created: '2018-10-31T09:51:43.036Z',
-     '1.0.0': '2018-10-31T09:51:43.402Z',
-     modified: '2018-11-09T17:14:52.755Z' },
-  maintainers:
-   [ 'andrealeo83 <andrealeo@libero.it>',
-     'andrealeo83f21 <andrea.leo@frontiere21.it>' ],
-  description: '* Nodejs and npm installed  * MongoDB installed and running on localhost',
-  homepage: 'https://www.tiledesk.com',
-  repository:
-   { type: 'git',
-     url: 'git+https://github.com/Tiledesk/tiledesk-api-nodejs.git' },
-  author: 'Andrea Leo - Frontiere21 SRL',
-  bugs: { url: 'https://github.com/Tiledesk/tiledesk-api-nodejs/issues' },
-  license: 'AGPL-3.0',
-  readmeFilename: 'README.md',
-  version: '1.0.0',
-  scripts: { start: 'node ./bin/www', test: 'mocha' },
-  dependencies:
-   { '@chat21/chat21-node-sdk': '^1.0.5',
-     'bcrypt-nodejs': '0.0.3',
-     'body-parser': '^1.16.1',
-     'chai-http': '^4.2.0',
-     'cookie-parser': '~1.4.3',
-     cors: '^2.8.4',
-     debug: '~2.6.0',
-     'email-templates': '^3.6.0',
-     express: '~4.14.1',
-     'express-session': '^1.15.2',
-     'fast-csv': '^2.4.1',
-     'firebase-admin': '^5.10.0',
-     'get-timezone-offset': '^1.0.3',
-     jade: '~1.11.0',
-     jsonwebtoken: '^7.3.0',
-     moment: '^2.22.2',
-     'moment-timezone': '^0.5.21',
-     mongoose: '^4.9.3',
-     morgan: '^1.7.0',
-     multer: '^1.3.0',
-     'node-rsa': '^1.0.1',
-     nodemailer: '^4.6.4',
-     passport: '^0.3.2',
-     'passport-http': '^0.3.0',
-     'passport-jwt': '^2.2.1',
-     request: '^2.85.0',
-     'request-promise': '^4.2.2',
-     'serve-favicon': '~2.3.2',
-     uniqid: '^5.0.3',
-     uuid: '^3.3.2' },
-  devDependencies:
-   { chai: '^4.1.2',
-     mocha: '^5.0.0',
-     nodemon: '^1.14.11',
-     sinon: '^4.2.2',
-     'sinon-mongoose': '^2.0.2' },
-  gitHead: '4b13a47e8083a322c911ad11d80a8d596cd856b7',
-  dist:
-   { shasum: 'fb7993e4b636088cf3b674252eeeb5e9f2de095b',
-     tarball: 'https://registry.npmjs.org/@tiledesk/tiledesk-api-nodejs/-/tiledesk-api-nodejs-1.0.0.tgz',
-     integrity: 'sha512-PJOzx3ZMeivSprYQqcKY+gzUlzMK5vLOyzn/zxd/vh5ln4zQf/4WtLO2JOsis5vtblc+zhkixjlE0Db6sfYAJw==',
-     fileCount: 79,
-     unpackedSize: 580713,
-     'npm-signature': '-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJb2XsvCRA9TVsSAnZWagAAHOYP/0dq/D+a7qAXTB3wDMpQ\nmG1awmlbzK2ltTyf0v3LbIJDxXu49VYcmAxQC2vXp0dXMmXukoE9AoYPVj9Q\nxMnGgMq35tKhQrDmIaJ/cRqpEuunxFgP7nQxow4Aikb8eukuU4A+Z+SPTnY6\n5TfPsR5JTW9MSEUUri2XWM6FUrKL0tyuG1ySmuzTqcpvcASOTzcDy8T8Ijna\naJkvwuWZzub5mlucGZM1ZFSk3wdETSuk/g43kzWtB82M94nt3z5ugIQ7yyhA\ntD/962vMMMFu2bLhF/380zERy+kEeeJrPqRGgPjjY8UJ5+aiZTAzIapX76W+\nCDYFmd4LE/9o3WUw9fcJ6TDQJTbyn+YpOZ3SjyVyzfxjQ8x9Kvh73zjhBFfh\nVt5uDrEQj+PfrG5Kux/8jpJZoJU5oX3VHLFD2vrFAutRP81EpHlS4na+QoN8\nPMZiMqOr6drVM8DA8K0LhzcnLIPUG6sC5ksf0kFNdYSQKgYSKW0Ofu19GQDX\nnPQecWB4q7ZS8iejqenY/CyDk3SLhFl1TuA29HbmUIPlMFPjHlPJs2RmmyDc\nN1mO5/7IUutD5/gO7zWku4AseBskxl0gooJFWAE66vakeCQNtbI3KZU8DS1q\nyj232V0UHgfruKuGBjsgI4i9eiHlhBcVtxB1Gu8DPW6Sj+NY9SfLRFYbWK+j\nEnzh\r\n=hwNo\r\n-----END PGP SIGNATURE-----\r\n' },
-  directories: {} }

package/versions DELETED Viewed

@@ -1,69 +0,0 @@
-{ name: '@tiledesk/tiledesk-api-nodejs',
-  'dist-tags': { latest: '1.0.0' },
-  versions: [ '1.0.0' ],
-  time:
-   { created: '2018-10-31T09:51:43.036Z',
-     '1.0.0': '2018-10-31T09:51:43.402Z',
-     modified: '2018-11-09T17:14:52.755Z' },
-  maintainers:
-   [ 'andrealeo83 <andrealeo@libero.it>',
-     'andrealeo83f21 <andrea.leo@frontiere21.it>' ],
-  description: '* Nodejs and npm installed  * MongoDB installed and running on localhost',
-  homepage: 'https://www.tiledesk.com',
-  repository:
-   { type: 'git',
-     url: 'git+https://github.com/Tiledesk/tiledesk-api-nodejs.git' },
-  author: 'Andrea Leo - Frontiere21 SRL',
-  bugs: { url: 'https://github.com/Tiledesk/tiledesk-api-nodejs/issues' },
-  license: 'AGPL-3.0',
-  readmeFilename: 'README.md',
-  version: '1.0.0',
-  scripts: { start: 'node ./bin/www', test: 'mocha' },
-  dependencies:
-   { '@chat21/chat21-node-sdk': '^1.0.5',
-     'bcrypt-nodejs': '0.0.3',
-     'body-parser': '^1.16.1',
-     'chai-http': '^4.2.0',
-     'cookie-parser': '~1.4.3',
-     cors: '^2.8.4',
-     debug: '~2.6.0',
-     'email-templates': '^3.6.0',
-     express: '~4.14.1',
-     'express-session': '^1.15.2',
-     'fast-csv': '^2.4.1',
-     'firebase-admin': '^5.10.0',
-     'get-timezone-offset': '^1.0.3',
-     jade: '~1.11.0',
-     jsonwebtoken: '^7.3.0',
-     moment: '^2.22.2',
-     'moment-timezone': '^0.5.21',
-     mongoose: '^4.9.3',
-     morgan: '^1.7.0',
-     multer: '^1.3.0',
-     'node-rsa': '^1.0.1',
-     nodemailer: '^4.6.4',
-     passport: '^0.3.2',
-     'passport-http': '^0.3.0',
-     'passport-jwt': '^2.2.1',
-     request: '^2.85.0',
-     'request-promise': '^4.2.2',
-     'serve-favicon': '~2.3.2',
-     uniqid: '^5.0.3',
-     uuid: '^3.3.2' },
-  devDependencies:
-   { chai: '^4.1.2',
-     mocha: '^5.0.0',
-     nodemon: '^1.14.11',
-     sinon: '^4.2.2',
-     'sinon-mongoose': '^2.0.2' },
-  gitHead: '4b13a47e8083a322c911ad11d80a8d596cd856b7',
-  dist:
-   { shasum: 'fb7993e4b636088cf3b674252eeeb5e9f2de095b',
-     tarball: 'https://registry.npmjs.org/@tiledesk/tiledesk-api-nodejs/-/tiledesk-api-nodejs-1.0.0.tgz',
-     integrity: 'sha512-PJOzx3ZMeivSprYQqcKY+gzUlzMK5vLOyzn/zxd/vh5ln4zQf/4WtLO2JOsis5vtblc+zhkixjlE0Db6sfYAJw==',
-     fileCount: 79,
-     unpackedSize: 580713,
-     'npm-signature': '-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJb2XsvCRA9TVsSAnZWagAAHOYP/0dq/D+a7qAXTB3wDMpQ\nmG1awmlbzK2ltTyf0v3LbIJDxXu49VYcmAxQC2vXp0dXMmXukoE9AoYPVj9Q\nxMnGgMq35tKhQrDmIaJ/cRqpEuunxFgP7nQxow4Aikb8eukuU4A+Z+SPTnY6\n5TfPsR5JTW9MSEUUri2XWM6FUrKL0tyuG1ySmuzTqcpvcASOTzcDy8T8Ijna\naJkvwuWZzub5mlucGZM1ZFSk3wdETSuk/g43kzWtB82M94nt3z5ugIQ7yyhA\ntD/962vMMMFu2bLhF/380zERy+kEeeJrPqRGgPjjY8UJ5+aiZTAzIapX76W+\nCDYFmd4LE/9o3WUw9fcJ6TDQJTbyn+YpOZ3SjyVyzfxjQ8x9Kvh73zjhBFfh\nVt5uDrEQj+PfrG5Kux/8jpJZoJU5oX3VHLFD2vrFAutRP81EpHlS4na+QoN8\nPMZiMqOr6drVM8DA8K0LhzcnLIPUG6sC5ksf0kFNdYSQKgYSKW0Ofu19GQDX\nnPQecWB4q7ZS8iejqenY/CyDk3SLhFl1TuA29HbmUIPlMFPjHlPJs2RmmyDc\nN1mO5/7IUutD5/gO7zWku4AseBskxl0gooJFWAE66vakeCQNtbI3KZU8DS1q\nyj232V0UHgfruKuGBjsgI4i9eiHlhBcVtxB1Gu8DPW6Sj+NY9SfLRFYbWK+j\nEnzh\r\n=hwNo\r\n-----END PGP SIGNATURE-----\r\n' },
-  directories: {} }