fix(adapter): conflict resolution

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: Test / Coverage
 
 on:
     push:
-        branches: [feature/monorepo]
+        branches: [dev]
     pull_request:
         branches: [main]
 

.github/workflows/contributors.yml

@@ -0,0 +1,20 @@
+name: Add contributors
+on:
+    schedule:
+        - cron: '20 20 * * *'
+    push:
+        branches: [dev]
+    pull_request:
+        branches: [main, dev]
+
+jobs:
+    contrib-readme-job:
+        runs-on: ubuntu-latest
+        name: A job to automate contrib in readme
+        steps:
+            - name: Contribute List
+              uses: akhilmhdh/contributors-readme-action@v2.3.6
+              with:
+                  image_size: 50
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

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

.yarn/releases/yarn-3.3.0.cjs

@@ -804,4 +804,4 @@ ${a.map(l=>`
   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
   IN THE SOFTWARE.
-*/
+*/

GLOSSARY.md

@@ -0,0 +1,2 @@
+CTX: Es el objeto que representa un mensaje, con opciones, id, ref
+messageInComming: Objeto entrante del provider {body, from,...}

README.md

@@ -8,13 +8,86 @@ Video como hacer PR: https://youtu.be/Lxt8Acob6aU
 
 
 **Comunidad**
+<!-- readme: collaborators,contributors -start -->
+<table>
+<tr>
+    <td align="center">
+        <a href="https://github.com/vicente1992">
+            <img src="https://avatars.githubusercontent.com/u/57806030?v=4" width="50;" alt="vicente1992"/>
+            <br />
+            <sub><b>Manuel Vicente Ortiz</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/leifermendez">
+            <img src="https://avatars.githubusercontent.com/u/15802366?v=4" width="50;" alt="leifermendez"/>
+            <br />
+            <sub><b>Leifer Mendez</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/leifermendezfroged">
+            <img src="https://avatars.githubusercontent.com/u/97020486?v=4" width="50;" alt="leifermendezfroged"/>
+            <br />
+            <sub><b>Leifer Mendez</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/Gonzalito87">
+            <img src="https://avatars.githubusercontent.com/u/100331586?v=4" width="50;" alt="Gonzalito87"/>
+            <br />
+            <sub><b>Null</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/aurik3">
+            <img src="https://avatars.githubusercontent.com/u/37228512?v=4" width="50;" alt="aurik3"/>
+            <br />
+            <sub><b>Null</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/jzvi12">
+            <img src="https://avatars.githubusercontent.com/u/10729787?v=4" width="50;" alt="jzvi12"/>
+            <br />
+            <sub><b>Null</b></sub>
+        </a>
+    </td></tr>
+<tr>
+    <td align="center">
+        <a href="https://github.com/tonyvazgar">
+            <img src="https://avatars.githubusercontent.com/u/21047090?v=4" width="50;" alt="tonyvazgar"/>
+            <br />
+            <sub><b>Luis Antonio Vázquez García</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/ulisesvina">
+            <img src="https://avatars.githubusercontent.com/u/20508563?v=4" width="50;" alt="ulisesvina"/>
+            <br />
+            <sub><b>Ulises Viña</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/rrruuuyyy">
+            <img src="https://avatars.githubusercontent.com/u/33061671?v=4" width="50;" alt="rrruuuyyy"/>
+            <br />
+            <sub><b>Rodrigo Mendoza Cabrera</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/yond1994">
+            <img src="https://avatars.githubusercontent.com/u/47557263?v=4" width="50;" alt="yond1994"/>
+            <br />
+            <sub><b>Yonathan Suarez</b></sub>
+        </a>
+    </td></tr>
+</table>
+<!-- readme: collaborators,contributors -end -->
 
 > Forma parte de este proyecto.
 
 -   [Discord](https://link.codigoencasa.com/DISCORD)
 -   [Twitter](https://twitter.com/leifermendez)
 -   [Youtube](https://www.youtube.com/watch?v=5lEMCeWEJ8o&list=PL_WGMLcL4jzWPhdhcUyhbFU6bC0oJd2BR)
--   [Telegram](https://t.me/leifermendez)
+-   [Telegram](https://t.me/leifermendez)
-
-
- 

TODO.md

@@ -2,31 +2,50 @@
 - [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
-- [ ] agregar export package
+- [X] agregar export package
 - [X] Posibilidad de en el capture meter todo un nuevo CTX  de FLOW .addAnswer('Marca la opcion',{capture:true, join:CTX})
 - [X] .addKeyword('1') no funciona con 1 caracter
 - [X] sensitivy viene activado por defecto
-- [ ] fallback respuesta en hijo: Se puede colocar en option el ref de la answer fallback
+- [X] fallback respuesta en hijo: Se puede colocar en option el ref de la answer fallback
+- [X] Cuando Envian Sticket devuelve mensaje raro
+- [x] addAnswer agregar delay
 - [ ] colocar mensaje esperando conectando whatsapp (provider)
-- [ ] Cuando Envian Sticket devuelve mensaje raro
 - [ ] createDatabase validar implementacion de funciones
+- [ ] limitar caracteres de mensajes 4000
+- [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
-- [ ] MySQL adapter
+- [X] MySQL adapter
 - [ ] JsonFile adapter
 
 ### @bot-whatsapp/provider
 - [X] agregar export package
 - [ ] __(doc):__ Video para explicar como implementar nuevos providers
-- [ ] WhatsappWeb provider enviar imagenes
+- [X] WhatsappWeb provider enviar imagenes
-- [ ] WhatsappWeb provider enviar audio
+- [X] WhatsappWeb provider enviar audio
+- [X] WhatsappWeb botones (Tiene truco) github:leifermendez/whatsapp-web.js
 - [ ] Twilio adapter
 - [ ] Meta adapter
 
 ### @bot-whatsapp/cli
-- [ ] Hacer comando para crear `example-app`
+- [X] Hacer comando para crear `example-app`
+
+
+### @bot-whatsapp/create-bot
+- [ ] 
+
+### Starters
+- [X] Base
+- [X] Basico
+- [ ] Enviando Imagen
+- [ ] Enviando Botones
+- [ ] Mezclando flujos hijos
+
+### Extra
+- [X] Crear CI mantener fork update https://stackoverflow.com/questions/23793062/can-forks-be-synced-automatically-in-github

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,6 +7,7 @@
     "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",
@@ -16,12 +17,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",
@@ -30,6 +31,7 @@
         "release": "standard-version"
     },
     "workspaces": [
+        "packages/create-bot-whatsapp",
         "packages/bot",
         "packages/cli",
         "packages/database",

packages/bot/core/core.class.js

@@ -1,6 +1,13 @@
 const { toCtx } = require('../io/methods')
 const { printer } = require('../utils/interactive')
+const { delay } = require('../utils/delay')
+const Queue = require('../utils/queue')
+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
@@ -21,7 +28,14 @@ class CoreClass {
         }
     }
 
+    /**
+     * Manejador de eventos
+     */
     listenerBusEvents = () => [
+        {
+            event: 'preinit',
+            func: () => printer('Iniciando provider espere...'),
+        },
         {
             event: 'require_action',
             func: ({ instructions, title = '⚡⚡ ACCION REQUERIDA ⚡⚡' }) =>
@@ -44,16 +58,19 @@ class CoreClass {
     ]
 
     /**
-     * @private
+     *
-     * @param {*} ctxMessage
+     * @param {*} messageInComming
+     * @returns
      */
     handleMsg = async (messageInComming) => {
+        logger.log(`[handleMsg]: `, messageInComming)
         const { body, from } = messageInComming
         let msgToSend = []
+        let fallBackFlag = false
+
+        if (!body.length) return
 
-        //Consultamos mensaje previo en DB
         const prevMsg = await this.databaseClass.getPrevByNumber(from)
-        //Consultamos for refSerializada en el flow actual
         const refToContinue = this.flowClass.findBySerialize(
             prevMsg?.refSerialize
         )
@@ -67,14 +84,24 @@ class CoreClass {
             this.databaseClass.save(ctxByNumber)
         }
 
-        //Si se tiene un callback se ejecuta
+        // 📄 [options: fallback]: esta funcion se encarga de repetir el ultimo mensaje
-        if (refToContinue && prevMsg?.options?.callback) {
+        const fallBack = () => {
-            const indexFlow = this.flowClass.findIndexByRef(refToContinue?.ref)
+            fallBackFlag = true
-            this.flowClass.allCallbacks[indexFlow].callback(messageInComming)
+            msgToSend = this.flowClass.find(refToContinue?.keyword, true) || []
+            this.sendFlow(msgToSend, from)
+            return refToContinue
         }
 
-        //Si se tiene anidaciones de flows, si tienes anidados obligatoriamente capture:true
+        // 📄 [options: callback]: Si se tiene un callback se ejecuta
-        if (prevMsg?.options?.nested?.length) {
+        if (!fallBackFlag && refToContinue && prevMsg?.options?.callback) {
+            const indexFlow = this.flowClass.findIndexByRef(refToContinue?.ref)
+            this.flowClass.allCallbacks[indexFlow].callback(messageInComming, {
+                fallBack,
+            })
+        }
+
+        // 📄🤘(tiene return) [options: nested(array)]: Si se tiene flujos hijos los implementa
+        if (!fallBackFlag && prevMsg?.options?.nested?.length) {
             const nestedRef = prevMsg.options.nested
             const flowStandalone = nestedRef.map((f) => ({
                 ...nestedRef.find((r) => r.refSerialize === f.refSerialize),
@@ -85,28 +112,44 @@ class CoreClass {
             return
         }
 
-        //Consultamos si se espera respuesta por parte de cliente "Ejemplo: Dime tu nombre"
+        // 📄🤘(tiene return) [options: capture (boolean)]: Si se tiene option boolean
-        if (!prevMsg?.options?.nested?.length && prevMsg?.options?.capture) {
+        if (!fallBackFlag && !prevMsg?.options?.nested?.length) {
-            msgToSend = this.flowClass.find(refToContinue?.ref, true) || []
+            const typeCapture = typeof prevMsg?.options?.capture
-        } else {
+            const valueCapture = prevMsg?.options?.capture
-            msgToSend = this.flowClass.find(body) || []
+
+            if (['string', 'boolean'].includes(typeCapture) && valueCapture) {
+                msgToSend = this.flowClass.find(refToContinue?.ref, true) || []
+                this.sendFlow(msgToSend, from)
+                return
+            }
         }
 
+        msgToSend = this.flowClass.find(body) || []
         this.sendFlow(msgToSend, from)
     }
 
+    /**
+     * Enviar mensaje con contexto atraves del proveedor de whatsapp
+     * @param {*} numberOrId
+     * @param {*} ctxMessage ver más en GLOSSARY.md
+     * @returns
+     */
     sendProviderAndSave = (numberOrId, ctxMessage) => {
         const { answer } = ctxMessage
         return Promise.all([
-            this.providerClass.sendMessage(numberOrId, answer),
+            this.providerClass.sendMessage(numberOrId, answer, ctxMessage),
             this.databaseClass.save({ ...ctxMessage, from: numberOrId }),
         ])
     }
 
-    sendFlow = (messageToSend, numberOrId) => {
+    sendFlow = async (messageToSend, numberOrId) => {
         const queue = []
         for (const ctxMessage of messageToSend) {
-            queue.push(this.sendProviderAndSave(numberOrId, ctxMessage))
+            const delayMs = ctxMessage?.options?.delay || 0
+            if (delayMs) await delay(delayMs)
+            Queue.enqueue(() =>
+                this.sendProviderAndSave(numberOrId, ctxMessage)
+            )
         }
         return Promise.all(queue)
     }

packages/bot/index.js

@@ -22,11 +22,13 @@ const createFlow = (args) => {
 
 /**
  * Crear instancia de clase Provider
+ * Depdendiendo del Provider puedes pasar argumentos
+ * Ver Documentacion
  * @param {*} args
  * @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)
         throw new Error('El provider no implementa ProviderClass')
     return providerInstance

packages/bot/io/flow.class.js

@@ -21,29 +21,25 @@ class FlowClass {
     }
 
     find = (keyOrWord, symbol = false, overFlow = null) => {
+        keyOrWord = `${keyOrWord}`
         let capture = false
         let messages = []
         let refSymbol = null
         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 sensitive = refSymbol?.options?.sensitive || false
             capture = refSymbol?.options?.capture || false
 
-            keyOrWord = mapSensitiveString(keyOrWord, sensitive)
-
             if (capture) return messages
 
             if (symbol) {
@@ -51,9 +47,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) => {
-                    mapSensitiveString(c.keyword, sensitive).includes(keyOrWord)
+                    return mapSensitive(c.keyword, sensitive).test(keyOrWord)
-                )
+                })
                 if (refSymbol?.ref) findIn(refSymbol.ref, true)
                 return messages
             }

packages/bot/io/methods/addAnswer.js

@@ -1,10 +1,9 @@
 const { generateRef } = require('../../utils/hash')
 const { toJson } = require('./toJson')
-const { toSerialize } = require('./toSerialize')
 /**
  *
  * @param answer string
- * @param options {media:string, buttons:[], capture:true default false}
+ * @param options {media:string, buttons:[{"body":"😎 Cursos"}], delay:ms, capture:true default false}
  * @returns
  */
 const addAnswer =
@@ -25,6 +24,7 @@ const addAnswer =
                     : false,
             child:
                 typeof options?.child === 'string' ? `${options?.child}` : null,
+            delay: typeof options?.delay === 'number' ? options?.delay : 0,
         })
 
         const getNested = () => ({
@@ -79,6 +79,7 @@ const addAnswer =
             }
         }
 
+        /// Retornar contexto no colocar nada más abajo de esto
         const ctx = ctxAnswer()
 
         return {

packages/bot/provider/provider.class.js

@@ -19,7 +19,7 @@ class ProviderClass extends EventEmitter {
      *
      */
 
-    sendMessage = async (userId, message) => {
+    sendMessage = async (userId, message, sendMessage) => {
         if (NODE_ENV !== 'production')
             console.log('[sendMessage]', { userId, message })
         return message

packages/bot/utils/delay.js

@@ -0,0 +1,4 @@
+const delay = (miliseconds) =>
+    new Promise((res) => setTimeout(res, miliseconds))
+
+module.exports = { delay }

packages/bot/utils/queue.js

@@ -0,0 +1,46 @@
+class Queue {
+    static queue = []
+    static pendingPromise = false
+
+    static enqueue(promise) {
+        return new Promise((resolve, reject) => {
+            this.queue.push({
+                promise,
+                resolve,
+                reject,
+            })
+            this.dequeue()
+        })
+    }
+
+    static dequeue() {
+        if (this.workingOnPromise) {
+            return false
+        }
+        const item = this.queue.shift()
+        if (!item) {
+            return false
+        }
+        try {
+            this.workingOnPromise = true
+            item.promise()
+                .then((value) => {
+                    this.workingOnPromise = false
+                    item.resolve(value)
+                    this.dequeue()
+                })
+                .catch((err) => {
+                    this.workingOnPromise = false
+                    item.reject(err)
+                    this.dequeue()
+                })
+        } catch (err) {
+            this.workingOnPromise = false
+            item.reject(err)
+            this.dequeue()
+        }
+        return true
+    }
+}
+
+module.exports = Queue

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

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

packages/create-bot-whatsapp/index.js

@@ -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

packages/create-bot-whatsapp/package.json

@@ -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"
+    }
+}

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

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

packages/database/package.json

@@ -10,11 +10,13 @@
     "dependencies": {
         "dotenv": "^16.0.3",
         "mongodb": "^4.11.0",
-        "stormdb": "^0.6.0"
+        "stormdb": "^0.6.0",
+        "mysql2": "^2.3.3"
     },
     "exports": {
         "./mock": "./lib/mock/index.cjs",
         "./mongo": "./lib/mongo/index.cjs",
-        "./json-file": "./lib/json-file/index.cjs"
+        "./json-file": "./lib/json-file/index.cjs",
+        "./mysql": "./lib/mysql/index.cjs"
     }
 }

packages/database/rollup-database.config.js

@@ -22,12 +22,20 @@ module.exports = [
         plugins: [commonjs()],
     },
     {
-        input: join(__dirname, 'src', 'json-file', 'index.js'),
+        input: join(__dirname, 'src', 'mysql', 'index.js'),
         output: {
             banner: banner['banner.output'].join(''),
-            file: join(__dirname, 'lib', 'json-file', 'index.cjs'),
+            file: join(__dirname, 'lib', 'mysql', 'index.cjs'),
             format: 'cjs',
         },
         plugins: [commonjs()],
     },
+    {
+        input: join(__dirname, 'src', 'json-file', 'index.js'),
+        output: {
+            banner: banner['banner.output'].join(''),
+            file: join(__dirname, 'lib', 'json-file', 'index.cjs'),
+        },
+        plugins: [commonjs()],
+    },
 ]

packages/database/src/mysql/index.js

@@ -0,0 +1,69 @@
+const mysql = require('mysql2')
+
+class MyslAdapter {
+    db
+    listHistory = []
+    credentials = { host: null, user: null, database: null }
+
+    constructor(_credentials) {
+        this.credentials = _credentials
+        this.init().then()
+    }
+
+    async init() {
+        this.db = mysql.createConnection(this.credentials)
+
+        await this.db.connect((error) => {
+            if (!error) {
+                console.log(`Solicitud de conexión a base de datos exitosa`)
+            }
+
+            if (error) {
+                console.log(`Solicitud de conexión fallida ${error.stack}`)
+            }
+        })
+    }
+
+    getPrevByNumber = (from) =>
+        new Promise((resolve, reject) => {
+            const sql = `SELECT * FROM history WHERE phone=${from} ORDER BY id DESC`
+            this.db.query(sql, (error, rows) => {
+                if (error) {
+                    reject(error)
+                }
+
+                if (rows.length) {
+                    const [row] = rows
+                    row.options = JSON.parse(row.options)
+                    resolve(row)
+                }
+
+                if (!rows.length) {
+                    resolve(null)
+                }
+            })
+        })
+
+    save = (ctx) => {
+        const values = [
+            [
+                ctx.ref,
+                ctx.keyword,
+                ctx.answer,
+                ctx.refSerialize,
+                ctx.from,
+                JSON.stringify(ctx.options),
+            ],
+        ]
+        const sql =
+            'INSERT INTO history (ref, keyword, answer, refSerialize, phone, options ) values ?'
+
+        this.db.query(sql, [values], (err) => {
+            if (err) throw err
+            console.log('Guardado en DB...', values)
+        })
+        this.listHistory.push(ctx)
+    }
+}
+
+module.exports = MyslAdapter

packages/docs/package.json

@@ -29,10 +29,13 @@
     "@types/node": "latest",
     "@typescript-eslint/eslint-plugin": "5.43.0",
     "@typescript-eslint/parser": "5.43.0",
+    "autoprefixer": "10.4.11",
     "eslint": "8.28.0",
     "eslint-plugin-qwik": "0.14.1",
     "node-fetch": "3.3.0",
+    "postcss": "^8.4.16",
     "prettier": "2.7.1",
+    "tailwindcss": "^3.1.8",
     "typescript": "4.9.3",
     "vite": "3.2.4",
     "vite-tsconfig-paths": "3.5.0",

packages/docs/postcss.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+}

packages/docs/src/global.css

@@ -63,4 +63,4 @@ code {
   border-radius: 3px;
   font-size: 0.9em;
   border-bottom: 2px solid #bfbfbf;
-}
+}

packages/docs/tailwind.config.js

@@ -0,0 +1,21 @@
+/** @type {import('tailwindcss').Config} */
+
+const defaultTheme = require("tailwindcss/defaultTheme");
+const colors = require("tailwindcss/colors");
+
+module.exports = {
+  content: ["./src/**/*.{js,ts,jsx,tsx,mdx}"],
+  theme: {
+    extend: {
+      colors: {
+        primary: colors.purple,
+        secondary: colors.sky,
+      },
+      fontFamily: {
+        sans: ["'Inter'", ...defaultTheme.fontFamily.sans],
+      },
+    },
+  },
+  plugins: [],
+  darkMode: "class",
+};

packages/provider/TODO.md

@@ -1,13 +0,0 @@
-# @bot-whatsapp/provider
-
-```js
-// bootstrap.js Como iniciar el provider
-const { inout, provider, database } = require('@bot-whatsapp')
-
-provider.start()
-provider.close()
-```
-
--   [ ] whatsapp-web.js _verificar update_
--   [ ] Meta _verificar tokens_
--   [ ] Twilio _verificar tokens_

packages/provider/src/twilio/index.js

@@ -1,19 +1,59 @@
 const twilio = require('twilio')
 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 {
-    constructor() {
+    twilioHook
-        super(TwilioVendor)
+    vendor
+    vendorNumber
+    constructor({ accountSid, authToken, vendorNumber }, _port = 3000) {
+        super()
+        this.vendor = new twilio(accountSid, authToken)
+        this.twilioHook = new TwilioWebHookServer(_port)
+        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,
-            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

packages/provider/src/twilio/server.js

@@ -0,0 +1,63 @@
+const { EventEmitter } = require('node:events')
+const polka = require('polka')
+const { urlencoded } = require('body-parser')
+const { parseNumber } = require('./utils')
+
+/**
+ * Encargado de levantar un servidor HTTP con una hook url
+ * [POST] /twilio-hook
+ */
+class TwilioWebHookServer extends EventEmitter {
+    twilioServer
+    twilioPort
+    constructor(_twilioPort) {
+        this.twilioServer = this.buildHTTPServer()
+        this.twilioPort = _twilioPort
+    }
+
+    /**
+     * Mensaje entrante
+     * emit: 'message'
+     * @param {*} req
+     * @param {*} res
+     */
+    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)
+    }
+
+    /**
+     * Contruir HTTP Server
+     * @returns
+     */
+    buildHTTPServer = () => {
+        return polka()
+            .use(urlencoded({ extended: true }))
+            .post('/twilio-hook', this.incomingMsg)
+    }
+
+    /**
+     * Puerto del HTTP
+     * @param {*} port default 3000
+     */
+    start = () => {
+        this.twilioServer.listen(this.twilioPort, () => {
+            console.log(``)
+            console.log(`[Twilio]: Agregar esta url "WHEN A MESSAGE COMES IN"`)
+            console.log(
+                `[Twilio]: http://localhost:${this.twilioPort}/twilio-hook`
+            )
+            console.log(`[Twilio]: Más información en la documentacion`)
+            console.log(``)
+        })
+        this.emit('ready')
+    }
+}
+
+module.exports = TwilioWebHookServer

