[core] 2025.5.3

fix #960

.env.example

@@ -23,9 +23,9 @@ WAHA_BASE_URL=http://localhost:3000
 #
 # https://waha.devlike.pro/docs/how-to/security/
 #
-WHATSAPP_API_KEY=321
-WAHA_DASHBOARD_USERNAME=waha
-WAHA_DASHBOARD_PASSWORD=waha
+WHATSAPP_API_KEY=admin
+WAHA_DASHBOARD_USERNAME=admin
+WAHA_DASHBOARD_PASSWORD=admin
 #WHATSAPP_SWAGGER_USERNAME=admin
 #WHATSAPP_SWAGGER_PASSWORD=admin
 
@@ -35,8 +35,8 @@ WAHA_DASHBOARD_PASSWORD=waha
 # https://waha.devlike.pro/docs/how-to/waha-dashboard/#configuration
 # Enabled by default
 #WAHA_DASHBOARD_ENABLED=true
-#WAHA_DASHBOARD_USERNAME=waha
-#WAHA_DASHBOARD_PASSWORD=waha
+#WAHA_DASHBOARD_USERNAME=admin
+#WAHA_DASHBOARD_PASSWORD=admin
 
 #
 # Logging

Dockerfile

@@ -131,7 +131,7 @@ RUN if [ "$USE_BROWSER" = "chromium" ]; then \
 # Install Chrome
 # Available versions:
 # https://www.ubuntuupdates.org/package/google_chrome/stable/main/base/google-chrome-stable
-ARG CHROME_VERSION="130.0.6723.69-1"
+ARG CHROME_VERSION="135.0.7049.114-1"
 RUN if [ "$USE_BROWSER" = "chrome" ]; then \
         wget --no-verbose -O /tmp/chrome.deb https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb \
           && apt-get update \

Makefile

@@ -35,7 +35,7 @@ for-swagger:
 	WHATSAPP_SWAGGER_CONFIG_ADVANCED=true . ${NVM_DIR}/nvm.sh && nvm exec yarn start
 
 up-noweb:
-	. ${NVM_DIR}/nvm.sh && nvm exec yarn up @adiwajshing/baileys@github:devlikeapro/Baileys#fork-master-channels-6712
+	. ${NVM_DIR}/nvm.sh && nvm exec yarn up @adiwajshing/baileys@github:devlikeapro/Baileys#fork-master-2025-05-01
 
 up-noweb-libsignal:
 	. ${NVM_DIR}/nvm.sh && nvm exec yarn up libsignal@github:devlikeapro/libsignal-node#fork-master

docker-compose/n8n/docker-compose.yaml

@@ -11,8 +11,8 @@ services:
       - './.media:/app/.media'
     environment:
       - WHATSAPP_API_KEY=321
-      - WAHA_DASHBOARD_USERNAME=waha
-      - WAHA_DASHBOARD_PASSWORD=waha
+      - WAHA_DASHBOARD_USERNAME=admin
+      - WAHA_DASHBOARD_PASSWORD=admin
       - WHATSAPP_DEFAULT_ENGINE=WEBJS
       - WAHA_PRINT_QR=False
       - WAHA_MEDIA_STORAGE=LOCAL

docker-compose/test/docker-compose.yaml

@@ -36,8 +36,8 @@ services:
       # Username and password for WAHA Dashboard
       # you can use the same username and password for both Swagger and Dashboard
       # Default - waha / waha
-      - WAHA_DASHBOARD_USERNAME=waha
-      - WAHA_DASHBOARD_PASSWORD=waha
+      - WAHA_DASHBOARD_USERNAME=admin
+      - WAHA_DASHBOARD_PASSWORD=admin
       # Engine specific environment variables
       # - WAHA_WEBJS_WEB_VERSION=2.2412.54-videofix
     restart: always

package.json

