chore: commit pending unoapi changes including jidmap ttl and mention remap

Author: ViperTecCorporation

.github/workflows/main.yml

@@ -21,8 +21,8 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps: 
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-node@v5
         with:
           node-version: 24
           cache: yarn
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Docker meta
         id: meta

.github/workflows/sync-upstream.yml

@@ -22,13 +22,13 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-      - name: Checkout base branch
-        uses: actions/checkout@v4
+      - name: Checkout base branch
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.base_branch }}
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v5
         with:
           node-version: '24'
           cache: yarn

.github/workflows/wiki-sync.yml

@@ -13,8 +13,8 @@ jobs:
       WIKI_TOKEN: ${{ secrets.WIKI_TOKEN }}
       REPO: ${{ github.repository }}
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
+      - name: Checkout repo
+        uses: actions/checkout@v5
 
       - name: Skip if no WIKI_TOKEN
         if: env.WIKI_TOKEN == ''

jest.config.js

@@ -1,7 +1,12 @@
 /** @type {import('ts-jest').JestConfigWithTsJest} */
-module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  globals: {
+    'ts-jest': {
+      diagnostics: false,
+    },
+  },
   moduleNameMapper: {
     '^baileys$': '<rootDir>/test-setup/baileys.mock.ts',
     '^baileys/lib/Utils/logger$': '<rootDir>/test-setup/baileys-logger.mock.ts',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "unoapi-cloud",
-  "version": "3.0.46",
+  "version": "3.0.47",
   "description": "Unoapi Cloud Fork Viper Tec baileys 7",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -85,7 +85,7 @@
     "@google-cloud/text-to-speech": "^5.2.0",
     "@redis/client": "^1.5.14",
     "@sentry/node": "^9.29.0",
-    "@whiskeysockets/baileys": "github:ViperTecCorporation/Baileys#88bd4044b817fe5ca238aca60b27705068658291",
+    "@whiskeysockets/baileys": "github:ViperTecCorporation/Baileys#2bc1e2daf6a4f5531b9d557d8c9abec9975dc13b",
     "amqplib": "^0.10.8",
     "audio-decode": "^2.2.3",
     "audio2textjs": "^1.0.5",
@@ -120,6 +120,6 @@
   "resolutions": {
     "libsignal": "https://codeload.github.com/whiskeysockets/libsignal-node/tar.gz/e81ecfc32eb74951d789ab37f7e341ab66d5fff1",
     "@whiskeysockets/libsignal-node": "https://codeload.github.com/whiskeysockets/libsignal-node/tar.gz/e81ecfc32eb74951d789ab37f7e341ab66d5fff1",
-    "@whiskeysockets/baileys": "github:ViperTecCorporation/Baileys#88bd4044b817fe5ca238aca60b27705068658291"
+    "@whiskeysockets/baileys": "github:ViperTecCorporation/Baileys#2bc1e2daf6a4f5531b9d557d8c9abec9975dc13b"
   }
 }

src/defaults.ts

@@ -54,19 +54,19 @@ export const WEBHOOK_FORWARD_BUSINESS_ACCOUNT_ID = process.env.WEBHOOK_FORWARD_B
 export const WEBHOOK_FORWARD_TOKEN = process.env.WEBHOOK_FORWARD_TOKEN || ''
 export const WEBHOOK_FORWARD_VERSION = process.env.WEBHOOK_FORWARD_VERSION || 'v17.0'
 export const WEBHOOK_FORWARD_URL = process.env.WEBHOOK_FORWARD_URL || 'https://graph.facebook.com'
