From ac8c09c665ab95855243fa9cd1bd7232ab4680f6 Mon Sep 17 00:00:00 2001 From: cheveguerra Date: Sun, 11 Dec 2022 03:41:41 -0600 Subject: [PATCH] Initial Mod v2 --- .gitattributes | 2 + README.md | 59 ++++- Whatsapp-Bot.ps1 | 1 + adapter/diaglogflow.js | 14 +- adapter/index.js | 260 ++++++++++++++++++- adapter/jsonDb.js | 4 +- app.js | 398 +++++++++++++++++++++++------ controllers/connection.js | 6 +- controllers/flows.js | 9 +- controllers/handle.js | 4 +- controllers/save.js | 8 +- controllers/send.js | 31 ++- flow/initial.json | 103 +++----- flow/response.json | 215 ++++++++-------- mediaSend/PTT-20220223-WA0000.opus | Bin 12001 -> 0 bytes package-lock.json | 273 +++++++++++++------- package.json | 29 +-- spam.json | 38 +++ test_mod_2.js | 1 - 19 files changed, 1047 insertions(+), 408 deletions(-) create mode 100644 .gitattributes create mode 100644 Whatsapp-Bot.ps1 delete mode 100644 mediaSend/PTT-20220223-WA0000.opus create mode 100644 spam.json delete mode 100644 test_mod_2.js diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..dfe0770 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto diff --git a/README.md b/README.md index 8be6f57..047b3e4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,39 @@ ## Chatbot Whatsapp (OpenSource) +#### Actualizado Diciembre 2022 + +Este proyecto es un fork del de [Leifer Mendez](https://github.com/leifermendez/bot-whatsapp), y tiene las siguientes modificaciones: + + - Permite menus y submenus + - Permite expresiones regulares en las palabras predefinidas en el initial.json. + - Permite remplazos en el texto de los mensajes por ejemplo: + - __%saludo%__ para que aparezca "Buenos días, tardes o noches" dependiendo de la hora. + - __%dia_semana%__ para que aparezca "lunes, martes, miercoles, etc" dependiendo del día de la semana. + - __%msjant_XX%__ para que aparezca el mensaje xx anterior, es decir, si quieres mostrar el texto de 2 mensajes anteriores se pone %%msjant_2%. + - etc, etc, se pueden agregar mas remplazos en la funcion "remplazos" en el archivo "adapter\index.js". + - Las modificaciones están enfocadas al uso de los archivos __initial.json__ y __response.json__, yo no uso MySQL o DialogFlow, así que no sé si las modificaciones funcionen con esos modulos, en particular el __remplazo %msjant_x%__ depende de los archivos __JSON__ que se crean en el directorio "chats". + - Tiene agregado el parche de botones. + +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__. + +[![Video](https://i.giphy.com/media/OBDi3CXC83WkNeLEZP/giphy.webp)](https://youtu.be/5lEMCeWEJ8o) + +### 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 @@ -58,6 +93,7 @@ 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 @@ -69,9 +105,9 @@ sudo apt install -y gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups __Instalar dependencias (npm install)__ > Ubicate en le directorio que descargaste y via consola o terminal ejecuta el siguiente comando -``` -npm i -``` +`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` @@ -90,14 +126,21 @@ 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 -Tambien puedes visitar la pagina http://127.0.0.1:3000/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! @@ -114,3 +157,11 @@ __Listo 😎__ > 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) diff --git a/Whatsapp-Bot.ps1 b/Whatsapp-Bot.ps1 new file mode 100644 index 0000000..7512a7e --- /dev/null +++ b/Whatsapp-Bot.ps1 @@ -0,0 +1 @@ +npm start \ No newline at end of file diff --git a/adapter/diaglogflow.js b/adapter/diaglogflow.js index 1d0d9a8..9a243b5 100644 --- a/adapter/diaglogflow.js +++ b/adapter/diaglogflow.js @@ -1,6 +1,6 @@ const dialogflow = require('@google-cloud/dialogflow'); const fs = require('fs') - +const { nanoid } = require('nanoid') /** * Debes de tener tu archivo con el nombre "chatbot-account.json" en la raíz del proyecto */ @@ -30,9 +30,9 @@ const checkFileCredentials = () => { // Detect intent method -const detectIntent = async (queryText, waPhoneNumber) => { +const detectIntent = async (queryText) => { let media = null; - const sessionId = KEEP_DIALOG_FLOW ? 1 : waPhoneNumber; + const sessionId = KEEP_DIALOG_FLOW ? 1 : nanoid(); const sessionPath = sessionClient.projectAgentSessionPath(PROJECID, sessionId); const languageCode = process.env.LANGUAGE const request = { @@ -56,7 +56,7 @@ const detectIntent = async (queryText, waPhoneNumber) => { const { fields } = parsePayload.payload media = fields.media.stringValue || null } - const customPayload = parsePayload ? parsePayload['payload'] : null + const customPayload = parsePayload['payload'] const parseData = { replyMessage: queryResult.fulfillmentText, @@ -66,12 +66,12 @@ const detectIntent = async (queryText, waPhoneNumber) => { return parseData } -const getDataIa = (message = '', sessionId = '', cb = () => { }) => { - detectIntent(message, sessionId).then((res) => { +const getDataIa = (message = '', cb = () => { }) => { + detectIntent(message).then((res) => { cb(res) }) } checkFileCredentials(); -module.exports = { getDataIa } \ No newline at end of file +module.exports = { getDataIa } diff --git a/adapter/index.js b/adapter/index.js index e6e5d74..6a1cc74 100644 --- a/adapter/index.js +++ b/adapter/index.js @@ -3,17 +3,114 @@ const { saveMessageJson } = require('./jsonDb') const { getDataIa } = require('./diaglogflow') const stepsInitial = require('../flow/initial.json') const stepsReponse = require('../flow/response.json') +const { isUndefined } = require('util'); +var msjsRecibidos = []; +var ultimoStep; //MOD by CHV - +var pasoAnterior = []; //MOD by CHV - Para guardar el paso anterior de cada número. +var pasoRequerido; //MOD by CHV - +var vamosA = ""; //MOD by CHV - +var VA = ""; //MOD by CHV - +var elNum; //MOD by CHV - +var cumplePasoPrevio; //MOD by CHV - +const resps = require('../flow/response.json'); //MOD by CHV - Agregamos para traer las respuestas. +const { appendFile } = require('fs') + +const get = (message, num) => new Promise((resolve, reject) => { //MOD by CHV - Agregamos parametro "num" para recibir el número de "app.js" + // console.log(num) + elNum = num //MOD by CHV - + if(siguientePaso.find(k => k.numero.includes(elNum))){ + console.log("siguientePaso="+siguientePaso.find(k => k.numero.includes(elNum))["numero"], siguientePaso.find(k => k.numero.includes(elNum))["va"]) + // ultimoStep = siguientePaso.find(k => k.numero.includes(elNum))["va"] + pasoAnterior[elNum] = siguientePaso.find(k => k.numero.includes(elNum))["va"] //Asignamos pasoAnterior al número. + siguientePaso.splice(siguientePaso.indexOf(elNum), 1) + console.log("******************** "+siguientePaso.find(k => k.numero.includes(elNum))) + } + if(siguientePaso.length>1){console.log(siguientePaso[1]["numero"], siguientePaso[1]["va"])} -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 } + var { key } = stepsInitial.find(k => k.keywords.includes(message)) || { key: null } + + /* ############################################### * REGEXP * #################################################### + Si queremos usar RegExp, en los "keywords" de inital.json, en lugar de un arreglo usamos un string (quitamos los []) + y en él usamos "*" para significar cualquier texto y "|" para significar "OR", esto nos permite ser mas flexibles + con los "keywords", por ejemplo, si queremos que el mensaje pueda decir: + + "Hola quiero info del paquete" o "Requiero mas informacion" + + ponemos "info" y la regla se va a disparar porque los dos contienen "info", o si queremos que se dispare con: + + "Quiero info del paquete numero 3" o "Me gusto el paquete de Angular" + + ponemos "paquete*3|paquete*angular" y la regla se dispara porque contiene "paquete" Y "3" -O- "paquete" Y "angular". + + ##################################################################################################################### + */ + var {keywords} = stepsInitial.find(k => k.key.includes(key)) || { keywords: null } + if(!Array.isArray(keywords)){key=null;}//Si "keywords" no es arreglo entonces ponemos "key" en null y usamos REGEXP para buscar reglas. + if(key == null && message.length > 0){ + console.log("======= KEY ES NULO USAMOS REGEXP ======="); + for (i=0; i -1){ + console.log("**************** HAY URL ****************") + } + break; + } + else{x = null;} + } else + { console.log("NO CUMPLE PASO REQ"); + // console.log("pasoReq=" + resps[stepsInitial[i].key.toString()].pasoRequerido + " - PasoAnt=" + ultimoStep) + } + } + } + // console.log("<<<<<<<<< "+key); + // cumplePasoRequerido(key) + // ultimoPaso = pasoRequerido; + // ultimoStep = key; + } const response = key || null - resolve(response) + // if(key != null){remplazos(resps[key].replyMessage.join(''));} + if(resps[key]!=undefined){VA = resps[key].goto}else{VA=null} + cumplePasoRequerido(key); + vamosA = VA; + // console.log(elNum) + + if(vamosA != "" && vamosA != undefined && cumplePasoPrevio == true){ + console.log("ASIGNAMOS VAMOSA = " + vamosA); + pasoAnterior[elNum] = vamosA; + } + // console.log("ULTIMOSTEP="+ultimoStep) + vamosA = ""; + // console.log("MESSAGE: "+message); + // console.log("KEY: "+key); + // console.log("RESPONSE: "+response); + if(cumplePasoPrevio) {resolve(response);} } + /** * Si usas MYSQL */ @@ -25,7 +122,6 @@ const get = (message) => new Promise((resolve, reject) => { }) - const reply = (step) => new Promise((resolve, reject) => { /** * Si no estas usando un gesto de base de datos @@ -52,13 +148,13 @@ const reply = (step) => new Promise((resolve, reject) => { } }) -const getIA = (message, sessionId) => new Promise((resolve, reject) => { +const getIA = (message) => new Promise((resolve, reject) => { /** * Si usas dialogflow */ if (process.env.DATABASE === 'dialogflow') { let resData = { replyMessage: '', media: null, trigger: null } - getDataIa(message, sessionId, (dt) => { + getDataIa(message,(dt) => { resData = { ...resData, ...dt } resolve(resData) }) @@ -70,16 +166,17 @@ const getIA = (message, sessionId) => new Promise((resolve, reject) => { * @param {*} message * @param {*} date * @param {*} trigger - * @param {*} number + * @param {*} number * @returns */ -const saveMessage = ( message, trigger, number ) => new Promise( async (resolve, reject) => { +const saveMessage = ( message, trigger, number, regla ) => new Promise( async (resolve, reject) => { //MOD by CHV - Agregamos el partametro "regla" para poder guardarlo en "chats/numero.json" switch ( process.env.DATABASE ) { case 'mysql': resolve( await saveMessageMysql( message, trigger, number ) ) break; case 'none': - resolve( await saveMessageJson( message, trigger, number ) ) + resolve( await saveMessageJson( message, trigger, number, regla) ) //MOD by CHV - Agregamos el paranetro "regla" + // console.log("REGLA DESDE APP.JS="+regla) break; default: resolve(true) @@ -87,4 +184,147 @@ const saveMessage = ( message, trigger, number ) => new Promise( async (resolve } }) -module.exports = { get, reply, getIA, saveMessage } \ No newline at end of file +module.exports = { get, reply, getIA, saveMessage, remplazos, stepsInitial } //MOD by CHV - Agregamos "remplazos" y "stepsInitial" para usarlos en "apps.js" + +/** + * Reemplaza texto en la respuesta con variables predefinidas. + */ +function remplazos(elTexto){ + laLista = elTexto.toString().split(' '); + // console.log(laLista); + // console.log('============= remplazos ============'); + for (var i = 0; i < laLista.length; i++) { + // console.log('Revisamos: '+laLista[i]); + if (laLista[i].search('%dia_semana%')>-1){//Remplaza con el dia de hoy. + var dia = new Date().getDay(); + if(dia==0){diaSemana='domingo';} + else if(dia==1){diaSemana='lunes';} + else if(dia==2){diaSemana='martes';} + else if(dia==3){diaSemana='miercoles';} + else if(dia==4){diaSemana='jueves';} + else if(dia==5){diaSemana='viernes';} + else {diaSemana='sábado';} + elTexto = elTexto.replace('%dia_semana%', diaSemana); + } + if (laLista[i].search('%saludo%')>-1){//Remplaza con "Buenos dias, tardes o noches" dependiendo de la hora. + var hora = new Date().getHours() + if(hora>0 && hora < 12){saludo='Buenos días';} + else if(hora>11 && hora < 19){saludo='Buenas tardes';} + else {saludo='Buenas noches';} + elTexto = elTexto.toString().replace('%saludo%', saludo); + } + if (laLista[i].search('%hora24%')>-1){//Remplaza con la hora a 24 hrs. + var hora = new Date().getHours(); + if (hora.toString().length < 2){hora = "0" + hora;} + elTexto = elTexto.toString().replace('%hora24%', hora); + } + if (laLista[i].search('%hora12%')>-1){//Remplaza con la hora a 12 hrs. + var hora = new Date().getHours(); + var ampm = hora >= 12 ? 'pm' : 'am'; + hora = hora % 12; + hora = hora ? hora : 12; // the hour '0' should be '12' + if (hora.toString().length < 2){hora = "0" + hora;} + elTexto = elTexto.toString().replace('%hora12%', hora); + } + if (laLista[i].search('%minutos%')>-1){//Remplaza con los minutos de la hora actual. + var mins = new Date().getMinutes(); + if (mins.toString().length < 2){mins = "0" + mins;} + elTexto = elTexto.toString().replace('%minutos%', mins); + } + if (laLista[i].search('%ampm%')>-1){//Remplaza con am o pm. + var hours = new Date().getHours(); + var ampm = hours >= 12 ? 'pm' : 'am'; + elTexto = elTexto.toString().replace('%ampm%', ampm); + } + if (laLista[i].search('%rnd_')>-1){//Remplaza con opción al azar dentro de las especificadas. + var inicio = laLista[i].search('%rnd_'); + var final = laLista[i].indexOf("%", inicio+1); + // console.log(inicio, final); + var subStr = laLista[i].substring(inicio, final+1); + // console.log("El substring="+subStr); + var partes = subStr.toString().split('_'); + if(partes.length > 1){ + var opciones = partes[1].toString().substring(0,partes[1].toString().length-1).split(","); + var elRand = Math.floor(Math.random() * (opciones.length)); + if(elRand == opciones.length){elRand = elRand - 1;} + // console.log(opciones.length, elRand, opciones[elRand]); + elTexto = elTexto.toString().replace(subStr, opciones[elRand]); + } + else{ + elTexto = elTexto.toString().replace(subStr, ""); + } + } + if(laLista[i].search('%msjant_')>-1){//Remplaza con el mensaje anterior especificado. + var histlMsjs = {}; + console.log("entramos a msjant") + // var hayHistorial = (chkFile(`${__dirname}/chats/`+from+".json")); + if(chkFile(`${__dirname}/../chats/`+elNum+".json")){ + let rawdata = fs.readFileSync(`./chats/${elNum}.json`); + let elHistorial0 = JSON.parse(rawdata); + elHistorial = elHistorial0["messages"]; + + var inicio = laLista[i].search('%msjant_'); + var final = laLista[i].indexOf("%", inicio+1); + var subStr = laLista[i].substring(inicio, final+1); + console.log("Substr = |" + subStr + "|"); + var partes = subStr.toString().split('_'); + if(partes.length > 1){ + console.log("Partes[1] = |" + partes[1] + "|"); + let posicion0 = partes[1].substring(0, partes[1].length-1) + console.log("Posicion0 = |" + posicion0 + "|"); + posicion = ((posicion0*1) + 1); + console.log("Posicion = " + posicion); + console.log( elHistorial.length ); + console.log((elHistorial.length*1)-posicion); + console.log("Mensaje="+elHistorial[elHistorial.length - posicion]["message"]) + elTexto = elTexto.toString().replace(subStr, elHistorial[elHistorial.length - posicion]["message"]); + } + // histlMsjs = elHistorial["messages"]; + // totalMsjs = histlMsjs.length-1; + // ultimoMensaje = histlMsjs[histlMsjs.length-1]; + // let mensajeAnterior = elHistorial["messages"][totalMsjs-1]; + // console.log("Mensajes:"+totalMsjs+", Ultimo:"+JSON.stringify(ultimoMensaje)); + // console.log("Anterior:"+JSON.stringify(mensajeAnterior)); + } + // return histlMsjs; + + } + } + // console.log("EL TEXTO="+elTexto); + return elTexto + } + +/** + * Revisa si la regla especificada depende (es submenu) de otra regla, y cambia la variable "cumplePasoPrevio" a verdadero o falso. + */ + function cumplePasoRequerido(step){ + //Traemos las respuestas para obtener el "pasoRequerido". + if(resps[step]!=undefined){pasoRequerido=resps[step].pasoRequerido}else{pasoRequerido=null} + if((pasoRequerido != null && pasoRequerido == ultimoStep)){ + // console.log("REQUIERE PASO PREVIO Y CUMPLE"); + cumplePasoPrevio = true; + } + else if((pasoRequerido != null && pasoRequerido != pasoAnterior[elNum])){ + // console.log("REQUIERE PASO PREVIO Y NO LO CUMPLE"); + cumplePasoPrevio = false; + } + else{ + // console.log("NO REQUIERE PASO PREVIO") + cumplePasoPrevio = true; + } + pasoAnterior[elNum] = step + ultimoPaso = pasoRequerido; +} + +const fs = require('fs'); +function chkFile(theFile){ //MOD by CHV - Agregamos para revisar que exista el archivo "chats/numero.json" + if (fs.existsSync(theFile)) { + // console.log("Si existe el archivo "+ theFile); + var h = true; + } + else{ + // console.log("No existe el archivo "+ theFile); + var h = false; + } + return h; +} \ No newline at end of file diff --git a/adapter/jsonDb.js b/adapter/jsonDb.js index dbc2626..4ca72ba 100644 --- a/adapter/jsonDb.js +++ b/adapter/jsonDb.js @@ -1,14 +1,14 @@ const Path = require('path') const StormDB = require("stormdb"); const date = new Date().toISOString(); -const saveMessageJson = (message, trigger, number) => new Promise( async(resolve,reject) =>{ +const saveMessageJson = (message, trigger, number, regla) => 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.get("messages").push({ message, date, trigger, regla}); db.save(); resolve('Saved') } catch (error) { diff --git a/app.js b/app.js index 36580c1..dc93a26 100644 --- a/app.js +++ b/app.js @@ -4,45 +4,61 @@ require('dotenv').config() const fs = require('fs'); const express = require('express'); +global.siguientePaso = [{"numero":"1", "va":"XXX"}]; //MOD by CHV - Agregamos para pasar el VAMOSA a "index.js" const cors = require('cors') +const axios = require('axios').default;//MOD by CHV - Agregamos para el get del "/URL" const qrcode = require('qrcode-terminal'); -const { Client, LocalAuth } = require('whatsapp-web.js'); +const { Client, LocalAuth, Buttons, List } = 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 { sendMedia, sendMessage, lastTrigger, sendMessageButton, readChat } = require('./controllers/send'); +const { remplazos, stepsInitial} = require('./adapter/index');//MOD by CHV - Agregamos para utilizar remplazos y stepsInitial +const { isUndefined } = require('util'); +const { isSet } = require('util/types'); +const { Console } = require('console'); 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 - */ +var client; +var totalMsjs; //MOD by CHV - +var vamosA = ""; //MOD by CHV - +var newBody; //MOD by CHV - +var nuevaRespuesta; //MOD by CHV - Se agrego para los remplazos +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)) { + // console.log("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"); + console.log("+++++++++++++++++++++++++++++++++++++ INICIO +++++++++++++++++++++++++++++++++++++++"); + // console.log("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"); + console.log("HORA:"+new Date().toLocaleTimeString()+" FROM:"+from+", BODY:"+body+", HASMEDIA:"+hasMedia); + newBody = removeDiacritics(body) //MOD by CHV - Agregamos para quitar acentos + // newBody = remplazos(newBody); + vamosA = ""; + 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) + message = newBody.toLowerCase(); const number = cleanNumber(from) - await readChat(number, message) + var { key } = stepsInitial.find(k => k.keywords.includes(message)) || { key: null }//MOD by CHV - Se agrega para obtener KEY + await readChat(number, message, null , key) //MOD by CHV - Agregamos key/regla para guardarla en "chats/numero.json" + /** * Guardamos el archivo multimedia que envia */ @@ -54,118 +70,336 @@ const listenMessage = () => client.on('message', async msg => { /** * 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, number); + if(!message.length) return; + const response = await bothResponse(message); await sendMessage(client, from, response.replyMessage); if (response.media) { - sendMedia(client, from, response.media); + sendMedia(client, from, response.media, response.trigger); } return } - /** - * Ver si viene de un paso anterior - * Aqui podemos ir agregando más pasos - * a tu gusto! - */ + var tempBody = body.toString().toLowerCase(); + + /** + * PRUEBA BOTONES NUEVOS + */ + // if(body=="579"){ + // const buttons_reply = new Buttons("Por favor vuelve a intentar, mandando *SOLO* la palabra *gallina* con una diagonal al principio 👇🏽 \n\n */gallina*\n ", [{body: "/gallina", id: 'errorGallina'}], 'Error', 'O haz clic en el siguiente botón') // Reply button + // for (const component of [buttons_reply]) await client.sendMessage(from, component); + // } + + + + /** + * Ver si viene de un paso anterior + * Aqui podemos ir agregando más pasos + * a tu gusto! + */ + const lastStep = await lastTrigger(from) || null; + // console.log("LAST STEP="+lastStep+", FROM:"+from); if (lastStep) { const response = await responseMessages(lastStep) - await sendMessage(client, from, response.replyMessage); + console.log("CLIENT="+client+", FROM:"+from+", REPLYMESSAGE:"+response.replyMessage); + await sendMessage(client, from, response.replyMessage, lastStep); } - + /** * Respondemos al primero paso si encuentra palabras clave */ - const step = await getMessages(message); - + // const step = await getMessages(message, ); + // console.log("STEP - "+step+"|"+message); + // console.log("****** STEP="+step); + // console.log("****** MESSAGE:"+message); + const step = await getMessages(message, from); if (step) { const response = await responseMessages(step); + // console.log("URL:"+nuevaRespuesta); + // console.log("HAY URL?? : "+nuevaRespuesta.search("/URL")); + + var resps = require('./flow/response.json'); + nuevaRespuesta = remplazos(resps[step].replyMessage.join('')); + var pasoRequerido = resps[step].pasoRequerido; + // var hayRequest = false; + // if(hayRequest==false && nuevaRespuesta.search("/URL")>-1){console.log("Paramos flujo para que no mande el mensaje '/URL'."); return;}//Si el trigger es desbloqueo ya no hace nada mas. /** * 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){ + // console.log("+++++++++++++++++++ SENDING MSG WITH DELAY ("+response.delay+") +++++++++++++++++"); + setTimeout(() => { + sendMessage(client, from, nuevaRespuesta, response.trigger, step); + // console.log(" ************* Msg with delay SENT ****************") + }, response.delay) + } + else{ + await sendMessage(client, from, nuevaRespuesta, response.trigger, step); + } if (!response.delay && response.media) { - sendMedia(client, from, response.media); + // console.log("++++++++++++++++++++++++++++ SEND MEDIA NO DELAY +++++++++++++++++++++++++++++++++++"); + sendMedia(client, from, response.media, response.trigger); } if (response.delay && response.media) { setTimeout(() => { - sendMedia(client, from, response.media); + // console.log("++++++++++++++++++++++++++++ SEND MEDIA AND DELAY +++++++++++++++++++++++++++++++++++"); + sendMedia(client, from, response.media, response.trigger); }, response.delay) } + if(response.hasOwnProperty('actions')){ + const { actions } = response; + // console.log("++++++++++++++++++++++++++++ SEND MESG BUTTON +++++++++++++++++++++++++++++++++++"); + await sendMessageButton(client, from, null, actions); + // return + } + return + } + /** + * Regresa el mensaje enviado, con los remplazos procesados. + */ + if(message.search('/rpt') > -1){ + newBody = remplazos(newBody); + newBody = newBody.replace("/rpt ", ""); + client.sendMessage(from, newBody); return } + /* + ============================================================================ + ========================== ENVIO MASIVO TEST =========================== + ============================================================================ + */ + if(message=='/spam'){ + const masivo = require('./spam.json') + function sleep(ms) { + return new Promise(resolve => setTimeout(resolve, ms)); + } + async function retardo() { + for (i=0;i generateImage(qr, () => { + qrcode.generate(qr, { small: true }); + console.log(`Ver QR http://localhost:${port}/qr`) + socketEvents.sendQR(qr) + })) -client = new Client({ - authStrategy: new LocalAuth(), - puppeteer: { headless: true } -}); + client.on('ready', (a) => { + connectionReady() + listenMessage() + // socketEvents.sendStatus(client) + }); -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() + 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 en el puerto ${port}`); + }) + checkEnvFile(); + +function chkFile(theFile){ //MOD by CHV - Agregamos para revisar que exista el archivo "chats/numero.json" + if (fs.existsSync(theFile)) { + // console.log("Si existe el archivo "+ theFile); + var h = true; + } + else{ + // console.log("No existe el archivo "+ theFile); + var h = false; + } + return h; } -server.listen(port, () => { - console.log(`El server esta listo por el puerto ${port}`); -}) -checkEnvFile(); \ No newline at end of file +/** + * Regresa el historial de mensajes del número especificado del directorio "chats". + */ +function traeMensajes(from){ //MOD by CHV - Agregamos para traer el historial de mensajes + var histlMsjs = {}; + var hayHistorial = (chkFile(`${__dirname}/chats/`+from+".json")); + if(hayHistorial){ + let rawdata = fs.readFileSync(`./chats/${from}.json`); + let elHistorial = JSON.parse(rawdata); + histlMsjs = elHistorial["messages"]; + // totalMsjs = histlMsjs.length-1; + ultimoMensaje = histlMsjs[histlMsjs.length-1]; + // let mensajeAnterior = elHistorial["messages"][totalMsjs-1]; + // console.log("Mensajes:"+totalMsjs+", Ultimo:"+JSON.stringify(ultimoMensaje)); + // console.log("Anterior:"+JSON.stringify(mensajeAnterior)); + } + return histlMsjs; +} + +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ +var defaultDiacriticsRemovalMap = [ //MOD by CHV - Agregamos para eliminar acentos + {'base':'A', 'letters':'\u0041\u24B6\uFF21\u00C0\u00C1\u00C2\u1EA6\u1EA4\u1EAA\u1EA8\u00C3\u0100\u0102\u1EB0\u1EAE\u1EB4\u1EB2\u0226\u01E0\u00C4\u01DE\u1EA2\u00C5\u01FA\u01CD\u0200\u0202\u1EA0\u1EAC\u1EB6\u1E00\u0104\u023A\u2C6F'}, + {'base':'AA','letters':'\uA732'}, + {'base':'AE','letters':'\u00C6\u01FC\u01E2'}, + {'base':'AO','letters':'\uA734'}, + {'base':'AU','letters':'\uA736'}, + {'base':'AV','letters':'\uA738\uA73A'}, + {'base':'AY','letters':'\uA73C'}, + {'base':'B', 'letters':'\u0042\u24B7\uFF22\u1E02\u1E04\u1E06\u0243\u0182\u0181'}, + {'base':'C', 'letters':'\u0043\u24B8\uFF23\u0106\u0108\u010A\u010C\u00C7\u1E08\u0187\u023B\uA73E'}, + {'base':'D', 'letters':'\u0044\u24B9\uFF24\u1E0A\u010E\u1E0C\u1E10\u1E12\u1E0E\u0110\u018B\u018A\u0189\uA779\u00D0'}, + {'base':'DZ','letters':'\u01F1\u01C4'}, + {'base':'Dz','letters':'\u01F2\u01C5'}, + {'base':'E', 'letters':'\u0045\u24BA\uFF25\u00C8\u00C9\u00CA\u1EC0\u1EBE\u1EC4\u1EC2\u1EBC\u0112\u1E14\u1E16\u0114\u0116\u00CB\u1EBA\u011A\u0204\u0206\u1EB8\u1EC6\u0228\u1E1C\u0118\u1E18\u1E1A\u0190\u018E'}, + {'base':'F', 'letters':'\u0046\u24BB\uFF26\u1E1E\u0191\uA77B'}, + {'base':'G', 'letters':'\u0047\u24BC\uFF27\u01F4\u011C\u1E20\u011E\u0120\u01E6\u0122\u01E4\u0193\uA7A0\uA77D\uA77E'}, + {'base':'H', 'letters':'\u0048\u24BD\uFF28\u0124\u1E22\u1E26\u021E\u1E24\u1E28\u1E2A\u0126\u2C67\u2C75\uA78D'}, + {'base':'I', 'letters':'\u0049\u24BE\uFF29\u00CC\u00CD\u00CE\u0128\u012A\u012C\u0130\u00CF\u1E2E\u1EC8\u01CF\u0208\u020A\u1ECA\u012E\u1E2C\u0197'}, + {'base':'J', 'letters':'\u004A\u24BF\uFF2A\u0134\u0248'}, + {'base':'K', 'letters':'\u004B\u24C0\uFF2B\u1E30\u01E8\u1E32\u0136\u1E34\u0198\u2C69\uA740\uA742\uA744\uA7A2'}, + {'base':'L', 'letters':'\u004C\u24C1\uFF2C\u013F\u0139\u013D\u1E36\u1E38\u013B\u1E3C\u1E3A\u0141\u023D\u2C62\u2C60\uA748\uA746\uA780'}, + {'base':'LJ','letters':'\u01C7'}, + {'base':'Lj','letters':'\u01C8'}, + {'base':'M', 'letters':'\u004D\u24C2\uFF2D\u1E3E\u1E40\u1E42\u2C6E\u019C'}, + {'base':'N', 'letters':'\u004E\u24C3\uFF2E\u01F8\u0143\u00D1\u1E44\u0147\u1E46\u0145\u1E4A\u1E48\u0220\u019D\uA790\uA7A4'}, + {'base':'NJ','letters':'\u01CA'}, + {'base':'Nj','letters':'\u01CB'}, + {'base':'O', 'letters':'\u004F\u24C4\uFF2F\u00D2\u00D3\u00D4\u1ED2\u1ED0\u1ED6\u1ED4\u00D5\u1E4C\u022C\u1E4E\u014C\u1E50\u1E52\u014E\u022E\u0230\u00D6\u022A\u1ECE\u0150\u01D1\u020C\u020E\u01A0\u1EDC\u1EDA\u1EE0\u1EDE\u1EE2\u1ECC\u1ED8\u01EA\u01EC\u00D8\u01FE\u0186\u019F\uA74A\uA74C'}, + {'base':'OI','letters':'\u01A2'}, + {'base':'OO','letters':'\uA74E'}, + {'base':'OU','letters':'\u0222'}, + {'base':'OE','letters':'\u008C\u0152'}, + {'base':'oe','letters':'\u009C\u0153'}, + {'base':'P', 'letters':'\u0050\u24C5\uFF30\u1E54\u1E56\u01A4\u2C63\uA750\uA752\uA754'}, + {'base':'Q', 'letters':'\u0051\u24C6\uFF31\uA756\uA758\u024A'}, + {'base':'R', 'letters':'\u0052\u24C7\uFF32\u0154\u1E58\u0158\u0210\u0212\u1E5A\u1E5C\u0156\u1E5E\u024C\u2C64\uA75A\uA7A6\uA782'}, + {'base':'S', 'letters':'\u0053\u24C8\uFF33\u1E9E\u015A\u1E64\u015C\u1E60\u0160\u1E66\u1E62\u1E68\u0218\u015E\u2C7E\uA7A8\uA784'}, + {'base':'T', 'letters':'\u0054\u24C9\uFF34\u1E6A\u0164\u1E6C\u021A\u0162\u1E70\u1E6E\u0166\u01AC\u01AE\u023E\uA786'}, + {'base':'TZ','letters':'\uA728'}, + {'base':'U', 'letters':'\u0055\u24CA\uFF35\u00D9\u00DA\u00DB\u0168\u1E78\u016A\u1E7A\u016C\u00DC\u01DB\u01D7\u01D5\u01D9\u1EE6\u016E\u0170\u01D3\u0214\u0216\u01AF\u1EEA\u1EE8\u1EEE\u1EEC\u1EF0\u1EE4\u1E72\u0172\u1E76\u1E74\u0244'}, + {'base':'V', 'letters':'\u0056\u24CB\uFF36\u1E7C\u1E7E\u01B2\uA75E\u0245'}, + {'base':'VY','letters':'\uA760'}, + {'base':'W', 'letters':'\u0057\u24CC\uFF37\u1E80\u1E82\u0174\u1E86\u1E84\u1E88\u2C72'}, + {'base':'X', 'letters':'\u0058\u24CD\uFF38\u1E8A\u1E8C'}, + {'base':'Y', 'letters':'\u0059\u24CE\uFF39\u1EF2\u00DD\u0176\u1EF8\u0232\u1E8E\u0178\u1EF6\u1EF4\u01B3\u024E\u1EFE'}, + {'base':'Z', 'letters':'\u005A\u24CF\uFF3A\u0179\u1E90\u017B\u017D\u1E92\u1E94\u01B5\u0224\u2C7F\u2C6B\uA762'}, + {'base':'a', 'letters':'\u0061\u24D0\uFF41\u1E9A\u00E0\u00E1\u00E2\u1EA7\u1EA5\u1EAB\u1EA9\u00E3\u0101\u0103\u1EB1\u1EAF\u1EB5\u1EB3\u0227\u01E1\u00E4\u01DF\u1EA3\u00E5\u01FB\u01CE\u0201\u0203\u1EA1\u1EAD\u1EB7\u1E01\u0105\u2C65\u0250'}, + {'base':'aa','letters':'\uA733'}, + {'base':'ae','letters':'\u00E6\u01FD\u01E3'}, + {'base':'ao','letters':'\uA735'}, + {'base':'au','letters':'\uA737'}, + {'base':'av','letters':'\uA739\uA73B'}, + {'base':'ay','letters':'\uA73D'}, + {'base':'b', 'letters':'\u0062\u24D1\uFF42\u1E03\u1E05\u1E07\u0180\u0183\u0253'}, + {'base':'c', 'letters':'\u0063\u24D2\uFF43\u0107\u0109\u010B\u010D\u00E7\u1E09\u0188\u023C\uA73F\u2184'}, + {'base':'d', 'letters':'\u0064\u24D3\uFF44\u1E0B\u010F\u1E0D\u1E11\u1E13\u1E0F\u0111\u018C\u0256\u0257\uA77A'}, + {'base':'dz','letters':'\u01F3\u01C6'}, + {'base':'e', 'letters':'\u0065\u24D4\uFF45\u00E8\u00E9\u00EA\u1EC1\u1EBF\u1EC5\u1EC3\u1EBD\u0113\u1E15\u1E17\u0115\u0117\u00EB\u1EBB\u011B\u0205\u0207\u1EB9\u1EC7\u0229\u1E1D\u0119\u1E19\u1E1B\u0247\u025B\u01DD'}, + {'base':'f', 'letters':'\u0066\u24D5\uFF46\u1E1F\u0192\uA77C'}, + {'base':'g', 'letters':'\u0067\u24D6\uFF47\u01F5\u011D\u1E21\u011F\u0121\u01E7\u0123\u01E5\u0260\uA7A1\u1D79\uA77F'}, + {'base':'h', 'letters':'\u0068\u24D7\uFF48\u0125\u1E23\u1E27\u021F\u1E25\u1E29\u1E2B\u1E96\u0127\u2C68\u2C76\u0265'}, + {'base':'hv','letters':'\u0195'}, + {'base':'i', 'letters':'\u0069\u24D8\uFF49\u00EC\u00ED\u00EE\u0129\u012B\u012D\u00EF\u1E2F\u1EC9\u01D0\u0209\u020B\u1ECB\u012F\u1E2D\u0268\u0131'}, + {'base':'j', 'letters':'\u006A\u24D9\uFF4A\u0135\u01F0\u0249'}, + {'base':'k', 'letters':'\u006B\u24DA\uFF4B\u1E31\u01E9\u1E33\u0137\u1E35\u0199\u2C6A\uA741\uA743\uA745\uA7A3'}, + {'base':'l', 'letters':'\u006C\u24DB\uFF4C\u0140\u013A\u013E\u1E37\u1E39\u013C\u1E3D\u1E3B\u017F\u0142\u019A\u026B\u2C61\uA749\uA781\uA747'}, + {'base':'lj','letters':'\u01C9'}, + {'base':'m', 'letters':'\u006D\u24DC\uFF4D\u1E3F\u1E41\u1E43\u0271\u026F'}, + {'base':'n', 'letters':'\u006E\u24DD\uFF4E\u01F9\u0144\u00F1\u1E45\u0148\u1E47\u0146\u1E4B\u1E49\u019E\u0272\u0149\uA791\uA7A5'}, + {'base':'nj','letters':'\u01CC'}, + {'base':'o', 'letters':'\u006F\u24DE\uFF4F\u00F2\u00F3\u00F4\u1ED3\u1ED1\u1ED7\u1ED5\u00F5\u1E4D\u022D\u1E4F\u014D\u1E51\u1E53\u014F\u022F\u0231\u00F6\u022B\u1ECF\u0151\u01D2\u020D\u020F\u01A1\u1EDD\u1EDB\u1EE1\u1EDF\u1EE3\u1ECD\u1ED9\u01EB\u01ED\u00F8\u01FF\u0254\uA74B\uA74D\u0275'}, + {'base':'oi','letters':'\u01A3'}, + {'base':'ou','letters':'\u0223'}, + {'base':'oo','letters':'\uA74F'}, + {'base':'p','letters':'\u0070\u24DF\uFF50\u1E55\u1E57\u01A5\u1D7D\uA751\uA753\uA755'}, + {'base':'q','letters':'\u0071\u24E0\uFF51\u024B\uA757\uA759'}, + {'base':'r','letters':'\u0072\u24E1\uFF52\u0155\u1E59\u0159\u0211\u0213\u1E5B\u1E5D\u0157\u1E5F\u024D\u027D\uA75B\uA7A7\uA783'}, + {'base':'s','letters':'\u0073\u24E2\uFF53\u00DF\u015B\u1E65\u015D\u1E61\u0161\u1E67\u1E63\u1E69\u0219\u015F\u023F\uA7A9\uA785\u1E9B'}, + {'base':'t','letters':'\u0074\u24E3\uFF54\u1E6B\u1E97\u0165\u1E6D\u021B\u0163\u1E71\u1E6F\u0167\u01AD\u0288\u2C66\uA787'}, + {'base':'tz','letters':'\uA729'}, + {'base':'u','letters': '\u0075\u24E4\uFF55\u00F9\u00FA\u00FB\u0169\u1E79\u016B\u1E7B\u016D\u00FC\u01DC\u01D8\u01D6\u01DA\u1EE7\u016F\u0171\u01D4\u0215\u0217\u01B0\u1EEB\u1EE9\u1EEF\u1EED\u1EF1\u1EE5\u1E73\u0173\u1E77\u1E75\u0289'}, + {'base':'v','letters':'\u0076\u24E5\uFF56\u1E7D\u1E7F\u028B\uA75F\u028C'}, + {'base':'vy','letters':'\uA761'}, + {'base':'w','letters':'\u0077\u24E6\uFF57\u1E81\u1E83\u0175\u1E87\u1E85\u1E98\u1E89\u2C73'}, + {'base':'x','letters':'\u0078\u24E7\uFF58\u1E8B\u1E8D'}, + {'base':'y','letters':'\u0079\u24E8\uFF59\u1EF3\u00FD\u0177\u1EF9\u0233\u1E8F\u00FF\u1EF7\u1E99\u1EF5\u01B4\u024F\u1EFF'}, + {'base':'z','letters':'\u007A\u24E9\uFF5A\u017A\u1E91\u017C\u017E\u1E93\u1E95\u01B6\u0225\u0240\u2C6C\uA763'} +]; + +var diacriticsMap = {}; +for (var i=0; i < defaultDiacriticsRemovalMap .length; i++){ + var letters = defaultDiacriticsRemovalMap [i].letters; + for (var j=0; j < letters.length ; j++){ + diacriticsMap[letters[j]] = defaultDiacriticsRemovalMap [i].base; + } +} + +// "what?" version ... http://jsperf.com/diacritics/12 +function removeDiacritics (str) { + return str.replace(/[^\u0000-\u007E]/g, function(a){ + return diacriticsMap[a] || a; + }); +} +// var paragraph = "L'avantage d'utiliser le lorem ipsum est bien évidemment de pouvoir créer des maquettes ou de remplir un site internet de contenus qui présentent un rendu s'approchant un maximum du rendu final. \n Par défaut lorem ipsum ne contient pas d'accent ni de caractères spéciaux contrairement à la langue française qui en contient beaucoup. C'est sur ce critère que nous proposons une solution avec cet outil qui générant du faux-texte lorem ipsum mais avec en plus, des caractères spéciaux tel que les accents ou certains symboles utiles pour la langue française. \n L'utilisation du lorem standard est facile d’utilisation mais lorsque le futur client utilisera votre logiciel il se peut que certains caractères spéciaux ou qu'un accent ne soient pas codés correctement. \n Cette page a pour but donc de pouvoir perdre le moins de temps possible et donc de tester directement si tous les encodages de base de donnée ou des sites sont les bons de plus il permet de récuperer un code css avec le texte formaté !"; +// alert(removeDiacritics(paragraph)); \ No newline at end of file diff --git a/controllers/connection.js b/controllers/connection.js index a2aa6f4..edb766e 100644 --- a/controllers/connection.js +++ b/controllers/connection.js @@ -1,7 +1,7 @@ const connectionReady = (cb = () =>{}) => { - console.log('Listo para escuchas mensajes') - console.log('Client is ready!'); - console.log('🔴 escribe: hola'); + console.log('Listo para escuchar mensajes') + console.log('El cliente esta listo!'); + console.log('🔴 Escribe: /hola'); cb() } diff --git a/controllers/flows.js b/controllers/flows.js index b0fc9d3..42e81a2 100644 --- a/controllers/flows.js +++ b/controllers/flows.js @@ -1,8 +1,9 @@ const {get, reply, getIA} = require('../adapter') const {saveExternalFile, checkIsUrl} = require('./handle') -const getMessages = async (message) => { - const data = await get(message) +const getMessages = async (message, num) => { //MOD by CHV - Agregamos el parametro "num" para recibir el numero desde "app.js" + // console.log("GETMESSAGES (flow.js)") + const data = await get(message, num) //MOD by CHV - Agregamos "num" return data } @@ -15,8 +16,8 @@ const responseMessages = async (step) => { return data } -const bothResponse = async (message, sessionId) => { - const data = await getIA(message, sessionId) +const bothResponse = async (message) => { + const data = await getIA(message) if(data && data.media){ const file = await saveExternalFile(data.media) return {...data,...{media:file}} diff --git a/controllers/handle.js b/controllers/handle.js index ce006d7..7b9e31a 100644 --- a/controllers/handle.js +++ b/controllers/handle.js @@ -69,7 +69,7 @@ const createClient = () => { authStrategy: new LocalAuth( {dataPath: './sessions/', clientId: 'bot'}), - puppeteer: { headless: false } + puppeteer: { headless: false, args: ['--no-sandbox','--disable-setuid-sandbox'] } }); } @@ -80,4 +80,4 @@ const isValidNumber = (rawNumber) => { return !exist } -module.exports = {cleanNumber, saveExternalFile, generateImage, checkIsUrl, checkEnvFile, createClient, isValidNumber} \ No newline at end of file +module.exports = {cleanNumber, saveExternalFile, generateImage, checkIsUrl, checkEnvFile, createClient, isValidNumber} diff --git a/controllers/save.js b/controllers/save.js index 92555e0..39a1964 100644 --- a/controllers/save.js +++ b/controllers/save.js @@ -8,8 +8,14 @@ const fs = require('fs') const saveMedia = (media) => { + var ext = ""; const extensionProcess = mimeDb[media.mimetype] - const ext = extensionProcess.extensions[0] + try { + ext = extensionProcess.extensions[0] + } catch (error) { + ext = ""; + } + fs.writeFile(`./media/${Date.now()}.${ext}`, media.data, { encoding: 'base64' }, function (err) { console.log('** Archivo Media Guardado **'); }); diff --git a/controllers/send.js b/controllers/send.js index d081381..7e25ec8 100644 --- a/controllers/send.js +++ b/controllers/send.js @@ -4,6 +4,7 @@ const moment = require('moment'); const fs = require('fs'); const { MessageMedia, Buttons } = require('whatsapp-web.js'); const { cleanNumber } = require('./handle') +const { remplazos } = require('../adapter/index'); //MOD by CHV - Agregamos remplazos const DELAY_TIME = 170; //ms const DIR_MEDIA = `${__dirname}/../mediaSend`; // import { Low, JSONFile } from 'lowdb' @@ -15,12 +16,15 @@ const { saveMessage } = require('../adapter') * @param {*} fileName */ -const sendMedia = (client, number = null, fileName = null) => { - if(!client) return cosnole.error("El objeto cliente no está definido."); +const sendMedia = (client, number = null, fileName = null, trigger = null) => { + if(!client) return console.error("El objeto cliente no está definido."); + console.log("MEDIA:"+fileName); try { number = cleanNumber(number || 0) const file = `${DIR_MEDIA}/${fileName}`; + console.log("FILE="+file); if (fs.existsSync(file)) { + console.log("ARCHIVO EXISTE"); const media = MessageMedia.fromFilePath(file); client.sendMessage(number, media, { sendAudioAsVoice: true }); } @@ -36,7 +40,7 @@ const sendMedia = (client, number = null, fileName = null) => { */ const sendMediaVoiceNote = (client, number = null, fileName = null) => { - if(!client) return cosnole.error("El objeto cliente no está definido."); + if(!client) return console.error("El objeto cliente no está definido."); try { number = cleanNumber(number || 0) const file = `${DIR_MEDIA}/${fileName}`; @@ -54,13 +58,16 @@ const sendMedia = (client, number = null, fileName = null) => { * Enviamos un mensaje simple (texto) a nuestro cliente * @param {*} number */ -const sendMessage = async (client, number = null, text = null, trigger = null) => { - setTimeout(async () => { +const sendMessage = async (client, number = null, text = null, trigger = null, regla) => { //MOD by CHV - Agregamos el parametro "regla" para guardarlo en "chats/nuero.json" + // console.log("SENDMESSAGE (send.js) & regla = " + regla) + setTimeout(async () => { number = cleanNumber(number) const message = text + // console.log("number="+number); client.sendMessage(number, message); - await readChat(number, message, trigger) + await readChat(number, message, trigger, regla) //MOD by CHV - Agregamos el parametro "regla" console.log(`⚡⚡⚡ Enviando mensajes....`); + // console.log("********************* SEND MESSAGE **************************************"); },DELAY_TIME) } @@ -71,10 +78,14 @@ const sendMessage = async (client, number = null, text = null, trigger = null) = 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); + let button = new Buttons(remplazos(message),[...buttons], title, footer); + // console.log("number="+number); client.sendMessage(number, button); console.log(`⚡⚡⚡ Enviando mensajes....`); + console.log("sendMessageButton."); + // console.log("Trigger="+trigger); + // console.log("************************ SEND MESSAGE BUTTON ***********************************"); } @@ -104,10 +115,10 @@ const lastTrigger = (number) => new Promise((resolve, reject) => { * @param {*} number * @param {*} message */ -const readChat = async (number, message, trigger = null) => { +const readChat = async (number, message, trigger = null, regla) => { //MOD by CHV - Agregamos el parametro "regla" para guardarlo en "chats/numero.json" number = cleanNumber(number) - await saveMessage( message, trigger, number ) - console.log('Saved') + await saveMessage( message, trigger, number, regla ) //MOD by CHV - Agregamos "regla" + // console.log('Saved') } module.exports = { sendMessage, sendMedia, lastTrigger, sendMessageButton, readChat, sendMediaVoiceNote } diff --git a/flow/initial.json b/flow/initial.json index 6a91c75..f9534db 100644 --- a/flow/initial.json +++ b/flow/initial.json @@ -1,93 +1,66 @@ [ { "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" + "xmuchas gracias", + "xgracias", + "xvale gracias" ], - "key": "STEP_1" + "key": "Gracias" }, { - "keywords": [ - "cursos", - "info", - "curso" ], - "key": "STEP_2" + "keywords": ["/menu"], + "key": "menu" }, { - "keywords": [ - "angular" - ], - "key": "STEP_2_1" + "keywords": ["1"], + "key": "opcion1" }, { - "keywords": [ - "node" - ], - "key": "STEP_2_2" + "keywords": ["2"], + "key": "opcion2" }, { - "keywords": [ - "ngrx" - ], - "key": "STEP_2_3" + "keywords": ["3"], + "key": "opcion3" }, { - "keywords": [ - "aws" - ], - "key": "STEP_2_4" + "keywords": "*", + "key": "recibenombre" }, { - "keywords": [ - "asesor", - "asesores", - "Vendedor", - "cobrador" - ], - "key": "STEP_3" + "keywords": "*", + "key": "recibecorreo" }, { - "keywords": [ - "muchas gracias", - "ok", - "gracias", - "vale gracias" - ], - "key": "STEP_4" + "keywords": "*", + "key": "gRevisaCliente" }, { - "keywords": [ - "youtube" - ], - "key": "STEP_5" + "keywords": "*", + "key": "gGuardainfo" }, { - "keywords": [ - "VER_CURSOS" - ], - "key": "STEP_6" + "keywords": ["rnd"], + "key": "rnd" }, { - "keywords": [ - "telegram" - ], - "key": "STEP_7" + "keywords": ["rnd2"], + "key": "rnd2" }, { - "keywords": [ - "audio" - ], - "key": "STEP_8" + "keywords": ["/venta","/borrarventa"], + "key": "venta" + }, + { + "keywords": "*", + "key": "borramosventa" + }, + { + "keywords": ["/rc","/recuperaclientes","/recuperarclientes"], + "key": "clientes" + }, + { + "keywords": "*", + "key": "recuperamosClientes" } ] \ No newline at end of file diff --git a/flow/response.json b/flow/response.json index 4413f32..915c874 100644 --- a/flow/response.json +++ b/flow/response.json @@ -11,27 +11,118 @@ "media":null, "trigger":null }, - "STEP_0":{ + "menu":{ "replyMessage":[ - "El flujo ha finalizado \n", - "pero puedes ver todo el codigo de este \n", - "repositorio en https://github.com/leifermendez/bot-whatsapp.git" + "%saludo%, este es el menú, selecciona una opción: \n", + "Pon *1* para mensajes anteriores.\n", + "Pon *2* para ver remplazos.\n", + "Pon *3* para esta opción.\n" ], "media":null, "trigger":null }, - "STEP_1":{ + "opcion1":{ "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*" + "Seleccionaste la opción 1 \n", + "*Ultimo:*\n%msjant_0% \n*Penultimo:*\n%msjant_1% \n*Antepenultimo:*\n%msjant_2% \n\n", + "Automáticamente el flujo se regresa al *menú*, asi que puedes poner nuevamente un número del 1 al 3 sin necesidad de volver a iniciar con */menu*." ], - "media":"https://media2.giphy.com/media/VQJu0IeULuAmCwf5SL/giphy.gif", + "media":null, + "pasoRequerido":"menu", + "goto":"menu" + }, + "opcion2":{ + "replyMessage":[ + "Seleccionaste la opción 2\n", + "Remplazamos %saludo.% con *\"%saludo%\"*\n", + "Remplazamos %dia_semana.% con *\"%dia_semana%\"*\n", + "Remplazamos %hora24.%:%minutos.% con *\"%hora24%:%minutos%\"*\n", + "Remplazamos %.rnd_👍🏽,🤞🏼,🤪,🤔% con '%rnd_👍🏽,🤞🏼,🤪,🤔%'\n\n", + "Automáticamente el flujo se regresa al *menú*, asi que puedes poner nuevamente un número del 1 al 3 sin necesidad de volver a iniciar con */menu*." + ], + "media":null, + "pasoRequerido":"menu", + "goto":"menu" + }, + "opcion3":{ + "replyMessage":[ + "Seleccionaste la opción 3\n\n", + "Automáticamente el flujo se regresa al *menú*, asi que puedes poner nuevamente un número del 1 al 3 sin necesidad de volver a iniciar con */menu*." + ], + "media":null, + "pasoRequerido":"menu", + "goto":"menu" + }, + "recibenombre":{ + "replyMessage":[ + "Gracias, ahora dame tu correo." + ], + "media":null, + "trigger":null, + "pasoRequerido":"opcion1" + }, + "recibecorreo":{ + "replyMessage":[ + "Gracias por tu correo." + ], + "media":null, + "trigger":null, + "pasoRequerido":"recibenombre" + }, + "gallina":{ + "replyMessage":[ + "%saludo%, por favor dame tu *número de cliente*, este lo puedes encontrar en tu ticket de compra." + ], + "media":null, + "trigger":null + }, + "gRevisaCliente":{ + "replyMessage":[ + "/URL=http://localhost:8888/dbrquery?j={\"query\":\"select_revisacliente_GUNA\",\"exec\":\"ExecuteQuery\",\"params\":{\"par1\":\"XXPARAM1XX\"}}" + ], + "media":null, + "trigger":null, + "pasoRequerido":"gallina" + }, + "gGuardainfo":{ + "replyMessage":[ + "/URL=http://localhost:8888/dbrquery?j={\"query\":\"insert_registroGallina_GUNA\",\"exec\":\"ExecuteCommand\",\"params\":{\"par1\":\"XXPARAM1XX\", \"par2\":\"XXPARAM2XX\", \"par3\":\"XXPARAM3XX\", \"par4\":\"XXPARAM4XX\"}}" + ], + "media":null, + "trigger":null, + "pasoRequerido":"gRevisaCliente" + }, + "rnd":{ + "replyMessage":[ + "%saludo%\nHoy es %dia_semana%.\nSon las %hora24%:%minutos% hrs.\nSon las %hora12%:%minutos% %ampm%\n*Palabra random:* %rnd_arbol,burro,cabra,dinosaurio,elefante,fuego,gorila%\n*Emoji random:* %rnd_👍🏽,😁,🤣,🤔,🤦🏽‍♂️,🙄,😎%\n*Número random:* %rnd_1,2,3,4,5,6,7%\n" + ], + "media":null, + "trigger":null + }, + "venta":{ + "replyMessage":[ + "%saludo%,\nPor favor escribe la *ruta* y el *almacén* de la venta que deseas borrar, separados por una diagonal.\nEjemplo: *101/6*\n" + ], + "media":null, + "trigger":null + }, + "borramosventa":{ + "replyMessage":[ + "/URL=http://localhost:8888/dbrquery?j={\"query\":\"select_revisaBorrarVenta\",\"exec\":\"ExecuteQuery\",\"params\":{\"par01\":\"XXPARAM01XX\", \"par02\":\"XXPARAM02XX\", \"par03\":\"XXPARAM03XX\", \"par04\":\"XXPARAM04XX\", \"par05\":\"XXPARAM05XX\", \"par06\":\"XXPARAM06XX\", \"par07\":\"XXPARAM07XX\", \"par08\":\"XXPARAM08XX\", \"par09\":\"XXPARAM09XX\", \"par10\":\"XXPARAM10XX\"}}" + ], + "media":null, + "trigger":null, + "pasoRequerido":"venta" + }, + "rnd2":{ + "replyMessage":[ + "" + ], + "media":null, "trigger":null, "actions":{ "title":"¿Que te interesa ver?", - "message":"Recuerda todo este contenido es gratis y estaria genial que me siguas!", + "message":"%saludo%\nHoy es %dia_semana%.\nSon las %hora24%:%minutos% hrs.\nSon las %hora12%:%minutos% %ampm%\n*Palabra random:* %rnd_arbol,burro,cabra,dinosaurio,elefante,fuego,gorila%\n*Emoji random:* %rnd_👍🏽,😁,🤣,🤔,🤦🏽‍♂️,🙄,😎%\n*Número random:* %rnd_1,2,3,4,5,6,7%\n", "footer":"Gracias", "buttons":[ {"body":"Cursos"}, @@ -40,109 +131,19 @@ ] } }, - "STEP_2":{ + "clientes":{ "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", - "🤖" + "%saludo%,\nPor favor escribe la *ruta* y el *almacén* de la ruta de la que quieres recuperar los clientes, separados por una diagonal.\nEjemplo: *101/6*\n" ], "media":null, "trigger":null }, - "STEP_2_3":{ + "recuperamosClientes":{ "replyMessage":[ - "NGRX para manejar estados en Angular \n", - "*(Gratis)* https://bit.ly/ngrx-desde-cero \n", - "A darle! 😮" + "/URL=http://localhost:8888/dbrquery?j={\"query\":\"proc_recuperaClientesNuevos\",\"exec\":\"ExecuteCommand\",\"params\":{\"par01\":\"XXPARAM01XX\", \"par02\":\"XXPARAM02XX\", \"par03\":\"XXPARAM03XX\"}}" ], "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 + "trigger":null, + "pasoRequerido":"clientes" } } \ No newline at end of file diff --git a/mediaSend/PTT-20220223-WA0000.opus b/mediaSend/PTT-20220223-WA0000.opus deleted file mode 100644 index 6e6e9951aa63ffac14e3a566a67f38433ca9c13a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12001 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.12.47" @@ -355,6 +357,15 @@ "lodash": "^4.17.14" } }, + "node_modules/@pm2/js-api/node_modules/axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dev": true, + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, "node_modules/@pm2/js-api/node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -524,9 +535,9 @@ "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==" }, "node_modules/@types/node": { - "version": "14.18.32", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.32.tgz", - "integrity": "sha512-Y6S38pFr04yb13qqHf8uk1nHE3lXgQ30WZbv1mLliV9pt0NjvqdWttLcrOYLnXbOafknVYRHZGoMSpR9UwfYow==" + "version": "14.18.33", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.33.tgz", + "integrity": "sha512-qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg==" }, "node_modules/@types/yauzl": { "version": "2.10.0", @@ -561,9 +572,9 @@ } }, "node_modules/acorn": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", - "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", + "version": "8.8.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", + "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", "bin": { "acorn": "bin/acorn" }, @@ -782,9 +793,9 @@ } }, "node_modules/ast-types/node_modules/tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==", "dev": true }, "node_modules/async": { @@ -814,13 +825,18 @@ "semver": "bin/semver" } }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, "node_modules/axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", - "dev": true, + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", + "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", "dependencies": { - "follow-redirects": "^1.14.0" + "follow-redirects": "^1.14.9", + "form-data": "^4.0.0" } }, "node_modules/balanced-match": { @@ -1178,6 +1194,17 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/commander": { "version": "2.15.1", "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", @@ -1315,9 +1342,9 @@ } }, "node_modules/dayjs": { - "version": "1.11.5", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.5.tgz", - "integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.6.tgz", + "integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==" }, "node_modules/debug": { "version": "2.6.9", @@ -1347,6 +1374,14 @@ "node": ">= 6" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -1467,9 +1502,9 @@ } }, "node_modules/engine.io": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.0.tgz", - "integrity": "sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz", + "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==", "dependencies": { "@types/cookie": "^0.4.1", "@types/cors": "^2.8.12", @@ -1920,7 +1955,6 @@ "version": "1.15.2", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", - "dev": true, "funding": [ { "type": "individual", @@ -1936,6 +1970,19 @@ } } }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -2943,9 +2990,9 @@ } }, "node_modules/marked": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/marked/-/marked-4.1.1.tgz", - "integrity": "sha512-0cNMnTcUJPxbA6uWmCmjWz4NJRe/0Xfk2NhXCUHjew9qJzFN20krFnsUe7QynwqOwa5m1fZ4UDg0ycKFVC0ccw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.2.tgz", + "integrity": "sha512-JjBTFTAvuTgANXx82a5vzK9JLSMoV6V3LBVn4Uhdso6t7vXrGx7g1Cd2r6NYSsxrYbQGFCMqBDhFHyK5q2UvcQ==", "bin": { "marked": "bin/marked.js" }, @@ -3118,6 +3165,17 @@ "safe-buffer": "~5.1.0" } }, + "node_modules/nanoid": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", + "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, "node_modules/needle": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz", @@ -3445,9 +3503,9 @@ } }, "node_modules/pidusage": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-3.0.1.tgz", - "integrity": "sha512-/UlE6DQIe6yuDvm3v6756U0ErEsj60FLQTRZ4qPQF9b5yZKhf4c0llzD0tZpyE03nn8HQoLniFgKsL0ABB3nCg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-3.0.2.tgz", + "integrity": "sha512-g0VU+y08pKw5M8EZ2rIGiEBaB8wrQMjYGFfW2QVIfyT8V+fq8YFLkvlz4bz5ljvFDJYNFCWT3PWqcRr2FKO81w==", "dev": true, "dependencies": { "safe-buffer": "^5.2.1" @@ -3845,9 +3903,9 @@ } }, "node_modules/protobufjs/node_modules/long": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/long/-/long-5.2.0.tgz", - "integrity": "sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w==" + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/long/-/long-5.2.1.tgz", + "integrity": "sha512-GKSNGeNAtw8IryjjkhZxuKB3JzlcLTwjtiQCHKvqQet81I93kXslhDQruGI/QsddO83mcDToBVy7GqGS/zYf/A==" }, "node_modules/proxy-addr": { "version": "2.0.7", @@ -4681,9 +4739,9 @@ } }, "node_modules/systeminformation": { - "version": "5.12.7", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.12.7.tgz", - "integrity": "sha512-Kubdu6YzMWtGEsnGF5ddohvIWsxOlEkV0P/3oKTPl56ADOowDiWBR59RpIRvbijXwEQrnRKeF3MOuH7apdEc/g==", + "version": "5.12.12", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.12.12.tgz", + "integrity": "sha512-qg9I+JxbzkgMy1eHIs+mHqVXY+LRBWLsxhffrlDm+XfzP17Jn34tLrYjrmQs3IcR6mqfXEDpfmd97FuZ32TnaQ==", "dev": true, "optional": true, "os": [ @@ -4857,9 +4915,9 @@ "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==" }, "node_modules/uglify-js": { - "version": "3.17.3", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.3.tgz", - "integrity": "sha512-JmMFDME3iufZnBpyKL+uS78LRiC+mK55zWfM5f/pWBJfpOttXAqYfdDGRukYhJuyRinvPVAtUhvy7rlDybNtFg==", + "version": "3.17.4", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", + "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==", "bin": { "uglifyjs": "bin/uglifyjs" }, @@ -5306,9 +5364,9 @@ }, "dependencies": { "@babel/parser": { - "version": "7.19.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.6.tgz", - "integrity": "sha512-h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA==" + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.2.tgz", + "integrity": "sha512-afk318kh2uKbo7BEj2QtEi8HVCGrwHUffrYDy7dgVcSa2j9lY3LDjPzcyGdpX7xgm35aWqvciZJ4WKmdF/SxYg==" }, "@fast-csv/format": { "version": "4.3.5", @@ -5346,9 +5404,9 @@ } }, "@grpc/grpc-js": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.7.2.tgz", - "integrity": "sha512-MqqbVynbe3VUSnApFW/dpkDaa9T1ASqRnMWeSPGFO/Ro98R7XUDLacfeBa7RaSI1iFu9GYk5gBKARf0zipFe4w==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.7.3.tgz", + "integrity": "sha512-H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog==", "requires": { "@grpc/proto-loader": "^0.7.0", "@types/node": ">=12.12.47" @@ -5563,6 +5621,15 @@ "lodash": "^4.17.14" } }, + "axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dev": true, + "requires": { + "follow-redirects": "^1.14.0" + } + }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -5717,9 +5784,9 @@ "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==" }, "@types/node": { - "version": "14.18.32", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.32.tgz", - "integrity": "sha512-Y6S38pFr04yb13qqHf8uk1nHE3lXgQ30WZbv1mLliV9pt0NjvqdWttLcrOYLnXbOafknVYRHZGoMSpR9UwfYow==" + "version": "14.18.33", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.33.tgz", + "integrity": "sha512-qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg==" }, "@types/yauzl": { "version": "2.10.0", @@ -5748,9 +5815,9 @@ } }, "acorn": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", - "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==" + "version": "8.8.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", + "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==" }, "acorn-jsx": { "version": "5.3.2", @@ -5921,9 +5988,9 @@ }, "dependencies": { "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==", "dev": true } } @@ -5951,13 +6018,18 @@ } } }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, "axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", - "dev": true, + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", + "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", "requires": { - "follow-redirects": "^1.14.0" + "follow-redirects": "^1.14.9", + "form-data": "^4.0.0" } }, "balanced-match": { @@ -6212,6 +6284,14 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, "commander": { "version": "2.15.1", "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", @@ -6322,9 +6402,9 @@ "dev": true }, "dayjs": { - "version": "1.11.5", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.5.tgz", - "integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==" + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.6.tgz", + "integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==" }, "debug": { "version": "2.6.9", @@ -6351,6 +6431,11 @@ "vm2": "^3.9.8" } }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" + }, "depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -6460,9 +6545,9 @@ } }, "engine.io": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.0.tgz", - "integrity": "sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz", + "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==", "requires": { "@types/cookie": "^0.4.1", "@types/cors": "^2.8.12", @@ -6786,8 +6871,17 @@ "follow-redirects": { "version": "1.15.2", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", - "dev": true + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" + }, + "form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } }, "forwarded": { "version": "0.2.0", @@ -7612,9 +7706,9 @@ "requires": {} }, "marked": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/marked/-/marked-4.1.1.tgz", - "integrity": "sha512-0cNMnTcUJPxbA6uWmCmjWz4NJRe/0Xfk2NhXCUHjew9qJzFN20krFnsUe7QynwqOwa5m1fZ4UDg0ycKFVC0ccw==" + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.2.tgz", + "integrity": "sha512-JjBTFTAvuTgANXx82a5vzK9JLSMoV6V3LBVn4Uhdso6t7vXrGx7g1Cd2r6NYSsxrYbQGFCMqBDhFHyK5q2UvcQ==" }, "mdurl": { "version": "1.0.1", @@ -7744,6 +7838,11 @@ } } }, + "nanoid": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", + "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==" + }, "needle": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz", @@ -7982,9 +8081,9 @@ "dev": true }, "pidusage": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-3.0.1.tgz", - "integrity": "sha512-/UlE6DQIe6yuDvm3v6756U0ErEsj60FLQTRZ4qPQF9b5yZKhf4c0llzD0tZpyE03nn8HQoLniFgKsL0ABB3nCg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-3.0.2.tgz", + "integrity": "sha512-g0VU+y08pKw5M8EZ2rIGiEBaB8wrQMjYGFfW2QVIfyT8V+fq8YFLkvlz4bz5ljvFDJYNFCWT3PWqcRr2FKO81w==", "dev": true, "requires": { "safe-buffer": "^5.2.1" @@ -8228,9 +8327,9 @@ }, "dependencies": { "long": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/long/-/long-5.2.0.tgz", - "integrity": "sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w==" + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/long/-/long-5.2.1.tgz", + "integrity": "sha512-GKSNGeNAtw8IryjjkhZxuKB3JzlcLTwjtiQCHKvqQet81I93kXslhDQruGI/QsddO83mcDToBVy7GqGS/zYf/A==" } } }, @@ -8903,9 +9002,9 @@ "dev": true }, "systeminformation": { - "version": "5.12.7", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.12.7.tgz", - "integrity": "sha512-Kubdu6YzMWtGEsnGF5ddohvIWsxOlEkV0P/3oKTPl56ADOowDiWBR59RpIRvbijXwEQrnRKeF3MOuH7apdEc/g==", + "version": "5.12.12", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.12.12.tgz", + "integrity": "sha512-qg9I+JxbzkgMy1eHIs+mHqVXY+LRBWLsxhffrlDm+XfzP17Jn34tLrYjrmQs3IcR6mqfXEDpfmd97FuZ32TnaQ==", "dev": true, "optional": true }, @@ -9028,9 +9127,9 @@ "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==" }, "uglify-js": { - "version": "3.17.3", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.3.tgz", - "integrity": "sha512-JmMFDME3iufZnBpyKL+uS78LRiC+mK55zWfM5f/pWBJfpOttXAqYfdDGRukYhJuyRinvPVAtUhvy7rlDybNtFg==" + "version": "3.17.4", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", + "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==" }, "unbzip2-stream": { "version": "1.4.3", diff --git a/package.json b/package.json index 20a8d94..8bb4231 100644 --- a/package.json +++ b/package.json @@ -1,36 +1,18 @@ { - "name": "bot-whatsapp", + "name": "test-ws-bot", "version": "1.0.0", - "description": "Bot de wahtsapp open source para MVP o pequeños negocios", + "description": "", "main": "app.js", "scripts": { "start": "node ./app.js", "test": "echo \"Error: no test specified\" && exit 1" }, - "keywords": [ - "whatsapp", - "bot-whatsapp", - "node-bot-whatsapp" - ], - "contributors": [ - { - "email": "leifer33@gmail.com", - "name": "Leifer Mendez", - "url": "https://leifermendez.github.io" - }, - { - "name": "aurik3", - "email": "aurik3@aurik3.com", - "url": "https://github.com/aurik3" - } - ], - "repository": { - "type": "git", - "url": "https://github.com/leifermendez/bot-whatsapp" - }, + "keywords": [], + "author": "", "license": "ISC", "dependencies": { "@google-cloud/dialogflow": "^5.2.0", + "axios": "^0.27.2", "cors": "^2.8.5", "dotenv": "^16.0.1", "exceljs": "^4.3.0", @@ -39,6 +21,7 @@ "mime-db": "^1.52.0", "moment": "^2.29.4", "mysql": "^2.18.1", + "nanoid": "^3.0.0", "qr-image": "^3.2.0", "qrcode-terminal": "^0.12.0", "socket.io": "^4.5.1", diff --git a/spam.json b/spam.json new file mode 100644 index 0000000..edb4051 --- /dev/null +++ b/spam.json @@ -0,0 +1,38 @@ +[ + { + "numero":"5215554192439" + }, + { + "numero":"5215527026728" + }, + { + "numero":"5215527026728" + }, + { + "numero":"5215527026728" + }, + { + "numero":"5215527026728" + }, + { + "numero":"5215527026728" + }, + { + "numero":"5215527026728" + }, + { + "numero":"5215527026728" + }, + { + "numero":"5215527026728" + }, + { + "numero":"5215527026728" + }, + { + "numero":"5215527026728" + }, + { + "numero":"5215554192439" + } +] \ No newline at end of file diff --git a/test_mod_2.js b/test_mod_2.js deleted file mode 100644 index 78d37da..0000000 --- a/test_mod_2.js +++ /dev/null @@ -1 +0,0 @@ -//just testing mod v2 \ No newline at end of file