Merge upstream/develop into develop

Author: KokeroO

package-lock.json

@@ -56,7 +56,7 @@
       "eslint --fix"
     ],
     "src/**/*.ts": [
-      "sh -c 'npm run build'"
+      "sh -c 'tsc --noEmit'"
     ]
   },
   "config": {
@@ -126,6 +126,8 @@
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
+    "@swc/core": "^1.13.5",
+    "@swc/helpers": "^0.5.17",
     "@types/compression": "^1.7.5",
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.18",

package.json

@@ -152,13 +152,7 @@ import { v4 } from 'uuid';
 import { BaileysMessageProcessor } from './baileysMessage.processor';
 import { useVoiceCallsBaileys } from './voiceCalls/useVoiceCallsBaileys';
 
-export interface ExtendedMessageKey extends WAMessageKey {
-  senderPn?: string;
-  previousRemoteJid?: string | null;
-}
-
 export interface ExtendedIMessageKey extends proto.IMessageKey {
-  senderPn?: string;
   remoteJidAlt?: string;
   participantAlt?: string;
   server_id?: string;
@@ -1004,10 +998,6 @@ export class BaileysStartupService extends ChannelStartupService {
             continue;
           }
 
-          if (m.key.remoteJid?.includes('@lid') && (m.key as ExtendedIMessageKey).senderPn) {
-            m.key.remoteJid = (m.key as ExtendedIMessageKey).senderPn;
-          }
-
           if (Long.isLong(m?.messageTimestamp)) {
             m.messageTimestamp = m.messageTimestamp?.toNumber();
           }
@@ -1069,16 +1059,7 @@ export class BaileysStartupService extends ChannelStartupService {
       settings: any,
     ) => {
       try {
-        // Garantir que localChatwoot está carregado antes de processar mensagens
-        if (this.configService.get<Chatwoot>('CHATWOOT').ENABLED && !this.localChatwoot?.enabled) {
-          await this.loadChatwoot();
-        }
-
         for (const received of messages) {
-          if (received.key.remoteJid?.includes('@lid') && (received.key as ExtendedMessageKey).senderPn) {
-            (received.key as ExtendedMessageKey).previousRemoteJid = received.key.remoteJid;
-            received.key.remoteJid = (received.key as ExtendedMessageKey).senderPn;
-          }
           if (
             received?.messageStubParameters?.some?.((param) =>
               [
@@ -1126,9 +1107,9 @@ export class BaileysStartupService extends ChannelStartupService {
             await this.sendDataWebhook(Events.MESSAGES_EDITED, editedMessage);
             const oldMessage = await this.getMessage(editedMessage.key, true);
             if ((oldMessage as any)?.id) {
-              const editedMessageTimestamp = Long.isLong(editedMessage?.timestampMs)
-                ? Math.floor(editedMessage.timestampMs.toNumber() / 1000)
-                : Math.floor((editedMessage.timestampMs as number) / 1000);
+              const editedMessageTimestamp = Long.isLong(received?.messageTimestamp)
+                ? Math.floor(received?.messageTimestamp.toNumber())
+                : Math.floor(received?.messageTimestamp as number);
 
               await this.prismaRepository.message.update({
                 where: { id: (oldMessage as any).id },
@@ -1367,10 +1348,6 @@ export class BaileysStartupService extends ChannelStartupService {
             }
           }
 
-          if (messageRaw.key.remoteJid?.includes('@lid') && messageRaw.key.remoteJidAlt) {
-            messageRaw.key.remoteJid = messageRaw.key.remoteJidAlt;
-          }
-
           this.logger.log(messageRaw);
 
           this.sendDataWebhook(Events.MESSAGES_UPSERT, messageRaw);
@@ -1446,25 +1423,18 @@ export class BaileysStartupService extends ChannelStartupService {
           continue;
         }
 
-        if (key.remoteJid?.includes('@lid') && key.remoteJidAlt) {
-          key.remoteJid = key.remoteJidAlt;
-        }
+        if (update.message !== null && update.status === undefined) continue;
 
         const updateKey = `${this.instance.id}_${key.id}_${update.status}`;
 
         const cached = await this.baileysCache.get(updateKey);
 
-        // Não ignorar mensagens deletadas (messageStubType === 1) mesmo que estejam em cache
-        const isDeletedMessage = update.messageStubType === 1;
-
-        if (cached && !isDeletedMessage) {
+        if (cached) {
           this.logger.info(`Message duplicated ignored [avoid deadlock]: ${updateKey}`);
           continue;
         }
 
-        if (!isDeletedMessage) {
-          await this.baileysCache.set(updateKey, true, this.UPDATE_CACHE_TTL_SECONDS);
-        }
+        await this.baileysCache.set(updateKey, true, 30 * 60);
 
         if (status[update.status] === 'READ' && key.fromMe) {
           if (this.configService.get<Chatwoot>('CHATWOOT').ENABLED && this.localChatwoot?.enabled) {
@@ -1494,7 +1464,7 @@ export class BaileysStartupService extends ChannelStartupService {
             keyId: key.id,
             remoteJid: key?.remoteJid,
             fromMe: key.fromMe,
-            participant: key?.remoteJid,
+            participant: key?.participant,
             status: status[update.status] ?? 'DELETED',
             pollUpdates,
             instanceId: this.instanceId,
@@ -1568,22 +1538,8 @@ export class BaileysStartupService extends ChannelStartupService {
 
           this.sendDataWebhook(Events.MESSAGES_UPDATE, message);
 
-          if (this.configService.get<Database>('DATABASE').SAVE_DATA.MESSAGE_UPDATE) {
-            // Verificar se a mensagem ainda existe antes de criar o update
-            const messageExists = await this.prismaRepository.message.findFirst({
-              where: {
-                instanceId: message.instanceId,
-                key: {
-                  path: ['id'],
-                  equals: message.keyId,
-                },
-              },
-            });
-
-            if (messageExists) {
-              await this.prismaRepository.messageUpdate.create({ data: message });
-            }
-          }
+          if (this.configService.get<Database>('DATABASE').SAVE_DATA.MESSAGE_UPDATE)
+            await this.prismaRepository.messageUpdate.create({ data: message });
 
           const existingChat = await this.prismaRepository.chat.findFirst({
             where: { instanceId: this.instanceId, remoteJid: message.remoteJid },
@@ -3453,18 +3409,13 @@ export class BaileysStartupService extends ChannelStartupService {
           }
 
           const numberJid = numberVerified?.jid || user.jid;
-          // const lid =
-          //   typeof numberVerified?.lid === 'string'
-          //     ? numberVerified.lid
-          //     : numberJid.includes('@lid')
-          //       ? numberJid.split('@')[1]
-          //       : undefined;
+
           return new OnWhatsAppDto(
             numberJid,
             !!numberVerified?.exists,
             user.number,
             contacts.find((c) => c.remoteJid === numberJid)?.pushName,
-            // lid,
+            undefined,
           );
         }),
       );
@@ -3616,7 +3567,7 @@ export class BaileysStartupService extends ChannelStartupService {
                 keyId: messageId,
                 remoteJid: response.key.remoteJid,
                 fromMe: response.key.fromMe,
-                participant: response.key?.remoteJid,
+                participant: response.key?.participant,
                 status: 'DELETED',
                 instanceId: this.instanceId,
               };
@@ -3676,7 +3627,10 @@ export class BaileysStartupService extends ChannelStartupService {
         }
       }
 
-      if ('messageContextInfo' in msg.message && Object.keys(msg.message).length === 1) {
+      if (
+        Object.keys(msg.message).length === 1 &&
+        Object.prototype.hasOwnProperty.call(msg.message, 'messageContextInfo')
+      ) {
         throw 'The message is messageContextInfo';
       }
 
@@ -4051,7 +4005,7 @@ export class BaileysStartupService extends ChannelStartupService {
                 keyId: messageId,
                 remoteJid: messageSent.key.remoteJid,
                 fromMe: messageSent.key.fromMe,
-                participant: messageSent.key?.remoteJid,
+                participant: messageSent.key?.participant,
                 status: 'EDITED',
                 instanceId: this.instanceId,
               };
@@ -4647,9 +4601,7 @@ export class BaileysStartupService extends ChannelStartupService {
     return response;
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public async baileysAssertSessions(jids: string[], _force?: boolean) {
-    // Note: _force parameter kept for API compatibility but not used in Baileys 7.0.0-rc.5+
+  public async baileysAssertSessions(jids: string[]) {
     const response = await this.client.assertSessions(jids);
 
     return response;
@@ -4854,7 +4806,7 @@ export class BaileysStartupService extends ChannelStartupService {
           {
             OR: [
               keyFilters?.remoteJid ? { key: { path: ['remoteJid'], equals: keyFilters?.remoteJid } } : {},
-              keyFilters?.senderPn ? { key: { path: ['senderPn'], equals: keyFilters?.senderPn } } : {},
+              keyFilters?.remoteJidAlt ? { key: { path: ['remoteJidAlt'], equals: keyFilters?.remoteJidAlt } } : {},
             ],
           },
         ],
@@ -4884,7 +4836,7 @@ export class BaileysStartupService extends ChannelStartupService {
           {
             OR: [
               keyFilters?.remoteJid ? { key: { path: ['remoteJid'], equals: keyFilters?.remoteJid } } : {},
-              keyFilters?.senderPn ? { key: { path: ['senderPn'], equals: keyFilters?.senderPn } } : {},
+              keyFilters?.remoteJidAlt ? { key: { path: ['remoteJidAlt'], equals: keyFilters?.remoteJidAlt } } : {},
             ],
           },
         ],