-export const WEBHOOK_FORWARD_TIMEOUT_MS = parseInt(process.env.WEBHOOK_TIMEOUT_MS || '6000')
+export const WEBHOOK_FORWARD_TIMEOUT_MS = parseInt(process.env.WEBHOOK_TIMEOUT_MS || '6000')
 
 // comunication
 export const UNOAPI_URL = process.env.UNOAPI_URL || 'http://localhost:9876'
 export const WEBHOOK_URL_ABSOLUTE = process.env.WEBHOOK_URL_ABSOLUTE || ''
 export const WEBHOOK_URL = process.env.WEBHOOK_URL || 'http://localhost:9876/webhooks/fake'
 export const WEBHOOK_HEADER = process.env.WEBHOOK_HEADER || 'Authorization'
 export const WEBHOOK_TOKEN = process.env.WEBHOOK_TOKEN || UNOAPI_AUTH_TOKEN || '123abc'
-export const WEBHOOK_TIMEOUT_MS = parseInt(process.env.WEBHOOK_TIMEOUT_MS || '6000')
-export const FETCH_TIMEOUT_MS = parseInt(process.env.FETCH_TIMEOUT_MS || '6000')
+export const WEBHOOK_TIMEOUT_MS = parseInt(process.env.WEBHOOK_TIMEOUT_MS || '6000')
+export const FETCH_TIMEOUT_MS = parseInt(process.env.FETCH_TIMEOUT_MS || '6000')
 export const CONNECTION_TYPE = process.env.CONNECTION_TYPE || 'qrcode'
 
-export const CONSUMER_TIMEOUT_MS = parseInt(process.env.CONSUMER_TIMEOUT_MS || '15000')
+export const CONSUMER_TIMEOUT_MS = parseInt(process.env.CONSUMER_TIMEOUT_MS || '15000')
 export const WEBHOOK_SEND_NEW_MESSAGES = process.env.WEBHOOK_SEND_NEW_MESSAGES == _undefined ? false : process.env.WEBHOOK_SEND_NEW_MESSAGES == 'true'
 export const WEBHOOK_SEND_INCOMING_MESSAGES = process.env.WEBHOOK_SEND_INCOMING_MESSAGES == _undefined ? true : process.env.WEBHOOK_SEND_INCOMING_MESSAGES == 'true'
 export const WEBHOOK_SEND_GROUP_MESSAGES = process.env.WEBHOOK_SEND_GROUP_MESSAGES == _undefined ? true : process.env.WEBHOOK_SEND_GROUP_MESSAGES == 'true'
@@ -89,13 +89,13 @@ export const WEBHOOK_SESSION = process.env.WEBHOOK_SESSION || ''
 // Webhook circuit breaker (fail fast when endpoints are offline)
 export const WEBHOOK_CB_ENABLED =
   process.env.WEBHOOK_CB_ENABLED == _undefined ? true : process.env.WEBHOOK_CB_ENABLED == 'true'
-export const WEBHOOK_CB_FAILURE_THRESHOLD = parseInt(process.env.WEBHOOK_CB_FAILURE_THRESHOLD || '1')
-export const WEBHOOK_CB_OPEN_MS = parseInt(process.env.WEBHOOK_CB_OPEN_MS || '120000')
-export const WEBHOOK_CB_FAILURE_TTL_MS = parseInt(process.env.WEBHOOK_CB_FAILURE_TTL_MS || '300000')
-export const WEBHOOK_CB_REQUEUE_DELAY_MS = parseInt(process.env.WEBHOOK_CB_REQUEUE_DELAY_MS || '300000')
-export const WEBHOOK_CB_LOCAL_CLEANUP_INTERVAL_MS = parseInt(process.env.WEBHOOK_CB_LOCAL_CLEANUP_INTERVAL_MS || '3600000')
-export const CONTACT_SYNC_ENABLED =
-  process.env.CONTACT_SYNC_ENABLED == _undefined ? false : process.env.CONTACT_SYNC_ENABLED == 'true'
+export const WEBHOOK_CB_FAILURE_THRESHOLD = parseInt(process.env.WEBHOOK_CB_FAILURE_THRESHOLD || '1')
+export const WEBHOOK_CB_OPEN_MS = parseInt(process.env.WEBHOOK_CB_OPEN_MS || '120000')
+export const WEBHOOK_CB_FAILURE_TTL_MS = parseInt(process.env.WEBHOOK_CB_FAILURE_TTL_MS || '300000')
+export const WEBHOOK_CB_REQUEUE_DELAY_MS = parseInt(process.env.WEBHOOK_CB_REQUEUE_DELAY_MS || '300000')
+export const WEBHOOK_CB_LOCAL_CLEANUP_INTERVAL_MS = parseInt(process.env.WEBHOOK_CB_LOCAL_CLEANUP_INTERVAL_MS || '3600000')
+export const CONTACT_SYNC_ENABLED =
+  process.env.CONTACT_SYNC_ENABLED == _undefined ? false : process.env.CONTACT_SYNC_ENABLED == 'true'
 export const CONTACT_SYNC_INTERVAL_MS = parseInt(process.env.CONTACT_SYNC_INTERVAL_MS || `${8 * 60 * 60 * 1000}`)
 export const CONTACT_SYNC_SCAN_COUNT = parseInt(process.env.CONTACT_SYNC_SCAN_COUNT || '500')
 export const CONTACT_SYNC_PENDING_TTL_SEC = parseInt(process.env.CONTACT_SYNC_PENDING_TTL_SEC || '900')
