GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases 323 Packages Wiki Activity Actions

new(whatsapp.gblib): New WhatsApp provider: Meta.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2024-04-28 16:17:00 -03:00
parent 37d9028f98
commit bac90cbff8
3 changed files with 130 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
packages/core.gbapp/services/GBConversationalService.ts
View file

@ -63,6 +63,8 @@ import * as marked from 'marked';
import Translate from '@google-cloud/translate';
import { GBUtil } from '../../../src/util.js';
import { GBLogEx } from './GBLogEx.js';
import { DialogKeywords } from '../../basic.gblib/services/DialogKeywords.js';
/**
* Provides basic services for handling messages and dispatching to back-end
@ -339,7 +341,7 @@ export class GBConversationalService {
}
public async sendEvent(min: GBMinInstance, step: GBDialogStep, name: string, value: Object): Promise<any> {
if ( step.context.activity.channelId !== 'msteams' &&
if (step.context.activity.channelId !== 'msteams' &&
step.context.activity.channelId !== 'omnichannel') {
GBLogEx.info(min,
`Sending event ${name}:${typeof value === 'object' ? JSON.stringify(value) : value ? value : ''} to client...`
@ -425,7 +427,7 @@ export class GBConversationalService {
}
}
public async sendToMobile(min: GBMinInstance, mobile: string, message: string, conversationId) {
public async sendToMobile(min: GBMinInstance, mobile: string, message: any, conversationId) {
GBLogEx.info(min, `Sending message ${message} to ${mobile}...`);
return min.whatsAppDirectLine ? await min.whatsAppDirectLine.sendToDevice(mobile, message, conversationId) :
await this.sendSms(min, mobile, message);
@ -646,6 +648,47 @@ export class GBConversationalService {
});
}
public async fillAndBroadcastTemplate(min: GBMinInstance, step: GBDialogStep, mobile: string, text) {
let image = /(.*)\n/gmi.exec(text)[0].trim();
const gbaiName = DialogKeywords.getGBAIPath(min.botId);
const fileUrl = urlJoin(process.env.BOT_URL,'kb', gbaiName, `${min.botId}.gbkb`, 'images', image);
let urlImage = image.startsWith('http')
? image
: fileUrl;
text = text.substring(image.length).trim();
let data = {
name: 'broadcast', components: [
{
type: "header",
parameters: [
{
type: "image",
image: {
link: urlImage,
},
},
],
},
{
type: "body",
parameters: [
{
type: "text",
text: text,
}
]
}
]
};
GBLogEx.info(min, `Sending answer file to mobile: ${mobile}.`);
await this.sendToMobile(min, mobile, data, null);
}
// tslint:enable:no-unsafe-any
public async sendMarkdownToMobile(min: GBMinInstance, step: GBDialogStep, mobile: string, text: string) {

20
packages/kb.gbapp/services/KBService.ts
View file

@ -743,6 +743,26 @@ export class KBService implements IGBKBService {
});
}
} else if (file !== null && file.name.endsWith('.docx')) {
const path = DialogKeywords.getGBAIPath(instance.botId, `gbkb`);
const localName = Path.join('work', path, 'articles', file.name);
let loader = new DocxLoader(localName);
let doc = await loader.load();
const answer = {
instanceId: instance.instanceId,
content: doc[0].pageContent,
format: '.md',
media: file.name,
packageId: packageId,
prevId: 0
};
data.answers.push(answer);
} else if (file !== null && file.name.endsWith('.toc.docx')) {
const path = DialogKeywords.getGBAIPath(instance.botId, `gbkb`);
const localName = Path.join('work', path, 'articles', file.name);
const buffer = Fs.readFileSync(localName, { encoding: null });

57
packages/whatsapp.gblib/services/WhatsappDirectLine.ts
View file

@ -142,8 +142,10 @@ export class WhatsappDirectLine extends GBService {
const createClient = () => {
const client = (this.customClient = new Client({
puppeteer: GBSSR.preparePuppeteer(localName)
, webVersionCache: { type: 'remote',
remotePath: `https://raw.githubusercontent.com/wppconnect-team/wa-version/main/html/${webVersion}.html` }
, webVersionCache: {
type: 'remote',
remotePath: `https://raw.githubusercontent.com/wppconnect-team/wa-version/main/html/${webVersion}.html`
}
}));
client.on(
'message',
@ -164,7 +166,7 @@ export class WhatsappDirectLine extends GBService {
qrcode.generate(qr, { small: true, scale: 0.5 });
const s = new DialogKeywords();
const qrBuf = await s.getQRCode({pid, text: qr});
const qrBuf = await s.getQRCode({ pid, text: qr });
const localName = Path.join('work', gbaiPath, 'cache', `qr${GBAdminService.getRndReadableIdentifier()}.png`);
Fs.writeFileSync(localName, qrBuf.data);
const url = urlJoin(
@ -174,12 +176,13 @@ export class WhatsappDirectLine extends GBService {
Path.basename(localName)
);
if (adminNumber){
if (adminNumber) {
await GBServer.globals.minBoot.whatsAppDirectLine.sendFileToDevice(adminNumber, url, Path.basename(localName), msg);
}
if (adminEmail){
await s.sendEmail({pid, to: adminEmail, subject: `Check your WhatsApp for bot ${this.min.botId}`,
if (adminEmail) {
await s.sendEmail({
pid, to: adminEmail, subject: `Check your WhatsApp for bot ${this.min.botId}`,
body: msg
});
}
@ -262,8 +265,14 @@ export class WhatsappDirectLine extends GBService {
switch (provider) {
case 'meta':
if (req.body.entry[0].changes[0].value.messages[0].text) {
text = req.body.entry[0].changes[0].value.messages[0].text.body;
}
else {
text = req.body.entry[0].changes[0].value.messages[0].button.text;
}
from = req.body.entry[0].changes[0].value.messages[0].from;
text = req.body.entry[0].changes[0].value.messages[0].text.body
to = this.min.core.getParam<string>(this.min.instance, 'Bot Number', null);
fromName = req.body.entry[0].changes[0].value.contacts[0].profile.name;
@ -710,7 +719,7 @@ export class WhatsappDirectLine extends GBService {
await this.sendFileToDevice(to, url, 'Audio', msg, chatId);
}
public async sendToDevice(to: string, msg: string, conversationId) {
public async sendToDevice(to: any, msg: string, conversationId) {
const cmd = '/audio ';
let url;
let chatId = WhatsappDirectLine.chatIds[conversationId];
@ -725,14 +734,23 @@ export class WhatsappDirectLine extends GBService {
switch (this.provider) {
case 'meta':
const bot = createBot(this.min.instance.whatsappServiceNumber,
const driver = createBot(this.min.instance.whatsappServiceNumber,
this.min.instance.whatsappServiceKey);
if (msg['name']) {
const res = await driver.sendTemplate(to, msg['name'], 'pt_br', msg['components']);
console.log(JSON.stringify(res));
}
else {
messages = msg.match(/(.|[\r\n]){1,4096}/g)
await CollectionUtil.asyncForEach(messages, async msg => {
await GBUtil.sleep(3000);
await bot.sendText(to, msg);
const res =await driver.sendText(to, msg);
console.log(JSON.stringify(res));
});
}
break;
case 'official':
@ -806,14 +824,23 @@ export class WhatsappDirectLine extends GBService {
switch (provider) {
case 'meta':
if (req.body.entry[0].changes[0].value.statuses){
GBLogEx.info(this.min, `WhatsApp: ${req.body.entry[0].changes[0].value.statuses[0].status}.`);
if (req.body.entry[0].changes[0].value.statuses) {
GBLogEx.info(this.min, `WhatsApp:${id} ${senderName} ${req.body.entry[0].changes[0].value.statuses[0].status}.`);
res.status(200);
res.end();
return;
}
if (req.body.entry[0].changes[0].value.messages[0].text) {
text = req.body.entry[0].changes[0].value.messages[0].text.body;
}
else {
text = req.body.entry[0].changes[0].value.messages[0].button.text;
}
id = req.body.entry[0].changes[0].value.messages[0].from;
text = req.body.entry[0].changes[0].value.messages[0].text.body
senderName = req.body.entry[0].changes[0].value.contacts[0].profile.name;
botId = this.botId;
break;
@ -838,7 +865,7 @@ export class WhatsappDirectLine extends GBService {
id = req.from.split('@')[0];
senderName = req._data.notifyName;
text = req.body;
botId=botId?? this.botId;
botId = botId ?? this.botId;
break;
}
@ -852,7 +879,7 @@ export class WhatsappDirectLine extends GBService {
)[0];
botId = botId??GBServer.globals.minBoot.botId;
botId = botId ?? GBServer.globals.minBoot.botId;
GBLogEx.info(this.min, `A WhatsApp mobile requested instance for: ${botId}.`);
let urlMin: any = GBServer.globals.minInstances.filter(p => p.instance.botId === botId)[0];