[core] 2025.5.4

fix #957

src/api/events.controller.ts

@@ -0,0 +1,50 @@
+import {
+  Body,
+  Controller,
+  Param,
+  Post,
+  UsePipes,
+  ValidationPipe,
+} from '@nestjs/common';
+import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
+import { WhatsappSession } from '@waha/core/abc/session.abc';
+import {
+  SessionApiParam,
+  WorkingSessionParam,
+} from '@waha/nestjs/params/SessionApiParam';
+
+import { SessionManager } from '../core/abc/manager.abc';
+import {
+  EventCancelRequest,
+  EventMessageRequest,
+} from '../structures/events.dto';
+import { WAMessage } from '../structures/responses.dto';
+
+@ApiSecurity('api_key')
+@Controller('api/:session/events')
+@ApiTags('📅 Events')
+export class EventsController {
+  constructor(private manager: SessionManager) {}
+
+  @Post()
+  @ApiOperation({ summary: 'Send an event message' })
+  @UsePipes(new ValidationPipe())
+  @SessionApiParam
+  async sendEvent(
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() request: EventMessageRequest,
+  ): Promise<WAMessage> {
+    return session.sendEvent(request);
+  }
+
+  // @Post(':id/cancel')
+  // @ApiOperation({ summary: 'Cancel an event by ID' })
+  // @UsePipes(new ValidationPipe())
+  // @SessionApiParam
+  // async cancelEvent(
+  //   @WorkingSessionParam session: WhatsappSession,
+  //   @Param('id') id: string,
+  // ): Promise<WAMessage> {
+  //   return session.cancelEvent(id);
+  // }
+}

src/api/lids.controller.ts

@@ -0,0 +1,102 @@
+import { isLidUser } from '@adiwajshing/baileys/lib/WABinary/jid-utils';
+import {
+  Controller,
+  Get,
+  Param,
+  Query,
+  UnprocessableEntityException,
+  UsePipes,
+  ValidationPipe,
+} from '@nestjs/common';
+import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
+import { WhatsappSession } from '@waha/core/abc/session.abc';
+import {
+  SessionApiParam,
+  WorkingSessionParam,
+} from '@waha/nestjs/params/SessionApiParam';
+import { CountResponse } from '@waha/structures/base.dto';
+import {
+  LidsListQueryParams,
+  LidToPhoneNumber,
+} from '@waha/structures/lids.dto';
+import { PaginationParams, SortOrder } from '@waha/structures/pagination.dto';
+
+import { SessionManager } from '../core/abc/manager.abc';
+
+@ApiSecurity('api_key')
+@Controller('api/:session/lids')
+@ApiTags('👤 Contacts')
+export class LidsController {
+  constructor(private manager: SessionManager) {}
+
+  @Get('/')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get all known lids to phone number mapping' })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async getAll(
+    @WorkingSessionParam session: WhatsappSession,
+    @Query() params: LidsListQueryParams,
+  ): Promise<Array<LidToPhoneNumber>> {
+    // Always lid
+    const pagination: PaginationParams = params;
+    pagination.sortBy = 'lid';
+    pagination.sortOrder = SortOrder.ASC;
+    const lids = await session.getAllLids(pagination);
+    return lids;
+  }
+
+  @Get('/count')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get the number of known lids' })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async getLidsCount(
+    @WorkingSessionParam session: WhatsappSession,
+  ): Promise<CountResponse> {
+    const count = await session.getLidsCount();
+    return {
+      count: count,
+    };
+  }
+
+  @Get('/:lid')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get phone number by lid' })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async findPNByLid(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('lid') lid: string,
+  ): Promise<LidToPhoneNumber> {
+    if (!lid.includes('@')) {
+      lid = lid + '@lid';
+    }
+
+    if (!isLidUser(lid)) {
+      throw new UnprocessableEntityException(
+        'Invalid LID - it must end with @lid',
+      );
+    }
+    const result = await session.findPNByLid(lid);
+    result.pn = result.pn || null;
+    return result;
+  }
+
+  @Get('/pn/:phoneNumber')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get lid by phone number (chat id)' })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async findLIDByPhoneNumber(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('phoneNumber') phoneNumber: string,
+  ): Promise<LidToPhoneNumber> {
+    if (isLidUser(phoneNumber)) {
+      return {
+        lid: phoneNumber,
+        pn: null,
+      };
+    }
+
+    const result = await session.findLIDByPhoneNumber(phoneNumber);
+    result.lid = result.lid || null;
+    return result;
+  }
+}

src/core/SwaggerConfiguratorCore.ts

@@ -71,6 +71,7 @@ export class SwaggerConfiguratorCore {
       )
       .addTag('👥 Groups', `Groups methods.<br>`)
       .addTag('✅ Presence', `Presence information`)
