[core] 2025.4.1

fix #880
fix #596

.dockerignore

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

.env.example

@@ -6,10 +6,12 @@
 # If you know the right URL, you can use it here.
 # Use any port in WHATSAPP_API_PORT and domain in WHATSAPP_API_HOSTNAME
 # https://waha.devlike.pro/docs/how-to/config/#common
+WAHA_BASE_URL=http://localhost:3000
+
 #WHATSAPP_API_SCHEMA=http
 #WHATSAPP_API_PORT=3000
 #WHATSAPP_API_HOSTNAME=localhost
-#WAHA_BASE_URL=http://localhost:3000
+
 #
 # Set your timezone to see the right time on screenshots
 # Find your timezone name in the list
@@ -90,6 +92,17 @@ WHATSAPP_SWAGGER_PASSWORD=admin
 #WHATSAPP_SWAGGER_TITLE=WAHA API
 #
 
+#
+# PostgresSQL Configuration
+# https://waha.devlike.pro/docs/how-to/storages/#sessions---postgresql
+#WHATSAPP_SESSIONS_POSTGRESQL_URL=postgres://postgres:postgres@postgres:5432/postgres?sslmode=disable
+#
+# Media - PostgresSQL Storage
+# https://waha.devlike.pro/docs/how-to/storages/#media---postgresql
+#WAHA_MEDIA_STORAGE=POSTGRESQL
+#WAHA_MEDIA_POSTGRESQL_URL=postgres://postgres:postgres@postgres:5432/postgres?sslmode=disable
+#
+
 #
 # Global Proxy Settings
 # https://waha.devlike.pro/docs/how-to/config/#global-proxy-configuration
@@ -101,22 +114,6 @@ WHATSAPP_SWAGGER_PASSWORD=admin
 #WHATSAPP_PROXY_SERVER_PASSWORD=pass
 #
 
-#
-# HTTPS Configuration
-# https://waha.devlike.pro/docs/how-to/config/#https
-#
-# Consider using certbot for HTTPS
-# https://waha.devlike.pro/blog/setting-up-https-for-waha/#lets-encrypt-certbot--waha
-#
-#WAHA_HTTPS_ENABLED=true
-#WAHA_HTTPS_PATH_KEY=/etc/letsencrypt/live/waha.example.pro/privkey.pem
-#WAHA_HTTPS_PATH_CERT=/etc/letsencrypt/live/waha.example.pro/cert.pem \
-#WAHA_HTTPS_PATH_CA=/etc/letsencrypt/live/waha.example.pro/chain.pem
-#WHATSAPP_API_SCHEMA=https
-#WHATSAPP_API_PORT=3000
-#WHATSAPP_API_HOSTNAME=waha.example.pro
-#
-
 #
 # Media Configuration
 #
@@ -169,8 +166,26 @@ WHATSAPP_FILES_FOLDER=/app/.media
 # volumes:
 # - './.sessions:/app/sessions'
 
+
 #
 # MongoDB Configuration
 # https://waha.devlike.pro/docs/how-to/storages/#sessions---mongodb
 #WHATSAPP_SESSIONS_MONGO_URL=mongodb://mongouser:mongopassword@mongodb:27017
 #
+
+#
+# HTTPS Configuration
+# https://waha.devlike.pro/docs/how-to/config/#https
+#
+# Consider using certbot for HTTPS
+# https://waha.devlike.pro/blog/setting-up-https-for-waha/#lets-encrypt-certbot--waha
+#
+#WAHA_HTTPS_ENABLED=true
+#WAHA_HTTPS_PATH_KEY=/etc/letsencrypt/live/waha.example.pro/privkey.pem
+#WAHA_HTTPS_PATH_CERT=/etc/letsencrypt/live/waha.example.pro/cert.pem \
+#WAHA_HTTPS_PATH_CA=/etc/letsencrypt/live/waha.example.pro/chain.pem
+#WHATSAPP_API_SCHEMA=https
+#WHATSAPP_API_PORT=3000
+#WHATSAPP_API_HOSTNAME=waha.example.pro
+#
+

.eslintignore

@@ -0,0 +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

.github/workflows/build.yaml

@@ -45,7 +45,7 @@ jobs:
           #  browser: "chrome"
           #  goss: 'goss-linux-arm'
 
-          # No browser - x86
+          # NOWEB - x86
           - runner: 'buildjet-4vcpu-ubuntu-2204'
             tag: 'noweb'
             platform: 'amd64'
@@ -53,7 +53,7 @@ jobs:
             engine: 'NOWEB'
             goss: 'goss-linux-amd64'
 
-          # No browser - ARM
+          # NOWEB - ARM
           - runner: 'buildjet-4vcpu-ubuntu-2204-arm'
             tag: 'noweb-arm'
             platform: 'linux/arm64'
@@ -61,6 +61,22 @@ jobs:
             engine: 'NOWEB'
             goss: 'goss-linux-arm'
 
+          # GOWS - x86
+          - runner: 'buildjet-4vcpu-ubuntu-2204'
+            tag: 'gows'
+            platform: 'amd64'
+            browser: 'none'
+            engine: 'GOWS'
+            goss: 'goss-linux-amd64'
+
+          # No browser - ARM
+          - runner: 'buildjet-4vcpu-ubuntu-2204-arm'
+            tag: 'gows-arm'
+            platform: 'linux/arm64'
+            browser: 'none'
+            engine: 'GOWS'
+            goss: 'goss-linux-arm'
+
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.gitignore

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

.pre-commit-config.yaml

@@ -2,6 +2,8 @@ exclude: |
   (?x)^(
     ^src/dashboard/.*|
     ^src/core/engines/webjs/.*html|
+    ^src/core/engines/gows/grpc/.*|
+    ^src/core/engines/gows/proto/.*|
     ^src/plus/engines/webjs/.*html|
     ^.yarn/.*
   )$
@@ -73,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

@@ -6,7 +6,7 @@ FROM node:${NODE_VERSION} AS build
 ENV PUPPETEER_SKIP_DOWNLOAD=True
 
 # npm packages
-WORKDIR /src
+WORKDIR /git
 COPY package.json .
 COPY yarn.lock .
 ENV YARN_CHECKSUM_BEHAVIOR=update
@@ -15,8 +15,8 @@ RUN yarn set version 3.6.3
 RUN yarn install
 
 # App
-WORKDIR /src
-ADD . /src
+WORKDIR /git
+ADD . /git
 RUN yarn install
 RUN yarn build && find ./dist -name "*.d.ts" -delete
 
@@ -25,16 +25,51 @@ RUN yarn build && find ./dist -name "*.d.ts" -delete
 #
 FROM node:${NODE_VERSION} AS dashboard
 
