[core] Use waha docker image

fix #741

.dockerignore

@@ -1,5 +1,6 @@
 Dockerfile
 src/core/engines/gows/grpc
+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

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

.gitignore

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

.pre-commit-config.yaml

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

Dockerfile

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

Makefile

@@ -35,7 +35,7 @@ for-swagger:
 	WHATSAPP_SWAGGER_CONFIG_ADVANCED=true . ${NVM_DIR}/nvm.sh && nvm exec yarn start
 
 up-noweb:
-	. ${NVM_DIR}/nvm.sh && nvm exec yarn up @adiwajshing/baileys@github:devlikeapro/Baileys#fork-master-channels-678
+	. ${NVM_DIR}/nvm.sh && nvm exec yarn up @adiwajshing/baileys@github:devlikeapro/Baileys#fork-master-channels-6712
 
 up-noweb-libsignal:
 	. ${NVM_DIR}/nvm.sh && nvm exec yarn up libsignal@github:devlikeapro/libsignal-node#fork-master
@@ -47,17 +47,14 @@ start-proxy:
 	docker run --rm -d --name squid-container -e TZ=UTC -p 3128:3128 ubuntu/squid:5.2-22.04_beta
 
 proto-gows:
-	rm -rf src/core/engines/gows/grpc
-	mkdir -p src/core/engines/gows/grpc
-	protoc \
-	--plugin=protoc-gen-ts=node_modules/.bin/protoc-gen-ts \
-	--plugin=protoc-gen-grpc=node_modules/.bin/grpc_tools_node_protoc_plugin \
-	--js_out=import_style=commonjs,binary:src/core/engines/gows/grpc \
-	--grpc_out=grpc_js:src/core/engines/gows/grpc \
-	--ts_out=grpc_js:src/core/engines/gows/grpc \
-	-I ../gows/proto ../gows/proto/gows.proto
+	node scripts/gows-proto.js build --dir ../gows/proto
 
 gows:
 	cd ../gows && \
 	export PATH=${HOME}/go/bin:${PATH} && \
-	make all
+	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=1000"
+
+# 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: {}

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",
@@ -68,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",
@@ -119,7 +123,8 @@
     "ts-loader": "^6.2.1",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.1.0",
