From 249a97862f042e4b3083861bc96dcb0dacd511f0 Mon Sep 17 00:00:00 2001 From: leifermendez Date: Mon, 9 Jan 2023 18:48:18 +0000 Subject: [PATCH 1/5] 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 1598ffa..9ad1739 100644 --- a/packages/bot/package.json +++ b/packages/bot/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/bot", - "version": "0.0.47-alpha.0", + "version": "0.0.48-alpha.0", "description": "", "main": "./lib/bundle.bot.cjs", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 4652931..056ba0f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/cli", - "version": "0.0.54-alpha.0", + "version": "0.0.55-alpha.0", "description": "", "main": "index.js", "devDependencies": { diff --git a/packages/create-bot-whatsapp/package.json b/packages/create-bot-whatsapp/package.json index 01b86e3..e6824e5 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.65-alpha.0", + "version": "0.0.66-alpha.0", "description": "", "main": "./lib/bundle.create-bot-whatsapp.cjs", "files": [ diff --git a/packages/database/package.json b/packages/database/package.json index aa3a35d..413c3b6 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/database", - "version": "0.0.46-alpha.0", + "version": "0.0.47-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 1634673..882edfe 100644 --- a/packages/portal/package.json +++ b/packages/portal/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/portal", - "version": "0.0.4-alpha.0", + "version": "0.0.5-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 4cd3912..2d02aab 100644 --- a/packages/provider/package.json +++ b/packages/provider/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/provider", - "version": "0.0.52-alpha.0", + "version": "0.0.53-alpha.0", "description": "Esto es el conector a Twilio, Meta, etc...", "main": "./lib/mock/index.cjs", "keywords": [], From ab2a21ee42afa8fb8f56fa5eaf02180feab63b03 Mon Sep 17 00:00:00 2001 From: leifermendez Date: Mon, 9 Jan 2023 18:48:23 +0000 Subject: [PATCH 2/5] =?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 7a23eb0cc6f93ec21c5ab34e46981ae7a93f42ff Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Mon, 9 Jan 2023 21:27:35 +0100 Subject: [PATCH 3/5] fix: :zap: fix inject port args --- packages/portal/portal.http.js | 2 +- packages/portal/src/components/qr/qr.tsx | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/portal/portal.http.js b/packages/portal/portal.http.js index 1958daa..26c7b45 100644 --- a/packages/portal/portal.http.js +++ b/packages/portal/portal.http.js @@ -30,7 +30,7 @@ const start = (args) => { polka() .use(serve) - .get(qrFile, (_, res) => { + .get('qr.png', (_, res) => { const qrSource = [ join(process.cwd(), qrFile), join(__dirname, '..', qrFile), diff --git a/packages/portal/src/components/qr/qr.tsx b/packages/portal/src/components/qr/qr.tsx index a0fb3d2..52ebe01 100644 --- a/packages/portal/src/components/qr/qr.tsx +++ b/packages/portal/src/components/qr/qr.tsx @@ -4,7 +4,6 @@ import { useStore, useStylesScoped$, } from '@builder.io/qwik' -import { useLocation } from '@builder.io/qwik-city' import style from './qr.css?inline' export const QR = component$(() => { @@ -19,15 +18,12 @@ export const QR = component$(() => { }, 800) }) - const location = useLocation() - const qrImage = location.query?.qr ?? 'qr.png' - return (
{ const injectArgs = { port: HTTP_PORT, publicSite: PUBLIC_URL, - qrFile: QR_FILE, + name: QR_FILE, ...args, } - const { port, publicSite, qrFile } = injectArgs + const { port, publicSite, name } = injectArgs polka() .use(serve) .get('qr.png', (_, res) => { const qrSource = [ - join(process.cwd(), qrFile), - join(__dirname, '..', qrFile), - join(__dirname, qrFile), + join(process.cwd(), `${name}.png`), + join(__dirname, '..', `${name}.png`), + join(__dirname, `${name}.png`), ].find((i) => existsSync(i)) const qrMark = [ diff --git a/packages/provider/src/baileys/index.js b/packages/provider/src/baileys/index.js index 16ae90d..232cdaf 100644 --- a/packages/provider/src/baileys/index.js +++ b/packages/provider/src/baileys/index.js @@ -24,16 +24,13 @@ const logger = new Console({ stdout: createWriteStream(`${process.cwd()}/baileys.log`), }) -const NAME_DIR_SESSION = `sessions` -const PATH_BASE = join(process.cwd(), NAME_DIR_SESSION) - /** * ⚙️ BaileysProvider: Es una clase tipo adaptor * que extiende clases de ProviderClass (la cual es como interfaz para sber que funciones rqueridas) * https://github.com/adiwajshing/Baileys */ class BaileysProvider extends ProviderClass { - globalVendorArgs = { qrFile: 'qr.png' } + globalVendorArgs = { name: `bot` } vendor saveCredsGlobal = null constructor(args) { @@ -46,6 +43,7 @@ class BaileysProvider extends ProviderClass { * Iniciar todo Bailey */ initBailey = async () => { + const NAME_DIR_SESSION = `${this.globalVendorArgs.name}_sessions` const { state, saveCreds } = await useMultiFileAuthState( NAME_DIR_SESSION ) @@ -72,6 +70,7 @@ class BaileysProvider extends ProviderClass { } if (statusCode === DisconnectReason.loggedOut) { + const PATH_BASE = join(process.cwd(), NAME_DIR_SESSION) rimraf(PATH_BASE, (err) => { if (err) return }) @@ -95,7 +94,10 @@ class BaileysProvider extends ProviderClass { `Necesitas ayuda: https://link.codigoencasa.com/DISCORD`, ], }) - await baileyGenerateImage(qr, this.globalVendorArgs.qrFile) + await baileyGenerateImage( + qr, + `${this.globalVendorArgs.name}.png` + ) } }) diff --git a/packages/provider/src/venom/index.js b/packages/provider/src/venom/index.js index 678b0f4..c958d83 100644 --- a/packages/provider/src/venom/index.js +++ b/packages/provider/src/venom/index.js @@ -20,7 +20,7 @@ const logger = new Console({ * https://github.com/orkestral/venom */ class VenomProvider extends ProviderClass { - globalVendorArgs = { qrFile: 'qr.png' } + globalVendorArgs = { name: `bot` } vendor constructor(args) { super() @@ -32,10 +32,11 @@ class VenomProvider extends ProviderClass { * Iniciamos el Proveedor Venom */ init = async () => { + const NAME_DIR_SESSION = `${this.globalVendorArgs.name}_sessions` try { const client = await venom.create( { - session: 'session-base', + session: NAME_DIR_SESSION, multidevice: true, }, (base) => this.generateQr(base), @@ -68,7 +69,7 @@ class VenomProvider extends ProviderClass { `Necesitas ayuda: https://link.codigoencasa.com/DISCORD`, ], }) - await venomGenerateImage(qr) + await venomGenerateImage(qr, `${this.globalVendorArgs.name}.png`) } /** diff --git a/packages/provider/src/web-whatsapp/index.js b/packages/provider/src/web-whatsapp/index.js index b93117c..fa8c9f5 100644 --- a/packages/provider/src/web-whatsapp/index.js +++ b/packages/provider/src/web-whatsapp/index.js @@ -19,13 +19,15 @@ const logger = new Console({ * https://github.com/pedroslopez/whatsapp-web.js */ class WebWhatsappProvider extends ProviderClass { - globalVendorArgs = { qrFile: 'qr.png' } + globalVendorArgs = { name: `bot` } vendor constructor(args) { super() this.globalVendorArgs = { ...this.globalVendorArgs, ...args } this.vendor = new Client({ - authStrategy: new LocalAuth(), + authStrategy: new LocalAuth({ + clientId: `${this.globalVendorArgs.name}_sessions`, + }), puppeteer: { headless: true, args: [ @@ -75,7 +77,7 @@ class WebWhatsappProvider extends ProviderClass { `Necesitas ayuda: https://link.codigoencasa.com/DISCORD`, ], }) - await wwebGenerateImage(qr) + await wwebGenerateImage(qr, `${this.globalVendorArgs.name}.png`) }, }, {