diff --git a/.env.example b/.env.example deleted file mode 100644 index beb1bb7..0000000 --- a/.env.example +++ /dev/null @@ -1,13 +0,0 @@ -######DATABASE: none, mysql, dialogflow - -DEFAULT_MESSAGE=true -SAVE_MEDIA=true -PORT=3000 -DATABASE=none -LANGUAGE=es -SQL_HOST= -SQL_USER= -SQL_PASS= -SQL_DATABASE= -KEEP_DIALOG_FLOW=false -MULTI_DEVICE=true \ No newline at end of file diff --git a/.fleet/settings.json b/.fleet/settings.json deleted file mode 100644 index e69de29..0000000 diff --git a/.gitignore b/.gitignore index f9ca563..079bd6a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,6 @@ config.json coverage/ *.lcov lib -tmp/ \ No newline at end of file +tmp/ +.fleet/ +example-app/ \ No newline at end of file diff --git a/README.md b/README.md index 455d71e..d6dea6d 100644 --- a/README.md +++ b/README.md @@ -1,155 +1,10 @@ -## Chatbot Whatsapp (OpenSource) -#### Actualizado Abril 2022 +Estamos mejorando esto para llevarlo a un siguiente nivel! -El siguiente proyecto se realizó con fines educativos para el canal de [Youtube (Leifer Mendez)](https://www.youtube.com/channel/UCgrIGp5QAnC0J8LfNJxDRDw?sub_confirmation=1) donde aprendemos a crear y implementar un chatbot increíble usando [node.js](https://codigoencasa.com/tag/nodejs/) además le agregamos inteligencia artificial gracias al servicio de __dialogflow__. +**Comunidad** -[![Video](https://i.giphy.com/media/OBDi3CXC83WkNeLEZP/giphy.webp)](https://youtu.be/5lEMCeWEJ8o) +> Forma parte de este proyecto. -### ATENCION 🔴 -> 💥💥 Si te aparece el Error Multi-device es porque tienes la cuenta de whatsapp afiliada al modo "BETA de Multi dispositivo" por el momento no se tiene soporte para esas personas si tu quieres hacer uso de este __BOT__ debes de salir del modo BETA y intentarlo de la manera tradicional - -> El core de whatsapp esta en constante actualizaciones por lo cual siempre revisa la ultima fecha de la actualizacion -> [VER](https://github.com/leifermendez/bot-whatsapp/commits/main) - -### Busco colaboradores ⭐ -Hola amigos me gusta mucho este proyecto pero por cuestiones de tiempo se me dificulta mantener las actualizaciones si alguno quieres participar en el proyecto escribeme a leifer.contacto@gmail.com - -#### Acceso rápido -> Si tienes una cuenta en __heroku__ puedes desplegar este proyecto con (1 click) - -[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/leifermendez/bot-whatsapp) - -> Comprarme un cafe! - -[![Comprar](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/leifermendez) - -#### Actualización - -| Feature | Status | -| ------------- | ------------- | -| Dialogflow | ✅ | -| MySQL | ✅ | -| JSON File | ✅ | -| QR Scan (route) | ✅ | -| Easy deploy heroku | ✅ | -| Buttons | ✅ℹ️ (No funciona en multi-device)| -| Send Voice Note | ✅ | -| Add support ubuntu/linux | ✅ | - -## Requisitos -- node v14 o superior -- VSCode (Editor de codigo) [Descargar](https://code.visualstudio.com/download) -- MySql (opcional) solo aplica si vas a usar el modo 'mysql' [sql-bot.sql migración](https://github.com/leifermendez/bot-whatsapp/blob/main/sql-bot.sql) -- Dialogflow (opcional) solo aplica si vas a usar el modo 'dialogflow' - -### (Nuevo) Botones - -[![btn](https://i.imgur.com/W7oYlSu.png)](https://youtu.be/5lEMCeWEJ8o) - -> Implementar los botones solo necesitas hacer uso del metodo __sendMessageButton__ que se encuentra dentro `./controllers/send` dejo un ejemplo de como usarlo. -[Ver implementación](https://github.com/leifermendez/bot-whatsapp/blob/main/app.js#L123) - -``` javascript -const { sendMessageButton } = require('./controllers/send') - -await sendMessageButton( - { - "title":"¿Que te interesa ver?", - "message":"Recuerda todo este contenido es gratis y estaria genial que me siguas!", - "footer":"Gracias", - "buttons":[ - {"body":"😎 Cursos"}, - {"body":"👉 Youtube"}, - {"body":"😁 Telegram"} - ] - } -) - -``` - -## Notas de Voz -[![voice note](https://i.imgur.com/zq6xYDp.png)](https://i.imgur.com/zq6xYDp.png) - -> Se pueden enviar notas de voz con formato nativo para que no se vea como reenviado. En este ejemplo enviare el archivo __PTT-20220223-WA0000.opus__ que se encuentra dentro de la carpeta de __/mediaSend__ - -``` javascript -const { sendMediaVoiceNote } = require('./controllers/send') - -await sendMediaVoiceNote(client, from, 'PTT-20220223-WA0000.opus') - -``` - -## Instruciones -__Descargar o Clonar repositorio__ -![](https://i.imgur.com/dSpUbFz.png) - -__Usas ¿Ubuntu / Linux?__ -> Asegurate de instalar los siguientes paquetes -``` -sudo apt-get install -y libgbm-dev -sudo apt install -y gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget -``` - -__Instalar dependencias (npm install)__ -> Ubicate en le directorio que descargaste y via consola o terminal ejecuta el siguiente comando - -`npm install` - -![](https://i.imgur.com/BJuMjGR.png) - -__Configurar .env__ -> Con el editor de texto crea un archivo `.env` el cual debes de guiarte del archivo `.env.example` -[Ver video explicando](https://youtu.be/5lEMCeWEJ8o?t=381) -``` -######DATABASE: none, mysql, dialogflow - -DEFAULT_MESSAGE=true -SAVE_MEDIA=true -PORT=3000 -DATABASE=none -LANGUAGE=es -SQL_HOST= -SQL_USER= -SQL_PASS= -SQL_DATABASE= -``` - -![](https://i.imgur.com/9poNnW0.png) - -__Ejecutar el script__ -> Ubicate en le directorio que descargaste y via consola o terminal ejecuta el siguiente comando -`npm run start` - -![](https://i.imgur.com/eMkBkuJ.png) - -__Whatsapp en tu celular__ -> Ahora abre la aplicación de Whatsapp en tu dispositivo y escanea el código QR - -Visitar la pagina -`http://localhost:3000/qr` - -![](https://i.imgur.com/Q3JEDlP.png) - -__Listo 😎__ -> Cuando sale este mensaje tu BOT está __listo__ para trabajar! -![](https://i.imgur.com/eoJ4Ruk.png) - -# ¿Quieres ver como se creó? 🤖 -- [Ver Video 1](https://www.youtube.com/watch?v=A_Xu0OR_HkE) -- [¿Como instalarlo? (Actulización)](https://youtu.be/5lEMCeWEJ8o) - -## ¿Como usarlo el chatbot de whatsapp? -> Escribe un mensaje al whatsapp que vinculaste con tu BOT - -![](https://i.imgur.com/OSUgljQ.png) - -> Ahora deberías obtener un arespuesta por parte del BOT como la siguiente, ademas de esto tambien se crea un archivo excel -con el historial de conversación con el número de tu cliente - -![](https://i.imgur.com/lrMLgR8.png) -![](https://i.imgur.com/UYcoUSV.png) - -## Preguntar al BOT -> Puedes interactuar con el bot ejemplo escribele __hola__ y el bot debe responderte! - -![](https://i.imgur.com/cNAS51I.png) +- [Discord](https://link.codigoencasa.com/DISCORD) +- [Twitter](https://twitter.com/leifermendez) +- [Youtube](https://www.youtube.com/watch?v=5lEMCeWEJ8o&list=PL_WGMLcL4jzWPhdhcUyhbFU6bC0oJd2BR) +- [Telegram](https://t.me/leifermendez) diff --git a/adapter/diaglogflow.js b/adapter/diaglogflow.js deleted file mode 100644 index c80b034..0000000 --- a/adapter/diaglogflow.js +++ /dev/null @@ -1,77 +0,0 @@ -const dialogflow = require('@google-cloud/dialogflow'); -const fs = require('fs') -const crypto = require('crypto'); -/** - * Debes de tener tu archivo con el nombre "chatbot-account.json" en la raíz del proyecto - */ - -const KEEP_DIALOG_FLOW = (process.env.KEEP_DIALOG_FLOW === 'true') -let PROJECID; -let CONFIGURATION; -let sessionClient; - -const checkFileCredentials = () => { - if(!fs.existsSync(`${__dirname}/../chatbot-account.json`)){ - return false - } - - const parseCredentials = JSON.parse(fs.readFileSync(`${__dirname}/../chatbot-account.json`)); - PROJECID = parseCredentials.project_id; - CONFIGURATION = { - credentials: { - private_key: parseCredentials['private_key'], - client_email: parseCredentials['client_email'] - } - } - sessionClient = new dialogflow.SessionsClient(CONFIGURATION); -} - -// Create a new session - - -// Detect intent method -const detectIntent = async (queryText) => { - let media = null; - const sessionId = KEEP_DIALOG_FLOW ? 1 : crypto.randomUUID(); - const sessionPath = sessionClient.projectAgentSessionPath(PROJECID, sessionId); - const languageCode = process.env.LANGUAGE - const request = { - session: sessionPath, - queryInput: { - text: { - text: queryText, - languageCode: languageCode, - }, - }, - }; - - const responses = await sessionClient.detectIntent(request); - const [singleResponse] = responses; - const { queryResult } = singleResponse - const { intent } = queryResult || { intent: {} } - const parseIntent = intent['displayName'] || null - const parsePayload = queryResult['fulfillmentMessages'].find((a) => a.message === 'payload'); - // console.log(singleResponse) - if (parsePayload && parsePayload.payload) { - const { fields } = parsePayload.payload - media = fields.media.stringValue || null - } - const customPayload = parsePayload['payload'] - - const parseData = { - replyMessage: queryResult.fulfillmentText, - media, - trigger: null - } - return parseData -} - -const getDataIa = (message = '', cb = () => { }) => { - detectIntent(message).then((res) => { - cb(res) - }) -} - -checkFileCredentials(); - -module.exports = { getDataIa } diff --git a/adapter/index.js b/adapter/index.js deleted file mode 100644 index 6f06561..0000000 --- a/adapter/index.js +++ /dev/null @@ -1,90 +0,0 @@ -const { getData, getReply, saveMessageMysql } = require('./mysql') -const { saveMessageJson } = require('./jsonDb') -const { getDataIa } = require('./diaglogflow') -const stepsInitial = require('../flow/initial.json') -const stepsReponse = require('../flow/response.json') - -const get = (message) => new Promise((resolve, reject) => { - /** - * Si no estas usando un gesto de base de datos - */ - - if (process.env.DATABASE === 'none') { - const { key } = stepsInitial.find(k => k.keywords.includes(message)) || { key: null } - const response = key || null - resolve(response) - } - /** - * Si usas MYSQL - */ - if (process.env.DATABASE === 'mysql') { - getData(message, (dt) => { - resolve(dt) - }); - } - -}) - - -const reply = (step) => new Promise((resolve, reject) => { - /** - * Si no estas usando un gesto de base de datos - */ - if (process.env.DATABASE === 'none') { - let resData = { replyMessage: '', media: null, trigger: null } - const responseFind = stepsReponse[step] || {}; - resData = { - ...resData, - ...responseFind, - replyMessage:responseFind.replyMessage.join('')} - resolve(resData); - return - } - /** - * Si usas MYSQL - */ - if (process.env.DATABASE === 'mysql') { - let resData = { replyMessage: '', media: null, trigger: null } - getReply(step, (dt) => { - resData = { ...resData, ...dt } - resolve(resData) - }); - } -}) - -const getIA = (message) => new Promise((resolve, reject) => { - /** - * Si usas dialogflow - */ - if (process.env.DATABASE === 'dialogflow') { - let resData = { replyMessage: '', media: null, trigger: null } - getDataIa(message,(dt) => { - resData = { ...resData, ...dt } - resolve(resData) - }) - } -}) - -/** - * - * @param {*} message - * @param {*} date - * @param {*} trigger - * @param {*} number - * @returns - */ -const saveMessage = ( message, trigger, number ) => new Promise( async (resolve, reject) => { - switch ( process.env.DATABASE ) { - case 'mysql': - resolve( await saveMessageMysql( message, trigger, number ) ) - break; - case 'none': - resolve( await saveMessageJson( message, trigger, number ) ) - break; - default: - resolve(true) - break; - } -}) - -module.exports = { get, reply, getIA, saveMessage } \ No newline at end of file diff --git a/adapter/jsonDb.js b/adapter/jsonDb.js deleted file mode 100644 index dbc2626..0000000 --- a/adapter/jsonDb.js +++ /dev/null @@ -1,20 +0,0 @@ -const Path = require('path') -const StormDB = require("stormdb"); -const date = new Date().toISOString(); -const saveMessageJson = (message, trigger, number) => new Promise( async(resolve,reject) =>{ - try { - const engine = new StormDB.localFileEngine( Path.join(__dirname, `/../chats/${number}.json`) ); - const db = new StormDB(engine); - // set default db value if db is empty - db.default({ messages: [] }); - // add new users entry - db.get("messages").push({ message, date, trigger }); - db.save(); - resolve('Saved') - } catch (error) { - console.log(error) - reject(error) - } -}) - -module.exports = { saveMessageJson } \ No newline at end of file diff --git a/adapter/mysql.js b/adapter/mysql.js deleted file mode 100644 index e92cf97..0000000 --- a/adapter/mysql.js +++ /dev/null @@ -1,74 +0,0 @@ -const {connection} = require('../config/mysql') -const DATABASE_NAME = process.env.SQL_DATABASE || 'db_test' - -getData = (message = '', callback) => connection.query( - `SELECT * FROM ${DATABASE_NAME}.initial WHERE keywords LIKE '%${message}%' LIMIT 1`, - (error, results - ) => { - const [response] = results - const key = response?.option_key || null - callback(key) -}); - - -getReply = (option_key = '', callback) => connection.query( - `SELECT * FROM ${DATABASE_NAME}.response WHERE option_key = '${option_key}' LIMIT 1`, - (error, results - ) => { - const [response] = results; - console.log(response) - const value = { - replyMessage:response?.replyMessage || '', - trigger:response?.trigger || '', - media:response?.media || '' - - } - callback(value) -}); - -getMessages = ( number ) => new Promise((resolve,reejct) => { - try { - connection.query( - `SELECT * FROM ${DATABASE_NAME}.response WHERE number = '${number}'`, (error, results) => { - if(error) { - console.log(error) - } - const [response] = results; - console.log(response) - const value = { - replyMessage:response?.replyMessage || '', - trigger:response?.trigger || '', - media:response?.media || '' - } - resolve(value) - }) - } catch (error) { - - } -}) - -saveMessageMysql = ( message, date, trigger, number ) => new Promise((resolve,reejct) => { - try { - connection.query( - `INSERT INTO ${DATABASE_NAME}.messages `+"( `message`, `date`, `trigger`, `number`)"+` VALUES ('${message}','${date}','${trigger}', '${number}')` , (error, results) => { - if(error) { - //TODO esta parte es mejor incluirla directamente en el archivo .sql template - console.log('DEBES DE CREAR LA TABLA DE MESSAGE') - // if( error.code === 'ER_NO_SUCH_TABLE' ){ - // connection.query( `CREATE TABLE ${DATABASE_NAME}.messages `+"( `date` DATE NOT NULL , `message` VARCHAR(450) NOT NULL , `trigger` VARCHAR(450) NOT NULL , `number` VARCHAR(50) NOT NULL ) ENGINE = InnoDB", async (error, results) => { - // setTimeout( async () => { - // return resolve( await this.saveMessageMysql( message, date, trigger, number ) ) - // }, 150) - // }) - // } - } - console.log('Saved') - console.log( results ) - resolve(results) - }) - } catch (error) { - - } -}) - -module.exports = {getData, getReply, saveMessageMysql} \ No newline at end of file diff --git a/app.js b/app.js deleted file mode 100644 index 755b924..0000000 --- a/app.js +++ /dev/null @@ -1,172 +0,0 @@ -/** - * ⚡⚡⚡ DECLARAMOS LAS LIBRERIAS y CONSTANTES A USAR! ⚡⚡⚡ - */ -require('dotenv').config() -const fs = require('fs'); -const express = require('express'); -const cors = require('cors') -const qrcode = require('qrcode-terminal'); -const { Client,LocalAuth } = require('whatsapp-web.js'); -const mysqlConnection = require('./config/mysql') -const { middlewareClient } = require('./middleware/client') -const { generateImage, cleanNumber, checkEnvFile, createClient, isValidNumber } = require('./controllers/handle') -const { connectionReady, connectionLost } = require('./controllers/connection') -const { saveMedia } = require('./controllers/save') -const { getMessages, responseMessages, bothResponse } = require('./controllers/flows') -const { sendMedia, sendMessage, lastTrigger, sendMessageButton, readChat } = require('./controllers/send') -const app = express(); -app.use(cors()) -app.use(express.json()) -const MULTI_DEVICE = process.env.MULTI_DEVICE || 'true'; -const server = require('http').Server(app) - -const port = process.env.PORT || 3000 -var client; -app.use('/', require('./routes/web')) - -/** - * Escuchamos cuando entre un mensaje - */ -const listenMessage = () => client.on('message', async msg => { - const { from, body, hasMedia } = msg; - - if(!isValidNumber(from)){ - return - } - - // Este bug lo reporto Lucas Aldeco Brescia para evitar que se publiquen estados - if (from === 'status@broadcast') { - return - } - message = body.toLowerCase(); - console.log('BODY',message) - const number = cleanNumber(from) - await readChat(number, message) - - /** - * Guardamos el archivo multimedia que envia - */ - if (process.env.SAVE_MEDIA && hasMedia) { - const media = await msg.downloadMedia(); - saveMedia(media); - } - - /** - * Si estas usando dialogflow solo manejamos una funcion todo es IA - */ - - if (process.env.DATABASE === 'dialogflow') { - if(!message.length) return; - const response = await bothResponse(message); - await sendMessage(client, from, response.replyMessage); - if (response.media) { - sendMedia(client, from, response.media); - } - return - } - - /** - * Ver si viene de un paso anterior - * Aqui podemos ir agregando más pasos - * a tu gusto! - */ - - const lastStep = await lastTrigger(from) || null; - if (lastStep) { - const response = await responseMessages(lastStep) - await sendMessage(client, from, response.replyMessage); - } - - /** - * Respondemos al primero paso si encuentra palabras clave - */ - const step = await getMessages(message); - - if (step) { - const response = await responseMessages(step); - - /** - * Si quieres enviar botones - */ - - await sendMessage(client, from, response.replyMessage, response.trigger); - - if(response.hasOwnProperty('actions')){ - const { actions } = response; - await sendMessageButton(client, from, null, actions); - return - } - - if (!response.delay && response.media) { - sendMedia(client, from, response.media); - } - if (response.delay && response.media) { - setTimeout(() => { - sendMedia(client, from, response.media); - }, response.delay) - } - return - } - - //Si quieres tener un mensaje por defecto - if (process.env.DEFAULT_MESSAGE === 'true') { - const response = await responseMessages('DEFAULT') - await sendMessage(client, from, response.replyMessage, response.trigger); - - /** - * Si quieres enviar botones - */ - if(response.hasOwnProperty('actions')){ - const { actions } = response; - await sendMessageButton(client, from, null, actions); - } - return - } -}); - - - -client = new Client({ - authStrategy: new LocalAuth(), - puppeteer: { headless: true } - }); - -client.on('qr', qr => generateImage(qr, () => { - qrcode.generate(qr, { small: true }); - - console.log(`Ver QR http://localhost:${port}/qr`) - socketEvents.sendQR(qr) -})) - -client.on('ready', (a) => { - connectionReady() - listenMessage() - // socketEvents.sendStatus(client) -}); - -client.on('auth_failure', (e) => { - // console.log(e) - // connectionLost() -}); - -client.on('authenticated', () => { - console.log('AUTHENTICATED'); -}); - - client.initialize(); - - - -/** - * Verificamos si tienes un gesto de db - */ - -if (process.env.DATABASE === 'mysql') { - mysqlConnection.connect() -} - -server.listen(port, () => { - console.log(`El server esta listo por el puerto ${port}`); -}) -checkEnvFile(); - diff --git a/app.json b/app.json deleted file mode 100644 index a602ccf..0000000 --- a/app.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "Chatbot Whatsapp (Leifer Mendez)", - "description": "El siguiente proyecto se realizó con fines educativos para el canal de Youtube (Leifer Mendez) donde aprendemos como usando node.js podemos crear un chatbot increíble que además le agregamos inteligencia artificial gracias al servicio de dialogflow", - "repository": "https://github.com/leifermendez/bot-whatsapp", - "logo": "https://avatars0.githubusercontent.com/u/15802366?s=460&u=77ec7ef359e8ed842aef769693f1675c0ed460fd&v=4", - "keywords": [ - "nodejs", - "whatsapp", - "bot", - "chatbot", - "dialogflow" - ], - "addons": [ - ], - "buildpacks": [ - { - "url": "heroku/nodejs" - }, - { - "url": "https://github.com/jontewks/puppeteer-heroku-buildpack" - } - ], - "env": { - "SAVE_MEDIA": "false", - "DATABASE": { - "description": "'none', 'mysql', 'dialogflow' por defecto 'none' Puedes usar alguna de los siguientes opciones. Pero antes debes de saber como funciona y eso lo explico en el video. Puedes obtener más información https://github.com/leifermendez/bot-whatsapp/blob/main/README.md", - "value": "none" - }, - "LANGUAGE": "es", - "SQL_HOST":"your_host", - "SQL_USER":"your_user", - "SQL_PASS":"your_password", - "SQL_DATABASE":"your_database" - } - } \ No newline at end of file diff --git a/chatbot-account.json b/chatbot-account.json deleted file mode 100644 index cb8956d..0000000 --- a/chatbot-account.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "", - "project_id": "", - "private_key_id": "", - "private_key":"", - "client_email": "", - "client_id": "", - "auth_uri": "", - "token_uri": "", - "auth_provider_x509_cert_url": "", - "client_x509_cert_url":"" - } - \ No newline at end of file diff --git a/chats/.gitkeep b/chats/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/config/mysql.js b/config/mysql.js deleted file mode 100644 index 8db7c76..0000000 --- a/config/mysql.js +++ /dev/null @@ -1,18 +0,0 @@ -const mysql = require('mysql'); -const connection = mysql.createConnection({ - host : process.env.SQL_HOST || 'localhost', - user : process.env.SQL_USER || 'root', - password : process.env.SQL_PASS || '', - database : process.env.SQL_DATABASE || 'pruebas' -}); - -const connect = () => connection.connect(function(err) { - if (err) { - console.error('error connecting: ' + err.stack); - return; - } - - console.log('Conexion correcta con tu base de datos MySQL') -}); - -module.exports = {connect, connection} \ No newline at end of file diff --git a/controllers/connection.js b/controllers/connection.js deleted file mode 100644 index a2aa6f4..0000000 --- a/controllers/connection.js +++ /dev/null @@ -1,14 +0,0 @@ -const connectionReady = (cb = () =>{}) => { - console.log('Listo para escuchas mensajes') - console.log('Client is ready!'); - console.log('🔴 escribe: hola'); - cb() -} - -const connectionLost = (cb = () =>{}) => { - console.log('** Error de autentificacion vuelve a generar el QRCODE (Borrar el archivo session.json) **'); - cb() -} - - -module.exports = {connectionReady, connectionLost} \ No newline at end of file diff --git a/controllers/flows.js b/controllers/flows.js deleted file mode 100644 index 0e769cd..0000000 --- a/controllers/flows.js +++ /dev/null @@ -1,28 +0,0 @@ -const {get, reply, getIA} = require('../adapter') -const {saveExternalFile, checkIsUrl} = require('./handle') - -const getMessages = async (message) => { - const data = await get(message) - return data -} - -const responseMessages = async (step) => { - const data = await reply(step) - if(data && data.media){ - const file = checkIsUrl(data.media) ? await saveExternalFile(data.media) : data.media; - return {...data,...{media:file}} - } - return data -} - -const bothResponse = async (message) => { - const data = await getIA(message) - if(data && data.media){ - const file = await saveExternalFile(data.media) - return {...data,...{media:file}} - } - return data -} - - -module.exports = { getMessages, responseMessages, bothResponse } \ No newline at end of file diff --git a/controllers/handle.js b/controllers/handle.js deleted file mode 100644 index ce006d7..0000000 --- a/controllers/handle.js +++ /dev/null @@ -1,83 +0,0 @@ -const { Client, LegacySessionAuth, LocalAuth } = require('whatsapp-web.js'); -const http = require('http'); // or 'https' for https:// URLs -const https = require('https'); // or 'https' for https:// URLs -const fs = require('fs'); -const qr = require('qr-image') - -const MULTI_DEVICE = process.env.MULTI_DEVICE || 'true'; - -const cleanNumber = (number) => { - number = number.replace('@c.us', ''); - number = `${number}@c.us`; - return number -} - -const saveExternalFile = (url) => new Promise((resolve, reject) => { - const ext = url.split('.').pop() - const checkProtocol = url.split('/').includes('https:'); - const handleHttp = checkProtocol ? https : http; - const name = `${Date.now()}.${ext}`; - const file = fs.createWriteStream(`${__dirname}/../mediaSend/${name}`); - console.log(url) - handleHttp.get(url, function(response) { - response.pipe(file); - file.on('finish', function() { - file.close(); // close() is async, call cb after close completes. - resolve(name) - }); - file.on('error', function() { - console.log('errro') - file.close(); // close() is async, call cb after close completes. - resolve(null) - }); - }); -}) - -const checkIsUrl = (path) => { - try{ - regex = /^(http(s)?:\/\/)[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+$/i; - match = path.match(regex); - return match[0] - }catch(e){ - return null - } -} - -const generateImage = (base64, cb = () => {}) => { - let qr_svg = qr.image(base64, { type: 'svg', margin: 4 }); - qr_svg.pipe(require('fs').createWriteStream('./mediaSend/qr-code.svg')); - console.log(`⚡ Recuerda que el QR se actualiza cada minuto ⚡'`); - console.log(`⚡ Actualiza F5 el navegador para mantener el mejor QR⚡`); - cb() -} - -const checkEnvFile = () => { - const pathEnv = `${__dirname}/../.env`; - const isExist = fs.existsSync(pathEnv); - if(!isExist){ - console.log(`🆗 ATENCION! 🆗 te falta crear tu archivo .env de lo contrario no funcionara`) - } -} - -/** - * - * @param {*} session - * @param {*} cb - */ -const createClient = () => { - client = new Client({ - authStrategy: new LocalAuth( - {dataPath: './sessions/', - clientId: 'bot'}), - puppeteer: { headless: false } - - }); -} - -const isValidNumber = (rawNumber) => { - const regexGroup = /\@g.us\b/gm; - const exist = rawNumber.match(regexGroup); - return !exist -} - -module.exports = {cleanNumber, saveExternalFile, generateImage, checkIsUrl, checkEnvFile, createClient, isValidNumber} \ No newline at end of file diff --git a/controllers/save.js b/controllers/save.js deleted file mode 100644 index 92555e0..0000000 --- a/controllers/save.js +++ /dev/null @@ -1,18 +0,0 @@ -const mimeDb = require('mime-db') -const fs = require('fs') - -/** - * Guardamos archivos multimedia que nuestro cliente nos envie! - * @param {*} media - */ - - -const saveMedia = (media) => { - const extensionProcess = mimeDb[media.mimetype] - const ext = extensionProcess.extensions[0] - fs.writeFile(`./media/${Date.now()}.${ext}`, media.data, { encoding: 'base64' }, function (err) { - console.log('** Archivo Media Guardado **'); - }); -} - -module.exports = {saveMedia} \ No newline at end of file diff --git a/controllers/send.js b/controllers/send.js deleted file mode 100644 index d081381..0000000 --- a/controllers/send.js +++ /dev/null @@ -1,113 +0,0 @@ - -const ExcelJS = require('exceljs'); -const moment = require('moment'); -const fs = require('fs'); -const { MessageMedia, Buttons } = require('whatsapp-web.js'); -const { cleanNumber } = require('./handle') -const DELAY_TIME = 170; //ms -const DIR_MEDIA = `${__dirname}/../mediaSend`; -// import { Low, JSONFile } from 'lowdb' -// import { join } from 'path' -const { saveMessage } = require('../adapter') -/** - * Enviamos archivos multimedia a nuestro cliente - * @param {*} number - * @param {*} fileName - */ - -const sendMedia = (client, number = null, fileName = null) => { - if(!client) return cosnole.error("El objeto cliente no está definido."); - try { - number = cleanNumber(number || 0) - const file = `${DIR_MEDIA}/${fileName}`; - if (fs.existsSync(file)) { - const media = MessageMedia.fromFilePath(file); - client.sendMessage(number, media, { sendAudioAsVoice: true }); - } - } catch(e) { - throw e; - } -} - -/** - * Enviamos archivos como notas de voz - * @param {*} number - * @param {*} fileName - */ - - const sendMediaVoiceNote = (client, number = null, fileName = null) => { - if(!client) return cosnole.error("El objeto cliente no está definido."); - try { - number = cleanNumber(number || 0) - const file = `${DIR_MEDIA}/${fileName}`; - if (fs.existsSync(file)) { - const media = MessageMedia.fromFilePath(file); - client.sendMessage(number, media ,{ sendAudioAsVoice: true }); - - } - }catch(e) { - throw e; -} - -} -/** - * Enviamos un mensaje simple (texto) a nuestro cliente - * @param {*} number - */ -const sendMessage = async (client, number = null, text = null, trigger = null) => { - setTimeout(async () => { - number = cleanNumber(number) - const message = text - client.sendMessage(number, message); - await readChat(number, message, trigger) - console.log(`⚡⚡⚡ Enviando mensajes....`); - },DELAY_TIME) -} - -/** - * Enviamos un mensaje con buttons a nuestro cliente - * @param {*} number - */ -const sendMessageButton = async (client, number = null, text = null, actionButtons) => { - number = cleanNumber(number) - const { title = null, message = null, footer = null, buttons = [] } = actionButtons; - let button = new Buttons(message,[...buttons], title, footer); - client.sendMessage(number, button); - - console.log(`⚡⚡⚡ Enviando mensajes....`); -} - - -/** - * Opte - */ -const lastTrigger = (number) => new Promise((resolve, reject) => { - number = cleanNumber(number) - const pathExcel = `${__dirname}/../chats/${number}.xlsx`; - const workbook = new ExcelJS.Workbook(); - if (fs.existsSync(pathExcel)) { - workbook.xlsx.readFile(pathExcel) - .then(() => { - const worksheet = workbook.getWorksheet(1); - const lastRow = worksheet.lastRow; - const getRowPrevStep = worksheet.getRow(lastRow.number); - const lastStep = getRowPrevStep.getCell('C').value; - resolve(lastStep) - }); - } else { - resolve(null) - } -}) - -/** - * Guardar historial de conversacion - * @param {*} number - * @param {*} message - */ -const readChat = async (number, message, trigger = null) => { - number = cleanNumber(number) - await saveMessage( message, trigger, number ) - console.log('Saved') -} - -module.exports = { sendMessage, sendMedia, lastTrigger, sendMessageButton, readChat, sendMediaVoiceNote } diff --git a/controllers/socket.js b/controllers/socket.js deleted file mode 100644 index 05ff8d3..0000000 --- a/controllers/socket.js +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = (socket) => { - return { - sendQR:(qr) => { - socket.emit('connection_qr',{ - qr - }) - }, - sendStatus:() => { - socket.emit('connection_status',{ - a:1 - }) - } - } - -} - diff --git a/controllers/web.js b/controllers/web.js deleted file mode 100644 index 5b7bad9..0000000 --- a/controllers/web.js +++ /dev/null @@ -1,17 +0,0 @@ -const fs = require('fs') -const { sendMessage } = require('../controllers/send') - -const sendMessagePost = (req, res) => { - console.log('asdasdasdasdasd') - const { message, number } = req.body - const client = req.clientWs || null; - sendMessage(client, number, message) - res.send({ status: 'Enviado!' }) -} - -const getQr = (req, res) => { - res.writeHead(200, { 'content-type': 'image/svg+xml' }); - fs.createReadStream(`${__dirname}/../mediaSend/qr-code.svg`).pipe(res); -} - -module.exports = { sendMessagePost, getQr } \ No newline at end of file diff --git a/flow/initial.json b/flow/initial.json deleted file mode 100644 index 6a91c75..0000000 --- a/flow/initial.json +++ /dev/null @@ -1,93 +0,0 @@ -[ - { - "keywords": [ - "hola", - "hola!", - "ola", - "ole", - "inicio", - "welcome", - "buenos días", - "buenas tardes", - "buenas noches", - "me dieron este número", - "venden a crédito", - "quisiera saber si venden", - "necesito saber" - ], - "key": "STEP_1" - }, - { - "keywords": [ - "cursos", - "info", - "curso" ], - "key": "STEP_2" - }, - { - "keywords": [ - "angular" - ], - "key": "STEP_2_1" - }, - { - "keywords": [ - "node" - ], - "key": "STEP_2_2" - }, - { - "keywords": [ - "ngrx" - ], - "key": "STEP_2_3" - }, - { - "keywords": [ - "aws" - ], - "key": "STEP_2_4" - }, - { - "keywords": [ - "asesor", - "asesores", - "Vendedor", - "cobrador" - ], - "key": "STEP_3" - }, - { - "keywords": [ - "muchas gracias", - "ok", - "gracias", - "vale gracias" - ], - "key": "STEP_4" - }, - { - "keywords": [ - "youtube" - ], - "key": "STEP_5" - }, - { - "keywords": [ - "VER_CURSOS" - ], - "key": "STEP_6" - }, - { - "keywords": [ - "telegram" - ], - "key": "STEP_7" - }, - { - "keywords": [ - "audio" - ], - "key": "STEP_8" - } -] \ No newline at end of file diff --git a/flow/response.json b/flow/response.json deleted file mode 100644 index 4413f32..0000000 --- a/flow/response.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "DEFAULT":{ - "replyMessage":[ - "*Esta respuesta es un respuesta default* cuando no se consigue una palabra clave \n", - "la puedes desactivar en tu archivo .env DEFAULT_MESSAGE=false \n", - "tambien te quiero recordar que si presentas algun error pasarte por el repositorio \n", - "https://github.com/leifermendez/bot-whatsapp#chatbot-whatsapp-opensource \n", - "y recuerda tener la ultima versión del proyecto \n\n", - "Prueba escribiendo *hola* \n" - ], - "media":null, - "trigger":null - }, - "STEP_0":{ - "replyMessage":[ - "El flujo ha finalizado \n", - "pero puedes ver todo el codigo de este \n", - "repositorio en https://github.com/leifermendez/bot-whatsapp.git" - ], - "media":null, - "trigger":null - }, - "STEP_1":{ - "replyMessage":[ - "Hola! y✌️ Bienvenido a este 🤖 CHATBOT de Whatsapp, lo primero \n", - "decirte que mi nombre es *Leifer Mendez*😎 \n", - "\n Si necesitas ver más info sobre las capacitacion tecnicas ", - "escribe *cursos* o *info* o escribe *audio*" - ], - "media":"https://media2.giphy.com/media/VQJu0IeULuAmCwf5SL/giphy.gif", - "trigger":null, - "actions":{ - "title":"¿Que te interesa ver?", - "message":"Recuerda todo este contenido es gratis y estaria genial que me siguas!", - "footer":"Gracias", - "buttons":[ - {"body":"Cursos"}, - {"body":"Youtube"}, - {"body":"Telegram"} - ] - } - }, - "STEP_2":{ - "replyMessage":[ - "Perfecto, te voy a pasar la lista ", - "de los temas que tengo y un breve video 🙂🤖 \n\n", - "*Angular* Basico (Pago) \n", - "*Angular* Basico (Gratis) \n", - "*Node* Basico (Gratis) \n", - "*NGRX* Basico (Gratis) \n", - "*AWS* Basico (Pago) \n\n", - "Escribe la palabra del tema que te interese \n" - ], - "media":"https://i.giphy.com/media/5J5gN0WUk0VToHaK2p/giphy-downsized.gif", - "trigger":null - }, - "STEP_2_1":{ - "replyMessage":[ - "Si te interesa Angular tienes disponible \n", - "*(Gratis)* https://bit.ly/367tJ32 \n\n", - "*(Pago)* https://link.codigoencasa.com/PROMO-INICIAL \n\n", - "*(Pago)* https://link.codigoencasa.com/ANGULAR-BASICO-EDTEAM \n\n", - "😎😎😎" - ], - "media":"https://i.imgur.com/Q0a5UQI.jpg", - "trigger":null - }, - "STEP_2_2":{ - "replyMessage":[ - "Si te interesa NODE tienes disponible \n", - "*(Gratis)* https://bit.ly/3od1Bl6 \n\n", - "Espero pronto tener más material disponible", - "🤖" - ], - "media":null, - "trigger":null - }, - "STEP_2_3":{ - "replyMessage":[ - "NGRX para manejar estados en Angular \n", - "*(Gratis)* https://bit.ly/ngrx-desde-cero \n", - "A darle! 😮" - ], - "media":null, - "trigger":null - }, - "STEP_2_4":{ - "replyMessage":[ - "Muy bien AWS esta pronto a salir pre-registrate aquí \n", - "*(Pre-registro)* https://link.codigoencasa.com/AWS-BASICO-INVITACION \n", - "😮😮" - ], - "media":null, - "trigger":null - }, - "STEP_3":{ - "replyMessage":[ - "¿Ok cual curso de intereso? \n", - "*angular* , *node*, *ngrx*, *aws*" - ], - "media":null, - "trigger":null - }, - "STEP_4":{ - "replyMessage":[ - "Gracias a ti! \n" - ], - "media":"https://media4.giphy.com/media/hur0SFIU5SH4mxNBWa/giphy.gif", - "trigger":null - }, - "STEP_5":{ - "replyMessage":[ - "Muy bien te comparto el canal de Youtube \n", - "https://youtube.com/leifermendez \n" - ], - "media":null, - "trigger":null - }, - "STEP_6":{ - "replyMessage":[ - "Perfecto, te voy a pasar la lista ", - "de los temas que tengo y un breve video 🙂🤖 \n\n", - "*Angular* Basico (Pago) \n", - "*Angular* Basico (Gratis) \n", - "*Node* Basico (Gratis) \n", - "*NGRX* Basico (Gratis) \n", - "*AWS* Basico (Pago) \n\n", - "Escribe la palabra del tema que te interese \n" - ], - "media":"https://i.giphy.com/media/5J5gN0WUk0VToHaK2p/giphy-downsized.gif", - "trigger":null - }, - "STEP_7":{ - "replyMessage":[ - "Vente al telegram \n", - "https://t.me/leifermendez \n" - ], - "media":null, - "trigger":null - }, - "STEP_8":{ - "replyMessage":[ - "Esto es una nota de voz \n" - ], - "media":"nota-de-voz.mp3", - "trigger":null - } -} \ No newline at end of file diff --git a/media/.gitkeep b/media/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/mediaSend/.gitkeep b/mediaSend/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/mediaSend/PTT-20220223-WA0000.opus b/mediaSend/PTT-20220223-WA0000.opus deleted file mode 100644 index 6e6e995..0000000 Binary files a/mediaSend/PTT-20220223-WA0000.opus and /dev/null differ diff --git a/mediaSend/nota-de-voz.mp3 b/mediaSend/nota-de-voz.mp3 deleted file mode 100644 index a10f4f8..0000000 Binary files a/mediaSend/nota-de-voz.mp3 and /dev/null differ diff --git a/middleware/client.js b/middleware/client.js deleted file mode 100644 index 67c0d30..0000000 --- a/middleware/client.js +++ /dev/null @@ -1,21 +0,0 @@ -const middlewareClient = (client = null) => async (req, res, next) => { - try { - - if(!client){ - res.status(409) - console.log(client) - res.send({ error: 'Error de client.' }) - }else{ - req.clientWs = client; - next() - } - - - } catch (e) { - console.log(e) - res.status(409) - res.send({ error: 'Error de client' }) - } - -} -module.exports = { middlewareClient } \ No newline at end of file diff --git a/middleware/db.js b/middleware/db.js deleted file mode 100644 index e69de29..0000000 diff --git a/package.json b/package.json index 3247115..1c01113 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "bot-whatsapp", + "name": "@bot-whatsapp/root", "version": "1.0.0", "description": "Bot de wahtsapp open source para MVP o pequeños negocios", "main": "app.js", @@ -20,16 +20,9 @@ "test": "npm run test.unit && npm run test.e2e", "cli": "node ./packages/cli/bin/cli.js" }, - "husky": { - "hooks": { - "pre-commit": "npm run format:check && npm run lint:fix", - "pre-push": "npm run test" - } - }, "workspaces": [ - "packages/cli", - "packages/io", - "packages/providers" + "packages/*", + "docs" ], "keywords": [ "whatsapp", @@ -78,7 +71,6 @@ "detect-package-manager": "^2.0.1", "eslint": "^8.26.0", "eslint-config-prettier": "^8.5.0", - "husky": "^8.0.2", "kleur": "^4.1.5", "pm2": "^5.2.0", "prettier": "^2.7.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 6c0a809..43b416e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,5 +1,5 @@ { - "name": "cli", + "name": "@bot-whatsapp/cli", "version": "0.0.1", "description": "", "main": "index.js", diff --git a/packages/core/package.json b/packages/core/package.json index 77e12a7..997cf69 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,5 +1,5 @@ { - "name": "bot-core", + "name": "@bot-whatsapp/core", "version": "0.0.1", "description": "", "main": "index.js", diff --git a/packages/io/package.json b/packages/io/package.json index f4f865a..0dd5b26 100644 --- a/packages/io/package.json +++ b/packages/io/package.json @@ -1,5 +1,5 @@ { - "name": "io", + "name": "@bot-whatsapp/io", "version": "0.0.1", "description": "", "main": "index.js", diff --git a/packages/provider/package.json b/packages/provider/package.json new file mode 100644 index 0000000..c7b3201 --- /dev/null +++ b/packages/provider/package.json @@ -0,0 +1,11 @@ +{ + "name": "@bot-whatsapp/provider", + "version": "0.0.1", + "description": "", + "main": "index.js", + "private": true, + "keywords": [], + "author": "", + "license": "ISC", + "devDependencies": {} +} diff --git a/routes/api.js b/routes/api.js deleted file mode 100644 index e723e56..0000000 --- a/routes/api.js +++ /dev/null @@ -1,7 +0,0 @@ -const express = require('express') -const router = express.Router(); -const { sendMessagePost } = require('../controllers/web')| - -router.post('/send', sendMessagePost) - -module.exports = router \ No newline at end of file diff --git a/routes/web.js b/routes/web.js deleted file mode 100644 index 32df0e5..0000000 --- a/routes/web.js +++ /dev/null @@ -1,7 +0,0 @@ -const express = require('express'); -const router = express.Router() -const { getQr } = require('../controllers/web') - -router.use('/qr', getQr) - -module.exports = router \ No newline at end of file diff --git a/sql-bot.sql b/sql-bot.sql deleted file mode 100644 index 0bbda74..0000000 --- a/sql-bot.sql +++ /dev/null @@ -1,79 +0,0 @@ --- MySQL dump 10.13 Distrib 8.0.27, for Win64 (x86_64) --- --- Host: 127.0.0.1 Database: db_test --- ------------------------------------------------------ --- Server version 5.7.33 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!50503 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `initial` --- - -DROP TABLE IF EXISTS `initial`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `initial` ( - `option_key` varchar(500) DEFAULT NULL, - `keywords` varchar(45) DEFAULT NULL, - `id` int(11) NOT NULL AUTO_INCREMENT, - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `initial` --- - -LOCK TABLES `initial` WRITE; -/*!40000 ALTER TABLE `initial` DISABLE KEYS */; -INSERT INTO `initial` VALUES ('STEP_1','hola, hola!,ola,inicio,welcome',2),('STEP_2','cursos,info,curso',3),('STEP_2_1','angular',4),('STEP_2_2','node',5),('STEP_2_3','ngrx',6),('STEP_2_4','aws',7),('STEP_3','asesor',8),('STEP_4','muchas gracias,gracias,vale gracias',9); -/*!40000 ALTER TABLE `initial` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `response` --- - -DROP TABLE IF EXISTS `response`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `response` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `option_key` varchar(45) DEFAULT NULL, - `replyMessage` varchar(45) DEFAULT NULL, - `trigger` varchar(45) DEFAULT NULL, - `media` varchar(200) DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `response` --- - -LOCK TABLES `response` WRITE; -/*!40000 ALTER TABLE `response` DISABLE KEYS */; -INSERT INTO `response` VALUES (1,'STEP_1','Hola soy el bot escribe curso',NULL,NULL),(2,'STEP_2','Te envio esto',NULL,'https://s2.q4cdn.com/175719177/files/doc_presentations/Placeholder-PDF.pdf'); -/*!40000 ALTER TABLE `response` ENABLE KEYS */; -UNLOCK TABLES; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2022-01-18 20:52:34