[core] 2025.5.2

fix #864

.dockerignore

@@ -1,5 +1,5 @@
 Dockerfile
-src/core/engines/gows/grpc
+src/core/engines/gows/proto
 .*sessions
 sessions
 files

.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

.eslintignore

@@ -1 +1,2 @@
 src/core/engines/gows/grpc/*
+src/core/engines/gows/proto/*

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,9 +1,10 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: '[BUG][WEBJS] - '
+title: '[WEBJS] - '
 labels: bug
 assignees: ''
+type: 'BUG'
 ---
 
 ### Describe the bug

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,9 +1,10 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: '[Feature Request]'
+title: ''
 labels: ''
 assignees: ''
+type: 'Feature'
 ---
 
 **Is your feature request related to a problem? Please describe.** I'm always

.gitignore

@@ -1,4 +1,4 @@
-src/core/engines/gows/grpc
+src/core/engines/gows/proto
 .env
 *.heapsnapshot
 .yarn

.pre-commit-config.yaml

@@ -3,6 +3,7 @@ exclude: |
     ^src/dashboard/.*|
     ^src/core/engines/webjs/.*html|
     ^src/core/engines/gows/grpc/.*|
+    ^src/core/engines/gows/proto/.*|
     ^src/plus/engines/webjs/.*html|
     ^.yarn/.*
   )$
@@ -74,4 +75,6 @@ repos:
               .pre-commit-config.yaml|
               ^src/core/engines/webjs/session.webjs.core.ts|
               ^src/core/engines/webjs/_lodash.js|
+              ^tests/perf/.*|
+              ^scripts/.*|
           )$

Dockerfile

@@ -1,9 +1,3 @@
-# GOWS
-ARG GOWS_GITHUB_REPO=devlikeapro/gows
-ARG GOWS_SHA=39ba4dcceeeb6e6fab172ee71ad1c09deea4db16
-ARG WAHA_DASHBOARD_GITHUB_REPO=devlikeapro/dashboard
-ARG WAHA_DASHBOARD_SHA=a1c839d8da94d1cade182addffdfc42fc0cf7ed3
-
 #
 # Build
 #
@@ -11,12 +5,8 @@ ARG NODE_VERSION=22.8-bullseye
 FROM node:${NODE_VERSION} AS build
 ENV PUPPETEER_SKIP_DOWNLOAD=True
 
-# install protoc
-RUN apt-get update && \
-    apt-get install protobuf-compiler -y
-
 # npm packages
-WORKDIR /src
+WORKDIR /git
 COPY package.json .
 COPY yarn.lock .
 ENV YARN_CHECKSUM_BEHAVIOR=update
@@ -25,19 +15,9 @@ RUN yarn set version 3.6.3
 RUN yarn install
 
 # App
-WORKDIR /src
-ADD . /src
+WORKDIR /git
+ADD . /git
 RUN yarn install
-
-# Build node grpc client for GOWS engine
-WORKDIR /gows/proto
-ARG GOWS_GITHUB_REPO
-ARG GOWS_SHA
-RUN wget https://raw.githubusercontent.com/${GOWS_GITHUB_REPO}/${GOWS_SHA}/proto/gows.proto
-WORKDIR /src
-
-RUN make proto-gows
-
 RUN yarn build && find ./dist -name "*.d.ts" -delete
 
 #
@@ -45,10 +25,13 @@ RUN yarn build && find ./dist -name "*.d.ts" -delete
 #
 FROM node:${NODE_VERSION} AS dashboard
 
-# Download WAHA Dashboard
-ARG WAHA_DASHBOARD_GITHUB_REPO
-ARG WAHA_DASHBOARD_SHA
+# jq to parse json
+RUN apt-get update && apt-get install -y jq && rm -rf /var/lib/apt/lists/*
+
+COPY waha.config.json /tmp/waha.config.json
 RUN \
+    WAHA_DASHBOARD_GITHUB_REPO=$(jq -r '.waha.dashboard.repo' /tmp/waha.config.json) && \
+    WAHA_DASHBOARD_SHA=$(jq -r '.waha.dashboard.ref' /tmp/waha.config.json) && \
     wget https://github.com/${WAHA_DASHBOARD_GITHUB_REPO}/archive/${WAHA_DASHBOARD_SHA}.zip \
     && unzip ${WAHA_DASHBOARD_SHA}.zip -d /tmp/dashboard \
     && mkdir -p /dashboard \
@@ -60,6 +43,10 @@ RUN \
 # GOWS
 #
 FROM golang:1.23-bullseye AS gows
+
+# jq to parse json
+RUN apt-get update && apt-get install -y jq && rm -rf /var/lib/apt/lists/*
+
 # install protoc
 RUN apt-get update && \
     apt-get install protobuf-compiler -y
@@ -69,16 +56,18 @@ RUN apt-get update  \
     && apt-get install -y libvips-dev \
     && rm -rf /var/lib/apt/lists/*
 
-ARG GOWS_GITHUB_REPO
-ARG GOWS_SHA
-RUN git clone https://github.com/${GOWS_GITHUB_REPO} gows && \
-    cd gows && \
-    git checkout ${GOWS_SHA}
-
+COPY waha.config.json /tmp/waha.config.json
 WORKDIR /go/gows
-RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
-RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
-RUN make all
+RUN \
+    GOWS_GITHUB_REPO=$(jq -r '.waha.gows.repo' /tmp/waha.config.json) && \
+    GOWS_SHA=$(jq -r '.waha.gows.ref' /tmp/waha.config.json) && \
+    ARCH=$(uname -m) && \
+    if [ "$ARCH" = "x86_64" ]; then ARCH="amd64"; \
+    elif [ "$ARCH" = "aarch64" ]; then ARCH="arm64"; \
+    else echo "Unsupported architecture: $ARCH" && exit 1; fi && \
+    mkdir -p /go/gows/bin && \
+    wget -O /go/gows/bin/gows https://github.com/${GOWS_GITHUB_REPO}/releases/download/${GOWS_SHA}/gows-${ARCH} && \
+    chmod +x /go/gows/bin/gows
 
 
 #
@@ -142,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 \
@@ -163,8 +152,8 @@ ENV WHATSAPP_DEFAULT_ENGINE=$WHATSAPP_DEFAULT_ENGINE
 # Attach sources, install packages
 WORKDIR /app
 COPY package.json ./
-COPY --from=build /src/node_modules ./node_modules
-COPY --from=build /src/dist ./dist
+COPY --from=build /git/node_modules ./node_modules
+COPY --from=build /git/dist ./dist
 COPY --from=dashboard /dashboard ./dist/dashboard
 COPY --from=gows /go/gows/bin/gows /app/gows
 ENV WAHA_GOWS_PATH /app/gows

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-678
+	. ${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
@@ -47,15 +47,7 @@ start-proxy:
 	docker run --rm -d --name squid-container -e TZ=UTC -p 3128:3128 ubuntu/squid:5.2-22.04_beta
 
 proto-gows:
-	rm -rf src/core/engines/gows/grpc
-	mkdir -p src/core/engines/gows/grpc
-	protoc \
-	--plugin=protoc-gen-ts=node_modules/.bin/protoc-gen-ts \
-	--plugin=protoc-gen-grpc=node_modules/.bin/grpc_tools_node_protoc_plugin \
-	--js_out=import_style=commonjs,binary:src/core/engines/gows/grpc \
-	--grpc_out=grpc_js:src/core/engines/gows/grpc \
-	--ts_out=grpc_js:src/core/engines/gows/grpc \
-	-I ../gows/proto ../gows/proto/gows.proto
+	node scripts/gows-proto.js build --dir ../gows/proto
 
 gows:
 	cd ../gows && \

README.md

@@ -6,22 +6,16 @@
 
 **WAHA** - **W**hats**A**pp **H**TTP **A**PI (REST API) that you can install on your own server and run in less than 5 minutes!
 
-[![Docker Pulls](https://img.shields.io/docker/pulls/devlikeapro/whatsapp-http-api)](https://hub.docker.com/r/devlikeapro/waha)
+[![Docker Pulls](https://img.shields.io/docker/pulls/devlikeapro/waha)](https://hub.docker.com/r/devlikeapro/waha)
 
 - Documentation: [https://waha.devlike.pro/](https://waha.devlike.pro/)
+- Dashboard Example: [https://waha.devlike.pro/dashboard](https://waha.devlike.pro/dashboard)
 - Swagger Example: [https://waha.devlike.pro/swagger](https://waha.devlike.pro/swagger)
 
 # Tables of Contents
 
 <!-- toc -->
 
-- [Features](#features)
-  * [Messages](#messages)
-  * [Sessions](#sessions)
-  * [Security](#security)
-  * [Updates](#updates)
-  * [Groups](#groups)
-  * [Contacts](#contacts)
 - [Quick start](#quick-start)
   * [Requirements](#requirements)
   * [Send your first message](#send-your-first-message)
@@ -32,52 +26,11 @@
     + [5. Get the screenshot](#5-get-the-screenshot)
     + [6. Send a text message](#6-send-a-text-message)
   * [What is next?](#what-is-next)
+- [Development](#development)
+  * [Start the project](#start-the-project)
 
 <!-- tocstop -->
 
-# Features
-
-## Messages
-- Send messages  
-- Receive messages  
-- Message replies  
-- Send location  
-- Receive location  
-- React to messages  
-- Send media (images/documents/files) 
-- Send voice messages 
-- Receive media (images/audio/video/documents) 
-- Receive messages - webhook retries 
-
-## Sessions
-- Multi Device  
-- Get the screenshot  
-- Session saving (don't have to scan QR on every restart) 
-- Single WhatsApp account running inside one container 
-- Multiple WhatsApp account running inside one container 
-
-## Security
-- Swagger panel authentication 
-- API authentication 
-
-## Updates
-- Bug fixes and updates come as soon as they are implemented. 
-
-## Groups
-- Create a group
-- Get invite for group
-- Modify group info (subject, description)
-- Add group participants
-- Kick group participants
-- Promote/demote group participants
-
-## Contacts
-- Mute/unmute chats
-- Block/unblock contacts
-- Get contact info
-- Get profile pictures
-- Get presence (online\offline\typing) status
-
 # Quick start
 
 ## Requirements
@@ -87,13 +40,6 @@ instruction <a href="https://docs.docker.com/get-docker/" target="_blank" rel="n
 
 When you are ready - come back and follows the below steps to send the first text message to WhatsApp via HTTP API!
 
-{{< details "Why Docker?" >}}
-Docker makes it easy to ship all-in-one solution with the runtime and dependencies. You don't have to worry about
-language-specific libraries or chrome installation.
-
-Also Docker makes installation and update processes so simple, just one command!
-{{< /details >}}
-
 ## Send your first message
 
 Let's go over steps that allow you to send your first text message via WhatsApp HTTP API!
@@ -114,7 +60,7 @@ docker pull devlikeapro/waha-plus
 docker logout
 ```
 
-Read more about how to get `PASSWORD` for [Plus Version →]({{< relref "plus-version" >}})
+Read more about how to get `PASSWORD` for [**➕ WAHA Plus**](https://waha.devlike.pro/docs/how-to/waha-plus/)
 
 ### 2. Run WhatsApp HTTP API
 
@@ -195,3 +141,19 @@ curl -d "{\"chatId\": \"${PHONE}@c.us\", \"text\": \"Hello from WhatsApp HTTP AP
 
 ## What is next?
 [Go and read the full documentation!](https://waha.devlike.pro/docs/overview/introduction/)
+
+# Development
+
+## Start the project
+1. Clone the repository
+2. Make sure you're using node>=22
+3. Run the following commands:
+```bash
+# Install dependencies
+yarn install
+# Fetch and compile proto files
+yarn gows:proto
+# Run
+yarn start
+# open http://localhost:3000
+```

docker-compose.yaml

@@ -38,7 +38,7 @@ services:
 #    command:
 #      - postgres
 #      - "-c"
-#      - "max_connections=1000"
+#      - "max_connections=3000"
 
 # NOTE: Only if you're using MongoDB
 # https://waha.devlike.pro/docs/how-to/storages/#sessions---mongodb

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

@@ -20,10 +20,13 @@
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "jest --config ./test/jest-e2e.json"
+    "test:e2e": "jest --config ./test/jest-e2e.json",
+    "gows:proto:fetch": "node scripts/gows-proto.js fetch",
+    "gows:proto:build": "node scripts/gows-proto.js build",
+    "gows:proto": "yarn gows:proto:fetch && yarn gows:proto:build"
   },
   "dependencies": {
-    "@adiwajshing/baileys": "github:devlikeapro/Baileys#fork-master-channels-678",
+    "@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",
@@ -44,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",
@@ -66,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",
@@ -91,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"
   },
@@ -120,7 +125,8 @@
     "ts-loader": "^6.2.1",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.1.0",
-    "typescript": "^4.8.4"
+    "typescript": "^4.8.4",
+    "yargs": "^17.7.2"
   },
   "jest": {
     "moduleFileExtensions": [

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."

scripts/gows-proto.js

@@ -0,0 +1,144 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const fs = require('fs');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const path = require('path');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const axios = require('axios');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { execSync } = require('child_process');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const yargs = require('yargs');
+
+// Defaults
+const CONFIG_FILE = 'waha.config.json';
+// Load defaults from package.json
+gows = (() => {
+  try {
+    const config = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
+    return config.waha.gows || {};
+  } catch (error) {
+    return {};
+  }
+})();
+
+const DEFAULT_REPO = gows.repo;
+if (!DEFAULT_REPO) {
+  throw new Error(`Missing default repo in ${CONFIG_FILE}`);
+}
+const DEFAULT_REF = gows.ref;
+if (!DEFAULT_REF) {
+  throw new Error('Missing default ref in ${CONFIG_FILE}');
+}
+const DEFAULT_DIR = './src/core/engines/gows/proto';
+
+const PROTO_FILES = ['gows.proto'];
+const PROTO_OUTPUT = './src/core/engines/gows/grpc';
+
+// Helper function to clean directory
+function cleanDirectory(directory, suffix) {
+  if (!fs.existsSync(directory)) {
+    fs.mkdirSync(directory, { recursive: true });
+    return;
+  }
+
+  const files = fs.readdirSync(directory);
+  for (const file of files) {
+    const filePath = path.join(directory, file);
+    if (file.endsWith(suffix)) {
+      fs.unlinkSync(filePath);
+    }
+  }
+}
+
+// Helper function to download files
+async function downloadFiles(repo, ref, directory) {
+  for (const file of PROTO_FILES) {
+    const url = `https://github.com/${repo}/releases/download/${ref}/${file}`;
+    const filePath = path.join(directory, file);
+    try {
+      const response = await axios.get(url, { responseType: 'arraybuffer' });
+      fs.writeFileSync(filePath, response.data);
+      console.log(`Downloaded: ${file}`);
+    } catch (error) {
+      console.error(`Failed to download ${file}: ${error.message}`);
+    }
+  }
+}
+
+// Handler for fetch command
+async function handleFetch(repo, ref, dir) {
+  console.log(`Fetching .proto files from ${repo}@${ref} to ${dir}...`);
+  cleanDirectory(dir, '.proto');
+  await downloadFiles(repo, ref, dir);
+}
+
+// Handler for build command
+function handleBuild(dir) {
+  console.log('Building gRPC files...');
+  cleanDirectory(PROTO_OUTPUT);
+
+  const command = `grpc_tools_node_protoc \
+        --plugin=protoc-gen-ts=node_modules/.bin/protoc-gen-ts \
+        --plugin=protoc-gen-grpc=node_modules/.bin/grpc_tools_node_protoc_plugin \
+        --js_out=import_style=commonjs,binary:${PROTO_OUTPUT} \
+        --grpc_out=grpc_js:${PROTO_OUTPUT} \
+        --ts_out=grpc_js:${PROTO_OUTPUT} \
+        -I ${dir} ${dir}/gows.proto`;
+
+  try {
+    execSync(command, { stdio: 'inherit' });
+    console.log('gRPC files built successfully.');
+  } catch (error) {
+    console.error(`Failed to build gRPC files: ${error.message}`);
+  }
+}
+
+//
+// Commands
+//
+
+// fetch
+yargs.command(
+  'fetch',
+  'Fetch .proto files from GitHub',
+  (yargs) => {
+    yargs
+      .option('repo', {
+        describe: 'GitHub repository (owner/repo)',
+        type: 'string',
+        default: DEFAULT_REPO,
+      })
+      .option('ref', {
+        describe: 'Git reference (branch or commit SHA)',
+        type: 'string',
+        default: DEFAULT_REF,
+      })
+      .option('dir', {
+        describe: 'Directory to output .proto files',
+        type: 'string',
+        default: DEFAULT_DIR,
+      });
+  },
+  async (argv) => {
+    await handleFetch(argv.repo, argv.ref, argv.dir);
+  },
+);
+
+// build
+yargs.command(
+  'build',
+  'Build gRPC files from .proto files',
+  (yargs) => {
+    yargs.option('dir', {
+      describe: 'Directory containing .proto files',
+      type: 'string',
+      default: DEFAULT_DIR,
+    });
+  },
+  (argv) => {
+    handleBuild(argv.dir);
+  },
+);
+
+// Parse arguments
+yargs.parse();

scripts/waha-run.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-set -e
-echo "Starting WAHA..."
-
-docker run -d \
-    --restart=always \
-    --name waha \
-    -p 3000:3000/tcp \
-    -v ./.sessions:/app/.sessions \
-    -v ./.media:/app/.media \
-    --env WHATSAPP_API_KEY=321 \
-    --env WAHA_DASHBOARD_USERNAME=waha \
-    --env WAHA_DASHBOARD_PASSWORD=waha \
-    --env WAHA_LOG_FORMAT=JSON \
-    --env WAHA_LOG_LEVEL=info \
-    --env WHATSAPP_DEFAULT_ENGINE=WEBJS \
-    --env WAHA_PRINT_QR=False \
-    --env WHATSAPP_FILES_LIFETIME=0 \
-    --env WHATSAPP_FILES_FOLDER=/app/.media \
-    devlikeapro/waha-plus:latest
-
-echo "WAHA started."

scripts/waha-update.sh

@@ -1,21 +0,0 @@
-set -e
-echo "Updating WAHA..."
-echo "Logging in to Docker..."
-docker login -u devlikeapro # -p {KEY} - you can hard code key here https://portal.devlike.pro/
-
-echo "Pulling the latest image..."
-docker pull devlikeapro/waha-plus
-
-echo "Logging out of Docker..."
-docker logout
-
-# Just pull if you're using WAHA Core
-# docker pull devlikeapro/waha
-
-echo "Stopping the current container..."
-docker stop waha || true
-echo "Removing the current container..."
-docker rm waha || true
-
-echo "Running WAHA..."
-sh ./waha-run.sh

src/api/auth.controller.ts

@@ -6,7 +6,6 @@ import {
   Query,
   UseInterceptors,
 } from '@nestjs/common';
-import { UnprocessableEntityException } from '@nestjs/common/exceptions/unprocessable-entity.exception';
 import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
 import { ApiFileAcceptHeader } from '@waha/nestjs/ApiFileAcceptHeader';
 import {
@@ -19,8 +18,6 @@ import { SessionManager } from '../core/abc/manager.abc';
 import { WhatsappSession } from '../core/abc/session.abc';
 import { BufferResponseInterceptor } from '../nestjs/BufferResponseInterceptor';
 import {
-  CaptchaBody,
-  OTPRequest,
   QRCodeFormat,
   QRCodeQuery,
   QRCodeValue,
@@ -63,42 +60,6 @@ class AuthController {
   ) {
     return session.requestCode(request.phoneNumber, request.method, request);
   }
-
-  @Post('authorize-code')
-  @SessionApiParam
-  @ApiOperation({
-    summary: 'Send OTP authentication code.',
-  })
-  authorizeCode(
-    @SessionParam session: WhatsappSession,
-    @Body() request: OTPRequest,
-  ) {
-    return session.authorizeCode(request.code);
-  }
-
-  @Get('captcha')
-  @SessionApiParam
-  @ApiFileAcceptHeader()
-  @UseInterceptors(new BufferResponseInterceptor())
-  @ApiOperation({
-    summary: 'Get captcha image.',
-  })
-  async getCaptcha(@SessionParam session: WhatsappSession): Promise<Buffer> {
-    const image = await session.getCaptcha();
-    return image.get();
-  }
-
-  @Post('captcha')
-  @SessionApiParam
-  @ApiOperation({
-    summary: 'Enter captcha code.',
-  })
-  saveCaptcha(
-    @SessionParam session: WhatsappSession,
-    @Body() body: CaptchaBody,
-  ) {
-    return session.saveCaptcha(body.code);
-  }
 }
 
 export { AuthController };

src/api/channels.controller.ts

@@ -3,31 +3,51 @@ import {
   Controller,
   Delete,
   Get,
+  HttpCode,
+  HttpStatus,
   Param,
   Post,
   Query,
+  UsePipes,
 } from '@nestjs/common';
-import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
+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,
 } from '@waha/nestjs/params/SessionApiParam';
+import { WAHAValidationPipe } from '@waha/nestjs/pipes/WAHAValidationPipe';
 import {
   Channel,
+  ChannelCategory,
+  ChannelCountry,
+  ChannelListResult,
+  ChannelMessage,
+  ChannelSearchByText,
+  ChannelSearchByView,
+  ChannelView,
   CreateChannelRequest,
   ListChannelsQuery,
   NewsletterIdApiParam,
   NewsletterIdOrInviteCodeApiParam,
+  PreviewChannelMessages,
 } from '@waha/structures/channels.dto';
 
 import { SessionManager } from '../core/abc/manager.abc';
-import { isNewsletter, WhatsappSession } from '../core/abc/session.abc';
+import {
+  parseChannelInviteLink,
+  WhatsappSession,
+} from '../core/abc/session.abc';
 
 @ApiSecurity('api_key')
 @Controller('api/:session/channels')
 @ApiTags('📢 Channels')
 export class ChannelsController {
-  constructor(private manager: SessionManager) {}
+  constructor(
+    private manager: SessionManager,
+    private channelsInfoService: ChannelsInfoServiceCore,
+  ) {}
 
   @Get('')
   @SessionApiParam
@@ -73,15 +93,47 @@ export class ChannelsController {
     @WorkingSessionParam session: WhatsappSession,
     @Param('id') id: string,
   ): Promise<Channel> {
-    if (isNewsletter(id)) {
+    if (isJidNewsletter(id)) {
       return session.channelsGetChannel(id);
     } else {
-      // https://www.whatsapp.com/channel/123 => 123
-      const inviteCode = id.split('/').pop();
+      const inviteCode = parseChannelInviteLink(id);
       return session.channelsGetChannelByInviteCode(inviteCode);
     }
   }
 
+  @Get(':id/messages/preview')
+  @SessionApiParam
+  @UsePipes(new WAHAValidationPipe())
+  @ApiParam({
+    name: 'id',
+    description: 'Channel id or invite code',
+    required: true,
+    type: 'string',
+    schema: {
+      default: '0029Va4K0PZ5a245NkngBA2M',
+    },
+  })
+  @ApiOperation({
+    summary: 'Preview channel messages',
+    description:
+      'You can use either ' +
+      'invite code (https://www.whatsapp.com/channel/123) or (123)' +
+      'OR' +
+      'Channel ID (123@newsletter).',
+  })
+  async previewChannelMessages(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('id') code: string,
+    @Query() query: PreviewChannelMessages,
+  ): Promise<ChannelMessage[]> {
+    if (isJidNewsletter(code)) {
+      const channel = await session.channelsGetChannel(code);
+      code = parseChannelInviteLink(channel.invite);
+    }
+    const inviteCode = parseChannelInviteLink(code);
+    return session.previewChannelMessages(inviteCode, query);
+  }
+
   @Post(':id/follow')
   @SessionApiParam
   @NewsletterIdApiParam
@@ -125,4 +177,49 @@ export class ChannelsController {
   ): Promise<void> {
     return session.channelsUnmuteChannel(id);
   }
+
+  @Post('/search/by-view')
+  @HttpCode(HttpStatus.OK)
+  @SessionApiParam
+  @UsePipes(new WAHAValidationPipe())
+  @ApiOperation({ summary: 'Search for channels (by view)' })
+  async searchByView(
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() request: ChannelSearchByView,
+  ): Promise<ChannelListResult> {
+    return session.searchChannelsByView(request);
+  }
+
+  @Post('/search/by-text')
+  @HttpCode(HttpStatus.OK)
+  @SessionApiParam
+  @UsePipes(new WAHAValidationPipe())
+  @ApiOperation({ summary: 'Search for channels (by text)' })
+  async searchByText(
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() request: ChannelSearchByText,
+  ): Promise<ChannelListResult> {
+    return session.searchChannelsByText(request);
+  }
+
+  @Get('/search/views')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get list of views for channel search' })
+  getSearchViews(): Promise<ChannelView[]> {
+    return this.channelsInfoService.getViews();
+  }
+
+  @Get('/search/countries')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get list of countries for channel search' })
+  getSearchCountries(): Promise<ChannelCountry[]> {
+    return this.channelsInfoService.getCountries();
+  }
+
+  @Get('/search/categories')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get list of categories for channel search' })
+  getSearchCategories(): Promise<ChannelCategory[]> {
+    return this.channelsInfoService.getCategories();
+  }
 }

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/groups.controller.ts

@@ -3,6 +3,8 @@ import {
   Controller,
   Delete,
   Get,
+  HttpCode,
+  HttpStatus,
   Param,
   Post,
   Put,
@@ -16,12 +18,20 @@ import {
   SessionApiParam,
   WorkingSessionParam,
 } from '@waha/nestjs/params/SessionApiParam';
+import { CountResponse, Result } from '@waha/structures/base.dto';
+import {
+  ChatPictureQuery,
+  ChatPictureResponse,
+} from '@waha/structures/chats.dto';
+import { ProfilePictureRequest } from '@waha/structures/profile.dto';
 
 import { SessionManager } from '../core/abc/manager.abc';
-import { WhatsappSession } from '../core/abc/session.abc';
+import { parseGroupInviteLink, WhatsappSession } from '../core/abc/session.abc';
 import {
   CreateGroupRequest,
   DescriptionRequest,
+  GroupField,
+  GroupsListFields,
   GroupsPaginationParams,
   JoinGroupRequest,
   JoinGroupResponse,
@@ -53,20 +63,19 @@ export class GroupsController {
     @WorkingSessionParam session: WhatsappSession,
     @Query() query: JoinGroupRequest,
   ): Promise<any> {
-    // https://chat.whatsapp.com/123 => 123
-    const code = query.code.split('/').pop();
+    const code = parseGroupInviteLink(query.code);
     return session.joinInfoGroup(code);
   }
 
   @Post('join')
+  @HttpCode(HttpStatus.OK)
   @SessionApiParam
   @ApiOperation({ summary: 'Join group via code' })
   async joinGroup(
     @WorkingSessionParam session: WhatsappSession,
     @Body() request: JoinGroupRequest,
   ): Promise<JoinGroupResponse> {
-    // https://chat.whatsapp.com/123 => 123
-    const code = request.code.split('/').pop();
+    const code = parseGroupInviteLink(request.code);
     const id = await session.joinGroup(code);
     return { id: id };
   }
@@ -75,14 +84,32 @@ export class GroupsController {
   @SessionApiParam
   @ApiOperation({ summary: 'Get all groups.' })
   @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
-  getGroups(
+  async getGroups(
     @WorkingSessionParam session: WhatsappSession,
     @Query() pagination: GroupsPaginationParams,
+    @Query() fields: GroupsListFields,
   ) {
-    return session.getGroups(pagination);
+    let groups: any = await session.getGroups(pagination);
+    groups = session.filterGroupsFields(groups, fields);
+    return groups;
+  }
+
+  @Get('/count')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get the number of groups.' })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async getGroupsCount(
+    @WorkingSessionParam session: WhatsappSession,
+  ): Promise<CountResponse> {
+    const data: any = await session.getGroups({});
+    const groups: any[] = Array.isArray(data) ? data : Object.values(data);
+    return {
+      count: groups.length,
+    };
   }
 
   @Post('refresh')
+  @HttpCode(HttpStatus.OK)
   @SessionApiParam
   @ApiOperation({ summary: 'Refresh groups from the server.' })
   @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
@@ -101,6 +128,100 @@ export class GroupsController {
     return session.getGroup(id);
   }
 
+  @Delete(':id')
+  @SessionApiParam
+  @GroupIdApiParam
+  @ApiOperation({ summary: 'Delete the group.' })
+  deleteGroup(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('id') id: string,
+  ) {
+    return session.deleteGroup(id);
+  }
+
+  @Post(':id/leave')
+  @HttpCode(HttpStatus.OK)
+  @SessionApiParam
+  @GroupIdApiParam
+  @ApiOperation({ summary: 'Leave the group.' })
+  leaveGroup(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('id') id: string,
+  ) {
+    return session.leaveGroup(id);
+  }
+
+  @Get(':id/picture')
+  @SessionApiParam
+  @GroupIdApiParam
+  @ApiOperation({ summary: 'Get group picture' })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async getChatPicture(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('id') id: string,
+    @Query() query: ChatPictureQuery,
+  ): Promise<ChatPictureResponse> {
+    const url = await session.getContactProfilePicture(id, query.refresh);
+    return { url: url };
+  }
+
+  @Put(':id/picture')
+  @SessionApiParam
+  @GroupIdApiParam
+  @ApiOperation({ summary: 'Set group picture' })
+  async setPicture(
+    @Param('id') id: string,
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() request: ProfilePictureRequest,
+  ): Promise<Result> {
+    const success = await session.updateGroupPicture(id, request.file);
+    return { success: success ?? true };
+  }
+
+  @Delete(':id/picture')
+  @SessionApiParam
+  @GroupIdApiParam
+  @ApiOperation({ summary: 'Delete group picture' })
+  async deletePicture(
+    @Param('id') id: string,
+    @WorkingSessionParam session: WhatsappSession,
+  ): Promise<Result> {
+    const success = await session.updateGroupPicture(id, null);
+    return { success: success || true };
+  }
+
+  @Put(':id/description')
+  @ApiOperation({
+    summary: 'Updates the group description.',
+    description:
+      'Returns "true" if the subject was properly updated. This can return "false" if the user does not have the necessary permissions.',
+  })
+  @SessionApiParam
+  @GroupIdApiParam
+  setDescription(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('id') id: string,
+    @Body() request: DescriptionRequest,
+  ) {
+    return session.setDescription(id, request.description);
+  }
+
+  @Put(':id/subject')
+  @SessionApiParam
+  @GroupIdApiParam
+  @ApiOperation({
+    summary: 'Updates the group subject',
+    description:
+      'Returns "true" if the subject was properly updated. This can return "false" if the user does not have the necessary permissions.',
+  })
+  setSubject(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('id') id: string,
+    @Body() request: SubjectRequest,
+  ) {
+    return session.setSubject(id, request.subject);
+  }
+
   @Put(':id/settings/security/info-admin-only')
   @SessionApiParam
   @GroupIdApiParam
@@ -162,60 +283,6 @@ export class GroupsController {
     return session.getMessagesAdminsOnly(id);
   }
 
-  @Delete(':id')
-  @SessionApiParam
-  @GroupIdApiParam
-  @ApiOperation({ summary: 'Delete the group.' })
-  deleteGroup(
-    @WorkingSessionParam session: WhatsappSession,
-    @Param('id') id: string,
-  ) {
-    return session.deleteGroup(id);
-  }
-
-  @Post(':id/leave')
-  @SessionApiParam
-  @GroupIdApiParam
-  @ApiOperation({ summary: 'Leave the group.' })
-  leaveGroup(
-    @WorkingSessionParam session: WhatsappSession,
-    @Param('id') id: string,
-  ) {
-    return session.leaveGroup(id);
-  }
-
-  @Put(':id/description')
-  @ApiOperation({
-    summary: 'Updates the group description.',
-    description:
-      'Returns "true" if the subject was properly updated. This can return "false" if the user does not have the necessary permissions.',
-  })
-  @SessionApiParam
-  @GroupIdApiParam
-  setDescription(
-    @WorkingSessionParam session: WhatsappSession,
-    @Param('id') id: string,
-    @Body() request: DescriptionRequest,
-  ) {
-    return session.setDescription(id, request.description);
-  }
-
-  @Put(':id/subject')
-  @SessionApiParam
-  @GroupIdApiParam
-  @ApiOperation({
-    summary: 'Updates the group subject',
-    description:
-      'Returns "true" if the subject was properly updated. This can return "false" if the user does not have the necessary permissions.',
-  })
-  setSubject(
-    @WorkingSessionParam session: WhatsappSession,
-    @Param('id') id: string,
-    @Body() request: SubjectRequest,
-  ) {
-    return session.setSubject(id, request.subject);
-  }
-
   @Get(':id/invite-code')
   @SessionApiParam
   @GroupIdApiParam
@@ -228,6 +295,7 @@ export class GroupsController {
   }
 
   @Post(':id/invite-code/revoke')
+  @HttpCode(HttpStatus.OK)
   @SessionApiParam
   @GroupIdApiParam
   @ApiOperation({
@@ -253,6 +321,7 @@ export class GroupsController {
   }
 
   @Post(':id/participants/add')
+  @HttpCode(HttpStatus.OK)
   @SessionApiParam
   @GroupIdApiParam
   @ApiOperation({ summary: 'Add participants' })
@@ -265,6 +334,7 @@ export class GroupsController {
   }
 
   @Post(':id/participants/remove')
+  @HttpCode(HttpStatus.OK)
   @SessionApiParam
   @GroupIdApiParam
   @ApiOperation({
@@ -279,6 +349,7 @@ export class GroupsController {
   }
 
   @Post(':id/admin/promote')
+  @HttpCode(HttpStatus.OK)
   @SessionApiParam
   @GroupIdApiParam
   @ApiOperation({ summary: 'Promote participants to admin users.' })
@@ -291,6 +362,7 @@ export class GroupsController {
   }
 
   @Post(':id/admin/demote')
+  @HttpCode(HttpStatus.OK)
   @SessionApiParam
   @GroupIdApiParam
   @ApiOperation({ summary: 'Demotes participants to regular users.' })

src/api/profile.controller.ts

@@ -0,0 +1,94 @@
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  Put,
+  UnprocessableEntityException,
+  UsePipes,
+} from '@nestjs/common';
+import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
+import { SessionManager } from '@waha/core/abc/manager.abc';
+import { WhatsappSession } from '@waha/core/abc/session.abc';
+import {
+  SessionApiParam,
+  WorkingSessionParam,
+} from '@waha/nestjs/params/SessionApiParam';
+import { WAHAValidationPipe } from '@waha/nestjs/pipes/WAHAValidationPipe';
+import { Result } from '@waha/structures/base.dto';
+import {
+  MyProfile,
+  ProfileNameRequest,
+  ProfilePictureRequest,
+  ProfileStatusRequest,
+} from '@waha/structures/profile.dto';
+
+@ApiSecurity('api_key')
+@Controller('api/:session/profile')
+@ApiTags('🆔 Profile')
+export class ProfileController {
+  constructor(private manager: SessionManager) {}
+
+  @Get('')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get my profile' })
+  async getMyProfile(
+    @WorkingSessionParam session: WhatsappSession,
+  ): Promise<MyProfile> {
+    const me = session.getSessionMeInfo();
+    if (!me) {
+      throw new UnprocessableEntityException('No profile found');
+    }
+    const picture = await session.getContactProfilePicture(me.id, false);
+    return {
+      id: me.id,
+      name: me.pushName,
+      picture: picture || null,
+    };
+  }
+
+  @Put('/name')
+  @SessionApiParam
+  @UsePipes(new WAHAValidationPipe())
+  @ApiOperation({ summary: 'Set my profile name' })
+  async setProfileName(
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() request: ProfileNameRequest,
+  ): Promise<Result> {
+    const success = await session.setProfileName(request.name);
+    return { success: success ?? true };
+  }
+
+  @Put('/status')
+  @SessionApiParam
+  @UsePipes(new WAHAValidationPipe())
+  @ApiOperation({ summary: 'Set profile status (About)' })
+  async setProfileStatus(
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() request: ProfileStatusRequest,
+  ): Promise<Result> {
+    const success = await session.setProfileStatus(request.status);
+    return { success: success ?? true };
+  }
+
+  @Put('/picture')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Set profile picture' })
+  async setProfilePicture(
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() request: ProfilePictureRequest,
+  ): Promise<Result> {
+    const success = await session.updateProfilePicture(request.file);
+    return { success: success ?? true };
+  }
+
+  @Delete('/picture')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Delete profile picture' })
+  async deleteProfilePicture(
+    @WorkingSessionParam session: WhatsappSession,
+  ): Promise<Result> {
+    const success = await session.updateProfilePicture(null);
+    return { success: success || true };
+  }
+}

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

@@ -57,13 +57,11 @@ export class SwaggerConfiguratorCore {
       .setVersion(VERSION.version)
       .addTag('🖥️ Sessions', 'Control WhatsApp sessions (accounts)')
       .addTag('🔑 Auth', 'Authentication')
+      .addTag('🆔 Profile', 'Your profile information')
       .addTag('🖼️ Screenshot', 'Get screenshot of WhatsApp and show QR code')
       .addTag('📤 Chatting', 'Chatting methods')
       .addTag('📢 Channels', 'Channels (newsletters) methods')
-      .addTag(
-        '🟢 Status',
-        'Status (aka stories) methods. <b>NOWEB</b> engine only!',
-      )
+      .addTag('🟢 Status', 'Status (aka stories) methods')
       .addTag('💬 Chats', `Chats methods`)
       .addTag(
         '👤 Contacts',
@@ -140,6 +138,7 @@ export class SwaggerConfiguratorCore {
       webhooks[event] = {
         post: {
           summary: eventMetadata.description,
+          deprecated: eventMetadata.deprecated || false,
           requestBody: {
             content: {
               'application/json': {

src/core/abc/manager.abc.ts

@@ -46,8 +46,10 @@ export abstract class SessionManager
   protected sessionWorkerRepository: ISessionWorkerRepository;
   private lock: any;
 
+  WAIT_SESSION_RUNNING_INTERVAL = 500;
+  WAIT_SESSION_RUNNING_TIMEOUT = 5_000;
   WAIT_STATUS_INTERVAL = 500;
-  WAIT_STATUS_TIMEOUT = 5_000;
+  WAIT_STATUS_TIMEOUT = 10_000;
   LOCK_TIMEOUT = 10_000;
 
   protected constructor(
@@ -148,6 +150,37 @@ 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,
+      this.WAIT_SESSION_RUNNING_TIMEOUT,
+    );
+
+    if (!running) {
+      const exists = await this.exists(sessionName);
+      if (!exists) {
+        throw new UnprocessableEntityException({
+          error: `Session "${sessionName}" does not exist`,
+          session: sessionName,
+        });
+      }
+
+      const msg = {
+        error:
+          'Session status is not as expected. Try again later or restart the session',
+        session: sessionName,
+        status: 'STOPPED',
+        expected: expected,
+      };
+      throw new UnprocessableEntityException(msg);
+    }
+
     const session = this.getSession(sessionName);
     const valid = await waitUntil(
       async () => expected.includes(session.status),
@@ -191,11 +224,14 @@ export function populateSessionInfo(
 ) {
   return (payload: any): WAHAWebhook => {
     const id = payload._eventId;
+    const timestampMs = payload._timestampMs;
     const data = { ...payload };
     delete data._eventId;
+    delete data._timestampMs;
     const me = session.getSessionMeInfo();
     return {
       id: id,
+      timestamp: timestampMs,
       event: event,
       session: session.name,
       metadata: session.sessionConfig?.metadata,

src/core/abc/session.abc.ts

@@ -1,18 +1,29 @@
+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,
+  ChannelMessage,
+  ChannelSearchByText,
+  ChannelSearchByView,
   CreateChannelRequest,
   ListChannelsQuery,
+  PreviewChannelMessages,
 } from '@waha/structures/channels.dto';
 import {
   ChatSummary,
   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';
 import { Label, LabelDTO, LabelID } from '@waha/structures/labels.dto';
 import { PaginationParams } from '@waha/structures/pagination.dto';
-import { WAMessage } from '@waha/structures/responses.dto';
+import { MessageSource, WAMessage } from '@waha/structures/responses.dto';
 import { DefaultMap } from '@waha/utils/DefaultMap';
 import { generatePrefixedId } from '@waha/utils/ids';
 import { LoggerBuilder } from '@waha/utils/logging';
@@ -20,7 +31,6 @@ import { complete } from '@waha/utils/reactive/complete';
 import { SwitchObservable } from '@waha/utils/reactive/SwitchObservable';
 import * as fs from 'fs';
 import * as lodash from 'lodash';
-import { PinoLogger } from 'nestjs-pino';
 import * as NodeCache from 'node-cache';
 import { Logger } from 'pino';
 import {
@@ -41,10 +51,12 @@ import {
   ChatRequest,
   CheckNumberStatusQuery,
   EditMessageRequest,
+  MessageButtonReply,
   MessageContactVcardRequest,
   MessageFileRequest,
   MessageForwardRequest,
   MessageImageRequest,
+  MessageLinkCustomPreviewRequest,
   MessageLinkPreviewRequest,
   MessageLocationRequest,
   MessagePollRequest,
@@ -65,7 +77,8 @@ import {
 } from '../../structures/enums.dto';
 import {
   CreateGroupRequest,
-  GroupsPaginationParams,
+  GroupField,
+  GroupsListFields,
   ParticipantsRequest,
   SettingsSecurityChangeInfo,
 } from '../../structures/groups.dto';
@@ -140,6 +153,12 @@ export abstract class WhatsappSession {
     stdTTL: 24 * 60 * 60, // 1 day
   });
 
+  // Save sent messages ids in cache so we can determine if a message was sent
+  // via API or APP
+  private sentMessageIds: NodeCache = new NodeCache({
+    stdTTL: 10 * 60, // 10 minutes
+  });
+
   public constructor({
     name,
     printQR,
@@ -170,6 +189,7 @@ export abstract class WhatsappSession {
             filter(Boolean),
             map((data) => {
               data._eventId = generatePrefixedId('evt');
+              data._timestampMs = Date.now();
               return data;
             }),
             retry(),
@@ -326,27 +346,68 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
-  public authorizeCode(code: string) {
-    throw new NotImplementedByEngineError();
-  }
-
   abstract getScreenshot(): Promise<Buffer>;
 
   public getSessionMeInfo(): MeInfo | null {
     return null;
   }
 
-  public getCaptcha(): Promise<QR> {
+  /**
+   * Profile methods
+   */
+  public setProfileName(name: string): Promise<boolean> {
     throw new NotImplementedByEngineError();
   }
 