-    "typescript": "^4.8.4"
+    "typescript": "^4.8.4",
+    "yargs": "^17.7.2"
   },
   "jest": {
     "moduleFileExtensions": [

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/v.${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/config.service.ts

@@ -134,6 +134,13 @@ export class WhatsappConfigService {
     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);
   }

src/core/SwaggerConfiguratorCore.ts

@@ -60,10 +60,7 @@ export class SwaggerConfiguratorCore {
       .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',

src/core/abc/session.abc.ts

@@ -242,12 +242,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',
@@ -257,13 +258,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',
@@ -273,7 +274,7 @@ export abstract class WhatsappSession {
       '--ignore-certificate-errors',
       '--ignore-ssl-errors',
       // https://github.com/devlikeapro/waha/issues/725
-      // '--in-process-gpu', // https://superuser.com/questions/654565/how-to-run-google-chrome-in-a-single-process
+      // '--in-process-gpu', // COMMENTED to test WEBJS stability
       '--metrics-recording-only',
       '--mute-audio',
       '--no-default-browser-check',
@@ -282,7 +283,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',
@@ -538,8 +539,8 @@ export abstract class WhatsappSession {
   protected async refreshProfilePicture(id: string) {
     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);
+      this.logger.warn('Error fetching profile picture');
+      this.logger.warn(err, err.stack);
       return null;
     });
     this.profilePictures.set(id, url);

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;
@@ -96,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

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

src/core/engines/const.ts

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

src/core/engines/gows/GowsSubprocess.ts

@@ -20,7 +20,9 @@ export class GowsSubprocess {
     this.logger.info('Starting GOWS subprocess...');
     this.logger.debug(`GOWS path '${this.path}', socket: '${this.socket}'...`);
 
-    this.child = spawn(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
@@ -76,7 +78,7 @@ export class GowsSubprocess {
 
   async stop() {
     this.logger.info('Stopping GOWS subprocess...');
-    this.child?.kill();
+    this.child?.kill('SIGTERM');
     this.logger.info('GOWS subprocess stopped');
   }
 

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/session.gows.core.ts

@@ -1,8 +1,17 @@
-import { isJidGroup, jidNormalizedUser } from '@adiwajshing/baileys';
+import {
+  getUrlFromDirectPath,
+  isJidGroup,
+  isJidStatusBroadcast,
+  jidNormalizedUser,
+} from '@adiwajshing/baileys';
 import * as grpc from '@grpc/grpc-js';
 import { connectivityState } from '@grpc/grpc-js';
 import { UnprocessableEntityException } from '@nestjs/common';
-import { WhatsappSession } from '@waha/core/abc/session.abc';
+import {
+  getChannelInviteLink,
+  WhatsappSession,
+} from '@waha/core/abc/session.abc';
+import { Jid } from '@waha/core/engines/const';
 import { EventsFromObservable } from '@waha/core/engines/gows/EventsFromObservable';
 import { GowsEventStreamObservable } from '@waha/core/engines/gows/GowsEventStreamObservable';
 import { messages } from '@waha/core/engines/gows/grpc/gows';
@@ -12,9 +21,18 @@ import {
   toCusFormat,
   toJID,
 } from '@waha/core/engines/noweb/session.noweb.core';
-import { AvailableInPlusVersion } from '@waha/core/exceptions';
+import {
+  AvailableInPlusVersion,
+  NotImplementedByEngineError,
+} from '@waha/core/exceptions';
 import { IMediaEngineProcessor } from '@waha/core/media/IMediaEngineProcessor';
 import { QR } from '@waha/core/QR';
+import {
+  Channel,
+  ChannelRole,
+  CreateChannelRequest,
+  ListChannelsQuery,
+} from '@waha/structures/channels.dto';
 import {
   ChatRequest,
   CheckNumberStatusQuery,
@@ -27,6 +45,7 @@ import {
   MessageTextRequest,
   MessageVoiceRequest,
   SendSeenRequest,
+  WANumberExistResult,
 } from '@waha/structures/chatting.dto';
 import {
   ACK_UNKNOWN,
@@ -41,6 +60,7 @@ import {
 } from '@waha/structures/presence.dto';
 import { WAMessage, WAMessageReaction } from '@waha/structures/responses.dto';
 import { MeInfo, ProxyConfig } from '@waha/structures/sessions.dto';
+import { StatusRequest, TextStatus } from '@waha/structures/status.dto';
 import { EnginePayload, WAMessageAckBody } from '@waha/structures/webhooks.dto';
 import { sleep, waitUntil } from '@waha/utils/promiseTimeout';
 import { onlyEvent } from '@waha/utils/reactive/ops/onlyEvent';
@@ -61,11 +81,27 @@ import { promisify } from 'util';
 
 import * as gows from './types';
 import MessageServiceClient = messages.MessageServiceClient;
+import {
+  optional,
+  parseJson,
+  parseJsonList,
+  statusToAck,
+} from '@waha/core/engines/gows/helpers';
+import {
+  ChatSortField,
+  ChatSummary,
+  GetChatMessageQuery,
+  GetChatMessagesFilter,
+  GetChatMessagesQuery,
+} from '@waha/structures/chats.dto';
+import { ContactQuery } from '@waha/structures/contacts.dto';
+import { PaginationParams, SortOrder } from '@waha/structures/pagination.dto';
 
 enum WhatsMeowEvent {
   CONNECTED = 'gows.ConnectedEventData',
   DISCONNECTED = 'events.Disconnected',
   KEEP_ALIVE_TIMEOUT = 'events.KeepAliveTimeout',
+  KEEP_ALIVE_RESTORED = 'events.KeepAliveRestored',
   QR_CHANNEL_ITEM = 'whatsmeow.QRChannelItem',
   MESSAGE = 'events.Message',
   RECEIPT = 'events.Receipt',
@@ -142,6 +178,7 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
       this.logger.error('Failed to start the client');
       this.logger.error(err, err.stack);
       this.status = WAHASessionStatus.FAILED;
+      throw err;
     }
   }
 
@@ -194,6 +231,11 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
         this.status = WAHASessionStatus.STARTING;
       }
     });
+    events.on(WhatsMeowEvent.KEEP_ALIVE_RESTORED, () => {
+      if (this.status != WAHASessionStatus.WORKING) {
+        this.status = WAHASessionStatus.WORKING;
+      }
+    });
     events.on(WhatsMeowEvent.QR_CHANNEL_ITEM, async (data) => {
       if (!data.Event) {
         return;
@@ -326,6 +368,7 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     this.events?.stop();
     this.stopEvents();
     this.client?.close();
+    this.mediaManager.close();
   }
 
   public async requestCode(phoneNumber: string, method: string, params?: any) {
@@ -400,11 +443,38 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     return this.messageResponse(jid, data);
   }
 
+  protected checkStatusRequest(request: StatusRequest) {
+    if (request.contacts && request.contacts?.length > 0) {
+      const msg =
+        "GOWS doesn't accept 'contacts'. Remove the field to send status to all contacts.";
+      throw new UnprocessableEntityException(msg);
+    }
+  }
+
+  public async sendTextStatus(status: TextStatus) {
+    this.checkStatusRequest(status);
+
+    const message = new messages.MessageRequest({
+      jid: Jid.BROADCAST,
+      text: status.text,
+      session: this.session,
+      backgroundColor: new messages.OptionalString({
+        value: status.backgroundColor,
+      }),
+      font: new messages.OptionalUInt32({
+        value: status.font,
+      }),
+    });
+    const response = await promisify(this.client.SendMessage)(message);
+    const data = response.toObject();
+    return this.messageResponse(Jid.BROADCAST, data);
+  }
+
   protected messageResponse(jid, data) {
     const id = buildMessageId({
       ID: data.id,
       IsFromMe: true,
-      IsGroup: isJidGroup(jid),
+      IsGroup: isJidGroup(jid) || isJidStatusBroadcast(jid),
       Chat: jid,
       Sender: this.me.id,
     });
@@ -414,8 +484,20 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     };
   }
 
-  checkNumberStatus(request: CheckNumberStatusQuery) {
-    throw new Error('Method not implemented.');
+  async checkNumberStatus(
+    request: CheckNumberStatusQuery,
+  ): Promise<WANumberExistResult> {
+    const req = new messages.CheckPhonesRequest({
+      session: this.session,
+      phones: [request.phone],
+    });
+    const response = await promisify(this.client.CheckPhones)(req);
+    const data = response.toObject();
+    const info = data.infos[0];
+    return {
+      numberExists: info.registered,
+      chatId: toCusFormat(info.jid),
+    };
   }
 
   sendLocation(request: MessageLocationRequest) {
@@ -567,7 +649,7 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
       return {
         participant: toCusFormat(data.From),
         lastKnownPresence: lastKnownPresence,
-        lastSeen: parseTimestamp(data.LastSeen),
+        lastSeen: parseTimestampToSeconds(data.LastSeen),
       };
     }
 
@@ -604,6 +686,293 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     };
   }
 
+  /**
+   * Channels methods
+   */
+  protected toChannel(newsletter: messages.Newsletter): Channel {
+    const role: ChannelRole =
+      (newsletter.role?.toUpperCase() as ChannelRole) || ChannelRole.GUEST;
+    let picture = newsletter.picture;
+    if (picture.startsWith('/')) {
+      picture = getUrlFromDirectPath(picture);
+    }
+    let preview = newsletter.preview;
+    if (preview.startsWith('/')) {
+      preview = getUrlFromDirectPath(preview);
+    }
+    return {
+      id: newsletter.id,
+      name: newsletter.name,
+      description: newsletter.description,
+      invite: getChannelInviteLink(newsletter.invite),
+      picture: picture,
+      preview: preview,
+      verified: newsletter.verified,
+      role: role,
+    };
+  }
+
+  public async channelsList(query: ListChannelsQuery): Promise<Channel[]> {
+    const request = new messages.NewsletterListRequest({
+      session: this.session,
+    });
+    const response = await promisify(this.client.GetSubscribedNewsletters)(
+      request,
+    );
+    const data = response.toObject();
+    const newsletters = data.newsletters;
+    let channels: Channel[] = newsletters.map(this.toChannel.bind(this));
+    if (query.role) {
+      // @ts-ignore
+      channels = channels.filter((channel) => channel.role === query.role);
+    }
+    return channels;
+  }
+
+  public async channelsCreateChannel(
+    request: CreateChannelRequest,
+  ): Promise<Channel> {
+    const req = new messages.CreateNewsletterRequest({
+      session: this.session,
+      name: request.name,
+      description: request.description,
+    });
+    const response = await promisify(this.client.CreateNewsletter)(req);
+    const newsletter = response.toObject() as messages.Newsletter;
+    return this.toChannel(newsletter);
+  }
+
+  public async channelsGetChannel(id: string): Promise<Channel> {
+    return await this.channelsGetChannelByInviteCode(id);
+  }
+
+  public async channelsGetChannelByInviteCode(
+    inviteCode: string,
+  ): Promise<Channel> {
+    const request = new messages.NewsletterInfoRequest({
+      session: this.session,
+      id: inviteCode,
+    });
+    const response = await promisify(this.client.GetNewsletterInfo)(request);
+    const newsletter = response.toObject() as messages.Newsletter;
+    return this.toChannel(newsletter);
+  }
+
+  public channelsFollowChannel(id: string): Promise<any> {
+    return this.channelsToggleFollow(id, true);
+  }
+
+  public channelsUnfollowChannel(id: string): Promise<any> {
+    return this.channelsToggleFollow(id, false);
+  }
+
+  protected async channelsToggleFollow(id: string, follow: boolean) {
+    const request = new messages.NewsletterToggleFollowRequest({
+      session: this.session,
+      jid: id,
+      follow: follow,
+    });
+    const response = await promisify(this.client.NewsletterToggleFollow)(
+      request,
+    );
+    return response.toObject();
+  }
+
+  public channelsMuteChannel(id: string): Promise<void> {
+    return this.channelsToggleMute(id, true);
+  }
+
+  public channelsUnmuteChannel(id: string): Promise<void> {
+    return this.channelsToggleMute(id, false);
+  }
+
+  protected async channelsToggleMute(id: string, mute: boolean): Promise<any> {
+    const request = new messages.NewsletterToggleMuteRequest({
+      session: this.session,
+      jid: id,
+      mute: mute,
+    });
+    const response = await promisify(this.client.NewsletterToggleMute)(request);
+    return response.toObject();
+  }
+
+  /**
+   * Contacts methods
+   */
+
+  protected toWAContact(contact) {
+    return {
+      id: toCusFormat(contact.Jid),
+      name: contact.Name,
+      pushname: contact.PushName,
+    };
+  }
+
+  public async getContact(query: ContactQuery) {
+    const jid = toJID(query.contactId);
+    const request = new messages.EntityByIdRequest({
+      session: this.session,
+      id: jid,
+    });
+    const response = await promisify(this.client.GetContact)(request);
+    const data = parseJson(response);
+    return this.toWAContact(data);
+  }
+
+  public async getContacts(pagination: PaginationParams) {
+    const request = new messages.GetContactsRequest({
+      session: this.session,
+      pagination: new messages.Pagination({
+        limit: pagination.limit,
+        offset: pagination.offset,
+      }),
+      sortBy: new messages.SortBy({
+        field: pagination.sortBy || 'id',
+        order:
+          pagination.sortOrder === SortOrder.DESC
+            ? messages.SortBy.Order.DESC
+            : messages.SortBy.Order.ASC,
+      }),
+    });
+    const response = await promisify(this.client.GetContacts)(request);
+    const data = parseJsonList(response);
+    return data.map(this.toWAContact.bind(this));
+  }
+
+  /**
+   * Chats methods
+   */
+  public async getChatsOverview(
+    pagination: PaginationParams,
+  ): Promise<ChatSummary[]> {
+    if (!pagination.sortBy) {
+      pagination.sortBy = 'timestamp';
+    }
+    if (!pagination.sortOrder) {
+      pagination.sortOrder = SortOrder.DESC;
+    }
+    const chats = await this.getChats(pagination);
+
+    const promises = [];
+    for (const chat of chats) {
+      promises.push(this.fetchChatSummary(chat));
+    }
+    const result = await Promise.all(promises);
+    return result;
+  }
+
+  protected async fetchChatSummary(chat): Promise<ChatSummary> {
+    const id = toCusFormat(chat.id);
+    const name = chat.name;
+    const picture = await this.getContactProfilePicture(chat.id, false);
+    const messages = await this.getChatMessages(
+      chat.id,
+      { limit: 1, offset: 0, downloadMedia: false },
+      {},
+    );
+    const message = messages.length > 0 ? messages[0] : null;
+    return {
+      id: id,
+      name: name || null,
+      picture: picture,
+      lastMessage: message,
+      _chat: chat,
+    };
+  }
+
+  protected toWAChat(chat) {
+    return {
+      id: toCusFormat(chat.Jid),
+      name: chat.Name,
+      conversationTimestamp: parseTimestampToSeconds(
+        chat.ConversationTimestamp,
+      ),
+    };
+  }
+
+  public async getChats(pagination: PaginationParams) {
+    if (pagination.sortBy === ChatSortField.CONVERSATION_TIMESTAMP) {
+      pagination.sortBy = 'timestamp';
+    }
+    const request = new messages.GetChatsRequest({
+      session: this.session,
+      pagination: new messages.Pagination({
+        limit: pagination.limit,
+        offset: pagination.offset,
+      }),
+      sortBy: new messages.SortBy({
+        field: pagination.sortBy || 'id',
+        order:
+          pagination.sortOrder === SortOrder.DESC
+            ? messages.SortBy.Order.DESC
+            : messages.SortBy.Order.ASC,
+      }),
+    });
+    const response = await promisify(this.client.GetChats)(request);
+    const data = parseJsonList(response);
+    return data.map(this.toWAChat.bind(this));
+  }
+
+  public async getChatMessages(
+    chatId: string,
+    query: GetChatMessagesQuery,
+    filter: GetChatMessagesFilter,
+  ) {
+    const downloadMedia = query.downloadMedia;
+    let jid: messages.OptionalString;
+    if (chatId === 'all') {
+      jid = null;
+    } else {
+      jid = new messages.OptionalString({
+        value: toJID(this.ensureSuffix(chatId)),
+      });
+    }
+
+    const request = new messages.GetMessagesRequest({
+      session: this.session,
+      filters: new messages.MessageFilters({
+        jid: jid,
+        timestampGte: optional(
+          filter['filter.timestamp.gte'],
+          messages.OptionalUInt64,
+        ),
+        timestampLte: optional(
+          filter['filter.timestamp.lte'],
+          messages.OptionalUInt64,
+        ),
+        fromMe: optional(filter['filter.fromMe'], messages.OptionalBool),
+      }),
+      pagination: new messages.Pagination({
+        limit: query.limit,
+        offset: query.offset,
+      }),
+    });
+    const response = await promisify(this.client.GetMessages)(request);
+    const msgs = parseJsonList(response);
+    const promises = [];
+    for (const msg of msgs) {
+      promises.push(this.processIncomingMessage(msg, downloadMedia));
+    }
+    let result = await Promise.all(promises);
+    result = result.filter(Boolean);
+    return result;
+  }
+
+  public async getChatMessage(
+    chatId: string,
+    messageId: string,
+    query: GetChatMessageQuery,
+  ): Promise<null | WAMessage> {
+    const key = parseMessageIdSerialized(messageId, true);
+    const request = new messages.EntityByIdRequest({
+      session: this.session,
+      id: key.id,
+    });
+    const response = await promisify(this.client.GetMessageById)(request);
+    const msg = parseJson(response);
+    return this.processIncomingMessage(msg, query.downloadMedia);
+  }
+
   //
   // END - Methods for API
   //
@@ -640,11 +1009,17 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     const id = buildMessageId(message);
     const body = this.extractBody(message.Message);
     const replyTo = null; // TODO: this.extractReplyTo(message.message);
-    const ack = null; // TODO: Extract
+
+    let ack;
+    if (message.Status) {
+      ack = statusToAck(message.Status);
+    } else {
+      ack = message.Info.IsFromMe ? WAMessageAck.SERVER : WAMessageAck.DEVICE;
+    }
 
     return {
       id: id,
-      timestamp: parseTimestamp(message.Info.Timestamp),
+      timestamp: parseTimestampToSeconds(message.Info.Timestamp),
       from: toCusFormat(fromToParticipant.from),
       fromMe: message.Info.IsFromMe,
       body: body,
@@ -771,7 +1146,7 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
     const messageId = this.buildMessageIdFromKey(reactionMessage.key);
     const reaction: WAMessageReaction = {
       id: id,
-      timestamp: parseTimestamp(message.Info.Timestamp),
+      timestamp: parseTimestampToSeconds(message.Info.Timestamp),
       from: toCusFormat(fromToParticipant.from),
       fromMe: message.Info.IsFromMe,
       to: toCusFormat(fromToParticipant.to),
@@ -804,6 +1179,10 @@ export class GOWSEngineMediaProcessor implements IMediaEngineProcessor<any> {
     return Boolean(extractMediaContent(message.Message));
   }
 
+  getChatId(message: any): string {
+    return toCusFormat(message.Info.Chat);
+  }
+
   getMessageId(message: any): string {
     return message.Info.ID;
   }
@@ -888,3 +1267,11 @@ function parseTimestamp(timestamp: string): number {
   // "2024-12-25T14:28:42+03:00" => 1234567890
   return new Date(timestamp).getTime();
 }
+
+function parseTimestampToSeconds(timestamp: string): number {
+  const ms = parseTimestamp(timestamp);
+  if (!ms) {
+    return ms;
+  }
+  return Math.floor(ms / 1000);
+}

src/core/engines/gows/types.ts

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

src/core/engines/noweb/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/session.noweb.core.ts

@@ -475,13 +475,17 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
         this.logger.error(e, e.stack);
       });
       this.logger.info('Creds saved');
-      this.authNOWEBStore = null;
     }
     this.status = WAHASessionStatus.STOPPED;
     this.stopEvents();
 
+    this.mediaManager.close();
     await this.end();
     await this.store?.close();
+    this.authNOWEBStore?.close().catch((err) => {
+      this.logger.error('Failed to close NOWEB auth store');
+      this.logger.error(err, err.stack);
+    });
   }
 
   protected async failed() {
@@ -1112,8 +1116,18 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     if (isJidStatusBroadcast(id)) {
       return null;
     }
-    const url = await this.sock.profilePictureUrl(contact, 'image');
-    return url;
+    try {
+      const url = await this.sock.profilePictureUrl(contact, 'image');
+      return url;
+    } catch (err) {
+      if (err.message == 'item-not-found') {
+        return null;
+      }
+      if (err.message == 'not-authorized') {
+        return null;
+      }
+      throw err;
+    }
   }
 
   public async blockContact(request: ContactRequest) {
@@ -1947,6 +1961,10 @@ export class NOWEBEngineMediaProcessor implements IMediaEngineProcessor<any> {
     return message.key.id;
   }
 
+  getChatId(message: any): string {
+    return toCusFormat(message.key.remoteJid);
+  }
+
   getMimetype(message: any): string {
     const content = extractMediaContent(message.message);
     return content.mimetype;

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/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`);
@@ -312,7 +312,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 +343,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 +351,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

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

@@ -32,6 +32,7 @@ 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));
@@ -117,5 +118,8 @@ export const useMultiFileAuthState = async (
     saveCreds: () => {
       return writeData(creds, 'creds.json');
     },
+    close: async () => {
+      return;
+    },
   };
 };

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

@@ -74,7 +74,7 @@ import { SingleDelayedJobRunner } from '@waha/utils/SingleDelayedJobRunner';
 import * as lodash from 'lodash';
 import { fromEvent, merge, mergeMap, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import {
+import WAWebJS, {
   Call,
   Channel as WEBJSChannel,
   Chat,
@@ -161,9 +161,10 @@ 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,
     });
@@ -263,6 +264,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     this.status = WAHASessionStatus.STOPPED;
     this.stopEvents();
     this.startDelayedJob.cancel();
+    this.mediaManager.close();
     await this.end();
   }
 
@@ -1052,7 +1054,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);
@@ -1320,6 +1322,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/manager.core.ts

@@ -1,6 +1,7 @@
 import {
   Injectable,
   NotFoundException,
+  OnModuleInit,
   UnprocessableEntityException,
 } from '@nestjs/common';
 import { EngineBootstrap } from '@waha/core/abc/EngineBootstrap';
@@ -57,7 +58,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)
@@ -119,11 +120,10 @@ export class SessionManagerCore extends SessionManager {
   }
 
   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();
   }
 
@@ -133,7 +133,8 @@ export class SessionManagerCore extends SessionManager {
   }
 
   private async clearStorage() {
-    const storage = this.mediaStorageFactory.build(
+    const storage = await this.mediaStorageFactory.build(
+      'all',
       this.log.logger.child({ name: 'Storage' }),
     );
     await storage.purge();
@@ -169,7 +170,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();
@@ -389,4 +391,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

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

@@ -30,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))) {
@@ -48,7 +48,7 @@ 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 });
@@ -62,12 +62,12 @@ export class LocalSessionConfigRepository extends ISessionConfigRepository {
     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,
@@ -76,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}`;
+  }
+}

src/core/storage/sqlite3/Sqlite3KVRepository.ts

@@ -1,177 +1,21 @@
-import { PaginationParams } from '@waha/structures/pagination.dto';
-import { KnexPaginator } from '@waha/utils/Paginator';
+import { SqlKVRepository } from '@waha/core/storage/sql/SqlKVRepository';
+import { Sqlite3Engine } from '@waha/core/storage/sqlite3/Sqlite3Engine';
+import { Sqlite3JsonQuery } from '@waha/core/storage/sqlite3/Sqlite3JsonQuery';
 import { Database } from 'better-sqlite3';
-import Knex, { QueryBuilder } from 'knex';
-
-import { Field, Schema } from './Schema';
+import Knex from 'knex';
 
 /**
  * Key value repository with extra metadata
  */
-export class Sqlite3KVRepository<Entity> {
-  private UPSERT_BATCH_SIZE = 100;
+export class Sqlite3KVRepository<Entity> extends SqlKVRepository<Entity> {
   protected db: Database;
+  protected jsonQuery = new Sqlite3JsonQuery();
 
-  private readonly metadata: Map<string, (entity: Entity) => any>;
-  protected readonly table: string;
-  private readonly columns: Field[];
-  private knex: Knex.Knex;
-
-  protected Paginator = KnexPaginator;
-
-  constructor(
-    db: Database,
-    schema: Schema,
-    metadata: Map<string, (entity: Entity) => any> | null = null,
-  ) {
-    this.db = db;
-    this.columns = schema.columns;
-    this.table = schema.name;
-    this.metadata = metadata || new Map();
-
+  constructor(db: Database) {
     // sqlite does not support inserting default values. Set the `useNullAsDefault` flag to hide this warning. (see docs https://knexjs.org/guide/query-builder.html#insert).
-    this.knex = Knex({ client: 'better-sqlite3', useNullAsDefault: true });
-  }
-
-  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));
-  }
-
-  protected getAllBy(filters: any) {
-    const query = this.select().where(filters);
-    return this.all(query);
-  }
-
-  protected async getBy(filters: any) {
-    const query = this.select().where(filters).limit(1);
-    return this.get(query);
-  }
-
-  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];
-      }
-    }
-    return data;
-  }
-
-  save(entity: Entity) {
-    return this.upsertOne(entity);
-  }
-
-  async getById(id: string): Promise<Entity | null> {
-    return this.getBy({ id: id });
-  }
-
-  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 keys = this.columns.map((c) => c.fieldName);
-    const values = data.map((d) => Object.values(d)).flat();
-    try {
-      this.db
-        .prepare(
-          `INSERT INTO ${this.table} (${keys.join(', ')})
-           VALUES ${data
-             .map(() => `(${keys.map(() => '?').join(', ')})`)
-             .join(', ')}
-           ON CONFLICT(id) DO UPDATE
-               SET ${keys.map((key) => `${key} = excluded.${key}`).join(', ')}`,
-        )
-        .run(values);
-    } catch (err) {
-      console.error(`Error upserting data: ${err}, values: ${values}`);
-      throw err;
-    }
-  }
-
-  protected async deleteBy(filters: any) {
-    const query = this.delete().where(filters);
-    await this.run(query);
-  }
-
-  async deleteAll() {
-    const query = this.delete();
-    await this.run(query);
-  }
-
-  async deleteById(id: string) {
-    await this.deleteBy({ id: id });
-  }
-
-  /**
-   * SQL helpers
-   */
-
-  protected select() {
-    return this.knex.select().from(this.table);
-  }
-
-  protected delete() {
-    return this.knex.delete().from(this.table);
-  }
-
-  protected async all(query: any) {
-    const sql = query.toSQL().sql;
-    const bind = query.toSQL().bindings;
-    const rows: any[] = this.db.prepare(sql).all(bind);
-    return rows.map((row) => this.parse(row));
-  }
-
-  protected async get(query: any) {
-    const sql = query.toSQL().sql;
-    const bind = query.toSQL().bindings;
-    const row: any = this.db.prepare(sql).get(bind);
-    if (!row) {
-      return null;
-    }
-    return this.parse(row);
-  }
-
-  protected async run(query: any) {
-    const sql = query.toSQL().sql;
-    const bind = query.toSQL().bindings;
-    return this.db.prepare(sql).run(bind);
-  }
-
-  protected stringify(data: any): string {
-    return JSON.stringify(data);
-  }
-
-  protected parse(row: any) {
-    return JSON.parse(row.data);
-  }
-
-  protected pagination(query: any, pagination?: PaginationParams) {
-    const paginator = new this.Paginator(pagination);
-    return paginator.apply(query);
+    const knex = Knex({ client: 'better-sqlite3', useNullAsDefault: true });
+    const engine = new Sqlite3Engine(db);
+    super(engine, knex);
+    this.db = db;
   }
 }

