[core] 2025.6.1

fix #919

Makefile

@@ -41,7 +41,7 @@ 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
+	. ${NVM_DIR}/nvm.sh && nvm exec yarn up whatsapp-web.js@github:devlikeapro/whatsapp-web.js#fork-main-2025-06-09
 
 start-proxy:
 	docker run --rm -d --name squid-container -e TZ=UTC -p 3128:3128 ubuntu/squid:5.2-22.04_beta

package.json

@@ -88,7 +88,7 @@
     "sharp": "^0.33.4",
     "swagger-ui-express": "^4.1.4",
     "ulid": "^2.3.0",
-    "whatsapp-web.js": "github:devlikeapro/whatsapp-web.js#fork-main-channels",
+    "whatsapp-web.js": "github:devlikeapro/whatsapp-web.js#fork-main-2025-06-09",
     "write-file-atomic": "^6.0.0"
   },
   "optionalDependencies": {
@@ -102,7 +102,7 @@
     "libsignal": "github:devlikeapro/libsignal-node#fork-master"
   },
   "devDependencies": {
-    "@grpc/grpc-js": "^1.12.4",
+    "@grpc/grpc-js": "^1.13.4",
     "@grpc/proto-loader": "^0.7.13",
     "@nestjs/cli": "^11.0.0",
     "@nestjs/schematics": "^11.0.0",
@@ -117,7 +117,7 @@
     "eslint-config-prettier": "^6.10.0",
     "eslint-plugin-import": "^2.20.1",
     "eslint-plugin-simple-import-sort": "^10.0.0",
-    "grpc-tools": "^1.12.4",
+    "grpc-tools": "^1.13.0",
     "jest": "^29.7.0",
     "prettier": "^1.19.1",
     "protoc-gen-ts": "^0.8.7",

prepare-chatgpt.sh

@@ -12,9 +12,9 @@ touch "$OUTPUT_FILE"
 # Find all .md files in the source directory and combine them
 find "$SOURCE_DIR" -type f -name "*.ts" | while read -r file; do
   # Add file name  to OUTPUT_FILE
-  echo -e "\n-------" >> "$OUTPUT_FILE"
+  echo "\n-------" >> "$OUTPUT_FILE"
   echo "File: $file" >> "$OUTPUT_FILE"
-  echo -e "-------\n" >> "$OUTPUT_FILE"
+  echo "-------\n" >> "$OUTPUT_FILE"
   # Append the content of the file to the output file
   cat "$file" >> "$OUTPUT_FILE"
 done

src/core/config/GowsEngineConfigService.ts

@@ -1,16 +1,21 @@
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
+import { WhatsappConfigService } from '@waha/config.service';
 import { BootstrapConfig } from '@waha/core/engines/gows/GowsBootstrap';
 import { GowsConfig } from '@waha/core/engines/gows/session.gows.core';
 
 @Injectable()
 export class GowsEngineConfigService {
-  constructor(protected configService: ConfigService) {}
+  constructor(
+    protected configService: ConfigService,
+    protected whatsappConfigService: WhatsappConfigService,
+  ) {}
 
   getBootstrapConfig(): BootstrapConfig {
     return {
       path: this.configService.get('WAHA_GOWS_PATH'),
       socket: this.getSocket(),
+      pprof: this.whatsappConfigService.debugModeEnabled,
     };
   }
 

src/core/engines/gows/GowsBootstrap.ts

@@ -22,6 +22,7 @@ export async function isUnixSocket(socketPath: string): Promise<boolean> {
 export interface BootstrapConfig {
   path: string;
   socket: string;
+  pprof?: boolean;
 }
 
 export class GowsBootstrap implements EngineBootstrap {
@@ -44,6 +45,7 @@ export class GowsBootstrap implements EngineBootstrap {
       this.logger,
       this.config.path,
       this.config.socket,
+      this.config.pprof,
     );
     this.gows.start(() => {
       this.logger.info(`GOWS stopped, exiting...`);

src/core/engines/gows/GowsSubprocess.ts

@@ -14,13 +14,22 @@ export class GowsSubprocess {
     private logger: Logger,
     readonly path: string,
     readonly socket: string,
+    readonly pprof: boolean = false,
   ) {}
 
   start(onExit: (code: number) => void) {
     this.logger.info('Starting GOWS subprocess...');
     this.logger.debug(`GOWS path '${this.path}', socket: '${this.socket}'...`);
 
-    this.child = spawn(this.path, ['--socket', this.socket], {
+    const args = ['--socket', this.socket];
+    if (this.pprof) {
+      this.logger.info('Debug mode enabled, adding pprof flags');
+      args.push('--pprof');
+      args.push('--pprof-port=6060');
+      args.push('--pprof-host=0.0.0.0');
+    }
+
+    this.child = spawn(this.path, args, {
       detached: true,
     });
     this.logger.debug(`GOWS started with PID: ${this.child.pid}`);

src/core/engines/gows/grpc/gows_grpc_pb.js

@@ -671,7 +671,7 @@ var EventStreamService = exports.EventStreamService = {
   },
 };
 
-exports.EventStreamClient = grpc.makeGenericClientConstructor(EventStreamService);
+exports.EventStreamClient = grpc.makeGenericClientConstructor(EventStreamService, 'EventStream');
 var MessageServiceService = exports.MessageServiceService = {
   //
 // Session management
@@ -1381,4 +1381,4 @@ getMessageById: {
   },
 };
 
-exports.MessageServiceClient = grpc.makeGenericClientConstructor(MessageServiceService);
+exports.MessageServiceClient = grpc.makeGenericClientConstructor(MessageServiceService, 'MessageService');

src/core/engines/webjs/Puppeteer.ts

@@ -0,0 +1,21 @@
+/**
+ * Expose a function to the page if it does not exist
+ *
+ * NOTE:
+ * Rewrite it to 'upsertFunction' after updating Puppeteer to 20.6 or higher
+ * using page.removeExposedFunction
+ * https://pptr.dev/api/puppeteer.page.removeExposedFunction
+ *
+ * @param {import(puppeteer).Page} page
+ * @param {string} name
+ * @param {Function} fn
+ */
+export async function exposeFunctionIfAbsent(page, name, fn) {
+  const exist = await page.evaluate((name) => {
+    return !!window[name];
+  }, name);
+  if (exist) {
+    return;
+  }
+  await page.exposeFunction(name, fn);
+}

src/core/engines/webjs/WebjsClientCore.ts

@@ -1,3 +1,4 @@
+import { exposeFunctionIfAbsent } from '@waha/core/engines/webjs/Puppeteer';
 import { WebJSPresence } from '@waha/core/engines/webjs/types';
 import { GetChatMessagesFilter } from '@waha/structures/chats.dto';
 import { Label } from '@waha/structures/labels.dto';
@@ -10,7 +11,6 @@ import * as lodash from 'lodash';
 import { Page } from 'puppeteer';
 import { Client, Events } from 'whatsapp-web.js';
 import { Message } from 'whatsapp-web.js/src/structures';
-import { exposeFunctionIfAbsent } from 'whatsapp-web.js/src/util/Puppeter';
 
 import { CallErrorEvent, PAGE_CALL_ERROR_EVENT, WPage } from './WPage';
 

src/version.ts

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

waha.config.json

@@ -2,7 +2,7 @@
   "waha": {
     "gows": {
       "repo": "devlikeapro/gows",
-      "ref": "v1.0.7"
+      "ref": "v1.0.8"
     },
     "dashboard": {
       "repo": "devlikeapro/dashboard",

yarn.lock

@@ -1299,13 +1299,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grpc/grpc-js@npm:^1.12.4":
-  version: 1.12.4
-  resolution: "@grpc/grpc-js@npm:1.12.4"
+"@grpc/grpc-js@npm:^1.13.4":
+  version: 1.13.4
+  resolution: "@grpc/grpc-js@npm:1.13.4"
   dependencies:
     "@grpc/proto-loader": ^0.7.13
     "@js-sdsl/ordered-map": ^4.4.2
-  checksum: 6dab69c70173735b775717361662ed5a931d2ca1bc9f3ed5f7095a05f26eb59489b1805b0a8f78b77f34d48a896f358ca951f0ce38d8053d18b0d5d0fd92837f
+  checksum: fe5db84bbbcd07cc1b68d1683b7fbe9cfcc5c3a60655ecc17fb3e1cd2adc4c1ce891b15e6e9a9c2140f6891def6f93b509a60d2bce253d13b317f9136e968451
   languageName: node
   linkType: hard
 
@@ -7871,15 +7871,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"grpc-tools@npm:^1.12.4":
-  version: 1.12.4
-  resolution: "grpc-tools@npm:1.12.4"
+"grpc-tools@npm:^1.13.0":
+  version: 1.13.0
+  resolution: "grpc-tools@npm:1.13.0"
   dependencies:
     "@mapbox/node-pre-gyp": ^1.0.5
   bin:
     grpc_tools_node_protoc: bin/protoc.js
     grpc_tools_node_protoc_plugin: bin/protoc_plugin.js
-  checksum: 5ea946c2d231e2b58be48b14e12f2982b44845f62d05327cf84f67fae30355c7a781d8443b0988f9db77d4eb219f15e5f98e869f6a14c4276084726e48dc8ec0
+  checksum: 0fbd4007f752f23ac49b83e2c6c516f004018e5e01bef669720c8aaf8b507d224983d15f6b90abe725164cdb77a4a449f8906a573e94c59e532f38a1ef221185
   languageName: node
   linkType: hard
 
@@ -13308,7 +13308,7 @@ __metadata:
     "@adiwajshing/keyed-db": ^0.2.4
     "@aws-sdk/client-s3": ^3.633.0
     "@aws-sdk/s3-request-presigner": ^3.633.0
-    "@grpc/grpc-js": ^1.12.4
+    "@grpc/grpc-js": ^1.13.4
     "@grpc/proto-loader": ^0.7.13
     "@nestjs/axios": ^3.0.2
     "@nestjs/cli": ^11.0.0
@@ -13355,7 +13355,7 @@ __metadata:
     file-type: 16.5.4
     fs-extra: ^11.2.0
     google-protobuf: ^3.21.4
-    grpc-tools: ^1.12.4
+    grpc-tools: ^1.13.0
     https-proxy-agent: ^7.0.0
     jest: ^29.7.0
     joi: ^17.13.3
@@ -13392,7 +13392,7 @@ __metadata:
     tsconfig-paths: ^4.1.0
     typescript: ^4.8.4
     ulid: ^2.3.0
-    whatsapp-web.js: "github:devlikeapro/whatsapp-web.js#fork-main-channels"
+    whatsapp-web.js: "github:devlikeapro/whatsapp-web.js#fork-main-2025-06-09"
     write-file-atomic: ^6.0.0
     yargs: ^17.7.2
   dependenciesMeta:
@@ -13486,9 +13486,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"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=26562719b4068713d588b7e8d51652a9f0e4f683"
+"whatsapp-web.js@github:devlikeapro/whatsapp-web.js#fork-main-2025-06-09":
+  version: 1.30.1-alpha.2
+  resolution: "whatsapp-web.js@https://github.com/devlikeapro/whatsapp-web.js.git#commit=f0e8284c9a281fa15ce2086d5668c02011947416"
   dependencies:
     "@pedroslopez/moduleraid": ^5.0.2
     archiver: ^5.3.1
@@ -13506,7 +13506,7 @@ __metadata:
       optional: true
     unzipper:
       optional: true
-  checksum: e1fe71ce6959542ec964b1d0e190071f0796c37459732c641b0b5be719383415b9f1008dab443713b20caf0562fecd3c005be5f64b3f992b56587122029666cd
+  checksum: ad0b97ac3b5246801af33e4e7cc34ce34b8541a3737bb97f53322f4612b8eb435eec2b47a6ef9f7f794649324d70041e3f6f6f5453be8d4b74da0051334ee98e
   languageName: node
   linkType: hard