[core] 2024.10.6

fix #586

.env.example

@@ -0,0 +1,168 @@
+# WAHA Configuration
+# 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/
+#
+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
+#
+
+#
+# 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
+#
+
+#
+# HTTPS Configuration
+# https://waha.devlike.pro/docs/how-to/config/#https
+#
+# Consider using certbot for HTTPS
+# https://waha.devlike.pro/blog/setting-up-https-for-waha/#lets-encrypt-certbot--waha
+#
+#WAHA_HTTPS_ENABLED=true
+#WAHA_HTTPS_PATH_KEY=/etc/letsencrypt/live/waha.example.pro/privkey.pem
+#WAHA_HTTPS_PATH_CERT=/etc/letsencrypt/live/waha.example.pro/cert.pem \
+#WAHA_HTTPS_PATH_CA=/etc/letsencrypt/live/waha.example.pro/chain.pem
+#WHATSAPP_API_SCHEMA=https
+#WHATSAPP_API_PORT=3000
+#WHATSAPP_API_HOSTNAME=waha.example.pro
+#
+
+#
+# Media Configuration
+#
+# 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
+#
+
+# 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
+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
+
+#
+# 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
+#
+
+#
+# MongoDB Configuration
+# https://waha.devlike.pro/docs/how-to/storages/#sessions---mongodb
+#WHATSAPP_SESSIONS_MONGO_URL=mongodb://mongodb:27017
+#

.gitignore

@@ -1,3 +1,4 @@
+.env
 *.heapsnapshot
 .yarn
 example.ts
@@ -15,6 +16,7 @@ test.js
 .wwebjs_cache
 src/dashboard
 .eslintcache
+__pycache__
 
 # compiled output
 /dist

Dockerfile

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

Makefile

@@ -32,10 +32,10 @@ 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-2
+	. ${NVM_DIR}/nvm.sh && nvm exec yarn up @adiwajshing/baileys@github:devlikeapro/Baileys#fork-master-channels-678
 
 up-webjs:
-	. ${NVM_DIR}/nvm.sh && nvm exec yarn up whatsapp-web.js@github:devlikeapro/whatsapp-web.js#fork-webpack-exodus-channels
+	. ${NVM_DIR}/nvm.sh && nvm exec yarn up whatsapp-web.js@github:devlikeapro/whatsapp-web.js#fork-main-channels
 
 start-proxy:
 	docker run --rm -d --name squid-container -e TZ=UTC -p 3128:3128 ubuntu/squid:5.2-22.04_beta

docker-compose.yaml

@@ -1,246 +1,56 @@
-#
 # https://waha.devlike.pro/docs/how-to/install/
-# Here's we provide a simple example of how to install WAHA using Docker Compose.
-#
-# We're assuming you have Docker and Docker Compose installed.
-# If you don't have Docker Compose installed, you can follow the official guide:
-# https://docs.docker.com/compose/install/
-#
-
 services:
   waha:
-    # Always restart the container on failure
     restart: always
-
-    #
-    # Image
-    #
-    image: devlikeapro/waha-plus:latest # or devlikeapro/waha:latest if you're using WAHA Core
-    #
-    # We strongly recommend using the pinned version of WAHA
-    # https://waha.devlike.pro/docs/how-to/engines/#versions
-    # image: devlikeapro/waha-plus:latest-2024.7.6 # 'latest' is not mistaken here
-    #
-    # Multiple images are available
     # https://waha.devlike.pro/docs/how-to/engines/#docker-images
-    # image: devlikeapro/waha-plus:chrome
-    #
+    # https://portal.devlike.pro/docker-image
+    image: devlikeapro/waha-plus:latest
+    # WAHA Core
+    # image: devlikeapro/waha:latest
 
-    # The first port can be any free port you want
-    # The second port must be the same as WHATSAPP_API_PORT or 3000 by default
-    # Consider using the same port for simplicity
     ports:
-      - '3000:3000/tcp'
-      # NOTE: if you're using HTTP, you can use the following port mapping
-      #- '80:3000/tcp'
-      # NOTE: if you're using HTTPS, you can use the following port mapping
-      #- '443:3000/tcp'
+      - '127.0.0.1:3000:3000/tcp'
 
     volumes:
       # Store sessions in the .sessions folder (comment it if you're using MongoDB)
-      # Doesn't work with WAHA Core
       - './.sessions:/app/.sessions'
 
+      # Save media files
       # https://waha.devlike.pro/docs/how-to/storages/#save-media-files-between-the-container-restarts
       - './.media:/app/.media'
 
-      # If you're using certbot for HTTPS, you can use the following volume mapping
-      # https://waha.devlike.pro/blog/setting-up-https-for-waha/#lets-encrypt-certbot--waha
-      # - '/etc/letsencrypt:/etc/letsencrypt'
-
-    # WAHA Configuration
-    # https://waha.devlike.pro/docs/how-to/config/
-    environment:
-      #
-      # 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
-      #
-      # 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
-      #
-      # Choose the right engine for your needs (WEBJS by default)
-      # https://waha.devlike.pro/docs/how-to/engines/
-      - WHATSAPP_DEFAULT_ENGINE=WEBJS
-      # Use NOWEB engine for the fastest performance
-      #- WHATSAPP_DEFAULT_ENGINE=NOWEB
-
-      #
-      # Sessions
-      #
-      # https://waha.devlike.pro/docs/how-to/config/#sessions
-      # Restart all sessions when container starts
-      - WHATSAPP_RESTART_ALL_SESSIONS=True
-      # 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
-      # Do not use both WHATSAPP_RESTART_ALL_SESSIONS and WHATSAPP_START_SESSION parameters
-      #
-
-      #
-      # Swagger
-      #
-      # https://waha.devlike.pro/docs/how-to/swagger/
-      #- 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
-      #
-
-      #
-      # 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
-      #
-
-      #
-      # HTTPS Configuration
-      #
-      # https://waha.devlike.pro/docs/how-to/config/#https
-      # Consider using certbot for HTTPS
-      # https://waha.devlike.pro/blog/setting-up-https-for-waha/#lets-encrypt-certbot--waha
-      #- WAHA_HTTPS_ENABLED=true
-      #- WAHA_HTTPS_PATH_KEY=/etc/letsencrypt/live/waha.example.pro/privkey.pem
-      #- WAHA_HTTPS_PATH_CERT=/etc/letsencrypt/live/waha.example.pro/cert.pem \
-      #- WAHA_HTTPS_PATH_CA=/etc/letsencrypt/live/waha.example.pro/chain.pem
-      #- WHATSAPP_API_SCHEMA=https
-      #- WHATSAPP_API_PORT=3000
-      #- WHATSAPP_API_HOSTNAME=waha.example.pro
-      #
-
-      #
-      # Media Configuration
-      #
-      # 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
-      #
-
-      # 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
-      - 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
-
-      #
-      # 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
-      #
-
-      #
-      # MongoDB Configuration
-      # https://waha.devlike.pro/docs/how-to/storages/#sessions---mongodb
-      #- WHATSAPP_SESSIONS_MONGO_URL=mongodb://mongodb:27017
-      #
+    env_file:
+      - .env
 
   # NOTE: Only if you're using MongoDB
   # https://waha.devlike.pro/docs/how-to/storages/#sessions---mongodb
   # Comment this block if you're using MongoDB
-  mongodb:
-    image: mongo
-    container_name: mongodb
-    ports:
-      - '27017:27017/tcp'
-    volumes:
-      - mongodb_data:/data/db
-    restart: always
+#  mongodb:
+#    image: mongo
+#    container_name: mongodb
+#    ports:
+#      - '127.0.0.1:27017:27017/tcp'
+#    volumes:
+#      - mongodb_data:/data/db
+#    restart: always
 
-  # NOTE: Only if you're using S3 to save media files
-  # https://waha.devlike.pro/docs/how-to/storages/#media---s3
-  # Comment this block if you're using AWS S3
-  minio:
-    image: quay.io/minio/minio
-    container_name: minio
-    restart: always
-    ports:
-      - '9000:9000'
-      - '9001:9001'
-    environment:
-      MINIO_REGION: 'eu-west-2'
-      MINIO_ROOT_USER: 'minioadmin'
-      MINIO_ROOT_PASSWORD: 'minioadmin'
-    volumes:
-      - minio_data:/data
-    command: server /data --console-address ":9001"
+# NOTE: Only if you're using S3 to save media files
+# https://waha.devlike.pro/docs/how-to/storages/#media---s3
+# Comment this block if you're using AWS S3
+#  minio:
+#    image: quay.io/minio/minio
+#    container_name: minio
+#    restart: always
+#    ports:
+#      - '127.0.0.1:9000:9000'
+#      - '127.0.0.1:9001:9001'
+#    environment:
+#      MINIO_REGION: 'eu-west-2'
+#      MINIO_ROOT_USER: 'minioadmin'
+#      MINIO_ROOT_PASSWORD: 'minioadmin'
+#    volumes:
+#      - minio_data:/data
+#    command: server /data --console-address ":9001"
 
 volumes:
   # NOTE: Only if you're using MongoDB

docker-compose/docker-compose.workers.yaml

@@ -0,0 +1,97 @@
+# https://waha.devlike.pro/docs/how-to/install/
+services:
+  # Just to connect
+  waha-dashboard:
+    restart: unless-stopped
+    image: devlikeapro/waha-plus:latest
+    ports:
+      - '127.0.0.1:3000:3000/tcp'
+    env_file:
+      - .env
+    environment:
+      - WAHA_WORKER_ID=waha-dashboard
+
+  waha1:
+    restart: unless-stopped
+    image: devlikeapro/waha-plus:latest
+    ports:
+      - '127.0.0.1:3001:3000/tcp'
+    volumes:
+      - './.media:/app/.media'
+    env_file:
+      - .env
+    environment:
+      - WAHA_WORKER_ID=waha1
+      - WAHA_BASE_URL=http://localhost:3001
+      - WHATSAPP_DEFAULT_ENGINE=NOWEB
+      # MongoDB
+      - WHATSAPP_SESSIONS_MONGO_URL=mongodb://mongodb:27017
+      # 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
+
+  waha2:
+    restart: unless-stopped
+    image: devlikeapro/waha-plus:latest
+    ports:
+      - '127.0.0.1:3002:3000/tcp'
+    volumes:
+      - './.media:/app/.media'
+    env_file:
+      - .env
+    environment:
+      - WAHA_WORKER_ID=waha2
+      - WAHA_BASE_URL=http://localhost:3002
+      - WHATSAPP_DEFAULT_ENGINE=NOWEB
+      # MongoDB
+      - WHATSAPP_SESSIONS_MONGO_URL=mongodb://mongodb:27017
+      # 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
+
+  # NOTE: Only if you're using MongoDB
+  # https://waha.devlike.pro/docs/how-to/storages/#sessions---mongodb
+  # Comment this block if you're not using MongoDB
+  mongodb:
+    image: mongo
+    container_name: mongodb
+    ports:
+      - '127.0.0.1:27017:27017/tcp'
+    volumes:
+      - mongodb_data:/data/db
+    restart: always
+
+  # NOTE: Only if you're using S3 to save media files
+  # https://waha.devlike.pro/docs/how-to/storages/#media---s3
+  # Comment this block if you're using S3
+  minio:
+    image: quay.io/minio/minio
+    container_name: minio
+    restart: always
+    ports:
+      - '127.0.0.1:9000:9000'
+      - '127.0.0.1:9001:9001'
+    environment:
+      MINIO_REGION: 'eu-west-2'
+      MINIO_ROOT_USER: 'minioadmin'
+      MINIO_ROOT_PASSWORD: 'minioadmin'
+    volumes:
+      - minio_data:/data
+    command: server /data --console-address ":9001"
+
+volumes:
+  # NOTE: Only if you're using MongoDB
+  mongodb_data: {}
+  minio_data: {}

docker-compose/n8n/docker-compose.yaml

@@ -14,7 +14,6 @@ services:
       - WAHA_DASHBOARD_USERNAME=waha
       - WAHA_DASHBOARD_PASSWORD=waha
       - WHATSAPP_DEFAULT_ENGINE=WEBJS
-      - WHATSAPP_RESTART_ALL_SESSIONS=True
       - WAHA_PRINT_QR=False
       - WAHA_MEDIA_STORAGE=LOCAL
       - WHATSAPP_FILES_LIFETIME=0

docker-compose/test/docker-compose.yaml

@@ -25,7 +25,6 @@ services:
       - './.sessions:/app/.sessions'
     environment:
       # Environment variables from https://waha.devlike.pro/docs/how-to/config/
-      # - WHATSAPP_RESTART_ALL_SESSIONS=True
       # - WHATSAPP_HOOK_URL=https://webhook.site/11111111-1111-1111-1111-11111111
       # - WHATSAPP_HOOK_EVENTS=message
       # - WHATSAPP_API_HOSTNAME=localhost
@@ -54,7 +53,6 @@ services:
       - './.sessions:/app/.sessions'
     environment:
       # Environment variables from https://waha.devlike.pro/docs/how-to/config/
-      # - WHATSAPP_RESTART_ALL_SESSIONS=True
       # - WHATSAPP_HOOK_URL=https://webhook.site/11111111-1111-1111-1111-11111111
       # - WHATSAPP_HOOK_EVENTS=message
       # - WHATSAPP_API_KEY=321

entrypoint.sh

@@ -8,4 +8,4 @@ uv_threadpool_size=$(($cpus * 2))
 export UV_THREADPOOL_SIZE="${UV_THREADPOOL_SIZE:-$uv_threadpool_size}"
 
 # Start your application using yarn
-node dist/main
+exec node dist/main

package.json

@@ -23,7 +23,7 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@adiwajshing/baileys": "github:devlikeapro/Baileys#fork-master-channels-2",
+    "@adiwajshing/baileys": "github:devlikeapro/Baileys#fork-master-channels-678",
     "@adiwajshing/keyed-db": "^0.2.4",
     "@aws-sdk/client-s3": "^3.633.0",
     "@aws-sdk/s3-request-presigner": "^3.633.0",
@@ -42,7 +42,10 @@
     "@types/lodash": "^4.14.194",
     "@types/ws": "^8.5.4",
     "adm-zip": "0.5.10",
+    "agentkeepalive": "^4.5.0",
     "async-lock": "^1.4.1",
+    "axios": "^1.7.7",
+    "axios-retry": "^4.5.0",
     "better-sqlite3": "11.3.0",
     "check-disk-space": "^3.4.0",
     "chokidar": "^3.6.0",
@@ -59,7 +62,7 @@
     "link-preview-js": "^3.0.4",
     "lodash": "^4.17.21",
     "mime-types": "^2.1.27",
-    "mongodb": "^6.3.0",
+    "mongodb": "6.9.0",
     "nestjs-pino": "^4.1.0",
     "passport": "^0.6.0",
     "passport-headerapikey": "^1.2.2",
@@ -71,13 +74,11 @@
     "qrcode": "^1.5.1",
     "qrcode-terminal": "^0.12.0",
     "reflect-metadata": "^0.1.13",
-    "request": "^2.88.2",
-    "requestretry": "^4.1.1",
     "rimraf": "^3.0.2",
     "rxjs": "^7.1.0",
     "sharp": "^0.33.4",
     "swagger-ui-express": "^4.1.4",
