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

Merge branch 'main' of https://github.com/GeneralBots/BotServer

Browse source
This commit is contained in:
rodrigorodriguez 2023-02-15 22:12:25 -03:00
commit 4c813ce02d
5 changed files with 133 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -133,7 +133,7 @@
"prism-media": "1.3.4",
"public-ip": "6.0.1",
"punycode": "2.1.1",
"puppeteer": "19.2.2",
"puppeteer": "19.6.3",
"puppeteer-extra": "3.3.4",
"puppeteer-extra-plugin-stealth": "2.11.1",
"qrcode": "1.5.1",
@ -165,7 +165,7 @@
"vm2-process": "2.1.1",
"walk-promise": "0.2.0",
"washyourmouthoutwithsoap": "1.0.2",
"whatsapp-web.js": "1.18.3",
"whatsapp-web.js": "github:pedroslopez/whatsapp-web.js#fix-buttons-list",
"winston": "3.8.2",
"winston-logs-display": "1.0.0",
"yarn": "1.22.19"

2
packages/basic.gblib/index.ts
View file

@ -60,7 +60,7 @@ export class GBBasicPackage implements IGBPackage {
public async loadPackage (core: IGBCoreService, sequelize: Sequelize): Promise<void> {
core.sequelize.addModels([GuaribasSchedule]);
app.use(koaBody.koaBody({ multipart: true, }));
//app.use(koaBody.koaBody({ multipart: true, }));
app.listen(1111);
}

10
packages/basic.gblib/services/DialogKeywords.ts
View file

@ -1050,9 +1050,9 @@ export class DialogKeywords {
public static async getProcessInfo(pid: number) {
const proc = GBServer.globals.processes[pid];
const min = GBServer.globals.minInstances.filter(p => p.instance.instanceId == proc.instanceId)[0];
const min = GBServer.globals.minInstances[0];//.filter(p => p.instance.instanceId == proc.instanceId)[0];
const sec = new SecService();
const user = await sec.getUserFromId(min.instance.instanceId, proc.userId);
const user = await sec.getUserFromId(min.instance.instanceId, "1");
const params = JSON.parse(user.params);
return {
min,
@ -1064,13 +1064,15 @@ export class DialogKeywords {
/**
* Talks to the user by using the specified text.
*/
public async talk({ pid, text }) {
public async talk(x) {
const text="",pid=0
GBLog.info(`BASIC: TALK '${text}'.`);
const { min, user } = await DialogKeywords.getProcessInfo(pid);
await min.whatsAppDirectLine.sendButton();
if (user) {
// TODO: const translate = this.user ? this.user.basicOptions.translatorOn : false;
await min.conversationalService['sendOnConversation'](min, user, text);
// await min.conversationalService['sendOnConversation'](min, user, text);
}
}

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

@ -43,12 +43,13 @@ import { Messages } from '../strings.js';
import { GuaribasUser } from '../../security.gbapp/models/index.js';
import { GBMinService } from '../../core.gbapp/services/GBMinService.js';
import { GBConfigService } from '../../core.gbapp/services/GBConfigService.js';
import * as wpp from 'whatsapp-web.js';
import qrcode from 'qrcode-terminal';
import express from 'express';
import { DialogKeywords } from '../../basic.gblib/services/DialogKeywords.js';
import { GBAdminService } from '../../admin.gbapp/services/GBAdminService.js';
import { method } from 'lodash';
import pkg from 'whatsapp-web.js';
const { Buttons, Client, MessageMedia } = pkg;
/**
* Support for Whatsapp.
@ -114,6 +115,14 @@ export class WhatsappDirectLine extends GBService {
}
}
public async sendButton() {
let url = 'https://wwebjs.dev/logo.png';
const media = await MessageMedia.fromUrl(url);
media.mimetype = 'image/png';
media.filename = 'hello.png';
let btnClickableMenu = new Buttons(media as any, [{ id: 'customId', body: 'button1' }, { body: 'button2' }]);
await this.sendToDevice("5521996049063",btnClickableMenu as any,null)
}
public async setup(setUrl: boolean) {
this.directLineClient = new Swagger({
spec: JSON.parse(Fs.readFileSync('directline-3.0.json', 'utf8')),
@ -123,115 +132,72 @@ export class WhatsappDirectLine extends GBService {
let url: string;
let body: any;
client.clientAuthorizations.add(
/*client.clientAuthorizations.add(
'AuthorizationBotConnector',
new Swagger.ApiKeyAuthorization('Authorization', `Bearer ${this.directLineSecret}`, 'header')
);
);*/
let options: any;
const phoneId = this.whatsappServiceNumber.split(';')[0];
switch (this.provider) {
case 'GeneralBots':
const minBoot = GBServer.globals.minBoot as any;
const minBoot = GBServer.globals.minBoot;
// TODO: REMOVE THIS.
if (!setUrl) {
this.customClient = minBoot.whatsAppDirectLine.customClient;
} else {
// Initialize the browser using a local profile for each bot.
const gbaiName = `${this.min.botId}.gbai`;
const localName = Path.join('work', gbaiName, 'profile');
const createClient = async browserWSEndpoint => {
let puppeteer: any = {
headless: false,
args: [
'--no-sandbox',
'--disable-setuid-sandbox',
'--disable-dev-shm-usage',
'--disable-accelerated-2d-canvas',
'--no-first-run',
'--no-zygote',
'--single-process',
'--disable-gpu',
'--disable-infobars',
'--disable-features=site-per-process',
`--user-data-dir=${localName}`
]
};
let puppeteer = { headless: false, args: ['--no-sandbox', '--disable-dev-shm-usage'] };
if (browserWSEndpoint) {
puppeteer = { browserWSEndpoint: browserWSEndpoint };
// puppeteer.browserWSEndpoint = browserWSEndpoint ;
}
const client = (this.customClient = new wpp.Client({
authStrategy: new wpp.LocalAuth({
clientId: this.min.botId,
dataPath: localName
}),
const client = (this.customClient = new Client({
puppeteer: puppeteer
}));
client.on(
'message',
(async (message: string) => {
(async message => {
await this.WhatsAppCallback(message, null);
}).bind(this)
);
client.on(
'qr',
(async qr => {
const adminNumber = this.min.core.getParam(this.min.instance, 'Bot Admin Number', null);
const adminEmail = this.min.core.getParam(this.min.instance, 'Bot Admin E-mail', null);
// Sends QR Code to boot bot admin.
const msg = `Please, scan QR Code with for bot ${this.botId}.`;
GBLog.info(msg);
qrcode.generate(qr, { small: true, scale: 0.5 });
// While handling other bots uses boot instance of this class to send QR Codes.
const s = new DialogKeywords(this.min, null, null);
const qrBuf = await s.getQRCode(qr);
const gbaiName = `${this.min.botId}.gbai`;
const localName = Path.join(
'work',
gbaiName,
'cache',
`qr${GBAdminService.getRndReadableIdentifier()}.png`
);
Fs.writeFileSync(localName, qrBuf);
const url = urlJoin(GBServer.globals.publicAddress, this.min.botId, 'cache', Path.basename(localName));
GBServer.globals.minBoot.whatsAppDirectLine.sendFileToDevice(
adminNumber,
url,
Path.basename(localName),
msg
);
s.sendEmail({ pid: 0, to: adminEmail, subject: `Check your WhatsApp for bot ${this.botId}`, body: msg });
// const s = new DialogKeywords(min., null, null, null);
// const qrBuf = await s.getQRCode(qr);
// const gbaiName = `${this.min.botId}.gbai`;
// const localName = Path.join('work', gbaiName, 'cache', `qr${GBAdminService.getRndReadableIdentifier()}.png`);
// fs.writeFileSync(localName, qrBuf);
// const url = urlJoin(
// GBServer.globals.publicAddress,
// this.min.botId,
// 'cache',
// Path.basename(localName)
// );
// GBServer.globals.minBoot.whatsAppDirectLine.sendFileToDevice(adminNumber, url, Path.basename(localName), msg);
// s.sendEmail(adminEmail, `Check your WhatsApp for bot ${this.botId}`, msg);
}).bind(this)
);
client.on('authenticated', async () => {
this.browserWSEndpoint = client.pupBrowser.wsEndpoint();
GBLog.verbose(`GBWhatsApp: QR Code authenticated for ${this.botId}.`);
});
client.on('ready', async () => {
client.pupBrowser.on(
'disconnected',
(async () => {
GBLog.info(`Browser terminated. Restarting ${this.min.botId} WhatsApp native provider.`);
await createClient.bind(this)(null);
}).bind(this)
);
GBLog.verbose(`GBWhatsApp: Emptying chat list for ${this.botId}...`);
// Keeps the chat list cleaned.
const chats = await client.getChats();
await CollectionUtil.asyncForEach(chats, async chat => {
const sleep = (ms: number) => {
const sleep = ms => {
return new Promise(resolve => {
setTimeout(resolve, ms);
});
@ -245,13 +211,26 @@ export class WhatsappDirectLine extends GBService {
}
});
});
client.initialize();
};
await createClient.bind(this)(this.browserWSEndpoint);
setUrl = false;
}
break;
case 'chatapi':
options = {
method: 'POST',
url: urlJoin(this.whatsappServiceUrl, 'webhook'),
timeout: 10000,
qs: {
token: this.whatsappServiceKey,
webhookUrl: `${GBServer.globals.publicAddress}/webhooks/whatsapp/${this.botId}`,
set: true
},
headers: {
'cache-control': 'no-cache'
}
};
break;
case 'chatapi':
url = urlJoin(this.whatsappServiceUrl, 'webhook');
@ -742,7 +721,7 @@ export class WhatsappDirectLine extends GBService {
let options;
switch (this.provider) {
case 'GeneralBots':
const attachment = await wpp.MessageMedia.fromUrl(url);
const attachment = await MessageMedia.fromUrl(url);
if (to.indexOf('@') == -1) {
if (to.length == 18) {
to = to + '@g.us';
@ -800,7 +779,7 @@ export class WhatsappDirectLine extends GBService {
break;
case 'graphapi':
url = `https://graph.facebook.com/v15.0/${phoneId}/messages`
url = `https://graph.facebook.com/v15.0/${phoneId}/messages`;
options = {
method: 'POST',
timeout: 10000,
@ -811,9 +790,9 @@ export class WhatsappDirectLine extends GBService {
body: {
messaging_product: 'whatsapp',
recipient_type: 'individual',
to: phoneId,
}
to: phoneId
}
};
}
if (options) {
@ -831,7 +810,7 @@ export class WhatsappDirectLine extends GBService {
let options;
switch (this.provider) {
case 'GeneralBots':
const attachment = wpp.MessageMedia.fromUrl(url);
const attachment = MessageMedia.fromUrl(url);
await this.customClient.sendMessage(to, attachment);
break;
@ -928,7 +907,6 @@ export class WhatsappDirectLine extends GBService {
};
break;
case 'graphapi':
}
if (options) {

10
swagger.json
View file

@ -13,7 +13,7 @@
"status": "Production"
}
},
"host": "",
"host": "f993e4828c0d50.lhr.life",
"basePath": "/",
"schemes": [
"https"
@ -21,11 +21,11 @@
"consumes": [],
"produces": [],
"paths": {
"/api/v2//dialog/talk": {
"/api/v2/dev-perdomo/dialog/talk": {
"post": {
"requestBody":{
"content": "text/plain"
},
"consumes":[
"text/plain; charset=utf-8"
],
"summary": "Talk to the user.",
"description": "Talk to the user.",
"x-ms-no-generic-test": true,