[core] bufferutil is optional (no arm)

fix #148 fix #327 fix #194 fix #211

.env.example

@@ -161,6 +161,14 @@ WHATSAPP_FILES_FOLDER=/app/.media
 #WHATSAPP_HOOK_EVENTS=session.status,message,message.reaction
 #
 
+#
+# Local Configuration
+#
+# WAHA_LOCAL_STORE_BASE_DIR=/app/sessions
+# Remember to map the volume to the host machine to the right direction in "volumes" field in docker-compose.yml
+# volumes:
+# - './.sessions:/app/sessions'
+
 #
 # MongoDB Configuration
 # https://waha.devlike.pro/docs/how-to/storages/#sessions---mongodb

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,25 +6,28 @@ labels: bug
 assignees: ''
 ---
 
-**Describe the bug**
+### Describe the bug
 
-> A clear and concise description of what the bug is. Feel free to remove
-> sections that you don't feel to make the text shorter!
+A clear and concise description of what the bug is. Feel free to remove sections
+that you don't feel to make the text shorter!
 
-**Version**
+### Version
+
+Get the WAHA version by calling `GET /api/version`
 
 ```json
 {
-  "version": "2023.11.1",
-  "engine": "NOWEB",
-  "tier": "PLUS",
-  "browser": "/usr/bin/google-chrome-stable"
+  "version": "YYYY.MM.DD",
+  "engine": "ENGINE",
+  "tier": "TIER"
 }
 ```
 
