Merge pull request #137 from vicente1992/feat-mysql-adapter

feat(adapter): added adapter mysql

.gitignore

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

.vscode/settings.json

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

TODO.md

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

core.class.log

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

package.json

@@ -7,7 +7,6 @@
     "scripts": {
         "commit": "git-cz",
         "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",
         "provider:rollup": "rollup --config ./packages/provider/rollup-provider.config.js ",
         "database:rollup": "rollup --config ./packages/database/rollup-database.config.js",
@@ -17,12 +16,12 @@
         "lint:check": "eslint ./packages",
         "lint:fix": "eslint --fix ./packages",
         "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",
         "test.unit": "node ./node_modules/uvu/bin.js packages test",
         "test.coverage": "node ./node_modules/c8/bin/c8.js npm run test.unit",
         "test": "npm run test.coverage",
         "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": "node ./example-app/app.js",
         "prepare": "npx husky install",
@@ -31,7 +30,6 @@
         "release": "standard-version"
     },
     "workspaces": [
-        "packages/create-bot-whatsapp",
         "packages/bot",
         "packages/cli",
         "packages/database",

packages/bot/core/core.class.js

@@ -1,11 +1,6 @@
 const { toCtx } = require('../io/methods')
 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
  * [ ] Guardar historial en db
@@ -30,10 +25,6 @@ class CoreClass {
      * Manejador de eventos
      */
     listenerBusEvents = () => [
-        {
-            event: 'preinit',
-            func: () => printer('Iniciando provider espere...'),
-        },
         {
             event: 'require_action',
             func: ({ instructions, title = '⚡⚡ ACCION REQUERIDA ⚡⚡' }) =>
@@ -61,7 +52,6 @@ class CoreClass {
      * @returns
      */
     handleMsg = async (messageInComming) => {
-        logger.log(`[handleMsg]: `, messageInComming)
         const { body, from } = messageInComming
         let msgToSend = []
         let fallBackFlag = false

packages/bot/index.js

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

packages/bot/io/flow.class.js

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

packages/create-bot-whatsapp/bin/create.js

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

packages/create-bot-whatsapp/index.js

@@ -1,12 +0,0 @@
-/**
- * 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

packages/create-bot-whatsapp/package.json

@@ -1,13 +0,0 @@
-{
-    "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"
-    }
-}

packages/create-bot-whatsapp/rollup-create.config.js

@@ -1,16 +0,0 @@
-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()],
-}

packages/database/src/mysql/index.js

@@ -1,17 +1,24 @@
+require('dotenv').config()
 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 {
     db
     listHistory = []
-    credentials = { host: null, user: null, database: null }
 
-    constructor(_credentials) {
+    constructor() {
-        this.credentials = _credentials
         this.init().then()
     }
 
     async init() {
-        this.db = mysql.createConnection(this.credentials)
+        this.db = mysql.createConnection({
+            host: DB_HOST,
+            user: DB_USER,
+            database: DB_NAME,
+        })
 
         await this.db.connect((error) => {
             if (!error) {

packages/provider/src/twilio/index.js

@@ -1,59 +1,19 @@
 const twilio = require('twilio')
 const { ProviderClass } = require('@bot-whatsapp/bot')
 
-const TwilioWebHookServer = require('./server')
+const TwilioVendor = new twilio(accountSid, authToken)
-const { parseNumber } = require('./utils')
 
-/**
- * { accountSid, authToken, vendorNumber }
- */
 class TwilioProvider extends ProviderClass {
-    twilioHook
+    constructor() {
-    vendor
+        super(TwilioVendor)
-    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 = async (number, message) => {
+    sendMessage = (message) =>
-        return this.vendor.messages.create({
+        this.vendor.messages.create({
             body: message,
-            from: ['whatsapp:+', parseNumber(this.vendorNumber)].join(''),
+            to: '+12345678901', // Text this number
-            to: ['whatsapp:+', parseNumber(number)].join(''),
+            from: '+12345678901', // From a valid Twilio number
         })
-    }
-
-    /**
-     * 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

packages/provider/src/twilio/server.js

@@ -1,28 +0,0 @@
-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

packages/provider/src/twilio/utils.js

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

packages/provider/src/web-whatsapp/index.js

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

scripts/move.js

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

yarn.lock

@@ -3136,16 +3136,6 @@ __metadata:
   languageName: node
   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":
   version: 1.1.1
   resolution: "create-require@npm:1.1.1"