packages/provider/src/twilio/utils.js

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

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

@@ -1,13 +1,24 @@
-const { Client, LocalAuth } = require('whatsapp-web.js')
+const {
+    Client,
+    LocalAuth,
+    MessageMedia,
+    Buttons,
+    List,
+} = require('whatsapp-web.js')
 const { ProviderClass } = require('@bot-whatsapp/bot')
 const { Console } = require('console')
-const { createWriteStream } = require('fs')
+const { createWriteStream, existsSync } = require('fs')
 const { cleanNumber, generateImage, isValidNumber } = require('./utils')
 
 const logger = new Console({
     stdout: createWriteStream('./log'),
 })
 
+/**
+ * WebWhatsappProvider: Es una clase tipo adaptor
+ * que extiende clases de ProviderClass (la cual es como interfaz para sber que funciones rqueridas)
+ * https://github.com/pedroslopez/whatsapp-web.js
+ */
 class WebWhatsappProvider extends ProviderClass {
     vendor
     constructor() {
@@ -21,13 +32,14 @@ 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', {
                 instructions: [
-                    `Debes eliminar la carpeta .wwebjs_auth`,
+                    `(Opcion 1): Debes eliminar la carpeta .wwebjs_auth y reiniciar nuevamente el bot. `,
-                    `y reiniciar nuevamente el bot `,
+                    `(Opcion 2): Intenta actualizar el paquete [npm install whatsapp-web.js] `,
+                    `(Opcion 3): Ir FORO de discord https://link.codigoencasa.com/DISCORD `,
                 ],
             })
         })