src/core/storage/sqlite3/Sqlite3SessionMeRepository.ts

@@ -1,32 +1,30 @@
 import { Sqlite3SchemaValidation } from '@waha/core/engines/noweb/store/sqlite3/Sqlite3SchemaValidation';
 import { ISessionMeRepository } from '@waha/core/storage/ISessionMeRepository';
 import { LocalStore } from '@waha/core/storage/LocalStore';
-import { Field, Index, Schema } from '@waha/core/storage/sqlite3/Schema';
+import { SQLMeMigrations, SQLMeSchema } from '@waha/core/storage/sql/schemas';
 import { Sqlite3KVRepository } from '@waha/core/storage/sqlite3/Sqlite3KVRepository';
 import { MeInfo } from '@waha/structures/sessions.dto';
-import * as path from 'path';
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const Database = require('better-sqlite3');
-
-const SCHEMA = new Schema(
-  'me',
-  [new Field('id', 'TEXT'), new Field('data', 'TEXT')],
-  [new Index('me_id_index', ['id'])],
-);
 
 class SessionMeInfo {
   id: string;
   me?: MeInfo;
 }
 
-export class LocalSessionMeRepository
+export class Sqlite3SessionMeRepository
   extends Sqlite3KVRepository<SessionMeInfo>
   implements ISessionMeRepository
 {
+  get schema() {
+    return SQLMeSchema;
+  }
+
+  get migrations() {
+    return SQLMeMigrations;
+  }
+
   constructor(store: LocalStore) {
     const db = store.getWAHADatabase();
-    super(db, SCHEMA);
+    super(db);
   }
 
   upsertMe(sessionName: string, me: MeInfo): Promise<void> {
@@ -42,19 +40,8 @@ export class LocalSessionMeRepository
     return this.deleteById(sessionName);
   }
 
-  async init(): Promise<void> {
-    this.migrations();
-    this.validateSchema();
-  }
-
-  private migrations() {
-    this.db.exec(
-      'CREATE TABLE IF NOT EXISTS me (id TEXT PRIMARY KEY, data TEXT)',
-    );
-    this.db.exec('CREATE UNIQUE INDEX IF NOT EXISTS me_id_index ON me (id)');
-  }
-
-  private validateSchema() {
-    new Sqlite3SchemaValidation(SCHEMA, this.db).validate();
+  protected async validateSchema() {
+    const validation = new Sqlite3SchemaValidation(this.schema, this.db);
+    validation.validate();
   }
 }

src/core/storage/sqlite3/Sqlite3SessionWorkerRepository.ts

@@ -0,0 +1,51 @@
+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 {
+  SQLSessionWorkerMigrations,
+  SQLSessionWorkerSchema,
+} from '@waha/core/storage/sql/schemas';
+import { Sqlite3KVRepository } from '@waha/core/storage/sqlite3/Sqlite3KVRepository';
+
+export class Sqlite3SessionWorkerRepository
+  extends Sqlite3KVRepository<SessionWorkerInfo>
+  implements ISessionWorkerRepository
+{
+  get schema() {
+    return SQLSessionWorkerSchema;
+  }
+
+  get migrations() {
+    return SQLSessionWorkerMigrations;
+  }
+
+  constructor(store: LocalStore) {
+    const db = store.getWAHADatabase();
+    super(db);
+  }
+
+  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);
+  }
+
+  protected async validateSchema() {
+    const validation = new Sqlite3SchemaValidation(this.schema, this.db);
+    validation.validate();
+  }
+}

