Merge pull request #412 from codigoencasa/feature/qr-file-name

Feature/qr file name
This commit is contained in:
Leifer Mendez
2023-01-09 22:27:42 +01:00
committed by GitHub
4 changed files with 22 additions and 17 deletions

View File

@@ -4,7 +4,7 @@ const { bgYellow, cyan } = require('kleur')
const polka = require('polka') const polka = require('polka')
const HTTP_PORT = process.env.PORT || 3000 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 = const PUBLIC_URL =
process.env.PUBLIC_URL ?? process.env.PUBLIC_URL ??
process.env.RAILWAY_STATIC_URL ?? process.env.RAILWAY_STATIC_URL ??
@@ -23,18 +23,18 @@ const start = (args) => {
const injectArgs = { const injectArgs = {
port: HTTP_PORT, port: HTTP_PORT,
publicSite: PUBLIC_URL, publicSite: PUBLIC_URL,
qrFile: QR_FILE, name: QR_FILE,
...args, ...args,
} }
const { port, publicSite, qrFile } = injectArgs const { port, publicSite, name } = injectArgs
polka() polka()
.use(serve) .use(serve)
.get('qr.png', (_, res) => { .get('qr.png', (_, res) => {
const qrSource = [ const qrSource = [
join(process.cwd(), qrFile), join(process.cwd(), `${name}.png`),
join(__dirname, '..', qrFile), join(__dirname, '..', `${name}.png`),
join(__dirname, qrFile), join(__dirname, `${name}.png`),
].find((i) => existsSync(i)) ].find((i) => existsSync(i))
const qrMark = [ const qrMark = [

View File

@@ -24,16 +24,13 @@ const logger = new Console({
stdout: createWriteStream(`${process.cwd()}/baileys.log`), 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 * ⚙️ BaileysProvider: Es una clase tipo adaptor
* que extiende clases de ProviderClass (la cual es como interfaz para sber que funciones rqueridas) * que extiende clases de ProviderClass (la cual es como interfaz para sber que funciones rqueridas)
* https://github.com/adiwajshing/Baileys * https://github.com/adiwajshing/Baileys
*/ */
class BaileysProvider extends ProviderClass { class BaileysProvider extends ProviderClass {
globalVendorArgs = { qrFile: 'qr.png' } globalVendorArgs = { name: `bot` }
vendor vendor
saveCredsGlobal = null saveCredsGlobal = null
constructor(args) { constructor(args) {
@@ -46,6 +43,7 @@ class BaileysProvider extends ProviderClass {
* Iniciar todo Bailey * Iniciar todo Bailey
*/ */
initBailey = async () => { initBailey = async () => {
const NAME_DIR_SESSION = `${this.globalVendorArgs.name}_sessions`
const { state, saveCreds } = await useMultiFileAuthState( const { state, saveCreds } = await useMultiFileAuthState(
NAME_DIR_SESSION NAME_DIR_SESSION
) )
@@ -72,6 +70,7 @@ class BaileysProvider extends ProviderClass {
} }
if (statusCode === DisconnectReason.loggedOut) { if (statusCode === DisconnectReason.loggedOut) {
const PATH_BASE = join(process.cwd(), NAME_DIR_SESSION)
rimraf(PATH_BASE, (err) => { rimraf(PATH_BASE, (err) => {
if (err) return if (err) return
}) })
@@ -95,7 +94,10 @@ class BaileysProvider extends ProviderClass {
`Necesitas ayuda: https://link.codigoencasa.com/DISCORD`, `Necesitas ayuda: https://link.codigoencasa.com/DISCORD`,
], ],
}) })
await baileyGenerateImage(qr, this.globalVendorArgs.qrFile) await baileyGenerateImage(
qr,
`${this.globalVendorArgs.name}.png`
)
} }
}) })

View File

@@ -20,7 +20,7 @@ const logger = new Console({
* https://github.com/orkestral/venom * https://github.com/orkestral/venom
*/ */
class VenomProvider extends ProviderClass { class VenomProvider extends ProviderClass {
globalVendorArgs = { qrFile: 'qr.png' } globalVendorArgs = { name: `bot` }
vendor vendor
constructor(args) { constructor(args) {
super() super()
@@ -32,10 +32,11 @@ class VenomProvider extends ProviderClass {
* Iniciamos el Proveedor Venom * Iniciamos el Proveedor Venom
*/ */
init = async () => { init = async () => {
const NAME_DIR_SESSION = `${this.globalVendorArgs.name}_sessions`
try { try {
const client = await venom.create( const client = await venom.create(
{ {
session: 'session-base', session: NAME_DIR_SESSION,
multidevice: true, multidevice: true,
}, },
(base) => this.generateQr(base), (base) => this.generateQr(base),
@@ -68,7 +69,7 @@ class VenomProvider extends ProviderClass {
`Necesitas ayuda: https://link.codigoencasa.com/DISCORD`, `Necesitas ayuda: https://link.codigoencasa.com/DISCORD`,
], ],
}) })
await venomGenerateImage(qr) await venomGenerateImage(qr, `${this.globalVendorArgs.name}.png`)
} }
/** /**

View File

@@ -19,13 +19,15 @@ const logger = new Console({
* https://github.com/pedroslopez/whatsapp-web.js * https://github.com/pedroslopez/whatsapp-web.js
*/ */
class WebWhatsappProvider extends ProviderClass { class WebWhatsappProvider extends ProviderClass {
globalVendorArgs = { qrFile: 'qr.png' } globalVendorArgs = { name: `bot` }
vendor vendor
constructor(args) { constructor(args) {
super() super()
this.globalVendorArgs = { ...this.globalVendorArgs, ...args } this.globalVendorArgs = { ...this.globalVendorArgs, ...args }
this.vendor = new Client({ this.vendor = new Client({
authStrategy: new LocalAuth(), authStrategy: new LocalAuth({
clientId: `${this.globalVendorArgs.name}_sessions`,
}),
puppeteer: { puppeteer: {
headless: true, headless: true,
args: [ args: [
@@ -75,7 +77,7 @@ class WebWhatsappProvider extends ProviderClass {
`Necesitas ayuda: https://link.codigoencasa.com/DISCORD`, `Necesitas ayuda: https://link.codigoencasa.com/DISCORD`,
], ],
}) })
await wwebGenerateImage(qr) await wwebGenerateImage(qr, `${this.globalVendorArgs.name}.png`)
}, },
}, },
{ {