mirror of
https://github.com/EvolutionAPI/evolution-api.git
synced 2025-07-16 04:02:54 -06:00
fix: update baileys version
This commit is contained in:
parent
e77a974b59
commit
fff11ea452
@ -13,6 +13,7 @@
|
|||||||
|
|
||||||
* Refactor integrations structure for modular system
|
* Refactor integrations structure for modular system
|
||||||
* Fixed dify agent integration
|
* Fixed dify agent integration
|
||||||
|
* Update Baileys Version
|
||||||
|
|
||||||
# 2.0.10 (2024-08-16 16:23)
|
# 2.0.10 (2024-08-16 16:23)
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@
|
|||||||
"@sentry/profiling-node": "^8.26.0",
|
"@sentry/profiling-node": "^8.26.0",
|
||||||
"amqplib": "^0.10.3",
|
"amqplib": "^0.10.3",
|
||||||
"axios": "^1.6.5",
|
"axios": "^1.6.5",
|
||||||
"baileys": "6.7.5",
|
"baileys": "6.7.7",
|
||||||
"class-validator": "^0.14.1",
|
"class-validator": "^0.14.1",
|
||||||
"compression": "^1.7.4",
|
"compression": "^1.7.4",
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
|
@ -1,4 +1,11 @@
|
|||||||
import { proto, WAPresence, WAPrivacyOnlineValue, WAPrivacyValue, WAReadReceiptsValue } from 'baileys';
|
import {
|
||||||
|
proto,
|
||||||
|
WAPresence,
|
||||||
|
WAPrivacyGroupAddValue,
|
||||||
|
WAPrivacyOnlineValue,
|
||||||
|
WAPrivacyValue,
|
||||||
|
WAReadReceiptsValue,
|
||||||
|
} from 'baileys';
|
||||||
|
|
||||||
export class OnWhatsAppDto {
|
export class OnWhatsAppDto {
|
||||||
constructor(
|
constructor(
|
||||||
@ -84,7 +91,7 @@ export class PrivacySettingDto {
|
|||||||
status: WAPrivacyValue;
|
status: WAPrivacyValue;
|
||||||
online: WAPrivacyOnlineValue;
|
online: WAPrivacyOnlineValue;
|
||||||
last: WAPrivacyValue;
|
last: WAPrivacyValue;
|
||||||
groupadd: WAPrivacyValue;
|
groupadd: WAPrivacyGroupAddValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class DeleteMessage {
|
export class DeleteMessage {
|
||||||
|
@ -92,10 +92,10 @@ import makeWASocket, {
|
|||||||
getContentType,
|
getContentType,
|
||||||
getDevice,
|
getDevice,
|
||||||
GroupMetadata,
|
GroupMetadata,
|
||||||
GroupParticipant,
|
// GroupParticipant,
|
||||||
isJidBroadcast,
|
isJidBroadcast,
|
||||||
isJidGroup,
|
isJidGroup,
|
||||||
// isJidNewsletter,
|
isJidNewsletter,
|
||||||
isJidUser,
|
isJidUser,
|
||||||
makeCacheableSignalKeyStore,
|
makeCacheableSignalKeyStore,
|
||||||
MessageUpsertType,
|
MessageUpsertType,
|
||||||
@ -144,7 +144,6 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
) {
|
) {
|
||||||
super(configService, eventEmitter, prismaRepository, chatwootCache);
|
super(configService, eventEmitter, prismaRepository, chatwootCache);
|
||||||
this.instance.qrcode = { count: 0 };
|
this.instance.qrcode = { count: 0 };
|
||||||
// this.recoveringMessages();
|
|
||||||
|
|
||||||
this.authStateProvider = new AuthStateProvider(this.providerFiles);
|
this.authStateProvider = new AuthStateProvider(this.providerFiles);
|
||||||
}
|
}
|
||||||
@ -159,58 +158,6 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
|
|
||||||
public phoneNumber: string;
|
public phoneNumber: string;
|
||||||
|
|
||||||
// private async recoveringMessages() {
|
|
||||||
// const cacheConf = this.configService.get<CacheConf>('CACHE');
|
|
||||||
|
|
||||||
// if ((cacheConf?.REDIS?.ENABLED && cacheConf?.REDIS?.URI !== '') || cacheConf?.LOCAL?.ENABLED) {
|
|
||||||
// this.logger.info('Recovering messages lost from cache');
|
|
||||||
// setInterval(async () => {
|
|
||||||
// this.baileysCache.keys().then((keys) => {
|
|
||||||
// keys.forEach(async (key) => {
|
|
||||||
// const data = await this.baileysCache.get(key.split(':')[2]);
|
|
||||||
|
|
||||||
// let message: any;
|
|
||||||
// let retry: number;
|
|
||||||
|
|
||||||
// if (!data?.message) {
|
|
||||||
// message = data;
|
|
||||||
// retry = 0;
|
|
||||||
// } else {
|
|
||||||
// message = data.message;
|
|
||||||
// retry = data.retry;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// if (message.messageStubParameters && message.messageStubParameters[0] === 'Message absent from node') {
|
|
||||||
// retry = retry + 1;
|
|
||||||
// this.logger.info(`Message absent from node, retrying to send, key: ${key.split(':')[2]} retry: ${retry}`);
|
|
||||||
// if (message.messageStubParameters[1]) {
|
|
||||||
// await this.client.sendMessageAck(JSON.parse(message.messageStubParameters[1], BufferJSON.reviver));
|
|
||||||
// }
|
|
||||||
|
|
||||||
// this.baileysCache.set(key.split(':')[2], { message, retry });
|
|
||||||
|
|
||||||
// if (retry >= 100) {
|
|
||||||
// this.logger.warn(`Message absent from node, retry limit reached, key: ${key.split(':')[2]}`);
|
|
||||||
// this.baileysCache.delete(key.split(':')[2]);
|
|
||||||
// return;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// });
|
|
||||||
// // 15 minutes
|
|
||||||
// }, 15 * 60 * 1000);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// private async forceUpdateGroupMetadataCache() {
|
|
||||||
// this.logger.verbose('Force update group metadata cache');
|
|
||||||
// const groups = await this.fetchAllGroups({ getParticipants: 'false' });
|
|
||||||
|
|
||||||
// for (const group of groups) {
|
|
||||||
// await this.updateGroupMetadataCache(group.id);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
public get connectionStatus() {
|
public get connectionStatus() {
|
||||||
return this.stateConnection;
|
return this.stateConnection;
|
||||||
}
|
}
|
||||||
@ -418,17 +365,6 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if (connection === 'connecting') {
|
|
||||||
// if (this.configService.get<Database>('DATABASE').ENABLED) {
|
|
||||||
// await this.prismaRepository.instance.update({
|
|
||||||
// where: { id: this.instanceId },
|
|
||||||
// data: {
|
|
||||||
// connectionStatus: 'connecting',
|
|
||||||
// },
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
if (connection === 'open') {
|
if (connection === 'open') {
|
||||||
this.instance.wuid = this.client.user.id.replace(/:\d+/, '');
|
this.instance.wuid = this.client.user.id.replace(/:\d+/, '');
|
||||||
this.instance.profilePictureUrl = (await this.profilePicture(this.instance.wuid)).profilePictureUrl;
|
this.instance.profilePictureUrl = (await this.profilePicture(this.instance.wuid)).profilePictureUrl;
|
||||||
@ -625,8 +561,8 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
shouldIgnoreJid: (jid) => {
|
shouldIgnoreJid: (jid) => {
|
||||||
const isGroupJid = this.localSettings.groupsIgnore && isJidGroup(jid);
|
const isGroupJid = this.localSettings.groupsIgnore && isJidGroup(jid);
|
||||||
const isBroadcast = !this.localSettings.readStatus && isJidBroadcast(jid);
|
const isBroadcast = !this.localSettings.readStatus && isJidBroadcast(jid);
|
||||||
// const isNewsletter = !isJidNewsletter(jid);
|
const isNewsletter = isJidNewsletter(jid);
|
||||||
const isNewsletter = jid && jid.includes('newsletter');
|
// const isNewsletter = jid && jid.includes('newsletter');
|
||||||
|
|
||||||
return isGroupJid || isBroadcast || isNewsletter;
|
return isGroupJid || isBroadcast || isNewsletter;
|
||||||
},
|
},
|
||||||
@ -634,7 +570,7 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
shouldSyncHistoryMessage: (msg: proto.Message.IHistorySyncNotification) => {
|
shouldSyncHistoryMessage: (msg: proto.Message.IHistorySyncNotification) => {
|
||||||
return this.historySyncNotification(msg);
|
return this.historySyncNotification(msg);
|
||||||
},
|
},
|
||||||
// cachedGroupMetadata: this.getGroupMetadataCache,
|
cachedGroupMetadata: this.getGroupMetadataCache,
|
||||||
userDevicesCache: this.userDevicesCache,
|
userDevicesCache: this.userDevicesCache,
|
||||||
transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3000 },
|
transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3000 },
|
||||||
};
|
};
|
||||||
@ -798,6 +734,10 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
|
|
||||||
const findParticipant = await this.chatwootService.findContact(instance, contact.remoteJid.split('@')[0]);
|
const findParticipant = await this.chatwootService.findContact(instance, contact.remoteJid.split('@')[0]);
|
||||||
|
|
||||||
|
if (!findParticipant) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
this.chatwootService.updateContact(instance, findParticipant.id, {
|
this.chatwootService.updateContact(instance, findParticipant.id, {
|
||||||
name: contact.pushName,
|
name: contact.pushName,
|
||||||
avatar_url: contact.profilePicUrl,
|
avatar_url: contact.profilePicUrl,
|
||||||
@ -1024,15 +964,15 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
if (received.message?.conversation || received.message?.extendedTextMessage?.text) {
|
if (received.message?.conversation || received.message?.extendedTextMessage?.text) {
|
||||||
const text = received.message?.conversation || received.message?.extendedTextMessage?.text;
|
const text = received.message?.conversation || received.message?.extendedTextMessage?.text;
|
||||||
if (text == 'requestPlaceholder' && !requestId) {
|
if (text == 'requestPlaceholder' && !requestId) {
|
||||||
// const messageId = await this.client.requestPlaceholderResend(received.key);
|
const messageId = await this.client.requestPlaceholderResend(received.key);
|
||||||
// console.log('requested placeholder resync, id=', messageId);
|
console.log('requested placeholder resync, id=', messageId);
|
||||||
} else if (requestId) {
|
} else if (requestId) {
|
||||||
console.log('Message received from phone, id=', requestId, received);
|
console.log('Message received from phone, id=', requestId, received);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (text == 'onDemandHistSync') {
|
if (text == 'onDemandHistSync') {
|
||||||
// const messageId = await this.client.fetchMessageHistory(50, received.key, received.messageTimestamp!);
|
const messageId = await this.client.fetchMessageHistory(50, received.key, received.messageTimestamp!);
|
||||||
// console.log('requested on-demand sync, id=', messageId);
|
console.log('requested on-demand sync, id=', messageId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1737,7 +1677,7 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
quoted: any,
|
quoted: any,
|
||||||
messageId?: string,
|
messageId?: string,
|
||||||
ephemeralExpiration?: number,
|
ephemeralExpiration?: number,
|
||||||
participants?: GroupParticipant[],
|
// participants?: GroupParticipant[],
|
||||||
) {
|
) {
|
||||||
const option: any = {
|
const option: any = {
|
||||||
quoted,
|
quoted,
|
||||||
@ -1745,10 +1685,10 @@ export class BaileysStartupService extends ChannelStartupService {
|
|||||||
|
|
||||||
if (isJidGroup(sender)) {
|
if (isJidGroup(sender)) {
|
||||||
option.useCachedGroupMetadata = true;
|
option.useCachedGroupMetadata = true;
|
||||||
if (participants)
|
// if (participants)
|
||||||
option.cachedGroupMetadata = async () => {
|
// option.cachedGroupMetadata = async () => {
|
||||||
return { participants: participants as GroupParticipant[] };
|
// return { participants: participants as GroupParticipant[] };
|
||||||
};
|
// };
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ephemeralExpiration) option.ephemeralExpiration = ephemeralExpiration;
|
if (ephemeralExpiration) option.ephemeralExpiration = ephemeralExpiration;
|
||||||
|
Loading…
Reference in New Issue
Block a user