From fd044fb1698f6b88c9255ce0c2ef6f8a77b3a5bd Mon Sep 17 00:00:00 2001 From: leifermendez Date: Mon, 9 Jan 2023 21:28:34 +0000 Subject: [PATCH 1/4] =?UTF-8?q?ci(providers):=20=F0=9F=91=8D=20updated=20v?= =?UTF-8?q?ersions=20stable=20providers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 3658efd98a02b2f2e7edb6afd677bad95e114516 Mon Sep 17 00:00:00 2001 From: leifermendez Date: Mon, 9 Jan 2023 21:30:46 +0000 Subject: [PATCH 2/4] ci(version): :zap: automatic - "${date}" updated versions every packages --- packages/bot/package.json | 2 +- packages/cli/package.json | 2 +- packages/create-bot-whatsapp/package.json | 2 +- packages/database/package.json | 2 +- packages/portal/package.json | 2 +- packages/provider/package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/bot/package.json b/packages/bot/package.json index 9ad1739..487bd2c 100644 --- a/packages/bot/package.json +++ b/packages/bot/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/bot", - "version": "0.0.48-alpha.0", + "version": "0.0.49-alpha.0", "description": "", "main": "./lib/bundle.bot.cjs", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 056ba0f..8bff566 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/cli", - "version": "0.0.55-alpha.0", + "version": "0.0.56-alpha.0", "description": "", "main": "index.js", "devDependencies": { diff --git a/packages/create-bot-whatsapp/package.json b/packages/create-bot-whatsapp/package.json index e6824e5..9bd4351 100644 --- a/packages/create-bot-whatsapp/package.json +++ b/packages/create-bot-whatsapp/package.json @@ -1,6 +1,6 @@ { "name": "create-bot-whatsapp", - "version": "0.0.66-alpha.0", + "version": "0.0.67-alpha.0", "description": "", "main": "./lib/bundle.create-bot-whatsapp.cjs", "files": [ diff --git a/packages/database/package.json b/packages/database/package.json index 413c3b6..f0b81e0 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/database", - "version": "0.0.47-alpha.0", + "version": "0.0.48-alpha.0", "description": "Esto es el conector a mysql, pg, mongo", "main": "./lib/mock/index.cjs", "keywords": [], diff --git a/packages/portal/package.json b/packages/portal/package.json index 882edfe..b2a951f 100644 --- a/packages/portal/package.json +++ b/packages/portal/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/portal", - "version": "0.0.5-alpha.0", + "version": "0.0.6-alpha.0", "description": "Portal WEB para escanear QR", "main": "./lib/portal.http.cjs", "scripts": { diff --git a/packages/provider/package.json b/packages/provider/package.json index 2d02aab..3b4c56d 100644 --- a/packages/provider/package.json +++ b/packages/provider/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/provider", - "version": "0.0.53-alpha.0", + "version": "0.0.54-alpha.0", "description": "Esto es el conector a Twilio, Meta, etc...", "main": "./lib/mock/index.cjs", "keywords": [], From af8b401d075e1c35065589ede61476461ce86b4d Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Tue, 10 Jan 2023 10:41:56 +0100 Subject: [PATCH 3/4] feat: :zap: qr portal --- packages/portal/portal.http.js | 33 +++++++++++++-------- packages/provider/src/baileys/index.js | 2 +- packages/provider/src/venom/index.js | 9 ++++-- packages/provider/src/web-whatsapp/index.js | 5 +++- 4 files changed, 32 insertions(+), 17 deletions(-) diff --git a/packages/portal/portal.http.js b/packages/portal/portal.http.js index 293885e..3066c12 100644 --- a/packages/portal/portal.http.js +++ b/packages/portal/portal.http.js @@ -1,6 +1,6 @@ const { join } = require('path') const { createReadStream, existsSync } = require('fs') -const { bgYellow, cyan } = require('kleur') +const { bgYellow, cyan, yellow } = require('kleur') const polka = require('polka') const HTTP_PORT = process.env.PORT || 3000 @@ -28,13 +28,28 @@ const start = (args) => { } const { port, publicSite, name } = injectArgs + const banner = () => { + console.log(``) + console.log(bgYellow(`🚩 ESCANEAR QR 🚩`)) + console.log(cyan(`Existen varias maneras de escanear el QR code`)) + console.log( + cyan(`- Tambien puedes visitar `), + yellow(`${publicSite}:${port}`) + ) + console.log( + cyan(`- Se ha creado un archivo que finaliza `), + yellow('qr.png') + ) + console.log(``) + } + polka() .use(serve) .get('qr.png', (_, res) => { const qrSource = [ - join(process.cwd(), `${name}.png`), - join(__dirname, '..', `${name}.png`), - join(__dirname, `${name}.png`), + join(process.cwd(), `${name}.qr.png`), + join(__dirname, '..', `${name}.qr.png`), + join(__dirname, `${name}.qr.png`), ].find((i) => existsSync(i)) const qrMark = [ @@ -42,17 +57,11 @@ const start = (args) => { join(__dirname, '..', 'dist', 'water-mark.png'), ].find((i) => existsSync(i)) const fileStream = createReadStream(qrSource ?? qrMark) + res.writeHead(200, { 'Content-Type': 'image/png' }) fileStream.pipe(res) }) - .listen(port, () => { - console.log(``) - console.log(bgYellow(`🚩 ESCANEAR QR 🚩`)) - console.log(cyan(`Existen varias maneras de escanear el QR code`)) - console.log(cyan(`- Se ha creado un archivo /qr.png`)) - console.log(cyan(`- Tambien puedes visitar ${publicSite}:${port}`)) - console.log(``) - }) + .listen(port, () => banner()) } module.exports = start diff --git a/packages/provider/src/baileys/index.js b/packages/provider/src/baileys/index.js index 232cdaf..6d82a9e 100644 --- a/packages/provider/src/baileys/index.js +++ b/packages/provider/src/baileys/index.js @@ -96,7 +96,7 @@ class BaileysProvider extends ProviderClass { }) await baileyGenerateImage( qr, - `${this.globalVendorArgs.name}.png` + `${this.globalVendorArgs.name}.qr.png` ) } }) diff --git a/packages/provider/src/venom/index.js b/packages/provider/src/venom/index.js index c958d83..7fa18c7 100644 --- a/packages/provider/src/venom/index.js +++ b/packages/provider/src/venom/index.js @@ -38,10 +38,13 @@ class VenomProvider extends ProviderClass { { session: NAME_DIR_SESSION, multidevice: true, + disableSpins: true, + disableWelcome: true, + logger, + logQR: false, }, (base) => this.generateQr(base), - undefined, - { logQR: false } + undefined ) this.vendor = client } catch (e) { @@ -69,7 +72,7 @@ class VenomProvider extends ProviderClass { `Necesitas ayuda: https://link.codigoencasa.com/DISCORD`, ], }) - await venomGenerateImage(qr, `${this.globalVendorArgs.name}.png`) + await venomGenerateImage(qr, `${this.globalVendorArgs.name}.qr.png`) } /** diff --git a/packages/provider/src/web-whatsapp/index.js b/packages/provider/src/web-whatsapp/index.js index fa8c9f5..154138f 100644 --- a/packages/provider/src/web-whatsapp/index.js +++ b/packages/provider/src/web-whatsapp/index.js @@ -77,7 +77,10 @@ class WebWhatsappProvider extends ProviderClass { `Necesitas ayuda: https://link.codigoencasa.com/DISCORD`, ], }) - await wwebGenerateImage(qr, `${this.globalVendorArgs.name}.png`) + await wwebGenerateImage( + qr, + `${this.globalVendorArgs.name}.qr.png` + ) }, }, { From 246ecdc11a8c4e652867c842b612dc4ce73f9828 Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Tue, 10 Jan 2023 10:44:49 +0100 Subject: [PATCH 4/4] feat: :zap: qr portal --- packages/provider/src/baileys/index.js | 2 +- packages/provider/src/venom/index.js | 2 +- packages/provider/src/web-whatsapp/index.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/provider/src/baileys/index.js b/packages/provider/src/baileys/index.js index 6d82a9e..de6c66d 100644 --- a/packages/provider/src/baileys/index.js +++ b/packages/provider/src/baileys/index.js @@ -89,7 +89,7 @@ class BaileysProvider extends ProviderClass { if (qr) { this.emit('require_action', { instructions: [ - `Debes escanear el QR Code para iniciar session reivsa qr.png`, + `Debes escanear el QR Code para iniciar ${this.globalVendorArgs.name}.qr.png`, `Recuerda que el QR se actualiza cada minuto `, `Necesitas ayuda: https://link.codigoencasa.com/DISCORD`, ], diff --git a/packages/provider/src/venom/index.js b/packages/provider/src/venom/index.js index 7fa18c7..4b7c231 100644 --- a/packages/provider/src/venom/index.js +++ b/packages/provider/src/venom/index.js @@ -67,7 +67,7 @@ class VenomProvider extends ProviderClass { console.clear() this.emit('require_action', { instructions: [ - `Debes escanear el QR Code para iniciar session reivsa qr.png`, + `Debes escanear el QR Code para iniciar ${this.globalVendorArgs.name}.qr.png`, `Recuerda que el QR se actualiza cada minuto `, `Necesitas ayuda: https://link.codigoencasa.com/DISCORD`, ], diff --git a/packages/provider/src/web-whatsapp/index.js b/packages/provider/src/web-whatsapp/index.js index 154138f..f7f8bd0 100644 --- a/packages/provider/src/web-whatsapp/index.js +++ b/packages/provider/src/web-whatsapp/index.js @@ -72,7 +72,7 @@ class WebWhatsappProvider extends ProviderClass { func: async (qr) => { this.emit('require_action', { instructions: [ - `Debes escanear el QR Code para iniciar session reivsa qr.png`, + `Debes escanear el QR Code para iniciar ${this.globalVendorArgs.name}.qr.png`, `Recuerda que el QR se actualiza cada minuto `, `Necesitas ayuda: https://link.codigoencasa.com/DISCORD`, ],