[core] 2025.10.5

[core] ChatWoot - timestamp for old messages
[core] ChatWoot - hour12
2025-11-04 14:00:34 +07:00 · 2025-11-04 14:00:33 +07:00 · 2025-11-04 14:00:33 +07:00 · 2025-11-04 14:00:32 +07:00 · 2025-11-04 14:00:32 +07:00 · 2025-11-04 14:00:31 +07:00
405 changed files with 77361 additions and 6399 deletions
@@ -1,4 +1,6 @@
 Dockerfile
+docker-compose
+src/core/engines/gows/proto
 .*sessions
 sessions
 files
@@ -1,176 +1,124 @@
-# WAHA Configuration
+# WAHA - WhatsApp HTTP API
+#
 # https://waha.devlike.pro/docs/how-to/config/
 #
-# Common
-#
-# 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
-#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
-# https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-#TZ=Europe/Dublin

-#
-# Security
-#
-# https://waha.devlike.pro/docs/how-to/security/
-#
-WHATSAPP_API_KEY=321
-WAHA_DASHBOARD_USERNAME=waha
-WAHA_DASHBOARD_PASSWORD=waha
-#WHATSAPP_SWAGGER_USERNAME=admin
-#WHATSAPP_SWAGGER_PASSWORD=admin
-
-#
-# Dashboard
-#
-# https://waha.devlike.pro/docs/how-to/waha-dashboard/#configuration
-# Enabled by default
-#WAHA_DASHBOARD_ENABLED=true
-#WAHA_DASHBOARD_USERNAME=waha
-#WAHA_DASHBOARD_PASSWORD=waha
-
-#
-# Logging
-# https://waha.devlike.pro/docs/how-to/observability/#logging
-#
-# Set log format to JSON if you consume logs with log management systems
-WAHA_LOG_FORMAT=JSON
-WAHA_LOG_LEVEL=info
-# WAHA_LOG_FORMAT=PRETTY
-# If you want to see more logs, you can set the log level to debug
-#WAHA_LOG_LEVEL=debug
-# DEBUG=1 # shortcut for setting log level to debug
-
-#
-# Engine
-# https://waha.devlike.pro/docs/how-to/engines/
-#
-# Choose the right engine for your needs (WEBJS by default)
-WHATSAPP_DEFAULT_ENGINE=WEBJS
-# Use NOWEB engine for the fastest performance
-#WHATSAPP_DEFAULT_ENGINE=NOWEB
-
-# Worker
-# WAHA_WORKER_ID=waha1
-
-#
-# Sessions
-# https://waha.devlike.pro/docs/how-to/config/#sessions
-#
-# Do not print QR codes in logs
-WAHA_PRINT_QR=False
-#
-# OR you can specify sessions by name, if you have handful amount of sessions
-#WHATSAPP_START_SESSION=session1,session2
-#
-# Restart all sessions when container starts
-# !!! Do not use it with multiple workers against one database !!!
-# WHATSAPP_RESTART_ALL_SESSIONS=True
-
-#
-# Swagger
-# https://waha.devlike.pro/docs/how-to/swagger/
-#
+# ====================
+# ===== SECURITY =====
+# ====================
+WAHA_API_KEY=00000000000000000000000000000000
+WAHA_DASHBOARD_USERNAME=admin
+WAHA_DASHBOARD_PASSWORD=11111111111111111111111111111111
 WHATSAPP_SWAGGER_USERNAME=admin
-WHATSAPP_SWAGGER_PASSWORD=admin
-# Disable Swagger
-#WHATSAPP_SWAGGER_ENABLED=false
-# Enable advanced Swagger configuration
-#WHATSAPP_SWAGGER_CONFIG_ADVANCED=true
-#
-# Swagger White Label customization
-# https://waha.devlike.pro/docs/how-to/swagger/#white-label
-#WHATSAPP_SWAGGER_TITLE=WAHA API
-#
+WHATSAPP_SWAGGER_PASSWORD=11111111111111111111111111111111

-#
-# Global Proxy Settings
-# https://waha.devlike.pro/docs/how-to/config/#global-proxy-configuration
-#
-# You can also set proxy settings for each session later when starting it
-# https://waha.devlike.pro/docs/how-to/sessions/#configure-proxy
-#WHATSAPP_PROXY_SERVER=proxy.example.com:3128
-#WHATSAPP_PROXY_SERVER_USERNAME=user
-#WHATSAPP_PROXY_SERVER_PASSWORD=pass
-#
+# Disable Dashboard or Swagger
+WAHA_DASHBOARD_ENABLED=True
+WHATSAPP_SWAGGER_ENABLED=True

-#
-# 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
-#
+# ==================
+# ===== COMMON =====
+# ==================
+# WhatsApp engine (WEBJS is default, GOWS or NOWEB for better performance)
+WHATSAPP_DEFAULT_ENGINE=WEBJS

-#
-# Media Configuration
-#
-# https://waha.devlike.pro/docs/how-to/config/#files
-#
-# Disable media (images, videos, files) download for incoming messages
-#WHATSAPP_DOWNLOAD_MEDIA=false
-#
-# Download only specific media types
-#WHATSAPP_FILES_MIMETYPES=image/jpeg,image/png
-#
+# Base URL for the API (used for webhooks, file URLs, etc.)
+WAHA_BASE_URL=http://localhost:3000
+# WAHA_PUBLIC_URL=http://localhost:3000

-# Media - Local Storage
-# https://waha.devlike.pro/docs/how-to/storages/#media---local
-#
-# Set to 0 to keep media files forever
-# https://waha.devlike.pro/docs/how-to/storages/#save-media-files-between-the-container-restarts
+# Server configuration (if you need to customize hostname/port)
+# WHATSAPP_API_SCHEMA=http
+# WHATSAPP_API_PORT=3000
+# WHATSAPP_API_HOSTNAME=localhost
+
+
+
+# ===================
+# ===== LOGGING =====
+# ===================
+# Log format: JSON (for log management systems) or PRETTY (for development)
+WAHA_LOG_FORMAT=JSON
+
+# Log level: info, debug, error, warn
+WAHA_LOG_LEVEL=info
+
+# Don't print QR codes in logs
+WAHA_PRINT_QR=False
+
+# =========================
+# ===== MEDIA STORAGE =====
+# =========================
+# Local storage (default)
 WAHA_MEDIA_STORAGE=LOCAL
 WHATSAPP_FILES_LIFETIME=0
 WHATSAPP_FILES_FOLDER=/app/.media
-# Keep media files for 180 seconds (3 minutes)
-#WHATSAPP_FILES_LIFETIME=180
-#

-# Media - S3 Storage
-# https://waha.devlike.pro/docs/how-to/storages/#media---s3
-#WAHA_MEDIA_STORAGE=S3
-#WAHA_S3_REGION=eu-west-2
-#WAHA_S3_BUCKET=waha
-#WAHA_S3_ACCESS_KEY_ID=minioadmin
-#WAHA_S3_SECRET_ACCESS_KEY=minioadmin
-#WAHA_S3_ENDPOINT=http://minio:9000 # Not required if you're using AWS S3
-#WAHA_S3_FORCE_PATH_STYLE=True # Required for Minio
-#WAHA_S3_PROXY_FILES=True # Required for docker-compose setup
+# Media download settings
+# WHATSAPP_DOWNLOAD_MEDIA=true
+# WHATSAPP_FILES_MIMETYPES=image/jpeg,image/png

-#
-# Global Webhooks
-#
-# https://waha.devlike.pro/docs/how-to/config/#webhooks
-# https://waha.devlike.pro/docs/how-to/webhooks/
-#WHATSAPP_HOOK_URL=https://webhook.site/11111111-1111-1111-1111-11111111
-#WHATSAPP_HOOK_EVENTS=session.status,message,message.reaction
-#
+# S3 storage (uncomment to use)
+# WAHA_MEDIA_STORAGE=S3
+# WAHA_S3_REGION=eu-west-2
+# WAHA_S3_BUCKET=waha
+# WAHA_S3_ACCESS_KEY_ID=minioadmin
+# WAHA_S3_SECRET_ACCESS_KEY=minioadmin
+# WAHA_S3_ENDPOINT=http://minio:9000
+# WAHA_S3_FORCE_PATH_STYLE=True
+# WAHA_S3_PROXY_FILES=True

-#
-# Local Configuration
-#
-# WAHA_LOCAL_STORE_BASE_DIR=/app/sessions
-# Remember to map the volume to the host machine to the right direction in "volumes" field in docker-compose.yml
-# volumes:
-# - './.sessions:/app/sessions'
+# PostgreSQL storage (uncomment to use)
+# WAHA_MEDIA_STORAGE=POSTGRESQL
+# WAHA_MEDIA_POSTGRESQL_URL=postgres://postgres:postgres@postgres:5432/postgres?sslmode=disable

