Bump version to 2023.5.3

Fix #90

.dockerignore

@@ -1,5 +1,5 @@
 Dockerfile
-.sessions
+.*sessions
 files
 venv
 .wwebjs_auth

.gitignore

@@ -1,4 +1,4 @@
-.sessions
+.*sessions
 tokens
 files
 venv

Dockerfile

@@ -4,6 +4,15 @@
 FROM node:18 as build
 ENV PUPPETEER_SKIP_DOWNLOAD=True
 
+
+# Install https://github.com/WhiskeySockets/Baileys
+WORKDIR /
+RUN git clone https://github.com/WhiskeySockets/Baileys WhiskeySockets-Baileys && \
+    cd WhiskeySockets-Baileys && \
+    git checkout b7878e531144133b48d9e5970787e7b256d21063 && \
+    yarn install && \
+    yarn build:all
+
 # npm packages
 WORKDIR /src
 COPY package.json .

Makefile

@@ -35,4 +35,5 @@ update-swagger:
 	wget http://localhost:3000/-json -O ./docs/site/static/swagger/openapi.json
 
 update-dependencies:
-	. ${NVM_DIR}/nvm.sh && nvm exec yarn install venom-bot whatsapp-web.js --save
+	. ${NVM_DIR}/nvm.sh && nvm exec yarn add whatsapp-web.js@https://github.com/pedroslopez/whatsapp-web.js
+	. ${NVM_DIR}/nvm.sh && nvm exec yarn add venom-bot

README.md

@@ -61,8 +61,6 @@
 
 ## Updates
 - Bug fixes and updates come as soon as they are implemented. 
-- One month delay in bug fixes and updates. 
-
 
 ## Groups
 - Create a group

docs/site/config/_default/params.toml

@@ -74,7 +74,7 @@ copyRight = "Copyright (c) 2021-2023 Dev Like A Pro"
 alert = true
 alertDismissable = false
 # alertText = "Introducing the Doks child theme, several DX + UX updates, and more! <a class=\"alert-link stretched-link\" href=\"https://getdoks.org/blog/doks-v0.2/\" target=\"_blank\" rel=\"noopener\">Check out Doks v0.2</a>"
-alertText = "Enjoy Core version or want to get WAHA Plus verison? You can <a class=\"alert-link stretched-link\" href=\"https://waha.devlike.pro/docs/how-to/plus-version/\">support the project -></a>"
+alertText = "Enjoy Core version or want to get WAHA Plus verison? <a class=\"alert-link stretched-link\" href=\"https://waha.devlike.pro/docs/how-to/plus-version/\">Support the project -></a>"
 
 # Edit Page
 # repoHost [Github | Gitea | GitLab | Bitbucket | BitbucketServer ] is used for building the edit link based on git hoster

docs/site/content/en/docs/help/changelog.md

@@ -5,18 +5,31 @@ lead: "Changelog"
 date: 2020-10-06T08:49:31+00:00
 lastmod: 2020-10-06T08:49:31+00:00
 draft: false
-images: []
+images: [ ]
 menu:
   docs:
     parent: "help"
 weight: 600
 toc: true
 ---
-## 2021.3
+
+## 2021.5 - May 2023
+
+- Added new [NOWEB engine]({{< relref "/docs/how-to/engines" >}}). **NOWEB** engine does not require a browser to work
+  with
+  WhatsApp Web, it does so directly using a WebSocket.
+  - Less CPU and RAM usage!
+  - Send Locations API works!
+  - Send Link Preview API works!
+  - ⚠ Read the article before using it [How to avoid blocking ->]({{< relref "/docs/help/how-to-avoid-blocking" >}}).
+
+## 2021.4 - March 2023
+
 - Add [Groups API]({{< relref "/docs/how-to/groups" >}})
 - Use Chromium by default instead of Chrome
 
-## 2021.1
+## 2021.1 - January 2023
+
 - Added  [Contacts API]({{< relref "/docs/how-to/contacts" >}})
   - Get all contacts
   - Get a contact
@@ -25,33 +38,42 @@ toc: true
   - Check number exists (is registered in WhatsApp) - works even if the number is not in the contact list
   - Block and unblock contact
 
