Merge pull request #541 from codigoencasa/dev

Dev

__test__/01-case.test.js

@@ -0,0 +1,41 @@
+const { test } = require('uvu')
+const assert = require('uvu/assert')
+const MOCK_DB = require('../packages/database/src/mock')
+const PROVIDER_DB = require('../packages/provider/src/mock')
+const {
+    addKeyword,
+    createBot,
+    createFlow,
+    createProvider,
+} = require('../packages/bot')
+
+test(`[Caso - 01] Flow Basico`, async () => {
+    const [VALUE_A, VALUE_B] = ['hola', 'buenas']
+
+    const flow = addKeyword(VALUE_A).addAnswer(VALUE_B)
+    const provider = createProvider(PROVIDER_DB)
+    const database = new MOCK_DB()
+
+    createBot({
+        database,
+        flow: createFlow([flow]),
+        provider,
+    })
+
+    provider.delaySendMessage(100, 'message', {
+        from: '000',
+        body: VALUE_A,
+    })
+
+    await delay(100)
+
+    const prevMsg = database.getPrevByNumber('000')
+
+    assert.is(prevMsg.answer, VALUE_B)
+})
+
+test.run()
+
+function delay(ms) {
+    return new Promise((res) => setTimeout(res, ms))
+}

__test__/02-case.test.js

@@ -0,0 +1,99 @@
+const { test } = require('uvu')
+const assert = require('uvu/assert')
+const MOCK_DB = require('../packages/database/src/mock')
+const PROVIDER_DB = require('../packages/provider/src/mock')
+const {
+    addKeyword,
+    createBot,
+    createFlow,
+    createProvider,
+} = require('../packages/bot/index')
+
+/**
+ * Falsear peticion async
+ * @param {*} fakeData
+ * @returns
+ */
+const fakeHTTP = async (fakeData = []) => {
+    console.log('⚡ Server request!')
+    await delay(50)
+    console.log('⚡ Server return!')
+    const data = fakeData.map((u, i) => ({ body: `${i + 1} ${u}` }))
+    console.log(data)
+    return Promise.resolve(data)
+}
+
+test(`[Caso - 02] Flow (flowDynamic)`, async () => {
+    const MOCK_VALUES = [
+        'Bienvenido te envio muchas marcas (5510)',
+        'Seleccione marca del auto a cotizar, con el *número* correspondiente',
+        'Seleccione la sub marca del auto a cotizar, con el *número* correspondiente:',
+        'Los precios rondan:',
+    ]
+    const provider = createProvider(PROVIDER_DB)
+    const database = new MOCK_DB()
+
+    const flujoPrincipal = addKeyword(['hola'])
+        .addAnswer(MOCK_VALUES[0], null, async (ctx, { flowDynamic }) => {
+            console.log('execute...')
+            const data = await fakeHTTP(['Ford', 'GM', 'BMW'])
+            return flowDynamic(data)
+        })
+        .addAnswer(MOCK_VALUES[1], null, async (ctx, { flowDynamic }) => {
+            const data = await fakeHTTP(['Ranger', 'Explorer'])
+            return flowDynamic(data)
+        })
+        .addAnswer(MOCK_VALUES[2], null, async (ctx, { flowDynamic }) => {
+            const data = await fakeHTTP(['Usado', 'Nuevos'])
+            return flowDynamic(data)
+        })
+        .addAnswer(MOCK_VALUES[3], null, async (ctx, { flowDynamic }) => {
+            const data = await fakeHTTP(['1000', '2000', '3000'])
+            return flowDynamic(data)
+        })
+
+    createBot({
+        database,
+        flow: createFlow([flujoPrincipal]),
+        provider,
+    })
+
+    provider.delaySendMessage(0, 'message', {
+        from: '000',
+        body: 'hola',
+    })
+
+    await delay(1200)
+    const getHistory = database.listHistory.map((i) => i.answer)
+    assert.is(MOCK_VALUES[0], getHistory[0])
+
+    //FlowDynamic
+    assert.is('1 Ford', getHistory[1])
+    assert.is('2 GM', getHistory[2])
+    assert.is('3 BMW', getHistory[3])
+
+    assert.is(MOCK_VALUES[1], getHistory[4])
+
+    //FlowDynamic
+    assert.is('1 Ranger', getHistory[5])
+    assert.is('2 Explorer', getHistory[6])
+
+    assert.is(MOCK_VALUES[2], getHistory[7])
+
+    //FlowDynamic
+    assert.is('1 Usado', getHistory[8])
+    assert.is('2 Nuevos', getHistory[9])
+
+    assert.is(MOCK_VALUES[3], getHistory[10])
+
+    //FlowDynamic
+    assert.is('1 1000', getHistory[11])
+    assert.is('2 2000', getHistory[12])
+    assert.is('3 3000', getHistory[13])
+})
+
+test.run()
+
+function delay(ms) {
+    return new Promise((res) => setTimeout(res, ms))
+}

