[core] WEBJS Remove in-process-gpu

fix #725

.github/workflows/build.yaml

@@ -8,7 +8,9 @@ on:
 jobs:
   docker-build:
     runs-on: ${{ matrix.runner }}
-    name: ${{ matrix.platform }} - ${{ matrix.browser }} - ${{ matrix.tag }}
+    name:
+      ${{ matrix.engine }} - ${{ matrix.browser }} - ${{ matrix.platform }} -
+      ${{ matrix.tag }}
     strategy:
       matrix:
         include:
@@ -17,6 +19,7 @@ jobs:
             tag: 'latest'
             platform: 'amd64'
             browser: 'chromium'
+            engine: 'WEBJS'
             goss: 'goss-linux-amd64'
 
           # Chromium - ARM
@@ -24,6 +27,7 @@ jobs:
             tag: 'arm'
             platform: 'linux/arm64'
             browser: 'chromium'
+            engine: 'WEBJS'
             goss: 'goss-linux-arm'
 
           # Chrome - x86
@@ -31,6 +35,7 @@ jobs:
             tag: 'chrome'
             platform: 'amd64'
             browser: 'chrome'
+            engine: 'WEBJS'
             goss: 'goss-linux-amd64'
 
           # Chrome - ARM (Chrome is not available for ARM)
@@ -45,6 +50,7 @@ jobs:
             tag: 'noweb'
             platform: 'amd64'
             browser: 'none'
+            engine: 'NOWEB'
             goss: 'goss-linux-amd64'
 
           # No browser - ARM
@@ -52,6 +58,7 @@ jobs:
             tag: 'noweb-arm'
             platform: 'linux/arm64'
             browser: 'none'
+            engine: 'NOWEB'
             goss: 'goss-linux-arm'
 
     steps:
@@ -85,6 +92,7 @@ jobs:
           platforms: ${{ matrix.platform }}
           build-args: |
             USE_BROWSER=${{ matrix.browser }}
+            WHATSAPP_DEFAULT_ENGINE=${{ matrix.engine }}
           push: false
           load: true
           tags: ${{ steps.meta.outputs.tags }}
@@ -116,6 +124,7 @@ jobs:
           platforms: ${{ matrix.platform }}
           build-args: |
             USE_BROWSER=${{ matrix.browser }}