src/nestjs/ws/WebsocketHeartbeatJob.ts

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

src/structures/sessions.dto.ts

@@ -166,8 +166,9 @@ export class SessionDetailedInfo extends SessionInfo {
   engine?: any;
 }
 
-const MONGO_DB_NAME_LIMIT = 64;
-const MONGO_DB_NAME_PREFIX_LEN = 'waha_noweb'.length;
+// Affect almost all Databases - Sqlite, MongoDB, Postgres.
+const DB_NAME_LIMIT = 64;
+const DB_NAME_MAX_PREFIX_LEN = 'waha_noweb'.length;
 
 export class SessionCreateRequest {
   @ApiProperty({
@@ -177,7 +178,7 @@ export class SessionCreateRequest {
   })
   @IsString()
   @IsOptional()
-  @MaxLength(MONGO_DB_NAME_LIMIT - MONGO_DB_NAME_PREFIX_LEN)
+  @MaxLength(DB_NAME_LIMIT - DB_NAME_MAX_PREFIX_LEN)
   name: string | undefined;
 
   @ValidateNested()

src/structures/status.dto.ts

@@ -24,7 +24,7 @@ export interface StatusRequest {
 export class TextStatus {
   text: string = 'Have a look! https://github.com/';
   backgroundColor: string = '#38b42f';
-  font: number = 1;
+  font: number = 0;
 
   @ContactsProperty
   contacts?: string[];

src/utils/Paginator.ts

@@ -1,4 +1,5 @@
-import { PaginationParams } from '@waha/structures/pagination.dto';
+import { IJsonQuery } from '@waha/core/storage/sql/IJsonQuery';
+import { PaginationParams, SortOrder } from '@waha/structures/pagination.dto';
 import * as lodash from 'lodash';
 
 export abstract class Paginator {
@@ -42,19 +43,27 @@ export class KnexPaginator extends Paginator {
   indexes: string[] = [];
   dataField: string = 'data';
 
+  constructor(
+    pagination: PaginationParams,
+    protected jsonQuery: IJsonQuery,
+  ) {
+    super(pagination);
+  }
+
   protected sort(query: any) {
     if (!this.pagination?.sortBy) {
       return query;
     }
     const sortBy = this.pagination.sortBy;
-    const direction = this.pagination.sortOrder || 'asc';
+    const direction = this.pagination.sortOrder || SortOrder.ASC;
     if (this.indexes.includes(sortBy)) {
       return query.orderBy(sortBy, direction);
     }
-    // Use data->"$.{field}"
+
     // Make sure to sanitize sortBy to prevent SQL injection
     // sqlite3 doesn't support binding for column names and direction
-    return query.orderByRaw(`${this.dataField}->'$.${sortBy}' ${direction}`);
+    const sql = this.jsonQuery.sortBy(this.dataField, sortBy, direction);
+    return query.orderByRaw(sql);
   }
 
   protected limit(query: any) {

src/version.ts

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

tests/perf/send.js

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

tests/perf/start.js

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

tsconfig.build.json

@@ -1,4 +1,4 @@
 {
   "extends": "./tsconfig.json",
-  "exclude": ["node_modules", "test", "dist", "**/*spec.ts"]
+  "exclude": ["node_modules", "test", "dist", "**/*spec.ts", "scripts/*.js"]
 }

waha.config.json

@@ -0,0 +1,12 @@
+{
+  "waha": {
+    "gows": {
+      "repo": "devlikeapro/gows",
+      "ref": "4b11c1d58018bc4b5028de51aa1bc7da9c2d9103"
+    },
+    "dashboard": {
+      "repo": "devlikeapro/dashboard",
+      "ref": "8c455ec6436398000a26df2a853a1d7dbe8567df"
+    }
+  }
+}

yarn.lock

@@ -5,12 +5,13 @@ __metadata:
   version: 6
   cacheKey: 8
 
-"@adiwajshing/baileys@github:devlikeapro/Baileys#fork-master-channels-678":
-  version: 6.7.8
-  resolution: "@adiwajshing/baileys@https://github.com/devlikeapro/Baileys.git#commit=04738f528321857efe837e3f93c73059878ecdcb"
+"@adiwajshing/baileys@github:devlikeapro/Baileys#fork-master-channels-6712":
+  version: 6.7.12
+  resolution: "@adiwajshing/baileys@https://github.com/devlikeapro/Baileys.git#commit=18359f20a3c34166665ad8b62000347ce0c4592e"
   dependencies:
     "@adiwajshing/keyed-db": ^0.2.4
     "@hapi/boom": ^9.1.3
+    "@whiskeysockets/eslint-config": "github:whiskeysockets/eslint-config"
     async-lock: ^1.4.1
     audio-decode: ^2.1.3
     axios: ^1.6.0
@@ -39,7 +40,7 @@ __metadata:
       optional: true
     sharp:
       optional: true
-  checksum: 0f7b2031eeb25137c65aee3151028f7a8637cfed0763c7426817415ec818ca71f55267b9de88511905bd266f4006301a26206dac9bdb1821d13f1a0cbf075e32
+  checksum: 53c939b9b2d47cb00db73e6cb04633fdd62c69dce6e5d830c3e18e09c90bceb0425c9c59ac58bfdeabce501091ca895132b035877243dfaf90f2297c99eb8fef
   languageName: node
   linkType: hard
 
@@ -1242,6 +1243,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@eslint-community/eslint-utils@npm:^4.4.0":
+  version: 4.4.1
+  resolution: "@eslint-community/eslint-utils@npm:4.4.1"
+  dependencies:
+    eslint-visitor-keys: ^3.4.3
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+  checksum: a7ffc838eb6a9ef594cda348458ccf38f34439ac77dc090fa1c120024bcd4eb911dfd74d5ef44d42063e7949fa7c5123ce714a015c4abb917d4124be1bd32bfe
+  languageName: node
+  linkType: hard
+
+"@eslint-community/regexpp@npm:^4.10.0":
+  version: 4.12.1
+  resolution: "@eslint-community/regexpp@npm:4.12.1"
+  checksum: 0d628680e204bc316d545b4993d3658427ca404ae646ce541fcc65306b8c712c340e5e573e30fb9f85f4855c0c5f6dca9868931f2fcced06417fbe1a0c6cd2d6
+  languageName: node
+  linkType: hard
+
 "@grpc/grpc-js@npm:^1.12.4":
   version: 1.12.4
   resolution: "@grpc/grpc-js@npm:1.12.4"
@@ -3453,6 +3472,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/eslint-plugin@npm:^7.15.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:7.18.0"
+  dependencies:
+    "@eslint-community/regexpp": ^4.10.0
+    "@typescript-eslint/scope-manager": 7.18.0
+    "@typescript-eslint/type-utils": 7.18.0
+    "@typescript-eslint/utils": 7.18.0
+    "@typescript-eslint/visitor-keys": 7.18.0
+    graphemer: ^1.4.0
+    ignore: ^5.3.1
+    natural-compare: ^1.4.0
+    ts-api-utils: ^1.3.0
+  peerDependencies:
+    "@typescript-eslint/parser": ^7.0.0
+    eslint: ^8.56.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: dfcf150628ca2d4ccdfc20b46b0eae075c2f16ef5e70d9d2f0d746acf4c69a09f962b93befee01a529f14bbeb3e817b5aba287d7dd0edc23396bc5ed1f448c3d
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/experimental-utils@npm:3.9.1":
   version: 3.9.1
   resolution: "@typescript-eslint/experimental-utils@npm:3.9.1"
@@ -3486,6 +3528,51 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/parser@npm:^7.15.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/parser@npm:7.18.0"
+  dependencies:
+    "@typescript-eslint/scope-manager": 7.18.0
+    "@typescript-eslint/types": 7.18.0
+    "@typescript-eslint/typescript-estree": 7.18.0
+    "@typescript-eslint/visitor-keys": 7.18.0
+    debug: ^4.3.4
+  peerDependencies:
+    eslint: ^8.56.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 132b56ac3b2d90b588d61d005a70f6af322860974225b60201cbf45abf7304d67b7d8a6f0ade1c188ac4e339884e78d6dcd450417f1481998f9ddd155bab0801
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/scope-manager@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/scope-manager@npm:7.18.0"
+  dependencies:
+    "@typescript-eslint/types": 7.18.0
+    "@typescript-eslint/visitor-keys": 7.18.0
+  checksum: b982c6ac13d8c86bb3b949c6b4e465f3f60557c2ccf4cc229799827d462df56b9e4d3eaed7711d79b875422fc3d71ec1ebcb5195db72134d07c619e3c5506b57
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/type-utils@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/type-utils@npm:7.18.0"
+  dependencies:
+    "@typescript-eslint/typescript-estree": 7.18.0
+    "@typescript-eslint/utils": 7.18.0
+    debug: ^4.3.4
+    ts-api-utils: ^1.3.0
+  peerDependencies:
+    eslint: ^8.56.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 68fd5df5146c1a08cde20d59b4b919acab06a1b06194fe4f7ba1b928674880249890785fbbc97394142f2ef5cff5a7fba9b8a940449e7d5605306505348e38bc
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/types@npm:3.9.1":
   version: 3.9.1
   resolution: "@typescript-eslint/types@npm:3.9.1"
@@ -3493,6 +3580,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/types@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/types@npm:7.18.0"
+  checksum: 7df2750cd146a0acd2d843208d69f153b458e024bbe12aab9e441ad2c56f47de3ddfeb329c4d1ea0079e2577fea4b8c1c1ce15315a8d49044586b04fedfe7a4d
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/typescript-estree@npm:3.9.1":
   version: 3.9.1
   resolution: "@typescript-eslint/typescript-estree@npm:3.9.1"
@@ -3512,6 +3606,39 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/typescript-estree@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/typescript-estree@npm:7.18.0"
+  dependencies:
+    "@typescript-eslint/types": 7.18.0
+    "@typescript-eslint/visitor-keys": 7.18.0
+    debug: ^4.3.4
+    globby: ^11.1.0
+    is-glob: ^4.0.3
+    minimatch: ^9.0.4
+    semver: ^7.6.0
+    ts-api-utils: ^1.3.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: c82d22ec9654973944f779eb4eb94c52f4a6eafaccce2f0231ff7757313f3a0d0256c3252f6dfe6d43f57171d09656478acb49a629a9d0c193fb959bc3f36116
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/utils@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/utils@npm:7.18.0"
+  dependencies:
+    "@eslint-community/eslint-utils": ^4.4.0
+    "@typescript-eslint/scope-manager": 7.18.0
+    "@typescript-eslint/types": 7.18.0
+    "@typescript-eslint/typescript-estree": 7.18.0
+  peerDependencies:
+    eslint: ^8.56.0
+  checksum: 751dbc816dab8454b7dc6b26a56671dbec08e3f4ef94c2661ce1c0fc48fa2d05a64e03efe24cba2c22d03ba943cd3c5c7a5e1b7b03bbb446728aec1c640bd767
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/visitor-keys@npm:3.9.1":
   version: 3.9.1
   resolution: "@typescript-eslint/visitor-keys@npm:3.9.1"
@@ -3521,6 +3648,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/visitor-keys@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/visitor-keys@npm:7.18.0"
+  dependencies:
+    "@typescript-eslint/types": 7.18.0
+    eslint-visitor-keys: ^3.4.3
+  checksum: 6e806a7cdb424c5498ea187a5a11d0fef7e4602a631be413e7d521e5aec1ab46ba00c76cfb18020adaa0a8c9802354a163bfa0deb74baa7d555526c7517bb158
+  languageName: node
+  linkType: hard
+
 "@wasm-audio-decoders/common@npm:9.0.4":
   version: 9.0.4
   resolution: "@wasm-audio-decoders/common@npm:9.0.4"
@@ -3711,6 +3848,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@whiskeysockets/eslint-config@github:whiskeysockets/eslint-config":
+  version: 1.0.0
+  resolution: "@whiskeysockets/eslint-config@https://github.com/whiskeysockets/eslint-config.git#commit=326b55f2842668f4e11f471451c4e39819a0e1bf"
+  dependencies:
+    "@typescript-eslint/eslint-plugin": ^7.15.0
+    "@typescript-eslint/parser": ^7.15.0
+    eslint-plugin-simple-import-sort: ^12.1.1
+  peerDependencies:
+    eslint: "*"
+    typescript: ">=4"
+  checksum: a1ae2c83b0b635cf4898b51a597cd9cabc0df3f5bd4f439a705a1f35877802e8f07836f3298d02b5543d41e07c266b348bd8c8458f83ed225d975e89618b0483
+  languageName: node
+  linkType: hard
+
 "@xtuc/ieee754@npm:^1.2.0":
   version: 1.2.0
   resolution: "@xtuc/ieee754@npm:1.2.0"
@@ -6236,6 +6387,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-plugin-simple-import-sort@npm:^12.1.1":
+  version: 12.1.1
+  resolution: "eslint-plugin-simple-import-sort@npm:12.1.1"
+  peerDependencies:
+    eslint: ">=5.0.0"
+  checksum: 6d73e43ecf6221c1952e0cc820e6867e3e1fe973575e23d438d1d3de52284ceb2a01d31e20a76de11feb158bbba98f113150a676cc5526a8b3a5844d63ca37f8
+  languageName: node
+  linkType: hard
+
 "eslint-scope@npm:5.1.1, eslint-scope@npm:^5.0.0, eslint-scope@npm:^5.1.0":
   version: 5.1.1
   resolution: "eslint-scope@npm:5.1.1"
@@ -6262,6 +6422,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-visitor-keys@npm:^3.4.3":
+  version: 3.4.3
+  resolution: "eslint-visitor-keys@npm:3.4.3"
+  checksum: 36e9ef87fca698b6fd7ca5ca35d7b2b6eeaaf106572e2f7fd31c12d3bfdaccdb587bba6d3621067e5aece31c8c3a348b93922ab8f7b2cbc6aaab5e1d89040c60
+  languageName: node
+  linkType: hard
+
 "eslint@npm:7.7.0":
   version: 7.7.0
   resolution: "eslint@npm:7.7.0"
@@ -7174,7 +7341,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globby@npm:^11.0.1":
+"globby@npm:^11.0.1, globby@npm:^11.1.0":
   version: 11.1.0
   resolution: "globby@npm:11.1.0"
   dependencies:
@@ -7211,6 +7378,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"graphemer@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "graphemer@npm:1.4.0"
+  checksum: bab8f0be9b568857c7bec9fda95a89f87b783546d02951c40c33f84d05bb7da3fd10f863a9beb901463669b6583173a8c8cc6d6b306ea2b9b9d5d3d943c3a673
+  languageName: node
+  linkType: hard
+
 "grpc-tools@npm:^1.12.4":
   version: 1.12.4
   resolution: "grpc-tools@npm:1.12.4"
@@ -7440,6 +7614,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ignore@npm:^5.3.1":
+  version: 5.3.2
+  resolution: "ignore@npm:5.3.2"
+  checksum: 2acfd32a573260ea522ea0bfeff880af426d68f6831f973129e2ba7363f422923cf53aab62f8369cbf4667c7b25b6f8a3761b34ecdb284ea18e87a5262a865be
+  languageName: node
+  linkType: hard
+
 "import-fresh@npm:^3.0.0, import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0":
   version: 3.3.0
   resolution: "import-fresh@npm:3.3.0"
@@ -9927,6 +10108,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pg-cloudflare@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "pg-cloudflare@npm:1.1.1"
+  checksum: 32aac06b5dc4588bbf78801b6267781bc7e13be672009df949d08e9627ba9fdc26924916665d4de99d47f9b0495301930547488dad889d826856976c7b3f3731
+  languageName: node
+  linkType: hard
+
 "pg-connection-string@npm:2.6.2":
   version: 2.6.2
   resolution: "pg-connection-string@npm:2.6.2"
@@ -9934,6 +10122,80 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pg-connection-string@npm:^2.7.0":
+  version: 2.7.0
+  resolution: "pg-connection-string@npm:2.7.0"
+  checksum: 68015a8874b7ca5dad456445e4114af3d2602bac2fdb8069315ecad0ff9660ec93259b9af7186606529ac4f6f72a06831e6f20897a689b16cc7fda7ca0e247fd
+  languageName: node
+  linkType: hard
+
+"pg-int8@npm:1.0.1":
+  version: 1.0.1
+  resolution: "pg-int8@npm:1.0.1"
+  checksum: a1e3a05a69005ddb73e5f324b6b4e689868a447c5fa280b44cd4d04e6916a344ac289e0b8d2695d66e8e89a7fba023affb9e0e94778770ada5df43f003d664c9
+  languageName: node
+  linkType: hard
+
+"pg-pool@npm:^3.7.0":
+  version: 3.7.0
+  resolution: "pg-pool@npm:3.7.0"
+  peerDependencies:
+    pg: ">=8.0"
+  checksum: 66fc1a5ad0e17b72671b9a2cd4c7a856fb08d3cb82da7af0b322590ada23127ac591111e855740405fde4f06c9de888abe9f3aa685ed6038c3232578e1fce8cf
+  languageName: node
+  linkType: hard
+
+"pg-protocol@npm:^1.7.0":
+  version: 1.7.0
+  resolution: "pg-protocol@npm:1.7.0"
+  checksum: 2dba740f6fc4b7f9761682c4c42d183b444292cdc7638b373f5247ec995c8199c369953343479281da3c41611fe34130a80c8668348d49a399c164f802f76be2
+  languageName: node
+  linkType: hard
+
+"pg-types@npm:^2.1.0":
+  version: 2.2.0
+  resolution: "pg-types@npm:2.2.0"
+  dependencies:
+    pg-int8: 1.0.1
+    postgres-array: ~2.0.0
+    postgres-bytea: ~1.0.0
+    postgres-date: ~1.0.4
+    postgres-interval: ^1.1.0
+  checksum: bf4ec3f594743442857fb3a8dfe5d2478a04c98f96a0a47365014557cbc0b4b0cee01462c79adca863b93befbf88f876299b75b72c665b5fb84a2c94fbd10316
+  languageName: node
+  linkType: hard
+
+"pg@npm:^8.13.1":
+  version: 8.13.1
+  resolution: "pg@npm:8.13.1"
+  dependencies:
+    pg-cloudflare: ^1.1.1
+    pg-connection-string: ^2.7.0
+    pg-pool: ^3.7.0
+    pg-protocol: ^1.7.0
+    pg-types: ^2.1.0
+    pgpass: 1.x
+  peerDependencies:
+    pg-native: ">=3.0.1"
+  dependenciesMeta:
+    pg-cloudflare:
+      optional: true
+  peerDependenciesMeta:
+    pg-native:
+      optional: true
+  checksum: 22cb97fcbee3348d5ee0b195071cc572f9c88eb40cbb61fe6726af68d55d5962121b2d630509bb907703e1c8bdc33de775462029c5399e2a841fa9e6c9da0242
+  languageName: node
+  linkType: hard
+
+"pgpass@npm:1.x":
+  version: 1.0.5
+  resolution: "pgpass@npm:1.0.5"
+  dependencies:
+    split2: ^4.1.0
+  checksum: 947ac096c031eebdf08d989de2e9f6f156b8133d6858c7c2c06c041e1e71dda6f5f3bad3c0ec1e96a09497bbc6ef89e762eefe703b5ef9cb2804392ec52ec400
+  languageName: node
+  linkType: hard
+
 "picocolors@npm:^1.0.0, picocolors@npm:^1.0.1":
   version: 1.0.1
   resolution: "picocolors@npm:1.0.1"
@@ -10097,6 +10359,36 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postgres-array@npm:~2.0.0":
+  version: 2.0.0
+  resolution: "postgres-array@npm:2.0.0"
+  checksum: 0e1e659888147c5de579d229a2d95c0d83ebdbffc2b9396d890a123557708c3b758a0a97ed305ce7f58edfa961fa9f0bbcd1ea9f08b6e5df73322e683883c464
+  languageName: node
+  linkType: hard
+
+"postgres-bytea@npm:~1.0.0":
+  version: 1.0.0
+  resolution: "postgres-bytea@npm:1.0.0"
+  checksum: d844ae4ca7a941b70e45cac1261a73ee8ed39d72d3d74ab1d645248185a1b7f0ac91a3c63d6159441020f4e1f7fe64689ac56536a307b31cef361e5187335090
+  languageName: node
+  linkType: hard
+
+"postgres-date@npm:~1.0.4":
+  version: 1.0.7
+  resolution: "postgres-date@npm:1.0.7"
+  checksum: 5745001d47e51cd767e46bcb1710649cd705d91a24d42fa661c454b6dcbb7353c066a5047983c90a626cd3bbfea9e626cc6fa84a35ec57e5bbb28b49f78e13ed
+  languageName: node
+  linkType: hard
+
+"postgres-interval@npm:^1.1.0":
+  version: 1.2.0
+  resolution: "postgres-interval@npm:1.2.0"
+  dependencies:
+    xtend: ^4.0.0
+  checksum: 746b71f93805ae33b03528e429dc624706d1f9b20ee81bf743263efb6a0cd79ae02a642a8a480dbc0f09547b4315ab7df6ce5ec0be77ed700bac42730f5c76b2
+  languageName: node
+  linkType: hard
+
 "prebuild-install@npm:^7.1.1":
   version: 7.1.2
   resolution: "prebuild-install@npm:7.1.2"
@@ -11312,7 +11604,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"split2@npm:^4.0.0":
+"split2@npm:^4.0.0, split2@npm:^4.1.0":
   version: 4.2.0
   resolution: "split2@npm:4.2.0"
   checksum: 05d54102546549fe4d2455900699056580cca006c0275c334611420f854da30ac999230857a85fdd9914dc2109ae50f80fda43d2a445f2aa86eccdc1dfce779d
@@ -11939,6 +12231,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ts-api-utils@npm:^1.3.0":
+  version: 1.4.3
+  resolution: "ts-api-utils@npm:1.4.3"
+  peerDependencies:
+    typescript: ">=4.2.0"
+  checksum: ea00dee382d19066b2a3d8929f1089888b05fec797e32e7a7004938eda1dccf2e77274ee2afcd4166f53fab9b8d7ee90ebb225a3183f9ba8817d636f688a148d
+  languageName: node
+  linkType: hard
+
 "ts-jest@npm:^29.1.3":
   version: 29.1.5
   resolution: "ts-jest@npm:29.1.5"
@@ -12448,7 +12749,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "waha@workspace:."
   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
@@ -12511,6 +12812,7 @@ __metadata:
     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
     prettier: ^1.19.1
@@ -12534,6 +12836,7 @@ __metadata:
     ulid: ^2.3.0
     whatsapp-web.js: "github:devlikeapro/whatsapp-web.js#fork-main-channels"
     write-file-atomic: ^6.0.0
+    yargs: ^17.7.2
   dependenciesMeta:
     bufferutil:
       optional: true
@@ -12628,7 +12931,7 @@ __metadata:
 
 "whatsapp-web.js@github:devlikeapro/whatsapp-web.js#fork-main-channels":
   version: 1.26.0
-  resolution: "whatsapp-web.js@https://github.com/devlikeapro/whatsapp-web.js.git#commit=a8683b0d1a5b8025ac1e7deb3476042ceadb4c07"
+  resolution: "whatsapp-web.js@https://github.com/devlikeapro/whatsapp-web.js.git#commit=5b4dd6dec206905e3aaa7b0461d7c6d4cc3126a8"
   dependencies:
     "@pedroslopez/moduleraid": ^5.0.2
     archiver: ^5.3.1
@@ -12646,7 +12949,7 @@ __metadata:
       optional: true
     unzipper:
       optional: true
-  checksum: 637e53dffdaa80813a5cdd72e519f8f68978e00db17b39b471f39c8e2b98bc85643fe74168255a1dfdc655c71803e3d01b4ca6635bc6159c429dd59232ac07d4
+  checksum: 441e54f450ed9ea5d5756c1ca4fd592e498ad79247d2c6508aee2a5c1b2608a9eb3f6360234f2f0ce563edb187a3d453d41773e745da9bebf657f575b9fa66b4
   languageName: node
   linkType: hard