__test__/03-case.test.js

@@ -0,0 +1,44 @@
+const { test } = require('uvu')
+const assert = require('uvu/assert')
+const MOCK_DB = require('../packages/database/src/mock')
+const PROVIDER_DB = require('../packages/provider/src/mock')
+const {
+    addKeyword,
+    createBot,
+    createFlow,
+    createProvider,
+} = require('../packages/bot/index')
+
+test(`[Caso - 03] Flow puro`, async () => {
+    const MOCK_VALUES = ['Bienvenido a mi tienda', 'Como estas?']
+
+    const provider = createProvider(PROVIDER_DB)
+    const database = new MOCK_DB()
+
+    const flujoPrincipal = addKeyword(['hola'])
+        .addAnswer(MOCK_VALUES[0])
+        .addAnswer(MOCK_VALUES[1])
+
+    createBot({
+        database,
+        flow: createFlow([flujoPrincipal]),
+        provider,
+    })
+
+    provider.delaySendMessage(0, 'message', {
+        from: '000',
+        body: 'hola',
+    })
+
+    await delay(10)
+    const getHistory = database.listHistory.map((i) => i.answer)
+
+    assert.is(MOCK_VALUES[0], getHistory[0])
+    assert.is(MOCK_VALUES[1], getHistory[1])
+})
+
+test.run()
+
+function delay(ms) {
+    return new Promise((res) => setTimeout(res, ms))
+}

__test__/04-case.test.js

@@ -0,0 +1,82 @@
+const { test } = require('uvu')
+const assert = require('uvu/assert')
+const MOCK_DB = require('../packages/database/src/mock')
+const PROVIDER_DB = require('../packages/provider/src/mock')
+const {
+    addKeyword,
+    createBot,
+    createFlow,
+    createProvider,
+} = require('../packages/bot/index')
+
+/**
+ * Falsear peticion async
+ * @param {*} fakeData
+ * @returns
+ */
+const fakeHTTP = async (fakeData = []) => {
+    console.log('⚡ Server request!')
+    await delay(50)
+    console.log('⚡ Server return!')
+    const data = fakeData.map((u, i) => ({ body: `${i + 1} ${u}` }))
+    console.log(data)
+    return Promise.resolve(data)
+}
+
+test(`[Caso - 04] Romper flujo (endFlow)`, async () => {
+    const MOCK_VALUES = [
+        'Bienvenido te envio muchas marcas (5510)',
+        'Seleccione marca del auto a cotizar, con el *número* correspondiente',
+        'Seleccione la sub marca del auto a cotizar, con el *número* correspondiente:',
+        'Los precios rondan:',
+    ]
+    const provider = createProvider(PROVIDER_DB)
+    const database = new MOCK_DB()
+
+    const flujoPrincipal = addKeyword(['hola'])
+        .addAnswer(MOCK_VALUES[0], null, async (ctx, { flowDynamic }) => {
+            console.log('execute...')
+            const data = await fakeHTTP(['Ford', 'GM', 'BMW'])
+            return flowDynamic(data)
+        })
+        .addAnswer(MOCK_VALUES[1], null, async (ctx, { endFlow }) => {
+            return endFlow()
+        })
+        .addAnswer(MOCK_VALUES[2], null, async (ctx, { flowDynamic }) => {
+            const data = await fakeHTTP(['Usado', 'Nuevos'])
+            return flowDynamic(data)
+        })
+        .addAnswer(MOCK_VALUES[3], null, async (ctx, { flowDynamic }) => {
+            const data = await fakeHTTP(['1000', '2000', '3000'])
+            return flowDynamic(data)
+        })
+
+    createBot({
+        database,
+        flow: createFlow([flujoPrincipal]),
+        provider,
+    })
+
+    provider.delaySendMessage(0, 'message', {
+        from: '000',
+        body: 'hola',
+    })
+
+    await delay(1200)
+    const getHistory = database.listHistory.map((i) => i.answer)
+    assert.is(MOCK_VALUES[0], getHistory[0])
+
+    //FlowDynamic
+    assert.is('1 Ford', getHistory[1])
+    assert.is('2 GM', getHistory[2])
+    assert.is('3 BMW', getHistory[3])
+
+    assert.is(MOCK_VALUES[1], getHistory[4])
+    assert.is(undefined, getHistory[5])
+})
+
+test.run()
+
+function delay(ms) {
+    return new Promise((res) => setTimeout(res, ms))
+}

