[core] 12.2

fix #683

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

@@ -17,6 +17,7 @@ import makeWASocket, {
   normalizeMessageContent,
   PresenceData,
   proto,
+  SocketConfig,
   WAMessageContent,
   WAMessageKey,
   WAMessageUpdate,
@@ -194,6 +195,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
 
   private autoRestartJob: SinglePeriodicJobRunner;
   private msgRetryCounterCache: NodeCache;
+  private placeholderResendCache: NodeCache;
   protected engineLogger: BaileysLogger;
 
   private authNOWEBStore: any;
@@ -213,6 +215,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',
@@ -252,7 +258,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')
@@ -264,11 +270,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,
@@ -278,20 +280,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;

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

@@ -99,6 +99,7 @@ const QRCode = require('qrcode');
 
 export interface WebJSConfig {
   webVersion?: string;
+  cacheType: 'local' | 'none';
 }
 
 export class WhatsappSessionWebJSCore extends WhatsappSession {
@@ -143,7 +144,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,
@@ -153,8 +158,7 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
       },
       webVersion: webVersion,
       webVersionCache: {
-        // type: 'none',
-        type: 'local',
+        type: cacheType,
         path: path,
         strict: true,
       },

src/core/manager.core.ts

@@ -3,6 +3,7 @@ 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';
@@ -11,7 +12,7 @@ import { promiseTimeout, sleep } from '@waha/utils/promiseTimeout';
 import { complete } from '@waha/utils/reactive/complete';
 import { SwitchObservable } from '@waha/utils/reactive/SwitchObservable';
 import { PinoLogger } from 'nestjs-pino';
-import { Observable } from 'rxjs';
+import { Observable, retry, share } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { WhatsappConfigService } from '../config.service';
@@ -69,6 +70,7 @@ export class SessionManagerCore extends SessionManager {
   constructor(
     config: WhatsappConfigService,
     private engineConfigService: EngineConfigService,
+    private webjsEngineConfigService: WebJSEngineConfigService,
     log: PinoLogger,
     private mediaStorageFactory: MediaStorageFactory,
   ) {
@@ -77,6 +79,14 @@ export class SessionManagerCore extends SessionManager {
     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();
@@ -167,6 +177,9 @@ 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);

src/version.ts

@@ -33,7 +33,7 @@ export function getEngineName(): string {
 }
 
 export const VERSION: WAHAEnvironment = {
-  version: '2024.11.5',
+  version: '2024.12.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=615f776f8f3ad929cdab17a77a50e21b59eaa674"
   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: b3ef06a8e4984de730e10c934ddc881871912425956222fb882571c2a21d94e85f4acd656e6cf99130ac59a89683e0fe1a32ccab7afe946ed0fb9402ab4a4d9d
   languageName: node
   linkType: hard
 
@@ -12394,7 +12394,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=73288b43a3a346520867ffcbf0de0867dd07b343"
   dependencies:
     "@pedroslopez/moduleraid": ^5.0.2
     archiver: ^5.3.1
@@ -12412,7 +12412,7 @@ __metadata:
       optional: true
     unzipper:
       optional: true
-  checksum: 7c914e9cdd4a25c967e057d0cb5019973f0556f6220320e4bcbc0666669801b92abf97c2cc783762ef462d0006123953e233136f457689ebac395260fe69a5fc
+  checksum: 2513fe75b213a8c78650c61abd1671a2f671ba4f5423fb949fda2d45cd2c24cf414dfdde5222adb6582cda264983f15a3701d0dfd8a6cf7918d70cfdfd5a7d58
   languageName: node
   linkType: hard