From 20f752e6c1b1f7d11948fc4f2f8950f7834df7d9 Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Mon, 9 Jan 2023 22:26:34 +0100 Subject: [PATCH] fix: :zap: fix inject port args --- packages/portal/portal.http.js | 12 ++++++------ packages/provider/src/baileys/index.js | 12 +++++++----- packages/provider/src/venom/index.js | 7 ++++--- packages/provider/src/web-whatsapp/index.js | 8 +++++--- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/packages/portal/portal.http.js b/packages/portal/portal.http.js index 26c7b4532..293885ebd 100644 --- a/packages/portal/portal.http.js +++ b/packages/portal/portal.http.js @@ -4,7 +4,7 @@ const { bgYellow, cyan } = require('kleur') const polka = require('polka') const HTTP_PORT = process.env.PORT || 3000 -const QR_FILE = process.env.QR_FILE ?? 'qr.png' +const QR_FILE = process.env.QR_FILE ?? 'bot' const PUBLIC_URL = process.env.PUBLIC_URL ?? process.env.RAILWAY_STATIC_URL ?? @@ -23,18 +23,18 @@ const start = (args) => { 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 16ae90d4c..232cdaf70 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 678b0f412..c958d83fc 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 b93117cc7..fa8c9f5ac 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`) }, }, {