NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2025-12-18 19:32:21 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: Simplified payloads and instance endpoint

Browse Source
This commit is contained in:
Davidson Gomes
2024-06-07 11:09:08 -03:00
parent eed32a3bd9
commit a578384e85
17 changed files with 207 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/api/controllers/instance.controller.ts
View File

@@ -50,14 +50,32 @@ export class InstanceController {
public async createInstance({
instanceName,
webhook,
webhookByEvents,
webhookBase64,
webhookEvents,
qrcode,
number,
integration,
token,
rejectCall,
msgCall,
groupsIgnore,
alwaysOnline,
readMessages,
readStatus,
syncFullHistory,
proxyHost,
proxyPort,
proxyProtocol,
proxyUsername,
proxyPassword,
webhookUrl,
webhookByEvents,
webhookBase64,
webhookEvents,
websocketEnabled,
websocketEvents,
rabbitmqEnabled,
rabbitmqEvents,
sqsEnabled,
sqsEvents,
chatwootAccountId,
chatwootToken,
chatwootUrl,
@@ -69,19 +87,6 @@ export class InstanceController {
chatwootMergeBrazilContacts,
chatwootImportMessages,
chatwootDaysLimitImportMessages,
rejectCall,
msgCall,
groupsIgnore,
alwaysOnline,
readMessages,
readStatus,
syncFullHistory,
websocketEnabled,
websocketEvents,
rabbitmqEnabled,
rabbitmqEvents,
sqsEnabled,
sqsEvents,
typebotUrl,
typebot,
typebotExpire,
@@ -89,7 +94,6 @@ export class InstanceController {
typebotDelayMessage,
typebotUnknownMessage,
typebotListeningFromMe,
proxy,
}: InstanceDto) {
try {
await this.authService.checkDuplicateToken(token);
@@ -123,7 +127,10 @@ export class InstanceController {
const instanceId = v4();
const hash = await this.authService.generateHash(token);
let hash: string;
if (!token) hash = v4().toUpperCase();
else hash = token;
await this.waMonitor.saveInstance({ instanceId, integration, instanceName, hash, number });
@@ -145,8 +152,8 @@ export class InstanceController {
let getWebhookEvents: string[];
if (webhook) {
if (!isURL(webhook, { require_tld: false })) {
if (webhookUrl) {
if (!isURL(webhookUrl, { require_tld: false })) {
throw new BadRequestException('Invalid "url" property in webhook');
}
@@ -184,7 +191,7 @@ export class InstanceController {
}
this.webhookService.create(instance, {
enabled: true,
url: webhook,
url: webhookUrl,
events: newEvents,
webhookByEvents,
webhookBase64,
@@ -348,19 +355,25 @@ export class InstanceController {
}
}
if (proxy) {
const testProxy = await this.proxyService.testProxy(proxy);
if (proxyHost && proxyPort && proxyProtocol) {
const testProxy = await this.proxyService.testProxy({
host: proxyHost,
port: proxyPort,
protocol: proxyProtocol,
username: proxyUsername,
password: proxyPassword,
});
if (!testProxy) {
throw new BadRequestException('Invalid proxy');
}
await this.proxyService.createProxy(instance, {
enabled: true,
host: proxy.host,
port: proxy.port,
protocol: proxy.protocol,
username: proxy.username,
password: proxy.password,
host: proxyHost,
port: proxyPort,
protocol: proxyProtocol,
username: proxyUsername,
password: proxyPassword,
});
}
@@ -429,7 +442,7 @@ export class InstanceController {
},
hash,
webhook: {
webhook,
webhookUrl,
webhookByEvents,
webhookBase64,
events: getWebhookEvents,
@@ -528,7 +541,7 @@ export class InstanceController {
},
hash,
webhook: {
webhook,
webhookUrl,
webhookByEvents,
webhookBase64,
events: getWebhookEvents,

10
src/api/dto/instance.dto.ts
View File

@@ -1,7 +1,5 @@
import { WAPresence } from '@whiskeysockets/baileys';
import { ProxyDto } from './proxy.dto';
export class InstanceDto {
instanceName: string;
instanceId?: string;
@@ -9,7 +7,7 @@ export class InstanceDto {
number?: string;
integration?: string;
token?: string;
webhook?: string;
webhookUrl?: string;
webhookByEvents?: boolean;
webhookBase64?: boolean;
webhookEvents?: string[];
@@ -44,7 +42,11 @@ export class InstanceDto {
typebotDelayMessage?: number;
typebotUnknownMessage?: string;
typebotListeningFromMe?: boolean;
proxy?: ProxyDto;
proxyHost?: string;
proxyPort?: string;
proxyProtocol?: string;
proxyUsername?: string;
proxyPassword?: string;
}
export class SetPresenceDto {

2
src/api/dto/proxy.dto.ts
View File

@@ -1,5 +1,5 @@
export class ProxyDto {
enabled: boolean;
enabled?: boolean;
host: string;
port: string;
protocol: string;

6
src/api/integrations/chatwoot/routes/chatwoot.router.ts
View File

@@ -1,6 +1,6 @@
import { RequestHandler, Router } from 'express';
import { chatwootSchema, instanceNameSchema } from '../../../../validate/validate.schema';
import { chatwootSchema, instanceSchema } from '../../../../validate/validate.schema';
import { RouterBroker } from '../../../abstract/abstract.router';
import { InstanceDto } from '../../../dto/instance.dto';
import { HttpStatus } from '../../../routes/index.router';
@@ -24,7 +24,7 @@ export class ChatwootRouter extends RouterBroker {
.get(this.routerPath('find'), ...guards, async (req, res) => {
const response = await this.dataValidate<InstanceDto>({
request: req,
schema: instanceNameSchema,
schema: instanceSchema,
ClassRef: InstanceDto,
execute: (instance) => chatwootController.findChatwoot(instance),
});
@@ -34,7 +34,7 @@ export class ChatwootRouter extends RouterBroker {
.post(this.routerPath('webhook'), async (req, res) => {
const response = await this.dataValidate<InstanceDto>({
request: req,
schema: instanceNameSchema,
schema: instanceSchema,
ClassRef: InstanceDto,
execute: (instance, data) => chatwootController.receiveWebhook(instance, data),
});

4
src/api/integrations/rabbitmq/routes/rabbitmq.router.ts
View File

@@ -1,6 +1,6 @@
import { RequestHandler, Router } from 'express';
import { instanceNameSchema, rabbitmqSchema } from '../../../../validate/validate.schema';
import { instanceSchema, rabbitmqSchema } from '../../../../validate/validate.schema';
import { RouterBroker } from '../../../abstract/abstract.router';
import { InstanceDto } from '../../../dto/instance.dto';
import { HttpStatus } from '../../../routes/index.router';
@@ -24,7 +24,7 @@ export class RabbitmqRouter extends RouterBroker {
.get(this.routerPath('find'), ...guards, async (req, res) => {
const response = await this.dataValidate<InstanceDto>({
request: req,
schema: instanceNameSchema,
schema: instanceSchema,
ClassRef: InstanceDto,
execute: (instance) => rabbitmqController.findRabbitmq(instance),
});

4
src/api/integrations/sqs/routes/sqs.router.ts
View File

@@ -1,6 +1,6 @@
import { RequestHandler, Router } from 'express';
import { instanceNameSchema, sqsSchema } from '../../../../validate/validate.schema';
import { instanceSchema, sqsSchema } from '../../../../validate/validate.schema';
import { RouterBroker } from '../../../abstract/abstract.router';
import { InstanceDto } from '../../../dto/instance.dto';
import { HttpStatus } from '../../../routes/index.router';
@@ -24,7 +24,7 @@ export class SqsRouter extends RouterBroker {
.get(this.routerPath('find'), ...guards, async (req, res) => {
const response = await this.dataValidate<InstanceDto>({
request: req,
schema: instanceNameSchema,
schema: instanceSchema,
ClassRef: InstanceDto,
execute: (instance) => sqsController.findSqs(instance),
});

4
src/api/integrations/typebot/routes/typebot.router.ts
View File

@@ -1,7 +1,7 @@
import { RequestHandler, Router } from 'express';
import {
instanceNameSchema,
instanceSchema,
typebotSchema,
typebotStartSchema,
typebotStatusSchema,
@@ -29,7 +29,7 @@ export class TypebotRouter extends RouterBroker {
.get(this.routerPath('find'), ...guards, async (req, res) => {
const response = await this.dataValidate<InstanceDto>({
request: req,
schema: instanceNameSchema,
schema: instanceSchema,
ClassRef: InstanceDto,
execute: (instance) => typebotController.findTypebot(instance),
});

4
src/api/integrations/websocket/routes/websocket.router.ts
View File

@@ -1,6 +1,6 @@
import { RequestHandler, Router } from 'express';
import { instanceNameSchema, websocketSchema } from '../../../../validate/validate.schema';
import { instanceSchema, websocketSchema } from '../../../../validate/validate.schema';
import { RouterBroker } from '../../../abstract/abstract.router';
import { InstanceDto } from '../../../dto/instance.dto';
import { HttpStatus } from '../../../routes/index.router';
@@ -24,7 +24,7 @@ export class WebsocketRouter extends RouterBroker {
.get(this.routerPath('find'), ...guards, async (req, res) => {
const response = await this.dataValidate<InstanceDto>({
request: req,
schema: instanceNameSchema,
schema: instanceSchema,
ClassRef: InstanceDto,
execute: (instance) => websocketController.findWebsocket(instance),
});

14
src/api/routes/instance.router.ts
View File

@@ -1,7 +1,7 @@
import { RequestHandler, Router } from 'express';
import { ConfigService } from '../../config/env.config';
import { instanceNameSchema, presenceOnlySchema } from '../../validate/validate.schema';
import { instanceSchema, presenceOnlySchema } from '../../validate/validate.schema';
import { RouterBroker } from '../abstract/abstract.router';
import { InstanceDto, SetPresenceDto } from '../dto/instance.dto';
import { instanceController } from '../server.module';
@@ -14,7 +14,7 @@ export class InstanceRouter extends RouterBroker {
.post('/create', ...guards, async (req, res) => {
const response = await this.dataValidate<InstanceDto>({
request: req,
schema: instanceNameSchema,
schema: instanceSchema,
ClassRef: InstanceDto,
execute: (instance) => instanceController.createInstance(instance),
});
@@ -24,7 +24,7 @@ export class InstanceRouter extends RouterBroker {
.put(this.routerPath('restart'), ...guards, async (req, res) => {
const response = await this.dataValidate<InstanceDto>({
request: req,
schema: instanceNameSchema,
schema: null,
ClassRef: InstanceDto,
execute: (instance) => instanceController.restartInstance(instance),
});
@@ -34,7 +34,7 @@ export class InstanceRouter extends RouterBroker {
.get(this.routerPath('connect'), ...guards, async (req, res) => {
const response = await this.dataValidate<InstanceDto>({
request: req,
schema: instanceNameSchema,
schema: null,
ClassRef: InstanceDto,
execute: (instance) => instanceController.connectToWhatsapp(instance),
});
@@ -44,7 +44,7 @@ export class InstanceRouter extends RouterBroker {
.get(this.routerPath('connectionState'), ...guards, async (req, res) => {
const response = await this.dataValidate<InstanceDto>({
request: req,
schema: instanceNameSchema,
schema: null,
ClassRef: InstanceDto,
execute: (instance) => instanceController.connectionState(instance),
});
@@ -76,7 +76,7 @@ export class InstanceRouter extends RouterBroker {
.delete(this.routerPath('logout'), ...guards, async (req, res) => {
const response = await this.dataValidate<InstanceDto>({
request: req,
schema: instanceNameSchema,
schema: null,
ClassRef: InstanceDto,
execute: (instance) => instanceController.logout(instance),
});
@@ -86,7 +86,7 @@ export class InstanceRouter extends RouterBroker {
.delete(this.routerPath('delete'), ...guards, async (req, res) => {
const response = await this.dataValidate<InstanceDto>({
request: req,
schema: instanceNameSchema,
schema: null,
ClassRef: InstanceDto,
execute: (instance) => instanceController.deleteInstance(instance),
});

4
src/api/routes/proxy.router.ts
View File

@@ -1,6 +1,6 @@
import { RequestHandler, Router } from 'express';
import { instanceNameSchema, proxySchema } from '../../validate/validate.schema';
import { instanceSchema, proxySchema } from '../../validate/validate.schema';
import { RouterBroker } from '../abstract/abstract.router';
import { InstanceDto } from '../dto/instance.dto';
import { ProxyDto } from '../dto/proxy.dto';
@@ -24,7 +24,7 @@ export class ProxyRouter extends RouterBroker {
.get(this.routerPath('find'), ...guards, async (req, res) => {
const response = await this.dataValidate<InstanceDto>({
request: req,
schema: instanceNameSchema,
schema: instanceSchema,
ClassRef: InstanceDto,
execute: (instance) => proxyController.findProxy(instance),
});

4
src/api/routes/settings.router.ts
View File

@@ -1,6 +1,6 @@
import { RequestHandler, Router } from 'express';
import { instanceNameSchema, settingsSchema } from '../../validate/validate.schema';
import { instanceSchema, settingsSchema } from '../../validate/validate.schema';
import { RouterBroker } from '../abstract/abstract.router';
import { InstanceDto } from '../dto/instance.dto';
import { SettingsDto } from '../dto/settings.dto';
@@ -24,7 +24,7 @@ export class SettingsRouter extends RouterBroker {
.get(this.routerPath('find'), ...guards, async (req, res) => {
const response = await this.dataValidate<InstanceDto>({
request: req,
schema: instanceNameSchema,
schema: instanceSchema,
ClassRef: InstanceDto,
execute: (instance) => settingsController.findSettings(instance),
});

6
src/api/routes/webhook.router.ts
View File

@@ -1,7 +1,7 @@
import { RequestHandler, Router } from 'express';
import { ConfigService, WaBusiness } from '../../config/env.config';
import { instanceNameSchema, webhookSchema } from '../../validate/validate.schema';
import { instanceSchema, webhookSchema } from '../../validate/validate.schema';
import { RouterBroker } from '../abstract/abstract.router';
import { InstanceDto } from '../dto/instance.dto';
import { WebhookDto } from '../dto/webhook.dto';
@@ -25,7 +25,7 @@ export class WebhookRouter extends RouterBroker {
.get(this.routerPath('find'), ...guards, async (req, res) => {
const response = await this.dataValidate<InstanceDto>({
request: req,
schema: instanceNameSchema,
schema: instanceSchema,
ClassRef: InstanceDto,
execute: (instance) => webhookController.findWebhook(instance),
});
@@ -35,7 +35,7 @@ export class WebhookRouter extends RouterBroker {
.post(this.routerPath('whatsapp'), async (req, res) => {
const response = await this.dataValidate<InstanceDto>({
request: req,
schema: instanceNameSchema,
schema: instanceSchema,
ClassRef: InstanceDto,
execute: (instance, data) => webhookController.receiveWebhook(instance, data),
});

2
src/api/server.module.ts
View File

@@ -52,7 +52,7 @@ export const waMonitor = new WAMonitoringService(
baileysCache,
);
const authService = new AuthService(waMonitor, configService, prismaRepository);
const authService = new AuthService(prismaRepository);
const typebotService = new TypebotService(waMonitor, configService, eventEmitter);
export const typebotController = new TypebotController(typebotService);

32
src/api/services/auth.service.ts
View File

@@ -1,40 +1,18 @@
import { v4 } from 'uuid';
import { ConfigService } from '../../config/env.config';
import { Logger } from '../../config/logger.config';
import { BadRequestException } from '../../exceptions';
import { PrismaRepository } from '../repository/repository.service';
import { WAMonitoringService } from './monitor.service';
export class AuthService {
constructor(
private readonly waMonitor: WAMonitoringService,
private readonly configService: ConfigService,
private readonly prismaRepository: PrismaRepository,
) {}
private readonly logger = new Logger(AuthService.name);
private async apikey(token?: string) {
const apikey = token ? token : v4().toUpperCase();
return apikey;
}
constructor(private readonly prismaRepository: PrismaRepository) {}
public async checkDuplicateToken(token: string) {
const instances = await this.waMonitor.instanceInfo();
const instances = await this.prismaRepository.instance.findMany({
where: { token },
});
const instance = instances.find((instance) => instance.instance.token === token);
if (instance) {
if (instances.length > 0) {
throw new BadRequestException('Token already exists');
}
return true;
}
public async generateHash(token?: string) {
const hash = await this.apikey(token);
return hash;
}
}

20
src/api/services/channels/whatsapp.baileys.service.ts
View File

@@ -369,6 +369,15 @@ export class BaileysStartupService extends ChannelStartupService {
status: 'closed',
});
if (this.configService.get<Database>('DATABASE').ENABLED) {
await this.prismaRepository.instance.update({
where: { id: this.instanceId },
data: {
connectionStatus: 'close',
},
});
}
if (this.configService.get<Chatwoot>('CHATWOOT').ENABLED && this.localChatwoot.enabled) {
this.chatwootService.eventWhatsapp(
Events.STATUS_INSTANCE,
@@ -404,6 +413,17 @@ export class BaileysStartupService extends ChannelStartupService {
`,
);
if (this.configService.get<Database>('DATABASE').ENABLED) {
await this.prismaRepository.instance.update({
where: { id: this.instanceId },
data: {
ownerJid: this.instance.wuid,
profilePicUrl: this.instance.profilePictureUrl,
connectionStatus: 'open',
},
});
}
if (this.configService.get<Chatwoot>('CHATWOOT').ENABLED && this.localChatwoot.enabled) {
this.chatwootService.eventWhatsapp(
Events.CONNECTION_UPDATE,