-# Download WAHA Dashboard
-ENV WAHA_DASHBOARD_SHA fed4e50e88e4d26c610e3289fd0d8657cb866543
+# 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 \
-    wget https://github.com/devlikeapro/dashboard/archive/${WAHA_DASHBOARD_SHA}.zip \
+    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 \
     && mv /tmp/dashboard/dashboard-${WAHA_DASHBOARD_SHA}/* /dashboard/ \
     && rm -rf ${WAHA_DASHBOARD_SHA}.zip \
     && rm -rf /tmp/dashboard/dashboard-${WAHA_DASHBOARD_SHA}
 
+#
+# 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
+
+# Image processing for thumbnails
+RUN apt-get update  \
+    && apt-get install -y libvips-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY waha.config.json /tmp/waha.config.json
+WORKDIR /go/gows
+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
+
+
 #
 # Final
 #
@@ -51,6 +86,11 @@ RUN echo "USE_BROWSER=$USE_BROWSER"
 # Install ffmpeg to generate previews for videos
 RUN apt-get update && apt-get install -y ffmpeg --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
+# Image processing for thumbnails
+RUN apt-get update  \
+    && apt-get install -y libvips \
+    && rm -rf /var/lib/apt/lists/*
+
 # Install zip and unzip - either for chromium or chrome
 RUN if [ "$USE_BROWSER" = "chromium" ] || [ "$USE_BROWSER" = "chrome" ]; then \
     apt-get update  \
@@ -100,15 +140,25 @@ RUN if [ "$USE_BROWSER" = "chrome" ]; then \
           && rm -rf /var/lib/apt/lists/*; \
     fi
 
-# Set the ENV for NOWEB docker image
+# GOWS requirements
+# libc6
+RUN  apt-get update \
+     && apt-get install -y libc6 \
+     && rm -rf /var/lib/apt/lists/*
+
+# Set the ENV for docker image
 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
+ENV WAHA_GOWS_SOCKET /tmp/gows.sock
+
 COPY entrypoint.sh /entrypoint.sh
 
 # Chokidar options to monitor file changes

Makefile

@@ -7,6 +7,9 @@ build-chrome:
 build-noweb:
 	docker build . -t devlikeapro/waha:noweb --build-arg USE_BROWSER=none --build-arg WHATSAPP_DEFAULT_ENGINE=NOWEB
 
+build-plus-gows:
+	docker build . -t devlikeapro/waha-plus:gows --build-arg USE_BROWSER=none --build-arg WHATSAPP_DEFAULT_ENGINE=GOWS
+
 build-all: build build-chrome build-noweb
 
 build-plus:
@@ -32,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-channels-6712
 
 up-noweb-libsignal:
 	. ${NVM_DIR}/nvm.sh && nvm exec yarn up libsignal@github:devlikeapro/libsignal-node#fork-master
@@ -42,3 +45,16 @@ up-webjs:
 
 start-proxy:
 	docker run --rm -d --name squid-container -e TZ=UTC -p 3128:3128 ubuntu/squid:5.2-22.04_beta
+
+proto-gows:
+	node scripts/gows-proto.js build --dir ../gows/proto
+
+gows:
+	cd ../gows && \
+	export PATH=${HOME}/go/bin:${PATH} && \
+	make all
+
+copy-dashboard:
+	cd ../waha-hub/ui && \
+	make copy-waha
+

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

@@ -22,9 +22,27 @@ services:
     env_file:
       - .env
 
-  # NOTE: Only if you're using MongoDB
-  # https://waha.devlike.pro/docs/how-to/storages/#sessions---mongodb
-  # Uncomment this block if you're using MongoDB
+# NOTE: Only if you're using PostgreSQL to save sessions
+# https://waha.devlike.pro/docs/how-to/storages/#media---postgresql
+#  postgres:
+#    image: postgres:17
+#    restart: always
+#    environment:
+#      POSTGRES_USER: postgres
+#      POSTGRES_PASSWORD: postgres
+#      POSTGRES_DB: postgres
+#    ports:
+#      - "5432:5432"
+#    volumes:
+#      - pg_data:/var/lib/postgresql/data
+#    command:
+#      - postgres
+#      - "-c"
+#      - "max_connections=3000"
+
+# NOTE: Only if you're using MongoDB
+# https://waha.devlike.pro/docs/how-to/storages/#sessions---mongodb
+# Uncomment this block if you're using MongoDB
 #  mongodb:
 #    image: mongo
 #    container_name: mongodb
@@ -55,6 +73,6 @@ services:
 #    command: server /data --console-address ":9001"
 
 volumes:
-  # NOTE: Only if you're using MongoDB
   mongodb_data: {}
   minio_data: {}
+  pg_data: {}

entrypoint.sh

@@ -2,7 +2,7 @@
 
 # Calculate UV_THREADPOOL_SIZE based on number of CPUs
 cpus=$(node -e "const os = require('os'); console.log(os.cpus().length);")
-uv_threadpool_size=$(($cpus * 2))
+uv_threadpool_size=$(($cpus * 1))
 
 # Set UV_THREADPOOL_SIZE as an environment variable
 export UV_THREADPOOL_SIZE="${UV_THREADPOOL_SIZE:-$uv_threadpool_size}"

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-channels-6712",
     "@adiwajshing/keyed-db": "^0.2.4",
     "@aws-sdk/client-s3": "^3.633.0",
     "@aws-sdk/s3-request-presigner": "^3.633.0",
@@ -55,6 +58,7 @@
     "express-basic-auth": "^1.2.1",
     "file-type": "16.5.4",
     "fs-extra": "^11.2.0",
+    "google-protobuf": "^3.21.4",
     "https-proxy-agent": "^7.0.0",
     "joi": "^17.13.3",
     "knex": "^3.1.0",
@@ -67,6 +71,7 @@
     "nestjs-pino": "^4.1.0",
     "passport": "^0.6.0",
     "passport-headerapikey": "^1.2.2",
+    "pg": "^8.13.1",
     "pino-http": "^10.2.0",
     "pino-pretty": "^11.2.1",
     "pretty-bytes": "5.6.0",
@@ -80,7 +85,8 @@
     "sharp": "^0.33.4",
     "swagger-ui-express": "^4.1.4",
     "ulid": "^2.3.0",
-    "whatsapp-web.js": "github:devlikeapro/whatsapp-web.js#fork-main-channels"
+    "whatsapp-web.js": "github:devlikeapro/whatsapp-web.js#fork-main-channels",
+    "write-file-atomic": "^6.0.0"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.8"
@@ -93,6 +99,8 @@
     "libsignal": "github:devlikeapro/libsignal-node#fork-master"
   },
   "devDependencies": {
+    "@grpc/grpc-js": "^1.12.4",
+    "@grpc/proto-loader": "^0.7.13",
     "@nestjs/cli": "^9.0.0",
     "@nestjs/schematics": "^9.0.1",
     "@nestjs/testing": "^9.0.9",
@@ -106,14 +114,17 @@
     "eslint-config-prettier": "^6.10.0",
     "eslint-plugin-import": "^2.20.1",
     "eslint-plugin-simple-import-sort": "^10.0.0",
+    "grpc-tools": "^1.12.4",
     "jest": "^29.7.0",
     "prettier": "^1.19.1",
+    "protoc-gen-ts": "^0.8.7",
     "supertest": "^4.0.2",
     "ts-jest": "^29.1.3",
     "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": [

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 {
   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 {
+  isNewsletter,
+  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
@@ -76,12 +96,44 @@ export class ChannelsController {
     if (isNewsletter(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 (isNewsletter(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/chatting.controller.ts

@@ -18,10 +18,12 @@ import {
   ChatRequest,
   CheckNumberStatusQuery,
   GetMessageQuery,
+  MessageButtonReply,
   MessageContactVcardRequest,
   MessageFileRequest,
   MessageForwardRequest,
   MessageImageRequest,
+  MessageLinkCustomPreviewRequest,
   MessageLinkPreviewRequest,
   MessageLocationRequest,
   MessagePollRequest,
@@ -94,6 +96,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)',
@@ -165,21 +186,20 @@ export class ChattingController {
     return whatsapp.sendLocation(request);
   }
 
-  @Post('/sendLinkPreview')
-  async sendLinkPreview(@Body() request: MessageLinkPreviewRequest) {
+  @Post('/sendContactVcard')
+  async sendContactVcard(@Body() request: MessageContactVcardRequest) {
     const whatsapp = await this.manager.getWorkingSession(request.session);
-    return whatsapp.sendLinkPreview(request);
+    return whatsapp.sendContactVCard(request);
   }
 
-  @Get('/messages')
-  @ApiOperation({ summary: 'Get messages in a chat' })
+  @Post('/send/buttons/reply')
+  @ApiOperation({
+    summary: 'Reply on a button message',
+  })
   @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
-  async getMessages(
-    @Query() query: GetMessageQuery,
-    @Query() filter: GetChatMessagesFilter,
-  ) {
-    const whatsapp = await this.manager.getWorkingSession(query.session);
-    return whatsapp.getChatMessages(query.chatId, query, filter);
+  async sendButtonsReply(@Body() request: MessageButtonReply) {
+    const whatsapp = await this.manager.getWorkingSession(request.session);
+    return whatsapp.sendButtonsReply(request);
   }
 
   @Get('/sendText')
@@ -192,10 +212,19 @@ export class ChattingController {
     return whatsapp.sendText(msg);
   }
 
-  @Post('/sendContactVcard')
-  async sendContactVcard(@Body() request: MessageContactVcardRequest) {
-    const whatsapp = await this.manager.getWorkingSession(request.session);
-    return whatsapp.sendContactVCard(request);
+  @Get('/messages')
+  @ApiOperation({
+    summary: 'Get messages in a chat',
+    description: 'DEPRECATED. Use "GET /api/chats/{id}/messages" instead',
+    deprecated: true,
+  })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async getMessages(
+    @Query() query: GetMessageQuery,
+    @Query() filter: GetChatMessagesFilter,
+  ) {
+    const whatsapp = await this.manager.getWorkingSession(query.session);
+    return whatsapp.getChatMessages(query.chatId, query, filter);
   }
 
   @Get('/checkNumberStatus')
@@ -221,4 +250,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,27 +119,20 @@ 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 {
     return this.configService.get('WHATSAPP_SESSIONS_MONGO_URL', undefined);
   }
 
+  getSessionPostgresUrl(): string | undefined {
+    return this.configService.get(
+      'WHATSAPP_SESSIONS_POSTGRESQL_URL',
+      undefined,
+    );
+  }
+
   get(name: string, defaultValue: any = undefined): any {
     return this.configService.get(name, defaultValue);
   }
@@ -175,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/QR.ts

@@ -1,13 +1,16 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const QRCode = require('qrcode');
+
 export class QR {
-  private base64: string;
   public raw?: string;
 
-  save(base64: string, raw?: string) {
-    this.base64 = base64.replace(/^data:image\/png;base64,/, '');
+  save(raw?: string) {
     this.raw = raw;
   }
 
-  get(): Buffer {
-    return Buffer.from(this.base64, 'base64');
+  async get(): Promise<Buffer> {
+    const url = await QRCode.toDataURL(this.raw);
+    const base64 = url.replace(/^data:image\/png;base64,/, '');
+    return Buffer.from(base64, 'base64');
   }
 }

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

@@ -0,0 +1,15 @@
+export interface EngineBootstrap {
+  bootstrap(): Promise<void>;
+
+  shutdown(): Promise<void>;
+}
+
+export class NoopEngineBootstrap implements EngineBootstrap {
+  async bootstrap(): Promise<void> {
+    return;
+  }
+
+  async shutdown(): Promise<void> {
+    return;
+  }
+}

src/core/abc/manager.abc.ts

@@ -1,8 +1,15 @@
 import {
   BeforeApplicationShutdown,
+  OnApplicationBootstrap,
   UnprocessableEntityException,
 } from '@nestjs/common';
 import { WhatsappConfigService } from '@waha/config.service';
+import {
+  EngineBootstrap,
+  NoopEngineBootstrap,
+} from '@waha/core/abc/EngineBootstrap';
+import { GowsEngineConfigService } from '@waha/core/config/GowsEngineConfigService';
+import { GowsBootstrap } from '@waha/core/engines/gows/GowsBootstrap';
 import { ISessionMeRepository } from '@waha/core/storage/ISessionMeRepository';
 import { ISessionWorkerRepository } from '@waha/core/storage/ISessionWorkerRepository';
 import { WAHAWebhook } from '@waha/structures/webhooks.dto';
@@ -29,7 +36,9 @@ import { WhatsappSession } from './session.abc';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const AsyncLock = require('async-lock');
 
-export abstract class SessionManager implements BeforeApplicationShutdown {
+export abstract class SessionManager
+  implements BeforeApplicationShutdown, OnApplicationBootstrap
+{
   public store: any;
   public sessionAuthRepository: ISessionAuthRepository;
   public sessionConfigRepository: ISessionConfigRepository;
@@ -37,14 +46,21 @@ export abstract class SessionManager implements BeforeApplicationShutdown {
   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(
-    protected config: WhatsappConfigService,
     protected log: PinoLogger,
+    protected config: WhatsappConfigService,
+    protected gowsConfigService: GowsEngineConfigService,
   ) {
-    this.lock = new AsyncLock({ maxPending: Infinity });
+    this.lock = new AsyncLock({
+      maxPending: Infinity,
+      timeout: this.LOCK_TIMEOUT,
+    });
     this.log.setContext(SessionManager.name);
   }
 
@@ -134,6 +150,37 @@ export abstract class SessionManager implements BeforeApplicationShutdown {
     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),
@@ -156,18 +203,35 @@ export abstract class SessionManager implements BeforeApplicationShutdown {
   beforeApplicationShutdown(signal?: string) {
     return;
   }
+
+  onApplicationBootstrap(): any {
+    return;
+  }
+
+  protected getEngineBootstrap(engine: WAHAEngine): EngineBootstrap {
+    const logger = this.log.logger.child({ engine: engine.toLowerCase() });
+    if (engine === WAHAEngine.GOWS) {
+      const config = this.gowsConfigService.getBootstrapConfig();
+      return new GowsBootstrap(logger, config);
+    }
+    return new NoopEngineBootstrap();
+  }
 }
+
 export function populateSessionInfo(
   event: WAHAEvents,
   session: WhatsappSession,
 ) {
   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,7 +1,13 @@
+import { isJidBroadcast } from '@adiwajshing/baileys/lib/WABinary/jid-utils';
 import {
   Channel,
+  ChannelListResult,
+  ChannelMessage,
+  ChannelSearchByText,
+  ChannelSearchByView,
   CreateChannelRequest,
   ListChannelsQuery,
+  PreviewChannelMessages,
 } from '@waha/structures/channels.dto';
 import {
   ChatSummary,
@@ -10,9 +16,10 @@ import {
   GetChatMessagesQuery,
 } 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';
@@ -40,10 +47,12 @@ import {
   ChatRequest,
   CheckNumberStatusQuery,
   EditMessageRequest,
+  MessageButtonReply,
   MessageContactVcardRequest,
   MessageFileRequest,
   MessageForwardRequest,
   MessageImageRequest,
+  MessageLinkCustomPreviewRequest,
   MessageLinkPreviewRequest,
   MessageLocationRequest,
   MessagePollRequest,
@@ -53,6 +62,7 @@ import {
   MessageTextRequest,
   MessageVideoRequest,
   MessageVoiceRequest,
+  SendSeenRequest,
 } from '../../structures/chatting.dto';
 import { ContactQuery, ContactRequest } from '../../structures/contacts.dto';
 import {
@@ -63,7 +73,8 @@ import {
 } from '../../structures/enums.dto';
 import {
   CreateGroupRequest,
-  GroupsPaginationParams,
+  GroupField,
+  GroupsListFields,
   ParticipantsRequest,
   SettingsSecurityChangeInfo,
 } from '../../structures/groups.dto';
@@ -138,6 +149,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,
@@ -168,6 +185,7 @@ export abstract class WhatsappSession {
             filter(Boolean),
             map((data) => {
               data._eventId = generatePrefixedId('evt');
+              data._timestampMs = Date.now();
               return data;
             }),
             retry(),
@@ -240,12 +258,13 @@ export abstract class WhatsappSession {
     // References:
     // https://github.com/pedroslopez/whatsapp-web.js/issues/1420
     // https://github.com/wppconnect-team/wppconnect/issues/1326
+    // https://superuser.com/questions/654565/how-to-run-google-chrome-in-a-single-process
     // https://www.bannerbear.com/blog/ways-to-speed-up-puppeteer-screenshots/
     return [
       '--aggressive-cache-discard',
       '--disable-accelerated-2d-canvas',
       '--disable-application-cache',
-      '--disable-background-networking',
+      // '--disable-background-networking', // COMMENTED to test WEBJS stability
       // DO NOT disable software rasterizer, it will break the video
       // https://github.com/devlikeapro/waha/issues/629
       // '--disable-software-rasterizer',
@@ -255,13 +274,13 @@ export abstract class WhatsappSession {
       '--disable-default-apps',
       '--disable-dev-shm-usage',
       '--disable-extensions',
-      '--disable-features=site-per-process',
-      '--disable-gpu',
+      // '--disable-features=site-per-process', // COMMENTED to test WEBJS stability
+      //'--disable-gpu', // COMMENTED to test WEBJS stability
       '--disable-offer-store-unmasked-wallet-cards',
       '--disable-offline-load-stale-cache',
       '--disable-popup-blocking',
       '--disable-setuid-sandbox',
-      '--disable-site-isolation-trials', // https://superuser.com/questions/654565/how-to-run-google-chrome-in-a-single-process
+      '--disable-site-isolation-trials',
       '--disable-speech-api',
       '--disable-sync',
       '--disable-translate',
@@ -270,7 +289,8 @@ export abstract class WhatsappSession {
       '--hide-scrollbars',
       '--ignore-certificate-errors',
       '--ignore-ssl-errors',
-      '--in-process-gpu', // https://superuser.com/questions/654565/how-to-run-google-chrome-in-a-single-process
+      // https://github.com/devlikeapro/waha/issues/725
+      // '--in-process-gpu', // COMMENTED to test WEBJS stability
       '--metrics-recording-only',
       '--mute-audio',
       '--no-default-browser-check',
@@ -279,7 +299,7 @@ export abstract class WhatsappSession {
       '--no-sandbox',
       '--no-zygote',
       '--password-store=basic',
-      '--renderer-process-limit=2', // https://superuser.com/questions/654565/how-to-run-google-chrome-in-a-single-process
+      // '--renderer-process-limit=2', // COMMENTED to test WEBJS stability
       '--safebrowsing-disable-auto-update',
       // '--single-process',
       '--use-mock-keychain',
@@ -322,27 +342,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);
@@ -361,6 +422,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);
@@ -377,9 +444,13 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
+  sendButtonsReply(request: MessageButtonReply) {
+    throw new NotImplementedByEngineError();
+  }
+
   abstract reply(request: MessageReplyRequest);
 
-  abstract sendSeen(chat: ChatRequest);
+  abstract sendSeen(chat: SendSeenRequest);
 
   abstract startTyping(chat: ChatRequest);
 
@@ -511,7 +582,7 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
-  public getContactAbout(query: ContactQuery) {
+  public getContactAbout(query: ContactQuery): Promise<{ about: string }> {
     throw new NotImplementedByEngineError();
   }
 
@@ -529,14 +600,24 @@ export abstract class WhatsappSession {
     if (!has || refresh) {
       await this.refreshProfilePicture(id);
     }
-    return this.profilePictures.get(id);
+    return this.profilePictures.get(id) || null;
   }
 
   protected async refreshProfilePicture(id: string) {
+    let fn: Promise<string>;
+    if (isJidBroadcast(id)) {
+      return null;
+    } else if (isNewsletter(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) => {
-      this.logger.error('Error fetching profile picture');
-      this.logger.error(err, err.stack);
+    const url = await fn.catch((err) => {
+      this.logger.warn('Error fetching profile picture');
+      this.logger.warn(err, err.stack);
       return null;
     });
     this.profilePictures.set(id, url);
@@ -566,10 +647,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();
   }
@@ -606,6 +699,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();
   }
@@ -650,13 +780,32 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
-  public subscribePresence(id: string): Promise<void> {
+  public subscribePresence(id: string): Promise<any> {
     throw new NotImplementedByEngineError();
   }
 
   /**
    * 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();
   }
@@ -718,6 +867,9 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
+  /**
+   * Engine methods
+   */
   public async getEngineInfo(): Promise<any> {
     return {};
   }