-  public saveCaptcha(code: string) {
+  public setProfileStatus(status: string): Promise<boolean> {
+    throw new NotImplementedByEngineError();
+  }
+
+  public async updateProfilePicture(
+    file: BinaryFile | RemoteFile | null,
+  ): Promise<boolean> {
+    if (file) {
+      await this.setProfilePicture(file);
+    } else {
+      await this.deleteProfilePicture();
+    }
+
+    // Refresh profile picture after update
+    setTimeout(() => {
+      this.logger.debug('Refreshing my profile picture after update...');
+      this.refreshMyProfilePicture()
+        .then(() => {
+          this.logger.debug('Refreshed my profile picture after update');
+        })
+        .catch((err) => {
+          this.logger.error('Error refreshing my profile picture after update');
+          this.logger.error(err, err.stack);
+        });
+    }, 3_000);
+
+    return true;
+  }
+
+  protected async refreshMyProfilePicture() {
+    const me = this.getSessionMeInfo();
+    await this.getContactProfilePicture(me.id, true);
+  }
+
+  protected setProfilePicture(file: BinaryFile | RemoteFile): Promise<boolean> {
+    throw new NotImplementedByEngineError();
+  }
+
+  protected deleteProfilePicture(): Promise<boolean> {
     throw new NotImplementedByEngineError();
   }
 
   /**
    * Other methods
    */
+  generateNewMessageId(): Promise<string> {
+    throw new NotImplementedByEngineError();
+  }
+
   abstract checkNumberStatus(request: CheckNumberStatusQuery);
 
   abstract sendText(request: MessageTextRequest);
@@ -365,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);
@@ -381,6 +448,10 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
+  sendButtonsReply(request: MessageButtonReply) {
+    throw new NotImplementedByEngineError();
+  }
+
   abstract reply(request: MessageReplyRequest);
 
   abstract sendSeen(chat: SendSeenRequest);