+            WHATSAPP_DEFAULT_ENGINE=${{ matrix.engine }}
           push: ${{ github.ref_type == 'tag' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

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 e6a72c5de2effc97d83e997cb1f361851604bae8
+ENV WAHA_DASHBOARD_SHA fed4e50e88e4d26c610e3289fd0d8657cb866543
 RUN \
     wget https://github.com/devlikeapro/dashboard/archive/${WAHA_DASHBOARD_SHA}.zip \
     && unzip ${WAHA_DASHBOARD_SHA}.zip -d /tmp/dashboard \
@@ -44,6 +44,7 @@ ENV PUPPETEER_SKIP_DOWNLOAD=True
 # https://github.com/devlikeapro/waha/issues/347
 ENV NODE_OPTIONS="--max-old-space-size=16384"
 ARG USE_BROWSER=chromium
+ARG WHATSAPP_DEFAULT_ENGINE
 
 RUN echo "USE_BROWSER=$USE_BROWSER"
 
@@ -99,6 +100,9 @@ RUN if [ "$USE_BROWSER" = "chrome" ]; then \
           && rm -rf /var/lib/apt/lists/*; \
     fi
 
+# Set the ENV for NOWEB docker image
+ENV WHATSAPP_DEFAULT_ENGINE=$WHATSAPP_DEFAULT_ENGINE
+
 # Attach sources, install packages
 WORKDIR /app
 COPY package.json ./

Makefile

@@ -5,7 +5,7 @@ build-chrome:
 	docker build . -t devlikeapro/waha-plus:chrome --build-arg USE_BROWSER=chrome
 
 build-noweb:
-	docker build . -t devlikeapro/waha:noweb --build-arg USE_BROWSER=none
+	docker build . -t devlikeapro/waha:noweb --build-arg USE_BROWSER=none --build-arg WHATSAPP_DEFAULT_ENGINE=NOWEB
 
 build-all: build build-chrome build-noweb
 
@@ -34,6 +34,9 @@ for-swagger:
 up-noweb:
 	. ${NVM_DIR}/nvm.sh && nvm exec yarn up @adiwajshing/baileys@github:devlikeapro/Baileys#fork-master-channels-678
 
+up-noweb-libsignal:
+	. ${NVM_DIR}/nvm.sh && nvm exec yarn up libsignal@github:devlikeapro/libsignal-node#fork-master
+
 up-webjs:
 	. ${NVM_DIR}/nvm.sh && nvm exec yarn up whatsapp-web.js@github:devlikeapro/whatsapp-web.js#fork-main-channels
 

package.json

@@ -59,6 +59,7 @@
     "joi": "^17.13.3",
     "knex": "^3.1.0",
     "libphonenumber-js": "^1.10.36",
+    "libsignal": "github:devlikeapro/libsignal-node#fork-master",
     "link-preview-js": "^3.0.4",
     "lodash": "^4.17.21",
     "mime-types": "^2.1.27",
@@ -75,10 +76,12 @@
     "qrcode-terminal": "^0.12.0",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
-    "rxjs": "^7.1.0",
+    "rxjs": "^7.8.1",
     "sharp": "^0.33.4",
     "swagger-ui-express": "^4.1.4",
-    "whatsapp-web.js": "github:devlikeapro/whatsapp-web.js#fork-main-channels"
+    "ulid": "^2.3.0",
+    "whatsapp-web.js": "github:devlikeapro/whatsapp-web.js#fork-main-channels",
+    "write-file-atomic": "^6.0.0"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.8"
@@ -87,7 +90,8 @@
     "bufferutil": "^4.0.8",
     "ws": "^8.18.0",
     "puppeteer": "^23.6.0",
-    "whatwg-url": "13.0.0"
+    "whatwg-url": "13.0.0",
+    "libsignal": "github:devlikeapro/libsignal-node#fork-master"
   },
   "devDependencies": {
     "@nestjs/cli": "^9.0.0",

src/api/chats.controller.ts

@@ -21,12 +21,16 @@ import {
 
 import { SessionManager } from '../core/abc/manager.abc';
 import { WhatsappSession } from '../core/abc/session.abc';
-import { parseBool } from '../helpers';
 import {
+  ChatPictureQuery,
+  ChatPictureResponse,
   ChatsPaginationParams,
+  ChatSummary,
   GetChatMessageQuery,
   GetChatMessagesFilter,
   GetChatMessagesQuery,
+  OverviewPaginationParams,
+  PinMessageRequest,
 } from '../structures/chats.dto';
 import { EditMessageRequest } from '../structures/chatting.dto';
 
@@ -47,6 +51,20 @@ class ChatsController {
     return session.getChats(pagination);
   }
 
+  @Get('overview')
+  @SessionApiParam
+  @ApiOperation({
+    summary:
+      'Get chats overview. Includes all necessary things to build UI "your chats overview" page - chat id, name, picture, last message. Sorting by last message timestamp',
+  })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  getChatsOverview(
+    @WorkingSessionParam session: WhatsappSession,
+    @Query() pagination: OverviewPaginationParams,
+  ): Promise<ChatSummary[]> {
+    return session.getChatsOverview(pagination);
+  }
+
   @Delete(':chatId')
   @SessionApiParam
   @ApiOperation({ summary: 'Deletes the chat' })
@@ -58,6 +76,19 @@ class ChatsController {
     return session.deleteChat(chatId);
   }
 
+  @Get(':chatId/picture')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Gets chat picture' })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async getChatPicture(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('chatId') chatId: string,
+    @Query() query: ChatPictureQuery,
+  ): Promise<ChatPictureResponse> {
+    const url = await session.getContactProfilePicture(chatId, query.refresh);
+    return { url: url };
+  }
+
   @Get(':chatId/messages')
   @SessionApiParam
   @ApiOperation({ summary: 'Gets messages in the chat' })
@@ -89,6 +120,33 @@ class ChatsController {
     return message;
   }
 
+  @Post(':chatId/messages/:messageId/pin')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Pins a message in the chat' })
+  @ChatIdApiParam
+  async pinMessage(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('chatId') chatId: string,
+    @Param('messageId') messageId: string,
+    @Body() body: PinMessageRequest,
+  ) {
+    const result = await session.pinMessage(chatId, messageId, body.duration);
+    return { success: result };
+  }
+
+  @Post(':chatId/messages/:messageId/unpin')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Unpins a message in the chat' })
+  @ChatIdApiParam
+  async unpinMessage(
+    @WorkingSessionParam session: WhatsappSession,
+    @Param('chatId') chatId: string,
+    @Param('messageId') messageId: string,
+  ) {
+    const result = await session.unpinMessage(chatId, messageId);
+    return { success: result };
+  }
+
   @Delete(':chatId/messages')
   @SessionApiParam
   @ApiOperation({ summary: 'Clears all messages from the chat' })

src/api/chatting.controller.ts

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

src/api/contacts.controller.ts

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

src/api/groups.controller.ts

@@ -6,6 +6,9 @@ import {
   Param,
   Post,
   Put,
+  Query,
+  UsePipes,
+  ValidationPipe,
 } from '@nestjs/common';
 import { ApiOperation, ApiSecurity, ApiTags } from '@nestjs/swagger';
 import { GroupIdApiParam } from '@waha/nestjs/params/ChatIdApiParam';
@@ -19,6 +22,9 @@ import { WhatsappSession } from '../core/abc/session.abc';
 import {
   CreateGroupRequest,
   DescriptionRequest,
+  GroupsPaginationParams,
+  JoinGroupRequest,
+  JoinGroupResponse,
   ParticipantsRequest,
   SettingsSecurityChangeInfo,
   SubjectRequest,
@@ -40,11 +46,48 @@ export class GroupsController {
     return session.createGroup(request);
   }
 
+  @Get('join-info')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Get info about the group before joining.' })
+  async joinInfoGroup(
+    @WorkingSessionParam session: WhatsappSession,
+    @Query() query: JoinGroupRequest,
+  ): Promise<any> {
+    // https://chat.whatsapp.com/123 => 123
+    const code = query.code.split('/').pop();
+    return session.joinInfoGroup(code);
+  }
+
+  @Post('join')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Join group via code' })
+  async joinGroup(
+    @WorkingSessionParam session: WhatsappSession,
+    @Body() request: JoinGroupRequest,
+  ): Promise<JoinGroupResponse> {
+    // https://chat.whatsapp.com/123 => 123
+    const code = request.code.split('/').pop();
+    const id = await session.joinGroup(code);
+    return { id: id };
+  }
+
   @Get('')
   @SessionApiParam
   @ApiOperation({ summary: 'Get all groups.' })
-  getGroups(@WorkingSessionParam session: WhatsappSession) {
-    return session.getGroups();
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  getGroups(
+    @WorkingSessionParam session: WhatsappSession,
+    @Query() pagination: GroupsPaginationParams,
+  ) {
+    return session.getGroups(pagination);
+  }
+
+  @Post('refresh')
+  @SessionApiParam
+  @ApiOperation({ summary: 'Refresh groups from the server.' })
+  @UsePipes(new ValidationPipe({ transform: true, whitelist: true }))
+  async refreshGroups(@WorkingSessionParam session: WhatsappSession) {
+    return { success: await session.refreshGroups() };
   }
 
   @Get(':id')

src/core/abc/manager.abc.ts

@@ -8,8 +8,8 @@ import { ISessionWorkerRepository } from '@waha/core/storage/ISessionWorkerRepos
 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 { merge, Observable, of } from 'rxjs';
 
 import {
   WAHAEngine,
@@ -25,7 +25,6 @@ import {
 import { ISessionAuthRepository } from '../storage/ISessionAuthRepository';
 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');
@@ -36,17 +35,20 @@ export abstract class SessionManager implements BeforeApplicationShutdown {
   public sessionConfigRepository: ISessionConfigRepository;
   protected sessionMeRepository: ISessionMeRepository;
   protected sessionWorkerRepository: ISessionWorkerRepository;
-  public events: EventEmitter;
   private lock: any;
 
   WAIT_STATUS_INTERVAL = 500;
   WAIT_STATUS_TIMEOUT = 5_000;
+  LOCK_TIMEOUT = 10_000;
 
   protected constructor(
     protected config: WhatsappConfigService,
     protected log: PinoLogger,
   ) {
-    this.lock = new AsyncLock({ maxPending: Infinity });
+    this.lock = new AsyncLock({
+      maxPending: Infinity,
+      timeout: this.LOCK_TIMEOUT,
+    });
     this.log.setContext(SessionManager.name);
   }
 
@@ -72,7 +74,18 @@ export abstract class SessionManager implements BeforeApplicationShutdown {
 
   protected abstract get EngineClass(): typeof WhatsappSession;
 
-  protected abstract get WebhookConductorClass(): typeof WebhookConductor;
+  public getSessionEvent(session: string, event: WAHAEvents): Observable<any> {
+    return of();
+  }
+
+  public getSessionEvents(
+    session: string,
+    events: WAHAEvents[],
+  ): Observable<any> {
+    return merge(
+      ...events.map((event) => this.getSessionEvent(session, event)),
+    );
+  }
 
   //
   // API Methods
@@ -114,22 +127,6 @@ export abstract class SessionManager implements BeforeApplicationShutdown {
     await this.sessionWorkerRepository?.unassign(name, this.workerId);
   }
 
-  protected handleSessionEvent(event: WAHAEvents, session: WhatsappSession) {
-    return (payload: any) => {
-      const me = session.getSessionMeInfo();
-      const data: WAHAWebhook = {
-        event: event,
-        session: session.name,
-        metadata: session.sessionConfig?.metadata,
-        me: me,
-        payload: payload,
-        engine: session.engine,
-        environment: VERSION,
-      };
-      this.events.emit(event, data);
-    };
-  }
-
   async getWorkingSession(sessionName: string): Promise<WhatsappSession> {
     return this.waitUntilStatus(sessionName, [WAHASessionStatus.WORKING]);
   }
@@ -160,7 +157,28 @@ export abstract class SessionManager implements BeforeApplicationShutdown {
     return session;
   }
 
-  async beforeApplicationShutdown(signal?: string) {
-    this.events.removeAllListeners();
+  beforeApplicationShutdown(signal?: string) {
+    return;
   }
 }
+export function populateSessionInfo(
+  event: WAHAEvents,
+  session: WhatsappSession,
+) {
+  return (payload: any): WAHAWebhook => {
+    const id = payload._eventId;
+    const data = { ...payload };
+    delete data._eventId;
+    const me = session.getSessionMeInfo();
+    return {
+      id: id,
+      event: event,
+      session: session.name,
+      metadata: session.sessionConfig?.metadata,
+      me: me,
+      payload: data,
+      engine: session.engine,
+      environment: VERSION,
+    };
+  };
+}

src/core/abc/session.abc.ts

@@ -4,6 +4,7 @@ import {
   ListChannelsQuery,
 } from '@waha/structures/channels.dto';
 import {
+  ChatSummary,
   GetChatMessageQuery,
   GetChatMessagesFilter,
   GetChatMessagesQuery,
@@ -12,11 +13,27 @@ import { SendButtonsRequest } from '@waha/structures/chatting.buttons.dto';
 import { Label, LabelDTO, LabelID } from '@waha/structures/labels.dto';
 import { PaginationParams } from '@waha/structures/pagination.dto';
 import { WAMessage } from '@waha/structures/responses.dto';
+import { DefaultMap } from '@waha/utils/DefaultMap';
+import { generatePrefixedId } from '@waha/utils/ids';
 import { LoggerBuilder } from '@waha/utils/logging';
-import { EventEmitter } from 'events';
+import { complete } from '@waha/utils/reactive/complete';
+import { SwitchObservable } from '@waha/utils/reactive/SwitchObservable';
 import * as fs from 'fs';
 import * as lodash from 'lodash';
+import * as NodeCache from 'node-cache';
 import { Logger } from 'pino';
+import {
+  BehaviorSubject,
+  catchError,
+  delay,
+  filter,
+  of,
+  retry,
+  share,
+  Subject,
+  switchMap,
+} from 'rxjs';
+import { distinctUntilChanged, map } from 'rxjs/operators';
 import { MessageId } from 'whatsapp-web.js';
 
 import {
@@ -46,6 +63,7 @@ import {
 } from '../../structures/enums.dto';
 import {
   CreateGroupRequest,
+  GroupsPaginationParams,
   ParticipantsRequest,
   SettingsSecurityChangeInfo,
 } from '../../structures/groups.dto';
@@ -88,10 +106,6 @@ export function ensureSuffix(phone) {
   return phone + suffix;
 }
 
-export enum WAHAInternalEvent {
-  ENGINE_START = 'engine.start',
-}
-
 export interface SessionParams {
   name: string;
   printQR: boolean;
@@ -104,7 +118,6 @@ export interface SessionParams {
 }
 
 export abstract class WhatsappSession {
-  public events: EventEmitter;
   public engine: WAHAEngine;
 
   public name: string;
@@ -119,6 +132,11 @@ export abstract class WhatsappSession {
 
   private _status: WAHASessionStatus;
   private shouldPrintQR: boolean;
+  protected events2: DefaultMap<WAHAEvents, SwitchObservable<any>>;
+  private status$: Subject<WAHASessionStatus>;
+  protected profilePictures: NodeCache = new NodeCache({
+    stdTTL: 24 * 60 * 60, // 1 day
+  });
 
   public constructor({
     name,
@@ -130,11 +148,64 @@ export abstract class WhatsappSession {
     sessionConfig,
     engineConfig,
   }: SessionParams) {
-    this.events = new EventEmitter();
+    this.status$ = new BehaviorSubject(null);
+
     this.name = name;
     this.proxyConfig = proxyConfig;
     this.loggerBuilder = loggerBuilder;
     this.logger = loggerBuilder.child({ name: 'WhatsappSession' });
+    this.events2 = new DefaultMap<WAHAEvents, SwitchObservable<any>>(
+      (key) =>
+        new SwitchObservable((obs$) => {
+          return obs$.pipe(
+            catchError((err) => {
+              this.logger.error(
+                `Caught error, dropping value from, event: '${key}'`,
+              );
+              this.logger.error(err, err.stack);
+              throw err;
+            }),
+            filter(Boolean),
+            map((data) => {
+              data._eventId = generatePrefixedId('evt');
+              return data;
+            }),
+            retry(),
+            share(),
+          );
+        }),
+    );
+
+    this.events2.get(WAHAEvents.SESSION_STATUS).switch(
+      this.status$
+        // initial value is null
+        .pipe(filter(Boolean))
+        // Wait for WORKING status to get all the info
+        // https://github.com/devlikeapro/waha/issues/409
+        .pipe(
+          switchMap((status: WAHASessionStatus) => {
+            const me = this.getSessionMeInfo();
+            const hasMe = !!me?.pushName && !!me?.id;
+            // Delay WORKING by 1 second if condition is met
+            // Usually we get WORKING with all the info after
+            if (status === WAHASessionStatus.WORKING && !hasMe) {
+              return of(status).pipe(delay(2000));
+            }
+            return of(status);
+          }),
+          // Remove consecutive duplicate WORKING statuses
+          distinctUntilChanged(
+            (prev, curr) => prev === curr && curr === WAHASessionStatus.WORKING,
+          ),
+        )
+        // Populate the session info
+        .pipe(
+          map<WAHASessionStatus, WASessionStatusBody>((status) => {
+            return { name: this.name, status: status };
+          }),
+        ),
+    );
+
     this.sessionStore = sessionStore;
     this.mediaManager = mediaManager;
     this.sessionConfig = sessionConfig;
@@ -142,6 +213,10 @@ export abstract class WhatsappSession {
     this.shouldPrintQR = printQR;
   }
 
+  public getEventObservable(event: WAHAEvents) {
+    return this.events2.get(event);
+  }
+
   protected set status(value: WAHASessionStatus) {
     if (this.unpairing && value !== WAHASessionStatus.STOPPED) {
       // In case of unpairing
@@ -149,8 +224,7 @@ export abstract class WhatsappSession {
       return;
     }
     this._status = value;
-    const body: WASessionStatusBody = { name: this.name, status: value };
-    this.events.emit(WAHAEvents.SESSION_STATUS, body);
+    this.status$.next(value);
   }
 
   public get status() {
@@ -196,7 +270,8 @@ export abstract class WhatsappSession {
       '--hide-scrollbars',
       '--ignore-certificate-errors',
       '--ignore-ssl-errors',
-      '--in-process-gpu', // https://superuser.com/questions/654565/how-to-run-google-chrome-in-a-single-process
+      // https://github.com/devlikeapro/waha/issues/725
+      // '--in-process-gpu', // https://superuser.com/questions/654565/how-to-run-google-chrome-in-a-single-process
       '--metrics-recording-only',
       '--mute-audio',
       '--no-default-browser-check',
@@ -223,30 +298,15 @@ export abstract class WhatsappSession {
   /** Stop the session */
   abstract stop(): Promise<void>;
 
+  protected stopEvents() {
+    complete(this.events2);
+  }
+
   /* Unpair the account */
   async unpair(): Promise<void> {
     return;
   }
 
-  /** Subscribe the handler to specific hook */
-  subscribeSessionEvent(
-    hook: WAHAEvents | string,
-    handler: (message) => void,
-  ): boolean {
-    switch (hook) {
-      case WAHAEvents.SESSION_STATUS:
-        this.events.on(WAHAEvents.SESSION_STATUS, handler);
-        return true;
-      default:
-        return false;
-    }
-  }
-
-  abstract subscribeEngineEvent(
-    hook: WAHAEvents | string,
-    handler: (message) => void,
-  ): boolean;
-
   /**
    * START - Methods for API
    */
@@ -339,6 +399,12 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
+  public getChatsOverview(
+    pagination: PaginationParams,
+  ): Promise<ChatSummary[]> {
+    throw new NotImplementedByEngineError();
+  }
+
   public deleteChat(chatId) {
     throw new NotImplementedByEngineError();
   }
@@ -359,6 +425,18 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
+  public pinMessage(
+    chatId: string,
+    messageId: string,
+    duration: number,
+  ): Promise<boolean> {
+    throw new NotImplementedByEngineError();
+  }
+
+  public unpinMessage(chatId: string, messageId: string): Promise<boolean> {
+    throw new NotImplementedByEngineError();
+  }
+
   public deleteMessage(chatId: string, messageId: string) {
     throw new NotImplementedByEngineError();
   }
@@ -438,8 +516,32 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
-  public getContactProfilePicture(query: ContactQuery) {
-    throw new NotImplementedByEngineError();
+  /**
+   * Fetch the latest profile picture of the contact (group, newsletter, etc.)
+   * @param id
+   */
+  abstract fetchContactProfilePicture(id: string): Promise<string | null>;
+
+  public async getContactProfilePicture(
+    id: string,
+    refresh: boolean,
+  ): Promise<string | null> {
+    const has: boolean = this.profilePictures.has(id);
+    if (!has || refresh) {
+      await this.refreshProfilePicture(id);
+    }
+    return this.profilePictures.get(id);
+  }
+
+  protected async refreshProfilePicture(id: string) {
+    this.profilePictures.del(id);
+    const url = await this.fetchContactProfilePicture(id).catch((err) => {
+      this.logger.error('Error fetching profile picture');
+      this.logger.error(err, err.stack);
+      return null;
+    });
+    this.profilePictures.set(id, url);
+    return url;
   }
 
   public blockContact(request: ContactRequest) {
@@ -457,7 +559,19 @@ export abstract class WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
-  public getGroups() {
+  public joinGroup(code: string): Promise<string> {
+    throw new NotImplementedByEngineError();
+  }
+
+  public joinInfoGroup(code: string): Promise<any> {
+    throw new NotImplementedByEngineError();
+  }
+
+  public getGroups(pagination: PaginationParams) {
+    throw new NotImplementedByEngineError();
+  }
+
+  public refreshGroups(): Promise<boolean> {
     throw new NotImplementedByEngineError();
   }
 

src/core/abc/webhooks.abc.ts

@@ -1,26 +0,0 @@
-import { LoggerBuilder } from '@waha/utils/logging';
-import { Logger } from 'pino';
-
-import { WebhookConfig } from '../../structures/webhooks.config.dto';
-import { WhatsappSession } from './session.abc';
-
-export abstract class WebhookSender {
-  protected url: string;
-  protected logger: Logger;
-  protected readonly config: WebhookConfig;
-
-  constructor(
-    loggerBuilder: LoggerBuilder,
-    protected webhookConfig: WebhookConfig,
-  ) {
-    this.url = webhookConfig.url;
-    this.logger = loggerBuilder.child({ name: WebhookSender.name });
-    this.config = webhookConfig;
-  }
-
-  abstract send(json: any): void;
-}
-
-export abstract class WebhookConductor {
-  abstract configure(session: WhatsappSession, webhooks: WebhookConfig[]);
-}

src/core/api/websocket.gateway.core.ts

@@ -14,10 +14,10 @@ import {
 import { SessionManager } from '@waha/core/abc/manager.abc';
 import { WebsocketHeartbeatJob } from '@waha/nestjs/ws/WebsocketHeartbeatJob';
 import { WebSocket } from '@waha/nestjs/ws/ws';
-import { WAHAEvents } from '@waha/structures/enums.dto';
+import { WAHAEvents, WAHAEventsWild } from '@waha/structures/enums.dto';
+import { EventWildUnmask } from '@waha/utils/events';
 import { generatePrefixedId } from '@waha/utils/ids';
 import { IncomingMessage } from 'http';
-import * as lodash from 'lodash';
 import * as url from 'url';
 import { Server } from 'ws';
 
@@ -37,11 +37,9 @@ export class WebsocketGatewayCore
   @WebSocketServer()
   server: Server;
 
-  private listeners: Map<WebSocket, { session: string; events: string[] }> =
-    new Map();
-
   private readonly logger: LoggerService;
   private heartbeat: WebsocketHeartbeatJob;
+  private eventUnmask = new EventWildUnmask(WAHAEvents, WAHAEventsWild);
 
   constructor(private manager: SessionManager) {
     this.logger = new Logger('WebsocketGateway');
@@ -56,49 +54,44 @@ export class WebsocketGatewayCore
     const id = generatePrefixedId('wsc');
     socket.id = id;
     this.logger.debug(`New client connected: ${request.url}`);
-    const params = this.getParams(id, request, socket);
-    if (!params) {
-      return;
-    }
-    const { session, events } = params;
+    const params = this.getParams(request);
+    const session: string = params.session;
+    const events: WAHAEvents[] = params.events;
     this.logger.debug(
       `Client connected to session: '${session}', events: ${events}, ${id}`,
     );
-    this.listeners.set(socket, { session, events });
+
+    const sub = this.manager
+      .getSessionEvents(session, events)
+      .subscribe((data) => {
+        this.logger.debug(`Sending data to client, event.id: ${data.id}`, data);
+        socket.send(JSON.stringify(data), (err) => {
+          if (!err) {
+            return;
+          }
+          this.logger.error(`Error sending data to client: ${err}`);
+        });
+      });
+    socket.on('close', () => {
+      this.logger.debug(`Client disconnected - ${socket.id}`);
+      sub.unsubscribe();
+    });
   }
 
-  private getParams(id: string, request: IncomingMessage, socket: WebSocket) {
+  private getParams(request: IncomingMessage) {
     const query = url.parse(request.url, true).query;
     const session = (query.session as string) || '*';
-    if (session !== '*') {
-      this.logger.warn(
-        `Only connecting to all sessions is allowed for now, use session=*, ${id}`,
-      );
-      const error =
-        'Only connecting to all sessions is allowed for now, use session=*';
-      socket.close(4001, JSON.stringify({ error }));
-      return null;
-    }
-
-    const events = ((query.events as string) || '*').split(',');
-    if (
-      !lodash.isEqual(events, ['*']) &&
-      !lodash.isEqual(events, [WAHAEvents.SESSION_STATUS])
-    ) {
-      this.logger.warn(
-        `Only \'session.status\' event is allowed for now, use events=session.status or events=*, ${id}`,
-      );
-      const error =
-        "Only 'session.status' event is allowed for now, use events=session.status or events=*";
-      socket.close(4001, JSON.stringify({ error }));
-      return null;
+    let paramsEvents = (query.events as string[]) || '*';
+    // if params events string - split by ","
+    if (typeof paramsEvents === 'string') {
+      paramsEvents = paramsEvents.split(',');
     }
+    const events = this.eventUnmask.unmask(paramsEvents);
     return { session, events };
   }
 
   handleDisconnect(socket: WebSocket): any {
     this.logger.debug(`Client disconnected - ${socket.id}`);
-    this.listeners.delete(socket);
   }
 
   async beforeApplicationShutdown(signal?: string) {
@@ -118,24 +111,9 @@ export class WebsocketGatewayCore
 
   afterInit(server: Server) {
     this.logger.debug('Websocket server initialized');
-    this.manager.events.on(
-      WAHAEvents.SESSION_STATUS,
-      this.sendToAll.bind(this),
-    );
-    this.logger.debug('Subscribed to manager events');
 
     this.logger.debug('Starting heartbeat service...');
     this.heartbeat.start(server);
     this.logger.debug('Heartbeat service started');
   }
-
-  sendToAll(data: any) {
-    this.listeners.forEach((options, client) => {
-      if (options.events.length === 0) {
-        return;
-      }
-      this.logger.debug('Sending data to client', data);
-      client.send(JSON.stringify(data));
-    });
-  }
 }

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 { WebJSEngineConfigService } from '@waha/core/config/WebJSEngineConfigService';
 import { MediaLocalStorageModule } from '@waha/core/media/local/media.local.storage.module';
 import { MediaLocalStorageConfig } from '@waha/core/media/local/MediaLocalStorageConfig';
 import { BufferJsonReplacerInterceptor } from '@waha/nestjs/BufferJsonReplacerInterceptor';
@@ -146,6 +147,7 @@ const PROVIDERS = [
   },
   DashboardConfigServiceCore,
   SwaggerConfigServiceCore,
+  WebJSEngineConfigService,
   WhatsappConfigService,
   EngineConfigService,
   WebsocketGatewayCore,

src/core/config/WebJSEngineConfigService.ts

@@ -0,0 +1,37 @@
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+
+import { WebJSConfig } from '../../core/engines/webjs/session.webjs.core';
+
+@Injectable()
+export class WebJSEngineConfigService {
+  constructor(protected configService: ConfigService) {}
+
+  getConfig(): WebJSConfig {
+    let webVersion = this.configService.get<string>(
+      'WAHA_WEBJS_WEB_VERSION',
+      undefined,
+    );
+    if (webVersion === '2.2412.54-videofix') {
+      // Deprecated version
+      webVersion = undefined;
+    }
+    return {
+      webVersion: webVersion,
+      cacheType: this.getCacheType(),
+    };
+  }
+
+  getCacheType(): 'local' | 'none' {
+    const cacheType = this.configService
+      .get<string>('WAHA_WEBJS_CACHE_TYPE', 'none')
+      .toLowerCase();
+    if (cacheType != 'local' && cacheType != 'none') {
+      throw new Error(
+        'Invalid cache type, only "local" and "none" are allowed',
+      );
+    }
+
+    return cacheType;
+  }
+}

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

@@ -1,5 +1,6 @@
 import makeWASocket, {
   Browsers,
+  Chat,
   Contact,
   DisconnectReason,
   downloadMediaMessage,
@@ -9,7 +10,9 @@ import makeWASocket, {
   getKeyAuthor,
   getUrlFromDirectPath,
   isJidGroup,
+  isJidNewsletter,
   isJidStatusBroadcast,
+  isJidUser,
   isRealMessage,
   jidNormalizedUser,
   makeCacheableSignalKeyStore,
@@ -17,15 +20,23 @@ import makeWASocket, {
   normalizeMessageContent,
   PresenceData,
   proto,
+  SocketConfig,
   WAMessageContent,
   WAMessageKey,
+  WAMessageUpdate,
 } from '@adiwajshing/baileys';
 import { WACallEvent } from '@adiwajshing/baileys/lib/Types/Call';
+import { BaileysEventMap } from '@adiwajshing/baileys/lib/Types/Events';
+import { GroupMetadata } from '@adiwajshing/baileys/lib/Types/GroupMetadata';
 import {
   Label as NOWEBLabel,
   LabelActionBody,
 } from '@adiwajshing/baileys/lib/Types/Label';
-import { LabelAssociationType } from '@adiwajshing/baileys/lib/Types/LabelAssociation';
+import {
+  ChatLabelAssociation,
+  LabelAssociationType,
+} from '@adiwajshing/baileys/lib/Types/LabelAssociation';
+import { MessageUserReceiptUpdate } from '@adiwajshing/baileys/lib/Types/Message';
 import { isLidUser } from '@adiwajshing/baileys/lib/WABinary/jid-utils';
 import { Logger as BaileysLogger } from '@adiwajshing/baileys/node_modules/pino';
 import { UnprocessableEntityException } from '@nestjs/common';
@@ -42,9 +53,11 @@ import {
   ListChannelsQuery,
 } from '@waha/structures/channels.dto';
 import {
+  ChatSummary,
   GetChatMessageQuery,
   GetChatMessagesFilter,
   GetChatMessagesQuery,
+  PinDuration,
 } from '@waha/structures/chats.dto';
 import { SendButtonsRequest } from '@waha/structures/chatting.buttons.dto';
 import { ContactQuery, ContactRequest } from '@waha/structures/contacts.dto';
@@ -58,18 +71,33 @@ import {
 import { ReplyToMessage } from '@waha/structures/message.dto';
 import { PaginationParams } from '@waha/structures/pagination.dto';
 import {
+  EnginePayload,
   PollVote,
   PollVotePayload,
   WAMessageAckBody,
 } from '@waha/structures/webhooks.dto';
 import { LoggerBuilder } from '@waha/utils/logging';
 import { sleep, waitUntil } from '@waha/utils/promiseTimeout';
+import { exclude } from '@waha/utils/reactive/ops/exclude';
 import { SingleDelayedJobRunner } from '@waha/utils/SingleDelayedJobRunner';
 import { SinglePeriodicJobRunner } from '@waha/utils/SinglePeriodicJobRunner';
 import * as Buffer from 'buffer';
 import { Agent } from 'https';
 import * as lodash from 'lodash';
 import * as NodeCache from 'node-cache';
+import {
+  filter,
+  fromEvent,
+  identity,
+  merge,
+  mergeAll,
+  mergeMap,
+  Observable,
+  partition,
+  share,
+  Subject,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import {
   ChatRequest,
@@ -122,7 +150,6 @@ import {
   ensureSuffix,
   getChannelInviteLink,
   isNewsletter,
-  WAHAInternalEvent,
   WhatsappSession,
 } from '../../abc/session.abc';
 import {
@@ -136,7 +163,7 @@ import { NowebAuthFactoryCore } from './NowebAuthFactoryCore';
 import { INowebStore } from './store/INowebStore';
 import { NowebPersistentStore } from './store/NowebPersistentStore';
 import { NowebStorageFactoryCore } from './store/NowebStorageFactoryCore';
-import { extractMediaContent } from './utils';
+import { ensureNumber, extractMediaContent } from './utils';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const QRCode = require('qrcode');
@@ -172,14 +199,11 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
 
   private autoRestartJob: SinglePeriodicJobRunner;
   private msgRetryCounterCache: NodeCache;
+  private placeholderResendCache: NodeCache;
   protected engineLogger: BaileysLogger;
 
   private authNOWEBStore: any;
 
-  get listenConnectionEventsFromTheStart() {
-    return true;
-  }
-
   sock: ReturnType<typeof makeWASocket>;
   store: INowebStore;
   private qr: QR;
@@ -195,6 +219,10 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
       stdTTL: 60 * 60, // 1 hour
       useClones: false,
     });
+    this.placeholderResendCache = new NodeCache({
+      stdTTL: 60 * 60, // 1 hour
+      useClones: false,
+    });
 
     this.engineLogger = this.loggerBuilder.child({
       name: 'NOWEBEngine',
@@ -234,7 +262,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     await this.sock?.logout();
   }
 
-  getSocketConfig(agent, state): any {
+  getSocketConfig(agent, state): Partial<SocketConfig> {
     const fullSyncEnabled = this.sessionConfig?.noweb?.store?.fullSync || false;
     const browser = fullSyncEnabled
       ? Browsers.ubuntu('Desktop')
@@ -246,11 +274,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     return {
       agent: agent,
       fetchAgent: agent,
-      auth: {
-        creds: state.creds,
-        /** caching makes the store faster to send/recv messages */
-        keys: makeCacheableSignalKeyStore(state.keys, this.engineLogger),
-      },
+      auth: state,
       printQRInTerminal: false,
       browser: browser,
       logger: this.engineLogger,
@@ -260,20 +284,30 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
       getMessage: (key) => this.getMessage(key),
       syncFullHistory: fullSyncEnabled,
       msgRetryCounterCache: this.msgRetryCounterCache,
+      placeholderResendCache: this.placeholderResendCache,
       markOnlineOnConnect: markOnlineOnConnect,
     };
   }
 
   async makeSocket(): Promise<any> {
     if (!this.authNOWEBStore) {
-      this.authNOWEBStore = await this.authFactory.buildAuth(
+      const store = await this.authFactory.buildAuth(
         this.sessionStore,
         this.name,
       );
+      /** caching makes the store faster to send/recv messages */
+      store.state.keys = makeCacheableSignalKeyStore(
+        store.state.keys,
+        this.engineLogger,
+      );
+      this.authNOWEBStore = store;
     }
     const { state, saveCreds } = this.authNOWEBStore;
     const agent = this.makeAgent();
-    const socketConfig = this.getSocketConfig(agent, state);
+    const socketConfig: SocketConfig = this.getSocketConfig(
+      agent,
+      state,
+    ) as SocketConfig;
     const sock = makeWASocket(socketConfig);
     sock.ev.on('creds.update', saveCreds);
     return sock;
@@ -286,27 +320,33 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     return createAgentProxy(this.proxyConfig);
   }
 
-  async connectStore() {
-    this.logger.debug(`Connecting store...`);
-    if (!this.store) {
-      this.logger.debug(`Making a new store...`);
-      const storeEnabled = this.sessionConfig?.noweb?.store?.enabled || false;
-      if (storeEnabled) {
-        this.logger.debug('Using NowebPersistentStore');
-        const storage = this.storageFactory.createStorage(
-          this.sessionStore,
-          this.name,
-        );
-        this.store = new NowebPersistentStore(
-          this.loggerBuilder.child({ name: NowebPersistentStore.name }),
-          storage,
-        );
-        await this.store.init();
-      } else {
-        this.logger.debug('Using NowebInMemoryStore');
-        this.store = new NowebInMemoryStore();
-      }
+  private async ensureStore() {
+    if (this.store) {
+      return;
     }
+
+    this.logger.debug(`Making a new store...`);
+    const storeEnabled = this.sessionConfig?.noweb?.store?.enabled || false;
+    if (!storeEnabled) {
+      this.logger.debug('Using NowebInMemoryStore');
+      this.store = new NowebInMemoryStore();
+      return;
+    }
+
+    this.logger.debug('Using NowebPersistentStore');
+    const storage = this.storageFactory.createStorage(
+      this.sessionStore,
+      this.name,
+    );
+    this.store = new NowebPersistentStore(
+      this.loggerBuilder.child({ name: NowebPersistentStore.name }),
+      storage,
+    );
+    await this.store.init();
+  }
+
+  connectStore() {
+    this.logger.debug(`Connecting store...`);
     this.logger.debug(`Binding store to socket...`);
     this.store.bind(this.sock.ev, this.sock);
   }
@@ -321,17 +361,19 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     this.shouldRestart = true;
     // @ts-ignore
     this.sock?.ev?.removeAllListeners();
+
+    await this.ensureStore();
     this.sock = await this.makeSocket();
+
     this.issueMessageUpdateOnEdits();
     this.issuePresenceUpdateOnMessageUpsert();
     if (this.isDebugEnabled()) {
       this.listenEngineEventsInDebugMode();
     }
-    await this.connectStore();
-    if (this.listenConnectionEventsFromTheStart) {
-      this.listenConnectionEvents();
-      this.events.emit(WAHAInternalEvent.ENGINE_START);
-    }
+    this.connectStore();
+    this.listenConnectionEvents();
+    this.subscribeEngineEvents2();
+    this.listenContactsUpdatePictureProfile();
     this.enableAutoRestart();
   }
 
@@ -429,7 +471,8 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     this.startDelayedJob.cancel();
     this.autoRestartJob.stop();
 
-    if (this.authNOWEBStore && this.status == WAHASessionStatus.WORKING) {
+    const hasCreds = this.authNOWEBStore?.state?.creds;
+    if (hasCreds && this.status == WAHASessionStatus.WORKING) {
       this.logger.info('Saving creds before stopping...');
       await this.authNOWEBStore.saveCreds().catch((e) => {
         this.logger.error('Failed to save creds');
@@ -439,7 +482,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
       this.authNOWEBStore = null;
     }
     this.status = WAHASessionStatus.STOPPED;
-    this.events.removeAllListeners();
+    this.stopEvents();
 
     await this.end();
     await this.store?.close();
@@ -807,6 +850,34 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     return await this.processIncomingMessage(message, query.downloadMedia);
   }
 
+  public async pinMessage(
+    chatId: string,
+    messageId: string,
+    duration: PinDuration,
+  ): Promise<boolean> {
+    const jid = toJID(chatId);
+    const key = parseMessageIdSerialized(messageId);
+    await this.sock.sendMessage(jid, {
+      pin: key,
+      type: proto.PinInChat.Type.PIN_FOR_ALL,
+      time: duration,
+    });
+    return true;
+  }
+
+  public async unpinMessage(
+    chatId: string,
+    messageId: string,
+  ): Promise<boolean> {
+    const jid = toJID(chatId);
+    const key = parseMessageIdSerialized(messageId);
+    await this.sock.sendMessage(jid, {
+      pin: key,
+      type: proto.PinInChat.Type.UNPIN_FOR_ALL,
+    });
+    return true;
+  }
+
   async setReaction(request: MessageReactionRequest) {
     const key = parseMessageIdSerialized(request.messageId);
     const reactionMessage = {
@@ -836,12 +907,52 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
    */
 
   async getChats(pagination: PaginationParams) {
-    const chats = await this.store.getChats(pagination);
+    const chats = await this.store.getChats(pagination, true);
     // Remove unreadCount, it's not ready yet
     chats.forEach((chat) => delete chat.unreadCount);
     return chats;
   }
 
+  public async getChatsOverview(
+    pagination: PaginationParams,
+  ): Promise<ChatSummary[]> {
+    const chats = await this.store.getChats(pagination, false);
+    // Remove unreadCount, it's not ready yet
+    chats.forEach((chat) => delete chat.unreadCount);
+
+    const promises = [];
+    for (const chat of chats) {
+      promises.push(this.fetchChatSummary(chat));
+    }
+    const result = await Promise.all(promises);
+    return result;
+  }
+
+  protected async fetchChatSummary(chat: Chat): Promise<ChatSummary> {
+    const id = toCusFormat(chat.id);
+    let name = chat.name;
+    if (!name) {
+      // Get name by contact
+      const jid = toJID(chat.id);
+      const contact = await this.store.getContactById(jid);
+      name = contact?.name || contact?.notify;
+    }
+    const picture = await this.getContactProfilePicture(chat.id, false);
+    const messages = await this.getChatMessages(
+      chat.id,
+      { limit: 1, offset: 0, downloadMedia: false },
+      {},
+    );
+    const message = messages.length > 0 ? messages[0] : null;
+    return {
+      id: id,
+      name: name || null,
+      picture: picture,
+      lastMessage: message,
+      _chat: chat,
+    };
+  }
+
   protected async chatsPutArchive(
     chatId: string,
     archive: boolean,
@@ -964,6 +1075,18 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     };
   }
 
+  private async toLabelChatAssociation(
+    association: ChatLabelAssociation,
+  ): Promise<LabelChatAssociation> {
+    const labelData = await this.store.getLabelById(association.labelId);
+    const label = labelData ? this.toLabel(labelData) : null;
+    return {
+      labelId: association.labelId,
+      chatId: toCusFormat(association.chatId),
+      label: label,
+    };
+  }
+
   /**
    * Contacts methods
    */
@@ -985,10 +1108,16 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     throw new NotImplementedByEngineError();
   }
 
-  public async getContactProfilePicture(query: ContactQuery) {
-    const contact = this.ensureSuffix(query.contactId);
+  public async fetchContactProfilePicture(id: string) {
+    const contact = this.ensureSuffix(id);
+    if (isJidNewsletter(id)) {
+      return null;
+    }
+    if (isJidStatusBroadcast(id)) {
+      return null;
+    }
     const url = await this.sock.profilePictureUrl(contact, 'image');
-    return { profilePictureURL: url };
+    return url;
   }
 
   public async blockContact(request: ContactRequest) {
@@ -1007,12 +1136,28 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     return this.sock.groupCreate(request.name, participants);
   }
 
-  public async getGroups() {
-    return await this.sock.groupFetchAllParticipating();
+  public joinGroup(code: string) {
+    return this.sock.groupAcceptInvite(code);
+  }
+
+  public joinInfoGroup(code: string) {
+    return this.sock.groupGetInviteInfo(code);
+  }
+
+  public async getGroups(pagination: PaginationParams) {
+    const groups = await this.store.getGroups(pagination);
+    // return {id: group} mapping for backward compatability
+    return lodash.keyBy(groups, 'id');
+  }
+
+  public async refreshGroups(): Promise<boolean> {
+    this.store.resetGroupsCache();
+    await this.store.getGroups({});
+    return true;
   }
 
   public async getGroup(id) {
-    const groups = await this.sock.groupFetchAllParticipating();
+    const groups = await this.getGroups({});
     return groups[id];
   }
 
@@ -1227,208 +1372,252 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     return await this.sock.newsletterAction(id, 'unmute');
   }
 
+  subscribeEngineEvents2() {
+    //
+    // All
+    //
+    const all$ = new Observable<EnginePayload>((subscriber) => {
+      return this.sock.ev.process((events) => {
+        // iterate over keys
+        for (const event in events) {
+          const data = events[event];
+          subscriber.next({ event: event, data: data });
+        }
+      });
+    });
+    this.events2.get(WAHAEvents.ENGINE_EVENT).switch(all$);
+
+    //
+    // Messages
+    //
+    const messagesUpsert$ = fromEvent(this.sock.ev, 'messages.upsert').pipe(
+      map((event: BaileysEventMap['messages.upsert']) => event.messages),
+      mergeAll(),
+    );
+    let [messagesFromMe$, messagesFromOthers$] = partition(
+      messagesUpsert$,
+      isMine,
+    );
+    messagesFromMe$ = messagesFromMe$.pipe(
+      mergeMap((msg) => this.processIncomingMessage(msg, true)),
+      share(), // share it so we don't process twice in message.any
+    );
+    messagesFromOthers$ = messagesFromOthers$.pipe(
+      mergeMap((msg) => this.processIncomingMessage(msg, true)),
+      share(), // share it so we don't process twice in message.any
+    );
+    const messagesFromAll$ = merge(messagesFromMe$, messagesFromOthers$);
+    this.events2.get(WAHAEvents.MESSAGE).switch(messagesFromOthers$);
+    this.events2.get(WAHAEvents.MESSAGE_ANY).switch(messagesFromAll$);
+
+    //
+    // Message Reactions
+    //
+    const messageReactions$ = messagesUpsert$.pipe(
+      map(this.processMessageReaction.bind(this)),
+      filter(Boolean),
+    );
+    this.events2.get(WAHAEvents.MESSAGE_REACTION).switch(messageReactions$);
+
+    //
+    // Message Ack
+    //
+    const messageUpdates$: Observable<WAMessageUpdate> = fromEvent(
+      this.sock.ev,
+      'messages.update',
+    ).pipe(
+      // @ts-ignore
+      mergeAll(),
+    );
+    const messageAckDirect$ = messageUpdates$.pipe(
+      filter(isMine), // ack comes only for MY messages
+      filter(isAckUpdateMessageEvent),
+      map(this.convertMessageUpdateToMessageAck.bind(this)),
+    );
+    const messageReceiptUpdate$: Observable<MessageUserReceiptUpdate> =
+      fromEvent(this.sock.ev, 'message-receipt.update').pipe(
+        // @ts-ignore
+        mergeAll(),
+      );
+
+    const messageAckGroups$ = messageReceiptUpdate$.pipe(
+      filter(isMine), // ack comes only for MY messages
+      map(this.convertMessageReceiptUpdateToMessageAck.bind(this)),
+    );
+    const messageAck$ = merge(messageAckDirect$, messageAckGroups$);
+    this.events2.get(WAHAEvents.MESSAGE_ACK).switch(messageAck$);
+
+    //
+    // Other
+    //
+    this.events2
+      .get(WAHAEvents.STATE_CHANGE)
+      .switch(fromEvent(this.sock.ev, 'connection.update'));
+    this.events2.get(WAHAEvents.GROUP_JOIN).switch(
+      // @ts-ignore
+      fromEvent<GroupMetadata[]>(this.sock.ev, 'groups.upsert').pipe(
+        mergeAll(),
+      ),
+    );
+    this.events2
+      .get(WAHAEvents.PRESENCE_UPDATE)
+      .switch(
+        fromEvent(this.sock.ev, 'presence.update').pipe(
+          map((data: any) => this.toWahaPresences(data.id, data.presences)),
+        ),
+      );
+
+    //
+    // Poll votes
+    //
+    this.events2
+      .get(WAHAEvents.POLL_VOTE)
+      .switch(
+        messageUpdates$.pipe(
+          mergeMap(this.handleMessagesUpdatePollVote.bind(this)),
+          filter(Boolean),
+        ),
+      );
+    this.events2
+      .get(WAHAEvents.POLL_VOTE_FAILED)
+      .switch(
+        messagesUpsert$.pipe(
+          mergeMap(this.handleMessageUpsertPollVoteFailed.bind(this)),
+          filter(Boolean),
+        ),
+      );
+
+    //
+    // Calls
+    //
+    // @ts-ignore
+    const calls$: Observable<WACallEvent[]> = fromEvent(this.sock.ev, 'call');
+    const call$ = calls$.pipe(mergeMap(identity));
+    this.events2.get(WAHAEvents.CALL_RECEIVED).switch(
+      call$.pipe(
+        filter((call: WACallEvent) => call.status === 'offer'),
+        map(this.toCallData.bind(this)),
+      ),
+    );
+    this.events2.get(WAHAEvents.CALL_ACCEPTED).switch(
+      call$.pipe(
+        filter((call: WACallEvent) => call.status === 'accept'),
+        map(this.toCallData.bind(this)),
+      ),
+    );
+    this.events2.get(WAHAEvents.CALL_REJECTED).switch(
+      calls$.pipe(
+        // Filter out if there's any "accept" events.
+        // Meaning it's been accepted on one device, but rejected on another
+        exclude((calls) => calls.some((call) => call.status === 'accept')),
+        mergeAll(),
+        filter((call: WACallEvent) => call.status === 'reject'),
+        // We get two "reject" events, one with null isGroup property, ignore it
+        exclude((call: WACallEvent) => call.isGroup == null),
+        map(this.toCallData.bind(this)),
+      ),
+    );
+
+    //
+    // Labels
+    //
+    // @ts-ignore
+    const labelsEdit$: Observable<NOWEBLabel> = fromEvent(
+      this.sock.ev,
+      'labels.edit',
+    );
+    this.events2.get(WAHAEvents.LABEL_UPSERT).switch(
+      labelsEdit$.pipe(
+        exclude((data: NOWEBLabel) => data.deleted),
+        map(this.toLabel.bind(this)),
+      ),
+    );
+    this.events2.get(WAHAEvents.LABEL_DELETED).switch(
+      labelsEdit$.pipe(
+        filter((data: NOWEBLabel) => data.deleted),
+        map(this.toLabel.bind(this)),
+      ),
+    );
+    const labelsAssociation$ = fromEvent(this.sock.ev, 'labels.association');
+    const labelsAssociationAdd$: Observable<ChatLabelAssociation> =
+      labelsAssociation$.pipe(
+        filter(({ type }: any) => type === 'add'),
+        map((data) => data.association),
+        filter(
+          (association: any) => association.type === LabelAssociationType.Chat,
+        ),
+      );
+
+    const labelsAssociationRemove$: Observable<ChatLabelAssociation> =
+      labelsAssociation$.pipe(
+        filter(({ type }: any) => type === 'remove'),
+        map((data) => data.association),
+        filter(
+          (association: any) => association.type === LabelAssociationType.Chat,
+        ),
+      );
+    this.events2
+      .get(WAHAEvents.LABEL_CHAT_ADDED)
+      .switch(
+        labelsAssociationAdd$.pipe(
+          mergeMap(this.toLabelChatAssociation.bind(this)),
+        ),
+      );
+    this.events2
+      .get(WAHAEvents.LABEL_CHAT_DELETED)
+      .switch(
+        labelsAssociationRemove$.pipe(
+          mergeMap(this.toLabelChatAssociation.bind(this)),
+        ),
+      );
+  }
+
+  protected listenContactsUpdatePictureProfile() {
+    this.sock.ev.on('contacts.update', async (updates) => {
+      for (const update of updates) {
+        if (update.imgUrl !== 'changed') {
+          continue;
+        }
+
+        this.logger.debug({ jid: update.id }, 'Profile picture updated');
+        const url = await this.refreshProfilePicture(update.id);
+        if (isJidUser(update.id)) {
+          // update 123@c.us and 123 profiles as well
+          const cus = toCusFormat(update.id);
+          this.profilePictures.set(cus, url);
+          const phone = update.id.split('@')[0];
+          this.profilePictures.set(phone, url);
+        }
+      }
+    });
+  }
+
   /**
    * END - Methods for API
    */
 
-  subscribeEngineEvent(event, handler): boolean {
-    switch (event) {
-      case WAHAEvents.MESSAGE:
-        this.sock.ev.on('messages.upsert', ({ messages }) => {
-          this.handleIncomingMessages(messages, handler, false);
-        });
-        return true;
-      case WAHAEvents.MESSAGE_REACTION:
-        this.sock.ev.on('messages.upsert', ({ messages }) => {
-          const reactions = this.processMessageReaction(messages);
-          reactions.map(handler);
-        });
-        return true;
-      case WAHAEvents.MESSAGE_ANY:
-        this.sock.ev.on('messages.upsert', ({ messages }) =>
-          this.handleIncomingMessages(messages, handler, true),
-        );
-        return true;
-      case WAHAEvents.MESSAGE_ACK: // Direct message ack
-        this.sock.ev.on('messages.update', (events) => {
-          events
-            .filter(isMine)
-            .filter(isAckUpdateMessageEvent)
-            .map(this.convertMessageUpdateToMessageAck)
-            .forEach(handler);
-        });
-        // Group message ack
-        this.sock.ev.on('message-receipt.update', (events) => {
-          events
-            .filter(isMine)
-            .map(this.convertMessageReceiptUpdateToMessageAck)
-            .forEach(handler);
-        });
-        return true;
-      case WAHAEvents.STATE_CHANGE:
-        this.sock.ev.on('connection.update', handler);
-        return true;
-      case WAHAEvents.GROUP_JOIN:
-        this.sock.ev.on('groups.upsert', handler);
-        return true;
-      case WAHAEvents.PRESENCE_UPDATE:
-        this.sock.ev.on('presence.update', (data) =>
-          handler(this.toWahaPresences(data.id, data.presences)),
-        );
-        return true;
-      case WAHAEvents.POLL_VOTE:
-        this.sock.ev.on('messages.update', (events) => {
-          events.forEach((event) =>
-            this.handleMessagesUpdatePollVote(event, handler),
-          );
-        });
-        return true;
-      case WAHAEvents.POLL_VOTE_FAILED:
-        this.sock.ev.on('messages.upsert', ({ messages }) => {
-          messages.forEach((message) =>
-            this.handleMessageUpsertPollVoteFailed(message, handler),
-          );
-        });
-        return true;
-      case WAHAEvents.CALL_RECEIVED:
-        this.sock.ev.on('call', (calls: WACallEvent[]) => {
-          calls = lodash.filter(calls, { status: 'offer' });
-          for (const call of calls) {
-            const body = this.toCallData(call);
-            handler(body);
-          }
-        });
-        return true;
-      case WAHAEvents.CALL_ACCEPTED:
-        this.sock.ev.on('call', (calls: WACallEvent[]) => {
-          calls = lodash.filter(calls, { status: 'accept' });
-          for (const call of calls) {
-            const body = this.toCallData(call);
-            handler(body);
-          }
-        });
-        return true;
-      case WAHAEvents.CALL_REJECTED:
-        this.sock.ev.on('call', (calls: WACallEvent[]) => {
-          const acceptCalls = lodash.filter(calls, { status: 'accept' });
-          if (acceptCalls.length > 0) {
-            // We got two events when accepting calls - reject and accept
-            // Like for each device
-            // So if we see accepted call - ignore rejected
-            return;
-          }
+  private processMessageReaction(message): WAMessageReaction | null {
+    if (!message) return null;
+    if (!message.message) return null;
+    if (!message.message.reactionMessage) return null;
 
-          calls = lodash.filter(calls, { status: 'reject' });
-          for (const call of calls) {
-            const body = this.toCallData(call);
-            if (body.isGroup == null) {
-              // We get two "reject" events, one with null property, ignore it
-              return;
-            }
-            handler(body);
-          }
-        });
-        return true;
-      case WAHAEvents.LABEL_UPSERT:
-        this.sock.ev.on('labels.edit', (data: NOWEBLabel) => {
-          if (data.deleted) {
-            return;
-          }
-          const body = this.toLabel(data);
-          handler(body);
-        });
-        return true;
-      case WAHAEvents.LABEL_DELETED:
-        this.sock.ev.on('labels.edit', (data: NOWEBLabel) => {
-          if (!data.deleted) {
-            return;
-          }
-          const body = this.toLabel(data);
-          handler(body);
-        });
-        return true;
-      case WAHAEvents.LABEL_CHAT_ADDED:
-        this.sock.ev.on('labels.association', async ({ association, type }) => {
-          if (type !== 'add') {
-            return;
-          }
-          if (association.type !== LabelAssociationType.Chat) {
-            return;
-          }
-          const labelData = await this.store.getLabelById(association.labelId);
-          const label = labelData ? this.toLabel(labelData) : null;
-          const body: LabelChatAssociation = {
-            labelId: association.labelId,
-            chatId: toCusFormat(association.chatId),
-            label: label,
-          };
-          handler(body);
-        });
-        return true;
-      case WAHAEvents.LABEL_CHAT_DELETED:
-        this.sock.ev.on('labels.association', async ({ association, type }) => {
-          if (type !== 'remove') {
-            return;
-          }
-          if (association.type !== LabelAssociationType.Chat) {
-            return;
-          }
-          const labelData = await this.store.getLabelById(association.labelId);
-          const label = labelData ? this.toLabel(labelData) : null;
-          const body: LabelChatAssociation = {
-            labelId: association.labelId,
-            chatId: toCusFormat(association.chatId),
-            label: label,
-          };
-          handler(body);
-        });
-        return true;
-      default:
-        return false;
-    }
-  }
-
-  private handleIncomingMessages(messages, handler, includeFromMe) {
-    for (const message of messages) {
-      // Do not include my messages
-      if (!includeFromMe && message.key.fromMe) {
-        continue;
-      }
-      this.processIncomingMessage(message).then((msg) => {
-        if (!msg) {
-          return;
-        }
-        handler(msg);
-      });
-    }
-  }
-
-  private processMessageReaction(messages: any[]): WAMessageReaction[] {
-    const reactions = [];
-    for (const message of messages) {
-      if (!message) return [];
-      if (!message.message) return [];
-      if (!message.message.reactionMessage) return [];
-
-      const id = buildMessageId(message.key);
-      const fromToParticipant = getFromToParticipant(message);
-      const reactionMessage = message.message.reactionMessage;
-      const messageId = buildMessageId(reactionMessage.key);
-      const reaction: WAMessageReaction = {
-        id: id,
-        timestamp: message.messageTimestamp,
-        from: toCusFormat(fromToParticipant.from),
-        fromMe: message.key.fromMe,
-        to: toCusFormat(fromToParticipant.to),
-        participant: toCusFormat(fromToParticipant.participant),
-        reaction: {
-          text: reactionMessage.text,
-          messageId: messageId,
-        },
-      };
-      reactions.push(reaction);
-    }
-    return reactions;
+    const id = buildMessageId(message.key);
+    const fromToParticipant = getFromToParticipant(message);
+    const reactionMessage = message.message.reactionMessage;
+    const messageId = buildMessageId(reactionMessage.key);
+    const reaction: WAMessageReaction = {
+      id: id,
+      timestamp: ensureNumber(message.messageTimestamp),
+      from: toCusFormat(fromToParticipant.from),
+      fromMe: message.key.fromMe,
+      to: toCusFormat(fromToParticipant.to),
+      participant: toCusFormat(fromToParticipant.participant),
+      reaction: {
+        text: reactionMessage.text,
+        messageId: messageId,
+      },
+    };
+    return reaction;
   }
 
   private async processIncomingMessage(message, downloadMedia = true) {
@@ -1467,7 +1656,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     const ack = message.ack || message.status - 1;
     return Promise.resolve({
       id: id,
-      timestamp: message.messageTimestamp,
+      timestamp: ensureNumber(message.messageTimestamp),
       from: toCusFormat(fromToParticipant.from),
       fromMe: message.key.fromMe,
       body: body,
@@ -1518,6 +1707,9 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
       return null;
     }
     const quotedMessage = contextInfo.quotedMessage;
+    if (!quotedMessage) {
+      return null;
+    }
     const body = this.extractBody(quotedMessage);
     return {
       id: contextInfo.stanzaId,
@@ -1577,7 +1769,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
     return body;
   }
 
-  protected async handleMessagesUpdatePollVote(event, handler) {
+  protected async handleMessagesUpdatePollVote(event) {
     const { key, update } = event;
     const pollUpdates = update?.pollUpdates;
     if (!pollUpdates) {
@@ -1608,17 +1800,17 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
       const pollVote: PollVote = {
         ...voteDestination,
         selectedOptions: selectedOptions,
-        timestamp: pollUpdate.senderTimestampMs,
+        timestamp: ensureNumber(pollUpdate.senderTimestampMs),
       };
       const payload: PollVotePayload = {
         vote: pollVote,
         poll: getDestination(pollCreationMessageKey),
       };
-      handler(payload);
+      return payload;
     }
   }
 
-  protected async handleMessageUpsertPollVoteFailed(message, handler) {
+  protected async handleMessageUpsertPollVoteFailed(message) {
     const pollUpdateMessage = message.message?.pollUpdateMessage;
     if (!pollUpdateMessage) {
       return;
@@ -1640,13 +1832,13 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
       // https://github.com/WhiskeySockets/Baileys/pull/348
       // Or without toNumber() - it depends on the PR above
       // timestamp: pollUpdateMessage.senderTimestampMs.toNumber()
-      timestamp: message.messageTimestamp,
+      timestamp: ensureNumber(message.messageTimestamp),
     };
     const payload: PollVotePayload = {
       vote: pollVote,
       poll: getDestination(pollCreationMessageKey),
     };
-    handler(payload);
+    return payload;
   }
 
   private toCallData(call: WACallEvent): CallData {
@@ -1843,9 +2035,13 @@ export function toJID(chatId) {
  * {id: "AAA", remoteJid: "11111111111@s.whatsapp.net", "fromMe": false}
  * false_11111111111@c.us_AA
  */
-function buildMessageId({ id, remoteJid, fromMe }) {
+function buildMessageId({ id, remoteJid, fromMe, participant }: WAMessageKey) {
   const chatId = toCusFormat(remoteJid);
-  return `${fromMe || false}_${chatId}_${id}`;
+  const parts = [fromMe || false, chatId, id];
+  if (participant) {
+    parts.push(toCusFormat(participant));
+  }
+  return parts.join('_');
 }
 
 /**
@@ -1853,22 +2049,31 @@ function buildMessageId({ id, remoteJid, fromMe }) {
  * false_11111111111@c.us_AAA
  * {id: "AAA", remoteJid: "11111111111@s.whatsapp.net", "fromMe": false}
  */
-function parseMessageIdSerialized(messageId: string, soft: boolean = false) {
+function parseMessageIdSerialized(
+  messageId: string,
+  soft: boolean = false,
+): WAMessageKey {
   if (!messageId.includes('_') && soft) {
     return { id: messageId };
   }
 
   const parts = messageId.split('_');
-  if (parts.length != 3) {
+  if (parts.length != 3 && parts.length != 4) {
     throw new Error(
-      'Message id be in format false_11111111111@c.us_AAAAAAAAAAAAAAAAAAAA',
+      'Message id be in format false_11111111111@c.us_AAAAAAAAAAAAAAAAAAAA[_participant]',
     );
   }
   const fromMe = parts[0] == 'true';
   const chatId = parts[1];
   const remoteJid = toJID(chatId);
   const id = parts[2];
-  return { fromMe: fromMe, id: id, remoteJid: remoteJid };
+  const participant = parts[3] ? toJID(parts[3]) : undefined;
+  return {
+    fromMe: fromMe,
+    id: id,
+    remoteJid: remoteJid,
+    participant: participant,
+  };
 }
 
 function getId(object) {

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

@@ -6,7 +6,10 @@ export interface IChatRepository {
 
   getAllByIds(ids: string[]): Promise<Chat[]>;
 
-  getAllWithMessages(pagination: PaginationParams): Promise<Chat[]>;
+  getAllWithMessages(
+    pagination: PaginationParams,
+    broadcast: boolean,
+  ): Promise<Chat[]>;
 
   getById(id: string): Promise<Chat | null>;
 

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

@@ -0,0 +1,14 @@
+import { GroupMetadata } from '@adiwajshing/baileys';
+import { PaginationParams } from '@waha/structures/pagination.dto';
+
+export interface IGroupRepository {
+  getAll(pagination?: PaginationParams): Promise<GroupMetadata[]>;
+
+  getById(id: string): Promise<GroupMetadata | null>;
+
+  deleteAll(): Promise<void>;
+
+  deleteById(id: string): Promise<void>;
+
+  save(group: GroupMetadata): Promise<void>;
+}

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

@@ -1,5 +1,6 @@
 import { WAMessage } from '@adiwajshing/baileys';
 import { LabelAssociation } from '@adiwajshing/baileys/lib/Types/LabelAssociation';
+import { IGroupRepository } from '@waha/core/engines/noweb/store/IGroupRepository';
 import { ILabelAssociationRepository } from '@waha/core/engines/noweb/store/ILabelAssociationsRepository';
 import { ILabelsRepository } from '@waha/core/engines/noweb/store/ILabelsRepository';
 
@@ -16,6 +17,8 @@ export abstract class INowebStorage {
 
   abstract getChatRepository(): IChatRepository;
 
+  abstract getGroupRepository(): IGroupRepository;
+
   abstract getMessagesRepository(): IMessagesRepository;
 
   abstract getLabelsRepository(): ILabelsRepository;

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

@@ -4,6 +4,7 @@ import {
   Contact,
   proto,
 } from '@adiwajshing/baileys';
+import { GroupMetadata } from '@adiwajshing/baileys/lib/Types/GroupMetadata';
 import { Label } from '@adiwajshing/baileys/lib/Types/Label';
 import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
 import { PaginationParams } from '@waha/structures/pagination.dto';
@@ -27,7 +28,7 @@ export interface INowebStore {
 
   getMessageById(chatId: string, messageId: string): Promise<any>;
 
-  getChats(pagination: PaginationParams): Promise<Chat[]>;
+  getChats(pagination: PaginationParams, broadcast: boolean): Promise<Chat[]>;
 
   getContacts(pagination: PaginationParams): Promise<Contact[]>;
 
@@ -40,4 +41,8 @@ export interface INowebStore {
   getChatsByLabelId(labelId: string): Promise<Chat[]>;
 
   getChatLabels(chatId: string): Promise<Label[]>;
+
+  getGroups(pagination: PaginationParams): Promise<GroupMetadata[]>;
+
+  resetGroupsCache(): void;
 }

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

@@ -1,8 +1,15 @@
-import { Chat, Contact, makeInMemoryStore, proto } from '@adiwajshing/baileys';
+import makeWASocket, {
+  Chat,
+  Contact,
+  GroupMetadata,
+  makeInMemoryStore,
+  proto,
+} from '@adiwajshing/baileys';
 import { Label } from '@adiwajshing/baileys/lib/Types/Label';
 import { BadRequestException } from '@nestjs/common';
 import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
 import { PaginationParams } from '@waha/structures/pagination.dto';
+import { PaginatorInMemory } from '@waha/utils/Paginator';
 
 import { INowebStore } from './INowebStore';
 
@@ -10,6 +17,8 @@ import { INowebStore } from './INowebStore';
 const logger = require('pino')();
 
 export class NowebInMemoryStore implements INowebStore {
+  private socket: ReturnType<typeof makeWASocket>;
+
   private store: ReturnType<typeof makeInMemoryStore>;
   errorMessage =
     'Enable NOWEB store "config.noweb.store.enabled=True" and "config.noweb.store.full_sync=True" when starting a new session. ' +
@@ -33,6 +42,7 @@ export class NowebInMemoryStore implements INowebStore {
 
   bind(ev: any, socket: any) {
     this.store.bind(ev);
+    this.socket = socket;
   }
 
   loadMessage(jid: string, id: string): Promise<proto.IWebMessageInfo> {
@@ -51,7 +61,7 @@ export class NowebInMemoryStore implements INowebStore {
     throw new BadRequestException(this.errorMessage);
   }
 
-  getChats(pagination: PaginationParams): Promise<Chat[]> {
+  getChats(pagination: PaginationParams, broadcast: boolean): Promise<Chat[]> {
     throw new BadRequestException(this.errorMessage);
   }
 
@@ -78,4 +88,15 @@ export class NowebInMemoryStore implements INowebStore {
   getChatLabels(chatId: string): Promise<Label[]> {
     throw new BadRequestException(this.errorMessage);
   }
+
+  async getGroups(pagination: PaginationParams): Promise<GroupMetadata[]> {
+    const response = await this.socket?.groupFetchAllParticipating();
+    const groups = Object.values(response);
+    const paginator = new PaginatorInMemory(pagination);
+    return paginator.apply(groups);
+  }
+
+  resetGroupsCache() {
+    return;
+  }
 }

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

@@ -1,27 +1,34 @@
-import {
+import makeWASocket, {
+  areJidsSameUser,
   BaileysEventEmitter,
   Chat,
   ChatUpdate,
   Contact,
+  GroupParticipant,
   isRealMessage,
   jidNormalizedUser,
+  ParticipantAction,
   proto,
   updateMessageWithReaction,
   updateMessageWithReceipt,
 } from '@adiwajshing/baileys';
+import { GroupMetadata } from '@adiwajshing/baileys/lib/Types/GroupMetadata';
 import { Label } from '@adiwajshing/baileys/lib/Types/Label';
 import {
   LabelAssociation,
   LabelAssociationType,
 } from '@adiwajshing/baileys/lib/Types/LabelAssociation';
+import { IGroupRepository } from '@waha/core/engines/noweb/store/IGroupRepository';
 import { ILabelAssociationRepository } from '@waha/core/engines/noweb/store/ILabelAssociationsRepository';
 import { ILabelsRepository } from '@waha/core/engines/noweb/store/ILabelsRepository';
 import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
 import { PaginationParams, SortOrder } from '@waha/structures/pagination.dto';
+import { DefaultMap } from '@waha/utils/DefaultMap';
+import { sleep, waitUntil } from '@waha/utils/promiseTimeout';
+import * as lodash from 'lodash';
 import { toNumber } from 'lodash';
 import { Logger } from 'pino';
 
-import { toJID } from '../session.noweb.core';
 import { IChatRepository } from './IChatRepository';
 import { IContactRepository } from './IContactRepository';
 import { IMessagesRepository } from './IMessagesRepository';
@@ -31,15 +38,27 @@ import { INowebStore } from './INowebStore';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const AsyncLock = require('async-lock');
 
+type ms = number;
+const HOUR: ms = 60 * 60 * 1000;
+
 export class NowebPersistentStore implements INowebStore {
-  private socket: any;
+  private socket: ReturnType<typeof makeWASocket>;
   private chatRepo: IChatRepository;
+  private groupRepo: IGroupRepository;
   private contactRepo: IContactRepository;
   private messagesRepo: IMessagesRepository;
   private labelsRepo: ILabelsRepository;
   private labelAssociationsRepo: ILabelAssociationRepository;
   public presences: any;
   private lock: any;
+  private groupsFetchLock: any = new AsyncLock({
+    maxPending: Infinity,
+    maxExecutionTime: 60_000,
+  });
+
+  private lastTimeGroupUpdate: Date = new Date(0);
+  private lastTimeGroupFetch: Date = new Date(0);
+  private GROUP_METADATA_CACHE_TIME = 24 * HOUR;
 
   constructor(
     private logger: Logger,
@@ -47,6 +66,7 @@ export class NowebPersistentStore implements INowebStore {
   ) {
     this.socket = null;
     this.chatRepo = storage.getChatRepository();
+    this.groupRepo = storage.getGroupRepository();
     this.contactRepo = storage.getContactsRepository();
     this.messagesRepo = storage.getMessagesRepository();
     this.labelsRepo = storage.getLabelsRepository();
@@ -88,6 +108,19 @@ export class NowebPersistentStore implements INowebStore {
     ev.on('chats.delete', (data) =>
       this.withLock('chats', () => this.onChatDelete(data)),
     );
+    // Groups
+    ev.on('groups.upsert', (data) =>
+      this.withLock('groups', () => this.onGroupUpsert(data)),
+    );
+    ev.on('groups.update', (data) =>
+      this.withLock('groups', () => this.onGroupUpdate(data)),
+    );
+    ev.on('group-participants.update', (data) =>
+      this.withLock(`group-${data.id}`, () =>
+        this.onGroupParticipantsUpdate(data),
+      ),
+    );
+
     // Contacts
     ev.on('contacts.upsert', (data) =>
       this.withLock('contacts', () => this.onContactsUpsert(data)),
@@ -195,7 +228,84 @@ export class NowebPersistentStore implements INowebStore {
       chat.conversationTimestamp = toNumber(chat.conversationTimestamp);
       await this.chatRepo.save(chat);
     }
-    this.logger.info(`history sync - '${chats.length}' synced chats`);
+    this.logger.info(`store sync - '${chats.length}' synced chats`);
+  }
+
+  private async onGroupUpsert(groups: GroupMetadata[]) {
+    for (const group of groups) {
+      await this.groupRepo.save(group);
+    }
+    this.logger.info(`store sync - '${groups.length}' synced groups`);
+  }
+
+  private async onGroupUpdate(groups: Partial<GroupMetadata>[]) {
+    for (const update of groups) {
+      let group = await this.groupRepo.getById(update.id);
+      group = Object.assign(group || {}, update) as GroupMetadata;
+      await this.groupRepo.save(group);
+    }
+    this.logger.info(`store sync - '${groups.length}' updated groups`);
+    this.lastTimeGroupUpdate = new Date();
+  }
+
+  private async onGroupParticipantsUpdate(data) {
+    const id: string = data.id;
+    const participants: string[] = data.participants;
+    const action: ParticipantAction = data.action;
+
+    if (action == 'remove') {
+      // Remove the group if the current user is removed
+      const myJid = this.socket?.authState?.creds?.me?.id;
+      const participantsIncludesMe = lodash.find(participants, (p) =>
+        areJidsSameUser(p, myJid),
+      );
+      if (participantsIncludesMe) {
+        await this.groupRepo.deleteById(id);
+        return;
+      }
+    }
+
+    let group = await this.groupRepo.getById(id);
+    if (!group) {
+      group = { id: id, participants: [] } as GroupMetadata;
+    }
+
+    const participantsById = new DefaultMap<string, GroupParticipant>((key) => {
+      return { id: key, admin: null } as GroupParticipant;
+    });
+    for (const participant of group.participants) {
+      participantsById.set(participant.id, participant);
+    }
+
+    for (const participant of participants) {
+      this.participantUpdate(participantsById, participant, action);
+    }
+    group.participants = Array.from(participantsById.values());
+    await this.groupRepo.save(group);
+  }
+
+  private participantUpdate(
+    participantsById: DefaultMap<string, GroupParticipant>,
+    participant: string,
+    action: ParticipantAction,
+  ) {
+    switch (action) {
+      case 'add':
+        // if there's no participant - add it (by id)
+        participantsById.get(participant);
+        break;
+      case 'remove':
+        // remove the participant (by id)
+        participantsById.delete(participant);
+        break;
+      case 'promote':
+        // set admin: admin
+        participantsById.get(participant).admin = 'admin';
+        break;
+      case 'demote':
+        participantsById.get(participant).admin = null;
+        break;
+    }
   }
 
   private async onChatUpdate(updates: ChatUpdate[]) {
@@ -338,10 +448,45 @@ export class NowebPersistentStore implements INowebStore {
     return this.messagesRepo.getByJidById(chatId, messageId);
   }
 
-  getChats(pagination: PaginationParams): Promise<Chat[]> {
+  getChats(pagination: PaginationParams, broadcast: boolean): Promise<Chat[]> {
     pagination.sortBy ||= 'conversationTimestamp';
     pagination.sortOrder ||= SortOrder.DESC;
-    return this.chatRepo.getAllWithMessages(pagination);
+    return this.chatRepo.getAllWithMessages(pagination, broadcast);
+  }
+
+  private shouldFetchGroup(): boolean {
+    const timePassed = new Date().getTime() - this.lastTimeGroupFetch.getTime();
+    return timePassed > this.GROUP_METADATA_CACHE_TIME;
+  }
+
+  private async fetchGroups() {
+    await this.groupsFetchLock.acquire('groups-fetch', async () => {
+      if (!this.shouldFetchGroup()) {
+        // Update has been done by another request
+        return;
+      }
+      const lastTimeGroupUpdate = this.lastTimeGroupUpdate;
+      await this.groupRepo.deleteAll();
+      await this.socket?.groupFetchAllParticipating();
+      // Wait until the groups update is done
+      await waitUntil(
+        async () => this.lastTimeGroupUpdate > lastTimeGroupUpdate,
+        100,
+        5_000,
+      );
+      this.lastTimeGroupFetch = new Date();
+    });
+  }
+
+  resetGroupsCache() {
+    this.lastTimeGroupFetch = new Date(0);
+  }
+
+  async getGroups(pagination: PaginationParams): Promise<GroupMetadata[]> {
+    if (this.shouldFetchGroup()) {
+      await this.fetchGroups();
+    }
+    return this.groupRepo.getAll(pagination);
   }
 
   getContactById(jid) {

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

@@ -18,6 +18,11 @@ export const NOWEB_STORE_SCHEMA = [
       new Index('chats_conversationTimestamp_index', ['conversationTimestamp']),
     ],
   ),
+  new Schema(
+    'groups',
+    [new Field('id', 'TEXT'), new Field('data', 'TEXT')],
+    [new Index('groups_id_index', ['id'])],
+  ),
   new Schema(
     'messages',
     [

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

@@ -15,9 +15,18 @@ export class Sqlite3ChatRepository
 {
   protected Paginator = ChatPaginator;
 
-  async getAllWithMessages(pagination: PaginationParams): Promise<Chat[]> {
+  async getAllWithMessages(
+    pagination: PaginationParams,
+    broadcast: boolean,
+  ): Promise<Chat[]> {
     // Get chats with conversationTimestamp is not Null
     let query = this.select().whereNotNull('conversationTimestamp');
+    if (!broadcast) {
+      // filter out chat by id if it ends at @newsletter or @broadcast
+      query = query
+        .andWhereNot('id', 'like', '%@broadcast')
+        .andWhereNot('id', 'like', '%@newsletter');
+    }
     query = this.pagination(query, pagination);
     return await this.all(query);
   }

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

@@ -0,0 +1,16 @@
+import { GroupMetadata } from '@adiwajshing/baileys/lib/Types/GroupMetadata';
+import { IGroupRepository } from '@waha/core/engines/noweb/store/IGroupRepository';
+import { KnexPaginator } from '@waha/utils/Paginator';
+
+import { NOWEBSqlite3KVRepository } from './NOWEBSqlite3KVRepository';
+
+class Paginator extends KnexPaginator {
+  indexes = ['id'];
+}
+
+export class Sqlite3GroupRepository
+  extends NOWEBSqlite3KVRepository<GroupMetadata>
+  implements IGroupRepository
+{
+  protected Paginator = Paginator;
+}

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

@@ -2,6 +2,7 @@ import { WAMessage } from '@adiwajshing/baileys';
 import { LabelAssociation } from '@adiwajshing/baileys/lib/Types/LabelAssociation';
 import { ILabelAssociationRepository } from '@waha/core/engines/noweb/store/ILabelAssociationsRepository';
 import { ILabelsRepository } from '@waha/core/engines/noweb/store/ILabelsRepository';
+import { Sqlite3GroupRepository } from '@waha/core/engines/noweb/store/sqlite3/Sqlite3GroupRepository';
 import { Sqlite3LabelAssociationsRepository } from '@waha/core/engines/noweb/store/sqlite3/Sqlite3LabelAssociationsRepository';
 import { Sqlite3LabelsRepository } from '@waha/core/engines/noweb/store/sqlite3/Sqlite3LabelsRepository';
 import { Field, Index, Schema } from '@waha/core/storage/sqlite3/Schema';
@@ -62,6 +63,14 @@ export class Sqlite3Storage extends INowebStorage {
       'CREATE INDEX IF NOT EXISTS chats_conversationTimestamp_index ON chats (conversationTimestamp)',
     );
 
+    // Groups
+    this.db.exec(
+      'CREATE TABLE IF NOT EXISTS groups (id TEXT PRIMARY KEY, data TEXT)',
+    );
+    this.db.exec(
+      'CREATE UNIQUE INDEX IF NOT EXISTS groups_id_index ON groups (id)',
+    );
+
     // Messages
     this.db.exec(
       'CREATE TABLE IF NOT EXISTS messages (jid TEXT, id TEXT, messageTimestamp INTEGER, data TEXT)',
@@ -119,6 +128,10 @@ export class Sqlite3Storage extends INowebStorage {
     return new Sqlite3ChatRepository(this.db, this.getSchema('chats'));
   }
 
+  getGroupRepository() {
+    return new Sqlite3GroupRepository(this.db, this.getSchema('groups'));
+  }
+
   getLabelsRepository(): ILabelsRepository {
     return new Sqlite3LabelsRepository(this.db, this.getSchema('labels'));
   }

src/core/engines/noweb/useMultiFileAuthState.ts

@@ -4,9 +4,12 @@ import {
   proto,
 } from '@adiwajshing/baileys';
 import { BufferJSON, initAuthCreds } from '@adiwajshing/baileys/lib/Utils';
-import { mkdir, readFile, stat, unlink, writeFile } from 'fs/promises';
+import { mkdir, readFile, stat, unlink } from 'fs/promises';
 import { join } from 'path';
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const writeFileAtomic = require('write-file-atomic');
+
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const AsyncLock = require('async-lock');
 
@@ -33,7 +36,10 @@ export const useMultiFileAuthState = async (
   const writeData = (data: any, file: string) => {
     const filePath = join(folder, fixFileName(file));
     return fileLock.acquire(filePath, () =>
-      writeFile(join(filePath), JSON.stringify(data, BufferJSON.replacer)),
+      writeFileAtomic(
+        join(filePath),
+        JSON.stringify(data, BufferJSON.replacer),
+      ),
     );
   };
 

src/core/engines/noweb/utils.ts

@@ -78,6 +78,14 @@ const isObjectALong = (value: any): value is Long => {
   );
 };
 
+export function ensureNumber(value: number | Long): number {
+  if (!value) {
+    // @ts-ignore
+    return value;
+  }
+  return typeof value === 'number' ? value : toNumber(value);
+}
+
 const toNumber = (longValue: Long): number => {
   const { low, high, unsigned } = longValue;
   const result = unsigned ? low >>> 0 : low + high * 0x100000000;

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

@@ -1,10 +1,8 @@
 import { UnprocessableEntityException } from '@nestjs/common';
 import {
   getChannelInviteLink,
-  WAHAInternalEvent,
   WhatsappSession,
 } from '@waha/core/abc/session.abc';
-import { toJID } from '@waha/core/engines/noweb/session.noweb.core';
 import { LocalAuth } from '@waha/core/engines/webjs/LocalAuth';
 import { WebjsClient } from '@waha/core/engines/webjs/WebjsClient';
 import {
@@ -15,7 +13,6 @@ import { IMediaEngineProcessor } from '@waha/core/media/IMediaEngineProcessor';
 import { QR } from '@waha/core/QR';
 import { splitAt } from '@waha/helpers';
 import { PairingCodeResponse } from '@waha/structures/auth.dto';
-import { CallData } from '@waha/structures/calls.dto';
 import {
   Channel,
   ChannelRole,
@@ -23,8 +20,8 @@ import {
   ListChannelsQuery,
 } from '@waha/structures/channels.dto';
 import {
-  ChatArchiveEvent,
   ChatSortField,
+  ChatSummary,
   GetChatMessageQuery,
   GetChatMessagesFilter,
   GetChatMessagesQuery,
@@ -57,23 +54,26 @@ import {
 } from '@waha/structures/enums.dto';
 import {
   CreateGroupRequest,
+  GroupSortField,
   ParticipantsRequest,
   SettingsSecurityChangeInfo,
 } from '@waha/structures/groups.dto';
 import { Label, LabelDTO, LabelID } from '@waha/structures/labels.dto';
 import { ReplyToMessage } from '@waha/structures/message.dto';
-import { PaginationParams } from '@waha/structures/pagination.dto';
+import { PaginationParams, SortOrder } from '@waha/structures/pagination.dto';
 import { WAMessage, WAMessageReaction } from '@waha/structures/responses.dto';
 import { MeInfo } from '@waha/structures/sessions.dto';
+import { StatusRequest, TextStatus } from '@waha/structures/status.dto';
 import {
-  BROADCAST_ID,
-  StatusRequest,
-  TextStatus,
-} from '@waha/structures/status.dto';
-import { WAMessageRevokedBody } from '@waha/structures/webhooks.dto';
+  EnginePayload,
+  WAMessageRevokedBody,
+} from '@waha/structures/webhooks.dto';
 import { PaginatorInMemory } from '@waha/utils/Paginator';
 import { sleep, waitUntil } from '@waha/utils/promiseTimeout';
 import { SingleDelayedJobRunner } from '@waha/utils/SingleDelayedJobRunner';
+import * as lodash from 'lodash';
+import { fromEvent, merge, mergeMap, Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 import {
   Call,
   Channel as WEBJSChannel,
@@ -96,6 +96,7 @@ const QRCode = require('qrcode');
 
 export interface WebJSConfig {
   webVersion?: string;
+  cacheType: 'local' | 'none';
 }
 
 export class WhatsappSessionWebJSCore extends WhatsappSession {
@@ -140,7 +141,11 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     const path = this.getClassDirName();
     const webVersion =
       this.engineConfig?.webVersion || '2.3000.1018072227-alpha';
-    this.logger.info(`Using web version: '${webVersion}'`);
+    const cacheType = this.engineConfig?.cacheType || 'none';
+    this.logger.info(`Using cache type: '${cacheType}'`);
+    if (cacheType === 'local') {
+      this.logger.info(`Using web version: '${webVersion}'`);
+    }
     return {
       puppeteer: {
         headless: true,
@@ -150,8 +155,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       },
       webVersion: webVersion,
       webVersionCache: {
-        // type: 'none',
-        type: 'local',
+        type: cacheType,
         path: path,
         strict: true,
       },
@@ -244,7 +248,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       this.listenEngineEventsInDebugMode();
     }
     this.listenConnectionEvents();
-    this.events.emit(WAHAInternalEvent.ENGINE_START);
+    this.subscribeEngineEvents2();
   }
 
   async start() {
@@ -260,7 +264,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
   async stop() {
     this.shouldRestart = false;
     this.status = WAHASessionStatus.STOPPED;
-    this.events.removeAllListeners();
+    this.stopEvents();
     this.startDelayedJob.cancel();
     await this.end();
   }
@@ -564,6 +568,41 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     return this.whatsapp.getChats(pagination);
   }
 
+  public async getChatsOverview(
+    pagination: PaginationParams,
+  ): Promise<ChatSummary[]> {
+    pagination = {
+      ...pagination,
+      sortBy: ChatSortField.CONVERSATION_TIMESTAMP,
+      sortOrder: SortOrder.DESC,
+    };
+    const chats = await this.getChats(pagination);
+
+    const promises = [];
+    for (const chat of chats) {
+      promises.push(this.fetchChatSummary(chat));
+    }
+    const result = await Promise.all(promises);
+    return result;
+  }
+
+  protected async fetchChatSummary(chat: Chat): Promise<ChatSummary> {
+    const picture = await this.getContactProfilePicture(
+      chat.id._serialized,
+      false,
+    );
+    const lastMessage = !!chat.lastMessage
+      ? this.toWAMessage(chat.lastMessage)
+      : null;
+    return {
+      id: chat.id._serialized,
+      name: chat.name || null,
+      picture: picture,
+      lastMessage: lastMessage,
+      _chat: chat,
+    };
+  }
+
   public async getChatMessages(
     chatId: string,
     query: GetChatMessagesQuery,
@@ -575,7 +614,6 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       );
     }
 
-    const limit = query.limit;
     const downloadMedia = query.downloadMedia;
     // Test there's chat with id
     await this.whatsapp.getChatById(this.ensureSuffix(chatId));
@@ -604,6 +642,23 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     return await this.processIncomingMessage(message, query.downloadMedia);
   }
 
+  public async pinMessage(
+    chatId: string,
+    messageId: string,
+    duration: number,
+  ): Promise<boolean> {
+    const message = await this.whatsapp.getMessageById(messageId);
+    return message.pin(duration);
+  }
+
+  public async unpinMessage(
+    chatId: string,
+    messageId: string,
+  ): Promise<boolean> {
+    const message = await this.whatsapp.getMessageById(messageId);
+    return message.unpin();
+  }
+
   async deleteChat(chatId) {
     const chat = await this.whatsapp.getChatById(chatId);
     return chat.delete();
@@ -706,11 +761,10 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     return { about: await contact.getAbout() };
   }
 
-  public async getContactProfilePicture(query: ContactQuery) {
-    const contact = await this.whatsapp.getContactById(
-      this.ensureSuffix(query.contactId),
-    );
-    return { profilePictureURL: await contact.getProfilePicUrl() };
+  public async fetchContactProfilePicture(id: string) {
+    const contact = await this.whatsapp.getContactById(this.ensureSuffix(id));
+    const url = await contact.getProfilePicUrl();
+    return url;
   }
 
   public async blockContact(request: ContactRequest) {
@@ -737,6 +791,14 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     return this.whatsapp.createGroup(request.name, participantIds);
   }
 
+  public joinGroup(code: string) {
+    return this.whatsapp.acceptInvite(code);
+  }
+
+  public joinInfoGroup(code: string) {
+    return this.whatsapp.getInviteInfo(code);
+  }
+
   public async getInfoAdminsOnly(id): Promise<SettingsSecurityChangeInfo> {
     const groupChat = (await this.whatsapp.getChatById(id)) as GroupChat;
     return {
@@ -766,10 +828,25 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     return groupChat.setMessagesAdminsOnly(value);
   }
 
-  public getGroups() {
-    return this.whatsapp
-      .getChats()
-      .then((chats) => chats.filter((chat) => chat.isGroup));
+  public async getGroups(pagination: PaginationParams) {
+    const chats = await this.whatsapp.getChats();
+    const groups = lodash.filter(chats, (chat) => chat.isGroup);
+
+    switch (pagination.sortBy) {
+      case GroupSortField.ID:
+        pagination.sortBy = 'id._serialized';
+        break;
+      case GroupSortField.SUBJECT:
+        pagination.sortBy = 'groupMetadata.subject';
+        break;
+    }
+
+    const paginator = new PaginatorInMemory(pagination);
+    return paginator.apply(groups);
+  }
+
+  public async refreshGroups(): Promise<boolean> {
+    return true;
   }
 
   public getGroup(id) {
@@ -994,85 +1071,146 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
   /**
    * END - Methods for API
    */
-
-  subscribeEngineEvent(event, handler): boolean {
-    switch (event) {
-      case WAHAEvents.MESSAGE:
-        this.whatsapp.on(Events.MESSAGE_RECEIVED, (message) =>
-          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,
-          async (after, before) => {
-            const afterMessage = after ? await this.toWAMessage(after) : null;
-            const beforeMessage = before
-              ? await this.toWAMessage(before)
-              : null;
-            const body: WAMessageRevokedBody = {
-              after: afterMessage,
-              before: beforeMessage,
+  subscribeEngineEvents2() {
+    //
+    // All
+    //
+    const events: Observable<EnginePayload>[] = [];
+    for (const key in Events) {
+      const event = Events[key];
+      const event$ = fromEvent(this.whatsapp, event);
+      events.push(
+        event$.pipe(
+          map((data) => {
+            return {
+              event: event,
+              data: data,
             };
-            handler(body);
-          },
-        );
-        return true;
-      case WAHAEvents.MESSAGE_REACTION:
-        this.whatsapp.on('message_reaction', (message) =>
-          handler(this.processMessageReaction(message)),
-        );
-        return true;
-      case WAHAEvents.MESSAGE_ANY:
-        this.whatsapp.on(Events.MESSAGE_CREATE, (message) =>
-          this.processIncomingMessage(message).then(handler),
-        );
-        return true;
-      case WAHAEvents.STATE_CHANGE:
-        this.whatsapp.on(Events.STATE_CHANGED, handler);
-        return true;
-      case WAHAEvents.MESSAGE_ACK:
-        // We do not download media here
-        this.whatsapp.on(Events.MESSAGE_ACK, (message) =>
-          this.toWAMessage(message).then(handler),
-        );
-        return true;
-      case WAHAEvents.GROUP_JOIN:
-        this.whatsapp.on(Events.GROUP_JOIN, handler);
-        return true;
-      case WAHAEvents.GROUP_LEAVE:
-        this.whatsapp.on(Events.GROUP_LEAVE, handler);
-        return true;
-      case WAHAEvents.CHAT_ARCHIVE:
-        this.whatsapp.on('chat_archived', (chat, archived, _) => {
-          const body: ChatArchiveEvent = {
-            id: chat.id._serialized,
-            archived: archived,
-            timestamp: chat.timestamp,
-          };
-          handler(body);
-        });
-        return true;
-      case WAHAEvents.CALL_RECEIVED:
-        this.whatsapp.on('call', (call: Call) => {
-          const body: CallData = {
-            id: call.id,
-            from: call.from,
-            timestamp: call.timestamp,
-            isVideo: call.isVideo,
-            isGroup: call.isGroup,
-          };
-          handler(body);
-        });
-        return true;
-      default:
-        return false;
+          }),
+        ),
+      );
     }
+    const all$ = merge(...events);
+    this.events2.get(WAHAEvents.ENGINE_EVENT).switch(all$);
+
+    //
+    // Messages
+    //
+    const messageReceived$ = fromEvent(this.whatsapp, Events.MESSAGE_RECEIVED);
+    const messagesFromOthers$ = messageReceived$.pipe(
+      mergeMap((msg: any) => this.processIncomingMessage(msg, true)),
+    );
+    this.events2.get(WAHAEvents.MESSAGE).switch(messagesFromOthers$);
+
+    const messageCreate$ = fromEvent(this.whatsapp, Events.MESSAGE_CREATE);
+    const messagesFromAll$ = messageCreate$.pipe(
+      mergeMap((msg: any) => this.processIncomingMessage(msg, true)),
+    );
+    this.events2.get(WAHAEvents.MESSAGE_ANY).switch(messagesFromAll$);
+
+    const messageCiphertext$ = fromEvent(
+      this.whatsapp,
+      Events.MESSAGE_CIPHERTEXT,
+    );
+    const messagesWaiting$ = messageCiphertext$.pipe(
+      mergeMap((msg: any) => this.processIncomingMessage(msg, true)),
+    );
+    this.events2.get(WAHAEvents.MESSAGE_WAITING).switch(messagesWaiting$);
+
+    const messageRevoked$ = fromEvent(
+      this.whatsapp,
+      Events.MESSAGE_REVOKED_EVERYONE,
+      (after, before) => {
+        return { after, before };
+      },
+    );
+    const messagesRevoked$ = messageRevoked$.pipe(
+      map((event): WAMessageRevokedBody => {
+        const afterMessage = event.after ? this.toWAMessage(event.after) : null;
+        const beforeMessage = event.before
+          ? this.toWAMessage(event.before)
+          : null;
+        return {
+          after: afterMessage,
+          before: beforeMessage,
+        };
+      }),
+    );
+    this.events2.get(WAHAEvents.MESSAGE_REVOKED).switch(messagesRevoked$);
+
+    const messageReaction$ = fromEvent(this.whatsapp, 'message_reaction');
+    const messagesReaction$ = messageReaction$.pipe(
+      map(this.processMessageReaction.bind(this)),
+    );
+    this.events2.get(WAHAEvents.MESSAGE_REACTION).switch(messagesReaction$);
+
+    const messageAck$ = fromEvent(
+      this.whatsapp,
+      Events.MESSAGE_ACK,
+      (message, ack) => {
+        return { message, ack };
+      },
+    );
+    const messagesAck$ = messageAck$.pipe(
+      map((event) => event.message),
+      map(this.toWAMessage.bind(this)),
+    );
+    this.events2.get(WAHAEvents.MESSAGE_ACK).switch(messagesAck$);
+
+    //
+    // Others
+    //
+    const stateChanged$ = fromEvent(this.whatsapp, Events.STATE_CHANGED);
+    this.events2.get(WAHAEvents.STATE_CHANGE).switch(stateChanged$);
+
+    //
+    // Groups
+    //
+    const groupJoin$ = fromEvent(this.whatsapp, Events.GROUP_JOIN);
+    this.events2.get(WAHAEvents.GROUP_JOIN).switch(groupJoin$);
+    const groupLeave$ = fromEvent(this.whatsapp, Events.GROUP_LEAVE);
+    this.events2.get(WAHAEvents.GROUP_LEAVE).switch(groupLeave$);
+
+    //
+    // Chats
+    //
+    const chatArchived$ = fromEvent(
+      this.whatsapp,
+      'chat_archived',
+      (chat, archived, _) => {
+        return {
+          chat: chat,
+          archived: archived,
+        };
+      },
+    );
+    const chatsArchived$ = chatArchived$.pipe(
+      map((event) => {
+        return {
+          id: event.chat.id._serialized,
+          archived: event.archived,
+          timestamp: event.chat.timestamp,
+        };
+      }),
+    );
+    this.events2.get(WAHAEvents.CHAT_ARCHIVE).switch(chatsArchived$);
+
+    //
+    // Calls
+    //
+    const call$ = fromEvent(this.whatsapp, 'call');
+    const calls$ = call$.pipe(
+      map((call: Call) => {
+        return {
+          id: call.id,
+          from: call.from,
+          timestamp: call.timestamp,
+          isVideo: call.isVideo,
+          isGroup: call.isGroup,
+        };
+      }),
+    );
+    this.events2.get(WAHAEvents.CALL_RECEIVED).switch(calls$);
   }
 
   private async processIncomingMessage(message: Message, downloadMedia = true) {
@@ -1084,7 +1222,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
         this.logger.error(e, e.stack);
       }
     }
-    return await this.toWAMessage(message);
+    return this.toWAMessage(message);
   }
 
   private processMessageReaction(reaction: Reaction): WAMessageReaction {
@@ -1102,10 +1240,10 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
     };
   }
 
-  protected toWAMessage(message: Message): Promise<WAMessage> {
+  protected toWAMessage(message: Message): WAMessage {
     const replyTo = this.extractReplyTo(message);
     // @ts-ignore
-    return Promise.resolve({
+    return {
       id: message.id._serialized,
       timestamp: message.timestamp,
       from: message.from,
@@ -1126,7 +1264,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       vCards: message.vCards,
       replyTo: replyTo,
       _data: message.rawData,
-    });
+    };
   }
 
   protected extractReplyTo(message: Message): ReplyToMessage | null {

src/core/integrations/webhooks/WebhookConductor.ts

@@ -0,0 +1,54 @@
+import { populateSessionInfo } from '@waha/core/abc/manager.abc';
+import { WhatsappSession } from '@waha/core/abc/session.abc';
+import { WebhookSender } from '@waha/core/integrations/webhooks/WebhookSender';
+import { WAHAEvents, WAHAEventsWild } from '@waha/structures/enums.dto';
+import { WebhookConfig } from '@waha/structures/webhooks.config.dto';
+import { EventWildUnmask } from '@waha/utils/events';
+import { LoggerBuilder } from '@waha/utils/logging';
+import { Logger } from 'pino';
+
+export class WebhookConductor {
+  private logger: Logger;
+  private eventUnmask = new EventWildUnmask(WAHAEvents, WAHAEventsWild);
+
+  constructor(protected loggerBuilder: LoggerBuilder) {
+    this.logger = loggerBuilder.child({ name: WebhookConductor.name });
+  }
+
+  protected buildSender(webhookConfig: WebhookConfig): WebhookSender {
+    return new WebhookSender(this.loggerBuilder, webhookConfig);
+  }
+
+  private getSuitableEvents(events: WAHAEvents[] | string[]): WAHAEvents[] {
+    return this.eventUnmask.unmask(events);
+  }
+
+  public configure(session: WhatsappSession, webhooks: WebhookConfig[]) {
+    for (const webhookConfig of webhooks) {
+      this.configureSingleWebhook(session, webhookConfig);
+    }
+  }
+
+  private configureSingleWebhook(
+    session: WhatsappSession,
+    webhook: WebhookConfig,
+  ) {
+    if (!webhook || !webhook.url || webhook.events.length === 0) {
+      return;
+    }
+
+    const url = webhook.url;
+    this.logger.info(`Configuring webhooks for ${url}...`);
+    const events = this.getSuitableEvents(webhook.events);
+    const sender = this.buildSender(webhook);
+    for (const event of events) {
+      const obs$ = session.getEventObservable(event);
+      obs$.subscribe((payload) => {
+        const data = populateSessionInfo(event, session)(payload);
+        sender.send(data);
+      });
+      this.logger.debug(`Event '${event}' is enabled for url: ${url}`);
+    }
+    this.logger.info(`Webhooks were configured for ${url}.`);
+  }
+}

src/core/integrations/webhooks/WebhookSender.ts

@@ -0,0 +1,203 @@
+import { SECOND } from '@waha/structures/enums.dto';
+import {
+  RetryPolicy,
+  WebhookConfig,
+} from '@waha/structures/webhooks.config.dto';
+import { LoggerBuilder } from '@waha/utils/logging';
+import { VERSION } from '@waha/version';
+import axios, { AxiosInstance } from 'axios';
+import axiosRetry, { retryAfter } from 'axios-retry';
+import * as crypto from 'crypto';
+import { Logger } from 'pino';
+import { ulid } from 'ulid';
+
+// 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;
+
+const DEFAULT_RETRY_DELAY_SECONDS = 2;
+const DEFAULT_RETRY_ATTEMPTS = 15;
+const DEFAULT_HMAC_ALGORITHM = 'sha512';
+
+function noDelay(_retryNumber = 0, error: any) {
+  return Math.max(0, retryAfter(error));
+}
+
+function constantDelay(delayFactor: number) {
+  return (_retryNumber = 0, error = undefined) => {
+    return Math.max(delayFactor, retryAfter(error));
+  };
+}
+
+export function exponentialDelay(delayFactor: number) {
+  return (retryNumber = 0, error = undefined) => {
+    const calculatedDelay = 2 ** retryNumber * delayFactor;
+    const delay = Math.max(calculatedDelay, retryAfter(error));
+    const randomSum = delay * 0.2 * Math.random(); // 0-20% of the delay
+    return delay + randomSum;
+  };
+}
+
+export class WebhookSender {
+  protected static AGENTS = {
+    http: new HttpAgent({}),
+    https: new HttpsAgent({}),
+  };
+
+  protected url: string;
+  protected logger: Logger;
+  protected readonly config: WebhookConfig;
+
+  protected axios: AxiosInstance;
+
+  constructor(
+    loggerBuilder: LoggerBuilder,
+    protected webhookConfig: WebhookConfig,
+  ) {
+    this.url = webhookConfig.url;
+    this.logger = loggerBuilder.child({ name: WebhookSender.name });
+    this.config = webhookConfig;
+    this.axios = this.buildAxiosInstance();
+  }
+
+  send(json: any) {
+    const body = JSON.stringify(json);
+    const headers = {
+      'content-type': 'application/json',
+    };
+    Object.assign(headers, this.getWebhookHeader());
+    Object.assign(headers, this.getHMACHeaders(body));
+    const ctx = {
+      id: headers['X-Webhook-Request-Id'],
+      ['event.id']: json.id,
+      url: this.url,
+    };
+    this.logger.info(ctx, `Sending POST...`);
+    this.logger.debug(ctx, `POST DATA`);
+
+    this.axios
+      .post(this.url, body, { headers: headers })
+      .then((response) => {
+        this.logger.info(
+          ctx,
+          `POST request was sent with status code: ${response.status}`,
+        );
+        this.logger.debug(
+          {
+            ...ctx,
+            body: response.data,
+          },
+          `Response`,
+        );
+      })
+      .catch((error) => {
+        this.logger.error(
+          {
+            ...ctx,
+            error: error.message,
+            data: error.response?.data,
+          },
+          `POST request failed: ${error.message}`,
+        );
+      });
+  }
+
+  protected buildAxiosInstance(): AxiosInstance {
+    // configure headers
+    const customHeaders = this.config.customHeaders || [];
+    const headers = {
+      'content-type': 'application/json',
+      'User-Agent': `WAHA/${VERSION.version}`,
+    };
+    customHeaders.forEach((header) => {
+      headers[header.name] = header.value;
+    });
+
+    // configure retry
+    const attempts = this.config.retries?.attempts ?? DEFAULT_RETRY_ATTEMPTS;
+    const delaySeconds =
+      this.config.retries?.delaySeconds ?? DEFAULT_RETRY_DELAY_SECONDS;
+    const delayMs = delaySeconds * SECOND;
+    const policy = this.config.retries?.policy;
+    const retryDelay = this.buildRetryDelay(policy, delayMs);
+
+    const instance = axios.create({
+      headers: headers,
+      httpAgent: WebhookSender.AGENTS.http,
+      httpsAgent: WebhookSender.AGENTS.https,
+    });
+    axiosRetry(instance, {
+      retries: attempts,
+      retryDelay: retryDelay,
+      retryCondition: (error) => true,
+      onRetry: (retryCount, error, requestConfig) => {
+        this.logger.warn(
+          { id: requestConfig.headers['X-Webhook-Request-Id'] },
+          `Error sending POST request: '${error.message}'. Retrying ${retryCount}/${attempts}...`,
+        );
+      },
+    });
+    return instance;
+  }
+
+  protected getHMACHeaders(body: string) {
+    // HMAC
+    const hmac = this.calculateHmac(body, DEFAULT_HMAC_ALGORITHM);
+    if (!hmac) {
+      return {};
+    }
+    return {
+      'X-Webhook-Hmac': hmac,
+      'X-Webhook-Hmac-Algorithm': DEFAULT_HMAC_ALGORITHM,
+    };
+  }
+
+  protected getWebhookHeader() {
+    return {
+      // UUID, no '-' in it
+      'X-Webhook-Request-Id': ulid(),
+      // unix timestamp with ms
+      'X-Webhook-Timestamp': Date.now().toString(),
+    };
+  }
+
+  private calculateHmac(body, algorithm) {
+    if (!this.config.hmac || !this.config.hmac.key) {
+      return undefined;
+    }
+
+    return crypto
+      .createHmac(algorithm, this.config.hmac.key)
+      .update(body)
+      .digest('hex');
+  }
+
+  private buildRetryDelay(
+    policy: RetryPolicy | null,
+    ms: number,
+  ): (retryNumber: number, error: any) => number {
+    if (!ms) {
+      this.logger.debug(`Using no delay, because delaySeconds set to 0`);
+      return noDelay;
+    }
+
+    switch (policy) {
+      case RetryPolicy.CONSTANT:
+        this.logger.debug(`Using constant delay with '${ms}' ms factor`);
+        return constantDelay(ms);
+
+      case RetryPolicy.LINEAR:
+        this.logger.debug(`Using linear delay with '${ms}' ms factor`);
+        return axiosRetry.linearDelay(ms);
+
+      case RetryPolicy.EXPONENTIAL:
+        this.logger.debug(`Using exponential delay with '${ms}' ms factor`);
+        return exponentialDelay(ms);
+
+      default:
+        this.logger.debug('No delay policy specified, using constant delay');
+        return constantDelay(ms);
+    }
+  }
+}

src/core/manager.core.ts

@@ -3,11 +3,17 @@ import {
   NotFoundException,
   UnprocessableEntityException,
 } from '@nestjs/common';
+import { WebJSEngineConfigService } from '@waha/core/config/WebJSEngineConfigService';
+import { WebhookConductor } from '@waha/core/integrations/webhooks/WebhookConductor';
 import { MediaStorageFactory } from '@waha/core/media/MediaStorageFactory';
+import { DefaultMap } from '@waha/utils/DefaultMap';
 import { getPinoLogLevel, LoggerBuilder } from '@waha/utils/logging';
 import { promiseTimeout, sleep } from '@waha/utils/promiseTimeout';
-import { EventEmitter } from 'events';
+import { complete } from '@waha/utils/reactive/complete';
+import { SwitchObservable } from '@waha/utils/reactive/SwitchObservable';
 import { PinoLogger } from 'nestjs-pino';
+import { Observable, retry, share } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { WhatsappConfigService } from '../config.service';
 import {
@@ -23,7 +29,7 @@ import {
   SessionInfo,
 } from '../structures/sessions.dto';
 import { WebhookConfig } from '../structures/webhooks.config.dto';
-import { SessionManager } from './abc/manager.abc';
+import { populateSessionInfo, SessionManager } from './abc/manager.abc';
 import { SessionParams, WhatsappSession } from './abc/session.abc';
 import { EngineConfigService } from './config/EngineConfigService';
 import { WhatsappSessionNoWebCore } from './engines/noweb/session.noweb.core';
@@ -33,7 +39,6 @@ import { getProxyConfig } from './helpers.proxy';
 import { MediaManager } from './media/MediaManager';
 import { LocalSessionAuthRepository } from './storage/LocalSessionAuthRepository';
 import { LocalStoreCore } from './storage/LocalStoreCore';
-import { WebhookConductorCore } from './webhooks.core';
 
 export class OnlyDefaultSessionIsAllowed extends UnprocessableEntityException {
   constructor() {
@@ -59,22 +64,29 @@ export class SessionManagerCore extends SessionManager {
   private sessionConfig?: SessionConfig;
   DEFAULT = 'default';
 
-  // @ts-ignore
-  protected WebhookConductorClass = WebhookConductorCore;
   protected readonly EngineClass: typeof WhatsappSession;
+  protected events2: DefaultMap<WAHAEvents, SwitchObservable<any>>;
 
   constructor(
     config: WhatsappConfigService,
     private engineConfigService: EngineConfigService,
+    private webjsEngineConfigService: WebJSEngineConfigService,
     log: PinoLogger,
     private mediaStorageFactory: MediaStorageFactory,
   ) {
     super(config, log);
-    this.events = new EventEmitter();
     this.session = DefaultSessionStatus.STOPPED;
     this.sessionConfig = null;
     const engineName = this.engineConfigService.getDefaultEngineName();
     this.EngineClass = this.getEngine(engineName);
+
+    this.events2 = new DefaultMap<WAHAEvents, SwitchObservable<any>>(
+      (key) =>
+        new SwitchObservable((obs$) => {
+          return obs$.pipe(retry(), share());
+        }),
+    );
+
     this.store = new LocalStoreCore(engineName.toLowerCase());
     this.sessionAuthRepository = new LocalSessionAuthRepository(this.store);
     this.startPredefinedSessions();
@@ -100,6 +112,7 @@ export class SessionManagerCore extends SessionManager {
   }
 
   async beforeApplicationShutdown(signal?: string) {
+    this.stopEvents();
     if (!this.session) {
       return;
     }
@@ -138,7 +151,7 @@ export class SessionManagerCore extends SessionManager {
         `Session '${this.DEFAULT}' is already started.`,
       );
     }
-    this.log.info(`'${name}' - starting session...`);
+    this.log.info({ session: name }, `Starting session...`);
     const logger = this.log.logger.child({ session: name });
     logger.level = getPinoLogLevel(this.sessionConfig?.debug);
     const loggerBuilder: LoggerBuilder = logger;
@@ -153,7 +166,7 @@ export class SessionManagerCore extends SessionManager {
       loggerBuilder.child({ name: 'MediaManager' }),
     );
 
-    const webhook = new this.WebhookConductorClass(loggerBuilder);
+    const webhook = new WebhookConductor(loggerBuilder);
     const proxyConfig = this.getProxyConfig();
     const sessionConfig: SessionParams = {
       name,
@@ -164,21 +177,19 @@ export class SessionManagerCore extends SessionManager {
       proxyConfig: proxyConfig,
       sessionConfig: this.sessionConfig,
     };
+    if (this.EngineClass === WhatsappSessionWebJSCore) {
+      sessionConfig.engineConfig = this.webjsEngineConfigService.getConfig();
+    }
     await this.sessionAuthRepository.init(name);
     // @ts-ignore
     const session = new this.EngineClass(sessionConfig);
     this.session = session;
+    this.updateSession();
 
     // configure webhooks
     const webhooks = this.getWebhooks();
     webhook.configure(session, webhooks);
 
-    // configure events
-    session.events.on(
-      WAHAEvents.SESSION_STATUS,
-      this.handleSessionEvent(WAHAEvents.SESSION_STATUS, session),
-    );
-
     // start session
     await session.start();
     logger.info('Session has been started.');
@@ -189,14 +200,32 @@ export class SessionManagerCore extends SessionManager {
     };
   }
 
+  private updateSession() {
+    if (!this.session) {
+      return;
+    }
+    const session: WhatsappSession = this.session as WhatsappSession;
+    for (const eventName in WAHAEvents) {
+      const event = WAHAEvents[eventName];
+      const stream$ = session
+        .getEventObservable(event)
+        .pipe(map(populateSessionInfo(event, session)));
+      this.events2.get(event).switch(stream$);
+    }
+  }
+
+  getSessionEvent(session: string, event: WAHAEvents): Observable<any> {
+    return this.events2.get(event);
+  }
+
   async stop(name: string, silent: boolean): Promise<void> {
     this.onlyDefault(name);
     if (!this.isRunning(name)) {
-      this.log.debug(`Session is not running.`, { session: name });
+      this.log.debug({ session: name }, `Session is not running.`);
       return;
     }
 
-    this.log.info(`Stopping session...`, { session: name });
+    this.log.info({ session: name }, `Stopping session...`);
     try {
       const session = this.getSession(name);
       await session.stop();
@@ -206,8 +235,9 @@ export class SessionManagerCore extends SessionManager {
         throw err;
       }
     }
-    this.log.info(`Session has been stopped.`, { session: name });
+    this.log.info({ session: name }, `Session has been stopped.`);
     this.session = DefaultSessionStatus.STOPPED;
+    this.updateSession();
     await sleep(this.SESSION_STOP_TIMEOUT);
   }
 
@@ -217,7 +247,7 @@ export class SessionManagerCore extends SessionManager {
     }
     const session = this.session as WhatsappSession;
 
-    this.log.info('Unpairing the device from account...', { session: name });
+    this.log.info({ session: name }, 'Unpairing the device from account...');
     await session.unpair().catch((err) => {
       this.log.warn(`Error while unpairing from device: ${err}`);
     });
@@ -232,6 +262,7 @@ export class SessionManagerCore extends SessionManager {
   async delete(name: string): Promise<void> {
     this.onlyDefault(name);
     this.session = DefaultSessionStatus.REMOVED;
+    this.updateSession();
     this.sessionConfig = undefined;
   }
 
@@ -339,4 +370,8 @@ export class SessionManagerCore extends SessionManager {
     const engine = await this.fetchEngineInfo();
     return { ...session, engine: engine };
   }
+
+  protected stopEvents() {
+    complete(this.events2);
+  }
 }

src/core/media/local/MediaLocalStorage.ts

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

src/core/storage/LocalSessionConfigRepository.ts

@@ -7,6 +7,9 @@ import { SessionConfig } from '../../structures/sessions.dto';
 import { ISessionConfigRepository } from './ISessionConfigRepository';
 import { LocalStore } from './LocalStore';
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const writeFileAtomic = require('write-file-atomic');
+
 export class LocalSessionConfigRepository extends ISessionConfigRepository {
   FILENAME = '.waha.session.config.json';
   private store: LocalStore;
@@ -52,7 +55,7 @@ export class LocalSessionConfigRepository extends ISessionConfigRepository {
     // Save config
     const filepath = this.getFilePath(sessionName);
     const content = JSON.stringify(config || null);
-    await fs.writeFile(filepath, content);
+    await writeFileAtomic(filepath, content);
   }
 
   private getFilePath(sessionName): string {

src/core/webhooks.core.ts

@@ -1,197 +0,0 @@
-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';
-
-// 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 {
-  protected static AGENTS = {
-    http: new HttpAgent({}),
-    https: new HttpsAgent({}),
-  };
-
-  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>) {
-    headers = headers || {};
-    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 {
-  private logger: Logger;
-
-  constructor(protected loggerBuilder: LoggerBuilder) {
-    this.logger = loggerBuilder.child({ name: WebhookConductor.name });
-  }
-
-  protected buildSender(webhookConfig: WebhookConfig): WebhookSender {
-    return new WebhookSenderCore(this.loggerBuilder, webhookConfig);
-  }
-
-  private getSuitableEvents(events: WAHAEvents[] | string[]): WAHAEvents[] {
-    const allEvents = Object.values(WAHAEvents);
-
-    // Enable all events if * in the events
-    // @ts-ignore
-    if (events.includes('*')) {
-      return allEvents;
-    }
-
-    // Get only known events, log and ignore others
-    const rightEvents = [];
-    for (const event of events) {
-      // @ts-ignore
-      if (!allEvents.includes(event)) {
-        this.logger.error(`Unknown event for webhook: '${event}'`);
-        continue;
-      }
-      rightEvents.push(event);
-    }
-    return rightEvents;
-  }
-
-  public configure(session: WhatsappSession, webhooks: WebhookConfig[]) {
-    for (const webhookConfig of webhooks) {
-      this.configureSingleWebhook(session, webhookConfig);
-    }
-  }
-
-  private configureSingleWebhook(
-    session: WhatsappSession,
-    webhook: WebhookConfig,
-  ) {
-    if (!webhook || !webhook.url || webhook.events.length === 0) {
-      return;
-    }
-
-    const url = webhook.url;
-    this.logger.info(`Configuring webhooks for ${url}...`);
-    const events = this.getSuitableEvents(webhook.events);
-    const sender = this.buildSender(webhook);
-    for (const event of events) {
-      const found = this.configureSingleEvent(
-        session.subscribeSessionEvent,
-        session,
-        event,
-        sender,
-        url,
-      );
-
-      if (!found) {
-        // Postpone for ENGINE_START event and configure engine events
-        session.events.on(WAHAInternalEvent.ENGINE_START, () => {
-          const found = this.configureSingleEvent(
-            session.subscribeEngineEvent,
-            session,
-            event,
-            sender,
-            url,
-          );
-          if (!found) {
-            this.logger.error(
-              `Engine does not support webhook event: '${event}' for url '${url}'`,
-            );
-          }
-        });
-      }
-    }
-    this.logger.info(`Webhooks were configured for ${url}.`);
-  }
-
-  private configureSingleEvent(
-    subscribeMethod,
-    session: WhatsappSession,
-    event: WAHAEvents,
-    sender: WebhookSender,
-    url: string,
-  ) {
-    const found = subscribeMethod.apply(session, [
-      event,
-      (data: any) => this.callWebhook(event, session, data, sender),
-    ]);
-    if (!found) {
-      return false;
-    }
-    this.logger.debug(`Event '${event}' is enabled for url: ${url}`);
-    return true;
-  }
-
-  public async callWebhook(
-    event,
-    session: WhatsappSession,
-    data: any,
-    sender: WebhookSender,
-  ) {
-    const me = session.getSessionMeInfo();
-    const json: WAHAWebhook = {
-      event: event,
-      session: session.name,
-      metadata: session.sessionConfig?.metadata,
-      me: me,
-      payload: data,
-      engine: session.engine,
-      environment: VERSION,
-    };
-    sender.send(json);
-  }
-}

src/structures/base.dto.ts

@@ -1,4 +1,4 @@
-import { IsNotEmpty } from 'class-validator';
+import { IsNotEmpty, IsString } from 'class-validator';
 
 export const WHATSAPP_DEFAULT_SESSION_NAME = 'default';
 
@@ -7,6 +7,7 @@ export const WHATSAPP_DEFAULT_SESSION_NAME = 'default';
  */
 export class SessionQuery {
   @IsNotEmpty()
+  @IsString()
   session: string = WHATSAPP_DEFAULT_SESSION_NAME;
 }
 

src/structures/chats.dto.ts

@@ -1,6 +1,9 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { BooleanString } from '@waha/nestjs/validation/BooleanString';
-import { PaginationParams } from '@waha/structures/pagination.dto';
+import {
+  LimitOffsetParams,
+  PaginationParams,
+} from '@waha/structures/pagination.dto';
 import { ChatIdProperty } from '@waha/structures/properties.dto';
 import { Transform, Type } from 'class-transformer';
 import { IsBoolean, IsEnum, IsNumber, IsOptional } from 'class-validator';
@@ -38,6 +41,23 @@ export class GetChatMessagesFilter {
   'filter.fromMe'?: boolean;
 }
 
+export class ChatPictureQuery {
+  @Transform(BooleanString)
+  @IsBoolean()
+  @IsOptional()
+  @ApiProperty({
+    example: false,
+    required: false,
+    description:
+      'Refresh the picture from the server (24h cache by default). Do not refresh if not needed, you can get rate limit error',
+  })
+  refresh?: boolean = false;
+}
+
+export class ChatPictureResponse {
+  url: string;
+}
+
 export class GetChatMessagesQuery {
   @IsNumber()
   @IsOptional()
@@ -50,7 +70,7 @@ export class GetChatMessagesQuery {
   offset?: number;
 
   @ApiProperty({
-    example: true,
+    example: false,
     required: false,
     description: 'Download media for messages',
   })
@@ -88,6 +108,38 @@ export class ChatsPaginationParams extends PaginationParams {
   sortBy?: string;
 }
 
+export enum PinDuration {
+  DAY = 86400,
+  WEEK = 604800,
+  MONTH = 2592000,
+}
+
+export class PinMessageRequest {
+  @IsNumber()
+  @IsEnum(PinDuration)
+  @ApiProperty({
+    description:
+      'Duration in seconds. 24 hours (86400), 7 days (604800), 30 days (2592000)',
+    example: 86400,
+  })
+  duration: number;
+}
+
+export class OverviewPaginationParams extends LimitOffsetParams {
+  @IsNumber()
+  @IsOptional()
+  @Type(() => Number)
+  limit?: number = 20;
+}
+
+export class ChatSummary {
+  id: string;
+  name: string | null;
+  picture: string | null;
+  lastMessage: any;
+  _chat: any;
+}
+
 /**
  * Events
  */

src/structures/contacts.dto.ts

@@ -1,7 +1,9 @@
 import { ApiProperty } from '@nestjs/swagger';
+import { BooleanString } from '@waha/nestjs/validation/BooleanString';
 import { PaginationParams } from '@waha/structures/pagination.dto';
 import { ChatIdProperty } from '@waha/structures/properties.dto';
-import { IsEnum, IsOptional, IsString } from 'class-validator';
+import { Transform } from 'class-transformer';
+import { IsBoolean, IsEnum, IsOptional, IsString } from 'class-validator';
 
 import { SessionBaseRequest, SessionQuery } from './base.dto';
 
@@ -15,6 +17,19 @@ export class ContactQuery extends SessionQuery {
   contactId: string;
 }
 
+export class ContactProfilePictureQuery extends ContactQuery {
+  @Transform(BooleanString)
+  @IsBoolean()
+  @IsOptional()
+  @ApiProperty({
+    example: false,
+    required: false,
+    description:
+      'Refresh the picture from the server (24h cache by default). Do not refresh if not needed, you can get rate limit error',
+  })
+  refresh?: boolean = false;
+}
+
 enum ContactSortField {
   ID = 'id',
   NAME = 'name',

src/structures/enums.dto.ts

@@ -22,8 +22,14 @@ export enum WAHAEvents {
   LABEL_DELETED = 'label.deleted',
   LABEL_CHAT_ADDED = 'label.chat.added',
   LABEL_CHAT_DELETED = 'label.chat.deleted',
+  ENGINE_EVENT = 'engine.event',
 }
 
+// All but no state.change, it's internal one
+export const WAHAEventsWild = Object.values(WAHAEvents).filter(
+  (e) => e !== WAHAEvents.STATE_CHANGE && e !== WAHAEvents.ENGINE_EVENT,
+);
+
 export enum WAHASessionStatus {
   STOPPED = 'STOPPED',
   STARTING = 'STARTING',
@@ -53,4 +59,5 @@ export enum WAMessageAck {
   READ = 3,
   PLAYED = 4,
 }
+
 export const ACK_UNKNOWN = 'UNKNOWN';

src/structures/groups.dto.ts

@@ -1,5 +1,15 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsArray, IsString } from 'class-validator';
+import { BooleanString } from '@waha/nestjs/validation/BooleanString';
+import { Transform } from 'class-transformer';
+import {
+  IsArray,
+  IsBoolean,
+  IsEnum,
+  IsOptional,
+  IsString,
+} from 'class-validator';
+
+import { PaginationParams } from './pagination.dto';
 
 /**
  * Structures
@@ -46,3 +56,35 @@ export class CreateGroupRequest {
   @IsArray()
   participants: Array<Participant>;
 }
+
+export class JoinGroupRequest {
+  @ApiProperty({
+    description: 'Group code (123) or url (https://chat.whatsapp.com/123)',
+    example: 'https://chat.whatsapp.com/1234567890abcdef',
+  })
+  @IsString()
+  code: string;
+}
+
+export class JoinGroupResponse {
+  @ApiProperty({
+    description: 'Group ID',
+    example: '123@g.us',
+  })
+  id: string;
+}
+
+export enum GroupSortField {
+  ID = 'id',
+  SUBJECT = 'subject',
+}
+
+export class GroupsPaginationParams extends PaginationParams {
+  @ApiProperty({
+    description: 'Sort by field',
+    enum: GroupSortField,
+  })
+  @IsOptional()
+  @IsEnum(GroupSortField)
+  sortBy?: string;
+}

src/structures/pagination.dto.ts

@@ -6,8 +6,7 @@ export enum SortOrder {
   DESC = 'desc',
   ASC = 'asc',
 }
-
-export class PaginationParams {
+export class LimitOffsetParams {
   @IsNumber()
   @IsOptional()
   @Type(() => Number)
@@ -17,7 +16,9 @@ export class PaginationParams {
   @IsOptional()
   @Type(() => Number)
   offset?: number;
+}
 
+export class PaginationParams extends LimitOffsetParams {
   @ApiProperty({
     description: 'Sort by field',
   })

src/structures/webhooks.dto.ts

@@ -101,6 +101,11 @@ export class WASessionStatusBody {
 }
 
 export class WAHAWebhook {
+  @ApiProperty({
+    example: 'evt_01jcn4pjwwg47bwy2gsey6q5sx',
+  })
+  id: string;
+
   @ApiProperty({
     example: 'default',
   })
@@ -320,6 +325,20 @@ class WAHAWebhookLabelChatDeleted extends WAHAWebhook {
   payload: LabelChatAssociation;
 }
 
+export class EnginePayload {
+  event: string;
+  data: any;
+}
+
+class WAHAWebhookEngineEvent extends WAHAWebhook {
+  @ApiProperty({
+    description: 'Internal engine event.',
+  })
+  event = WAHAEvents.ENGINE_EVENT;
+
+  payload: EnginePayload;
+}
+
 const WAHA_WEBHOOKS = [
   WAHAWebhookSessionStatus,
   WAHAWebhookMessage,
@@ -341,5 +360,6 @@ const WAHA_WEBHOOKS = [
   WAHAWebhookLabelDeleted,
   WAHAWebhookLabelChatAdded,
   WAHAWebhookLabelChatDeleted,
+  WAHAWebhookEngineEvent,
 ];
 export { WAHA_WEBHOOKS };

src/utils/DefaultMap.ts

@@ -0,0 +1,15 @@
+export class DefaultMap<K, T> extends Map<K, T> {
+  private readonly factory: (key: K) => T;
+
+  constructor(factory: (key: K) => T) {
+    super();
+    this.factory = factory;
+  }
+
+  get(key: K): T {
+    if (!this.has(key)) {
+      this.set(key, this.factory(key));
+    }
+    return super.get(key);
+  }
+}

src/utils/events.ts

@@ -0,0 +1,31 @@
+/**
+ * Unmask "*" in events list to exact values
+ * Remove duplicates if any
+ */
+export class EventWildUnmask {
+  constructor(
+    private readonly events: string[] | any,
+    private readonly all: string[] | any | null = null,
+  ) {
+    // in case of enum - convert to array
+    this.events = Object.values(events);
+    this.all = all ? Object.values(all) : this.events;
+  }
+
+  unmask(events: string[]) {
+    const rightEvents = [];
+    if (events.includes('*')) {
+      rightEvents.push(...this.all);
+    }
+
+    // Get only known events, log and ignore others
+    for (const event of events) {
+      if (!this.events.includes(event)) {
+        continue;
+      }
+      rightEvents.push(event);
+    }
+    // return unique values
+    return [...new Set(rightEvents)];
+  }
+}

src/utils/ids.ts

@@ -1,10 +1,9 @@
-import { v4 as uuid4 } from 'uuid';
+import { ulid } from 'ulid';
 
 /**
  * Generate prefix uuid (but remove -)
  * @param prefix
  */
 export function generatePrefixedId(prefix: string) {
-  const id = uuid4().replace(/-/g, '');
-  return `${prefix}_${id}`;
+  return `${prefix}_${ulid().toLowerCase()}`;
 }

src/utils/logging.ts

@@ -25,10 +25,14 @@ function getNestJSLogLevels(): LogLevel[] {
 
 export function getPinoLogLevel(debug: boolean = false): Level {
   const enableDebug = process.env.DEBUG != undefined || debug;
+  const level = getDefaultPinoLogLevel();
+  if (level === 'trace') {
+    return 'trace';
+  }
   if (enableDebug) {
     return 'debug';
   }
-  return getDefaultPinoLogLevel();
+  return level;
 }
 
 export function isDebugEnabled() {

src/utils/reactive/SwitchObservable.ts

@@ -0,0 +1,34 @@
+import { BehaviorSubject, EMPTY, Observable, share, switchMap } from 'rxjs';
+
+const noop = (x: any) => x;
+
+/**
+ * Observable that can easily be switched to new observable
+ * So you can change "source" of the observable,
+ * but clients will use the same observable (but consume NEW data from NEW source)
+ */
+export class SwitchObservable<T> extends Observable<T> {
+  private subject$: BehaviorSubject<Observable<T>>;
+
+  /**
+   * fn - Modify inner observable
+   *
+   */
+  constructor(fn: (source: Observable<T>) => Observable<T> = noop) {
+    const subject$ = new BehaviorSubject<Observable<any>>(EMPTY);
+    let observable$ = subject$.pipe(switchMap((stream$) => stream$));
+    observable$ = fn(observable$);
+
+    super((subscriber) => observable$.subscribe(subscriber));
+    this.subject$ = subject$;
+  }
+
+  switch(newObservable$: Observable<T>) {
+    this.subject$.next(newObservable$);
+  }
+
+  complete() {
+    this.switch(EMPTY);
+    this.subject$.complete();
+  }
+}

src/utils/reactive/complete.ts

@@ -0,0 +1,19 @@
+import { Subject } from 'rxjs';
+
+interface WithValues<T> {
+  values(): IterableIterator<T>;
+}
+
+interface Completable {
+  complete(): void;
+}
+
+/**
+ * Go over collection and complete each item
+ * @param collection
+ */
+export function complete(collection: WithValues<Completable>) {
+  for (const item of collection.values()) {
+    item.complete();
+  }
+}

src/utils/reactive/ops/exclude.ts

@@ -0,0 +1,8 @@
+import { filter } from 'rxjs';
+
+/**
+ * Just as filter, but opposite
+ */
+export function exclude<T>(predicate: (...args) => boolean) {
+  return filter((...args) => !predicate(...args));
+}

src/version.ts

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

yarn.lock

@@ -7,7 +7,7 @@ __metadata:
 
 "@adiwajshing/baileys@github:devlikeapro/Baileys#fork-master-channels-678":
   version: 6.7.8
-  resolution: "@adiwajshing/baileys@https://github.com/devlikeapro/Baileys.git#commit=e2d6246da89a4775a8482fbe8de2a42b8421516d"
+  resolution: "@adiwajshing/baileys@https://github.com/devlikeapro/Baileys.git#commit=04738f528321857efe837e3f93c73059878ecdcb"
   dependencies:
     "@adiwajshing/keyed-db": ^0.2.4
     "@hapi/boom": ^9.1.3
@@ -39,7 +39,7 @@ __metadata:
       optional: true
     sharp:
       optional: true
-  checksum: 43ac116fcc3eca176ff036a296c99d8be39bdcaafb788fb65305ee06d59060f0b8b8d5dee8596d9dca9794843dd76e90769e5acfa6d14ff55ad2a0f2616686e3
+  checksum: 0f7b2031eeb25137c65aee3151028f7a8637cfed0763c7426817415ec818ca71f55267b9de88511905bd266f4006301a26206dac9bdb1821d13f1a0cbf075e32
   languageName: node
   linkType: hard
 
@@ -8474,13 +8474,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"libsignal@github:WhiskeySockets/libsignal-node":
+"libsignal@github:devlikeapro/libsignal-node#fork-master":
   version: 2.0.1
-  resolution: "libsignal@https://github.com/WhiskeySockets/libsignal-node.git#commit=83a3e3a3864511cb74df1b796373f0d49d071134"
+  resolution: "libsignal@https://github.com/devlikeapro/libsignal-node.git#commit=83bc9236ee3d96ae1747cf3ca2e505b10cf97250"
   dependencies:
     curve25519-js: ^0.0.4
     protobufjs: 6.8.8
-  checksum: bc8a8c4d54395e6b3f7224e72fe0c447859eed688cc28da3a56d76dcd5bf1ea71b25b3ff0da96646b636f2bb679898ca38eff909cb83ef3e3b017fe81e06ed50
+  checksum: 3ee39bc7cbd123fa2c1f84ff53ab4e3dacfb5a00d10944960fd72156b24a5eb5af1fa5ca31b9f25b26aab107c712d8c295c85b0bed26ad6eba6d0e3f26f38927
   languageName: node
   linkType: hard
 
@@ -10619,7 +10619,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rxjs@npm:7.8.1, rxjs@npm:^7.1.0, rxjs@npm:^7.5.5":
+"rxjs@npm:7.8.1, rxjs@npm:^7.5.5, rxjs@npm:^7.8.1":
   version: 7.8.1
   resolution: "rxjs@npm:7.8.1"
   dependencies:
@@ -12018,6 +12018,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ulid@npm:^2.3.0":
+  version: 2.3.0
+  resolution: "ulid@npm:2.3.0"
+  bin:
+    ulid: ./bin/cli.js
+  checksum: d6dbf253fdc189f60fe2829d934ee5447b3dab62d05449a2e0fe89670d77087dd6eba4f844a69f9ffdb01384ec6fd97bdd9be638fc67d593569a45e8969f1e69
+  languageName: node
+  linkType: hard
+
 "unbox-primitive@npm:^1.0.2":
   version: 1.0.2
   resolution: "unbox-primitive@npm:1.0.2"
@@ -12263,6 +12272,7 @@ __metadata:
     joi: ^17.13.3
     knex: ^3.1.0
     libphonenumber-js: ^1.10.36
+    libsignal: "github:devlikeapro/libsignal-node#fork-master"
     link-preview-js: ^3.0.4
     lodash: ^4.17.21
     mime-types: ^2.1.27
@@ -12280,7 +12290,7 @@ __metadata:
     qrcode-terminal: ^0.12.0
     reflect-metadata: ^0.1.13
     rimraf: ^3.0.2
-    rxjs: ^7.1.0
+    rxjs: ^7.8.1
     sharp: ^0.33.4
     supertest: ^4.0.2
     swagger-ui-express: ^4.1.4
@@ -12289,7 +12299,9 @@ __metadata:
     ts-node: ^10.9.1
     tsconfig-paths: ^4.1.0
     typescript: ^4.8.4
+    ulid: ^2.3.0
     whatsapp-web.js: "github:devlikeapro/whatsapp-web.js#fork-main-channels"
+    write-file-atomic: ^6.0.0
   dependenciesMeta:
     bufferutil:
       optional: true
@@ -12384,7 +12396,7 @@ __metadata:
 
 "whatsapp-web.js@github:devlikeapro/whatsapp-web.js#fork-main-channels":
   version: 1.26.0
-  resolution: "whatsapp-web.js@https://github.com/devlikeapro/whatsapp-web.js.git#commit=aa90f7378659a237f30cda6d368359a1f81904dc"
+  resolution: "whatsapp-web.js@https://github.com/devlikeapro/whatsapp-web.js.git#commit=a8683b0d1a5b8025ac1e7deb3476042ceadb4c07"
   dependencies:
     "@pedroslopez/moduleraid": ^5.0.2
     archiver: ^5.3.1
@@ -12402,7 +12414,7 @@ __metadata:
       optional: true
     unzipper:
       optional: true
-  checksum: 7c914e9cdd4a25c967e057d0cb5019973f0556f6220320e4bcbc0666669801b92abf97c2cc783762ef462d0006123953e233136f457689ebac395260fe69a5fc
+  checksum: 637e53dffdaa80813a5cdd72e519f8f68978e00db17b39b471f39c8e2b98bc85643fe74168255a1dfdc655c71803e3d01b4ca6635bc6159c429dd59232ac07d4
   languageName: node
   linkType: hard
 
@@ -12557,6 +12569,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"write-file-atomic@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "write-file-atomic@npm:6.0.0"
+  dependencies:
+    imurmurhash: ^0.1.4
+    signal-exit: ^4.0.1
+  checksum: 35f1303b0229c89c36d0817de9912b43a242f775cb0f386fecf97bac735013e1fde5f464c2ce9f63288d2c91b1ec5bc18d55347b0e37c0e4dbc64b60dc220629
+  languageName: node
+  linkType: hard
+
 "write@npm:1.0.3":
   version: 1.0.3
   resolution: "write@npm:1.0.3"