-#
-# MongoDB Configuration
-# https://waha.devlike.pro/docs/how-to/storages/#sessions---mongodb
-#WHATSAPP_SESSIONS_MONGO_URL=mongodb://mongouser:mongopassword@mongodb:27017
-#
+# ===========================
+# ===== SESSION STORAGE =====
+# ===========================
+# PostgreSQL for sessions (uncomment to use)
+# WHATSAPP_SESSIONS_POSTGRESQL_URL=postgres://postgres:postgres@postgres:5432/postgres?sslmode=disable
+
+# MongoDB for sessions (uncomment to use)
+# WHATSAPP_SESSIONS_MONGO_URL=mongodb://mongouser:mongopassword@mongodb:27017
+
+# =================
+# ===== APPS ======
+# =================
+# WAHA_APPS_ENABLED=True
+# REDIS_URL=redis://:redis@redis:6379
+
+# Apps Jobs configuration - *_AGE in seconds
+# WAHA_APPS_JOBS_REMOVE_ON_COMPLETE_AGE=
+# WAHA_APPS_JOBS_REMOVE_ON_COMPLETE_COUNT=
+# WAHA_APPS_JOBS_REMOVE_ON_FAIL_AGE=
+# WAHA_APPS_JOBS_REMOVE_ON_FAIL_COUNT
+
+
+# ==================================
+# ===== ADVANCED CONFIGURATION =====
+# ==================================
+
+# Timezone for screenshots and logs
+# TZ=Europe/Dublin
+
+# Session management
+# WHATSAPP_START_SESSION=session1,session2
+# WHATSAPP_RESTART_ALL_SESSIONS=False
+
+# Webhooks
+# WHATSAPP_HOOK_URL=https://webhook.site/11111111-1111-1111-1111-11111111
+# WHATSAPP_HOOK_CUSTOM_HEADERS=custom_header_key:custom_header_value
+# WHATSAPP_HOOK_EVENTS=session.status,message,message.reaction
+
+# Proxy configuration
+# WHATSAPP_PROXY_SERVER=proxy.example.com:3128
+# WHATSAPP_PROXY_SERVER_USERNAME=user
+# WHATSAPP_PROXY_SERVER_PASSWORD=pass
+
+# HTTPS configuration
+# !DEPRECATED!
+# Setup nginx reverse proxy to handle TLS connection
+# using Let's encrypt or self-issued certificate
+# 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
@@ -0,0 +1,3 @@
+src/core/engines/gows/grpc/*
+src/core/engines/gows/proto/*
+src/core/engines/webjs/_lodash.js
@@ -1,36 +0,0 @@
-module.exports = {
-  parser: '@typescript-eslint/parser',
-  parserOptions: {
-    project: 'tsconfig.json',
-    sourceType: 'module',
-  },
-  plugins: ['@typescript-eslint/eslint-plugin', 'simple-import-sort'],
-  extends: [
-    'plugin:@typescript-eslint/eslint-recommended',
-    'plugin:@typescript-eslint/recommended',
-    'prettier',
-    'prettier/@typescript-eslint',
-  ],
-  root: true,
-  env: {
-    node: true,
-    jest: true,
-  },
-  rules: {
-    'simple-import-sort/imports': 'error',
-    'simple-import-sort/exports': 'error',
-    '@typescript-eslint/interface-name-prefix': 'off',
-    '@typescript-eslint/explicit-function-return-type': 'off',
-    '@typescript-eslint/explicit-module-boundary-types': 'off',
-    '@typescript-eslint/no-inferrable-types': 'off',
-    '@typescript-eslint/no-explicit-any': 'off',
-    '@typescript-eslint/ban-ts-ignore': 'off',
-    '@typescript-eslint/ban-ts-comment': 'off',
-    '@typescript-eslint/no-unused-vars': 'off',
-    'lines-between-class-members': [
-      'error',
-      'always',
-      { exceptAfterSingleLine: true },
-    ],
-  },
-};
@@ -1,9 +1,10 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: '[BUG][WEBJS] - '
+title: '[WEBJS] - '
 labels: bug
 assignees: ''
+type: 'BUG'
 ---

 ### Describe the bug
@@ -1,9 +1,10 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: '[Feature Request]'
+title: ''
 labels: ''
 assignees: ''
+type: 'Feature'
 ---

 **Is your feature request related to a problem? Please describe.** I'm always
@@ -8,7 +8,9 @@ on:
 jobs:
  docker-build:
    runs-on: ${{ matrix.runner }}
-    name: ${{ matrix.platform }} - ${{ matrix.browser }} - ${{ matrix.tag }}
+    name:
+      ${{ matrix.engine }} - ${{ matrix.browser }} - ${{ matrix.platform }} -
+      ${{ matrix.tag }}
    strategy:
      matrix:
        include:
@@ -17,6 +19,7 @@ jobs:
            tag: 'latest'
            platform: 'amd64'
            browser: 'chromium'
+            engine: 'WEBJS'
            goss: 'goss-linux-amd64'

          # Chromium - ARM
@@ -24,6 +27,7 @@ jobs:
            tag: 'arm'
            platform: 'linux/arm64'
            browser: 'chromium'
+            engine: 'WEBJS'
            goss: 'goss-linux-arm'

          # Chrome - x86
@@ -31,6 +35,7 @@ jobs:
            tag: 'chrome'
            platform: 'amd64'
            browser: 'chrome'
+            engine: 'WEBJS'
            goss: 'goss-linux-amd64'

          # Chrome - ARM (Chrome is not available for ARM)
@@ -40,18 +45,36 @@ jobs:
          #  browser: "chrome"
          #  goss: 'goss-linux-arm'

-          # No browser - x86
+          # NOWEB - x86
          - runner: 'buildjet-4vcpu-ubuntu-2204'
            tag: 'noweb'
            platform: 'amd64'
            browser: 'none'
+            engine: 'NOWEB'
            goss: 'goss-linux-amd64'

-          # No browser - ARM
+          # NOWEB - ARM
          - runner: 'buildjet-4vcpu-ubuntu-2204-arm'
            tag: 'noweb-arm'
            platform: 'linux/arm64'
            browser: 'none'
+            engine: 'NOWEB'
+            goss: 'goss-linux-arm'
+
+          # GOWS - x86
+          - runner: 'buildjet-4vcpu-ubuntu-2204'
+            tag: 'gows'
+            platform: 'amd64'
+            browser: 'none'
+            engine: 'GOWS'
+            goss: 'goss-linux-amd64'
+
+          # No browser - ARM
+          - runner: 'buildjet-4vcpu-ubuntu-2204-arm'
+            tag: 'gows-arm'
+            platform: 'linux/arm64'
+            browser: 'none'
+            engine: 'GOWS'
            goss: 'goss-linux-arm'

    steps:
@@ -85,6 +108,7 @@ jobs:
          platforms: ${{ matrix.platform }}
          build-args: |
            USE_BROWSER=${{ matrix.browser }}
+            WHATSAPP_DEFAULT_ENGINE=${{ matrix.engine }}
          push: false
          load: true
          tags: ${{ steps.meta.outputs.tags }}
@@ -102,7 +126,12 @@ jobs:
        working-directory: tests/smoke
        timeout-minutes: 2
        run: |
-          docker run -d --name smoke --rm -p3000:3000 ${{ vars.DOCKER_IMAGE }}:${{ matrix.tag }}
+          docker run -d \
+            --name smoke \
+            --rm -p3000:3000 \
+            -e WAHA_API_KEY=test \
+            ${{ vars.DOCKER_IMAGE }}:${{ matrix.tag }}
+
          sleep 3
          docker logs smoke
          goss validate --retry-timeout 30s --sleep 1s
@@ -116,6 +145,7 @@ jobs:
          platforms: ${{ matrix.platform }}
          build-args: |
            USE_BROWSER=${{ matrix.browser }}
+            WHATSAPP_DEFAULT_ENGINE=${{ matrix.engine }}
          push: ${{ github.ref_type == 'tag' }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
@@ -0,0 +1,126 @@
+name: Dev
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  workflow_dispatch:
+
+jobs:
+  docker-build:
+    if: github.repository == 'devlikeapro/waha-plus'
+    runs-on: ${{ matrix.runner }}
+    name:
+      ${{ matrix.engine }} - ${{ matrix.browser }} - ${{ matrix.platform }} -
+      ${{ matrix.tag }}
+    strategy:
+      matrix:
+        include:
+          - runner: 'buildjet-4vcpu-ubuntu-2204'
+            tag: 'dev'
+            platform: 'amd64'
+            browser: 'chromium'
+            engine: 'WEBJS'
+            goss: 'goss-linux-amd64'
+          - runner: 'buildjet-4vcpu-ubuntu-2204-arm'
+            tag: 'dev-arm'
+            platform: 'linux/arm64'
+            browser: 'chromium'
+            engine: 'WEBJS'
+            goss: 'goss-linux-arm'
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Check recent changes
+        id: recent
+        run: |
+          count=$(git rev-list --after="24 hours ago" --count HEAD || true)
+          if [ "$count" -gt 0 ]; then
+            echo "has_recent=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "has_recent=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: No recent changes summary
+        if: ${{ steps.recent.outputs.has_recent != 'true' }}
+        run:
+          echo "No commits in the last 24 hours; skipping build." >>
+          "$GITHUB_STEP_SUMMARY"
+
+      - name: Set up Docker Buildx
+        if: ${{ steps.recent.outputs.has_recent == 'true' }}
+        uses: docker/setup-buildx-action@v2
+
+      - name: Docker meta
+        if: ${{ steps.recent.outputs.has_recent == 'true' }}
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ vars.DOCKER_IMAGE }}
+          flavor: latest=false
+          tags: |
+            type=raw,value=${{ matrix.tag }}
+
+      - name: Login to image repository
+        if: ${{ steps.recent.outputs.has_recent == 'true' }}
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Build
+        if: ${{ steps.recent.outputs.has_recent == 'true' }}
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: Dockerfile
+          platforms: ${{ matrix.platform }}
+          build-args: |
+            USE_BROWSER=${{ matrix.browser }}
+            WHATSAPP_DEFAULT_ENGINE=${{ matrix.engine }}
+          push: false
+          load: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Install goss
+        if: ${{ steps.recent.outputs.has_recent == 'true' }}
+        env:
+          GOSS_DOWNLOAD: 'https://github.com/goss-org/goss/releases/download'
+          GOSS_VERSION: 'v0.4.8'
+        run: |
+          curl -L https://github.com/goss-org/goss/releases/download/${{ env.GOSS_VERSION }}/${{ matrix.goss }} -o /usr/local/bin/goss
+          chmod +rx /usr/local/bin/goss
+
+      - name: Run smoke tests
+        if: ${{ steps.recent.outputs.has_recent == 'true' }}
+        working-directory: tests/smoke
+        timeout-minutes: 2
+        run: |
+          docker run -d \
+            --name smoke \
+            --rm -p3000:3000 \
+            -e WAHA_API_KEY=test \
+            ${{ vars.DOCKER_IMAGE }}:${{ matrix.tag }}
+
+          sleep 3
+          docker logs smoke
+          goss validate --retry-timeout 30s --sleep 1s
+          docker rm --force smoke
+
+      - name: Push
+        if: ${{ steps.recent.outputs.has_recent == 'true' }}
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: Dockerfile
+          platforms: ${{ matrix.platform }}
+          build-args: |
+            USE_BROWSER=${{ matrix.browser }}
+            WHATSAPP_DEFAULT_ENGINE=${{ matrix.engine }}
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
@@ -0,0 +1,51 @@
+name: 'github-translate'
+on:
+  issues:
+    types: [opened]
+  issue_comment:
+    types: [created]
+  discussion:
+    types: [created]
+  discussion_comment:
+    types: [created]
+  # pull_request_target:
+  #   types: [opened, edited]
+  # pull_request_review_comment:
+  #   types: [created, edited]
+
+jobs:
+  en:
+    if: github.repository == 'devlikeapro/waha'
+    permissions:
+      issues: write
+      discussions: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: devlikeapro/github-translate-action@main
+        env:
+          # GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          IS_MODIFY_TITLE: true
+          CUSTOM_BOT_NOTE: 'English'
+          TARGET_LANGUAGE: 'eng'
+          TRANSLATED_LANGUAGE: 'en'
+#  pt:
+#    permissions:
+#      issues: write
+#      discussions: write
+#      pull-requests: write
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v4
+#      - uses: devlikeapro/github-translate-action@main
+#        env:
+#          # GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        with:
+#          IS_MODIFY_TITLE: false
+#          CUSTOM_BOT_NOTE: 'Portuguese'
+#          TARGET_LANGUAGE: 'por'
+#          TRANSLATED_LANGUAGE: 'pt'
@@ -1,3 +1,4 @@
+src/core/engines/gows/proto
 .env
 *.heapsnapshot
 .yarn
@@ -1 +1 @@
-v22.8
+v22.16
@@ -0,0 +1,15 @@
+{
+  "$schema": "./node_modules/oxlint/configuration_schema.json",
+  "plugins": ["typescript"],
+  "env": {
+    "builtin": true
+  },
+  "rules": {
+    "@typescript-eslint/explicit-function-return-type": "off",
+    "@typescript-eslint/explicit-module-boundary-types": "off",
+    "@typescript-eslint/no-inferrable-types": "off",
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/ban-ts-comment": "off",
+    "no-unused-vars": "off"
+  }
+}
@@ -2,6 +2,8 @@ exclude: |
  (?x)^(
    ^src/dashboard/.*|
    ^src/core/engines/webjs/.*html|
+    ^src/core/engines/gows/grpc/.*|
+    ^src/core/engines/gows/proto/.*|
    ^src/plus/engines/webjs/.*html|
    ^.yarn/.*
  )$
@@ -15,18 +17,12 @@ repos:
        language: python
        stages: [commit-msg]

-  - repo: local
-    hooks:
-      - id: lint
-        stages: [pre-commit]
-        name: lint
+      - id: oxlint
+        name: oxlint
+        entry: npx oxlint --fix --deny-warnings
        language: system
-        entry: bash -c '$HOME/.nvm/nvm-exec npm run lint-cache'
-        pass_filenames: false
-        files: |
-          (?x)^(
-              src/.*|
-          )$
+        pass_filenames: true
+        files: \.(ts|tsx|js|jsx)$

  - repo: https://github.com/pre-commit/mirrors-prettier
    rev: 'v3.1.0'
@@ -37,6 +33,7 @@ repos:
          (?x)^(
              docs/.*|
              README.md|
+              tests/smoke/goss.yaml|
          )$
  - repo: https://github.com/Lucas-C/pre-commit-hooks-nodejs
    rev: v1.1.2
@@ -70,7 +67,11 @@ repos:
        exclude: |
          (?x)^(
              entrypoint.sh|
+              AGENTS.md|
              .pre-commit-config.yaml|
              ^src/core/engines/webjs/session.webjs.core.ts|
              ^src/core/engines/webjs/_lodash.js|
+              ^tests/perf/.*|
+              ^scripts/.*|
+              ^scripts/init-waha.js|
          )$
@@ -0,0 +1,124 @@
+# WAHA Agent Playbook
+
+This guide summarizes how to explore, modify, and validate the WhatsApp HTTP API
+(WAHA) codebase when assisting as an automation or coding agent.
+
+## Product & Variants
+
+- WAHA ships in **Core** and **Plus** editions. Core lives under `src/core` and
+  only supports the default session plus minimal media features. Plus extends
+  core via `src/plus` to add multi-session orchestration, richer media handling,
+  and external storage integrations.
+- Core code must remain free from Plus-only references. A pre-commit hook
+  rejects the word `plus` inside core files; reuse abstractions exposed through
+  `@waha/core/**` instead of importing Plus modules from Core.
+- Commit subjects are validated: changes that touch `src/plus` require a
+  `[PLUS] …` prefix and must not include non-Plus files; everything else must
+  use `[core] …`. Verify against `./.precommit/validate_commit_message.py` if
+  unsure.
+
+## Tech Stack Snapshot
+
+- **Runtime**: Node.js 22.x, Yarn 3.6 (Berry). Always install packages and run
+  scripts with Yarn.
+- **Framework**: NestJS v11 with dependency injection, modular controllers in
+  `src/api`, and Pino-based logging via `nestjs-pino`.
+- **Engines**: WhatsApp engines are abstracted (`WEBJS`, `GOWS`, `NOWEB`). Core
+  uses `SessionManagerCore`; Plus swaps to `SessionManagerPlus` with extra
+  storage backends (Mongo/Postgres/SQLite).
+- **ESM Bridge**: ESM-only dependencies (Baileys) load through
+  `src/vendor/esm.ts`. Add new ESM modules there to ensure they load exactly
+  once.
+- **Utilities**: RxJS streams (`SwitchObservable`, `DefaultMap`) drive webhook
+  event fan-out. Prefer existing helpers in `src/utils` and `src/core/utils`
+  before adding bespoke logic.
+
+## Repository Landmarks
+
+- `src/main.ts`: runtime entry point; dynamically loads the correct AppModule
+  (Core vs Plus) and configures global interceptors/filters.
+- `src/api/**`: REST controllers and WebSocket gateway. Keep handlers thin;
+  delegate to managers/services. HTTP routes follow `/api/{sessionName}/…`;
+  always thread the session name through request DTOs and guards instead of
+  hardcoding `default`.
+- `src/core/**`: shared abstractions (config services, engine bootstrap,
+  storage, session management). Core only allows the `default` session and
+  cleans up storage on boot.
+- `src/plus/**`: multi-session orchestration, advanced media services, and
+  external persistence layers (Mongo, Postgres). Reuse this layer when adding
+  Plus-only capabilities.
+- `src/apps/**`: integrations (e.g., ChatWoot) and application-specific
+  services.
+- `src/structures/**` and `src/utils/**`: DTOs, enums (event names follow
+  `domain.action`), helper utilities. Maintain naming consistency when
+  introducing new events.
+- `tests/**`: Jest-based suites; do not add new tests unless explicitly asked,
+  but keep existing tests working.
+
+## Coding Expectations
+
+- Favor composable, long-lived solutions. If a helper already exists (e.g.,
+  `parseBool`, `DefaultMap`, media factories), extend it instead of reinventing
+  logic. Lodash ships with the project—prefer its utilities over hand-rolled
+  helpers. Import lodash as a namespace (`import * as lodash from 'lodash';`) so
+  helpers like `lodash.camelCase` stay consistent across files. When a new
+  third-party library seems necessary, confirm with the user, especially if the
+  package looks stale.
+- Stick to NestJS patterns: inject dependencies through constructors, expose
+  provider tokens from modules, and keep controllers free from business logic.
+- Logging goes through injected `PinoLogger` or helpers in
+  `src/utils/logging.ts`. `console.log` is blocked by pre-commit.
+- Respect path aliases (`@waha/...`) defined in `tsconfig.json`; keep imports
+  consistent (use absolute aliases, not relative `../../../`).
+- Avoid naming unused variables with a leading underscore; if a parameter is
+  required by a signature, explicitly `void` it instead.
+- For configs, prefer runtime configurability over constants. Environment keys
+  follow `WAHA_*` for global values and `WAHA_SESSION_CONFIG_*` /
+  `session.config.*` for per-session overrides. If both env and config are
+  supported, honor both (`WAHA_WEBJS_CONFIG_*` vs. `session.webjs.config.*`).
+
+## Language & Localization
+
+- Keep identifiers (classes, methods, variables) and code comments in English so
+  the codebase stays consistent for the global team.
+- Route user-visible strings through the existing i18n structure rather than
+  hardcoding text. ChatWoot copy belongs in `src/apps/chatwoot/i18n` with
+  English as the source locale before adding translations.
+
+## ChatWoot Integration Notes
+
+- Avoid introducing synthetic events; map onto existing webhook or engine events
+  whenever plausible. Always use the official ChatWoot API client located in
+  `src/apps/chatwoot/client`.
+- When adding events, align consumer names with webhook/event identifiers (e.g.,
+  `message.any`).
+
+## Workflow Checklist
+
+1. Identify whether work targets Core, Plus, or shared layers. If Plus-only,
+   isolate changes to `src/plus` and ensure the commit prefix matches.
+2. Lean on existing services/managers; extend the appropriate session manager
+   rather than branching logic inline.
+3. After edits run:
+   - `pre-commit run --all-files`
+   - `yarn build`
+   - `yarn test` Use Node 22. Address lint or formatting issues before
+     proceeding.
+4. Do **not** start the application yourself; ask the user to run it if runtime
+   validation is required.
+5. Capture any assumptions or open questions for the user, especially when
+   touching configs, introducing dependencies, or modifying public APIs.
+
+## Additional Tips
+
+- Concurrency-sensitive sections (session start/stop) rely on `async-lock`. When
+  adding async flows, reuse `SessionManager.withLock` or existing retry
+  utilities (`promiseTimeout`, `waitUntil`).
+- Media features centralize through `MediaManager` and `MediaStorageFactory`.
+  When altering media behavior, update both Core and Plus variants where
+  applicable.
+- Keep docs and code ASCII unless a file already uses other characters. When
+  updating documentation, mirror the concise, actionable tone used here.
+
+Following this playbook keeps contributions aligned with WAHA’s structure,
+automation hooks, and release process.
@@ -1,55 +1,105 @@
+ARG NODE_IMAGE_TAG=22.16-bookworm-slim
+ARG GOLANG_IMAGE_TAG=1.23-bookworm
+
 #
 # Build
 #
-ARG NODE_VERSION=22.8-bullseye
-FROM node:${NODE_VERSION} AS build
+FROM node:${NODE_IMAGE_TAG} AS build
 ENV PUPPETEER_SKIP_DOWNLOAD=True

 # npm packages
-WORKDIR /src
+WORKDIR /git
 COPY package.json .
 COPY yarn.lock .
 ENV YARN_CHECKSUM_BEHAVIOR=update
+
+# git
+RUN apt-get update && apt-get install -y git
+
 RUN npm install -g corepack && corepack enable
 RUN yarn set version 3.6.3
 RUN yarn install

 # App
-WORKDIR /src
-ADD . /src
+WORKDIR /git
+ADD . /git
 RUN yarn install
 RUN yarn build && find ./dist -name "*.d.ts" -delete

 #
 # Dashboard
 #
-FROM node:${NODE_VERSION} AS dashboard
+FROM node:${NODE_IMAGE_TAG} AS dashboard

-# Download WAHA Dashboard
-ENV WAHA_DASHBOARD_SHA 45db5b46a944f4320136f2409d8b970483c8bd9d
+# jq to parse json
+RUN apt-get update && apt-get install -y jq && rm -rf /var/lib/apt/lists/*
+
+# wget, unzip
+RUN apt-get update && apt-get install -y wget unzip && rm -rf /var/lib/apt/lists/*
+
+COPY waha.config.json /tmp/waha.config.json
 RUN \
-    wget https://github.com/devlikeapro/dashboard/archive/${WAHA_DASHBOARD_SHA}.zip \
+    WAHA_DASHBOARD_GITHUB_REPO=$(jq -r '.waha.dashboard.repo' /tmp/waha.config.json) && \
+    WAHA_DASHBOARD_SHA=$(jq -r '.waha.dashboard.ref' /tmp/waha.config.json) && \
+    wget https://github.com/${WAHA_DASHBOARD_GITHUB_REPO}/archive/${WAHA_DASHBOARD_SHA}.zip \
    && unzip ${WAHA_DASHBOARD_SHA}.zip -d /tmp/dashboard \
    && mkdir -p /dashboard \
    && mv /tmp/dashboard/dashboard-${WAHA_DASHBOARD_SHA}/* /dashboard/ \
    && rm -rf ${WAHA_DASHBOARD_SHA}.zip \
    && rm -rf /tmp/dashboard/dashboard-${WAHA_DASHBOARD_SHA}

+#
+# GOWS
+#
+FROM golang:${GOLANG_IMAGE_TAG} AS gows
+
+# jq to parse json
+RUN apt-get update && apt-get install -y jq && rm -rf /var/lib/apt/lists/*
+
+# install protoc
+RUN apt-get update && \
+    apt-get install protobuf-compiler -y
+
+# Image processing for thumbnails
+RUN apt-get update  \
+    && apt-get install -y libvips-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY waha.config.json /tmp/waha.config.json
+WORKDIR /go/gows
+RUN \
+    GOWS_GITHUB_REPO=$(jq -r '.waha.gows.repo' /tmp/waha.config.json) && \
+    GOWS_SHA=$(jq -r '.waha.gows.ref' /tmp/waha.config.json) && \
+    ARCH=$(uname -m) && \
+    if [ "$ARCH" = "x86_64" ]; then ARCH="amd64"; \
+    elif [ "$ARCH" = "aarch64" ]; then ARCH="arm64"; \
+    else echo "Unsupported architecture: $ARCH" && exit 1; fi && \
+    mkdir -p /go/gows/bin && \
+    wget -O /go/gows/bin/gows https://github.com/${GOWS_GITHUB_REPO}/releases/download/${GOWS_SHA}/gows-${ARCH} && \
+    chmod +x /go/gows/bin/gows
+
+
 #
 # Final
 #
-FROM node:${NODE_VERSION} AS release
+FROM node:${NODE_IMAGE_TAG} AS release
 ENV PUPPETEER_SKIP_DOWNLOAD=True
 # Quick fix for memory potential memory leaks
 # https://github.com/devlikeapro/waha/issues/347
 ENV NODE_OPTIONS="--max-old-space-size=16384"
 ARG USE_BROWSER=chromium
+ARG WHATSAPP_DEFAULT_ENGINE

 RUN echo "USE_BROWSER=$USE_BROWSER"

 # Install ffmpeg to generate previews for videos
 RUN apt-get update && apt-get install -y ffmpeg --no-install-recommends && rm -rf /var/lib/apt/lists/*

+# Image processing for thumbnails
+RUN apt-get update  \
+    && apt-get install -y libvips \
+    && rm -rf /var/lib/apt/lists/*
+
 # Install zip and unzip - either for chromium or chrome
 RUN if [ "$USE_BROWSER" = "chromium" ] || [ "$USE_BROWSER" = "chrome" ]; then \
    apt-get update  \
@@ -57,6 +107,13 @@ RUN if [ "$USE_BROWSER" = "chromium" ] || [ "$USE_BROWSER" = "chrome" ]; then \
    && rm -rf /var/lib/apt/lists/*; \
    fi

+# Install wget - either for chromium or chrome
+RUN if [ "$USE_BROWSER" = "chromium" ] || [ "$USE_BROWSER" = "chrome" ]; then \
+    apt-get update  \
+    && apt-get install -y wget \
+    && rm -rf /var/lib/apt/lists/*; \
+    fi
+
 # Install fonts if using either chromium or chrome
 RUN if [ "$USE_BROWSER" = "chromium" ] || [ "$USE_BROWSER" = "chrome" ]; then \
    apt-get update  \
@@ -78,6 +135,21 @@ RUN if [ "$USE_BROWSER" = "chromium" ] || [ "$USE_BROWSER" = "chrome" ]; then \
    && rm -rf /var/lib/apt/lists/*; \
    fi

+# Install xvfb, xauth
+RUN if [ "$USE_BROWSER" = "chromium" ] || [ "$USE_BROWSER" = "chrome" ]; then \
+    apt-get update && apt-get install -y --no-install-recommends \
+        xvfb \
+        xauth \
+        libnss3 \
+        libxss1 \
+        libasound2 \
+        libatk-bridge2.0-0 \
+        libgtk-3-0 \
+        libdrm2 \
+        ca-certificates \
+        && rm -rf /var/lib/apt/lists/*; \
+    fi
+
 # Install Chromium
 RUN if [ "$USE_BROWSER" = "chromium" ]; then \
        apt-get update  \
@@ -90,7 +162,7 @@ RUN if [ "$USE_BROWSER" = "chromium" ]; then \
 # Install Chrome
 # Available versions:
 # https://www.ubuntuupdates.org/package/google_chrome/stable/main/base/google-chrome-stable
-ARG CHROME_VERSION="130.0.6723.69-1"
+ARG CHROME_VERSION="140.0.7339.80-1"
 RUN if [ "$USE_BROWSER" = "chrome" ]; then \
        wget --no-verbose -O /tmp/chrome.deb https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb \
          && apt-get update \
@@ -99,12 +171,38 @@ RUN if [ "$USE_BROWSER" = "chrome" ]; then \
          && rm -rf /var/lib/apt/lists/*; \
    fi

+# curl
+RUN apt-get update  \
+    && apt-get install -y curl \
+    && rm -rf /var/lib/apt/lists/*
+
+# GOWS requirements
+# libc6
+RUN  apt-get update \
+     && apt-get install -y libc6 \
+     && rm -rf /var/lib/apt/lists/*
+
+# Install tini for proper init process
+RUN apt-get update && apt-get install -y tini && rm -rf /var/lib/apt/lists/*
+
+# Set the ENV for docker image
+ENV WHATSAPP_DEFAULT_ENGINE=$WHATSAPP_DEFAULT_ENGINE
+
 # Attach sources, install packages
 WORKDIR /app
 COPY package.json ./
-COPY --from=build /src/node_modules ./node_modules
-COPY --from=build /src/dist ./dist
+COPY --from=build /git/node_modules ./node_modules
+COPY --from=build /git/dist ./dist
 COPY --from=dashboard /dashboard ./dist/dashboard
+COPY --from=gows /go/gows/bin/gows /app/gows
+COPY .env.example ./.env.example
+COPY scripts/init-waha.js ./scripts/init-waha.js
+RUN chmod +x ./scripts/init-waha.js \
+  && printf '%s\n' '#!/bin/sh' 'exec node /app/scripts/init-waha.js "$@"' > /usr/local/bin/init-waha \
+  && chmod +x /usr/local/bin/init-waha
+ENV WAHA_GOWS_PATH=/app/gows
+ENV WAHA_GOWS_SOCKET=/tmp/gows.sock
+
 COPY entrypoint.sh /entrypoint.sh

 # Chokidar options to monitor file changes
@@ -116,4 +214,6 @@ ENV WAHA_ZIPPER=ZIPUNZIP

 # Run command, etc
 EXPOSE 3000
+# Use tini as init system to handle zombie processes properly
+ENTRYPOINT ["/usr/bin/tini", "--"]
 CMD ["/entrypoint.sh"]
@@ -1,16 +1,19 @@
+build-all: build-plus build-chrome build-gows build-noweb
+
 build:
 	docker build . -t devlikeapro/waha

+build-plus:
+	docker build . -t devlikeapro/waha-plus
+
 build-chrome:
 	docker build . -t devlikeapro/waha-plus:chrome --build-arg USE_BROWSER=chrome

 build-noweb:
-	docker build . -t devlikeapro/waha:noweb --build-arg USE_BROWSER=none
+	docker build . -t devlikeapro/waha-plus:noweb --build-arg USE_BROWSER=none --build-arg WHATSAPP_DEFAULT_ENGINE=NOWEB

-build-all: build build-chrome build-noweb
-
-build-plus:
-	docker build . -t devlikeapro/waha-plus
+build-gows:
+	docker build . -t devlikeapro/waha-plus:gows --build-arg USE_BROWSER=none --build-arg WHATSAPP_DEFAULT_ENGINE=GOWS

 build-ssh:
 	# check IMAGE provided
@@ -32,10 +35,26 @@ 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
+	yarn up @adiwajshing/baileys@github:devlikeapro/Baileys#fork-master-2025-10-19
+
+up-noweb-libsignal:
+	yarn up libsignal@github:devlikeapro/libsignal-node#fork-master

 up-webjs:
-	. ${NVM_DIR}/nvm.sh && nvm exec yarn up whatsapp-web.js@github:devlikeapro/whatsapp-web.js#fork-main-channels
+	yarn up whatsapp-web.js@github:devlikeapro/whatsapp-web.js#fork-main-2025-09-10

 start-proxy:
 	docker run --rm -d --name squid-container -e TZ=UTC -p 3128:3128 ubuntu/squid:5.2-22.04_beta
+
+proto-gows:
+	node scripts/gows-proto.js build --dir ../gows/proto
+
+gows:
+	cd ../gows && \
+	export PATH=${HOME}/go/bin:${PATH} && \
+	make all
+
+copy-dashboard:
+	cd ../waha-hub/ui && \
+	make copy-waha
+
@@ -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 (check [.nvmrc](/.nvmrc) to get the version)
+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
+```
@@ -8,6 +8,17 @@ services:
    # WAHA Core
    # image: devlikeapro/waha:latest

+    # Add "dns" if you have a problem with resolving "web.whatsapp.com"
+    dns:
+      - 1.1.1.1
+      - 8.8.8.8
+
+    logging:
+      driver: 'json-file'
+      options:
+        max-size: '100m'
+        max-file: '10'
+
    ports:
      - '127.0.0.1:3000:3000/tcp'

@@ -17,14 +28,37 @@ services:

      # Save media files
      # https://waha.devlike.pro/docs/how-to/storages/#save-media-files-between-the-container-restarts
-      - './.media:/app/.media'
+      - './media:/app/.media'

    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.6
+#    restart: always
+#    environment:
+#      POSTGRES_USER: postgres
+#      POSTGRES_PASSWORD: postgres
+#      POSTGRES_DB: postgres
+#    ports:
+#      - "127.0.0.1:5432:5432"
+#    volumes:
+#      - pg_data:/var/lib/postgresql/data
+#    command:
+#      - postgres
+#      - "-c"
+#      - "max_connections=3000"
+#    logging:
+#      driver: "json-file"
+#      options:
+#        max-size: "100m"
+#        max-file: "10"
+
+# 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
@@ -35,6 +69,11 @@ services:
 #    environment:
 #      - MONGO_INITDB_ROOT_USERNAME=mongouser
 #      - MONGO_INITDB_ROOT_PASSWORD=mongopassword
+#    logging:
+#      driver: "json-file"
+#      options:
+#        max-size: "100m"
+#        max-file: "10"

 # NOTE: Only if you're using S3 to save media files
 # https://waha.devlike.pro/docs/how-to/storages/#media---s3
@@ -53,8 +92,13 @@ services:
 #    volumes:
 #      - minio_data:/data
 #    command: server /data --console-address ":9001"
+#    logging:
+#      driver: "json-file"
+#      options:
+#        max-size: "100m"
+#        max-file: "10"

 volumes:
-  # NOTE: Only if you're using MongoDB
  mongodb_data: {}
  minio_data: {}
+  pg_data: {}
@@ -0,0 +1,265 @@
+# Learn about the various environment variables at
+# https://www.chatwoot.com/docs/self-hosted/configuration/environment-variables/#rails-production-variables
+
+# Increase rack default timeout (30s) to avoid timeout errors
+# Workaround for https://github.com/devlikeapro/waha/issues/1389
+RACK_TIMEOUT_SERVICE_TIMEOUT=60
+
+# Used to verify the integrity of signed cookies. so ensure a secure value is set
+# SECRET_KEY_BASE should be alphanumeric. Avoid special characters or symbols. 
+# Use `rake secret` to generate this variable
+SECRET_KEY_BASE=replace_with_lengthy_secure_hex
+
+# Replace with the URL you are planning to use for your app
+FRONTEND_URL=http://chatwoot:3009
+# To use a dedicated URL for help center pages
+# HELPCENTER_URL=http://0.0.0.0:3000
+
+# If the variable is set, all non-authenticated pages would fallback to the default locale.
+# Whenever a new account is created, the default language will be DEFAULT_LOCALE instead of en
+# DEFAULT_LOCALE=en
+
+# If you plan to use CDN for your assets, set Asset CDN Host
+ASSET_CDN_HOST=
+
+# Force all access to the app over SSL, default is set to false
+FORCE_SSL=false
+
+# This lets you control new sign ups on your chatwoot installation
+# true : default option, allows sign ups
+# false : disables all the end points related to sign ups
+# api_only: disables the UI for signup, but you can create sign ups via the account apis
+ENABLE_ACCOUNT_SIGNUP=false
+
+# Redis config
+# specify the configs via single URL or individual variables
+# ref: https://www.iana.org/assignments/uri-schemes/prov/redis
+# You can also use the following format for the URL: redis://:password@host:port/db_number
+REDIS_URL=redis://redis:6379
+# If you are using docker-compose, set this variable's value to be any string,
+# which will be the password for the redis service running inside the docker-compose
+# to make it secure
+REDIS_PASSWORD=redis
+# Redis Sentinel can be used by passing list of sentinel host and ports e,g. sentinel_host1:port1,sentinel_host2:port2
+REDIS_SENTINELS=
+# Redis sentinel master name is required when using sentinel, default value is "mymaster".
+# You can find list of master using "SENTINEL masters" command
+REDIS_SENTINEL_MASTER_NAME=
+
+# By default Chatwoot will pass REDIS_PASSWORD as the password value for sentinels
+# Use the following environment variable to customize passwords for sentinels.
+# Use empty string if sentinels are configured with out passwords
+# REDIS_SENTINEL_PASSWORD=
+
+# Redis premium breakage in heroku fix
+# enable the following configuration
+# ref: https://github.com/chatwoot/chatwoot/issues/2420
+# REDIS_OPENSSL_VERIFY_MODE=none
+
+# Postgres Database config variables
+# You can leave POSTGRES_DATABASE blank. The default name of
+# the database in the production environment is chatwoot_production
+POSTGRES_DATABASE=chatwoot
+POSTGRES_HOST=postgres
+POSTGRES_USERNAME=postgres
+POSTGRES_PASSWORD=postgres
+RAILS_ENV=development
+# Changes the Postgres query timeout limit. The default is 14 seconds. Modify only when required.
+# POSTGRES_STATEMENT_TIMEOUT=14s
+RAILS_MAX_THREADS=5
+
+# The email from which all outgoing emails are sent
+# could user either  `email@yourdomain.com` or `BrandName <email@yourdomain.com>`
+MAILER_SENDER_EMAIL=Chatwoot <accounts@chatwoot.com>
+
+#SMTP domain key is set up for HELO checking
+SMTP_DOMAIN=chatwoot.com
+# Set the value to "mailhog" if using docker-compose for development environments,
+# Set the value as "localhost" or your SMTP address in other environments
+# If SMTP_ADDRESS is empty, Chatwoot would try to use sendmail(postfix)
+SMTP_ADDRESS=
+SMTP_PORT=1025
+SMTP_USERNAME=
+SMTP_PASSWORD=
+# plain,login,cram_md5
+SMTP_AUTHENTICATION=
+SMTP_ENABLE_STARTTLS_AUTO=true
+# Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert', see http://api.rubyonrails.org/classes/ActionMailer/Base.html
+SMTP_OPENSSL_VERIFY_MODE=peer
+# Comment out the following environment variables if required by your SMTP server
+# SMTP_TLS=
+# SMTP_SSL=
+# SMTP_OPEN_TIMEOUT
+# SMTP_READ_TIMEOUT
+
+# Mail Incoming
+# This is the domain set for the reply emails when conversation continuity is enabled
+MAILER_INBOUND_EMAIL_DOMAIN=
+# Set this to the appropriate ingress channel with regards to incoming emails
+# Possible values are :
+# relay for Exim, Postfix, Qmail
+# mailgun for Mailgun
+# mandrill for Mandrill
+# postmark for Postmark
+# sendgrid for Sendgrid
+RAILS_INBOUND_EMAIL_SERVICE=
+# Use one of the following based on the email ingress service
+# Ref: https://edgeguides.rubyonrails.org/action_mailbox_basics.html
+# Set this to a password of your choice and use it in the Inbound webhook
+RAILS_INBOUND_EMAIL_PASSWORD=
+
+MAILGUN_INGRESS_SIGNING_KEY=
+MANDRILL_INGRESS_API_KEY=
+
+# Creating Your Inbound Webhook Instructions for Postmark and Sendgrid:
+# Inbound webhook URL format:
+#    https://actionmailbox:[YOUR_RAILS_INBOUND_EMAIL_PASSWORD]@[YOUR_CHATWOOT_DOMAIN.COM]/rails/action_mailbox/[RAILS_INBOUND_EMAIL_SERVICE]/inbound_emails
+# Note: Replace the values inside the brackets; do not include the brackets themselves.
+# Example: https://actionmailbox:mYRandomPassword3@chatwoot.example.com/rails/action_mailbox/postmark/inbound_emails
+# For Postmark
+# Ensure the 'Include raw email content in JSON payload' checkbox is selected in the inbound webhook section.
+
+# Storage
+ACTIVE_STORAGE_SERVICE=local
+
+# Amazon S3
+# documentation: https://www.chatwoot.com/docs/configuring-s3-bucket-as-cloud-storage
+S3_BUCKET_NAME=
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_REGION=
+
+# Log settings
+# Disable if you want to write logs to a file
+RAILS_LOG_TO_STDOUT=true
+LOG_LEVEL=info
+LOG_SIZE=500
+# Configure this environment variable if you want to use lograge instead of rails logger
+#LOGRAGE_ENABLED=true
+
+### This environment variables are only required if you are setting up social media channels
+
+# Facebook
+# documentation: https://www.chatwoot.com/docs/facebook-setup
+FB_VERIFY_TOKEN=
+FB_APP_SECRET=
+FB_APP_ID=
+
+# https://developers.facebook.com/docs/messenger-platform/instagram/get-started#app-dashboard
+IG_VERIFY_TOKEN=
+
+# Twitter
+# documentation: https://www.chatwoot.com/docs/twitter-app-setup
+TWITTER_APP_ID=
+TWITTER_CONSUMER_KEY=
+TWITTER_CONSUMER_SECRET=
+TWITTER_ENVIRONMENT=
+
+#slack integration
+SLACK_CLIENT_ID=
+SLACK_CLIENT_SECRET=
+
+# Google OAuth
+GOOGLE_OAUTH_CLIENT_ID=
+GOOGLE_OAUTH_CLIENT_SECRET=
+GOOGLE_OAUTH_CALLBACK_URL=
+
+### Change this env variable only if you are using a custom build mobile app
+## Mobile app env variables
+IOS_APP_ID=L7YLMN4634.com.chatwoot.app
+ANDROID_BUNDLE_ID=com.chatwoot.app
+
+# https://developers.google.com/android/guides/client-auth (use keytool to print the fingerprint in the first section)
+ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:D4:5D:D4:53:F8:3B:FB:D3:C6:28:64:1D:AA:08:1E:D8
+
+### Smart App Banner
+# https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/PromotingAppswithAppBanners/PromotingAppswithAppBanners.html
+# You can find your app-id in https://itunesconnect.apple.com
+#IOS_APP_IDENTIFIER=1495796682
+
+## Push Notification
+## generate a new key value here : https://d3v.one/vapid-key-generator/
+# VAPID_PUBLIC_KEY=
+# VAPID_PRIVATE_KEY=
+#
+# for mobile apps
+# FCM_SERVER_KEY=
+
+### APM and Error Monitoring configurations
+## Elastic APM
+## https://www.elastic.co/guide/en/apm/agent/ruby/current/getting-started-rails.html
+# ELASTIC_APM_SERVER_URL=
+# ELASTIC_APM_SECRET_TOKEN=
+
+## Sentry
+# SENTRY_DSN=
+
+
+## Scout
+## https://scoutapm.com/docs/ruby/configuration
+# SCOUT_KEY=YOURKEY
+# SCOUT_NAME=YOURAPPNAME (Production)
+# SCOUT_MONITOR=true
+
+## NewRelic
+# https://docs.newrelic.com/docs/agents/ruby-agent/configuration/ruby-agent-configuration/
+# NEW_RELIC_LICENSE_KEY=
+# Set this to true to allow newrelic apm to send logs.
+# This is turned off by default.
+# NEW_RELIC_APPLICATION_LOGGING_ENABLED=
+
+## Datadog
+## https://github.com/DataDog/dd-trace-rb/blob/master/docs/GettingStarted.md#environment-variables
+# DD_TRACE_AGENT_URL=
+
+# MaxMindDB API key to download GeoLite2 City database
+# IP_LOOKUP_API_KEY=
+
+## Rack Attack configuration
+## To prevent and throttle abusive requests
+# ENABLE_RACK_ATTACK=true
+# RACK_ATTACK_LIMIT=300
+# ENABLE_RACK_ATTACK_WIDGET_API=true
+CONVERSATION_MESSAGE_PER_MINUTE_LIMIT=3000
+
+## Running chatwoot as an API only server
+## setting this value to true will disable the frontend dashboard endpoints
+# CW_API_ONLY_SERVER=false
+
+## Development Only Config
+# if you want to use letter_opener for local emails
+# LETTER_OPENER=true
+# meant to be used in github codespaces
+# WEBPACKER_DEV_SERVER_PUBLIC=
+
+# If you want to use official mobile app,
+# the notifications would be relayed via a Chatwoot server
+ENABLE_PUSH_RELAY_SERVER=true
+
+# Stripe API key
+STRIPE_SECRET_KEY=
+STRIPE_WEBHOOK_SECRET=
+
+# Set to true if you want to upload files to cloud storage using the signed url
+# Make sure to follow https://edgeguides.rubyonrails.org/active_storage_overview.html#cross-origin-resource-sharing-cors-configuration on the cloud storage after setting this to true.
+DIRECT_UPLOADS_ENABLED=
+
+#MS OAUTH creds
+AZURE_APP_ID=
+AZURE_APP_SECRET=
+
+## Advanced configurations
+## Change these values to fine tune performance
+# control the concurrency setting of sidekiq
+# SIDEKIQ_CONCURRENCY=10
+
+
+# AI powered features
+## OpenAI key
+# OPENAI_API_KEY=
+
+# Housekeeping/Performance related configurations
+# Set to true if you want to remove stale contact inboxes
+# contact_inboxes with no conversation older than 90 days will be removed
+# REMOVE_STALE_CONTACT_INBOX_JOB_STATUS=false
+
@@ -0,0 +1,116 @@
+# WAHA - WhatsApp HTTP API
+#
+# https://waha.devlike.pro/docs/how-to/config/
+#
+
+# ====================
+# ===== SECURITY =====
+# ====================
+WAHA_API_KEY_PLAIN=00000000000000000000000000000000
+WAHA_API_KEY=00000000000000000000000000000000
+WAHA_DASHBOARD_USERNAME=admin
+WAHA_DASHBOARD_PASSWORD=11111111111111111111111111111111
+WHATSAPP_SWAGGER_USERNAME=admin
+WHATSAPP_SWAGGER_PASSWORD=11111111111111111111111111111111
+
+# Disable Dashboard or Swagger
+WAHA_DASHBOARD_ENABLED=True
+WHATSAPP_SWAGGER_ENABLED=True
+
+# ==================
+# ===== COMMON =====
+# ==================
+# Base URL for the API (used for webhooks, file URLs, etc.)
+WAHA_BASE_URL=http://waha:3000
+WAHA_PUBLIC_URL=http://localhost:3000
+
+# Server configuration (if you need to customize hostname/port)
+# WHATSAPP_API_SCHEMA=http
+# WHATSAPP_API_PORT=3000
+# WHATSAPP_API_HOSTNAME=localhost
+
+# WhatsApp engine (WEBJS is default, GOWS or NOWEB for better performance)
+WHATSAPP_DEFAULT_ENGINE=GOWS
+
+# =================
+# ===== APPS ======
+# =================
+WAHA_APPS_ENABLED=True
+REDIS_URL=redis://:redis@redis:6379
+
+# ===================
+# ===== LOGGING =====
+# ===================
+# Log format: JSON (for log management systems) or PRETTY (for development)
+WAHA_LOG_FORMAT=JSON
+
+# Log level: info, debug, error, warn
+WAHA_LOG_LEVEL=info
+
+# Don't print QR codes in logs
+WAHA_PRINT_QR=False
+
+# =========================
+# ===== MEDIA STORAGE =====
+# =========================
+# Local storage (default)
+WAHA_MEDIA_STORAGE=LOCAL
+WHATSAPP_FILES_LIFETIME=1800
+WHATSAPP_FILES_FOLDER=/app/.media
+
+# Media download settings
+# WHATSAPP_DOWNLOAD_MEDIA=true
+# WHATSAPP_FILES_MIMETYPES=image/jpeg,image/png
+
+# S3 storage (uncomment to use)
+# WAHA_MEDIA_STORAGE=S3
+# WAHA_S3_REGION=eu-west-2
+# WAHA_S3_BUCKET=waha
+# WAHA_S3_ACCESS_KEY_ID=minioadmin
+# WAHA_S3_SECRET_ACCESS_KEY=minioadmin
+# WAHA_S3_ENDPOINT=http://minio:9000
+# WAHA_S3_FORCE_PATH_STYLE=True
+# WAHA_S3_PROXY_FILES=True
+
+# PostgreSQL storage (uncomment to use)
+# WAHA_MEDIA_STORAGE=POSTGRESQL
+# WAHA_MEDIA_POSTGRESQL_URL=postgres://postgres:postgres@postgres:5432/postgres?sslmode=disable
+
+# ===========================
+# ===== SESSION STORAGE =====
+# ===========================
+# PostgreSQL for sessions (uncomment to use)
+WHATSAPP_SESSIONS_POSTGRESQL_URL=postgres://postgres:postgres@postgres:5432/postgres?sslmode=disable
+
+# MongoDB for sessions (uncomment to use)
+# WHATSAPP_SESSIONS_MONGO_URL=mongodb://mongouser:mongopassword@mongodb:27017
+
+
+# ==================================
+# ===== ADVANCED CONFIGURATION =====
+# ==================================
+
+# Timezone for screenshots and logs
+# TZ=Europe/Dublin
+
+# Session management
+# WHATSAPP_START_SESSION=session1,session2
+# WHATSAPP_RESTART_ALL_SESSIONS=False
+
+# Webhooks
+# WHATSAPP_HOOK_URL=https://webhook.site/11111111-1111-1111-1111-11111111
+# WHATSAPP_HOOK_EVENTS=session.status,message,message.reaction
+
+# Proxy configuration
+# WHATSAPP_PROXY_SERVER=proxy.example.com:3128
+# WHATSAPP_PROXY_SERVER_USERNAME=user
+# WHATSAPP_PROXY_SERVER_PASSWORD=pass
+
+# HTTPS configuration
+# !DEPRECATED!
+# Setup nginx reverse proxy to handle TLS connection
+# using Let's encrypt or self-issued certificate
+# 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
@@ -0,0 +1,99 @@
+services:
+  waha:
+    restart: always
+    image: devlikeapro/waha-plus
+    ports:
+      - '127.0.0.1:3000:3000/tcp'
+    volumes:
+      - './sessions:/app/.sessions' # required for WAHA Core only
+      - './media:/app/.media'
+    env_file:
+      - .waha.env
+    depends_on:
+      - postgres
+      - redis
+      - chatwoot
+      - chatwoot-sidekiq
+    logging:
+      driver: 'json-file'
+      options:
+        max-size: '100m'
+        max-file: '10'
+    dns:
+      - 1.1.1.1
+      - 8.8.8.8
+
+  base: &base
+    image: chatwoot/chatwoot:v4.7.0
+    env_file: .chatwoot.env ## Change this file for customized env variables
+    volumes:
+      - chatwoot_storage:/app/storage
+    extra_hosts:
+      - 'host.docker.internal:host-gateway'
+    logging:
+      driver: 'json-file'
+      options:
+        max-size: '100m'
+        max-file: '10'
+
+  chatwoot:
+    <<: *base
+    depends_on:
+      - postgres
+      - redis
+    ports:
+      - '127.0.0.1:3009:3009'
+    environment:
+      - NODE_ENV=production
+      - RAILS_ENV=production
+      - INSTALLATION_ENV=docker
+    entrypoint: docker/entrypoints/rails.sh
+    command: ['bundle', 'exec', 'rails', 's', '-p', '3009', '-b', '0.0.0.0']
+    restart: always
+
+  chatwoot-sidekiq:
+    <<: *base
+    depends_on:
+      - postgres
+      - redis
+    environment:
+      - NODE_ENV=production
+      - RAILS_ENV=production
+      - INSTALLATION_ENV=docker
+    command: ['bundle', 'exec', 'sidekiq', '-C', 'config/sidekiq.yml']
+    restart: always
+
+  postgres:
+    image: pgvector/pgvector:pg16
+    restart: always
+    ports:
+      - '127.0.0.1:5432:5432'
+    volumes:
+      - chatwoot_pg_data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_DB=chatwoot
+      - POSTGRES_USER=postgres
+      # Please provide your own password.
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_HOST_AUTH_METHOD=trust
+
+  redis:
+    image: redis:alpine
+    restart: always
+    command:
+      - 'sh'
+      - '-c'
+      - >
+        redis-server --bind 0.0.0.0 --port 6379 --requirepass
+        ${REDIS_PASSWORD:-redis} --timeout 300 --tcp-keepalive 60 --save 900 1
+        --save 300 10 --save 60 10000 --appendonly yes --appendfsync everysec
+    env_file: .chatwoot.env
+    volumes:
+      - chatwoot_redis:/data
+    ports:
+      - '127.0.0.1:6379:6379'
+
+volumes:
+  chatwoot_pg_data: {}
+  chatwoot_redis: {}
+  chatwoot_storage: {}
@@ -17,7 +17,7 @@ services:
    ports:
      - '127.0.0.1:3001:3000/tcp'
    volumes:
-      - './.media:/app/.media'
+      - './media:/app/.media'
    env_file:
      - .env
    environment:
@@ -42,7 +42,7 @@ services:
    ports:
      - '127.0.0.1:3002:3000/tcp'
    volumes:
-      - './.media:/app/.media'
+      - './media:/app/.media'
    env_file:
      - .env
    environment:
@@ -7,12 +7,12 @@ services:
    ports:
      - '3000:3000/tcp'
    volumes:
-      - './.sessions:/app/.sessions'
-      - './.media:/app/.media'
+      - './sessions:/app/.sessions'
+      - './media:/app/.media'
    environment:
-      - WHATSAPP_API_KEY=321
-      - WAHA_DASHBOARD_USERNAME=waha
-      - WAHA_DASHBOARD_PASSWORD=waha
+      - WAHA_API_KEY=321
+      - WAHA_DASHBOARD_USERNAME=admin
+      - WAHA_DASHBOARD_PASSWORD=admin
      - WHATSAPP_DEFAULT_ENGINE=WEBJS
      - WAHA_PRINT_QR=False
      - WAHA_MEDIA_STORAGE=LOCAL
@@ -29,15 +29,15 @@ services:
      # - WHATSAPP_HOOK_EVENTS=message
      # - WHATSAPP_API_HOSTNAME=localhost
      - WHATSAPP_DEFAULT_ENGINE=WEBJS
-      - WHATSAPP_API_KEY=321
+      - WAHA_API_KEY=321
      # Username and password for Swagger
      - WHATSAPP_SWAGGER_USERNAME=swagger
      - WHATSAPP_SWAGGER_PASSWORD=admin
      # Username and password for WAHA Dashboard
      # you can use the same username and password for both Swagger and Dashboard
      # Default - waha / waha
-      - WAHA_DASHBOARD_USERNAME=waha
-      - WAHA_DASHBOARD_PASSWORD=waha
+      - WAHA_DASHBOARD_USERNAME=admin
+      - WAHA_DASHBOARD_PASSWORD=admin
      # Engine specific environment variables
      # - WAHA_WEBJS_WEB_VERSION=2.2412.54-videofix
    restart: always
@@ -55,7 +55,7 @@ services:
      # Environment variables from https://waha.devlike.pro/docs/how-to/config/
      # - WHATSAPP_HOOK_URL=https://webhook.site/11111111-1111-1111-1111-11111111
      # - WHATSAPP_HOOK_EVENTS=message
-      # - WHATSAPP_API_KEY=321
+      # - WAHA_API_KEY=321
      # - WHATSAPP_SWAGGER_USERNAME=admin
      # - WHATSAPP_SWAGGER_PASSWORD=123
      # - WAHA_DASHBOARD_USERNAME=admin
@@ -1,11 +1,82 @@
 #!/bin/sh

+
+#
 # Calculate UV_THREADPOOL_SIZE based on number of CPUs
-cpus=$(node -e "const os = require('os'); console.log(os.cpus().length);")
+#
+# Try to get CPU count using Node.js, fallback to 1 if it fails
+cpus=$(node -e "const os = require('os'); console.log(os.cpus().length);" 2>/dev/null) || cpus=1
+# Make sure cpus is a number, default to 1 if not
+case $cpus in
+  ''|*[!0-9]*) cpus=1 ;;
+esac
 uv_threadpool_size=$(($cpus * 2))

+# Check if uv_threadpool_size is less than 4 (default), set it to 4 if it is
+if [ "$uv_threadpool_size" -lt 4 ]; then
+  uv_threadpool_size=4
+fi
+
 # Set UV_THREADPOOL_SIZE as an environment variable
 export UV_THREADPOOL_SIZE="${UV_THREADPOOL_SIZE:-$uv_threadpool_size}"

-# Start your application using yarn
-exec node dist/main
+#
+# Handle API key hashing
+#
+# Save WHATSAPP_API_KEY or WAHA_API_KEY in a variable (WHATSAPP_API_KEY has priority)
+if [ -n "$WHATSAPP_API_KEY" ]; then
+  key="$WHATSAPP_API_KEY"
+elif [ -n "$WAHA_API_KEY" ]; then
+  key="$WAHA_API_KEY"
+fi
+
+# Unset both environment variables
+unset WHATSAPP_API_KEY
+unset WAHA_API_KEY
+
+# Process the key if it exists
+if [ -n "$key" ]; then
+  # Check if key is already hashed
+  if echo "$key" | grep -q "^sha512:"; then
+    # If already hashed, use it as is
+    export WAHA_API_KEY="$key"
+  else
+    # Hash the key using sha512sum
+    HASHED_KEY=$(echo -n "$key" | sha512sum | awk '{print $1}')
+    export WAHA_API_KEY="sha512:$HASHED_KEY"
+  fi
+fi
+
+#
+# xvfb-run
+#
+USE_XVFB=false
+
+# Check WAHA_RUN_XVFB parameter - only test for "false" case, treat all others as True
+if [ "$WAHA_RUN_XVFB" = "false" ] || [ "$WAHA_RUN_XVFB" = "False" ] || [ "$WAHA_RUN_XVFB" = "0" ]; then
+  # Explicitly disabled by user
+  echo "WAHA_RUN_XVFB value: $WAHA_RUN_XVFB - xvfb is disabled"
+  USE_XVFB=false
+else
+  # Check engine and run test if it's WEBJS or not specified
+  if [ -z "$WHATSAPP_DEFAULT_ENGINE" ] || [ "$WHATSAPP_DEFAULT_ENGINE" = "WEBJS" ]; then
+    # Try to run xvfb-run with a test command
+    if xvfb-run --auto-servernum echo "xvfb-run is working!"; then
+      USE_XVFB=true
+    else
+      echo "xvfb-run test failed, do not run it"
+      USE_XVFB=false
+    fi
+  fi
+fi
+
+#
+# Start your application using node with exec to ensure proper signal handling
+#
+if [ "$USE_XVFB" = "true" ]; then
+  echo "Executing node with xvfb-run..."
+  exec xvfb-run --auto-servernum node dist/main
+else
+  echo "Executing node without xvfb-run..."
+  exec node dist/main
+fi
@@ -3,7 +3,13 @@
  "sourceRoot": "src",
  "compilerOptions": {
    "plugins": ["@nestjs/swagger"],
-    "assets": ["dashboard/**", "core/engines/webjs/*", "plus/engines/webjs/*"],
+    "assets": [
+      "dashboard/**",
+      "core/engines/webjs/*",
+      "plus/engines/webjs/*",
+      "apps/chatwoot/i18n/locales/*.yaml",
+      "apps/chatwoot/i18n/locales/*.yml"
+    ],
    "watchAssets": true
  }
 }
@@ -14,72 +14,101 @@
    "start:debug": "nest start --debug --watch",
    "start:prod": "node dist/main",
    "start:prod-exit": "node dist/main",
-    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix --max-warnings=0",
-    "lint-cache": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix --cache --max-warnings=0",
+    "lint": "oxlint --deny-warnings",
+    "lint-fix": "oxlint --fix --deny-warnings",
    "test": "jest",
    "test:watch": "jest --watch",
    "test:cov": "jest --coverage",
    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "jest --config ./test/jest-e2e.json"
+    "test:e2e": "jest --config ./test/jest-e2e.json",
+    "gows:proto:fetch": "node scripts/gows-proto.js fetch",
+    "gows:proto:build": "node scripts/gows-proto.js build",
+    "gows:proto": "yarn gows:proto:fetch && yarn gows:proto:build"
  },
  "dependencies": {
-    "@adiwajshing/baileys": "github:devlikeapro/Baileys#fork-master-channels-678",
+    "@adiwajshing/baileys": "github:devlikeapro/Baileys#fork-master-2025-10-19",
    "@adiwajshing/keyed-db": "^0.2.4",
    "@aws-sdk/client-s3": "^3.633.0",
    "@aws-sdk/s3-request-presigner": "^3.633.0",
+    "@bull-board/api": "^6.9.1",
+    "@bull-board/express": "^6.9.1",
+    "@bull-board/nestjs": "^6.9.1",
+    "@figuro/chatwoot-sdk": "^1.1.17",
+    "@liaoliaots/nestjs-redis": "^9",
    "@nestjs/axios": "^3.0.2",
-    "@nestjs/common": "^9.0.9",
+    "@nestjs/bullmq": "^11.0.2",
+    "@nestjs/common": "^11.0.0",
    "@nestjs/config": "^3.2.3",
-    "@nestjs/core": "^9.0.9",
-    "@nestjs/passport": "^9.0.0",
-    "@nestjs/platform-express": "^9.0.9",
-    "@nestjs/platform-ws": "^9.0.9",
-    "@nestjs/serve-static": "^2.1.3",
+    "@nestjs/core": "^11.0.0",
+    "@nestjs/passport": "^11.0.0",
+    "@nestjs/platform-express": "^11.1.5",
+    "@nestjs/platform-ws": "^11.0.0",
+    "@nestjs/serve-static": "^5.0.0",
    "@nestjs/swagger": "^7.1.11",
    "@nestjs/terminus": "^10.2.3",
-    "@nestjs/websockets": "^9.0.9",
+    "@nestjs/websockets": "^11.0.0",
    "@types/better-sqlite3": "^7.6.10",
    "@types/lodash": "^4.14.194",
+    "@types/mustache": "^4.2.5",
+    "@types/passport": "^1.0.17",
+    "@types/sqlite3": "^5.1.0",
    "@types/ws": "^8.5.4",
    "adm-zip": "0.5.10",
    "agentkeepalive": "^4.5.0",
    "async-lock": "^1.4.1",
-    "axios": "^1.7.7",
+    "audio-decode": "^2.2.2",
+    "axios": "^1.9.0",
    "axios-retry": "^4.5.0",
    "better-sqlite3": "11.3.0",
+    "bullmq": "^5.48.1",
    "check-disk-space": "^3.4.0",
    "chokidar": "^3.6.0",
    "class-transformer": "^0.5.1",
    "class-validator": "0.14.0",
-    "del": "^6.0.0",
+    "commander": "^14.0.1",
+    "del": "^8.0.0",
    "express-basic-auth": "^1.2.1",
    "file-type": "16.5.4",
    "fs-extra": "^11.2.0",
+    "google-protobuf": "^3.21.4",
    "https-proxy-agent": "^7.0.0",
+    "ical.js": "^2.2.1",
+    "ioredis": "^5",
    "joi": "^17.13.3",
    "knex": "^3.1.0",
    "libphonenumber-js": "^1.10.36",
+    "libsignal": "github:WhiskeySockets/libsignal-node#master",
    "link-preview-js": "^3.0.4",
    "lodash": "^4.17.21",
+    "long": "^5.3.2",
    "mime-types": "^2.1.27",
    "mongodb": "6.9.0",
+    "ms": "^2.1.3",
+    "mustache": "^4.2.0",
    "nestjs-pino": "^4.1.0",
-    "passport": "^0.6.0",
+    "node-cache": "5.1.2",
+    "passport": "^0.7.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",
    "promise-retry": "^2.0.1",
-    "puppeteer": "^23.6.0",
+    "puppeteer": "^24.19.0",
    "qrcode": "^1.5.1",
    "qrcode-terminal": "^0.12.0",
    "reflect-metadata": "^0.1.13",
-    "rimraf": "^3.0.2",
+    "rimraf": "^4.3.0",
    "rxjs": "^7.8.1",
    "sharp": "^0.33.4",
+    "shell-quote": "^1.8.3",
+    "sqlite3": "^5.1.7",
    "swagger-ui-express": "^4.1.4",
    "ulid": "^2.3.0",
-    "whatsapp-web.js": "github:devlikeapro/whatsapp-web.js#fork-main-channels"
+    "undici": "^7.16.0",
+    "whatsapp-web.js": "github:devlikeapro/whatsapp-web.js#fork-main-2025-09-10",
+    "write-file-atomic": "^6.0.0",
+    "yaml": "^2.7.1"
  },
  "optionalDependencies": {
    "bufferutil": "^4.0.8"
@@ -87,31 +116,33 @@
  "resolutions": {
    "bufferutil": "^4.0.8",
    "ws": "^8.18.0",
-    "puppeteer": "^23.6.0",
-    "whatwg-url": "13.0.0"
+    "puppeteer": "^24.19.0",
+    "whatwg-url": "13.0.0",
+    "axios": "^1.9.0"
  },
  "devDependencies": {
-    "@nestjs/cli": "^9.0.0",
-    "@nestjs/schematics": "^9.0.1",
-    "@nestjs/testing": "^9.0.9",
+    "@grpc/grpc-js": "^1.13.4",
+    "@grpc/proto-loader": "^0.7.13",
+    "@nestjs/cli": "^11.0.0",
+    "@nestjs/schematics": "^11.0.0",
+    "@nestjs/testing": "^11.0.0",
    "@types/express": "^4.17.3",
    "@types/jest": "26.0.10",
    "@types/node": "^18.14.2",
+    "@types/node-fetch": "^2.6.13",
+    "@types/semver": "^7.7.0",
    "@types/supertest": "^2.0.8",
-    "@typescript-eslint/eslint-plugin": "3.9.1",
-    "@typescript-eslint/parser": "3.9.1",
-    "eslint": "7.7.0",
-    "eslint-config-prettier": "^6.10.0",
-    "eslint-plugin-import": "^2.20.1",
-    "eslint-plugin-simple-import-sort": "^10.0.0",
+    "grpc-tools": "^1.13.0",
    "jest": "^29.7.0",
+    "oxlint": "^1.13.0",
    "prettier": "^1.19.1",
+    "protoc-gen-ts": "^0.8.7",
    "supertest": "^4.0.2",
    "ts-jest": "^29.1.3",
    "ts-loader": "^6.2.1",
-    "ts-node": "^10.9.1",
+    "ts-node": "^10.9.2",
    "tsconfig-paths": "^4.1.0",
-    "typescript": "^4.8.4"
+    "typescript": "5.9.2"
  },
  "jest": {
    "moduleFileExtensions": [
@@ -120,6 +151,9 @@
      "ts"
    ],
    "rootDir": "src",
+    "moduleNameMapper": {
+      "^@waha/(.*)$": "<rootDir>/$1"
+    },
    "testRegex": ".test.ts$",
    "transform": {
      "^.+\\.(t|j)s$": "ts-jest"
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Set source and output file
+SOURCE_DIR="src"
+OUTPUT_DIR="$HOME/Downloads/chatgpt"
+OUTPUT_FILE="$OUTPUT_DIR/waha.ts"
+
+# Create or clear the output file
+rm -f "$OUTPUT_FILE"
+touch "$OUTPUT_FILE"
+
+# Find all .md files in the source directory and combine them
+find "$SOURCE_DIR" -type f -name "*.ts" | while read -r file; do
+  # Add file name  to OUTPUT_FILE
+  echo "\n-------" >> "$OUTPUT_FILE"
+  echo "File: $file" >> "$OUTPUT_FILE"
+  echo "-------\n" >> "$OUTPUT_FILE"
+  # Append the content of the file to the output file
+  cat "$file" >> "$OUTPUT_FILE"
+done
+
+echo "All .ts files combined into $OUTPUT_FILE with separators."
@@ -0,0 +1,72 @@
+#!/usr/bin/env node
+const { readFileSync } = require('fs');
+const { spawnSync } = require('child_process');
+const path = require('path');
+const YAML = require('yaml');
+
+const repoRoot = path.resolve(__dirname, '..');
+const enPath = path.join(repoRoot, 'src/apps/chatwoot/i18n/locales/en-US.yaml');
+const contents = readFileSync(enPath, 'utf8');
+const document = YAML.parse(contents);
+
+const flatten = (node, prefix = '') => {
+  if (node && typeof node === 'object' && !Array.isArray(node)) {
+    return Object.entries(node).reduce((acc, [key, value]) => {
+      const next = prefix ? `${prefix}.${key}` : key;
+      return acc.concat(flatten(value, next));
+    }, []);
+  }
+
+  return [prefix];
+};
+
+const allKeys = flatten(document).filter(Boolean);
+
+const ignoredPrefixes = ['datetime.', 'locale.'];
+
+const ignored = new Set();
+const unused = [];
+
+const searchRoots = ['src', 'tests'];
+
+for (const key of allKeys) {
+  if (
+    ignoredPrefixes.some((prefix) => key.startsWith(prefix)) ||
+    !key.includes('.')
+  ) {
+    ignored.add(key);
+    continue;
+  }
+
+  const result = spawnSync(
+    'rg',
+    [
+      '--files-with-matches',
+      '--fixed-strings',
+      key,
+      ...searchRoots,
+      '--glob',
+      '!apps/chatwoot/i18n/locales/*.yaml',
+    ],
+    {
+      cwd: repoRoot,
+      encoding: 'utf8',
+    },
+  );
+
+  if (result.status !== 0 || !result.stdout.trim()) {
+    unused.push(key);
+  }
+}
+
+const message = [
+  `Scanned ${allKeys.length} keys.`,
+  `Ignored ${ignored.size} keys (datetime.*, locale.*, or without dot).`,
+  unused.length
+    ? `Found ${unused.length} potentially unused keys:\n - ${unused.join(
+        '\n - ',
+      )}`
+    : 'No unused keys detected.',
+];
+
+console.log(message.join('\n'));
@@ -0,0 +1,144 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const fs = require('fs');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const path = require('path');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const axios = require('axios');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { execSync } = require('child_process');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const yargs = require('yargs');
+
+// Defaults
+const CONFIG_FILE = 'waha.config.json';
+// Load defaults from package.json
+gows = (() => {
+  try {
+    const config = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
+    return config.waha.gows || {};
+  } catch (error) {
+    return {};
+  }
+})();
+
+const DEFAULT_REPO = gows.repo;
+if (!DEFAULT_REPO) {
+  throw new Error(`Missing default repo in ${CONFIG_FILE}`);
+}
+const DEFAULT_REF = gows.ref;
+if (!DEFAULT_REF) {
+  throw new Error('Missing default ref in ${CONFIG_FILE}');
+}
+const DEFAULT_DIR = './src/core/engines/gows/proto';
+
+const PROTO_FILES = ['gows.proto'];
+const PROTO_OUTPUT = './src/core/engines/gows/grpc';
+
+// Helper function to clean directory
+function cleanDirectory(directory, suffix) {
+  if (!fs.existsSync(directory)) {
+    fs.mkdirSync(directory, { recursive: true });
+    return;
+  }
+
+  const files = fs.readdirSync(directory);
+  for (const file of files) {
+    const filePath = path.join(directory, file);
+    if (file.endsWith(suffix)) {
+      fs.unlinkSync(filePath);
+    }
+  }
+}
+
+// Helper function to download files
+async function downloadFiles(repo, ref, directory) {
+  for (const file of PROTO_FILES) {
+    const url = `https://github.com/${repo}/releases/download/${ref}/${file}`;
+    const filePath = path.join(directory, file);
+    try {
+      const response = await axios.get(url, { responseType: 'arraybuffer' });
+      fs.writeFileSync(filePath, response.data);
+      console.log(`Downloaded: ${file}`);
+    } catch (error) {
+      console.error(`Failed to download ${file}: ${error.message}`);
+    }
+  }
+}
+
+// Handler for fetch command
+async function handleFetch(repo, ref, dir) {
+  console.log(`Fetching .proto files from ${repo}@${ref} to ${dir}...`);
+  cleanDirectory(dir, '.proto');
+  await downloadFiles(repo, ref, dir);
+}
+
+// Handler for build command
+function handleBuild(dir) {
+  console.log('Building gRPC files...');
+  cleanDirectory(PROTO_OUTPUT);
+
+  const command = `grpc_tools_node_protoc \
+        --plugin=protoc-gen-ts=node_modules/.bin/protoc-gen-ts \
+        --plugin=protoc-gen-grpc=node_modules/.bin/grpc_tools_node_protoc_plugin \
+        --js_out=import_style=commonjs,binary:${PROTO_OUTPUT} \
+        --grpc_out=grpc_js:${PROTO_OUTPUT} \
+        --ts_out=grpc_js:${PROTO_OUTPUT} \
+        -I ${dir} ${dir}/gows.proto`;
+
+  try {
+    execSync(command, { stdio: 'inherit' });
+    console.log('gRPC files built successfully.');
+  } catch (error) {
+    console.error(`Failed to build gRPC files: ${error.message}`);
+  }
+}
+
+//
+// Commands
+//
+
+// fetch
+yargs.command(
+  'fetch',
+  'Fetch .proto files from GitHub',
+  (yargs) => {
+    yargs
+      .option('repo', {
+        describe: 'GitHub repository (owner/repo)',
+        type: 'string',
+        default: DEFAULT_REPO,
+      })
+      .option('ref', {
+        describe: 'Git reference (branch or commit SHA)',
+        type: 'string',
+        default: DEFAULT_REF,
+      })
+      .option('dir', {
+        describe: 'Directory to output .proto files',
+        type: 'string',
+        default: DEFAULT_DIR,
+      });
+  },
+  async (argv) => {
+    await handleFetch(argv.repo, argv.ref, argv.dir);
+  },
+);
+
+// build
+yargs.command(
+  'build',
+  'Build gRPC files from .proto files',
+  (yargs) => {
+    yargs.option('dir', {
+      describe: 'Directory containing .proto files',
+      type: 'string',
+      default: DEFAULT_DIR,
+    });
+  },
+  (argv) => {
+    handleBuild(argv.dir);
+  },
+);
+
+// Parse arguments
+yargs.parse();
@@ -0,0 +1,92 @@
+#!/usr/bin/env node
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const crypto = require('crypto');
+
+const projectRoot = path.resolve(__dirname, '..');
+
+const args = process.argv.slice(2);
+const forceIndex = args.indexOf('--force');
+const forceOverwrite = forceIndex !== -1;
+
+if (forceOverwrite) {
+  args.splice(forceIndex, 1);
+}
+
+const folderArg = args[0] || '.';
+const sourceArgRaw = args[1];
+const targetArg = args[2] || '.env';
+
+const envDir = path.resolve(process.cwd(), folderArg);
+const sourceArg = sourceArgRaw || '.env.example';
+const templateBaseDir = sourceArgRaw ? envDir : projectRoot;
+const templatePath = path.isAbsolute(sourceArg)
+  ? sourceArg
+  : path.resolve(templateBaseDir, sourceArg);
+const targetPath = path.isAbsolute(targetArg)
+  ? targetArg
+  : path.resolve(envDir, targetArg);
+
+function exitWithMessage(message, code = 1) {
+  console.error(message);
+  process.exit(code);
+}
+
+if (!fs.existsSync(envDir)) {
+  exitWithMessage(`Target directory does not exist: ${envDir}`);
+}
+
+if (!fs.existsSync(templatePath)) {
+  exitWithMessage(`Missing template file: ${templatePath}`);
+}
+
+if (!forceOverwrite && fs.existsSync(targetPath)) {
+  const stats = fs.statSync(targetPath);
+  if (stats.size > 0) {
+    exitWithMessage(
+      `${targetPath} already exists and is not empty. Remove it manually or rerun with --force to overwrite.`,
+    );
+  }
+}
+
+const exampleContent = fs.readFileSync(templatePath, 'utf8');
+
+function generateSecret() {
+  return crypto.randomUUID({ disableEntropyCache: true }).replace(/-/g, '');
+}
+
+const apiKey = generateSecret();
+const adminPassword = generateSecret();
+
+const updatedContent = exampleContent
+  .replace(/^WAHA_API_KEY=.*/m, `WAHA_API_KEY=${apiKey}`)
+  .replace(/^WAHA_API_KEY_PLAIN=.*/m, `WAHA_API_KEY_PLAIN=${apiKey}`)
+  .replace(/^WAHA_DASHBOARD_USERNAME=.*/m, 'WAHA_DASHBOARD_USERNAME=admin')
+  .replace(
+    /^WAHA_DASHBOARD_PASSWORD=.*/m,
+    `WAHA_DASHBOARD_PASSWORD=${adminPassword}`,
+  )
+  .replace(/^WHATSAPP_SWAGGER_USERNAME=.*/m, 'WHATSAPP_SWAGGER_USERNAME=admin')
+  .replace(
+    /^WHATSAPP_SWAGGER_PASSWORD=.*/m,
+    `WHATSAPP_SWAGGER_PASSWORD=${adminPassword}`,
+  );
+
+fs.writeFileSync(targetPath, updatedContent, { encoding: 'utf8' });
+
+const lines = [
+  'Credentials generated.',
+  '',
+  'Dashboard and Swagger:',
+  '  - Username: admin',
+  `  - Password: ${adminPassword}`,
+  '',
+  'API key: ',
+  `  - ${apiKey}`,
+  '',
+  'Use it in the Dashboard connection flow: https://waha.devlike.pro/docs/how-to/dashboard/#api-key',
+];
+
+console.log(lines.join('\n'));
@@ -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."
@@ -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
@@ -6,7 +6,6 @@ import {
  Query,
  UseInterceptors,
 } from '@nestjs/common';
