Compare commits

..

3 Commits

Author SHA1 Message Date
Leifer Mendez
8dd3be909b feat(provider): added twilio provider 2022-12-06 21:28:52 +01:00
Leifer Mendez
24ac9fbf48 fix(bot): fix sensitive case 2022-12-06 19:35:21 +01:00
Leifer Mendez
4350dff22a feat(provider): 🔥 add twilii (weoking) 2022-12-05 20:45:05 +01:00
19 changed files with 177 additions and 45 deletions

2
.gitignore vendored
View File

@@ -18,6 +18,8 @@ config.json
coverage/ coverage/
*.lcov *.lcov
log log
log/*
*.log
lib lib
tmp/ tmp/
.yarn/* .yarn/*

View File

@@ -1,3 +1,9 @@
{ {
"conventionalCommits.scopes": ["hook", "contributing", "cli", "bot"] "conventionalCommits.scopes": [
"hook",
"contributing",
"cli",
"bot",
"provider"
]
} }

View File

@@ -2,6 +2,7 @@
- [X] __(doc)__ Video de como colaborar PR - [X] __(doc)__ Video de como colaborar PR
- [ ] __(doc)__ Video implementación de test y cobertura - [ ] __(doc)__ Video implementación de test y cobertura
- [ ] __(doc)__ Video explicacion de github action - [ ] __(doc)__ Video explicacion de github action
- [ ] Crear packages list externas
### @bot-whatsapp/bot ### @bot-whatsapp/bot
- [X] agregar export package - [X] agregar export package
@@ -13,12 +14,13 @@
- [ ] colocar mensaje esperando conectando whatsapp (provider) - [ ] colocar mensaje esperando conectando whatsapp (provider)
- [ ] createDatabase validar implementacion de funciones - [ ] createDatabase validar implementacion de funciones
- [ ] limitar caracteres de mensajes - [ ] limitar caracteres de mensajes
- [X] cuando envias numeros (5 o 1) se dispara el flujo
### @bot-whatsapp/database ### @bot-whatsapp/database
- [X] agregar export package - [X] agregar export package
- [X] __(doc):__ Video para explicar como implementar nuevos database - [X] __(doc):__ Video para explicar como implementar nuevos database
- [X] Mongo adapter - [X] Mongo adapter
- [ ] MySQL adapter - [X] MySQL adapter
- [ ] JsonFile adapter - [ ] JsonFile adapter
### @bot-whatsapp/provider ### @bot-whatsapp/provider

View File

@@ -1,3 +0,0 @@
[handleMsg]: { from: 'XXXXXX', body: 'hola', hasMedia: false }
[handleMsg]: { from: 'XXXXXX', body: 'hola', hasMedia: false }
[handleMsg]: { from: 'XXXXXX', body: 'hola', hasMedia: false }

View File

@@ -7,6 +7,7 @@
"scripts": { "scripts": {
"commit": "git-cz", "commit": "git-cz",
"cli:rollup": "rollup --config ./packages/cli/rollup-cli.config.js ", "cli:rollup": "rollup --config ./packages/cli/rollup-cli.config.js ",
"create-bot:rollup": "rollup --config ./packages/create-bot-whatsapp/rollup-create.config.js ",
"bot:rollup": "rollup --config ./packages/bot/rollup-bot.config.js", "bot:rollup": "rollup --config ./packages/bot/rollup-bot.config.js",
"provider:rollup": "rollup --config ./packages/provider/rollup-provider.config.js ", "provider:rollup": "rollup --config ./packages/provider/rollup-provider.config.js ",
"database:rollup": "rollup --config ./packages/database/rollup-database.config.js", "database:rollup": "rollup --config ./packages/database/rollup-database.config.js",
@@ -16,12 +17,12 @@
"lint:check": "eslint ./packages", "lint:check": "eslint ./packages",
"lint:fix": "eslint --fix ./packages", "lint:fix": "eslint --fix ./packages",
"build": "yarn run cli:rollup && yarn run bot:rollup && yarn run provider:rollup && yarn run database:rollup", "build": "yarn run cli:rollup && yarn run bot:rollup && yarn run provider:rollup && yarn run database:rollup",
"link.dist": "cd packages/bot && npm link && cd ../provider && npm link && cd ../cli && npm link && cd ../database && npm link && cd ../provider && npm link",
"copy.lib": "node ./scripts/move.js", "copy.lib": "node ./scripts/move.js",
"test.unit": "node ./node_modules/uvu/bin.js packages test", "test.unit": "node ./node_modules/uvu/bin.js packages test",
"test.coverage": "node ./node_modules/c8/bin/c8.js npm run test.unit", "test.coverage": "node ./node_modules/c8/bin/c8.js npm run test.unit",
"test": "npm run test.coverage", "test": "npm run test.coverage",
"cli": "node ./packages/cli/bin/cli.js", "cli": "node ./packages/cli/bin/cli.js",
"create": "node ./packages/create-bot-whatsapp/bin/create.js",
"dev:debug": "node --inspect ./example-app/app.js", "dev:debug": "node --inspect ./example-app/app.js",
"dev": "node ./example-app/app.js", "dev": "node ./example-app/app.js",
"prepare": "npx husky install", "prepare": "npx husky install",
@@ -30,6 +31,7 @@
"release": "standard-version" "release": "standard-version"
}, },
"workspaces": [ "workspaces": [
"packages/create-bot-whatsapp",
"packages/bot", "packages/bot",
"packages/cli", "packages/cli",
"packages/database", "packages/database",

View File

@@ -1,6 +1,11 @@
const { toCtx } = require('../io/methods') const { toCtx } = require('../io/methods')
const { printer } = require('../utils/interactive') const { printer } = require('../utils/interactive')
const { Console } = require('console')
const { createWriteStream } = require('fs')
const logger = new Console({
stdout: createWriteStream(`${process.cwd()}/core.class.log`),
})
/** /**
* [ ] Escuchar eventos del provider asegurarte que los provider emitan eventos * [ ] Escuchar eventos del provider asegurarte que los provider emitan eventos
* [ ] Guardar historial en db * [ ] Guardar historial en db
@@ -25,6 +30,10 @@ class CoreClass {
* Manejador de eventos * Manejador de eventos
*/ */
listenerBusEvents = () => [ listenerBusEvents = () => [
{
event: 'preinit',
func: () => printer('Iniciando provider espere...'),
},
{ {
event: 'require_action', event: 'require_action',
func: ({ instructions, title = '⚡⚡ ACCION REQUERIDA ⚡⚡' }) => func: ({ instructions, title = '⚡⚡ ACCION REQUERIDA ⚡⚡' }) =>
@@ -52,6 +61,7 @@ class CoreClass {
* @returns * @returns
*/ */
handleMsg = async (messageInComming) => { handleMsg = async (messageInComming) => {
logger.log(`[handleMsg]: `, messageInComming)
const { body, from } = messageInComming const { body, from } = messageInComming
let msgToSend = [] let msgToSend = []
let fallBackFlag = false let fallBackFlag = false

View File

@@ -25,8 +25,8 @@ const createFlow = (args) => {
* @param {*} args * @param {*} args
* @returns * @returns
*/ */
const createProvider = (providerClass = class {}) => { const createProvider = (providerClass = class {}, args = null) => {
const providerInstance = new providerClass() const providerInstance = new providerClass(args)
if (!providerClass.prototype instanceof ProviderClass) if (!providerClass.prototype instanceof ProviderClass)
throw new Error('El provider no implementa ProviderClass') throw new Error('El provider no implementa ProviderClass')
return providerInstance return providerInstance

View File

@@ -21,29 +21,25 @@ class FlowClass {
} }
find = (keyOrWord, symbol = false, overFlow = null) => { find = (keyOrWord, symbol = false, overFlow = null) => {
keyOrWord = `${keyOrWord}`
let capture = false let capture = false
let messages = [] let messages = []
let refSymbol = null let refSymbol = null
overFlow = overFlow ?? this.flowSerialize overFlow = overFlow ?? this.flowSerialize
const mapSensitiveString = (str, flag = false) => { /** Retornar expresion regular para buscar coincidencia */
if (!flag && Array.isArray(str)) { const mapSensitive = (str, flag = false) => {
return str.map((c) => c.toLowerCase()) const regexSensitive = flag ? 'g' : 'i'
if (Array.isArray(str)) {
return new RegExp(str.join('|'), regexSensitive)
} }
return new RegExp(str, regexSensitive)
if (!flag && typeof str === 'string') {
return str.toLowerCase()
}
return str
} }
const findIn = (keyOrWord, symbol = false, flow = overFlow) => { const findIn = (keyOrWord, symbol = false, flow = overFlow) => {
const sensitive = refSymbol?.options?.sensitive || false const sensitive = refSymbol?.options?.sensitive || false
capture = refSymbol?.options?.capture || false capture = refSymbol?.options?.capture || false
keyOrWord = mapSensitiveString(keyOrWord, sensitive)
if (capture) return messages if (capture) return messages
if (symbol) { if (symbol) {
@@ -51,9 +47,9 @@ class FlowClass {
if (refSymbol?.answer) messages.push(refSymbol) if (refSymbol?.answer) messages.push(refSymbol)
if (refSymbol?.ref) findIn(refSymbol.ref, true) if (refSymbol?.ref) findIn(refSymbol.ref, true)
} else { } else {
refSymbol = flow.find((c) => refSymbol = flow.find((c) => {
mapSensitiveString(c.keyword, sensitive).includes(keyOrWord) return mapSensitive(c.keyword, sensitive).test(keyOrWord)
) })
if (refSymbol?.ref) findIn(refSymbol.ref, true) if (refSymbol?.ref) findIn(refSymbol.ref, true)
return messages return messages
} }

View File

@@ -0,0 +1,3 @@
#!/usr/bin/env node
const main = require('../lib/bin/bundle.create.cjs')
main()

View File

@@ -0,0 +1,12 @@
/**
* Main function
*/
const main = () => {
console.clear()
console.log(``)
console.log(`[PostInstall]: Este es el main function.`)
console.log(`[PostInstall]: 👌 Aqui podrias instalar cosas`)
console.log(``)
}
module.exports = main

View File

@@ -0,0 +1,13 @@
{
"name": "create-bot-whatsapp",
"version": "0.0.1",
"description": "",
"main": "./lib/bin/bundle.create.cjs",
"private": true,
"dependencies": {
"@bot-whatsapp/cli": "*"
},
"bin": {
"bot": "./lib/bin/bundle.create.cjs"
}
}

View File

@@ -0,0 +1,16 @@
const banner = require('../../config/banner.rollup.json')
const commonjs = require('@rollup/plugin-commonjs')
const { nodeResolve } = require('@rollup/plugin-node-resolve')
const { join } = require('path')
const PATH = join(__dirname, 'lib', 'bin', 'bundle.create.cjs')
module.exports = {
input: join(__dirname, 'index.js'),
output: {
banner: banner['banner.output'].join(''),
file: PATH,
format: 'cjs',
},
plugins: [commonjs(), nodeResolve()],
}

View File

@@ -1,24 +1,17 @@
require('dotenv').config()
const mysql = require('mysql2') const mysql = require('mysql2')
const DB_NAME = process.env.DB_NAME || 'db_bot'
const DB_HOST = process.env.DB_HOST || 'localhost'
const DB_USER = process.env.DB_USER || 'root'
class MyslAdapter { class MyslAdapter {
db db
listHistory = [] listHistory = []
credentials = { host: null, user: null, database: null }
constructor() { constructor(_credentials) {
this.credentials = _credentials
this.init().then() this.init().then()
} }
async init() { async init() {
this.db = mysql.createConnection({ this.db = mysql.createConnection(this.credentials)
host: DB_HOST,
user: DB_USER,
database: DB_NAME,
})
await this.db.connect((error) => { await this.db.connect((error) => {
if (!error) { if (!error) {

View File

@@ -1,19 +1,59 @@
const twilio = require('twilio') const twilio = require('twilio')
const { ProviderClass } = require('@bot-whatsapp/bot') const { ProviderClass } = require('@bot-whatsapp/bot')
const TwilioVendor = new twilio(accountSid, authToken) const TwilioWebHookServer = require('./server')
const { parseNumber } = require('./utils')
/**
* { accountSid, authToken, vendorNumber }
*/
class TwilioProvider extends ProviderClass { class TwilioProvider extends ProviderClass {
constructor() { twilioHook
super(TwilioVendor) vendor
vendorNumber
constructor({ accountSid, authToken, vendorNumber }) {
super()
this.vendor = new twilio(accountSid, authToken)
this.twilioHook = new TwilioWebHookServer()
this.vendorNumber = vendorNumber
this.twilioHook.start()
const listEvents = this.busEvents()
for (const { event, func } of listEvents) {
this.twilioHook.on(event, func)
}
} }
sendMessage = (message) => sendMessage = async (number, message) => {
this.vendor.messages.create({ return this.vendor.messages.create({
body: message, body: message,
to: '+12345678901', // Text this number from: ['whatsapp:+', parseNumber(this.vendorNumber)].join(''),
from: '+12345678901', // From a valid Twilio number to: ['whatsapp:+', parseNumber(number)].join(''),
}) })
}
/**
* Mapeamos los eventos nativos de whatsapp-web.js a los que la clase Provider espera
* para tener un standar de eventos
* @returns
*/
busEvents = () => [
{
event: 'auth_failure',
func: (payload) => this.emit('error', payload),
},
{
event: 'ready',
func: () => this.emit('ready', true),
},
{
event: 'message',
func: (payload) => {
this.emit('message', payload)
},
},
]
} }
module.exports = TwilioProvider module.exports = TwilioProvider

View File

@@ -0,0 +1,28 @@
const { EventEmitter } = require('node:events')
const polka = require('polka')
const { urlencoded } = require('body-parser')
const { parseNumber } = require('./utils')
class TwilioWebHookServer extends EventEmitter {
incomingMsg = (req, res) => {
const { body } = req
this.emit('message', {
from: parseNumber(body.From),
to: parseNumber(body.To),
body: body.Body,
})
const json = JSON.stringify({ body })
res.end(json)
}
start = () => {
polka()
.use(urlencoded({ extended: true }))
.post('/hook', this.incomingMsg)
.listen(3000, () => {
console.log(`> Running on localhost:3000 /hook`)
})
}
}
module.exports = TwilioWebHookServer

View File

@@ -0,0 +1,5 @@
const parseNumber = (number) => {
return `${number}`.replace('whatsapp:', '').replace('+', '')
}
module.exports = { parseNumber }

View File

@@ -32,7 +32,7 @@ class WebWhatsappProvider extends ProviderClass {
for (const { event, func } of listEvents) { for (const { event, func } of listEvents) {
this.vendor.on(event, func) this.vendor.on(event, func)
} }
this.vendor.emit('preinit')
this.vendor.initialize().catch((e) => { this.vendor.initialize().catch((e) => {
logger.log(e) logger.log(e)
this.emit('require_action', { this.emit('require_action', {
@@ -72,10 +72,6 @@ class WebWhatsappProvider extends ProviderClass {
event: 'ready', event: 'ready',
func: () => this.emit('ready', true), func: () => this.emit('ready', true),
}, },
{
event: 'authenticated',
func: () => this.emit('ready', true),
},
{ {
event: 'message', event: 'message',
func: (payload) => { func: (payload) => {

View File

@@ -11,6 +11,7 @@ const copyLibPkg = async (pkgName, to) => {
} }
Promise.all([ Promise.all([
copyLibPkg('create-bot-whatsapp', appDir),
copyLibPkg('bot', appDir), copyLibPkg('bot', appDir),
copyLibPkg('database', appDir), copyLibPkg('database', appDir),
copyLibPkg('provider', appDir), copyLibPkg('provider', appDir),

View File

@@ -3136,6 +3136,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"create-bot-whatsapp@workspace:packages/create-bot-whatsapp":
version: 0.0.0-use.local
resolution: "create-bot-whatsapp@workspace:packages/create-bot-whatsapp"
dependencies:
"@bot-whatsapp/cli": "*"
bin:
bot: ./lib/bin/bundle.create.cjs
languageName: unknown
linkType: soft
"create-require@npm:^1.1.0": "create-require@npm:^1.1.0":
version: 1.1.1 version: 1.1.1
resolution: "create-require@npm:1.1.1" resolution: "create-require@npm:1.1.1"