-    "whatsapp-web.js": "github:devlikeapro/whatsapp-web.js#fork-webpack-exodus-channels"
+    "whatsapp-web.js": "github:devlikeapro/whatsapp-web.js#fork-main-channels"
   },
   "devDependencies": {
     "@nestjs/cli": "^9.0.0",

scripts/waha-run.sh

@@ -14,7 +14,6 @@ docker run -d \
     --env WAHA_LOG_FORMAT=JSON \
     --env WAHA_LOG_LEVEL=info \
     --env WHATSAPP_DEFAULT_ENGINE=WEBJS \
-    --env WHATSAPP_RESTART_ALL_SESSIONS=True \
     --env WAHA_PRINT_QR=False \
     --env WHATSAPP_FILES_LIFETIME=0 \
     --env WHATSAPP_FILES_FOLDER=/app/.media \

src/api/chatting.controller.ts

@@ -1,5 +1,15 @@
-import { Body, Controller, Get, Post, Put, Query } from '@nestjs/common';
+import {
+  Body,
+  Controller,
+  Get,
+  Post,
+  Put,
+  Query,
+  UsePipes,
+} from '@nestjs/common';
 import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
+import { WAHAValidationPipe } from '@waha/nestjs/pipes/WAHAValidationPipe';
+import { SendButtonsRequest } from '@waha/structures/chatting.buttons.dto';
 
 import { SessionManager } from '../core/abc/manager.abc';
 import {
@@ -8,6 +18,7 @@ import {
   GetMessageQuery,
   MessageContactVcardRequest,
   MessageFileRequest,
+  MessageForwardRequest,
   MessageImageRequest,
   MessageLinkPreviewRequest,
   MessageLocationRequest,
@@ -81,6 +92,25 @@ export class ChattingController {
     return whatsapp.sendVideo(request);
   }
 
+  @Post('/sendButtons')
+  @ApiOperation({
+    summary: 'Send buttons (interactive message)',
+    description: 'Send Buttons',
+  })
+  @UsePipes(new WAHAValidationPipe())
+  async sendButtons(@Body() request: SendButtonsRequest) {
+    const whatsapp = await this.manager.getWorkingSession(request.session);
+    return whatsapp.sendButtons(request);
+  }
+
+  @Post('/forwardMessage')
+  async forwardMessage(
+    @Body() request: MessageForwardRequest,
+  ): Promise<WAMessage> {
+    const whatsapp = await this.manager.getWorkingSession(request.session);
+    return await whatsapp.forwardMessage(request);
+  }
+
   @Post('/sendSeen')
   async sendSeen(@Body() chat: SendSeenRequest) {
     const whatsapp = await this.manager.getWorkingSession(chat.session);

src/api/server.controller.ts

@@ -9,14 +9,11 @@ import {
   NotFoundException,
   Post,
   Query,
-  Res,
   StreamableFile,
-  UseInterceptors,
   UsePipes,
 } from '@nestjs/common';
 import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
 import { WhatsappConfigService } from '@waha/config.service';
-import { getApp } from '@waha/main';
 import { WAHAValidationPipe } from '@waha/nestjs/pipes/WAHAValidationPipe';
 import { WAHAEnvironment } from '@waha/structures/environment.dto';
 import {
@@ -25,6 +22,7 @@ import {
   StopRequest,
   StopResponse,
 } from '@waha/structures/server.dto';
+import { sleep } from '@waha/utils/promiseTimeout';
 import { VERSION } from '@waha/version';
 import * as lodash from 'lodash';
 
@@ -34,7 +32,7 @@ import * as lodash from 'lodash';
 export class ServerController {
   private logger: Logger;
 
-  constructor() {
+  constructor(private config: WhatsappConfigService) {
     this.logger = new Logger('ServerController');
   }
 
@@ -79,6 +77,9 @@ export class ServerController {
     return {
       startTimestamp: startTimestamp,
       uptime: uptime,
+      worker: {
+        id: this.config.workerId,
+      },
     };
   }
 
@@ -97,16 +98,14 @@ export class ServerController {
       setTimeout(() => {
         this.logger.log('Force stopping the server');
         process.kill(process.pid, 'SIGKILL');
+        process.exit(0);
       }, timeout);
     } else {
       this.logger.log(`Gracefully stopping the server in ${timeout}ms`);
       setTimeout(async () => {
         this.logger.log('Gracefully closing the application...');
-        const app = getApp();
-        if (app) {
-          await app.close();
-        }
-        this.logger.log('Application closed');
+        process.kill(process.pid, 'SIGTERM');
+        await sleep(10_000);
         process.exit(0);
       }, timeout);
     }

src/api/sessions.controller.ts

@@ -35,21 +35,14 @@ import {
   SessionUpdateRequest,
 } from '../structures/sessions.dto';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const AsyncLock = require('async-lock');
-
 @ApiSecurity('api_key')
 @Controller('api/sessions')
 @ApiTags('🖥️ Sessions')
 class SessionsController {
-  private lock: any;
-
-  constructor(private manager: SessionManager) {
-    this.lock = new AsyncLock({ maxPending: Infinity });
-  }
+  constructor(private manager: SessionManager) {}
 
   private withLock(name: string, fn: () => any) {
-    return this.lock.acquire(name, fn);
+    return this.manager.withLock(name, fn);
   }
 
   @Get('/')
@@ -98,6 +91,7 @@ class SessionsController {
       const start = request.start || false;
       await this.manager.upsert(name, config);
       if (start) {
+        await this.manager.assign(name);
         await this.manager.start(name);
       }
     });
@@ -140,6 +134,7 @@ class SessionsController {
   @UsePipes(new WAHAValidationPipe())
   async delete(@Param('session') name: string): Promise<void> {
     await this.withLock(name, async () => {
+      await this.manager.unassign(name);
       await this.manager.stop(name, true);
       await this.manager.logout(name);
       await this.manager.delete(name);
@@ -151,7 +146,7 @@ class SessionsController {
   @ApiOperation({
     summary: 'Start the session',
     description:
-      'Start the session with the given name. The session must exist. Identity operation.',
+      'Start the session with the given name. The session must exist. Idempotent operation.',
   })
   @UsePipes(new WAHAValidationPipe())
   async start(@Param('session') name: string): Promise<SessionDTO> {
@@ -160,10 +155,8 @@ class SessionsController {
       if (!exists) {
         throw new NotFoundException('Session not found');
       }
-      const isRunning = this.manager.isRunning(name);
-      if (!isRunning) {
-        await this.manager.start(name);
-      }
+      await this.manager.assign(name);
+      await this.manager.start(name);
     });
     return await this.manager.getSessionInfo(name);
   }
@@ -177,10 +170,7 @@ class SessionsController {
   @UsePipes(new WAHAValidationPipe())
   async stop(@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.unassign(name);
       await this.manager.stop(name, false);
     });
     return await this.manager.getSessionInfo(name);
@@ -222,6 +212,7 @@ class SessionsController {
       if (!exists) {
         throw new NotFoundException('Session not found');
       }
+      await this.manager.assign(name);
       await this.manager.stop(name, true);
       await this.manager.start(name);
     });
@@ -248,6 +239,7 @@ class SessionsController {
     return await this.withLock(name, async () => {
       const config = request.config;
       await this.manager.upsert(name, config);
+      await this.manager.assign(name);
       return await this.manager.start(name);
     });
   }
@@ -265,12 +257,14 @@ class SessionsController {
     if (request.logout) {
       // Old API did remove the session complete
       await this.withLock(name, async () => {
+        await this.manager.unassign(name);
         await this.manager.stop(name, true);
         await this.manager.logout(name);
         await this.manager.delete(name);
       });
     } else {
       await this.withLock(name, async () => {
+        await this.manager.unassign(name);
         await this.manager.stop(name, false);
       });
     }
@@ -288,6 +282,7 @@ class SessionsController {
   ): Promise<void> {
     const name = request.name;
     await this.withLock(name, async () => {
+      await this.manager.unassign(name);
       await this.manager.stop(name, true);
       await this.manager.logout(name);
       await this.manager.delete(name);

src/config.service.ts

@@ -18,9 +18,43 @@ export class WhatsappConfigService {
   }
 
   get port(): string {
+    if (this.configService.get('PORT')) {
+      return this.configService.get('PORT');
+    }
     return this.configService.get('WHATSAPP_API_PORT', '3000');
   }
 
+  get baseUrl(): string {
+    let baseUrl = this.configService.get('WAHA_BASE_URL', '');
+    if (!baseUrl) {
+      // combine schema+hostname+port
+      baseUrl = `${this.schema}://${this.hostname}:${this.port}`;
+    }
+    // remove / at the end
+    return baseUrl.replace(/\/$/, '');
+  }
+
+  get workerId(): string {
+    return this.configService.get('WAHA_WORKER_ID', '');
+  }
+
+  get shouldRestartWorkerSessions(): boolean {
+    const value = this.configService.get(
+      'WAHA_WORKER_RESTART_SESSIONS',
+      'true',
+    );
+    return parseBool(value);
+  }
+
+  get autoStartDelaySeconds(): number {
+    const value = this.configService.get('WAHA_AUTO_START_DELAY_SECONDS', '0');
+    try {
+      return parseInt(value, 10);
+    } catch (error) {
+      return 0;
+    }
+  }
+
   get mimetypes(): string[] {
     if (!this.shouldDownloadMedia) {
       return ['mimetype/ignore-all-media'];

src/core/SwaggerConfiguratorCore.ts

@@ -20,11 +20,11 @@ export class SwaggerConfiguratorCore {
 
   get description() {
     return (
-      'WhatsApp HTTP API that you can run in a click!<br/>' +
+      '<b>WhatsApp HTTP API</b> that you can run in a click!<br/>' +
+      '<a href="/dashboard"><b>📊 Dashboard</b></a><br/>' +
       '<br/>' +
       'Learn more:' +
       '<ul>' +
-      '<li><a href="/dashboard">WAHA Dashboard</a></li>' +
       '<li><a href="https://waha.devlike.pro/" target="_blank">Documentation</a></li>' +
       '<li><a href="https://waha.devlike.pro/docs/how-to/engines/#features" target="_blank">Supported features in engines</a></li>' +
       '<li><a href="https://github.com/devlikeapro/waha" target="_blank">GitHub - WAHA Core</a></li>' +

src/core/abc/manager.abc.ts

@@ -2,11 +2,14 @@ import {
   BeforeApplicationShutdown,
   UnprocessableEntityException,
 } from '@nestjs/common';
+import { WhatsappConfigService } from '@waha/config.service';
 import { ISessionMeRepository } from '@waha/core/storage/ISessionMeRepository';
+import { ISessionWorkerRepository } from '@waha/core/storage/ISessionWorkerRepository';
 import { WAHAWebhook } from '@waha/structures/webhooks.dto';
 import { waitUntil } from '@waha/utils/promiseTimeout';
 import { VERSION } from '@waha/version';
 import { EventEmitter } from 'events';
+import { PinoLogger } from 'nestjs-pino';
 
 import {
   WAHAEngine,
@@ -24,15 +27,47 @@ import { ISessionConfigRepository } from '../storage/ISessionConfigRepository';
 import { WhatsappSession } from './session.abc';
 import { WebhookConductor } from './webhooks.abc';
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const AsyncLock = require('async-lock');
+
 export abstract class SessionManager implements BeforeApplicationShutdown {
   public store: any;
   public sessionAuthRepository: ISessionAuthRepository;
   public sessionConfigRepository: ISessionConfigRepository;
   protected sessionMeRepository: ISessionMeRepository;
+  protected sessionWorkerRepository: ISessionWorkerRepository;
   public events: EventEmitter;
+  private lock: any;
+
   WAIT_STATUS_INTERVAL = 500;
   WAIT_STATUS_TIMEOUT = 5_000;
 
+  protected constructor(
+    protected config: WhatsappConfigService,
+    protected log: PinoLogger,
+  ) {
+    this.lock = new AsyncLock({ maxPending: Infinity });
+    this.log.setContext(SessionManager.name);
+  }
+
+  protected startPredefinedSessions() {
+    const startSessions = this.config.startSessions;
+    startSessions.forEach((sessionName) => {
+      this.withLock(sessionName, async () => {
+        const log = this.log.logger.child({ session: sessionName });
+        log.info(`Restarting PREDEFINED session...`);
+        await this.start(sessionName).catch((error) => {
+          log.error(`Failed to start PREDEFINED session: ${error}`);
+          log.error(error.stack);
+        });
+      });
+    });
+  }
+
+  public withLock(name: string, fn: () => any) {
+    return this.lock.acquire(name, fn);
+  }
+
   protected abstract getEngine(engine: WAHAEngine): typeof WhatsappSession;
 
   protected abstract get EngineClass(): typeof WhatsappSession;
@@ -65,7 +100,19 @@ export abstract class SessionManager implements BeforeApplicationShutdown {
 
   abstract getSessions(all: boolean): Promise<SessionInfo[]>;
 
-  handleSessionEvent(event: WAHAEvents, session: WhatsappSession) {
+  get workerId() {
+    return this.config.workerId;
+  }
+
+  async assign(name: string) {
+    await this.sessionWorkerRepository?.assign(name, this.workerId);
+  }
+
+  async unassign(name: string) {
+    await this.sessionWorkerRepository?.unassign(name, this.workerId);
+  }
+
+  protected handleSessionEvent(event: WAHAEvents, session: WhatsappSession) {
     return (payload: any) => {
       const me = session.getSessionMeInfo();
       const data: WAHAWebhook = {

src/core/abc/session.abc.ts

@@ -4,7 +4,9 @@ import {
   ListChannelsQuery,
 } from '@waha/structures/channels.dto';
 import { GetChatsQuery } from '@waha/structures/chats.dto';
+import { SendButtonsRequest } from '@waha/structures/chatting.buttons.dto';
 import { Label, LabelID } from '@waha/structures/labels.dto';
+import { WAMessage } from '@waha/structures/responses.dto';
 import { LoggerBuilder } from '@waha/utils/logging';
 import { EventEmitter } from 'events';
 import * as fs from 'fs';
@@ -18,6 +20,7 @@ import {
   GetMessageQuery,
   MessageContactVcardRequest,
   MessageFileRequest,
+  MessageForwardRequest,
   MessageImageRequest,
   MessageLinkPreviewRequest,
   MessageLocationRequest,
@@ -279,6 +282,8 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
+  abstract forwardMessage(request: MessageForwardRequest): Promise<WAMessage>;
+
   abstract sendImage(request: MessageImageRequest);
 
   abstract sendFile(request: MessageFileRequest);
@@ -289,6 +294,10 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
+  sendButtons(request: SendButtonsRequest) {
+    throw new NotImplementedByEngineError();
+  }
+
   abstract reply(request: MessageReplyRequest);
 
   abstract sendSeen(chat: ChatRequest);

src/core/abc/webhooks.abc.ts

@@ -7,6 +7,7 @@ import { WhatsappSession } from './session.abc';
 export abstract class WebhookSender {
   protected url: string;
   protected logger: Logger;
+  protected readonly config: WebhookConfig;
 
   constructor(
     loggerBuilder: LoggerBuilder,
@@ -14,9 +15,10 @@ export abstract class WebhookSender {
   ) {
     this.url = webhookConfig.url;
     this.logger = loggerBuilder.child({ name: WebhookSender.name });
+    this.config = webhookConfig;
   }
 
-  abstract send(json);
+  abstract send(json: any): void;
 }
 
 export abstract class WebhookConductor {

src/core/app.module.core.ts

@@ -10,6 +10,7 @@ import {
   ServerDebugController,
 } from '@waha/api/server.controller';
 import { WebsocketGatewayCore } from '@waha/core/api/websocket.gateway.core';
+import { MediaLocalStorageModule } from '@waha/core/media/local/media.local.storage.module';
 import { MediaLocalStorageConfig } from '@waha/core/media/local/MediaLocalStorageConfig';
 import { BufferJsonReplacerInterceptor } from '@waha/nestjs/BufferJsonReplacerInterceptor';
 import {
@@ -44,7 +45,7 @@ import { SwaggerConfigServiceCore } from './config/SwaggerConfigServiceCore';
 import { WAHAHealthCheckServiceCore } from './health/WAHAHealthCheckServiceCore';
 import { SessionManagerCore } from './manager.core';
 
-export const IMPORTS = [
+export const IMPORTS_CORE = [
   LoggerModule.forRoot({
     renameContext: 'name',
     pinoHttp: {
@@ -100,6 +101,18 @@ export const IMPORTS = [
   PassportModule,
   TerminusModule,
 ];
+
+const IMPORTS_MEDIA = [
+  ConfigModule.forRoot({
+    validationSchema: Joi.object({
+      WAHA_MEDIA_STORAGE: Joi.string().valid('LOCAL', 'S3').default('LOCAL'),
+    }),
+  }),
+  MediaLocalStorageModule,
+];
+
+const IMPORTS = [...IMPORTS_CORE, ...IMPORTS_MEDIA];
+
 export const CONTROLLERS = [
   AuthController,
   SessionsController,

src/core/engines/noweb/noweb.buttons.ts

@@ -0,0 +1,107 @@
+import { generateWAMessageFromContent, proto } from '@adiwajshing/baileys';
+import { Button, ButtonType } from '@waha/structures/chatting.buttons.dto';
+
+function toName(type: ButtonType) {
+  switch (type) {
+    case ButtonType.REPLY:
+      return 'quick_reply';
+    case ButtonType.URL:
+      return 'cta_url';
+    case ButtonType.CALL:
+      return 'cta_call';
+    case ButtonType.COPY:
+      return 'cta_copy';
+  }
+}
+
+export function randomId() {
+  // generate 16 random digits
+  return Math.random().toString().slice(2, 18);
+}
+
+export function buttonToJson(button: Button) {
+  const name = toName(button.type);
+  const buttonParams: any = {
+    display_text: button.text,
+    id: button.id || randomId(),
+    disabled: false,
+  };
+  switch (button.type) {
+    case ButtonType.REPLY:
+      break;
+    case ButtonType.CALL:
+      buttonParams.phone_number = button.phoneNumber;
+      break;
+    case ButtonType.COPY:
+      buttonParams.copy_code = button.copyCode;
+      break;
+    case ButtonType.URL:
+      buttonParams.url = button.url;
+      buttonParams.merchant_url = button.url;
+      break;
+  }
+  return {
+    name: name,
+    buttonParamsJson: JSON.stringify(buttonParams),
+  };
+}
+
+export async function sendButtonMessage(
+  sock: any,
+  chatId: string,
+  buttons: Button[],
+  header?: string,
+  headerImage?: any,
+  body?: string,
+  footer?: string,
+) {
+  const data = {
+    viewOnceMessage: {
+      message: {
+        messageContextInfo: {
+          deviceListMetadata: {},
+          deviceListMetadataVersion: 2,
+        },
+        interactiveMessage: {
+          body: undefined,
+          header: undefined,
+          footer: undefined,
+          nativeFlowMessage: {
+            buttons: buttons.map(buttonToJson),
+            messageParamsJson: JSON.stringify({
+              from: 'api',
+              templateId: randomId(),
+            }),
+          },
+        },
+      },
+    },
+  };
+
+  if (header || headerImage) {
+    data.viewOnceMessage.message.interactiveMessage.header = {
+      title: header,
+      hasMediaAttachment: !!headerImage,
+      imageMessage: headerImage,
+    };
+  }
+  if (body) {
+    data.viewOnceMessage.message.interactiveMessage.body = {
+      text: body,
+    };
+  }
+  if (footer) {
+    data.viewOnceMessage.message.interactiveMessage.footer = {
+      text: footer,
+    };
+  }
+
+  const msg = proto.Message.fromObject(data);
+  const fullMessage = generateWAMessageFromContent(chatId, msg, {
+    userJid: sock?.user?.id,
+  });
+  await sock.relayMessage(chatId, fullMessage.message, {
+    messageId: fullMessage.key.id,
+  });
+  return fullMessage;
+}

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

@@ -2,6 +2,7 @@ import makeWASocket, {
   Browsers,
   Contact,
   DisconnectReason,
+  downloadMediaMessage,
   extractMessageContent,
   getAggregateVotesInPollMessage,
   getContentType,
@@ -25,6 +26,7 @@ import { LabelAssociationType } from '@adiwajshing/baileys/lib/Types/LabelAssoci
 import { isLidUser } from '@adiwajshing/baileys/lib/WABinary/jid-utils';
 import { Logger as BaileysLogger } from '@adiwajshing/baileys/node_modules/pino';
 import { UnprocessableEntityException } from '@nestjs/common';
+import { sendButtonMessage } from '@waha/core/engines/noweb/noweb.buttons';
 import { NowebInMemoryStore } from '@waha/core/engines/noweb/store/NowebInMemoryStore';
 import { IMediaEngineProcessor } from '@waha/core/media/IMediaEngineProcessor';
 import { flipObject, parseBool, splitAt } from '@waha/helpers';
@@ -37,7 +39,9 @@ import {
   ListChannelsQuery,
 } from '@waha/structures/channels.dto';
 import { GetChatsQuery } from '@waha/structures/chats.dto';
+import { SendButtonsRequest } from '@waha/structures/chatting.buttons.dto';
 import { ContactQuery, ContactRequest } from '@waha/structures/contacts.dto';
+import { BinaryFile, RemoteFile } from '@waha/structures/files.dto';
 import {
   Label,
   LabelChatAssociation,
@@ -49,6 +53,7 @@ import {
   PollVotePayload,
   WAMessageAckBody,
 } from '@waha/structures/webhooks.dto';
+import { LoggerBuilder } from '@waha/utils/logging';
 import { waitUntil } from '@waha/utils/promiseTimeout';
 import { SingleDelayedJobRunner } from '@waha/utils/SingleDelayedJobRunner';
 import { SinglePeriodicJobRunner } from '@waha/utils/SinglePeriodicJobRunner';
@@ -66,6 +71,7 @@ import {
   MessageContactVcardRequest,
   MessageDestination,
   MessageFileRequest,
+  MessageForwardRequest,
   MessageImageRequest,
   MessageLinkPreviewRequest,
   MessageLocationRequest,
@@ -161,6 +167,8 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
   private msgRetryCounterCache: NodeCache;
   protected engineLogger: BaileysLogger;
 
+  private authNOWEBStore: any;
+
   get listenConnectionEventsFromTheStart() {
     return true;
   }
@@ -200,11 +208,17 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
       delay * SECOND,
       this.logger,
     );
+    this.authNOWEBStore = null;
   }
 
   async start() {
     this.status = WAHASessionStatus.STARTING;
-    await this.buildClient();
+    await this.buildClient().catch((err) => {
+      this.logger.error('Failed to start the client');
+      this.logger.error(err, err.stack);
+      this.status = WAHASessionStatus.FAILED;
+      this.restartClient();
+    });
   }
 
   getSocketConfig(agent, state): any {
@@ -238,10 +252,13 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
   }
 
   async makeSocket(): Promise<any> {
-    const { state, saveCreds } = await this.authFactory.buildAuth(
-      this.sessionStore,
-      this.name,
-    );
+    if (!this.authNOWEBStore) {
+      this.authNOWEBStore = await this.authFactory.buildAuth(
+        this.sessionStore,
+        this.name,
+      );
+    }
+    const { state, saveCreds } = this.authNOWEBStore;
     const agent = this.makeAgent();
     const socketConfig = this.getSocketConfig(agent, state);
     const sock = makeWASocket(socketConfig);
@@ -271,12 +288,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
           this.loggerBuilder.child({ name: NowebPersistentStore.name }),
           storage,
         );
-        await this.store.init().catch((err) => {
-          this.logger.error(`Failed to initialize storage or store: ${err}`);
-          this.status = WAHASessionStatus.FAILED;
-          this.end();
-          throw err;
-        });
+        await this.store.init();
       } else {
         this.logger.debug('Using NowebInMemoryStore');
         this.store = new NowebInMemoryStore();
@@ -351,6 +363,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
         );
         return;
       }
+      await this.end();
       await this.start();
     });
   }
@@ -384,8 +397,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
           this.logger.error(
             `Connection closed due to '${lastDisconnect.error}', do not reconnect the session.`,
           );
-          await this.end();
-          this.status = WAHASessionStatus.FAILED;
+          await this.failed();
         }
       }
 
@@ -401,11 +413,34 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
 
   async stop() {
     this.shouldRestart = false;
+    this.startDelayedJob.cancel();
+    this.autoRestartJob.stop();
+
+    if (this.authNOWEBStore && this.status == WAHASessionStatus.WORKING) {
+      this.logger.info('Saving creds before stopping...');
+      await this.authNOWEBStore.saveCreds().catch((e) => {
+        this.logger.error('Failed to save creds');
+        this.logger.error(e, e.stack);
+      });
+      this.logger.info('Creds saved');
+      this.authNOWEBStore = null;
+    }
     this.status = WAHASessionStatus.STOPPED;
     this.events.removeAllListeners();
-    this.startDelayedJob.cancel();
+
     await this.end();
-    return;
+    await this.store?.close();
+  }
+
+  protected async failed() {
+    this.shouldRestart = false;
+    this.startDelayedJob.cancel();
+    this.autoRestartJob.stop();
+
+    this.status = WAHASessionStatus.FAILED;
+
+    await this.end();
+    await this.store?.close();
   }
 
   private issueMessageUpdateOnEdits() {
@@ -471,7 +506,6 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     // @ts-ignore
     this.sock?.ev?.removeAllListeners();
     this.sock?.ws?.removeAllListeners();
-    await this.store?.close();
     // wait until connection is not connecting to avoid error:
     // "WebSocket was closed before the connection was established"
     await waitUntil(async () => !this.sock?.ws?.isConnecting, 1_000, 10_000);
@@ -641,6 +675,30 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     throw new AvailableInPlusVersion();
   }
 
+  protected async uploadMedia(
+    file: RemoteFile | BinaryFile,
+    type,
+  ): Promise<any> {
+    if (file && ('url' in file || 'data' in file)) {
+      throw new AvailableInPlusVersion('Sending media (image, video, pdf)');
+    }
+    return;
+  }
+
+  async sendButtons(request: SendButtonsRequest) {
+    const chatId = toJID(this.ensureSuffix(request.chatId));
+    const headerImage = await this.uploadMedia(request.headerImage, 'image');
+    return await sendButtonMessage(
+      this.sock,
+      chatId,
+      request.buttons,
+      request.header,
+      headerImage,
+      request.body,
+      request.footer,
+    );
+  }
+
   sendLocation(request: MessageLocationRequest) {
     return this.sock.sendMessage(request.chatId, {
       location: {
@@ -650,6 +708,23 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     });
   }
 
+  async forwardMessage(request: MessageForwardRequest): Promise<WAMessage> {
+    const key = parseMessageIdSerialized(request.messageId);
+    const forwardMessage = await this.store.loadMessage(key.remoteJid, key.id);
+    if (!forwardMessage) {
+      throw new UnprocessableEntityException(
+        `Message with id '${request.messageId}' not found`,
+      );
+    }
+    const chatId = toJID(this.ensureSuffix(request.chatId));
+    const message = {
+      forward: forwardMessage,
+      force: true,
+    };
+    const result = await this.sock.sendMessage(chatId, message, {});
+    return this.toWAMessage(result);
+  }
+
   sendLinkPreview(request: MessageLinkPreviewRequest) {
     const text = `${request.title}\n${request.url}`;
     const chatId = toJID(this.ensureSuffix(request.chatId));
@@ -1329,6 +1404,10 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
       // @ts-ignore - AudioMessage doesn't have caption field
       body = mediaContent?.caption;
     }
+    // Response for buttons
+    if (!body) {
+      body = message.templateButtonReplyMessage?.selectedDisplayText;
+    }
     return body;
   }
 
@@ -1509,7 +1588,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
   }
 
   protected downloadMedia(message) {
-    const processor = new EngineMediaProcessor(this);
+    const processor = new NOWEBEngineMediaProcessor(this, this.loggerBuilder);
     return this.mediaManager.processMedia(processor, message, this.name);
   }
 
@@ -1526,23 +1605,66 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
   }
 }
 
-export class EngineMediaProcessor implements IMediaEngineProcessor<any> {
-  constructor(public session: WhatsappSessionNoWebCore) {}
+function hasPath(url: string) {
+  if (!url) {
+    return false;
+  }
+  try {
+    const urlObj = new URL(url);
+    return urlObj.pathname !== '/';
+  } catch (error) {
+    return false;
+  }
+}
+
+export class NOWEBEngineMediaProcessor implements IMediaEngineProcessor<any> {
+  private readonly logger: BaileysLogger;
+
+  constructor(
+    public session: WhatsappSessionNoWebCore,
+    loggerBuilder: LoggerBuilder,
+  ) {
+    this.logger = loggerBuilder.child({
+      name: NOWEBEngineMediaProcessor.name,
+    }) as unknown as BaileysLogger;
+  }
 
   hasMedia(message: any): boolean {
     return Boolean(extractMediaContent(message.message));
   }
 
   getMessageId(message: any): string {
-    return '';
+    return message.key.id;
   }
 
   getMimetype(message: any): string {
-    return '';
+    const content = extractMediaContent(message.message);
+    return content.mimetype;
   }
 
-  getMediaBuffer(message: any): Promise<Buffer | null> {
-    return Promise.resolve(undefined);
+  async getMediaBuffer(message: any): Promise<Buffer | null> {
+    const content = extractMediaContent(message.message);
+    // Fix Stickers
+    // https://github.com/devlikeapro/waha/issues/504
+    const url = content.url;
+    if (!hasPath(url)) {
+      // Set it to null so the engine handles it right
+      content.url = null;
+    }
+
+    return (await downloadMediaMessage(
+      message,
+      'buffer',
+      {},
+      {
+        logger: this.logger,
+        reuploadRequest: this.session.sock.updateMediaMessage,
+      },
+    ).finally(() => {
+      // Fix Stickers - set url back, just to have it in the response
+      // https://github.com/devlikeapro/waha/issues/504
+      content.url = url;
+    })) as Buffer;
   }
 
   getFilename(message: any): string | null {

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

@@ -26,6 +26,7 @@ import {
   EditMessageRequest,
   GetMessageQuery,
   MessageFileRequest,
+  MessageForwardRequest,
   MessageImageRequest,
   MessageLocationRequest,
   MessageReactionRequest,
@@ -69,7 +70,9 @@ import {
   Label as WEBJSLabel,
   Location,
   Message,
+  MessageMedia,
   Reaction,
+  WAState,
 } from 'whatsapp-web.js';
 import { Message as MessageInstance } from 'whatsapp-web.js/src/structures';
 
@@ -87,6 +90,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
   protected engineConfig?: WebJSConfig;
 
   private startDelayedJob: SingleDelayedJobRunner;
+  private engineStateCheckDelayedJob: SingleDelayedJobRunner;
   private shouldRestart: boolean;
 
   whatsapp: WebjsClient;
@@ -103,6 +107,11 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       this.START_ATTEMPT_DELAY_SECONDS * SECOND,
       this.logger,
     );
+    this.engineStateCheckDelayedJob = new SingleDelayedJobRunner(
+      'engine-state-check',
+      2 * SECOND,
+      this.logger,
+    );
   }
 
   /**
@@ -221,7 +230,12 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
 
   async start() {
     this.status = WAHASessionStatus.STARTING;
-    await this.init();
+    await this.init().catch((err) => {
+      this.logger.error('Failed to start the client');
+      this.logger.error(err, err.stack);
+      this.status = WAHASessionStatus.FAILED;
+      this.restartClient();
+    });
     return this;
   }
 
@@ -234,6 +248,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
   }
 
   private async end() {
+    this.engineStateCheckDelayedJob.cancel();
     try {
       this.whatsapp?.removeAllListeners();
       this.whatsapp?.pupBrowser?.removeAllListeners();
@@ -296,22 +311,61 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       this.logger.info(`Session '${this.name}' is ready!`);
     });
 
-    this.whatsapp.on(Events.AUTHENTICATED, () => {
+    this.whatsapp.on(Events.AUTHENTICATED, (args) => {
       this.status = WAHASessionStatus.WORKING;
       this.qr.save('');
-      this.logger.info(`Session '${this.name}' has been authenticated!`);
+      this.logger.info({ args: args }, `Session has been authenticated!`);
     });
 
-    this.whatsapp.on(Events.AUTHENTICATION_FAILURE, () => {
+    this.whatsapp.on(Events.AUTHENTICATION_FAILURE, (args) => {
       this.status = WAHASessionStatus.FAILED;
       this.qr.save('');
-      this.logger.info(`Session '${this.name}' has been disconnected!`);
+      this.logger.info({ args: args }, `Session has failed to authenticate!`);
     });
 
-    this.whatsapp.on(Events.DISCONNECTED, () => {
+    this.whatsapp.on(Events.DISCONNECTED, (args) => {
       this.status = WAHASessionStatus.FAILED;
       this.qr.save('');
-      this.logger.info(`Session '${this.name}' has been disconnected!`);
+      this.logger.info({ args: args }, `Session has been disconnected!`);
+    });
+
+    this.whatsapp.on(Events.STATE_CHANGED, (state: WAState) => {
+      const badStates = [WAState.OPENING, WAState.TIMEOUT];
+      const log = this.logger.child({ state: state, event: 'change_state' });
+
+      log.info('Session engine state changed');
+      if (!badStates.includes(state)) {
+        return;
+      }
+
+      log.info(`Session state changed to bad state, waiting for recovery...`);
+      this.engineStateCheckDelayedJob.schedule(async () => {
+        if (!this.startDelayedJob.scheduled) {
+          log.info('Session is restarting already, skip check.');
+          return;
+        }
+
+        if (!this.whatsapp) {
+          log.warn('Session is not initialized, skip recovery.');
+          return;
+        }
+
+        const currentState = await this.whatsapp.getState().catch((error) => {
+          log.error('Failed to get current state');
+          log.error(error, error.stack);
+          return null;
+        });
+        log.setBindings({ currentState: currentState });
+        if (!currentState) {
+          log.warn('Session has no current state, skip restarting.');
+          return;
+        } else if (badStates.includes(currentState)) {
+          log.info('Session is still in bad state, restarting...');
+          this.restartClient();
+          return;
+        }
+        log.info('Session has recovered, no need to restart.');
+      });
     });
   }
 
@@ -336,7 +390,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     // show it as ABCD-ABCD
     const parts = splitAt(code, 4);
     const codeRepr = parts.join('-');
-    this.logger.info(`Your code: ${codeRepr}`);
+    this.logger.debug(`Your code: ${codeRepr}`);
     return { code: codeRepr };
   }
 
@@ -415,6 +469,15 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     return this.whatsapp.sendMessage(request.chatId, location, options);
   }
 
+  async forwardMessage(request: MessageForwardRequest): Promise<WAMessage> {
+    const forwardMessage = this.recreateMessage(request.messageId);
+    const msg = await forwardMessage.forward(request.chatId);
+    // Return "sent: true" for now
+    // need to research how to get the data from WebJS
+    // @ts-ignore
+    return { sent: msg || false };
+  }
+
   async sendSeen(request: SendSeenRequest) {
     const chat: Chat = await this.whatsapp.getChatById(request.chatId);
     await chat.sendSeen();
@@ -841,6 +904,11 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
           this.processIncomingMessage(message).then(handler),
         );
         return true;
+      case WAHAEvents.MESSAGE_WAITING:
+        this.whatsapp.on(Events.MESSAGE_CIPHERTEXT, (message) =>
+          this.processIncomingMessage(message).then(handler),
+        );
+        return true;
       case WAHAEvents.MESSAGE_REVOKED:
         this.whatsapp.on(
           Events.MESSAGE_REVOKED_EVERYONE,
@@ -991,7 +1059,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
   }
 
   protected downloadMedia(message: Message) {
-    const processor = new EngineMediaProcessor();
+    const processor = new WEBJSEngineMediaProcessor();
     return this.mediaManager.processMedia(processor, message, this.name);
   }
 
@@ -1008,7 +1076,9 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
   }
 }
 
-export class EngineMediaProcessor implements IMediaEngineProcessor<Message> {
+export class WEBJSEngineMediaProcessor
+  implements IMediaEngineProcessor<Message>
+{
   hasMedia(message: Message): boolean {
     if (!message.hasMedia) {
       return false;
@@ -1018,15 +1088,21 @@ export class EngineMediaProcessor implements IMediaEngineProcessor<Message> {
   }
 
   getMessageId(message: Message): string {
-    return '';
+    return message.id._serialized;
   }
 
   getMimetype(message: Message): string {
-    return '';
+    // @ts-ignore
+    return message.rawData.mimetype;
   }
 
-  getMediaBuffer(message: Message): Promise<Buffer | null> {
-    return Promise.resolve(undefined);
+  async getMediaBuffer(message: Message): Promise<Buffer | null> {
+    return message.downloadMedia().then((media: MessageMedia) => {
+      if (!media) {
+        return null;
+      }
+      return Buffer.from(media.data, 'base64');
+    });
   }
 
   getFilename(message: Message): string | null {

src/core/exceptions.ts

@@ -13,9 +13,9 @@ export class NotImplementedByEngineError extends UnprocessableEntityException {
 }
 
 export class AvailableInPlusVersion extends UnprocessableEntityException {
-  constructor() {
+  constructor(feature: string = 'The feature') {
     super(
-      `The feature is available only in Plus version. Check this out: ${DOCS_URL}`,
+      `${feature} is available only in Plus version. Check this out: ${DOCS_URL}`,
     );
   }
 }

src/core/manager.core.ts

@@ -1,10 +1,9 @@
 import {
   Injectable,
-  LogLevel,
   NotFoundException,
   UnprocessableEntityException,
 } from '@nestjs/common';
-import { MediaNoopStorage } from '@waha/core/media/MediaNoopStorage';
+import { MediaStorageFactory } from '@waha/core/media/MediaStorageFactory';
 import { getPinoLogLevel, LoggerBuilder } from '@waha/utils/logging';
 import { promiseTimeout, sleep } from '@waha/utils/promiseTimeout';
 import { EventEmitter } from 'events';
@@ -31,7 +30,7 @@ import { WhatsappSessionNoWebCore } from './engines/noweb/session.noweb.core';
 import { WhatsappSessionWebJSCore } from './engines/webjs/session.webjs.core';
 import { DOCS_URL } from './exceptions';
 import { getProxyConfig } from './helpers.proxy';
-import { MediaManagerCore } from './media/MediaManagerCore';
+import { MediaManager } from './media/MediaManager';
 import { LocalSessionAuthRepository } from './storage/LocalSessionAuthRepository';
 import { LocalStoreCore } from './storage/LocalStoreCore';
 import { WebhookConductorCore } from './webhooks.core';
@@ -43,6 +42,7 @@ export class OnlyDefaultSessionIsAllowed extends UnprocessableEntityException {
     );
   }
 }
+
 enum DefaultSessionStatus {
   REMOVED = undefined,
   STOPPED = null,
@@ -64,26 +64,22 @@ export class SessionManagerCore extends SessionManager {
   protected readonly EngineClass: typeof WhatsappSession;
 
   constructor(
-    private config: WhatsappConfigService,
+    config: WhatsappConfigService,
     private engineConfigService: EngineConfigService,
-    private log: PinoLogger,
+    log: PinoLogger,
+    private mediaStorageFactory: MediaStorageFactory,
   ) {
-    super();
+    super(config, log);
     this.events = new EventEmitter();
     this.session = DefaultSessionStatus.STOPPED;
     this.sessionConfig = null;
-    this.log.setContext(SessionManagerCore.name);
     const engineName = this.engineConfigService.getDefaultEngineName();
     this.EngineClass = this.getEngine(engineName);
     this.store = new LocalStoreCore(engineName.toLowerCase());
     this.sessionAuthRepository = new LocalSessionAuthRepository(this.store);
     this.startPredefinedSessions();
-  }
-
-  protected startPredefinedSessions() {
-    const startSessions = this.config.startSessions;
-    startSessions.forEach((sessionName) => {
-      this.start(sessionName);
+    this.clearStorage().catch((error) => {
+      this.log.error({ error }, 'Error while clearing storage');
     });
   }
 
@@ -110,6 +106,13 @@ export class SessionManagerCore extends SessionManager {
     await this.stop(this.DEFAULT, true);
   }
 
+  private async clearStorage() {
+    const storage = this.mediaStorageFactory.build(
+      this.log.logger.child({ name: 'Storage' }),
+    );
+    await storage.purge();
+  }
+
   //
   // API Methods
   //
@@ -136,14 +139,20 @@ export class SessionManagerCore extends SessionManager {
       );
     }
     this.log.info(`'${name}' - starting session...`);
-    const mediaManager = new MediaManagerCore(
-      new MediaNoopStorage(),
-      this.config.mimetypes,
-    );
     const logger = this.log.logger.child({ session: name });
     logger.level = getPinoLogLevel(this.sessionConfig?.debug);
     const loggerBuilder: LoggerBuilder = logger;
 
+    const storage = this.mediaStorageFactory.build(
+      loggerBuilder.child({ name: 'Storage' }),
+    );
+    await storage.init();
+    const mediaManager = new MediaManager(
+      storage,
+      this.config.mimetypes,
+      loggerBuilder.child({ name: 'MediaManager' }),
+    );
+
     const webhook = new this.WebhookConductorClass(loggerBuilder);
     const proxyConfig = this.getProxyConfig();
     const sessionConfig: SessionParams = {

src/core/media/MediaManager.ts

@@ -0,0 +1,198 @@
+import { IMediaEngineProcessor } from '@waha/core/media/IMediaEngineProcessor';
+import { IMediaManager } from '@waha/core/media/IMediaManager';
+import {
+  IMediaStorage,
+  MediaData,
+  MediaStorageData,
+} from '@waha/core/media/IMediaStorage';
+import { WAMedia } from '@waha/structures/media.dto';
+import { Logger } from 'pino';
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const mime = require('mime-types');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const promiseRetry = require('promise-retry');
+
+export class MediaManager implements IMediaManager {
+  // https://github.com/IndigoUnited/node-promise-retry
+  RETRY_OPTIONS = {
+    retries: 5,
+    minTimeout: 100,
+    maxTimeout: 500,
+  };
+
+  constructor(
+    private storage: IMediaStorage,
+    private mimetypes: string[],
+    protected log: Logger,
+  ) {
+    // Log mimetypes
+    if (this.mimetypes && this.mimetypes.length > 0) {
+      const mimetypes = this.mimetypes.join(',');
+      const msg = `Only '${mimetypes}' mimetypes will be downloaded for the session`;
+      this.log.info(msg);
+    }
+  }
+
+  /**
+   *  Check that we need to download files with the mimetype
+   */
+  private shouldProcessMimetype(mimetype: string) {
+    // No specific mimetypes provided - always download
+    if (!this.mimetypes || this.mimetypes.length === 0) {
+      return true;
+    }
+    // Found "right" mimetype in the list of allowed mimetypes - download it
+    return this.mimetypes.some((type) => mimetype.startsWith(type));
+  }
+
+  private async processMediaInternal<Message>(
+    processor: IMediaEngineProcessor<Message>,
+    message: Message,
+    session: string,
+  ): Promise<WAMedia | null> {
+    const messageId = processor.getMessageId(message);
+    const mimetype = processor.getMimetype(message);
+    const filename = processor.getFilename(message);
+    if (!this.shouldProcessMimetype(mimetype)) {
+      this.log.info(
+        `The message '${messageId}' has '${mimetype}' mimetype media, skip it.`,
+      );
+      return null;
+    }
+
+    const extension = mime.extension(mimetype);
+    const mediaData: MediaData = {
+      session: session,
+      message: {
+        id: messageId,
+      },
+      file: {
+        extension: extension,
+        filename: filename,
+      },
+    };
+
+    const exists = await this.withRetry('Checking media', () =>
+      this.exists(mediaData),
+    );
+
+    if (!exists) {
+      this.log.info(`The message ${messageId} has media, downloading it...`);
+      // Fetching media
+      const buffer = await this.withRetry('Fetching media', () =>
+        this.fetchMedia(message, processor),
+      );
+      // Saving media
+      await this.withRetry('Saving media', () =>
+        this.saveMedia(buffer, mediaData),
+      );
+      this.log.info(`The media from '${messageId}' has been saved.`);
+    }
+
+    const data = await this.withRetry('Getting media URL', () =>
+      this.getStorageData(mediaData),
+    );
+    return data;
+  }
+
+  async processMedia<Message>(
+    processor: IMediaEngineProcessor<Message>,
+    message: Message,
+    session: string,
+  ): Promise<Message> {
+    let messageId: string;
+    try {
+      messageId = processor.getMessageId(message);
+      if (!processor.hasMedia(message)) {
+        return message;
+      }
+    } catch (error) {
+      this.log.error(
+        error,
+        `Error checking if message has media for message '${messageId}'`,
+      );
+      return message;
+    }
+
+    let media: WAMedia = {
+      url: null,
+      filename: null,
+      mimetype: null,
+    };
+    try {
+      media.filename = processor.getFilename(message);
+      media.mimetype = processor.getMimetype(message);
+      media.filename = processor.getFilename(message);
+      const data = await this.processMediaInternal(processor, message, session);
+      media = { ...media, ...data };
+    } catch (err) {
+      this.log.error(err, `Error processing media for message '${messageId}'`);
+      media.error = err;
+      // @ts-ignore
+      media.error.details = `${err.stack}`;
+    }
+    // @ts-ignore
+    message.media = media;
+    return message;
+  }
+
+  private async fetchMedia(
+    message: any,
+    processor: IMediaEngineProcessor<any>,
+  ): Promise<Buffer> {
+    const messageId = processor.getMessageId(message);
+    this.log.debug(`Fetching media from WhatsApp message '${messageId}'...`);
+    const buffer = await processor.getMediaBuffer(message);
+    if (!buffer) {
+      throw new Error(
+        `Message '${messageId}' has no media, but it has media flag in the engine`,
+      );
+    }
+    return buffer;
+  }
+
+  private async saveMedia(
+    buffer: Buffer,
+    mediaData: MediaData,
+  ): Promise<boolean> {
+    this.log.debug(
+      `Saving media from WhatsApp the message '${mediaData.message.id}'...`,
+    );
+    const result = await this.storage.save(buffer, mediaData);
+    this.log.debug(`The media from '${mediaData.message.id}' has been saved.`);
+    return result;
+  }
+
+  private async getStorageData(
+    mediaData: MediaData,
+  ): Promise<MediaStorageData> {
+    return await this.storage.getStorageData(mediaData);
+  }
+
+  private async exists(mediaData: MediaData): Promise<boolean> {
+    this.log.trace(
+      `Checking if media exists for message '${mediaData.message.id}'...`,
+    );
+    const result = await this.storage.exists(mediaData);
+    this.log.trace(
+      `Media for message '${mediaData.message.id}' exists: ${result}`,
+    );
+    return result;
+  }
+
+  private async withRetry(name: string, fn: CallableFunction) {
+    const retryOptions = this.RETRY_OPTIONS;
+    try {
+      return await promiseRetry((retry: CallableFunction, number: number) => {
+        return fn().catch(retry);
+      }, retryOptions);
+    } catch (error) {
+      this.log.error(
+        error,
+        `Failed to execute '${name}', tried '${retryOptions.retries}' times`,
+      );
+      throw error;
+    }
+  }
+}

src/core/media/MediaManagerCore.ts

@@ -1,44 +0,0 @@
-import { IMediaEngineProcessor } from '@waha/core/media/IMediaEngineProcessor';
-import { IMediaStorage, MediaData } from '@waha/core/media/IMediaStorage';
-import { WAMedia } from '@waha/structures/media.dto';
-
-import { IMediaManager } from './IMediaManager';
-
-export class MediaManagerCore implements IMediaManager {
-  constructor(
-    private storage: IMediaStorage,
-    private mimetypes: string[],
-  ) {}
-
-  async processMedia<Message>(
-    processor: IMediaEngineProcessor<Message>,
-    message: Message,
-    session: string,
-  ): Promise<Message> {
-    if (!processor.hasMedia(message)) {
-      return message;
-    }
-    const mimetype = '';
-    const mediaData: MediaData = {
-      session: session,
-      message: {
-        id: '',
-      },
-      file: {
-        extension: '',
-      },
-    };
-    const { url } = await this.storage.getStorageData(mediaData);
-
-    const filename = processor.getFilename(message);
-    const media: WAMedia = {
-      mimetype: mimetype,
-      filename: filename,
-      url: url,
-    };
-
-    // @ts-ignore
-    message.media = media;
-    return message;
-  }
-}

src/core/media/MediaNoopStorage.ts

@@ -1,25 +0,0 @@
-import { DOCS_URL } from '@waha/core/exceptions';
-import { IMediaStorage, MediaData } from '@waha/core/media/IMediaStorage';
-
-export class MediaNoopStorage implements IMediaStorage {
-  async init() {
-    return;
-  }
-
-  async save(buffer: Buffer, data: MediaData): Promise<boolean> {
-    return Promise.resolve(true);
-  }
-
-  async exists(data: MediaData): Promise<boolean> {
-    return false;
-  }
-
-  async getStorageData(data: MediaData) {
-    const url = `Media attachment's available only in WAHA Plus version. ${DOCS_URL}`;
-    return { url };
-  }
-
-  async purge() {
-    return;
-  }
-}

src/core/media/MediaStorageFactory.ts

@@ -0,0 +1,6 @@
+import { IMediaStorage } from '@waha/core/media/IMediaStorage';
+import { Logger } from 'pino';
+
+export abstract class MediaStorageFactory {
+  abstract build(logger: Logger): IMediaStorage;
+}

src/core/media/local/MediaLocalStorage.ts

@@ -0,0 +1,95 @@
+import { IMediaStorage, MediaData } from '@waha/core/media/IMediaStorage';
+import { SECOND } from '@waha/structures/enums.dto';
+import * as fsp from 'fs/promises';
+import * as path from 'path';
+import { Logger } from 'pino';
+import { promisify } from 'util';
+import fs = require('fs');
+import del = require('del');
+import { fileExists } from '@waha/utils/files';
+
+const writeFileAsync = promisify(fs.writeFile);
+
+/**
+ * Save files locally using the filesystem
+ */
+export class MediaLocalStorage implements IMediaStorage {
+  private readonly lifetimeMs: number;
+
+  constructor(
+    protected log: Logger,
+    private filesFolder: string,
+    private baseUrl: string,
+    lifetimeSeconds: number,
+  ) {
+    this.lifetimeMs = lifetimeSeconds * SECOND;
+    if (this.lifetimeMs === 0) {
+      this.log.info('Files lifetime is 0, files will not be removed');
+    }
+  }
+
+  async init() {
+    return;
+  }
+
+  async exists(data: MediaData): Promise<boolean> {
+    const filepath = this.getFullPath(data);
+    return await fileExists(filepath);
+  }
+
+  public async save(buffer: Buffer, data: MediaData): Promise<boolean> {
+    const filepath = this.getFullPath(data);
+    const folder = path.dirname(filepath);
+    await fsp.mkdir(folder, { recursive: true });
+    await writeFileAsync(filepath, buffer);
+    this.postponeRemoval(filepath);
+    return true;
+  }
+
+  public async getStorageData(data: MediaData) {
+    const filename = this.getKey(data);
+    const url = this.baseUrl + filename;
+    return { url };
+  }
+
+  async purge() {
+    if (this.lifetimeMs === 0) {
+      this.log.info('No need to purge files with lifetime 0');
+      return;
+    }
+
+    if (fs.existsSync(this.filesFolder)) {
+      del([`${this.filesFolder}/*`], { force: true }).then((paths) => {
+        if (paths.length === 0) {
+          return;
+        }
+        this.log.info('Deleted files and directories:\n', paths.join('\n'));
+      });
+    } else {
+      fs.mkdirSync(this.filesFolder);
+      this.log.info(`Directory '${this.filesFolder}' created from scratch`);
+    }
+  }
+
+  private getKey(data: MediaData) {
+    return `${data.session}/${data.message.id}.${data.file.extension}`;
+  }
+
+  private getFullPath(data: MediaData) {
+    const filepath = this.getKey(data);
+    return path.resolve(`${this.filesFolder}/${filepath}`);
+  }
+
+  private postponeRemoval(filepath: string) {
+    if (this.lifetimeMs === 0) {
+      return;
+    }
+    setTimeout(
+      () =>
+        fs.unlink(filepath, () => {
+          this.log.info(`File ${filepath} was removed`);
+        }),
+      this.lifetimeMs,
+    );
+  }
+}

src/core/media/local/MediaLocalStorageConfig.ts

@@ -8,7 +8,7 @@ export class MediaLocalStorageConfig {
   constructor(private config: WhatsappConfigService) {}
 
   get filesURL(): string {
-    return `${this.config.schema}://${this.config.hostname}:${this.config.port}${this.filesUri}/`;
+    return `${this.config.baseUrl}${this.filesUri}/`;
   }
 
   get filesFolder(): string {

src/core/media/local/MediaLocalStorageFactory.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@nestjs/common';
+import { IMediaStorage } from '@waha/core/media/IMediaStorage';
+import { MediaLocalStorage } from '@waha/core/media/local/MediaLocalStorage';
+import { MediaLocalStorageConfig } from '@waha/core/media/local/MediaLocalStorageConfig';
+import { MediaStorageFactory } from '@waha/core/media/MediaStorageFactory';
+import { Logger } from 'pino';
+
+@Injectable()
+export class MediaLocalStorageFactory extends MediaStorageFactory {
+  constructor(private config: MediaLocalStorageConfig) {
+    super();
+  }
+
+  build(logger: Logger): IMediaStorage {
+    return new MediaLocalStorage(
+      logger,
+      this.config.filesFolder,
+      this.config.filesURL,
+      this.config.filesLifetime,
+    );
+  }
+}

src/core/media/local/media.local.storage.module.ts

@@ -0,0 +1,34 @@
+import { Module } from '@nestjs/common';
+import { ServeStaticModule } from '@nestjs/serve-static';
+import { WhatsappConfigService } from '@waha/config.service';
+import { MediaLocalStorageConfig } from '@waha/core/media/local/MediaLocalStorageConfig';
+import { MediaLocalStorageFactory } from '@waha/core/media/local/MediaLocalStorageFactory';
+import { MediaStorageFactory } from '@waha/core/media/MediaStorageFactory';
+
+@Module({
+  imports: [
+    ServeStaticModule.forRootAsync({
+      imports: [],
+      extraProviders: [MediaLocalStorageConfig, WhatsappConfigService],
+      inject: [MediaLocalStorageConfig],
+      useFactory: (config: MediaLocalStorageConfig) => {
+        return [
+          {
+            rootPath: config.filesFolder,
+            serveRoot: config.filesUri,
+          },
+        ];
+      },
+    }),
+  ],
+  providers: [
+    {
+      provide: MediaStorageFactory,
+      useClass: MediaLocalStorageFactory,
+    },
+    WhatsappConfigService,
+    MediaLocalStorageConfig,
+  ],
+  exports: [MediaStorageFactory],
+})
+export class MediaLocalStorageModule {}

src/core/storage/ISessionWorkerRepository.ts

@@ -0,0 +1,18 @@
+export class SessionWorkerInfo {
+  id: string; // aka session name here
+  worker: string;
+}
+
+export abstract class ISessionWorkerRepository {
+  abstract assign(session: string, worker: string): Promise<void>;
+
+  abstract unassign(session: string, worker: string): Promise<void>;
+
+  abstract remove(session: string): Promise<void>;
+
+  abstract getAll(): Promise<SessionWorkerInfo[]>;
+
+  abstract getSessionsByWorker(worker: string): Promise<string[]>;
+
+  abstract init(): Promise<void>;
+}

src/core/storage/LocalSessionMeRepository.ts

@@ -1,8 +1,8 @@
-import { NOWEBSqlite3KVRepository } from '@waha/core/engines/noweb/store/sqlite3/NOWEBSqlite3KVRepository';
 import { Sqlite3SchemaValidation } from '@waha/core/engines/noweb/store/sqlite3/Sqlite3SchemaValidation';
 import { ISessionMeRepository } from '@waha/core/storage/ISessionMeRepository';
 import { LocalStore } from '@waha/core/storage/LocalStore';
 import { Field, Index, Schema } from '@waha/core/storage/sqlite3/Schema';
+import { Sqlite3KVRepository } from '@waha/core/storage/sqlite3/Sqlite3KVRepository';
 import { MeInfo } from '@waha/structures/sessions.dto';
 import * as path from 'path';
 
@@ -21,7 +21,7 @@ class SessionMeInfo {
 }
 
 export class LocalSessionMeRepository
-  extends NOWEBSqlite3KVRepository<SessionMeInfo>
+  extends Sqlite3KVRepository<SessionMeInfo>
   implements ISessionMeRepository
 {
   constructor(store: LocalStore) {

src/core/storage/LocalSessionWorkerRepository.ts

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

src/core/webhooks.core.ts

@@ -1,29 +1,79 @@
+import { LoggerBuilder } from '@waha/utils/logging';
+import Agent from 'agentkeepalive';
+import axios from 'axios';
+import { AxiosInstance } from 'axios';
+import { Logger } from 'pino';
+
 import { WAHAEvents } from '../structures/enums.dto';
 import { WebhookConfig } from '../structures/webhooks.config.dto';
 import { WAHAWebhook } from '../structures/webhooks.dto';
 import { VERSION } from '../version';
 import { WAHAInternalEvent, WhatsappSession } from './abc/session.abc';
 import { WebhookConductor, WebhookSender } from './abc/webhooks.abc';
-import request = require('request');
-import { LoggerBuilder } from '@waha/utils/logging';
-import { Logger } from 'pino';
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const HttpAgent = require('agentkeepalive');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const HttpsAgent = require('agentkeepalive').HttpsAgent;
 
 export class WebhookSenderCore extends WebhookSender {
-  send(json) {
-    this.logger.info({ url: this.url }, `Sending POST ...`);
-    this.logger.debug({ data: json }, `POST DATA`);
+  protected static AGENTS = {
+    http: new HttpAgent({}),
+    https: new HttpsAgent({}),
+  };
 
-    request.post(this.url, { json: json }, (error, res, body) => {
-      if (error) {
-        this.logger.error(error);
-        return;
-      }
-      this.logger.info(
-        `POST request was sent with status code: ${res.statusCode}`,
-      );
-      this.logger.debug({ body: body }, `Response`);
+  protected axios: AxiosInstance;
+
+  constructor(loggerBuilder: LoggerBuilder, webhookConfig: WebhookConfig) {
+    super(loggerBuilder, webhookConfig);
+    this.axios = this.buildAxiosInstance();
+  }
+
+  protected buildAxiosInstance() {
+    const headers = {
+      'content-type': 'application/json',
+      'User-Agent': `WAHA/${VERSION.version}`,
+    };
+    return axios.create({
+      headers: headers,
+      httpAgent: WebhookSenderCore.AGENTS.http,
+      httpsAgent: WebhookSenderCore.AGENTS.https,
     });
   }
+
+  send(json: any, headers?: Record<string, string>) {
+    this.logger.info(
+      { id: headers['X-Webhook-Request-Id'], url: this.url },
+      `Sending POST...`,
+    );
+    this.logger.debug(
+      { id: headers['X-Webhook-Request-Id'], data: json },
+      `POST DATA`,
+    );
+
+    this.axios
+      .post(this.url, json, { headers: headers })
+      .then((response) => {
+        this.logger.info(
+          { id: headers['X-Webhook-Request-Id'] },
+          `POST request was sent with status code: ${response.status}`,
+        );
+        this.logger.debug(
+          { id: headers['X-Webhook-Request-Id'], body: response.data },
+          `Response`,
+        );
+      })
+      .catch((error) => {
+        this.logger.error(
+          {
+            id: headers['X-Webhook-Request-Id'],
+            error: error.message,
+            data: error.response?.data,
+          },
+          `POST request failed: ${error.message}`,
+        );
+      });
+  }
 }
 
 export class WebhookConductorCore implements WebhookConductor {
@@ -121,7 +171,7 @@ export class WebhookConductorCore implements WebhookConductor {
     if (!found) {
       return false;
     }
-    this.logger.info(`Event '${event}' is enabled for url: ${url}`);
+    this.logger.debug(`Event '${event}' is enabled for url: ${url}`);
     return true;
   }
 

src/main.ts

@@ -29,6 +29,13 @@ process.on('unhandledRejection', (reason, promise) => {
   // @ts-ignore
   logger.error(reason.stack);
 });
+process.on('SIGINT', () => {
+  logger.info('SIGINT received');
+});
+
+process.on('SIGTERM', () => {
+  logger.info('SIGTERM received');
+});
 
 async function loadModules(): Promise<
   [typeof AppModuleCore, typeof SwaggerConfiguratorCore]
@@ -51,18 +58,12 @@ async function loadModules(): Promise<
   return [AppModulePlus, SwaggerConfiguratorPlus];
 }
 
-let app = undefined;
-
-export function getApp() {
-  return app;
-}
-
 async function bootstrap() {
   const version = getWAHAVersion();
   logger.info(`WAHA (WhatsApp HTTP API) - Running ${version} version...`);
   const [AppModule, SwaggerModule] = await loadModules();
   const httpsOptions = AppModule.getHttpsOptions(logger);
-  app = await NestFactory.create(AppModule, {
+  const app = await NestFactory.create(AppModule, {
     logger: getNestJSLogLevels(),
     httpsOptions: httpsOptions,
     bufferLogs: true,
@@ -73,7 +74,6 @@ async function bootstrap() {
   // https://github.com/iamolegga/nestjs-pino?tab=readme-ov-file#expose-stack-trace-and-error-class-in-err-property
   app.useGlobalInterceptors(new LoggerErrorInterceptor());
 
-  app.enableShutdownHooks();
   app.useGlobalFilters(new AllExceptionsFilter());
   app.enableCors();
   // Ideally, we should apply it globally.
@@ -90,6 +90,7 @@ async function bootstrap() {
   swaggerConfigurator.configure(WAHA_WEBHOOKS);
 
   AppModule.appReady(app, logger);
+  app.enableShutdownHooks();
   const config = app.get(WhatsappConfigService);
   await app.listen(config.port);
   logger.info(`WhatsApp HTTP API is running on: ${await app.getUrl()}`);

src/structures/chatting.buttons.dto.ts

@@ -0,0 +1,137 @@
+import { ApiExtraModels, ApiProperty, getSchemaPath } from '@nestjs/swagger';
+import { WHATSAPP_DEFAULT_SESSION_NAME } from '@waha/structures/base.dto';
+import { ChatRequest } from '@waha/structures/chatting.dto';
+import { BinaryFile, RemoteFile } from '@waha/structures/files.dto';
+import { ChatIdProperty } from '@waha/structures/properties.dto';
+import { Type } from 'class-transformer';
+import {
+  ArrayMaxSize,
+  ArrayMinSize,
+  IsArray,
+  IsEnum,
+  IsNotEmpty,
+  IsOptional,
+  IsString,
+  ValidateIf,
+  ValidateNested,
+} from 'class-validator';
+
+export enum ButtonType {
+  REPLY = 'reply',
+  URL = 'url',
+  CALL = 'call',
+  COPY = 'copy',
+}
+
+/**
+ * buttons:
+ *    - type: reply|url|call|copy
+ *      text: Display Text
+ *      url: only for url (required)
+ *      phone_number: only for call (required)
+ */
+export class Button {
+  @IsEnum(ButtonType)
+  type: ButtonType = ButtonType.REPLY;
+
+  @ApiProperty({
+    example: 'Button Text',
+  })
+  @IsString()
+  text: string;
+
+  @ApiProperty({
+    example: '321321',
+  })
+  @IsOptional()
+  @IsString()
+  id?: string;
+
+  @ApiProperty({
+    example: 'https://example.com',
+  })
+  @ValidateIf((o) => o.type === ButtonType.URL)
+  @IsNotEmpty()
+  url?: string;
+
+  @ApiProperty({
+    example: '+1234567890',
+  })
+  @ValidateIf((o) => o.type === ButtonType.CALL)
+  @IsNotEmpty()
+  phoneNumber?: string;
+
+  @ApiProperty({
+    example: '4321',
+  })
+  @ValidateIf((o) => o.type === ButtonType.COPY)
+  @IsNotEmpty()
+  copyCode?: string;
+}
+
+@ApiExtraModels(RemoteFile, BinaryFile)
+export class SendButtonsRequest {
+  @IsString()
+  session: string = WHATSAPP_DEFAULT_SESSION_NAME;
+
+  @ChatIdProperty()
+  @IsString()
+  chatId: string;
+
+  @ApiProperty({
+    example: 'How are you?',
+  })
+  @IsOptional()
+  header: string;
+
+  @ApiProperty({
+    oneOf: [
+      { $ref: getSchemaPath(RemoteFile) },
+      { $ref: getSchemaPath(BinaryFile) },
+    ],
+  })
+  @IsOptional()
+  headerImage?: RemoteFile | BinaryFile;
+
+  @ApiProperty({
+    example: 'Tell us how are you please 🙏',
+  })
+  @IsOptional()
+  body: string;
+
+  @ApiProperty({
+    example: 'If you have any questions, please send it in the chat',
+  })
+  @IsOptional()
+  footer: string;
+
+  @ValidateNested({ each: true })
+  @Type(() => Button)
+  @IsArray()
+  @ArrayMinSize(1)
+  @ArrayMaxSize(4)
+  @ApiProperty({
+    example: [
+      {
+        type: 'reply',
+        text: 'I am good!',
+      },
+      {
+        type: 'call',
+        text: 'Call us',
+        phoneNumber: '+1234567890',
+      },
+      {
+        type: 'copy',
+        text: 'Copy code',
+        copyCode: '4321',
+      },
+      {
+        type: 'url',
+        text: 'How did you do that?',
+        url: 'https://waha.devlike.pro',
+      },
+    ],
+  })
+  buttons: Button[];
+}

src/structures/chatting.dto.ts

@@ -243,6 +243,12 @@ export class MessageVideoRequest extends ChatRequest {
     example: null,
   })
   reply_to?: string;
+
+  @ApiProperty({
+    description: 'Send as video note (aka instant or round video).',
+    example: false,
+  })
+  asNote?: boolean;
 }
 
 export class MessageLinkPreviewRequest extends ChatRequest {
@@ -250,6 +256,13 @@ export class MessageLinkPreviewRequest extends ChatRequest {
   title: string;
 }
 
+export class MessageForwardRequest extends ChatRequest {
+  @ApiProperty({
+    example: 'false_11111111111@c.us_AAAAAAAAAAAAAAAAAAAA',
+  })
+  messageId: string;
+}
+
 export class MessageReactionRequest extends MessageRequest {
   @ApiProperty({
     description:

src/structures/enums.dto.ts

@@ -6,6 +6,7 @@ export enum WAHAEvents {
   MESSAGE_REACTION = 'message.reaction',
   MESSAGE_ANY = 'message.any',
   MESSAGE_ACK = 'message.ack',
+  MESSAGE_WAITING = 'message.waiting',
   MESSAGE_REVOKED = 'message.revoked',
   STATE_CHANGE = 'state.change',
   GROUP_JOIN = 'group.join',

src/structures/files.dto.ts

@@ -21,7 +21,7 @@ export class RemoteFile {
   @ApiProperty({
     example:
       process.env.WHATSAPP_SWAGGER_JPG_EXAMPLE_URL ||
-      'https://github.com/devlikeapro/waha/raw/core/examples/dev.likeapro.jpg',
+      'https://github.com/devlikeapro/waha/raw/core/examples/waha.jpg',
   })
   url: string;
 }
@@ -42,7 +42,7 @@ export class BinaryFile {
   @ApiProperty({
     description: 'Base64-encoded data of the file',
     example:
-      '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',
+      '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
Line truncated
   })
   data: string;
 }

src/structures/server.dto.ts

@@ -36,6 +36,14 @@ export class StopResponse {
   stopping: boolean = true;
 }
 
+export class WorkerInfo {
+  @ApiProperty({
+    example: 'waha',
+    description: 'The worker ID.',
+  })
+  id: string;
+}
+
 export class ServerStatusResponse {
   @ApiProperty({
     example: 1723788847247,
@@ -48,4 +56,6 @@ export class ServerStatusResponse {
     description: 'The uptime of the server in milliseconds.',
   })
   uptime: number;
+
+  worker: WorkerInfo;
 }

src/structures/sessions.dto.ts

@@ -159,6 +159,7 @@ export class MeInfo {
 
 export class SessionInfo extends SessionDTO {
   me?: MeInfo;
+  assignedWorker?: string;
 }
 
 export class SessionDetailedInfo extends SessionInfo {

src/structures/webhooks.config.dto.ts

@@ -11,6 +11,12 @@ import {
   ValidateNested,
 } from 'class-validator';
 
+export enum RetryPolicy {
+  LINEAR = 'linear',
+  EXPONENTIAL = 'exponential',
+  CONSTANT = 'constant',
+}
+
 export class RetriesConfiguration {
   @ApiProperty({
     example: 2,
@@ -25,6 +31,13 @@ export class RetriesConfiguration {
   @IsNumber()
   @IsOptional()
   attempts?: number;
+
+  @ApiProperty({
+    example: RetryPolicy.LINEAR,
+  })
+  @IsOptional()
+  @IsEnum(RetryPolicy)
+  policy?: RetryPolicy;
 }
 
 export class CustomHeader {

src/utils/SingleDelayedJobRunner.ts

@@ -22,8 +22,12 @@ export class SingleDelayedJobRunner {
     });
   }
 
+  get scheduled(): boolean {
+    return !!this.timeout;
+  }
+
   schedule(fn: FunctionNoArgs): boolean {
-    if (this.timeout) {
+    if (this.scheduled) {
       const msg = `Job has been started before, do not schedule it again`;
       this.log(this.warningOverride, msg);
       return false;
@@ -31,16 +35,24 @@ export class SingleDelayedJobRunner {
 
     this.timeout = setTimeout(() => {
       this.logger.debug(`Running job...`);
-      fn().finally(() => {
-        this.timeout = null;
-        this.logger.debug(`Job finished`);
-      });
+      fn()
+        .catch((error) => {
+          this.logger.error(`Job failed: ${error}`);
+          this.logger.error(error.stack);
+        })
+        .finally(() => {
+          this.timeout = null;
+          this.logger.debug(`Job finished`);
+        });
     }, this.timeoutMs);
     this.logger.info(`Job scheduled with timeout ${this.timeoutMs} ms`);
     return true;
   }
 
   cancel() {
+    if (!this.timeout) {
+      return;
+    }
     clearTimeout(this.timeout);
     this.timeout = null;
     this.logger.info(`Job cancelled`);

src/utils/SinglePeriodicJobRunner.ts

@@ -40,16 +40,24 @@ export class SinglePeriodicJobRunner {
 
       this.isWorking = true;
       this.logger.debug('Running job...');
-      fn().finally(() => {
-        this.isWorking = false;
-        this.logger.debug(`Job finished`);
-      });
+      fn()
+        .catch((error) => {
+          this.logger.error(`Job failed: ${error}`);
+          this.logger.error(error.stack);
+        })
+        .finally(() => {
+          this.isWorking = false;
+          this.logger.debug(`Job finished`);
+        });
     }, this.intervalMs);
     this.logger.info(`Job started with interval ${this.intervalMs} ms`);
     return true;
   }
 
   stop() {
+    if (!this.interval) {
+      return;
+    }
     clearInterval(this.interval);
     this.interval = null;
     this.logger.info(`Job stopped`);

src/version.ts

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

yarn.lock

@@ -5,16 +5,16 @@ __metadata:
   version: 6
   cacheKey: 8
 
-"@adiwajshing/baileys@github:devlikeapro/Baileys#fork-master-channels-2":
-  version: 6.7.7
-  resolution: "@adiwajshing/baileys@https://github.com/devlikeapro/Baileys.git#commit=84b7f66ea819a4abadddf41586192bb35916809c"
+"@adiwajshing/baileys@github:devlikeapro/Baileys#fork-master-channels-678":
+  version: 6.7.8
+  resolution: "@adiwajshing/baileys@https://github.com/devlikeapro/Baileys.git#commit=d0323b92eb8365e6f32a61e41dd00010602d07f1"
   dependencies:
     "@adiwajshing/keyed-db": ^0.2.4
     "@hapi/boom": ^9.1.3
     async-lock: ^1.4.1
     audio-decode: ^2.1.3
     axios: ^1.6.0
-    cache-manager: 4.0.1
+    cache-manager: ^5.7.6
     futoin-hkdf: ^1.5.1
     libphonenumber-js: ^1.10.20
     libsignal: "github:WhiskeySockets/libsignal-node"
@@ -39,7 +39,7 @@ __metadata:
       optional: true
     sharp:
       optional: true
-  checksum: 670506c283521ff5d9a6e2baf08c1b0a99e1ad5b699a9ac088563bae39e623fae2ff7a679da6db3633f3bf91f8f8344f4433fd010535be0f196138500c632eda
+  checksum: a3b461006443713074401a17c3481aef571301e83f1fba193d06e7f9ea4c47359b5c973d0b3804e34d4e48c35bdc1a64d8c3e59a0a744e5bc9bcca591d180901
   languageName: node
   linkType: hard
 
@@ -3752,13 +3752,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"adm-zip@npm:^0.5.10":
-  version: 0.5.14
-  resolution: "adm-zip@npm:0.5.14"
-  checksum: 83a4bc0bdff70f3276992810db96b10ffbf3c07667a9c3395e3dc60ca40ecbb920812dde212e1e21633b1508f1ea6fc427ac451aa68ee1a597b7251b2c1fc844
-  languageName: node
-  linkType: hard
-
 "agent-base@npm:6":
   version: 6.0.2
   resolution: "agent-base@npm:6.0.2"
@@ -3777,6 +3770,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"agentkeepalive@npm:^4.5.0":
+  version: 4.5.0
+  resolution: "agentkeepalive@npm:4.5.0"
+  dependencies:
+    humanize-ms: ^1.2.1
+  checksum: 13278cd5b125e51eddd5079f04d6fe0914ac1b8b91c1f3db2c1822f99ac1a7457869068997784342fe455d59daaff22e14fb7b8c3da4e741896e7e31faf92481
+  languageName: node
+  linkType: hard
+
 "aggregate-error@npm:^3.0.0":
   version: 3.1.0
   resolution: "aggregate-error@npm:3.1.0"
@@ -3822,7 +3824,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:^6.10.0, ajv@npm:^6.10.2, ajv@npm:^6.12.3, ajv@npm:^6.12.5":
+"ajv@npm:^6.10.0, ajv@npm:^6.10.2, ajv@npm:^6.12.5":
   version: 6.12.6
   resolution: "ajv@npm:6.12.6"
   dependencies:
@@ -4107,22 +4109,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"asn1@npm:~0.2.3":
-  version: 0.2.6
-  resolution: "asn1@npm:0.2.6"
-  dependencies:
-    safer-buffer: ~2.1.0
-  checksum: 39f2ae343b03c15ad4f238ba561e626602a3de8d94ae536c46a4a93e69578826305366dc09fbb9b56aec39b4982a463682f259c38e59f6fa380cd72cd61e493d
-  languageName: node
-  linkType: hard
-
-"assert-plus@npm:1.0.0, assert-plus@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "assert-plus@npm:1.0.0"
-  checksum: 19b4340cb8f0e6a981c07225eacac0e9d52c2644c080198765d63398f0075f83bbc0c8e95474d54224e297555ad0d631c1dcd058adb1ddc2437b41a6b424ac64
-  languageName: node
-  linkType: hard
-
 "ast-types@npm:^0.13.4":
   version: 0.13.4
   resolution: "ast-types@npm:0.13.4"
@@ -4146,13 +4132,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"async@npm:3.2.3":
-  version: 3.2.3
-  resolution: "async@npm:3.2.3"
-  checksum: c4bee57ab2249af3dc83ca3ef9acfa8e822c0d5e5aa41bae3eaf7f673648343cd64ecd7d26091ffd357f3f044428b17b5f00098494b6cf8b6b3e9681f0636ca1
-  languageName: node
-  linkType: hard
-
 "async@npm:>=0.2.9, async@npm:^3.2.4":
   version: 3.2.5
   resolution: "async@npm:3.2.5"
@@ -4213,17 +4192,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aws-sign2@npm:~0.7.0":
-  version: 0.7.0
-  resolution: "aws-sign2@npm:0.7.0"
-  checksum: b148b0bb0778098ad8cf7e5fc619768bcb51236707ca1d3e5b49e41b171166d8be9fdc2ea2ae43d7decf02989d0aaa3a9c4caa6f320af95d684de9b548a71525
-  languageName: node
-  linkType: hard
-
-"aws4@npm:^1.8.0":
-  version: 1.13.0
-  resolution: "aws4@npm:1.13.0"
-  checksum: 71594a17a5f7b1a9151ef515500c18f1029caa51e2cb65c1b5b324d9bd8dac89896a9e296825d4e6befdcd612d7fc3b0d8042c667555a56df3ee1ab15d4d9b35
+"axios-retry@npm:^4.5.0":
+  version: 4.5.0
+  resolution: "axios-retry@npm:4.5.0"
+  dependencies:
+    is-retry-allowed: ^2.2.0
+  peerDependencies:
+    axios: 0.x || 1.x
+  checksum: ec831e566ed3a55d3c3c927c1d42c52f2c2f1a8ea99ff8521d3675c6313f8c77f704c7186299fda08b7dc0f771a2c5471e72d279789d5aade65ec3755ab3a1ff
   languageName: node
   linkType: hard
 
@@ -4238,6 +4214,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"axios@npm:^1.7.7":
+  version: 1.7.7
+  resolution: "axios@npm:1.7.7"
+  dependencies:
+    follow-redirects: ^1.15.6
+    form-data: ^4.0.0
+    proxy-from-env: ^1.1.0
+  checksum: 882d4fe0ec694a07c7f5c1f68205eb6dc5a62aecdb632cc7a4a3d0985188ce3030e0b277e1a8260ac3f194d314ae342117660a151fabffdc5081ca0b5a8b47fe
+  languageName: node
+  linkType: hard
+
 "b4a@npm:^1.6.4":
   version: 1.6.6
   resolution: "b4a@npm:1.6.6"
@@ -4358,15 +4345,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bcrypt-pbkdf@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "bcrypt-pbkdf@npm:1.0.2"
-  dependencies:
-    tweetnacl: ^0.14.3
-  checksum: 4edfc9fe7d07019609ccf797a2af28351736e9d012c8402a07120c4453a3b789a15f2ee1530dc49eee8f7eb9379331a8dd4b3766042b9e502f74a68e7f662291
-  languageName: node
-  linkType: hard
-
 "better-sqlite3@npm:11.3.0":
   version: 11.3.0
   resolution: "better-sqlite3@npm:11.3.0"
@@ -4657,14 +4635,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cache-manager@npm:4.0.1":
-  version: 4.0.1
-  resolution: "cache-manager@npm:4.0.1"
+"cache-manager@npm:^5.7.6":
+  version: 5.7.6
+  resolution: "cache-manager@npm:5.7.6"
   dependencies:
-    async: 3.2.3
+    eventemitter3: ^5.0.1
     lodash.clonedeep: ^4.5.0
-    lru-cache: ^7.10.1
-  checksum: 8ca25b1e603111f033d1a3f1463b2a9203e9ea61a0706265a4d4f63d54a8be95f9e79efb04fc43103219becb4903a5db747a346e009e7102767a47e5677219b2
+    lru-cache: ^10.2.2
+    promise-coalesce: ^1.1.2
+  checksum: c61d30e2824f99f04af8e14a2e98c2274daa276cce82f64f0ac4c4bd59cf30e1ad9dec4028148206ad729196b242940476602e2f12496366d6f3f4b9da7c24c5
   languageName: node
   linkType: hard
 
@@ -4709,13 +4688,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caseless@npm:~0.12.0":
-  version: 0.12.0
-  resolution: "caseless@npm:0.12.0"
-  checksum: b43bd4c440aa1e8ee6baefee8063b4850fd0d7b378f6aabc796c9ec8cb26d27fb30b46885350777d9bd079c5256c0e1329ad0dc7c2817e0bb466810ebb353751
-  languageName: node
-  linkType: hard
-
 "chainsaw@npm:~0.1.0":
   version: 0.1.0
   resolution: "chainsaw@npm:0.1.0"
@@ -5083,7 +5055,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"combined-stream@npm:^1.0.6, combined-stream@npm:^1.0.8, combined-stream@npm:~1.0.6":
+"combined-stream@npm:^1.0.6, combined-stream@npm:^1.0.8":
   version: 1.0.8
   resolution: "combined-stream@npm:1.0.8"
   dependencies:
@@ -5202,13 +5174,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-util-is@npm:1.0.2":
-  version: 1.0.2
-  resolution: "core-util-is@npm:1.0.2"
-  checksum: 7a4c925b497a2c91421e25bf76d6d8190f0b2359a9200dbeed136e63b2931d6294d3b1893eda378883ed363cd950f44a12a401384c609839ea616befb7927dab
-  languageName: node
-  linkType: hard
-
 "core-util-is@npm:~1.0.0":
   version: 1.0.3
   resolution: "core-util-is@npm:1.0.3"
@@ -5355,15 +5320,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dashdash@npm:^1.12.0":
-  version: 1.14.1
-  resolution: "dashdash@npm:1.14.1"
-  dependencies:
-    assert-plus: ^1.0.0
-  checksum: 3634c249570f7f34e3d34f866c93f866c5b417f0dd616275decae08147dcdf8fccfaa5947380ccfb0473998ea3a8057c0b4cd90c875740ee685d0624b2983598
-  languageName: node
-  linkType: hard
-
 "data-uri-to-buffer@npm:^6.0.2":
   version: 6.0.2
   resolution: "data-uri-to-buffer@npm:6.0.2"
@@ -5744,16 +5700,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ecc-jsbn@npm:~0.1.1":
-  version: 0.1.2
-  resolution: "ecc-jsbn@npm:0.1.2"
-  dependencies:
-    jsbn: ~0.1.0
-    safer-buffer: ^2.1.0
-  checksum: 22fef4b6203e5f31d425f5b711eb389e4c6c2723402e389af394f8411b76a488fa414d309d866e2b577ce3e8462d344205545c88a8143cc21752a5172818888a
-  languageName: node
-  linkType: hard
-
 "ee-first@npm:1.1.1":
   version: 1.1.1
   resolution: "ee-first@npm:1.1.1"
@@ -6295,6 +6241,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eventemitter3@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "eventemitter3@npm:5.0.1"
+  checksum: 543d6c858ab699303c3c32e0f0f47fc64d360bf73c3daf0ac0b5079710e340d6fe9f15487f94e66c629f5f82cd1a8678d692f3dbb6f6fcd1190e1b97fcad36f8
+  languageName: node
+  linkType: hard
+
 "events@npm:^3.2.0, events@npm:^3.3.0":
   version: 3.3.0
   resolution: "events@npm:3.3.0"
@@ -6418,7 +6371,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"extend@npm:^3.0.0, extend@npm:^3.0.2, extend@npm:~3.0.2":
+"extend@npm:^3.0.0":
   version: 3.0.2
   resolution: "extend@npm:3.0.2"
   checksum: a50a8309ca65ea5d426382ff09f33586527882cf532931cb08ca786ea3146c0553310bda688710ff61d7668eba9f96b923fe1420cdf56a2c3eaf30fcab87b515
@@ -6453,20 +6406,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"extsprintf@npm:1.3.0":
-  version: 1.3.0
-  resolution: "extsprintf@npm:1.3.0"
-  checksum: cee7a4a1e34cffeeec18559109de92c27517e5641991ec6bab849aa64e3081022903dd53084f2080d0d2530803aa5ee84f1e9de642c365452f9e67be8f958ce2
-  languageName: node
-  linkType: hard
-
-"extsprintf@npm:^1.2.0":
-  version: 1.4.1
-  resolution: "extsprintf@npm:1.4.1"
-  checksum: a2f29b241914a8d2bad64363de684821b6b1609d06ae68d5b539e4de6b28659715b5bea94a7265201603713b7027d35399d10b0548f09071c5513e65e8323d33
-  languageName: node
-  linkType: hard
-
 "fast-copy@npm:^3.0.2":
   version: 3.0.2
   resolution: "fast-copy@npm:3.0.2"
@@ -6694,13 +6633,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"forever-agent@npm:~0.6.1":
-  version: 0.6.1
-  resolution: "forever-agent@npm:0.6.1"
-  checksum: 766ae6e220f5fe23676bb4c6a99387cec5b7b62ceb99e10923376e27bfea72f3c3aeec2ba5f45f3f7ba65d6616965aa7c20b15002b6860833bb6e394dea546a8
-  languageName: node
-  linkType: hard
-
 "fork-ts-checker-webpack-plugin@npm:8.0.0":
   version: 8.0.0
   resolution: "fork-ts-checker-webpack-plugin@npm:8.0.0"
@@ -6746,17 +6678,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"form-data@npm:~2.3.2":
-  version: 2.3.3
-  resolution: "form-data@npm:2.3.3"
-  dependencies:
-    asynckit: ^0.4.0
-    combined-stream: ^1.0.6
-    mime-types: ^2.1.12
-  checksum: 10c1780fa13dbe1ff3100114c2ce1f9307f8be10b14bf16e103815356ff567b6be39d70fc4a40f8990b9660012dc24b0f5e1dde1b6426166eb23a445ba068ca3
-  languageName: node
-  linkType: hard
-
 "formidable@npm:^1.2.0":
   version: 1.2.6
   resolution: "formidable@npm:1.2.6"
@@ -6997,15 +6918,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"getpass@npm:^0.1.1":
-  version: 0.1.7
-  resolution: "getpass@npm:0.1.7"
-  dependencies:
-    assert-plus: ^1.0.0
-  checksum: ab18d55661db264e3eac6012c2d3daeafaab7a501c035ae0ccb193c3c23e9849c6e29b6ac762b9c2adae460266f925d55a3a2a3a3c8b94be2f222df94d70c046
-  languageName: node
-  linkType: hard
-
 "github-from-package@npm:0.0.0":
   version: 0.0.0
   resolution: "github-from-package@npm:0.0.0"
@@ -7127,23 +7039,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"har-schema@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "har-schema@npm:2.0.0"
-  checksum: d8946348f333fb09e2bf24cc4c67eabb47c8e1d1aa1c14184c7ffec1140a49ec8aa78aa93677ae452d71d5fc0fdeec20f0c8c1237291fc2bcb3f502a5d204f9b
-  languageName: node
-  linkType: hard
-
-"har-validator@npm:~5.1.3":
-  version: 5.1.5
-  resolution: "har-validator@npm:5.1.5"
-  dependencies:
-    ajv: ^6.12.3
-    har-schema: ^2.0.0
-  checksum: b998a7269ca560d7f219eedc53e2c664cd87d487e428ae854a6af4573fc94f182fe9d2e3b92ab968249baec7ebaf9ead69cf975c931dc2ab282ec182ee988280
-  languageName: node
-  linkType: hard
-
 "has-bigints@npm:^1.0.1, has-bigints@npm:^1.0.2":
   version: 1.0.2
   resolution: "has-bigints@npm:1.0.2"
@@ -7262,17 +7157,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-signature@npm:~1.2.0":
-  version: 1.2.0
-  resolution: "http-signature@npm:1.2.0"
-  dependencies:
-    assert-plus: ^1.0.0
-    jsprim: ^1.2.2
-    sshpk: ^1.7.0
-  checksum: 3324598712266a9683585bb84a75dec4fd550567d5e0dd4a0fff6ff3f74348793404d3eeac4918fa0902c810eeee1a86419e4a2e92a164132dfe6b26743fb47c
-  languageName: node
-  linkType: hard
-
 "https-proxy-agent@npm:5.0.1":
   version: 5.0.1
   resolution: "https-proxy-agent@npm:5.0.1"
@@ -7307,6 +7191,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"humanize-ms@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "humanize-ms@npm:1.2.1"
+  dependencies:
+    ms: ^2.0.0
+  checksum: 9c7a74a2827f9294c009266c82031030eae811ca87b0da3dceb8d6071b9bde22c9f3daef0469c3c533cc67a97d8a167cd9fc0389350e5f415f61a79b171ded16
+  languageName: node
+  linkType: hard
+
 "iconv-lite@npm:0.4.24, iconv-lite@npm:^0.4.24":
   version: 0.4.24
   resolution: "iconv-lite@npm:0.4.24"
@@ -7678,6 +7571,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-retry-allowed@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "is-retry-allowed@npm:2.2.0"
+  checksum: 3d1103a9290b5d03626756a41054844633eac78bc5d3e3a95b13afeae94fa3cfbcf7f0b5520d83f75f48a25ce7b142fdbac4217dc4b0630f3ea55e866ec3a029
+  languageName: node
+  linkType: hard
+
 "is-shared-array-buffer@npm:^1.0.2, is-shared-array-buffer@npm:^1.0.3":
   version: 1.0.3
   resolution: "is-shared-array-buffer@npm:1.0.3"
@@ -7721,13 +7621,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-typedarray@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "is-typedarray@npm:1.0.0"
-  checksum: 3508c6cd0a9ee2e0df2fa2e9baabcdc89e911c7bd5cf64604586697212feec525aa21050e48affb5ffc3df20f0f5d2e2cf79b08caa64e1ccc9578e251763aef7
-  languageName: node
-  linkType: hard
-
 "is-unicode-supported@npm:^0.1.0":
   version: 0.1.0
   resolution: "is-unicode-supported@npm:0.1.0"
@@ -7772,13 +7665,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"isstream@npm:~0.1.2":
-  version: 0.1.2
-  resolution: "isstream@npm:0.1.2"
-  checksum: 1eb2fe63a729f7bdd8a559ab552c69055f4f48eb5c2f03724430587c6f450783c8f1cd936c1c952d0a927925180fcc892ebd5b174236cf1065d4bd5bdb37e963
-  languageName: node
-  linkType: hard
-
 "istanbul-lib-coverage@npm:^3.0.0, istanbul-lib-coverage@npm:^3.2.0":
   version: 3.2.2
   resolution: "istanbul-lib-coverage@npm:3.2.2"
@@ -8390,13 +8276,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsbn@npm:~0.1.0":
-  version: 0.1.1
-  resolution: "jsbn@npm:0.1.1"
-  checksum: e5ff29c1b8d965017ef3f9c219dacd6e40ad355c664e277d31246c90545a02e6047018c16c60a00f36d561b3647215c41894f5d869ada6908a2e0ce4200c88f2
-  languageName: node
-  linkType: hard
-
 "jsesc@npm:^2.5.1":
   version: 2.5.2
   resolution: "jsesc@npm:2.5.2"
@@ -8427,13 +8306,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json-schema@npm:0.4.0":
-  version: 0.4.0
-  resolution: "json-schema@npm:0.4.0"
-  checksum: 66389434c3469e698da0df2e7ac5a3281bcff75e797a5c127db7c5b56270e01ae13d9afa3c03344f76e32e81678337a8c912bdbb75101c62e487dc3778461d72
-  languageName: node
-  linkType: hard
-
 "json-stable-stringify-without-jsonify@npm:^1.0.1":
   version: 1.0.1
   resolution: "json-stable-stringify-without-jsonify@npm:1.0.1"
@@ -8441,13 +8313,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json-stringify-safe@npm:~5.0.1":
-  version: 5.0.1
-  resolution: "json-stringify-safe@npm:5.0.1"
-  checksum: 48ec0adad5280b8a96bb93f4563aa1667fd7a36334f79149abd42446d0989f2ddc58274b479f4819f1f00617957e6344c886c55d05a4e15ebb4ab931e4a6a8ee
-  languageName: node
-  linkType: hard
-
 "json5@npm:^1.0.1, json5@npm:^1.0.2":
   version: 1.0.2
   resolution: "json5@npm:1.0.2"
@@ -8488,18 +8353,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsprim@npm:^1.2.2":
-  version: 1.4.2
-  resolution: "jsprim@npm:1.4.2"
-  dependencies:
-    assert-plus: 1.0.0
-    extsprintf: 1.3.0
-    json-schema: 0.4.0
-    verror: 1.10.0
-  checksum: 2ad1b9fdcccae8b3d580fa6ced25de930eaa1ad154db21bbf8478a4d30bbbec7925b5f5ff29b933fba9412b16a17bd484a8da4fdb3663b5e27af95dd693bab2a
-  languageName: node
-  linkType: hard
-
 "kleur@npm:^3.0.3":
   version: 3.0.3
   resolution: "kleur@npm:3.0.3"
@@ -8729,6 +8582,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lru-cache@npm:^10.2.2":
+  version: 10.4.3
+  resolution: "lru-cache@npm:10.4.3"
+  checksum: 6476138d2125387a6d20f100608c2583d415a4f64a0fecf30c9e2dda976614f09cad4baa0842447bd37dd459a7bd27f57d9d8f8ce558805abd487c583f3d774a
+  languageName: node
+  linkType: hard
+
 "lru-cache@npm:^5.1.1":
   version: 5.1.1
   resolution: "lru-cache@npm:5.1.1"
@@ -8738,7 +8598,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^7.10.1, lru-cache@npm:^7.14.1":
+"lru-cache@npm:^7.14.1":
   version: 7.18.3
   resolution: "lru-cache@npm:7.18.3"
   checksum: e550d772384709deea3f141af34b6d4fa392e2e418c1498c078de0ee63670f1f46f5eee746e8ef7e69e1c895af0d4224e62ee33e66a543a14763b0f2e74c1356
@@ -8891,7 +8751,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mime-types@npm:^2.1.12, mime-types@npm:^2.1.27, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
+"mime-types@npm:^2.1.12, mime-types@npm:^2.1.27, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
   version: 2.1.35
   resolution: "mime-types@npm:2.1.35"
   dependencies:
@@ -9110,9 +8970,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mongodb@npm:^6.3.0":
-  version: 6.7.0
-  resolution: "mongodb@npm:6.7.0"
+"mongodb@npm:6.9.0":
+  version: 6.9.0
+  resolution: "mongodb@npm:6.9.0"
   dependencies:
     "@mongodb-js/saslprep": ^1.1.5
     bson: ^6.7.0
@@ -9140,7 +9000,7 @@ __metadata:
       optional: true
     socks:
       optional: true
-  checksum: 11677b416ba2bd8c8835663445b89db7f32faca763c5c3ce6d9de246826b4796ec628c35e84d1dc0b3c11be9623a1ebd6ecdb8eb90a40eededb8bc4fd75e4693
+  checksum: 754beb9acf605bbb4d55383fd1df1915ec25043f1e6ad0226d34a5d32b85ad822f784cf77d2751592696f5af72b5dc62a01514c4eb5fc0c7c0f495bf5764555a
   languageName: node
   linkType: hard
 
@@ -9167,7 +9027,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ms@npm:2.1.3, ms@npm:^2.1.1":
+"ms@npm:2.1.3, ms@npm:^2.0.0, ms@npm:^2.1.1":
   version: 2.1.3
   resolution: "ms@npm:2.1.3"
   checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d
@@ -9402,13 +9262,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"oauth-sign@npm:~0.9.0":
-  version: 0.9.0
-  resolution: "oauth-sign@npm:0.9.0"
-  checksum: 8f5497a127967866a3c67094c21efd295e46013a94e6e828573c62220e9af568cc1d2d04b16865ba583e430510fa168baf821ea78f355146d8ed7e350fc44c64
-  languageName: node
-  linkType: hard
-
 "object-assign@npm:^4, object-assign@npm:^4.1.1":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
@@ -9823,13 +9676,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"performance-now@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "performance-now@npm:2.1.0"
-  checksum: 534e641aa8f7cba160f0afec0599b6cecefbb516a2e837b512be0adbe6c1da5550e89c78059c7fabc5c9ffdf6627edabe23eb7c518c4500067a898fa65c2b550
-  languageName: node
-  linkType: hard
-
 "pg-connection-string@npm:2.6.2":
   version: 2.6.2
   resolution: "pg-connection-string@npm:2.6.2"
@@ -10117,6 +9963,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"promise-coalesce@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "promise-coalesce@npm:1.1.2"
+  checksum: 6f951b5db40ca78d09ad0f72adea0a2e9c5bdb0fc5b3ef218c611e2191c6ce2e9f752f815630fd07875dd1c9f04cc7327d6bada04b662dce986ce86ab88c2d5e
+  languageName: node
+  linkType: hard
+
 "promise-retry@npm:^2.0.1":
   version: 2.0.1
   resolution: "promise-retry@npm:2.0.1"
@@ -10221,13 +10074,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"psl@npm:^1.1.28":
-  version: 1.9.0
-  resolution: "psl@npm:1.9.0"
-  checksum: 20c4277f640c93d393130673f392618e9a8044c6c7bf61c53917a0fddb4952790f5f362c6c730a9c32b124813e173733f9895add8d26f566ed0ea0654b2e711d
-  languageName: node
-  linkType: hard
-
 "pump@npm:^3.0.0":
   version: 3.0.0
   resolution: "pump@npm:3.0.0"
@@ -10245,7 +10091,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"punycode@npm:^2.1.0, punycode@npm:^2.1.1, punycode@npm:^2.3.0":
+"punycode@npm:^2.1.0, punycode@npm:^2.3.0":
   version: 2.3.1
   resolution: "punycode@npm:2.3.1"
   checksum: bb0a0ceedca4c3c57a9b981b90601579058903c62be23c5e8e843d2c2d4148a3ecf029d5133486fb0e1822b098ba8bba09e89d6b21742d02fa26bda6441a6fb2
@@ -10366,13 +10212,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"qs@npm:~6.5.2":
-  version: 6.5.3
-  resolution: "qs@npm:6.5.3"
-  checksum: 6f20bf08cabd90c458e50855559539a28d00b2f2e7dddcb66082b16a43188418cb3cb77cbd09268bcef6022935650f0534357b8af9eeb29bf0f27ccb17655692
-  languageName: node
-  linkType: hard
-
 "querystring@npm:0.2.0":
   version: 0.2.0
   resolution: "querystring@npm:0.2.0"
@@ -10593,47 +10432,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"request@npm:^2.88.2":
-  version: 2.88.2
-  resolution: "request@npm:2.88.2"
-  dependencies:
-    aws-sign2: ~0.7.0
-    aws4: ^1.8.0
-    caseless: ~0.12.0
-    combined-stream: ~1.0.6
-    extend: ~3.0.2
-    forever-agent: ~0.6.1
-    form-data: ~2.3.2
-    har-validator: ~5.1.3
-    http-signature: ~1.2.0
-    is-typedarray: ~1.0.0
-    isstream: ~0.1.2
-    json-stringify-safe: ~5.0.1
-    mime-types: ~2.1.19
-    oauth-sign: ~0.9.0
-    performance-now: ^2.1.0
-    qs: ~6.5.2
-    safe-buffer: ^5.1.2
-    tough-cookie: ~2.5.0
-    tunnel-agent: ^0.6.0
-    uuid: ^3.3.2
-  checksum: 4e112c087f6eabe7327869da2417e9d28fcd0910419edd2eb17b6acfc4bfa1dad61954525949c228705805882d8a98a86a0ea12d7f739c01ee92af7062996983
-  languageName: node
-  linkType: hard
-
-"requestretry@npm:^4.1.1":
-  version: 4.1.2
-  resolution: "requestretry@npm:4.1.2"
-  dependencies:
-    extend: ^3.0.2
-    lodash: ^4.17.15
-    when: ^3.7.7
-  peerDependencies:
-    request: 2.*.*
-  checksum: 2dc43395c6d9b5b8dc5e1716db9014ea35185be46200ef067c56d28f356e799423a46e515f059f70402e2ada44fbaa41cad2d9103ca4be60f04ca465e8153d50
-  languageName: node
-  linkType: hard
-
 "require-directory@npm:^2.1.1":
   version: 2.1.1
   resolution: "require-directory@npm:2.1.1"
@@ -10823,7 +10621,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"safe-buffer@npm:5.2.1, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.2, safe-buffer@npm:~5.2.0":
+"safe-buffer@npm:5.2.1, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.2.0":
   version: 5.2.1
   resolution: "safe-buffer@npm:5.2.1"
   checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491
@@ -10848,7 +10646,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.0.2, safer-buffer@npm:^2.1.0, safer-buffer@npm:~2.1.0":
+"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0":
   version: 2.1.2
   resolution: "safer-buffer@npm:2.1.2"
   checksum: cab8f25ae6f1434abee8d80023d7e72b598cf1327164ddab31003c51215526801e40b66c5e65d658a0af1e9d6478cadcb4c745f4bd6751f97d8644786c0978b0
@@ -11273,27 +11071,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sshpk@npm:^1.7.0":
-  version: 1.18.0
-  resolution: "sshpk@npm:1.18.0"
-  dependencies:
-    asn1: ~0.2.3
-    assert-plus: ^1.0.0
-    bcrypt-pbkdf: ^1.0.0
-    dashdash: ^1.12.0
-    ecc-jsbn: ~0.1.1
-    getpass: ^0.1.1
-    jsbn: ~0.1.0
-    safer-buffer: ^2.0.2
-    tweetnacl: ~0.14.0
-  bin:
-    sshpk-conv: bin/sshpk-conv
-    sshpk-sign: bin/sshpk-sign
-    sshpk-verify: bin/sshpk-verify
-  checksum: 01d43374eee3a7e37b3b82fdbecd5518cbb2e47ccbed27d2ae30f9753f22bd6ffad31225cb8ef013bc3fb7785e686cea619203ee1439a228f965558c367c3cfa
-  languageName: node
-  linkType: hard
-
 "ssri@npm:^10.0.0":
   version: 10.0.6
   resolution: "ssri@npm:10.0.6"
@@ -11854,16 +11631,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tough-cookie@npm:~2.5.0":
-  version: 2.5.0
-  resolution: "tough-cookie@npm:2.5.0"
-  dependencies:
-    psl: ^1.1.28
-    punycode: ^2.1.1
-  checksum: 16a8cd090224dd176eee23837cbe7573ca0fa297d7e468ab5e1c02d49a4e9a97bb05fef11320605eac516f91d54c57838a25864e8680e27b069a5231d8264977
-  languageName: node
-  linkType: hard
-
 "tr46@npm:^4.1.1":
   version: 4.1.1
   resolution: "tr46@npm:4.1.1"
@@ -12060,13 +11827,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tweetnacl@npm:^0.14.3, tweetnacl@npm:~0.14.0":
-  version: 0.14.5
-  resolution: "tweetnacl@npm:0.14.5"
-  checksum: 6061daba1724f59473d99a7bb82e13f211cdf6e31315510ae9656fefd4779851cb927adad90f3b488c8ed77c106adc0421ea8055f6f976ff21b27c5c4e918487
-  languageName: node
-  linkType: hard
-
 "type-check@npm:^0.4.0, type-check@npm:~0.4.0":
   version: 0.4.0
   resolution: "type-check@npm:0.4.0"
@@ -12344,15 +12104,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:^3.3.2":
-  version: 3.4.0
-  resolution: "uuid@npm:3.4.0"
-  bin:
-    uuid: ./bin/uuid
-  checksum: 58de2feed61c59060b40f8203c0e4ed7fd6f99d42534a499f1741218a1dd0c129f4aa1de797bcf822c8ea5da7e4137aa3673431a96dae729047f7aca7b27866f
-  languageName: node
-  linkType: hard
-
 "uuid@npm:^9.0.1":
   version: 9.0.1
   resolution: "uuid@npm:9.0.1"
@@ -12401,22 +12152,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"verror@npm:1.10.0":
-  version: 1.10.0
-  resolution: "verror@npm:1.10.0"
-  dependencies:
-    assert-plus: ^1.0.0
-    core-util-is: 1.0.2
-    extsprintf: ^1.2.0
-  checksum: c431df0bedf2088b227a4e051e0ff4ca54df2c114096b0c01e1cbaadb021c30a04d7dd5b41ab277bcd51246ca135bf931d4c4c796ecae7a4fef6d744ecef36ea
-  languageName: node
-  linkType: hard
-
 "waha@workspace:.":
   version: 0.0.0-use.local
   resolution: "waha@workspace:."
   dependencies:
-    "@adiwajshing/baileys": "github:devlikeapro/Baileys#fork-master-channels-2"
+    "@adiwajshing/baileys": "github:devlikeapro/Baileys#fork-master-channels-678"
     "@adiwajshing/keyed-db": ^0.2.4
     "@aws-sdk/client-s3": ^3.633.0
     "@aws-sdk/s3-request-presigner": ^3.633.0
@@ -12444,7 +12184,10 @@ __metadata:
     "@typescript-eslint/eslint-plugin": 3.9.1
     "@typescript-eslint/parser": 3.9.1
     adm-zip: 0.5.10
+    agentkeepalive: ^4.5.0
     async-lock: ^1.4.1
+    axios: ^1.7.7
+    axios-retry: ^4.5.0
     better-sqlite3: 11.3.0
     check-disk-space: ^3.4.0
     chokidar: ^3.6.0
@@ -12466,7 +12209,7 @@ __metadata:
     link-preview-js: ^3.0.4
     lodash: ^4.17.21
     mime-types: ^2.1.27
-    mongodb: ^6.3.0
+    mongodb: 6.9.0
     nestjs-pino: ^4.1.0
     passport: ^0.6.0
     passport-headerapikey: ^1.2.2
@@ -12479,8 +12222,6 @@ __metadata:
     qrcode: ^1.5.1
     qrcode-terminal: ^0.12.0
     reflect-metadata: ^0.1.13
-    request: ^2.88.2
-    requestretry: ^4.1.1
     rimraf: ^3.0.2
     rxjs: ^7.1.0
     sharp: ^0.33.4
@@ -12491,7 +12232,7 @@ __metadata:
     ts-node: ^10.9.1
     tsconfig-paths: ^4.1.0
     typescript: ^4.8.4
-    whatsapp-web.js: "github:devlikeapro/whatsapp-web.js#fork-webpack-exodus-channels"
+    whatsapp-web.js: "github:devlikeapro/whatsapp-web.js#fork-main-channels"
   languageName: unknown
   linkType: soft
 
@@ -12588,12 +12329,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatsapp-web.js@github:devlikeapro/whatsapp-web.js#fork-webpack-exodus-channels":
-  version: 1.24.0
-  resolution: "whatsapp-web.js@https://github.com/devlikeapro/whatsapp-web.js.git#commit=f28dad2d12136192e9ee45370d768323196c10c0"
+"whatsapp-web.js@github:devlikeapro/whatsapp-web.js#fork-main-channels":
+  version: 1.26.0
+  resolution: "whatsapp-web.js@https://github.com/devlikeapro/whatsapp-web.js.git#commit=6a333d0088591269238726e9effa3cbb14c8e7c7"
   dependencies:
     "@pedroslopez/moduleraid": ^5.0.2
-    adm-zip: ^0.5.10
     archiver: ^5.3.1
     fluent-ffmpeg: 2.1.2
     fs-extra: ^10.1.0
@@ -12609,7 +12349,7 @@ __metadata:
       optional: true
     unzipper:
       optional: true
-  checksum: 0bd28b1f332aafaa6f9d467de04c33da99c139208d03bef78c5323c0e3ada6762f31e156d63cc2f6a46bb90e298ad08ddd2db25e13fb045fc2d1a2e69595758b
+  checksum: 51e9dce51270cf6fb20acd0bd7368f36763dcc3d28c6c3725c78b46edd5da21fea2c9c1f78ab6699464e4e1a6d9c361b6ab76a88225ebdeeb3f9abdd860d082c
   languageName: node
   linkType: hard
 
@@ -12633,13 +12373,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"when@npm:^3.7.7":
-  version: 3.7.8
-  resolution: "when@npm:3.7.8"
-  checksum: 1f7a3d4a125c61108c51a58b7e42350d290f0595c42fb864a38d403101b40ede28d29068c9f7a8c3e4e0128f2050f7cc68c7e82b3a39a9156f6929fc69bf42fb
-  languageName: node
-  linkType: hard
-
 "which-boxed-primitive@npm:^1.0.2":
   version: 1.0.2
   resolution: "which-boxed-primitive@npm:1.0.2"