-import { UnprocessableEntityException } from '@nestjs/common/exceptions/unprocessable-entity.exception';
 import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
 import { ApiFileAcceptHeader } from '@waha/nestjs/ApiFileAcceptHeader';
 import {
@@ -19,8 +18,6 @@ import { SessionManager } from '../core/abc/manager.abc';
 import { WhatsappSession } from '../core/abc/session.abc';
 import { BufferResponseInterceptor } from '../nestjs/BufferResponseInterceptor';
 import {
-  CaptchaBody,
-  OTPRequest,
  QRCodeFormat,
  QRCodeQuery,
  QRCodeValue,
@@ -39,8 +36,8 @@ class AuthController {
    summary: 'Get QR code for pairing WhatsApp API.',
  })
  @SessionApiParam
-  @ApiFileAcceptHeader(Base64File, QRCodeValue)
-  @UseInterceptors(new BufferResponseInterceptor())
+  @ApiFileAcceptHeader('image/png', Base64File, QRCodeValue)
+  @UseInterceptors(new BufferResponseInterceptor('image/png'))
  async getQR(
    @QRCodeSessionParam session: WhatsappSession,
    @Query() query: QRCodeQuery,
@@ -63,42 +60,6 @@ class AuthController {
  ) {
    return session.requestCode(request.phoneNumber, request.method, request);
  }
-
-  @Post('authorize-code')
-  @SessionApiParam
-  @ApiOperation({
-    summary: 'Send OTP authentication code.',
-  })
-  authorizeCode(
-    @SessionParam session: WhatsappSession,
-    @Body() request: OTPRequest,
-  ) {
-    return session.authorizeCode(request.code);
-  }
-
-  @Get('captcha')
-  @SessionApiParam
-  @ApiFileAcceptHeader()
-  @UseInterceptors(new BufferResponseInterceptor())
-  @ApiOperation({
-    summary: 'Get captcha image.',
-  })
-  async getCaptcha(@SessionParam session: WhatsappSession): Promise<Buffer> {
-    const image = await session.getCaptcha();
-    return image.get();
-  }
-
-  @Post('captcha')
-  @SessionApiParam
-  @ApiOperation({
-    summary: 'Enter captcha code.',
-  })
-  saveCaptcha(
-    @SessionParam session: WhatsappSession,
-    @Body() body: CaptchaBody,
-  ) {
-    return session.saveCaptcha(body.code);
-  }
 }

 export { AuthController };
@@ -3,31 +3,51 @@ import {
  Controller,
  Delete,
  Get,
+  HttpCode,
+  HttpStatus,
  Param,
  Post,
  Query,
+  UsePipes,
 } from '@nestjs/common';
-import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiParam, ApiSecurity, ApiTags } from '@nestjs/swagger';
+import { ChannelsInfoServiceCore } from '@waha/core/services/ChannelsInfoServiceCore';
+import { isJidNewsletter } from '@waha/core/utils/jids';
 import {
  SessionApiParam,
  WorkingSessionParam,
 } from '@waha/nestjs/params/SessionApiParam';