@@ -114,12 +114,12 @@ export const PROXY_URL = process.env.PROXY_URL
 
 // behavior of unoapi
 export const UNOAPI_SERVER_NAME = process.env.UNOAPI_SERVER_NAME || 'server_1'
-export const CONNECTING_TIMEOUT_MS = parseInt(process.env.CONNECTING_TIMEOUT_MS || '180000')
-export const BAILEYS_IDLE_RECONNECT_ENABLED =
-  process.env.BAILEYS_IDLE_RECONNECT_ENABLED === _undefined ? false : process.env.BAILEYS_IDLE_RECONNECT_ENABLED == 'true'
-export const BAILEYS_IDLE_RECONNECT_MS = parseInt(process.env.BAILEYS_IDLE_RECONNECT_MS || `${30 * 60 * 1000}`)
-export const BAILEYS_IDLE_RECONNECT_CHECK_MS = parseInt(process.env.BAILEYS_IDLE_RECONNECT_CHECK_MS || '60000')
-export const UNOAPI_RETRY_REQUEST_DELAY_MS = parseInt(process.env.UNOAPI_RETRY_REQUEST_DELAY || process.env.UNOAPI_RETRY_REQUEST_DELAY_MS || '5000')
+export const CONNECTING_TIMEOUT_MS = parseInt(process.env.CONNECTING_TIMEOUT_MS || '180000')
+export const BAILEYS_IDLE_RECONNECT_ENABLED =
+  process.env.BAILEYS_IDLE_RECONNECT_ENABLED === _undefined ? false : process.env.BAILEYS_IDLE_RECONNECT_ENABLED == 'true'
+export const BAILEYS_IDLE_RECONNECT_MS = parseInt(process.env.BAILEYS_IDLE_RECONNECT_MS || `${30 * 60 * 1000}`)
+export const BAILEYS_IDLE_RECONNECT_CHECK_MS = parseInt(process.env.BAILEYS_IDLE_RECONNECT_CHECK_MS || '60000')
+export const UNOAPI_RETRY_REQUEST_DELAY_MS = parseInt(process.env.UNOAPI_RETRY_REQUEST_DELAY || process.env.UNOAPI_RETRY_REQUEST_DELAY_MS || '5000')
 // export const QR_TIMEOUT = parseInt(process.env.QR_TIMEOUT || '30000')
 // export const SLEEP_TIME = parseInt(process.env.SLEEP_TIME || '5000')
 // export const MAX_QRCODE_GENERATE = process.env.MAX_QRCODE_GENERATE || 6