+      .addTag('📅 Events', `Event Message`)
       .addTag(
         '🏷️ Labels',
         'Labels - available only for WhatsApp Business accounts',

src/core/abc/manager.abc.ts

@@ -50,7 +50,6 @@ export abstract class SessionManager
   WAIT_SESSION_RUNNING_TIMEOUT = 5_000;
   WAIT_STATUS_INTERVAL = 500;
   WAIT_STATUS_TIMEOUT = 10_000;
-  LOCK_TIMEOUT = 10_000;
 
   protected constructor(
     protected log: PinoLogger,
@@ -59,7 +58,7 @@ export abstract class SessionManager
   ) {
     this.lock = new AsyncLock({
       maxPending: Infinity,
-      timeout: this.LOCK_TIMEOUT,
+      maxExecutionTime: 30_000,
     });
     this.log.setContext(SessionManager.name);
   }

src/core/abc/session.abc.ts

@@ -22,7 +22,11 @@ import {
 import { SendButtonsRequest } from '@waha/structures/chatting.buttons.dto';
 import { BinaryFile, RemoteFile } from '@waha/structures/files.dto';
 import { Label, LabelDTO, LabelID } from '@waha/structures/labels.dto';
-import { PaginationParams } from '@waha/structures/pagination.dto';
+import { LidToPhoneNumber } from '@waha/structures/lids.dto';
+import {
+  LimitOffsetParams,
+  PaginationParams,
+} from '@waha/structures/pagination.dto';
 import { MessageSource, WAMessage } from '@waha/structures/responses.dto';
 import { DefaultMap } from '@waha/utils/DefaultMap';
 import { generatePrefixedId } from '@waha/utils/ids';
@@ -75,6 +79,10 @@ import {
   WAHAPresenceStatus,
   WAHASessionStatus,
 } from '../../structures/enums.dto';
+import {
+  EventCancelRequest,
+  EventMessageRequest,
+} from '../../structures/events.dto';
 import {
   CreateGroupRequest,
   GroupField,
@@ -466,6 +474,14 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
+  sendEvent(request: EventMessageRequest): Promise<WAMessage> {
+    throw new NotImplementedByEngineError();
+  }
+
+  cancelEvent(eventId: string): Promise<WAMessage> {
+    throw new NotImplementedByEngineError();
+  }
+
   /**
    * Chats methods
    */
@@ -615,6 +631,29 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
+  /**
+   * Lid to Phone Number methods
+   */
+  public async getAllLids(
+    pagination: PaginationParams,
+  ): Promise<Array<LidToPhoneNumber>> {
+    throw new NotImplementedByEngineError();
+  }
+
+  public async getLidsCount(): Promise<number> {
+    throw new NotImplementedByEngineError();
+  }
+
+  public async findPNByLid(lid: string): Promise<LidToPhoneNumber> {
+    throw new NotImplementedByEngineError();
+  }
+
+  public async findLIDByPhoneNumber(
+    phoneNumber: string,
+  ): Promise<LidToPhoneNumber> {
+    throw new NotImplementedByEngineError();
+  }
+
   /**
    * Fetch the latest profile picture of the contact (group, newsletter, etc.)
    * @param id

src/core/app.module.core.ts

@@ -5,6 +5,7 @@ import { PassportModule } from '@nestjs/passport';
 import { ServeStaticModule } from '@nestjs/serve-static';
 import { TerminusModule } from '@nestjs/terminus';
 import { ChannelsController } from '@waha/api/channels.controller';
+import { LidsController } from '@waha/api/lids.controller';
 import { ProfileController } from '@waha/api/profile.controller';
 import {
   ServerController,
@@ -31,6 +32,7 @@ import { AuthController } from '../api/auth.controller';
 import { ChatsController } from '../api/chats.controller';
 import { ChattingController } from '../api/chatting.controller';
 import { ContactsController } from '../api/contacts.controller';
+import { EventsController } from '../api/events.controller';
 import { GroupsController } from '../api/groups.controller';
 import { HealthController } from '../api/health.controller';
 import { LabelsController } from '../api/labels.controller';
@@ -129,9 +131,11 @@ export const CONTROLLERS = [
   StatusController,
   LabelsController,
   ContactsController,
+  LidsController,
   GroupsController,
   PresenceController,
   ScreenshotController,
+  EventsController,
   PingController,
   HealthController,
   ServerController,

src/core/engines/gows/appstate.ts

@@ -0,0 +1,3 @@
+export function isFromFullSync(event: any): boolean {
+  return event.FromFullSync;
+}

src/core/engines/gows/grpc/gows_grpc_pb.js

@@ -15,6 +15,28 @@ function deserialize_messages_ButtonReplyRequest(buffer_arg) {
   return gows_pb.ButtonReplyRequest.deserializeBinary(new Uint8Array(buffer_arg));
 }
 
+function serialize_messages_CancelEventMessageRequest(arg) {
+  if (!(arg instanceof gows_pb.CancelEventMessageRequest)) {
+    throw new Error('Expected argument of type messages.CancelEventMessageRequest');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_messages_CancelEventMessageRequest(buffer_arg) {
+  return gows_pb.CancelEventMessageRequest.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
+function serialize_messages_ChatLabelRequest(arg) {
+  if (!(arg instanceof gows_pb.ChatLabelRequest)) {
+    throw new Error('Expected argument of type messages.ChatLabelRequest');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_messages_ChatLabelRequest(buffer_arg) {
+  return gows_pb.ChatLabelRequest.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
 function serialize_messages_ChatPresenceRequest(arg) {
   if (!(arg instanceof gows_pb.ChatPresenceRequest)) {
     throw new Error('Expected argument of type messages.ChatPresenceRequest');
@@ -70,6 +92,17 @@ function deserialize_messages_CreateNewsletterRequest(buffer_arg) {
   return gows_pb.CreateNewsletterRequest.deserializeBinary(new Uint8Array(buffer_arg));
 }
 
+function serialize_messages_DeleteLabelRequest(arg) {
+  if (!(arg instanceof gows_pb.DeleteLabelRequest)) {
+    throw new Error('Expected argument of type messages.DeleteLabelRequest');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_messages_DeleteLabelRequest(buffer_arg) {
+  return gows_pb.DeleteLabelRequest.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
 function serialize_messages_DownloadMediaRequest(arg) {
   if (!(arg instanceof gows_pb.DownloadMediaRequest)) {
     throw new Error('Expected argument of type messages.DownloadMediaRequest');
@@ -158,6 +191,28 @@ function deserialize_messages_GetContactsRequest(buffer_arg) {
   return gows_pb.GetContactsRequest.deserializeBinary(new Uint8Array(buffer_arg));
 }
 
+function serialize_messages_GetLabelsRequest(arg) {
+  if (!(arg instanceof gows_pb.GetLabelsRequest)) {
+    throw new Error('Expected argument of type messages.GetLabelsRequest');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_messages_GetLabelsRequest(buffer_arg) {
+  return gows_pb.GetLabelsRequest.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
+function serialize_messages_GetLidsRequest(arg) {
+  if (!(arg instanceof gows_pb.GetLidsRequest)) {
+    throw new Error('Expected argument of type messages.GetLidsRequest');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_messages_GetLidsRequest(buffer_arg) {
+  return gows_pb.GetLidsRequest.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
 function serialize_messages_GetMessagesRequest(arg) {
   if (!(arg instanceof gows_pb.GetMessagesRequest)) {
     throw new Error('Expected argument of type messages.GetMessagesRequest');
@@ -389,6 +444,17 @@ function deserialize_messages_OptionalString(buffer_arg) {
   return gows_pb.OptionalString.deserializeBinary(new Uint8Array(buffer_arg));
 }
 
+function serialize_messages_OptionalUInt64(arg) {
+  if (!(arg instanceof gows_pb.OptionalUInt64)) {
+    throw new Error('Expected argument of type messages.OptionalUInt64');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_messages_OptionalUInt64(buffer_arg) {
+  return gows_pb.OptionalUInt64.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
 function serialize_messages_PairCodeRequest(arg) {
   if (!(arg instanceof gows_pb.PairCodeRequest)) {
     throw new Error('Expected argument of type messages.PairCodeRequest');
@@ -576,6 +642,17 @@ function deserialize_messages_UpdateParticipantsRequest(buffer_arg) {
   return gows_pb.UpdateParticipantsRequest.deserializeBinary(new Uint8Array(buffer_arg));
 }
 
+function serialize_messages_UpsertLabelRequest(arg) {
+  if (!(arg instanceof gows_pb.UpsertLabelRequest)) {
+    throw new Error('Expected argument of type messages.UpsertLabelRequest');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_messages_UpsertLabelRequest(buffer_arg) {
+  return gows_pb.UpsertLabelRequest.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
 
 //
 // Events
@@ -691,6 +768,53 @@ setProfileName: {
     responseDeserialize: deserialize_messages_Empty,
   },
   //
+// Lids
+//
+getAllLids: {
+    path: '/messages.MessageService/GetAllLids',
+    requestStream: false,
+    responseStream: false,
+    requestType: gows_pb.GetLidsRequest,
+    responseType: gows_pb.JsonList,
+    requestSerialize: serialize_messages_GetLidsRequest,
+    requestDeserialize: deserialize_messages_GetLidsRequest,
+    responseSerialize: serialize_messages_JsonList,
+    responseDeserialize: deserialize_messages_JsonList,
+  },
+  getLidsCount: {
+    path: '/messages.MessageService/GetLidsCount',
+    requestStream: false,
+    responseStream: false,
+    requestType: gows_pb.Session,
+    responseType: gows_pb.OptionalUInt64,
+    requestSerialize: serialize_messages_Session,
+    requestDeserialize: deserialize_messages_Session,
+    responseSerialize: serialize_messages_OptionalUInt64,
+    responseDeserialize: deserialize_messages_OptionalUInt64,
+  },
+  findPNByLid: {
+    path: '/messages.MessageService/FindPNByLid',
+    requestStream: false,
+    responseStream: false,
+    requestType: gows_pb.EntityByIdRequest,
+    responseType: gows_pb.OptionalString,
+    requestSerialize: serialize_messages_EntityByIdRequest,
+    requestDeserialize: deserialize_messages_EntityByIdRequest,
+    responseSerialize: serialize_messages_OptionalString,
+    responseDeserialize: deserialize_messages_OptionalString,
+  },
+  findLIDByPhoneNumber: {
+    path: '/messages.MessageService/FindLIDByPhoneNumber',
+    requestStream: false,
+    responseStream: false,
+    requestType: gows_pb.EntityByIdRequest,
+    responseType: gows_pb.OptionalString,
+    requestSerialize: serialize_messages_EntityByIdRequest,
+    requestDeserialize: deserialize_messages_EntityByIdRequest,
+    responseSerialize: serialize_messages_OptionalString,
+    responseDeserialize: deserialize_messages_OptionalString,
+  },
+  //
 // Groups
 //
 fetchGroups: {
@@ -1090,6 +1214,100 @@ getSubscribedNewsletters: {
     responseDeserialize: deserialize_messages_Empty,
   },
   //
+// Labels
+//
+getLabels: {
+    path: '/messages.MessageService/GetLabels',
+    requestStream: false,
+    responseStream: false,
+    requestType: gows_pb.GetLabelsRequest,
+    responseType: gows_pb.JsonList,
+    requestSerialize: serialize_messages_GetLabelsRequest,
+    requestDeserialize: deserialize_messages_GetLabelsRequest,
+    responseSerialize: serialize_messages_JsonList,
+    responseDeserialize: deserialize_messages_JsonList,
+  },
+  upsertLabel: {
+    path: '/messages.MessageService/UpsertLabel',
+    requestStream: false,
+    responseStream: false,
+    requestType: gows_pb.UpsertLabelRequest,
+    responseType: gows_pb.Empty,
+    requestSerialize: serialize_messages_UpsertLabelRequest,
+    requestDeserialize: deserialize_messages_UpsertLabelRequest,
+    responseSerialize: serialize_messages_Empty,
+    responseDeserialize: deserialize_messages_Empty,
+  },
+  deleteLabel: {
+    path: '/messages.MessageService/DeleteLabel',
+    requestStream: false,
+    responseStream: false,
+    requestType: gows_pb.DeleteLabelRequest,
+    responseType: gows_pb.Empty,
+    requestSerialize: serialize_messages_DeleteLabelRequest,
+    requestDeserialize: deserialize_messages_DeleteLabelRequest,
+    responseSerialize: serialize_messages_Empty,
+    responseDeserialize: deserialize_messages_Empty,
+  },
+  addChatLabel: {
+    path: '/messages.MessageService/AddChatLabel',
+    requestStream: false,
+    responseStream: false,
+    requestType: gows_pb.ChatLabelRequest,
+    responseType: gows_pb.Empty,
+    requestSerialize: serialize_messages_ChatLabelRequest,
+    requestDeserialize: deserialize_messages_ChatLabelRequest,
+    responseSerialize: serialize_messages_Empty,
+    responseDeserialize: deserialize_messages_Empty,
+  },
+  removeChatLabel: {
+    path: '/messages.MessageService/RemoveChatLabel',
+    requestStream: false,
+    responseStream: false,
+    requestType: gows_pb.ChatLabelRequest,
+    responseType: gows_pb.Empty,
+    requestSerialize: serialize_messages_ChatLabelRequest,
+    requestDeserialize: deserialize_messages_ChatLabelRequest,
+    responseSerialize: serialize_messages_Empty,
+    responseDeserialize: deserialize_messages_Empty,
+  },
+  getLabelsByJid: {
+    path: '/messages.MessageService/GetLabelsByJid',
+    requestStream: false,
+    responseStream: false,
+    requestType: gows_pb.EntityByIdRequest,
+    responseType: gows_pb.JsonList,
+    requestSerialize: serialize_messages_EntityByIdRequest,
+    requestDeserialize: deserialize_messages_EntityByIdRequest,
+    responseSerialize: serialize_messages_JsonList,
+    responseDeserialize: deserialize_messages_JsonList,
+  },
+  getChatsByLabelId: {
+    path: '/messages.MessageService/GetChatsByLabelId',
+    requestStream: false,
+    responseStream: false,
+    requestType: gows_pb.EntityByIdRequest,
+    responseType: gows_pb.JsonList,
+    requestSerialize: serialize_messages_EntityByIdRequest,
+    requestDeserialize: deserialize_messages_EntityByIdRequest,
+    responseSerialize: serialize_messages_JsonList,
+    responseDeserialize: deserialize_messages_JsonList,
+  },
+  //
+// Events
+//
+cancelEventMessage: {
+    path: '/messages.MessageService/CancelEventMessage',
+    requestStream: false,
+    responseStream: false,
+    requestType: gows_pb.CancelEventMessageRequest,
+    responseType: gows_pb.MessageResponse,
+    requestSerialize: serialize_messages_CancelEventMessageRequest,
+    requestDeserialize: deserialize_messages_CancelEventMessageRequest,
+    responseSerialize: serialize_messages_MessageResponse,
+    responseDeserialize: deserialize_messages_MessageResponse,
+  },
+  //
 // Media
 //
 downloadMedia: {

src/core/engines/gows/labels.gows.ts

@@ -0,0 +1,45 @@
+import { toCusFormat } from '@waha/core/engines/noweb/session.noweb.core';
+import { Label, LabelChatAssociation } from '@waha/structures/labels.dto';
+
+import * as gows from './types';
+
+/**
+ * Converts a GOWS LabelEdit event to a Label DTO
+ */
+export function eventToLabelDTO(labelEdit: gows.LabelEdit): Label {
+  return {
+    id: labelEdit.LabelID,
+    name: labelEdit.Action.name,
+    color: labelEdit.Action.color,
+    colorHex: Label.toHex(labelEdit.Action.color),
+  } as Label;
+}
+
+/**
+ * Converts a GOWS LabelAssociationChat event to a LabelChatAssociation DTO
+ */
+export function eventToLabelChatAssociationDTO(
+  labelAssoc: gows.LabelAssociationChat,
+): LabelChatAssociation {
+  return {
+    labelId: labelAssoc.LabelID,
+    label: null, // We don't have the label info here
+    chatId: toCusFormat(labelAssoc.JID),
+  };
+}
+
+/**
+ * Checks if a LabelEdit event is for a label creation or update (not deletion)
+ */
+export function isLabelUpsertEvent(labelEdit: gows.LabelEdit): boolean {
+  return !labelEdit.Action.deleted;
+}
+
+/**
+ * Checks if a LabelAssociationChat event is for adding a label to a chat
+ */
+export function isLabelChatAddedEvent(
+  labelAssoc: gows.LabelAssociationChat,
+): boolean {
+  return labelAssoc.Action.labeled === true;
+}

src/core/engines/gows/session.gows.core.ts

@@ -5,6 +5,7 @@ import {
   isJidGroup,
   jidNormalizedUser,
   normalizeMessageContent,
+  WAMessageKey,
 } from '@adiwajshing/baileys';
 import { isJidBroadcast } from '@adiwajshing/baileys/lib/WABinary/jid-utils';
 import * as grpc from '@grpc/grpc-js';
@@ -32,7 +33,10 @@ import {
   statusToAck,
 } from '@waha/core/engines/gows/helpers';
 import { GowsAuthFactoryCore } from '@waha/core/engines/gows/store/GowsAuthFactoryCore';
-import { toCusFormat } from '@waha/core/engines/noweb/session.noweb.core';
+import {
+  getDestination,
+  toCusFormat,
+} from '@waha/core/engines/noweb/session.noweb.core';
 import { extractMediaContent } from '@waha/core/engines/noweb/utils';
 import {
   AvailableInPlusVersion,
@@ -67,6 +71,8 @@ import {
   ChatRequest,
   CheckNumberStatusQuery,
   EditMessageRequest,
+  MessageContactVcardRequest,
+  MessageDestination,
   MessageFileRequest,
   MessageForwardRequest,
   MessageImageRequest,
@@ -87,6 +93,12 @@ import {
   WAHASessionStatus,
   WAMessageAck,
 } from '@waha/structures/enums.dto';
+import {
+  EventCancelRequest,
+  EventMessageRequest,
+  EventResponse,
+  EventResponsePayload,
+} from '@waha/structures/events.dto';
 import { BinaryFile, RemoteFile } from '@waha/structures/files.dto';
 import {
   CreateGroupRequest,
@@ -118,11 +130,7 @@ import { sleep, waitUntil } from '@waha/utils/promiseTimeout';
 import { onlyEvent } from '@waha/utils/reactive/ops/onlyEvent';
 import * as NodeCache from 'node-cache';
 import {
-  debounceTime,
-  distinct,
   filter,
-  groupBy,
-  interval,
   merge,
   mergeMap,
   Observable,
@@ -136,6 +144,22 @@ import { promisify } from 'util';
 import * as gows from './types';
 import { MessageStatus } from './types';
 import MessageServiceClient = messages.MessageServiceClient;
+import { isFromFullSync } from '@waha/core/engines/gows/appstate';
+import { toVcard } from '@waha/core/helpers';
+import { AckToStatus } from '@waha/core/utils/acks';
+import { ParseEventResponseType } from '@waha/core/utils/events';
+import { DistinctAck } from '@waha/core/utils/reactive';
+import { Label, LabelDTO, LabelID } from '@waha/structures/labels.dto';
+import { LidToPhoneNumber } from '@waha/structures/lids.dto';
+import { exclude } from '@waha/utils/reactive/ops/exclude';
+import * as lodash from 'lodash';
+
+import {
+  eventToLabelChatAssociationDTO,
+  eventToLabelDTO,
+  isLabelChatAddedEvent,
+  isLabelUpsertEvent,
+} from './labels.gows';
 
 enum WhatsMeowEvent {
   CONNECTED = 'gows.ConnectedEventData',
@@ -152,6 +176,11 @@ enum WhatsMeowEvent {
   // Groups
   GROUP_INFO = 'events.GroupInfo',
   JOINED_GROUP = 'events.JoinedGroup',
+  // Labels
+  LABEL_EDIT = 'events.LabelEdit',
+  LABEL_ASSOCIATION_CHAT = 'events.LabelAssociationChat',
+  // Events
+  EVENT_MESSAGE_RESPONSE = 'gows.EventMessageResponse',
 }
 
 const gRPCClientConfig = {
@@ -374,11 +403,7 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     const receipt$ = all$.pipe(onlyEvent(WhatsMeowEvent.RECEIPT));
     const messageAck$ = receipt$.pipe(
       mergeMap(this.receiptToMessageAck.bind(this)),
-      // emit only if we haven’t seen this key since the last flush
-      distinct(
-        (msg: WAMessageAckBody) => `${msg.id}-${msg.ack}-${msg.participant}`,
-        interval(60_000),
-      ),
+      DistinctAck(),
     );
     this.events2.get(WAHAEvents.MESSAGE_ACK).switch(messageAck$);
 
@@ -425,6 +450,69 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
       filter(Boolean),
     );
     this.events2.get(WAHAEvents.GROUP_V2_UPDATE).switch(groupV2Update$);
+
+    // Label Events
+    // First, create streams for the raw label events
+    const labelEditEvents$ = all$.pipe(
+      onlyEvent(WhatsMeowEvent.LABEL_EDIT),
+      exclude(isFromFullSync),
+    );
+
+    // Split the raw label edit events into upsert and deleted events
+    const [labelUpsertEvents$, labelDeletedEvents$] = partition(
+      labelEditEvents$,
+      isLabelUpsertEvent,
+    );
+
+    // Convert the events to DTOs
+    const labelUpsert$ = labelUpsertEvents$.pipe(map(eventToLabelDTO));
+
+    const labelDeleted$ = labelDeletedEvents$.pipe(map(eventToLabelDTO));
+
+    this.events2.get(WAHAEvents.LABEL_UPSERT).switch(labelUpsert$);
+    this.events2.get(WAHAEvents.LABEL_DELETED).switch(labelDeleted$);
+
+    // Handle event message response
+    const eventMessageResponse$ = all$.pipe(
+      onlyEvent(WhatsMeowEvent.EVENT_MESSAGE_RESPONSE),
+      map(this.toEventResponsePayload.bind(this)),
+      filter(Boolean),
+    );
+
+    // Split into successful and failed responses
+    const [eventResponseSuccess$, eventResponseFailed$] = partition(
+      eventMessageResponse$,
+      (payload: EventResponsePayload) => !!payload.eventResponse,
+    );
+
+    this.events2.get(WAHAEvents.EVENT_RESPONSE).switch(eventResponseSuccess$);
+    this.events2
+      .get(WAHAEvents.EVENT_RESPONSE_FAILED)
+      .switch(eventResponseFailed$);
+
+    // Handle label association events
+    const labelAssociationEvents$ = all$.pipe(
+      onlyEvent(WhatsMeowEvent.LABEL_ASSOCIATION_CHAT),
+      exclude(isFromFullSync),
+    );
+
+    // Split the raw label association events into added and deleted events
+    const [labelChatAddedEvents$, labelChatDeletedEvents$] = partition(
+      labelAssociationEvents$,
+      isLabelChatAddedEvent,
+    );
+
+    // Convert the events to DTOs
+    const labelChatAdded$ = labelChatAddedEvents$.pipe(
+      map(eventToLabelChatAssociationDTO),
+    );
+
+    const labelChatDeleted$ = labelChatDeletedEvents$.pipe(
+      map(eventToLabelChatAssociationDTO),
+    );
+
+    this.events2.get(WAHAEvents.LABEL_CHAT_ADDED).switch(labelChatAdded$);
+    this.events2.get(WAHAEvents.LABEL_CHAT_DELETED).switch(labelChatDeleted$);
   }
 
   async fetchContactProfilePicture(id: string): Promise<string> {
@@ -593,6 +681,20 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     return this.messageResponse(jid, data);
   }
 
+  async sendContactVCard(request: MessageContactVcardRequest) {
+    const jid = toJID(this.ensureSuffix(request.chatId));
+    const contacts = request.contacts.map((el) => ({ vcard: toVcard(el) }));
+    const message = new messages.MessageRequest({
+      jid: jid,
+      session: this.session,
+      replyTo: getMessageIdFromSerialized(request.reply_to),
+      contacts: contacts.map((contact) => new messages.vCardContact(contact)),
+    });
+    const response = await promisify(this.client.SendMessage)(message);
+    const data = response.toObject();
+    return this.messageResponse(jid, data);
+  }
+
   public async deleteMessage(chatId: string, messageId: string) {
     const jid = toJID(this.ensureSuffix(chatId));
     const key = parseMessageIdSerialized(messageId);
@@ -952,6 +1054,59 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     return this.messageResponse(key.remoteJid, data);
   }
 
+  async sendEvent(request: EventMessageRequest): Promise<WAMessage> {
+    const jid = toJID(this.ensureSuffix(request.chatId));
+    const event = request.event;
+
+    // Create EventLocation if provided
+    let location = null;
+    if (event.location) {
+      location = new messages.EventLocation({
+        name: event.location.name,
+        // Doesn't work right now
+        degreesLatitude: 0,
+        degreesLongitude: 0,
+      });
+    }
+
+    // Create event payload
+    const eventMessage = new messages.EventMessage({
+      name: event.name,
+      description: event.description,
+      startTime: event.startTime,
+      endTime: event.endTime,
+      location: location,
+      extraGuestsAllowed: event.extraGuestsAllowed,
+    });
+
+    // Create message
+    const message = new messages.MessageRequest({
+      jid: jid,
+      session: this.session,
+      event: eventMessage,
+      replyTo: getMessageIdFromSerialized(request.reply_to),
+    });
+
+    const response = await promisify(this.client.SendMessage)(message);
+    const data = response.toObject();
+    return this.messageResponse(jid, data) as any;
+  }
+
+  async cancelEvent(eventId: string): Promise<WAMessage> {
+    throw new Error('Method not implemented.');
+
+    const key = parseMessageIdSerialized(eventId, false);
+    const jid = key.remoteJid;
+    const request = new messages.CancelEventMessageRequest({
+      session: this.session,
+      jid: jid,
+      messageId: key.id,
+    });
+    const response = await promisify(this.client.CancelEventMessage)(request);
+    const data = response.toObject();
+    return this.messageResponse(jid, data) as any;
+  }
+
   public async setPresence(presence: WAHAPresenceStatus, chatId?: string) {
     let request: any;
     let method: any;
@@ -1252,6 +1407,62 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     return data.map(this.toWAContact.bind(this));
   }
 
+  /**
+   * Lid to Phone Number methods
+   */
+  public async getAllLids(
+    pagination: PaginationParams,
+  ): Promise<Array<LidToPhoneNumber>> {
+    const request = new messages.GetLidsRequest({
+      session: this.session,
+    });
+    const response = await promisify(this.client.GetAllLids)(request);
+    const data = parseJsonList(response);
+
+    const lids = data.map((item) => ({
+      lid: item.lid,
+      pn: toCusFormat(item.pn),
+    }));
+
+    // Use in-memory pagination
+    const paginator = new PaginatorInMemory(pagination);
+    return paginator.apply(lids);
+  }
+
+  public async getLidsCount(): Promise<number> {
+    const response = await promisify(this.client.GetLidsCount)(this.session);
+    return response?.value;
+  }
+
+  public async findPNByLid(lid: string): Promise<LidToPhoneNumber> {
+    const request = new messages.EntityByIdRequest({
+      session: this.session,
+      id: lid,
+    });
+    const response = await promisify(this.client.FindPNByLid)(request);
+    const phoneNumber = response?.value;
+    return {
+      lid: lid,
+      pn: phoneNumber ? toCusFormat(phoneNumber) : null,
+    };
+  }
+
+  public async findLIDByPhoneNumber(
+    phoneNumber: string,
+  ): Promise<LidToPhoneNumber> {
+    const pn = toJID(phoneNumber);
+    const request = new messages.EntityByIdRequest({
+      session: this.session,
+      id: pn,
+    });
+    const response = await promisify(this.client.FindLIDByPhoneNumber)(request);
+    const lid = response.value;
+    return {
+      lid: lid || null,
+      pn: toCusFormat(pn),
+    };
+  }
+
   /**
    * Chats methods
    */
@@ -1342,7 +1553,7 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     }
 
     const status =
-      filter['filter.ack'] != null ? filter['filter.ack'] + 1 : null;
+      filter['filter.ack'] != null ? AckToStatus(filter['filter.ack']) : null;
     const request = new messages.GetMessagesRequest({
       session: this.session,
       filters: new messages.MessageFilters({
@@ -1396,6 +1607,119 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     return this.processIncomingMessage(msg, query.downloadMedia);
   }
 
+  /**
+   * Labels methods
+   */
+
+  public async getLabels(): Promise<Label[]> {
+    const request = new messages.GetLabelsRequest({
+      session: this.session,
+    });
+    const response = await promisify(this.client.GetLabels)(request);
+    const labels = parseJsonList(response);
+    return labels.map(this.toLabel);
+  }
+
+  public async createLabel(labelDto: LabelDTO): Promise<Label> {
+    const labels = await this.getLabels();
+    const highestLabelId = lodash.max(
+      labels.map((label) => parseInt(label.id)),
+    );
+    const labelId = highestLabelId ? highestLabelId + 1 : 1;
+    const label: Label = {
+      id: labelId.toString(),
+      name: labelDto.name,
+      color: labelDto.color,
+      colorHex: Label.toHex(labelDto.color),
+    };
+    return this.updateLabel(label);
+  }
+
+  protected toLabel(label: any): Label {
+    const color = label.color;
+    return {
+      id: label.id,
+      name: label.name,
+      color: color,
+      colorHex: Label.toHex(color),
+    };
+  }
+
+  public async updateLabel(label: Label): Promise<Label> {
+    const request = new messages.UpsertLabelRequest({
+      session: this.session,
+      label: new messages.Label({
+        id: label.id,
+        name: label.name,
+        color: label.color,
+      }),
+    });
+    await promisify(this.client.UpsertLabel)(request);
+    return label;
+  }
+
+  public async deleteLabel(label: Label): Promise<void> {
+    const request = new messages.DeleteLabelRequest({
+      session: this.session,
+      label: new messages.Label({
+        id: label.id,
+        name: label.name,
+        color: label.color,
+      }),
+    });
+    await promisify(this.client.DeleteLabel)(request);
+  }
+
+  public async getChatsByLabelId(labelId: string) {
+    const request = new messages.EntityByIdRequest({
+      session: this.session,
+      id: labelId,
+    });
+    const response = await promisify(this.client.GetChatsByLabelId)(request);
+    const ids = parseJsonList(response);
+    return ids.map((jid) => {
+      return {
+        id: toCusFormat(jid),
+      };
+    });
+  }
+
+  public async getChatLabels(chatId: string): Promise<Label[]> {
+    const jid = toJID(chatId);
+    const request = new messages.EntityByIdRequest({
+      session: this.session,
+      id: jid,
+    });
+    const response = await promisify(this.client.GetLabelsByJid)(request);
+    const labels = parseJsonList(response);
+    return labels.map(this.toLabel);
+  }
+
+  public async putLabelsToChat(chatId: string, labels: LabelID[]) {
+    const jid = toJID(chatId);
+    const labelsIds = labels.map((label) => label.id);
+    const currentLabels = await this.getChatLabels(jid);
+    const currentLabelsIds = currentLabels.map((label) => label.id);
+    const addLabelsIds = lodash.difference(labelsIds, currentLabelsIds);
+    const removeLabelsIds = lodash.difference(currentLabelsIds, labelsIds);
+    for (const labelId of addLabelsIds) {
+      const request = new messages.ChatLabelRequest({
+        session: this.session,
+        labelId: labelId,
+        chatId: jid,
+      });
+      await promisify(this.client.AddChatLabel)(request);
+    }
+    for (const labelId of removeLabelsIds) {
+      const request = new messages.ChatLabelRequest({
+        session: this.session,
+        labelId: labelId,
+        chatId: jid,
+      });
+      await promisify(this.client.RemoveChatLabel)(request);
+    }
+  }
+
   //
   // END - Methods for API
   //
@@ -1404,10 +1728,12 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     // if there is no text or media message
     if (!message) return;
     if (!message.Message) return;
-    // Ignore reactions, we have dedicated handler for that
+    // Ignore reactions, we have a dedicated handler for that
     if (message.Message.reactionMessage) return;
-    // Ignore poll votes, we have dedicated handler for that
+    // Ignore poll votes, we have a dedicated handler for that
     if (message.Message.pollUpdateMessage) return;
+    // Ignore event response, we have a dedicated handler for that
+    if (message.Message.encEventResponseMessage) return;
     // Ignore protocol messages
     if (message.Message.protocolMessage) return;
 
@@ -1415,7 +1741,7 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     const hasSomeContent = !!getContentType(normalizedContent);
     if (!hasSomeContent) {
       // Ignore key distribution messages
-      if (message.message.senderKeyDistributionMessage) return;
+      if (message?.Message?.senderKeyDistributionMessage) return;
     }
 
     if (downloadMedia) {
@@ -1470,6 +1796,37 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     };
   }
 
+  private toEventResponsePayload(event: any): EventResponsePayload {
+    const msg = this.toWAMessage(event);
+    let response: EventResponse | null = null;
+    if (event.EventResponse) {
+      response = {
+        response: ParseEventResponseType(event.EventResponse.response),
+        timestampMs: event.EventResponse.timestampMS,
+        extraGuestCount: event.EventResponse.extraGuestCount || 0,
+      };
+    }
+
+    // Extract event creation message key from the message
+    const message = event.Message || event.message;
+    const eventCreationMessageKey =
+      message?.encEventResponseMessage?.eventCreationMessageKey;
+    const key: WAMessageKey = {
+      remoteJid: eventCreationMessageKey.remoteJID,
+      fromMe: eventCreationMessageKey.fromMe,
+      id: eventCreationMessageKey.ID,
+      participant: eventCreationMessageKey.participant,
+    };
+    const eventCreationKey = getDestination(key);
+
+    return {
+      ...msg,
+      eventCreationKey: eventCreationKey,
+      eventResponse: response,
+      _data: event,
+    };
+  }
+
   private getSourceDeviceByMsg(message): MessageSource {
     if (!message.Info.IsFromMe) {
       return MessageSource.APP;

src/core/engines/gows/types.ts

@@ -39,3 +39,31 @@ export enum MessageStatus {
   Read = 4,
   Played = 5,
 }
+
+export interface LabelEditAction {
+  name: string;
+  color: number;
+  deleted: boolean;
+  orderIndex: number;
+  isActive: boolean;
+  type: number;
+}
+
+export interface LabelEdit {
+  Timestamp: string;
+  LabelID: string;
+  Action: LabelEditAction;
+  FromFullSync: boolean;
+}
+
+export interface LabelAssociationChatAction {
+  labeled: boolean;
+}
+
+export interface LabelAssociationChat {
+  JID: string;
+  Timestamp: string;
+  LabelID: string;
+  Action: LabelAssociationChatAction;
+  FromFullSync: boolean;
+}

src/core/engines/noweb/session.noweb.core.ts

@@ -2,6 +2,7 @@ import makeWASocket, {
   Browsers,
   Chat,
   Contact,
+  decryptPollVote,
   DisconnectReason,
   downloadMediaMessage,
   extractMessageContent,
@@ -36,11 +37,11 @@ import {
   LabelAssociationType,
 } from '@adiwajshing/baileys/lib/Types/LabelAssociation';
 import { MessageUserReceiptUpdate } from '@adiwajshing/baileys/lib/Types/Message';
+import { ILogger } from '@adiwajshing/baileys/lib/Utils/logger';
 import {
   isJidBroadcast,
   isLidUser,
 } from '@adiwajshing/baileys/lib/WABinary/jid-utils';
-import { Logger as BaileysLogger } from '@adiwajshing/baileys/node_modules/pino';
 import { UnprocessableEntityException } from '@nestjs/common';
 import {
   ensureSuffix,
@@ -65,9 +66,11 @@ import { toVcard } from '@waha/core/helpers';
 import { createAgentProxy } from '@waha/core/helpers.proxy';
 import { IMediaEngineProcessor } from '@waha/core/media/IMediaEngineProcessor';
 import { QR } from '@waha/core/QR';
+import { AckToStatus, StatusToAck } from '@waha/core/utils/acks';
 import { ExtractMessageKeysForRead } from '@waha/core/utils/convertors';
 import { parseMessageIdSerialized } from '@waha/core/utils/ids';
 import { isJidNewsletter, toJID } from '@waha/core/utils/jids';
+import { DistinctAck } from '@waha/core/utils/reactive';
 import { flipObject, splitAt } from '@waha/helpers';
 import { PairingCodeResponse } from '@waha/structures/auth.dto';
 import { CallData } from '@waha/structures/calls.dto';
@@ -135,6 +138,7 @@ import {
   LabelDTO,
   LabelID,
 } from '@waha/structures/labels.dto';
+import { LidToPhoneNumber } from '@waha/structures/lids.dto';
 import { ReplyToMessage } from '@waha/structures/message.dto';
 import { PaginationParams } from '@waha/structures/pagination.dto';
 import {
@@ -218,7 +222,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
   private autoRestartJob: SinglePeriodicJobRunner;
   private msgRetryCounterCache: NodeCache;
   private placeholderResendCache: NodeCache;
-  protected engineLogger: BaileysLogger;
+  protected engineLogger: ILogger;
 
   private authNOWEBStore: any;
 
@@ -246,7 +250,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
 
     this.engineLogger = this.loggerBuilder.child({
       name: 'NOWEBEngine',
-    }) as unknown as BaileysLogger;
+    }) as unknown as ILogger;
 
     // Restart job if session failed
     this.startDelayedJob = new SingleDelayedJobRunner(
@@ -395,6 +399,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     this.sock = await this.makeSocket();
 
     this.issueMessageUpdateOnEdits();
+    this.issueMessageUpdateOnPoll();
     this.fixMessageUpsertStatus();
     this.issuePresenceUpdateOnMessageUpsert();
     if (this.isDebugEnabled()) {
@@ -566,11 +571,11 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
   }
 
   private fixMessageUpsertStatus() {
-    // If no status - set it to WAMessageAck.DEVICE + 1
+    // If no status - set it to WAMessageAck.DEVICE
     this.sock.ev.on('messages.upsert', ({ messages }) => {
       for (const message of messages) {
         if (message.status == null) {
-          message.status = WAMessageAck.DEVICE + 1;
+          message.status = AckToStatus(WAMessageAck.DEVICE);
         }
       }
     });
@@ -602,6 +607,67 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     });
   }
 
+  private issueMessageUpdateOnPoll() {
+    // Fix for https://github.com/devlikeapro/waha/issues/960
+    this.sock.ev.on('messages.upsert', async ({ messages }) => {
+      const meId = this.getSessionMeInfo().id;
+      if (!meId) {
+        return;
+      }
+      for (const message of messages) {
+        const content = normalizeMessageContent(message.message);
+        if (!content.pollUpdateMessage) {
+          continue;
+        }
+        const creationMsgKey = content.pollUpdateMessage.pollCreationMessageKey;
+        // we need to fetch the poll creation message to get the poll enc key
+        const pollMsg = await this.getMessage(creationMsgKey);
+        if (!pollMsg) {
+          this.logger.warn(
+            { creationMsgKey },
+            'poll creation message not found, cannot decrypt update',
+          );
+          continue;
+        }
+
+        const meIdNormalised = jidNormalizedUser(meId);
+        const pollCreatorJid = getKeyAuthor(creationMsgKey, meIdNormalised);
+        const voterJid = getKeyAuthor(message.key, meIdNormalised);
+        const pollEncKey = pollMsg.messageContextInfo?.messageSecret;
+
+        try {
+          const voteMsg = decryptPollVote(content.pollUpdateMessage.vote, {
+            pollEncKey,
+            pollCreatorJid,
+            pollMsgId: creationMsgKey.id,
+            voterJid,
+          });
+          this.sock.ev.emit('messages.update', [
+            {
+              key: creationMsgKey,
+              update: {
+                pollUpdates: [
+                  {
+                    pollUpdateMessageKey: message.key,
+                    vote: voteMsg,
+                    senderTimestampMs: (
+                      content.pollUpdateMessage.senderTimestampMs as Long
+                    ).toNumber(),
+                  },
+                ],
+              },
+            },
+          ]);
+        } catch (err) {
+          this.logger.warn(
+            { err, creationMsgKey },
+            'failed to decrypt poll vote',
+          );
+        }
+      }
+    });
+  }
+
   private issuePresenceUpdateOnMessageUpsert() {
     //
     // Fix for "typing" after sending a message
@@ -920,7 +986,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     // Emit events for our reads
     const updates = keys.map((key) => ({
       key: key,
-      update: { status: WAMessageAck.READ + 1 },
+      update: { status: AckToStatus(WAMessageAck.READ) },
     }));
     this.sock?.ev.emit('messages.update', updates);
   }
@@ -1274,6 +1340,44 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
+  /**
+   * Lid to Phone Number methods
+   */
+  public async getAllLids(
+    pagination: PaginationParams,
+  ): Promise<Array<LidToPhoneNumber>> {
+    const lids = await this.store.getAllLids(pagination);
+    return lids.map((value) => {
+      return {
+        lid: value.lid,
+        pn: toCusFormat(value.pn),
+      };
+    });
+  }
+
+  public async getLidsCount(): Promise<number> {
+    return this.store.getLidsCount();
+  }
+
+  public async findPNByLid(lid: string): Promise<LidToPhoneNumber> {
+    const pn = await this.store.findPNByLid(lid);
+    return {
+      lid: lid,
+      pn: pn ? toCusFormat(pn) : null,
+    };
+  }
+
+  public async findLIDByPhoneNumber(
+    phoneNumber: string,
+  ): Promise<LidToPhoneNumber> {
+    const pn = toJID(phoneNumber);
+    const lid = await this.store.findLidByPN(pn);
+    return {
+      lid: lid || null,
+      pn: toCusFormat(pn),
+    };
+  }
+
   /**
    * Group methods
    */
@@ -1755,7 +1859,9 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
       filter(isMine), // ack comes only for MY messages
       map(this.convertMessageReceiptUpdateToMessageAck.bind(this)),
     );
-    const messageAck$ = merge(messageAckDirect$, messageAckGroups$);
+    const messageAck$ = merge(messageAckDirect$, messageAckGroups$).pipe(
+      DistinctAck(),
+    );
     this.events2.get(WAHAEvents.MESSAGE_ACK).switch(messageAck$);
 
     //
@@ -1998,7 +2104,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     const hasSomeContent = !!getContentType(normalizedContent);
     if (!hasSomeContent) {
       // Ignore key distribution messages
-      if (message.message.senderKeyDistributionMessage) return;
+      if (message?.message?.senderKeyDistributionMessage) return;
     }
 
     if (downloadMedia) {
@@ -2025,7 +2131,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     const id = buildMessageId(message.key);
     const body = this.extractBody(message.message);
     const replyTo = this.extractReplyTo(message.message);
-    const ack = message.ack || message.status - 1;
+    const ack = message.ack || StatusToAck(message.status);
     const mediaContent = extractMediaContent(message.message);
     const source = this.getMessageSource(message.key.id);
     return Promise.resolve({
@@ -2114,7 +2220,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     const message = event;
     const fromToParticipant = getFromToParticipant(message.key);
     const id = buildMessageId(message.key);
-    const ack = message.update.status - 1;
+    const ack = StatusToAck(message.update.status);
     const body: WAMessageAckBody = {
       id: id,
       from: toCusFormat(fromToParticipant.from),
@@ -2129,7 +2235,6 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
 
   protected convertMessageReceiptUpdateToMessageAck(event): WAMessageAckBody {
     const fromToParticipant = getFromToParticipant(event.key);
-    const id = buildMessageId(event.key);
 
     const receipt = event.receipt;
     let ack;
@@ -2140,6 +2245,15 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     } else if (receipt.readTimestamp) {
       ack = WAMessageAck.READ;
     }
+
+    const key = { ...event.key };
+    if (key.fromMe) {
+      key.participant = this.getSessionMeInfo()?.id;
+    } else {
+      key.participant = event.receipt.userJid;
+    }
+    const id = buildMessageId(key);
+
     const body: WAMessageAckBody = {
       id: id,
       from: toCusFormat(fromToParticipant.from),
@@ -2148,6 +2262,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
       fromMe: event.key.fromMe,
       ack: ack,
       ackName: WAMessageAck[ack] || ACK_UNKNOWN,
+      _data: event,
     };
     return body;
   }
@@ -2323,7 +2438,7 @@ function hasPath(url: string) {
 }
 
 export class NOWEBEngineMediaProcessor implements IMediaEngineProcessor<any> {
-  private readonly logger: BaileysLogger;
+  private readonly logger: ILogger;
 
   constructor(
     public session: WhatsappSessionNoWebCore,
@@ -2331,7 +2446,7 @@ export class NOWEBEngineMediaProcessor implements IMediaEngineProcessor<any> {
   ) {
     this.logger = loggerBuilder.child({
       name: NOWEBEngineMediaProcessor.name,
-    }) as unknown as BaileysLogger;
+    }) as unknown as ILogger;
   }
 
   hasMedia(message: any): boolean {
@@ -2485,7 +2600,7 @@ function getFrom(key, meId) {
   return key.remoteJid;
 }
 
-function getDestination(key, meId = undefined): MessageDestination {
+export function getDestination(key, meId = undefined): MessageDestination {
   return {
     id: buildMessageId(key),
     to: toCusFormat(getTo(key, meId)),

src/core/engines/noweb/store/IChatRepository.ts

@@ -18,4 +18,6 @@ export interface IChatRepository {
   deleteById(id: string): Promise<void>;
 
   save(chat: Chat): Promise<void>;
+
+  upsertMany(chats: Chat[]): Promise<void>;
 }

src/core/engines/noweb/store/IContactRepository.ts

@@ -11,4 +11,8 @@ export interface IContactRepository {
   deleteById(id: string): Promise<void>;
 
   save(contact: Contact): Promise<void>;
+
+  upsertMany(contacts: Contact[]): Promise<void>;
+
+  getEntitiesByIds(ids: string[]): Promise<Map<string, Contact | null>>;
 }

src/core/engines/noweb/store/INowebLidPNRepository.ts

@@ -0,0 +1,33 @@
+import { LimitOffsetParams } from '@waha/structures/pagination.dto';
+
+export class LidToPN {
+  id: string;
+  pn: string;
+}
+
+export interface INowebLidPNRepository {
+  /**
+   * Save lid to phone number mapping
+   */
+  saveLids(lids: LidToPN[]): Promise<void>;
+
+  /**
+   * Get all lids with pagination
+   */
+  getAllLids(pagination?: LimitOffsetParams): Promise<LidToPN[]>;
+
+  /**
+   * Get a total count of lids
+   */
+  getLidsCount(): Promise<number>;
+
+  /**
+   * Find a phone number by lid
+   */
+  findPNByLid(lid: string): Promise<string | null>;
+
+  /**
+   * Find lid by phone number
+   */
+  findLidByPN(pn: string): Promise<string | null>;
+}

src/core/engines/noweb/store/INowebStorage.ts

@@ -5,6 +5,7 @@ import { ILabelsRepository } from '@waha/core/engines/noweb/store/ILabelsReposit
 import { IChatRepository } from './IChatRepository';
 import { IContactRepository } from './IContactRepository';
 import { IMessagesRepository } from './IMessagesRepository';
+import { INowebLidPNRepository } from './INowebLidPNRepository';
 
 export abstract class INowebStorage {
   abstract init(): Promise<void>;
@@ -22,4 +23,6 @@ export abstract class INowebStorage {
   abstract getLabelsRepository(): ILabelsRepository;
 
   abstract getLabelAssociationRepository(): ILabelAssociationRepository;
+
+  abstract getLidPNRepository(): INowebLidPNRepository;
 }

src/core/engines/noweb/store/INowebStore.ts

@@ -7,7 +7,11 @@ import {
 import { GroupMetadata } from '@adiwajshing/baileys/lib/Types/GroupMetadata';
 import { Label } from '@adiwajshing/baileys/lib/Types/Label';
 import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
-import { PaginationParams } from '@waha/structures/pagination.dto';
+import { LidToPhoneNumber } from '@waha/structures/lids.dto';
+import {
+  LimitOffsetParams,
+  PaginationParams,
+} from '@waha/structures/pagination.dto';
 
 export interface INowebStore {
   presences: any;
@@ -47,4 +51,13 @@ export interface INowebStore {
   getGroups(pagination: PaginationParams): Promise<GroupMetadata[]>;
 
   resetGroupsCache(): void;
+
+  // Lid Repository methods
+  getAllLids(pagination?: LimitOffsetParams): Promise<LidToPhoneNumber[]>;
+
+  getLidsCount(): Promise<number>;
+
+  findPNByLid(lid: string): Promise<string | null>;
+
+  findLidByPN(pn: string): Promise<string | null>;
 }

src/core/engines/noweb/store/NowebInMemoryStore.ts

@@ -7,7 +7,11 @@ import makeWASocket, {
 import { Label } from '@adiwajshing/baileys/lib/Types/Label';
 import { BadRequestException } from '@nestjs/common';
 import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
-import { PaginationParams } from '@waha/structures/pagination.dto';
+import { LidToPhoneNumber } from '@waha/structures/lids.dto';
+import {
+  LimitOffsetParams,
+  PaginationParams,
+} from '@waha/structures/pagination.dto';
 import { PaginatorInMemory } from '@waha/utils/Paginator';
 
 import { INowebStore } from './INowebStore';
@@ -107,4 +111,23 @@ export class NowebInMemoryStore implements INowebStore {
   resetGroupsCache() {
     return;
   }
+
+  //
+  // Lids methods
+  //
+  getAllLids(pagination?: LimitOffsetParams): Promise<LidToPhoneNumber[]> {
+    throw new BadRequestException(this.errorMessage);
+  }
+
+  findLidByPN(pn: string): Promise<string | null> {
+    throw new BadRequestException(this.errorMessage);
+  }
+
+  findPNByLid(lid: string): Promise<string | null> {
+    throw new BadRequestException(this.errorMessage);
+  }
+
+  getLidsCount(): Promise<number> {
+    throw new BadRequestException(this.errorMessage);
+  }
 }

src/core/engines/noweb/store/NowebPersistentStore.ts

@@ -5,6 +5,7 @@ import makeWASocket, {
   ChatUpdate,
   Contact,
   GroupParticipant,
+  isJidUser,
   isRealMessage,
   jidNormalizedUser,
   ParticipantAction,
@@ -18,13 +19,19 @@ import {
   LabelAssociation,
   LabelAssociationType,
 } from '@adiwajshing/baileys/lib/Types/LabelAssociation';
+import { isLidUser } from '@adiwajshing/baileys/lib/WABinary/jid-utils';
 import { IGroupRepository } from '@waha/core/engines/noweb/store/IGroupRepository';
 import { ILabelAssociationRepository } from '@waha/core/engines/noweb/store/ILabelAssociationsRepository';
 import { ILabelsRepository } from '@waha/core/engines/noweb/store/ILabelsRepository';
 import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
-import { PaginationParams, SortOrder } from '@waha/structures/pagination.dto';
+import { LidToPhoneNumber } from '@waha/structures/lids.dto';
+import {
+  LimitOffsetParams,
+  PaginationParams,
+  SortOrder,
+} from '@waha/structures/pagination.dto';
 import { DefaultMap } from '@waha/utils/DefaultMap';
-import { sleep, waitUntil } from '@waha/utils/promiseTimeout';
+import { waitUntil } from '@waha/utils/promiseTimeout';
 import * as lodash from 'lodash';
 import { toNumber } from 'lodash';
 import { Logger } from 'pino';
@@ -32,6 +39,7 @@ import { Logger } from 'pino';
 import { IChatRepository } from './IChatRepository';
 import { IContactRepository } from './IContactRepository';
 import { IMessagesRepository } from './IMessagesRepository';
+import { INowebLidPNRepository, LidToPN } from './INowebLidPNRepository';
 import { INowebStorage } from './INowebStorage';
 import { INowebStore } from './INowebStore';
 
@@ -49,8 +57,14 @@ export class NowebPersistentStore implements INowebStore {
   private messagesRepo: IMessagesRepository;
   private labelsRepo: ILabelsRepository;
   private labelAssociationsRepo: ILabelAssociationRepository;
+  private lidRepo: INowebLidPNRepository;
   public presences: any;
-  private lock: any;
+
+  private lock: any = new AsyncLock({
+    maxPending: Infinity,
+    maxExecutionTime: 60_000,
+  });
+
   private groupsFetchLock: any = new AsyncLock({
     maxPending: Infinity,
     maxExecutionTime: 60_000,
@@ -71,8 +85,8 @@ export class NowebPersistentStore implements INowebStore {
     this.messagesRepo = storage.getMessagesRepository();
     this.labelsRepo = storage.getLabelsRepository();
     this.labelAssociationsRepo = storage.getLabelAssociationRepository();
+    this.lidRepo = storage.getLidPNRepository();
     this.presences = {};
-    this.lock = new AsyncLock({ maxPending: Infinity });
   }
 
   init(): Promise<void> {
@@ -112,9 +126,16 @@ export class NowebPersistentStore implements INowebStore {
     ev.on('groups.upsert', (data) =>
       this.withLock('groups', () => this.onGroupUpsert(data)),
     );
-    ev.on('groups.update', (data) =>
-      this.withLock('groups', () => this.onGroupUpdate(data)),
-    );
+    ev.on('groups.update', (data) => {
+      this.withLock('groups', () => this.onGroupUpdate(data));
+      this.withLock('lids', async () => {
+        const participants = lodash.flatMap(data, (g) => g?.participants || []);
+        const lids = await this.handleLidPNUpdates(participants);
+        this.logger.debug(
+          `groups.update - '${lids.length}' synced lid to pn mapping`,
+        );
+      });
+    });
     ev.on('group-participants.update', (data) =>
       this.withLock(`group-${data.id}`, () =>
         this.onGroupParticipantsUpdate(data),
@@ -122,12 +143,24 @@ export class NowebPersistentStore implements INowebStore {
     );
 
     // Contacts
-    ev.on('contacts.upsert', (data) =>
-      this.withLock('contacts', () => this.onContactsUpsert(data)),
-    );
-    ev.on('contacts.update', (data) =>
-      this.withLock('contacts', () => this.onContactUpdate(data)),
-    );
+    ev.on('contacts.upsert', (data) => {
+      this.withLock('contacts', () => this.onContactsUpsert(data));
+      this.withLock('lids', async () => {
+        const lids = await this.handleLidPNUpdates(data);
+        this.logger.debug(
+          `contacts.upsert - '${lids.length}' synced lid to pn mapping`,
+        );
+      });
+    });
+    ev.on('contacts.update', (data) => {
+      this.withLock('contacts', () => this.onContactUpdate(data));
+      this.withLock('lids', async () => {
+        const lids = await this.handleLidPNUpdates(data);
+        this.logger.debug(
+          `contacts.update - '${lids.length}' synced lid to pn mapping`,
+        );
+      });
+    });
     ev.on('labels.edit', (data) => this.onLabelsEdit(data));
     ev.on('labels.association', ({ association, type }) =>
       this.onLabelsAssociation(association, type),
@@ -162,6 +195,12 @@ export class NowebPersistentStore implements INowebStore {
         await this.onContactsUpsert(contacts);
         this.logger.info(`history sync - '${contacts.length}' synced contacts`);
       }),
+      this.withLock('lids', async () => {
+        const lids = await this.handleLidPNUpdates(contacts);
+        this.logger.info(
+          `history sync - '${lids.length}' synced lid to pn mapping`,
+        );
+      }),
       this.withLock('chats', () => this.onChatUpsert(chats)),
       this.withLock('messages', () => this.syncMessagesHistory(messages)),
     ]);
@@ -194,9 +233,26 @@ export class NowebPersistentStore implements INowebStore {
       const jid = jidNormalizedUser(update.key.remoteJid!);
       const message = await this.messagesRepo.getByJidById(jid, update.key.id);
       if (!message) {
+        this.logger.warn(
+          `got update for non-existent message. update: '${JSON.stringify(
+            update,
+          )}'`,
+        );
         continue;
       }
       const fields = { ...update.update };
+      // check if fields has only "status" field
+      const onlyStatusField =
+        Object.keys(fields).length === 1 &&
+        'status' in fields &&
+        fields.status !== null;
+      if (onlyStatusField) {
+        // if so, check the message don't have a newer status
+        if (message.status >= fields.status) {
+          continue;
+        }
+      }
+
       // It can overwrite the key, so we need to delete it
       delete fields['key'];
       Object.assign(message, fields);
@@ -226,8 +282,8 @@ export class NowebPersistentStore implements INowebStore {
     for (const chat of chats) {
       delete chat['messages'];
       chat.conversationTimestamp = toNumber(chat.conversationTimestamp) || null;
-      await this.chatRepo.save(chat);
     }
+    await this.chatRepo.upsertMany(chats);
     this.logger.info(`store sync - '${chats.length}' synced chats`);
   }
 
@@ -333,15 +389,19 @@ export class NowebPersistentStore implements INowebStore {
   }
 
   private async onContactsUpsert(contacts: Contact[]) {
+    const upserts = [];
+    const ids = contacts.map((c) => c.id);
+    const contactById = await this.contactRepo.getEntitiesByIds(ids);
     for (const update of contacts) {
-      const contact = await this.contactRepo.getById(update.id);
+      const contact = contactById.get(update.id) || {};
       // remove undefined from data
       Object.keys(update).forEach(
         (key) => update[key] === undefined && delete update[key],
       );
-      const result = { ...(contact || {}), ...update };
-      await this.contactRepo.save(result);
+      const result = { ...contact, ...update };
+      upserts.push(result);
     }
+    await this.contactRepo.upsertMany(upserts);
   }
 
   private async onContactUpdate(updates: Partial<Contact>[]) {
@@ -538,4 +598,64 @@ export class NowebPersistentStore implements INowebStore {
     const ids = associations.map((association) => association.labelId);
     return await this.labelsRepo.getAllByIds(ids);
   }
+
+  //
+  // Lid methods
+  //
+  private async handleLidPNUpdates(contacts: Array<Partial<Contact>>) {
+    let lids: LidToPN[] = [];
+    for (const contact of contacts) {
+      // contact.id = pn, contact.lid = lid
+      if (isJidUser(contact.id) && isLidUser(contact.lid)) {
+        lids.push({
+          pn: contact.id,
+          id: contact.lid,
+        });
+      }
+      // contact.pn = pn, contact.lid = lid
+      else if (isJidUser(contact.pn) && isLidUser(contact.lid)) {
+        lids.push({
+          pn: contact.pn,
+          id: contact.lid,
+        });
+      }
+      // contact.pn = pn, contact.id = lid
+      else if (isJidUser(contact.pn) && isLidUser(contact.id)) {
+        lids.push({
+          pn: contact.pn,
+          id: contact.id,
+        });
+      }
+    }
+    // make lids unique by id
+    lids = lodash.uniqBy(lids, 'id');
+    if (lids.length > 0) {
+      await this.lidRepo.saveLids(lids);
+    }
+    return lids;
+  }
+
+  async getAllLids(
+    pagination?: LimitOffsetParams,
+  ): Promise<LidToPhoneNumber[]> {
+    const lids = await this.lidRepo.getAllLids(pagination);
+    return lids.map((value) => {
+      return {
+        lid: value.id,
+        pn: value.pn,
+      };
+    });
+  }
+
+  getLidsCount(): Promise<number> {
+    return this.lidRepo.getLidsCount();
+  }
+
+  findPNByLid(lid: string): Promise<string | null> {
+    return this.lidRepo.findPNByLid(lid);
+  }
+
+  findLidByPN(pn: string): Promise<string | null> {
+    return this.lidRepo.findLidByPN(pn);
+  }
 }

src/core/engines/noweb/store/schemas.ts

@@ -65,6 +65,15 @@ export const NowebLabelAssociationsSchema = new Schema(
   ],
 );
 
+export const NowebLidMapSchema = new Schema(
+  'lid_map',
+  [new Field('id', 'TEXT'), new Field('pn', 'TEXT'), new Field('data', 'TEXT')],
+  [
+    new Index('lid_map_id_index', ['id']),
+    new Index('lid_map_pn_index', ['pn']),
+  ],
+);
+
 export const NOWEB_STORE_SCHEMA = [
   NowebContactSchema,
   NowebChatSchema,
@@ -72,6 +81,7 @@ export const NOWEB_STORE_SCHEMA = [
   NowebMessagesSchema,
   NowebLabelsSchema,
   NowebLabelAssociationsSchema,
+  NowebLidMapSchema,
 ];
 
 export const Migrations: string[] = [
@@ -100,4 +110,8 @@ export const Migrations: string[] = [
   'CREATE INDEX IF NOT EXISTS label_assoc_type_label_index ON "labelAssociations" (type, "labelId")',
   'CREATE INDEX IF NOT EXISTS label_assoc_type_chat_index ON "labelAssociations" (type, "chatId")',
   'CREATE INDEX IF NOT EXISTS label_assoc_type_message_index ON "labelAssociations" (type, "messageId")',
+  // Lid Map
+  'CREATE TABLE IF NOT EXISTS lid_map (id TEXT PRIMARY KEY, pn TEXT, data TEXT)',
+  'CREATE UNIQUE INDEX IF NOT EXISTS lid_map_id_index ON lid_map (id)',
+  'CREATE INDEX IF NOT EXISTS lid_map_pn_index ON lid_map (pn)',
 ];

src/core/engines/noweb/store/sql/SqlMessagesMethods.ts

@@ -1,5 +1,6 @@
 import { ALL_JID } from '@waha/core/engines/noweb/session.noweb.core';
 import { SqlKVRepository } from '@waha/core/storage/sql/SqlKVRepository';
+import { AckToStatus } from '@waha/core/utils/acks';
 import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
 import { PaginationParams } from '@waha/structures/pagination.dto';
 
@@ -43,7 +44,7 @@ export class SqlMessagesMethods {
       query = query.whereRaw(sql, [value]);
     }
     if (filter['filter.ack'] != null) {
-      const status = filter['filter.ack'] + 1;
+      const status = AckToStatus(filter['filter.ack']);
       const [sql, value] = this.repository.filterJson('data', 'status', status);
       query = query.whereRaw(sql, [value]);
     }

src/core/engines/noweb/store/sqlite3/Sqlite3LidPNRepository.ts

@@ -0,0 +1,41 @@
+import { NowebLidMapSchema } from '@waha/core/engines/noweb/store/schemas';
+import { LimitOffsetParams } from '@waha/structures/pagination.dto';
+import { KnexPaginator } from '@waha/utils/Paginator';
+
+import { INowebLidPNRepository, LidToPN } from '../INowebLidPNRepository';
+import { NOWEBSqlite3KVRepository } from './NOWEBSqlite3KVRepository';
+
+export class LidPaginator extends KnexPaginator {
+  indexes = ['id', 'pn'];
+}
+
+export class Sqlite3LidPNRepository
+  extends NOWEBSqlite3KVRepository<LidToPN>
+  implements INowebLidPNRepository
+{
+  get schema() {
+    return NowebLidMapSchema;
+  }
+
+  saveLids(lids: LidToPN[]): Promise<void> {
+    return this.upsertMany(lids);
+  }
+
+  getAllLids(pagination?: LimitOffsetParams): Promise<LidToPN[]> {
+    return this.getAll(pagination);
+  }
+
+  getLidsCount(): Promise<number> {
+    return this.getCount();
+  }
+
+  async findLidByPN(pn: string): Promise<string | null> {
+    const value = await this.getBy({ pn: pn });
+    return value?.id || null;
+  }
+
+  async findPNByLid(lid: string): Promise<string | null> {
+    const value = await this.getBy({ id: lid });
+    return value?.pn || null;
+  }
+}

src/core/engines/noweb/store/sqlite3/Sqlite3Storage.ts

@@ -1,8 +1,10 @@
 import { ILabelAssociationRepository } from '@waha/core/engines/noweb/store/ILabelAssociationsRepository';
 import { ILabelsRepository } from '@waha/core/engines/noweb/store/ILabelsRepository';
+import { INowebLidPNRepository } from '@waha/core/engines/noweb/store/INowebLidPNRepository';
 import { Sqlite3GroupRepository } from '@waha/core/engines/noweb/store/sqlite3/Sqlite3GroupRepository';
 import { Sqlite3LabelAssociationsRepository } from '@waha/core/engines/noweb/store/sqlite3/Sqlite3LabelAssociationsRepository';
 import { Sqlite3LabelsRepository } from '@waha/core/engines/noweb/store/sqlite3/Sqlite3LabelsRepository';
+import { Sqlite3LidPNRepository } from '@waha/core/engines/noweb/store/sqlite3/Sqlite3LidPNRepository';
 import { Schema } from '@waha/core/storage/Schema';
 
 import { INowebStorage } from '../INowebStorage';
@@ -74,4 +76,8 @@ export class Sqlite3Storage extends INowebStorage {
   getMessagesRepository() {
     return new Sqlite3MessagesRepository(this.db);
   }
+
+  getLidPNRepository(): INowebLidPNRepository {
+    return new Sqlite3LidPNRepository(this.db);
+  }
 }

src/core/engines/noweb/useMultiFileAuthState.ts

@@ -18,7 +18,10 @@ const AsyncLock = require('async-lock');
 // https://github.com/nodejs/node/issues/26338
 // Default pending is 1000, set it to infinity
 // https://github.com/rogierschouten/async-lock/issues/63
-const fileLock = new AsyncLock({ maxPending: Infinity });
+const fileLock = new AsyncLock({
+  maxPending: Infinity,
+  maxExecutionTime: 30_000,
+});
 
 /**
  * stores the full authentication state in a single folder.

src/core/engines/webjs/WebjsClientCore.ts

@@ -1,5 +1,6 @@
 import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
 import { Label } from '@waha/structures/labels.dto';
+import { LidToPhoneNumber } from '@waha/structures/lids.dto';
 import { PaginationParams } from '@waha/structures/pagination.dto';
 import { TextStatus } from '@waha/structures/status.dto';
 import { EventEmitter } from 'events';
@@ -99,7 +100,7 @@ export class WebjsClientCore extends Client {
   }
 
   async createLabel(name: string, color: number): Promise<number> {
-    const labelId: number = await this.pupPage.evaluate(
+    const labelId: number = (await this.pupPage.evaluate(
       async (name, color) => {
         // @ts-ignore
         return await window.WAHA.WAWebBizLabelEditingAction.labelAddAction(
@@ -109,7 +110,7 @@ export class WebjsClientCore extends Client {
       },
       name,
       color,
-    );
+    )) as any;
     return labelId;
   }
 
@@ -262,4 +263,77 @@ export class WebjsClientCore extends Client {
 
     return messages.map((m) => new Message(this, m));
   }
+
+  public async getAllLids(
+    pagination: PaginationParams,
+  ): Promise<Array<LidToPhoneNumber>> {
+    const lids: Array<LidToPhoneNumber> = (await this.pupPage.evaluate(
+      async (pagination) => {
+        pagination.limit ||= Infinity;
+        pagination.offset ||= 0;
+        pagination.sortBy ||= 'lid';
+
+        // @ts-ignore
+        const WAWebApiContact = window.Store.LidUtils;
+
+        await WAWebApiContact.warmUpAllLidPnMappings();
+        const lidMap = WAWebApiContact.lidPnCache['$1'];
+        const values = Array.from(lidMap.values());
+        const result = values.map((map) => {
+          return {
+            // @ts-ignore
+            lid: map.lid._serialized,
+            // @ts-ignore
+            pn: map.phoneNumber._serialized,
+          };
+        });
+        // @ts-ignore
+        const paginator = new window.Paginator(pagination);
+        const page = paginator.apply(result);
+        return page;
+      },
+      pagination,
+    )) as any;
+    return lids;
+  }
+
+  public async getLidsCount(): Promise<number> {
+    const count: number = (await this.pupPage.evaluate(async () => {
+      // @ts-ignore
+      const WAWebApiContact = window.Store.LidUtils;
+
+      await WAWebApiContact.warmUpAllLidPnMappings();
+      const lidMap = WAWebApiContact.lidPnCache['$1'];
+      return lidMap.size;
+    })) as any;
+    return count;
+  }
+
+  public async findPNByLid(lid: string): Promise<string> {
+    const pn = await this.pupPage.evaluate(async (lid) => {
+      // @ts-ignore
+      const WAWebApiContact = window.Store.LidUtils;
+      // @ts-ignore
+      const WAWebWidFactory = window.Store.WidFactory;
+
+      const wid = WAWebWidFactory.createWid(lid);
+      const result = WAWebApiContact.getPhoneNumber(wid);
+      return result ? result._serialized : null;
+    }, lid);
+    return pn;
+  }
+
+  public async findLIDByPhoneNumber(phoneNumber: string): Promise<string> {
+    const lid: string = (await this.pupPage.evaluate(async (pn) => {
+      // @ts-ignore
+      const WAWebApiContact = window.Store.LidUtils;
+      // @ts-ignore
+      const WAWebWidFactory = window.Store.WidFactory;
+
+      const wid = WAWebWidFactory.createWid(pn);
+      const result = WAWebApiContact.getCurrentLid(wid);
+      return result ? result._serialized : null;
+    }, phoneNumber)) as any;
+    return lid;
+  }
 }

src/core/engines/webjs/_Paginator.js

@@ -17,7 +17,7 @@ exports.LoadPaginator = () => {
       }
       return window.lodash.orderBy(
         data,
-        [this.pagination.sortBy],
+        [this.NullLast(this.pagination.sortBy)],
         [this.pagination.sortOrder || 'asc'],
       );
     }
@@ -30,6 +30,16 @@ exports.LoadPaginator = () => {
       const limit = this.pagination.limit || Infinity;
       return data.slice(offset, offset + limit);
     }
+
+    NullLast(field) {
+      return (item) => {
+        const value = item?.[field];
+        if (value == null) {
+          return -Infinity;
+        }
+        return value;
+      };
+    }
   }
   window.Paginator = Paginator;
 };

src/core/engines/webjs/session.webjs.core.ts

@@ -30,10 +30,12 @@ import {
 } from '@waha/core/exceptions';
 import { IMediaEngineProcessor } from '@waha/core/media/IMediaEngineProcessor';
 import { QR } from '@waha/core/QR';
+import { StatusToAck } from '@waha/core/utils/acks';
 import {
   parseMessageIdSerialized,
   SerializeMessageKey,
 } from '@waha/core/utils/ids';
+import { DistinctAck } from '@waha/core/utils/reactive';
 import { splitAt } from '@waha/helpers';
 import { PairingCodeResponse } from '@waha/structures/auth.dto';
 import {
@@ -91,6 +93,7 @@ import {
   SettingsSecurityChangeInfo,
 } from '@waha/structures/groups.dto';
 import { Label, LabelDTO, LabelID } from '@waha/structures/labels.dto';
+import { LidToPhoneNumber } from '@waha/structures/lids.dto';
 import { ReplyToMessage } from '@waha/structures/message.dto';
 import { PaginationParams, SortOrder } from '@waha/structures/pagination.dto';
 import {
@@ -110,19 +113,10 @@ import { sleep, waitUntil } from '@waha/utils/promiseTimeout';
 import { SingleDelayedJobRunner } from '@waha/utils/SingleDelayedJobRunner';
 import * as lodash from 'lodash';
 import { ProtocolError } from 'puppeteer';
-import {
-  debounceTime,
-  distinct,
-  filter,
-  fromEvent,
-  groupBy,
-  interval,
-  merge,
-  mergeMap,
-  Observable,
-} from 'rxjs';
+import { filter, fromEvent, merge, mergeMap, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import {
+  AuthStrategy,
   Call,
   Channel as WEBJSChannel,
   Chat,
@@ -351,10 +345,11 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
 
   private async end() {
     this.engineStateCheckDelayedJob.cancel();
+    this.whatsapp?.removeAllListeners();
+    this.whatsapp?.pupBrowser?.removeAllListeners();
+    this.whatsapp?.pupPage?.removeAllListeners();
+
     try {
-      this.whatsapp?.removeAllListeners();
-      this.whatsapp?.pupBrowser?.removeAllListeners();
-      this.whatsapp?.pupPage?.removeAllListeners();
       // It's possible that browser yet starting
       await waitUntil(
         async () => {
@@ -365,11 +360,30 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
         1_000,
         10_000,
       );
-      this.whatsapp?.destroy().catch((error) => {
-        this.logger.warn(error, 'Failed to destroy the client');
-      });
+      this.logger.debug(
+        'Successfully waited for browser to be ready for closing',
+      );
     } catch (error) {
-      this.logger.error(error);
+      this.logger.error(
+        error,
+        'Failed while waiting for browser to be ready for closing',
+      );
+    }
+
+    try {
+      await this.whatsapp?.destroy();
+      this.logger.debug('Successfully destroyed whatsapp client');
+    } catch (error) {
+      this.logger.error(error, 'Failed to destroy whatsapp client');
+    }
+
+    try {
+      // @ts-ignore
+      const strategy: AuthStrategy = this.whatsapp?.authStrategy;
+      await strategy?.destroy();
+      this.logger.debug('Successfully destroyed auth strategy');
+    } catch (error) {
+      this.logger.error(error, 'Failed to destroy auth strategy');
     }
   }
 
@@ -913,6 +927,38 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     await contact.unblock();
   }
 
+  /**
+   * Lid to Phone Number methods
+   */
+  public async getAllLids(
+    pagination: PaginationParams,
+  ): Promise<Array<LidToPhoneNumber>> {
+    return this.whatsapp.getAllLids(pagination);
+  }
+
+  public async getLidsCount(): Promise<number> {
+    return this.whatsapp.getLidsCount();
+  }
+
+  public async findPNByLid(lid: string): Promise<LidToPhoneNumber> {
+    const phoneNumber = await this.whatsapp.findPNByLid(lid);
+    return {
+      lid: lid,
+      pn: phoneNumber,
+    };
+  }
+
+  public async findLIDByPhoneNumber(
+    phoneNumber: string,
+  ): Promise<LidToPhoneNumber> {
+    const pn = toCusFormat(phoneNumber);
+    const lid = await this.whatsapp.findLIDByPhoneNumber(pn);
+    return {
+      lid: lid,
+      pn: pn,
+    };
+  }
+
   /**
    * Group methods
    */
@@ -1336,13 +1382,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
 
     const messageAckAll$ = merge(messagesAckDM$, messageAckGroups$);
 
-    const messageAck$ = messageAckAll$.pipe(
-      // emit only if we haven’t seen this key since the last flush
-      distinct(
-        (msg: WAMessageAckBody) => `${msg.id}-${msg.ack}-${msg.participant}`,
-        interval(60_000),
-      ),
-    );
+    const messageAck$ = messageAckAll$.pipe(DistinctAck());
     this.events2.get(WAHAEvents.MESSAGE_ACK).switch(messageAck$);
 
     //
@@ -1487,7 +1527,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       };
       const fromToParticipant = getFromToParticipant(messageKey);
       const id = SerializeMessageKey(messageKey);
-      const ack = receipt.status - 1;
+      const ack = StatusToAck(receipt.status);
       acks.push({
         id: id,
         from: fromToParticipant.from,

src/core/helpers.ts

@@ -1,20 +1,23 @@
-export function toVcard(data): string {
+import { Contact, VCardContact } from '@waha/structures/chatting.dto';
+
+export function toVcard(data: Contact | VCardContact): string {
   if (data.vcard) {
     return data.vcard;
   }
+  const contact: Contact = data as any;
   const parts = [];
   parts.push('BEGIN:VCARD');
   parts.push('VERSION:3.0');
-  parts.push(`FN:${data.fullName}`);
-  if (data.organization) {
-    parts.push(`ORG:${data.organization};`);
+  parts.push(`FN:${contact.fullName}`);
+  if (contact.organization) {
+    parts.push(`ORG:${contact.organization};`);
   }
-  if (data.whatsappId) {
+  if (contact.whatsappId) {
     parts.push(
-      `TEL;type=CELL;type=VOICE;waid=${data.whatsappId}:${data.phoneNumber}`,
+      `TEL;type=CELL;type=VOICE;waid=${contact.whatsappId}:${contact.phoneNumber}`,
     );
   } else {
-    parts.push(`TEL;type=CELL;type=VOICE:${data.phoneNumber}`);
+    parts.push(`TEL;type=CELL;type=VOICE:${contact.phoneNumber}`);
   }
   parts.push('END:VCARD');
   return parts.join('\n');

src/core/storage/sql/SqlKVRepository.ts

@@ -4,6 +4,7 @@ import { ISQLEngine } from '@waha/core/storage/sql/ISQLEngine';
 import { PaginationParams } from '@waha/structures/pagination.dto';
 import { KnexPaginator } from '@waha/utils/Paginator';
 import Knex from 'knex';
+import * as lodash from 'lodash';
 
 export type Migration = string;
 
@@ -79,17 +80,26 @@ export class SqlKVRepository<Entity> {
   }
 
   private async upsertBatch(entities: Entity[]): Promise<void> {
-    const data = entities.map((entity) => this.dump(entity));
+    const all = entities.map((entity) => this.dump(entity));
+    // make it unique by .id
+    const data = lodash.uniqBy(all, (d: any) => d.id);
+    if (data.length != all.length) {
+      console.warn(
+        `WARNING - Duplicated entities for upsert batch: ${JSON.stringify(
+          entities,
+        )}`,
+      );
+    }
     const columns = this.columns.map((c) => `"${c.fieldName}"`);
     const values = data.map((d) => Object.values(d)).flat();
     const sql = `INSERT INTO "${this.table}" (${columns.join(', ')})
                  VALUES ${data
                    .map(() => `(${columns.map(() => '?').join(', ')})`)
-                   .join(', ')}
-                 ON CONFLICT(id) DO UPDATE
-                     SET ${columns
-                       .map((column) => `${column} = excluded.${column}`)
-                       .join(', ')}`;
+                   .join(', ')} ON CONFLICT(id) DO
+    UPDATE
+      SET ${columns
+        .map((column) => `${column} = excluded.${column}`)
+        .join(', ')}`;
     try {
       await this.raw(sql, values);
     } catch (err) {
@@ -109,8 +119,43 @@ export class SqlKVRepository<Entity> {
     return this.all(query);
   }
 
-  getAllByIds(ids: string[]) {
-    return this.all(this.select().whereIn('id', ids));
+  async getCount(): Promise<number> {
+    const query = this.select().count({ count: 'id' });
+    const row = await this.engine.get(query);
+    if (!row) {
+      return 0;
+    }
+    return parseInt(row.count, 10);
+  }
+
+  async getAllByIds(ids: string[]) {
+    const entitiesMap = await this.getEntitiesByIds(ids);
+    return Array.from(entitiesMap.values()).filter(
+      (entity) => entity !== null,
+    ) as Entity[];
+  }
+
+  async getEntitiesByIds(ids: string[]): Promise<Map<string, Entity | null>> {
+    if (ids.length === 0) {
+      return new Map();
+    }
+
+    const rows = await this.engine.all(this.select().whereIn('id', ids));
+    const entitiesMap = new Map<string, Entity | null>();
+
+    // Initialize a map with null values for all requested IDs
+    for (const id of ids) {
+      entitiesMap.set(id, null);
+    }
+
+    // Fill in the map with found entities
+    for (const row of rows) {
+      if (row && row.id) {
+        entitiesMap.set(row.id, this.parse(row));
+      }
+    }
+
+    return entitiesMap;
   }
 
   getById(id: string): Promise<Entity | null> {

src/core/utils/acks.ts

@@ -0,0 +1,9 @@
+import { WAMessageAck } from '@waha/structures/enums.dto';
+
+export function StatusToAck(status: number): WAMessageAck {
+  return status - 1;
+}
+
+export function AckToStatus(ack: number): number {
+  return ack + 1;
+}

src/core/utils/events.ts

@@ -0,0 +1,16 @@
+import { EventResponseType } from '@waha/structures/events.dto';
+
+export function ParseEventResponseType(response: number) {
+  switch (response) {
+    case 0:
+      return EventResponseType.UNKNOWN;
+    case 1:
+      return EventResponseType.GOING;
+    case 2:
+      return EventResponseType.NOT_GOING;
+    case 3:
+      return EventResponseType.MAYBE;
+    default:
+      return EventResponseType.UNKNOWN;
+  }
+}

src/core/utils/reactive.ts

@@ -0,0 +1,10 @@
+import { WAMessageAckBody } from '@waha/structures/webhooks.dto';
+import { distinct, interval } from 'rxjs';
+
+export function DistinctAck(flushEvery: number = 60_000) {
+  // only if we haven’t seen this key since the last flush
+  return distinct(
+    (msg: WAMessageAckBody) => `${msg.id}-${msg.ack}-${msg.participant}`,
+    interval(flushEvery),
+  );
+}

src/structures/chatting.dto.ts

@@ -164,6 +164,9 @@ export class MessageContactVcardRequest extends ChatRequest {
     ],
   })
   contacts: (VCardContact | Contact)[];
+
+  @ReplyToProperty()
+  reply_to?: string;
 }
 
 export class MessageTextRequest extends ChatRequest {

src/structures/enums.dto.ts

@@ -26,6 +26,8 @@ export enum WAHAEvents {
   LABEL_DELETED = 'label.deleted',
   LABEL_CHAT_ADDED = 'label.chat.added',
   LABEL_CHAT_DELETED = 'label.chat.deleted',
+  EVENT_RESPONSE = 'event.response',
+  EVENT_RESPONSE_FAILED = 'event.response.failed',
   ENGINE_EVENT = 'engine.event',
 }
 

src/structures/events.dto.ts

@@ -0,0 +1,144 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { MessageDestination } from '@waha/structures/chatting.dto';
+import { WAMessageBase } from '@waha/structures/responses.dto';
+import { Type } from 'class-transformer';
+import {
+  IsBoolean,
+  IsNotEmpty,
+  IsNumber,
+  IsOptional,
+  IsString,
+  ValidateNested,
+} from 'class-validator';
+
+import { ChatIdProperty, ReplyToProperty } from './properties.dto';
+
+export class EventLocation {
+  @ApiProperty({
+    description: 'Name of the location',
+    example: 'Luxe Nail Studio 💅',
+  })
+  @IsString()
+  @IsNotEmpty()
+  name: string;
+
+  //
+  // Doesn't work right now
+  //
+  // @ApiProperty({
+  //   description: 'Latitude of the location',
+  //   example: 38.8937255,
+  // })
+  // @IsNumber()
+  // @IsOptional()
+  // degreesLatitude?: number;
+  //
+  // @ApiProperty({
+  //   description: 'Longitude of the location',
+  //   example: -77.0969763,
+  // })
+  // @IsNumber()
+  // @IsOptional()
+  // degreesLongitude?: number;
+}
+
+export class EventMessage {
+  @ApiProperty({
+    description: 'Name of the event',
+    example: "John's Nail Appointment 💅",
+  })
+  @IsString()
+  @IsNotEmpty()
+  name: string;
+
+  @ApiProperty({
+    description: 'Description of the event',
+    example:
+      "It's time for your nail care session! 🌟\\n\\nYou'll be getting a *classic gel manicure* – clean, polished, and long-lasting. 💖\\n\\n📍 *Location:* Luxe Nail Studio\\nWe're on the *2nd floor of the Plaza Mall*, next to the flower shop. Look for the *pink neon sign*!\\n\\nFeel free to arrive *5–10 mins early* so we can get started on time 😊",
+    required: false,
+  })
+  @IsString()
+  @IsOptional()
+  description?: string;
+
+  @ApiProperty({
+    description: 'Start time of the event (Unix timestamp in seconds)',
+    example: 2063137000,
+  })
+  @IsNumber()
+  @IsNotEmpty()
+  startTime: number;
+
+  @ApiProperty({
+    description: 'End time of the event (Unix timestamp in seconds)',
+    example: null,
+    required: false,
+  })
+  @IsNumber()
+  @IsOptional()
+  endTime?: number;
+
+  @ApiProperty({
+    description: 'Location of the event',
+    required: false,
+    type: EventLocation,
+  })
+  @ValidateNested()
+  @Type(() => EventLocation)
+  @IsOptional()
+  location?: EventLocation;
+
+  @ApiProperty({
+    description: 'Whether extra guests are allowed',
+    example: false,
+    required: false,
+  })
+  @IsBoolean()
+  @IsOptional()
+  extraGuestsAllowed?: boolean;
+}
+
+export class EventMessageRequest {
+  @ChatIdProperty()
+  chatId: string;
+
+  event: EventMessage;
+
+  @ReplyToProperty()
+  reply_to?: string;
+}
+
+export class EventCancelRequest {
+  @ApiProperty({
+    description: 'ID of the event message to cancel',
+    example: 'true_12345678901@c.us_ABCDEFGHIJKLMNOPQRST',
+  })
+  @IsString()
+  @IsNotEmpty()
+  id: string;
+}
+
+export enum EventResponseType {
+  UNKNOWN = 'UNKNOWN',
+  GOING = 'GOING',
+  NOT_GOING = 'NOT_GOING',
+  MAYBE = 'MAYBE',
+}
+
+export class EventResponse {
+  response: EventResponseType;
+  timestampMs: number;
+  extraGuestCount: number;
+}
+
+export class EventResponsePayload extends WAMessageBase {
+  eventCreationKey: MessageDestination;
+  eventResponse?: EventResponse;
+
+  /** Returns a message in a raw format */
+  @ApiProperty({
+    description:
+      'Message in a raw format that we get from WhatsApp. May be changed anytime, use it with caution! It depends a lot on the underlying backend.',
+  })
+  _data?: any;
+}

src/structures/lids.dto.ts

@@ -0,0 +1,21 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { LimitOffsetParams } from '@waha/structures/pagination.dto';
+
+export class LidToPhoneNumber {
+  @ApiProperty({
+    description: 'Linked ID for the user',
+    example: '1111111@lid',
+  })
+  lid?: string;
+
+  @ApiProperty({
+    description: 'Phone number (chat id) for the user',
+    example: '3333333@c.us',
+  })
+  pn?: string;
+}
+
+export class LidsListQueryParams extends LimitOffsetParams {
+  limit?: number = 100;
+  offset?: number = 0;
+}

src/structures/responses.dto.ts

@@ -16,7 +16,7 @@ export enum MessageSource {
   APP = 'app',
 }
 
-class WAMessageBase {
+export class WAMessageBase {
   @MessageIdProperty()
   id: string;
 

src/structures/webhooks.dto.ts

@@ -1,5 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { CallData } from '@waha/structures/calls.dto';
+import { EventResponsePayload } from '@waha/structures/events.dto';
 import { Label, LabelChatAssociation } from '@waha/structures/labels.dto';
 
 import { ChatArchiveEvent } from './chats.dto';
@@ -344,6 +345,25 @@ export class EnginePayload {
   data: any;
 }
 
+export class WAHAWebhookEventResponse extends WAHAWebhook {
+  @ApiProperty({
+    description: 'The event is triggered when the event response is received.',
+  })
+  event = WAHAEvents.EVENT_RESPONSE;
+
+  payload: EventResponsePayload;
+}
+
+export class WAHAWebhookEventResponseFailed extends WAHAWebhook {
+  @ApiProperty({
+    description:
+      'The event is triggered when the event response is failed to decrypt.',
+  })
+  event = WAHAEvents.EVENT_RESPONSE_FAILED;
+
+  payload: EventResponsePayload;
+}
+
 export class WAHAWebhookEngineEvent extends WAHAWebhook {
   @ApiProperty({
     description: 'Internal engine event.',

src/structures/webhooks.ts

@@ -10,6 +10,8 @@ import {
   WAHAWebhookCallRejected,
   WAHAWebhookChatArchive,
   WAHAWebhookEngineEvent,
+  WAHAWebhookEventResponse,
+  WAHAWebhookEventResponseFailed,
   WAHAWebhookGroupJoin,
   WAHAWebhookGroupLeave,
   WAHAWebhookLabelChatAdded,
@@ -50,6 +52,8 @@ const WAHA_WEBHOOKS = [
   WAHAWebhookLabelDeleted,
   WAHAWebhookLabelChatAdded,
   WAHAWebhookLabelChatDeleted,
+  WAHAWebhookEventResponse,
+  WAHAWebhookEventResponseFailed,
   WAHAWebhookEngineEvent,
   WAHAWebhookGroupJoin,
   WAHAWebhookGroupLeave,

src/utils/Paginator.ts

@@ -24,8 +24,8 @@ export class PaginatorInMemory extends Paginator {
     }
     return lodash.orderBy(
       data,
-      this.pagination.sortBy,
-      this.pagination.sortOrder || 'asc',
+      [this.NullLast(this.pagination.sortBy)],
+      [this.pagination.sortOrder || 'asc'],
     );
   }
 
@@ -37,6 +37,16 @@ export class PaginatorInMemory extends Paginator {
     const limit = this.pagination.limit || Infinity;
     return data.slice(offset, offset + limit);
   }
+
+  NullLast(field) {
+    return (item) => {
+      const value = item?.[field];
+      if (value == null) {
+        return -Infinity;
+      }
+      return value;
+    };
+  }
 }
 
 export class KnexPaginator extends Paginator {

src/version.ts

@@ -33,7 +33,7 @@ export function getEngineName(): string {
 }
 
 export const VERSION: WAHAEnvironment = {
-  version: '2025.4.2',
+  version: '2025.5.4',
   engine: getEngineName(),
   tier: getWAHAVersion(),
   browser:

waha.config.json

@@ -2,11 +2,11 @@
   "waha": {
     "gows": {
       "repo": "devlikeapro/gows",
-      "ref": "v1.0.4"
+      "ref": "v1.0.6"
     },
     "dashboard": {
       "repo": "devlikeapro/dashboard",
-      "ref": "8f156ca15f460c68bea87535cf6d9f5c51c07f1f"
+      "ref": "3fb6694d849ca0b567679dd59311a50b9d727f2f"
     }
   }
 }

yarn.lock

@@ -7,7 +7,7 @@ __metadata:
 
 "@adiwajshing/baileys@github:devlikeapro/Baileys#fork-master-2025-05-01":
   version: 6.7.16
-  resolution: "@adiwajshing/baileys@https://github.com/devlikeapro/Baileys.git#commit=3cdc44f0fb97bb1c50b6e518862b763211f6b739"
+  resolution: "@adiwajshing/baileys@https://github.com/devlikeapro/Baileys.git#commit=a4ce7aa53079106d2821248ec9d4e876678fb9d3"
   dependencies:
     "@cacheable/node-cache": ^1.4.0
     "@hapi/boom": ^9.1.3
@@ -34,7 +34,7 @@ __metadata:
       optional: true
     sharp:
       optional: true
-  checksum: 7e9e4622b26a020428b678543ba4e59a35f679e8f00dd975eb20e7acd6afc6c465c107091a590ae7245fc3f29940611ac6f2b80fcd173fde742926887c41b563
+  checksum: c52ef3717f4e281182a602d0f4b5b085b800c297f7f2ee7d8d9707a03191e0dc21282b87771d6e09a3836e322934849593110e2d26c624de25709ce136e7ecf5
   languageName: node
   linkType: hard
 
@@ -12879,7 +12879,7 @@ __metadata:
 
 "whatsapp-web.js@github:devlikeapro/whatsapp-web.js#fork-main-channels":
   version: 1.26.0
-  resolution: "whatsapp-web.js@https://github.com/devlikeapro/whatsapp-web.js.git#commit=00fbdc333b53c052bf5ed1ecbcc0a9b3616d0e03"
+  resolution: "whatsapp-web.js@https://github.com/devlikeapro/whatsapp-web.js.git#commit=ae0d467885ac832a4c5804f736f9da226148f3c0"
   dependencies:
     "@pedroslopez/moduleraid": ^5.0.2
     archiver: ^5.3.1
@@ -12897,7 +12897,7 @@ __metadata:
       optional: true
     unzipper:
       optional: true
-  checksum: 9c96dc9705330372bbbf1e08f565ff0cc175a698b787f4937cf5064714b832958311fee991900e2dcbb9dfba31722940803919ca50ca2dbf51f928a650ba8764
+  checksum: 60ef6d7d5a19a7575d9eddd9e4a42049715619e6f6e92a6d8558909fbff1de9924b2d82eb8dcbea21598e256335a967be5376421917dd01f1f391bc71bb46387
   languageName: node
   linkType: hard