-> You can get the WAHA version by calling `GET /api/version` Try to update to
-> [the latest version](https://github.com/devlikeapro/waha/releases) before
-> creating an issue!
+Try to update to
+[the latest version](https://github.com/devlikeapro/waha/releases) before
+creating an issue!
+
+## Steps
 
 **To Reproduce** Steps to reproduce the behavior:
 
@@ -33,29 +36,23 @@ assignees: ''
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+### Expected behavior
 
-> A clear and concise description of what you expected to happen.
+A clear and concise description of what you expected to happen.
 
-**Engine** I'm using **WEBJS** engine.
+### Requests - Responses
 
-> If you set `WHATSAPP_DEFAULT_ENGINE` explicitly to
-> [one of the engine](https://waha.devlike.pro/docs/how-to/engines/) - please
-> provide that information here and in the issue title.
+Please attach all sent requests, responses that you sent.
 
-**Requests - Responses**
+### Docker Logs
 
-> Please attach all sent requests, responses that you sent.
+Collect and attach related docker logs if you have any
+https://waha.devlike.pro/docs/how-to/deploy/#viewing-the-logs
 
-**Docker Logs**
+### Screenshots
 
-> Collect and attach related docker logs if you have any
-> https://waha.devlike.pro/docs/how-to/deploy/#viewing-the-logs
+If applicable, add screenshots to help explain your problem.
 
-**Screenshots**
+### Additional context
 
-> If applicable, add screenshots to help explain your problem.
-
-**Additional context**
-
-> Add any other context about the problem here.
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -9,16 +9,16 @@ assignees: ''
 **Is your feature request related to a problem? Please describe.** I'm always
 frustrated when [...]
 
-> A clear and concise description of what the problem is. Ex.
+A clear and concise description of what the problem is. Ex.
 
 **Describe the solution you'd like**
 
-> A clear and concise description of what you want to happen.
+A clear and concise description of what you want to happen.
 
 **Describe alternatives you've considered**
 
-> A clear and concise description of any alternative solutions or features
-> you've considered.
+A clear and concise description of any alternative solutions or features you've
+considered.
 
 **Additional context** Add any other context or screenshots about the feature
 request here.

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,9 @@
+---
+name: Question
+about: I have a question about the project or feature
+title: '[Question] '
+labels: 'question'
+assignees: ''
+---
+
+👉 Kindly use [GitHub Discussions](https://github.com/devlikeapro/waha/discussions) to ask questions!

.pre-commit-config.yaml

@@ -72,4 +72,5 @@ repos:
               entrypoint.sh|
               .pre-commit-config.yaml|
               ^src/core/engines/webjs/session.webjs.core.ts|
+              ^src/core/engines/webjs/_lodash.js|
           )$

Dockerfile

@@ -26,7 +26,7 @@ RUN yarn build && find ./dist -name "*.d.ts" -delete
 FROM node:${NODE_VERSION} AS dashboard
 
 # Download WAHA Dashboard
-ENV WAHA_DASHBOARD_SHA 5199c68522e81e911b440834fa7adc15ff4a1cf9
+ENV WAHA_DASHBOARD_SHA e6a72c5de2effc97d83e997cb1f361851604bae8
 RUN \
     wget https://github.com/devlikeapro/dashboard/archive/${WAHA_DASHBOARD_SHA}.zip \
     && unzip ${WAHA_DASHBOARD_SHA}.zip -d /tmp/dashboard \

package.json

@@ -80,6 +80,15 @@
     "swagger-ui-express": "^4.1.4",
     "whatsapp-web.js": "github:devlikeapro/whatsapp-web.js#fork-main-channels"
   },
+  "optionalDependencies": {
+    "bufferutil": "^4.0.8"
+  },
+  "resolutions": {
+    "bufferutil": "^4.0.8",
+    "ws": "^8.18.0",
+    "puppeteer": "^21.0.0",
+    "whatwg-url": "13.0.0"
+  },
   "devDependencies": {
     "@nestjs/cli": "^9.0.0",
     "@nestjs/schematics": "^9.0.1",

src/api/chats.controller.ts

@@ -3,6 +3,7 @@ import {
   Controller,
   Delete,
   Get,
+  NotFoundException,
   Param,
   Post,
   Put,
@@ -21,7 +22,12 @@ import {
 import { SessionManager } from '../core/abc/manager.abc';
 import { WhatsappSession } from '../core/abc/session.abc';
 import { parseBool } from '../helpers';
-import { GetChatMessagesQuery, GetChatsQuery } from '../structures/chats.dto';
+import {
+  ChatsPaginationParams,
+  GetChatMessageQuery,
+  GetChatMessagesFilter,
+  GetChatMessagesQuery,
+} from '../structures/chats.dto';
 import { EditMessageRequest } from '../structures/chatting.dto';
 
 @ApiSecurity('api_key')
@@ -36,9 +42,9 @@ class ChatsController {
   @ApiOperation({ summary: 'Get chats' })
   getChats(
     @WorkingSessionParam session: WhatsappSession,
-    @Query() query: GetChatsQuery,
+    @Query() pagination: ChatsPaginationParams,
   ) {
-    return session.getChats(query);
+    return session.getChats(pagination);
   }
 
   @Delete(':chatId')
@@ -56,13 +62,31 @@ class ChatsController {
   @SessionApiParam
   @ApiOperation({ summary: 'Gets messages in the chat' })
   @ChatIdApiParam
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
   getChatMessages(
     @Query() query: GetChatMessagesQuery,
+    @Query() filter: GetChatMessagesFilter,
     @WorkingSessionParam session: WhatsappSession,
     @Param('chatId') chatId: string,
   ) {
-    const downloadMedia = parseBool(query.downloadMedia);
-    return session.getChatMessages(chatId, query.limit, downloadMedia);
+    return session.getChatMessages(chatId, query, filter);
+  }
+
+  @Get(':chatId/messages/:messageId')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Gets message by id' })
+  @ChatIdApiParam
+  async getChatMessage(
+    @Query() query: GetChatMessageQuery,
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('chatId') chatId: string,
+    @Param('messageId') messageId: string,
+  ) {
+    const message = await session.getChatMessage(chatId, messageId, query);
+    if (!message) {
+      throw new NotFoundException('Message not found');
+    }
+    return message;
   }
 
   @Delete(':chatId/messages')
@@ -124,6 +148,17 @@ class ChatsController {
   ) {
     return session.chatsUnarchiveChat(chatId);
   }
+
+  @Post(':chatId/unread')
+  @SessionApiParam
+  @ChatIdApiParam
+  @ApiOperation({ summary: 'Unread the chat' })
+  unreadChat(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('chatId') chatId: string,
+  ) {
+    return session.chatsUnreadChat(chatId);
+  }
 }
 
 export { ChatsController };

src/api/chatting.controller.ts

@@ -9,6 +9,7 @@ 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 { SendButtonsRequest } from '@waha/structures/chatting.buttons.dto';
 
 import { SessionManager } from '../core/abc/manager.abc';
@@ -171,9 +172,12 @@ export class ChattingController {
 
   @Get('/messages')
   @ApiOperation({ summary: 'Get messages in a chat' })
-  async getMessages(@Query() query: GetMessageQuery) {
+  async getMessages(
+    @Query() query: GetMessageQuery,
+    @Query() filter: GetChatMessagesFilter,
+  ) {
     const whatsapp = await this.manager.getWorkingSession(query.session);
-    return whatsapp.getMessages(query);
+    return whatsapp.getChatMessages(query.chatId, query, filter);
   }
 
   @Get('/sendText')

src/api/contacts.controller.ts

@@ -1,4 +1,12 @@
-import { Body, Controller, Get, Post, Query } from '@nestjs/common';
+import {
+  Body,
+  Controller,
+  Get,
+  Post,
+  Query,
+  UsePipes,
+  ValidationPipe,
+} from '@nestjs/common';
 import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
 
 import { SessionManager } from '../core/abc/manager.abc';
@@ -7,7 +15,11 @@ import {
   CheckNumberStatusQuery,
   WANumberExistResult,
 } from '../structures/chatting.dto';
-import { ContactQuery, ContactRequest } from '../structures/contacts.dto';
+import {
+  ContactQuery,
+  ContactRequest,
+  ContactsPaginationParams,
+} from '../structures/contacts.dto';
 
 @ApiSecurity('api_key')
 @Controller('api/contacts')
@@ -15,6 +27,17 @@ import { ContactQuery, ContactRequest } from '../structures/contacts.dto';
 export class ContactsController {
   constructor(private manager: SessionManager) {}
 
+  @Get('/all')
+  @ApiOperation({ summary: 'Get all contacts' })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async getAll(
+    @Query() query: SessionQuery,
+    @Query() pagination: ContactsPaginationParams,
+  ) {
+    const whatsapp = await this.manager.getWorkingSession(query.session);
+    return whatsapp.getContacts(pagination);
+  }
+
   @Get('/')
   @ApiOperation({
     summary: 'Get contact basic info',
@@ -26,13 +49,6 @@ export class ContactsController {
     return whatsapp.getContact(query);
   }
 
-  @Get('/all')
-  @ApiOperation({ summary: 'Get all contacts' })
-  async getAll(@Query() query: SessionQuery) {
-    const whatsapp = await this.manager.getWorkingSession(query.session);
-    return whatsapp.getContacts();
-  }
-
   @Get('/check-exists')
   @ApiOperation({ summary: 'Check phone number is registered in WhatsApp.' })
   async checkExists(

src/api/sessions.controller.ts

@@ -135,6 +135,7 @@ class SessionsController {
   async delete(@Param('session') name: string): Promise<void> {
     await this.withLock(name, async () => {
       await this.manager.unassign(name);
+      await this.manager.unpair(name);
       await this.manager.stop(name, true);
       await this.manager.logout(name);
       await this.manager.delete(name);
@@ -190,6 +191,7 @@ class SessionsController {
         throw new NotFoundException('Session not found');
       }
       const isRunning = this.manager.isRunning(name);
+      await this.manager.unpair(name);
       await this.manager.stop(name, true);
       await this.manager.logout(name);
       if (isRunning) {
@@ -258,6 +260,7 @@ class SessionsController {
       // Old API did remove the session complete
       await this.withLock(name, async () => {
         await this.manager.unassign(name);
+        await this.manager.unpair(name);
         await this.manager.stop(name, true);
         await this.manager.logout(name);
         await this.manager.delete(name);
@@ -283,6 +286,7 @@ class SessionsController {
     const name = request.name;
     await this.withLock(name, async () => {
       await this.manager.unassign(name);
+      await this.manager.unpair(name);
       await this.manager.stop(name, true);
       await this.manager.logout(name);
       await this.manager.delete(name);

src/core/abc/manager.abc.ts

@@ -94,6 +94,8 @@ export abstract class SessionManager implements BeforeApplicationShutdown {
 
   abstract logout(name: string): Promise<void>;
 
+  abstract unpair(name: string): Promise<void>;
+
   abstract getSession(name: string): WhatsappSession;
 
   abstract getSessionInfo(name: string): Promise<SessionDetailedInfo | null>;

src/core/abc/session.abc.ts

@@ -3,9 +3,14 @@ import {
   CreateChannelRequest,
   ListChannelsQuery,
 } from '@waha/structures/channels.dto';
-import { GetChatsQuery } from '@waha/structures/chats.dto';
+import {
+  GetChatMessageQuery,
+  GetChatMessagesFilter,
+  GetChatMessagesQuery,
+} from '@waha/structures/chats.dto';
 import { SendButtonsRequest } from '@waha/structures/chatting.buttons.dto';
 import { Label, LabelID } from '@waha/structures/labels.dto';
+import { PaginationParams } from '@waha/structures/pagination.dto';
 import { WAMessage } from '@waha/structures/responses.dto';
 import { LoggerBuilder } from '@waha/utils/logging';
 import { EventEmitter } from 'events';
@@ -17,7 +22,6 @@ import {
   ChatRequest,
   CheckNumberStatusQuery,
   EditMessageRequest,
-  GetMessageQuery,
   MessageContactVcardRequest,
   MessageFileRequest,
   MessageForwardRequest,
@@ -111,6 +115,7 @@ export abstract class WhatsappSession {
   protected proxyConfig?: ProxyConfig;
   public sessionConfig?: SessionConfig;
   protected engineConfig?: any;
+  protected unpairing: boolean = false;
 
   private _status: WAHASessionStatus;
   private shouldPrintQR: boolean;
@@ -138,6 +143,11 @@ export abstract class WhatsappSession {
   }
 
   protected set status(value: WAHASessionStatus) {
+    if (this.unpairing && value !== WAHASessionStatus.STOPPED) {
+      // In case of unpairing
+      // wait for STOPPED event, ignore the rest
+      return;
+    }
     this._status = value;
     const body: WASessionStatusBody = { name: this.name, status: value };
     this.events.emit(WAHAEvents.SESSION_STATUS, body);
@@ -168,6 +178,7 @@ export abstract class WhatsappSession {
       '--disable-default-apps',
       '--disable-dev-shm-usage',
       '--disable-extensions',
+      '--disable-features=site-per-process',
       '--disable-gpu',
       '--disable-offer-store-unmasked-wallet-cards',
       '--disable-offline-load-stale-cache',
@@ -208,6 +219,11 @@ export abstract class WhatsappSession {
   /** Stop the session */
   abstract stop(): Promise<void>;
 
+  /* Unpair the account */
+  async unpair(): Promise<void> {
+    return;
+  }
+
   /** Subscribe the handler to specific hook */
   subscribeSessionEvent(
     hook: WAHAEvents | string,
@@ -306,10 +322,6 @@ export abstract class WhatsappSession {
 
   abstract stopTyping(chat: ChatRequest);
 
-  getMessages(query: GetMessageQuery) {
-    throw new NotImplementedByEngineError();
-  }
-
   abstract setReaction(request: MessageReactionRequest);
 
   setStar(request: MessageStarRequest): Promise<void> {
@@ -319,7 +331,7 @@ export abstract class WhatsappSession {
   /**
    * Chats methods
    */
-  public getChats(query: GetChatsQuery) {
+  public getChats(pagination: PaginationParams) {
     throw new NotImplementedByEngineError();
   }
 
@@ -329,12 +341,20 @@ export abstract class WhatsappSession {
 
   public getChatMessages(
     chatId: string,
-    limit: number,
-    downloadMedia: boolean,
+    query: GetChatMessagesQuery,
+    filter: GetChatMessagesFilter,
   ) {
     throw new NotImplementedByEngineError();
   }
 
+  public getChatMessage(
+    chatId: string,
+    messageId: string,
+    query: GetChatMessageQuery,
+  ): Promise<null | WAMessage> {
+    throw new NotImplementedByEngineError();
+  }
+
   public deleteMessage(chatId: string, messageId: string) {
     throw new NotImplementedByEngineError();
   }
@@ -359,6 +379,10 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
+  public chatsUnreadChat(chatId: string): Promise<any> {
+    throw new NotImplementedByEngineError();
+  }
+
   /**
    * Labels methods
    */
@@ -386,7 +410,7 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
-  public getContacts() {
+  public getContacts(pagination: PaginationParams) {
     throw new NotImplementedByEngineError();
   }
 

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

@@ -29,7 +29,7 @@ import { UnprocessableEntityException } from '@nestjs/common';
 import { sendButtonMessage } from '@waha/core/engines/noweb/noweb.buttons';
 import { NowebInMemoryStore } from '@waha/core/engines/noweb/store/NowebInMemoryStore';
 import { IMediaEngineProcessor } from '@waha/core/media/IMediaEngineProcessor';
-import { flipObject, parseBool, splitAt } from '@waha/helpers';
+import { flipObject, splitAt } from '@waha/helpers';
 import { PairingCodeResponse } from '@waha/structures/auth.dto';
 import { CallData } from '@waha/structures/calls.dto';
 import {
@@ -38,7 +38,11 @@ import {
   CreateChannelRequest,
   ListChannelsQuery,
 } from '@waha/structures/channels.dto';
-import { GetChatsQuery } from '@waha/structures/chats.dto';
+import {
+  GetChatMessageQuery,
+  GetChatMessagesFilter,
+  GetChatMessagesQuery,
+} from '@waha/structures/chats.dto';
 import { SendButtonsRequest } from '@waha/structures/chatting.buttons.dto';
 import { ContactQuery, ContactRequest } from '@waha/structures/contacts.dto';
 import { BinaryFile, RemoteFile } from '@waha/structures/files.dto';
@@ -48,26 +52,25 @@ import {
   LabelID,
 } from '@waha/structures/labels.dto';
 import { ReplyToMessage } from '@waha/structures/message.dto';
+import { PaginationParams } from '@waha/structures/pagination.dto';
 import {
   PollVote,
   PollVotePayload,
   WAMessageAckBody,
 } from '@waha/structures/webhooks.dto';
 import { LoggerBuilder } from '@waha/utils/logging';
-import { waitUntil } from '@waha/utils/promiseTimeout';
+import { sleep, waitUntil } from '@waha/utils/promiseTimeout';
 import { SingleDelayedJobRunner } from '@waha/utils/SingleDelayedJobRunner';
 import { SinglePeriodicJobRunner } from '@waha/utils/SinglePeriodicJobRunner';
 import * as Buffer from 'buffer';
 import { Agent } from 'https';
 import * as lodash from 'lodash';
-import { toNumber } from 'lodash';
 import * as NodeCache from 'node-cache';
 
 import {
   ChatRequest,
   CheckNumberStatusQuery,
   EditMessageRequest,
-  GetMessageQuery,
   MessageContactVcardRequest,
   MessageDestination,
   MessageFileRequest,
@@ -221,6 +224,12 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     });
   }
 
+  async unpair() {
+    this.unpairing = true;
+    this.shouldRestart = false;
+    await this.sock?.logout();
+  }
+
   getSocketConfig(agent, state): any {
     const fullSyncEnabled = this.sessionConfig?.noweb?.store?.fullSync || false;
     const browser = fullSyncEnabled
@@ -437,8 +446,14 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     this.startDelayedJob.cancel();
     this.autoRestartJob.stop();
 
+    // We'll restart the client if it's in the process of unpairing
     this.status = WAHASessionStatus.FAILED;
 
+    if (this.unpairing) {
+      // Wait for unpairing to complete before ending the socket
+      await sleep(1_000);
+    }
+
     await this.end();
     await this.store?.close();
   }
@@ -754,19 +769,17 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     return this.sock.sendPresenceUpdate('paused', chatId);
   }
 
-  async getMessages(query: GetMessageQuery) {
-    return this.getChatMessages(query.chatId, query.limit, query.downloadMedia);
-  }
-
   public async getChatMessages(
     chatId: string,
-    limit: number,
-    downloadMedia: boolean,
+    query: GetChatMessagesQuery,
+    filter: GetChatMessagesFilter,
   ) {
-    downloadMedia = parseBool(downloadMedia);
+    const downloadMedia = query.downloadMedia;
+    const pagination = query as PaginationParams;
     const messages = await this.store.getMessagesByJid(
       toJID(chatId),
-      toNumber(limit),
+      filter,
+      pagination,
     );
 
     const promises = [];
@@ -778,6 +791,17 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     return result;
   }
 
+  public async getChatMessage(
+    chatId: string,
+    messageId: string,
+    query: GetChatMessageQuery,
+  ): Promise<null | WAMessage> {
+    const key = parseMessageIdSerialized(messageId, true);
+    const message = await this.store.getMessageById(toJID(chatId), key.id);
+    if (!message) return null;
+    return await this.processIncomingMessage(message, query.downloadMedia);
+  }
+
   async setReaction(request: MessageReactionRequest) {
     const key = parseMessageIdSerialized(request.messageId);
     const reactionMessage = {
@@ -806,8 +830,8 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
    * Chats methods
    */
 
-  async getChats(query: GetChatsQuery) {
-    const chats = await this.store.getChats(query.limit, query.offset);
+  async getChats(pagination: PaginationParams) {
+    const chats = await this.store.getChats(pagination);
     // Remove unreadCount, it's not ready yet
     chats.forEach((chat) => delete chat.unreadCount);
     return chats;
@@ -818,7 +842,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     archive: boolean,
   ): Promise<any> {
     const jid = toJID(chatId);
-    const messages = await this.store.getMessagesByJid(jid, 1);
+    const messages = await this.store.getMessagesByJid(jid, {}, { limit: 1 });
     return await this.sock.chatModify(
       { archive: archive, lastMessages: messages },
       jid,
@@ -833,6 +857,15 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     return this.chatsPutArchive(chatId, false);
   }
 
+  public async chatsUnreadChat(chatId: string): Promise<any> {
+    const jid = toJID(chatId);
+    const messages = await this.store.getMessagesByJid(jid, {}, { limit: 1 });
+    return await this.sock.chatModify(
+      { markRead: false, lastMessages: messages },
+      jid,
+    );
+  }
+
   /**
    * Labels methods
    */
@@ -892,8 +925,8 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     return this.toWAContact(contact);
   }
 
-  async getContacts() {
-    const contacts = await this.store.getContacts();
+  async getContacts(pagination: PaginationParams) {
+    const contacts = await this.store.getContacts(pagination);
     return contacts.map(this.toWAContact);
   }
 
@@ -1702,6 +1735,8 @@ function toCusFormat(remoteJid) {
   return ensureSuffix(number);
 }
 
+export const ALL_JID = 'all@s.whatsapp.net';
+
 /**
  * Convert from 11111111111@c.us to 11111111111@s.whatsapp.net
  * @param chatId

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

@@ -1,11 +1,12 @@
 import { Chat } from '@adiwajshing/baileys';
+import { PaginationParams } from '@waha/structures/pagination.dto';
 
 export interface IChatRepository {
   getAll(): Promise<Chat[]>;
 
   getAllByIds(ids: string[]): Promise<Chat[]>;
 
-  getAllWithMessages(limit?: number, offset?: number): Promise<Chat[]>;
+  getAllWithMessages(pagination: PaginationParams): Promise<Chat[]>;
 
   getById(id: string): Promise<Chat | null>;
 

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

@@ -1,7 +1,8 @@
 import { Contact } from '@adiwajshing/baileys';
+import { PaginationParams } from '@waha/structures/pagination.dto';
 
 export interface IContactRepository {
-  getAll(): Promise<Contact[]>;
+  getAll(pagination?: PaginationParams): Promise<Contact[]>;
 
   getById(id: string): Promise<Contact | null>;
 

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

@@ -1,3 +1,6 @@
+import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
+import { PaginationParams } from '@waha/structures/pagination.dto';
+
 export interface IMessagesRepository {
   deleteAll(): Promise<void>;
 
@@ -5,7 +8,11 @@ export interface IMessagesRepository {
 
   upsertOne(message: any): Promise<void>;
 
-  getAllByJid(jid: string, limit: number): Promise<any[]>;
+  getAllByJid(
+    jid: string,
+    filter: GetChatMessagesFilter,
+    pagination: PaginationParams,
+  ): Promise<any[]>;
 
   getByJidById(jid: string, id: string): Promise<any | null>;
 

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

@@ -5,6 +5,8 @@ import {
   proto,
 } from '@adiwajshing/baileys';
 import { Label } from '@adiwajshing/baileys/lib/Types/Label';
+import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
+import { PaginationParams } from '@waha/structures/pagination.dto';
 
 export interface INowebStore {
   presences: any;
@@ -17,11 +19,17 @@ export interface INowebStore {
 
   loadMessage(jid: string, id: string): Promise<proto.IWebMessageInfo>;
 
-  getMessagesByJid(chatId: string, limit: number): Promise<any>;
+  getMessagesByJid(
+    chatId: string,
+    filter: GetChatMessagesFilter,
+    pagination: PaginationParams,
+  ): Promise<any>;
 
-  getChats(limit?: number, offset?: number): Promise<Chat[]>;
+  getMessageById(chatId: string, messageId: string): Promise<any>;
 
-  getContacts(): Promise<Contact[]>;
+  getChats(pagination: PaginationParams): Promise<Chat[]>;
+
+  getContacts(pagination: PaginationParams): Promise<Contact[]>;
 
   getContactById(jid: string): Promise<Contact>;
 

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

@@ -1,6 +1,8 @@
 import { Chat, Contact, makeInMemoryStore, proto } from '@adiwajshing/baileys';
 import { Label } from '@adiwajshing/baileys/lib/Types/Label';
 import { BadRequestException } from '@nestjs/common';
+import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
+import { PaginationParams } from '@waha/structures/pagination.dto';
 
 import { INowebStore } from './INowebStore';
 
@@ -37,15 +39,23 @@ export class NowebInMemoryStore implements INowebStore {
     return this.store.loadMessage(jid, id);
   }
 
-  getMessagesByJid(chatId: string, limit: number): Promise<any> {
+  getMessagesByJid(
+    chatId: string,
+    filter: GetChatMessagesFilter,
+    pagination: PaginationParams,
+  ): Promise<any> {
     throw new BadRequestException(this.errorMessage);
   }
 
-  getChats(limit?: number, offset?: number): Promise<Chat[]> {
+  getMessageById(chatId: string, messageId: string): Promise<any> {
     throw new BadRequestException(this.errorMessage);
   }
 
-  getContacts(): Promise<Contact[]> {
+  getChats(pagination: PaginationParams): Promise<Chat[]> {
+    throw new BadRequestException(this.errorMessage);
+  }
+
+  getContacts(pagination: PaginationParams): Promise<Contact[]> {
     throw new BadRequestException(this.errorMessage);
   }
 

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

@@ -16,6 +16,8 @@ import {
 } from '@adiwajshing/baileys/lib/Types/LabelAssociation';
 import { ILabelAssociationRepository } from '@waha/core/engines/noweb/store/ILabelAssociationsRepository';
 import { ILabelsRepository } from '@waha/core/engines/noweb/store/ILabelsRepository';
+import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
+import { PaginationParams, SortOrder } from '@waha/structures/pagination.dto';
 import { toNumber } from 'lodash';
 import { Logger } from 'pino';
 
@@ -322,20 +324,32 @@ export class NowebPersistentStore implements INowebStore {
     return proto.WebMessageInfo.fromObject(data);
   }
 
-  getMessagesByJid(chatId: string, limit: number) {
-    return this.messagesRepo.getAllByJid(toJID(chatId), toNumber(limit));
+  getMessagesByJid(
+    chatId: string,
+    filter: GetChatMessagesFilter,
+    pagination: PaginationParams,
+  ): Promise<any> {
+    pagination.sortBy = 'messageTimestamp';
+    pagination.sortOrder = SortOrder.DESC;
+    return this.messagesRepo.getAllByJid(chatId, filter, pagination);
   }
 
-  getChats(limit?: number, offset?: number): Promise<Chat[]> {
-    return this.chatRepo.getAllWithMessages(limit, offset);
+  getMessageById(chatId: string, messageId: string): Promise<any> {
+    return this.messagesRepo.getByJidById(chatId, messageId);
+  }
+
+  getChats(pagination: PaginationParams): Promise<Chat[]> {
+    pagination.sortBy ||= 'conversationTimestamp';
+    pagination.sortOrder ||= SortOrder.DESC;
+    return this.chatRepo.getAllWithMessages(pagination);
   }
 
   getContactById(jid) {
     return this.contactRepo.getById(jid);
   }
 
-  getContacts() {
-    return this.contactRepo.getAll();
+  getContacts(pagination: PaginationParams) {
+    return this.contactRepo.getAll(pagination);
   }
 
   getLabels(): Promise<Label[]> {

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

@@ -1,23 +1,24 @@
 import { Chat } from '@adiwajshing/baileys';
+import { PaginationParams } from '@waha/structures/pagination.dto';
+import { KnexPaginator } from '@waha/utils/Paginator';
 
 import { IChatRepository } from '../IChatRepository';
 import { NOWEBSqlite3KVRepository } from './NOWEBSqlite3KVRepository';
 
+class ChatPaginator extends KnexPaginator {
+  indexes = ['id', 'conversationTimestamp'];
+}
+
 export class Sqlite3ChatRepository
   extends NOWEBSqlite3KVRepository<Chat>
   implements IChatRepository
 {
-  async getAllWithMessages(limit?: number, offset?: number): Promise<Chat[]> {
+  protected Paginator = ChatPaginator;
+
+  async getAllWithMessages(pagination: PaginationParams): Promise<Chat[]> {
     // Get chats with conversationTimestamp is not Null
-    let query = this.select()
-      .whereNotNull('conversationTimestamp')
-      .orderBy('conversationTimestamp', 'desc');
-    if (limit != null) {
-      query = query.limit(limit);
-    }
-    if (offset != null) {
-      query = query.offset(offset);
-    }
+    let query = this.select().whereNotNull('conversationTimestamp');
+    query = this.pagination(query, pagination);
     return await this.all(query);
   }
 }

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

@@ -1,8 +1,16 @@
 import { Contact } from '@adiwajshing/baileys';
+import { KnexPaginator } from '@waha/utils/Paginator';
 
 import { IContactRepository } from '../IContactRepository';
 import { NOWEBSqlite3KVRepository } from './NOWEBSqlite3KVRepository';
 
+class ContactPaginator extends KnexPaginator {
+  indexes = ['id'];
+}
+
 export class Sqlite3ContactRepository
   extends NOWEBSqlite3KVRepository<Contact>
-  implements IContactRepository {}
+  implements IContactRepository
+{
+  protected Paginator = ContactPaginator;
+}

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

@@ -1,3 +1,7 @@
+import { ALL_JID } from '@waha/core/engines/noweb/session.noweb.core';
+import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
+import { PaginationParams } from '@waha/structures/pagination.dto';
+
 import { IMessagesRepository } from '../IMessagesRepository';
 import { NOWEBSqlite3KVRepository } from './NOWEBSqlite3KVRepository';
 
@@ -9,11 +13,36 @@ export class Sqlite3MessagesRepository
     return this.upsertMany(messages);
   }
 
-  getAllByJid(jid: string, limit: number): Promise<any[]> {
-    const query = this.select()
-      .where({ jid: jid })
-      .limit(limit)
-      .orderBy('messageTimestamp', 'DESC');
+  async getAllByJid(
+    jid: string,
+    filter: GetChatMessagesFilter,
+    pagination: PaginationParams,
+  ): Promise<any[]> {
+    let query = this.select();
+    if (jid !== ALL_JID) {
+      query = this.select().where({ jid: jid });
+    }
+    if (filter['filter.timestamp.lte'] != null) {
+      query = query.where(
+        'messageTimestamp',
+        '<=',
+        filter['filter.timestamp.lte'],
+      );
+    }
+    if (filter['filter.timestamp.gte'] != null) {
+      query = query.where(
+        'messageTimestamp',
+        '>=',
+        filter['filter.timestamp.gte'],
+      );
+    }
+    if (filter['filter.fromMe'] != null) {
+      // filter by data->"$.key.fromMe"
+      query = query.whereRaw("data->'$.key.fromMe' = ?", [
+        filter['filter.fromMe'] ? 'true' : 'false',
+      ]);
+    }
+    query = this.pagination(query, pagination);
     return this.all(query);
   }
 

src/core/engines/webjs/WahaInjected.js

@@ -1,15 +0,0 @@
-exports.LoadUtils = () => {
-  window.WAHA = {};
-
-  window.WAHA.getChats = async (limit, offset) => {
-    let chats = window.Store.Chat.getModelsArray();
-    if (limit || offset) {
-      offset = offset || 0;
-      limit = limit || Infinity;
-      chats = chats.slice(offset, offset + limit);
-    }
-
-    const chatPromises = chats.map((chat) => window.WWebJS.getChatModel(chat));
-    return await Promise.all(chatPromises);
-  };
-};

src/core/engines/webjs/WebjsClient.ts

@@ -1,7 +1,17 @@
+import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
+import { PaginationParams } from '@waha/structures/pagination.dto';
+import * as lodash from 'lodash';
 import { Client } from 'whatsapp-web.js';
+import { Message } from 'whatsapp-web.js/src/structures';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const { LoadUtils } = require('./WahaInjected');
+const { LoadWAHA } = require('./_WAHA.js');
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { LoadLodash } = require('./_lodash.js');
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { LoadPaginator } = require('./_Paginator.js');
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const ChatFactory = require('whatsapp-web.js/src/factories/ChatFactory');
@@ -12,27 +22,110 @@ export class WebjsClient extends Client {
     // We can still call and override it
     // @ts-ignore
     await super.inject();
-    //Load util functions (serializers, helper functions)
-    await this.pupPage.evaluate(LoadUtils);
+
+    // Load util functions (serializers, helper functions)
+    await this.pupPage.evaluate(LoadLodash);
+    await this.pupPage.evaluate(LoadPaginator);
+    await this.pupPage.evaluate(LoadWAHA);
   }
 
-  async getChats(limit?: number, offset?: number) {
-    if (limit == null && offset == null) {
+  async unpair() {
+    await this.pupPage.evaluate(async () => {
+      if (
+        // @ts-ignore
+        window.Store &&
+        // @ts-ignore
+        window.Store.AppState &&
+        // @ts-ignore
+        typeof window.Store.AppState.logout === 'function'
+      ) {
+        // @ts-ignore
+        await window.Store.AppState.logout();
+      }
+    });
+  }
+
+  async getChats(pagination?: PaginationParams) {
+    if (lodash.isEmpty(pagination)) {
       return await super.getChats();
     }
-    return await this.getChats2(limit, offset);
-  }
 
-  private async getChats2(limit?: number, offset?: number) {
-    const chats = await this.pupPage.evaluate(
-      async (limit, offset) => {
-        // @ts-ignore
-        return await window.WAHA.getChats(limit, offset);
-      },
-      limit,
-      offset,
-    );
+    // Get paginated chats
+    pagination.limit ||= Infinity;
+    pagination.offset ||= 0;
+
+    const chats = await this.pupPage.evaluate(async (pagination) => {
+      // @ts-ignore
+      return await window.WAHA.getChats(pagination);
+    }, pagination);
 
     return chats.map((chat) => ChatFactory.create(this, chat));
   }
+
+  async getMessages(
+    chatId: string,
+    filter: GetChatMessagesFilter,
+    pagination: PaginationParams,
+  ) {
+    const messages = await this.pupPage.evaluate(
+      async (chatId, filter, pagination) => {
+        pagination.limit ||= Infinity;
+        pagination.offset ||= 0;
+
+        const msgFilter = (m) => {
+          if (m.isNotification) {
+            return false;
+          }
+          if (
+            filter['filter.fromMe'] != null &&
+            m.id.fromMe !== filter['filter.fromMe']
+          ) {
+            return false;
+          }
+          if (
+            filter['filter.timestamp.gte'] != null &&
+            m.t < filter['filter.timestamp.gte']
+          ) {
+            return false;
+          }
+          if (
+            filter['filter.timestamp.lte'] != null &&
+            m.t > filter['filter.timestamp.lte']
+          ) {
+            return false;
+          }
+          return true;
+        };
+
+        // @ts-ignore
+        const chat = await window.WWebJS.getChat(chatId, { getAsModel: false });
+        let msgs = chat.msgs.getModelsArray().filter(msgFilter);
+
+        while (msgs.length < pagination.limit + pagination.offset) {
+          const loadedMessages =
+            // @ts-ignore
+            await window.Store.ConversationMsgs.loadEarlierMsgs(chat);
+          if (!loadedMessages || !loadedMessages.length) break;
+          msgs = [...loadedMessages.filter(msgFilter), ...msgs];
+        }
+
+        if (msgs.length > pagination.limit + pagination.offset) {
+          // sort by t - new first
+          msgs = msgs.sort((a, b) => b.t - a.t);
+          msgs = msgs.slice(
+            pagination.offset,
+            pagination.limit + pagination.offset,
+          );
+        }
+
+        // @ts-ignore
+        return msgs.map((m) => window.WWebJS.getMessageModel(m));
+      },
+      chatId,
+      filter,
+      pagination,
+    );
+
+    return messages.map((m) => new Message(this, m));
+  }
 }

src/core/engines/webjs/_Paginator.js

@@ -0,0 +1,35 @@
+exports.LoadPaginator = () => {
+  class Paginator {
+    constructor(pagination) {
+      this.pagination = pagination;
+    }
+
+    apply(data) {
+      if (window.lodash.isEmpty(this.pagination)) {
+        return data;
+      }
+      return this.limit(this.sort(data));
+    }
+
+    sort(data) {
+      if (!this.pagination?.sortBy) {
+        return data;
+      }
+      return window.lodash.orderBy(
+        data,
+        [this.pagination.sortBy],
+        [this.pagination.sortOrder || 'asc'],
+      );
+    }
+
+    limit(data) {
+      if (!this.pagination?.limit) {
+        return data;
+      }
+      const offset = this.pagination.offset || 0;
+      const limit = this.pagination.limit || Infinity;
+      return data.slice(offset, offset + limit);
+    }
+  }
+  window.Paginator = Paginator;
+};

src/core/engines/webjs/_WAHA.js

@@ -0,0 +1,11 @@
+exports.LoadWAHA = () => {
+  window.WAHA = {};
+
+  window.WAHA.getChats = async (pagination) => {
+    let chats = window.Store.Chat.getModelsArray().slice();
+    const paginator = new window.Paginator(pagination);
+    chats = paginator.apply(chats);
+    const chatPromises = chats.map((chat) => window.WWebJS.getChatModel(chat));
+    return await Promise.all(chatPromises);
+  };
+};

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

@@ -10,7 +10,7 @@ import {
 } from '@waha/core/exceptions';
 import { IMediaEngineProcessor } from '@waha/core/media/IMediaEngineProcessor';
 import { QR } from '@waha/core/QR';
-import { parseBool, splitAt } from '@waha/helpers';
+import { splitAt } from '@waha/helpers';
 import { PairingCodeResponse } from '@waha/structures/auth.dto';
 import { CallData } from '@waha/structures/calls.dto';
 import {
@@ -19,12 +19,17 @@ import {
   CreateChannelRequest,
   ListChannelsQuery,
 } from '@waha/structures/channels.dto';
-import { ChatArchiveEvent, GetChatsQuery } from '@waha/structures/chats.dto';
+import {
+  ChatArchiveEvent,
+  ChatSortField,
+  GetChatMessageQuery,
+  GetChatMessagesFilter,
+  GetChatMessagesQuery,
+} from '@waha/structures/chats.dto';
 import {
   ChatRequest,
   CheckNumberStatusQuery,
   EditMessageRequest,
-  GetMessageQuery,
   MessageFileRequest,
   MessageForwardRequest,
   MessageImageRequest,
@@ -54,10 +59,12 @@ import {
 } from '@waha/structures/groups.dto';
 import { Label, LabelID } from '@waha/structures/labels.dto';
 import { ReplyToMessage } from '@waha/structures/message.dto';
+import { PaginationParams } from '@waha/structures/pagination.dto';
 import { WAMessage, WAMessageReaction } from '@waha/structures/responses.dto';
 import { MeInfo } from '@waha/structures/sessions.dto';
 import { WAMessageRevokedBody } from '@waha/structures/webhooks.dto';
-import { waitUntil } from '@waha/utils/promiseTimeout';
+import { PaginatorInMemory } from '@waha/utils/Paginator';
+import { sleep, waitUntil } from '@waha/utils/promiseTimeout';
 import { SingleDelayedJobRunner } from '@waha/utils/SingleDelayedJobRunner';
 import {
   Call,
@@ -128,7 +135,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     // this.log.debug(`Using web version: '${webVersion}'`);
     return {
       puppeteer: {
-        headless: true,
+        headless: 'new',
         executablePath: this.getBrowserExecutablePath(),
         args: this.getBrowserArgsForPuppeteer(),
         dumpio: this.isDebugEnabled(),
@@ -193,15 +200,13 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       .then(() => {
         // Listen for browser disconnected event
         this.whatsapp.pupBrowser.on('disconnected', () => {
-          this.status = WAHASessionStatus.FAILED;
           this.logger.error('The browser has been disconnected');
-          this.restartClient();
+          this.failed();
         });
         // Listen for page close event
         this.whatsapp.pupPage.on('close', () => {
-          this.status = WAHASessionStatus.FAILED;
           this.logger.error('The WhatsApp Web page has been closed');
-          this.restartClient();
+          this.failed();
         });
 
         // Listen for page error event
@@ -216,9 +221,8 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
         }
       })
       .catch((error) => {
-        this.status = WAHASessionStatus.FAILED;
         this.logger.error(error);
-        this.restartClient();
+        this.failed();
         return;
       });
     if (this.isDebugEnabled()) {
@@ -233,8 +237,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     await this.init().catch((err) => {
       this.logger.error('Failed to start the client');
       this.logger.error(err, err.stack);
-      this.status = WAHASessionStatus.FAILED;
-      this.restartClient();
+      this.failed();
     });
     return this;
   }
@@ -247,6 +250,20 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     await this.end();
   }
 
+  protected failed() {
+    // We'll restart the client if it's in the process of unpairing
+    this.status = WAHASessionStatus.FAILED;
+    this.restartClient();
+  }
+
+  async unpair() {
+    this.unpairing = true;
+    this.shouldRestart = false;
+    await this.whatsapp.unpair();
+    // Wait for unpairing to complete
+    await sleep(2_000);
+  }
+
   private async end() {
     this.engineStateCheckDelayedJob.cancel();
     try {
@@ -318,13 +335,13 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     });
 
     this.whatsapp.on(Events.AUTHENTICATION_FAILURE, (args) => {
-      this.status = WAHASessionStatus.FAILED;
+      this.failed();
       this.qr.save('');
       this.logger.info({ args: args }, `Session has failed to authenticate!`);
     });
 
     this.whatsapp.on(Events.DISCONNECTED, (args) => {
-      this.status = WAHASessionStatus.FAILED;
+      this.failed();
       this.qr.save('');
       this.logger.info({ args: args }, `Session has been disconnected!`);
     });
@@ -340,7 +357,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
 
       log.info(`Session state changed to bad state, waiting for recovery...`);
       this.engineStateCheckDelayedJob.schedule(async () => {
-        if (!this.startDelayedJob.scheduled) {
+        if (this.startDelayedJob.scheduled) {
           log.info('Session is restarting already, skip check.');
           return;
         }
@@ -493,10 +510,6 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     await chat.clearState();
   }
 
-  async getMessages(query: GetMessageQuery) {
-    return this.getChatMessages(query.chatId, query.limit, query.downloadMedia);
-  }
-
   async setReaction(request: MessageReactionRequest) {
     const message = this.recreateMessage(request.messageId);
     return message.react(request.reaction);
@@ -525,18 +538,39 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
   /**
    * Chats methods
    */
-  getChats(query: GetChatsQuery) {
-    return this.whatsapp.getChats(query.limit, query.offset);
+  getChats(pagination: PaginationParams) {
+    switch (pagination.sortBy) {
+      case ChatSortField.ID:
+        pagination.sortBy = 'id._serialized';
+        break;
+      case ChatSortField.CONVERSATION_TIMESTAMP:
+        pagination.sortBy = 't';
+        break;
+    }
+    return this.whatsapp.getChats(pagination);
   }
 
-  async getChatMessages(chatId: string, limit: number, downloadMedia: boolean) {
-    downloadMedia = parseBool(downloadMedia);
-    const chat: Chat = await this.whatsapp.getChatById(
+  public async getChatMessages(
+    chatId: string,
+    query: GetChatMessagesQuery,
+    filter: GetChatMessagesFilter,
+  ) {
+    if (chatId == 'all') {
+      throw new NotImplementedByEngineError(
+        "Can not get messages from 'all' in WEBJS",
+      );
+    }
+
+    const limit = query.limit;
+    const downloadMedia = query.downloadMedia;
+    // Test there's chat with id
+    await this.whatsapp.getChatById(this.ensureSuffix(chatId));
+    const pagination: PaginationParams = query;
+    const messages = await this.whatsapp.getMessages(
       this.ensureSuffix(chatId),
+      filter,
+      pagination,
     );
-    const messages = await chat.fetchMessages({
-      limit: limit,
-    });
     const promises = [];
     for (const msg of messages) {
       promises.push(this.processIncomingMessage(msg, downloadMedia));
@@ -546,6 +580,16 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     return result;
   }
 
+  public async getChatMessage(
+    chatId: string,
+    messageId: string,
+    query: GetChatMessageQuery,
+  ): Promise<null | WAMessage> {
+    const message = await this.whatsapp.getMessageById(messageId);
+    if (!message) return null;
+    return await this.processIncomingMessage(message, query.downloadMedia);
+  }
+
   async deleteChat(chatId) {
     const chat = await this.whatsapp.getChatById(chatId);
     return chat.delete();
@@ -566,6 +610,11 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     return this.whatsapp.unarchiveChat(id);
   }
 
+  public chatsUnreadChat(chatId: string): Promise<any> {
+    const id = this.ensureSuffix(chatId);
+    return this.whatsapp.markChatUnread(id);
+  }
+
   /**
    *
    * Label methods
@@ -611,10 +660,11 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       .then(this.toWAContact);
   }
 
-  getContacts() {
-    return this.whatsapp
-      .getContacts()
-      .then((contacts) => contacts.map(this.toWAContact));
+  async getContacts(pagination: PaginationParams) {
+    const contactsWEBJS = await this.whatsapp.getContacts();
+    const contacts = contactsWEBJS.map(this.toWAContact);
+    const paginator = new PaginatorInMemory(pagination);
+    return paginator.apply(contacts);
   }
 
   public async getContactAbout(query: ContactQuery) {

src/core/exceptions.ts

@@ -6,7 +6,7 @@ export class NotImplementedByEngineError extends UnprocessableEntityException {
   constructor(msg = '') {
     let error = 'The method is not implemented by the engine.';
     if (msg) {
-      error += ` ${msg}`;
+      error = `${msg} ${error}`;
     }
     super(error);
   }

src/core/manager.core.ts

@@ -211,6 +211,19 @@ export class SessionManagerCore extends SessionManager {
     await sleep(this.SESSION_STOP_TIMEOUT);
   }
 
+  async unpair(name: string) {
+    if (!this.session) {
+      return;
+    }
+    const session = this.session as WhatsappSession;
+
+    this.log.info('Unpairing the device from account...', { session: name });
+    await session.unpair().catch((err) => {
+      this.log.warn(`Error while unpairing from device: ${err}`);
+    });
+    await sleep(1000);
+  }
+
   async logout(name: string): Promise<void> {
     this.onlyDefault(name);
     await this.sessionAuthRepository.clean(name);

src/core/storage/sqlite3/Sqlite3KVRepository.ts

@@ -1,5 +1,7 @@
+import { PaginationParams } from '@waha/structures/pagination.dto';
+import { KnexPaginator } from '@waha/utils/Paginator';
 import { Database } from 'better-sqlite3';
-import Knex from 'knex';
+import Knex, { QueryBuilder } from 'knex';
 
 import { Field, Schema } from './Schema';
 
@@ -15,6 +17,8 @@ export class Sqlite3KVRepository<Entity> {
   private readonly columns: Field[];
   private knex: Knex.Knex;
 
+  protected Paginator = KnexPaginator;
+
   constructor(
     db: Database,
     schema: Schema,
@@ -29,8 +33,10 @@ export class Sqlite3KVRepository<Entity> {
     this.knex = Knex({ client: 'better-sqlite3', useNullAsDefault: true });
   }
 
-  getAll() {
-    return this.all(this.select());
+  getAll(pagination?: PaginationParams) {
+    let query = this.select();
+    query = this.pagination(query, pagination);
+    return this.all(query);
   }
 
   getAllByIds(ids: string[]) {
@@ -163,4 +169,9 @@ export class Sqlite3KVRepository<Entity> {
   protected parse(row: any) {
     return JSON.parse(row.data);
   }
+
+  protected pagination(query: any, pagination?: PaginationParams) {
+    const paginator = new this.Paginator(pagination);
+    return paginator.apply(query);
+  }
 }

src/structures/chats.dto.ts

@@ -1,35 +1,91 @@
 import { ApiProperty } from '@nestjs/swagger';
+import { BooleanString } from '@waha/nestjs/validation/BooleanString';
+import { PaginationParams } from '@waha/structures/pagination.dto';
 import { ChatIdProperty } from '@waha/structures/properties.dto';
-import { Type } from 'class-transformer';
-import { IsNumber, IsOptional } from 'class-validator';
-
-import { SessionQuery } from './base.dto';
+import { Transform, Type } from 'class-transformer';
+import { IsBoolean, IsEnum, IsNumber, IsOptional } from 'class-validator';
 
 /**
  * Queries
  */
 
-export class GetChatMessagesQuery extends SessionQuery {
+export class GetChatMessagesFilter {
+  @ApiProperty({
+    required: false,
+    description: 'Filter messages before this timestamp (inclusive)',
+  })
+  @IsNumber()
+  @IsOptional()
+  @Type(() => Number)
+  'filter.timestamp.lte'?: number;
+
+  @ApiProperty({
+    required: false,
+    description: 'Filter messages after this timestamp (inclusive)',
+  })
+  @IsNumber()
+  @IsOptional()
+  @Type(() => Number)
+  'filter.timestamp.gte'?: number;
+
+  @ApiProperty({
+    required: false,
+    description: 'From me filter (by default shows all messages)',
+  })
+  @Transform(BooleanString)
+  @IsBoolean()
+  @IsOptional()
+  'filter.fromMe'?: boolean;
+}
+
+export class GetChatMessagesQuery {
+  @IsNumber()
+  @IsOptional()
+  @Type(() => Number)
   limit: number = 100;
 
+  @IsNumber()
+  @IsOptional()
+  @Type(() => Number)
+  offset?: number;
+
   @ApiProperty({
     example: true,
     required: false,
     description: 'Download media for messages',
   })
+  @Transform(BooleanString)
+  @IsBoolean()
+  @IsOptional()
   downloadMedia: boolean = true;
 }
 
-export class GetChatsQuery {
-  @IsNumber()
+export class GetChatMessageQuery {
+  @ApiProperty({
+    example: true,
+    required: false,
+    description: 'Download media for messages',
+  })
+  @Transform(BooleanString)
+  @IsBoolean()
   @IsOptional()
-  @Type(() => Number)
-  limit?: number;
+  downloadMedia: boolean = true;
+}
 
-  @IsNumber()
+export enum ChatSortField {
+  CONVERSATION_TIMESTAMP = 'conversationTimestamp',
+  ID = 'id',
+  NAME = 'name',
+}
+
+export class ChatsPaginationParams extends PaginationParams {
+  @ApiProperty({
+    description: 'Sort by field',
+    enum: ChatSortField,
+  })
   @IsOptional()
-  @Type(() => Number)
-  offset?: number;
+  @IsEnum(ChatSortField)
+  sortBy?: string;
 }
 
 /**

src/structures/chatting.dto.ts

@@ -4,9 +4,14 @@ import {
   ApiProperty,
   getSchemaPath,
 } from '@nestjs/swagger';
-import { IsNumber, IsString } from 'class-validator';
+import { GetChatMessagesQuery } from '@waha/structures/chats.dto';
+import { IsNotEmpty, IsNumber, IsString } from 'class-validator';
 
-import { SessionBaseRequest, SessionQuery } from './base.dto';
+import {
+  SessionBaseRequest,
+  SessionQuery,
+  WHATSAPP_DEFAULT_SESSION_NAME,
+} from './base.dto';
 import {
   BinaryFile,
   RemoteFile,
@@ -42,16 +47,12 @@ export class ChatQuery extends SessionQuery {
   chatId: string;
 }
 
-export class GetMessageQuery extends ChatQuery {
-  @IsNumber()
-  limit: number;
+export class GetMessageQuery extends GetChatMessagesQuery {
+  @IsNotEmpty()
+  session: string = WHATSAPP_DEFAULT_SESSION_NAME;
 
-  @ApiProperty({
-    example: true,
-    required: false,
-    description: 'Download media for messages',
-  })
-  downloadMedia: true;
+  @ChatIdProperty()
+  chatId: string;
 }
 
 export class GetPresenceQuery extends ChatQuery {}

src/structures/contacts.dto.ts

@@ -1,5 +1,7 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { PaginationParams } from '@waha/structures/pagination.dto';
 import { ChatIdProperty } from '@waha/structures/properties.dto';
-import { IsString } from 'class-validator';
+import { IsEnum, IsOptional, IsString } from 'class-validator';
 
 import { SessionBaseRequest, SessionQuery } from './base.dto';
 
@@ -13,6 +15,21 @@ export class ContactQuery extends SessionQuery {
   contactId: string;
 }
 
+enum ContactSortField {
+  ID = 'id',
+  NAME = 'name',
+}
+
+export class ContactsPaginationParams extends PaginationParams {
+  @ApiProperty({
+    description: 'Sort by field',
+    enum: ContactSortField,
+  })
+  @IsOptional()
+  @IsEnum(ContactSortField)
+  sortBy?: string;
+}
+
 /**
  * Requests
  */

src/structures/pagination.dto.ts

@@ -0,0 +1,33 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
+import { IsNumber, IsOptional, ValidateIf } from 'class-validator';
+
+export enum SortOrder {
+  DESC = 'desc',
+  ASC = 'asc',
+}
+
+export class PaginationParams {
+  @IsNumber()
+  @IsOptional()
+  @Type(() => Number)
+  limit?: number;
+
+  @IsNumber()
+  @IsOptional()
+  @Type(() => Number)
+  offset?: number;
+
+  @ApiProperty({
+    description: 'Sort by field',
+  })
+  @IsOptional()
+  sortBy?: string;
+
+  @ApiProperty({
+    description:
+      'Sort order - <b>desc</b>ending (Z => A, New first) or <b>asc</b>ending (A => Z, Old first)',
+  })
+  @IsOptional()
+  sortOrder?: SortOrder;
+}

src/utils/Paginator.ts

@@ -0,0 +1,93 @@
+import { PaginationParams } from '@waha/structures/pagination.dto';
+import * as lodash from 'lodash';
+
+export abstract class Paginator {
+  constructor(protected readonly pagination: PaginationParams) {}
+
+  apply<T>(data: T): T {
+    if (lodash.isEmpty(this.pagination)) {
+      return data;
+    }
+    return this.limit(this.sort(data));
+  }
+
+  protected abstract sort(data: any);
+
+  protected abstract limit(data: any);
+}
+
+export class PaginatorInMemory extends Paginator {
+  protected sort(data: any[]) {
+    if (!this.pagination?.sortBy) {
+      return data;
+    }
+    return lodash.orderBy(
+      data,
+      this.pagination.sortBy,
+      this.pagination.sortOrder || 'asc',
+    );
+  }
+
+  protected limit(data: any[]) {
+    if (!this.pagination?.limit) {
+      return data;
+    }
+    const offset = this.pagination.offset || 0;
+    const limit = this.pagination.limit || Infinity;
+    return data.slice(offset, offset + limit);
+  }
+}
+
+export class KnexPaginator extends Paginator {
+  indexes: string[] = [];
+  dataField: string = 'data';
+
+  protected sort(query: any) {
+    if (!this.pagination?.sortBy) {
+      return query;
+    }
+    const sortBy = this.pagination.sortBy;
+    const direction = this.pagination.sortOrder || 'asc';
+    if (this.indexes.includes(sortBy)) {
+      return query.orderBy(sortBy, direction);
+    }
+    // Use data->"$.{field}"
+    // Make sure to sanitize sortBy to prevent SQL injection
+    // sqlite3 doesn't support binding for column names and direction
+    return query.orderByRaw(`${this.dataField}->'$.${sortBy}' ${direction}`);
+  }
+
+  protected limit(query: any) {
+    const limit = this.pagination.limit;
+    const offset = this.pagination.offset;
+    if (limit != null) {
+      query = query.limit(limit);
+    }
+    if (offset != null) {
+      query = query.offset(offset);
+    }
+    return query;
+  }
+}
+
+export class MongoPaginator extends Paginator {
+  protected sort(query: any) {
+    if (!this.pagination?.sortBy) {
+      return query;
+    }
+    const mongoDirection = this.pagination.sortOrder === 'asc' ? 1 : -1;
+    return query.sort({ [this.pagination.sortBy]: mongoDirection });
+  }
+
+  protected limit(query: any) {
+    const limit = this.pagination.limit;
+    const offset = this.pagination.offset;
+    if (limit != null) {
+      query = query.limit(limit);
+    }
+    if (offset != null) {
+      query = query.skip(offset);
+    }
+    return query;
+  }
+}

src/version.ts

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

yarn.lock

@@ -7,7 +7,7 @@ __metadata:
 
 "@adiwajshing/baileys@github:devlikeapro/Baileys#fork-master-channels-678":
   version: 6.7.8
-  resolution: "@adiwajshing/baileys@https://github.com/devlikeapro/Baileys.git#commit=d0323b92eb8365e6f32a61e41dd00010602d07f1"
+  resolution: "@adiwajshing/baileys@https://github.com/devlikeapro/Baileys.git#commit=1a3d827b5d9633e0b82d95362fc07cf1060aa32f"
   dependencies:
     "@adiwajshing/keyed-db": ^0.2.4
     "@hapi/boom": ^9.1.3
@@ -39,7 +39,7 @@ __metadata:
       optional: true
     sharp:
       optional: true
-  checksum: a3b461006443713074401a17c3481aef571301e83f1fba193d06e7f9ea4c47359b5c973d0b3804e34d4e48c35bdc1a64d8c3e59a0a744e5bc9bcca591d180901
+  checksum: fd4053af48069c3cdd6017075490d2061302e8006acbcf4d9a831159a1ae213548d135acbc4f2b8217c48bf989dbdc5c96a904df71becf2b0576a7a61998cc83
   languageName: node
   linkType: hard
 
@@ -3752,15 +3752,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"agent-base@npm:6":
-  version: 6.0.2
-  resolution: "agent-base@npm:6.0.2"
-  dependencies:
-    debug: 4
-  checksum: f52b6872cc96fd5f622071b71ef200e01c7c4c454ee68bc9accca90c98cfb39f2810e3e9aa330435835eedc8c23f4f8a15267f67c6e245d2b33757575bdac49d
-  languageName: node
-  linkType: hard
-
 "agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1":
   version: 7.1.1
   resolution: "agent-base@npm:7.1.1"
@@ -4599,6 +4590,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bufferutil@npm:^4.0.8":
+  version: 4.0.8
+  resolution: "bufferutil@npm:4.0.8"
+  dependencies:
+    node-gyp: latest
+    node-gyp-build: ^4.3.0
+  checksum: 7e9a46f1867dca72fda350966eb468eca77f4d623407b0650913fadf73d5750d883147d6e5e21c56f9d3b0bdc35d5474e80a600b9f31ec781315b4d2469ef087
+  languageName: node
+  linkType: hard
+
 "busboy@npm:^1.0.0":
   version: 1.6.0
   resolution: "busboy@npm:1.6.0"
@@ -5551,13 +5552,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"devtools-protocol@npm:0.0.1045489":
-  version: 0.0.1045489
-  resolution: "devtools-protocol@npm:0.0.1045489"
-  checksum: 670b2ecc8e890358b08da3095b4c927ffc5ef846a39e1526ff99aecaa623b339450dfe308e421e64bf94308441832b8e9497ebda97fb02266fef3f455286742f
-  languageName: node
-  linkType: hard
-
 "devtools-protocol@npm:0.0.1232444":
   version: 0.0.1232444
   resolution: "devtools-protocol@npm:0.0.1232444"
@@ -7157,16 +7151,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:5.0.1":
-  version: 5.0.1
-  resolution: "https-proxy-agent@npm:5.0.1"
-  dependencies:
-    agent-base: 6
-    debug: 4
-  checksum: 571fccdf38184f05943e12d37d6ce38197becdd69e58d03f43637f7fa1269cf303a7d228aa27e5b27bbd3af8f09fd938e1c91dcfefff2df7ba77c20ed8dfc765
-  languageName: node
-  linkType: hard
-
 "https-proxy-agent@npm:^7.0.0, https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.2":
   version: 7.0.4
   resolution: "https-proxy-agent@npm:7.0.4"
@@ -9178,6 +9162,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-gyp-build@npm:^4.3.0":
+  version: 4.8.2
+  resolution: "node-gyp-build@npm:4.8.2"
+  bin:
+    node-gyp-build: bin.js
+    node-gyp-build-optional: optional.js
+    node-gyp-build-test: build-test.js
+  checksum: 1a57bba8c4c193f808bd8ad1484d4ebdd8106dd9f04a3e82554dc716e3a2d87d7e369e9503c145e0e6a7e2c663fec0d8aaf52bd8156342ec7fc388195f37824e
+  languageName: node
+  linkType: hard
+
 "node-gyp@npm:latest":
   version: 10.1.0
   resolution: "node-gyp@npm:10.1.0"
@@ -10060,7 +10055,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"proxy-from-env@npm:1.1.0, proxy-from-env@npm:^1.1.0":
+"proxy-from-env@npm:^1.1.0":
   version: 1.1.0
   resolution: "proxy-from-env@npm:1.1.0"
   checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4
@@ -10098,24 +10093,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"puppeteer-core@npm:18.2.1":
-  version: 18.2.1
-  resolution: "puppeteer-core@npm:18.2.1"
-  dependencies:
-    cross-fetch: 3.1.5
-    debug: 4.3.4
-    devtools-protocol: 0.0.1045489
-    extract-zip: 2.0.1
-    https-proxy-agent: 5.0.1
-    proxy-from-env: 1.1.0
-    rimraf: 3.0.2
-    tar-fs: 2.1.1
-    unbzip2-stream: 1.4.3
-    ws: 8.9.0
-  checksum: 27ed65a7335ee3f4356425ebe4bbb5202f7b39493398643554a12b981922b2243dc331d9a478215706b79696bcf391637dd5e5405d60aff6ba8f94f0c3fea742
-  languageName: node
-  linkType: hard
-
 "puppeteer-core@npm:21.11.0":
   version: 21.11.0
   resolution: "puppeteer-core@npm:21.11.0"
@@ -10130,18 +10107,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"puppeteer@npm:^18.2.1":
-  version: 18.2.1
-  resolution: "puppeteer@npm:18.2.1"
-  dependencies:
-    https-proxy-agent: 5.0.1
-    progress: 2.0.3
-    proxy-from-env: 1.1.0
-    puppeteer-core: 18.2.1
-  checksum: 58ba8c7abd82071dc12e280622fa352a8ac253375a514c7a3527b468672a4ccdfe20b37aa09498774da2f0666bcdd9a47838c6661de483a3d6e10b47ef666113
-  languageName: node
-  linkType: hard
-
 "puppeteer@npm:^21.0.0":
   version: 21.11.0
   resolution: "puppeteer@npm:21.11.0"
@@ -10555,17 +10520,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rimraf@npm:3.0.2, rimraf@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "rimraf@npm:3.0.2"
-  dependencies:
-    glob: ^7.1.3
-  bin:
-    rimraf: bin.js
-  checksum: 87f4164e396f0171b0a3386cc1877a817f572148ee13a7e113b238e48e8a9f2f31d009a92ec38a591ff1567d9662c6b67fd8818a2dbbaed74bc26a87a2a4a9a0
-  languageName: node
-  linkType: hard
-
 "rimraf@npm:4.4.1":
   version: 4.4.1
   resolution: "rimraf@npm:4.4.1"
@@ -10577,6 +10531,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rimraf@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "rimraf@npm:3.0.2"
+  dependencies:
+    glob: ^7.1.3
+  bin:
+    rimraf: bin.js
+  checksum: 87f4164e396f0171b0a3386cc1877a817f572148ee13a7e113b238e48e8a9f2f31d009a92ec38a591ff1567d9662c6b67fd8818a2dbbaed74bc26a87a2a4a9a0
+  languageName: node
+  linkType: hard
+
 "run-async@npm:^2.4.0":
   version: 2.4.1
   resolution: "run-async@npm:2.4.1"
@@ -11419,18 +11384,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tar-fs@npm:2.1.1, tar-fs@npm:^2.0.0":
-  version: 2.1.1
-  resolution: "tar-fs@npm:2.1.1"
-  dependencies:
-    chownr: ^1.1.1
-    mkdirp-classic: ^0.5.2
-    pump: ^3.0.0
-    tar-stream: ^2.1.4
-  checksum: f5b9a70059f5b2969e65f037b4e4da2daf0fa762d3d232ffd96e819e3f94665dbbbe62f76f084f1acb4dbdcce16c6e4dac08d12ffc6d24b8d76720f4d9cf032d
-  languageName: node
-  linkType: hard
-
 "tar-fs@npm:3.0.4":
   version: 3.0.4
   resolution: "tar-fs@npm:3.0.4"
@@ -11442,6 +11395,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tar-fs@npm:^2.0.0":
+  version: 2.1.1
+  resolution: "tar-fs@npm:2.1.1"
+  dependencies:
+    chownr: ^1.1.1
+    mkdirp-classic: ^0.5.2
+    pump: ^3.0.0
+    tar-stream: ^2.1.4
+  checksum: f5b9a70059f5b2969e65f037b4e4da2daf0fa762d3d232ffd96e819e3f94665dbbbe62f76f084f1acb4dbdcce16c6e4dac08d12ffc6d24b8d76720f4d9cf032d
+  languageName: node
+  linkType: hard
+
 "tar-stream@npm:^2.1.4, tar-stream@npm:^2.2.0":
   version: 2.2.0
   resolution: "tar-stream@npm:2.2.0"
@@ -11640,13 +11605,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tr46@npm:~0.0.3":
-  version: 0.0.3
-  resolution: "tr46@npm:0.0.3"
-  checksum: 726321c5eaf41b5002e17ffbd1fb7245999a073e8979085dacd47c4b4e8068ff5777142fc6726d6ca1fd2ff16921b48788b87225cbc57c72636f6efa8efbffe3
-  languageName: node
-  linkType: hard
-
 "traverse@npm:>=0.3.0 <0.4":
   version: 0.3.9
   resolution: "traverse@npm:0.3.9"
@@ -12189,6 +12147,7 @@ __metadata:
     axios: ^1.7.7
     axios-retry: ^4.5.0
     better-sqlite3: 11.3.0
+    bufferutil: ^4.0.8
     check-disk-space: ^3.4.0
     chokidar: ^3.6.0
     class-transformer: ^0.5.1
@@ -12233,6 +12192,9 @@ __metadata:
     tsconfig-paths: ^4.1.0
     typescript: ^4.8.4
     whatsapp-web.js: "github:devlikeapro/whatsapp-web.js#fork-main-channels"
+  dependenciesMeta:
+    bufferutil:
+      optional: true
   languageName: unknown
   linkType: soft
 
@@ -12264,13 +12226,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webidl-conversions@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "webidl-conversions@npm:3.0.1"
-  checksum: c92a0a6ab95314bde9c32e1d0a6dfac83b578f8fa5f21e675bc2706ed6981bc26b7eb7e6a1fab158e5ce4adf9caa4a0aee49a52505d4d13c7be545f15021b17c
-  languageName: node
-  linkType: hard
-
 "webidl-conversions@npm:^7.0.0":
   version: 7.0.0
   resolution: "webidl-conversions@npm:7.0.0"
@@ -12331,7 +12286,7 @@ __metadata:
 
 "whatsapp-web.js@github:devlikeapro/whatsapp-web.js#fork-main-channels":
   version: 1.26.0
-  resolution: "whatsapp-web.js@https://github.com/devlikeapro/whatsapp-web.js.git#commit=6a333d0088591269238726e9effa3cbb14c8e7c7"
+  resolution: "whatsapp-web.js@https://github.com/devlikeapro/whatsapp-web.js.git#commit=76329eedc27b07c11e38bf1b60e6c2476c11dd73"
   dependencies:
     "@pedroslopez/moduleraid": ^5.0.2
     archiver: ^5.3.1
@@ -12349,11 +12304,11 @@ __metadata:
       optional: true
     unzipper:
       optional: true
-  checksum: 51e9dce51270cf6fb20acd0bd7368f36763dcc3d28c6c3725c78b46edd5da21fea2c9c1f78ab6699464e4e1a6d9c361b6ab76a88225ebdeeb3f9abdd860d082c
+  checksum: b8d4fcb1fd1365a38f07f95dd2eb1fd743c6c406fc7ac679662ddeded80c441720bc8400222a37d61765ebcbb5c6799f169d5ac45f12f58b5421c55bb9f2ab7e
   languageName: node
   linkType: hard
 
-"whatwg-url@npm:^13.0.0":
+"whatwg-url@npm:13.0.0":
   version: 13.0.0
   resolution: "whatwg-url@npm:13.0.0"
   dependencies:
@@ -12363,16 +12318,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-url@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "whatwg-url@npm:5.0.0"
-  dependencies:
-    tr46: ~0.0.3
-    webidl-conversions: ^3.0.0
-  checksum: b8daed4ad3356cc4899048a15b2c143a9aed0dfae1f611ebd55073310c7b910f522ad75d727346ad64203d7e6c79ef25eafd465f4d12775ca44b90fa82ed9e2c
-  languageName: node
-  linkType: hard
-
 "which-boxed-primitive@npm:^1.0.2":
   version: 1.0.2
   resolution: "which-boxed-primitive@npm:1.0.2"
@@ -12523,9 +12468,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:8.13.0":
-  version: 8.13.0
-  resolution: "ws@npm:8.13.0"
+"ws@npm:^8.18.0":
+  version: 8.18.0
+  resolution: "ws@npm:8.18.0"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -12534,52 +12479,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 53e991bbf928faf5dc6efac9b8eb9ab6497c69feeb94f963d648b7a3530a720b19ec2e0ec037344257e05a4f35bd9ad04d9de6f289615ffb133282031b18c61c
-  languageName: node
-  linkType: hard
-
-"ws@npm:8.16.0":
-  version: 8.16.0
-  resolution: "ws@npm:8.16.0"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ">=5.0.2"
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: feb3eecd2bae82fa8a8beef800290ce437d8b8063bdc69712725f21aef77c49cb2ff45c6e5e7fce622248f9c7abaee506bae0a9064067ffd6935460c7357321b
-  languageName: node
-  linkType: hard
-
-"ws@npm:8.9.0":
-  version: 8.9.0
-  resolution: "ws@npm:8.9.0"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ^5.0.2
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 23aa0f021b2eb65c108ec4c3e08c0d81ba01f82b500432dfe327fd6be36079c1d81fdb0eac6464d2a0eb49904d34a9ab8c59619d673fa07b8346f83aeb0cbf12
-  languageName: node
-  linkType: hard
-
-"ws@npm:^8.13.0":
-  version: 8.17.1
-  resolution: "ws@npm:8.17.1"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ">=5.0.2"
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 442badcce1f1178ec87a0b5372ae2e9771e07c4929a3180321901f226127f252441e8689d765aa5cfba5f50ac60dd830954afc5aeae81609aefa11d3ddf5cecf
+  checksum: 91d4d35bc99ff6df483bdf029b9ea4bfd7af1f16fc91231a96777a63d263e1eabf486e13a2353970efc534f9faa43bdbf9ee76525af22f4752cbc5ebda333975
   languageName: node
   linkType: hard