@@ -152,12 +152,12 @@ export const UNOAPI_QUEUE_BULK_SENDER = `${UNOAPI_QUEUE_NAME}.bulk.sender`
 export const UNOAPI_QUEUE_BULK_STATUS = `${UNOAPI_QUEUE_NAME}.bulk.status`
 export const UNOAPI_QUEUE_BULK_REPORT = `${UNOAPI_QUEUE_NAME}.bulk.report`
 export const UNOAPI_QUEUE_BULK_WEBHOOK = `${UNOAPI_QUEUE_NAME}.bulk.webhook`
-export const UNOAPI_QUEUE_COMMANDER = `${UNOAPI_QUEUE_NAME}.commander`
-export const UNOAPI_QUEUE_INCOMING = `${UNOAPI_QUEUE_NAME}.incoming`
-export const UNOAPI_QUEUE_TRANSCRIBER = `${UNOAPI_QUEUE_NAME}.transcribe`
-export const RELOAD_PUBLISH_BROKER = process.env.RELOAD_PUBLISH_BROKER === _undefined ? false : process.env.RELOAD_PUBLISH_BROKER == 'true'
-export const RELOAD_BAILEYS_DEBOUNCE_MS = parseInt(process.env.RELOAD_BAILEYS_DEBOUNCE_MS || '15000')
-export const UNOAPI_MESSAGE_RETRY_LIMIT = parseInt(process.env.UNOAPI_MESSAGE_RETRY_LIMIT || '5')
+export const UNOAPI_QUEUE_COMMANDER = `${UNOAPI_QUEUE_NAME}.commander`
+export const UNOAPI_QUEUE_INCOMING = `${UNOAPI_QUEUE_NAME}.incoming`
+export const UNOAPI_QUEUE_TRANSCRIBER = `${UNOAPI_QUEUE_NAME}.transcribe`
+export const RELOAD_PUBLISH_BROKER = process.env.RELOAD_PUBLISH_BROKER === _undefined ? false : process.env.RELOAD_PUBLISH_BROKER == 'true'
+export const RELOAD_BAILEYS_DEBOUNCE_MS = parseInt(process.env.RELOAD_BAILEYS_DEBOUNCE_MS || '15000')
+export const UNOAPI_MESSAGE_RETRY_LIMIT = parseInt(process.env.UNOAPI_MESSAGE_RETRY_LIMIT || '5')
 export const UNOAPI_MESSAGE_RETRY_DELAY = parseInt(process.env.UNOAPI_MESSAGE_RETRY_DELAY || '10000')
 export const UNOAPI_DELAY_BETWEEN_MESSAGES_MS = parseInt(process.env.UNOAPI_DELAY_BETWEEN_MESSAGES_MS || '0')
 export const UNOAPI_DELAY_AFTER_FIRST_MESSAGE_MS = parseInt(process.env.UNOAPI_DELAY_AFTER_FIRST_MESSAGE_MS || '0')
@@ -235,19 +235,19 @@ export const CONFIG_SESSION_PHONE_CLIENT = process.env.CONFIG_SESSION_PHONE_CLIE
 export const CONFIG_SESSION_PHONE_NAME = process.env.CONFIG_SESSION_PHONE_NAME || 'Chrome'
 export const MESSAGE_CHECK_WAAPP = process.env.MESSAGE_CHECK_WAAPP || ''
 export const WHATSAPP_VERSION = process.env.WHATSAPP_VERSION ? JSON.parse(process.env.WHATSAPP_VERSION) as WAVersion : undefined