@@ -416,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,
@@ -515,7 +611,7 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
-  public getContactAbout(query: ContactQuery) {
+  public getContactAbout(query: ContactQuery): Promise<{ about: string }> {
     throw new NotImplementedByEngineError();
   }
 
@@ -537,8 +633,18 @@ export abstract class WhatsappSession {
   }
 
   protected async refreshProfilePicture(id: string) {
+    let fn: Promise<string>;
+    if (isJidBroadcast(id)) {
+      return null;
+    } else if (isJidNewsletter(id)) {
+      fn = this.channelsGetChannel(id).then(
+        (channel: Channel) => channel.picture || channel.preview,
+      );
+    } else {
+      fn = this.fetchContactProfilePicture(id);
+    }
     this.profilePictures.del(id);
-    const url = await this.fetchContactProfilePicture(id).catch((err) => {
+    const url = await fn.catch((err) => {
       this.logger.warn('Error fetching profile picture');
       this.logger.warn(err, err.stack);
       return null;
@@ -570,10 +676,22 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
-  public getGroups(pagination: PaginationParams) {
+  public getGroups(pagination: PaginationParams): Promise<any> {
     throw new NotImplementedByEngineError();
   }
 
+  public filterGroupsFields(data: any, fields: GroupsListFields) {
+    const groups: any[] = Array.isArray(data) ? data : Object.values(data);
+    if (fields.exclude?.includes(GroupField.PARTICIPANTS)) {
+      groups.forEach((group) => this.removeGroupsFieldParticipant(group));
+    }
+    return data;
+  }
+
+  protected removeGroupsFieldParticipant(group: any) {
+    return;
+  }
+
   public refreshGroups(): Promise<boolean> {
     throw new NotImplementedByEngineError();
   }
@@ -610,6 +728,43 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
+  public async updateGroupPicture(
+    id: string,
+    file: BinaryFile | RemoteFile | null,
+  ): Promise<boolean> {
+    if (file) {
+      await this.setGroupPicture(id, file);
+    } else {
+      await this.deleteGroupPicture(id);
+    }
+
+    // Refresh picture after update
+    setTimeout(() => {
+      this.logger.debug('Refreshing group profile picture after update...');
+      this.refreshProfilePicture(id)
+        .then(() => {
+          this.logger.debug('Refreshed group profile picture after update');
+        })
+        .catch((err) => {
+          this.logger.error('Error refreshing my profile picture after update');
+          this.logger.error(err, err.stack);
+        });
+    }, 3_000);
+
+    return true;
+  }
+
+  protected setGroupPicture(
+    id: string,
+    file: BinaryFile | RemoteFile,
+  ): Promise<boolean> {
+    throw new NotImplementedByEngineError();
+  }
+
+  protected deleteGroupPicture(id: string): Promise<boolean> {
+    throw new NotImplementedByEngineError();
+  }
+
   public setSubject(id, description) {
     throw new NotImplementedByEngineError();
   }
@@ -661,6 +816,25 @@ export abstract class WhatsappSession {
   /**
    * Channels methods
    */
+  public searchChannelsByView(
+    query: ChannelSearchByView,
+  ): Promise<ChannelListResult> {
+    throw new NotImplementedByEngineError();
+  }
+
+  public searchChannelsByText(
+    query: ChannelSearchByText,
+  ): Promise<ChannelListResult> {
+    throw new NotImplementedByEngineError();
+  }
+
+  public async previewChannelMessages(
+    inviteCode: string,
+    query: PreviewChannelMessages,
+  ): Promise<ChannelMessage[]> {
+    throw new NotImplementedByEngineError();
+  }
+
   public channelsList(query: ListChannelsQuery): Promise<Channel[]> {
     throw new NotImplementedByEngineError();
   }
@@ -722,6 +896,9 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
+  /**
+   * Engine methods
+   */
   public async getEngineInfo(): Promise<any> {
     return {};
   }
@@ -763,12 +940,58 @@ export abstract class WhatsappSession {
     );
     qrcode.generate(qr.raw, { small: true });
   }
+
+  protected saveSentMessageId(id: string) {
+    this.sentMessageIds.set(id, true);
+  }
+
+  protected getMessageSource(id: string): MessageSource {
+    if (!id) {
+      return MessageSource.APP;
+    }
+    const api = this.sentMessageIds.has(id);
+    return api ? MessageSource.API : MessageSource.APP;
+  }
 }
 
-export function isNewsletter(jid: string) {
-  return jid.endsWith('@newsletter');
+export function getGroupInviteLink(code: string) {
+  if (code.startsWith('https://')) {
+    return code;
+  }
+  return `https://chat.whatsapp.com/${code}`;
+}
+
+export function parseGroupInviteLink(link: string) {
+  // https://chat.whatsapp.com/123 => 123
+  return link.split('/').pop();
 }
 
 export function getChannelInviteLink(code: string) {
   return `https://whatsapp.com/channel/${code}`;
 }
+
+export function parseChannelInviteLink(link: string): string {
+  // https://www.whatsapp.com/channel/123 => 123
+  const code = link.split('/').pop();
+  return code;
+}
+
+export function getPublicUrlFromDirectPath(directPath: string) {
+  return `https://pps.whatsapp.net${directPath}`;
+}
+
+const deviceRegexp = /^.*:(\d+)@.*$/;
+
+/**
+ * Extracts the device ID from a JID string.
+ *
+ * @param jid - The JID string (e.g., "123123:12@c.us")
+ * @return The extracted device ID (e.g., "12") or null if the format is invalid.
+ */
+export function extractDeviceId(jid: string): string | null {
+  if (!jid) {
+    return null;
+  }
+  const match = jid.match(deviceRegexp);
+  return match ? match[1] : null;
+}

src/core/api/websocket.gateway.core.ts

@@ -32,7 +32,7 @@ export class WebsocketGatewayCore
     OnGatewayDisconnect,
     BeforeApplicationShutdown
 {
-  HEARTBEAT_INTERVAL = 10_000;
+  HEARTBEAT_INTERVAL = 60_000;
 
   @WebSocketServer()
   server: Server;

src/core/app.module.core.ts

@@ -5,6 +5,7 @@ import { PassportModule } from '@nestjs/passport';
 import { ServeStaticModule } from '@nestjs/serve-static';
 import { TerminusModule } from '@nestjs/terminus';
 import { ChannelsController } from '@waha/api/channels.controller';
+import { ProfileController } from '@waha/api/profile.controller';
 import {
   ServerController,
   ServerDebugController,
@@ -14,6 +15,7 @@ import { GowsEngineConfigService } from '@waha/core/config/GowsEngineConfigServi
 import { WebJSEngineConfigService } from '@waha/core/config/WebJSEngineConfigService';
 import { MediaLocalStorageModule } from '@waha/core/media/local/media.local.storage.module';
 import { MediaLocalStorageConfig } from '@waha/core/media/local/MediaLocalStorageConfig';
+import { ChannelsInfoServiceCore } from '@waha/core/services/ChannelsInfoServiceCore';
 import { BufferJsonReplacerInterceptor } from '@waha/nestjs/BufferJsonReplacerInterceptor';
 import {
   getPinoHttpUseLevel,
@@ -120,6 +122,7 @@ const IMPORTS = [...IMPORTS_CORE, ...IMPORTS_MEDIA];
 export const CONTROLLERS = [
   AuthController,
   SessionsController,
+  ProfileController,
   ChattingController,
   ChatsController,
   ChannelsController,
@@ -148,6 +151,7 @@ const PROVIDERS = [
     provide: APP_INTERCEPTOR,
     useClass: BufferJsonReplacerInterceptor,
   },
+  ChannelsInfoServiceCore,
   DashboardConfigServiceCore,
   SwaggerConfigServiceCore,
   WebJSEngineConfigService,

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

@@ -0,0 +1,3 @@
+export enum Jid {
+  BROADCAST = 'status@broadcast',
+}

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

@@ -0,0 +1,191 @@
+import {
+  GOWSGroupParticipant,
+  GroupInfoEvent,
+  GroupInfoFull,
+  JoinedGroupEvent,
+} from '@waha/core/engines/gows/types.group';
+import { toJID } from '@waha/core/utils/jids';
+import {
+  GroupId,
+  GroupInfo,
+  GroupParticipant,
+  GroupParticipantRole,
+} from '@waha/structures/groups.dto';
+import {
+  GroupParticipantType,
+  GroupV2JoinEvent,
+  GroupV2LeaveEvent,
+  GroupV2ParticipantsEvent,
+  GroupV2UpdateEvent,
+} from '@waha/structures/groups.events.dto';
+import { MeInfo } from '@waha/structures/sessions.dto';
+
+export function ToGroupV2JoinEvent(event: JoinedGroupEvent): GroupV2JoinEvent {
+  return {
+    timestamp: Date.now(),
+    group: ToGroupInfo(event),
+    _data: event,
+  };
+}
+
+export function ToGroupV2LeaveEvent(
+  me: MeInfo | null,
+  event: GroupInfoEvent,
+): GroupV2LeaveEvent | null {
+  if (!event.Leave || event.Leave.length === 0) {
+    return null;
+  }
+  if (!me?.id) {
+    return null;
+  }
+  const jid = toJID(me.id);
+  const left = event.Leave;
+  if (!left.includes(jid)) {
+    return null;
+  }
+  return {
+    timestamp: Date.now(),
+    group: {
+      id: event.JID,
+    },
+    _data: event,
+  };
+}
+
+export function ToGroupV2UpdateEvent(
+  event: GroupInfoEvent,
+): GroupV2UpdateEvent | null {
+  const group = ToGroupInfoPartial(event);
+  if (!group) {
+    return null;
+  }
+  return {
+    timestamp: Date.now(),
+    group: group,
+    _data: event,
+  };
+}
+
+export function ToGroupV2ParticipantsEvents(
+  event: GroupInfoEvent,
+): GroupV2ParticipantsEvent[] {
+  const id: GroupId = {
+    id: event.JID,
+  };
+  const events: GroupV2ParticipantsEvent[] = [];
+  const maps = [
+    { participants: event.Leave, type: GroupParticipantType.LEAVE },
+    { participants: event.Join, type: GroupParticipantType.JOIN },
+    { participants: event.Promote, type: GroupParticipantType.PROMOTE },
+    { participants: event.Demote, type: GroupParticipantType.DEMOTE },
+  ];
+  for (const map of maps) {
+    const participants = getParticipants(map.participants, map.type);
+    if (participants) {
+      events.push({
+        group: id,
+        type: map.type,
+        timestamp: Date.now(),
+        participants: participants,
+        _data: event,
+      });
+    }
+  }
+  return events;
+}
+
+function getParticipants(jids: string[] | null, type: GroupParticipantType) {
+  if (!jids) {
+    return;
+  }
+  let role: GroupParticipantRole;
+  switch (type) {
+    case GroupParticipantType.JOIN:
+      role = GroupParticipantRole.PARTICIPANT;
+      break;
+    case GroupParticipantType.LEAVE:
+      role = GroupParticipantRole.LEFT;
+      break;
+    case GroupParticipantType.PROMOTE:
+      role = GroupParticipantRole.ADMIN;
+      break;
+    case GroupParticipantType.DEMOTE:
+      role = GroupParticipantRole.PARTICIPANT;
+      break;
+  }
+  const participants: GroupParticipant[] = [];
+  for (const jid of jids) {
+    participants.push({
+      id: jid,
+      role: role,
+    });
+  }
+  return participants;
+}
+
+function ToGroupInfo(group: GroupInfoFull): GroupInfo {
+  const participants: GroupParticipant[] = extractParticipants(
+    group.Participants,
+  );
+  return {
+    id: group.JID,
+    subject: group.Name,
+    description: group.Topic,
+    invite: undefined,
+    participants: participants,
+    membersCanAddNewMember: group.MemberAddMode === 'all_member_add',
+    membersCanSendMessages: !!group.IsAnnounce,
+    newMembersApprovalRequired: group.IsJoinApprovalRequired,
+  };
+}
+
+function ToGroupInfoPartial(group: GroupInfoEvent): GroupInfo | null {
+  const announce: boolean | undefined = group.Announce?.IsAnnounce;
+  let membersCanSendMessages: boolean | undefined;
+  // revert announce or undefined
+  if (announce === undefined) {
+    membersCanSendMessages = undefined;
+  } else {
+    membersCanSendMessages = !announce;
+  }
+
+  const info = {
+    id: group.JID,
+    subject: group.Name?.Name,
+    description: group.Topic?.Topic,
+    invite: group.NewInviteLink || undefined,
+    membersCanAddNewMember: undefined,
+    membersCanSendMessages: membersCanSendMessages,
+    newMembersApprovalRequired:
+      group.MembershipApprovalMode?.IsJoinApprovalRequired,
+    participants: undefined,
+  };
+  // check if all fields are undefined but id - return null
+  for (const key in info) {
+    if (key !== 'id' && info[key] !== undefined) {
+      return info;
+    }
+  }
+  return null;
+}
+
+function extractParticipants(
+  participants: GOWSGroupParticipant[],
+): GroupParticipant[] {
+  const result: GroupParticipant[] = [];
+  for (const participant of participants) {
+    let role: GroupParticipantRole;
+    if (participant.IsSuperAdmin) {
+      role = GroupParticipantRole.SUPERADMIN;
+    } else if (participant.IsAdmin) {
+      role = GroupParticipantRole.ADMIN;
+    } else {
+      role = GroupParticipantRole.PARTICIPANT;
+    }
+    result.push({
+      id: participant.JID,
+      role: role,
+    });
+  }
+  return result;
+}

src/core/engines/gows/helpers.ts

@@ -0,0 +1,42 @@
+import { messages } from '@waha/core/engines/gows/grpc/gows';
+import { MessageStatus } from '@waha/core/engines/gows/types';
+import { WAMessageAck } from '@waha/structures/enums.dto';
+
+export function optional(value: any, type) {
+  if (value === null || value === undefined) {
+    return null;
+  }
+  return new type({ value: value });
+}
+
+export function parseJson(value: messages.Json | { data?: string }) {
+  if (value instanceof messages.Json) {
+    value = value.toObject();
+  }
+  if (value.data === undefined) {
+    return undefined;
+  }
+  return JSON.parse(value.data);
+}
+
+export function parseJsonList(value: messages.JsonList) {
+  return value.toObject().elements.map((value) => parseJson(value));
+}
+
+export function statusToAck(status: MessageStatus): WAMessageAck | null {
+  switch (status) {
+    case MessageStatus.Error:
+      return WAMessageAck.ERROR;
+    case MessageStatus.Pending:
+      return WAMessageAck.PENDING;
+    case MessageStatus.ServerAck:
+      return WAMessageAck.SERVER;
+    case MessageStatus.DeliveryAck:
+      return WAMessageAck.DEVICE;
+    case MessageStatus.Read:
+      return WAMessageAck.READ;
+    case MessageStatus.Played:
+      return WAMessageAck.PLAYED;
+  }
+  return null;
+}

src/core/engines/gows/types.group.ts

@@ -0,0 +1,108 @@
+// JID just a string alias, we dump it as String in golang
+type JID = string;
+
+interface GroupName {
+  Name: string;
+  NameSetAt: string; // ISO string format for time
+  NameSetBy: JID;
+}
+
+interface GroupTopic {
+  Topic: string;
+  TopicID: string;
+  TopicSetAt: string;
+  TopicSetBy: JID;
+  TopicDeleted: boolean;
+}
+
+interface GroupLocked {
+  IsLocked: boolean;
+}
+
+interface GroupAnnounce {
+  IsAnnounce: boolean;
+  AnnounceVersionID: string;
+}
+
+interface GroupEphemeral {
+  IsEphemeral: boolean;
+  DisappearingTimer: number;
+}
+
+interface GroupMembershipApprovalMode {
+  IsJoinApprovalRequired: boolean;
+}
+
+interface GroupDelete {
+  Deleted: boolean;
+  DeleteReason: string;
+}
+
+interface GroupLinkTarget {
+  JID: JID;
+  GroupName: GroupName;
+  GroupIsDefaultSub: GroupIsDefaultSub;
+}
+
+interface GroupLinkChange {
+  Type: string; // Enum in Go: GroupLinkChangeType
+  UnlinkReason: string; // Enum in Go: GroupUnlinkReason
+  Group: GroupLinkTarget;
+}
+
+interface GroupIsDefaultSub {
+  IsDefaultSubGroup: boolean;
+}
+
+export interface GroupInfoEvent {
+  JID: JID;
+  Notify: string;
+  Sender?: JID;
+  Timestamp: string;
+
+  Name?: GroupName;
+  Topic?: GroupTopic;
+  Locked?: GroupLocked;
+  Announce?: GroupAnnounce;
+  Ephemeral?: GroupEphemeral;
+
+  MembershipApprovalMode?: GroupMembershipApprovalMode;
+  Delete?: GroupDelete;
+
+  Link?: GroupLinkChange;
+  Unlink?: GroupLinkChange;
+  NewInviteLink?: string;
+
+  PrevParticipantVersionID: string;
+  ParticipantVersionID: string;
+
+  JoinReason: string;
+
+  Join: JID[];
+  Leave: JID[];
+  Promote: JID[];
+  Demote: JID[];
+}
+
+export interface GOWSGroupParticipant {
+  JID: JID;
+  IsAdmin: boolean;
+  IsSuperAdmin: boolean;
+}
+
+export interface GroupInfoFull {
+  JID: JID;
+  OwnerJID: JID;
+  Name: string; // Name has additional properties here
+  Topic: string; // Topic has additional properties here
+  IsLocked: boolean; // specifies whether the group info can only be edited by admins.
+  IsAnnounce: boolean; // specifies whether only admins can send messages in the group
+  Participants: GOWSGroupParticipant[];
+  MemberAddMode: string; // all_member_add | admin_add
+  IsJoinApprovalRequired: boolean;
+}
+
+export interface JoinedGroupEvent extends GroupInfoFull {
+  Reason: string;
+  Type: string;
+}

src/core/engines/gows/types.ts

@@ -22,3 +22,20 @@ export interface ChatPresence {
   State: ChatPresenceState;
   Media: ChatPresenceMedia;
 }
+
+/**
+ *  StatusError       Status = 0
+ *  StatusPending     Status = 1
+ *  StatusServerAck   Status = 2
+ *  StatusDeliveryAck Status = 3
+ *  StatusRead        Status = 4
+ *  StatusPlayed      Status = 5
+ */
+export enum MessageStatus {
+  Error = 0,
+  Pending = 1,
+  ServerAck = 2,
+  DeliveryAck = 3,
+  Read = 4,
+  Played = 5,
+}

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/groups.noweb.ts

@@ -0,0 +1,143 @@
+import { GroupMetadata, jidNormalizedUser } from '@adiwajshing/baileys';
+import type { Contact } from '@adiwajshing/baileys/lib/Types/Contact';
+import {
+  GroupParticipant as NOWEBGroupParticipant,
+  ParticipantAction,
+} from '@adiwajshing/baileys/lib/Types/GroupMetadata';
+import { getGroupInviteLink } from '@waha/core/abc/session.abc';
+import { toCusFormat } from '@waha/core/engines/noweb/session.noweb.core';
+import {
+  GroupInfo,
+  GroupParticipant,
+  GroupParticipantRole,
+} from '@waha/structures/groups.dto';
+import {
+  GroupParticipantType,
+  GroupV2JoinEvent,
+  GroupV2LeaveEvent,
+  GroupV2ParticipantsEvent,
+  GroupV2UpdateEvent,
+} from '@waha/structures/groups.events.dto';
+
+export function ToGroupInfo(group: Partial<GroupMetadata>): GroupInfo {
+  let participants: GroupParticipant[] = undefined;
+  if (group.participants && group.participants.length > 0) {
+    participants = group.participants.map(ToGroupParticipant);
+  }
+  return {
+    id: group.id,
+    subject: group.subject,
+    description: group.desc,
+    invite: group.inviteCode ? getGroupInviteLink(group.inviteCode) : undefined,
+    participants: participants,
+    membersCanAddNewMember: group.memberAddMode,
+    membersCanSendMessages: group.announce,
+    newMembersApprovalRequired: group.joinApprovalMode,
+  };
+}
+
+export function ToGroupV2JoinEvent(group: GroupMetadata): GroupV2JoinEvent {
+  return {
+    timestamp: Date.now(),
+    group: ToGroupInfo(group),
+    _data: group,
+  };
+}
+
+export function ToGroupParticipant(
+  participant: NOWEBGroupParticipant,
+): GroupParticipant {
+  let role: GroupParticipantRole = GroupParticipantRole.PARTICIPANT;
+  if (participant.admin === 'admin') {
+    role = GroupParticipantRole.ADMIN;
+  } else if (participant.admin === 'superadmin') {
+    role = GroupParticipantRole.SUPERADMIN;
+  }
+  return {
+    id: toCusFormat(participant.id),
+    role: role,
+  };
+}
+
+interface GroupParticipantUpdate {
+  id: string;
+  author: string;
+  participants: string[];
+  action: ParticipantAction;
+}
+
+export function ToGroupV2Participants(
+  update: GroupParticipantUpdate,
+): GroupV2ParticipantsEvent {
+  let role: GroupParticipantRole;
+  let type: GroupParticipantType;
+  switch (update.action) {
+    case 'add':
+      role = GroupParticipantRole.PARTICIPANT;
+      type = GroupParticipantType.JOIN;
+      break;
+    case 'remove':
+      role = GroupParticipantRole.LEFT;
+      type = GroupParticipantType.LEAVE;
+      break;
+    case 'promote':
+      role = GroupParticipantRole.ADMIN;
+      type = GroupParticipantType.PROMOTE;
+      break;
+    case 'demote':
+      role = GroupParticipantRole.ADMIN;
+      type = GroupParticipantType.DEMOTE;
+      break;
+  }
+
+  const participants: GroupParticipant[] = update.participants.map((id) => {
+    return {
+      id: toCusFormat(id),
+      role: role,
+    };
+  });
+
+  return {
+    group: {
+      id: toCusFormat(update.id),
+    },
+    type: type,
+    timestamp: Date.now(),
+    participants: participants,
+    _data: update,
+  };
+}
+
+export function ToGroupV2UpdateEvent(
+  group: Partial<GroupMetadata>,
+): GroupV2UpdateEvent {
+  return {
+    timestamp: Date.now(),
+    group: ToGroupInfo(group),
+    _data: group,
+  };
+}
+
+export function ToGroupV2LeaveEvent(
+  me: Contact,
+  update: GroupParticipantUpdate,
+): GroupV2LeaveEvent | null {
+  if (update.action !== 'remove') {
+    return null;
+  }
+  if (!me) {
+    return null;
+  }
+  const meId = jidNormalizedUser(me.id);
+  if (!update.participants.includes(meId)) {
+    return null;
+  }
+
+  return {
+    timestamp: Date.now(),
+    group: {
+      id: toCusFormat(update.id),
+    },
+    _data: update,
+  };
+}

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

@@ -8,6 +8,8 @@ export interface IMessagesRepository {
 
   upsertOne(message: any): Promise<void>;
 
+  getById(id: string): Promise<any | null>;
+
   getAllByJid(
     jid: string,
     filter: GetChatMessagesFilter,

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

@@ -30,6 +30,8 @@ export interface INowebStore {
 
   getChats(pagination: PaginationParams, broadcast: boolean): Promise<Chat[]>;
 
+  getChat(jid: string): Promise<Chat | null>;
+
   getContacts(pagination: PaginationParams): Promise<Contact[]>;
 
   getContactById(jid: string): Promise<Contact>;

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> {
@@ -65,6 +69,10 @@ export class NowebInMemoryStore implements INowebStore {
     throw new BadRequestException(this.errorMessage);
   }
 
+  getChat(jid: string): Promise<Chat | null> {
+    return null;
+  }
+
   getContacts(pagination: PaginationParams): Promise<Contact[]> {
     throw new BadRequestException(this.errorMessage);
   }
@@ -91,7 +99,7 @@ export class NowebInMemoryStore implements INowebStore {
 
   async getGroups(pagination: PaginationParams): Promise<GroupMetadata[]> {
     const response = await this.socket?.groupFetchAllParticipating();
-    const groups = Object.values(response);
+    const groups: any[] = Object.values(response);
     const paginator = new PaginatorInMemory(pagination);
     return paginator.apply(groups);
   }

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`);
   }
 
@@ -269,6 +286,9 @@ export class NowebPersistentStore implements INowebStore {
     if (!group) {
       group = { id: id, participants: [] } as GroupMetadata;
     }
+    if (!group.participants) {
+      group.participants = [];
+    }
 
     const participantsById = new DefaultMap<string, GroupParticipant>((key) => {
       return { id: key, admin: null } as GroupParticipant;
@@ -330,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>[]) {
@@ -360,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;
@@ -427,7 +456,12 @@ export class NowebPersistentStore implements INowebStore {
   }
 
   async loadMessage(jid: string, id: string) {
-    const data = await this.messagesRepo.getByJidById(jid, id);
+    let data;
+    if (!jid) {
+      data = await this.messagesRepo.getById(id);
+    } else {
+      data = await this.messagesRepo.getByJidById(jid, id);
+    }
     if (!data) {
       return null;
     }
@@ -454,6 +488,10 @@ export class NowebPersistentStore implements INowebStore {
     return this.chatRepo.getAllWithMessages(pagination, broadcast);
   }
 
+  async getChat(jid: string): Promise<Chat | null> {
+    return await this.chatRepo.getById(jid);
+  }
+
   private shouldFetchGroup(): boolean {
     const timePassed = new Date().getTime() - this.lastTimeGroupFetch.getTime();
     return timePassed > this.GROUP_METADATA_CACHE_TIME;

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

@@ -1,7 +1,7 @@
 import { extractMessageContent, proto } from '@adiwajshing/baileys';
 
 export function extractMediaContent(
-  content: proto.IMessage | null | undefined,
+  content: any | proto.IMessage | null | undefined,
 ) {
   content = extractMessageContent(content);
   const mediaContent =

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

@@ -2,9 +2,14 @@ import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
 import { Label } from '@waha/structures/labels.dto';
 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');
@@ -18,17 +23,65 @@ const { LoadPaginator } = require('./_Paginator.js');
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const ChatFactory = require('whatsapp-web.js/src/factories/ChatFactory');
 
-export class WebjsClient extends Client {
+export class WebjsClientCore extends Client {
+  public events = new EventEmitter();
+  private wpage: WPage = null;
+
   constructor(options) {
     super(options);
     // Wait until it's READY and inject more utils
     this.on(Events.READY, async () => {
-      await this.pupPage.evaluate(LoadLodash);
-      await this.pupPage.evaluate(LoadPaginator);
-      await this.pupPage.evaluate(LoadWAHA);
+      await this.attachCustomEventListeners();
+      await this.injectWaha();
     });
   }
 
+  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);
+    await this.pupPage.evaluate(LoadWAHA);
+  }
+
+  async attachCustomEventListeners() {
+    await exposeFunctionIfAbsent(
+      this.pupPage,
+      'onNewMessageId',
+      (messageId: string) => {
+        this.events.emit('message.id', { id: messageId });
+        return;
+      },
+    );
+  }
+
+  async destroy() {
+    this.events.removeAllListeners();
+    this.wpage?.removeAllListeners();
+    await super.destroy();
+  }
+
+  async setPushName(name: string) {
+    await this.pupPage.evaluate(async (pushName) => {
+      return await window['WAHA'].WAWebSetPushnameConnAction.setPushname(
+        pushName,
+      );
+    }, name);
+    if (this.info) {
+      this.info.pushname = name;
+    }
+  }
+
   async unpair() {
     await this.pupPage.evaluate(async () => {
       if (
@@ -163,6 +216,9 @@ export class WebjsClient extends Client {
           ) {
             return false;
           }
+          if (filter['filter.ack'] != null && m.ack !== filter['filter.ack']) {
+            return false;
+          }
           return true;
         };
 
@@ -174,8 +230,17 @@ export class WebjsClient 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/_WAHA.js

@@ -11,4 +11,14 @@ exports.LoadWAHA = () => {
     const chatPromises = chats.map((chat) => window.WWebJS.getChatModel(chat));
     return await Promise.all(chatPromises);
   };
+
+  // Set push name
+  window.WAHA.WAWebSetPushnameConnAction = window.require(
+    'WAWebSetPushnameConnAction',
+  );
+
+  // Get my status
+  window.WAHA.WAWebTextStatusCollection = window.require(
+    'WAWebTextStatusCollection',
+  );
 };

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

@@ -0,0 +1,154 @@
+import { WebjsClientCore } from '@waha/core/engines/webjs/WebjsClientCore';
+import {
+  GroupId,
+  GroupInfo,
+  GroupParticipant,
+  GroupParticipantRole,
+} from '@waha/structures/groups.dto';
+import {
+  GroupParticipantType,
+  GroupV2JoinEvent,
+  GroupV2LeaveEvent,
+  GroupV2ParticipantsEvent,
+  GroupV2UpdateEvent,
+} from '@waha/structures/groups.events.dto';
+import {
+  GroupChat,
+  GroupNotification,
+  GroupNotificationTypes,
+  GroupParticipant as WEBJSGroupParticipant,
+} from 'whatsapp-web.js';
+
+function ToGroupInfo(
+  group: GroupChat,
+  invite: string,
+  participants = [],
+): GroupInfo {
+  // @ts-ignore
+  const groupMetadata = group.groupMetadata;
+  const info: GroupInfo = {
+    // @ts-ignore
+    id: group.id._serialized,
+    subject: group.name,
+    description: group.description,
+    invite: invite,
+    membersCanAddNewMember: groupMetadata.restrict,
+    membersCanSendMessages: groupMetadata.announce,
+    newMembersApprovalRequired: groupMetadata.membershipApprovalMode,
+    participants: participants,
+  };
+  return info;
+}
+
+export async function ToGroupV2JoinEvent(
+  client: WebjsClientCore,
+  me: string,
+  notification: GroupNotification,
+): Promise<GroupV2JoinEvent | null> {
+  if (!notification.recipientIds.includes(me)) {
+    return null;
+  }
+  // @ts-ignore
+  const group: GroupChat = await client.getChatById(notification.id.remote);
+  const invite = await group.getInviteCode();
+  const participants = getParticipants(group.participants);
+  const info: GroupInfo = ToGroupInfo(group, invite, participants);
+  return {
+    timestamp: notification.timestamp,
+    group: info,
+    _data: notification,
+  };
+}
+
+function getParticipants(
+  participants: WEBJSGroupParticipant[],
+): GroupParticipant[] {
+  return participants.map((participant) => {
+    let role: GroupParticipantRole = GroupParticipantRole.PARTICIPANT;
+    if (participant.isSuperAdmin) {
+      role = GroupParticipantRole.SUPERADMIN;
+    } else if (participant.isAdmin) {
+      role = GroupParticipantRole.ADMIN;
+    }
+
+    return {
+      id: participant.id._serialized,
+      role: role,
+    };
+  });
+}
+
+export function ToGroupV2LeaveEvent(
+  me: string,
+  notification: GroupNotification,
+): GroupV2LeaveEvent | null {
+  if (!notification.recipientIds.includes(me)) {
+    return null;
+  }
+  const group: GroupId = {
+    // @ts-ignore
+    id: notification.id.remote,
+  };
+  return {
+    timestamp: notification.timestamp,
+    group: group,
+    _data: notification,
+  };
+}
+
+export async function ToGroupV2UpdateEvent(
+  client: WebjsClientCore,
+  notification: GroupNotification,
+): Promise<GroupV2UpdateEvent> {
+  // @ts-ignore
+  const group: GroupChat = await client.getChatById(notification.id.remote);
+  const invite = await group.getInviteCode();
+  const info: GroupInfo = ToGroupInfo(group, invite, undefined);
+  return {
+    group: info,
+    timestamp: notification.timestamp,
+    _data: notification,
+  };
+}
+
+export function ToGroupV2ParticipantsEvent(
+  notification: GroupNotification,
+): GroupV2ParticipantsEvent | null {
+  let type: GroupParticipantType;
+  let role: GroupParticipantRole;
+  if (['add', 'invite', 'linked_group_join'].includes(notification.type)) {
+    type = GroupParticipantType.JOIN;
+    role = GroupParticipantRole.PARTICIPANT;
+  } else if (['remove', 'leave'].includes(notification.type)) {
+    type = GroupParticipantType.LEAVE;
+    role = GroupParticipantRole.LEFT;
+  } else if (['promote'].includes(notification.type)) {
+    type = GroupParticipantType.PROMOTE;
+    role = GroupParticipantRole.ADMIN;
+  } else if (['demote'].includes(notification.type)) {
+    type = GroupParticipantType.DEMOTE;
+    role = GroupParticipantRole.PARTICIPANT;
+  } else {
+    return null;
+  }
+
+  const participants: GroupParticipant[] = notification.recipientIds.map(
+    (id) => {
+      return {
+        id: id,
+        role: role,
+      };
+    },
+  );
+  const group: GroupId = {
+    // @ts-ignore
+    id: notification.id.remote,
+  };
+  return {
+    group: group,
+    type: type,
+    timestamp: notification.timestamp,
+    participants: participants,
+    _data: notification,
+  };
+}

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

@@ -1,23 +1,53 @@
+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,
+  ToGroupV2ParticipantsEvent,
+  ToGroupV2UpdateEvent,
+} from '@waha/core/engines/webjs/groups.webjs';
 import { LocalAuth } from '@waha/core/engines/webjs/LocalAuth';
-import { WebjsClient } from '@waha/core/engines/webjs/WebjsClient';
+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 {
   Channel,
+  ChannelListResult,
+  ChannelMessage,
   ChannelRole,
+  ChannelSearchByText,
+  ChannelSearchByView,
   CreateChannelRequest,
   ListChannelsQuery,
+  PreviewChannelMessages,
 } from '@waha/structures/channels.dto';
 import {
   ChatSortField,
@@ -25,11 +55,14 @@ import {
   GetChatMessageQuery,
   GetChatMessagesFilter,
   GetChatMessagesQuery,
+  ReadChatMessagesQuery,
+  ReadChatMessagesResponse,
 } from '@waha/structures/chats.dto';
 import {
   ChatRequest,
   CheckNumberStatusQuery,
   EditMessageRequest,
+  MessageButtonReply,
   MessageFileRequest,
   MessageForwardRequest,
   MessageImageRequest,
@@ -52,6 +85,7 @@ import {
   WAHASessionStatus,
   WAMessageAck,
 } from '@waha/structures/enums.dto';
+import { BinaryFile, RemoteFile } from '@waha/structures/files.dto';
 import {
   CreateGroupRequest,
   GroupSortField,
@@ -61,20 +95,27 @@ import {
 import { Label, LabelDTO, LabelID } from '@waha/structures/labels.dto';
 import { ReplyToMessage } from '@waha/structures/message.dto';
 import { PaginationParams, SortOrder } from '@waha/structures/pagination.dto';
-import { WAMessage, WAMessageReaction } from '@waha/structures/responses.dto';
+import {
+  MessageSource,
+  WAMessage,
+  WAMessageReaction,
+} from '@waha/structures/responses.dto';
 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 { fromEvent, merge, mergeMap, Observable } from 'rxjs';
+import { ProtocolError } from 'puppeteer';
+import { filter, fromEvent, merge, mergeMap, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import WAWebJS, {
+import {
+  AuthStrategy,
   Call,
   Channel as WEBJSChannel,
   Chat,
@@ -82,9 +123,11 @@ import WAWebJS, {
   Contact,
   Events,
   GroupChat,
+  GroupNotification,
   Label as WEBJSLabel,
   Location,
   Message,
+  MessageAck,
   MessageMedia,
   Reaction,
   WAState,
@@ -106,7 +149,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
   private engineStateCheckDelayedJob: SingleDelayedJobRunner;
   private shouldRestart: boolean;
 
-  whatsapp: WebjsClient;
+  whatsapp: WebjsClientCore;
   protected qr: QR;
 
   public constructor(config) {
@@ -169,7 +212,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       rmMaxRetries: undefined,
     });
     this.addProxyConfig(clientOptions);
-    return new WebjsClient(clientOptions);
+    return new WebjsClientCore(clientOptions);
   }
 
   private restartClient() {
@@ -220,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");
@@ -284,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 () => {
@@ -298,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');
     }
   }
 
@@ -450,6 +530,30 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     };
   }
 
+  /**
+   * Profile methods
+   */
+  public async setProfileName(name: string): Promise<boolean> {
+    await this.whatsapp.setPushName(name);
+    return true;
+  }
+
+  public async setProfileStatus(status: string): Promise<boolean> {
+    await this.whatsapp.setStatus(status);
+    return true;
+  }
+
+  protected setProfilePicture(file: BinaryFile | RemoteFile): Promise<boolean> {
+    throw new AvailableInPlusVersion();
+  }
+
+  protected deleteProfilePicture(): Promise<boolean> {
+    throw new AvailableInPlusVersion();
+  }
+
+  /**
+   * Other methods
+   */
   sendText(request: MessageTextRequest) {
     const options = this.getMessageOptions(request);
     return this.whatsapp.sendMessage(
@@ -473,13 +577,18 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     const options = {
       // It's fine to sent just ids instead of Contact object
       mentions: request.mentions as unknown as string[],
+      linkPreview: request.linkPreview,
     };
     return message.edit(request.text, options);
   }
 
   reply(request: MessageReplyRequest) {
     const options = this.getMessageOptions(request);
-    return this.whatsapp.sendMessage(request.chatId, request.text, options);
+    return this.whatsapp.sendMessage(
+      this.ensureSuffix(request.chatId),
+      request.text,
+      options,
+    );
   }
 
   sendImage(request: MessageImageRequest) {
@@ -494,17 +603,25 @@ 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,
     });
     const options = this.getMessageOptions(request);
-    return this.whatsapp.sendMessage(request.chatId, location, options);
+    return this.whatsapp.sendMessage(
+      this.ensureSuffix(request.chatId),
+      location,
+      options,
+    );
   }
 
   async forwardMessage(request: MessageForwardRequest): Promise<WAMessage> {
     const forwardMessage = this.recreateMessage(request.messageId);
-    const msg = await forwardMessage.forward(request.chatId);
+    const msg = await forwardMessage.forward(this.ensureSuffix(request.chatId));
     // Return "sent: true" for now
     // need to research how to get the data from WebJS
     // @ts-ignore
@@ -512,17 +629,23 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
   }
 
   async sendSeen(request: SendSeenRequest) {
-    const chat: Chat = await this.whatsapp.getChatById(request.chatId);
+    const chat: Chat = await this.whatsapp.getChatById(
+      this.ensureSuffix(request.chatId),
+    );
     await chat.sendSeen();
   }
 
   async startTyping(request: ChatRequest) {
-    const chat: Chat = await this.whatsapp.getChatById(request.chatId);
+    const chat: Chat = await this.whatsapp.getChatById(
+      this.ensureSuffix(request.chatId),
+    );
     await chat.sendStateTyping();
   }
 
   async stopTyping(request: ChatRequest) {
-    const chat: Chat = await this.whatsapp.getChatById(request.chatId);
+    const chat: Chat = await this.whatsapp.getChatById(
+      this.ensureSuffix(request.chatId),
+    );
     await chat.clearState();
   }
 
@@ -630,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,
@@ -637,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);
   }
 
@@ -658,7 +805,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
   }
 
   async deleteChat(chatId) {
-    const chat = await this.whatsapp.getChatById(chatId);
+    const chat = await this.whatsapp.getChatById(this.ensureSuffix(chatId));
     return chat.delete();
   }
 
@@ -843,6 +990,13 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     return paginator.apply(groups);
   }
 
+  protected removeGroupsFieldParticipant(group: any) {
+    delete group.groupMetadata?.participants;
+    delete group.groupMetadata?.pendingParticipants;
+    delete group.groupMetadata?.pastParticipants;
+    delete group.groupMetadata?.membershipApprovalRequests;
+  }
+
   public async refreshGroups(): Promise<boolean> {
     return true;
   }
@@ -922,6 +1076,25 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
   /**
    * Channels methods
    */
+  public searchChannelsByView(
+    query: ChannelSearchByView,
+  ): Promise<ChannelListResult> {
+    throw new AvailableInPlusVersion();
+  }
+
+  public searchChannelsByText(
+    query: ChannelSearchByText,
+  ): Promise<ChannelListResult> {
+    throw new AvailableInPlusVersion();
+  }
+
+  public async previewChannelMessages(
+    inviteCode: string,
+    query: PreviewChannelMessages,
+  ): Promise<ChannelMessage[]> {
+    throw new AvailableInPlusVersion();
+  }
+
   protected ChatToChannel(chat: WEBJSChannel): Channel {
     // @ts-ignore
     const metadata = chat.channelMetadata;
@@ -938,6 +1111,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       picture: null,
       verified: metadata.verified,
       role: role,
+      subscribersCount: null,
     };
   }
 
@@ -955,6 +1129,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       picture: metadata.pictureUrl,
       verified: metadata.isVerified,
       role: role,
+      subscribersCount: metadata.subscribersCount,
     };
   }
 
@@ -966,6 +1141,10 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       channels = channels.filter((channel) => channel.role === query.role);
     }
 
+    // Exclude GUEST, browser saves the data
+    // when we search channels or getting messages
+    channels = channels.filter((channel) => channel.role !== 'GUEST');
+
     const promises = channels.map(async (channel) =>
       this.whatsapp.getProfilePicUrl(channel.id),
     );
@@ -1054,7 +1233,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
    * Status methods
    */
   protected checkStatusRequest(request: StatusRequest) {
-    if (request.contacts?.length > 0) {
+    if (request.contacts && request.contacts?.length > 0) {
       const msg =
         "WEBJS doesn't accept 'contacts'. Remove the field to send status to all contacts.";
       throw new UnprocessableEntityException(msg);
@@ -1070,6 +1249,11 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
    * END - Methods for API
    */
   subscribeEngineEvents2() {
+    // Save sent message in cache
+    this.whatsapp.events.on('message.id', (data) => {
+      this.saveSentMessageId(data.id);
+    });
+
     //
     // All
     //
@@ -1142,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
@@ -1164,10 +1361,52 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     //
     // Groups
     //
-    const groupJoin$ = fromEvent(this.whatsapp, Events.GROUP_JOIN);
-    this.events2.get(WAHAEvents.GROUP_JOIN).switch(groupJoin$);
-    const groupLeave$ = fromEvent(this.whatsapp, Events.GROUP_LEAVE);
-    this.events2.get(WAHAEvents.GROUP_LEAVE).switch(groupLeave$);
+    const groupJoin$ = fromEvent<GroupNotification>(
+      this.whatsapp,
+      Events.GROUP_JOIN,
+    );
+    this.events2.get(WAHAEvents.GROUP_JOIN).switch(groupJoin$); // v1
+    const groupV2Join$ = groupJoin$.pipe(
+      mergeMap((evt) =>
+        ToGroupV2JoinEvent(this.whatsapp, this.getSessionMeInfo().id, evt),
+      ),
+      filter(Boolean),
+    );
+    this.events2.get(WAHAEvents.GROUP_V2_JOIN).switch(groupV2Join$);
+
+    const groupLeave$ = fromEvent<GroupNotification>(
+      this.whatsapp,
+      Events.GROUP_LEAVE,
+    );
+    this.events2.get(WAHAEvents.GROUP_LEAVE).switch(groupLeave$); // v1
+    const groupV2Leave$ = groupLeave$.pipe(
+      map((evt) => ToGroupV2LeaveEvent(this.getSessionMeInfo().id, evt)),
+      filter(Boolean),
+    );
+    this.events2.get(WAHAEvents.GROUP_V2_LEAVE).switch(groupV2Leave$);
+
+    const groupAdminChanged$ = fromEvent(
+      this.whatsapp,
+      Events.GROUP_ADMIN_CHANGED,
+    );
+    const groupV2Participants = merge(
+      groupJoin$,
+      groupLeave$,
+      groupAdminChanged$,
+    ).pipe(map(ToGroupV2ParticipantsEvent), filter(Boolean));
+    this.events2
+      .get(WAHAEvents.GROUP_V2_PARTICIPANTS)
+      .switch(groupV2Participants);
+
+    const groupUpdate$ = fromEvent<GroupNotification>(
+      this.whatsapp,
+      Events.GROUP_UPDATE,
+    );
+    const groupV2Update$ = groupUpdate$.pipe(
+      mergeMap((evt) => ToGroupV2UpdateEvent(this.whatsapp, evt)),
+      filter(Boolean),
+    );
+    this.events2.get(WAHAEvents.GROUP_V2_UPDATE).switch(groupV2Update$);
 
     //
     // Chats
@@ -1211,7 +1450,10 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     this.events2.get(WAHAEvents.CALL_RECEIVED).switch(calls$);
   }
 
-  private async processIncomingMessage(message: Message, downloadMedia = true) {
+  protected async processIncomingMessage(
+    message: Message,
+    downloadMedia = true,
+  ) {
     if (downloadMedia) {
       try {
         message = await this.downloadMedia(message);
@@ -1224,10 +1466,12 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
   }
 
   private processMessageReaction(reaction: Reaction): WAMessageReaction {
+    const source = this.getMessageSource(reaction.id.id);
     return {
       id: reaction.id._serialized,
       from: reaction.senderId,
       fromMe: reaction.id.fromMe,
+      source: source,
       participant: reaction.senderId,
       to: reaction.id.remote,
       timestamp: reaction.timestamp,
@@ -1238,21 +1482,52 @@ 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,
       // Media
       // @ts-ignore
-      hasMedia: Boolean(message.media),
+      hasMedia: Boolean(message.hasMedia),
       // @ts-ignore
-      media: message.media,
+      media: message.media || null,
       // @ts-ignore
       mediaUrl: message.media?.url,
       // @ts-ignore
@@ -1267,7 +1542,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
 
   protected extractReplyTo(message: Message): ReplyToMessage | null {
     // @ts-ignore
-    const quotedMsg = message.rawData.quotedMsg;
+    const quotedMsg = message.rawData?.quotedMsg;
     if (!quotedMsg) {
       return;
     }
@@ -1275,6 +1550,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       id: quotedMsg.id?.id,
       participant: quotedMsg.author || quotedMsg.from,
       body: quotedMsg.caption || quotedMsg.body,
+      _data: quotedMsg,
     };
   }
 
@@ -1301,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/integrations/webhooks/WebhookSender.ts

@@ -66,7 +66,7 @@ export class WebhookSender {
     const headers = {
       'content-type': 'application/json',
     };
-    Object.assign(headers, this.getWebhookHeader());
+    Object.assign(headers, this.getWebhookHeader(json));
     Object.assign(headers, this.getHMACHeaders(body));
     const ctx = {
       id: headers['X-Webhook-Request-Id'],
@@ -153,12 +153,13 @@ export class WebhookSender {
     };
   }
 
-  protected getWebhookHeader() {
+  protected getWebhookHeader(json: any) {
+    const timestamp = json.timestamp?.toString() || Date.now().toString();
     return {
       // UUID, no '-' in it
       'X-Webhook-Request-Id': ulid(),
       // unix timestamp with ms
-      'X-Webhook-Timestamp': Date.now().toString(),
+      'X-Webhook-Timestamp': timestamp,
     };
   }
 

src/core/manager.core.ts

@@ -45,9 +45,11 @@ import { LocalSessionAuthRepository } from './storage/LocalSessionAuthRepository
 import { LocalStoreCore } from './storage/LocalStoreCore';
 
 export class OnlyDefaultSessionIsAllowed extends UnprocessableEntityException {
-  constructor() {
+  constructor(name: string) {
+    const encoded = Buffer.from(name, 'utf-8').toString('base64');
     super(
-      `WAHA Core support only 'default' session. If you want to run more then one WhatsApp account - please get WAHA PLUS version. Check this out: ${DOCS_URL}`,
+      `WAHA Core support only 'default' session. You tried to access '${name}' session (base64: ${encoded}). ` +
+        `If you want to run more then one WhatsApp account - please get WAHA PLUS version. Check this out: ${DOCS_URL}`,
     );
   }
 }
@@ -115,7 +117,7 @@ export class SessionManagerCore extends SessionManager implements OnModuleInit {
 
   private onlyDefault(name: string) {
     if (name !== this.DEFAULT) {
-      throw new OnlyDefaultSessionIsAllowed();
+      throw new OnlyDefaultSessionIsAllowed(name);
     }
   }
 
@@ -362,9 +364,9 @@ export class SessionManagerCore extends SessionManager implements OnModuleInit {
       try {
         engineInfo = await promiseTimeout(1000, session.getEngineInfo());
       } catch (error) {
-        this.log.warn(
+        this.log.debug(
           { session: session.name, error: `${error}` },
-          'Error while getting engine info',
+          'Can not get engine info',
         );
       }
     }

src/core/services/ChannelsInfoServiceCore.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@nestjs/common';
+import { AvailableInPlusVersion } from '@waha/core/exceptions';
+import {
+  ChannelCategory,
+  ChannelCountry,
+  ChannelView,
+} from '@waha/structures/channels.dto';
+
+@Injectable()
+export class ChannelsInfoServiceCore {
+  async getCountries(): Promise<ChannelCountry[]> {
+    throw new AvailableInPlusVersion();
+  }
+
+  async getCategories(): Promise<ChannelCategory[]> {
+    throw new AvailableInPlusVersion();
+  }
+
+  async getViews(): Promise<ChannelView[]> {
+    throw new AvailableInPlusVersion();
+  }
+}

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

@@ -30,4 +30,14 @@ function splitAt(str: string, index) {
   return [fst.join(''), snd.join('')];
 }
 
+export function sortObjectByValues(obj: any) {
+  if (!obj) {
+    return obj;
+  }
+  return Object.fromEntries(
+    // @ts-ignore
+    Object.entries(obj).sort(([, v1], [, v2]) => v2 - v1),
+  );
+}
+
 export { flipObject, parseBool, splitAt };

src/main.ts

@@ -1,5 +1,6 @@
 import { NestFactory } from '@nestjs/core';
 import { WsAdapter } from '@nestjs/platform-ws';
+import { WAHA_WEBHOOKS } from '@waha/structures/webhooks';
 import {
   getNestJSLogLevels,
   getPinoLogLevel,
@@ -15,7 +16,6 @@ import { WhatsappConfigService } from './config.service';
 import { AppModuleCore } from './core/app.module.core';
 import { SwaggerConfiguratorCore } from './core/SwaggerConfiguratorCore';
 import { AllExceptionsFilter } from './nestjs/AllExceptionsFilter';
-import { WAHA_WEBHOOKS } from './structures/webhooks.dto';
 import { getWAHAVersion, VERSION, WAHAVersion } from './version';
 
 const logger: Logger = pino({
@@ -23,12 +23,22 @@ const logger: Logger = pino({
   transport: getPinoTransport(),
 }).child({ name: 'Bootstrap' });
 
-logger.info('NODE - Catching unhandled rejection enabled');
-process.on('unhandledRejection', (reason, promise) => {
-  logger.error('Unhandled Rejection at:', promise, 'reason:', reason);
-  // @ts-ignore
-  logger.error(reason.stack);
+process.on('uncaughtException', (err) => {
+  logger.error('Uncaught Exception:', err);
+  if (err instanceof Error) {
+    logger.error(err.stack);
+  }
 });
+process.on('unhandledRejection', (reason, promise) => {
+  logger.error('Unhandled Rejection at:', promise);
+  if (reason instanceof Error) {
+    logger.error(reason.stack);
+  } else {
+    logger.error('Unhandled rejection reason:', reason);
+  }
+});
+logger.info('NODE - Catching unhandled rejections and exceptions enabled');
+
 process.on('SIGINT', () => {
   logger.info('SIGINT received');
 });

src/nestjs/params/MessageIdApiParam.ts

@@ -4,6 +4,7 @@ export const MessageIdApiParam = ApiParam({
   name: 'messageId',
   required: true,
   type: 'string',
-  description: 'Message ID',
+  description:
+    'Message ID in format <code>{fromMe}_{chat}_{message_id}[_{participant}]</code>',
   example: 'true_123456789@c.us_BAE6A33293978B16',
 });

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/nestjs/ws/WebsocketHeartbeatJob.ts

@@ -22,7 +22,7 @@ export class WebsocketHeartbeatJob {
           this.logger.debug(
             `Terminating client connection due to heartbeat timeout, ${client.id}`,
           );
-          return client.terminate();
+          client.terminate();
         }
 
         client.isAlive = false;

src/structures/auth.dto.ts

@@ -35,14 +35,6 @@ export class RequestCodeRequest {
   localeCountry: string;
 }
 
-export class OTPRequest {
-  code: string;
-}
-
-export class CaptchaBody {
-  code: string;
-}
-
 export class PairingCodeResponse {
   code: string;
 }

src/structures/base.dto.ts

@@ -16,5 +16,17 @@ export class SessionQuery {
  */
 
 export class SessionBaseRequest {
+  @IsString()
   session: string = WHATSAPP_DEFAULT_SESSION_NAME;
 }
+
+export class Result {
+  success: boolean = true;
+}
+
+/**
+ * Responses
+ */
+export class CountResponse {
+  count: number = 0;
+}

src/structures/channels.dto.ts

@@ -1,5 +1,17 @@
 import { ApiParam, ApiProperty, getSchemaPath } from '@nestjs/swagger';
+import { BooleanString } from '@waha/nestjs/validation/BooleanString';
 import { BinaryFile, RemoteFile } from '@waha/structures/files.dto';
+import { WAMessage } from '@waha/structures/responses.dto';
+import { Transform, Type } from 'class-transformer';
+import {
+  ArrayMinSize,
+  IsArray,
+  IsBoolean,
+  IsNotEmpty,
+  IsNumber,
+  IsOptional,
+  IsString,
+} from 'class-validator';
 
 export class CreateChannelRequest {
   @ApiProperty({
@@ -38,7 +50,7 @@ export class ListChannelsQuery {
   role?: ChannelRoleFilter;
 }
 
-export class Channel {
+class ChannelBase {
   @ApiProperty({
     description: 'Newsletter id',
     example: '123123123123@newsletter',
@@ -73,9 +85,15 @@ export class Channel {
 
   verified: boolean;
 
+  subscribersCount: number;
+}
+
+export class Channel extends ChannelBase {
   role: ChannelRole;
 }
 
+export class ChannelPublicInfo extends ChannelBase {}
+
 export const NewsletterIdApiParam = ApiParam({
   name: 'id',
   required: true,
@@ -96,3 +114,86 @@ export const NewsletterIdOrInviteCodeApiParam = ApiParam({
   description:
     'WhatsApp Channel ID or invite code from invite link https://www.whatsapp.com/channel/11111',
 });
+
+export class ChannelCountry {
+  code: string;
+  name: string;
+}
+
+export class ChannelCategory {
+  value: string;
+  name: string;
+}
+
+export class ChannelView {
+  value: string;
+  name: string;
+}
+
+export class ChannelSearch {
+  @IsNumber()
+  @IsOptional()
+  limit: number = 50;
+
+  @IsString()
+  startCursor: string = '';
+}
+
+export class ChannelSearchByView extends ChannelSearch {
+  @IsString()
+  view: string = 'RECOMMENDED';
+
+  @IsArray()
+  @IsString({ each: true })
+  @ArrayMinSize(1)
+  countries: string[] = ['US'];
+
+  @IsArray()
+  @IsString({ each: true })
+  categories: string[] = [];
+}
+
+export class ChannelSearchByText extends ChannelSearch {
+  @IsString()
+  @IsNotEmpty()
+  text: string = 'Donald Trump';
+
+  @IsArray()
+  @IsString({ each: true })
+  categories: string[] = [];
+}
+
+export class ChannelPagination {
+  startCursor: string | null;
+  endCursor: string | null;
+  hasNextPage: boolean;
+  hasPreviousPage: boolean;
+}
+
+export class ChannelListResult {
+  page: ChannelPagination;
+  channels: ChannelPublicInfo[];
+}
+
+export class ChannelMessage {
+  message: WAMessage;
+
+  @ApiProperty({
+    example: { '👍': 10, '❤️': 5 },
+    type: Object,
+    additionalProperties: { type: 'number' },
+  })
+  reactions: { [emoji: string]: number };
+
+  viewCount: number;
+}
+
+export class PreviewChannelMessages {
+  @Transform(BooleanString)
+  @IsBoolean()
+  downloadMedia: boolean = false;
+
+  @IsNumber()
+  @Type(() => Number)
+  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;
 }
@@ -158,6 +176,74 @@ export class MessageTextRequest extends ChatRequest {
   reply_to?: string;
 
   linkPreview?: boolean = true;
+  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 {
@@ -165,6 +251,9 @@ export class EditMessageRequest {
 
   @ApiHideProperty()
   mentions?: string[];
+
+  linkPreview?: boolean = true;
+  linkPreviewHighQuality?: boolean = false;
 }
 
 export class MessageReplyRequest extends MessageTextRequest {
@@ -329,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

@@ -11,6 +11,10 @@ export enum WAHAEvents {
   STATE_CHANGE = 'state.change',
   GROUP_JOIN = 'group.join',
   GROUP_LEAVE = 'group.leave',
+  GROUP_V2_JOIN = 'group.v2.join',
+  GROUP_V2_LEAVE = 'group.v2.leave',
+  GROUP_V2_UPDATE = 'group.v2.update',
+  GROUP_V2_PARTICIPANTS = 'group.v2.participants',
   PRESENCE_UPDATE = 'presence.update',
   POLL_VOTE = 'poll.vote',
   POLL_VOTE_FAILED = 'poll.vote.failed',
@@ -25,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,
@@ -61,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/groups.dto.ts

@@ -74,6 +74,23 @@ export class JoinGroupResponse {
   id: string;
 }
 
+export enum GroupField {
+  NONE = '',
+  PARTICIPANTS = 'participants',
+}
+
+export class GroupsListFields {
+  @IsOptional()
+  @ApiProperty({
+    description: 'Exclude fields',
+    enum: GroupField,
+    isArray: true,
+    required: false,
+  })
+  @IsEnum(GroupField, { each: true })
+  exclude: string[];
+}
+
 export enum GroupSortField {
   ID = 'id',
   SUBJECT = 'subject',
@@ -88,3 +105,69 @@ export class GroupsPaginationParams extends PaginationParams {
   @IsEnum(GroupSortField)
   sortBy?: string;
 }
+
+export enum GroupParticipantRole {
+  LEFT = 'left',
+  PARTICIPANT = 'participant',
+  ADMIN = 'admin',
+  SUPERADMIN = 'superadmin',
+}
+
+export class GroupParticipant {
+  @ApiProperty({
+    example: '123456789@c.us',
+  })
+  id: string;
+
+  @ApiProperty({
+    example: GroupParticipantRole.PARTICIPANT,
+  })
+  role: GroupParticipantRole;
+}
+
+export class GroupId {
+  @ApiProperty({
+    example: '123456789@g.us',
+  })
+  id: string;
+}
+
+export class GroupInfo {
+  @ApiProperty({
+    example: '123456789@g.us',
+  })
+  id: string;
+
+  @ApiProperty({
+    example: 'Group Name',
+  })
+  subject: string;
+
+  @ApiProperty({
+    example: 'Group Description',
+  })
+  description: string;
+
+  participants: GroupParticipant[];
+
+  @ApiProperty({
+    description: 'Invite URL',
+    example: 'https://chat.whatsapp.com/1234567890abcdef',
+  })
+  invite?: string;
+
+  @ApiProperty({
+    description: 'Members can add new members',
+  })
+  membersCanAddNewMember: boolean;
+
+  @ApiProperty({
+    description: 'Members can send messages to the group',
+  })
+  membersCanSendMessages: boolean;
+
+  @ApiProperty({
+    description: 'Admin approval required for new members',
+  })
+  newMembersApprovalRequired: boolean;
+}

src/structures/groups.events.dto.ts

@@ -0,0 +1,71 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+import { GroupId, GroupInfo, GroupParticipant } from './groups.dto';
+
+/**
+ * Happens when you join or are added to a group.
+ */
+export class GroupV2JoinEvent {
+  @ApiProperty({
+    description: 'Unix timestamp',
+    example: 1666943582,
+  })
+  timestamp: number;
+
+  group: GroupInfo;
+
+  _data: any;
+}
+
+/**
+ * Happens when you leave or are removed from a group.
+ */
+export class GroupV2LeaveEvent {
+  @ApiProperty({
+    description: 'Unix timestamp',
+    example: 1666943582,
+  })
+  timestamp: number;
+
+  group: GroupId;
+
+  _data: any;
+}
+
+export class GroupV2UpdateEvent {
+  @ApiProperty({
+    description: 'Unix timestamp',
+    example: 1666943582,
+  })
+  timestamp: number;
+
+  group: Partial<GroupInfo>;
+
+  _data: any;
+}
+
+export enum GroupParticipantType {
+  JOIN = 'join',
+  LEAVE = 'leave',
+  PROMOTE = 'promote',
+  DEMOTE = 'demote',
+}
+
+export class GroupV2ParticipantsEvent {
+  group: GroupId;
+
+  @ApiProperty({
+    description: 'Type of the event',
+  })
+  type: GroupParticipantType;
+
+  @ApiProperty({
+    description: 'Unix timestamp',
+    example: 1666943582,
+  })
+  timestamp: number;
+
+  participants: GroupParticipant[];
+
+  _data: any;
+}

src/structures/groups.webhooks.dto.ts

@@ -0,0 +1,45 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { WAHAEvents } from '@waha/structures/enums.dto';
+import {
+  GroupV2JoinEvent,
+  GroupV2LeaveEvent,
+  GroupV2ParticipantsEvent,
+  GroupV2UpdateEvent,
+} from '@waha/structures/groups.events.dto';
+import { WAHAWebhook } from '@waha/structures/webhooks.dto';
+
+export class WebhookGroupV2Join extends WAHAWebhook {
+  @ApiProperty({
+    description: 'When you joined or were added to a group',
+  })
+  event = WAHAEvents.GROUP_V2_JOIN;
+
+  payload: GroupV2JoinEvent;
+}
+
+export class WebhookGroupV2Leave extends WAHAWebhook {
+  @ApiProperty({
+    description: 'When you left or were removed from a group',
+  })
+  event = WAHAEvents.GROUP_V2_LEAVE;
+
+  payload: GroupV2LeaveEvent;
+}
+
+export class WebhookGroupV2Update extends WAHAWebhook {
+  @ApiProperty({
+    description: 'When group info is updated',
+  })
+  event = WAHAEvents.GROUP_V2_UPDATE;
+
+  payload: GroupV2UpdateEvent;
+}
+
+export class WebhookGroupV2Participants extends WAHAWebhook {
+  @ApiProperty({
+    description: 'When participants changed - join, leave, promote to admin',
+  })
+  event = WAHAEvents.GROUP_V2_PARTICIPANTS;
+
+  payload: GroupV2ParticipantsEvent;
+}

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/profile.dto.ts

@@ -0,0 +1,45 @@
+import { ApiExtraModels, ApiProperty, getSchemaPath } from '@nestjs/swagger';
+import { BinaryFile, RemoteFile } from '@waha/structures/files.dto';
+import { ChatIdProperty } from '@waha/structures/properties.dto';
+import { IsNotEmpty, IsString } from 'class-validator';
+
+export class MyProfile {
+  @ChatIdProperty()
+  id: string;
+
+  name: string;
+
+  @ApiProperty({
+    example: 'https://example.com/picture.jpg',
+  })
+  picture: string | null;
+}
+
+export class ProfileNameRequest {
+  @IsString()
+  @IsNotEmpty()
+  @ApiProperty({
+    example: 'My New Name',
+  })
+  name: string;
+}
+
+export class ProfileStatusRequest {
+  @IsString()
+  @IsNotEmpty()
+  @ApiProperty({
+    example: '🎉 Hey there! I am using WhatsApp 🎉',
+  })
+  status: string;
+}
+
+@ApiExtraModels(RemoteFile, BinaryFile)
+export class ProfilePictureRequest {
+  @ApiProperty({
+    oneOf: [
+      { $ref: getSchemaPath(RemoteFile) },
+      { $ref: getSchemaPath(BinaryFile) },
+    ],
+  })
+  file: BinaryFile | RemoteFile;
+}

src/structures/responses.dto.ts

@@ -11,6 +11,11 @@ export class WALocation {
   longitude: string;
 }
 
+export enum MessageSource {
+  API = 'api',
+  APP = 'app',
+}
+
 class WAMessageBase {
   @MessageIdProperty()
   id: string;
@@ -33,6 +38,13 @@ class WAMessageBase {
   })
   fromMe: boolean;
 
+  @ApiProperty({
+    description:
+      'The device that sent the message - either API or APP. Available in events (webhooks/websockets) only and only "fromMe: true" messages.',
+    example: MessageSource.API,
+  })
+  source: MessageSource;
+
   @ChatIdProperty({
     description: `
 * ID for who this message is for.

src/structures/status.dto.ts

@@ -17,21 +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 = 1;
+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) },
@@ -41,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) },
@@ -57,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) },
@@ -73,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/structures/webhooks.dto.ts

@@ -91,6 +91,7 @@ export class PollVotePayload {
 export class WAMessageRevokedBody {
   after?: WAMessage;
   before?: WAMessage;
+  _data?: any;
 }
 
 export class WASessionStatusBody {
@@ -104,10 +105,18 @@ export class WASessionStatusBody {
 
 export class WAHAWebhook {
   @ApiProperty({
-    example: 'evt_01jcn4pjwwg47bwy2gsey6q5sx',
+    example: 'evt_01aaaaaaaaaaaaaaaaaaaaaaaa',
+    description:
+      'Unique identifier for the event - lower case ULID format. https://github.com/ulid/spec',
   })
   id: string;
 
+  @ApiProperty({
+    example: 1634567890123,
+    description: 'Unix timestamp (ms) for when the event was created.',
+  })
+  timestamp: number;
+
   @ApiProperty({
     example: 'default',
   })
@@ -148,14 +157,14 @@ export class WAHAWebhookSessionStatus extends WAHAWebhook {
   payload: WASessionStatusBody;
 }
 
-class WAHAWebhookMessage extends WAHAWebhook {
+export class WAHAWebhookMessage extends WAHAWebhook {
   @ApiProperty({ description: 'Incoming message.' })
   event = WAHAEvents.MESSAGE;
 
   payload: WAMessage;
 }
 
-class WAHAWebhookMessageReaction extends WAHAWebhook {
+export class WAHAWebhookMessageReaction extends WAHAWebhook {
   @ApiProperty({
     description:
       'The event is triggered when a user reacts or removes a reaction.',
@@ -165,7 +174,7 @@ class WAHAWebhookMessageReaction extends WAHAWebhook {
   payload: WAMessageReaction;
 }
 
-class WAHAWebhookMessageAny extends WAHAWebhook {
+export class WAHAWebhookMessageAny extends WAHAWebhook {
   @ApiProperty({
     description: 'Fired on all message creations, including your own.',
   })
@@ -174,7 +183,7 @@ class WAHAWebhookMessageAny extends WAHAWebhook {
   payload: WAMessage;
 }
 
-class WAHAWebhookMessageAck extends WAHAWebhook {
+export class WAHAWebhookMessageAck extends WAHAWebhook {
   @ApiProperty({
     description:
       'Receive events when server or recipient gets the message, read or played it.',
@@ -184,7 +193,7 @@ class WAHAWebhookMessageAck extends WAHAWebhook {
   payload: WAMessageAckBody;
 }
 
-class WAHAWebhookMessageRevoked extends WAHAWebhook {
+export class WAHAWebhookMessageRevoked extends WAHAWebhook {
   @ApiProperty({
     description:
       'The event is triggered when a user, whether it be you or any other participant, ' +
@@ -195,34 +204,37 @@ class WAHAWebhookMessageRevoked extends WAHAWebhook {
   payload: WAMessageRevokedBody;
 }
 
-class WAHAWebhookStateChange extends WAHAWebhook {
+export class WAHAWebhookStateChange extends WAHAWebhook {
   @ApiProperty({
     description: 'It’s an internal engine’s state, not session status.',
+    deprecated: true,
   })
   event = WAHAEvents.STATE_CHANGE;
 
   payload: any;
 }
 
-class WAHAWebhookGroupJoin extends WAHAWebhook {
+export class WAHAWebhookGroupJoin extends WAHAWebhook {
   @ApiProperty({
     description: 'Some one join a group.',
+    deprecated: true,
   })
   event = WAHAEvents.GROUP_JOIN;
 
   payload: any;
 }
 
-class WAHAWebhookGroupLeave extends WAHAWebhook {
+export class WAHAWebhookGroupLeave extends WAHAWebhook {
   @ApiProperty({
     description: 'Some one left a group.',
+    deprecated: true,
   })
   event = WAHAEvents.GROUP_LEAVE;
 
   payload: any;
 }
 
-class WAHAWebhookPresenceUpdate extends WAHAWebhook {
+export class WAHAWebhookPresenceUpdate extends WAHAWebhook {
   @ApiProperty({
     description: 'The most recent presence information for a chat.',
   })
@@ -231,7 +243,7 @@ class WAHAWebhookPresenceUpdate extends WAHAWebhook {
   payload: WAHAChatPresences;
 }
 
-class WAHAWebhookPollVote extends WAHAWebhook {
+export class WAHAWebhookPollVote extends WAHAWebhook {
   @ApiProperty({
     description: 'With this event, you receive new votes for the poll sent.',
   })
@@ -240,7 +252,7 @@ class WAHAWebhookPollVote extends WAHAWebhook {
   payload: PollVotePayload;
 }
 
-class WAHAWebhookPollVoteFailed extends WAHAWebhook {
+export class WAHAWebhookPollVoteFailed extends WAHAWebhook {
   @ApiProperty({
     description:
       'There may be cases when it fails to decrypt a vote from the user. ' +
@@ -251,7 +263,7 @@ class WAHAWebhookPollVoteFailed extends WAHAWebhook {
   payload: PollVotePayload;
 }
 
-class WAHAWebhookChatArchive extends WAHAWebhook {
+export class WAHAWebhookChatArchive extends WAHAWebhook {
   @ApiProperty({
     description:
       'The event is triggered when the chat is archived or unarchived',
@@ -261,7 +273,7 @@ class WAHAWebhookChatArchive extends WAHAWebhook {
   payload: ChatArchiveEvent;
 }
 
-class WAHAWebhookCallReceived extends WAHAWebhook {
+export class WAHAWebhookCallReceived extends WAHAWebhook {
   @ApiProperty({
     description:
       'The event is triggered when the call is received by the user.',
@@ -271,7 +283,7 @@ class WAHAWebhookCallReceived extends WAHAWebhook {
   payload: CallData;
 }
 
-class WAHAWebhookCallAccepted extends WAHAWebhook {
+export class WAHAWebhookCallAccepted extends WAHAWebhook {
   @ApiProperty({
     description:
       'The event is triggered when the call is accepted by the user.',
@@ -281,7 +293,7 @@ class WAHAWebhookCallAccepted extends WAHAWebhook {
   payload: CallData;
 }
 
-class WAHAWebhookCallRejected extends WAHAWebhook {
+export class WAHAWebhookCallRejected extends WAHAWebhook {
   @ApiProperty({
     description:
       'The event is triggered when the call is rejected by the user.',
@@ -291,7 +303,7 @@ class WAHAWebhookCallRejected extends WAHAWebhook {
   payload: CallData;
 }
 
-class WAHAWebhookLabelUpsert extends WAHAWebhook {
+export class WAHAWebhookLabelUpsert extends WAHAWebhook {
   @ApiProperty({
     description: 'The event is triggered when a label is created or updated',
   })
@@ -300,7 +312,7 @@ class WAHAWebhookLabelUpsert extends WAHAWebhook {
   payload: Label;
 }
 
-class WAHAWebhookLabelDeleted extends WAHAWebhook {
+export class WAHAWebhookLabelDeleted extends WAHAWebhook {
   @ApiProperty({
     description: 'The event is triggered when a label is deleted',
   })
@@ -309,7 +321,7 @@ class WAHAWebhookLabelDeleted extends WAHAWebhook {
   payload: Label;
 }
 
-class WAHAWebhookLabelChatAdded extends WAHAWebhook {
+export class WAHAWebhookLabelChatAdded extends WAHAWebhook {
   @ApiProperty({
     description: 'The event is triggered when a label is added to a chat',
   })
@@ -318,7 +330,7 @@ class WAHAWebhookLabelChatAdded extends WAHAWebhook {
   payload: LabelChatAssociation;
 }
 
-class WAHAWebhookLabelChatDeleted extends WAHAWebhook {
+export class WAHAWebhookLabelChatDeleted extends WAHAWebhook {
   @ApiProperty({
     description: 'The event is triggered when a label is deleted from a chat',
   })
@@ -332,7 +344,7 @@ export class EnginePayload {
   data: any;
 }
 
-class WAHAWebhookEngineEvent extends WAHAWebhook {
+export class WAHAWebhookEngineEvent extends WAHAWebhook {
   @ApiProperty({
     description: 'Internal engine event.',
   })
@@ -340,28 +352,3 @@ class WAHAWebhookEngineEvent extends WAHAWebhook {
 
   payload: EnginePayload;
 }
-
-const WAHA_WEBHOOKS = [
-  WAHAWebhookSessionStatus,
-  WAHAWebhookMessage,
-  WAHAWebhookMessageReaction,
-  WAHAWebhookMessageAny,
-  WAHAWebhookMessageAck,
-  WAHAWebhookMessageRevoked,
-  WAHAWebhookStateChange,
-  WAHAWebhookGroupJoin,
-  WAHAWebhookGroupLeave,
-  WAHAWebhookPresenceUpdate,
-  WAHAWebhookPollVote,
-  WAHAWebhookPollVoteFailed,
-  WAHAWebhookChatArchive,
-  WAHAWebhookCallReceived,
-  WAHAWebhookCallAccepted,
-  WAHAWebhookCallRejected,
-  WAHAWebhookLabelUpsert,
-  WAHAWebhookLabelDeleted,
-  WAHAWebhookLabelChatAdded,
-  WAHAWebhookLabelChatDeleted,
-  WAHAWebhookEngineEvent,
-];
-export { WAHA_WEBHOOKS };

src/structures/webhooks.ts

@@ -0,0 +1,58 @@
+import {
+  WebhookGroupV2Join,
+  WebhookGroupV2Leave,
+  WebhookGroupV2Participants,
+  WebhookGroupV2Update,
+} from '@waha/structures/groups.webhooks.dto';
+import {
+  WAHAWebhookCallAccepted,
+  WAHAWebhookCallReceived,
+  WAHAWebhookCallRejected,
+  WAHAWebhookChatArchive,
+  WAHAWebhookEngineEvent,
+  WAHAWebhookGroupJoin,
+  WAHAWebhookGroupLeave,
+  WAHAWebhookLabelChatAdded,
+  WAHAWebhookLabelChatDeleted,
+  WAHAWebhookLabelDeleted,
+  WAHAWebhookLabelUpsert,
+  WAHAWebhookMessage,
+  WAHAWebhookMessageAck,
+  WAHAWebhookMessageAny,
+  WAHAWebhookMessageReaction,
+  WAHAWebhookMessageRevoked,
+  WAHAWebhookPollVote,
+  WAHAWebhookPollVoteFailed,
+  WAHAWebhookPresenceUpdate,
+  WAHAWebhookSessionStatus,
+  WAHAWebhookStateChange,
+} from '@waha/structures/webhooks.dto';
+
+const WAHA_WEBHOOKS = [
+  WAHAWebhookSessionStatus,
+  WAHAWebhookMessage,
+  WAHAWebhookMessageReaction,
+  WAHAWebhookMessageAny,
+  WAHAWebhookMessageAck,
+  WAHAWebhookMessageRevoked,
+  WebhookGroupV2Join,
+  WebhookGroupV2Leave,
+  WebhookGroupV2Update,
+  WebhookGroupV2Participants,
+  WAHAWebhookPresenceUpdate,
+  WAHAWebhookPollVote,
+  WAHAWebhookPollVoteFailed,
+  WAHAWebhookChatArchive,
+  WAHAWebhookCallReceived,
+  WAHAWebhookCallAccepted,
+  WAHAWebhookCallRejected,
+  WAHAWebhookLabelUpsert,
+  WAHAWebhookLabelDeleted,
+  WAHAWebhookLabelChatAdded,
+  WAHAWebhookLabelChatDeleted,
+  WAHAWebhookEngineEvent,
+  WAHAWebhookGroupJoin,
+  WAHAWebhookGroupLeave,
+  WAHAWebhookStateChange,
+];
+export { WAHA_WEBHOOKS };

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.1.4',
+  version: '2025.5.2',
   engine: getEngineName(),
   tier: getWAHAVersion(),
-  browser: getBrowserExecutablePath(),
+  browser:
+    getEngineName() === WAHAEngine.WEBJS ? getBrowserExecutablePath() : null,
 };

tests/perf/send.js

@@ -0,0 +1,59 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const axios = require('axios');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const yargs = require('yargs/yargs');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { hideBin } = require('yargs/helpers');
+
+// Parse CLI arguments
+const argv = yargs(hideBin(process.argv))
+  .option('number', {
+    alias: 'n',
+    type: 'number',
+    description: 'Number of messages to send',
+    default: 10,
+  })
+  .option('chat-id', {
+    alias: 'to',
+    type: 'number',
+    description: 'Chat ID to send messages to',
+    demandOption: true,
+  })
+  .option('session', {
+    type: 'string',
+    description: 'Session ID to use',
+    demandOption: true,
+  })
+  .option('api-key', {
+    alias: 'k',
+    type: 'string',
+    description: 'API key for authentication',
+    demandOption: true,
+  })
+  .help().argv;
+
+const sendTextMessage = async (session, numMessages, chatId, apiKey) => {
+  const url = 'http://localhost:3000/api/sendText/';
+  for (let i = 1; i <= numMessages; i++) {
+    console.log(`Sending message ${i}`);
+    const response = await axios.post(
+      url,
+      {
+        chatId: chatId.toString(),
+        session: session,
+        text: `Message - ${i}`,
+      },
+      {
+        headers: {
+          Accept: 'application/json',
+          'X-Api-Key': apiKey,
+          'Content-Type': 'application/json',
+        },
+      },
+    );
+    console.log(`Message ${i} sent successfully:`, response.data);
+  }
+};
+
+// Run the script
+sendTextMessage(argv.session, argv.number, argv['chat-id'], argv['api-key']);

tests/perf/start.js

@@ -0,0 +1,56 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const axios = require('axios');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const yargs = require('yargs/yargs');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { hideBin } = require('yargs/helpers');
+
+// Parse CLI arguments
+const argv = yargs(hideBin(process.argv))
+  .option('sessions', {
+    alias: 'n',
+    type: 'number',
+    description: 'Number of sessions to create',
+    default: 10,
+  })
+  .option('api-key', {
+    alias: 'k',
+    type: 'string',
+    description: 'API key for authentication',
+    demandOption: true,
+  })
+  .help().argv;
+
+const createSessions = async (numSessions, apiKey) => {
+  const url = 'http://localhost:3000/api/sessions/';
+
+  for (let i = 1; i <= numSessions; i++) {
+    try {
+      console.log(`Creating session ${i}`);
+      const response = await axios.post(
+        url,
+        {
+          name: '',
+          config: {
+            metadata: {},
+            webhooks: [],
+          },
+          start: true,
+        },
+        {
+          headers: {
+            Accept: 'application/json',
+            'X-Api-Key': apiKey,
+            'Content-Type': 'application/json',
+          },
+        },
+      );
+      console.log(`Session ${i} created successfully:`, response.data);
+    } catch (error) {
+      console.error(`Error creating session ${i}:`, error.message);
+    }
+  }
+};
+
+// Run the script
+createSessions(argv.sessions, argv['api-key']);