@@ -26,7 +26,7 @@
     "gows:proto": "yarn gows:proto:fetch && yarn gows:proto:build"
   },
   "dependencies": {
-    "@adiwajshing/baileys": "github:devlikeapro/Baileys#fork-master-channels-6712",
+    "@adiwajshing/baileys": "github:devlikeapro/Baileys#fork-master-2025-05-01",
     "@adiwajshing/keyed-db": "^0.2.4",
     "@aws-sdk/client-s3": "^3.633.0",
     "@aws-sdk/s3-request-presigner": "^3.633.0",
@@ -47,6 +47,7 @@
     "adm-zip": "0.5.10",
     "agentkeepalive": "^4.5.0",
     "async-lock": "^1.4.1",
+    "audio-decode": "^2.2.2",
     "axios": "^1.7.7",
     "axios-retry": "^4.5.0",
     "better-sqlite3": "11.3.0",
@@ -69,6 +70,7 @@
     "mime-types": "^2.1.27",
     "mongodb": "6.9.0",
     "nestjs-pino": "^4.1.0",
+    "node-cache": "5.1.2",
     "passport": "^0.6.0",
     "passport-headerapikey": "^1.2.2",
     "pg": "^8.13.1",
@@ -94,7 +96,7 @@
   "resolutions": {
     "bufferutil": "^4.0.8",
     "ws": "^8.18.0",
-    "puppeteer": "^23.6.0",
+    "puppeteer": "^24.7.2",
     "whatwg-url": "13.0.0",
     "libsignal": "github:devlikeapro/libsignal-node#fork-master"
   },

prepare-chatgpt.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Set source and output file
+SOURCE_DIR="src"
+OUTPUT_DIR="$HOME/Downloads/chatgpt"
+OUTPUT_FILE="$OUTPUT_DIR/waha.ts"
+
+# Create or clear the output file
+rm -f "$OUTPUT_FILE"
+touch "$OUTPUT_FILE"
+
+# Find all .md files in the source directory and combine them
+find "$SOURCE_DIR" -type f -name "*.ts" | while read -r file; do
+  # Add file name  to OUTPUT_FILE
+  echo -e "\n-------" >> "$OUTPUT_FILE"
+  echo "File: $file" >> "$OUTPUT_FILE"
+  echo -e "-------\n" >> "$OUTPUT_FILE"
+  # Append the content of the file to the output file
+  cat "$file" >> "$OUTPUT_FILE"
+done
+
+echo "All .ts files combined into $OUTPUT_FILE with separators."

src/api/channels.controller.ts

@@ -12,6 +12,7 @@ import {
 } from '@nestjs/common';
 import { ApiOperation, ApiParam, ApiSecurity, ApiTags } from '@nestjs/swagger';
 import { ChannelsInfoServiceCore } from '@waha/core/services/ChannelsInfoServiceCore';
+import { isJidNewsletter } from '@waha/core/utils/jids';
 import {
   SessionApiParam,
   WorkingSessionParam,
@@ -35,7 +36,6 @@ import {
 
 import { SessionManager } from '../core/abc/manager.abc';
 import {
-  isNewsletter,
   parseChannelInviteLink,
   WhatsappSession,
 } from '../core/abc/session.abc';
@@ -93,7 +93,7 @@ export class ChannelsController {
     @WorkingSessionParam session: WhatsappSession,
     @Param('id') id: string,
   ): Promise<Channel> {
-    if (isNewsletter(id)) {
+    if (isJidNewsletter(id)) {
       return session.channelsGetChannel(id);
     } else {
       const inviteCode = parseChannelInviteLink(id);
@@ -126,7 +126,7 @@ export class ChannelsController {
     @Param('id') code: string,
     @Query() query: PreviewChannelMessages,
   ): Promise<ChannelMessage[]> {
-    if (isNewsletter(code)) {
+    if (isJidNewsletter(code)) {
       const channel = await session.channelsGetChannel(code);
       code = parseChannelInviteLink(channel.invite);
     }

src/api/chats.controller.ts

@@ -1,3 +1,4 @@
+import { isJidGroup } from '@adiwajshing/baileys';
 import {
   Body,
   Controller,
@@ -31,6 +32,9 @@ import {
   GetChatMessagesQuery,
   OverviewPaginationParams,
   PinMessageRequest,
+  ReadChatMessagesQuery,
+  ReadChatMessagesResponse,
+  transformAck,
 } from '../structures/chats.dto';
 import { EditMessageRequest } from '../structures/chatting.dto';
 
@@ -100,9 +104,23 @@ class ChatsController {
     @WorkingSessionParam session: WhatsappSession,
     @Param('chatId') chatId: string,
   ) {
+    filter = transformAck(filter);
     return session.getChatMessages(chatId, query, filter);
   }
 
+  @Post(':chatId/messages/read')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Read unread messages in the chat' })
+  @ChatIdApiParam
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  readChatMessages(
+    @Query() query: ReadChatMessagesQuery,
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('chatId') chatId: string,
+  ): Promise<ReadChatMessagesResponse> {
+    return session.readChatMessages(chatId, query);
+  }
+
   @Get(':chatId/messages/:messageId')
   @SessionApiParam
   @ApiOperation({ summary: 'Gets message by id' })

src/api/chatting.controller.ts

@@ -10,7 +10,11 @@ import {
 } from '@nestjs/common';
 import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
 import { WAHAValidationPipe } from '@waha/nestjs/pipes/WAHAValidationPipe';
-import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
+import {
+  GetChatMessagesFilter,
+  ReadChatMessagesQuery,
+  transformAck,
+} from '@waha/structures/chats.dto';
 import { SendButtonsRequest } from '@waha/structures/chatting.buttons.dto';
 
 import { SessionManager } from '../core/abc/manager.abc';
@@ -18,10 +22,12 @@ import {
   ChatRequest,
   CheckNumberStatusQuery,
   GetMessageQuery,
+  MessageButtonReply,
   MessageContactVcardRequest,
   MessageFileRequest,
   MessageForwardRequest,
   MessageImageRequest,
+  MessageLinkCustomPreviewRequest,
   MessageLinkPreviewRequest,
   MessageLocationRequest,
   MessagePollRequest,
@@ -94,6 +100,25 @@ export class ChattingController {
     return whatsapp.sendVideo(request);
   }
 
+  @Post('/send/link-custom-preview')
+  @ApiOperation({
+    summary: 'Send a text message with a CUSTOM link preview.',
+    description:
+      'You can use regular /api/sendText if you wanna send auto-generated link preview.',
+  })
+  @UsePipes(new WAHAValidationPipe())
+  async sendLinkCustomPreview(
+    @Body() request: MessageLinkCustomPreviewRequest,
+  ): Promise<any> {
+    const whatsapp = await this.manager.getWorkingSession(request.session);
+    if (!request.text.includes(request.preview.url)) {
+      throw new Error(
+        '"text" must include the URL provided in the "preview.url"',
+      );
+    }
+    return whatsapp.sendLinkCustomPreview(request);
+  }
+
   @Post('/sendButtons')
   @ApiOperation({
     summary: 'Send buttons (interactive message)',
@@ -115,6 +140,15 @@ export class ChattingController {
 
   @Post('/sendSeen')
   async sendSeen(@Body() chat: SendSeenRequest) {
+    const hasMessageId = chat.messageIds?.length > 0 || Boolean(chat.messageId);
+    if (!hasMessageId) {
+      const whatsapp = await this.manager.getWorkingSession(chat.session);
+      const query: ReadChatMessagesQuery = {
+        messages: null,
+        days: 7,
+      };
+      return whatsapp.readChatMessages(chat.chatId, query);
+    }
     const whatsapp = await this.manager.getWorkingSession(chat.session);
     return whatsapp.sendSeen(chat);
   }
@@ -165,18 +199,22 @@ export class ChattingController {
     return whatsapp.sendLocation(request);
   }
 
-  @Post('/sendLinkPreview')
-  async sendLinkPreview(@Body() request: MessageLinkPreviewRequest) {
-    const whatsapp = await this.manager.getWorkingSession(request.session);
-    return whatsapp.sendLinkPreview(request);
-  }
-
   @Post('/sendContactVcard')
   async sendContactVcard(@Body() request: MessageContactVcardRequest) {
     const whatsapp = await this.manager.getWorkingSession(request.session);
     return whatsapp.sendContactVCard(request);
   }
 
+  @Post('/send/buttons/reply')
+  @ApiOperation({
+    summary: 'Reply on a button message',
+  })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async sendButtonsReply(@Body() request: MessageButtonReply) {
+    const whatsapp = await this.manager.getWorkingSession(request.session);
+    return whatsapp.sendButtonsReply(request);
+  }
+
   @Get('/sendText')
   @ApiOperation({ summary: 'Send a text message', deprecated: true })
   async sendTextGet(@Query() query: MessageTextQuery) {
@@ -198,6 +236,7 @@ export class ChattingController {
     @Query() query: GetMessageQuery,
     @Query() filter: GetChatMessagesFilter,
   ) {
+    filter = transformAck(filter);
     const whatsapp = await this.manager.getWorkingSession(query.session);
     return whatsapp.getChatMessages(query.chatId, query, filter);
   }
@@ -225,4 +264,11 @@ export class ChattingController {
     const whatsapp = await this.manager.getWorkingSession(request.session);
     return whatsapp.reply(request);
   }
+
+  @Post('/sendLinkPreview')
+  @ApiOperation({ deprecated: true })
+  async sendLinkPreview_DEPRECATED(@Body() request: MessageLinkPreviewRequest) {
+    const whatsapp = await this.manager.getWorkingSession(request.session);
+    return whatsapp.sendLinkPreview(request);
+  }
 }

src/api/status.controller.ts

@@ -1,9 +1,10 @@
-import { Body, Controller, Post } from '@nestjs/common';
+import { Body, Controller, Get, Post } from '@nestjs/common';
 import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
 import {
   SessionApiParam,
   WorkingSessionParam,
 } from '@waha/nestjs/params/SessionApiParam';
+import { NewMessageIDResponse } from '@waha/structures/chatting.dto';
 
 import { SessionManager } from '../core/abc/manager.abc';
 import { WhatsappSession } from '../core/abc/session.abc';
@@ -70,6 +71,18 @@ class StatusController {
   ) {
     return session.deleteStatus(status);
   }
+
+  @Get('new-message-id')
+  @SessionApiParam
+  @ApiOperation({
+    summary: 'Generate message ID you can use to batch contacts',
+  })
+  async getNewMessageId(
+    @WorkingSessionParam session: WhatsappSession,
+  ): Promise<NewMessageIDResponse> {
+    const id = await session.generateNewMessageId();
+    return { id: id };
+  }
 }
 
 export { StatusController };

src/config.service.ts

@@ -1,13 +1,19 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger, OnApplicationBootstrap } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import { WAHAEvents } from '@waha/structures/enums.dto';
+import { GlobalWebhookConfigConfig } from '@waha/core/config/GlobalWebhookConfig';
 
 import { parseBool } from './helpers';
 import { WebhookConfig } from './structures/webhooks.config.dto';
 
 @Injectable()
-export class WhatsappConfigService {
-  constructor(private configService: ConfigService) {}
+export class WhatsappConfigService implements OnApplicationBootstrap {
+  private logger: Logger;
+  private webhookConfig: GlobalWebhookConfigConfig;
+
+  constructor(private configService: ConfigService) {
+    this.logger = new Logger('WhatsappConfigService');
+    this.webhookConfig = new GlobalWebhookConfigConfig(configService);
+  }
 
   get schema() {
     return this.configService.get('WHATSAPP_API_SCHEMA', 'http');
@@ -113,21 +119,7 @@ export class WhatsappConfigService {
   }
 
   getWebhookConfig(): WebhookConfig | undefined {
-    const url = this.getWebhookUrl();
-    const events = this.getWebhookEvents();
-    if (!url || events.length === 0) {
-      return undefined;
-    }
-    return { url: url, events: events };
-  }
-
-  private getWebhookUrl(): string | undefined {
-    return this.get('WHATSAPP_HOOK_URL');
-  }
-
-  private getWebhookEvents(): WAHAEvents[] {
-    const value = this.get('WHATSAPP_HOOK_EVENTS', '');
-    return value ? value.split(',') : [];
+    return this.webhookConfig.config;
   }
 
   getSessionMongoUrl(): string | undefined {
@@ -182,4 +174,11 @@ export class WhatsappConfigService {
     const value = this.configService.get('WAHA_DEBUG_MODE', 'false');
     return parseBool(value);
   }
+
+  onApplicationBootstrap() {
+    const error = this.webhookConfig.validateConfig();
+    if (error) {
+      throw new Error(`Invalid global webhook config:\n${error}\n`);
+    }
+  }
 }

src/core/abc/manager.abc.ts

@@ -150,6 +150,12 @@ export abstract class SessionManager
     sessionName: string,
     expected: WAHASessionStatus[],
   ): Promise<WhatsappSession> {
+    if (!sessionName) {
+      throw new UnprocessableEntityException({
+        error: `Session name is required`,
+        session: sessionName,
+      });
+    }
     const running = await waitUntil(
       async () => this.isRunning(sessionName),
       this.WAIT_SESSION_RUNNING_INTERVAL,

src/core/abc/session.abc.ts

@@ -1,3 +1,6 @@
+import { isJidBroadcast } from '@adiwajshing/baileys/lib/WABinary/jid-utils';
+import { MessagesForRead } from '@waha/core/utils/convertors';
+import { isJidNewsletter } from '@waha/core/utils/jids';
 import {
   Channel,
   ChannelListResult,
@@ -13,6 +16,8 @@ import {
   GetChatMessageQuery,
   GetChatMessagesFilter,
   GetChatMessagesQuery,
+  ReadChatMessagesQuery,
+  ReadChatMessagesResponse,
 } from '@waha/structures/chats.dto';
 import { SendButtonsRequest } from '@waha/structures/chatting.buttons.dto';
 import { BinaryFile, RemoteFile } from '@waha/structures/files.dto';
@@ -46,10 +51,12 @@ import {
   ChatRequest,
   CheckNumberStatusQuery,
   EditMessageRequest,
+  MessageButtonReply,
   MessageContactVcardRequest,
   MessageFileRequest,
   MessageForwardRequest,
   MessageImageRequest,
+  MessageLinkCustomPreviewRequest,
   MessageLinkPreviewRequest,
   MessageLocationRequest,
   MessagePollRequest,
@@ -397,6 +404,10 @@ export abstract class WhatsappSession {
   /**
    * Other methods
    */
+  generateNewMessageId(): Promise<string> {
+    throw new NotImplementedByEngineError();
+  }
+
   abstract checkNumberStatus(request: CheckNumberStatusQuery);
 
   abstract sendText(request: MessageTextRequest);
@@ -415,6 +426,12 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
+  sendLinkCustomPreview(
+    request: MessageLinkCustomPreviewRequest,
+  ): Promise<any> {
+    throw new NotImplementedByEngineError();
+  }
+
   abstract forwardMessage(request: MessageForwardRequest): Promise<WAMessage>;
 
   abstract sendImage(request: MessageImageRequest);
@@ -431,6 +448,10 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
+  sendButtonsReply(request: MessageButtonReply) {
+    throw new NotImplementedByEngineError();
+  }
+
   abstract reply(request: MessageReplyRequest);
 
   abstract sendSeen(chat: SendSeenRequest);
@@ -466,10 +487,35 @@ export abstract class WhatsappSession {
     chatId: string,
     query: GetChatMessagesQuery,
     filter: GetChatMessagesFilter,
-  ) {
+  ): Promise<WAMessage[]> {
     throw new NotImplementedByEngineError();
   }
 
+  abstract readChatMessages(
+    chatId: string,
+    request: ReadChatMessagesQuery,
+  ): Promise<ReadChatMessagesResponse>;
+
+  protected async readChatMessagesWSImpl(
+    chatId: string,
+    request: ReadChatMessagesQuery,
+  ): Promise<ReadChatMessagesResponse> {
+    const { query, filter } = MessagesForRead(chatId, request);
+    const messages = await this.getChatMessages(chatId, query, filter);
+    this.logger.debug(`Found ${messages.length} messages to read`);
+    if (messages.length === 0) {
+      return { ids: [] };
+    }
+    const ids = messages.map((m) => m.id);
+    const seen: SendSeenRequest = {
+      chatId: chatId,
+      messageIds: ids,
+      session: '',
+    };
+    await this.sendSeen(seen);
+    return { ids: ids };
+  }
+
   public getChatMessage(
     chatId: string,
     messageId: string,
@@ -588,7 +634,9 @@ export abstract class WhatsappSession {
 
   protected async refreshProfilePicture(id: string) {
     let fn: Promise<string>;
-    if (isNewsletter(id)) {
+    if (isJidBroadcast(id)) {
+      return null;
+    } else if (isJidNewsletter(id)) {
       fn = this.channelsGetChannel(id).then(
         (channel: Channel) => channel.picture || channel.preview,
       );
@@ -848,6 +896,9 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
+  /**
+   * Engine methods
+   */
   public async getEngineInfo(): Promise<any> {
     return {};
   }
@@ -903,10 +954,6 @@ export abstract class WhatsappSession {
   }
 }
 
-export function isNewsletter(jid: string) {
-  return jid.endsWith('@newsletter');
-}
-
 export function getGroupInviteLink(code: string) {
   if (code.startsWith('https://')) {
     return code;

src/core/config/GlobalWebhookConfig.ts

@@ -0,0 +1,167 @@
+import { ConfigService } from '@nestjs/config';
+import { WAHAEvents } from '@waha/structures/enums.dto';
+import {
+  CustomHeader,
+  HmacConfiguration,
+  RetriesConfiguration,
+  WebhookConfig,
+} from '@waha/structures/webhooks.config.dto';
+import { plainToInstance } from 'class-transformer';
+import { validateSync, ValidationError } from 'class-validator';
+
+enum Env {
+  WHATSAPP_HOOK_URL = 'WHATSAPP_HOOK_URL',
+  WHATSAPP_HOOK_EVENTS = 'WHATSAPP_HOOK_EVENTS',
+  WHATSAPP_HOOK_RETRIES_POLICY = 'WHATSAPP_HOOK_RETRIES_POLICY',
+  WHATSAPP_HOOK_RETRIES_DELAY_SECONDS = 'WHATSAPP_HOOK_RETRIES_DELAY_SECONDS',
+  WHATSAPP_HOOK_RETRIES_ATTEMPTS = 'WHATSAPP_HOOK_RETRIES_ATTEMPTS',
+  WHATSAPP_HOOK_HMAC_KEY = 'WHATSAPP_HOOK_HMAC_KEY',
+  WHATSAPP_HOOK_CUSTOM_HEADERS = 'WHATSAPP_HOOK_CUSTOM_HEADERS',
+}
+
+export class GlobalWebhookConfigConfig {
+  protected _config: WebhookConfig | null = null;
+
+  constructor(private configService: ConfigService) {}
+
+  private getUrl(): string | undefined {
+    return this.configService.get(Env.WHATSAPP_HOOK_URL);
+  }
+
+  private getEvents(): WAHAEvents[] {
+    const value = this.configService.get(Env.WHATSAPP_HOOK_EVENTS, '');
+    return value ? value.split(',') : [];
+  }
+
+  private getHmac(): HmacConfiguration | null {
+    const key = this.configService.get(Env.WHATSAPP_HOOK_HMAC_KEY, '');
+    if (!key) {
+      return null;
+    }
+    return {
+      key: key,
+    };
+  }
+
+  private getRetries(): RetriesConfiguration | null {
+    const policy: any = this.configService.get(
+      Env.WHATSAPP_HOOK_RETRIES_POLICY,
+      null,
+    );
+    const delaySeconds: any = this.configService.get(
+      Env.WHATSAPP_HOOK_RETRIES_DELAY_SECONDS,
+      null,
+    );
+    const attempts: any = this.configService.get(
+      Env.WHATSAPP_HOOK_RETRIES_ATTEMPTS,
+      null,
+    );
+    if (!policy && !delaySeconds && !attempts) {
+      return null;
+    }
+    return {
+      policy: policy,
+      delaySeconds: delaySeconds,
+      attempts: attempts,
+    };
+  }
+
+  private getCustomHeaders(): CustomHeader[] {
+    // key:value;key2:value
+    const value = this.configService.get(Env.WHATSAPP_HOOK_CUSTOM_HEADERS, '');
+    if (!value) {
+      return [];
+    }
+    const headers = value.split(';');
+    return headers.map((header: string) => {
+      const parts = header.split(':');
+      if (parts.length !== 2) {
+        throw new Error(
+          `${Env.WHATSAPP_HOOK_CUSTOM_HEADERS} - Invalid custom header, no ':' found in '${header}'`,
+        );
+      }
+      return {
+        name: parts[0],
+        value: parts[1],
+      };
+    });
+  }
+
+  get config() {
+    if (!this._config) {
+      this._config = this.parseWebhookConfig();
+    }
+    return this._config;
+  }
+
+  validateConfig(): string | null {
+    const config = this.parseWebhookConfig();
+    if (!config) {
+      return null;
+    }
+    const errors = validateSync(config);
+    if (errors.length > 0) {
+      return this.formatErrors([], errors, []).join('\n');
+    }
+    return;
+  }
+
+  private getEnv(key: string): string | null {
+    const keys = {
+      url: Env.WHATSAPP_HOOK_URL,
+      events: Env.WHATSAPP_HOOK_EVENTS,
+      'retries.policy': Env.WHATSAPP_HOOK_RETRIES_POLICY,
+      'retries.delaySeconds': Env.WHATSAPP_HOOK_RETRIES_DELAY_SECONDS,
+      'retries.attempts': Env.WHATSAPP_HOOK_RETRIES_ATTEMPTS,
+      'hmac.key': Env.WHATSAPP_HOOK_HMAC_KEY,
+    };
+    return keys[key] || null;
+  }
+
+  private formatErrors(
+    lines: string[],
+    errors: ValidationError[],
+    path: string[],
+  ) {
+    for (const err of errors) {
+      path = [...path, err.property];
+      for (const key in err.constraints) {
+        if (!err.constraints.hasOwnProperty(key)) {
+          continue;
+        }
+        const property = path.join('.');
+        const env = this.getEnv(property);
+        if (env) {
+          const value = this.configService.get(env, '');
+          const line = `- ${env} (${property}): '${value}' => '${err.value}' - ${err.constraints[key]}`;
+          lines.push(line);
+        } else {
+          const line = `- ${property}: '${err.value}' - ${err.constraints[key]}`;
+          lines.push(line);
+        }
+      }
+      if (err.children) {
+        this.formatErrors(lines, err.children, path);
+      }
+    }
+    return lines;
+  }
+
+  private parseWebhookConfig(): WebhookConfig | null {
+    const url = this.getUrl();
+    const events = this.getEvents();
+    if (!url || events.length === 0) {
+      return null;
+    }
+    const data: WebhookConfig = {
+      url: url,
+      events: events,
+      hmac: this.getHmac(),
+      retries: this.getRetries(),
+      customHeaders: this.getCustomHeaders(),
+    };
+    return plainToInstance(WebhookConfig, data, {
+      enableImplicitConversion: true,
+    });
+  }
+}

src/core/engines/gows/groups.gows.ts

@@ -4,7 +4,7 @@ import {
   GroupInfoFull,
   JoinedGroupEvent,
 } from '@waha/core/engines/gows/types.group';
-import { toJID } from '@waha/core/engines/noweb/session.noweb.core';
+import { toJID } from '@waha/core/utils/jids';
 import {
   GroupId,
   GroupInfo,

src/core/engines/gows/grpc/gows.ts

@@ -2535,6 +2535,142 @@ export namespace messages {
             return Media.deserialize(bytes);
         }
     }
+    export class LinkPreview extends pb_1.Message {
+        #one_of_decls: number[][] = [];
+        constructor(data?: any[] | {
+            url?: string;
+            title?: string;
+            description?: string;
+            image?: Uint8Array;
+        }) {
+            super();
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
+            if (!Array.isArray(data) && typeof data == "object") {
+                if ("url" in data && data.url != undefined) {
+                    this.url = data.url;
+                }
+                if ("title" in data && data.title != undefined) {
+                    this.title = data.title;
+                }
+                if ("description" in data && data.description != undefined) {
+                    this.description = data.description;
+                }
+                if ("image" in data && data.image != undefined) {
+                    this.image = data.image;
+                }
+            }
+        }
+        get url() {
+            return pb_1.Message.getFieldWithDefault(this, 1, "") as string;
+        }
+        set url(value: string) {
+            pb_1.Message.setField(this, 1, value);
+        }
+        get title() {
+            return pb_1.Message.getFieldWithDefault(this, 2, "") as string;
+        }
+        set title(value: string) {
+            pb_1.Message.setField(this, 2, value);
+        }
+        get description() {
+            return pb_1.Message.getFieldWithDefault(this, 3, "") as string;
+        }
+        set description(value: string) {
+            pb_1.Message.setField(this, 3, value);
+        }
+        get image() {
+            return pb_1.Message.getFieldWithDefault(this, 4, new Uint8Array(0)) as Uint8Array;
+        }
+        set image(value: Uint8Array) {
+            pb_1.Message.setField(this, 4, value);
+        }
+        static fromObject(data: {
+            url?: string;
+            title?: string;
+            description?: string;
+            image?: Uint8Array;
+        }): LinkPreview {
+            const message = new LinkPreview({});
+            if (data.url != null) {
+                message.url = data.url;
+            }
+            if (data.title != null) {
+                message.title = data.title;
+            }
+            if (data.description != null) {
+                message.description = data.description;
+            }
+            if (data.image != null) {
+                message.image = data.image;
+            }
+            return message;
+        }
+        toObject() {
+            const data: {
+                url?: string;
+                title?: string;
+                description?: string;
+                image?: Uint8Array;
+            } = {};
+            if (this.url != null) {
+                data.url = this.url;
+            }
+            if (this.title != null) {
+                data.title = this.title;
+            }
+            if (this.description != null) {
+                data.description = this.description;
+            }
+            if (this.image != null) {
+                data.image = this.image;
+            }
+            return data;
+        }
+        serialize(): Uint8Array;
+        serialize(w: pb_1.BinaryWriter): void;
+        serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+            const writer = w || new pb_1.BinaryWriter();
+            if (this.url.length)
+                writer.writeString(1, this.url);
+            if (this.title.length)
+                writer.writeString(2, this.title);
+            if (this.description.length)
+                writer.writeString(3, this.description);
+            if (this.image.length)
+                writer.writeBytes(4, this.image);
+            if (!w)
+                return writer.getResultBuffer();
+        }
+        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): LinkPreview {
+            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new LinkPreview();
+            while (reader.nextField()) {
+                if (reader.isEndGroup())
+                    break;
+                switch (reader.getFieldNumber()) {
+                    case 1:
+                        message.url = reader.readString();
+                        break;
+                    case 2:
+                        message.title = reader.readString();
+                        break;
+                    case 3:
+                        message.description = reader.readString();
+                        break;
+                    case 4:
+                        message.image = reader.readBytes();
+                        break;
+                    default: reader.skipField();
+                }
+            }
+            return message;
+        }
+        serializeBinary(): Uint8Array {
+            return this.serialize();
+        }
+        static deserializeBinary(bytes: Uint8Array): LinkPreview {
+            return LinkPreview.deserialize(bytes);
+        }
+    }
     export class MessageRequest extends pb_1.Message {
         #one_of_decls: number[][] = [];
         constructor(data?: any[] | {
@@ -2547,9 +2683,12 @@ export namespace messages {
             linkPreview?: boolean;
             linkPreviewHighQuality?: boolean;
             replyTo?: string;
+            id?: string;
+            participants?: string[];
+            preview?: LinkPreview;
         }) {
             super();
-            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [11], this.#one_of_decls);
             if (!Array.isArray(data) && typeof data == "object") {
                 if ("session" in data && data.session != undefined) {
                     this.session = data.session;
@@ -2578,6 +2717,15 @@ export namespace messages {
                 if ("replyTo" in data && data.replyTo != undefined) {
                     this.replyTo = data.replyTo;
                 }
+                if ("id" in data && data.id != undefined) {
+                    this.id = data.id;
+                }
+                if ("participants" in data && data.participants != undefined) {
+                    this.participants = data.participants;
+                }
+                if ("preview" in data && data.preview != undefined) {
+                    this.preview = data.preview;
+                }
             }
         }
         get session() {
@@ -2646,6 +2794,27 @@ export namespace messages {
         set replyTo(value: string) {
             pb_1.Message.setField(this, 9, value);
         }
+        get id() {
+            return pb_1.Message.getFieldWithDefault(this, 10, "") as string;
+        }
+        set id(value: string) {
+            pb_1.Message.setField(this, 10, value);
+        }
+        get participants() {
+            return pb_1.Message.getFieldWithDefault(this, 11, []) as string[];
+        }
+        set participants(value: string[]) {
+            pb_1.Message.setField(this, 11, value);
+        }
+        get preview() {
+            return pb_1.Message.getWrapperField(this, LinkPreview, 12) as LinkPreview;
+        }
+        set preview(value: LinkPreview) {
+            pb_1.Message.setWrapperField(this, 12, value);
+        }
+        get has_preview() {
+            return pb_1.Message.getField(this, 12) != null;
+        }
         static fromObject(data: {
             session?: ReturnType<typeof Session.prototype.toObject>;
             jid?: string;
@@ -2656,6 +2825,9 @@ export namespace messages {
             linkPreview?: boolean;
             linkPreviewHighQuality?: boolean;
             replyTo?: string;
+            id?: string;
+            participants?: string[];
+            preview?: ReturnType<typeof LinkPreview.prototype.toObject>;
         }): MessageRequest {
             const message = new MessageRequest({});
             if (data.session != null) {
@@ -2685,6 +2857,15 @@ export namespace messages {
             if (data.replyTo != null) {
                 message.replyTo = data.replyTo;
             }
+            if (data.id != null) {
+                message.id = data.id;
+            }
+            if (data.participants != null) {
+                message.participants = data.participants;
+            }
+            if (data.preview != null) {
+                message.preview = LinkPreview.fromObject(data.preview);
+            }
             return message;
         }
         toObject() {
@@ -2698,6 +2879,9 @@ export namespace messages {
                 linkPreview?: boolean;
                 linkPreviewHighQuality?: boolean;
                 replyTo?: string;
+                id?: string;
+                participants?: string[];
+                preview?: ReturnType<typeof LinkPreview.prototype.toObject>;
             } = {};
             if (this.session != null) {
                 data.session = this.session.toObject();
@@ -2726,6 +2910,15 @@ export namespace messages {
             if (this.replyTo != null) {
                 data.replyTo = this.replyTo;
             }
+            if (this.id != null) {
+                data.id = this.id;
+            }
+            if (this.participants != null) {
+                data.participants = this.participants;
+            }
+            if (this.preview != null) {
+                data.preview = this.preview.toObject();
+            }
             return data;
         }
         serialize(): Uint8Array;
@@ -2750,6 +2943,12 @@ export namespace messages {
                 writer.writeBool(8, this.linkPreviewHighQuality);
             if (this.replyTo.length)
                 writer.writeString(9, this.replyTo);
+            if (this.id.length)
+                writer.writeString(10, this.id);
+            if (this.participants.length)
+                writer.writeRepeatedString(11, this.participants);
+            if (this.has_preview)
+                writer.writeMessage(12, this.preview, () => this.preview.serialize(writer));
             if (!w)
                 return writer.getResultBuffer();
         }
@@ -2786,6 +2985,15 @@ export namespace messages {
                     case 9:
                         message.replyTo = reader.readString();
                         break;
+                    case 10:
+                        message.id = reader.readString();
+                        break;
+                    case 11:
+                        pb_1.Message.addToRepeatedField(message, 11, reader.readString());
+                        break;
+                    case 12:
+                        reader.readMessage(message.preview, () => message.preview = LinkPreview.deserialize(reader));
+                        break;
                     default: reader.skipField();
                 }
             }
@@ -3076,6 +3284,73 @@ export namespace messages {
             return MessageResponse.deserialize(bytes);
         }
     }
+    export class NewMessageIDResponse extends pb_1.Message {
+        #one_of_decls: number[][] = [];
+        constructor(data?: any[] | {
+            id?: string;
+        }) {
+            super();
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
+            if (!Array.isArray(data) && typeof data == "object") {
+                if ("id" in data && data.id != undefined) {
+                    this.id = data.id;
+                }
+            }
+        }
+        get id() {
+            return pb_1.Message.getFieldWithDefault(this, 1, "") as string;
+        }
+        set id(value: string) {
+            pb_1.Message.setField(this, 1, value);
+        }
+        static fromObject(data: {
+            id?: string;
+        }): NewMessageIDResponse {
+            const message = new NewMessageIDResponse({});
+            if (data.id != null) {
+                message.id = data.id;
+            }
+            return message;
+        }
+        toObject() {
+            const data: {
+                id?: string;
+            } = {};
+            if (this.id != null) {
+                data.id = this.id;
+            }
+            return data;
+        }
+        serialize(): Uint8Array;
+        serialize(w: pb_1.BinaryWriter): void;
+        serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+            const writer = w || new pb_1.BinaryWriter();
+            if (this.id.length)
+                writer.writeString(1, this.id);
+            if (!w)
+                return writer.getResultBuffer();
+        }
+        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): NewMessageIDResponse {
+            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new NewMessageIDResponse();
+            while (reader.nextField()) {
+                if (reader.isEndGroup())
+                    break;
+                switch (reader.getFieldNumber()) {
+                    case 1:
+                        message.id = reader.readString();
+                        break;
+                    default: reader.skipField();
+                }
+            }
+            return message;
+        }
+        serializeBinary(): Uint8Array {
+            return this.serialize();
+        }
+        static deserializeBinary(bytes: Uint8Array): NewMessageIDResponse {
+            return NewMessageIDResponse.deserialize(bytes);
+        }
+    }
     export class ProfilePictureRequest extends pb_1.Message {
         #one_of_decls: number[][] = [];
         constructor(data?: any[] | {
@@ -3236,6 +3511,168 @@ export namespace messages {
             return ProfilePictureResponse.deserialize(bytes);
         }
     }
+    export class ButtonReplyRequest extends pb_1.Message {
+        #one_of_decls: number[][] = [];
+        constructor(data?: any[] | {
+            session?: Session;
+            jid?: string;
+            selectedDisplayText?: string;
+            selectedButtonID?: string;
+            replyTo?: string;
+        }) {
+            super();
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
+            if (!Array.isArray(data) && typeof data == "object") {
+                if ("session" in data && data.session != undefined) {
+                    this.session = data.session;
+                }
+                if ("jid" in data && data.jid != undefined) {
+                    this.jid = data.jid;
+                }
+                if ("selectedDisplayText" in data && data.selectedDisplayText != undefined) {
+                    this.selectedDisplayText = data.selectedDisplayText;
+                }
+                if ("selectedButtonID" in data && data.selectedButtonID != undefined) {
+                    this.selectedButtonID = data.selectedButtonID;
+                }
+                if ("replyTo" in data && data.replyTo != undefined) {
+                    this.replyTo = data.replyTo;
+                }
+            }
+        }
+        get session() {
+            return pb_1.Message.getWrapperField(this, Session, 1) as Session;
+        }
+        set session(value: Session) {
+            pb_1.Message.setWrapperField(this, 1, value);
+        }
+        get has_session() {
+            return pb_1.Message.getField(this, 1) != null;
+        }
+        get jid() {
+            return pb_1.Message.getFieldWithDefault(this, 2, "") as string;
+        }
+        set jid(value: string) {
+            pb_1.Message.setField(this, 2, value);
+        }
+        get selectedDisplayText() {
+            return pb_1.Message.getFieldWithDefault(this, 3, "") as string;
+        }
+        set selectedDisplayText(value: string) {
+            pb_1.Message.setField(this, 3, value);
+        }
+        get selectedButtonID() {
+            return pb_1.Message.getFieldWithDefault(this, 4, "") as string;
+        }
+        set selectedButtonID(value: string) {
+            pb_1.Message.setField(this, 4, value);
+        }
+        get replyTo() {
+            return pb_1.Message.getFieldWithDefault(this, 5, "") as string;
+        }
+        set replyTo(value: string) {
+            pb_1.Message.setField(this, 5, value);
+        }
+        static fromObject(data: {
+            session?: ReturnType<typeof Session.prototype.toObject>;
+            jid?: string;
+            selectedDisplayText?: string;
+            selectedButtonID?: string;
+            replyTo?: string;
+        }): ButtonReplyRequest {
+            const message = new ButtonReplyRequest({});
+            if (data.session != null) {
+                message.session = Session.fromObject(data.session);
+            }
+            if (data.jid != null) {
+                message.jid = data.jid;
+            }
+            if (data.selectedDisplayText != null) {
+                message.selectedDisplayText = data.selectedDisplayText;
+            }
+            if (data.selectedButtonID != null) {
+                message.selectedButtonID = data.selectedButtonID;
+            }
+            if (data.replyTo != null) {
+                message.replyTo = data.replyTo;
+            }
+            return message;
+        }
+        toObject() {
+            const data: {
+                session?: ReturnType<typeof Session.prototype.toObject>;
+                jid?: string;
+                selectedDisplayText?: string;
+                selectedButtonID?: string;
+                replyTo?: string;
+            } = {};
+            if (this.session != null) {
+                data.session = this.session.toObject();
+            }
+            if (this.jid != null) {
+                data.jid = this.jid;
+            }
+            if (this.selectedDisplayText != null) {
+                data.selectedDisplayText = this.selectedDisplayText;
+            }
+            if (this.selectedButtonID != null) {
+                data.selectedButtonID = this.selectedButtonID;
+            }
+            if (this.replyTo != null) {
+                data.replyTo = this.replyTo;
+            }
+            return data;
+        }
+        serialize(): Uint8Array;
+        serialize(w: pb_1.BinaryWriter): void;
+        serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+            const writer = w || new pb_1.BinaryWriter();
+            if (this.has_session)
+                writer.writeMessage(1, this.session, () => this.session.serialize(writer));
+            if (this.jid.length)
+                writer.writeString(2, this.jid);
+            if (this.selectedDisplayText.length)
+                writer.writeString(3, this.selectedDisplayText);
+            if (this.selectedButtonID.length)
+                writer.writeString(4, this.selectedButtonID);
+            if (this.replyTo.length)
+                writer.writeString(5, this.replyTo);
+            if (!w)
+                return writer.getResultBuffer();
+        }
+        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): ButtonReplyRequest {
+            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new ButtonReplyRequest();
+            while (reader.nextField()) {
+                if (reader.isEndGroup())
+                    break;
+                switch (reader.getFieldNumber()) {
+                    case 1:
+                        reader.readMessage(message.session, () => message.session = Session.deserialize(reader));
+                        break;
+                    case 2:
+                        message.jid = reader.readString();
+                        break;
+                    case 3:
+                        message.selectedDisplayText = reader.readString();
+                        break;
+                    case 4:
+                        message.selectedButtonID = reader.readString();
+                        break;
+                    case 5:
+                        message.replyTo = reader.readString();
+                        break;
+                    default: reader.skipField();
+                }
+            }
+            return message;
+        }
+        serializeBinary(): Uint8Array {
+            return this.serialize();
+        }
+        static deserializeBinary(bytes: Uint8Array): ButtonReplyRequest {
+            return ButtonReplyRequest.deserialize(bytes);
+        }
+    }
     export class PresenceRequest extends pb_1.Message {
         #one_of_decls: number[][] = [];
         constructor(data?: any[] | {
@@ -3546,9 +3983,10 @@ export namespace messages {
             sender?: string;
             messageId?: string;
             type?: ReceiptType;
+            messageIds?: string[];
         }) {
             super();
-            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [6], this.#one_of_decls);
             if (!Array.isArray(data) && typeof data == "object") {
                 if ("session" in data && data.session != undefined) {
                     this.session = data.session;
@@ -3565,6 +4003,9 @@ export namespace messages {
                 if ("type" in data && data.type != undefined) {
                     this.type = data.type;
                 }
+                if ("messageIds" in data && data.messageIds != undefined) {
+                    this.messageIds = data.messageIds;
+                }
             }
         }
         get session() {
@@ -3600,12 +4041,19 @@ export namespace messages {
         set type(value: ReceiptType) {
             pb_1.Message.setField(this, 5, value);
         }
+        get messageIds() {
+            return pb_1.Message.getFieldWithDefault(this, 6, []) as string[];
+        }
+        set messageIds(value: string[]) {
+            pb_1.Message.setField(this, 6, value);
+        }
         static fromObject(data: {
             session?: ReturnType<typeof Session.prototype.toObject>;
             jid?: string;
             sender?: string;
             messageId?: string;
             type?: ReceiptType;
+            messageIds?: string[];
         }): MarkReadRequest {
             const message = new MarkReadRequest({});
             if (data.session != null) {
@@ -3623,6 +4071,9 @@ export namespace messages {
             if (data.type != null) {
                 message.type = data.type;
             }
+            if (data.messageIds != null) {
+                message.messageIds = data.messageIds;
+            }
             return message;
         }
         toObject() {
@@ -3632,6 +4083,7 @@ export namespace messages {
                 sender?: string;
                 messageId?: string;
                 type?: ReceiptType;
+                messageIds?: string[];
             } = {};
             if (this.session != null) {
                 data.session = this.session.toObject();
@@ -3648,6 +4100,9 @@ export namespace messages {
             if (this.type != null) {
                 data.type = this.type;
             }
+            if (this.messageIds != null) {
+                data.messageIds = this.messageIds;
+            }
             return data;
         }
         serialize(): Uint8Array;
@@ -3664,6 +4119,8 @@ export namespace messages {
                 writer.writeString(4, this.messageId);
             if (this.type != ReceiptType.READ)
                 writer.writeEnum(5, this.type);
+            if (this.messageIds.length)
+                writer.writeRepeatedString(6, this.messageIds);
             if (!w)
                 return writer.getResultBuffer();
         }
@@ -3688,6 +4145,9 @@ export namespace messages {
                     case 5:
                         message.type = reader.readEnum();
                         break;
+                    case 6:
+                        pb_1.Message.addToRepeatedField(message, 6, reader.readString());
+                        break;
                     default: reader.skipField();
                 }
             }
@@ -3980,9 +4440,10 @@ export namespace messages {
             jid?: string;
             sender?: string;
             messageId?: string;
+            participants?: string[];
         }) {
             super();
-            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [5], this.#one_of_decls);
             if (!Array.isArray(data) && typeof data == "object") {
                 if ("session" in data && data.session != undefined) {
                     this.session = data.session;
@@ -3996,6 +4457,9 @@ export namespace messages {
                 if ("messageId" in data && data.messageId != undefined) {
                     this.messageId = data.messageId;
                 }
+                if ("participants" in data && data.participants != undefined) {
+                    this.participants = data.participants;
+                }
             }
         }
         get session() {
@@ -4025,11 +4489,18 @@ export namespace messages {
         set messageId(value: string) {
             pb_1.Message.setField(this, 4, value);
         }
+        get participants() {
+            return pb_1.Message.getFieldWithDefault(this, 5, []) as string[];
+        }
+        set participants(value: string[]) {
+            pb_1.Message.setField(this, 5, value);
+        }
         static fromObject(data: {
             session?: ReturnType<typeof Session.prototype.toObject>;
             jid?: string;
             sender?: string;
             messageId?: string;
+            participants?: string[];
         }): RevokeMessageRequest {
             const message = new RevokeMessageRequest({});
             if (data.session != null) {
@@ -4044,6 +4515,9 @@ export namespace messages {
             if (data.messageId != null) {
                 message.messageId = data.messageId;
             }
+            if (data.participants != null) {
+                message.participants = data.participants;
+            }
             return message;
         }
         toObject() {
@@ -4052,6 +4526,7 @@ export namespace messages {
                 jid?: string;
                 sender?: string;
                 messageId?: string;
+                participants?: string[];
             } = {};
             if (this.session != null) {
                 data.session = this.session.toObject();
@@ -4065,6 +4540,9 @@ export namespace messages {
             if (this.messageId != null) {
                 data.messageId = this.messageId;
             }
+            if (this.participants != null) {
+                data.participants = this.participants;
+            }
             return data;
         }
         serialize(): Uint8Array;
@@ -4079,6 +4557,8 @@ export namespace messages {
                 writer.writeString(3, this.sender);
             if (this.messageId.length)
                 writer.writeString(4, this.messageId);
+            if (this.participants.length)
+                writer.writeRepeatedString(5, this.participants);
             if (!w)
                 return writer.getResultBuffer();
         }
@@ -4100,6 +4580,9 @@ export namespace messages {
                     case 4:
                         message.messageId = reader.readString();
                         break;
+                    case 5:
+                        pb_1.Message.addToRepeatedField(message, 5, reader.readString());
+                        break;
                     default: reader.skipField();
                 }
             }
@@ -6474,6 +6957,7 @@ export namespace messages {
             timestampGte?: OptionalUInt64;
             timestampLte?: OptionalUInt64;
             fromMe?: OptionalBool;
+            status?: OptionalUInt32;
         }) {
             super();
             pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
@@ -6490,6 +6974,9 @@ export namespace messages {
                 if ("fromMe" in data && data.fromMe != undefined) {
                     this.fromMe = data.fromMe;
                 }
+                if ("status" in data && data.status != undefined) {
+                    this.status = data.status;
+                }
             }
         }
         get jid() {
@@ -6528,11 +7015,21 @@ export namespace messages {
         get has_fromMe() {
             return pb_1.Message.getField(this, 4) != null;
         }
+        get status() {
+            return pb_1.Message.getWrapperField(this, OptionalUInt32, 5) as OptionalUInt32;
+        }
+        set status(value: OptionalUInt32) {
+            pb_1.Message.setWrapperField(this, 5, value);
+        }
+        get has_status() {
+            return pb_1.Message.getField(this, 5) != null;
+        }
         static fromObject(data: {
             jid?: ReturnType<typeof OptionalString.prototype.toObject>;
             timestampGte?: ReturnType<typeof OptionalUInt64.prototype.toObject>;
             timestampLte?: ReturnType<typeof OptionalUInt64.prototype.toObject>;
             fromMe?: ReturnType<typeof OptionalBool.prototype.toObject>;
+            status?: ReturnType<typeof OptionalUInt32.prototype.toObject>;
         }): MessageFilters {
             const message = new MessageFilters({});
             if (data.jid != null) {
@@ -6547,6 +7044,9 @@ export namespace messages {
             if (data.fromMe != null) {
                 message.fromMe = OptionalBool.fromObject(data.fromMe);
             }
+            if (data.status != null) {
+                message.status = OptionalUInt32.fromObject(data.status);
+            }
             return message;
         }
         toObject() {
@@ -6555,6 +7055,7 @@ export namespace messages {
                 timestampGte?: ReturnType<typeof OptionalUInt64.prototype.toObject>;
                 timestampLte?: ReturnType<typeof OptionalUInt64.prototype.toObject>;
                 fromMe?: ReturnType<typeof OptionalBool.prototype.toObject>;
+                status?: ReturnType<typeof OptionalUInt32.prototype.toObject>;
             } = {};
             if (this.jid != null) {
                 data.jid = this.jid.toObject();
@@ -6568,6 +7069,9 @@ export namespace messages {
             if (this.fromMe != null) {
                 data.fromMe = this.fromMe.toObject();
             }
+            if (this.status != null) {
+                data.status = this.status.toObject();
+            }
             return data;
         }
         serialize(): Uint8Array;
@@ -6582,6 +7086,8 @@ export namespace messages {
                 writer.writeMessage(3, this.timestampLte, () => this.timestampLte.serialize(writer));
             if (this.has_fromMe)
                 writer.writeMessage(4, this.fromMe, () => this.fromMe.serialize(writer));
+            if (this.has_status)
+                writer.writeMessage(5, this.status, () => this.status.serialize(writer));
             if (!w)
                 return writer.getResultBuffer();
         }
@@ -6603,6 +7109,9 @@ export namespace messages {
                     case 4:
                         reader.readMessage(message.fromMe, () => message.fromMe = OptionalBool.deserialize(reader));
                         break;
+                    case 5:
+                        reader.readMessage(message.status, () => message.status = OptionalUInt32.deserialize(reader));
+                        break;
                     default: reader.skipField();
                 }
             }
@@ -7282,6 +7791,15 @@ export namespace messages {
                 responseSerialize: (message: CheckPhonesResponse) => Buffer.from(message.serialize()),
                 responseDeserialize: (bytes: Buffer) => CheckPhonesResponse.deserialize(new Uint8Array(bytes))
             },
+            GenerateNewMessageID: {
+                path: "/messages.MessageService/GenerateNewMessageID",
+                requestStream: false,
+                responseStream: false,
+                requestSerialize: (message: Session) => Buffer.from(message.serialize()),
+                requestDeserialize: (bytes: Buffer) => Session.deserialize(new Uint8Array(bytes)),
+                responseSerialize: (message: NewMessageIDResponse) => Buffer.from(message.serialize()),
+                responseDeserialize: (bytes: Buffer) => NewMessageIDResponse.deserialize(new Uint8Array(bytes))
+            },
             SendMessage: {
                 path: "/messages.MessageService/SendMessage",
                 requestStream: false,
@@ -7327,6 +7845,15 @@ export namespace messages {
                 responseSerialize: (message: MessageResponse) => Buffer.from(message.serialize()),
                 responseDeserialize: (bytes: Buffer) => MessageResponse.deserialize(new Uint8Array(bytes))
             },
+            SendButtonReply: {
+                path: "/messages.MessageService/SendButtonReply",
+                requestStream: false,
+                responseStream: false,
+                requestSerialize: (message: ButtonReplyRequest) => Buffer.from(message.serialize()),
+                requestDeserialize: (bytes: Buffer) => ButtonReplyRequest.deserialize(new Uint8Array(bytes)),
+                responseSerialize: (message: MessageResponse) => Buffer.from(message.serialize()),
+                responseDeserialize: (bytes: Buffer) => MessageResponse.deserialize(new Uint8Array(bytes))
+            },
             GetSubscribedNewsletters: {
                 path: "/messages.MessageService/GetSubscribedNewsletters",
                 requestStream: false,
@@ -7483,11 +8010,13 @@ export namespace messages {
         abstract SendChatPresence(call: grpc_1.ServerUnaryCall<ChatPresenceRequest, Empty>, callback: grpc_1.sendUnaryData<Empty>): void;
         abstract SubscribePresence(call: grpc_1.ServerUnaryCall<SubscribePresenceRequest, Empty>, callback: grpc_1.sendUnaryData<Empty>): void;
         abstract CheckPhones(call: grpc_1.ServerUnaryCall<CheckPhonesRequest, CheckPhonesResponse>, callback: grpc_1.sendUnaryData<CheckPhonesResponse>): void;
+        abstract GenerateNewMessageID(call: grpc_1.ServerUnaryCall<Session, NewMessageIDResponse>, callback: grpc_1.sendUnaryData<NewMessageIDResponse>): void;
         abstract SendMessage(call: grpc_1.ServerUnaryCall<MessageRequest, MessageResponse>, callback: grpc_1.sendUnaryData<MessageResponse>): void;
         abstract SendReaction(call: grpc_1.ServerUnaryCall<MessageReaction, MessageResponse>, callback: grpc_1.sendUnaryData<MessageResponse>): void;
         abstract MarkRead(call: grpc_1.ServerUnaryCall<MarkReadRequest, Empty>, callback: grpc_1.sendUnaryData<Empty>): void;
         abstract EditMessage(call: grpc_1.ServerUnaryCall<EditMessageRequest, MessageResponse>, callback: grpc_1.sendUnaryData<MessageResponse>): void;
         abstract RevokeMessage(call: grpc_1.ServerUnaryCall<RevokeMessageRequest, MessageResponse>, callback: grpc_1.sendUnaryData<MessageResponse>): void;
+        abstract SendButtonReply(call: grpc_1.ServerUnaryCall<ButtonReplyRequest, MessageResponse>, callback: grpc_1.sendUnaryData<MessageResponse>): void;
         abstract GetSubscribedNewsletters(call: grpc_1.ServerUnaryCall<NewsletterListRequest, NewsletterList>, callback: grpc_1.sendUnaryData<NewsletterList>): void;
         abstract GetNewsletterInfo(call: grpc_1.ServerUnaryCall<NewsletterInfoRequest, Newsletter>, callback: grpc_1.sendUnaryData<Newsletter>): void;
         abstract GetNewsletterMessagesByInvite(call: grpc_1.ServerUnaryCall<GetNewsletterMessagesByInviteRequest, Json>, callback: grpc_1.sendUnaryData<Json>): void;
@@ -7591,6 +8120,9 @@ export namespace messages {
         CheckPhones: GrpcUnaryServiceInterface<CheckPhonesRequest, CheckPhonesResponse> = (message: CheckPhonesRequest, metadata: grpc_1.Metadata | grpc_1.CallOptions | grpc_1.requestCallback<CheckPhonesResponse>, options?: grpc_1.CallOptions | grpc_1.requestCallback<CheckPhonesResponse>, callback?: grpc_1.requestCallback<CheckPhonesResponse>): grpc_1.ClientUnaryCall => {
             return super.CheckPhones(message, metadata, options, callback);
         };
+        GenerateNewMessageID: GrpcUnaryServiceInterface<Session, NewMessageIDResponse> = (message: Session, metadata: grpc_1.Metadata | grpc_1.CallOptions | grpc_1.requestCallback<NewMessageIDResponse>, options?: grpc_1.CallOptions | grpc_1.requestCallback<NewMessageIDResponse>, callback?: grpc_1.requestCallback<NewMessageIDResponse>): grpc_1.ClientUnaryCall => {
+            return super.GenerateNewMessageID(message, metadata, options, callback);
+        };
         SendMessage: GrpcUnaryServiceInterface<MessageRequest, MessageResponse> = (message: MessageRequest, metadata: grpc_1.Metadata | grpc_1.CallOptions | grpc_1.requestCallback<MessageResponse>, options?: grpc_1.CallOptions | grpc_1.requestCallback<MessageResponse>, callback?: grpc_1.requestCallback<MessageResponse>): grpc_1.ClientUnaryCall => {
             return super.SendMessage(message, metadata, options, callback);
         };
@@ -7606,6 +8138,9 @@ export namespace messages {
         RevokeMessage: GrpcUnaryServiceInterface<RevokeMessageRequest, MessageResponse> = (message: RevokeMessageRequest, metadata: grpc_1.Metadata | grpc_1.CallOptions | grpc_1.requestCallback<MessageResponse>, options?: grpc_1.CallOptions | grpc_1.requestCallback<MessageResponse>, callback?: grpc_1.requestCallback<MessageResponse>): grpc_1.ClientUnaryCall => {
             return super.RevokeMessage(message, metadata, options, callback);
         };
+        SendButtonReply: GrpcUnaryServiceInterface<ButtonReplyRequest, MessageResponse> = (message: ButtonReplyRequest, metadata: grpc_1.Metadata | grpc_1.CallOptions | grpc_1.requestCallback<MessageResponse>, options?: grpc_1.CallOptions | grpc_1.requestCallback<MessageResponse>, callback?: grpc_1.requestCallback<MessageResponse>): grpc_1.ClientUnaryCall => {
+            return super.SendButtonReply(message, metadata, options, callback);
+        };
         GetSubscribedNewsletters: GrpcUnaryServiceInterface<NewsletterListRequest, NewsletterList> = (message: NewsletterListRequest, metadata: grpc_1.Metadata | grpc_1.CallOptions | grpc_1.requestCallback<NewsletterList>, options?: grpc_1.CallOptions | grpc_1.requestCallback<NewsletterList>, callback?: grpc_1.requestCallback<NewsletterList>): grpc_1.ClientUnaryCall => {
             return super.GetSubscribedNewsletters(message, metadata, options, callback);
         };

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

@@ -4,6 +4,17 @@
 var grpc = require('@grpc/grpc-js');
 var gows_pb = require('./gows_pb.js');
 
+function serialize_messages_ButtonReplyRequest(arg) {
+  if (!(arg instanceof gows_pb.ButtonReplyRequest)) {
+    throw new Error('Expected argument of type messages.ButtonReplyRequest');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_messages_ButtonReplyRequest(buffer_arg) {
+  return gows_pb.ButtonReplyRequest.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');
@@ -279,6 +290,17 @@ function deserialize_messages_MessageResponse(buffer_arg) {
   return gows_pb.MessageResponse.deserializeBinary(new Uint8Array(buffer_arg));
 }
 
+function serialize_messages_NewMessageIDResponse(arg) {
+  if (!(arg instanceof gows_pb.NewMessageIDResponse)) {
+    throw new Error('Expected argument of type messages.NewMessageIDResponse');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_messages_NewMessageIDResponse(buffer_arg) {
+  return gows_pb.NewMessageIDResponse.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
 function serialize_messages_Newsletter(arg) {
   if (!(arg instanceof gows_pb.Newsletter)) {
     throw new Error('Expected argument of type messages.Newsletter');
@@ -899,7 +921,18 @@ getProfilePicture: {
   //
 // Message
 //
-sendMessage: {
+generateNewMessageID: {
+    path: '/messages.MessageService/GenerateNewMessageID',
+    requestStream: false,
+    responseStream: false,
+    requestType: gows_pb.Session,
+    responseType: gows_pb.NewMessageIDResponse,
+    requestSerialize: serialize_messages_Session,
+    requestDeserialize: deserialize_messages_Session,
+    responseSerialize: serialize_messages_NewMessageIDResponse,
+    responseDeserialize: deserialize_messages_NewMessageIDResponse,
+  },
+  sendMessage: {
     path: '/messages.MessageService/SendMessage',
     requestStream: false,
     responseStream: false,
@@ -954,6 +987,17 @@ sendMessage: {
     responseSerialize: serialize_messages_MessageResponse,
     responseDeserialize: deserialize_messages_MessageResponse,
   },
+  sendButtonReply: {
+    path: '/messages.MessageService/SendButtonReply',
+    requestStream: false,
+    responseStream: false,
+    requestType: gows_pb.ButtonReplyRequest,
+    responseType: gows_pb.MessageResponse,
+    requestSerialize: serialize_messages_ButtonReplyRequest,
+    requestDeserialize: deserialize_messages_ButtonReplyRequest,
+    responseSerialize: serialize_messages_MessageResponse,
+    responseDeserialize: deserialize_messages_MessageResponse,
+  },
   //
 // Newsletters
 //

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

@@ -1,9 +1,12 @@
 import {
+  aggregateMessageKeysNotFromMe,
+  getContentType,
   getUrlFromDirectPath,
   isJidGroup,
-  isJidStatusBroadcast,
   jidNormalizedUser,
+  normalizeMessageContent,
 } from '@adiwajshing/baileys';
+import { isJidBroadcast } from '@adiwajshing/baileys/lib/WABinary/jid-utils';
 import * as grpc from '@grpc/grpc-js';
 import { connectivityState } from '@grpc/grpc-js';
 import { UnprocessableEntityException } from '@nestjs/common';
@@ -29,11 +32,7 @@ import {
   statusToAck,
 } from '@waha/core/engines/gows/helpers';
 import { GowsAuthFactoryCore } from '@waha/core/engines/gows/store/GowsAuthFactoryCore';
-import {
-  parseMessageIdSerialized,
-  toCusFormat,
-  toJID,
-} from '@waha/core/engines/noweb/session.noweb.core';
+import { toCusFormat } from '@waha/core/engines/noweb/session.noweb.core';
 import { extractMediaContent } from '@waha/core/engines/noweb/utils';
 import {
   AvailableInPlusVersion,
@@ -41,6 +40,9 @@ import {
 } from '@waha/core/exceptions';
 import { IMediaEngineProcessor } from '@waha/core/media/IMediaEngineProcessor';
 import { QR } from '@waha/core/QR';
+import { ExtractMessageKeysForRead } from '@waha/core/utils/convertors';
+import { parseMessageIdSerialized } from '@waha/core/utils/ids';
+import { toJID } from '@waha/core/utils/jids';
 import {
   Channel,
   ChannelListResult,
@@ -58,6 +60,8 @@ import {
   GetChatMessageQuery,
   GetChatMessagesFilter,
   GetChatMessagesQuery,
+  ReadChatMessagesQuery,
+  ReadChatMessagesResponse,
 } from '@waha/structures/chats.dto';
 import {
   ChatRequest,
@@ -66,6 +70,7 @@ import {
   MessageFileRequest,
   MessageForwardRequest,
   MessageImageRequest,
+  MessageLinkCustomPreviewRequest,
   MessageLocationRequest,
   MessageReactionRequest,
   MessageReplyRequest,
@@ -90,6 +95,7 @@ import {
   ParticipantsRequest,
   SettingsSecurityChangeInfo,
 } from '@waha/structures/groups.dto';
+import { ReplyToMessage } from '@waha/structures/message.dto';
 import { PaginationParams, SortOrder } from '@waha/structures/pagination.dto';
 import {
   WAHAChatPresences,
@@ -104,7 +110,6 @@ import { MeInfo, ProxyConfig } from '@waha/structures/sessions.dto';
 import {
   BROADCAST_ID,
   DeleteStatusRequest,
-  StatusRequest,
   TextStatus,
 } from '@waha/structures/status.dto';
 import { EnginePayload, WAMessageAckBody } from '@waha/structures/webhooks.dto';
@@ -113,9 +118,7 @@ import { sleep, waitUntil } from '@waha/utils/promiseTimeout';
 import { onlyEvent } from '@waha/utils/reactive/ops/onlyEvent';
 import * as NodeCache from 'node-cache';
 import {
-  debounceTime,
   filter,
-  groupBy,
   merge,
   mergeMap,
   Observable,
@@ -127,7 +130,10 @@ import { map } from 'rxjs/operators';
 import { promisify } from 'util';
 
 import * as gows from './types';
+import { MessageStatus } from './types';
 import MessageServiceClient = messages.MessageServiceClient;
+import { AckToStatus } from '@waha/core/utils/acks';
+import { DistinctAck } from '@waha/core/utils/reactive';
 
 enum WhatsMeowEvent {
   CONNECTED = 'gows.ConnectedEventData',
@@ -344,10 +350,18 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
 
     let [messagesFromMe$, messagesFromOthers$] = partition(messages$, isMine);
     messagesFromMe$ = messagesFromMe$.pipe(
+      map((msg) => {
+        msg.Status = MessageStatus.ServerAck;
+        return msg;
+      }),
       mergeMap((msg) => this.processIncomingMessage(msg, true)),
       share(), // share it so we don't process twice in message.any
     );
     messagesFromOthers$ = messagesFromOthers$.pipe(
+      map((msg) => {
+        msg.Status = MessageStatus.DeliveryAck;
+        return msg;
+      }),
       mergeMap((msg) => this.processIncomingMessage(msg, true)),
       share(), // share it so we don't process twice in message.any
     );
@@ -358,14 +372,7 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     const receipt$ = all$.pipe(onlyEvent(WhatsMeowEvent.RECEIPT));
     const messageAck$ = receipt$.pipe(
       mergeMap(this.receiptToMessageAck.bind(this)),
-      // Create a composite key for deduplication
-      groupBy((message) => `${message.id}-${message.ack}`),
-      mergeMap((group$) =>
-        group$.pipe(
-          debounceTime(1000), // Wait 1 second for deduplication
-          map((message) => message), // Pass the latest message after debounce
-        ),
-      ),
+      DistinctAck(),
     );
     this.events2.get(WAHAEvents.MESSAGE_ACK).switch(messageAck$);
 
@@ -537,6 +544,14 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
   /**
    * Other methods
    */
+  async generateNewMessageId(): Promise<string> {
+    const response = await promisify(this.client.GenerateNewMessageID)(
+      this.session,
+    );
+    const data = response.toObject();
+    return data.id;
+  }
+
   async sendText(request: MessageTextRequest) {
     const jid = toJID(this.ensureSuffix(request.chatId));
     const message = new messages.MessageRequest({
@@ -586,19 +601,19 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     return this.messageResponse(jid, data);
   }
 
-  protected checkStatusRequest(request: StatusRequest) {
-    if (request.contacts && request.contacts?.length > 0) {
-      const msg =
-        "GOWS doesn't accept 'contacts'. Remove the field to send status to all contacts.";
-      throw new UnprocessableEntityException(msg);
+  protected async prepareJidsForStatus(contacts: string[]) {
+    if (!contacts || contacts.length == 0) {
+      return [];
     }
+    return contacts.map(toJID);
   }
 
   public async sendTextStatus(status: TextStatus) {
-    this.checkStatusRequest(status);
-
+    const participants = await this.prepareJidsForStatus(status.contacts);
     const message = new messages.MessageRequest({
+      id: status.id,
       jid: Jid.BROADCAST,
+      participants: participants,
       text: status.text,
       session: this.session,
       backgroundColor: new messages.OptionalString({
@@ -616,13 +631,14 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
   }
 
   public async deleteStatus(request: DeleteStatusRequest) {
-    this.checkStatusRequest(request);
+    const participants = await this.prepareJidsForStatus(request.contacts);
     const key = parseMessageIdSerialized(request.id, true);
     const message = new messages.RevokeMessageRequest({
       session: this.session,
       jid: BROADCAST_ID,
       sender: '',
       messageId: key.id,
+      participants: participants,
     });
     const response = await promisify(this.client.RevokeMessage)(message);
     const data = response.toObject();
@@ -630,11 +646,11 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
   }
 
   protected messageResponse(jid, data) {
-    const message = parseJson(data.message);
+    const message = data.message ? parseJson(data.message) : null;
     const id = buildMessageId({
       ID: data.id,
       IsFromMe: true,
-      IsGroup: isJidGroup(jid) || isJidStatusBroadcast(jid),
+      IsGroup: isJidGroup(jid) || isJidBroadcast(jid),
       Chat: jid,
       Sender: this.me.id,
     });
@@ -680,20 +696,35 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     throw new AvailableInPlusVersion();
   }
 
+  sendLinkCustomPreview(
+    request: MessageLinkCustomPreviewRequest,
+  ): Promise<any> {
+    throw new AvailableInPlusVersion();
+  }
+
   reply(request: MessageReplyRequest) {
     throw new Error('Method not implemented.');
   }
 
   async sendSeen(request: SendSeenRequest) {
-    const key = parseMessageIdSerialized(request.messageId);
-    const req = new messages.MarkReadRequest({
-      session: this.session,
-      jid: key.remoteJid,
-      messageId: key.id,
-      sender: key.fromMe ? this.me.id : key.participant,
-    });
-    const response = await promisify(this.client.MarkRead)(req);
-    response.toObject();
+    const keys = ExtractMessageKeysForRead(request);
+    if (keys.length === 0) {
+      return;
+    }
+    const receipts = aggregateMessageKeysNotFromMe(keys);
+    for (const receipt of receipts) {
+      if (receipt.messageIds.length === 0) {
+        return;
+      }
+      const req = new messages.MarkReadRequest({
+        session: this.session,
+        jid: receipt.jid,
+        messageIds: receipt.messageIds,
+        sender: receipt.participant,
+      });
+      const response = await promisify(this.client.MarkRead)(req);
+      response.toObject();
+    }
     return;
   }
 
@@ -908,7 +939,7 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
       jid: key.remoteJid,
       messageId: key.id,
       reaction: request.reaction,
-      sender: key.fromMe ? this.me.id : key.participant,
+      sender: key.fromMe ? this.me.id : key.participant || key.remoteJid,
     });
     const response = await promisify(this.client.SendReaction)(message);
     const data = response.toObject();
@@ -1190,7 +1221,7 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
       session: this.session,
       id: jid,
     });
-    const response = await promisify(this.client.GetContact)(request);
+    const response = await promisify(this.client.GetContactById)(request);
     const data = parseJson(response);
     return this.toWAContact(data);
   }
@@ -1304,6 +1335,8 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
       });
     }
 
+    const status =
+      filter['filter.ack'] != null ? AckToStatus(filter['filter.ack']) : null;
     const request = new messages.GetMessagesRequest({
       session: this.session,
       filters: new messages.MessageFilters({
@@ -1317,6 +1350,7 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
           messages.OptionalUInt64,
         ),
         fromMe: optional(filter['filter.fromMe'], messages.OptionalBool),
+        status: optional(status, messages.OptionalUInt32),
       }),
       pagination: new messages.Pagination({
         limit: query.limit,
@@ -1334,6 +1368,13 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     return result;
   }
 
+  public readChatMessages(
+    chatId: string,
+    request: ReadChatMessagesQuery,
+  ): Promise<ReadChatMessagesResponse> {
+    return this.readChatMessagesWSImpl(chatId, request);
+  }
+
   public async getChatMessage(
     chatId: string,
     messageId: string,
@@ -1363,8 +1404,13 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     if (message.Message.pollUpdateMessage) return;
     // Ignore protocol messages
     if (message.Message.protocolMessage) return;
-    // Ignore key distribution messages
-    if (message.Message.senderKeyDistributionMessage) return;
+
+    const normalizedContent = normalizeMessageContent(message.Message);
+    const hasSomeContent = !!getContentType(normalizedContent);
+    if (!hasSomeContent) {
+      // Ignore key distribution messages
+      if (message?.Message?.senderKeyDistributionMessage) return;
+    }
 
     if (downloadMedia) {
       try {
@@ -1386,12 +1432,12 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     const fromToParticipant = getFromToParticipant(message);
     const id = buildMessageId(message);
     const body = this.extractBody(message.Message);
-    const replyTo = null; // TODO: this.extractReplyTo(message.message);
-    let ack;
-    if (message.Status) {
-      ack = statusToAck(message.Status);
-    } else {
-      ack = message.Info.IsFromMe ? WAMessageAck.SERVER : WAMessageAck.DEVICE;
+    const replyTo = this.extractReplyTo(message.Message);
+    let ack = statusToAck(message.Status);
+    if (ack === WAMessageAck.ERROR) {
+      // GOWS error because of how golang treats it as null
+      // It'll be UNKNOWN instead of ERROR
+      ack = null;
     }
     const mediaContent = extractMediaContent(message.Message);
     const source = this.getSourceDeviceByMsg(message);
@@ -1444,6 +1490,25 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     return body;
   }
 
+  protected extractReplyTo(message): ReplyToMessage | null {
+    const msgType = getContentType(message);
+    const contextInfo = message[msgType]?.contextInfo;
+    if (!contextInfo) {
+      return null;
+    }
+    const quotedMessage = contextInfo.quotedMessage;
+    if (!quotedMessage) {
+      return null;
+    }
+    const body = this.extractBody(quotedMessage);
+    return {
+      id: contextInfo.stanzaID,
+      participant: toCusFormat(contextInfo.participant),
+      body: body,
+      _data: quotedMessage,
+    };
+  }
+
   public async getEngineInfo() {
     const clientState = this.client?.getChannel().getConnectivityState(false);
     const streamState = this.stream$?.client

src/core/engines/noweb/PresenceProxy.ts

@@ -0,0 +1,51 @@
+import * as NodeCache from 'node-cache';
+
+export class PresenceProxy {
+  private cache: NodeCache;
+
+  public proxy: Record<string, any>;
+
+  constructor() {
+    this.cache = new NodeCache({
+      stdTTL: 60, // 1 minute
+      checkperiod: 60, // 1 minute
+      useClones: false,
+    });
+
+    this.proxy = new Proxy(
+      {},
+      {
+        get: (_, prop: string) => {
+          return this.cache.get(prop);
+        },
+
+        set: (_, prop: string, value) => {
+          this.cache.set(prop, value);
+          return true;
+        },
+
+        deleteProperty: (_, prop: string) => {
+          return this.cache.del(prop) > 0;
+        },
+
+        has: (_, prop: string) => {
+          return this.cache.has(prop);
+        },
+
+        ownKeys: () => {
+          return this.cache.keys();
+        },
+
+        getOwnPropertyDescriptor: (_, prop: string) => {
+          if (this.cache.has(prop)) {
+            return {
+              enumerable: true,
+              configurable: true,
+            };
+          }
+          return undefined;
+        },
+      },
+    );
+  }
+}

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

@@ -2,6 +2,7 @@ import makeWASocket, {
   Browsers,
   Chat,
   Contact,
+  decryptPollVote,
   DisconnectReason,
   downloadMediaMessage,
   extractMessageContent,
@@ -10,8 +11,6 @@ import makeWASocket, {
   getContentType,
   getKeyAuthor,
   isJidGroup,
-  isJidNewsletter,
-  isJidStatusBroadcast,
   isJidUser,
   isRealMessage,
   jidNormalizedUser,
@@ -38,14 +37,16 @@ import {
   LabelAssociationType,
 } from '@adiwajshing/baileys/lib/Types/LabelAssociation';
 import { MessageUserReceiptUpdate } from '@adiwajshing/baileys/lib/Types/Message';
-import { isLidUser } from '@adiwajshing/baileys/lib/WABinary/jid-utils';
-import { Logger as BaileysLogger } from '@adiwajshing/baileys/node_modules/pino';
+import { ILogger } from '@adiwajshing/baileys/lib/Utils/logger';
+import {
+  isJidBroadcast,
+  isLidUser,
+} from '@adiwajshing/baileys/lib/WABinary/jid-utils';
 import { UnprocessableEntityException } from '@nestjs/common';
 import {
   ensureSuffix,
   getChannelInviteLink,
   getPublicUrlFromDirectPath,
-  isNewsletter,
   WhatsappSession,
 } from '@waha/core/abc/session.abc';
 import {
@@ -65,6 +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';
@@ -85,6 +91,8 @@ import {
   GetChatMessagesFilter,
   GetChatMessagesQuery,
   PinDuration,
+  ReadChatMessagesQuery,
+  ReadChatMessagesResponse,
 } from '@waha/structures/chats.dto';
 import { SendButtonsRequest } from '@waha/structures/chatting.buttons.dto';
 import {
@@ -96,6 +104,7 @@ import {
   MessageFileRequest,
   MessageForwardRequest,
   MessageImageRequest,
+  MessageLinkCustomPreviewRequest,
   MessageLinkPreviewRequest,
   MessageLocationRequest,
   MessagePollRequest,
@@ -140,6 +149,7 @@ import { MeInfo } from '@waha/structures/sessions.dto';
 import {
   BROADCAST_ID,
   DeleteStatusRequest,
+  StatusRequest,
   TextStatus,
 } from '@waha/structures/status.dto';
 import {
@@ -154,6 +164,7 @@ import { sleep, waitUntil } from '@waha/utils/promiseTimeout';
 import { exclude } from '@waha/utils/reactive/ops/exclude';
 import { SingleDelayedJobRunner } from '@waha/utils/SingleDelayedJobRunner';
 import { SinglePeriodicJobRunner } from '@waha/utils/SinglePeriodicJobRunner';
+import { StatusTracker } from '@waha/utils/StatusTracker';
 import * as Buffer from 'buffer';
 import { Agent } from 'https';
 import * as lodash from 'lodash';
@@ -175,6 +186,8 @@ import { INowebStore } from './store/INowebStore';
 import { NowebPersistentStore } from './store/NowebPersistentStore';
 import { NowebStorageFactoryCore } from './store/NowebStorageFactoryCore';
 import { ensureNumber, extractMediaContent } from './utils';
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const promiseRetry = require('promise-retry');
 
 export const BaileysEvents = {
   CONNECTION_UPDATE: 'connection.update',
@@ -208,7 +221,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
   private autoRestartJob: SinglePeriodicJobRunner;
   private msgRetryCounterCache: NodeCache;
   private placeholderResendCache: NodeCache;
-  protected engineLogger: BaileysLogger;
+  protected engineLogger: ILogger;
 
   private authNOWEBStore: any;
 
@@ -216,6 +229,8 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
   store: INowebStore;
   private qr: QR;
 
+  private statusTracker = new StatusTracker();
+
   public constructor(config) {
     super(config);
     this.shouldRestart = true;
@@ -234,7 +249,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(
@@ -254,6 +269,15 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     this.authNOWEBStore = null;
   }
 
+  protected set status(value: WAHASessionStatus) {
+    this.statusTracker.track(value);
+    super.status = value;
+  }
+
+  public get status() {
+    return super.status;
+  }
+
   async start() {
     this.status = WAHASessionStatus.STARTING;
     await this.buildClient().catch((err) => {
@@ -374,6 +398,8 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     this.sock = await this.makeSocket();
 
     this.issueMessageUpdateOnEdits();
+    this.issueMessageUpdateOnPoll();
+    this.fixMessageUpsertStatus();
     this.issuePresenceUpdateOnMessageUpsert();
     if (this.isDebugEnabled()) {
       this.listenEngineEventsInDebugMode();
@@ -419,6 +445,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
       );
       return;
     }
+
     this.startDelayedJob.schedule(async () => {
       if (!this.shouldRestart) {
         this.logger.warn(
@@ -443,12 +470,36 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
         this.resubscribeToKnownPresences();
         return;
       } else if (connection === 'close') {
-        const shouldReconnect =
-          // @ts-ignore: Property output does not exist on type 'Error'
-          lastDisconnect.error?.output?.statusCode !==
-          DisconnectReason.loggedOut;
         this.qr.save('');
-        // reconnect if not logged out
+        const statusCode = lastDisconnect.error?.output?.statusCode;
+
+        // Restart required from the server
+        const restartRequired = statusCode === DisconnectReason.restartRequired;
+        if (restartRequired) {
+          this.restartClient();
+          return;
+        }
+
+        // Stuck in STARTING status
+        if (this.statusTracker.isStuckInStarting()) {
+          this.logger.error(
+            'Session stuck in STARTING status, force stopping the session.',
+          );
+          await this.failed();
+          return;
+        }
+
+        // Do not reconnect if the QR code has not been scanned yet
+        if (this.status == WAHASessionStatus.SCAN_QR_CODE) {
+          this.logger.warn(
+            'QR code has not been scanned yet, force stopping the session.',
+          );
+          await this.failed();
+          return;
+        }
+
+        // Reconnect if not logged out
+        const shouldReconnect = statusCode !== DisconnectReason.loggedOut;
         if (shouldReconnect) {
           if (lastDisconnect.error) {
             this.logger.info(
@@ -456,12 +507,14 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
             );
           }
           this.restartClient();
-        } else {
-          this.logger.error(
-            `Connection closed due to '${lastDisconnect.error}', do not reconnect the session.`,
-          );
-          await this.failed();
+          return;
         }
+
+        // Unknown error or logged out
+        this.logger.error(
+          `Connection closed due to '${lastDisconnect.error}', do not reconnect the session.`,
+        );
+        await this.failed();
       }
 
       // Save QR
@@ -516,6 +569,17 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     await this.store?.close();
   }
 
+  private fixMessageUpsertStatus() {
+    // 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 = AckToStatus(WAMessageAck.DEVICE);
+        }
+      }
+    });
+  }
+
   private issueMessageUpdateOnEdits() {
     // Remove it after it's been merged
     // https://github.com/WhiskeySockets/Baileys/pull/855/
@@ -542,6 +606,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
@@ -691,6 +816,10 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     };
   }
 
+  async generateNewMessageId(): Promise<string> {
+    return this.generateMessageID();
+  }
+
   async sendText(request: MessageTextRequest) {
     const chatId = toJID(this.ensureSuffix(request.chatId));
     const message = {
@@ -777,6 +906,12 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     throw new AvailableInPlusVersion();
   }
 
+  sendLinkCustomPreview(
+    request: MessageLinkCustomPreviewRequest,
+  ): Promise<any> {
+    throw new AvailableInPlusVersion();
+  }
+
   protected async uploadMedia(
     file: RemoteFile | BinaryFile,
     type,
@@ -839,16 +974,20 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
   }
 
   async sendSeen(request: SendSeenRequest) {
-    const key = parseMessageIdSerialized(request.messageId);
-    const participant = request.participant
-      ? toJID(this.ensureSuffix(request.participant))
-      : undefined;
-    const data = {
-      remoteJid: key.remoteJid,
-      id: key.id,
-      participant: participant,
-    };
-    return this.sock.readMessages([data]);
+    const keys = ExtractMessageKeysForRead(request);
+    if (keys.length === 0) {
+      return;
+    }
+
+    // Send read
+    await this.sock.readMessages(keys);
+
+    // Emit events for our reads
+    const updates = keys.map((key) => ({
+      key: key,
+      update: { status: AckToStatus(WAMessageAck.READ) },
+    }));
+    this.sock?.ev.emit('messages.update', updates);
   }
 
   async startTyping(request: ChatRequest) {
@@ -883,6 +1022,13 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     return result;
   }
 
+  public readChatMessages(
+    chatId: string,
+    request: ReadChatMessagesQuery,
+  ): Promise<ReadChatMessagesResponse> {
+    return this.readChatMessagesWSImpl(chatId, request);
+  }
+
   public async getChatMessage(
     chatId: string,
     messageId: string,
@@ -924,13 +1070,34 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
 
   async setReaction(request: MessageReactionRequest) {
     const key = parseMessageIdSerialized(request.messageId);
-    const reactionMessage = {
-      react: {
-        text: request.reaction,
-        key: key,
-      },
-    };
-    return this.sock.sendMessage(key.remoteJid, reactionMessage);
+    if (isJidNewsletter(key.remoteJid)) {
+      let serverId = Number(key.id);
+      if (!serverId) {
+        const msg = await this.store.getMessageById(key.remoteJid, key.id);
+        if (msg) {
+          // @ts-ignore
+          serverId = Number(msg.key.server_id);
+        }
+      }
+      if (!serverId) {
+        throw new UnprocessableEntityException(
+          `Unable to get server id for channel message '${key.id}'`,
+        );
+      }
+      return this.sock.newsletterReactMessage(
+        key.remoteJid,
+        serverId.toString(),
+        request.reaction,
+      );
+    } else {
+      const reactionMessage = {
+        react: {
+          text: request.reaction,
+          key: key,
+        },
+      };
+      return this.sock.sendMessage(key.remoteJid, reactionMessage);
+    }
   }
 
   async setStar(request: MessageStarRequest) {
@@ -1150,12 +1317,6 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
 
   public async fetchContactProfilePicture(id: string) {
     const contact = this.ensureSuffix(id);
-    if (isJidNewsletter(id)) {
-      return null;
-    }
-    if (isJidStatusBroadcast(id)) {
-      return null;
-    }
     try {
       const url = await this.sock.profilePictureUrl(contact, 'image');
       return url;
@@ -1314,7 +1475,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
   public async getPresence(chatId: string): Promise<WAHAChatPresences> {
     const remoteJid = toJID(chatId);
     if (!(remoteJid in this.store.presences)) {
-      this.store.presences[remoteJid] = [];
+      this.store.presences[remoteJid] = {};
       await this.sock.presenceSubscribe(remoteJid);
       await sleep(1000);
     }
@@ -1330,21 +1491,101 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
   /**
    * Status methods
    */
+  public async sendStatusMessage(
+    message: any,
+    options: any,
+    jids: string[],
+    batchSize?: number,
+  ) {
+    if (!batchSize || batchSize == 0) {
+      batchSize = 5_000;
+    }
+    const chunks = lodash.chunk(jids, batchSize);
+    if (chunks.length == 0) {
+      throw new UnprocessableEntityException('No participants to send status');
+    }
+
+    const logger = this.logger.child({
+      'message.id': options.messageId,
+      chunks: chunks.length,
+      size: batchSize,
+    });
+    logger.info(`Sending status message to ${jids.length} participants`);
+    let result = null;
+    for (const [index, participants] of chunks.entries()) {
+      const batchOptions = { ...options };
+      batchOptions.statusJidList = participants;
+      const r = await this.sendStatusMessageOneChunk(
+        message,
+        batchOptions,
+        logger,
+        index,
+      );
+      result = result || r;
+    }
+    logger.info(
+      `Sending status message to ${jids.length} participants - success`,
+    );
+    return result;
+  }
+
+  private async sendStatusMessageOneChunk(
+    message: any,
+    options: any,
+    logger: any,
+    index: number,
+  ) {
+    // https://github.com/IndigoUnited/node-promise-retry
+    const retryOptions = {
+      retries: 5,
+      minTimeout: 1000,
+      maxTimeout: 6000,
+    };
+    try {
+      const resp = await promiseRetry((retry, number) => {
+        return this.sock
+          .sendMessage(BROADCAST_ID, message, options)
+          .catch(retry);
+      }, retryOptions);
+      logger.info(`Sending status message (${index + 1} chunk) - success`);
+      return resp;
+    } catch (err) {
+      logger.error(`Sending status message (${index + 1} chunk - failed`);
+      logger.error(err, err.stack);
+      throw err;
+    }
+  }
+
   public async sendTextStatus(status: TextStatus) {
     const message = {
       text: status.text,
       linkPreview: this.getLinkPreview(status),
     };
     const jids = await this.prepareJidsForStatus(status.contacts);
-    const messageId = this.generateMessageID();
+    if (!status.id) {
+      this.upsertMeInJIDs(jids);
+    }
+    const messageId = this.prepareMessageIdForStatus(status);
     const options: MiscMessageGenerationOptions = {
       backgroundColor: status.backgroundColor,
       font: status.font,
-      statusJidList: jids,
       linkPreviewHighQuality: status.linkPreviewHighQuality,
       messageId: messageId,
     };
-    return await this.sock.sendMessage(BROADCAST_ID, message, options);
+    return await this.sendStatusMessage(
+      message,
+      options,
+      jids,
+      status.contacts?.length,
+    );
+  }
+
+  protected prepareMessageIdForStatus(status: StatusRequest) {
+    if (status.id) {
+      this.saveSentMessageId(status.id);
+      return status.id;
+    }
+    return this.generateMessageID();
   }
 
   protected async prepareJidsForStatus(contacts: string[]) {
@@ -1354,7 +1595,6 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     } else {
       jids = await this.fetchMyContactsJids();
     }
-    this.upsertMeInJIDs(jids);
     return jids;
   }
 
@@ -1370,12 +1610,18 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     key.fromMe = true;
     key.remoteJid = BROADCAST_ID;
     const jids = await this.prepareJidsForStatus(request.contacts);
+    this.upsertMeInJIDs(jids);
     const newMessageId = this.generateMessageID();
     const options = {
       statusJidList: jids,
       messageId: newMessageId,
     };
-    return await this.sock.sendMessage(BROADCAST_ID, { delete: key }, options);
+    return await this.sendStatusMessage(
+      { delete: key },
+      options,
+      jids,
+      request.contacts?.length,
+    );
   }
 
   protected upsertMeInJIDs(jids: string[]) {
@@ -1384,7 +1630,8 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     }
     const myJID = jidNormalizedUser(this.sock.authState.creds.me.id);
     if (!jids.includes(myJID)) {
-      jids.push(myJID);
+      // insert my jid first
+      jids.unshift(myJID);
     }
   }
 
@@ -1525,7 +1772,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
       // @ts-ignore
       filter(
         (message) =>
-          message.message.protocolMessage?.type ===
+          message.message?.protocolMessage?.type ===
           proto.Message.ProtocolMessage.Type.REVOKE,
       ),
       mergeMap(async (message): Promise<WAMessageRevokedBody> => {
@@ -1573,7 +1820,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$);
 
     //
@@ -1770,7 +2019,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     if (!message.message.reactionMessage) return null;
 
     const id = buildMessageId(message.key);
-    const fromToParticipant = getFromToParticipant(message);
+    const fromToParticipant = getFromToParticipant(message.key);
     const reactionMessage = message.message.reactionMessage;
     const messageId = buildMessageId(reactionMessage.key);
     const source = this.getMessageSource(message.key.id);
@@ -1802,16 +2051,23 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     if (message.message.call?.callKey) return;
     // Ignore revoke, we have a dedicated handler for that
     if (
-      message.message.protocolMessage?.type ===
+      message.message?.protocolMessage?.type ===
       proto.Message.ProtocolMessage.Type.REVOKE
     )
       return;
     if (
-      message.message.protocolMessage?.type ===
+      message.message?.protocolMessage?.type ===
       proto.Message.ProtocolMessage.Type.EPHEMERAL_SYNC_RESPONSE
     )
       return;
 
+    const normalizedContent = normalizeMessageContent(message.message);
+    const hasSomeContent = !!getContentType(normalizedContent);
+    if (!hasSomeContent) {
+      // Ignore key distribution messages
+      if (message?.message?.senderKeyDistributionMessage) return;
+    }
+
     if (downloadMedia) {
       try {
         message = await this.downloadMedia(message);
@@ -1832,11 +2088,11 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
   }
 
   protected toWAMessage(message): Promise<WAMessage> {
-    const fromToParticipant = getFromToParticipant(message);
+    const fromToParticipant = getFromToParticipant(message.key);
     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({
@@ -1908,6 +2164,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
       id: contextInfo.stanzaId,
       participant: toCusFormat(contextInfo.participant),
       body: body,
+      _data: quotedMessage,
     };
   }
 
@@ -1922,9 +2179,9 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
 
   protected convertMessageUpdateToMessageAck(event): WAMessageAckBody {
     const message = event;
-    const fromToParticipant = getFromToParticipant(message);
+    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),
@@ -1938,8 +2195,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
   }
 
   protected convertMessageReceiptUpdateToMessageAck(event): WAMessageAckBody {
-    const fromToParticipant = getFromToParticipant(event);
-    const id = buildMessageId(event.key);
+    const fromToParticipant = getFromToParticipant(event.key);
 
     const receipt = event.receipt;
     let ack;
@@ -1950,6 +2206,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),
@@ -1958,6 +2223,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
       fromMe: event.key.fromMe,
       ack: ack,
       ackName: WAMessageAck[ack] || ACK_UNKNOWN,
+      _data: event,
     };
     return body;
   }
@@ -2133,7 +2399,7 @@ function hasPath(url: string) {
 }
 
 export class NOWEBEngineMediaProcessor implements IMediaEngineProcessor<any> {
-  private readonly logger: BaileysLogger;
+  private readonly logger: ILogger;
 
   constructor(
     public session: WhatsappSessionNoWebCore,
@@ -2141,7 +2407,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 {
@@ -2202,13 +2468,13 @@ export function toCusFormat(remoteJid) {
   if (isJidGroup(remoteJid)) {
     return remoteJid;
   }
-  if (isJidStatusBroadcast(remoteJid)) {
+  if (isJidBroadcast(remoteJid)) {
     return remoteJid;
   }
   if (isLidUser(remoteJid)) {
     return remoteJid;
   }
-  if (isNewsletter(remoteJid)) {
+  if (isJidNewsletter(remoteJid)) {
     return remoteJid;
   }
   if (!remoteJid) {
@@ -2225,24 +2491,6 @@ export function toCusFormat(remoteJid) {
 
 export const ALL_JID = 'all@s.whatsapp.net';
 
-/**
- * Convert from 11111111111@c.us to 11111111111@s.whatsapp.net
- * @param chatId
- */
-export function toJID(chatId) {
-  if (isJidGroup(chatId)) {
-    return chatId;
-  }
-  if (isJidStatusBroadcast(chatId)) {
-    return chatId;
-  }
-  if (isNewsletter(chatId)) {
-    return chatId;
-  }
-  const number = chatId.split('@')[0];
-  return number + '@s.whatsapp.net';
-}
-
 /**
  * Build WAHA message id from engine one
  * {id: "AAA", remoteJid: "11111111111@s.whatsapp.net", "fromMe": false}
@@ -2257,38 +2505,6 @@ function buildMessageId({ id, remoteJid, fromMe, participant }: WAMessageKey) {
   return parts.join('_');
 }
 
-/**
- * Parse message id from WAHA to engine
- * false_11111111111@c.us_AAA
- * {id: "AAA", remoteJid: "11111111111@s.whatsapp.net", "fromMe": false}
- */
-export function parseMessageIdSerialized(
-  messageId: string,
-  soft: boolean = false,
-): WAMessageKey {
-  if (!messageId.includes('_') && soft) {
-    return { id: messageId };
-  }
-
-  const parts = messageId.split('_');
-  if (parts.length != 3 && parts.length != 4) {
-    throw new Error(
-      'Message id be in format false_11111111111@c.us_AAAAAAAAAAAAAAAAAAAA[_participant]',
-    );
-  }
-  const fromMe = parts[0] == 'true';
-  const chatId = parts[1];
-  const remoteJid = toJID(chatId);
-  const id = parts[2];
-  const participant = parts[3] ? toJID(parts[3]) : undefined;
-  return {
-    fromMe: fromMe,
-    id: id,
-    remoteJid: remoteJid,
-    participant: participant,
-  };
-}
-
 function getId(object) {
   return object.id;
 }
@@ -2305,15 +2521,15 @@ function isAckUpdateMessageEvent(event) {
   return event?.update.status != null;
 }
 
-function getFromToParticipant(message) {
-  const isGroupMessage = Boolean(message.key.participant);
+export function getFromToParticipant(key) {
+  const isGroupMessage = Boolean(key.participant);
   let participant: string;
   let to: string;
   if (isGroupMessage) {
-    participant = message.key.participant;
-    to = message.key.remoteJid;
+    participant = key.participant;
+    to = key.remoteJid;
   }
-  const from = message.key.remoteJid;
+  const from = key.remoteJid;
   return {
     from: from,
     to: to,

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/NowebInMemoryStore.ts

@@ -2,7 +2,6 @@ import makeWASocket, {
   Chat,
   Contact,
   GroupMetadata,
-  makeInMemoryStore,
   proto,
 } from '@adiwajshing/baileys';
 import { Label } from '@adiwajshing/baileys/lib/Types/Label';
@@ -12,6 +11,7 @@ import { PaginationParams } from '@waha/structures/pagination.dto';
 import { PaginatorInMemory } from '@waha/utils/Paginator';
 
 import { INowebStore } from './INowebStore';
+import makeInMemoryStore from './memory/make-in-memory-store';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const logger = require('pino')();
@@ -26,6 +26,10 @@ export class NowebInMemoryStore implements INowebStore {
 
   constructor() {
     this.store = makeInMemoryStore({ logger: logger });
+    const presences = {};
+    this.store.presences = presences;
+    // Adjust inline even handler
+    this.store.setPresences(presences);
   }
 
   init(): Promise<void> {

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

@@ -194,9 +194,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 +243,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 +350,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>[]) {
@@ -363,7 +384,12 @@ export class NowebPersistentStore implements INowebStore {
 
       if (update.imgUrl === 'changed') {
         contact.imgUrl = this.socket
-          ? await this.socket?.profilePictureUrl(contact.id)
+          ? await this.socket?.profilePictureUrl(contact.id).catch((error) => {
+              this.logger.warn(
+                `failed to get profile picture for contact '${contact.id}': ${error}`,
+              );
+              return undefined;
+            })
           : undefined;
       } else if (update.imgUrl === 'removed') {
         delete contact.imgUrl;

src/core/engines/noweb/store/memory/make-in-memory-store.ts

@@ -0,0 +1,564 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
+import type {
+  BaileysEventEmitter,
+  Chat,
+  ConnectionState,
+  Contact,
+  GroupMetadata,
+  PresenceData,
+  WAMessage,
+  WAMessageCursor,
+  WAMessageKey,
+} from '@adiwajshing/baileys/lib/Types';
+import { Label } from '@adiwajshing/baileys/lib/Types/Label';
+import {
+  LabelAssociation,
+  LabelAssociationType,
+  MessageLabelAssociation,
+} from '@adiwajshing/baileys/lib/Types/LabelAssociation';
+import {
+  md5,
+  toNumber,
+  updateMessageWithReaction,
+  updateMessageWithReceipt,
+} from '@adiwajshing/baileys/lib/Utils';
+import {
+  jidDecode,
+  jidNormalizedUser,
+} from '@adiwajshing/baileys/lib/WABinary';
+import { proto } from '@adiwajshing/baileys/WAProto';
+import type { Comparable } from '@adiwajshing/keyed-db/lib/Types';
+import type { Logger } from 'pino';
+
+import makeOrderedDictionary from './make-ordered-dictionary';
+import { ObjectRepository } from './object-repository';
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const KeyedDB = require('@adiwajshing/keyed-db').default;
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { writeFileSync } = require('fs');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { readFileSync, existsSync } = require('fs');
+
+type WASocket = ReturnType<any>;
+
+export const waChatKey = (pin: boolean) => ({
+  key: (c: Chat) =>
+    (pin ? (c.pinned ? '1' : '0') : '') +
+    (c.archived ? '0' : '1') +
+    (c.conversationTimestamp
+      ? c.conversationTimestamp.toString(16).padStart(8, '0')
+      : '') +
+    c.id,
+  compare: (k1: string, k2: string) => k2.localeCompare(k1),
+});
+
+export const waMessageID = (m: WAMessage) => m.key.id || '';
+
+export const waLabelAssociationKey: Comparable<LabelAssociation, string> = {
+  key: (la: LabelAssociation) =>
+    la.type === LabelAssociationType.Chat
+      ? la.chatId + la.labelId
+      : la.chatId + la.messageId + la.labelId,
+  compare: (k1: string, k2: string) => k2.localeCompare(k1),
+};
+
+export type BaileysInMemoryStoreConfig = {
+  chatKey?: Comparable<Chat, string>;
+  labelAssociationKey?: Comparable<LabelAssociation, string>;
+  logger: Logger;
+  socket?: WASocket;
+};
+
+const makeMessagesDictionary = () => makeOrderedDictionary(waMessageID);
+
+export default (config: BaileysInMemoryStoreConfig) => {
+  const socket = config.socket;
+  const chatKey = config.chatKey || waChatKey(true);
+  const labelAssociationKey =
+    config.labelAssociationKey || waLabelAssociationKey;
+  const logger: Logger = config.logger;
+
+  const chats = new KeyedDB(chatKey, (c) => c.id) as any;
+  const messages: { [_: string]: ReturnType<typeof makeMessagesDictionary> } =
+    {};
+  const contacts: { [_: string]: Contact } = {};
+  const groupMetadata: { [_: string]: GroupMetadata } = {};
+  let presences: { [id: string]: { [participant: string]: PresenceData } } = {};
+  const state: ConnectionState = { connection: 'close' };
+  const labels = new ObjectRepository<Label>();
+  const labelAssociations = new KeyedDB(
+    labelAssociationKey,
+    labelAssociationKey.key,
+  ) as any;
+
+  const assertMessageList = (jid: string) => {
+    if (!messages[jid]) {
+      messages[jid] = makeMessagesDictionary();
+    }
+
+    return messages[jid];
+  };
+
+  const contactsUpsert = (newContacts: Contact[]) => {
+    const oldContacts = new Set(Object.keys(contacts));
+    for (const contact of newContacts) {
+      oldContacts.delete(contact.id);
+      contacts[contact.id] = Object.assign(contacts[contact.id] || {}, contact);
+    }
+
+    return oldContacts;
+  };
+
+  const labelsUpsert = (newLabels: Label[]) => {
+    for (const label of newLabels) {
+      labels.upsertById(label.id, label);
+    }
+  };
+
+  /**
+   * binds to a BaileysEventEmitter.
+   * It listens to all events and constructs a state that you can query accurate data from.
+   * Eg. can use the store to fetch chats, contacts, messages etc.
+   * @param ev typically the event emitter from the socket connection
+   */
+  const bind = (ev: BaileysEventEmitter) => {
+    ev.on('connection.update', (update) => {
+      Object.assign(state, update);
+    });
+
+    ev.on(
+      'messaging-history.set',
+      ({
+        chats: newChats,
+        contacts: newContacts,
+        messages: newMessages,
+        isLatest,
+        syncType,
+      }) => {
+        if (syncType === proto.HistorySync.HistorySyncType.ON_DEMAND) {
+          return; // FOR NOW,
+          //TODO: HANDLE
+        }
+
+        if (isLatest) {
+          chats.clear();
+
+          for (const id in messages) {
+            delete messages[id];
+          }
+        }
+
+        const chatsAdded = chats.insertIfAbsent(...newChats).length;
+        logger.debug({ chatsAdded }, 'synced chats');
+
+        const oldContacts = contactsUpsert(newContacts);
+        if (isLatest) {
+          for (const jid of oldContacts) {
+            delete contacts[jid];
+          }
+        }
+
+        logger.debug(
+          { deletedContacts: isLatest ? oldContacts.size : 0, newContacts },
+          'synced contacts',
+        );
+
+        for (const msg of newMessages) {
+          const jid = msg.key.remoteJid!;
+          const list = assertMessageList(jid);
+          list.upsert(msg, 'prepend');
+        }
+
+        logger.debug({ messages: newMessages.length }, 'synced messages');
+      },
+    );
+
+    ev.on('contacts.upsert', (contacts) => {
+      contactsUpsert(contacts);
+    });
+
+    ev.on('contacts.update', async (updates) => {
+      for (const update of updates) {
+        let contact: Contact;
+        if (contacts[update.id!]) {
+          contact = contacts[update.id!];
+        } else {
+          const contactHashes = await Promise.all(
+            Object.keys(contacts).map(async (contactId) => {
+              const { user } = jidDecode(contactId)!;
+              return [
+                contactId,
+                (await md5(Buffer.from(user + 'WA_ADD_NOTIF', 'utf8')))
+                  .toString('base64')
+                  .slice(0, 3),
+              ];
+            }),
+          );
+          contact =
+            contacts[contactHashes.find(([, b]) => b === update.id)?.[0] || '']; // find contact by attrs.hash, when user is not saved as a contact
+        }
+
+        if (contact) {
+          if (update.imgUrl === 'changed') {
+            contact.imgUrl = socket
+              ? await socket?.profilePictureUrl(contact.id)
+              : undefined;
+          } else if (update.imgUrl === 'removed') {
+            delete contact.imgUrl;
+          }
+        } else {
+          return logger.debug(
+            { update },
+            'got update for non-existant contact',
+          );
+        }
+
+        Object.assign(contacts[contact.id], contact);
+      }
+    });
+    ev.on('chats.upsert', (newChats) => {
+      chats.upsert(...newChats);
+    });
+    ev.on('chats.update', (updates) => {
+      for (let update of updates) {
+        const result = chats.update(update.id!, (chat) => {
+          if (update.unreadCount! > 0) {
+            update = { ...update };
+            update.unreadCount = (chat.unreadCount || 0) + update.unreadCount!;
+          }
+
+          Object.assign(chat, update);
+        });
+        if (!result) {
+          logger.debug({ update }, 'got update for non-existant chat');
+        }
+      }
+    });
+
+    ev.on('labels.edit', (label: Label) => {
+      if (label.deleted) {
+        return labels.deleteById(label.id);
+      }
+
+      // WhatsApp can store only up to 20 labels
+      if (labels.count() < 20) {
+        return labels.upsertById(label.id, label);
+      }
+
+      logger.error('Labels count exceed');
+    });
+
+    ev.on('labels.association', ({ type, association }) => {
+      switch (type) {
+        case 'add':
+          labelAssociations.upsert(association);
+          break;
+        case 'remove':
+          labelAssociations.delete(association);
+          break;
+        default:
+          console.error(`unknown operation type [${type}]`);
+      }
+    });
+
+    ev.on('presence.update', ({ id, presences: update }) => {
+      presences[id] = presences[id] || {};
+      Object.assign(presences[id], update);
+    });
+    ev.on('chats.delete', (deletions) => {
+      for (const item of deletions) {
+        if (chats.get(item)) {
+          chats.deleteById(item);
+        }
+      }
+    });
+    ev.on('messages.upsert', ({ messages: newMessages, type }) => {
+      switch (type) {
+        case 'append':
+        case 'notify':
+          for (const msg of newMessages) {
+            const jid = jidNormalizedUser(msg.key.remoteJid!);
+            const list = assertMessageList(jid);
+            list.upsert(msg, 'append');
+
+            if (type === 'notify' && !chats.get(jid)) {
+              ev.emit('chats.upsert', [
+                {
+                  id: jid,
+                  conversationTimestamp: toNumber(msg.messageTimestamp),
+                  unreadCount: 1,
+                },
+              ]);
+            }
+          }
+
+          break;
+      }
+    });
+    ev.on('messages.update', (updates) => {
+      for (const { update, key } of updates) {
+        const list = assertMessageList(jidNormalizedUser(key.remoteJid!));
+        if (update?.status) {
+          const listStatus = list.get(key.id!)?.status;
+          if (listStatus && update?.status <= listStatus) {
+            logger.debug(
+              { update, storedStatus: listStatus },
+              'status stored newer then update',
+            );
+            delete update.status;
+            logger.debug({ update }, 'new update object');
+          }
+        }
+
+        const result = list.updateAssign(key.id!, update);
+        if (!result) {
+          logger.debug({ update }, 'got update for non-existent message');
+        }
+      }
+    });
+    ev.on('messages.delete', (item) => {
+      if ('all' in item) {
+        const list = messages[item.jid];
+        list?.clear();
+      } else {
+        const jid = item.keys[0].remoteJid!;
+        const list = messages[jid];
+        if (list) {
+          const idSet = new Set(item.keys.map((k) => k.id));
+          list.filter((m) => !idSet.has(m.key.id));
+        }
+      }
+    });
+
+    ev.on('groups.update', (updates) => {
+      for (const update of updates) {
+        const id = update.id!;
+        if (groupMetadata[id]) {
+          Object.assign(groupMetadata[id], update);
+        } else {
+          logger.debug(
+            { update },
+            'got update for non-existant group metadata',
+          );
+        }
+      }
+    });
+
+    ev.on('group-participants.update', ({ id, participants, action }) => {
+      const metadata = groupMetadata[id];
+      if (metadata) {
+        switch (action) {
+          case 'add':
+            metadata.participants.push(
+              ...participants.map((id) => ({
+                id,
+                isAdmin: false,
+                isSuperAdmin: false,
+              })),
+            );
+            break;
+          case 'demote':
+          case 'promote':
+            for (const participant of metadata.participants) {
+              if (participants.includes(participant.id)) {
+                participant.isAdmin = action === 'promote';
+              }
+            }
+
+            break;
+          case 'remove':
+            metadata.participants = metadata.participants.filter(
+              (p) => !participants.includes(p.id),
+            );
+            break;
+        }
+      }
+    });
+
+    ev.on('message-receipt.update', (updates) => {
+      for (const { key, receipt } of updates) {
+        const obj = messages[key.remoteJid!];
+        const msg = obj?.get(key.id!);
+        if (msg) {
+          updateMessageWithReceipt(msg, receipt);
+        }
+      }
+    });
+
+    ev.on('messages.reaction', (reactions) => {
+      for (const { key, reaction } of reactions) {
+        const obj = messages[key.remoteJid!];
+        const msg = obj?.get(key.id!);
+        if (msg) {
+          updateMessageWithReaction(msg, reaction);
+        }
+      }
+    });
+  };
+
+  const toJSON = () => ({
+    chats,
+    contacts,
+    messages,
+    labels,
+    labelAssociations,
+  });
+
+  const fromJSON = (json: {
+    chats: Chat[];
+    contacts: { [id: string]: Contact };
+    messages: { [id: string]: WAMessage[] };
+    labels: { [labelId: string]: Label };
+    labelAssociations: LabelAssociation[];
+  }) => {
+    chats.upsert(...json.chats);
+    labelAssociations.upsert(...(json.labelAssociations || []));
+    contactsUpsert(Object.values(json.contacts));
+    labelsUpsert(Object.values(json.labels || {}));
+    for (const jid in json.messages) {
+      const list = assertMessageList(jid);
+      for (const msg of json.messages[jid]) {
+        list.upsert(proto.WebMessageInfo.fromObject(msg), 'append');
+      }
+    }
+  };
+
+  return {
+    chats,
+    contacts,
+    messages,
+    groupMetadata,
+    state,
+    presences,
+    setPresences: (obj: any) => {
+      presences = obj;
+    },
+    labels,
+    labelAssociations,
+    bind,
+    /** loads messages from the store, if not found -- uses the legacy connection */
+    loadMessages: async (
+      jid: string,
+      count: number,
+      cursor: WAMessageCursor,
+    ) => {
+      const list = assertMessageList(jid);
+      const mode = !cursor || 'before' in cursor ? 'before' : 'after';
+      const cursorKey = !!cursor
+        ? 'before' in cursor
+          ? cursor.before
+          : cursor.after
+        : undefined;
+      const cursorValue = cursorKey ? list.get(cursorKey.id!) : undefined;
+
+      let messages: WAMessage[];
+      if (list && mode === 'before' && (!cursorKey || cursorValue)) {
+        if (cursorValue) {
+          const msgIdx = list.array.findIndex(
+            (m) => m.key.id === cursorKey?.id,
+          );
+          messages = list.array.slice(0, msgIdx);
+        } else {
+          messages = list.array;
+        }
+
+        const diff = count - messages.length;
+        if (diff < 0) {
+          messages = messages.slice(-count); // get the last X messages
+        }
+      } else {
+        messages = [];
+      }
+
+      return messages;
+    },
+    /**
+     * Get all available labels for profile
+     *
+     * Keep in mind that the list is formed from predefined tags and tags
+     * that were "caught" during their editing.
+     */
+    getLabels: () => {
+      return labels;
+    },
+
+    /**
+     * Get labels for chat
+     *
+     * @returns Label IDs
+     **/
+    getChatLabels: (chatId: string) => {
+      return labelAssociations.filter((la) => la.chatId === chatId).all();
+    },
+
+    /**
+     * Get labels for message
+     *
+     * @returns Label IDs
+     **/
+    getMessageLabels: (messageId: string) => {
+      const associations = labelAssociations
+        .filter((la: MessageLabelAssociation) => la.messageId === messageId)
+        .all();
+
+      return associations.map(({ labelId }) => labelId);
+    },
+    loadMessage: async (jid: string, id: string) => messages[jid]?.get(id),
+    mostRecentMessage: async (jid: string) => {
+      const message: WAMessage | undefined = messages[jid]?.array.slice(-1)[0];
+      return message;
+    },
+    fetchImageUrl: async (jid: string, sock: WASocket | undefined) => {
+      const contact = contacts[jid];
+      if (!contact) {
+        return sock?.profilePictureUrl(jid);
+      }
+
+      if (typeof contact.imgUrl === 'undefined') {
+        contact.imgUrl = await sock?.profilePictureUrl(jid);
+      }
+
+      return contact.imgUrl;
+    },
+    fetchGroupMetadata: async (jid: string, sock: WASocket | undefined) => {
+      if (!groupMetadata[jid]) {
+        const metadata = await sock?.groupMetadata(jid);
+        if (metadata) {
+          groupMetadata[jid] = metadata;
+        }
+      }
+
+      return groupMetadata[jid];
+    },
+    // fetchBroadcastListInfo: async(jid: string, sock: WASocket | undefined) => {
+    // 	if(!groupMetadata[jid]) {
+    // 		const metadata = await sock?.getBroadcastListInfo(jid)
+    // 		if(metadata) {
+    // 			groupMetadata[jid] = metadata
+    // 		}
+    // 	}
+
+    // 	return groupMetadata[jid]
+    // },
+    fetchMessageReceipts: async ({ remoteJid, id }: WAMessageKey) => {
+      const list = messages[remoteJid!];
+      const msg = list?.get(id!);
+      return msg?.userReceipt;
+    },
+    toJSON,
+    fromJSON,
+    writeToFile: (path: string) => {
+      writeFileSync(path, JSON.stringify(toJSON()));
+    },
+    readFromFile: (path: string) => {
+      if (existsSync(path)) {
+        logger.debug({ path }, 'reading from file');
+        const jsonStr = readFileSync(path, { encoding: 'utf-8' });
+        const json = JSON.parse(jsonStr);
+        fromJSON(json);
+      }
+    },
+  };
+};

src/core/engines/noweb/store/memory/make-ordered-dictionary.ts

@@ -0,0 +1,86 @@
+function makeOrderedDictionary<T>(idGetter: (item: T) => string) {
+  const array: T[] = [];
+  const dict: { [_: string]: T } = {};
+
+  const get = (id: string): T | undefined => dict[id];
+
+  const update = (item: T) => {
+    const id = idGetter(item);
+    const idx = array.findIndex((i) => idGetter(i) === id);
+    if (idx >= 0) {
+      array[idx] = item;
+      dict[id] = item;
+    }
+
+    return false;
+  };
+
+  const upsert = (item: T, mode: 'append' | 'prepend') => {
+    const id = idGetter(item);
+    if (get(id)) {
+      update(item);
+    } else {
+      if (mode === 'append') {
+        array.push(item);
+      } else {
+        array.splice(0, 0, item);
+      }
+
+      dict[id] = item;
+    }
+  };
+
+  const remove = (item: T) => {
+    const id = idGetter(item);
+    const idx = array.findIndex((i) => idGetter(i) === id);
+    if (idx >= 0) {
+      array.splice(idx, 1);
+      delete dict[id];
+      return true;
+    }
+
+    return false;
+  };
+
+  return {
+    array,
+    get,
+    upsert,
+    update,
+    remove,
+    updateAssign: (id: string, update: Partial<T>) => {
+      const item = get(id);
+      if (item) {
+        Object.assign(item, update);
+        delete dict[id];
+        dict[idGetter(item)] = item;
+        return true;
+      }
+
+      return false;
+    },
+    clear: () => {
+      array.splice(0, array.length);
+      for (const key of Object.keys(dict)) {
+        delete dict[key];
+      }
+    },
+    filter: (contain: (item: T) => boolean) => {
+      let i = 0;
+      while (i < array.length) {
+        if (!contain(array[i])) {
+          delete dict[idGetter(array[i])];
+          array.splice(i, 1);
+        } else {
+          i += 1;
+        }
+      }
+    },
+    toJSON: () => array,
+    fromJSON: (newItems: T[]) => {
+      array.splice(0, array.length, ...newItems);
+    },
+  };
+}
+
+export default makeOrderedDictionary;

src/core/engines/noweb/store/memory/object-repository.ts

@@ -0,0 +1,32 @@
+export class ObjectRepository<T extends any> {
+  readonly entityMap: Map<string, T>;
+
+  constructor(entities: Record<string, T> = {}) {
+    this.entityMap = new Map(Object.entries(entities));
+  }
+
+  findById(id: string) {
+    return this.entityMap.get(id);
+  }
+
+  findAll() {
+    return Array.from(this.entityMap.values());
+  }
+
+  upsertById(id: string, entity: T) {
+    // @ts-ignore
+    return this.entityMap.set(id, { ...entity });
+  }
+
+  deleteById(id: string) {
+    return this.entityMap.delete(id);
+  }
+
+  count() {
+    return this.entityMap.size;
+  }
+
+  toJSON() {
+    return this.findAll();
+  }
+}

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';
 
@@ -35,14 +36,26 @@ export class SqlMessagesMethods {
     }
     if (filter['filter.fromMe'] != null) {
       // filter by data json inside
-      const sql = this.repository.filterJson('data', 'key.fromMe');
-      query = query.whereRaw(sql, [filter['filter.fromMe'] ? 'true' : 'false']);
+      const [sql, value] = this.repository.filterJson(
+        'data',
+        'key.fromMe',
+        filter['filter.fromMe'],
+      );
+      query = query.whereRaw(sql, [value]);
+    }
+    if (filter['filter.ack'] != null) {
+      const status = AckToStatus(filter['filter.ack']);
+      const [sql, value] = this.repository.filterJson('data', 'status', status);
+      query = query.whereRaw(sql, [value]);
     }
     query = this.repository.pagination(query, pagination);
     return this.repository.all(query);
   }
 
   async getByJidById(jid: string, id: string): Promise<any> {
+    if (jid === ALL_JID) {
+      return this.repository.getBy({ id: id });
+    }
     return this.repository.getBy({ jid: jid, id: id });
   }
 

src/core/engines/webjs/WPage.ts

@@ -0,0 +1,110 @@
+import { sleep } from '@waha/utils/promiseTimeout';
+import { EventEmitter } from 'events';
+import { Key } from 'node-cache';
+import { Page } from 'puppeteer';
+
+export interface CallErrorEvent {
+  method: string | symbol;
+  error: unknown;
+}
+
+export const PAGE_CALL_ERROR_EVENT = 'page.call.error';
+
+/**
+ * WPage is a puppeter.Page wrapper that use ALL original methods from Page,
+ * but in case if there were any errors in the call (original) -
+ * it calls the errorCallback with method name, error and arguments
+ *
+ * Find in webjs used functions like "pupPage.{function}"
+ * >>> cd src
+ * >>> grep -rho 'page\.[a-zA-Z0-9_]\+(' . --include="*.js" | sed 's/($//' | sort -u
+ *
+ * Find in webjs used functions like "page.{function}"
+ * >>> cd src
+ * >>> grep -rho 'page\.[a-zA-Z0-9_]\+(' . --include="*.js" | sed 's/($//' | sort -u
+ *
+ */
+export class WPage extends EventEmitter {
+  constructor(private page: Page) {
+    super();
+  }
+
+  async evaluate(fn, ...args: any[]) {
+    try {
+      return await this.page.evaluate(fn, ...args);
+    } catch (err) {
+      this.emit(PAGE_CALL_ERROR_EVENT, { method: 'evaluate', error: err });
+      throw err;
+    }
+  }
+
+  async screenshot(options) {
+    try {
+      return await this.page.screenshot(options);
+    } catch (err) {
+      this.emit(PAGE_CALL_ERROR_EVENT, { method: 'screenshot', error: err });
+      throw err;
+    }
+  }
+
+  // waitForNavigation
+  async waitForNavigation(options: any) {
+    try {
+      return await this.page.waitForNavigation(options);
+    } catch (err) {
+      this.emit(PAGE_CALL_ERROR_EVENT, {
+        method: 'waitForNavigation',
+        error: err,
+      });
+      throw err;
+    }
+  }
+
+  // waitForFunction
+  async waitForFunction(fn, options, ...args) {
+    try {
+      return await this.page.waitForFunction(fn, options, ...args);
+    } catch (err) {
+      this.emit(PAGE_CALL_ERROR_EVENT, {
+        method: 'waitForFunction',
+        error: err,
+      });
+      throw err;
+    }
+  }
+
+  // setRequestInterception
+  async setRequestInterception(value: boolean) {
+    try {
+      return await this.page.setRequestInterception(value);
+    } catch (err) {
+      this.emit(PAGE_CALL_ERROR_EVENT, {
+        method: 'setRequestInterception',
+        error: err,
+      });
+      throw err;
+    }
+  }
+
+  // exposeFunction
+  async exposeFunction(name: string, fn: (...args: any[]) => any) {
+    try {
+      return await this.page.exposeFunction(name, fn);
+    } catch (err) {
+      this.emit(PAGE_CALL_ERROR_EVENT, {
+        method: 'exposeFunction',
+        error: err,
+      });
+      throw err;
+    }
+  }
+
+  on(event: string | symbol, listener: (...args: any[]) => void): this {
+    if (event === PAGE_CALL_ERROR_EVENT) {
+      super.on(event, listener);
+      return this;
+    }
+    this.page.on(event, listener);
+    return this.page as any;
+  }
+}

src/core/engines/webjs/WebjsClientCore.ts

@@ -4,10 +4,13 @@ import { PaginationParams } from '@waha/structures/pagination.dto';
 import { TextStatus } from '@waha/structures/status.dto';
 import { EventEmitter } from 'events';
 import * as lodash from 'lodash';
+import { Page } from 'puppeteer';
 import { Client, Events } from 'whatsapp-web.js';
 import { Message } from 'whatsapp-web.js/src/structures';
 import { exposeFunctionIfAbsent } from 'whatsapp-web.js/src/util/Puppeter';
 
+import { CallErrorEvent, PAGE_CALL_ERROR_EVENT, WPage } from './WPage';
+
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const { LoadWAHA } = require('./_WAHA.js');
 
@@ -22,6 +25,7 @@ const ChatFactory = require('whatsapp-web.js/src/factories/ChatFactory');
 
 export class WebjsClientCore extends Client {
   public events = new EventEmitter();
+  private wpage: WPage = null;
 
   constructor(options) {
     super(options);
@@ -32,6 +36,18 @@ export class WebjsClientCore extends Client {
     });
   }
 
+  async initialize() {
+    const result = await super.initialize();
+    if (this.pupPage && !(this.pupPage instanceof WPage)) {
+      this.wpage = new WPage(this.pupPage);
+      this.wpage.on(PAGE_CALL_ERROR_EVENT as any, (event: CallErrorEvent) => {
+        this.events.emit(PAGE_CALL_ERROR_EVENT as any, event);
+      });
+      this.pupPage = this.wpage as any as Page;
+    }
+    return result;
+  }
+
   async injectWaha() {
     await this.pupPage.evaluate(LoadLodash);
     await this.pupPage.evaluate(LoadPaginator);
@@ -51,6 +67,7 @@ export class WebjsClientCore extends Client {
 
   async destroy() {
     this.events.removeAllListeners();
+    this.wpage?.removeAllListeners();
     await super.destroy();
   }
 
@@ -199,6 +216,9 @@ export class WebjsClientCore extends Client {
           ) {
             return false;
           }
+          if (filter['filter.ack'] != null && m.ack !== filter['filter.ack']) {
+            return false;
+          }
           return true;
         };
 
@@ -210,8 +230,17 @@ export class WebjsClientCore extends Client {
           const loadedMessages =
             // @ts-ignore
             await window.Store.ConversationMsgs.loadEarlierMsgs(chat);
-          if (!loadedMessages || !loadedMessages.length) break;
+          if (!loadedMessages || loadedMessages.length == 0) break;
+
           msgs = [...loadedMessages.filter(msgFilter), ...msgs];
+          msgs = msgs.sort((a, b) => b.t - a.t);
+
+          // Check if the earliest message is already outside the timerange filter
+          const earliest = msgs[msgs.length - 1];
+          if (earliest.t < (filter['filter.timestamp.gte'] || Infinity)) {
+            // Add only messages that pass the filter and stop loading more
+            break;
+          }
         }
 
         if (msgs.length > pagination.limit + pagination.offset) {

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/ack.webjs.ts

@@ -0,0 +1,163 @@
+import {
+  areJidsSameUser,
+  BinaryNode,
+  getBinaryNodeChildren,
+  getStatusFromReceiptType,
+  isJidGroup,
+  isJidStatusBroadcast,
+  jidEncode,
+  jidNormalizedUser,
+  proto,
+} from '@adiwajshing/baileys';
+
+export interface ReceiptEvent {
+  key: proto.IMessageKey;
+  participant?: string;
+  messageIds: string[];
+  status: number;
+  _node: any;
+}
+
+interface Me {
+  id: string;
+  lid?: string;
+}
+
+function jid(field: any) {
+  if (!field) {
+    return field;
+  }
+  const data = field['$1'];
+  if (!data) {
+    return data;
+  }
+
+  let server = data.server;
+  if (!server) {
+    server =
+      data.domainType === 0 || data.domainType === 128
+        ? 's.whatsapp.net'
+        : 'lid';
+  }
+  return jidEncode(data.user, server, data.device);
+}
+
+export function TagReceiptNodeToReceiptEvent(
+  node: BinaryNode,
+  me: Me,
+): ReceiptEvent[] {
+  const { attrs, content } = node;
+  const status = getStatusFromReceiptType(attrs.type);
+  if (status == null) {
+    return null;
+  }
+
+  const from = jidNormalizedUser(jid(attrs.from));
+  const participant = jidNormalizedUser(jid(attrs.participant));
+  const recipient = jidNormalizedUser(jid(attrs.recipient));
+
+  const isLid = from.includes('lid');
+  const isNodeFromMe = areJidsSameUser(
+    participant || from,
+    isLid ? me?.lid : me?.id,
+  );
+  const remoteJid = !isNodeFromMe || isJidGroup(from) ? from : recipient;
+  const fromMe = !recipient || (attrs.type === 'retry' && isNodeFromMe);
+
+  // basically, we only want to know when a message from us has been delivered to/read by the other person
+  // or another device of ours has read some messages
+  if (status < proto.WebMessageInfo.Status.SERVER_ACK && isNodeFromMe) {
+    return [];
+  }
+
+  const key: proto.IMessageKey = {
+    remoteJid: remoteJid,
+    id: '',
+    fromMe: fromMe,
+  };
+
+  const ids = [attrs.id];
+  if (Array.isArray(content)) {
+    const items = getBinaryNodeChildren(content[0], 'item');
+    ids.push(...items.map((i) => i.attrs.id));
+  }
+
+  if (isJidGroup(remoteJid) || isJidStatusBroadcast(remoteJid)) {
+    if (participant) {
+      key.participant = fromMe ? (isLid ? me.lid : me.id) : recipient;
+      const eventParticipant = fromMe ? participant : isLid ? me.lid : me.id;
+      return [
+        {
+          key: key,
+          messageIds: ids,
+          status: status as any,
+          participant: eventParticipant,
+          _node: node,
+        },
+      ];
+    } else {
+      // Handle grouped receipts
+      return handleGroupedReceipts(node, key, status, fromMe, isLid, me);
+    }
+  }
+
+  return [
+    {
+      key: key,
+      messageIds: ids,
+      status: status as any,
+      _node: node,
+    },
+  ];
+}
+
+function handleGroupedReceipts(
+  node: BinaryNode,
+  key: proto.IMessageKey,
+  status: number,
+  fromMe: boolean,
+  isLid: boolean,
+  me: Me,
+): ReceiptEvent[] | null {
+  const { content } = node;
+  if (!Array.isArray(content)) {
+    return [];
+  }
+  const participantsTags = content.filter((c) => c.tag === 'participants');
+  if (participantsTags.length === 0) {
+    return null;
+  }
+
+  const receiptEvents: ReceiptEvent[] = [];
+
+  for (const participants of participantsTags) {
+    const participantKey = participants.attrs?.key;
+    if (!participantKey) continue;
+
+    const users = getBinaryNodeChildren(participants, 'user');
+    for (const user of users) {
+      const userAttrs = user.attrs;
+      if (!userAttrs) continue;
+
+      const userJid = jidNormalizedUser(jid(userAttrs.jid));
+      if (!userJid) continue;
+
+      key.participant = fromMe ? (isLid ? me.lid : me.id) : userJid;
+      const eventParticipant = fromMe ? userJid : isLid ? me.lid : me.id;
+      const receiptEvent: ReceiptEvent = {
+        key: {
+          ...key,
+          id: participantKey,
+        },
+        messageIds: [participantKey],
+        status: status as any,
+        participant: eventParticipant,
+        _node: node,
+      };
+
+      receiptEvents.push(receiptEvent);
+    }
+  }
+
+  return receiptEvents;
+}

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

@@ -1,8 +1,17 @@
+import { isJidGroup, isJidStatusBroadcast } from '@adiwajshing/baileys';
 import { UnprocessableEntityException } from '@nestjs/common';
 import {
   getChannelInviteLink,
   WhatsappSession,
 } from '@waha/core/abc/session.abc';
+import {
+  getFromToParticipant,
+  toCusFormat,
+} from '@waha/core/engines/noweb/session.noweb.core';
+import {
+  ReceiptEvent,
+  TagReceiptNodeToReceiptEvent,
+} from '@waha/core/engines/webjs/ack.webjs';
 import {
   ToGroupV2JoinEvent,
   ToGroupV2LeaveEvent,
@@ -11,12 +20,22 @@ import {
 } from '@waha/core/engines/webjs/groups.webjs';
 import { LocalAuth } from '@waha/core/engines/webjs/LocalAuth';
 import { WebjsClientCore } from '@waha/core/engines/webjs/WebjsClientCore';
+import {
+  CallErrorEvent,
+  PAGE_CALL_ERROR_EVENT,
+} from '@waha/core/engines/webjs/WPage';
 import {
   AvailableInPlusVersion,
   NotImplementedByEngineError,
 } 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 {
@@ -36,11 +55,14 @@ import {
   GetChatMessageQuery,
   GetChatMessagesFilter,
   GetChatMessagesQuery,
+  ReadChatMessagesQuery,
+  ReadChatMessagesResponse,
 } from '@waha/structures/chats.dto';
 import {
   ChatRequest,
   CheckNumberStatusQuery,
   EditMessageRequest,
+  MessageButtonReply,
   MessageFileRequest,
   MessageForwardRequest,
   MessageImageRequest,
@@ -82,15 +104,18 @@ import { MeInfo } from '@waha/structures/sessions.dto';
 import { StatusRequest, TextStatus } from '@waha/structures/status.dto';
 import {
   EnginePayload,
+  WAMessageAckBody,
   WAMessageRevokedBody,
 } from '@waha/structures/webhooks.dto';
 import { PaginatorInMemory } from '@waha/utils/Paginator';
 import { sleep, waitUntil } from '@waha/utils/promiseTimeout';
 import { SingleDelayedJobRunner } from '@waha/utils/SingleDelayedJobRunner';
 import * as lodash from 'lodash';
+import { ProtocolError } from 'puppeteer';
 import { filter, fromEvent, merge, mergeMap, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import {
+  AuthStrategy,
   Call,
   Channel as WEBJSChannel,
   Chat,
@@ -102,6 +127,7 @@ import {
   Label as WEBJSLabel,
   Location,
   Message,
+  MessageAck,
   MessageMedia,
   Reaction,
   WAState,
@@ -237,12 +263,29 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
           this.logger.error('The browser has been disconnected');
           this.failed();
         });
+
         // Listen for page close event
         this.whatsapp.pupPage.on('close', () => {
           this.logger.error('The WhatsApp Web page has been closed');
           this.failed();
         });
 
+        // Listen for function call errors
+        this.whatsapp.events.on(
+          PAGE_CALL_ERROR_EVENT,
+          (event: CallErrorEvent) => {
+            if (event.error instanceof ProtocolError) {
+              this.logger.error(
+                `ProtocolError when calling page method: ${String(
+                  event.method,
+                )}, restarting client...`,
+              );
+              this.logger.error(event.error);
+              this.failed();
+            }
+          },
+        );
+
         // Listen for page error event
         if (this.isDebugEnabled()) {
           this.logger.debug("Logging 'console' event for web page");
@@ -301,10 +344,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 () => {
@@ -315,11 +359,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');
     }
   }
 
@@ -540,6 +603,10 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     throw new AvailableInPlusVersion();
   }
 
+  sendButtonsReply(request: MessageButtonReply) {
+    throw new AvailableInPlusVersion();
+  }
+
   async sendLocation(request: MessageLocationRequest) {
     const location = new Location(request.latitude, request.longitude, {
       name: request.title,
@@ -686,6 +753,17 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     return result;
   }
 
+  public async readChatMessages(
+    chatId: string,
+    request: ReadChatMessagesQuery,
+  ): Promise<ReadChatMessagesResponse> {
+    const chat: Chat = await this.whatsapp.getChatById(
+      this.ensureSuffix(chatId),
+    );
+    await chat.sendSeen();
+    return { ids: null };
+  }
+
   public async getChatMessage(
     chatId: string,
     messageId: string,
@@ -693,6 +771,19 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
   ): Promise<null | WAMessage> {
     const message = await this.whatsapp.getMessageById(messageId);
     if (!message) return null;
+    if (
+      isJidGroup(message.id.remote) ||
+      isJidStatusBroadcast(message.id.remote)
+    ) {
+      // @ts-ignore
+      message.rawData.receipts = await message.getInfo().catch((error) => {
+        this.logger.error(
+          { error: error, msg: message.id._serialized },
+          'Failed to get receipts',
+        );
+        return null;
+      });
+    }
     return await this.processIncomingMessage(message, query.downloadMedia);
   }
 
@@ -1235,18 +1326,31 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     );
     this.events2.get(WAHAEvents.MESSAGE_REACTION).switch(messagesReaction$);
 
-    const messageAck$ = fromEvent(
+    const messageAckWEBJS$ = fromEvent(
       this.whatsapp,
       Events.MESSAGE_ACK,
       (message, ack) => {
         return { message, ack };
       },
     );
-    const messagesAck$ = messageAck$.pipe(
+    const messagesAckDM$ = messageAckWEBJS$.pipe(
       map((event) => event.message),
-      map(this.toWAMessage.bind(this)),
+      map<any, WAMessage>(this.toWAMessage.bind(this)),
+      filter((ack) => !isJidGroup(ack.to) && !isJidStatusBroadcast(ack.to)),
     );
-    this.events2.get(WAHAEvents.MESSAGE_ACK).switch(messagesAck$);
+    const tagReceiptNode$ = fromEvent(this.whatsapp, Events.TAG_RECEIPT);
+    const messageAckGroups$ = tagReceiptNode$.pipe(
+      mergeMap((node) =>
+        TagReceiptNodeToReceiptEvent(node as any, this.getSessionMeInfo()),
+      ),
+      mergeMap(this.TagReceiptToMessageAck.bind(this)),
+      filter((ack) => isJidGroup(ack.to) || isJidStatusBroadcast(ack.to)),
+    );
+
+    const messageAckAll$ = merge(messagesAckDM$, messageAckGroups$);
+
+    const messageAck$ = messageAckAll$.pipe(DistinctAck());
+    this.events2.get(WAHAEvents.MESSAGE_ACK).switch(messageAck$);
 
     //
     // Others
@@ -1378,15 +1482,44 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     };
   }
 
+  protected TagReceiptToMessageAck(receipt: ReceiptEvent): WAMessageAckBody[] {
+    const ids = receipt.messageIds;
+    const acks = [];
+    for (const id_ of ids) {
+      const messageKey = {
+        fromMe: receipt.key.fromMe,
+        remoteJid: toCusFormat(receipt.key.remoteJid),
+        participant: toCusFormat(receipt.key.participant),
+        id: id_,
+      };
+      const fromToParticipant = getFromToParticipant(messageKey);
+      const id = SerializeMessageKey(messageKey);
+      const ack = StatusToAck(receipt.status);
+      acks.push({
+        id: id,
+        from: fromToParticipant.from,
+        to: fromToParticipant.to,
+        participant: toCusFormat(receipt.participant),
+        fromMe: !receipt.key.fromMe, // reverted, it's right
+        ack: ack,
+        ackName: WAMessageAck[ack] || ACK_UNKNOWN,
+        _data: receipt._node,
+      });
+    }
+    return acks;
+  }
+
   protected toWAMessage(message: Message): WAMessage {
     const replyTo = this.extractReplyTo(message);
     const source = this.getMessageSource(message.id.id);
+    const key = parseMessageIdSerialized(message.id._serialized);
     // @ts-ignore
     return {
       id: message.id._serialized,
       timestamp: message.timestamp,
       from: message.from,
       fromMe: message.fromMe,
+      participant: toCusFormat(key.participant),
       source: source,
       to: message.to,
       body: message.body,
@@ -1417,6 +1550,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       id: quotedMsg.id?.id,
       participant: quotedMsg.author || quotedMsg.from,
       body: quotedMsg.caption || quotedMsg.body,
+      _data: quotedMsg,
     };
   }
 
@@ -1443,7 +1577,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     let mentions = request.mentions;
     mentions = mentions ? mentions.map(this.ensureSuffix) : undefined;
 
-    const quotedMessageId = request.reply_to;
+    const quotedMessageId = request.reply_to || request.replyTo;
 
     return {
       mentions: mentions,

src/core/storage/sql/IJsonQuery.ts

@@ -1,4 +1,4 @@
 export interface IJsonQuery {
-  filter(field: string, key: string): string;
+  filter(field: string, key: string, value: any): [string, string];
   sortBy(field: string, sortBy: string, direction: string): string;
 }

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,7 +80,16 @@ 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(', ')})
@@ -109,8 +119,34 @@ export class SqlKVRepository<Entity> {
     return this.all(query);
   }
 
-  getAllByIds(ids: string[]) {
-    return this.all(this.select().whereIn('id', ids));
+  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> {
@@ -187,8 +223,8 @@ export class SqlKVRepository<Entity> {
   /**
    * JSON helpers
    */
-  public filterJson(field: string, key: string): string {
-    return this.jsonQuery.filter(field, key);
+  public filterJson(field: string, key: string, value: any): [string, string] {
+    return this.jsonQuery.filter(field, key, value);
   }
 
   protected stringify(data: any): string {

src/core/storage/sqlite3/Sqlite3JsonQuery.ts

@@ -1,9 +1,9 @@
 import { IJsonQuery } from '@waha/core/storage/sql/IJsonQuery';
 
 export class Sqlite3JsonQuery implements IJsonQuery {
-  filter(field: string, key: string): string {
+  filter(field: string, key: string, value: any): [string, string] {
     const jsonPath = `$.${key}`;
-    return `${field}->'${jsonPath}' = ?`;
+    return [`${field}->'${jsonPath}' = ?`, `${value}`];
   }
 
   sortBy(field: string, sortBy: string, direction: string): string {

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/convertors.ts

@@ -0,0 +1,72 @@
+import { isJidGroup, WAMessageKey } from '@adiwajshing/baileys';
+import { parseMessageIdSerialized } from '@waha/core/utils/ids';
+import { toJID } from '@waha/core/utils/jids';
+import {
+  GetChatMessagesFilter,
+  GetChatMessagesQuery,
+  ReadChatMessagesQuery,
+} from '@waha/structures/chats.dto';
+import { SendSeenRequest } from '@waha/structures/chatting.dto';
+import { WAMessageAck } from '@waha/structures/enums.dto';
+
+export function ExtractMessageKeysForRead(
+  request: SendSeenRequest,
+): WAMessageKey[] {
+  const jid = toJID(request.chatId);
+  const defaults = {
+    remoteJid: jid,
+    participant: request.participant,
+  };
+  const ids = request.messageIds || [];
+  if (request.messageId) {
+    ids.push(request.messageId);
+  }
+  const keys: WAMessageKey[] = [];
+  for (const messageId of ids) {
+    const parsed = parseMessageIdSerialized(messageId, false);
+    if (parsed.fromMe) {
+      continue;
+    }
+    const key: WAMessageKey = {
+      id: parsed.id,
+      remoteJid: parsed.remoteJid
+        ? toJID(parsed.remoteJid)
+        : defaults.remoteJid,
+      participant: parsed.participant
+        ? toJID(parsed.participant)
+        : defaults.participant,
+    };
+    keys.push(key);
+  }
+  return keys;
+}
+
+function daysToMs(days: number) {
+  return days * 24 * 60 * 60 * 1000;
+}
+
+export function MessagesForRead(
+  chatId: string,
+  request: ReadChatMessagesQuery,
+): {
+  query: GetChatMessagesQuery;
+  filter: GetChatMessagesFilter;
+} {
+  const limit = request.messages || isJidGroup(chatId) ? 100 : 30;
+  const query: GetChatMessagesQuery = {
+    offset: 0,
+    limit: limit,
+    downloadMedia: false,
+  };
+  const afterMs = Date.now() - daysToMs(request.days);
+  const after = Math.floor(afterMs / 1000);
+  const filter: GetChatMessagesFilter = {
+    'filter.ack': WAMessageAck.DEVICE,
+    'filter.fromMe': false,
+    'filter.timestamp.gte': after,
+  };
+  return {
+    query: query,
+    filter: filter,
+  };
+}

src/core/utils/ids.ts

@@ -0,0 +1,40 @@
+import { WAMessageKey } from '@adiwajshing/baileys';
+import { toJID } from '@waha/core/utils/jids';
+
+/**
+ * Parse message id from WAHA to engine
+ * false_11111111111@c.us_AAA
+ * {id: "AAA", remoteJid: "11111111111@s.whatsapp.net", "fromMe": false}
+ */
+export function parseMessageIdSerialized(
+  messageId: string,
+  soft: boolean = false,
+): WAMessageKey {
+  if (!messageId.includes('_') && soft) {
+    return { id: messageId };
+  }
+
+  const parts = messageId.split('_');
+  if (parts.length != 3 && parts.length != 4) {
+    throw new Error(
+      'Message id be in format false_11111111111@c.us_AAAAAAAAAAAAAAAAAAAA[_participant]',
+    );
+  }
+  const fromMe = parts[0] == 'true';
+  const chatId = parts[1];
+  const remoteJid = toJID(chatId);
+  const id = parts[2];
+  const participant = parts[3] ? toJID(parts[3]) : undefined;
+  return {
+    fromMe: fromMe,
+    id: id,
+    remoteJid: remoteJid,
+    participant: participant,
+  };
+}
+
+export function SerializeMessageKey(key: WAMessageKey) {
+  const { fromMe, id, remoteJid, participant } = key;
+  const participantStr = participant ? `_${participant}` : '';
+  return `${fromMe ? 'true' : 'false'}_${remoteJid}_${id}${participantStr}`;
+}

src/core/utils/jids.ts

@@ -0,0 +1,37 @@
+import { isJidGroup, isJidMetaIa } from '@adiwajshing/baileys';
+import {
+  isJidBroadcast,
+  isLidUser,
+} from '@adiwajshing/baileys/lib/WABinary/jid-utils';
+
+export function isJidNewsletter(jid: string) {
+  return jid.endsWith('@newsletter');
+}
+
+export function isJidCus(jid: string) {
+  return jid?.endsWith('@c.us');
+}
+
+/**
+ * Convert from 11111111111@c.us to 11111111111@s.whatsapp.net
+ * @param chatId
+ */
+export function toJID(chatId) {
+  if (isJidGroup(chatId)) {
+    return chatId;
+  }
+  if (isJidBroadcast(chatId)) {
+    return chatId;
+  }
+  if (isJidNewsletter(chatId)) {
+    return chatId;
+  }
+  if (isLidUser(chatId)) {
+    return chatId;
+  }
+  if (isJidMetaIa(chatId)) {
+    return chatId;
+  }
+  const number = chatId.split('@')[0];
+  return number + '@s.whatsapp.net';
+}

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/helpers.ts

@@ -31,6 +31,9 @@ function splitAt(str: string, index) {
 }
 
 export function sortObjectByValues(obj: any) {
+  if (!obj) {
+    return obj;
+  }
   return Object.fromEntries(
     // @ts-ignore
     Object.entries(obj).sort(([, v1], [, v2]) => v2 - v1),

src/nestjs/validation/IsFileType.ts

@@ -0,0 +1,28 @@
+import {
+  registerDecorator,
+  ValidationArguments,
+  ValidationOptions,
+} from 'class-validator';
+
+export function IsFileType(validationOptions?: ValidationOptions) {
+  return function (object: any, propertyName: string) {
+    registerDecorator({
+      name: 'isFileType',
+      target: object.constructor,
+      propertyName: propertyName,
+      options: validationOptions,
+      validator: {
+        validate(value: any, _args: ValidationArguments) {
+          return (
+            value &&
+            typeof value === 'object' &&
+            (typeof value.data === 'string' || typeof value.url === 'string')
+          );
+        },
+        defaultMessage() {
+          return 'must contain either "data" or "url".';
+        },
+      },
+    });
+  };
+}

src/structures/base.dto.ts

@@ -16,6 +16,7 @@ export class SessionQuery {
  */
 
 export class SessionBaseRequest {
+  @IsString()
   session: string = WHATSAPP_DEFAULT_SESSION_NAME;
 }
 

src/structures/channels.dto.ts

@@ -195,5 +195,5 @@ export class PreviewChannelMessages {
 
   @IsNumber()
   @Type(() => Number)
-  limit: number = 100;
+  limit: number = 10;
 }

src/structures/chats.dto.ts

@@ -1,5 +1,7 @@
+import { BadRequestException } from '@nestjs/common';
 import { ApiProperty } from '@nestjs/swagger';
 import { BooleanString } from '@waha/nestjs/validation/BooleanString';
+import { WAMessageAck, WAMessageAckName } from '@waha/structures/enums.dto';
 import {
   LimitOffsetParams,
   PaginationParams,
@@ -39,6 +41,30 @@ export class GetChatMessagesFilter {
   @IsBoolean()
   @IsOptional()
   'filter.fromMe'?: boolean;
+
+  @ApiProperty({
+    required: false,
+    description: 'Filter messages by acknowledgment status',
+    enum: WAMessageAckName,
+  })
+  @IsEnum(WAMessageAckName)
+  @IsOptional()
+  'filter.ack'?: WAMessageAck;
+}
+
+export function transformAck(
+  filter: GetChatMessagesFilter,
+): GetChatMessagesFilter {
+  if (!filter) return filter;
+  if (!filter['filter.ack']) return filter;
+  const ackName = filter['filter.ack'];
+  // @ts-ignore
+  const ack: WAMessageAck = WAMessageAck[ackName];
+  if (ack == null) {
+    throw new BadRequestException(`Invalid ack: '${ackName}'`);
+  }
+  filter['filter.ack'] = ack;
+  return filter;
 }
 
 export class ChatPictureQuery {
@@ -62,7 +88,7 @@ export class GetChatMessagesQuery {
   @IsNumber()
   @IsOptional()
   @Type(() => Number)
-  limit: number = 100;
+  limit: number = 10;
 
   @IsNumber()
   @IsOptional()
@@ -80,6 +106,35 @@ export class GetChatMessagesQuery {
   downloadMedia: boolean = true;
 }
 
+export class ReadChatMessagesQuery {
+  @ApiProperty({
+    example: 30,
+    required: false,
+    description: 'How much messages to read (latest first)',
+  })
+  @Type(() => Number)
+  @IsNumber()
+  @IsOptional()
+  messages: number;
+
+  @ApiProperty({
+    required: false,
+    description: 'How much days to read (latest first)',
+  })
+  @Type(() => Number)
+  @IsNumber()
+  @IsOptional()
+  days: number = 7;
+}
+
+export class ReadChatMessagesResponse {
+  @ApiProperty({
+    required: false,
+    description: 'Messages IDs that have been read',
+  })
+  ids?: string[];
+}
+
 export class GetChatMessageQuery {
   @ApiProperty({
     example: true,

src/structures/chatting.dto.ts

@@ -4,8 +4,17 @@ import {
   ApiProperty,
   getSchemaPath,
 } from '@nestjs/swagger';
+import { IsFileType } from '@waha/nestjs/validation/IsFileType';
 import { GetChatMessagesQuery } from '@waha/structures/chats.dto';
-import { IsNotEmpty, IsNumber, IsString } from 'class-validator';
+import { plainToInstance, Transform, Type } from 'class-transformer';
+import {
+  IsBoolean,
+  IsNotEmpty,
+  IsOptional,
+  IsString,
+  IsUrl,
+  ValidateNested,
+} from 'class-validator';
 
 import {
   SessionBaseRequest,
@@ -14,6 +23,9 @@ import {
 } from './base.dto';
 import {
   BinaryFile,
+  FileContent,
+  FileType,
+  FileURL,
   RemoteFile,
   VideoBinaryFile,
   VideoRemoteFile,
@@ -64,24 +76,30 @@ export class GetPresenceQuery extends ChatQuery {}
  */
 export class ChatRequest extends SessionBaseRequest {
   @ChatIdProperty()
+  @IsString()
   chatId: string;
 }
 
 export class SendSeenRequest extends ChatRequest {
   @ApiProperty({
-    example: 'false_11111111111@c.us_AAAAAAAAAAAAAAAAAAAA',
+    example: null,
+    deprecated: true,
     required: false,
-    description:
-      "NOWEB engine only - it's important to mark ALL messages as seen",
   })
   messageId?: string;
 
+  @ApiProperty({
+    example: ['false_11111111111@c.us_AAAAAAAAAAAAAAAAAAAA'],
+    required: false,
+  })
+  messageIds?: string[];
+
   @ApiProperty({
     example: '11111111111@c.us',
     required: false,
     default: null,
     description:
-      'NOWEB engine only - the ID of the user that sent the  message (undefined for individual chats)',
+      'NOWEB engine only - the ID of the user that sent the message (undefined for individual chats)',
   })
   participant?: string;
 }
@@ -161,6 +179,73 @@ export class MessageTextRequest extends ChatRequest {
   linkPreviewHighQuality?: boolean = false;
 }
 
+@ApiExtraModels(FileURL, FileContent)
+export class LinkPreviewData {
+  @IsNotEmpty()
+  @IsUrl({
+    protocols: ['http', 'https'],
+    require_protocol: true,
+    require_tld: false,
+  })
+  url: string = 'https://github.com/';
+
+  @IsString()
+  title: string = 'Your Title';
+
+  @IsString()
+  description: string = 'Check this out, amazing!';
+
+  @IsOptional()
+  @ValidateNested()
+  @Transform(
+    ({ value }) => {
+      if (value?.url) {
+        return plainToInstance(FileURL, value);
+      }
+      if (value?.data) {
+        return plainToInstance(FileContent, value);
+      }
+      return value;
+    },
+    { toClassOnly: true },
+  )
+  @IsFileType({ message: 'Image must contain either "data" or "url".' })
+  @ApiProperty({
+    oneOf: [
+      { $ref: getSchemaPath(FileURL) },
+      { $ref: getSchemaPath(FileContent) },
+    ],
+    example: {
+      url:
+        process.env.WHATSAPP_SWAGGER_JPG_EXAMPLE_URL ||
+        'https://github.com/devlikeapro/waha/raw/core/examples/waha.jpg',
+    },
+  })
+  image?: FileType;
+}
+
+export class MessageLinkCustomPreviewRequest extends ChatRequest {
+  @IsString()
+  @ApiProperty({
+    description:
+      'The text to send. MUST include the URL provided in preview.url',
+  })
+  text: string = 'Check this out! https://github.com/';
+
+  @IsBoolean()
+  @IsOptional()
+  linkPreviewHighQuality?: boolean = true;
+
+  @ValidateNested()
+  @Type(() => LinkPreviewData)
+  preview: LinkPreviewData;
+
+  @ReplyToProperty()
+  @IsString()
+  @IsOptional()
+  reply_to?: string;
+}
+
 export class EditMessageRequest {
   text: string = 'Hello, world!';
 
@@ -333,3 +418,27 @@ export class MessageDestination {
   from: string;
   fromMe: boolean;
 }
+
+export class MessageButtonReply extends ChatRequest {
+  @ReplyToProperty()
+  @IsString()
+  @IsNotEmpty()
+  replyTo?: string;
+
+  @IsString()
+  @IsNotEmpty()
+  selectedDisplayText: string;
+
+  @IsString()
+  @IsNotEmpty()
+  selectedButtonID: string;
+}
+
+export class NewMessageIDResponse {
+  @ApiProperty({
+    description: 'Pre-generated message id',
+    example: 'BBBBBBBBBBBBBBBBB',
+    required: true,
+  })
+  id: string;
+}

src/structures/enums.dto.ts

@@ -29,6 +29,9 @@ export enum WAHAEvents {
   ENGINE_EVENT = 'engine.event',
 }
 
+export type AllEventType = WAHAEvents | '*';
+export const AllEvents = [...Object.values(WAHAEvents), '*'];
+
 // All but no state.change, it's internal one
 export const WAHAEventsWild = Object.values(WAHAEvents).filter(
   (e) => e !== WAHAEvents.STATE_CHANGE && e !== WAHAEvents.ENGINE_EVENT,
@@ -65,4 +68,13 @@ export enum WAMessageAck {
   PLAYED = 4,
 }
 
+export enum WAMessageAckName {
+  ERROR = 'ERROR',
+  PENDING = 'PENDING',
+  SERVER = 'SERVER',
+  DEVICE = 'DEVICE',
+  READ = 'READ',
+  PLAYED = 'PLAYED',
+}
+
 export const ACK_UNKNOWN = 'UNKNOWN';

src/structures/files.dto.ts

@@ -1,4 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
+import { IsBase64, IsNotEmpty, IsString, IsUrl } from 'class-validator';
 
 export class Base64File {
   mimetype: string;
@@ -117,3 +118,33 @@ export class VideoRemoteFile {
   })
   url: string;
 }
+
+export class FileURL {
+  @IsString()
+  @IsNotEmpty()
+  @IsUrl({
+    protocols: ['http', 'https'],
+    require_protocol: true,
+    require_tld: false,
+  })
+  @ApiProperty({
+    example:
+      process.env.WHATSAPP_SWAGGER_JPG_EXAMPLE_URL ||
+      'https://github.com/devlikeapro/waha/raw/core/examples/waha.jpg',
+  })
+  url?: string;
+}
+
+export class FileContent {
+  @IsString()
+  @IsNotEmpty()
+  @IsBase64()
+  @ApiProperty({
+    description: 'Base64-encoded data of the file',
+    example:
+      '/9j/4AAQSkZJRgABAQAAAQABAAD//gAfQ29tcHJlc3NlZCBieSBqcGVnLXJlY29tcHJlc3P/2wCEAAQEBAQEBAQEBAQGBgUGBggHBwcHCAwJCQkJCQwTDA4MDA4MExEUEA8QFBEeFxUVFx4iHRsdIiolJSo0MjRERFwBBAQEBAQEBAQEBAYGBQYGCAcHBwcIDAkJCQkJDBMMDgwMDgwTERQQDxAUER4XFRUXHiIdGx0iKiUlKjQyNEREXP/CABEIAgACAAMBIgACEQEDEQH/xAAcAAEAAgIDAQAAAAAAAAAAAAAABgcEBQEDCAL/2gAIAQEAAAAA9/AAABxix7SajXYWN1uzJzdjud1v8vkAAAAAADjRRGL6kAAbaUzDdcgAAAAAOmDQnVAAADazec9oAAAAA6K9gvQAAAA753YXcAAAAD5hNb4oAAAAMuyppyAAAAa2p4+AAAAAJBbmcAAABD6s6AAAAAAd9qy4AAAKzgIAAAAAAn9lgAAOKjiQAAAAAAJdbfIAAcU7GAAAAAAAEnuLkAAVDEwAAAAAABLbdAAKxgYAAAAAc9HR9ZXICfWYABDKoAAAAAOqLRvR4x9bSQSrbgtuXgBrKO6QAAAAPmFQfoAG/sLajuvPYgCk9CAAAABr6u1QAH1PpsN9dgBBquAAAAA1NUYwAAmNii05uB10HigAAAAwagxgPn7+XIE6nhlX13ArevQAAAAcVJpQTi2ZvteuMV1UWvBbG+LDscOig+gAAAAEQrgMr0TZde1zosiW2rm+dK6DZXHy7787xAK0AAAABxTGCO71PtPNUTD7u+6/OFYhZ0oLNnpxRWrAACPxDKnOYAR6qgvyy/JuqAXPeHkbQiQWsbS9eUfpUAANFUxsrj5AV3DRuPYfmiu74sryJ0A9WaDzkPq8fsuvfqygQAAV1DhcO1AVHpRclvePfr2z9+c6tBZnovxb1C3N0T6zOKL1QAAQqvj6uvJA5pLFHpLo86ceytn5QiQNn7N8kxUWdKDa3phUGAAD4q2Pc2VKwHNH9A9RRehVuegvKsLB2e3PLMFFkS4X5H6jAAA1FQba4ADmk8Qekurzkempr5nhFpa6vm49keSYqLMlQt3SV6AABqaf21wACo9KLjuLx0d3o+yYVM/ugqdtL0H4u6xbO9FiaeJgAAamn9rcIAruGja+xfN1bCyroluo8xxT1nEvPAXh3CWa3SgAAamn9tcAAjlWDj19WNIBx39XF4XH5F0w3ltBu8LBAAa7H4NZW2bZ4+8/IHFLYZsfZvlWNbGPh23pcfmavAsmWhnY/SAHEKhOKAA3tgbkhtdlnekYvJ+YLXWk75bZ315xggZ1zfQd3X8gDiro2AAHNnyZxUGpehpLBYItScbfHi9cVPigtKSA+nyAIPAQAAO25cxrqh6AOHH0AmViAfX31AHFJY4AACdTw0dVdQAAlFm8gd2RggGqp4AAA3tsjU1dgAAJvPwDOzNKAaGpwY/fyDr47Q2dxh1QKG/IA21h70AbvYxMA0FUD4ieJ2y7vGnjrf7sbK5AMSIxrTjjLkMrkAAJZt68A+NbF4MNVGje70QnrczkZlq9uwAfGB0fWdlcAALD3NRgx6dwwYEUJFuBD8V3TQCaWEAAAAW5IKDBHqqAaTW5u/5GLoG9zANjcoAAABfmbReqCN1aAAAAZ90cAAAAbW9OazgIRyrAAAADPujgAAACe2a0VJBo6lAAAANpcQAAAC6pA4orVjiuND0YwMHVANrnA2HbPZIAAABtL2ECrIHMeqkGk0ADfbwNjc3AAAABZc/HVQPQCP1SDFh4CXZgbG5QAAADvvvICuK8BoanAjepBtZKDZ3GAAAAWDZIOqhMUMGlwOI9pxuJDyCRWoAAAAyr67gITVYKf1IDpwGd3gLGmAAAAC0ZyAUpoA0FUAAAbK4fsAAADfXYAMCiukIlXHyAANja2eAAAB3XjswAh9Sg10M0eNxxyDjnnYSSY9gAAAC15mABWcBAcgA4AAAAE8s4AAqGJgAAAAAACV2+AAOKdjAAAAAAACT3FyAAHFRxIAAAAAAEst3kAABWcBAAAAAAE8s3kAAAQ6rOkAAAAAHdaMzAAAA19Sx8AAAAASC19mAAAAcQytcMAAAAGZY825AAAAB8V5A8cAAABkTuwO8AAAAAdUIg2qAAAG1m047wAAAAAHGiiMX1IAA20nl2+5AAAAAAA4xY/ptPrMPo6nb35mz2+5kOWAAAD//EABsBAQACAwEBAAAAAAAAAAAAAAAEBQIDBgEH/9oACAECEAAAAAA11NXBi6m2VOtLbYAACJzdLgAM7vo5YADDmeexAAZdD02YAROMggAAndnLAIHE6AAAG/tp4EThNIAAePTd3csMODhAAGuBFwbZc7Kb3mY5XnQACLV4g2223o+pInAYgANFP4trjCigtl1s7+W5CiAAKXT73EShz6Wv5dPsb7rtXzvADGqztBopnUR8ue8drztZne5/RKrjQEenX2RCrHf8D9b+YwUvqeLXmzsayhAKjdYiBXO+4Hs6+lxw7bhV1uvoNeAVm6aIlU7rjdHX9LT8/J5lfZT42kHmKt3S/cvcKPzrqWv1+zuz4DDfct2rwK6D4DKymVsH6Dh740cfoW0p68ESqAPbrZT6fHrwnWR7t0ishPfD14s5uNbDDKwnDdJgGNXFys9EFZe1ixnetUXX7ulZBPn0LCj8e2OiInoBtuwAL6z45rowAMr4ADsrX53hjS4eMto0+Pd9wADP6Jt5CiKuGzsxW61lOAAvuuROAxVkImSkaEWkwAGXfyzledRqgZsD272AA6PqRhwcJDgYA2WUgAE3vMwicJpAAAG7u5YEDiNIAADd288AicXCAABO7OWAGHM89iAAy6HpswAETnKTAAZ3fRywAAa6mrgxdbZKnWlrtAH/xAAbAQEAAgMBAQAAAAAAAAAAAAAABAUCAwYBB//aAAgBAxAAAAAAMIEGJowZ75c6fmAACPTVmIAys7mQAAxpKfwAB7cXeQAaOaigAAldLvAIvMagAAG3p5QEfltQAAePTZ1UgMeVigAGEXRizkSvZXVZCipgADRB8BnYZ3N6R+S8AAaq/wAWFhjVxWdjn1shz1UAAVuv3p49VndRKJKmWvQ4cdiB5AynDVXLzV7UeOmpoWVpl2NfzgDTXrTIjQnWcp9B4eKkXvNLPPo4NUAV+yYIsN1nJ9JErPMem5ZZbLWLEAIWySI8F1POauhuq6p3Ui0yl6NYPPEPOS99xrPOhrImHsnpeSx22Lbr8CHG8B7Mkw4vXYjVzupP3vXgjwQBZ5V+o98EqYe7NQhRnvgE2T5Cjh7LlDbuiHkDTlN1RU32ClyvWGjBs35BLl1LGs8ezNUdLRDOzAAtpvOMKwADK0AA6Sfx2ONdge7Br8e7bAAGXY589VEGOzmiFgmyQALXoUfkvEKMSd7RGJ0gAHvWyCipmmvGTE9sswAXN6MeUjI8Tzwe5TNwAJXVZBH5bUAAANvUyAIvL6wAAG3p5QBH5uKAACV0kgAMaSoxAAZW93kAA0U1XiAMrO5kAAAwgQYujW2b5U6fmAP/xABREAACAQIDAgcJCgwFAwUBAAABAgMEBQAGESExEhMgQVFhcQciMDJAQnKBkRAUFVBSU6GxwdEjMzVDVWJzgpKTorIWJDRU0mN0g0RFZMLhw//aAAgBAQABPwDyiqu1vpNlRVwx6czOAT6sVWdLPESImlm9BNB/Vpioz65BWmt4A6Xf7AMS5zvbghHiiB+Qn/InEuY73N49xk/dAT+0DD3O5P49fUntlbDTzMdWmc9rHBZjvJOAzDcSMLPMh1WZwepiMLc7kniXCpHZK2Isx3uHxLhJ+8A/9wOIs53pAA7xSgfLT/iRilz/ACJsqLeDrvZH+wjFJnSyysOOMsPpp/x1xTXW31ZHvesikPyVcE+zGvxYSBvOK3M1ooeEr1YkceZF35+jYMVuep31WgpFQfLlOp9gxV3y7VuvH10nBPmqeAvsXTyGkvt2oiOIrpQBuVjwx7G1xRZ7nTRa6kVxzvFsPsOKDNForVVI6sRSsfFl7w4BB3H4nq66koo+HUTpFGOdiBri454iTWO2wcYfnJNi+obziuvdzuOoqqtyh8xe9T2Dyehvd0tpHvWrcIPMbvk9h3YtueomKpcoDG3zke1fZvGKOto6xONpp0kj5ypB9XxHW1tLQxGaqnWNF5yfoGLpnd24UVri4I+ekG31LioqqirkMtTM8rnnc6+V09VUUkgmppnicc6nTFrzu6hYbrFwh89GNvay4oq2krIRUUsySod2h5+vy9mVQWYgADUk4vOc4KctBbAJpdxkP4tezpxV11XXymarnaV+s7B2Dm8vo66roJRNSTtG/VuPaOfFlzvFPwYLmBFLzS+Y3b8nCsGAZSCDtBHll1vNFaouMqZdCR3ka7XbsGLxmOuuxZC3FU3NEh3+kef4js+Y6+0MqK3G0+u2Jzu9E82LTeaC7RcZTy7VGrxnYwPWPKr/AJrhoOHS0RWWq3E70j7ek4qKmermeeplaSVjtZviWnqZ6SZJ6aVo5F3MuMv5shuHFUldwY6ncp3I5+/q8nZlRWZiAoGpJxmLNjTF6K1uVj3PMN7dS9XX8U5cza0BSiurloT3qzHevU334RldVZWBUjUEeSSyx08TyzOFRQWZidAAMZizLLc2alpGZKMHsMnWerq+K8uZnltTrS1TF6Jj2mP7x1YhminjSWF1ZHAKlTqCPIp5o4InllcJGgJLHYABjMOYpbtK0EJKUanYu4uRzt8W5dzFNaJVhmYtRsdq86E86/aMQzRzxJNE4aNgGVgdQQfIHdY0Z3YKqjUk7ABjMuYnukrUtMxFGjfzCOc9XR8X5ZzG9pmFNUuTRufXGTzjqwjq6q6MCrDUEbQR4fNmYjUM9son/BKdJnHnkeaOofEmh36Yeppo/wAZUwp6UijBudtG+4U381cLX0D+LXU57JVwrK+1HVvRIPgco5ka
Line truncated
+  })
+  data?: string;
+}
+
+export type FileType = FileURL | FileContent;

src/structures/message.dto.ts

@@ -15,4 +15,9 @@ export class ReplyToMessage {
     example: 'Hello!',
   })
   body?: string;
+
+  @ApiProperty({
+    description: "Raw data from reply's message",
+  })
+  _data?: any;
 }

src/structures/status.dto.ts

@@ -17,24 +17,30 @@ const ContactsProperty = ApiProperty({
   required: false,
 });
 
-export interface StatusRequest {
-  contacts?: string[];
-}
-
-export class TextStatus {
-  text: string = 'Have a look! https://github.com/';
-  backgroundColor: string = '#38b42f';
-  font: number = 0;
+export class StatusRequest {
+  @ApiProperty({
+    description: 'Pre-generated status message id',
+    example: 'BBBBBBBBBBBBBBBBB',
+    default: null,
+    required: false,
+  })
+  id?: string;
 
   @ContactsProperty
   contacts?: string[];
+}
+
+export class TextStatus extends StatusRequest {
+  text: string = 'Have a look! https://github.com/';
+  backgroundColor: string = '#38b42f';
+  font: number = 0;
 
   linkPreview?: boolean = true;
   linkPreviewHighQuality?: boolean = false;
 }
 
 @ApiExtraModels(RemoteFile, BinaryFile)
-export class ImageStatus {
+export class ImageStatus extends StatusRequest {
   @ApiProperty({
     oneOf: [
       { $ref: getSchemaPath(RemoteFile) },
@@ -44,13 +50,10 @@ export class ImageStatus {
   file: RemoteFile | BinaryFile;
 
   caption?: string;
-
-  @ContactsProperty
-  contacts?: string[];
 }
 
 @ApiExtraModels(VoiceRemoteFile, VoiceBinaryFile)
-export class VoiceStatus {
+export class VoiceStatus extends StatusRequest {
   @ApiProperty({
     oneOf: [
       { $ref: getSchemaPath(VoiceRemoteFile) },
@@ -60,13 +63,10 @@ export class VoiceStatus {
   file: VoiceRemoteFile | VoiceBinaryFile;
 
   backgroundColor: string = '#38b42f';
-
-  @ContactsProperty
-  contacts?: string[];
 }
 
 @ApiExtraModels(VideoRemoteFile, VideoBinaryFile)
-export class VideoStatus {
+export class VideoStatus extends StatusRequest {
   @ApiProperty({
     oneOf: [
       { $ref: getSchemaPath(VideoRemoteFile) },
@@ -76,14 +76,11 @@ export class VideoStatus {
   file: VideoRemoteFile | VideoBinaryFile;
 
   caption?: string;
-
-  @ContactsProperty
-  contacts?: string[];
 }
 
-export class DeleteStatusRequest {
+export class DeleteStatusRequest extends StatusRequest {
   @ApiProperty({
-    description: 'status message id',
+    description: 'Status message id to delete',
     example: 'AAAAAAAAAAAAAAAAA',
   })
   id: string;

src/structures/webhooks.config.dto.ts

@@ -1,15 +1,21 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { WAHAEvents } from '@waha/structures/enums.dto';
+import {
+  AllEvents,
+  AllEventType,
+  WAHAEvents,
+} from '@waha/structures/enums.dto';
 import { Type } from 'class-transformer';
 import {
   IsArray,
   IsEnum,
+  IsIn,
   IsNumber,
   IsOptional,
   IsString,
   IsUrl,
   ValidateNested,
 } from 'class-validator';
+import { each } from 'lodash';
 
 export enum RetryPolicy {
   LINEAR = 'linear',
@@ -70,16 +76,20 @@ export class WebhookConfig {
     description:
       'You can use https://docs.webhook.site/ to test webhooks and see the payload',
   })
-  @IsUrl({ require_protocol: true, require_tld: false })
+  @IsUrl({
+    protocols: ['http', 'https'],
+    require_protocol: true,
+    require_tld: false,
+  })
   url: string;
 
   @ApiProperty({
     example: ['message', 'session.status'],
     required: true,
   })
-  @IsEnum(WAHAEvents, { each: true })
+  @IsIn(AllEvents, { each: true })
   @IsArray()
-  events: WAHAEvents[];
+  events: AllEventType[];
 
   @ApiProperty({
     example: null,

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/utils/StatusTracker.ts

@@ -0,0 +1,25 @@
+import { WAHASessionStatus } from '../structures/enums.dto';
+
+const STUCK_IN_STARTING_THRESHOLD = 60;
+
+/**
+ * Keeps track of session statuses (with timestamps) for the last `trackPeriodMs` milliseconds.
+ */
+export class StatusTracker {
+  private numberOfStarting: number = 0;
+
+  public track(status: WAHASessionStatus): void {
+    if (status == WAHASessionStatus.STARTING) {
+      this.numberOfStarting += 1;
+    } else {
+      this.numberOfStarting = 0;
+    }
+  }
+
+  /**
+   * Checks if the session has been continuously 'STARTING'
+   */
+  public isStuckInStarting(): boolean {
+    return this.numberOfStarting >= STUCK_IN_STARTING_THRESHOLD;
+  }
+}

src/version.ts

@@ -33,8 +33,9 @@ export function getEngineName(): string {
 }
 
 export const VERSION: WAHAEnvironment = {
-  version: '2025.3.1',
+  version: '2025.5.3',
   engine: getEngineName(),
   tier: getWAHAVersion(),
-  browser: getBrowserExecutablePath(),
+  browser:
+    getEngineName() === WAHAEngine.WEBJS ? getBrowserExecutablePath() : null,
 };

waha.config.json

@@ -2,11 +2,11 @@
   "waha": {
     "gows": {
       "repo": "devlikeapro/gows",
-      "ref": "v1.0.1"
+      "ref": "v1.0.5"
     },
     "dashboard": {
       "repo": "devlikeapro/dashboard",
-      "ref": "d7440caaefc2e80c0a4a1a61386f448c09cceeab"
+      "ref": "8f156ca15f460c68bea87535cf6d9f5c51c07f1f"
     }
   }
 }