-## 2022.12
+## 2022.12 - December 2023
+
 - Added `GET /messages/` endpoint to get chat messages [#31](https://github.com/devlikeapro/whatsapp-http-api/issues/31)
 
 ### Security ![](/images/versions/plus.png)
+
 - Added `WHATSAPP_SWAGGER_USERNAME` and `WHATSAPP_SWAGGER_PASSWORD` to hide and protect swagger panel.
 
 ## 2022.11
+
 **Please test changes in test environment before update production!!**
 
-### Engine ![](/images/versions/core.png) ![](/images/versions/plus.png)
-1. WAHA has changed its underlying engine from Venom to Whatsapp Web.JS. It might change the response and webhook's payloads.
+### Engine ![](/images/versions/core.png)
+
+1. WAHA has changed its underlying engine from Venom to Whatsapp Web.JS. It might change the response and webhook's
+   payloads.
 2. Optimize CPU and memory consumption.
 
+### Requests ![](/images/versions/core.png)
 
-### Requests ![](/images/versions/core.png) ![](/images/versions/plus.png)
 - For all `/api/session/` requests use `name` field instead of `sessionName`.
 - For all "chatting" requests use `session` field instead of `sessionName`.
 
 ### Sessions ![](/images/versions/plus.png)
+
 Now you don't have to scan QR code each time you run WAHA, WAHA saves it for you! Available only in Plus version.
 
 ### Authentication ![](/images/versions/plus.png)
+
 Now you can authenticate all requests for WAHA - use `WHATSAPP_API_KEY=secret` environment variable to set "secret key".
 
-If `WHATSAPP_API_KEY` is set - requests must have `X-Api-Key` header with `secret` value, where `secret` - any random secret key.
+If `WHATSAPP_API_KEY` is set - requests must have `X-Api-Key` header with `secret` value, where `secret` - any random
+secret key.
+
+### Webhooks ![](/images/versions/core.png)
 
-### Webhooks ![](/images/versions/core.png) ![](/images/versions/plus.png)
 #### Configuration
 
 Instead of setting each webhook via environment variables - we use two environments variables:

docs/site/content/en/docs/help/faq.md

@@ -5,7 +5,7 @@ lead: "Answers to frequently asked questions."
 date: 2020-10-06T08:49:31+00:00
 lastmod: 2020-10-06T08:49:31+00:00
 draft: false
-images: []
+images: [ ]
 menu:
 docs:
 parent: "help"
@@ -13,7 +13,28 @@ weight: 630
 toc: true
 ---
 
+## How to update?
+
+{{< alert icon="💡" text="Please test all new versions in the development environment before updating production!" />}}
+
+![](/images/versions/core.png) For **Core** version the command is
+
+```bash
+docker pull devlikeapro/whatsapp-http-api
+```
+
+![](/images/versions/plus.png) For **Plus** version, we use login to get the image before:
+
+```bash
+docker login -u devlikeapro -p {PASSWORD}
+docker pull devlikeapro/whatsapp-http-api-plus
+docker logout
+```
+
+Read more about how to get `PASSWORD` for [Plus Version →]({{< relref "plus-version" >}})
+
 ## How much CPU and Memory does WhatsApp HTTP API consume?
+
 The benchmark has been made on **Intel(R) Core(TM) i7-10510U CPU @ 1.80GHz**.
 It may differ from case to case, it depends on usage pattern - how many messages you get, how many send, etc.
 
@@ -22,6 +43,7 @@ It may differ from case to case, it depends on usage pattern - how many messages
 | 1                                    | 30%  | 400MB  |
 | 10                                   | 270% | 1.5GB  |
 
-
 The nature of WhatsApp HTTP API and its underlying engines - is to run **real** WhatsApp Web version in Chrome and
 communicate with it to prevent blocking from WhatsApp. It's the reason why it's so demanding on resources.
+
+If you're looking for less resource demanded engine - [have a look at **NOWEB** engine ->]({{< relref "/docs/how-to/engines" >}})

docs/site/content/en/docs/help/how-to-avoid-blocking.md

@@ -0,0 +1,58 @@
+---
+title: "How to Avoid Blocking"
+description: "How to Avoid Blocking From Whatsapp"
+date: 2020-11-12T13:26:54+01:00
+lastmod: 2020-11-12T13:26:54+01:00
+draft: false
+images: [ ]
+menu:
+  docs:
+    parent: "help"
+weight: 610
+toc: true
+---
+
+How to Avoid Blocking in WhatsApp when developing bots.
+
+It's important to keep in mind that WhatsApp has strict policies in place to prevent spamming and abuse of their
+platform.
+
+If you're developing a bot for WhatsApp, it's crucial to follow these guidelines to avoid getting blocked.
+
+## Guidelines to Follow
+
+### 1. Only Reply to Messages
+
+When developing a bot for WhatsApp, you **should never initiate a conversation**.
+Instead, your bot **should only reply** to messages that it receives.
+This will prevent your bot from being flagged as spam by WhatsApp's users and algorithms.
+
+### 2. Avoid Spamming and Sending Unnecessary Content
+
+Sending too many messages or sending content that the user did not request can also lead to your bot being blocked. Make
+sure to only send relevant and useful information to the user.
+Additionally, do not send too many messages at once, as this can also trigger spam filters.
+
+### 3. Other Considerations
+
+There are other guidelines to follow when developing a bot for WhatsApp, such as avoiding the use of banned words and
+not sharing sensitive or inappropriate content.
+Make sure to read WhatsApp's policies thoroughly to ensure that your bot complies with all of their rules.
+
+## How to Process Messages
+
+When processing messages in your bot, it's important to follow certain steps to avoid being flagged as spam.
+Here's a recommended process to follow:
+
+1. **Send seen** before processing the message. This can be done by sending a `POST /api/sendSeen/` request to
+   the WAHA API.
+
+2. **Start typing** before sending a message and wait for a random interval depending on the size of the message. This can
+   be done by sending a `POST /api/startTyping/` request.
+
+3. **Stop typing** before sending the message. This can be done by sending a `POST /api/stopTyping/` request.
+
+4. **Send the text message** using the `POST /api/sendText` request.
+
+By following these steps, you can ensure that your bot processes messages in a way that's compliant with WhatsApp's
+guidelines and reduces the risk of being blocked.

docs/site/content/en/docs/help/how-to-update.md

@@ -1,34 +0,0 @@
----
-title: "How to Update"
-description: "Regularly update the installed WAHA to keep your bot stable, usable, and secure."
-lead: "Regularly update the installed WAHA to keep your bot stable, usable, and secure."
-date: 2020-11-12T13:26:54+01:00
-lastmod: 2020-11-12T13:26:54+01:00
-draft: false
-images: []
-menu:
-  docs:
-    parent: "help"
-weight: 610
-toc: true
----
-
-{{< alert icon="💡" text="Please test all new versions in the development environment before updating production!" />}}
-
-## Core
-![](/images/versions/core.png) For Core version the command is
-
-```bash
-docker pull devlikeapro/whatsapp-http-api
-```
-
-## Plus
-![](/images/versions/plus.png) For Plus version, we use login to get the image before:
-
-```bash
-docker login -u devlikeapro -p {PASSWORD}
-docker pull devlikeapro/whatsapp-http-api-plus
-docker logout
-```
-
-Read more about how to get `PASSWORD` for [Plus Version →]({{< relref "plus-version" >}})

docs/site/content/en/docs/how-to/config/index.md

@@ -12,7 +12,7 @@ You can configure WhatsApp HTTP API behaviour via environment variables, by addi
 begging of the command line or by using [other options](https://docs.docker.com/engine/reference/commandline/run/)
 
 ```bash
-docker run -it -e WHATSAPP_HOOK_EVENTS=* -e WHATSAPP_HOOK_URL=https://httpbin.org/post devlikeapro/whatsapp-http-api
+docker run -it -e "WHATSAPP_HOOK_EVENTS=*" -e WHATSAPP_HOOK_URL=https://httpbin.org/post devlikeapro/whatsapp-http-api
 ```
 
 ## Environment variables
@@ -34,25 +34,3 @@ docker run -it -e WHATSAPP_HOOK_EVENTS=* -e WHATSAPP_HOOK_URL=https://httpbin.or
 - `WHATSAPP_FILES_LIFETIME`- to keep free space files will be removed after this time (default: `180`, in seconds)
 - `WHATSAPP_FILES_FOLDER` - folder where will be stored files from chats (images, voice messages) (
   default: `/tmp/whatsapp-files`)
-
-## Engines
-
-Under the hood **WAHA** allows you to use two different engines. You can control what you want to run by settings
-`WHATSAPP_DEFAULT_ENGINE` environment variables.
-
-If you have any problems with one engine - try another!
-
-{{< alert icon="👉" text="API responses and webhook payloads may differ significantly! We do our best to keep requests body stable between engines." />}}
-
-### WhatsApp WebJS ![](/images/versions/core.png)
-
-**WAHA** uses **WhatsApp WebJS** engine by default
-
-- https://github.com/pedroslopez/whatsapp-web.js
-- `WHATSAPP_DEFAULT_ENGINE=WEBJS`
-
-### Venom ![](/images/versions/core.png)
-
-- https://github.com/orkestral/venom
-- `WHATSAPP_DEFAULT_ENGINE=VENOM`
-

docs/site/content/en/docs/how-to/engines/index.md

@@ -0,0 +1,52 @@
+---
+title: "Engines"
+description: "Engines"
+lead: ""
+date: 2020-10-06T08:48:45+00:00
+lastmod: 2020-10-06T08:48:45+00:00
+draft: false
+images: [ ]
+weight: 800
+---
+
+Under the hood **WAHA** allows you to use two different engines. You can control what you want to run by settings
+`WHATSAPP_DEFAULT_ENGINE` environment variables.
+
+```bash
+docker run -it -e "WHATSAPP_DEFAULT_ENGINE=WEBJS" devlikeapro/whatsapp-http-api
+```
+
+If you have any problems with one engine - try another!
+
+{{< alert icon="👉" text="API responses and webhook payloads may differ significantly! We do our best to keep requests body stable between engines." />}}
+
+All engines are available in Core version ![](/images/versions/core.png)
+
+## WEBJS
+
+A WhatsApp API client that connects through the WhatsApp Web browser app.
+It uses Puppeteer to run a real instance of Whatsapp Web to avoid getting blocked.
+
+**WAHA** uses **WhatsApp WebJS** engine by default.
+
+- `WHATSAPP_DEFAULT_ENGINE=WEBJS`
+- https://github.com/pedroslopez/whatsapp-web.js
+
+## NOWEB
+
+**NOWEB** engine does not require a browser to work with WhatsApp Web, it does so directly using a WebSocket.
+Not running Chromium saves you CPU and Memory, so you can run more instances on a single server!
+
+️Working with the engine requires more attention, because it's easy to be blocked with it!
+
+⚠ Read the article before using **NOWEB** engine [How to avoid blocking ->]({{< relref "/docs/help/how-to-avoid-blocking" >}}).
+
+- `WHATSAPP_DEFAULT_ENGINE=NOWEB`
+- https://github.com/WhiskeySockets/Baileys
+
+## VENOM
+
+It's a high-performance system developed with JavaScript to create a bot for WhatsApp
+
+- `WHATSAPP_DEFAULT_ENGINE=VENOM`
+- https://github.com/orkestral/venom

docs/site/content/en/docs/how-to/plus-version/index.md

@@ -32,8 +32,7 @@ The Plus additional features are:
 4. [**Security** →]({{< relref "/docs/how-to/security" >}})
 5. [**Saving sessions** →]({{< relref "/docs/how-to/sessions" >}})
 6. [**Support multiple sessions** →]({{< relref "/docs/how-to/sessions" >}})
-7. **Instant updates** - no one month delay in getting bugfixes or new features
-8. **Priority in support** - on both bugs and features
+7. **Priority in support** - on both bugs and features
 
 ## Differences
 

docs/site/content/en/docs/how-to/receive-messages/index.md

@@ -9,17 +9,26 @@ images: []
 weight: 120
 ---
 
-The project uses [Webhooks](https://en.wikipedia.org/wiki/Webhook) to send the messages or events from WhatsApp to your
+The project uses [Webhooks](https://en.wikipedia.org/wiki/Webhook) to send the messages and events from WhatsApp to your
 application.
 
-## Webhooks ![](/images/versions/core.png) ![](/images/versions/plus.png)
+Webhooks are a way for two different applications to communicate with each other in real-time.
+When a certain event happens in one application, it sends a message to another application through a webhook URL.
+The receiving application can then take action based on the information received.
+
+To receive incoming messages with webhooks,
+you first need to set up a webhook URL in your application and pass it to `WHATSAPP_HOOK_URL` environment variable.
+This URL is where WhatsApp will send incoming messages and other events -
+define which events you want to receive with `WHATSAPP_HOOK_EVENTS` environment variable.
+
+## Webhooks ![](/images/versions/core.png)
 
 You can configure where you want to receive events in environment variables:
 
 - `WHATSAPP_HOOK_URL=https://httpbin.org/post`  - to set up a URL for the webhook
 - `WHATSAPP_HOOK_EVENTS=message,message.any,state.change,group.join,group.leave` - specify events. DO NOT specify all of
   them, it's too heavy payload, choose the right for you.
-- `WHATSAPP_HOOK_EVENTS=*` - subscribe to all events. It's not recommended for production, but it's fine for
+  - `WHATSAPP_HOOK_EVENTS=*` - subscribe to all events. It's not recommended for production, but it's fine for
   development.
 
 On the URL that you set via `WHATSAPP_HOOK_URL` you receive JSON-data with following format:
@@ -27,6 +36,7 @@ On the URL that you set via `WHATSAPP_HOOK_URL` you receive JSON-data with follo
 ```json
 {
   "event": "message",
+  "session": "default",
   "payload": {}
 }
 ```
@@ -40,7 +50,7 @@ Below the list of all events that WhatsApp HTTP API sends to your.
 Run the bellow command and see look at the logs - it prints body request for all events that happen in your WhatsApp!
 
 ```bash
-docker run -it -e WHATSAPP_HOOK_EVENTS=* -e WHATSAPP_HOOK_URL=https://httpbin.org/post devlikeapro/whatsapp-http-api
+docker run -it -e "WHATSAPP_HOOK_EVENTS=*" -e WHATSAPP_HOOK_URL=https://httpbin.org/post devlikeapro/whatsapp-http-api
 ```
 
 ### Examples
@@ -55,7 +65,7 @@ You can create a pull request with your favorite language in the [GitHub, in exa
 Just put the code and **README.md** file in the folder - we'll do the rest!
 
 
-## Events ![](/images/versions/core.png) ![](/images/versions/plus.png)
+## Events ![](/images/versions/core.png)
 
 ### message
 
@@ -64,6 +74,7 @@ Incoming message (text/audio/files)
 ```json
 {
   "event": "message",
+  "session": "default",
   "payload": {
     "id": "true_11111111111@c.us_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
     "timestamp": 1667561485,
@@ -126,6 +137,7 @@ Fired on all message creations, including your own. The payload is the same as f
 ```json
 {
   "event": "message.any",
+  "session": "default",
   "payload": {}
 }
 ```
@@ -135,6 +147,7 @@ Fired on all message creations, including your own. The payload is the same as f
 ```json
 {
   "event": "message.ack",
+  "session": "default",
   "payload": {}
 }
 ```
@@ -144,6 +157,7 @@ Fired on all message creations, including your own. The payload is the same as f
 ```json
 {
   "event": "state.change",
+  "session": "default",
   "payload": {}
 }
 ```
@@ -153,6 +167,7 @@ Fired on all message creations, including your own. The payload is the same as f
 ```json
 {
   "event": "group.join",
+  "session": "default",
   "payload": {}
 }
 ```
@@ -162,6 +177,7 @@ Fired on all message creations, including your own. The payload is the same as f
 ```json
 {
   "event": "group.left",
+  "session": "default",
   "payload": {}
 }
 ```
@@ -176,6 +192,7 @@ For example, you can get the webhook like this with `mediaUrl` value (we've skip
 ```json
 {
   "event": "message",
+  "session": "default",
   "payload": {
     "id": "true_11111111111@c.us_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
     "timestamp": 1667561485,

docs/site/content/en/docs/how-to/send-messages/index.md

@@ -28,7 +28,7 @@ Read more about [multiple sessions →]({{< relref "/docs/how-to/sessions" >}})
     For phone number `12132132131` the `chatId` is  `12132132131@c.us`.
   - **Groups** use random number with `@g.us` at the end.
 
-## Send text ![](/images/versions/core.png) ![](/images/versions/plus.png)
+## Send text ![](/images/versions/core.png)
 To send text message - use `POST /api/sendText` with example payload.
 ```json
 {
@@ -38,7 +38,7 @@ To send text message - use `POST /api/sendText` with example payload.
 }
 ```
 
-## Reply on message ![](/images/versions/core.png) ![](/images/versions/plus.png)
+## Reply on message ![](/images/versions/core.png)
 To reply on a message - use `POST /api/reply` with example payload.
 ```json
 {
@@ -52,7 +52,7 @@ To reply on a message - use `POST /api/reply` with example payload.
 ### Reply files ![](/images/versions/plus-soon.png)
 WAHA does not support reply with files (images, voice, etc). If you're interested in it - please create an issue in GitHub.
 
-## Add a reaction ![](/images/versions/core.png) ![](/images/versions/plus.png)
+## Add a reaction ![](/images/versions/core.png)
 Use `PUT /api/reaction` method to set reaction to a message.
 
 {{< alert icon="👉" text="Reaction API uses PUT, not POST request! Please make sure you send right request." />}}

docs/site/content/en/docs/overview/introduction.md

@@ -22,7 +22,22 @@ toc: true
 
 {{< alert icon="👉" text="Run WhatsApp HTTP API in less than 5 minutes!" />}}
 
-Go straight to the [Quick Start →]({{< relref "quick-start" >}})
+We will guide you through the necessary steps to successfully send your first text message using WhatsApp HTTP API in
+[Quick Start →]({{< relref "quick-start" >}}).
+
+If you find it easier to follow a video tutorial rather than reading through text, we've got you covered!
+A 3-minute video tutorial is available to help you navigate WhatsApp HTTP API smoothly.
+
+<div class="d-flex justify-content-center my-4">
+  <iframe
+    width="560" height="315"
+    src="https://www.youtube.com/embed/RFerMyAUPRg"
+    title="YouTube video player"
+    frameborder="0"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+    allowfullscreen
+  ></iframe>
+</div>
 
 ## Features
 WAHA is distributed in two versions:
@@ -32,21 +47,21 @@ WAHA is distributed in two versions:
 Here's the available features:
 
 ### Messages
-- Send messages ![](/images/versions/core.png) ![](/images/versions/plus.png)
-- Receive messages ![](/images/versions/core.png) ![](/images/versions/plus.png)
-- Message replies ![](/images/versions/core.png) ![](/images/versions/plus.png)
-- Send location ![](/images/versions/core.png) ![](/images/versions/plus.png)
-- Send buttons ![](/images/versions/core.png) ![](/images/versions/plus.png)
-- Receive location ![](/images/versions/core.png) ![](/images/versions/plus.png)
-- React to messages ![](/images/versions/core.png) ![](/images/versions/plus.png)
+- Send messages ![](/images/versions/core.png)
+- Receive messages ![](/images/versions/core.png)
+- Message replies ![](/images/versions/core.png)
+- Send location ![](/images/versions/core.png)
+- Send buttons ![](/images/versions/core.png)
+- Receive location ![](/images/versions/core.png)
+- React to messages ![](/images/versions/core.png)
 - Send media (images/documents/files) ![](/images/versions/plus.png)
 - Send voice messages ![](/images/versions/plus.png)
 - Receive media (images/audio/video/documents) ![](/images/versions/plus.png)
 - Receive messages - webhook retries ![](/images/versions/plus.png)
 
 ### Sessions
-- Multi Device ![](/images/versions/core.png) ![](/images/versions/plus.png)
-- Get the screenshot ![](/images/versions/core.png) ![](/images/versions/plus.png)
+- Multi Device ![](/images/versions/core.png)
+- Get the screenshot ![](/images/versions/core.png)
 - Session saving (don't have to scan QR on every restart) ![](/images/versions/plus.png)
 - Session saving on remote storage (database, redis) ![](/images/versions/plus-soon.png)
 - Single WhatsApp account running inside one container ![](/images/versions/core.png)
@@ -54,26 +69,21 @@ Here's the available features:
 
 ### Security
 - API authentication ![](/images/versions/plus.png)
-- Swagger panel authentication ![](/images/versions/plus-soon.png)
+- Swagger panel authentication ![](/images/versions/plus.png)
 
 ### Updates
-- Bug fixes and updates come as soon as they are implemented. ![](/images/versions/plus.png)
-- One month delay in bug fixes and updates. ![](/images/versions/core.png)
+- Bug fixes and updates come as soon as they are implemented. ![](/images/versions/core.png)![](/images/versions/plus.png)
 
-
-### Groups ![](/images/versions/soon.png)
-- Join groups by invite
+### Groups ![](/images/versions/core.png)
+- Create a group
 - Get invite for group
 - Modify group info (subject, description)
-- Modify group settings (send messages, edit info)
 - Add group participants
 - Kick group participants
 - Promote/demote group participants
 
-### Contacts ![](/images/versions/soon.png)
-- Mention users
+### Contacts ![](/images/versions/core.png)
 - Mute/unmute chats
 - Block/unblock contacts
 - Get contact info
 - Get profile pictures
-- Set user status message

docs/site/content/en/docs/overview/quick-start/index.md

@@ -13,7 +13,8 @@ weight: 110
 toc: true
 ---
 
-On this page you're going to install WAHA, run it, authenticate the client using QR code and send the first text message to WhatsApp!
+On this page you're going to install WAHA, run it, authenticate the client using QR code and send the first text message
+to WhatsApp!
 
 ## Requirements
 
@@ -31,7 +32,21 @@ Also Docker makes installation and update processes so simple, just one command!
 
 ## Send your first message
 
-Let's go over steps that allow you to send your first text message via WhatsApp HTTP API!
+We will guide you through the necessary steps to successfully send your first text message using WhatsApp HTTP API.
+
+If you find it easier to follow a video tutorial rather than reading through text, we've got you covered!
+A 3-minute video tutorial is available to help you navigate WhatsApp HTTP API smoothly.
+
+<div class="d-flex justify-content-center my-4">
+  <iframe
+    width="560" height="315"
+    src="https://www.youtube.com/embed/RFerMyAUPRg"
+    title="YouTube video player"
+    frameborder="0"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+    allowfullscreen
+  ></iframe>
+</div>
 
 ### 1. Download image
 
@@ -53,6 +68,28 @@ docker logout
 
 Read more about how to get `PASSWORD` for [Plus Version →]({{< relref "plus-version" >}})
 
+#### 1.1 Download image on ARM
+
+If you're using ARM (like Apple Silicon, Apple M1, etc) - use following commands to download the image
+
+![](/images/versions/core.png) For Core version the command is
+```bash
+# Download the image
+docker pull devlikeapro/whatsapp-http-api:arm
+# Rename it, so you can use devlikeapro/whatsapp-http-api image in other place
+docker tag devlikeapro/whatsapp-http-api:arm devlikeapro/whatsapp-http-api
+```
+
+![](/images/versions/plus.png) For Plus version the command is:
+```bash
+docker login -u devlikeapro -p {PASSWORD}
+docker pull devlikeapro/whatsapp-http-api-plus:arm
+docker logout
+
+# Rename it, so you can use devlikeapro/whatsapp-http-api image in other place
+docker tag devlikeapro/whatsapp-http-api-plus:arm devlikeapro/whatsapp-http-api
+```
+
 ### 2. Run WhatsApp HTTP API
 
 Run WhatsApp HTTP API:
@@ -83,8 +120,8 @@ How to log in - the instruction on WhatsApp site
 
 When your ready - find `POST /api/session/start`, click on **Try it out**, then **Execute** a bit below.
 
-
 The example payload:
+
 ```json
 {
   "name": "default"
@@ -93,7 +130,8 @@ The example payload:
 
 ![](session-start.png)
 
-By using the request with `name` values you can start multiple session (WhatsApp accounts) inside the single docker container in Plus
+By using the request with `name` values you can start multiple session (WhatsApp accounts) inside the single docker
+container in Plus
 ![](/images/versions/plus.png) version and only one account in Core ![](/images/versions/core.png) version.
 
 Read more about [multiple sessions →]({{< relref "/docs/how-to/sessions" >}})
@@ -123,6 +161,7 @@ way: use a phone international phone number without `+` symbol and add `@c.us` a
 For phone number `12132132131` the `chatId` is  `12132132131@c.us`.
 
 The example payload:
+
 ```json
 {
   "chatId": "12132132130@c.us",
@@ -142,6 +181,7 @@ curl -d "{\"chatId\": \"${PHONE}@c.us\", \"text\": \"Hello from WhatsApp HTTP AP
 ```
 
 ## What is next?
+
 - Right now you've sent simple text message, but you can send more! [Send messages →]({{< relref "/docs/how-to/send-messages" >}})
 - Read how to receive and response to messages [Receive messages →]({{< relref "/docs/how-to/receive-messages" >}})
 - Make sure your [API is properly protected ->]({{< relref "/docs/how-to/security" >}})

docs/site/layouts/index.html

@@ -15,6 +15,18 @@
       <p class="meta"><a href="https://github.com/devlikeapro/whatsapp-http-api">Source code in GitHub.</a></p>
     </div>
   </div>
+  <div>
+    <div class="d-flex justify-content-center my-4">
+      <iframe
+        width="560" height="315"
+        src="https://www.youtube.com/embed/RFerMyAUPRg"
+        title="YouTube video player"
+        frameborder="0"
+        allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+        allowfullscreen
+      ></iframe>
+    </div>
+  </div>
 </section>
 {{ end }}
 
@@ -22,6 +34,14 @@
 <section class="section section-sm">
   <div class="container">
     <div class="row justify-content-center text-center">
+      <div class="col-lg-5">
+        <h2 class="h4">It's free!</h2>
+        <p>
+          <b>WAHA Core</b> version is always free!
+          <br>
+          Even <b>WAHA Plus</b> version have no licence expiration!
+        </p>
+      </div>
       <div class="col-lg-5">
         <h2 class="h4">Language agnostic</h2>
         <p>
@@ -36,17 +56,6 @@
         <h2 class="h4">Well documented</h2>
         <p>Documentation has a lof examples and how-to guides.</p>
       </div>
-      <div class="col-lg-5">
-        <h2 class="h4">No blocking</h2>
-        <p>
-          Under the hood it runs a real instance of Whatsapp Web to avoid getting blocked.
-          <br/>
-          <small class="text-muted">
-            WhatsApp does not allow bots or unofficial clients on their platform, so this shouldn't be considered
-            totally safe.
-          </small>
-        </p>
-      </div>
     </div>
     <div class="row justify-content-center text-center">
       <div class="col-lg-5">
@@ -67,11 +76,14 @@
         </p>
       </div>
       <div class="col-lg-5">
-        <h2 class="h4">It's free!</h2>
+        <h2 class="h4">No blocking</h2>
         <p>
-          <b>WAHA Core</b> version is always free!
-          <br>
-          Even <b>WAHA Plus</b>  version does not require monthly donations and have no licence expiration!
+          Under the hood it runs a real instance of Whatsapp Web to avoid getting blocked.
+          <br/>
+          <small class="text-muted">
+            WhatsApp does not allow bots or unofficial clients on their platform, so this shouldn't be considered
+            totally safe.
+          </small>
         </p>
       </div>
     </div>

examples/python/README.md

@@ -1,29 +1,50 @@
 # WAHA (WhatsApp HTTP API) Python examples
 
-## Requirements
+## Installation
 
 We assume that you have installed software:
 
 1. Python 3
 2. Docker
 
+### Download and start image
+
 First of all, you must run WhatsApp HTTP API locally (which under the hood it runs real WhatsApp Web instance and expose
 HTTP API for interaction).
 
 Here are the steps from [Quick Start](https://waha.devlike.pro/docs/overview/quick-start/):
 
-1. Download and start WhatsApp HTTP API docker container
+Download and start WhatsApp HTTP API docker container
 
 ```bash
 # Download the image
 docker pull devlikeapro/whatsapp-http-api
 # Run the docker container
-docker run -it --rm --network=host -e WHATSAPP_HOOK_URL=http://localhost:5000/bot -e WHATSAPP_HOOK_EVENTS=* --name whatsapp-http-api devlikeapro/whatsapp-http-api
+docker run -it --rm --network=host -e WHATSAPP_HOOK_URL=http://localhost:5000/bot -e "WHATSAPP_HOOK_EVENTS=*" --name whatsapp-http-api devlikeapro/whatsapp-http-api
 
 # It prints logs and the last line must be
 # WhatsApp HTTP API is running on: http://[::1]:3000
 ```
 
+#### Download image - ARM
+
+If you're using ARM (like Apple Silicon, Apple M1, etc) - use following commands to download the image
+
+![](/images/versions/core.png) For Core version the command is
+```bash
+# Download the image
+docker pull devlikeapro/whatsapp-http-api:arm
+# Rename it, so you can use devlikeapro/whatsapp-http-api image in other place
+docker tag devlikeapro/whatsapp-http-api:arm devlikeapro/whatsapp-http-api
+# Run the docker container
+docker run -it --rm --network=host -e WHATSAPP_HOOK_URL=http://localhost:5000/bot -e "WHATSAPP_HOOK_EVENTS=*" --name whatsapp-http-api devlikeapro/whatsapp-http-api
+
+# It prints logs and the last line must be
+# WhatsApp HTTP API is running on: http://[::1]:3000
+```
+
+### Start session and scan QR
+
 2. Open Swagger API in the browser http://localhost:3000/
 3. Start session and scan QR code in swagger
     1. Find `POST /api/session/start` request press **Try it out** and **Execute** it with `default` session name
@@ -77,7 +98,7 @@ Download **WAHA Plus** version:
 # Download the image
 docker pull devlikeapro/whatsapp-http-api-plus
 # Run the docker container
-docker run -it --rm --network=host -e WHATSAPP_HOOK_URL=http://localhost:5000/bot -e WHATSAPP_HOOK_EVENTS=* --name whatsapp-http-api devlikeapro/whatsapp-http-api-plus
+docker run -it --rm --network=host -e WHATSAPP_HOOK_URL=http://localhost:5000/bot -e "WHATSAPP_HOOK_EVENTS=*" --name whatsapp-http-api devlikeapro/whatsapp-http-api-plus
 ```
 
 Run the WhatsApp Download Files bot:

examples/python/whatsapp_download_files_bot.py

@@ -25,6 +25,17 @@ def send_message(chat_id, text):
     )
     response.raise_for_status()
 
+def send_seen(chat_id, message_id, participant):
+    response = requests.post(
+        "http://localhost:3000/api/sendSeen",
+        json={
+            "session": "default",
+            "chatId": chat_id,
+            "messageId": message_id,
+            "participant": participant,
+        },
+    )
+    response.raise_for_status()
 
 @app.route("/")
 def whatsapp_echo():
@@ -48,7 +59,13 @@ def whatsapp_webhook():
         return "No files in the message"
 
     # Number in format 791111111@c.us
-    from_ = payload["from"]
+    chat_id = payload["from"]
+    # Message ID - false_11111111111@c.us_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    message_id = payload['id']
+    # For groups - who sent the message
+    participant = payload.get('participant')
+    # IMPORTANT - Always send seen before sending new message
+    send_seen(chat_id=chat_id, message_id=message_id, participant=participant)
 
     # Download the file and download it to the current folder
     client_url = payload["mediaUrl"]
@@ -61,7 +78,7 @@ def whatsapp_webhook():
     # Send a text back via WhatsApp HTTP API
     text = f"We have downloaded file here: {path}"
     print(text)
-    send_message(chat_id=from_, text=text)
+    send_message(chat_id=chat_id, text=text)
 
     # Send OK back
     return "OK"

examples/python/whatsapp_echo_bot.py

@@ -24,6 +24,31 @@ def send_message(chat_id, text):
     )
     response.raise_for_status()
 
+def reply(chat_id, message_id, text):
+    response = requests.post(
+        "http://localhost:3000/api/reply",
+        json={
+            "chatId": chat_id,
+            "text": text,
+            "reply_to": message_id,
+            "session": "default",
+        },
+    )
+    response.raise_for_status()
+
+
+def send_seen(chat_id, message_id, participant):
+    response = requests.post(
+        "http://localhost:3000/api/sendSeen",
+        json={
+            "session": "default",
+            "chatId": chat_id,
+            "messageId": message_id,
+            "participant": participant,
+        },
+    )
+    response.raise_for_status()
+
 
 @app.route("/")
 def whatsapp_echo():
@@ -45,9 +70,19 @@ def whatsapp_webhook():
     payload = data["payload"]
     # The text
     text = payload["body"]
-    # Number in format 1231231231@c.us
-    from_ = payload["from"]
+    # Number in format 1231231231@c.us or @g.us for group
+    chat_id = payload["from"]
+    # Message ID - false_11111111111@c.us_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    message_id = payload['id']
+    # For groups - who sent the message
+    participant = payload.get('participant')
+    # IMPORTANT - Always send seen before sending new message
+    send_seen(chat_id=chat_id, message_id=message_id, participant=participant)
+
     # Send a text back via WhatsApp HTTP API
-    send_message(chat_id=from_, text=text)
+    send_message(chat_id=chat_id, text=text)
+    # OR reply on the message
+    # reply(chat_id=chat_id, message_id=message_id, text=text)
+
     # Send OK back
     return "OK"

package.json

@@ -22,6 +22,8 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
+    "@adiwajshing/baileys": "file:../WhiskeySockets-Baileys",
+    "@adiwajshing/keyed-db": "^0.2.4",
     "@nestjs/common": "^9.0.9",
     "@nestjs/config": "^0.5.0",
     "@nestjs/core": "^9.0.9",
@@ -29,12 +31,16 @@
     "@nestjs/platform-express": "^9.0.9",
     "@nestjs/serve-static": "^2.1.3",
     "@nestjs/swagger": "^6.0.5",
+    "@types/ws": "^8.5.4",
     "class-validator": "^0.12.2",
     "del": "^6.0.0",
     "express-basic-auth": "^1.2.1",
+    "file-type": "16.5.4",
+    "link-preview-js": "^3.0.4",
     "mime-types": "^2.1.27",
     "passport": "^0.6.0",
     "passport-headerapikey": "^1.2.2",
+    "qrcode": "^1.5.1",
     "qrcode-terminal": "^0.12.0",
     "reflect-metadata": "^0.1.13",
     "request": "^2.88.2",
@@ -43,7 +49,7 @@
     "rxjs": "^7.1.0",
     "swagger-ui-express": "^4.1.4",
     "venom-bot": "^4.3.7",
-    "whatsapp-web.js": "pedroslopez/whatsapp-web.js"
+    "whatsapp-web.js": "https://github.com/pedroslopez/whatsapp-web.js"
   },
   "devDependencies": {
     "@nestjs/cli": "^9.0.0",

src/api/chatting.controller.ts

@@ -2,7 +2,7 @@ import {Body, Controller, Get, Post, Put, Query} from '@nestjs/common';
 import {ApiOperation, ApiSecurity, ApiTags} from "@nestjs/swagger";
 import {
     ChatRequest,
-    CheckNumberStatusQuery,
+    CheckNumberStatusQuery, GetMessageQuery,
     MessageContactVcardRequest,
     MessageFileRequest,
     MessageImageRequest,
@@ -13,7 +13,7 @@ import {
     MessageTextButtonsRequest,
     MessageTextQuery,
     MessageTextRequest,
-    MessageVoiceRequest
+    MessageVoiceRequest, SendSeenRequest
 } from "../structures/chatting.dto";
 import {WAMessage, WANumberExistResult} from "../structures/responses.dto";
 import {SessionManager} from "../core/abc/manager.abc";
@@ -105,7 +105,7 @@ export class ChattingController {
     }
 
     @Post('/sendSeen')
-    sendSeen(@Body() chat: ChatRequest) {
+    sendSeen(@Body() chat: SendSeenRequest) {
         const whatsapp = this.manager.getSession(chat.session)
         return whatsapp.sendSeen(chat)
     }
@@ -131,4 +131,11 @@ export class ChattingController {
         const whatsapp = this.manager.getSession(request.session)
         return whatsapp.setReaction(request)
     }
+
+    @Get('/messages')
+    @ApiOperation({summary: 'Get messages in a chat'})
+    getMessages( @Query() query: GetMessageQuery ) {
+        const whatsapp = this.manager.getSession(query.session)
+        return whatsapp.getMessages(query)
+    }
 }

src/core/QR.ts

@@ -0,0 +1,11 @@
+export class QR {
+    private base64: string;
+
+    save(base64) {
+        this.base64 = base64.replace(/^data:image\/png;base64,/, '');
+    }
+
+    get(): Buffer {
+        return Buffer.from(this.base64, "base64")
+    }
+}

src/core/abc/session.abc.ts

@@ -2,7 +2,7 @@ import {WAEvents, WhatsappStatus} from "../../structures/enums.dto";
 import {ConsoleLogger} from "@nestjs/common";
 import {
     ChatRequest,
-    CheckNumberStatusQuery,
+    CheckNumberStatusQuery, GetMessageQuery,
     MessageContactVcardRequest,
     MessageFileRequest,
     MessageImageRequest,
@@ -23,6 +23,8 @@ import * as fs from "fs";
 
 const CHROME_PATH = "/usr/bin/google-chrome-stable"
 const CHROMIUM_PATH = "/usr/bin/chromium"
+import { EventEmitter } from 'events'
+
 
 export function getBrowserExecutablePath() {
     if (fs.existsSync(CHROME_PATH)) {
@@ -30,14 +32,27 @@ export function getBrowserExecutablePath() {
     }
     return CHROMIUM_PATH
 }
+export function ensureSuffix(phone) {
+    const suffix = "@c.us"
+    if (phone.includes("@")) {
+        return phone
+    }
+    return phone + suffix
+}
+
+export enum WAHAInternalEvent {
+    engine_start = "engine.start",
+}
 
 export abstract class WhatsappSession {
     public status: WhatsappStatus;
+    public events: EventEmitter
 
     public constructor(public name: string, protected storage: MediaStorage, protected log: ConsoleLogger) {
         this.name = name
         this.status = WhatsappStatus.STARTING
         this.log = log
+        this.events = new EventEmitter()
     }
 
     getBrowserExecutablePath() {
@@ -115,8 +130,11 @@ export abstract class WhatsappSession {
 
     abstract stopTyping(chat: ChatRequest)
 
+    abstract getMessages(query: GetMessageQuery)
+
     abstract setReaction(request: MessageReactionRequest)
 
+
     /**
      * Contacts methods
      */
@@ -213,11 +231,7 @@ export abstract class WhatsappSession {
      * @param phone
      */
     protected ensureSuffix(phone) {
-        const suffix = "@c.us"
-        if (phone.includes("@")) {
-            return phone
-        }
-        return phone + suffix
+        return ensureSuffix(phone)
     }
 
     protected deserializeId(messageId: string): MessageId {

src/core/manager.core.ts

@@ -1,6 +1,6 @@
 import {ConsoleLogger, Injectable, NotFoundException, UnprocessableEntityException} from "@nestjs/common";
 import {SessionManager} from "./abc/manager.abc";
-import {WhatsappSession} from "./abc/session.abc";
+import {WAHAInternalEvent, WhatsappSession} from "./abc/session.abc";
 import {WhatsappEngine} from "../structures/enums.dto";
 import {SessionDTO, SessionStartRequest, SessionStopRequest} from "../structures/sessions.dto";
 import {WhatsappConfigService} from "../config.service";
@@ -9,6 +9,7 @@ import {WhatsappSessionWebJSCore} from "./session.webjs.core";
 import {DOCS_URL} from "./exceptions";
 import {WebhookConductorCore} from "./webhooks.core";
 import {MediaStorageCore} from "./storage.core";
+import {WhatsappSessionNoWebCore} from "./session.noweb.core";
 
 export class OnlyDefaultSessionIsAllowed extends UnprocessableEntityException {
     constructor() {
@@ -49,6 +50,8 @@ export class SessionManagerCore extends SessionManager {
             return WhatsappSessionWebJSCore
         } else if (engine === WhatsappEngine.VENOM) {
             return WhatsappSessionVenomCore
+        } else if (engine === WhatsappEngine.NOWEB) {
+            return WhatsappSessionNoWebCore
         } else {
             throw new NotFoundException(`Unknown whatsapp engine '${engine}'.`)
         }
@@ -100,7 +103,8 @@ export class SessionManagerCore extends SessionManager {
         const session = new this.EngineClass(name, storage, log)
         this.session = session
 
-        session.start().then(() => webhook.configure(session))
+        session.events.on(WAHAInternalEvent.engine_start, () => webhook.configure(session))
+        session.start()
         return {name: session.name, status: session.status}
     }
 

src/core/session.noweb.core.ts

@@ -0,0 +1,474 @@
+import {SECOND, WAEvents, WhatsappStatus} from "../structures/enums.dto";
+import makeWASocket, {DisconnectReason, makeInMemoryStore, isJidGroup, useMultiFileAuthState} from '@adiwajshing/baileys'
+
+import {ensureSuffix, WAHAInternalEvent, WhatsappSession} from "./abc/session.abc";
+import {WAMessage, WANumberExistResult} from "../structures/responses.dto";
+import {
+    Button,
+    ChatRequest,
+    CheckNumberStatusQuery,
+    GetMessageQuery,
+    MessageContactVcardRequest,
+    MessageFileRequest,
+    MessageImageRequest,
+    MessageLinkPreviewRequest,
+    MessageLocationRequest,
+    MessageReactionRequest,
+    MessageReplyRequest,
+    MessageTextButtonsRequest,
+    MessageTextRequest,
+    MessageVoiceRequest,
+    SendSeenRequest
+} from "../structures/chatting.dto";
+import {AvailableInPlusVersion, NotImplementedByEngineError} from "./exceptions";
+import {ContactQuery, ContactRequest} from "../structures/contacts.dto";
+import {CreateGroupRequest, ParticipantsRequest} from "../structures/groups.dto";
+import {QR} from "./QR";
+import {MediaStorage} from "./abc/storage.abc";
+import {ConsoleLogger, UnprocessableEntityException} from "@nestjs/common";
+import {Message} from "whatsapp-web.js";
+import * as fs from "fs";
+import * as path from "path";
+import * as os from "os";
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const QRCode = require('qrcode')
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const logger = require('pino')()
+
+
+export const BaileysEvents = {
+    CONNECTION_UPDATE: "connection.update",
+    CREDS_UPDATE: "creds.update",
+    MESSAGES_UPSERT: "messages.upsert",
+    GROUPS_UPSERT: 'groups.upsert',
+}
+
+export class WhatsappSessionNoWebCore extends WhatsappSession {
+    sock: any
+    store: any
+    private qr: QR
+    authFolder: string
+
+    public constructor(public name: string, protected storage: MediaStorage, protected log: ConsoleLogger) {
+        super(name, storage, log);
+        this.qr = new QR()
+        this.authFolder = this.getAuthFolder()
+    }
+
+    start() {
+        return this.buildClient()
+    }
+
+    protected getAuthFolder() {
+        return  fs.mkdtempSync(path.join(os.tmpdir(), 'noweb-'))
+    }
+
+    async makeSocket() {
+        const {state, saveCreds} = await useMultiFileAuthState(this.authFolder)
+        const sock: any = makeWASocket({
+            auth: state,
+            printQRInTerminal: true,
+            browser: ['Linux', 'Chrome', '111.0.5563.64'],
+            logger: logger,
+        })
+        sock.ev.on(BaileysEvents.CREDS_UPDATE, saveCreds)
+        return sock
+    }
+    connectStore(){
+        if (!this.store){
+            this.store = makeInMemoryStore({ })
+        }
+        this.store.bind(this.sock.ev)
+    }
+
+    async buildClient() {
+        this.sock = await this.makeSocket()
+        this.connectStore()
+        this.sock.ev.on(BaileysEvents.CONNECTION_UPDATE, async (update) => {
+            const {connection, lastDisconnect, qr} = update
+            if (connection === 'connecting') {
+                this.qr.save("")
+                this.status = WhatsappStatus.WORKING
+                return
+            } else if (connection === 'close') {
+                const shouldReconnect = (lastDisconnect.error)?.output?.statusCode !== DisconnectReason.loggedOut
+                this.log.error('connection closed due to ', lastDisconnect.error, ', reconnecting ', shouldReconnect)
+                this.qr.save("")
+                this.status = WhatsappStatus.FAILED
+                // reconnect if not logged out
+                if (shouldReconnect) {
+                    setTimeout(() => this.buildClient(), 2 * SECOND)
+                }
+            }
+
+            // Save QR
+            if (qr) {
+                this.status = WhatsappStatus.SCAN_QR_CODE
+                QRCode.toDataURL(qr).then((url) => {
+                    this.qr.save(url)
+                })
+            }
+        })
+        this.events.emit(WAHAInternalEvent.engine_start)
+    }
+
+    stop() {
+        this.sock.ws.removeAllListeners()
+        this.log.log('socket connection terminated')
+        return
+    }
+
+    /**
+     * START - Methods for API
+     */
+    async getScreenshot(): Promise<Buffer | string> {
+        if (this.status === WhatsappStatus.STARTING) {
+            throw new UnprocessableEntityException(`The session is starting, please try again after few seconds`);
+        } else if (this.status === WhatsappStatus.SCAN_QR_CODE) {
+            return Promise.resolve(this.qr.get())
+        } else if (this.status === WhatsappStatus.WORKING) {
+            throw new UnprocessableEntityException(`Can not get screenshot for non chrome based engine.`);
+        } else {
+            throw new UnprocessableEntityException(`Unknown status - ${this.status}`);
+        }
+    }
+
+    async checkNumberStatus(request: CheckNumberStatusQuery): Promise<WANumberExistResult> {
+        const phone = request.phone.split("@")[0]
+        const [result] = await this.sock.onWhatsApp(phone)
+        if (!result) {
+            return {numberExists: false}
+        }
+        return {numberExists: result.exists}
+    }
+
+    sendText(request: MessageTextRequest) {
+        const chatId = this.ensureSuffix(request.chatId)
+        return this.sock.sendMessage(chatId, {text: request.text})
+    }
+
+    sendTextButtons(request: MessageTextButtonsRequest) {
+        const buttons = request.buttons.map((button: Button) => {
+            return {
+                buttonId: button.id, buttonText: {displayText: button.text}, type: 1
+            }
+        })
+
+        const buttonMessage = {
+            text: request.title,
+            buttons: buttons,
+            headerType: 1
+        }
+
+        return this.sock.sendMessage(request.chatId, buttonMessage)
+    }
+
+    sendContactVCard(request: MessageContactVcardRequest) {
+        throw new NotImplementedByEngineError()
+    }
+
+    async reply(request: MessageReplyRequest) {
+        const {id} = parseMessageId(request.reply_to)
+        const message = await this.store.loadMessage(toJID(request.chatId), id)
+        return await this.sock.sendMessage(request.chatId, {text: request.text}, {quoted: message})
+    }
+
+    sendImage(request: MessageImageRequest) {
+        throw new AvailableInPlusVersion()
+    }
+
+    sendFile(request: MessageFileRequest) {
+        throw new AvailableInPlusVersion()
+    }
+
+    sendVoice(request: MessageVoiceRequest) {
+        throw new AvailableInPlusVersion()
+    }
+
+    sendLocation(request: MessageLocationRequest) {
+        return this.sock.sendMessage(
+            request.chatId,
+            {location: {degreesLatitude: request.latitude, degreesLongitude: request.longitude}}
+        )
+    }
+
+    sendLinkPreview(request: MessageLinkPreviewRequest) {
+        const text = `${request.title}\n${request.url}`
+        const chatId = this.ensureSuffix(request.chatId)
+        return this.sock.sendMessage(chatId, {text: text})
+    }
+
+
+    async sendSeen(request: SendSeenRequest) {
+        const key = parseMessageId(request.messageId)
+        const data = {
+            remoteJid: key.remoteJid,
+            id: key.id,
+            participant: request.participant
+        }
+        return this.sock.readMessages([data])
+    }
+
+    async startTyping(request: ChatRequest) {
+        return this.sock.sendPresenceUpdate('composing', request.chatId)
+    }
+
+    async stopTyping(request: ChatRequest) {
+        return this.sock.sendPresenceUpdate("paused", request.chatId)
+    }
+
+    async getMessages(query: GetMessageQuery) {
+        throw new NotImplementedByEngineError()
+    }
+
+    async setReaction(request: MessageReactionRequest) {
+        const key = parseMessageId(request.messageId)
+        const reactionMessage = {
+            react: {
+                text: request.reaction,
+                key: key,
+            }
+        }
+        return this.sock.sendMessage(key.remoteJid, reactionMessage)
+    }
+
+
+    /**
+     * Contacts methods
+     */
+    getContact(query: ContactQuery) {
+        throw new NotImplementedByEngineError()
+    }
+
+    getContacts() {
+        throw new NotImplementedByEngineError()
+    }
+
+    public async getContactAbout(query: ContactQuery) {
+        throw new NotImplementedByEngineError()
+    }
+
+    public async getContactProfilePicture(query: ContactQuery) {
+        throw new NotImplementedByEngineError()
+    }
+
+    public async blockContact(request: ContactRequest) {
+        throw new NotImplementedByEngineError()
+    }
+
+    public async unblockContact(request: ContactRequest) {
+        throw new NotImplementedByEngineError()
+    }
+
+    /**
+     * Group methods
+     */
+    public createGroup(request: CreateGroupRequest) {
+        const participants = request.participants.map(getId)
+        return this.sock.groupCreate(request.name, participants)
+    }
+
+    public async getGroups() {
+        return await this.sock.groupFetchAllParticipating()
+    }
+
+    public async getGroup(id) {
+        const groups = await this.sock.groupFetchAllParticipating()
+        return groups[id]
+    }
+
+    public async deleteGroup(id) {
+        throw new NotImplementedByEngineError()
+    }
+
+    public async leaveGroup(id) {
+        return this.sock.groupLeave(id)
+    }
+
+    public async setDescription(id, description) {
+        return this.sock.groupUpdateDescription(id, description)
+    }
+
+    public async setSubject(id, subject) {
+        return this.sock.groupUpdateSubject(id, subject)
+    }
+
+    public async getInviteCode(id): Promise<string> {
+        return this.sock.groupInviteCode(id)
+    }
+
+    public async revokeInviteCode(id): Promise<string> {
+        await this.sock.groupRevokeInvite(id)
+        return this.sock.groupInviteCode(id)
+    }
+
+    public async getParticipants(id) {
+        const groups = await this.sock.groupFetchAllParticipating()
+        return groups[id].participants
+    }
+
+    public async addParticipants(id, request: ParticipantsRequest) {
+        const participants = request.participants.map(getId)
+        return this.sock.groupParticipantsUpdate(id, participants, "add")
+    }
+
+    public async removeParticipants(id, request: ParticipantsRequest) {
+        const participants = request.participants.map(getId)
+        return this.sock.groupParticipantsUpdate(id, participants, "remove")
+    }
+
+    public async promoteParticipantsToAdmin(id, request: ParticipantsRequest) {
+        const participants = request.participants.map(getId)
+        return this.sock.groupParticipantsUpdate(id, participants, "promote")
+    }
+
+    public async demoteParticipantsToUser(id, request: ParticipantsRequest) {
+        const participants = request.participants.map(getId)
+        return this.sock.groupParticipantsUpdate(id, participants, "demote")
+    }
+
+    /**
+     * END - Methods for API
+     */
+
+    subscribe(event, handler) {
+        if (event === WAEvents.MESSAGE) {
+            return this.sock.ev.on(BaileysEvents.MESSAGES_UPSERT,
+                ({messages}) => this.handleIncomingMessages(messages, handler, false)
+            )
+        } else if (event === WAEvents.MESSAGE_ANY) {
+            return this.sock.ev.on(BaileysEvents.MESSAGES_UPSERT,
+                ({messages}) => this.handleIncomingMessages(messages, handler, true)
+            )
+        } else if (event === WAEvents.STATE_CHANGE) {
+            return this.sock.ev.on(BaileysEvents.CONNECTION_UPDATE, handler)
+        } else if (event === WAEvents.GROUP_JOIN) {
+            return this.sock.ev.on(BaileysEvents.GROUPS_UPSERT, handler)
+        } else {
+            throw new NotImplementedByEngineError(`Engine does not support webhook event: ${event}`)
+        }
+    }
+
+    private handleIncomingMessages(messages, handler, includeFromMe) {
+        for (const message of messages) {
+            // if there is no text or media message
+            if (!message) return;
+            if (!message.message) return
+            // Do not include my messages
+            if (!includeFromMe && message.key.fromMe) {
+                continue
+            }
+            this.processIncomingMessage(message).then(handler)
+        }
+    }
+
+    private processIncomingMessage(message) {
+        return this.downloadMedia(message).then(this.toWAMessage)
+    }
+
+    protected toWAMessage(message): Promise<WAMessage> {
+        const isGroupMessage = Boolean(message.key.participant)
+        let participant: string
+        let to: string
+        if (isGroupMessage) {
+            participant = message.key.participant
+            to = message.key.remoteJid
+        }
+        const from = message.key.remoteJid
+        const id = buildMessageId(message.key)
+        let body = message.message.conversation
+        if (!body){
+            // Some of the messages have no conversation, but instead have text in extendedTextMessage
+            // https://github.com/devlikeapro/whatsapp-http-api/issues/90
+            body = message.message.extendedTextMessage?.text
+        }
+        return Promise.resolve({
+            id: id,
+            timestamp: message.messageTimestamp,
+            from: toCusFormat(from),
+            fromMe: message.key.fromMe,
+            body: body,
+            to: toCusFormat(to),
+            participant: toCusFormat(participant),
+            // @ts-ignore
+            hasMedia: Boolean(message.mediaUrl),
+            // @ts-ignore
+            mediaUrl: message.mediaUrl,
+            // @ts-ignore
+            ack: message.ack,
+            location: message.location,
+            vCards: message.vCards,
+            _data: message,
+        })
+    }
+
+    protected async downloadMedia(message: Message) {
+        if (!message.hasMedia) {
+            return message
+        }
+
+        // @ts-ignore
+        message.mediaUrl = await this.storage.save(message.key.id, "", undefined)
+        return message
+    }
+
+}
+
+/**
+ * Convert from 11111111111@s.whatsapp.net to 11111111111@c.us
+ */
+function toCusFormat(remoteJid) {
+    if (isJidGroup(remoteJid)) {
+        return remoteJid
+    }
+    if (!remoteJid) {
+        return
+    }
+    const number = remoteJid.split("@")[0]
+    return ensureSuffix(number)
+}
+
+/**
+ * Convert from 11111111111@c.us to 11111111111@s.whatsapp.net
+ * @param chatId
+ */
+function toJID(chatId) {
+    if (isJidGroup(chatId)) {
+        return chatId
+    }
+    const number = chatId.split("@")[0]
+    return number + "@s.whatsapp.net"
+}
+
+/**
+ * Build WAHA message id from engine one
+ * {id: "AAA", remoteJid: "11111111111@s.whatsapp.net", "fromMe": false}
+ * false_11111111111@c.us_AA
+ */
+function buildMessageId({id, remoteJid, fromMe}) {
+    const chatId = toCusFormat(remoteJid)
+    return `${fromMe || false}_${chatId}_${id}`
+}
+
+/**
+ * Parse message id from WAHA to engine
+ * false_11111111111@c.us_AAA
+ * {id: "AAA", remoteJid: "11111111111@s.whatsapp.net", "fromMe": false}
+ */
+function parseMessageId(messageId) {
+    const parts = messageId.split("_")
+    if (parts.length != 3) {
+        throw new Error("Message id be in format false_11111111111@c.us_AAAAAAAAAAAAAAAAAAAA")
+    }
+    const fromMe = parts[0] == "true"
+    const chatId = parts[1]
+    const remoteJid = toJID(chatId)
+    const id = parts[2]
+    return {fromMe: fromMe, id: id, remoteJid: remoteJid}
+}
+
+
+function getId(object) {
+    return object.id
+}

src/core/session.venom.core.ts

@@ -1,8 +1,9 @@
-import {WhatsappSession} from "./abc/session.abc";
+import {WAHAInternalEvent, WhatsappSession} from "./abc/session.abc";
 import {
     Button,
     ChatRequest,
     CheckNumberStatusQuery,
+    GetMessageQuery,
     MessageContactVcardRequest,
     MessageFileRequest,
     MessageImageRequest,
@@ -20,20 +21,7 @@ import {NotImplementedByEngineError} from "./exceptions";
 import {MediaStorage} from "./abc/storage.abc";
 import {UnprocessableEntityException} from "@nestjs/common/exceptions/unprocessable-entity.exception";
 import {ConsoleLogger} from "@nestjs/common";
-import {ContactQuery} from "../structures/contacts.dto";
-
-class QR {
-    private base64: string;
-
-    save(base64) {
-        this.base64 = base64.replace(/^data:image\/png;base64,/, '');
-    }
-
-    get(): Buffer {
-        return Buffer.from(this.base64, "base64")
-    }
-
-}
+import {QR} from "./QR";
 
 export class WhatsappSessionVenomCore extends WhatsappSession {
     whatsapp: Whatsapp;
@@ -84,6 +72,7 @@ export class WhatsappSessionVenomCore extends WhatsappSession {
         }
 
         this.status = WhatsappStatus.WORKING
+        this.events.emit(WAHAInternalEvent.engine_start)
         return this
     }
 
@@ -126,10 +115,10 @@ export class WhatsappSessionVenomCore extends WhatsappSession {
 
     async checkNumberStatus(request: CheckNumberStatusQuery): Promise<WANumberExistResult> {
         try {
-            return  await this.whatsapp.checkNumberStatus(this.ensureSuffix(request.phone))
+            return await this.whatsapp.checkNumberStatus(this.ensureSuffix(request.phone))
         } catch (error) {
             // Catch number doesn't exist error and return it as is
-            if (error.status === 404 && !error.numberExists){
+            if (error.status === 404 && !error.numberExists) {
                 return error
             }
             throw error
@@ -177,11 +166,11 @@ export class WhatsappSessionVenomCore extends WhatsappSession {
             return {
                 buttonId: button.id,
                 buttonText: {
-                    displayText: button.body
+                    displayText: button.text
                 }
             }
         })
-        return this.whatsapp.sendButtons(this.ensureSuffix(request.chatId), request.title, buttons, request.text)
+        return this.whatsapp.sendButtons(this.ensureSuffix(request.chatId), request.title, buttons, request.footer)
     }
 
     startTyping(chat: ChatRequest) {
@@ -192,6 +181,20 @@ export class WhatsappSessionVenomCore extends WhatsappSession {
         return this.whatsapp.stopTyping(chat.chatId)
     }
 
+    async getMessages(query: GetMessageQuery) {
+        const messages = await this.whatsapp.getAllMessagesInChat(query.chatId, true, false)
+        // Go over messages, download media, and convert to right format.
+        const result = []
+        for (const [count, message] of messages.entries()) {
+            if (count > query.limit) {
+                // Have enough in the list, stop processing
+                break
+            }
+            result.push(await this.processIncomingMessage(message))
+        }
+        return result
+    }
+
     setReaction(request: MessageReactionRequest) {
         throw new NotImplementedByEngineError()
     }

src/core/session.webjs.core.ts

@@ -2,11 +2,13 @@ import {UnprocessableEntityException} from "@nestjs/common/exceptions/unprocessa
 import {Buttons, Chat, Client, Contact, Events, GroupChat, Location, Message} from "whatsapp-web.js";
 import {Message as MessageInstance} from "whatsapp-web.js/src/structures"
 import {WAEvents, WhatsappStatus} from "../structures/enums.dto";
-import {WhatsappSession} from "./abc/session.abc";
+import {WAHAInternalEvent, WhatsappSession} from "./abc/session.abc";
 import {WAMessage, WANumberExistResult} from "../structures/responses.dto";
 import {
+    Button,
     ChatRequest,
     CheckNumberStatusQuery,
+    GetMessageQuery,
     MessageContactVcardRequest,
     MessageFileRequest,
     MessageImageRequest,
@@ -16,7 +18,7 @@ import {
     MessageReplyRequest,
     MessageTextButtonsRequest,
     MessageTextRequest,
-    MessageVoiceRequest
+    MessageVoiceRequest, SendSeenRequest
 } from "../structures/chatting.dto";
 import {AvailableInPlusVersion, NotImplementedByEngineError} from "./exceptions";
 import {ContactQuery, ContactRequest} from "../structures/contacts.dto";
@@ -58,11 +60,12 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
             this.status = WhatsappStatus.WORKING
             this.log.log(`Session '${this.name}' has been authenticated!`)
         });
+        this.events.emit(WAHAInternalEvent.engine_start)
         return this
     }
 
     stop() {
-        return this.whatsapp.pupPage.close()
+        return this.whatsapp.destroy()
     }
 
     /**
@@ -85,7 +88,13 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     }
 
     sendTextButtons(request: MessageTextButtonsRequest) {
-        const message = new Buttons("", request.buttons, request.title, request.text)
+        const buttons = request.buttons.map((button: Button) => {
+            return {
+                id: button.id,
+                body: button.text,
+            }
+        })
+        const message = new Buttons("", buttons, request.title, request.footer)
         return this.whatsapp.sendMessage(this.ensureSuffix(request.chatId), message)
     }
 
@@ -126,7 +135,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     }
 
 
-    async sendSeen(request: ChatRequest) {
+    async sendSeen(request: SendSeenRequest) {
         const chat: Chat = await this.whatsapp.getChatById(request.chatId)
         await chat.sendSeen()
     }
@@ -141,10 +150,21 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
         await chat.clearState()
     }
 
+    async getMessages(query: GetMessageQuery) {
+        const chat: Chat = await this.whatsapp.getChatById(this.ensureSuffix(query.chatId))
+        const messages = await chat.fetchMessages({
+            limit: query.limit,
+        })
+        // Go over messages, download media, and convert to right format.
+        const result = []
+        for (const message of messages) {
+            result.push(await this.processIncomingMessage(message))
+        }
+        return result
+    }
+
     async setReaction(request: MessageReactionRequest) {
         const messageId = this.deserializeId(request.messageId)
-        console.log(messageId)
-
         // Recreate instance to react on it
         const message = new MessageInstance(this.whatsapp)
         message.id = messageId

src/core/webhooks.core.ts

@@ -1,4 +1,4 @@
-import {WhatsappSession} from "./abc/session.abc";
+import {WAHAInternalEvent, WhatsappSession} from "./abc/session.abc";
 import {ConsoleLogger} from "@nestjs/common";
 import {WAEvents} from "../structures/enums.dto";
 import {WAWebhook} from "../structures/responses.dto";
@@ -40,7 +40,7 @@ export class WebhookConductorCore implements WebhookConductor {
         this.log.log('Configuring webhooks...')
         for (const event of this.events) {
             try {
-                session.subscribe(event, (data: any) => this.callWebhook(event, data, this.url))
+                session.subscribe(event, (data: any) => this.callWebhook(event, session, data, this.url))
             } catch (error) {
                 if (error instanceof NotImplementedByEngineError) {
                     this.log.error(error)
@@ -53,8 +53,8 @@ export class WebhookConductorCore implements WebhookConductor {
         this.log.log('Webhooks were configured.')
     }
 
-    public callWebhook(event, data: any, url) {
-        const json: WAWebhook = {event: event, payload: data}
+    public callWebhook(event, session: WhatsappSession, data: any, url) {
+        const json: WAWebhook = {event: event, session: session.name, payload: data}
         this.log.log(`Sending POST to ${url}...`)
         this.log.debug(`POST DATA: ${JSON.stringify(json)}`)
         this.post(json, url)

src/main.ts

@@ -4,6 +4,7 @@ import {AllExceptionsFilter} from "./api/exception.filter";
 import {getWAHAVersion, VERSION, WAHAVersion} from "./version";
 import {AppModuleCore} from "./core/app.module.core";
 import {SwaggerModuleCore} from "./core/swagger.module.core";
+import {json, urlencoded} from "express";
 
 async function loadModules(): Promise<[typeof AppModuleCore, typeof SwaggerModuleCore]> {
     const version = getWAHAVersion()
@@ -32,6 +33,10 @@ async function bootstrap() {
     app.enableShutdownHooks();
     app.useGlobalFilters(new AllExceptionsFilter());
 
+    // Allow to send big body - for images and attachments
+    app.use(json({limit: '50mb'}));
+    app.use(urlencoded({limit: '50mb'}));
+
     // Configure swagger
     const swagger = new SwaggerModule()
     swagger.configure(app)

src/structures/chatting.dto.ts

@@ -1,4 +1,4 @@
-import {IsNotEmpty, IsString} from "class-validator";
+import {IsNotEmpty, IsString, IsOptional, IsNumber} from "class-validator";
 import {ApiExtraModels, ApiProperty, getSchemaPath} from "@nestjs/swagger";
 import {SessionBaseRequest, SessionQuery} from "./base.dto";
 
@@ -18,6 +18,18 @@ export class MessageTextQuery extends SessionQuery {
     text: string
 }
 
+export class ChatQuery extends SessionQuery {
+    @ApiProperty({
+        example: '11111111111@c.us',
+    })
+    chatId: string
+}
+
+export class GetMessageQuery extends ChatQuery {
+    @IsNumber()
+    limit: number
+}
+
 
 /**
  * Requests
@@ -29,7 +41,23 @@ export class ChatRequest extends SessionBaseRequest {
     chatId: string
 }
 
-export class MessageRequest extends SessionBaseRequest{
+export class SendSeenRequest extends ChatRequest {
+    @ApiProperty({
+        example: 'false_11111111111@c.us_AAAAAAAAAAAAAAAAAAAA',
+        required: false,
+        description: "NOWEB engine only - it's important to mark ALL messages as seen"
+    })
+    messageId?: string
+
+    @ApiProperty({
+        example: '11111111111@c.us',
+        required: false,
+        description: "NOWEB engine only - the ID of the user that sent the  message (undefined for individual chats)"
+    })
+    participant?: string
+}
+
+export class MessageRequest extends SessionBaseRequest {
     @ApiProperty({
         example: "false_11111111111@c.us_AAAAAAAAAAAAAAAAAAAA",
     })
@@ -47,12 +75,12 @@ export class MessageTextRequest extends ChatRequest {
 
 export class Button {
     id: string
-    body: string
+    text: string
 }
 
 export class MessageTextButtonsRequest extends ChatRequest {
     title: string;
-    text: string;
+    footer?: string
     buttons?: Array<Button>;
 }
 
@@ -186,3 +214,4 @@ export class MessageReactionRequest extends MessageRequest {
     })
     reaction: string
 }
+

src/structures/enums.dto.ts

@@ -18,5 +18,6 @@ export enum WhatsappStatus {
 
 export enum WhatsappEngine {
     VENOM = "VENOM",
-    WEBJS = "WEBJS"
+    WEBJS = "WEBJS",
+    NOWEB = "NOWEB",
 }

src/structures/responses.dto.ts

@@ -88,6 +88,11 @@ export class WAMessage {
     })
     to: string
 
+    @ApiProperty({
+        description: "For groups - participant who sent the message"
+    })
+    participant: string
+
     @ApiProperty({
         description: "Message content"
     })
@@ -133,6 +138,7 @@ export class WAMessage {
 
 export class WAWebhook {
     event: WAEvents
+    session: string
     // eslint-disable-next-line @typescript-eslint/ban-types
     payload: WAMessage | WAGroupNotification | object
 }

src/version.ts

@@ -28,7 +28,7 @@ export function getWAHAVersion(): WAHAVersion {
 }
 
 export const VERSION = {
-    version: "2023.3.1",
+    version: "2023.5.3",
     tier: getWAHAVersion(),
     browser: getBrowserExecutablePath()
 }