cheveguerra/bot-whatsapp
1
0
Fork 0
mirror of https://github.com/cheveguerra/bot-whatsapp.git synced 2026-04-20 20:49:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed dialogflow session id

Browse Source
This commit is contained in:
jzvi12
2022-12-05 19:10:41 -05:00
parent f21a58b6ff
commit 1884832192
6 changed files with 42 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
adapter/diaglogflow.js
View File

@@ -1,6 +1,6 @@
const dialogflow = require('@google-cloud/dialogflow'); const dialogflow = require('@google-cloud/dialogflow');
const fs = require('fs') 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 * 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 // Detect intent method
const detectIntent = async (queryText) => { const detectIntent = async (queryText, waPhoneNumber) => {
let media = null; let media = null;
const sessionId = KEEP_DIALOG_FLOW ? 1 : crypto.randomUUID(); const sessionId = KEEP_DIALOG_FLOW ? 1 : waPhoneNumber;
const sessionPath = sessionClient.projectAgentSessionPath(PROJECID, sessionId); const sessionPath = sessionClient.projectAgentSessionPath(PROJECID, sessionId);
const languageCode = process.env.LANGUAGE const languageCode = process.env.LANGUAGE
const request = { const request = {
@@ -66,12 +66,12 @@ const detectIntent = async (queryText) => {
return parseData return parseData
} }
const getDataIa = (message = '', cb = () => { }) => { const getDataIa = (message = '', sessionId = '', cb = () => { }) => {
detectIntent(message).then((res) => { detectIntent(message, sessionId).then((res) => {
cb(res) cb(res)
}) })
} }
checkFileCredentials(); checkFileCredentials();
module.exports = { getDataIa } module.exports = { getDataIa }

4
adapter/index.js
View File

@@ -52,13 +52,13 @@ const reply = (step) => new Promise((resolve, reject) => {
} }
}) })
const getIA = (message) => new Promise((resolve, reject) => { const getIA = (message, sessionId) => new Promise((resolve, reject) => {
/** /**
* Si usas dialogflow * Si usas dialogflow
*/ */
if (process.env.DATABASE === 'dialogflow') { if (process.env.DATABASE === 'dialogflow') {
let resData = { replyMessage: '', media: null, trigger: null } let resData = { replyMessage: '', media: null, trigger: null }
getDataIa(message,(dt) => { getDataIa(message, sessionId, (dt) => {
resData = { ...resData, ...dt } resData = { ...resData, ...dt }
resolve(resData) resolve(resData)
}) })

47
app.js
View File

@@ -6,7 +6,7 @@ const fs = require('fs');
const express = require('express'); const express = require('express');
const cors = require('cors') const cors = require('cors')
const qrcode = require('qrcode-terminal'); const qrcode = require('qrcode-terminal');
const { Client,LocalAuth } = require('whatsapp-web.js'); const { Client, LocalAuth } = require('whatsapp-web.js');
const mysqlConnection = require('./config/mysql') const mysqlConnection = require('./config/mysql')
const { middlewareClient } = require('./middleware/client') const { middlewareClient } = require('./middleware/client')
const { generateImage, cleanNumber, checkEnvFile, createClient, isValidNumber } = require('./controllers/handle') const { generateImage, cleanNumber, checkEnvFile, createClient, isValidNumber } = require('./controllers/handle')
@@ -30,7 +30,7 @@ app.use('/', require('./routes/web'))
const listenMessage = () => client.on('message', async msg => { const listenMessage = () => client.on('message', async msg => {
const { from, body, hasMedia } = msg; const { from, body, hasMedia } = msg;
if(!isValidNumber(from)){ if (!isValidNumber(from)) {
return return
} }
@@ -39,7 +39,7 @@ const listenMessage = () => client.on('message', async msg => {
return return
} }
message = body.toLowerCase(); message = body.toLowerCase();
console.log('BODY',message) console.log('BODY', message)
const number = cleanNumber(from) const number = cleanNumber(from)
await readChat(number, message) await readChat(number, message)
@@ -56,8 +56,8 @@ const listenMessage = () => client.on('message', async msg => {
*/ */
if (process.env.DATABASE === 'dialogflow') { if (process.env.DATABASE === 'dialogflow') {
if(!message.length) return; if (!message.length) return;
const response = await bothResponse(message); const response = await bothResponse(message, number);
await sendMessage(client, from, response.replyMessage); await sendMessage(client, from, response.replyMessage);
if (response.media) { if (response.media) {
sendMedia(client, from, response.media); sendMedia(client, from, response.media);
@@ -91,7 +91,7 @@ const listenMessage = () => client.on('message', async msg => {
await sendMessage(client, from, response.replyMessage, response.trigger); await sendMessage(client, from, response.replyMessage, response.trigger);
if(response.hasOwnProperty('actions')){ if (response.hasOwnProperty('actions')) {
const { actions } = response; const { actions } = response;
await sendMessageButton(client, from, null, actions); await sendMessageButton(client, from, null, actions);
return return
@@ -116,7 +116,7 @@ const listenMessage = () => client.on('message', async msg => {
/** /**
* Si quieres enviar botones * Si quieres enviar botones
*/ */
if(response.hasOwnProperty('actions')){ if (response.hasOwnProperty('actions')) {
const { actions } = response; const { actions } = response;
await sendMessageButton(client, from, null, actions); await sendMessageButton(client, from, null, actions);
} }
@@ -127,33 +127,33 @@ const listenMessage = () => client.on('message', async msg => {
client = new Client({ client = new Client({
authStrategy: new LocalAuth(), authStrategy: new LocalAuth(),
puppeteer: { headless: true } puppeteer: { headless: true }
}); });
client.on('qr', qr => generateImage(qr, () => { client.on('qr', qr => generateImage(qr, () => {
qrcode.generate(qr, { small: true }); qrcode.generate(qr, { small: true });
console.log(`Ver QR http://localhost:${port}/qr`) console.log(`Ver QR http://localhost:${port}/qr`)
socketEvents.sendQR(qr) socketEvents.sendQR(qr)
})) }))
client.on('ready', (a) => { client.on('ready', (a) => {
connectionReady() connectionReady()
listenMessage() listenMessage()
// socketEvents.sendStatus(client) // socketEvents.sendStatus(client)
}); });
client.on('auth_failure', (e) => { client.on('auth_failure', (e) => {
// console.log(e) // console.log(e)
// connectionLost() // connectionLost()
}); });
client.on('authenticated', () => { client.on('authenticated', () => {
console.log('AUTHENTICATED'); console.log('AUTHENTICATED');
}); });
client.initialize(); client.initialize();
@@ -168,5 +168,4 @@ if (process.env.DATABASE === 'mysql') {
server.listen(port, () => { server.listen(port, () => {
console.log(`El server esta listo por el puerto ${port}`); console.log(`El server esta listo por el puerto ${port}`);
}) })
checkEnvFile(); checkEnvFile();

4
controllers/flows.js
View File

@@ -15,8 +15,8 @@ const responseMessages = async (step) => {
return data return data
} }
const bothResponse = async (message) => { const bothResponse = async (message, sessionId) => {
const data = await getIA(message) const data = await getIA(message, sessionId)
if(data && data.media){ if(data && data.media){
const file = await saveExternalFile(data.media) const file = await saveExternalFile(data.media)
return {...data,...{media:file}} return {...data,...{media:file}}

42
package-lock.json generated
View File

@@ -22,13 +22,12 @@
"qrcode-terminal": "^0.12.0", "qrcode-terminal": "^0.12.0",
"socket.io": "^4.5.1", "socket.io": "^4.5.1",
"stormdb": "^0.6.0", "stormdb": "^0.6.0",
"whatsapp-web.js": "^1.18.0", "whatsapp-web.js": "^1.18.4",
"xlsx": "^0.18.5" "xlsx": "^0.18.5"
}, },
"devDependencies": { "devDependencies": {
"pm2": "^5.2.0", "pm2": "^5.2.0",
"prettier": "2.7.1", "prettier": "2.7.1"
"rollup": "^3.2.3"
}, },
"engines": { "engines": {
"node": "16.x" "node": "16.x"
@@ -4242,22 +4241,6 @@
"url": "https://github.com/sponsors/isaacs" "url": "https://github.com/sponsors/isaacs"
} }
}, },
"node_modules/rollup": {
"version": "3.2.3",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-3.2.3.tgz",
"integrity": "sha512-qfadtkY5kl0F5e4dXVdj2D+GtOdifasXHFMiL1SMf9ADQDv5Eti6xReef9FKj+iQPR2pvtqWna57s/PjARY4fg==",
"dev": true,
"bin": {
"rollup": "dist/bin/rollup"
},
"engines": {
"node": ">=14.18.0",
"npm": ">=8.0.0"
},
"optionalDependencies": {
"fsevents": "~2.3.2"
}
},
"node_modules/run-series": { "node_modules/run-series": {
"version": "1.1.9", "version": "1.1.9",
"resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.9.tgz", "resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.9.tgz",
@@ -5039,9 +5022,9 @@
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
}, },
"node_modules/whatsapp-web.js": { "node_modules/whatsapp-web.js": {
"version": "1.18.0", "version": "1.18.4",
"resolved": "https://registry.npmjs.org/whatsapp-web.js/-/whatsapp-web.js-1.18.0.tgz", "resolved": "https://registry.npmjs.org/whatsapp-web.js/-/whatsapp-web.js-1.18.4.tgz",
"integrity": "sha512-3cCW28/w7llZmTgiO9osumaopOuBBduvyuW02yfy3q9Rz4Wq9Oe1dRedE/kkq764zB8AZcuTs0tE8OKTq2Zobw==", "integrity": "sha512-Dqu6Q37tDDAcVJ44aMdRE76sI/9rBCUG+NTz1Kxh2w4obX2WtpoRetilxqgx1r4+pFUl58Lf21wGOEwPZ1pT/A==",
"dependencies": { "dependencies": {
"@pedroslopez/moduleraid": "^5.0.2", "@pedroslopez/moduleraid": "^5.0.2",
"fluent-ffmpeg": "^2.1.2", "fluent-ffmpeg": "^2.1.2",
@@ -8598,15 +8581,6 @@
"glob": "^7.1.3" "glob": "^7.1.3"
} }
}, },
"rollup": {
"version": "3.2.3",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-3.2.3.tgz",
"integrity": "sha512-qfadtkY5kl0F5e4dXVdj2D+GtOdifasXHFMiL1SMf9ADQDv5Eti6xReef9FKj+iQPR2pvtqWna57s/PjARY4fg==",
"dev": true,
"requires": {
"fsevents": "~2.3.2"
}
},
"run-series": { "run-series": {
"version": "1.1.9", "version": "1.1.9",
"resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.9.tgz", "resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.9.tgz",
@@ -9193,9 +9167,9 @@
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
}, },
"whatsapp-web.js": { "whatsapp-web.js": {
"version": "1.18.0", "version": "1.18.4",
"resolved": "https://registry.npmjs.org/whatsapp-web.js/-/whatsapp-web.js-1.18.0.tgz", "resolved": "https://registry.npmjs.org/whatsapp-web.js/-/whatsapp-web.js-1.18.4.tgz",
"integrity": "sha512-3cCW28/w7llZmTgiO9osumaopOuBBduvyuW02yfy3q9Rz4Wq9Oe1dRedE/kkq764zB8AZcuTs0tE8OKTq2Zobw==", "integrity": "sha512-Dqu6Q37tDDAcVJ44aMdRE76sI/9rBCUG+NTz1Kxh2w4obX2WtpoRetilxqgx1r4+pFUl58Lf21wGOEwPZ1pT/A==",
"requires": { "requires": {
"@pedroslopez/moduleraid": "^5.0.2", "@pedroslopez/moduleraid": "^5.0.2",
"archiver": "^5.3.1", "archiver": "^5.3.1",

2
package.json
View File

@@ -43,7 +43,7 @@
"qrcode-terminal": "^0.12.0", "qrcode-terminal": "^0.12.0",
"socket.io": "^4.5.1", "socket.io": "^4.5.1",
"stormdb": "^0.6.0", "stormdb": "^0.6.0",
"whatsapp-web.js": "latest", "whatsapp-web.js": "^1.18.4",
"xlsx": "^0.18.5" "xlsx": "^0.18.5"
}, },
"devDependencies": { "devDependencies": {