package.json

@@ -24,7 +24,8 @@
         "build": "yarn run cli:rollup && yarn run bot:rollup && yarn run provider:rollup && yarn run database:rollup && yarn run contexts:rollup && yarn run create-bot-whatsapp:rollup && yarn run portal:rollup",
         "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.e2e": "node ./node_modules/uvu/bin.js __test__",
+        "test.coverage": "node ./node_modules/c8/bin/c8.js npm run test.unit && npm run test.e2e",
         "test": "npm run test.coverage",
         "cli": "node ./packages/cli/bin/cli.js",
         "create": "node ./packages/create-bot-whatsapp/bin/create.js",

packages/bot/core/core.class.js

@@ -72,11 +72,12 @@ class CoreClass {
         const { body, from } = messageCtxInComming
         let msgToSend = []
         let fallBackFlag = false
+        let endFlowFlag = false
         if (this.generalArgs.blackList.includes(from)) return
         if (!body) return
         if (!body.length) return
 
-        const prevMsg = await this.databaseClass.getPrevByNumber(from)
+        let prevMsg = await this.databaseClass.getPrevByNumber(from)
         const refToContinue = this.flowClass.findBySerialize(
             prevMsg?.refSerialize
         )
@@ -90,13 +91,28 @@ class CoreClass {
             this.databaseClass.save(ctxByNumber)
         }
 
+        // 📄 Limpiar cola de procesos
+        const clearQueue = () => {
+            QueuePrincipal.pendingPromise = false
+            QueuePrincipal.queue = []
+        }
+
+        // 📄 Finalizar flujo
+        const endFlow = async () => {
+            prevMsg = null
+            endFlowFlag = true
+            clearQueue()
+            return
+        }
+
         // 📄 Esta funcion se encarga de enviar un array de mensajes dentro de este ctx
         const sendFlow = async (messageToSend, numberOrId) => {
             // [1 Paso] esto esta bien!
-            if (prevMsg?.options?.capture) await cbEveryCtx(prevMsg?.ref)
 
+            if (prevMsg?.options?.capture) await cbEveryCtx(prevMsg?.ref)
             const queue = []
             for (const ctxMessage of messageToSend) {
+                if (endFlowFlag) return
                 const delayMs = ctxMessage?.options?.delay || 0
                 if (delayMs) await delay(delayMs)
                 QueuePrincipal.enqueue(() =>
@@ -145,6 +161,7 @@ class CoreClass {
                 })
                 .slice(0, optListMsg.limit)
 
+            if (endFlowFlag) return
             for (const msg of parseListMsg) {
                 await this.sendProviderAndSave(from, msg)
             }
@@ -163,6 +180,7 @@ class CoreClass {
             return this.flowClass.allCallbacks[inRef](messageCtxInComming, {
                 fallBack,
                 flowDynamic,
+                endFlow,
             })
         }
 

packages/bot/tests/flow.class.test.js

@@ -1,7 +1,6 @@
 const { test } = require('uvu')
 const assert = require('uvu/assert')
 const FlowClass = require('../io/flow.class')
-const MockProvider = require('../../../__mocks__/mock.provider')
 const { addKeyword } = require('../index')
 
 test(`[FlowClass] Probando instanciamiento de clase`, async () => {