+import { WAHAValidationPipe } from '@waha/nestjs/pipes/WAHAValidationPipe';
 import {
  Channel,
+  ChannelCategory,
+  ChannelCountry,
+  ChannelListResult,
+  ChannelMessage,
+  ChannelSearchByText,
+  ChannelSearchByView,
+  ChannelView,
  CreateChannelRequest,
  ListChannelsQuery,
  NewsletterIdApiParam,
  NewsletterIdOrInviteCodeApiParam,
+  PreviewChannelMessages,
 } from '@waha/structures/channels.dto';

 import { SessionManager } from '../core/abc/manager.abc';
-import { isNewsletter, WhatsappSession } from '../core/abc/session.abc';
+import {
+  parseChannelInviteLink,
+  WhatsappSession,
+} from '../core/abc/session.abc';

@ApiSecurity('api_key')
@Controller('api/:session/channels')
@ApiTags('📢 Channels')
 export class ChannelsController {
-  constructor(private manager: SessionManager) {}
+  constructor(
+    private manager: SessionManager,
+    private channelsInfoService: ChannelsInfoServiceCore,
+  ) {}

  @Get('')
  @SessionApiParam
@@ -73,15 +93,47 @@ export class ChannelsController {
    @WorkingSessionParam session: WhatsappSession,
    @Param('id') id: string,
  ): Promise<Channel> {
-    if (isNewsletter(id)) {
+    if (isJidNewsletter(id)) {
      return session.channelsGetChannel(id);
    } else {
-      // https://www.whatsapp.com/channel/123 => 123
-      const inviteCode = id.split('/').pop();
+      const inviteCode = parseChannelInviteLink(id);
      return session.channelsGetChannelByInviteCode(inviteCode);
    }
  }

+  @Get(':id/messages/preview')
+  @SessionApiParam
+  @UsePipes(new WAHAValidationPipe())
+  @ApiParam({
+    name: 'id',
+    description: 'Channel id or invite code',
+    required: true,
+    type: 'string',
+    schema: {
+      default: '0029Va4K0PZ5a245NkngBA2M',
+    },
+  })
+  @ApiOperation({
+    summary: 'Preview channel messages',
+    description:
+      'You can use either ' +
+      'invite code (https://www.whatsapp.com/channel/123) or (123)' +
+      'OR' +
+      'Channel ID (123@newsletter).',
+  })
+  async previewChannelMessages(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('id') code: string,
+    @Query() query: PreviewChannelMessages,
+  ): Promise<ChannelMessage[]> {
+    if (isJidNewsletter(code)) {
+      const channel = await session.channelsGetChannel(code);
+      code = parseChannelInviteLink(channel.invite);
+    }
+    const inviteCode = parseChannelInviteLink(code);
+    return session.previewChannelMessages(inviteCode, query);
+  }
+
  @Post(':id/follow')
  @SessionApiParam
  @NewsletterIdApiParam
@@ -125,4 +177,49 @@ export class ChannelsController {
  ): Promise<void> {
    return session.channelsUnmuteChannel(id);
  }
+
+  @Post('/search/by-view')
+  @HttpCode(HttpStatus.OK)
+  @SessionApiParam
+  @UsePipes(new WAHAValidationPipe())
+  @ApiOperation({ summary: 'Search for channels (by view)' })
+  async searchByView(
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() request: ChannelSearchByView,
+  ): Promise<ChannelListResult> {
+    return session.searchChannelsByView(request);
+  }
+
+  @Post('/search/by-text')
+  @HttpCode(HttpStatus.OK)
+  @SessionApiParam
+  @UsePipes(new WAHAValidationPipe())
+  @ApiOperation({ summary: 'Search for channels (by text)' })
+  async searchByText(
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() request: ChannelSearchByText,
+  ): Promise<ChannelListResult> {
+    return session.searchChannelsByText(request);
+  }
+
+  @Get('/search/views')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get list of views for channel search' })
+  getSearchViews(): Promise<ChannelView[]> {
+    return this.channelsInfoService.getViews();
+  }
+
+  @Get('/search/countries')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get list of countries for channel search' })
+  getSearchCountries(): Promise<ChannelCountry[]> {
+    return this.channelsInfoService.getCountries();
+  }
+
+  @Get('/search/categories')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get list of categories for channel search' })
+  getSearchCategories(): Promise<ChannelCategory[]> {
+    return this.channelsInfoService.getCategories();
+  }
 }
@@ -21,15 +21,25 @@ import {

 import { SessionManager } from '../core/abc/manager.abc';
 import { WhatsappSession } from '../core/abc/session.abc';
-import { parseBool } from '../helpers';
 import {
+  ChatPictureQuery,
+  ChatPictureResponse,
  ChatsPaginationParams,
+  ChatSummary,
  GetChatMessageQuery,
  GetChatMessagesFilter,
  GetChatMessagesQuery,
+  MessageSortField,
+  OverviewBodyRequest,
+  OverviewFilter,
+  OverviewPaginationParams,
  PinMessageRequest,
+  ReadChatMessagesQuery,
+  ReadChatMessagesResponse,
+  transformAck,
 } from '../structures/chats.dto';
 import { EditMessageRequest } from '../structures/chatting.dto';
+import { SortOrder } from '@waha/structures/pagination.dto';

@ApiSecurity('api_key')
@Controller('api/:session/chats')
@@ -48,6 +58,35 @@ class ChatsController {
    return session.getChats(pagination);
  }

+  @Get('overview')
+  @SessionApiParam
+  @ApiOperation({
+    summary:
+      'Get chats overview. Includes all necessary things to build UI "your chats overview" page - chat id, name, picture, last message. Sorting by last message timestamp',
+  })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  getChatsOverview(
+    @WorkingSessionParam session: WhatsappSession,
+    @Query() pagination: OverviewPaginationParams,
+    @Query() filter: OverviewFilter,
+  ): Promise<ChatSummary[]> {
+    return session.getChatsOverview(pagination, filter);
+  }
+
+  @Post('overview')
+  @SessionApiParam
+  @ApiOperation({
+    summary:
+      'Get chats overview. Use POST if you have too many "ids" params - GET can limit it',
+  })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  postChatsOverview(
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() body: OverviewBodyRequest,
+  ): Promise<ChatSummary[]> {
+    return session.getChatsOverview(body.pagination, body.filter);
+  }
+
  @Delete(':chatId')
  @SessionApiParam
  @ApiOperation({ summary: 'Deletes the chat' })
@@ -59,6 +98,19 @@ class ChatsController {
    return session.deleteChat(chatId);
  }

+  @Get(':chatId/picture')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Gets chat picture' })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async getChatPicture(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('chatId') chatId: string,
+    @Query() query: ChatPictureQuery,
+  ): Promise<ChatPictureResponse> {
+    const url = await session.getContactProfilePicture(chatId, query.refresh);
+    return { url: url };
+  }
+
  @Get(':chatId/messages')
  @SessionApiParam
  @ApiOperation({ summary: 'Gets messages in the chat' })
@@ -70,9 +122,25 @@ class ChatsController {
    @WorkingSessionParam session: WhatsappSession,
    @Param('chatId') chatId: string,
  ) {
+    query.sortBy = query.sortBy || MessageSortField.TIMESTAMP;
+    query.sortOrder = query.sortOrder || SortOrder.DESC;
+    filter = transformAck(filter);
    return session.getChatMessages(chatId, query, filter);
  }

+  @Post(':chatId/messages/read')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Read unread messages in the chat' })
+  @ChatIdApiParam
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  readChatMessages(
+    @Query() query: ReadChatMessagesQuery,
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('chatId') chatId: string,
+  ): Promise<ReadChatMessagesResponse> {
+    return session.readChatMessages(chatId, query);
+  }
+
  @Get(':chatId/messages/:messageId')
  @SessionApiParam
  @ApiOperation({ summary: 'Gets message by id' })
@@ -10,21 +10,29 @@ import {
 } from '@nestjs/common';
 import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
 import { WAHAValidationPipe } from '@waha/nestjs/pipes/WAHAValidationPipe';
-import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
+import {
+  GetChatMessagesFilter,
+  ReadChatMessagesQuery,
+  transformAck,
+} from '@waha/structures/chats.dto';
 import { SendButtonsRequest } from '@waha/structures/chatting.buttons.dto';
+import { SendListRequest } from '@waha/structures/chatting.list.dto';

 import { SessionManager } from '../core/abc/manager.abc';
 import {
  ChatRequest,
  CheckNumberStatusQuery,
  GetMessageQuery,
+  MessageButtonReply,
  MessageContactVcardRequest,
  MessageFileRequest,
  MessageForwardRequest,
  MessageImageRequest,
+  MessageLinkCustomPreviewRequest,
  MessageLinkPreviewRequest,
  MessageLocationRequest,
  MessagePollRequest,
+  MessagePollVoteRequest,
  MessageReactionRequest,
  MessageReplyRequest,
  MessageStarRequest,
@@ -94,10 +102,30 @@ export class ChattingController {
    return whatsapp.sendVideo(request);
  }

+  @Post('/send/link-custom-preview')
+  @ApiOperation({
+    summary: 'Send a text message with a CUSTOM link preview.',
+    description:
+      'You can use regular /api/sendText if you wanna send auto-generated link preview.',
+  })
+  @UsePipes(new WAHAValidationPipe())
+  async sendLinkCustomPreview(
+    @Body() request: MessageLinkCustomPreviewRequest,
+  ): Promise<any> {
+    const whatsapp = await this.manager.getWorkingSession(request.session);
+    if (!request.text.includes(request.preview.url)) {
+      throw new Error(
+        '"text" must include the URL provided in the "preview.url"',
+      );
+    }
+    return whatsapp.sendLinkCustomPreview(request);
+  }
+
  @Post('/sendButtons')
  @ApiOperation({
-    summary: 'Send buttons (interactive message)',
+    summary: 'Send buttons message (interactive)',
    description: 'Send Buttons',
+    deprecated: true,
  })
  @UsePipes(new WAHAValidationPipe())
  async sendButtons(@Body() request: SendButtonsRequest) {
@@ -105,6 +133,17 @@ export class ChattingController {
    return whatsapp.sendButtons(request);
  }

+  @Post('/sendList')
+  @ApiOperation({
+    summary: 'Send a list message (interactive)',
+    description: 'Send a List message with sections and rows',
+  })
+  @UsePipes(new WAHAValidationPipe())
+  async sendList(@Body() request: SendListRequest) {
+    const whatsapp = await this.manager.getWorkingSession(request.session);
+    return whatsapp.sendList(request);
+  }
+
  @Post('/forwardMessage')
  async forwardMessage(
    @Body() request: MessageForwardRequest,
@@ -115,6 +154,15 @@ export class ChattingController {

  @Post('/sendSeen')
  async sendSeen(@Body() chat: SendSeenRequest) {
+    const hasMessageId = chat.messageIds?.length > 0 || Boolean(chat.messageId);
+    if (!hasMessageId) {
+      const whatsapp = await this.manager.getWorkingSession(chat.session);
+      const query: ReadChatMessagesQuery = {
+        messages: null,
+        days: 7,
+      };
+      return whatsapp.readChatMessages(chat.chatId, query);
+    }
    const whatsapp = await this.manager.getWorkingSession(chat.session);
    return whatsapp.sendSeen(chat);
  }
@@ -159,27 +207,37 @@ export class ChattingController {
    return whatsapp.sendPoll(request);
  }

+  @Post('/sendPollVote')
+  @ApiOperation({
+    summary: 'Vote on a poll',
+    description: 'Cast vote(s) on an existing poll message',
+  })
+  @UsePipes(new WAHAValidationPipe())
+  async sendPollVote(@Body() request: MessagePollVoteRequest) {
+    const whatsapp = await this.manager.getWorkingSession(request.session);
+    return whatsapp.sendPollVote(request);
+  }
+
  @Post('/sendLocation')
  async sendLocation(@Body() request: MessageLocationRequest) {
    const whatsapp = await this.manager.getWorkingSession(request.session);
    return whatsapp.sendLocation(request);
  }

-  @Post('/sendLinkPreview')
-  async sendLinkPreview(@Body() request: MessageLinkPreviewRequest) {
+  @Post('/sendContactVcard')
+  async sendContactVcard(@Body() request: MessageContactVcardRequest) {
    const whatsapp = await this.manager.getWorkingSession(request.session);
-    return whatsapp.sendLinkPreview(request);
+    return whatsapp.sendContactVCard(request);
  }

-  @Get('/messages')
-  @ApiOperation({ summary: 'Get messages in a chat' })
+  @Post('/send/buttons/reply')
+  @ApiOperation({
+    summary: 'Reply on a button message',
+  })
  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
-  async getMessages(
-    @Query() query: GetMessageQuery,
-    @Query() filter: GetChatMessagesFilter,
-  ) {
-    const whatsapp = await this.manager.getWorkingSession(query.session);
-    return whatsapp.getChatMessages(query.chatId, query, filter);
+  async sendButtonsReply(@Body() request: MessageButtonReply) {
+    const whatsapp = await this.manager.getWorkingSession(request.session);
+    return whatsapp.sendButtonsReply(request);
  }

  @Get('/sendText')
@@ -192,10 +250,20 @@ export class ChattingController {
    return whatsapp.sendText(msg);
  }

-  @Post('/sendContactVcard')
-  async sendContactVcard(@Body() request: MessageContactVcardRequest) {
-    const whatsapp = await this.manager.getWorkingSession(request.session);
-    return whatsapp.sendContactVCard(request);
+  @Get('/messages')
+  @ApiOperation({
+    summary: 'Get messages in a chat',
+    description: 'DEPRECATED. Use "GET /api/chats/{id}/messages" instead',
+    deprecated: true,
+  })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async getMessages(
+    @Query() query: GetMessageQuery,
+    @Query() filter: GetChatMessagesFilter,
+  ) {
+    filter = transformAck(filter);
+    const whatsapp = await this.manager.getWorkingSession(query.session);
+    return whatsapp.getChatMessages(query.chatId, query, filter);
  }

  @Get('/checkNumberStatus')
@@ -221,4 +289,11 @@ export class ChattingController {
    const whatsapp = await this.manager.getWorkingSession(request.session);
    return whatsapp.reply(request);
  }
+
+  @Post('/sendLinkPreview')
+  @ApiOperation({ deprecated: true })
+  async sendLinkPreview_DEPRECATED(@Body() request: MessageLinkPreviewRequest) {
+    const whatsapp = await this.manager.getWorkingSession(request.session);
+    return whatsapp.sendLinkPreview(request);
+  }
 }
@@ -16,6 +16,7 @@ import {
  WANumberExistResult,
 } from '../structures/chatting.dto';
 import {
+  ContactProfilePictureQuery,
  ContactQuery,
  ContactRequest,
  ContactsPaginationParams,
@@ -75,9 +76,14 @@ export class ContactsController {
    description:
      'If privacy settings do not allow to get the picture, the method will return null.',
  })
-  async getProfilePicture(@Query() query: ContactQuery) {
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async getProfilePicture(@Query() query: ContactProfilePictureQuery) {
    const whatsapp = await this.manager.getWorkingSession(query.session);
-    return whatsapp.getContactProfilePicture(query);
+    const url = await whatsapp.getContactProfilePicture(
+      query.contactId,
+      query.refresh,
+    );
+    return { profilePictureURL: url };
  }

  @Post('/block')
@@ -0,0 +1,50 @@
+import {
+  Body,
+  Controller,
+  Param,
+  Post,
+  UsePipes,
+  ValidationPipe,
+} from '@nestjs/common';
+import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
+import { WhatsappSession } from '@waha/core/abc/session.abc';
+import {
+  SessionApiParam,
+  WorkingSessionParam,
+} from '@waha/nestjs/params/SessionApiParam';
+
+import { SessionManager } from '../core/abc/manager.abc';
+import {
+  EventCancelRequest,
+  EventMessageRequest,
+} from '../structures/events.dto';
+import { WAMessage } from '../structures/responses.dto';
+
+@ApiSecurity('api_key')
+@Controller('api/:session/events')
+@ApiTags('📅 Events')
+export class EventsController {
+  constructor(private manager: SessionManager) {}
+
+  @Post()
+  @ApiOperation({ summary: 'Send an event message' })
+  @UsePipes(new ValidationPipe())
+  @SessionApiParam
+  async sendEvent(
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() request: EventMessageRequest,
+  ): Promise<WAMessage> {
+    return session.sendEvent(request);
+  }
+
+  // @Post(':id/cancel')
+  // @ApiOperation({ summary: 'Cancel an event by ID' })
+  // @UsePipes(new ValidationPipe())
+  // @SessionApiParam
+  // async cancelEvent(
+  //   @WorkingSessionParam session: WhatsappSession,
+  //   @Param('id') id: string,
+  // ): Promise<WAMessage> {
+  //   return session.cancelEvent(id);
+  // }
+}
@@ -3,9 +3,14 @@ import {
  Controller,
  Delete,
  Get,
+  HttpCode,
+  HttpStatus,
  Param,
  Post,
  Put,
+  Query,
+  UsePipes,
+  ValidationPipe,
 } from '@nestjs/common';
 import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
 import { GroupIdApiParam } from '@waha/nestjs/params/ChatIdApiParam';
@@ -13,12 +18,23 @@ import {
  SessionApiParam,
  WorkingSessionParam,
 } from '@waha/nestjs/params/SessionApiParam';
+import { CountResponse, Result } from '@waha/structures/base.dto';
+import {
+  ChatPictureQuery,
+  ChatPictureResponse,
+} from '@waha/structures/chats.dto';
+import { ProfilePictureRequest } from '@waha/structures/profile.dto';

 import { SessionManager } from '../core/abc/manager.abc';
-import { WhatsappSession } from '../core/abc/session.abc';
+import { parseGroupInviteLink, WhatsappSession } from '../core/abc/session.abc';
 import {
  CreateGroupRequest,
  DescriptionRequest,
+  GroupField,
+  GroupsListFields,
+  GroupsPaginationParams,
+  JoinGroupRequest,
+  JoinGroupResponse,
  ParticipantsRequest,
  SettingsSecurityChangeInfo,
  SubjectRequest,
@@ -40,11 +56,65 @@ export class GroupsController {
    return session.createGroup(request);
  }

+  @Get('join-info')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get info about the group before joining.' })
+  async joinInfoGroup(
+    @WorkingSessionParam session: WhatsappSession,
+    @Query() query: JoinGroupRequest,
+  ): Promise<any> {
+    const code = parseGroupInviteLink(query.code);
+    return session.joinInfoGroup(code);
+  }
+
+  @Post('join')
+  @HttpCode(HttpStatus.OK)
+  @SessionApiParam
+  @ApiOperation({ summary: 'Join group via code' })
+  async joinGroup(
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() request: JoinGroupRequest,
+  ): Promise<JoinGroupResponse> {
+    const code = parseGroupInviteLink(request.code);
+    const id = await session.joinGroup(code);
+    return { id: id };
+  }
+
  @Get('')
  @SessionApiParam
  @ApiOperation({ summary: 'Get all groups.' })
-  getGroups(@WorkingSessionParam session: WhatsappSession) {
-    return session.getGroups();
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async getGroups(
+    @WorkingSessionParam session: WhatsappSession,
+    @Query() pagination: GroupsPaginationParams,
+    @Query() fields: GroupsListFields,
+  ) {
+    let groups: any = await session.getGroups(pagination);
+    groups = session.filterGroupsFields(groups, fields);
+    return groups;
+  }
+
+  @Get('/count')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get the number of groups.' })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async getGroupsCount(
+    @WorkingSessionParam session: WhatsappSession,
+  ): Promise<CountResponse> {
+    const data: any = await session.getGroups({});
+    const groups: any[] = Array.isArray(data) ? data : Object.values(data);
+    return {
+      count: groups.length,
+    };
+  }
+
+  @Post('refresh')
+  @HttpCode(HttpStatus.OK)
+  @SessionApiParam
+  @ApiOperation({ summary: 'Refresh groups from the server.' })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async refreshGroups(@WorkingSessionParam session: WhatsappSession) {
+    return { success: await session.refreshGroups() };
  }

  @Get(':id')
@@ -58,6 +128,100 @@ export class GroupsController {
    return session.getGroup(id);
  }

+  @Delete(':id')
+  @SessionApiParam
+  @GroupIdApiParam
+  @ApiOperation({ summary: 'Delete the group.' })
+  deleteGroup(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('id') id: string,
+  ) {
+    return session.deleteGroup(id);
+  }
+
+  @Post(':id/leave')
+  @HttpCode(HttpStatus.OK)
+  @SessionApiParam
+  @GroupIdApiParam
+  @ApiOperation({ summary: 'Leave the group.' })
+  leaveGroup(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('id') id: string,
+  ) {
+    return session.leaveGroup(id);
+  }
+
+  @Get(':id/picture')
+  @SessionApiParam
+  @GroupIdApiParam
+  @ApiOperation({ summary: 'Get group picture' })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async getChatPicture(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('id') id: string,
+    @Query() query: ChatPictureQuery,
+  ): Promise<ChatPictureResponse> {
+    const url = await session.getContactProfilePicture(id, query.refresh);
+    return { url: url };
+  }
+
+  @Put(':id/picture')
+  @SessionApiParam
+  @GroupIdApiParam
+  @ApiOperation({ summary: 'Set group picture' })
+  async setPicture(
+    @Param('id') id: string,
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() request: ProfilePictureRequest,
+  ): Promise<Result> {
+    const success = await session.updateGroupPicture(id, request.file);
+    return { success: success ?? true };
+  }
+
+  @Delete(':id/picture')
+  @SessionApiParam
+  @GroupIdApiParam
+  @ApiOperation({ summary: 'Delete group picture' })
+  async deletePicture(
+    @Param('id') id: string,
+    @WorkingSessionParam session: WhatsappSession,
+  ): Promise<Result> {
+    const success = await session.updateGroupPicture(id, null);
+    return { success: success || true };
+  }
+
+  @Put(':id/description')
+  @ApiOperation({
+    summary: 'Updates the group description.',
+    description:
+      'Returns "true" if the subject was properly updated. This can return "false" if the user does not have the necessary permissions.',
+  })
+  @SessionApiParam
+  @GroupIdApiParam
+  setDescription(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('id') id: string,
+    @Body() request: DescriptionRequest,
+  ) {
+    return session.setDescription(id, request.description);
+  }
+
+  @Put(':id/subject')
+  @SessionApiParam
+  @GroupIdApiParam
+  @ApiOperation({
+    summary: 'Updates the group subject',
+    description:
+      'Returns "true" if the subject was properly updated. This can return "false" if the user does not have the necessary permissions.',
+  })
+  setSubject(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('id') id: string,
+    @Body() request: SubjectRequest,
+  ) {
+    return session.setSubject(id, request.subject);
+  }
+
  @Put(':id/settings/security/info-admin-only')
  @SessionApiParam
  @GroupIdApiParam
@@ -119,60 +283,6 @@ export class GroupsController {
    return session.getMessagesAdminsOnly(id);
  }

-  @Delete(':id')
-  @SessionApiParam
-  @GroupIdApiParam
-  @ApiOperation({ summary: 'Delete the group.' })
-  deleteGroup(
-    @WorkingSessionParam session: WhatsappSession,
-    @Param('id') id: string,
-  ) {
-    return session.deleteGroup(id);
-  }
-
-  @Post(':id/leave')
-  @SessionApiParam
-  @GroupIdApiParam
-  @ApiOperation({ summary: 'Leave the group.' })
-  leaveGroup(
-    @WorkingSessionParam session: WhatsappSession,
-    @Param('id') id: string,
-  ) {
-    return session.leaveGroup(id);
-  }
-
-  @Put(':id/description')
-  @ApiOperation({
-    summary: 'Updates the group description.',
-    description:
-      'Returns "true" if the subject was properly updated. This can return "false" if the user does not have the necessary permissions.',
-  })
-  @SessionApiParam
-  @GroupIdApiParam
-  setDescription(
-    @WorkingSessionParam session: WhatsappSession,
-    @Param('id') id: string,
-    @Body() request: DescriptionRequest,
-  ) {
-    return session.setDescription(id, request.description);
-  }
-
-  @Put(':id/subject')
-  @SessionApiParam
-  @GroupIdApiParam
-  @ApiOperation({
-    summary: 'Updates the group subject',
-    description:
-      'Returns "true" if the subject was properly updated. This can return "false" if the user does not have the necessary permissions.',
-  })
-  setSubject(
-    @WorkingSessionParam session: WhatsappSession,
-    @Param('id') id: string,
-    @Body() request: SubjectRequest,
-  ) {
-    return session.setSubject(id, request.subject);
-  }
-
  @Get(':id/invite-code')
  @SessionApiParam
  @GroupIdApiParam
@@ -185,6 +295,7 @@ export class GroupsController {
  }

  @Post(':id/invite-code/revoke')
+  @HttpCode(HttpStatus.OK)
  @SessionApiParam
  @GroupIdApiParam
  @ApiOperation({
@@ -210,6 +321,7 @@ export class GroupsController {
  }

  @Post(':id/participants/add')
+  @HttpCode(HttpStatus.OK)
  @SessionApiParam
  @GroupIdApiParam
  @ApiOperation({ summary: 'Add participants' })
@@ -222,6 +334,7 @@ export class GroupsController {
  }

  @Post(':id/participants/remove')
+  @HttpCode(HttpStatus.OK)
  @SessionApiParam
  @GroupIdApiParam
  @ApiOperation({
@@ -236,6 +349,7 @@ export class GroupsController {
  }

  @Post(':id/admin/promote')
+  @HttpCode(HttpStatus.OK)
  @SessionApiParam
  @GroupIdApiParam
  @ApiOperation({ summary: 'Promote participants to admin users.' })
@@ -248,6 +362,7 @@ export class GroupsController {
  }

  @Post(':id/admin/demote')
+  @HttpCode(HttpStatus.OK)
  @SessionApiParam
  @GroupIdApiParam
  @ApiOperation({ summary: 'Demotes participants to regular users.' })
@@ -0,0 +1,102 @@
+import {
+  Controller,
+  Get,
+  Param,
+  Query,
+  UnprocessableEntityException,
+  UsePipes,
+  ValidationPipe,
+} from '@nestjs/common';
+import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
+import { WhatsappSession } from '@waha/core/abc/session.abc';
+import {
+  SessionApiParam,
+  WorkingSessionParam,
+} from '@waha/nestjs/params/SessionApiParam';
+import { CountResponse } from '@waha/structures/base.dto';
+import {
+  LidsListQueryParams,
+  LidToPhoneNumber,
+} from '@waha/structures/lids.dto';
+import { PaginationParams, SortOrder } from '@waha/structures/pagination.dto';
+
+import { SessionManager } from '../core/abc/manager.abc';
+import { isLidUser } from '@waha/core/utils/jids';
+
+@ApiSecurity('api_key')
+@Controller('api/:session/lids')
+@ApiTags('👤 Contacts')
+export class LidsController {
+  constructor(private manager: SessionManager) {}
+
+  @Get('/')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get all known lids to phone number mapping' })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async getAll(
+    @WorkingSessionParam session: WhatsappSession,
+    @Query() params: LidsListQueryParams,
+  ): Promise<Array<LidToPhoneNumber>> {
+    // Always lid
+    const pagination: PaginationParams = params;
+    pagination.sortBy = 'lid';
+    pagination.sortOrder = SortOrder.ASC;
+    const lids = await session.getAllLids(pagination);
+    return lids;
+  }
+
+  @Get('/count')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get the number of known lids' })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async getLidsCount(
+    @WorkingSessionParam session: WhatsappSession,
+  ): Promise<CountResponse> {
+    const count = await session.getLidsCount();
+    return {
+      count: count,
+    };
+  }
+
+  @Get('/:lid')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get phone number by lid' })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async findPNByLid(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('lid') lid: string,
+  ): Promise<LidToPhoneNumber> {
+    if (!lid.includes('@')) {
+      lid = lid + '@lid';
+    }
+
+    if (!isLidUser(lid)) {
+      throw new UnprocessableEntityException(
+        'Invalid LID - it must end with @lid',
+      );
+    }
+    const result = await session.findPNByLid(lid);
+    result.pn = result.pn || null;
+    return result;
+  }
+
+  @Get('/pn/:phoneNumber')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get lid by phone number (chat id)' })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async findLIDByPhoneNumber(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('phoneNumber') phoneNumber: string,
+  ): Promise<LidToPhoneNumber> {
+    if (isLidUser(phoneNumber)) {
+      return {
+        lid: phoneNumber,
+        pn: null,
+      };
+    }
+
+    const result = await session.findLIDByPhoneNumber(phoneNumber);
+    result.lid = result.lid || null;
+    return result;
+  }
+}
@@ -0,0 +1,83 @@
+import {
+  Body,
+  Controller,
+  Post,
+  UnprocessableEntityException,
+  UseInterceptors,
+} from '@nestjs/common';
+import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
+import { SessionManager } from '@waha/core/abc/manager.abc';
+import { WAMimeType } from '@waha/core/media/WAMimeType';
+import { ApiFileAcceptHeader } from '@waha/nestjs/ApiFileAcceptHeader';
+import {
+  SessionApiParam,
+  WorkingSessionParam,
+} from '@waha/nestjs/params/SessionApiParam';
+import {
+  FileDTO,
+  VideoFileDTO,
+  VoiceFileDTO,
+} from '@waha/structures/media.dto';
+
+import { WhatsappSession } from '../core/abc/session.abc';
+import { BufferResponseInterceptor } from '../nestjs/BufferResponseInterceptor';
+
+@ApiSecurity('api_key')
+@Controller('api/:session/media')
+@ApiTags('🖼️ Media')
+class MediaController {
+  constructor(private manager: SessionManager) {}
+
+  @Post('convert/voice')
+  @ApiOperation({
+    summary: 'Convert voice to WhatsApp format (opus)',
+  })
+  @SessionApiParam
+  @UseInterceptors(
+    new BufferResponseInterceptor(WAMimeType.VOICE, 'output.opus'),
+  )
+  @ApiFileAcceptHeader(WAMimeType.VOICE)
+  async convertVoice(
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() file: VoiceFileDTO,
+  ): Promise<Buffer> {
+    const data = await this.buffer(session, file);
+    const content = await session.mediaConverter.voice(data);
+    return content;
+  }
+
+  @Post('convert/video')
+  @ApiOperation({
+    summary: 'Convert video to WhatsApp format (mp4)',
+  })
+  @SessionApiParam
+  @UseInterceptors(
+    new BufferResponseInterceptor(WAMimeType.VIDEO, 'output.mp4'),
+  )
+  @ApiFileAcceptHeader(WAMimeType.VIDEO)
+  async convertVideo(
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() file: VideoFileDTO,
+  ): Promise<Buffer> {
+    const data = await this.buffer(session, file);
+    const content = await session.mediaConverter.video(data);
+    return content;
+  }
+
+  private async buffer(
+    session: WhatsappSession,
+    file: FileDTO,
+  ): Promise<Buffer> {
+    if ('url' in file) {
+      return session.fetch(file.url);
+    } else if ('data' in file) {
+      return Buffer.from(file.data, 'base64');
+    } else {
+      throw new UnprocessableEntityException(
+        'Either "url" or "data" must be specified.',
+      );
+    }
+  }
+}
+
+export { MediaController };
@@ -0,0 +1,94 @@
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  Put,
+  UnprocessableEntityException,
+  UsePipes,
+} from '@nestjs/common';
+import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
+import { SessionManager } from '@waha/core/abc/manager.abc';
+import { WhatsappSession } from '@waha/core/abc/session.abc';
+import {
+  SessionApiParam,
+  WorkingSessionParam,
+} from '@waha/nestjs/params/SessionApiParam';
+import { WAHAValidationPipe } from '@waha/nestjs/pipes/WAHAValidationPipe';
+import { Result } from '@waha/structures/base.dto';
+import {
+  MyProfile,
+  ProfileNameRequest,
+  ProfilePictureRequest,
+  ProfileStatusRequest,
+} from '@waha/structures/profile.dto';
+
+@ApiSecurity('api_key')
+@Controller('api/:session/profile')
+@ApiTags('🆔 Profile')
+export class ProfileController {
+  constructor(private manager: SessionManager) {}
+
+  @Get('')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get my profile' })
+  async getMyProfile(
+    @WorkingSessionParam session: WhatsappSession,
+  ): Promise<MyProfile> {
+    const me = session.getSessionMeInfo();
+    if (!me) {
+      throw new UnprocessableEntityException('No profile found');
+    }
+    const picture = await session.getContactProfilePicture(me.id, false);
+    return {
+      id: me.id,
+      name: me.pushName,
+      picture: picture || null,
+    };
+  }
+
+  @Put('/name')
+  @SessionApiParam
+  @UsePipes(new WAHAValidationPipe())
+  @ApiOperation({ summary: 'Set my profile name' })
+  async setProfileName(
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() request: ProfileNameRequest,
+  ): Promise<Result> {
+    const success = await session.setProfileName(request.name);
+    return { success: success ?? true };
+  }
+
+  @Put('/status')
+  @SessionApiParam
+  @UsePipes(new WAHAValidationPipe())
+  @ApiOperation({ summary: 'Set profile status (About)' })
+  async setProfileStatus(
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() request: ProfileStatusRequest,
+  ): Promise<Result> {
+    const success = await session.setProfileStatus(request.status);
+    return { success: success ?? true };
+  }
+
+  @Put('/picture')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Set profile picture' })
+  async setProfilePicture(
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() request: ProfilePictureRequest,
+  ): Promise<Result> {
+    const success = await session.updateProfilePicture(request.file);
+    return { success: success ?? true };
+  }
+
+  @Delete('/picture')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Delete profile picture' })
+  async deleteProfilePicture(
+    @WorkingSessionParam session: WhatsappSession,
+  ): Promise<Result> {
+    const success = await session.updateProfilePicture(null);
+    return { success: success || true };
+  }
+}
@@ -21,8 +21,8 @@ export class ScreenshotController {
  constructor(private manager: SessionManager) {}

  @Get('/screenshot')
-  @UseInterceptors(new BufferResponseInterceptor())
-  @ApiFileAcceptHeader()
+  @UseInterceptors(new BufferResponseInterceptor('image/jpeg'))
+  @ApiFileAcceptHeader('image/jpeg')
  async screenshot(
    @Res({ passthrough: true }) res: Response,
    @Query() sessionQuery: SessionQuery,
@@ -1,15 +1,12 @@
 import * as process from 'node:process';
-import * as v8 from 'node:v8';

 import {
  Body,
  Controller,
  Get,
  Logger,
-  NotFoundException,
  Post,
  Query,
-  StreamableFile,
  UsePipes,
 } from '@nestjs/common';
 import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
@@ -112,34 +109,3 @@ export class ServerController {
    return { stopping: true };
  }
 }
-
-@ApiSecurity('api_key')
-@Controller('api/server/debug')
-@ApiTags('🔍 Observability')
-export class ServerDebugController {
-  private logger: Logger;
-  private readonly enabled: boolean;
-
-  constructor(protected config: WhatsappConfigService) {
-    this.logger = new Logger('ServerDebugController');
-    this.enabled = this.config.debugModeEnabled;
-  }
-
-  @Get('heapsnapshot')
-  @ApiOperation({
-    summary: 'Return a heapsnapshot',
-    description: "Return a heapsnapshot of the server's memory",
-  })
-  async heapsnapshot() {
-    if (!this.enabled) {
-      throw new NotFoundException('WAHA_DEBUG_MODE is disabled');
-    }
-    this.logger.log('Creating a heap snapshot...');
-    const heap = v8.getHeapSnapshot();
-    const fileName = `${Date.now()}.heapsnapshot`;
-    return new StreamableFile(heap, {
-      type: 'application/octet-stream',
-      disposition: `attachment; filename=${fileName}`,
-    });
-  }
-}
@@ -0,0 +1,79 @@
+import * as v8 from 'node:v8';
+
+import {
+  Controller,
+  Get,
+  Logger,
+  NotFoundException,
+  Query,
+  StreamableFile,
+  UsePipes,
+} from '@nestjs/common';
+import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
+import { WhatsappConfigService } from '@waha/config.service';
+import { SessionManager } from '@waha/core/abc/manager.abc';
+import { WhatsappSession } from '@waha/core/abc/session.abc';
+import {
+  SessionApiParam,
+  WorkingSessionParam,
+} from '@waha/nestjs/params/SessionApiParam';
+import { WAHAValidationPipe } from '@waha/nestjs/pipes/WAHAValidationPipe';
+import { BrowserTraceQuery } from '@waha/structures/server.debug.dto';
+import { createReadStream } from 'fs';
+
+@ApiSecurity('api_key')
+@Controller('api/server/debug')
+@ApiTags('🔍 Observability')
+export class ServerDebugController {
+  private logger: Logger;
+  private readonly enabled: boolean;
+
+  constructor(
+    private config: WhatsappConfigService,
+    private manager: SessionManager,
+  ) {
+    this.logger = new Logger('ServerDebugController');
+    this.enabled = this.config.debugModeEnabled;
+  }
+
+  @Get('heapsnapshot')
+  @ApiOperation({
+    summary: 'Return a heapsnapshot for the current nodejs process',
+    description: "Return a heapsnapshot of the server's memory",
+  })
+  async heapsnapshot() {
+    if (!this.enabled) {
+      throw new NotFoundException('WAHA_DEBUG_MODE is disabled');
+    }
+    this.logger.log('Creating a heap snapshot...');
+    const heap = v8.getHeapSnapshot();
+    const fileName = `${Date.now()}.heapsnapshot`;
+    return new StreamableFile(heap, {
+      type: 'application/octet-stream',
+      disposition: `attachment; filename=${fileName}`,
+    });
+  }
+
+  @Get('browser/trace/:session')
+  @ApiOperation({
+    summary: 'Collect and get a trace.json for Chrome DevTools ',
+    description: 'Uses https://pptr.dev/api/puppeteer.tracing',
+  })
+  @SessionApiParam
+  @UsePipes(new WAHAValidationPipe())
+  async browserTrace(
+    @WorkingSessionParam session: WhatsappSession,
+    @Query() query: BrowserTraceQuery,
+  ) {
+    if (!this.enabled) {
+      throw new NotFoundException('WAHA_DEBUG_MODE is disabled');
+    }
+    const filepath = await session.browserTrace(query);
+    const stream = createReadStream(filepath);
+    const filename = `trace - ${session.name} - ${new Date()}.json`;
+    return new StreamableFile(stream, {
+      type: 'application/octet-stream',
+      disposition: `attachment; filename=${filename}`,
+    });
+  }
+}
@@ -209,16 +209,7 @@ class SessionsController {
  })
  @UsePipes(new WAHAValidationPipe())
  async restart(@Param('session') name: string): Promise<SessionDTO> {
-    await this.withLock(name, async () => {
-      const exists = await this.manager.exists(name);
-      if (!exists) {
-        throw new NotFoundException('Session not found');
-      }
-      await this.manager.assign(name);
-      await this.manager.stop(name, true);
-      await this.manager.start(name);
-    });
-
+    await this.manager.restart(name);
    return await this.manager.getSessionInfo(name);
  }

@@ -233,6 +224,9 @@ class SessionsController {
    @Body() request: SessionStartDeprecatedRequest,
  ): Promise<SessionDTO> {
    const name = request.name;
+    if (!request.name) {
+      throw new UnprocessableEntityException('Session name is required');
+    }
    if (this.manager.isRunning(name)) {
      const msg = `Session '${name}' is already started.`;
      throw new UnprocessableEntityException(msg);
@@ -255,6 +249,9 @@ class SessionsController {
  async DEPRECATED_stop(
    @Body() request: SessionStopDeprecatedRequest,
  ): Promise<void> {
+    if (!request.name) {
+      throw new UnprocessableEntityException('Session name is required');
+    }
    const name = request.name;
    if (request.logout) {
      // Old API did remove the session complete
@@ -283,6 +280,9 @@ class SessionsController {
  async DEPRECATED_logout(
    @Body() request: SessionLogoutDeprecatedRequest,
  ): Promise<void> {
+    if (!request.name) {
+      throw new UnprocessableEntityException('Session name is required');
+    }
    const name = request.name;
    await this.withLock(name, async () => {
      await this.manager.unassign(name);
@@ -1,9 +1,10 @@
-import { Body, Controller, Post } from '@nestjs/common';
+import { Body, Controller, Get, Post } from '@nestjs/common';
 import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
 import {
  SessionApiParam,
  WorkingSessionParam,
 } from '@waha/nestjs/params/SessionApiParam';
+import { NewMessageIDResponse } from '@waha/structures/chatting.dto';

 import { SessionManager } from '../core/abc/manager.abc';
 import { WhatsappSession } from '../core/abc/session.abc';
@@ -70,6 +71,18 @@ class StatusController {
  ) {
    return session.deleteStatus(status);
  }
+
+  @Get('new-message-id')
+  @SessionApiParam
+  @ApiOperation({
+    summary: 'Generate message ID you can use to batch contacts',
+  })
+  async getNewMessageId(
+    @WorkingSessionParam session: WhatsappSession,
+  ): Promise<NewMessageIDResponse> {
+    const id = await session.generateNewMessageId();
+    return { id: id };
+  }
 }

 export { StatusController };
@@ -12,6 +12,7 @@ import {
  WebSocketServer,
 } from '@nestjs/websockets';
 import { SessionManager } from '@waha/core/abc/manager.abc';
+import { WebSocketAuth } from '@waha/core/auth/WebSocketAuth';
 import { WebsocketHeartbeatJob } from '@waha/nestjs/ws/WebsocketHeartbeatJob';
 import { WebSocket } from '@waha/nestjs/ws/ws';
 import { WAHAEvents, WAHAEventsWild } from '@waha/structures/enums.dto';
@@ -21,6 +22,15 @@ import { IncomingMessage } from 'http';
 import * as url from 'url';
 import { Server } from 'ws';

+export enum WebSocketCloseCode {
+  NORMAL = 1000,
+  GOING_AWAY = 1001,
+  PROTOCOL_ERROR = 1002,
+  UNSUPPORTED_DATA = 1003,
+  POLICY_VIOLATION = 1008,
+  INTERNAL_ERROR = 1011,
+}
+
@WebSocketGateway({
  path: '/ws',
  cors: true,
@@ -32,7 +42,7 @@ export class WebsocketGatewayCore
    OnGatewayDisconnect,
    BeforeApplicationShutdown
 {
-  HEARTBEAT_INTERVAL = 10_000;
+  HEARTBEAT_INTERVAL = 60_000;

  @WebSocketServer()
  server: Server;
@@ -41,7 +51,10 @@ export class WebsocketGatewayCore
  private heartbeat: WebsocketHeartbeatJob;
  private eventUnmask = new EventWildUnmask(WAHAEvents, WAHAEventsWild);

-  constructor(private manager: SessionManager) {
+  constructor(
+    private manager: SessionManager,
+    private auth: WebSocketAuth,
+  ) {
    this.logger = new Logger('WebsocketGateway');
    this.heartbeat = new WebsocketHeartbeatJob(
      this.logger,
@@ -51,21 +64,35 @@ export class WebsocketGatewayCore

  handleConnection(socket: WebSocket, request: IncomingMessage, ...args): any {
    // wsc - websocket client
-    const id = generatePrefixedId('wsc');
-    socket.id = id;
-    this.logger.debug(`New client connected: ${request.url}`);
+    socket.id = generatePrefixedId('wsc');
+
+    if (!this.auth.validateRequest(request)) {
+      // Not authorized - close connection
+      socket.close(WebSocketCloseCode.POLICY_VIOLATION, 'Unauthorized');
+      this.logger.debug(
+        `Unauthorized websocket connection attempt: ${request.url} - ${socket.id}`,
+      );
+      return;
+    }
+
+    this.logger.debug(`New client connected: ${request.url} - ${socket.id}`);
    const params = this.getParams(request);
    const session: string = params.session;
    const events: WAHAEvents[] = params.events;
    this.logger.debug(
-      `Client connected to session: '${session}', events: ${events}, ${id}`,
+      `Client connected to session: '${session}', events: ${events}, ${socket.id}`,
    );

    const sub = this.manager
      .getSessionEvents(session, events)
      .subscribe((data) => {
        this.logger.debug(`Sending data to client, event.id: ${data.id}`, data);
-        socket.send(JSON.stringify(data));
+        socket.send(JSON.stringify(data), (err) => {
+          if (!err) {
+            return;
+          }
+          this.logger.error(`Error sending data to client: ${err}`);
+        });
      });
    socket.on('close', () => {
      this.logger.debug(`Client disconnected - ${socket.id}`);
@@ -91,17 +118,10 @@ 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
    this.logger.log('Websocket server is down');
-    this.heartbeat?.stop();
  }

  afterInit(server: Server) {
@@ -0,0 +1,74 @@
+import { JOB_DELAY, JOB_LOCK_TTL } from '@waha/apps/app_sdk/constants';
+import { JobLoggerWrapper } from '@waha/apps/app_sdk/JobLoggerWrapper';
+import { RMutexService } from '@waha/modules/rmutex/rmutex.service';
+import { BaseWorkerHost } from '@waha/utils/bull/BaseWorkerHost';
+import { Job } from 'bullmq';
+import { DelayedError } from 'bullmq';
+import { PinoLogger } from 'nestjs-pino';
+import { Logger } from 'pino';
+
+export interface JobDataTimeout {
+  timeout?: {
+    job?: number;
+  };
+}
+
+/**
+ * Base class for app consumers that provides common functionality
+ * like mutex locking, logging setup, and error handling.
+ */
+export abstract class AppConsumer extends BaseWorkerHost {
+  protected readonly logger: Logger;
+
+  constructor(
+    appName: string,
+    componentName: string,
+    log: PinoLogger,
+    protected readonly rmutex: RMutexService,
+  ) {
+    super();
+    this.logger = log.logger.child({
+      app: appName,
+      component: componentName,
+    });
+  }
+
+  protected signal(job) {
+    if (job.data?.timeout?.job != null) {
+      return AbortSignal.timeout(job.data?.timeout?.job);
+    }
+    // Aka never abort
+    return new AbortController().signal;
+  }
+
+  /**
+   * Executes a job with mutex locking to ensure only one job processes a specific resource at a time.
+   * @param job The job to process
+   * @param mutexKey The key to use for mutex locking
+   * @param processor The function that processes the job
+   * @returns The result of the processor function
+   */
+  protected async withMutex<T, R>(
+    job: Job<T, R, any>,
+    mutexKey: string,
+    processor: () => Promise<R>,
+  ): Promise<R> {
+    const mutex = this.rmutex.get(mutexKey, JOB_LOCK_TTL);
+    const lock = await mutex.lock();
+
+    if (!lock) {
+      const logger = new JobLoggerWrapper(job, this.logger);
+      logger.debug(
+        `Postponing job '${job.id}' for ${JOB_DELAY}ms, another job is already running the mutex.key='${mutexKey}'`,
+      );
+      await job.moveToDelayed(Date.now() + JOB_DELAY);
+      throw new DelayedError();
+    }
+
+    try {
+      return await processor();
+    } finally {
+      await lock.release();
+    }
+  }
+}
@@ -0,0 +1,58 @@
+import { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
+
+import { ILogger } from './ILogger';
+
+export class AxiosLogging {
+  constructor(private readonly logger: ILogger) {}
+
+  applyTo(instance: AxiosInstance) {
+    instance.interceptors.request.use(this.onRequest.bind(this));
+    instance.interceptors.response.use(
+      this.onResponse.bind(this),
+      this.onError.bind(this),
+    );
+  }
+
+  private onRequest(config: AxiosRequestConfig) {
+    const method = config.method?.toUpperCase() ?? 'GET';
+    const url = config.url ?? '';
+    const query = config.params
+      ? `?${new URLSearchParams(config.params).toString()}`
+      : '';
+    const body = config.data ? JSON.stringify(config.data) : '';
+
+    this.logger.debug(`${method} ${url}${query} ${body}`);
+    return config;
+  }
+
+  private onResponse(response: AxiosResponse) {
+    const { method, url } = response.config;
+    const status = response.status;
+    const methodStr = method?.toUpperCase() ?? 'GET';
+    const responseData = JSON.stringify(response.data);
+
+    if (status >= 200 && status < 400) {
+      this.logger.debug(`${methodStr} ${status}:OK ${url}`);
+      this.logger.trace(`${methodStr} ${status}:OK ${url} ${responseData}`);
+    } else {
+      this.logger.warn(`${methodStr} ${status} ${url} ${responseData}`);
+    }
+
+    return response;
+  }
+
+  private onError(error: any) {
+    if (error.response) {
+      const { method, url } = error.config;
+      const status = error.response.status;
+      const message = `${
+        method?.toUpperCase() ?? 'GET'
+      } ${status} ${url} ${JSON.stringify(error.response.data)}`;
+      this.logger.error(message);
+    } else {
+      this.logger.error(`Axios error: ${error.message}`);
+    }
+
+    return Promise.reject(error);
+  }
+}
@@ -0,0 +1,26 @@
+import { BullMQAdapter } from '@bull-board/api/bullMQAdapter';
+import { BullBoardModule } from '@bull-board/nestjs';
+import { BullModule } from '@nestjs/bullmq';
+import { RegisterQueueOptions } from '@nestjs/bullmq/dist/interfaces/register-queue-options.interface';
+import { DynamicModule } from '@nestjs/common';
+
+/**
+ * Registers a queue with both BullModule and BullBoardModule
+ * This ensures that whenever a queue is registered, it's also added to the Bull Board
+ *
+ * @param options Queue options including name
+ * @returns An array of dynamic modules for both BullModule and BullBoardModule
+ */
+export function RegisterAppQueue(
+  options: RegisterQueueOptions,
+): DynamicModule[] {
+  return [
+    BullModule.registerQueue({
+      ...options,
+    }),
+    BullBoardModule.forFeature({
+      name: options.name,
+      adapter: BullMQAdapter,
+    }),
+  ];
+}
@@ -0,0 +1,8 @@
+export interface ILogger {
+  fatal(log: string): void;
+  error(log: string): void;
+  warn(log: string): void;
+  info(log: string): void;
+  debug(log: string): void;
+  trace(log: string): void;
+}
@@ -0,0 +1,58 @@
+import { Job } from 'bullmq';
+import { Logger } from 'pino';
+
+import { ILogger } from './ILogger';
+
+/**
+ * JobLoggerWrapper is a wrapper around the BullMQ Job class that provides
+ * a logger with the job ID as a child context.
+ * It allows logging messages to the job's log
+ * and also to the logger itself.
+ */
+export class JobLoggerWrapper implements ILogger {
+  private readonly logger: Logger;
+
+  constructor(
+    private job: Job,
+    logger: Logger,
+  ) {
+    this.logger = logger.child({ jobId: job.id });
+  }
+
+  fatal(log: string): void {
+    this.log(log, 'fatal');
+  }
+
+  error(log: string): void {
+    this.log(log, 'error');
+  }
+
+  warn(log: string): void {
+    this.log(log, 'warn');
+  }
+
+  info(log: string): void {
+    this.log(log, 'info');
+  }
+
+  debug(log: string): void {
+    this.log(log, 'debug');
+  }
+
+  trace(log: string): void {
+    this.log(log, 'trace');
+  }
+
+  private log(msg: string, level: string) {
+    if (!this.logger.isLevelEnabled(level)) {
+      return;
+    }
+    this.logger[level](msg);
+    const timestamp = new Date().toISOString();
+    this.job
+      .log(`[${timestamp}] ${level.toUpperCase()}: ${msg}`)
+      .catch((err) => {
+        this.logger.error('Error logging message to job', err);
+      });
+  }
+}
@@ -0,0 +1,94 @@
+import { Backoffs, Job } from 'bullmq';
+import { FlowJob } from 'bullmq/dist/esm/interfaces';
+
+/**
+ * Calculates the delay until the next attempt for a job.
+ *
+ * @param job The job to calculate the next attempt delay for
+ * @returns The delay in milliseconds, or null if there is no next attempt or backoff is not set
+ */
+export function NextAttemptDelayInMs(job: Job): number | null {
+  const attemptsMade = job.attemptsMade + 1;
+  const maxAttempts = job.opts?.attempts || 1;
+  // If this is the last attempt, return null
+  if (attemptsMade >= maxAttempts) {
+    return null;
+  }
+  // Normalize the backoff options
+  const backoff = Backoffs.normalize(job.opts.backoff);
+  if (!backoff) {
+    return null;
+  }
+  // Calculate the delay using Backoffs.calculate
+  const delay = Backoffs.calculate(backoff, attemptsMade, new Error(), job);
+  // The delay can be a Promise, a number, or undefined
+  if (delay === undefined) {
+    return null;
+  }
+  // If it's a Promise, we can't handle it synchronously, so return null
+  if (delay instanceof Promise) {
+    return null;
+  }
+  return delay;
+}
+
+export function NextAttemptDelayInWholeSeconds(job: Job) {
+  const delay = NextAttemptDelayInMs(job);
+  if (delay == null) {
+    return null;
+  }
+  return Math.round(delay / 1000);
+}
+
+/**
+ * Checks if a job has been retried (not on its first attempt).
+ *
+ * @param job The job to check
+ * @returns True if the job has been retried (attemptsMade > 1), false otherwise
+ */
+export function HasBeenRetried(job: Job): boolean {
+  const attemptsMade = job.attemptsMade + 1;
+  return attemptsMade > 1;
+}
+
+let base =
+  process.env.WAHA_PUBLIC_URL ||
+  process.env.WAHA_BASE_URL ||
+  'http://localhost:3000';
+// cut / at the end
+base = base.replace(/\/+$/, '');
+
+export function JobLink(job: Job): { text: string; url: string } {
+  const text = `${job.queueName} => ${job.id}`;
+  const queue = encodeURIComponent(job.queueName);
+  const id = encodeURIComponent(job.id);
+  const url = `${base}/jobs/queue/${queue}/${id}`;
+  return { text: text, url: url };
+}
+
+/**
+ * Chain jobs so that they run one at a time
+ * A | B | C
+ * to
+ * A -> B -> C
+ */
+export function ChainJobsOneAtATime(jobs: FlowJob[]): FlowJob {
+  if (jobs.length == 0) {
+    throw new Error('No jobs provided');
+  }
+
+  for (const job of jobs) {
+    if (job.children.length != 0) {
+      throw new Error('Jobs with children are not supported');
+    }
+  }
+  const left = [...jobs];
+  const root = left.pop();
+  let parent = root;
+  while (left.length != 0) {
+    const job = left.pop();
+    parent.children = [job];
+    parent = job;
+  }
+  return root;
+}
@@ -0,0 +1,79 @@
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  Inject,
+  NotFoundException,
+  Param,
+  Post,
+  Put,
+  Query,
+  UsePipes,
+} from '@nestjs/common';
+import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
+import {
+  AppsService,
+  IAppsService,
+} from '@waha/apps/app_sdk/services/IAppsService';
+import { SessionManager } from '@waha/core/abc/manager.abc';
+import { WAHAValidationPipe } from '@waha/nestjs/pipes/WAHAValidationPipe';
+
+import { App } from '../dto/app.dto';
+import { ListAppsQuery } from '../dto/query.dto';
+
+@ApiSecurity('api_key')
+@Controller('api/apps')
+@ApiTags('🧩 Apps')
+export class AppsController {
+  constructor(
+    @Inject(AppsService)
+    private appsService: IAppsService,
+    private manager: SessionManager,
+  ) {}
+
+  @Get('/')
+  @ApiOperation({ summary: 'List all apps for a session' })
+  @UsePipes(new WAHAValidationPipe())
+  async list(
+    @Query(new WAHAValidationPipe()) query: ListAppsQuery,
+  ): Promise<App[]> {
+    return this.appsService.list(this.manager, query.session);
+  }
+
+  @Post('/')
+  @ApiOperation({ summary: 'Create a new app' })
+  @UsePipes(new WAHAValidationPipe())
+  async create(@Body() app: App): Promise<App> {
+    return await this.appsService.create(this.manager, app);
+  }
+
+  @Get('/:id')
+  @ApiOperation({ summary: 'Get app by ID' })
+  @UsePipes(new WAHAValidationPipe())
+  async get(@Param('id') id: string): Promise<App> {
+    return await this.appsService.get(this.manager, id);
+  }
+
+  @Put('/:id')
+  @ApiOperation({ summary: 'Update an existing app' })
+  @UsePipes(new WAHAValidationPipe())
+  async update(@Param('id') id: string, @Body() app: App): Promise<App> {
+    if (!app.id) {
+      app.id = id;
+    } else if (app.id !== id) {
+      throw new NotFoundException(
+        `App ID in path (${id}) does not match ID in body (${app.id})`,
+      );
+    }
+
+    return await this.appsService.update(this.manager, app);
+  }
+
+  @Delete('/:id')
+  @ApiOperation({ summary: 'Delete an app' })
+  @UsePipes(new WAHAValidationPipe())
+  async delete(@Param('id') id: string): Promise<void> {
+    await this.appsService.delete(this.manager, id);
+  }
+}
@@ -0,0 +1,25 @@
+import * as process from 'node:process';
+
+import { parseBool } from '@waha/helpers';
+import * as basicAuth from 'express-basic-auth';
+import { Auth } from '@waha/core/auth/config';
+
+export function BullAuthMiddleware() {
+  let username = Auth.dashboard.username.value || '';
+  let password = Auth.dashboard.password.value || '';
+  if (process.env.WAHA_DASHBOARD_ENABLED) {
+    const enabled = parseBool(process.env.WAHA_DASHBOARD_ENABLED);
+    if (!enabled) {
+      // Generate a random uuid4 username/password to effectively disable access
+      username = 'admin';
+      password = crypto.randomUUID();
+    }
+  }
+
+  return basicAuth({
+    challenge: true,
+    users: {
+      [String(username)]: String(password),
+    },
+  });
+}
@@ -0,0 +1,42 @@
+import { DefaultJobOptions } from 'bullmq';
+
+export const JOB_DELAY = 1_000;
+export const JOB_LOCK_TTL = 20_000;
+export const JOB_CONCURRENCY =
+  parseInt(process.env.WAHA_APPS_JOBS_CONCURRENCY) || 50;
+
+function jobRemoveOptions() {
+  // in seconds
+  const HOUR = 60 * 60;
+  const DAY = 24 * HOUR;
+  return {
+    removeOnComplete: {
+      age:
+        parseInt(process.env.WAHA_APPS_JOBS_REMOVE_ON_COMPLETE_AGE) || 3 * DAY,
+      count:
+        parseInt(process.env.WAHA_APPS_JOBS_REMOVE_ON_COMPLETE_COUNT) || 1000,
+    },
+    removeOnFail: {
+      age: parseInt(process.env.WAHA_APPS_JOBS_REMOVE_ON_FAIL_AGE) || 31 * DAY,
+      count: parseInt(process.env.WAHA_APPS_JOBS_REMOVE_ON_FAIL_COUNT) || 1000,
+    },
+  };
+}
+
+export const JobRemoveOptions = jobRemoveOptions();
+
+export const ExponentialRetriesJobOptions: DefaultJobOptions = {
+  attempts: 3,
+  backoff: {
+    type: 'exponential',
+    delay: 1000,
+  },
+};
+
+export const NoRetriesJobOptions: DefaultJobOptions = {
+  attempts: 1,
+};
+
+export function merge(...args: any[]) {
+  return Object.assign({}, ...args);
+}
@@ -0,0 +1,60 @@
+import { ChatWootAppConfig } from '@waha/apps/chatwoot/dto/config.dto';
+import { Type } from 'class-transformer';
+import {
+  IsBoolean,
+  IsEnum,
+  IsOptional,
+  IsString,
+  ValidateNested,
+} from 'class-validator';
+import { ApiExtraModels, ApiProperty } from '@nestjs/swagger';
+
+export type AllowedAppConfig = ChatWootAppConfig;
+
+export enum AppName {
+  chatwoot = 'chatwoot',
+}
+
+@ApiExtraModels(ChatWootAppConfig)
+export class App<T extends AllowedAppConfig = any> {
+  @IsString()
+  id: string;
+
+  @IsString()
+  session: string;
+
+  // App name (aka type)
+  @IsEnum(AppName)
+  app: AppName;
+
+  @ApiProperty({
+    description:
+      'Enable or disable this app without deleting it. If omitted, treated as enabled (true).',
+    required: false,
+    default: true,
+  })
+  @IsOptional()
+  @IsBoolean()
+  enabled?: boolean = true;
+
+  @ValidateNested()
+  @Type((options) => {
+    if (options && options.object && options.object.app) {
+      switch (options.object.app) {
+        case AppName.chatwoot:
+          return ChatWootAppConfig;
+        default:
+          return Object;
+      }
+    }
+    return Object;
+  })
+  config: T;
+}
+
+export class ChatWootAppDto extends App<ChatWootAppConfig> {
+  @Type(() => ChatWootAppConfig)
+  config: ChatWootAppConfig;
+}
+
+export type AppDto = ChatWootAppDto;
@@ -0,0 +1,13 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsNotEmpty, IsString } from 'class-validator';
+
+export class ListAppsQuery {
+  @ApiProperty({
+    example: 'default',
+    required: true,
+    description: 'Session name to list apps for',
+  })
+  @IsString()
+  @IsNotEmpty()
+  session: string;
+}
@@ -0,0 +1,12 @@
+import { ILogger } from '@waha/apps/app_sdk/ILogger';
+
+export function JestLogger(): ILogger {
+  return {
+    fatal: jest.fn(),
+    error: jest.fn(),
+    warn: jest.fn(),
+    info: jest.fn(),
+    debug: jest.fn(),
+    trace: jest.fn(),
+  };
+}
@@ -0,0 +1,29 @@
+import * as path from 'node:path';
+
+import { Knex } from 'knex';
+
+function migrateSDK(knex: Knex): Promise<any> {
+  const config = {
+    directory: `${__dirname}/migrations`,
+    tableName: 'apps_migrations',
+    loadExtensions: ['.js'],
+  };
+  return knex.migrate.latest(config);
+}
+
+function migrateApp(knex: Knex, app: string): Promise<any> {
+  // one level upp
+  const appsDirectory = path.join(__dirname, '..', '..', 'apps');
+  const directory = path.join(appsDirectory, app, 'migrations');
+  const config = {
+    directory: directory,
+    tableName: `app_${app}_migrations`,
+    loadExtensions: ['.js'],
+  };
+  return knex.migrate.latest(config);
+}
+
+export async function migrate(knex: Knex) {
+  await migrateSDK(knex);
+  await migrateApp(knex, 'chatwoot');
+}
@@ -0,0 +1,22 @@
+import { Knex } from 'knex';
+
+exports.up = function (knex: Knex) {
+  return knex.schema
+    .createTable('apps', function (table) {
+      table.increments('pk');
+      table.string('id', 64);
+      table.string('session', 64);
+      table.string('app', 64);
+      table.json('config');
+    })
+    .table('apps', function (table) {
+      table.unique(['pk']);
+      table.index(['session']);
+      table.index(['id']);
+      table.unique(['id']);
+    });
+};
+
+exports.down = function (knex: Knex) {
+  return knex.schema.dropTable('apps');
+};
@@ -0,0 +1,26 @@
+import { Knex } from 'knex';
+
+exports.up = async function (knex: Knex) {
+  // Add a boolean column 'enabled' defaulting to true and not nullable.
+  const hasColumn = await knex.schema.hasColumn('apps', 'enabled');
+  if (!hasColumn) {
+    await knex.schema.alterTable('apps', (table) => {
+      table.boolean('enabled').defaultTo(true);
+    });
+    // Ensure existing rows have enabled=true
+    await knex('apps').update({ enabled: true });
+    // Make the column NOT NULL
+    await knex.schema.alterTable('apps', (table) => {
+      table.boolean('enabled').notNullable().defaultTo(true).alter();
+    });
+  }
+};
+
+exports.down = async function (knex: Knex) {
+  const hasColumn = await knex.schema.hasColumn('apps', 'enabled');
+  if (hasColumn) {
+    await knex.schema.alterTable('apps', (table) => {
+      table.dropColumn('enabled');
+    });
+  }
+};
@@ -0,0 +1,51 @@
+import { Injectable, UnprocessableEntityException } from '@nestjs/common';
+import { IAppsService } from '@waha/apps/app_sdk/services/IAppsService';
+import { DataStore } from '@waha/core/abc/DataStore';
+import { SessionManager } from '@waha/core/abc/manager.abc';
+import { WhatsappSession } from '@waha/core/abc/session.abc';
+import { Knex } from 'knex';
+
+import { App } from '../dto/app.dto';
+
+class AppsIsDisabledError extends UnprocessableEntityException {
+  constructor() {
+    super(
+      "Apps are disabled. Enable it by setting 'WAHA_APPS_ENABLED=True' environment variable.",
+    );
+  }
+}
+
+@Injectable()
+export class AppsDisabledService implements IAppsService {
+  async list(manager: SessionManager, session: string): Promise<App[]> {
+    throw new AppsIsDisabledError();
+  }
+
+  async get(manager: SessionManager, appId: string): Promise<App> {
+    throw new AppsIsDisabledError();
+  }
+
+  async create(manager: SessionManager, app: App): Promise<App> {
+    throw new AppsIsDisabledError();
+  }
+
+  async update(manager: SessionManager, app: App): Promise<App> {
+    throw new AppsIsDisabledError();
+  }
+
+  async delete(manager: SessionManager, appId: string) {
+    throw new AppsIsDisabledError();
+  }
+
+  migrate(knex: Knex<any, any[]>): Promise<void> {
+    return;
+  }
+
+  async beforeSessionStart(session: WhatsappSession, store: DataStore) {
+    return;
+  }
+
+  async afterSessionStart(session: WhatsappSession, store: DataStore) {
+    return;
+  }
+}
@@ -0,0 +1,192 @@
+import { Injectable, NotFoundException } from '@nestjs/common';
+import { migrate } from '@waha/apps/app_sdk/migrations';
+import { IAppService } from '@waha/apps/app_sdk/services/IAppService';
+import { IAppsService } from '@waha/apps/app_sdk/services/IAppsService';
+import { ChatWootAppService } from '@waha/apps/chatwoot/services/ChatWootAppService';
+import { DataStore } from '@waha/core/abc/DataStore';
+import { SessionManager } from '@waha/core/abc/manager.abc';
+import { WhatsappSession } from '@waha/core/abc/session.abc';
+import { generatePrefixedId } from '@waha/utils/ids';
+import { Knex } from 'knex';
+import { InjectPinoLogger, PinoLogger } from 'nestjs-pino';
+
+import { App, AppName } from '../dto/app.dto';
+import { AppRepository } from '../storage/AppRepository';
+
+@Injectable()
+export class AppsEnabledService implements IAppsService {
+  constructor(
+    protected readonly chatwootService: ChatWootAppService,
+    @InjectPinoLogger('AppsService')
+    protected logger: PinoLogger,
+  ) {}
+
+  async list(manager: SessionManager, session: string): Promise<App[]> {
+    const knex = manager.store.getWAHADatabase();
+    const repo = new AppRepository(knex);
+    const apps = await repo.getAllBySession(session);
+    apps.forEach((app) => {
+      delete app.pk;
+    });
+    return apps;
+  }
+
+  async create(manager: SessionManager, app: App): Promise<App> {
+    await this.checkSessionExists(manager, app.session);
+    app.id = app.id || generatePrefixedId('app');
+
+    const knex = manager.store.getWAHADatabase();
+    const repo = new AppRepository(knex);
+
+    const existingApp = await repo.getById(app.id);
+    if (existingApp) {
+      throw new Error(`App with ID '${app.id}' already exists.`);
+    }
+
+    // Validate only one Chatwoot app per session
+    if (app.app === AppName.chatwoot) {
+      const existingApps = await repo.getAllBySession(app.session);
+      const existingChatwootApp = existingApps.find(
+        (existingApp) => existingApp.app === AppName.chatwoot,
+      );
+
+      if (existingChatwootApp) {
+        throw new Error(
+          `Only one Chatwoot app is allowed per session. Session '${app.session}' already has a Chatwoot app with ID '${existingChatwootApp.id}'.`,
+        );
+      }
+    }
+
+    const service = this.getAppService(app);
+    service.validate(app);
+    // Only run beforeCreated when app is enabled (default true if omitted)
+    if (app.enabled !== false) {
+      await service.beforeCreated(app);
+    }
+
+    const result = await repo.save(app);
+    if (app.enabled) {
+      await this.restartIfRunning(manager, app.session);
+    }
+    delete result.pk;
+    return result;
+  }
+
+  async get(manager: SessionManager, appId: string): Promise<App> {
+    const knex = manager.store.getWAHADatabase();
+    const repo = new AppRepository(knex);
+    const app = await repo.getById(appId);
+    if (!app) {
+      throw new NotFoundException(`App '${appId}' not found`);
+    }
+    delete (app as any).pk;
+    return app;
+  }
+
+  async update(manager: SessionManager, app: App): Promise<App> {
+    await this.checkSessionExists(manager, app.session);
+    const knex = manager.store.getWAHADatabase();
+    const repo = new AppRepository(knex);
+    const savedApp = await repo.getById(app.id);
+    if (!savedApp) {
+      throw new NotFoundException(`App '${app.id}' not found`);
+    }
+    if (savedApp.app != app.app) {
+      throw new Error(
+        `Can not change app type. Delete and create a new app. Before type: '${savedApp.app}' After type: '${app.app}'`,
+      );
+    }
+    if (savedApp.session != app.session) {
+      throw new Error(
+        `Can not change session. Delete and create a new app. Before session: '${savedApp.session}' After session: '${app.session}'`,
+      );
+    }
+
+    const service = this.getAppService(app);
+    service.validate(app);
+
+    const hasEnabledChange = savedApp.enabled !== app.enabled;
+
+    if (hasEnabledChange) {
+      if (app.enabled) {
+        await service.beforeEnabled(savedApp, app);
+      } else {
+        await service.beforeDisabled(savedApp, app);
+      }
+    } else {
+      await service.beforeUpdated(savedApp, app);
+    }
+
+    await repo.update(app.id, app);
+    await this.restartIfRunning(manager, app.session);
+
+    const updated = await repo.getById(app.id);
+    delete (updated as any)?.pk;
+    return updated!;
+  }
+
+  async delete(manager: SessionManager, appId: string) {
+    const knex = manager.store.getWAHADatabase();
+    const repo = new AppRepository(knex);
+    const app = await repo.getById(appId);
+    if (!app) {
+      throw new NotFoundException(`App '${appId}' not found`);
+    }
+    const service = this.getAppService(app);
+    await service.beforeDeleted(app);
+    await repo.delete(app.id);
+    await this.restartIfRunning(manager, app.session);
+    return;
+  }
+
+  async beforeSessionStart(session: WhatsappSession, store: DataStore) {
+    const knex = store.getWAHADatabase();
+    const repo = new AppRepository(knex);
+    const apps = await repo.getEnabledBySession(session.name);
+    for (const app of apps) {
+      const service = this.getAppService(app);
+      service.beforeSessionStart(app, session);
+    }
+  }
+
+  async afterSessionStart(session: WhatsappSession, store: DataStore) {
+    const knex = store.getWAHADatabase();
+    const repo = new AppRepository(knex);
+    const apps = await repo.getEnabledBySession(session.name);
+    for (const app of apps) {
+      const service = this.getAppService(app);
+      service.afterSessionStart(app, session);
+    }
+  }
+
+  async migrate(knex: Knex): Promise<void> {
+    await migrate(knex);
+  }
+
+  private restartIfRunning(manager: SessionManager, session: string) {
+    const isRunning = manager.isRunning(session);
+    if (!isRunning) {
+      return;
+    }
+    return manager.restart(session);
+  }
+
+  private getAppService(app: App): IAppService {
+    switch (app.app) {
+      case AppName.chatwoot:
+        return this.chatwootService;
+      default:
+        throw new Error(`App '${app.app}' not supported`);
+    }
+  }
+
+  private async checkSessionExists(
+    manager: SessionManager,
+    sessionName: string,
+  ) {
+    const session = await manager.exists(sessionName);
+    if (session === null) {
+      throw new NotFoundException('Session not found');
+    }
+  }
+}
@@ -0,0 +1,29 @@
+import { App } from '@waha/apps/app_sdk/dto/app.dto';
+import { WhatsappSession } from '@waha/core/abc/session.abc';
+
+/**
+ * Exact App service
+ */
+export interface IAppService {
+  validate(app: App): void;
+
+  beforeCreated(app: App): Promise<void>;
+
+  /**
+   * Called only when the app transitions from disabled -> enabled.
+   */
+  beforeEnabled(savedApp: App, newApp: App): Promise<void>;
+
+  /**
+   * Called only when the app transitions from enabled -> disabled.
+   */
+  beforeDisabled(savedApp: App, newApp: App): Promise<void>;
+
+  beforeUpdated(savedApp: App, newApp: App): Promise<void>;
+
+  beforeDeleted(app: App): Promise<void>;
+
+  beforeSessionStart(app: App, session: WhatsappSession): void;
+
+  afterSessionStart(app: App, session: WhatsappSession): void;
+}
@@ -0,0 +1,25 @@
+import { App } from '@waha/apps/app_sdk/dto/app.dto';
+import { DataStore } from '@waha/core/abc/DataStore';
+import { SessionManager } from '@waha/core/abc/manager.abc';
+import { WhatsappSession } from '@waha/core/abc/session.abc';
+import { Knex } from 'knex';
+
+export interface IAppsService {
+  list(manager: SessionManager, session: string): Promise<App[]>;
+
+  get(manager: SessionManager, appId: string): Promise<App>;
+
+  create(manager: SessionManager, app: App): Promise<App>;
+
+  update(manager: SessionManager, app: App): Promise<App>;
+
+  delete(manager: SessionManager, appId: string): Promise<void>;
+
+  beforeSessionStart(session: WhatsappSession, store: DataStore): Promise<void>;
+
+  afterSessionStart(session: WhatsappSession, store: DataStore): Promise<void>;
+
+  migrate(knex: Knex): Promise<void>;
+}
+
+export const AppsService = Symbol('AppsService');
@@ -0,0 +1,126 @@
+import { Knex } from 'knex';
+
+import { App } from '../dto/app.dto';
+import { AppDB } from './types';
+
+export class AppRepository {
+  static tableName = 'apps';
+
+  constructor(private readonly knex: Knex) {}
+
+  get tableName() {
+    return AppRepository.tableName;
+  }
+
+  /**
+   * Saves an app to the database
+   */
+  async save(app: Omit<App, 'pk'>): Promise<AppDB> {
+    const appToSave: any = { ...app };
+    if (appToSave.config && typeof appToSave.config === 'object') {
+      appToSave.config = JSON.stringify(appToSave.config);
+    }
+    const [pk] = await this.knex(this.tableName)
+      .insert(appToSave)
+      .returning('pk');
+    return { ...app, pk: pk };
+  }
+
+  private deserialize(app: AppDB): AppDB {
+    const parsedConfig =
+      typeof app.config === 'string' ? JSON.parse(app.config) : app.config;
+
+    // Ensure 'enabled' is boolean (SQLite may return 0/1)
+    let enabled: boolean;
+    switch (app.enabled as any) {
+      case undefined:
+      case true:
+      case 1:
+      case '1':
+        enabled = true;
+        break;
+      case false:
+      case 0:
+        enabled = false;
+        break;
+      default:
+        enabled = true;
+    }
+
+    return { ...(app as any), enabled: enabled, config: parsedConfig } as AppDB;
+  }
+
+  private serialize<T extends Partial<App>>(app: T): T {
+    const appCopy = { ...app };
+    if (appCopy.config && typeof appCopy.config === 'object') {
+      appCopy.config = JSON.stringify(appCopy.config);
+    }
+    return appCopy;
+  }
+
+  /**
+   * Gets an app by its id
+   */
+  async getById(id: string): Promise<AppDB | null> {
+    const app = await this.knex(this.tableName).where('id', id).first();
+    if (!app) {
+      return null;
+    }
+    return this.deserialize(app);
+  }
+
+  /**
+   * Gets an enabled app by id, or null if not found or disabled.
+   */
+  async findEnabledAppById(id: string): Promise<AppDB | null> {
+    const app = await this.knex(this.tableName)
+      .where('id', id)
+      .andWhere('enabled', true)
+      .first();
+    if (!app) {
+      return null;
+    }
+    return this.deserialize(app);
+  }
+
+  /**
+   * Gets all apps
+   */
+  async getAllBySession(session: string): Promise<AppDB[]> {
+    return this.knex(this.tableName)
+      .select('*')
+      .where('session', session)
+      .orderBy('id', 'asc')
+      .then((apps) => apps.map((app) => this.deserialize(app)));
+  }
+
+  /**
+   * Gets only enabled apps for a session.
+   */
+  async getEnabledBySession(session: string): Promise<AppDB[]> {
+    return this.knex(this.tableName)
+      .select('*')
+      .where('session', session)
+      .andWhere('enabled', true)
+      .orderBy('id', 'asc')
+      .then((apps) => apps.map((app) => this.deserialize(app)));
+  }
+
+  /**
+   * Updates an app
+   */
+  async update(id: string, app: Partial<Omit<App, 'id'>>): Promise<void> {
+    const appToUpdate: any = this.serialize(app);
+    if (appToUpdate.enabled === undefined) {
+      delete appToUpdate.enabled; // keep current value
+    }
+    await this.knex(this.tableName).where('id', id).update(appToUpdate);
+  }
+
+  /**
+   * Deletes an app
+   */
+  async delete(id: string): Promise<void> {
+    await this.knex(this.tableName).where('id', id).delete();
+  }
+}
@@ -0,0 +1,6 @@
+import { App } from '@waha/apps/app_sdk/dto/app.dto';
+
+export interface AppDB extends App {
+  // Internal database number
+  pk: number;
+}
@@ -0,0 +1,43 @@
+import * as lodash from 'lodash';
+
+type Call<Record> = (processed: number) => Promise<Record[]>;
+
+export interface PaginatorParams {
+  processed?: number;
+  max?: number;
+}
+
+const DefaultParams: PaginatorParams = {
+  processed: 0,
+  max: Infinity,
+};
+
+/**
+ * Generic paginator for APIs that return arrays of records with limits and offsets.
+ */
+export class ArrayPaginator<Record> {
+  private readonly params: PaginatorParams;
+
+  constructor(params: PaginatorParams = DefaultParams) {
+    this.params = lodash.merge({}, DefaultParams, params) as PaginatorParams;
+  }
+
+  async *iterate(call: Call<Record>): AsyncGenerator<Record> {
+    let processed = this.params.processed;
+    let records: Record[] = [];
+
+    while (true) {
+      records = await call(processed);
+      if (records.length === 0) {
+        return;
+      }
+      for (const record of records) {
+        yield record;
+        processed += 1;
+        if (processed >= this.params.max) {
+          return;
+        }
+      }
+    }
+  }
+}
@@ -0,0 +1,462 @@
+import { Channel } from '@waha/structures/channels.dto';
+import {
+  GetChatMessagesFilter,
+  GetChatMessagesQuery,
+} from '@waha/structures/chats.dto';
+import {
+  ChatRequest,
+  MessageFileRequest,
+  MessageImageRequest,
+  MessageTextRequest,
+  MessageVideoRequest,
+  MessageVoiceRequest,
+  WANumberExistResult,
+} from '@waha/structures/chatting.dto';
+import { SessionInfo } from '@waha/structures/sessions.dto';
+import axios, { AxiosInstance } from 'axios';
+import { Auth } from '@waha/core/auth/config';
+import { ContactSortField } from '@waha/structures/contacts.dto';
+import { PaginationParams } from '@waha/structures/pagination.dto';
+
+export interface RequestOptions {
+  signal?: AbortSignal;
+}
+
+export class WAHASelf {
+  public client: AxiosInstance;
+
+  constructor() {
+    // Set 'X-Api-Key'
+    const key = Auth.keyplain.value;
+    const port =
+      parseInt(process.env.PORT) ||
+      parseInt(process.env.WHATSAPP_API_PORT) ||
+      3000;
+    const url = `http://localhost:${port}`;
+    this.client = axios.create({
+      baseURL: url,
+      headers: {
+        'X-Api-Key': key,
+        'Content-Type': 'application/json',
+      },
+    });
+  }
+
+  async fetch(url: string, opts?: RequestOptions): Promise<Buffer> {
+    const response = await this.client.get(url, {
+      responseType: 'arraybuffer',
+      signal: opts?.signal,
+    });
+    return Buffer.from(response.data);
+  }
+
+  async qr(session: string, opts?: RequestOptions): Promise<Buffer> {
+    const url = `/api/${session}/auth/qr`;
+    return await this.fetch(url, opts);
+  }
+
+  async screenshot(session: string, opts?: RequestOptions): Promise<Buffer> {
+    const url = `/api/screenshot?session=${session}`;
+    return await this.fetch(url, opts);
+  }
+
+  async restart(session: string, opts?: RequestOptions): Promise<any> {
+    const url = `/api/sessions/${session}/restart`;
+    return await this.client.post(url, undefined, { signal: opts?.signal });
+  }
+
+  async logout(session: string, opts?: RequestOptions): Promise<any> {
+    const url = `/api/sessions/${session}/logout`;
+    return await this.client.post(url, undefined, { signal: opts?.signal });
+  }
+
+  async stop(session: string, opts?: RequestOptions): Promise<any> {
+    const url = `/api/sessions/${session}/stop`;
+    return await this.client.post(url, undefined, { signal: opts?.signal });
+  }
+
+  async get(session: string, opts?: RequestOptions): Promise<SessionInfo> {
+    const url = `/api/sessions/${session}/`;
+    return await this.client
+      .get(url, { signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  async getChats(
+    session: string,
+    page: PaginationParams,
+    opts?: RequestOptions,
+  ) {
+    const url = `/api/${session}/chats`;
+    const params = {
+      ...page,
+    };
+    return await this.client
+      .get(url, { params: params, signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  async getContacts(
+    session: string,
+    page: PaginationParams,
+    opts?: RequestOptions,
+  ) {
+    const url = `/api/contacts/all`;
+    const params = {
+      session: session,
+      ...page,
+      sortBy: ContactSortField.ID,
+      sortOrder: ContactSortField.ID,
+    };
+    return await this.client
+      .get(url, { params: params, signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  async getContact(session: string, contactId: string, opts?: RequestOptions) {
+    const url = `/api/contacts`;
+    const params = {
+      session: session,
+      contactId: contactId,
+    };
+    return await this.client
+      .get(url, { params: params, signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  async contactCheckExists(
+    session: string,
+    phone: string,
+    opts?: RequestOptions,
+  ): Promise<WANumberExistResult> {
+    const url = `/api/contacts/check-exists`;
+    const params = {
+      phone: phone,
+      session: session,
+    };
+    return await this.client
+      .get(url, { params: params, signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  async getGroup(session: string, groupId: string, opts?: RequestOptions) {
+    const url = `/api/${session}/groups/${groupId}`;
+    return await this.client
+      .get(url, { signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  async getChannel(
+    session: string,
+    channelId: string,
+    opts?: RequestOptions,
+  ): Promise<Channel> {
+    const url = `/api/${session}/channels/${channelId}`;
+    return await this.client
+      .get(url, { signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  async getChatPicture(
+    session: string,
+    chatId: string,
+    opts?: RequestOptions,
+  ): Promise<string | null> {
+    const url = `/api/${session}/chats/${chatId}/picture`;
+    return await this.client
+      .get(url, { signal: opts?.signal })
+      .then((response) => response.data?.url);
+  }
+
+  async sendText(
+    body: MessageTextRequest,
+    opts?: RequestOptions,
+  ): Promise<any> {
+    const url = `/api/sendText`;
+    return await this.client
+      .post(url, body, { signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  async sendImage(
+    body: MessageImageRequest,
+    opts?: RequestOptions,
+  ): Promise<any> {
+    const url = `/api/sendImage`;
+    return await this.client
+      .post(url, body, { signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  async sendVideo(
+    body: MessageVideoRequest,
+    opts?: RequestOptions,
+  ): Promise<any> {
+    const url = `/api/sendVideo`;
+    return await this.client
+      .post(url, body, { signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  async sendVoice(
+    body: MessageVoiceRequest,
+    opts?: RequestOptions,
+  ): Promise<any> {
+    const url = `/api/sendVoice`;
+    return await this.client
+      .post(url, body, { signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  async sendFile(
+    body: MessageFileRequest,
+    opts?: RequestOptions,
+  ): Promise<any> {
+    const url = `/api/sendFile`;
+    return await this.client
+      .post(url, body, { signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  async deleteMessage(
+    session: string,
+    chatId: string,
+    messageId: string,
+    opts?: RequestOptions,
+  ) {
+    const url = `/api/${session}/chats/${chatId}/messages/${messageId}`;
+    return await this.client
+      .delete(url, { signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  async startTyping(body: ChatRequest, opts?: RequestOptions) {
+    const url = `/api/startTyping`;
+    return await this.client
+      .post(url, body, { signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  async stopTyping(body: ChatRequest, opts?: RequestOptions) {
+    const url = `/api/stopTyping`;
+    return await this.client.post(url, body, { signal: opts?.signal });
+  }
+
+  async readMessages(session: string, chatId: string, opts?: RequestOptions) {
+    const url = `/api/${session}/chats/${chatId}/messages/read`;
+    return await this.client
+      .post(url, undefined, { signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  async getMessages(
+    session: string,
+    chatId: string,
+    query: GetChatMessagesQuery,
+    filter: GetChatMessagesFilter,
+    opts?: RequestOptions,
+  ) {
+    const url = `/api/${session}/chats/${chatId}/messages`;
+    const params = {
+      ...query,
+      ...filter,
+    };
+    return await this.client
+      .get(url, { params: params, signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  async getMessageById(
+    session: string,
+    chatId: string,
+    messageId: string,
+    media: boolean,
+    opts?: RequestOptions,
+  ) {
+    const url = `/api/${session}/chats/${chatId}/messages/${messageId}`;
+    const params = {
+      downloadMedia: media,
+    };
+    return await this.client
+      .get(url, { params: params, signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  async findPNByLid(
+    session: string,
+    lid: string,
+    opts?: RequestOptions,
+  ): Promise<string | null> {
+    const url = `/api/${session}/lids/${lid}`;
+    return await this.client
+      .get(url, { signal: opts?.signal })
+      .then((response) => response.data.pn);
+  }
+
+  async findLIDByPN(
+    session: string,
+    pn: string,
+    opts?: RequestOptions,
+  ): Promise<string | null> {
+    const url = `/api/${session}/lids/pn/${pn}`;
+    return await this.client
+      .get(url, { signal: opts?.signal })
+      .then((response) => response.data.lid);
+  }
+
+  /**
+   * Get the server version
+   * @returns Server version information
+   */
+  async serverVersion(opts?: RequestOptions): Promise<any> {
+    const url = `/api/server/version`;
+    return await this.client
+      .get(url, { signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  /**
+   * Get the server status
+   * @returns Server status information
+   */
+  async serverStatus(opts?: RequestOptions): Promise<any> {
+    const url = `/api/server/status`;
+    return await this.client
+      .get(url, { signal: opts?.signal })
+      .then((response) => response.data);
+  }
+
+  /**
+   * Reboot the server
+   * @param force Whether to force reboot (true) or gracefully reboot (false)
+   * @returns Server stop response
+   */
+  async serverReboot(
+    force: boolean = false,
+    opts?: RequestOptions,
+  ): Promise<any> {
+    const url = `/api/server/stop`;
+    return await this.client
+      .post(url, { force }, { signal: opts?.signal })
+      .then((response) => response.data);
+  }
+}
+
+export class WAHASessionAPI {
+  constructor(
+    private session: string,
+    private api: WAHASelf,
+  ) {}
+
+  getChats(page: PaginationParams, opts?: RequestOptions) {
+    return this.api.getChats(this.session, page, opts);
+  }
+
+  getContacts(page: PaginationParams, opts?: RequestOptions): Promise<any> {
+    return this.api.getContacts(this.session, page, opts);
+  }
+
+  getContact(contactId: string, opts?: RequestOptions): Promise<any> {
+    return this.api.getContact(this.session, contactId, opts);
+  }
+
+  contactCheckExists(
+    phone: string,
+    opts?: RequestOptions,
+  ): Promise<WANumberExistResult> {
+    return this.api.contactCheckExists(this.session, phone, opts);
+  }
+
+  getGroup(groupId: string, opts?: RequestOptions): Promise<any> {
+    return this.api.getGroup(this.session, groupId, opts);
+  }
+
+  getChannel(channelId: string, opts?: RequestOptions): Promise<Channel> {
+    return this.api.getChannel(this.session, channelId, opts);
+  }
+
+  getChatPicture(
+    chatId: string,
+    opts?: RequestOptions,
+  ): Promise<string | null> {
+    return this.api.getChatPicture(this.session, chatId, opts);
+  }
+
+  sendText(body: MessageTextRequest, opts?: RequestOptions): Promise<any> {
+    body.session = this.session;
+    return this.api.sendText(body, opts);
+  }
+
+  sendImage(body: MessageImageRequest, opts?: RequestOptions): Promise<any> {
+    body.session = this.session;
+    return this.api.sendImage(body, opts);
+  }
+
+  sendVideo(body: MessageVideoRequest, opts?: RequestOptions): Promise<any> {
+    body.session = this.session;
+    return this.api.sendVideo(body, opts);
+  }
+
+  sendVoice(body: MessageVoiceRequest, opts?: RequestOptions): Promise<any> {
+    body.session = this.session;
+    return this.api.sendVoice(body, opts);
+  }
+
+  sendFile(body: MessageFileRequest, opts?: RequestOptions): Promise<any> {
+    body.session = this.session;
+    return this.api.sendFile(body, opts);
+  }
+
+  deleteMessage(chatId: string, messageId: string, opts?: RequestOptions) {
+    return this.api.deleteMessage(this.session, chatId, messageId, opts);
+  }
+
+  startTyping(body: ChatRequest, opts?: RequestOptions) {
+    body.session = this.session;
+    return this.api.startTyping(body, opts);
+  }
+
+  stopTyping(body: ChatRequest, opts?: RequestOptions) {
+    body.session = this.session;
+    return this.api.stopTyping(body, opts);
+  }
+
+  readMessages(chatId: string, opts?: RequestOptions) {
+    return this.api.readMessages(this.session, chatId, opts);
+  }
+
+  async getMessages(
+    chatId: string,
+    query: GetChatMessagesQuery,
+    filter: GetChatMessagesFilter,
+    opts?: RequestOptions,
+  ) {
+    return this.api.getMessages(this.session, chatId, query, filter, opts);
+  }
+
+  async getMessageById(
+    chatId: string,
+    messageId: string,
+    media: boolean,
+    opts?: RequestOptions,
+  ) {
+    return this.api.getMessageById(
+      this.session,
+      chatId,
+      messageId,
+      media,
+      opts,
+    );
+  }
+
+  //
+  // Lids
+  //
+  findPNByLid(lid: string, opts?: RequestOptions) {
+    return this.api.findPNByLid(this.session, lid, opts);
+  }
+
+  findLIDByPN(pn: string, opts?: RequestOptions) {
+    return this.api.findLIDByPN(this.session, pn, opts);
+  }
+}
@@ -0,0 +1,113 @@
+import * as process from 'node:process';
+
+import { ExpressAdapter } from '@bull-board/express';
+import { BullBoardModule } from '@bull-board/nestjs';
+import { RedisModule } from '@liaoliaots/nestjs-redis';
+import { BullModule } from '@nestjs/bullmq';
+import { AppsController } from '@waha/apps/app_sdk/api/apps.controller';
+import { BullAuthMiddleware } from '@waha/apps/app_sdk/auth';
+import { AppsDisabledService } from '@waha/apps/app_sdk/services/AppsDisabledService';
+import { AppsEnabledService } from '@waha/apps/app_sdk/services/AppsEnabledService';
+import { AppsService } from '@waha/apps/app_sdk/services/IAppsService';
+import { ChatwootLocalesController } from '@waha/apps/chatwoot/api/chatwoot.locales.controller';
+import { ChatWootExports } from '@waha/apps/chatwoot/chatwoot.module';
+import { parseBool } from '@waha/helpers';
+import { RMutexModule } from '@waha/modules/rmutex';
+import { Auth } from '@waha/core/auth/config';
+
+const IMPORTS = [
+  BullModule.forRoot({
+    connection: {
+      url: process.env.REDIS_URL || 'redis://:redis@localhost:6379',
+      maxRetriesPerRequest: null,
+    },
+    prefix: `waha-${process.env.WAHA_WORKER_ID}`,
+  }),
+  RedisModule.forRoot({
+    closeClient: true,
+    config: {
+      url: process.env.REDIS_URL || 'redis://:redis@localhost:6379',
+      onClientCreated: async (client) => {
+        try {
+          await client.ping();
+        } catch (err) {
+          console.error('[Redis] Connection failed:', err);
+          process.exit(1); // Stop the app if Redis is unavailable
+        }
+      },
+    },
+  }),
+  RMutexModule,
+  BullBoardModule.forRoot({
+    route: '/jobs',
+    adapter: ExpressAdapter,
+    middleware: BullAuthMiddleware(),
+    boardOptions: {
+      uiConfig: {
+        boardTitle: 'Jobs | WAHA',
+        boardLogo: {
+          path: '/dashboard/layout/images/logo-white.svg',
+          width: 35,
+          height: 35,
+        },
+        favIcon: {
+          default: '/dashboard/favicon.ico',
+          alternative: '/dashboard/favicon.ico',
+        },
+        miscLinks: [
+          {
+            text: '📊 Dashboard',
+            url: '/dashboard',
+          },
+          {
+            text: '📚 Swagger (OpenAPI)',
+            url: '/',
+          },
+        ],
+      },
+    },
+  }),
+  ...ChatWootExports.imports,
+];
+
+const AppsEnabled = {
+  imports: IMPORTS,
+  controllers: [AppsController, ...ChatWootExports.controllers],
+  providers: [
+    {
+      provide: AppsService,
+      useClass: AppsEnabledService,
+    },
+    ...ChatWootExports.providers,
+  ],
+};
+
+const AppsDisabled = {
+  providers: [
+    {
+      provide: AppsService,
+      useClass: AppsDisabledService,
+    },
+  ],
+  imports: [],
+  controllers: [AppsController, ChatwootLocalesController],
+};
+
+function checkApiKey() {
+  const key = Auth.key.value;
+  if (!key) {
+    return;
+  }
+  const plain = Auth.keyplain.value;
+  if (!plain) {
+    throw Error(
+      'WAHA_API_KEY set, please provide WAHA_API_KEY_PLAIN when WAHA_APPS_ENABLED',
+    );
+  }
+}
+
+const enabled = parseBool(process.env.WAHA_APPS_ENABLED);
+if (enabled) {
+  checkApiKey();
+}
+export const AppsModuleExports = enabled ? AppsEnabled : AppsDisabled;
@@ -0,0 +1,31 @@
+import { Controller, Get } from '@nestjs/common';
+import { sortBy } from 'lodash';
+import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
+import { i18n } from '@waha/apps/chatwoot/i18n';
+
+interface LanguageResponse {
+  name: string;
+  locale: string;
+}
+
+@Controller('api/apps/chatwoot')
+@ApiSecurity('api_key')
+@ApiTags('🧩 Apps')
+export class ChatwootLocalesController {
+  @Get('locales')
+  @ApiOperation({
+    summary: 'Get available languages for Chatwoot app',
+    description: 'Get available languages for Chatwoot app',
+  })
+  getLanguages(): LanguageResponse[] {
+    const locales = i18n.available();
+    const priority = ['en-US', 'pt-BR', 'es-ES'];
+    return sortBy(locales, [
+      (x) => {
+        const idx = priority.indexOf(x.locale);
+        return idx === -1 ? Number.MAX_SAFE_INTEGER : idx;
+      },
+      'locale',
+    ]);
+  }
+}
@@ -0,0 +1,115 @@
+import {
+  Body,
+  Controller,
+  NotFoundException,
+  Param,
+  Post,
+} from '@nestjs/common';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
+import { IsCommandsChat } from '@waha/apps/chatwoot/client/ids';
+import { EventName, MessageType } from '@waha/apps/chatwoot/client/types';
+import { InboxData } from '@waha/apps/chatwoot/consumers/types';
+import { ChatWootQueueService } from '@waha/apps/chatwoot/services/ChatWootQueueService';
+import { SessionManager } from '@waha/core/abc/manager.abc';
+import { AppRepository } from '@waha/apps/app_sdk/storage/AppRepository';
+import { CommandPrefix } from '@waha/apps/chatwoot/cli';
+
+@Controller('webhooks/chatwoot/')
+@ApiTags('🧩 Apps')
+export class ChatwootWebhookController {
+  constructor(
+    private readonly chatWootQueueService: ChatWootQueueService,
+    private readonly manager: SessionManager,
+  ) {}
+
+  @Post(':session/:id')
+  @ApiOperation({
+    summary: 'Chatwoot Webhook',
+    description: 'Chatwoot Webhook',
+  })
+  async webhook(
+    @Param('session') session: string,
+    @Param('id') id: string,
+    @Body() body: any,
+  ) {
+    if (!body || !body?.event) {
+      return { success: true };
+    }
+
+    // Ignore all incoming messages
+    if (body.message_type == MessageType.INCOMING) {
+      return { success: true };
+    }
+
+    const isCommandsChat = IsCommandsChat(body);
+    // Ignore private notes (most of them)
+    const deleted = body?.content_attributes?.deleted;
+    if (body.private) {
+      // Ignore any private note in commands chats
+      if (isCommandsChat) {
+        return { success: true };
+      }
+      // keep "deleted" notes
+      // So Agent can delete "Sent From API/WhatsApp" messages in ChatWoot
+      if (!deleted) {
+        return { success: true };
+      }
+    }
+
+    const data: InboxData = {
+      session: session,
+      app: id,
+      body: body,
+    };
+
+    // Skip if app is disabled or does not exist
+    const knex = this.manager.store.getWAHADatabase();
+    const repo = new AppRepository(knex);
+    const app = await repo.findEnabledAppById(id);
+    if (!app || app.session !== session) {
+      throw new NotFoundException(`App '${id}' not found`);
+    }
+
+    // Check if it's a command message (sent to the special inbox contact)
+    // Check if it's a deleted message
+    if (deleted && !isCommandsChat) {
+      await this.chatWootQueueService.addMessageDeletedJob(data);
+      return { success: true };
+    }
+
+    // Route to specific queues based on an event type
+    switch (body.event) {
+      case EventName.MESSAGE_CREATED:
+        if (isCommandsChat || body.content?.startsWith(CommandPrefix)) {
+          await this.chatWootQueueService.addCommandsJob(body.event, data);
+        } else {
+          await this.chatWootQueueService.addMessageCreatedJob(data);
+        }
+        return { success: true };
+      case EventName.MESSAGE_UPDATED:
+        // We handle only "retries" on message_update
+        // This is the attribute ChatWoot send
+        // There's NO other way to identify "status: read" updates right now
+        // There's no "body.status" in message_updated webhook :(
+        const isRetryNull = body.content_attributes?.external_error === null;
+        const isRetrySomething = Boolean(
+          body.content_attributes?.external_error,
+        );
+        const isRetry = isRetryNull || isRetrySomething;
+        if (!isRetry) {
+          return { success: true };
+        }
+
+        if (isCommandsChat || body.content?.startsWith(CommandPrefix)) {
+          await this.chatWootQueueService.addCommandsJob(body.event, data);
+        } else {
+          await this.chatWootQueueService.addMessageUpdatedJob(data);
+        }
+        return { success: true };
+      default:
+        // Ignore other events
+        await this.chatWootQueueService.addJobToQueue(body.event, data);
+        return { success: true };
+    }
+  }
+}
@@ -0,0 +1,53 @@
+import { ChatWootAPIConfig } from '@waha/apps/chatwoot/client/interfaces';
+import * as NodeCache from 'node-cache';
+
+import { IConversationCache } from './IConversationCache';
+import { ContactIds } from '@waha/apps/chatwoot/client/ConversationService';
+
+const cache: NodeCache = new NodeCache({
+  stdTTL: 24 * 60 * 60, // 1 day
+  useClones: false,
+});
+
+export function CacheForConfig(config: ChatWootAPIConfig): ConversationCache {
+  return new ConversationCache(`${config.url}+${config.inboxId}`);
+}
+
+class ConversationCache implements IConversationCache {
+  constructor(private prefix: string) {}
+
+  private fullKey(key: string) {
+    return `${this.prefix}.${key}`;
+  }
+
+  delete(key: string): void {
+    const fullKey = this.fullKey(key);
+    cache.del(fullKey);
+  }
+
+  get(key: string): ContactIds | null {
+    const fullKey = this.fullKey(key);
+    return cache.get(fullKey) || null;
+  }
+
+  has(key: string): boolean {
+    const fullKey = this.fullKey(key);
+    return cache.has(fullKey);
+  }
+
+  set(key: string, value: ContactIds): void {
+    const fullKey = this.fullKey(key);
+    cache.set(fullKey, value);
+  }
+
+  /**
+   * Completely clean the cache with the prefix
+   */
+  clean() {
+    cache.keys().forEach((key) => {
+      if (key.startsWith(this.prefix)) {
+        cache.del(key);
+      }
+    });
+  }
+}
@@ -0,0 +1,9 @@
+import { ContactIds } from '@waha/apps/chatwoot/client/ConversationService';
+
+export interface IConversationCache {
+  get(key: string): ContactIds | null;
+  set(key: string, value: ContactIds): void;
+  has(key: string): boolean;
+  delete(key: string): void;
+  clean(): void;
+}
@@ -0,0 +1,143 @@
+import { RegisterAppQueue } from '@waha/apps/app_sdk/BullUtils';
+import {
+  ExponentialRetriesJobOptions,
+  JobRemoveOptions,
+  merge,
+  NoRetriesJobOptions,
+} from '@waha/apps/app_sdk/constants';
+import { MessageCleanupConsumer } from '@waha/apps/chatwoot/consumers/scheduled/message.cleanup';
+import { ChatWootAppService } from '@waha/apps/chatwoot/services/ChatWootAppService';
+import * as lodash from 'lodash';
+
+import { ChatwootLocalesController } from './api/chatwoot.locales.controller';
+import { ChatwootWebhookController } from './api/chatwoot.webhook.controller';
+import { ChatWootInboxCommandsConsumer } from './consumers/inbox/commands';
+import { ChatWootInboxMessageCreatedConsumer } from './consumers/inbox/message_created';
+import { ChatWootInboxMessageDeletedConsumer } from './consumers/inbox/message_deleted';
+import { ChatWootInboxMessageUpdatedConsumer } from './consumers/inbox/message_updated';
+import { FlowProducerName, QueueName } from './consumers/QueueName';
+import { CheckVersionConsumer } from './consumers/scheduled/check.version';
+import { WAHAMessageAnyConsumer } from './consumers/waha/message.any';
+import { WAHAMessageEditedConsumer } from './consumers/waha/message.edited';
+import { WAHAMessageReactionConsumer } from './consumers/waha/message.reaction';
+import { WAHAMessageRevokedConsumer } from './consumers/waha/message.revoked';
+import { WAHAMessageAckConsumer } from './consumers/waha/message.ack';
+import { WAHASessionStatusConsumer } from './consumers/waha/session.status';
+import { ChatWootQueueService } from './services/ChatWootQueueService';
+import { ChatWootScheduleService } from './services/ChatWootScheduleService';
+import { ChatWootWAHAQueueService } from './services/ChatWootWAHAQueueService';
+import { QueueRegistry } from './services/QueueRegistry';
+import { ChatWootConversationCreatedConsumer } from './consumers/inbox/conversation_created';
+import { ChatWootConversationStatusChangedConsumer } from '@waha/apps/chatwoot/consumers/inbox/conversation_status_changed';
+import { TaskContactsPullConsumer } from '@waha/apps/chatwoot/consumers/task/contacts.pull';
+import { TaskMessagesPullConsumer } from '@waha/apps/chatwoot/consumers/task/messages.pull';
+import { BullModule } from '@nestjs/bullmq';
+import { QueueManager } from '@waha/apps/chatwoot/services/QueueManager';
+
+const CONTROLLERS = [ChatwootWebhookController, ChatwootLocalesController];
+
+const IMPORTS = lodash.flatten([
+  BullModule.registerFlowProducer({
+    name: FlowProducerName.MESSAGES_PULL_FLOW,
+  }),
+  RegisterAppQueue({
+    name: QueueName.SCHEDULED_MESSAGE_CLEANUP,
+    defaultJobOptions: merge(ExponentialRetriesJobOptions, JobRemoveOptions),
+  }),
+  RegisterAppQueue({
+    name: QueueName.SCHEDULED_CHECK_VERSION,
+    defaultJobOptions: merge(NoRetriesJobOptions, JobRemoveOptions),
+  }),
+  RegisterAppQueue({
+    name: QueueName.TASK_CONTACTS_PULL,
+    defaultJobOptions: merge(ExponentialRetriesJobOptions, JobRemoveOptions),
+  }),
+  RegisterAppQueue({
+    name: QueueName.TASK_MESSAGES_PULL,
+    defaultJobOptions: merge(ExponentialRetriesJobOptions, JobRemoveOptions),
+  }),
+  RegisterAppQueue({
+    name: QueueName.WAHA_MESSAGE_ANY,
+    defaultJobOptions: merge(ExponentialRetriesJobOptions, JobRemoveOptions),
+  }),
+  RegisterAppQueue({
+    name: QueueName.WAHA_MESSAGE_REACTION,
+    defaultJobOptions: merge(ExponentialRetriesJobOptions, JobRemoveOptions),
+  }),
+  RegisterAppQueue({
+    name: QueueName.WAHA_MESSAGE_EDITED,
+    defaultJobOptions: merge(ExponentialRetriesJobOptions, JobRemoveOptions),
+  }),
+  RegisterAppQueue({
+    name: QueueName.WAHA_MESSAGE_REVOKED,
+    defaultJobOptions: merge(ExponentialRetriesJobOptions, JobRemoveOptions),
+  }),
+  RegisterAppQueue({
+    name: QueueName.WAHA_MESSAGE_ACK,
+    defaultJobOptions: merge(ExponentialRetriesJobOptions, JobRemoveOptions),
+  }),
+  RegisterAppQueue({
+    name: QueueName.WAHA_SESSION_STATUS,
+    defaultJobOptions: merge(ExponentialRetriesJobOptions, JobRemoveOptions),
+  }),
+  RegisterAppQueue({
+    name: QueueName.INBOX_MESSAGE_CREATED,
+    defaultJobOptions: merge(ExponentialRetriesJobOptions, JobRemoveOptions),
+  }),
+  RegisterAppQueue({
+    name: QueueName.INBOX_MESSAGE_UPDATED,
+    defaultJobOptions: merge(ExponentialRetriesJobOptions, JobRemoveOptions),
+  }),
+  RegisterAppQueue({
+    name: QueueName.INBOX_CONVERSATION_CREATED,
+    defaultJobOptions: merge(NoRetriesJobOptions, JobRemoveOptions),
+  }),
+  RegisterAppQueue({
+    name: QueueName.INBOX_CONVERSATION_STATUS_CHANGED,
+    defaultJobOptions: merge(NoRetriesJobOptions, JobRemoveOptions),
+  }),
+  RegisterAppQueue({
+    name: QueueName.INBOX_MESSAGE_DELETED,
+    defaultJobOptions: merge(ExponentialRetriesJobOptions, JobRemoveOptions),
+  }),
+  RegisterAppQueue({
+    name: QueueName.INBOX_COMMANDS,
+    defaultJobOptions: merge(NoRetriesJobOptions, JobRemoveOptions),
+  }),
+]);
+
+const PROVIDERS = [
+  ChatWootInboxMessageCreatedConsumer,
+  ChatWootInboxMessageUpdatedConsumer,
+  ChatWootInboxMessageDeletedConsumer,
+  // Conversation events
+  ChatWootConversationCreatedConsumer,
+  ChatWootConversationStatusChangedConsumer,
+  ChatWootInboxCommandsConsumer,
+  // Tasks
+  TaskContactsPullConsumer,
+  TaskMessagesPullConsumer,
+  // WAHA
+  WAHASessionStatusConsumer,
+  WAHAMessageAnyConsumer,
+  WAHAMessageReactionConsumer,
+  WAHAMessageEditedConsumer,
+  WAHAMessageRevokedConsumer,
+  WAHAMessageAckConsumer,
+  // Scheduled
+  MessageCleanupConsumer,
+  CheckVersionConsumer,
+  // Services
+  ChatWootWAHAQueueService,
+  ChatWootQueueService,
+  ChatWootScheduleService,
+  ChatWootAppService,
+  QueueRegistry,
+  QueueManager,
+];
+
+export const ChatWootExports = {
+  providers: PROVIDERS,
+  imports: IMPORTS,
+  controllers: CONTROLLERS,
+};
@@ -0,0 +1,80 @@
+import { CommandContext } from '@waha/apps/chatwoot/cli/types';
+import { QueueName } from '@waha/apps/chatwoot/consumers/QueueName';
+import {
+  ContactsPullOptions,
+  ContactsPullStatusMessage,
+} from '@waha/apps/chatwoot/consumers/task/contacts.pull';
+import { Job, JobsOptions, Queue } from 'bullmq';
+import { ChatWootScheduleService } from '@waha/apps/chatwoot/services/ChatWootScheduleService';
+import { ILogger } from '@waha/apps/app_sdk/ILogger';
+import { JobDataTimeout } from '@waha/apps/app_sdk/AppConsumer';
+import {
+  ExponentialRetriesJobOptions,
+  JobRemoveOptions,
+  merge,
+} from '@waha/apps/app_sdk/constants';
+
+export async function ContactsPullStart(
+  ctx: CommandContext,
+  options: ContactsPullOptions,
+  jobOptions: JobsOptions & JobDataTimeout,
+) {
+  const jobId = ChatWootScheduleService.SingleJobId(ctx.data.app);
+  const job: Job = await ctx.queues.contactsPull.getJob(jobId);
+  if (job) {
+    const state = await job.getState();
+    const done = state === 'completed' || state === 'failed';
+    if (!done) {
+      const msg = ctx.l.r('cli.cmd.contacts.pull.already-running');
+      await ctx.conversation.incoming(msg);
+      return;
+    }
+
+    // Remove already done job
+    await ContactsPullRemove(ctx.queues.contactsPull, ctx.data.app, ctx.logger);
+  }
+
+  const opts: JobsOptions = merge(
+    ExponentialRetriesJobOptions,
+    JobRemoveOptions,
+    jobOptions,
+  );
+  const data = {
+    ...ctx.data,
+    timeout: {
+      job: jobOptions.timeout.job,
+    },
+    options: options,
+  };
+  opts.jobId = jobId;
+  await ctx.queues.contactsPull.add(QueueName.TASK_CONTACTS_PULL, data, opts);
+}
+
+export async function ContactsPullStatus(ctx: CommandContext) {
+  const jobId = ChatWootScheduleService.SingleJobId(ctx.data.app);
+  const job: Job | null = await ctx.queues.contactsPull.getJob(jobId);
+
+  if (!job) {
+    const msg = ctx.l.r('cli.cmd.contacts.status.not-found');
+    await ctx.conversation.incoming(msg);
+    return;
+  }
+  const state = await job.getState();
+  const msg = ContactsPullStatusMessage(ctx.l, job, state);
+  await ctx.conversation.incoming(msg);
+}
+
+export async function ContactsPullRemove(
+  queue: Queue,
+  app: string,
+  logger: ILogger,
+): Promise<boolean> {
+  const jobId = ChatWootScheduleService.SingleJobId(app);
+  const job: Job = await queue.getJob(jobId);
+  if (!job) {
+    logger.info('Pull Contacts job has already been removed');
+    return false;
+  }
+  await job.remove();
+  return true;
+}
@@ -0,0 +1,7 @@
+import { CommandContext } from '@waha/apps/chatwoot/cli/types';
+import { TKey } from '@waha/apps/chatwoot/i18n/templates';
+
+export async function CommandDisabled(ctx: CommandContext, command: string) {
+  const text = ctx.l.r('cli.cmd.disabled', { command: command });
+  await ctx.conversation.incoming(text);
+}
@@ -0,0 +1,182 @@
+import * as lodash from 'lodash';
+import { CommandContext } from '@waha/apps/chatwoot/cli/types';
+import { QueueName } from '@waha/apps/chatwoot/consumers/QueueName';
+import {
+  ChatID,
+  MessagesPullOptions,
+  MessagesPullStatusMessage,
+  TaskActivity,
+} from '@waha/apps/chatwoot/consumers/task/messages.pull';
+import { ChatWootScheduleService } from '@waha/apps/chatwoot/services/ChatWootScheduleService';
+import { ILogger } from '@waha/apps/app_sdk/ILogger';
+import { JobDataTimeout } from '@waha/apps/app_sdk/AppConsumer';
+import { FlowProducer, Job, JobsOptions, Queue } from 'bullmq';
+import { FlowJob } from 'bullmq/dist/esm/interfaces';
+import { GetAllChatIDs, IsCommandsChat } from '@waha/apps/chatwoot/client/ids';
+import { ChainJobsOneAtATime } from '@waha/apps/app_sdk/JobUtils';
+import {
+  ExponentialRetriesJobOptions,
+  JobRemoveOptions,
+  merge,
+} from '@waha/apps/app_sdk/constants';
+import { EngineHelper } from '@waha/apps/chatwoot/waha';
+import { WAHASelf, WAHASessionAPI } from '@waha/apps/app_sdk/waha/WAHASelf';
+import {
+  IgnoreJidConfig,
+  isNullJid,
+  isPnUser,
+  JidFilter,
+} from '@waha/core/utils/jids';
+
+function oneJob(chat: string, data, opts: JobsOptions): FlowJob {
+  data = lodash.cloneDeep(data);
+  data.options.chat = chat;
+  opts = lodash.cloneDeep(opts);
+  return {
+    name: chat,
+    queueName: QueueName.TASK_MESSAGES_PULL,
+    data: data,
+    opts: merge(ExponentialRetriesJobOptions, JobRemoveOptions, opts),
+    children: [],
+  };
+}
+
+export async function MessagesPullStart(
+  ctx: CommandContext,
+  options: MessagesPullOptions,
+  jobOptions: JobsOptions & JobDataTimeout,
+) {
+  const queue = ctx.queues.messagesPull;
+  const jobId = ChatWootScheduleService.SingleJobId(ctx.data.app);
+  const job: Job | null = await queue.getJob(jobId);
+
+  if (job) {
+    const state = await job.getState();
+    const done = state === 'completed' || state === 'failed';
+    if (!done) {
+      const msg = ctx.l.r('cli.cmd.messages.pull.already-running', {
+        chat: job.data.options.chat,
+      });
+      await ctx.conversation.incoming(msg);
+      return;
+    }
+
+    await MessagesPullRemove(queue, ctx.data.app, ctx.logger);
+  }
+  const opts: JobsOptions = {
+    ...jobOptions,
+    ignoreDependencyOnFailure: true,
+    delay: 1_000,
+  };
+  const data = {
+    ...ctx.data,
+    timeout: {
+      job: jobOptions.timeout.job,
+    },
+    options: options,
+  };
+  const producer: FlowProducer = ctx.flows.messagesPull;
+  let chats: string[] = [options.chat];
+
+  if (options.chat === ChatID.ALL) {
+    if (IsCommandsChat(data.body)) {
+      if (EngineHelper.SupportsAllChatForMessage()) {
+        //   keep "all" chats - that's fine
+      } else {
+        // "all" chats for engine that doesn't support it
+        chats = await resolveAllToChats(ctx.waha, ctx.data.session, options);
+        if (chats.length == 0) {
+          throw new Error(ctx.l.r('cli.cmd.messages.pull.no-chats-found'));
+        }
+      }
+    } else {
+      // It's per-chat command, get the chat ids and run the pulling process
+      chats = GetAllChatIDs(data.body?.conversation?.meta?.sender);
+      chats = EngineHelper.FilterChatIdsForMessages(chats);
+    }
+  }
+  const children = chats.map((chat) => oneJob(chat, data, opts));
+
+  let root: FlowJob;
+  if (children.length == 1) {
+    // Schedule one job, no "summary" job required
+    root = children[0];
+  } else {
+    // Add "summary" parent job so we get the overall progress at the end
+    root = oneJob(ChatID.SUMMARY, data, opts);
+    root.children = [ChainJobsOneAtATime(children)];
+  }
+  root.opts.jobId = jobId;
+  await producer.add(root);
+  const activity = new TaskActivity(ctx.l, ctx.conversation);
+  await activity.details(data);
+}
+
+export async function MessagesPullStatus(ctx: CommandContext) {
+  const queue = ctx.queues.messagesPull;
+  const jobId = ChatWootScheduleService.SingleJobId(ctx.data.app);
+  const job: Job | null = await queue.getJob(jobId);
+
+  if (!job) {
+    const msg = ctx.l.r('cli.cmd.messages.status.not-found');
+    await ctx.conversation.incoming(msg);
+    return;
+  }
+
+  const state = await job.getState();
+  const msg = MessagesPullStatusMessage(ctx.l, job, state);
+  await ctx.conversation.incoming(msg);
+}
+
+export async function MessagesPullRemove(
+  queue: Queue,
+  app: string,
+  logger: ILogger,
+): Promise<boolean> {
+  const jobId = ChatWootScheduleService.SingleJobId(app);
+  const job: Job | null = await queue.getJob(jobId);
+  if (!job) {
+    logger.info('Pull Messages job has already been removed');
+    return false;
+  }
+
+  await job.remove();
+  return true;
+}
+
+/**
+ * WORKING ONLY FOR WEBJS
+ */
+async function resolveAllToChats(
+  waha: WAHASelf,
+  sessionName: string,
+  options: MessagesPullOptions,
+): Promise<string[]> {
+  const session = new WAHASessionAPI(sessionName, waha);
+  let chats = await session.getChats({
+    limit: undefined,
+    offset: undefined,
+  });
+  // new chat last
+  chats = lodash.sortBy(chats, (c) => c.timestamp || 0);
+
+  const gte = Date.now() - options.period.start;
+  const result = [];
+  const jids = new JidFilter(options.ignore);
+  for (const chat of chats) {
+    const id = chat.id._serialized;
+    if (!jids.include(id)) {
+      continue;
+    }
+    if (isNullJid(id)) {
+      continue;
+    }
+    const timestamp = (chat.timestamp || Infinity) * 1000;
+    if (timestamp < gte) {
+      // Too old chat
+      continue;
+    }
+    result.push(id);
+  }
+  return result;
+}
@@ -0,0 +1,52 @@
+import * as lodash from 'lodash';
+import { QueueManager } from '@waha/apps/chatwoot/services/QueueManager';
+import { Locale } from '@waha/apps/chatwoot/i18n/locale';
+import { Conversation } from '@waha/apps/chatwoot/client/Conversation';
+import { QueueRegistry } from '@waha/apps/chatwoot/services/QueueRegistry';
+
+function repr(name: string): string {
+  // No chatwoot in the name always (it start with chatwoot)
+  name = name.replace('chatwoot.', '');
+  // No waha in the name
+  name = name.replace('waha |', 'whatsapp |');
+  return name;
+}
+
+export interface QueueCommandContext {
+  queues: {
+    registry: QueueRegistry;
+  };
+  l: Locale;
+  conversation: Conversation;
+}
+
+export async function QueueStatus(ctx: QueueCommandContext, name: string) {
+  const manager = new QueueManager(ctx.queues.registry);
+  const names = manager.resolve(name);
+  let result = await manager.status(names);
+  for (const status of result) {
+    status.name = repr(status.name);
+  }
+  // locked: true - last
+  result = lodash.sortBy(result, [(x) => !!x.locked, 'name']);
+  const msg = ctx.l.r('cli.cmd.queue.status.result', {
+    queues: result,
+  });
+  await ctx.conversation.incoming(msg);
+}
+
+export async function QueueStart(ctx: QueueCommandContext, name: string) {
+  const manager = new QueueManager(ctx.queues.registry);
+  const names = manager.resolve(name);
+  await manager.resume(names);
+  const msg = ctx.l.r('cli.cmd.queue.resumed');
+  await ctx.conversation.activity(msg);
+}
+
+export async function QueueStop(ctx: QueueCommandContext, name?: string) {
+  const manager = new QueueManager(ctx.queues.registry);
+  const names = manager.resolve(name);
+  await manager.pause(names);
+  const msg = ctx.l.r('cli.cmd.queue.paused');
+  await ctx.conversation.activity(msg);
+}
@@ -0,0 +1,22 @@
+import { CommandContext } from '@waha/apps/chatwoot/cli/types';
+import { TKey } from '@waha/apps/chatwoot/i18n/templates';
+
+export async function ServerStatus(ctx: CommandContext) {
+  ctx.logger.info('Getting server version and status');
+  const version = await ctx.waha.serverVersion();
+  const status = await ctx.waha.serverStatus();
+  const text = ctx.l.key(TKey.APP_SERVER_VERSION_AND_STATUS).render({
+    version: JSON.stringify(version, null, 2),
+    status: JSON.stringify(status, null, 2),
+  });
+  await ctx.conversation.incoming(text);
+}
+
+export async function ServerReboot(ctx: CommandContext, force: boolean) {
+  const type = force ? 'force' : 'graceful';
+  const tkey = force ? TKey.APP_SERVER_REBOOT_FORCE : TKey.APP_SERVER_REBOOT;
+  ctx.logger.info(`Rebooting server (${type})`);
+  const text = ctx.l.key(tkey).render();
+  await ctx.conversation.incoming(text);
+  await ctx.waha.serverReboot(false);
+}
@@ -0,0 +1,54 @@
+import { CommandContext } from '@waha/apps/chatwoot/cli/types';
+import { TKey } from '@waha/apps/chatwoot/i18n/templates';
+import { SessionStatusEmoji } from '@waha/apps/chatwoot/emoji';
+import { AttachmentFromBuffer } from '@waha/apps/chatwoot/client/messages';
+import { MessageType } from '@waha/apps/chatwoot/client/types';
+
+export async function SessionRestart(ctx: CommandContext) {
+  await ctx.waha.restart(ctx.data.session);
+}
+
+export async function SessionStart(ctx: CommandContext) {
+  return SessionRestart(ctx);
+}
+
+export async function SessionLogout(ctx: CommandContext) {
+  ctx.logger.info(`Logging out session ${ctx.data.session}`);
+  await ctx.waha.logout(ctx.data.session);
+  const text = ctx.l.key(TKey.APP_LOGOUT_SUCCESS).render();
+  await ctx.conversation.incoming(text);
+}
+
+export async function SessionStop(ctx: CommandContext) {
+  ctx.logger.info(`Stopping session ${ctx.data.session}`);
+  await ctx.waha.stop(ctx.data.session);
+}
+
+export async function SessionStatus(ctx: CommandContext) {
+  ctx.logger.info(`Getting status for session ${ctx.data.session}`);
+  const session = await ctx.waha.get(ctx.data.session);
+  const emoji = SessionStatusEmoji(session.status);
+  const text = ctx.l.key(TKey.APP_SESSION_CURRENT_STATUS).render({
+    emoji: emoji,
+    session: session.name,
+    status: session.status,
+    name: session.me?.pushName || 'Unknown',
+    id: session.me?.id || 'No phone number',
+  });
+  await ctx.conversation.incoming(text);
+}
+
+export async function SessionQR(ctx: CommandContext) {
+  const content = await ctx.waha.qr(ctx.data.session);
+  const message = AttachmentFromBuffer(content, 'qr.jpg');
+  message.message_type = MessageType.INCOMING;
+  await ctx.conversation.send(message);
+}
+
+export async function SessionScreenshot(ctx: CommandContext) {
+  ctx.logger.info(`Getting screenshot for session ${ctx.data.session}`);
+  const content = await ctx.waha.screenshot(ctx.data.session);
+  const message = AttachmentFromBuffer(content, 'screenshot.jpg');
+  message.message_type = MessageType.INCOMING;
+  await ctx.conversation.send(message);
+}
@@ -0,0 +1,35 @@
+import { CommanderError } from 'commander';
+import { parse } from 'shell-quote';
+import { BufferedOutput } from '@waha/apps/chatwoot/cli/utils/BufferedOutput';
+import { CommandContext } from '@waha/apps/chatwoot/cli/types';
+import { ChatWootCommandsConfig } from '@waha/apps/chatwoot/dto/config.dto';
+import { BuildProgram } from '@waha/apps/chatwoot/cli/program.a';
+import { CHATWOOT_COMMAND_PREFIX } from '@waha/apps/chatwoot/env';
+
+export async function runText(
+  commands: ChatWootCommandsConfig,
+  ctx: CommandContext,
+  text: string,
+) {
+  // Prepare text for cli like command
+  text = text
+    .split('\n') // split into lines
+    .map((line) => line.trimStart()) // remove indentation
+    .join(' ') // join with space
+    .trim(); // final cleanup
+  const output = new BufferedOutput();
+  const program = BuildProgram(commands, ctx, output);
+  const argv = parse(text);
+  try {
+    await program.parseAsync(argv, { from: 'user' });
+  } catch (err) {
+    if (err instanceof CommanderError) {
+      return output;
+    } else {
+      throw err; // unexpected bug in your action code
+    }
+  }
+  return output;
+}
+
+export const CommandPrefix = CHATWOOT_COMMAND_PREFIX;
@@ -0,0 +1,70 @@
+import { ChatWootCommandsConfig } from '@waha/apps/chatwoot/dto/config.dto';
+import { CommandContext } from '@waha/apps/chatwoot/cli/types';
+import { Argument, Command, Option, OutputConfiguration } from 'commander';
+import {
+  buildFormatHelp,
+  fullCommandPath,
+} from '@waha/apps/chatwoot/cli/utils/help';
+import { AddSessionCommand } from '@waha/apps/chatwoot/cli/program.session';
+import { AddContactsCommand } from '@waha/apps/chatwoot/cli/program.contacts';
+import { AddMessagesCommand } from '@waha/apps/chatwoot/cli/program.messages';
+import { AddServerCommand } from '@waha/apps/chatwoot/cli/program.server';
+import { AddQueueCommand } from '@waha/apps/chatwoot/cli/program.queue';
+
+function Program(ctx: CommandContext, output: OutputConfiguration) {
+  const l = ctx.l;
+  const program = new Command();
+  program
+    .name('')
+    .description(l.r('cli.cmd.root.description'))
+    .exitOverride()
+    .configureOutput(output)
+    .showSuggestionAfterError(true)
+    .configureHelp({
+      helpWidth: 200,
+      styleOptionTerm(str: string) {
+        return `- \`${str}\``;
+      },
+      styleArgumentTerm(str: string) {
+        return `- **${str}**`;
+      },
+      styleUsage(str) {
+        return `**${str}**`;
+      },
+      styleSubcommandTerm(str: string) {
+        return `- **${str}**`;
+      },
+      styleSubcommandDescription(str: string) {
+        return str ? `- ${str}` : str;
+      },
+      subcommandTerm: fullCommandPath,
+      commandUsage(cmd) {
+        // For the root program - no usage
+        if (!cmd.parent)
+          return `${l.r('cli.usage.command')} ${l.r('cli.usage.options')}`;
+        // For subcommands, keep default behavior
+        if (cmd.commands.length > 0) {
+          return `${fullCommandPath(cmd)} ${l.r('cli.usage.command')} ${l.r(
+            'cli.usage.options',
+          )}`;
+        }
+        return `${fullCommandPath(cmd)} ${l.r('cli.usage.options')}`;
+      },
+      formatHelp: buildFormatHelp(l),
+    });
+  return program;
+}
+
+export function BuildProgram(
+  commands: ChatWootCommandsConfig,
+  ctx: CommandContext,
+  output: OutputConfiguration,
+) {
+  const program = Program(ctx, output);
+  AddSessionCommand(program, ctx);
+  AddContactsCommand(program, ctx);
+  AddMessagesCommand(program, ctx, commands.queue);
+  AddQueueCommand(program, ctx, commands.queue);
+  AddServerCommand(program, ctx, commands.server);
+  return program;
+}
@@ -0,0 +1,113 @@
+import { Argument, Command, Option } from 'commander';
+import { CommandContext } from '@waha/apps/chatwoot/cli/types';
+import {
+  JobAttemptsOption,
+  JobTimeoutOption,
+  ParseMS,
+  NotNegativeNumber,
+  ProgressOption,
+} from '@waha/apps/chatwoot/cli/utils/options';
+import {
+  ContactsPullStart,
+  ContactsPullStatus,
+} from '@waha/apps/chatwoot/cli/cmd.contacts';
+import { ContactsPullOptions } from '@waha/apps/chatwoot/consumers/task/contacts.pull';
+import { JobsOptions } from 'bullmq';
+import { JobDataTimeout } from '@waha/apps/app_sdk/AppConsumer';
+
+export function AddContactsCommand(program: Command, ctx: CommandContext) {
+  const l = ctx.l;
+  const SyncGroup = l.r('cli.cmd.root.sub.sync');
+  program.commandsGroup(SyncGroup);
+
+  program
+    .command('contacts')
+    .summary(l.r('cli.cmd.contacts.summary'))
+    .description(l.r('cli.cmd.contacts.description'))
+    .helpGroup(SyncGroup)
+    .addArgument(
+      new Argument(
+        '[action]',
+        l.r('cli.cmd.contacts.action.description'),
+      ).choices(['pull', 'status', 'help']),
+    )
+    .addOption(
+      new Option(
+        '-a, --avatar <mode>',
+        l.r('cli.cmd.contacts.pull.option.avatar'),
+      )
+        .choices(['if-missing', 'update'])
+        .preset('if-missing'),
+    )
+    .option('-g, --groups', l.r('cli.cmd.contacts.pull.option.groups'))
+    .option('-l, --lids', l.r('cli.cmd.contacts.pull.option.lids'))
+    .option(
+      '--na, --no-attributes',
+      l.r('cli.cmd.contacts.pull.option.no-attributes'),
+    )
+    .option(
+      '-b, --batch <number>',
+      l.r('cli.cmd.contacts.pull.option.batch'),
+      NotNegativeNumber,
+      100,
+    )
+    .addOption(
+      ProgressOption(l.r('cli.cmd.contacts.pull.option.progress'), 100),
+    )
+    .addOption(new JobAttemptsOption(l, 6))
+    .addOption(new JobTimeoutOption(l, '10m'))
+    .addOption(
+      new Option(
+        '--dc, --delay-contact <duration>',
+        l.r('cli.cmd.contacts.pull.option.delay-contact'),
+      )
+        .argParser(ParseMS)
+        .default(ParseMS('0.1s'), '0.1s'),
+    )
+    .addOption(
+      new Option(
+        '--db, --delay-batch <duration>',
+        l.r('cli.cmd.contacts.pull.option.delay-batch'),
+      )
+        .argParser(ParseMS)
+        .default(ParseMS('1s'), '1s'),
+    )
+    .action(async (action, opts, cmd: Command) => {
+      if (!action) {
+        cmd.outputHelp();
+        return;
+      }
+
+      if (action === 'help') {
+        cmd.outputHelp();
+        return;
+      }
+
+      if (action === 'status') {
+        await ContactsPullStatus(ctx);
+        return;
+      }
+
+      const options: ContactsPullOptions = {
+        batch: opts.batch,
+        progress: opts.progress,
+        avatar: opts.avatar,
+        attributes: opts.attributes,
+        contacts: {
+          lids: opts.lids,
+          groups: opts.groups,
+        },
+        delay: {
+          contact: opts.delayContact,
+          batch: opts.delayBatch,
+        },
+      };
+      const jobOptions: JobsOptions & JobDataTimeout = {
+        attempts: opts.attempts,
+        timeout: {
+          job: opts.timeout,
+        },
+      };
+      await ContactsPullStart(ctx, options, jobOptions);
+    });
+}
@@ -0,0 +1,142 @@
+import { Argument, Command, Option } from 'commander';
+import { CommandContext } from '@waha/apps/chatwoot/cli/types';
+import {
+  JobAttemptsOption,
+  JobTimeoutOption,
+  ParseMS,
+  NotNegativeNumber,
+  ProgressOption,
+} from '@waha/apps/chatwoot/cli/utils/options';
+import {
+  MessagesPullStart,
+  MessagesPullStatus,
+} from '@waha/apps/chatwoot/cli/cmd.messages';
+import { MessagesPullOptions } from '@waha/apps/chatwoot/consumers/task/messages.pull';
+import { JobsOptions } from 'bullmq';
+import { JobDataTimeout } from '@waha/apps/app_sdk/AppConsumer';
+
+export function AddMessagesCommand(
+  program: Command,
+  ctx: CommandContext,
+  queue: boolean,
+) {
+  const l = ctx.l;
+  const SyncGroup = l.r('cli.cmd.root.sub.sync');
+  program.commandsGroup(SyncGroup);
+
+  program
+    .command('messages')
+    .summary(l.r('cli.cmd.messages.summary'))
+    .description(l.r('cli.cmd.messages.description'))
+    .helpGroup(SyncGroup)
+    .addArgument(
+      new Argument(
+        '[action]',
+        l.r('cli.cmd.messages.action.description'),
+      ).choices(['pull', 'status', 'help']),
+    )
+    .addArgument(
+      new Argument('[end]', l.r('cli.cmd.messages.pull.argument.end'))
+        .argParser(ParseMS)
+        .default(ParseMS('1d'), '1d'),
+    )
+    .addArgument(
+      new Argument('[start]', l.r('cli.cmd.messages.pull.argument.start'))
+        .argParser(ParseMS)
+        .default(ParseMS('0d'), '0d'),
+    )
+    .option(
+      '-c, --chat <chat>',
+      l.r('cli.cmd.messages.pull.option.chat'),
+      'all',
+    )
+    .option('-f, --force', l.r('cli.cmd.messages.pull.option.force'))
+    .option('--nd, --no-dm', l.r('cli.cmd.messages.pull.option.no-dm'))
+    .option('-g, --groups', l.r('cli.cmd.messages.pull.option.groups'))
+    .option('--ch, --channels', l.r('cli.cmd.messages.pull.option.channels'))
+    .option('-s, --status', l.r('cli.cmd.messages.pull.option.status'))
+    .option('--bc, --broadcast', l.r('cli.cmd.messages.pull.option.broadcast'))
+    .option('-m, --media', l.r('cli.cmd.messages.pull.option.media'))
+    .option('--pause', l.r('cli.cmd.messages.pull.option.pause'))
+    .option(
+      '--rc, --resolve-conversations',
+      l.r('cli.cmd.messages.pull.option.resolve-conversations'),
+    )
+    .option(
+      '-b, --batch <number>',
+      l.r('cli.cmd.messages.pull.option.batch'),
+      NotNegativeNumber,
+      100 as any,
+    )
+    .addOption(ProgressOption(l.r('cli.cmd.messages.pull.option.progress')))
+    .addOption(new JobAttemptsOption(l, 6))
+    .addOption(new JobTimeoutOption(l, '10m'))
+    .addOption(
+      new Option(
+        '--tm, --timeout-media <duration>',
+        l.r('cli.cmd.messages.pull.option.timeout-media'),
+      )
+        .argParser(ParseMS)
+        .default(ParseMS('30s'), '30s'),
+    )
+    .action(async (action, end, start, opts, cmd: Command) => {
+      if (!action) {
+        cmd.outputHelp();
+        return;
+      }
+
+      if (action === 'help') {
+        cmd.outputHelp();
+        return;
+      }
+
+      if (action === 'status') {
+        await MessagesPullStatus(ctx);
+        return;
+      }
+      if (end > start) {
+        // Swap
+        const tmp = end;
+        end = start;
+        start = tmp;
+      }
+
+      if (opts.pause && !queue) {
+        await ctx.conversation.incoming(
+          l.r('cli.cmd.messages.pull.error.pause-no-queue'),
+        );
+        return;
+      }
+
+      const options: MessagesPullOptions = {
+        chat: opts.chat,
+        progress: opts.progress,
+        period: {
+          end: end,
+          start: start,
+        },
+        media: opts.media,
+        force: opts.force,
+        pause: opts.pause,
+        timeout: {
+          media: opts.timeoutMedia,
+        },
+        batch: opts.batch,
+        ignore: {
+          dm: !opts.dm,
+          status: !opts.status,
+          groups: !opts.groups,
+          channels: !opts.channels,
+          broadcast: !opts.broadcast,
+        },
+        resolveConversations: opts.resolveConversations,
+      };
+      const jobOptions: JobsOptions & JobDataTimeout = {
+        attempts: opts.attempts,
+        timeout: {
+          job: opts.timeout,
+        },
+      };
+      await MessagesPullStart(ctx, options, jobOptions);
+    });
+}
@@ -0,0 +1,66 @@
+import { Argument, Command } from 'commander';
+import { CommandContext } from '@waha/apps/chatwoot/cli/types';
+import { CommandDisabled } from '@waha/apps/chatwoot/cli/cmd.disabled';
+import {
+  QueueStart,
+  QueueStatus,
+  QueueStop,
+} from '@waha/apps/chatwoot/cli/cmd.queue';
+
+export function AddQueueCommand(
+  program: Command,
+  ctx: CommandContext,
+  enabled: boolean,
+) {
+  const l = ctx.l;
+  const QueueGroup = l.r('cli.cmd.root.sub.queue');
+  program.commandsGroup(QueueGroup);
+
+  program
+    .command('queue', { hidden: !enabled })
+    .alias('q')
+    .summary(l.r('cli.cmd.queue.summary'))
+    .description(l.r('cli.cmd.queue.description'))
+    .helpGroup(QueueGroup)
+    .addArgument(
+      new Argument('[action]', l.r('cli.cmd.queue.action.description'))
+        .choices(['status', 'start', 'stop', 'help'])
+        .default('help'),
+    )
+    .addArgument(
+      new Argument('[name]', l.r('cli.cmd.queue.argument.name')).default(''),
+    )
+    .action(async function (this: Command, action: string, name: string) {
+      if (!action) {
+        this.outputHelp();
+        return;
+      }
+
+      if (action === 'help') {
+        this.outputHelp();
+        return;
+      }
+
+      if (!enabled) {
+        await CommandDisabled(ctx, 'queue');
+        return;
+      }
+
+      if (action === 'status') {
+        await QueueStatus(ctx, name);
+        return;
+      }
+
+      if (action === 'start') {
+        await QueueStart(ctx, name);
+        return;
+      }
+
+      if (action === 'stop') {
+        await QueueStop(ctx, name);
+        return;
+      }
+
+      this.outputHelp();
+    });
+}
@@ -0,0 +1,38 @@
+import { Command } from 'commander';
+import { CommandContext } from '@waha/apps/chatwoot/cli/types';
+import { CommandDisabled } from '@waha/apps/chatwoot/cli/cmd.disabled';
+import { ServerReboot, ServerStatus } from '@waha/apps/chatwoot/cli/cmd.server';
+
+export function AddServerCommand(
+  program: Command,
+  ctx: CommandContext,
+  enabled: boolean,
+) {
+  const l = ctx.l;
+  const ServerGroup = l.r('cli.cmd.root.sub.server');
+  program.commandsGroup(ServerGroup);
+
+  const server = program
+    .command('server', { hidden: !enabled })
+    .description(l.r('cli.cmd.server.description'))
+    .helpGroup(ServerGroup);
+  if (!enabled) {
+    // Do not show help, show disabled ASAP
+    server.action(() => CommandDisabled(ctx, 'server'));
+  }
+  server
+    .command('status')
+    .description(l.r('cli.cmd.server.status.description'))
+    .action(() =>
+      enabled ? ServerStatus(ctx) : CommandDisabled(ctx, 'server status'),
+    );
+  server
+    .command('reboot')
+    .description(l.r('cli.cmd.server.reboot.description'))
+    .option('-f, --force', l.r('cli.cmd.server.reboot.option.force'), false)
+    .action((opts) =>
+      enabled
+        ? ServerReboot(ctx, opts.force)
+        : CommandDisabled(ctx, 'server reboot'),
+    );
+}
@@ -0,0 +1,60 @@
+import { Command } from 'commander';
+import { CommandContext } from '@waha/apps/chatwoot/cli/types';
+import {
+  SessionLogout,
+  SessionQR,
+  SessionRestart,
+  SessionScreenshot,
+  SessionStart,
+  SessionStatus,
+  SessionStop,
+} from '@waha/apps/chatwoot/cli/cms.session';
+
+export function AddSessionCommand(program: Command, ctx: CommandContext) {
+  const l = ctx.l;
+  const SessionGroup = l.r('cli.cmd.root.sub.session');
+  program.commandsGroup(SessionGroup);
+
+  program
+    .command('status')
+    .alias('1')
+    .description(l.r('cli.cmd.session.status.description'))
+    .helpGroup(SessionGroup)
+    .action(() => SessionStatus(ctx));
+  program
+    .command('restart')
+    .alias('2')
+    .description(l.r('cli.cmd.session.restart.description'))
+    .helpGroup(SessionGroup)
+    .action(() => SessionRestart(ctx));
+  program
+    .command('start')
+    .alias('3')
+    .description(l.r('cli.cmd.session.start.description'))
+    .helpGroup(SessionGroup)
+    .action(() => SessionStart(ctx));
+  program
+    .command('stop')
+    .alias('4')
+    .description(l.r('cli.cmd.session.stop.description'))
+    .helpGroup(SessionGroup)
+    .action(() => SessionStop(ctx));
+  program
+    .command('logout')
+    .alias('5')
+    .description(l.r('cli.cmd.session.logout.description'))
+    .helpGroup(SessionGroup)
+    .action(() => SessionLogout(ctx));
+  program
+    .command('qr')
+    .alias('6')
+    .description(l.r('cli.cmd.session.qr.description'))
+    .helpGroup(SessionGroup)
+    .action(() => SessionQR(ctx));
+  program
+    .command('screenshot')
+    .alias('7')
+    .description(l.r('cli.cmd.session.screenshot.description'))
+    .helpGroup(SessionGroup)
+    .action(() => SessionScreenshot(ctx));
+}
@@ -0,0 +1,23 @@
+import { WAHASelf } from '@waha/apps/app_sdk/waha/WAHASelf';
+import { Locale } from '@waha/apps/chatwoot/i18n/locale';
+import { Conversation } from '../client/Conversation';
+import { ILogger } from '@waha/apps/app_sdk/ILogger';
+import { FlowProducer, Queue } from 'bullmq';
+import { InboxData } from '@waha/apps/chatwoot/consumers/types';
+import { QueueRegistry } from '@waha/apps/chatwoot/services/QueueRegistry';
+
+export interface CommandContext {
+  data: InboxData;
+  logger: ILogger;
+  l: Locale;
+  waha: WAHASelf;
+  conversation: Conversation;
+  queues: {
+    registry: QueueRegistry;
+    contactsPull: Queue;
+    messagesPull: Queue;
+  };
+  flows: {
+    messagesPull: FlowProducer;
+  };
+}
@@ -0,0 +1,26 @@
+import { OutputConfiguration } from 'commander';
+
+export class BufferedOutput implements OutputConfiguration {
+  private outBuffer: string[] = [];
+  private errBuffer: string[] = [];
+
+  writeOut = (str: string): void => {
+    this.outBuffer.push(str);
+  };
+
+  writeErr = (str: string): void => {
+    this.errBuffer.push(str);
+  };
+
+  outputError = (str: string, write: (s: string) => void) => {
+    this.errBuffer.push(str);
+  };
+
+  get out() {
+    return this.outBuffer.join('');
+  }
+
+  get err() {
+    return this.errBuffer.join('');
+  }
+}
@@ -0,0 +1,132 @@
+import { Command, Help, Option } from 'commander';
+import { Locale } from '@waha/apps/chatwoot/i18n/locale';
+
+export function fullCommandPath(sub: Command): string {
+  const parts: string[] = [];
+  let cmd: Command | null = sub;
+  // collect names up to (but not including) the root program
+  const name = cmd.name();
+  if (name) parts.push(name);
+  while (cmd && cmd.parent) {
+    cmd = cmd.parent!;
+    const name = cmd.name();
+    if (name && name != 'program') parts.push(name);
+  }
+  return parts.reverse().join(' ');
+}
+
+export function buildFormatHelp(l: Locale) {
+  /**
+   * Commands first, then Arguments, then Options
+   * @param cmd
+   * @param helper
+   */
+
+  return function formatHelp(this: Help, cmd: Command, helper: Help) {
+    const termWidth = helper.padWidth(cmd, helper);
+    const helpWidth = helper.helpWidth ?? 80;
+
+    const callFormatItem = (term: string, description: string) =>
+      helper.formatItem(term, termWidth, description, helper);
+    let output: string[] = [];
+
+    const commandDescription = helper.commandDescription(cmd);
+    if (commandDescription.length > 0) {
+      output = output.concat([
+        helper.boxWrap(
+          helper.styleCommandDescription(commandDescription),
+          helpWidth,
+        ),
+        '',
+      ]);
+    }
+
+    const usage = helper.commandUsage(cmd);
+    if (usage) {
+      output.push(
+        `${
+          helper.styleTitle(l.r('cli.help.usage.title')) + '\n'
+        } ${helper.styleUsage(helper.commandUsage(cmd))}`,
+      );
+      output.push('');
+    }
+
+    const commandGroups = this.groupItems(
+      cmd.commands as Command[],
+      helper.visibleCommands(cmd),
+      (sub) => sub.helpGroup() || l.r('cli.help.commands.defaultGroup'),
+    );
+    commandGroups.forEach((commands, group) => {
+      if (!commands.length) {
+        return;
+      }
+
+      const commandLines = commands.map((sub) => {
+        const commandTerm = helper.styleSubcommandTerm(
+          helper.subcommandTerm(sub),
+        );
+        const description = helper.subcommandDescription(sub);
+        const styledDescription = description
+          ? helper.styleSubcommandDescription(description)
+          : '';
+        return `${commandTerm} ${styledDescription}`;
+      });
+
+      output.push(helper.styleTitle(group));
+      output.push(...commandLines);
+      output.push('');
+    });
+
+    const argumentList = helper
+      .visibleArguments(cmd)
+      .map((argument) =>
+        callFormatItem(
+          helper.styleArgumentTerm(helper.argumentTerm(argument)),
+          helper.styleArgumentDescription(helper.argumentDescription(argument)),
+        ),
+      );
+    output = output.concat(
+      this.formatItemList(
+        l.r('cli.help.arguments.title'),
+        argumentList,
+        helper,
+      ),
+    );
+
+    const optionGroups = this.groupItems(
+      cmd.options as Option[],
+      helper.visibleOptions(cmd),
+      (option) =>
+        option.helpGroupHeading ?? l.r('cli.help.options.defaultGroup'),
+    );
+    optionGroups.forEach((options, group) => {
+      const optionList = options.map((option) =>
+        callFormatItem(
+          helper.styleOptionTerm(helper.optionTerm(option)),
+          helper.styleOptionDescription(helper.optionDescription(option)),
+        ),
+      );
+      output = output.concat(this.formatItemList(group, optionList, helper));
+    });
+
+    if (helper.showGlobalOptions) {
+      const globalOptionList = helper
+        .visibleGlobalOptions(cmd)
+        .map((option) =>
+          callFormatItem(
+            helper.styleOptionTerm(helper.optionTerm(option)),
+            helper.styleOptionDescription(helper.optionDescription(option)),
+          ),
+        );
+      output = output.concat(
+        this.formatItemList(
+          l.r('cli.help.globalOptions.title'),
+          globalOptionList,
+          helper,
+        ),
+      );
+    }
+
+    return output.join('\n');
+  };
+}
@@ -0,0 +1,65 @@
+import * as ms from 'ms';
+import { Option } from 'commander';
+import { Locale } from '@waha/apps/chatwoot/i18n/locale';
+
+/**
+ * Parse human string into milliseconds
+ */
+export function ParseMS(value: string) {
+  const duration = ms(value);
+  if (duration == null) throw new Error(`Invalid duration: "${value}"`);
+  if (duration < 0) throw new Error(`Duration cannot be negative: "${value}"`);
+  return duration;
+}
+
+export function ParseSeconds(value: string): number {
+  const duration = ParseMS(value);
+  return Math.floor(duration / 1000);
+}
+
+export class JobAttemptsOption extends Option {
+  constructor(l: Locale, def: number) {
+    super('--at, --attempts <number>', l.r('cli.cmd.options.job.attempts'));
+    this.argParser(NotNegativeNumber);
+    this.default(def);
+  }
+}
+
+export class JobTimeoutOption extends Option {
+  constructor(l: Locale, def: string) {
+    super('-t, --timeout <duration>', l.r('cli.cmd.options.job.timeout'));
+    this.argParser(ParseMS);
+    this.default(ParseMS(def));
+  }
+}
+
+export function ProgressOption(
+  description: string,
+  def: number = 1000,
+): Option {
+  return new Option('-p, --progress [number]', description)
+    .argParser(NotNegativeNumber)
+    .default(def);
+}
+
+export function NotNegativeNumber(value: string): number {
+  const n = parseInt(value, 10);
+  if (isNaN(n)) {
+    throw new Error(`Invalid number: "${value}"`);
+  }
+  if (n < 0) {
+    throw new Error(`Number must be positive or 0: "${value}"`);
+  }
+  return n;
+}
+
+export function PositiveNumber(value: string): number {
+  const n = parseInt(value, 10);
+  if (isNaN(n)) {
+    throw new Error(`Invalid number: "${value}"`);
+  }
+  if (n <= 0) {
+    throw new Error(`Number must be positive: "${value}"`);
+  }
+  return n;
+}