@@ -60,10 +72,6 @@ class WebWhatsappProvider extends ProviderClass {
             event: 'ready',
             func: () => this.emit('ready', true),
         },
-        {
-            event: 'authenticated',
-            func: () => this.emit('ready', true),
-        },
         {
             event: 'message',
             func: (payload) => {
@@ -80,10 +88,87 @@ class WebWhatsappProvider extends ProviderClass {
         },
     ]
 
-    sendMessage = async (userId, message) => {
+    /**
-        const number = cleanNumber(userId)
+     * Enviar un archivo multimedia
+     * https://docs.wwebjs.dev/MessageMedia.html
+     * @private
+     * @param {*} number
+     * @param {*} mediaInput
+     * @returns
+     */
+    sendMedia = async (number, mediaInput = null) => {
+        if (!existsSync(mediaInput))
+            throw new Error(`NO_SE_ENCONTRO: ${mediaInput}`)
+        const media = MessageMedia.fromFilePath(mediaInput)
+        return this.vendor.sendMessage(number, media, {
+            sendAudioAsVoice: true,
+        })
+    }
+
+    /**
+     * Enviar botones
+     * https://docs.wwebjs.dev/Buttons.html
+     * @private
+     * @param {*} number
+     * @param {*} message
+     * @param {*} buttons []
+     * @returns
+     */
+    sendButtons = async (number, message, buttons = []) => {
+        const buttonMessage = new Buttons(message, buttons, '', '')
+        return this.vendor.sendMessage(number, buttonMessage)
+    }
+
+    /**
+     * Enviar lista
+     * https://docs.wwebjs.dev/List.html
+     * @private
+     * @alpha No funciona en whatsapp bussines
+     * @param {*} number
+     * @param {*} message
+     * @param {*} buttons []
+     * @returns
+     */
+    sendList = async (number, message, listInput = []) => {
+        let sections = [
+            {
+                title: 'sectionTitle',
+                rows: [
+                    { title: 'ListItem1', description: 'desc' },
+                    { title: 'ListItem2' },
+                ],
+            },
+        ]
+        let list = new List('List body', 'btnText', sections, 'Title', 'footer')
+        return this.vendor.sendMessage(number, list)
+    }
+
+    /**
+     * Enviar un mensaje solo texto
+     * https://docs.wwebjs.dev/Message.html
+     * @private
+     * @param {*} number
+     * @param {*} message
+     * @returns
+     */
+    sendText = async (number, message) => {
         return this.vendor.sendMessage(number, message)
     }
+
+    /**
+     *
+     * @param {*} userId
+     * @param {*} message
+     * @param {*} param2
+     * @returns
+     */
+    sendMessage = async (userId, message, { options }) => {
+        const number = cleanNumber(userId)
+        if (options?.media) return this.sendMedia(number, options.media)
+        if (options?.buttons?.length)
+            return this.sendButtons(number, message, options.buttons)
+        return this.sendText(number, message)
+    }
 }
 
 module.exports = WebWhatsappProvider

scripts/move.js

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

starters/apps/base/app.js

@@ -5,11 +5,6 @@ const {
     addKeyword,
 } = require('@bot-whatsapp/bot')
 
-/**
- *  ATENCION: Si vas a usar el provider whatsapp-web.js
- *  recuerda ejecutar npm i whatsapp-web.js@latest
- */
-
 const WebWhatsappProvider = require('@bot-whatsapp/provider/web-whatsapp')
 const MockAdapter = require('@bot-whatsapp/database/mock')
 

starters/apps/basic/app.js

@@ -6,11 +6,6 @@ const {
     addChild,
 } = require('@bot-whatsapp/bot')
 
-/**
- *  ATENCION: Si vas a usar el provider whatsapp-web.js
- *  recuerda ejecutar npm i whatsapp-web.js@latest
- */
-
 const WebWhatsappProvider = require('@bot-whatsapp/provider/web-whatsapp')
 const MockAdapter = require('@bot-whatsapp/database/mock')