@@ -759,12 +911,62 @@ 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;
@@ -65,7 +65,12 @@ export class WebsocketGatewayCore
       .getSessionEvents(session, events)
       .subscribe((data) => {
         this.logger.debug(`Sending data to client, event.id: ${data.id}`, data);
-        socket.send(JSON.stringify(data));
+        socket.send(JSON.stringify(data), (err) => {
+          if (!err) {
+            return;
+          }
+          this.logger.error(`Error sending data to client: ${err}`);
+        });
       });
     socket.on('close', () => {
       this.logger.debug(`Client disconnected - ${socket.id}`);
@@ -91,17 +96,25 @@ export class WebsocketGatewayCore
 
   async beforeApplicationShutdown(signal?: string) {
     this.logger.log('Shutting down websocket server');
+    this.heartbeat?.stop();
+
     // Allow pending messages to be sent, it can be even 1ms, just to release the event loop
     await sleep(100);
-    this.server?.clients.forEach((options, client) => {
-      // @ts-ignore
-      this.logger.debug(`Closing client connection - ${client.id}...`);
-      client.close(1001, 'Server is shutting down');
-    });
-    // Do not turn off heartbeat service here,
-    // it's responsible for terminating the connection that is not alive
+    // Close clients and server
+    await this.close(this.server);
     this.logger.log('Websocket server is down');
-    this.heartbeat?.stop();
+  }
+
+  // Cherry-pick from nestjs new version
+  // https://github.com/nestjs/nest/pull/13531/files
+  private async close(server: any) {
+    const closeEventSignal = new Promise((resolve, reject) =>
+      server.close((err) => (err ? reject(err) : resolve(undefined))),
+    );
+    for (const ws of server.clients) {
+      ws.terminate();
+    }
+    await closeEventSignal;
   }
 
   afterInit(server: Server) {

src/core/app.module.core.ts

@@ -5,14 +5,17 @@ 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,
 } from '@waha/api/server.controller';
 import { WebsocketGatewayCore } from '@waha/core/api/websocket.gateway.core';
+import { GowsEngineConfigService } from '@waha/core/config/GowsEngineConfigService';
 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,
@@ -106,7 +109,9 @@ export const IMPORTS_CORE = [
 const IMPORTS_MEDIA = [
   ConfigModule.forRoot({
     validationSchema: Joi.object({
-      WAHA_MEDIA_STORAGE: Joi.string().valid('LOCAL', 'S3').default('LOCAL'),
+      WAHA_MEDIA_STORAGE: Joi.string()
+        .valid('LOCAL', 'S3', 'POSTGRESQL')
+        .default('LOCAL'),
     }),
   }),
   MediaLocalStorageModule,
@@ -117,6 +122,7 @@ const IMPORTS = [...IMPORTS_CORE, ...IMPORTS_MEDIA];
 export const CONTROLLERS = [
   AuthController,
   SessionsController,
+  ProfileController,
   ChattingController,
   ChatsController,
   ChannelsController,
@@ -145,9 +151,11 @@ const PROVIDERS = [
     provide: APP_INTERCEPTOR,
     useClass: BufferJsonReplacerInterceptor,
   },
+  ChannelsInfoServiceCore,
   DashboardConfigServiceCore,
   SwaggerConfigServiceCore,
   WebJSEngineConfigService,
+  GowsEngineConfigService,
   WhatsappConfigService,
   EngineConfigService,
   WebsocketGatewayCore,

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/config/GowsEngineConfigService.ts

@@ -0,0 +1,26 @@
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { BootstrapConfig } from '@waha/core/engines/gows/GowsBootstrap';
+import { GowsConfig } from '@waha/core/engines/gows/session.gows.core';
+
+@Injectable()
+export class GowsEngineConfigService {
+  constructor(protected configService: ConfigService) {}
+
+  getBootstrapConfig(): BootstrapConfig {
+    return {
+      path: this.configService.get('WAHA_GOWS_PATH'),
+      socket: this.getSocket(),
+    };
+  }
+
+  getSocket() {
+    return this.configService.get('WAHA_GOWS_SOCKET', '/tmp/gows.sock');
+  }
+
+  getConfig(): GowsConfig {
+    return {
+      connection: 'unix:' + this.getSocket(),
+    };
+  }
+}

src/core/engines/const.ts

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

src/core/engines/gows/EventsFromObservable.ts

@@ -0,0 +1,31 @@
+import { EventEmitter } from 'events';
+import { Observable, Subscription } from 'rxjs';
+
+interface EventValue<T> {
+  event: string;
+  data: T;
+}
+
+export class EventsFromObservable<Events extends string> extends EventEmitter {
+  private subscription: Subscription;
+
+  constructor(private observable: Observable<EventValue<any>>) {
+    super();
+  }
+
+  on(event: Events, listener: (...args: any[]) => void): this {
+    return super.on(event as string, listener);
+  }
+
+  start() {
+    this.subscription = this.observable.subscribe({
+      next: (data) => this.emit(data.event, data.data),
+      complete: () => this.removeAllListeners(),
+      error: (err) => null,
+    });
+  }
+
+  stop() {
+    this.subscription.unsubscribe();
+  }
+}

src/core/engines/gows/GowsBootstrap.ts

@@ -0,0 +1,72 @@
+import { EngineBootstrap } from '@waha/core/abc/EngineBootstrap';
+import { GowsSubprocess } from '@waha/core/engines/gows/GowsSubprocess';
+import { promises as fs } from 'fs';
+import { Logger } from 'pino';
+
+export async function isUnixSocket(socketPath: string): Promise<boolean> {
+  try {
+    // Get the file stats
+    const stats = await fs.lstat(socketPath);
+    // Check if the path is a socket
+    return stats.isSocket();
+  } catch (error) {
+    // Handle errors (e.g., file does not exist)
+    if (error.code === 'ENOENT') {
+      return false; // Path does not exist
+    }
+    // Re-throw other errors for debugging purposes
+    throw error;
+  }
+}
+
+export interface BootstrapConfig {
+  path: string;
+  socket: string;
+}
+
+export class GowsBootstrap implements EngineBootstrap {
+  private gows: GowsSubprocess;
+
+  constructor(
+    private logger: Logger,
+    private config: BootstrapConfig,
+  ) {}
+
+  async bootstrap(): Promise<void> {
+    if (!this.config.path) {
+      this.logger.warn('GOWS path is not set, skipping GOWS initialization.');
+      this.logger.warn('Make sure to run GOWS manually.');
+      this.checkSocket(this.config.socket);
+      return;
+    }
+
+    this.gows = new GowsSubprocess(
+      this.logger,
+      this.config.path,
+      this.config.socket,
+    );
+    this.gows.start(() => {
+      this.logger.info(`GOWS stopped, exiting...`);
+      process.kill(process.pid, 'SIGTERM');
+    });
+    await this.gows.waitWhenReady(10_000);
+    await this.checkSocket(this.config.socket);
+    return;
+  }
+
+  async shutdown(): Promise<void> {
+    if (this.gows) {
+      await this.gows.stop();
+    }
+  }
+
+  /**
+   * Check the provided path exists and is a socket
+   * @param path
+   */
+  async checkSocket(path: string) {
+    if (!(await isUnixSocket(path))) {
+      throw new Error(`Invalid socket path: ${path}`);
+    }
+  }
+}

src/core/engines/gows/GowsEventStreamObservable.ts

@@ -0,0 +1,69 @@
+import * as grpc from '@grpc/grpc-js';
+import { messages } from '@waha/core/engines/gows/grpc/gows';
+import { EnginePayload } from '@waha/structures/webhooks.dto';
+import { sleep } from '@waha/utils/promiseTimeout';
+import { Logger } from 'pino';
+import { Observable } from 'rxjs';
+
+/**
+ * Observable that listens to a gRPC stream and emits EnginePayload objects.
+ * Pass a factory function that returns a client and a stream.
+ */
+export class GowsEventStreamObservable extends Observable<EnginePayload> {
+  _client: grpc.Client;
+  CLIENT_CLOSE_TIMEOUT = 1_000;
+
+  constructor(
+    private logger: Logger,
+    factory: () => {
+      client: grpc.Client;
+      stream: grpc.ClientReadableStream<messages.EventJson>;
+    },
+  ) {
+    super((subscriber) => {
+      this.logger.debug('Creating grpc client and stream...');
+      const { client, stream } = factory();
+      this._client = client;
+
+      stream.on('data', (raw) => {
+        const obj = raw.toObject();
+        obj.data = JSON.parse(obj.data);
+        subscriber?.next(obj);
+      });
+
+      stream.on('end', (...args) => {
+        this.logger.debug('Stream ended', args);
+        subscriber?.complete();
+        subscriber = null;
+      });
+
+      stream.on('error', async (err: any) => {
+        const CLIENT_CANCELLED_CODE = grpc.status.CANCELLED;
+        if (err.code === CLIENT_CANCELLED_CODE) {
+          this.logger.debug('Stream cancelled by client');
+          return;
+        }
+        this.logger.error(err, 'Stream error');
+        // Give some time to node event loop to process the error
+        await sleep(100);
+        subscriber?.error(err);
+        subscriber = null;
+      });
+
+      return async () => {
+        this.logger.debug('Closing stream client...');
+        client.close();
+        await sleep(this.CLIENT_CLOSE_TIMEOUT);
+        this.logger.debug('Stream client closed');
+
+        this.logger.debug('Cancelling stream...');
+        stream.cancel();
+        this.logger.debug('Stream cancelled');
+      };
+    });
+  }
+
+  get client(): Omit<grpc.Client, 'close'> {
+    return this._client;
+  }
+}

src/core/engines/gows/GowsSubprocess.ts

@@ -0,0 +1,100 @@
+import { sleep, waitUntil } from '@waha/utils/promiseTimeout';
+import { spawn } from 'child_process';
+import { Logger } from 'pino';
+
+export class GowsSubprocess {
+  private checkIntervalMs: number = 100;
+  private readyDelayMs: number = 1_000;
+  private readyText = 'gRPC server started!';
+
+  private child: any;
+  private ready: boolean = false;
+
+  constructor(
+    private logger: Logger,
+    readonly path: string,
+    readonly socket: string,
+  ) {}
+
+  start(onExit: (code: number) => void) {
+    this.logger.info('Starting GOWS subprocess...');
+    this.logger.debug(`GOWS path '${this.path}', socket: '${this.socket}'...`);
+
+    this.child = spawn(this.path, ['--socket', this.socket], {
+      detached: true,
+    });
+    this.logger.debug(`GOWS started with PID: ${this.child.pid}`);
+    this.child.on('close', async (code, singal) => {
+      const msg = code
+        ? `GOWS subprocess closed with code ${code}`
+        : `GOWS subprocess closed by signal ${singal}`;
+      this.logger.debug(msg);
+      onExit(code);
+    });
+    this.child.on('error', (err) => {
+      this.logger.error(`GOWS subprocess error: ${err}`);
+    });
+
+    this.child.stderr.setEncoding('utf8');
+    this.child.stderr.on('data', (data) => {
+      this.logger.error(data);
+    });
+
+    this.child.stdout.setEncoding('utf8');
+    this.child.stdout.on('data', async (data) => {
+      // remove empty line at the end, split by \n
+      const lines = data.trim().split('\n');
+      lines.forEach((line) => this.log(line));
+    });
+    this.listenReady();
+  }
+
+  listenReady() {
+    this.child.stdout.on('data', async (data) => {
+      if (this.ready) {
+        return;
+      }
+      if (!data.includes(this.readyText)) {
+        return;
+      }
+      await sleep(this.readyDelayMs);
+      this.ready = true;
+      this.logger.info('GOWS is ready');
+    });
+  }
+
+  async waitWhenReady(timeout: number) {
+    const started = await waitUntil(
+      async () => this.ready,
+      this.checkIntervalMs,
+      timeout,
+    );
+    if (!started) {
+      const msg = 'GOWS did not start after 10 seconds';
+      this.logger.error(msg);
+      throw new Error(msg);
+    }
+  }
+
+  async stop() {
+    this.logger.info('Stopping GOWS subprocess...');
+    this.child?.kill('SIGTERM');
+    this.logger.info('GOWS subprocess stopped');
+  }
+
+  private log(msg) {
+    if (msg.startsWith('ERROR | ')) {
+      this.logger.error(msg.slice(8));
+    } else if (msg.startsWith('WARN | ')) {
+      this.logger.warn(msg.slice(7));
+    } else if (msg.startsWith('INFO | ')) {
+      this.logger.info(msg.slice(7));
+    } else if (msg.startsWith('DEBUG | ')) {
+      this.logger.debug(msg.slice(8));
+    } else if (msg.startsWith('TRACE | ')) {
+      this.logger.trace(msg.slice(8));
+    } else {
+      this.logger.info(msg);
+    }
+  }
+}

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/engines/noweb/session.noweb.core';
+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/store/GowsAuth.ts

@@ -0,0 +1,4 @@
+export interface GowsAuth {
+  address(): string;
+  dialect(): string;
+}

src/core/engines/gows/store/GowsAuthFactoryCore.ts

@@ -0,0 +1,26 @@
+import * as path from 'node:path';
+
+import { DataStore } from '@waha/core/abc/DataStore';
+import { GowsAuthSimple } from '@waha/core/engines/gows/store/GowsAuthSimple';
+import { LocalStore } from '@waha/core/storage/LocalStore';
+
+import { GowsAuth } from './GowsAuth';
+
+export class GowsAuthFactoryCore {
+  buildAuth(store: DataStore, name: string): Promise<GowsAuth> {
+    if (store instanceof LocalStore) return this.buildSqlite3(store, name);
+    throw new Error(`Unsupported store type '${store.constructor.name}'`);
+  }
+
+  protected async buildSqlite3(
+    store: LocalStore,
+    name: string,
+  ): Promise<GowsAuth> {
+    await store.init(name);
+    const authFolder = store.getSessionDirectory(name);
+    // resolve path
+    const authFolderFullPath = path.resolve(authFolder);
+    const connection = `file:${authFolderFullPath}/gows.db`;
+    return new GowsAuthSimple(connection, 'sqlite3');
+  }
+}

src/core/engines/gows/store/GowsAuthSimple.ts

@@ -0,0 +1,19 @@
+import { GowsAuth } from '@waha/core/engines/gows/store/GowsAuth';
+
+export class GowsAuthSimple implements GowsAuth {
+  private _address: string;
+  private _dialect: string;
+
+  constructor(address: string, dialect: string) {
+    this._address = address;
+    this._dialect = dialect;
+  }
+
+  address() {
+    return this._address;
+  }
+
+  dialect(): string {
+    return this._dialect;
+  }
+}

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

@@ -0,0 +1,41 @@
+export interface Presence {
+  From: string;
+  Unavailable: boolean;
+  LastSeen: string;
+}
+
+export enum ChatPresenceState {
+  COMPOSING = 'composing',
+  PAUSED = 'paused',
+}
+
+export enum ChatPresenceMedia {
+  TEXT = '',
+  AUDIO = 'audio',
+}
+
+export interface ChatPresence {
+  Chat: string;
+  Sender: string;
+  IsFromMe: boolean;
+  IsGroup: boolean;
+  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/NowebAuthFactoryCore.ts

@@ -11,7 +11,7 @@ export class NowebAuthFactoryCore {
   protected async buildLocalAuth(store: LocalStore, name: string) {
     await store.init(name);
     const authFolder = store.getSessionDirectory(name);
-    const { state, saveCreds } = await useMultiFileAuthState(authFolder);
-    return { state, saveCreds };
+    const { state, saveCreds, close } = await useMultiFileAuthState(authFolder);
+    return { state, saveCreds, close };
   }
 }

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

@@ -1,5 +1,3 @@
-import { WAMessage } from '@adiwajshing/baileys';
-import { LabelAssociation } from '@adiwajshing/baileys/lib/Types/LabelAssociation';
 import { IGroupRepository } from '@waha/core/engines/noweb/store/IGroupRepository';
 import { ILabelAssociationRepository } from '@waha/core/engines/noweb/store/ILabelAssociationsRepository';
 import { ILabelsRepository } from '@waha/core/engines/noweb/store/ILabelsRepository';
@@ -24,20 +22,4 @@ export abstract class INowebStorage {
   abstract getLabelsRepository(): ILabelsRepository;
 
   abstract getLabelAssociationRepository(): ILabelAssociationRepository;
-
-  protected getMessagesMetadata(): Map<string, any> {
-    return new Map()
-      .set('jid', (msg: WAMessage) => msg.key.remoteJid)
-      .set('id', (msg: WAMessage) => msg.key.id)
-      .set('messageTimestamp', (msg: WAMessage) => msg.messageTimestamp);
-  }
-
-  protected getLabelAssociationMetadata() {
-    return new Map().set(
-      'id',
-      (a: LabelAssociation) =>
-        // @ts-ignore
-        `${a.type}_${a.labelId}_${a.chatId}_${a.messageId}`,
-    );
-  }
 }

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

@@ -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

@@ -225,7 +225,7 @@ export class NowebPersistentStore implements INowebStore {
   private async onChatUpsert(chats: Chat[]) {
     for (const chat of chats) {
       delete chat['messages'];
-      chat.conversationTimestamp = toNumber(chat.conversationTimestamp);
+      chat.conversationTimestamp = toNumber(chat.conversationTimestamp) || null;
       await this.chatRepo.save(chat);
     }
     this.logger.info(`store sync - '${chats.length}' synced chats`);
@@ -269,6 +269,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;
@@ -312,7 +315,7 @@ export class NowebPersistentStore implements INowebStore {
     for (const update of updates) {
       const chat = (await this.chatRepo.getById(update.id)) || ({} as Chat);
       Object.assign(chat, update);
-      chat.conversationTimestamp = toNumber(chat.conversationTimestamp);
+      chat.conversationTimestamp = toNumber(chat.conversationTimestamp) || null;
       delete chat['messages'];
       await this.chatRepo.save(chat);
     }
@@ -343,7 +346,7 @@ export class NowebPersistentStore implements INowebStore {
 
   private async onContactUpdate(updates: Partial<Contact>[]) {
     for (const update of updates) {
-      const contact = await this.contactRepo.getById(update.id);
+      let contact = await this.contactRepo.getById(update.id);
 
       if (!contact) {
         this.logger.warn(
@@ -351,7 +354,7 @@ export class NowebPersistentStore implements INowebStore {
             update,
           )}'`,
         );
-        continue;
+        contact = {} as Contact;
         // TODO: Find contact by hash if not found
         //  find contact by attrs.hash, when user is not saved as a contact
         //  check the in-memory for that
@@ -360,7 +363,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 +435,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 +467,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/NowebStorageFactoryCore.ts

@@ -1,9 +1,19 @@
+import { LocalStore } from '@waha/core/storage/LocalStore';
+
 import { DataStore } from '../../../abc/DataStore';
 import { INowebStorage } from './INowebStorage';
 import { Sqlite3Storage } from './sqlite3/Sqlite3Storage';
 
 export class NowebStorageFactoryCore {
   createStorage(store: DataStore, name: string): INowebStorage {
-    return new Sqlite3Storage(':memory:');
+    if (store instanceof LocalStore) {
+      return this.buildStorageSqlite3(store, name);
+    }
+    throw new Error(`Unsupported store type '${store.constructor.name}'`);
+  }
+
+  private buildStorageSqlite3(store: LocalStore, name: string) {
+    const filePath = store.getFilePath(name, 'store.sqlite3');
+    return new Sqlite3Storage(filePath);
   }
 }

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

@@ -1,63 +0,0 @@
-import { Field, Index, Schema } from '@waha/core/storage/sqlite3/Schema';
-
-export const NOWEB_STORE_SCHEMA = [
-  new Schema(
-    'contacts',
-    [new Field('id', 'TEXT'), new Field('data', 'TEXT')],
-    [new Index('contacts_id_index', ['id'])],
-  ),
-  new Schema(
-    'chats',
-    [
-      new Field('id', 'TEXT'),
-      new Field('conversationTimestamp', 'INTEGER'),
-      new Field('data', 'TEXT'),
-    ],
-    [
-      new Index('chats_id_index', ['id']),
-      new Index('chats_conversationTimestamp_index', ['conversationTimestamp']),
-    ],
-  ),
-  new Schema(
-    'groups',
-    [new Field('id', 'TEXT'), new Field('data', 'TEXT')],
-    [new Index('groups_id_index', ['id'])],
-  ),
-  new Schema(
-    'messages',
-    [
-      new Field('jid', 'TEXT'),
-      new Field('id', 'TEXT'),
-      new Field('messageTimestamp', 'INTEGER'),
-      new Field('data', 'TEXT'),
-    ],
-    [
-      new Index('messages_id_index', ['id']),
-      new Index('messages_jid_id_index', ['jid', 'id']),
-      new Index('messages_jid_timestamp_index', ['jid', 'messageTimestamp']),
-      new Index('timestamp_index', ['messageTimestamp']),
-    ],
-  ),
-  new Schema(
-    'labels',
-    [new Field('id', 'TEXT'), new Field('data', 'TEXT')],
-    [new Index('labels_id_index', ['id'])],
-  ),
-  new Schema(
-    'labelAssociations',
-    [
-      new Field('id', 'TEXT'),
-      new Field('type', 'TEXT'),
-      new Field('labelId', 'TEXT'),
-      new Field('chatId', 'TEXT'),
-      new Field('messageId', 'TEXT'),
-      new Field('data', 'TEXT'),
-    ],
-    [
-      new Index('label_assoc_id_index', ['id']),
-      new Index('label_assoc_type_label_index', ['type', 'labelId']),
-      new Index('label_assoc_type_chat_index', ['type', 'chatId']),
-      new Index('label_assoc_type_message_index', ['type', 'messageId']),
-    ],
-  ),
-];

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

@@ -0,0 +1,14 @@
+import { WAMessage } from '@adiwajshing/baileys';
+import { LabelAssociation } from '@adiwajshing/baileys/lib/Types/LabelAssociation';
+
+export const NowebMessagesMetadata = new Map()
+  .set('jid', (msg: WAMessage) => msg.key.remoteJid)
+  .set('id', (msg: WAMessage) => msg.key.id)
+  .set('messageTimestamp', (msg: WAMessage) => msg.messageTimestamp);
+
+export const NowebLabelAssociationsMetadata = new Map().set(
+  'id',
+  (a: LabelAssociation) =>
+    // @ts-ignore
+    `${a.type}_${a.labelId}_${a.chatId}_${a.messageId}`,
+);

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

@@ -0,0 +1,103 @@
+import { Field, Index, Schema } from '@waha/core/storage/Schema';
+
+export const NowebContactSchema = new Schema(
+  'contacts',
+  [new Field('id', 'TEXT'), new Field('data', 'TEXT')],
+  [new Index('contacts_id_index', ['id'])],
+);
+
+export const NowebChatSchema = new Schema(
+  'chats',
+  [
+    new Field('id', 'TEXT'),
+    new Field('conversationTimestamp', 'INTEGER'),
+    new Field('data', 'TEXT'),
+  ],
+  [
+    new Index('chats_id_index', ['id']),
+    new Index('chats_conversationTimestamp_index', ['conversationTimestamp']),
+  ],
+);
+
+export const NowebGroupsSchema = new Schema(
+  'groups',
+  [new Field('id', 'TEXT'), new Field('data', 'TEXT')],
+  [new Index('groups_id_index', ['id'])],
+);
+
+export const NowebMessagesSchema = new Schema(
+  'messages',
+  [
+    new Field('jid', 'TEXT'),
+    new Field('id', 'TEXT'),
+    new Field('messageTimestamp', 'INTEGER'),
+    new Field('data', 'TEXT'),
+  ],
+  [
+    new Index('messages_id_index', ['id']),
+    new Index('messages_jid_id_index', ['jid', 'id']),
+    new Index('messages_jid_timestamp_index', ['jid', 'messageTimestamp']),
+    new Index('timestamp_index', ['messageTimestamp']),
+  ],
+);
+
+export const NowebLabelsSchema = new Schema(
+  'labels',
+  [new Field('id', 'TEXT'), new Field('data', 'TEXT')],
+  [new Index('labels_id_index', ['id'])],
+);
+
+export const NowebLabelAssociationsSchema = new Schema(
+  'labelAssociations',
+  [
+    new Field('id', 'TEXT'),
+    new Field('type', 'TEXT'),
+    new Field('labelId', 'TEXT'),
+    new Field('chatId', 'TEXT'),
+    new Field('messageId', 'TEXT'),
+    new Field('data', 'TEXT'),
+  ],
+  [
+    new Index('label_assoc_id_index', ['id']),
+    new Index('label_assoc_type_label_index', ['type', 'labelId']),
+    new Index('label_assoc_type_chat_index', ['type', 'chatId']),
+    new Index('label_assoc_type_message_index', ['type', 'messageId']),
+  ],
+);
+
+export const NOWEB_STORE_SCHEMA = [
+  NowebContactSchema,
+  NowebChatSchema,
+  NowebGroupsSchema,
+  NowebMessagesSchema,
+  NowebLabelsSchema,
+  NowebLabelAssociationsSchema,
+];
+
+export const Migrations: string[] = [
+  // Contacts
+  'CREATE TABLE IF NOT EXISTS contacts (id TEXT PRIMARY KEY, data TEXT)',
+  'CREATE UNIQUE INDEX IF NOT EXISTS contacts_id_index ON contacts (id)',
+  // Chats
+  'CREATE TABLE IF NOT EXISTS chats (id TEXT PRIMARY KEY, "conversationTimestamp" INTEGER, data TEXT)',
+  'CREATE UNIQUE INDEX IF NOT EXISTS chats_id_index ON chats (id)',
+  'CREATE INDEX IF NOT EXISTS "chats_conversationTimestamp_index" ON chats ("conversationTimestamp")',
+  // Groups
+  'CREATE TABLE IF NOT EXISTS groups (id TEXT PRIMARY KEY, data TEXT)',
+  'CREATE UNIQUE INDEX IF NOT EXISTS groups_id_index ON groups (id)',
+  // Messages
+  'CREATE TABLE IF NOT EXISTS messages (jid TEXT, id TEXT, "messageTimestamp" INTEGER, data TEXT)',
+  'CREATE UNIQUE INDEX IF NOT EXISTS messages_id_index ON messages (id)',
+  'CREATE INDEX IF NOT EXISTS messages_jid_id_index ON messages (jid, id)',
+  'CREATE INDEX IF NOT EXISTS messages_jid_timestamp_index ON messages (jid, "messageTimestamp")',
+  'CREATE INDEX IF NOT EXISTS timestamp_index ON messages ("messageTimestamp")',
+  // Labels
+  'CREATE TABLE IF NOT EXISTS labels (id TEXT PRIMARY KEY, data TEXT)',
+  'CREATE UNIQUE INDEX IF NOT EXISTS labels_id_index ON labels (id)',
+  // Label associations
+  'CREATE TABLE IF NOT EXISTS "labelAssociations" (id TEXT PRIMARY KEY, type TEXT, "labelId" TEXT, "chatId" TEXT, "messageId" TEXT, data TEXT)',
+  'CREATE UNIQUE INDEX IF NOT EXISTS label_assoc_id_index ON "labelAssociations" (id)',
+  'CREATE INDEX IF NOT EXISTS label_assoc_type_label_index ON "labelAssociations" (type, "labelId")',
+  'CREATE INDEX IF NOT EXISTS label_assoc_type_chat_index ON "labelAssociations" (type, "chatId")',
+  'CREATE INDEX IF NOT EXISTS label_assoc_type_message_index ON "labelAssociations" (type, "messageId")',
+];

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

@@ -0,0 +1,23 @@
+import { Chat } from '@adiwajshing/baileys';
+import { SqlKVRepository } from '@waha/core/storage/sql/SqlKVRepository';
+import { PaginationParams } from '@waha/structures/pagination.dto';
+
+export class SqlChatMethods {
+  constructor(private repository: SqlKVRepository<any>) {}
+
+  async getAllWithMessages(
+    pagination: PaginationParams,
+    broadcast: boolean,
+  ): Promise<Chat[]> {
+    // Get chats with conversationTimestamp is not Null
+    let query = this.repository.select().whereNotNull('conversationTimestamp');
+    if (!broadcast) {
+      // filter out chat by id if it ends at @newsletter or @broadcast
+      query = query
+        .andWhereNot('id', 'like', '%@broadcast')
+        .andWhereNot('id', 'like', '%@newsletter');
+    }
+    query = this.repository.pagination(query, pagination);
+    return await this.repository.all(query);
+  }
+}

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

@@ -0,0 +1,40 @@
+import {
+  LabelAssociation,
+  LabelAssociationType,
+} from '@adiwajshing/baileys/lib/Types/LabelAssociation';
+import { SqlKVRepository } from '@waha/core/storage/sql/SqlKVRepository';
+
+export class SqlLabelAssociationsMethods {
+  constructor(private repository: SqlKVRepository<any>) {}
+
+  async deleteOne(association: LabelAssociation): Promise<void> {
+    await this.repository.deleteBy({
+      type: association.type,
+      chatId: association.chatId,
+      labelId: association.labelId,
+      // @ts-ignore: messageId doesn't existing in ChatLabelAssociation
+      messageId: association.messageId || null,
+    });
+  }
+
+  async deleteByLabelId(labelId: string): Promise<void> {
+    await this.repository.deleteBy({ labelId: labelId });
+  }
+
+  getAssociationsByLabelId(
+    labelId: string,
+    type: LabelAssociationType,
+  ): Promise<LabelAssociation[]> {
+    return this.repository.getAllBy({
+      type: type,
+      labelId: labelId,
+    });
+  }
+
+  getAssociationsByChatId(chatId: string): Promise<LabelAssociation[]> {
+    return this.repository.getAllBy({
+      chatId: chatId,
+      type: LabelAssociationType.Chat,
+    });
+  }
+}

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

@@ -0,0 +1,73 @@
+import { ALL_JID } from '@waha/core/engines/noweb/session.noweb.core';
+import { SqlKVRepository } from '@waha/core/storage/sql/SqlKVRepository';
+import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
+import { PaginationParams } from '@waha/structures/pagination.dto';
+
+export class SqlMessagesMethods {
+  constructor(private repository: SqlKVRepository<any>) {}
+
+  upsert(messages: any[]): Promise<void> {
+    return this.repository.upsertMany(messages);
+  }
+
+  async getAllByJid(
+    jid: string,
+    filter: GetChatMessagesFilter,
+    pagination: PaginationParams,
+  ): Promise<any[]> {
+    let query = this.repository.select();
+    if (jid !== ALL_JID) {
+      query = this.repository.select().where({ jid: jid });
+    }
+    if (filter['filter.timestamp.lte'] != null) {
+      query = query.where(
+        'messageTimestamp',
+        '<=',
+        filter['filter.timestamp.lte'],
+      );
+    }
+    if (filter['filter.timestamp.gte'] != null) {
+      query = query.where(
+        'messageTimestamp',
+        '>=',
+        filter['filter.timestamp.gte'],
+      );
+    }
+    if (filter['filter.fromMe'] != null) {
+      // filter by data json inside
+      const sql = this.repository.filterJson('data', 'key.fromMe');
+      query = query.whereRaw(sql, [filter['filter.fromMe'] ? 'true' : 'false']);
+    }
+    query = this.repository.pagination(query, pagination);
+    return this.repository.all(query);
+  }
+
+  async getByJidById(jid: string, id: string): Promise<any> {
+    return this.repository.getBy({ jid: jid, id: id });
+  }
+
+  async updateByJidAndId(
+    jid: string,
+    id: string,
+    update: any,
+  ): Promise<boolean> {
+    const entity = await this.getByJidById(jid, id);
+    if (!entity) {
+      return false;
+    }
+    Object.assign(entity, update);
+    await this.repository.upsertOne(entity);
+  }
+
+  async deleteByJidByIds(jid: string, ids: string[]): Promise<void> {
+    const query = `DELETE
+                   FROM "${this.repository.table}"
+                   WHERE jid = ?
+                     AND id IN (${ids.map(() => '?').join(', ')})`;
+    await this.repository.raw(query, [jid, ...ids]);
+  }
+
+  deleteAllByJid(jid: string): Promise<void> {
+    return this.repository.deleteBy({ jid: jid });
+  }
+}

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

@@ -1,4 +1,6 @@
 import { Chat } from '@adiwajshing/baileys';
+import { NowebChatSchema } from '@waha/core/engines/noweb/store/schemas';
+import { SqlChatMethods } from '@waha/core/engines/noweb/store/sql/SqlChatMethods';
 import { PaginationParams } from '@waha/structures/pagination.dto';
 import { KnexPaginator } from '@waha/utils/Paginator';
 
@@ -15,19 +17,18 @@ export class Sqlite3ChatRepository
 {
   protected Paginator = ChatPaginator;
 
-  async getAllWithMessages(
+  get schema() {
+    return NowebChatSchema;
+  }
+
+  get methods() {
+    return new SqlChatMethods(this);
+  }
+
+  getAllWithMessages(
     pagination: PaginationParams,
     broadcast: boolean,
   ): Promise<Chat[]> {
-    // Get chats with conversationTimestamp is not Null
-    let query = this.select().whereNotNull('conversationTimestamp');
-    if (!broadcast) {
-      // filter out chat by id if it ends at @newsletter or @broadcast
-      query = query
-        .andWhereNot('id', 'like', '%@broadcast')
-        .andWhereNot('id', 'like', '%@newsletter');
-    }
-    query = this.pagination(query, pagination);
-    return await this.all(query);
+    return this.methods.getAllWithMessages(pagination, broadcast);
   }
 }

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

@@ -1,4 +1,5 @@
 import { Contact } from '@adiwajshing/baileys';
+import { NowebContactSchema } from '@waha/core/engines/noweb/store/schemas';
 import { KnexPaginator } from '@waha/utils/Paginator';
 
 import { IContactRepository } from '../IContactRepository';
@@ -13,4 +14,8 @@ export class Sqlite3ContactRepository
   implements IContactRepository
 {
   protected Paginator = ContactPaginator;
+
+  get schema() {
+    return NowebContactSchema;
+  }
 }

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

@@ -1,5 +1,6 @@
 import { GroupMetadata } from '@adiwajshing/baileys/lib/Types/GroupMetadata';
 import { IGroupRepository } from '@waha/core/engines/noweb/store/IGroupRepository';
+import { NowebGroupsSchema } from '@waha/core/engines/noweb/store/schemas';
 import { KnexPaginator } from '@waha/utils/Paginator';
 
 import { NOWEBSqlite3KVRepository } from './NOWEBSqlite3KVRepository';
@@ -13,4 +14,8 @@ export class Sqlite3GroupRepository
   implements IGroupRepository
 {
   protected Paginator = Paginator;
+
+  get schema() {
+    return NowebGroupsSchema;
+  }
 }

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

@@ -3,6 +3,9 @@ import {
   LabelAssociationType,
 } from '@adiwajshing/baileys/lib/Types/LabelAssociation';
 import { ILabelAssociationRepository } from '@waha/core/engines/noweb/store/ILabelAssociationsRepository';
+import { NowebLabelAssociationsMetadata } from '@waha/core/engines/noweb/store/metadata';
+import { NowebLabelAssociationsSchema } from '@waha/core/engines/noweb/store/schemas';
+import { SqlLabelAssociationsMethods } from '@waha/core/engines/noweb/store/sql/SqlLabelAssociationsMethods';
 
 import { NOWEBSqlite3KVRepository } from './NOWEBSqlite3KVRepository';
 
@@ -10,31 +13,34 @@ export class Sqlite3LabelAssociationsRepository
   extends NOWEBSqlite3KVRepository<LabelAssociation>
   implements ILabelAssociationRepository
 {
+  get schema() {
+    return NowebLabelAssociationsSchema;
+  }
+
+  get metadata() {
+    return NowebLabelAssociationsMetadata;
+  }
+
+  get methods() {
+    return new SqlLabelAssociationsMethods(this);
+  }
+
   async deleteOne(association: LabelAssociation): Promise<void> {
-    await this.deleteBy({
-      type: association.type,
-      chatId: association.chatId,
-      labelId: association.labelId,
-      // @ts-ignore: messageId doesn't existing in ChatLabelAssociation
-      messageId: association.messageId || null,
-    });
+    return this.methods.deleteOne(association);
   }
 
   async deleteByLabelId(labelId: string): Promise<void> {
-    await this.deleteBy({ labelId: labelId });
+    return this.methods.deleteByLabelId(labelId);
   }
 
   getAssociationsByLabelId(
     labelId: string,
     type: LabelAssociationType,
   ): Promise<LabelAssociation[]> {
-    return this.getAllBy({
-      type: type,
-      labelId: labelId,
-    });
+    return this.methods.getAssociationsByLabelId(labelId, type);
   }
 
   getAssociationsByChatId(chatId: string): Promise<LabelAssociation[]> {
-    return this.getAllBy({ chatId: chatId, type: LabelAssociationType.Chat });
+    return this.methods.getAssociationsByChatId(chatId);
   }
 }

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

@@ -1,8 +1,14 @@
 import { Label } from '@adiwajshing/baileys/lib/Types/Label';
 import { ILabelsRepository } from '@waha/core/engines/noweb/store/ILabelsRepository';
+import { NowebLabelsSchema } from '@waha/core/engines/noweb/store/schemas';
 
 import { NOWEBSqlite3KVRepository } from './NOWEBSqlite3KVRepository';
 
 export class Sqlite3LabelsRepository
   extends NOWEBSqlite3KVRepository<Label>
-  implements ILabelsRepository {}
+  implements ILabelsRepository
+{
+  get schema() {
+    return NowebLabelsSchema;
+  }
+}

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

@@ -1,4 +1,6 @@
-import { ALL_JID } from '@waha/core/engines/noweb/session.noweb.core';
+import { NowebMessagesMetadata } from '@waha/core/engines/noweb/store/metadata';
+import { NowebMessagesSchema } from '@waha/core/engines/noweb/store/schemas';
+import { SqlMessagesMethods } from '@waha/core/engines/noweb/store/sql/SqlMessagesMethods';
 import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
 import { PaginationParams } from '@waha/structures/pagination.dto';
 
@@ -9,8 +11,20 @@ export class Sqlite3MessagesRepository
   extends NOWEBSqlite3KVRepository<any>
   implements IMessagesRepository
 {
+  get schema() {
+    return NowebMessagesSchema;
+  }
+
+  get methods() {
+    return new SqlMessagesMethods(this);
+  }
+
+  get metadata() {
+    return NowebMessagesMetadata;
+  }
+
   upsert(messages: any[]): Promise<void> {
-    return this.upsertMany(messages);
+    return this.methods.upsert(messages);
   }
 
   async getAllByJid(
@@ -18,36 +32,11 @@ export class Sqlite3MessagesRepository
     filter: GetChatMessagesFilter,
     pagination: PaginationParams,
   ): Promise<any[]> {
-    let query = this.select();
-    if (jid !== ALL_JID) {
-      query = this.select().where({ jid: jid });
-    }
-    if (filter['filter.timestamp.lte'] != null) {
-      query = query.where(
-        'messageTimestamp',
-        '<=',
-        filter['filter.timestamp.lte'],
-      );
-    }
-    if (filter['filter.timestamp.gte'] != null) {
-      query = query.where(
-        'messageTimestamp',
-        '>=',
-        filter['filter.timestamp.gte'],
-      );
-    }
-    if (filter['filter.fromMe'] != null) {
-      // filter by data->"$.key.fromMe"
-      query = query.whereRaw("data->'$.key.fromMe' = ?", [
-        filter['filter.fromMe'] ? 'true' : 'false',
-      ]);
-    }
-    query = this.pagination(query, pagination);
-    return this.all(query);
+    return this.methods.getAllByJid(jid, filter, pagination);
   }
 
   async getByJidById(jid: string, id: string): Promise<any> {
-    return this.getBy({ jid: jid, id: id });
+    return this.methods.getByJidById(jid, id);
   }
 
   async updateByJidAndId(
@@ -55,23 +44,14 @@ export class Sqlite3MessagesRepository
     id: string,
     update: any,
   ): Promise<boolean> {
-    const entity = await this.getByJidById(jid, id);
-    if (!entity) {
-      return false;
-    }
-    Object.assign(entity, update);
-    await this.upsertOne(entity);
+    return this.methods.updateByJidAndId(jid, id, update);
   }
 
   async deleteByJidByIds(jid: string, ids: string[]): Promise<void> {
-    const query = `DELETE
-                   FROM ${this.table}
-                   WHERE jid = ?
-                     AND id IN (${ids.map(() => '?').join(', ')})`;
-    this.db.prepare(query).run([jid, ...ids]);
+    return this.methods.deleteByJidByIds(jid, ids);
   }
 
   deleteAllByJid(jid: string): Promise<void> {
-    return this.deleteBy({ jid: jid });
+    return this.methods.deleteAllByJid(jid);
   }
 }

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

@@ -1,4 +1,4 @@
-import { Schema } from '@waha/core/storage/sqlite3/Schema';
+import { Schema } from '@waha/core/storage/Schema';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const Database = require('better-sqlite3');

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

@@ -1,14 +1,12 @@
-import { WAMessage } from '@adiwajshing/baileys';
-import { LabelAssociation } from '@adiwajshing/baileys/lib/Types/LabelAssociation';
 import { ILabelAssociationRepository } from '@waha/core/engines/noweb/store/ILabelAssociationsRepository';
 import { ILabelsRepository } from '@waha/core/engines/noweb/store/ILabelsRepository';
 import { Sqlite3GroupRepository } from '@waha/core/engines/noweb/store/sqlite3/Sqlite3GroupRepository';
 import { Sqlite3LabelAssociationsRepository } from '@waha/core/engines/noweb/store/sqlite3/Sqlite3LabelAssociationsRepository';
 import { Sqlite3LabelsRepository } from '@waha/core/engines/noweb/store/sqlite3/Sqlite3LabelsRepository';
-import { Field, Index, Schema } from '@waha/core/storage/sqlite3/Schema';
+import { Schema } from '@waha/core/storage/Schema';
 
 import { INowebStorage } from '../INowebStorage';
-import { NOWEB_STORE_SCHEMA } from '../Schema';
+import { Migrations, NOWEB_STORE_SCHEMA } from '../schemas';
 import { Sqlite3ChatRepository } from './Sqlite3ChatRepository';
 import { Sqlite3ContactRepository } from './Sqlite3ContactRepository';
 import { Sqlite3MessagesRepository } from './Sqlite3MessagesRepository';
@@ -44,121 +42,36 @@ export class Sqlite3Storage extends INowebStorage {
   }
 
   private migration0001init() {
-    // Contacts
-    this.db.exec(
-      'CREATE TABLE IF NOT EXISTS contacts (id TEXT PRIMARY KEY, data TEXT)',
-    );
-    this.db.exec(
-      'CREATE UNIQUE INDEX IF NOT EXISTS contacts_id_index ON contacts (id)',
-    );
-
-    // Chats
-    this.db.exec(
-      'CREATE TABLE IF NOT EXISTS chats (id TEXT PRIMARY KEY, conversationTimestamp INTEGER, data TEXT)',
-    );
-    this.db.exec(
-      'CREATE UNIQUE INDEX IF NOT EXISTS chats_id_index ON chats (id)',
-    );
-    this.db.exec(
-      'CREATE INDEX IF NOT EXISTS chats_conversationTimestamp_index ON chats (conversationTimestamp)',
-    );
-
-    // Groups
-    this.db.exec(
-      'CREATE TABLE IF NOT EXISTS groups (id TEXT PRIMARY KEY, data TEXT)',
-    );
-    this.db.exec(
-      'CREATE UNIQUE INDEX IF NOT EXISTS groups_id_index ON groups (id)',
-    );
-
-    // Messages
-    this.db.exec(
-      'CREATE TABLE IF NOT EXISTS messages (jid TEXT, id TEXT, messageTimestamp INTEGER, data TEXT)',
-    );
-    this.db.exec(
-      'CREATE UNIQUE INDEX IF NOT EXISTS messages_id_index ON messages (id)',
-    );
-    this.db.exec(
-      'CREATE INDEX IF NOT EXISTS messages_jid_id_index ON messages (jid, id)',
-    );
-    this.db.exec(
-      'CREATE INDEX IF NOT EXISTS messages_jid_timestamp_index ON messages (jid, messageTimestamp)',
-    );
-    this.db.exec(
-      'CREATE INDEX IF NOT EXISTS timestamp_index ON messages (messageTimestamp)',
-    );
-
-    //
-    // Labels
-    //
-    this.db.exec(
-      'CREATE TABLE IF NOT EXISTS labels (id TEXT PRIMARY KEY, data TEXT)',
-    );
-    this.db.exec(
-      'CREATE UNIQUE INDEX IF NOT EXISTS labels_id_index ON labels (id)',
-    );
-
-    // Label associations
-    this.db.exec(
-      'CREATE TABLE IF NOT EXISTS labelAssociations (id TEXT PRIMARY KEY, type TEXT, labelId TEXT, chatId TEXT, messageId TEXT, data TEXT)',
-    );
-    this.db.exec(
-      'CREATE UNIQUE INDEX IF NOT EXISTS label_assoc_id_index ON labelAssociations (id)',
-    );
-    this.db.exec(
-      'CREATE INDEX IF NOT EXISTS label_assoc_type_label_index ON labelAssociations (type, labelId)',
-    );
-    this.db.exec(
-      'CREATE INDEX IF NOT EXISTS label_assoc_type_chat_index ON labelAssociations (type, chatId)',
-    );
-    this.db.exec(
-      'CREATE INDEX IF NOT EXISTS label_assoc_type_message_index ON labelAssociations (type, messageId)',
-    );
+    for (const migration of Migrations) {
+      this.db.exec(migration);
+    }
   }
 
   async close() {
-    this.db.close();
+    return this.db.close();
   }
 
   getContactsRepository() {
-    return new Sqlite3ContactRepository(this.db, this.getSchema('contacts'));
+    return new Sqlite3ContactRepository(this.db);
   }
 
   getChatRepository() {
-    return new Sqlite3ChatRepository(this.db, this.getSchema('chats'));
+    return new Sqlite3ChatRepository(this.db);
   }
 
   getGroupRepository() {
-    return new Sqlite3GroupRepository(this.db, this.getSchema('groups'));
+    return new Sqlite3GroupRepository(this.db);
   }
 
   getLabelsRepository(): ILabelsRepository {
-    return new Sqlite3LabelsRepository(this.db, this.getSchema('labels'));
+    return new Sqlite3LabelsRepository(this.db);
   }
 
   getLabelAssociationRepository(): ILabelAssociationRepository {
-    const metadata = this.getLabelAssociationMetadata();
-    return new Sqlite3LabelAssociationsRepository(
-      this.db,
-      this.getSchema('labelAssociations'),
-      metadata,
-    );
+    return new Sqlite3LabelAssociationsRepository(this.db);
   }
 
   getMessagesRepository() {
-    const metadata = this.getMessagesMetadata();
-    return new Sqlite3MessagesRepository(
-      this.db,
-      this.getSchema('messages'),
-      metadata,
-    );
-  }
-
-  getSchema(name: string) {
-    const schema = this.tables.find((table) => table.name === name);
-    if (!schema) {
-      throw new Error(`Schema not found: ${name}`);
-    }
-    return schema;
+    return new Sqlite3MessagesRepository(this.db);
   }
 }

src/core/engines/noweb/useMultiFileAuthState.ts

@@ -4,9 +4,12 @@ import {
   proto,
 } from '@adiwajshing/baileys';
 import { BufferJSON, initAuthCreds } from '@adiwajshing/baileys/lib/Utils';
-import { mkdir, readFile, stat, unlink, writeFile } from 'fs/promises';
+import { mkdir, readFile, stat, unlink } from 'fs/promises';
 import { join } from 'path';
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const writeFileAtomic = require('write-file-atomic');
+
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const AsyncLock = require('async-lock');
 
@@ -29,11 +32,15 @@ export const useMultiFileAuthState = async (
 ): Promise<{
   state: AuthenticationState;
   saveCreds: () => Promise<void>;
+  close: () => Promise<void>;
 }> => {
   const writeData = (data: any, file: string) => {
     const filePath = join(folder, fixFileName(file));
     return fileLock.acquire(filePath, () =>
-      writeFile(join(filePath), JSON.stringify(data, BufferJSON.replacer)),
+      writeFileAtomic(
+        join(filePath),
+        JSON.stringify(data, BufferJSON.replacer),
+      ),
     );
   };
 
@@ -111,5 +118,8 @@ export const useMultiFileAuthState = async (
     saveCreds: () => {
       return writeData(creds, 'creds.json');
     },
+    close: async () => {
+      return;
+    },
   };
 };

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

@@ -2,9 +2,11 @@ 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 { Client, Events } from 'whatsapp-web.js';
 import { Message } from 'whatsapp-web.js/src/structures';
+import { exposeFunctionIfAbsent } from 'whatsapp-web.js/src/util/Puppeter';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const { LoadWAHA } = require('./_WAHA.js');
@@ -18,17 +20,51 @@ 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();
+
   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 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();
+    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 (

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/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

@@ -3,8 +3,14 @@ import {
   getChannelInviteLink,
   WhatsappSession,
 } from '@waha/core/abc/session.abc';
+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 {
   AvailableInPlusVersion,
   NotImplementedByEngineError,
@@ -15,9 +21,14 @@ 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,
@@ -30,6 +41,7 @@ import {
   ChatRequest,
   CheckNumberStatusQuery,
   EditMessageRequest,
+  MessageButtonReply,
   MessageFileRequest,
   MessageForwardRequest,
   MessageImageRequest,
@@ -52,6 +64,7 @@ import {
   WAHASessionStatus,
   WAMessageAck,
 } from '@waha/structures/enums.dto';
+import { BinaryFile, RemoteFile } from '@waha/structures/files.dto';
 import {
   CreateGroupRequest,
   GroupSortField,
@@ -61,7 +74,11 @@ 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 {
@@ -72,7 +89,7 @@ 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 { filter, fromEvent, merge, mergeMap, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import {
   Call,
@@ -82,6 +99,7 @@ import {
   Contact,
   Events,
   GroupChat,
+  GroupNotification,
   Label as WEBJSLabel,
   Location,
   Message,
@@ -91,9 +109,6 @@ import {
 } from 'whatsapp-web.js';
 import { Message as MessageInstance } from 'whatsapp-web.js/src/structures';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const QRCode = require('qrcode');
-
 export interface WebJSConfig {
   webVersion?: string;
   cacheType: 'local' | 'none';
@@ -109,7 +124,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
   private engineStateCheckDelayedJob: SingleDelayedJobRunner;
   private shouldRestart: boolean;
 
-  whatsapp: WebjsClient;
+  whatsapp: WebjsClientCore;
   protected qr: QR;
 
   public constructor(config) {
@@ -164,14 +179,15 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
 
   protected async buildClient() {
     const clientOptions = this.getClientOptions();
+    const base = process.env.WAHA_LOCAL_STORE_BASE_DIR || './.sessions';
     clientOptions.authStrategy = new LocalAuth({
       clientId: this.name,
-      dataPath: undefined,
+      dataPath: `${base}/webjs/default`,
       logger: this.logger,
       rmMaxRetries: undefined,
     });
     this.addProxyConfig(clientOptions);
-    return new WebjsClient(clientOptions);
+    return new WebjsClientCore(clientOptions);
   }
 
   private restartClient() {
@@ -266,6 +282,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     this.status = WAHASessionStatus.STOPPED;
     this.stopEvents();
     this.startDelayedJob.cancel();
+    this.mediaManager.close();
     await this.end();
   }
 
@@ -335,8 +352,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     this.whatsapp.on(Events.QR_RECEIVED, async (qr) => {
       this.logger.debug('QR received');
       // Convert to image and save
-      const url = await QRCode.toDataURL(qr);
-      this.qr.save(url, qr);
+      this.qr.save(qr);
       this.printQR(this.qr);
       this.status = WAHASessionStatus.SCAN_QR_CODE;
     });
@@ -452,6 +468,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(
@@ -475,13 +515,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) {
@@ -496,17 +541,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
@@ -514,17 +567,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();
   }
 
@@ -660,7 +719,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();
   }
 
@@ -845,6 +904,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;
   }
@@ -924,6 +990,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;
@@ -940,6 +1025,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       picture: null,
       verified: metadata.verified,
       role: role,
+      subscribersCount: null,
     };
   }
 
@@ -957,6 +1043,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       picture: metadata.pictureUrl,
       verified: metadata.isVerified,
       role: role,
+      subscribersCount: metadata.subscribersCount,
     };
   }
 
@@ -968,6 +1055,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),
     );
@@ -1056,7 +1147,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);
@@ -1072,6 +1163,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
     //
@@ -1166,10 +1262,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
@@ -1213,7 +1351,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);
@@ -1226,10 +1367,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,
@@ -1242,19 +1385,21 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
 
   protected toWAMessage(message: Message): WAMessage {
     const replyTo = this.extractReplyTo(message);
+    const source = this.getMessageSource(message.id.id);
     // @ts-ignore
     return {
       id: message.id._serialized,
       timestamp: message.timestamp,
       from: message.from,
       fromMe: message.fromMe,
+      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
@@ -1269,7 +1414,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;
     }
@@ -1277,6 +1422,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       id: quotedMsg.id?.id,
       participant: quotedMsg.author || quotedMsg.from,
       body: quotedMsg.caption || quotedMsg.body,
+      _data: quotedMsg,
     };
   }
 
@@ -1303,7 +1449,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,
@@ -1324,6 +1470,10 @@ export class WEBJSEngineMediaProcessor
     return message.type !== 'revoked';
   }
 
+  getChatId(message: Message): string {
+    return message.id.remote;
+  }
+
   getMessageId(message: Message): string {
     return message.id._serialized;
   }

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

@@ -1,9 +1,13 @@
 import {
   Injectable,
   NotFoundException,
+  OnModuleInit,
   UnprocessableEntityException,
 } from '@nestjs/common';
+import { EngineBootstrap } from '@waha/core/abc/EngineBootstrap';
+import { GowsEngineConfigService } from '@waha/core/config/GowsEngineConfigService';
 import { WebJSEngineConfigService } from '@waha/core/config/WebJSEngineConfigService';
+import { WhatsappSessionGoWSCore } from '@waha/core/engines/gows/session.gows.core';
 import { WebhookConductor } from '@waha/core/integrations/webhooks/WebhookConductor';
 import { MediaStorageFactory } from '@waha/core/media/MediaStorageFactory';
 import { DefaultMap } from '@waha/utils/DefaultMap';
@@ -41,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}`,
     );
   }
 }
@@ -54,7 +60,7 @@ enum DefaultSessionStatus {
 }
 
 @Injectable()
-export class SessionManagerCore extends SessionManager {
+export class SessionManagerCore extends SessionManager implements OnModuleInit {
   SESSION_STOP_TIMEOUT = 3000;
 
   // session - exists and running (or failed or smth)
@@ -66,19 +72,22 @@ export class SessionManagerCore extends SessionManager {
 
   protected readonly EngineClass: typeof WhatsappSession;
   protected events2: DefaultMap<WAHAEvents, SwitchObservable<any>>;
+  protected readonly engineBootstrap: EngineBootstrap;
 
   constructor(
     config: WhatsappConfigService,
     private engineConfigService: EngineConfigService,
     private webjsEngineConfigService: WebJSEngineConfigService,
+    gowsConfigService: GowsEngineConfigService,
     log: PinoLogger,
     private mediaStorageFactory: MediaStorageFactory,
   ) {
-    super(config, log);
+    super(log, config, gowsConfigService);
     this.session = DefaultSessionStatus.STOPPED;
     this.sessionConfig = null;
     const engineName = this.engineConfigService.getDefaultEngineName();
     this.EngineClass = this.getEngine(engineName);
+    this.engineBootstrap = this.getEngineBootstrap(engineName);
 
     this.events2 = new DefaultMap<WAHAEvents, SwitchObservable<any>>(
       (key) =>
@@ -89,7 +98,6 @@ export class SessionManagerCore extends SessionManager {
 
     this.store = new LocalStoreCore(engineName.toLowerCase());
     this.sessionAuthRepository = new LocalSessionAuthRepository(this.store);
-    this.startPredefinedSessions();
     this.clearStorage().catch((error) => {
       this.log.error({ error }, 'Error while clearing storage');
     });
@@ -100,6 +108,8 @@ export class SessionManagerCore extends SessionManager {
       return WhatsappSessionWebJSCore;
     } else if (engine === WAHAEngine.NOWEB) {
       return WhatsappSessionNoWebCore;
+    } else if (engine === WAHAEngine.GOWS) {
+      return WhatsappSessionGoWSCore;
     } else {
       throw new NotFoundException(`Unknown whatsapp engine '${engine}'.`);
     }
@@ -107,20 +117,26 @@ export class SessionManagerCore extends SessionManager {
 
   private onlyDefault(name: string) {
     if (name !== this.DEFAULT) {
-      throw new OnlyDefaultSessionIsAllowed();
+      throw new OnlyDefaultSessionIsAllowed(name);
     }
   }
 
   async beforeApplicationShutdown(signal?: string) {
-    this.stopEvents();
-    if (!this.session) {
-      return;
+    if (this.session) {
+      await this.stop(this.DEFAULT, true);
     }
-    await this.stop(this.DEFAULT, true);
+    this.stopEvents();
+    await this.engineBootstrap.shutdown();
+  }
+
+  async onApplicationBootstrap() {
+    await this.engineBootstrap.bootstrap();
+    this.startPredefinedSessions();
   }
 
   private async clearStorage() {
-    const storage = this.mediaStorageFactory.build(
+    const storage = await this.mediaStorageFactory.build(
+      'all',
       this.log.logger.child({ name: 'Storage' }),
     );
     await storage.purge();
@@ -156,7 +172,8 @@ export class SessionManagerCore extends SessionManager {
     logger.level = getPinoLogLevel(this.sessionConfig?.debug);
     const loggerBuilder: LoggerBuilder = logger;
 
-    const storage = this.mediaStorageFactory.build(
+    const storage = await this.mediaStorageFactory.build(
+      name,
       loggerBuilder.child({ name: 'Storage' }),
     );
     await storage.init();
@@ -179,6 +196,8 @@ export class SessionManagerCore extends SessionManager {
     };
     if (this.EngineClass === WhatsappSessionWebJSCore) {
       sessionConfig.engineConfig = this.webjsEngineConfigService.getConfig();
+    } else if (this.EngineClass === WhatsappSessionGoWSCore) {
+      sessionConfig.engineConfig = this.gowsConfigService.getConfig();
     }
     await this.sessionAuthRepository.init(name);
     // @ts-ignore
@@ -345,9 +364,9 @@ export class SessionManagerCore extends SessionManager {
       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',
         );
       }
     }
@@ -374,4 +393,12 @@ export class SessionManagerCore extends SessionManager {
   protected stopEvents() {
     complete(this.events2);
   }
+
+  async onModuleInit() {
+    await this.init();
+  }
+
+  async init() {
+    await this.store.init();
+  }
 }

src/core/media/IMediaEngineProcessor.ts

@@ -11,6 +11,8 @@ interface IMediaEngineProcessor<Message> {
 
   getMessageId(message: Message): string;
 
+  getChatId(message: Message): string;
+
   getMediaBuffer(message: Message): Promise<Buffer | null>;
 }
 

src/core/media/IMediaManager.ts

@@ -10,6 +10,7 @@ interface IMediaManager {
     message: Message,
     session: string,
   ): Promise<Message>;
+  close(): void;
 }
 
 export { IMediaManager };

src/core/media/IMediaStorage.ts

@@ -6,6 +6,9 @@ import { S3MediaData } from '@waha/structures/media.s3.dto';
 interface Message {
   // false_111111111@c.us_AAAAAAAAAAAAAA
   id: string;
+
+  // 1111111@c.us
+  chatId: string;
 }
 
 interface File {
@@ -37,6 +40,19 @@ abstract class IMediaStorage {
   abstract getStorageData(data: MediaData): Promise<MediaStorageData>;
 
   abstract purge(): Promise<void>;
+
+  abstract close(): Promise<void>;
+}
+
+export function getMetadata(data: MediaData): any {
+  const now = new Date();
+  return {
+    'waha-session': data.session,
+    'waha-chat-id': data.message.chatId,
+    'waha-message-id': data.message.id,
+    'waha-media-filename': data.file.filename,
+    'waha-created-at': now.getTime(),
+  };
 }
 
 export { IMediaStorage };

src/core/media/MediaManager.ts

@@ -52,6 +52,7 @@ export class MediaManager implements IMediaManager {
     session: string,
   ): Promise<WAMedia | null> {
     const messageId = processor.getMessageId(message);
+    const chatId = processor.getChatId(message);
     const mimetype = processor.getMimetype(message);
     const filename = processor.getFilename(message);
     if (!this.shouldProcessMimetype(mimetype)) {
@@ -66,6 +67,7 @@ export class MediaManager implements IMediaManager {
       session: session,
       message: {
         id: messageId,
+        chatId: chatId,
       },
       file: {
         extension: extension,
@@ -195,4 +197,10 @@ export class MediaManager implements IMediaManager {
       throw error;
     }
   }
+
+  close() {
+    this.storage.close().catch((err) => {
+      this.log.error(`Failed to close media storage: ${err}`);
+    });
+  }
 }

src/core/media/MediaStorageFactory.ts

@@ -2,5 +2,5 @@ import { IMediaStorage } from '@waha/core/media/IMediaStorage';
 import { Logger } from 'pino';
 
 export abstract class MediaStorageFactory {
-  abstract build(logger: Logger): IMediaStorage;
+  abstract build(name: string, logger: Logger): Promise<IMediaStorage>;
 }

src/core/media/local/MediaLocalStorage.ts

@@ -3,12 +3,12 @@ import { SECOND } from '@waha/structures/enums.dto';
 import * as fsp from 'fs/promises';
 import * as path from 'path';
 import { Logger } from 'pino';
-import { promisify } from 'util';
 import fs = require('fs');
 import del = require('del');
 import { fileExists } from '@waha/utils/files';
 
-const writeFileAsync = promisify(fs.writeFile);
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const writeFileAtomic = require('write-file-atomic');
 
 /**
  * Save files locally using the filesystem
@@ -41,7 +41,7 @@ export class MediaLocalStorage implements IMediaStorage {
     const filepath = this.getFullPath(data);
     const folder = path.dirname(filepath);
     await fsp.mkdir(folder, { recursive: true });
-    await writeFileAsync(filepath, buffer);
+    await writeFileAtomic(filepath, buffer);
     this.postponeRemoval(filepath);
     return true;
   }
@@ -92,4 +92,8 @@ export class MediaLocalStorage implements IMediaStorage {
       this.lifetimeMs,
     );
   }
+
+  async close() {
+    return;
+  }
 }

src/core/media/local/MediaLocalStorageFactory.ts

@@ -11,7 +11,8 @@ export class MediaLocalStorageFactory extends MediaStorageFactory {
     super();
   }
 
-  build(logger: Logger): IMediaStorage {
+  async build(name: string, logger: Logger): Promise<IMediaStorage> {
+    // Local storage uses the same folder for all sessions
     return new MediaLocalStorage(
       logger,
       this.config.filesFolder,

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

@@ -1,16 +1,18 @@
 import { SessionConfig } from '../../structures/sessions.dto';
 
 export abstract class ISessionConfigRepository {
-  abstract save(
+  abstract saveConfig(
     sessionName: string,
     config: SessionConfig | null,
   ): Promise<void>;
 
-  abstract get(sessionName: string): Promise<SessionConfig | null>;
+  abstract getConfig(sessionName: string): Promise<SessionConfig | null>;
 
   abstract exists(sessionName: string): Promise<boolean>;
 
-  abstract delete(sessionName: string): Promise<void>;
+  abstract deleteConfig(sessionName: string): Promise<void>;
 
-  abstract getAll(): Promise<string[]>;
+  abstract getAllConfigs(): Promise<string[]>;
+
+  abstract init(): Promise<void>;
 }

src/core/storage/LocalSessionConfigRepository.ts

@@ -7,6 +7,9 @@ import { SessionConfig } from '../../structures/sessions.dto';
 import { ISessionConfigRepository } from './ISessionConfigRepository';
 import { LocalStore } from './LocalStore';
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const writeFileAtomic = require('write-file-atomic');
+
 export class LocalSessionConfigRepository extends ISessionConfigRepository {
   FILENAME = '.waha.session.config.json';
   private store: LocalStore;
@@ -27,7 +30,7 @@ export class LocalSessionConfigRepository extends ISessionConfigRepository {
     return true;
   }
 
-  async get(sessionName: string): Promise<SessionConfig | null> {
+  async getConfig(sessionName: string): Promise<SessionConfig | null> {
     const filepath = this.getFilePath(sessionName);
     // Check file exists
     if (!(await fileExists(filepath))) {
@@ -45,26 +48,26 @@ export class LocalSessionConfigRepository extends ISessionConfigRepository {
     return JSON.parse(content);
   }
 
-  async save(sessionName: string, config: SessionConfig | null) {
+  async saveConfig(sessionName: string, config: SessionConfig | null) {
     // Create folder if not exist
     const folder = this.store.getSessionDirectory(sessionName);
     await fs.mkdir(folder, { recursive: true });
     // Save config
     const filepath = this.getFilePath(sessionName);
     const content = JSON.stringify(config || null);
-    await fs.writeFile(filepath, content);
+    await writeFileAtomic(filepath, content);
   }
 
   private getFilePath(sessionName): string {
     return this.store.getFilePath(sessionName, this.FILENAME);
   }
 
-  async delete(sessionName: string): Promise<void> {
+  async deleteConfig(sessionName: string): Promise<void> {
     const sessionDirectory = this.store.getSessionDirectory(sessionName);
     await fs.remove(sessionDirectory);
   }
 
-  async getAll(): Promise<string[]> {
+  async getAllConfigs(): Promise<string[]> {
     await this.store.init();
     const content = await fs.readdir(this.store.getEngineDirectory(), {
       withFileTypes: true,
@@ -73,4 +76,8 @@ export class LocalSessionConfigRepository extends ISessionConfigRepository {
       .filter((dirent) => dirent.isDirectory())
       .map((dirent) => dirent.name);
   }
+
+  async init() {
+    return;
+  }
 }

src/core/storage/LocalSessionWorkerRepository.ts

@@ -1,74 +0,0 @@
-import { Sqlite3SchemaValidation } from '@waha/core/engines/noweb/store/sqlite3/Sqlite3SchemaValidation';
-import {
-  ISessionWorkerRepository,
-  SessionWorkerInfo,
-} from '@waha/core/storage/ISessionWorkerRepository';
-import { LocalStore } from '@waha/core/storage/LocalStore';
-import { Field, Index, Schema } from '@waha/core/storage/sqlite3/Schema';
-import { Sqlite3KVRepository } from '@waha/core/storage/sqlite3/Sqlite3KVRepository';
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const Database = require('better-sqlite3');
-
-const SCHEMA = new Schema(
-  'session_worker',
-  [
-    new Field('id', 'TEXT'),
-    new Field('worker', 'TEXT'),
-    new Field('data', 'TEXT'),
-  ],
-  [
-    new Index('session_worker_id_idx', ['id']),
-    new Index('session_worker_worker_idx', ['worker']),
-  ],
-);
-
-export class LocalSessionWorkerRepository
-  extends Sqlite3KVRepository<SessionWorkerInfo>
-  implements ISessionWorkerRepository
-{
-  constructor(store: LocalStore) {
-    const db = store.getWAHADatabase();
-    super(db, SCHEMA);
-  }
-
-  assign(session: string, worker: string): Promise<void> {
-    return this.upsertOne({ id: session, worker: worker });
-  }
-
-  unassign(session: string, worker: string): Promise<void> {
-    return this.deleteBy({ id: session, worker: worker });
-  }
-
-  remove(session: string) {
-    return this.deleteById(session);
-  }
-
-  async getSessionsByWorker(worker: string): Promise<string[]> {
-    const data = await this.getAllBy({ worker: worker });
-    return data.map((d) => d.id);
-  }
-
-  async init(): Promise<void> {
-    this.migrations();
-    this.validateSchema();
-  }
-
-  private migrations() {
-    this.db.exec(
-      'CREATE TABLE IF NOT EXISTS session_worker (id TEXT, worker TEXT, data TEXT)',
-    );
-    // Session can have only one record
-    this.db.exec(
-      'CREATE UNIQUE INDEX IF NOT EXISTS session_worker_id_idx ON session_worker (id)',
-    );
-    // Worker can have multiple records
-    this.db.exec(
-      'CREATE INDEX IF NOT EXISTS session_worker_worker_idx ON session_worker (worker)',
-    );
-  }
-
-  private validateSchema() {
-    new Sqlite3SchemaValidation(SCHEMA, this.db).validate();
-  }
-}

src/core/storage/LocalStoreCore.ts

@@ -9,10 +9,8 @@ import { LocalStore } from './LocalStore';
 const Database = require('better-sqlite3');
 
 export class LocalStoreCore extends LocalStore {
-  protected readonly baseDirectory: string = path.join(
-    os.tmpdir(),
-    'waha-sessions',
-  );
+  protected readonly baseDirectory: string =
+    process.env.WAHA_LOCAL_STORE_BASE_DIR || './.sessions';
 
   private readonly engine: string;
   private db: any;
@@ -54,8 +52,7 @@ export class LocalStoreCore extends LocalStore {
   }
 
   protected getDirectoryPath(name: string): string {
-    const suffix = crypto.createHash('md5').update(name).digest('hex');
-    return path.join(this.getEngineDirectory(), `${name}-${suffix}`);
+    return path.join(this.getEngineDirectory(), name);
   }
 
   getWAHADatabase(): any {

src/core/storage/sql/IJsonQuery.ts

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

src/core/storage/sql/ISQLEngine.ts

@@ -0,0 +1,28 @@
+import Knex from 'knex';
+
+export interface ISQLEngine {
+  /**
+   * Run a query that does not return any data
+   */
+  run(query: Knex.QueryBuilder): Promise<void>;
+
+  /**
+   * Get a single row from the database
+   */
+  get(query: Knex.QueryBuilder): Promise<any | null>;
+
+  /**
+   * Get all rows from the database
+   */
+  all(query: Knex.QueryBuilder): Promise<any[]>;
+
+  /**
+   * Run a raw SQL query with bindings
+   */
+  raw(sql: string, bindings: any[]): Promise<void>;
+
+  /**
+   * Execute a raw SQL query
+   */
+  exec(sql: string): Promise<void>;
+}

src/core/storage/sql/SqlKVRepository.ts

@@ -0,0 +1,217 @@
+import { Field, Schema } from '@waha/core/storage/Schema';
+import { IJsonQuery } from '@waha/core/storage/sql/IJsonQuery';
+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';
+
+export type Migration = string;
+
+export class SqlKVRepository<Entity> {
+  protected UPSERT_BATCH_SIZE = 100;
+  protected Paginator: typeof KnexPaginator = KnexPaginator;
+
+  protected jsonQuery: IJsonQuery;
+
+  get schema(): Schema {
+    throw new Error('Not implemented');
+  }
+
+  get metadata(): Map<string, (entity: Entity) => any> {
+    return new Map();
+  }
+
+  get migrations(): Migration[] {
+    return [];
+  }
+
+  constructor(
+    private engine: ISQLEngine,
+    protected knex: Knex.Knex,
+  ) {}
+
+  get columns(): Field[] {
+    return this.schema.columns;
+  }
+
+  get table(): string {
+    return this.schema.name;
+  }
+
+  /**
+   * Migrations
+   */
+  async init(): Promise<void> {
+    await this.applyMigrations();
+    await this.validateSchema();
+  }
+
+  protected async applyMigrations() {
+    for (const migration of this.migrations) {
+      await this.engine.exec(migration);
+    }
+  }
+
+  protected async validateSchema() {
+    return;
+  }
+
+  /**
+   * Update methods
+   */
+  save(entity: Entity) {
+    return this.upsertOne(entity);
+  }
+
+  async upsertOne(entity: Entity): Promise<void> {
+    await this.upsertMany([entity]);
+  }
+
+  async upsertMany(entities: Entity[]): Promise<void> {
+    if (entities.length === 0) {
+      return;
+    }
+    const batchSize = this.UPSERT_BATCH_SIZE;
+    for (let i = 0; i < entities.length; i += batchSize) {
+      const batch = entities.slice(i, i + batchSize);
+      await this.upsertBatch(batch);
+    }
+  }
+
+  private async upsertBatch(entities: Entity[]): Promise<void> {
+    const data = entities.map((entity) => this.dump(entity));
+    const columns = this.columns.map((c) => `"${c.fieldName}"`);
+    const values = data.map((d) => Object.values(d)).flat();
+    const sql = `INSERT INTO "${this.table}" (${columns.join(', ')})
+                 VALUES ${data
+                   .map(() => `(${columns.map(() => '?').join(', ')})`)
+                   .join(', ')}
+                 ON CONFLICT(id) DO UPDATE
+                     SET ${columns
+                       .map((column) => `${column} = excluded.${column}`)
+                       .join(', ')}`;
+    try {
+      await this.raw(sql, values);
+    } catch (err) {
+      console.error(
+        `Error upserting data: ${err}, sql: ${sql}, values: ${values}`,
+      );
+      throw err;
+    }
+  }
+
+  /**
+   * Get methods
+   */
+  getAll(pagination?: PaginationParams) {
+    let query = this.select();
+    query = this.pagination(query, pagination);
+    return this.all(query);
+  }
+
+  getAllByIds(ids: string[]) {
+    return this.all(this.select().whereIn('id', ids));
+  }
+
+  getById(id: string): Promise<Entity | null> {
+    return this.getBy({ id: id });
+  }
+
+  getAllBy(filters: any) {
+    const query = this.select().where(filters);
+    return this.all(query);
+  }
+
+  public async getBy(filters: any) {
+    const query = this.select().where(filters).limit(1);
+    return this.get(query);
+  }
+
+  /**
+   * Delete methods
+   */
+  async deleteAll() {
+    const query = this.delete();
+    await this.run(query);
+  }
+
+  async deleteById(id: string) {
+    await this.deleteBy({ id: id });
+  }
+
+  public async deleteBy(filters: any) {
+    const query = this.delete().where(filters);
+    await this.run(query);
+  }
+
+  /**
+   * SQL Implementation details
+   */
+  public async raw(sql: string, bindings: any[]): Promise<void> {
+    await this.engine.raw(sql, bindings);
+  }
+
+  protected async run(query: Knex.QueryBuilder): Promise<void> {
+    await this.engine.run(query);
+  }
+
+  protected async get(query: Knex.QueryBuilder): Promise<Entity | null> {
+    const row = await this.engine.get(query);
+    if (!row) {
+      return null;
+    }
+    return this.parse(row);
+  }
+
+  public async all(query: Knex.QueryBuilder): Promise<Entity[]> {
+    const rows = await this.engine.all(query);
+    return rows.map((row) => this.parse(row));
+  }
+
+  /**
+   * SQL helpers
+   */
+  public select() {
+    return this.knex.select().from(this.table);
+  }
+
+  protected delete() {
+    return this.knex.delete().from(this.table);
+  }
+
+  public pagination(query: any, pagination?: PaginationParams) {
+    const paginator = new this.Paginator(pagination, this.jsonQuery);
+    return paginator.apply(query);
+  }
+
+  /**
+   * JSON helpers
+   */
+  public filterJson(field: string, key: string): string {
+    return this.jsonQuery.filter(field, key);
+  }
+
+  protected stringify(data: any): string {
+    return JSON.stringify(data);
+  }
+
+  protected parse(row: any) {
+    return JSON.parse(row.data);
+  }
+
+  protected dump(entity: Entity) {
+    const data = {};
+    const raw = entity;
+    for (const field of this.columns) {
+      const fn = this.metadata.get(field.fieldName);
+      if (fn) {
+        data[field.fieldName] = fn(raw);
+      } else if (field.fieldName == 'data') {
+        data['data'] = this.stringify(raw);
+      } else {
+        data[field.fieldName] = raw[field.fieldName] ?? null;
+      }
+    }
+    return data;
+  }
+}

src/core/storage/sql/schemas.ts

@@ -0,0 +1,54 @@
+import { Field, Index, Schema } from '@waha/core/storage/Schema';
+import { Migration } from '@waha/core/storage/sql/SqlKVRepository';
+
+/**
+ * Session Config
+ */
+export const SQLSessionConfigSchema = new Schema(
+  'session_config',
+  [new Field('id', 'TEXT'), new Field('data', 'TEXT')],
+  [new Index('session_config_id_index', ['id'])],
+);
+
+export const SQLSessionConfigMigrations: Migration[] = [
+  'CREATE TABLE IF NOT EXISTS session_config (id TEXT PRIMARY KEY, data TEXT)',
+  'CREATE UNIQUE INDEX IF NOT EXISTS session_config_id_index ON session_config (id)',
+];
+
+/**
+ * Me
+ */
+export const SQLMeSchema = new Schema(
+  'me',
+  [new Field('id', 'TEXT'), new Field('data', 'TEXT')],
+  [new Index('me_id_index', ['id'])],
+);
+
+export const SQLMeMigrations: Migration[] = [
+  'CREATE TABLE IF NOT EXISTS me (id TEXT PRIMARY KEY, data TEXT)',
+  'CREATE UNIQUE INDEX IF NOT EXISTS me_id_index ON me (id)',
+];
+
+/**
+ * Worker
+ */
+export const SQLSessionWorkerSchema = new Schema(
+  'session_worker',
+  [
+    new Field('id', 'TEXT'),
+    new Field('worker', 'TEXT'),
+    new Field('data', 'TEXT'),
+  ],
+  [
+    new Index('session_worker_id_idx', ['id']),
+    new Index('session_worker_worker_idx', ['worker']),
+  ],
+);
+
+export const SQLSessionWorkerMigrations: Migration[] = [
+  'CREATE TABLE IF NOT EXISTS session_worker (id TEXT, worker TEXT, data TEXT)',
+  // Session can have only one record
+  'CREATE UNIQUE INDEX IF NOT EXISTS session_worker_id_idx ON session_worker (id)',
+  // Worker can have multiple records
+  'CREATE INDEX IF NOT EXISTS session_worker_worker_idx ON session_worker (worker)',
+];

src/core/storage/sqlite3/Sqlite3Engine.ts

@@ -0,0 +1,38 @@
+import { ISQLEngine } from '@waha/core/storage/sql/ISQLEngine';
+import { Database } from 'better-sqlite3';
+import { Knex } from 'knex';
+
+export class Sqlite3Engine implements ISQLEngine {
+  constructor(protected db: Database) {}
+
+  async all(query: Knex.QueryBuilder): Promise<any[]> {
+    const sql = query.toSQL().sql;
+    const bind = query.toSQL().bindings;
+    return this.db.prepare(sql).all(bind);
+  }
+
+  async get(query: Knex.QueryBuilder): Promise<any | null> {
+    const sql = query.toSQL().sql;
+    const bind = query.toSQL().bindings;
+    const row: any = this.db.prepare(sql).get(bind);
+    if (!row) {
+      return null;
+    }
+    return row;
+  }
+
+  async run(query: Knex.QueryBuilder): Promise<void> {
+    const sql = query.toSQL().sql;
+    const bind = query.toSQL().bindings;
+    this.db.prepare(sql).run(bind);
+    return;
+  }
+
+  async raw(sql: string, bindings: any[]) {
+    this.db.prepare(sql).run(bindings);
+  }
+
+  async exec(sql): Promise<void> {
+    this.db.exec(sql);
+  }
+}

src/core/storage/sqlite3/Sqlite3JsonQuery.ts

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