-export const AVAILABLE_LOCALES = JSON.parse(process.env.AVAILABLE_LOCALES || '["en", "pt_BR", "pt"]')
-export const BAILEYS_COUNTRY_CODE = (process.env.BAILEYS_COUNTRY_CODE || 'BR').toUpperCase()
-export const ONLY_HELLO_TEMPLATE: boolean = process.env.ONLY_HELLO_TEMPLATE === _undefined ? false : process.env.ONLY_HELLO_TEMPLATE == 'true'
-export const DEFAULT_BROWSER = [CONFIG_SESSION_PHONE_CLIENT, CONFIG_SESSION_PHONE_NAME, release()]
+export const AVAILABLE_LOCALES = JSON.parse(process.env.AVAILABLE_LOCALES || '["en", "pt_BR", "pt"]')
+export const BAILEYS_COUNTRY_CODE = (process.env.BAILEYS_COUNTRY_CODE || 'BR').toUpperCase()
+export const ONLY_HELLO_TEMPLATE: boolean = process.env.ONLY_HELLO_TEMPLATE === _undefined ? false : process.env.ONLY_HELLO_TEMPLATE == 'true'
+export const DEFAULT_BROWSER = [CONFIG_SESSION_PHONE_CLIENT, CONFIG_SESSION_PHONE_NAME, release()]
 
 // Embedded Signup (WhatsApp Cloud)
 export const EMBEDDED_SIGNUP_APP_ID = process.env.EMBEDDED_SIGNUP_APP_ID || ''
 export const EMBEDDED_SIGNUP_APP_SECRET = process.env.EMBEDDED_SIGNUP_APP_SECRET || ''
 export const EMBEDDED_SIGNUP_REDIRECT_URI = process.env.EMBEDDED_SIGNUP_REDIRECT_URI || ''
 export const EMBEDDED_SIGNUP_GRAPH_VERSION = process.env.EMBEDDED_SIGNUP_GRAPH_VERSION || 'v24.0'
-export const QR_TIMEOUT_MS = parseInt(process.env.QR_TIMEOUT_MS || '60000')
-export const QR_POST_LOGIN_SUPPRESS_MS = parseInt(process.env.QR_POST_LOGIN_SUPPRESS_MS || '45000')
-export const STATUS_FAILED_WEBHOOK_URL = process.env.STATUS_FAILED_WEBHOOK_URL || ''
+export const QR_TIMEOUT_MS = parseInt(process.env.QR_TIMEOUT_MS || '60000')
+export const QR_POST_LOGIN_SUPPRESS_MS = parseInt(process.env.QR_POST_LOGIN_SUPPRESS_MS || '45000')
+export const STATUS_FAILED_WEBHOOK_URL = process.env.STATUS_FAILED_WEBHOOK_URL || ''
 // Status broadcast behavior
 export const STATUS_ALLOW_LID: boolean = process.env.STATUS_ALLOW_LID === _undefined ? true : process.env.STATUS_ALLOW_LID == 'true'
 // Enable/disable sending Status (status@broadcast). When disabled, outgoing status
@@ -301,14 +301,15 @@ export const GROUP_ONLY_DELIVERED_STATUS =
 export const RECEIPT_RETRY_ASSERT_COOLDOWN_MS = parseInt(process.env.RECEIPT_RETRY_ASSERT_COOLDOWN_MS || '15000')
 export const RECEIPT_RETRY_ASSERT_MAX_TARGETS = parseInt(process.env.RECEIPT_RETRY_ASSERT_MAX_TARGETS || '400')
 
-// JID mapping cache (PN <-> LID)
-export const JIDMAP_CACHE_ENABLED = process.env.JIDMAP_CACHE_ENABLED === _undefined ? true : process.env.JIDMAP_CACHE_ENABLED == 'true'
-// Enable/disable jidmap list endpoint.
-export const JIDMAP_LIST_ENABLED = process.env.JIDMAP_LIST_ENABLED === _undefined ? true : process.env.JIDMAP_LIST_ENABLED == 'true'
+// JID mapping cache (PN <-> LID)
+export const JIDMAP_CACHE_ENABLED = process.env.JIDMAP_CACHE_ENABLED === _undefined ? true : process.env.JIDMAP_CACHE_ENABLED == 'true'
+// Enable/disable jidmap list endpoint.
+export const JIDMAP_LIST_ENABLED = process.env.JIDMAP_LIST_ENABLED === _undefined ? true : process.env.JIDMAP_LIST_ENABLED == 'true'
 // Enable/disable lookups against stored jidmap cache (unoapi-jidmap:*).
-export const JIDMAP_STORED_LOOKUP_ENABLED =
-  process.env.JIDMAP_STORED_LOOKUP_ENABLED === _undefined ? false : process.env.JIDMAP_STORED_LOOKUP_ENABLED == 'true'
-export const JIDMAP_TTL_SECONDS = parseInt(process.env.JIDMAP_TTL_SECONDS || '604800') // 7 days
+export const JIDMAP_STORED_LOOKUP_ENABLED =
+  process.env.JIDMAP_STORED_LOOKUP_ENABLED === _undefined ? true : process.env.JIDMAP_STORED_LOOKUP_ENABLED == 'true'
+// 0 or negative => do not expire mappings
+export const JIDMAP_TTL_SECONDS = parseInt(process.env.JIDMAP_TTL_SECONDS || '0')
 
 // Self-heal: assert sessions when decrypt stub is detected in inbound messages
 export const SELFHEAL_ASSERT_ON_DECRYPT =
@@ -390,9 +391,9 @@ export const ONE_TO_ONE_ADDRESSING_MODE: 'lid' | 'pn' = (() => {
   return (v === 'lid' ? 'lid' : 'pn')
 })()
 
-// Background resolver: try to map LIDs seen to PN asynchronously (accelerates JIDMAP population)
-export const LID_RESOLVER_ENABLED: boolean =
-  process.env.LID_RESOLVER_ENABLED === _undefined ? true : process.env.LID_RESOLVER_ENABLED == 'true'
+// Background resolver: try to map LIDs seen to PN asynchronously (accelerates JIDMAP population)
+export const LID_RESOLVER_ENABLED: boolean =
+  process.env.LID_RESOLVER_ENABLED === _undefined ? true : process.env.LID_RESOLVER_ENABLED == 'true'
 export const LID_RESOLVER_BACKOFF_MS: number[] = (() => {
   try {
     const raw = (process.env.LID_RESOLVER_BACKOFF_MS || '30000,120000,300000').toString()
@@ -405,8 +406,8 @@ export const LID_RESOLVER_MAX_PENDING = parseInt(process.env.LID_RESOLVER_MAX_PE
 // Enriquecimento do JIDMAP (PN<->LID) a partir do contact-info
 export const JIDMAP_ENRICH_ENABLED = process.env.JIDMAP_ENRICH_ENABLED === _undefined ? false : process.env.JIDMAP_ENRICH_ENABLED == 'true'
 export const JIDMAP_ENRICH_PER_SWEEP = parseInt(process.env.JIDMAP_ENRICH_PER_SWEEP || '20')
-// Espelhar periodicamente o cache interno (unoapi-auth:*:lid-mapping-*) no JIDMAP
-export const JIDMAP_ENRICH_AUTH_ENABLED = process.env.JIDMAP_ENRICH_AUTH_ENABLED === _undefined ? true : process.env.JIDMAP_ENRICH_AUTH_ENABLED == 'true'
+// Espelhar periodicamente o cache interno (unoapi-auth:*:lid-mapping-*) no JIDMAP
+export const JIDMAP_ENRICH_AUTH_ENABLED = process.env.JIDMAP_ENRICH_AUTH_ENABLED === _undefined ? true : process.env.JIDMAP_ENRICH_AUTH_ENABLED == 'true'
 
 // Watchdog purge scan batch size (Redis SCAN COUNT per pattern)
 export const WATCHDOG_PURGE_SCAN_COUNT = parseInt(process.env.WATCHDOG_PURGE_SCAN_COUNT || '20')
@@ -422,10 +423,10 @@ export const ACK_RETRY_DELAYS_MS: number[] = (() => {
     return raw.split(',').map((s) => parseInt(s.trim())).filter((n) => Number.isFinite(n) && n > 0)
   } catch { return [8000, 30000, 60000] }
 })()
-// Optional hard cap for attempts; if set lower than delays length, it limits retries
-export const ACK_RETRY_MAX_ATTEMPTS: number = parseInt(process.env.ACK_RETRY_MAX_ATTEMPTS || '0') || 0
-// Enable/disable ACK-retry scheduling entirely (default true)
-export const ACK_RETRY_ENABLED: boolean = process.env.ACK_RETRY_ENABLED === _undefined ? false : process.env.ACK_RETRY_ENABLED == 'true'
+// Optional hard cap for attempts; if set lower than delays length, it limits retries
+export const ACK_RETRY_MAX_ATTEMPTS: number = parseInt(process.env.ACK_RETRY_MAX_ATTEMPTS || '0') || 0
+// Enable/disable ACK-retry scheduling entirely (default true)
+export const ACK_RETRY_ENABLED: boolean = process.env.ACK_RETRY_ENABLED === _undefined ? false : process.env.ACK_RETRY_ENABLED == 'true'
 
 // Media send retry (ex.: presigned URL 403 enquanto objeto não ficou disponível)
 export const MEDIA_RETRY_ENABLED: boolean =

src/services/client_baileys.ts

@@ -142,6 +142,60 @@ const buildSendOkResponse = (to: string, keyId: string) => ({
 })
 
 export class ClientBaileys implements Client {
+  private async remapMentionsToLidForGroup(targetTo: string, content: any) {
+    try {
+      if (!targetTo || !isJidGroup(targetTo)) return
+      const inputMentions: string[] = Array.isArray(content?.mentions) ? content.mentions : []
+      if (!inputMentions.length) return
+
+      const remapped: string[] = []
+      for (const raw of inputMentions) {
+        const mention = `${raw || ''}`.trim()
+        if (!mention) continue
+
+        // Keep LID mentions as-is.
+        if (isLidUser(mention as any)) {
+          remapped.push(jidNormalizedUser(mention as any) as string)
+          continue
+        }
+
+        // Normalize mention to PN JID first.
+        let pnJid = ''
+        if (isPnUser(mention as any)) {
+          pnJid = jidNormalizedUser(mention as any) as string
+        } else {
+          const pn = ensurePn(mention.startsWith('@') ? mention.slice(1) : mention)
+          if (pn) pnJid = phoneNumberToJid(pn)
+        }
+
+        if (!pnJid) {
+          remapped.push(mention)
+          continue
+        }
+
+        let lidJid: string | undefined
+        try {
+          lidJid = await this.store?.dataStore?.getLidForPn?.(this.phone, pnJid)
+        } catch {}
+        remapped.push(lidJid && isLidUser(lidJid as any) ? (jidNormalizedUser(lidJid as any) as string) : pnJid)
+      }
+
+      const unique = Array.from(new Set(remapped.filter(Boolean)))
+      const changed = unique.length !== inputMentions.length || unique.some((m, i) => m !== inputMentions[i])
+      if (changed) {
+        content.mentions = unique
+        logger.info(
+          'MENTION_UNO_REMAP to=%s before=%s after=%s',
+          targetTo,
+          JSON.stringify(inputMentions),
+          JSON.stringify(unique),
+        )
+      }
+    } catch (e) {
+      logger.debug(e as any, 'Ignore mention remap error for %s', targetTo)
+    }
+  }
+
   /**
    * High-level client that wraps Baileys send/receive operations for a single phone session.
    *
@@ -1056,6 +1110,7 @@ export class ClientBaileys implements Client {
               )
             } catch {}
             content = toBaileysMessageContent(payload, this.config.customMessageCharactersFunction)
+            await this.remapMentionsToLidForGroup(targetTo, content as any)
             try {
               logger.info(
                 'MENTION_SEND content to=%s mentionAll=%s mentions=%s text="%s"',