@neelegirly/baileys 2.2.17 → 2.2.19

package/README.md

@@ -2,49 +2,90 @@
 
 # 🌸 @neelegirly/baileys 🌸
 
-### *The cutest WhatsApp Web API glow-up for Node.js*  
-### *QR Branding · LID Support · Stable Sessions · Update Checks*
+### *Die WhatsApp Web API mit sauberem Neelegirly-Glow-up*
+### *QR Branding · Wrapper-Aware Update Notify · LID · Smart Queue*
 
-[![npm](https://img.shields.io/npm/v/@neelegirly/baileys?style=for-the-badge&color=ff69b4&logo=npm)](https://www.npmjs.com/package/@neelegirly/baileys)
-[![wa-api](https://img.shields.io/badge/wa--api-1.7.16-c77dff?style=for-the-badge)](https://www.npmjs.com/package/@neelegirly/wa-api)
+[![Version](https://img.shields.io/badge/Version-2.2.19-ff69b4?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@neelegirly/baileys)
+[![wa-api](https://img.shields.io/badge/wa--api-1.8.4-c77dff?style=for-the-badge)](https://www.npmjs.com/package/@neelegirly/wa-api)
 [![libsignal](https://img.shields.io/badge/libsignal-1.0.28-f4a261?style=for-the-badge)](https://www.npmjs.com/package/@neelegirly/libsignal)
+[![Node](https://img.shields.io/badge/Node-16+-4caf50?style=for-the-badge&logo=node.js)](https://nodejs.org)
+[![npm](https://img.shields.io/npm/v/%40neelegirly%2Fbaileys?style=for-the-badge&color=ff69b4&logo=npm)](https://www.npmjs.com/package/@neelegirly/baileys)
 
 <p align="center">
-  <img src="https://files.catbox.moe/5bqumy.jpeg" width="420" alt="Neelegirly baileys hero" />
+  <img src="https://files.catbox.moe/5bqumy.jpeg" width="780" alt="@neelegirly/baileys Hero" />
 </p>
 
-**🎀 Release-Stack:** `@neelegirly/baileys 2.2.17` · `@neelegirly/libsignal 1.0.28` · `@neelegirly/wa-api 1.7.16`
+<p align="center"><sub>2026 Glow-Up Edition · frische WA-API- und USync-Patches · Companion-Stack auf <strong>2.2.19 / 1.8.4 / 1.0.28</strong></sub></p>
+
+[**Installation**](#-installation) · [**Quickstart**](#-quickstart) · [**Highlights**](#-highlights) · [**QR Branding**](#-qr-branding--update-status) · [**Migration**](#-namespace-migration) · [**Release Notes**](#-release-notes-2219)
 
 </div>
 
-Neelegirly-Variante von Baileys als WhatsApp-Web-Basis fuer Node.js — gemacht fuer stabile Bots, schoene QR-Flows und einen sauber gepinnten Multi-Session-Stack.
+---
+
+Neelegirlys Variante von Baileys ist die WhatsApp-Web-Basis für stabile Bots, schöne QR-Flows und einen sauber gepinnten Multi-Session-Stack. Die Library bleibt nah an Baileys, aber mit fokussiertem Branding, Update-Notify und Begleit-Ökosystem für `@neelegirly/wa-api`.
 
 > Hinweis: Dieses Projekt ist nicht offiziell mit WhatsApp, Meta oder Baileys-Upstream verbunden.
 
+---
+
 ## ✨ Highlights
 
 | Feature | Beschreibung | Status |
 | --- | --- | --- |
 | 💖 Multi-Device API | WhatsApp Web auf Node.js mit Event-Flow | ✅ |
 | 📷 QR Branding | Header/Footer + Wrapper-/Versionskontext direkt im QR-Flow | ✅ |
-| 🔔 Update-Checks | npm zuerst, GitHub-Fallback, semver-sicher | ✅ |
-| 🧷 LID / Session-Fokus | passend fuer moderne Multi-Device-/Linked-ID-Flows | ✅ |
+| 🔔 Wrapper-Aware Update Notify | Status für Baileys **und** optionalen Wrapper-Kontext | ✅ |
+| 🚀 Smart Queue | Retries, Prioritäten und Bulk-Sending für produktive Setups | ✅ |
+| 🧷 LID / Session-Fokus | passend für moderne Multi-Device-/Linked-ID-Flows | ✅ |
 | 🎀 Neelegirly Scope | sauber auf `@neelegirly/*` ausgerichtet | ✅ |
 
-## 📦 Kompatibilitaet
+---
+
+## 🆕 Was sich in `v2.2.19` geändert hat
+
+- ✅ Aktuelle Baileys-Upstream-Fixes vom 24./25. April 2026 sauber übernommen
+- ✅ AB-Props-Query nutzt wieder den aktuellen `abt`/Protocol-1-Flow
+- ✅ Username-Felder in Contacts, Gruppenmetadaten, Message Keys und USync ergänzt
+- ✅ App-State-Sync robuster bei fehlenden Keys, Snapshot-Retry und Reconnects
+- ✅ Call-Events, Album-Messages und History/Media-Streaming erweitert
+
+---
+
+## 📦 Kompatibilität
 
 | Paket | Empfohlene Version |
 | --- | --- |
-| `@neelegirly/baileys` | `2.2.17` |
-| `@neelegirly/wa-api` | `1.7.16` |
+| `@neelegirly/baileys` | `2.2.19` |
+| `@neelegirly/wa-api` | `1.8.4` |
 | `@neelegirly/libsignal` | `1.0.28` |
 
+---
+
 ## 🚀 Installation
 
+### npm
+
 ```bash
-npm install @neelegirly/baileys@2.2.17 @neelegirly/libsignal@1.0.28 --save-exact
+npm install @neelegirly/baileys@2.2.19 @neelegirly/libsignal@1.0.28 --save-exact
 ```
 
+### yarn
+
+```bash
+yarn add @neelegirly/baileys@2.2.19 @neelegirly/libsignal@1.0.28 --exact
+```
+
+### pnpm
+
+```bash
+pnpm add @neelegirly/baileys@2.2.19 @neelegirly/libsignal@1.0.28 --save-exact
+```
+
+> Für den kompletten Neelegirly-Stack passt dazu `@neelegirly/wa-api@1.8.4`.
+
+---
+
 ## ⚡ Quickstart
 
 ```ts
@@ -77,6 +118,7 @@ async function start() {
     if (connection === 'close') {
       const statusCode = lastDisconnect?.error?.output?.statusCode
       const isLoggedOut = statusCode === DisconnectReason.loggedOut
+
       if (!isLoggedOut) start().catch(console.error)
     }
   })
@@ -85,21 +127,33 @@ async function start() {
 start().catch(console.error)
 ```
 
-> Direktes `sock.ev.on('creds.update', saveCreds)` ist fuer kleine Demos okay. In produktiven Multi-Session-Setups sollten Credential-Saves gebuendelt/debounced werden, damit Session-Dateien bei vielen Updates stabil bleiben.
+> Direktes `sock.ev.on('creds.update', saveCreds)` ist für kleine Demos okay. In produktiven Multi-Session-Setups sollten Credential-Saves gebündelt oder debounced werden.
 
-## 🌐 Namespace-Migration
+---
 
-Wenn du vom Upstream kommst, nutze den Import-Scope von Neelegirly:
+## 🧩 Companion Stack
 
-```diff
-- import makeWASocket from '@whiskeysockets/baileys'
-+ import makeWASocket from '@neelegirly/baileys'
-```
+| Paket | Rolle |
+|------|-------|
+| `@neelegirly/baileys 2.2.19` | Socket, Events, Messaging |
+| `@neelegirly/libsignal 1.0.28` | Signal-Protokoll-Komponente |
+| `@neelegirly/wa-api 1.8.4` | Lifecycle-, Session- und Update-Wrapper |
+
+---
+
+## 🩷 QR Branding & Update Status
+
+Beim QR-Scan werden automatisch Markenzeilen oberhalb und unterhalb des QR-Codes ausgegeben. Die Ausgabe liest Versionen dynamisch aus `package.json`, verarbeitet Update-Status robust und kann zusätzlich Wrapper-Kontext aus `@neelegirly/wa-api` darstellen.
+
+Typische Anzeige:
 
-## 🩷 QR-Branding und Versionsanzeige
+- `Baileys Update-Status: up to date (2.2.19)`
+- `Wrapper Update-Status: up to date (1.8.4)`
+- Bei echten Updates werden kompakte Hinweise auf `latest` eingeblendet
 
-Beim QR-Scan werden automatisch Markenzeilen oberhalb und unterhalb des QR-Codes ausgegeben.
-Die Anzeige liest Versionen dynamisch aus `package.json`, erkennt Wrapper-Kontexte und zeigt bei Bedarf einen kompakten Update-Hinweis an.
+Wenn kein Wrapper-Kontext vorhanden ist, bleibt die Anzeige sauber bei Baileys. Kein unnötiges Drama, nur QR. ✨
+
+---
 
 ## 🔄 Update-Check
 
@@ -107,9 +161,37 @@ Die Anzeige liest Versionen dynamisch aus `package.json`, erkennt Wrapper-Kontex
 - Quelle 2: GitHub Releases (`neelegirly/baileys`) als Fallback
 - Fehler und Timeouts werden abgefangen, ohne den Prozess zu stoppen
 - Semver-Vergleich wird numerisch ausgewertet
+- Wrapper-Status kann über die von `@neelegirly/wa-api` gesetzten Umgebungsvariablen übernommen werden
+
+Wenn du direkt prüfen willst:
+
+```ts
+import { checkNpmVersion } from '@neelegirly/baileys'
+
+const info = await checkNpmVersion('@neelegirly/baileys', '2.2.19', {
+  githubRepo: 'neelegirly/baileys'
+})
+
+console.log(info)
+```
+
+---
+
+## 🌐 Namespace-Migration
+
+Wenn du vom Upstream kommst, nutze den Neelegirly-Scope:
+
+```diff
+- import makeWASocket from '@whiskeysockets/baileys'
++ import makeWASocket from '@neelegirly/baileys'
+```
+
+---
 
-## 🎉 Release-Notizen
+## 📝 Release Notes `2.2.19`
 
-- README im Hero-/Glow-up-Stil komplett erneuert
-- Stack auf `2.2.17 / 1.7.16 / 1.0.28` aktualisiert
-- QR-/Versionsbranding bleibt zentral im Package verankert
+- 🔧 Upstream-Änderungen vom 24./25. April 2026 portiert, ohne QR-/Update-Notify- oder Message-ID-Handling umzubauen
+- 🧩 Username-USync und Inbound-Username-Felder für Kontakte, Gruppen und Message Keys ergänzt
+- 🛡️ App-State-Sync und libsignal-LID/PN-Typen robuster gemacht
+- 🖼️ Album-Message-Sending und erweiterte Call-Event-Typen ergänzt
+- 🔗 Companion-Stack auf `2.2.19 / 1.8.4 / 1.0.28` aktualisiert

package/lib/Socket/business.d.ts

@@ -144,6 +144,11 @@ export declare const makeBusinessSocket: (config: SocketConfig) => {
     resyncAppState: (collections: readonly ("critical_block" | "critical_unblock_low" | "regular_high" | "regular_low" | "regular")[], isInitialSync: boolean) => Promise<void>
     chatModify: (mod: import("../Types").ChatModification, jid: string) => Promise<void>
     cleanDirtyBits: (type: "account_sync" | "groups", fromTimestamp?: string | number | undefined) => Promise<void>
+    serverProps: {
+        privacyTokenOn1to1: boolean
+        profilePicPrivacyToken: boolean
+        lidTrustedTokenIssueToLid: boolean
+    }
     addLabel: (jid: string, labels: import("../Types/Label").LabelActionBody) => Promise<void>
     addChatLabel: (jid: string, labelId: string) => Promise<void>
     removeChatLabel: (jid: string, labelId: string) => Promise<void>
@@ -184,4 +189,4 @@ export declare const makeBusinessSocket: (config: SocketConfig) => {
     requestPairingCode: (phoneNumber: string, code?: string) => Promise<string>
     waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => boolean | undefined, timeoutMs?: number | undefined) => Promise<void>
     sendWAMBuffer: (wamBuffer: Buffer) => Promise<BinaryNode>
-}
+}

package/lib/Socket/chats.d.ts

@@ -48,6 +48,11 @@ export declare const makeChatsSocket: (config: SocketConfig) => {
     resyncAppState: (collections: readonly ("critical_block" | "critical_unblock_low" | "regular_high" | "regular_low" | "regular")[], isInitialSync: boolean) => Promise<void>
     chatModify: (mod: ChatModification, jid: string) => Promise<void>
     cleanDirtyBits: (type: 'account_sync' | 'groups', fromTimestamp?: number | string) => Promise<void>
+    serverProps: {
+        privacyTokenOn1to1: boolean
+        profilePicPrivacyToken: boolean
+        lidTrustedTokenIssueToLid: boolean
+    }
     addLabel: (jid: string, labels: LabelActionBody) => Promise<void>
     addChatLabel: (jid: string, labelId: string) => Promise<void>
     removeChatLabel: (jid: string, labelId: string) => Promise<void>
@@ -95,4 +100,4 @@ export declare const makeChatsSocket: (config: SocketConfig) => {
      * requires the last messages till the last message received required for archive & unread
     */
     sendWAMBuffer: (wamBuffer: Buffer) => Promise<BinaryNode>
-}
+}

package/lib/Socket/chats.js

@@ -21,9 +21,16 @@ const MAX_SYNC_ATTEMPTS = 2
 const makeChatsSocket = (config) => {
     const { logger, markOnlineOnConnect, fireInitQueries, appStateMacVerification, shouldIgnoreJid, shouldSyncHistoryMessage, } = config
     const Neele = usync_1.makeUSyncSocket(config)
-    const { ev, ws, authState, generateMessageTag, sendNode, query, onUnexpectedError, groupFetchAllParticipating } = Neele
+    const { ev, ws, authState, generateMessageTag, sendNode, query, onUnexpectedError, groupFetchAllParticipating, signalRepository } = Neele
+    const getLIDForPN = signalRepository?.lidMapping?.getLIDForPN?.bind(signalRepository.lidMapping)
+    const getPNForLID = signalRepository?.lidMapping?.getPNForLID?.bind(signalRepository.lidMapping)
     
     let privacySettings
+    const serverProps = {
+        privacyTokenOn1to1: true,
+        profilePicPrivacyToken: true,
+        lidTrustedTokenIssueToLid: false
+    }
     let syncState = Types_1.SyncState.Connecting
     
     /** this mutex ensures that the notifications (receipts, messages etc.) are processed in order */
@@ -31,6 +38,7 @@ const makeChatsSocket = (config) => {
     
     // Timeout for AwaitingInitialSync State
     let awaitingSyncTimeout
+    const blockedCollections = new Set()
     
     const placeholderResendCache = config.placeholderResendCache || new node_cache_1.default({
         stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY,
@@ -337,6 +345,40 @@ const makeChatsSocket = (config) => {
     }
     
     const updateBlockStatus = async (jid, action) => {
+        const normalizedJid = WABinary_1.jidNormalizedUser(jid)
+        let lid
+        let pn_jid
+        if (WABinary_1.isLidUser(normalizedJid) || WABinary_1.isHostedLidUser(normalizedJid)) {
+            lid = normalizedJid
+            if (action === 'block') {
+                const pn = getPNForLID ? await getPNForLID(normalizedJid) : undefined
+                if (!pn) {
+                    throw new boom_1.Boom(`Unable to resolve PN JID for LID: ${jid}`, { statusCode: 400 })
+                }
+                pn_jid = WABinary_1.jidNormalizedUser(pn)
+            }
+        } else if (WABinary_1.isJidUser(normalizedJid) || WABinary_1.isHostedPnUser(normalizedJid)) {
+            const mapped = getLIDForPN ? await getLIDForPN(normalizedJid) : undefined
+            if (!mapped) {
+                throw new boom_1.Boom(`Unable to resolve LID for PN JID: ${jid}`, { statusCode: 400 })
+            }
+            lid = WABinary_1.jidNormalizedUser(mapped)
+            if (action === 'block') {
+                pn_jid = normalizedJid
+            }
+        } else {
+            throw new boom_1.Boom(`Invalid jid: ${jid}`, { statusCode: 400 })
+        }
+        const itemAttrs = {
+            action,
+            jid: lid
+        }
+        if (action === 'block') {
+            if (!pn_jid) {
+                throw new boom_1.Boom(`pn_jid required for block: ${jid}`, { statusCode: 400 })
+            }
+            itemAttrs.pn_jid = pn_jid
+        }
         await query({
             tag: 'iq',
             attrs: {
@@ -347,10 +389,7 @@ const makeChatsSocket = (config) => {
             content: [
                 {
                     tag: 'item',
-                    attrs: {
-                        action,
-                        jid
-                    }
+                    attrs: itemAttrs
                 }
             ]
         })
@@ -444,6 +483,7 @@ const makeChatsSocket = (config) => {
             const collectionsToHandle = new Set(collections)
             // in case something goes wrong -- ensure we don't enter a loop that cannot be exited from
             const attemptsMap = {}
+            const forceSnapshotCollections = new Set()
             // keep executing till all collections are done
             // sometimes a single patch request will not return all the patches (God knows why)
             // so we fetch till they're all done (this is determined by the "has_more_patches" flag)
@@ -455,6 +495,7 @@ const makeChatsSocket = (config) => {
                     const result = await authState.keys.get('app-state-sync-version', [name])
                     let state = result[name]
                     if (state) {
+                        state = Utils_1.ensureLTHashStateVersion(state)
                         if (typeof initialVersionMap[name] === 'undefined') {
                             initialVersionMap[name] = state.version
                         }
@@ -463,14 +504,18 @@ const makeChatsSocket = (config) => {
                         state = Utils_1.newLTHashState()
                     }
                     states[name] = state
-                    logger.info(`resyncing ${name} from v${state.version}`)
+                    const shouldForceSnapshot = forceSnapshotCollections.has(name)
+                    if (shouldForceSnapshot) {
+                        forceSnapshotCollections.delete(name)
+                    }
+                    logger.info(`resyncing ${name} from v${state.version}${shouldForceSnapshot ? ' (forcing snapshot)' : ''}`)
                     nodes.push({
                         tag: 'collection',
                         attrs: {
                             name,
                             version: state.version.toString(),
-                            // return snapshot if being synced from scratch
-                            'return_snapshot': (!state.version).toString()
+                            // return snapshot if syncing from scratch or forcing after a failed attempt
+                            'return_snapshot': (shouldForceSnapshot || !state.version).toString()
                         }
                     })
                 }
@@ -523,19 +568,28 @@ const makeChatsSocket = (config) => {
                         }
                     }                     
                     catch (error) {
-                        // if retry attempts overshoot
-                        // or key not found
-                        const isIrrecoverableError = attemptsMap[name] >= MAX_SYNC_ATTEMPTS
-                            || error.output?.statusCode === 404
-                            || error.name === 'TypeError'
-                        logger.info({ name, error: error.stack }, `failed to sync state from version${isIrrecoverableError ? '' : ', removing and trying from scratch'}`)
-                        await authState.keys.set({ 'app-state-sync-version': { [name]: null } })
-                        // increment number of retries
                         attemptsMap[name] = (attemptsMap[name] || 0) + 1
-                        
-                        if (isIrrecoverableError) {
-                            // stop retrying
+                        const logData = {
+                            name,
+                            attempt: attemptsMap[name],
+                            version: states[name].version,
+                            statusCode: error.output?.statusCode,
+                            errorType: error.name,
+                            error: error.stack
+                        }
+                        if (Utils_1.isMissingKeyError(error) && attemptsMap[name] >= MAX_SYNC_ATTEMPTS) {
+                            logger.warn(logData, `${name} blocked on missing key from v${states[name].version}, parking after ${attemptsMap[name]} attempts`)
+                            blockedCollections.add(name)
+                            collectionsToHandle.delete(name)
+                        } else if (Utils_1.isMissingKeyError(error)) {
+                            logger.info(logData, `${name} blocked on missing key from v${states[name].version}, retrying with snapshot`)
+                            forceSnapshotCollections.add(name)
+                        } else if (Utils_1.isAppStateSyncIrrecoverable(error, attemptsMap[name])) {
+                            logger.warn(logData, `failed to sync ${name} from v${states[name].version}, giving up`)
                             collectionsToHandle.delete(name)
+                        } else {
+                            logger.info(logData, `failed to sync ${name} from v${states[name].version}, forcing snapshot retry`)
+                            forceSnapshotCollections.add(name)
                         }
                     }
                 }
@@ -698,7 +752,7 @@ const makeChatsSocket = (config) => {
                 logger.debug({ patch: patchCreate }, 'applying app patch')
                 await resyncAppState([name], false)
                 const { [name]: currentSyncVersion } = await authState.keys.get('app-state-sync-version', [name])
-                initial = currentSyncVersion || Utils_1.newLTHashState()
+                initial = currentSyncVersion ? Utils_1.ensureLTHashStateVersion(currentSyncVersion) : Utils_1.newLTHashState()
                 encodeResult = await Utils_1.encodeSyncdPatch(patchCreate, myAppStateKeyId, initial, getAppStateSyncKey)
                 const { patch, state } = encodeResult
                 
@@ -748,19 +802,19 @@ const makeChatsSocket = (config) => {
         }
     }
     
-    /** sending non-abt props may fix QR scan fail if server expects */
+    /** fetch AB props */
     const fetchProps = async () => {
         const resultNode = await query({
             tag: 'iq',
             attrs: {
                 to: WABinary_1.S_WHATSAPP_NET,
-                xmlns: 'w',
+                xmlns: 'abt',
                 type: 'get',
             },
             content: [
                 { tag: 'props', attrs: {
-                        protocol: '2',
-                        hash: authState?.creds?.lastPropHash || ''
+                        protocol: '1',
+                        ...(authState?.creds?.lastPropHash ? { hash: authState.creds.lastPropHash } : {})
                     } }
             ]
         })
@@ -776,7 +830,19 @@ const makeChatsSocket = (config) => {
             
             props = WABinary_1.reduceBinaryNodeToDictionary(propsNode, 'prop')
         }
-        logger.debug('fetched props')
+        const privacyTokenProp = props['10518'] ?? props['privacy_token_sending_on_all_1_on_1_messages']
+        if (privacyTokenProp !== undefined) {
+            serverProps.privacyTokenOn1to1 = privacyTokenProp === 'true' || privacyTokenProp === '1'
+        }
+        const profilePicProp = props['9666'] ?? props['profile_scraping_privacy_token_in_photo_iq']
+        if (profilePicProp !== undefined) {
+            serverProps.profilePicPrivacyToken = profilePicProp === 'true' || profilePicProp === '1'
+        }
+        const lidIssueProp = props['14303'] ?? props['lid_trusted_token_issue_to_lid']
+        if (lidIssueProp !== undefined) {
+            serverProps.lidTrustedTokenIssueToLid = lidIssueProp === 'true' || lidIssueProp === '1'
+        }
+        logger.debug({ serverProps }, 'fetched props')
         return props
     }
     
@@ -1037,6 +1103,9 @@ const makeChatsSocket = (config) => {
     })
     
     ev.on('connection.update', ({ connection, receivedPendingNotifications }) => {
+        if (connection === 'close') {
+            blockedCollections.clear()
+        }
         if (connection === 'open') {
             if (fireInitQueries) {
                 executeInitQueries()
@@ -1050,7 +1119,7 @@ const makeChatsSocket = (config) => {
         	return
         }
         
-        syncState = Types_1.AwaitingInitialSync
+        syncState = Types_1.SyncState.AwaitingInitialSync
         logger.info('Connection is now AwaitingInitialSync, buffering events') 
         ev.buffer() 
         
@@ -1065,7 +1134,14 @@ const makeChatsSocket = (config) => {
         	return 
         }
         
-        logger.info('History sync is enabled, awaiting notification with a 20s timeout.') 
+        if (authState.creds.accountSyncCounter > 0) {
+            logger.info('Reconnection with existing sync data, skipping history sync wait. Transitioning to Online.')
+            syncState = Types_1.SyncState.Online
+            setTimeout(() => ev.flush(), 0)
+            return
+        }
+
+        logger.info('First connection, awaiting history sync notification with a 20s timeout.')
         
         if (awaitingSyncTimeout) {
         	clearTimeout(awaitingSyncTimeout) 
@@ -1076,15 +1152,32 @@ const makeChatsSocket = (config) => {
         		logger.warn('Timeout in AwaitingInitialSync, forcing state to Online and flushing buffer') 
         		syncState = Types_1.SyncState.Online
         		ev.flush() 
+                const accountSyncCounter = (authState.creds.accountSyncCounter || 0) + 1
+                ev.emit('creds.update', { accountSyncCounter })
         	}
         }, 20_000) 
     })
-    
+
+    ev.on('creds.update', ({ myAppStateKeyId }) => {
+        if (!myAppStateKeyId || blockedCollections.size === 0) {
+            return
+        }
+        if (syncState === Types_1.SyncState.Syncing) {
+            blockedCollections.clear()
+            return
+        }
+        const collections = [...blockedCollections]
+        blockedCollections.clear()
+        logger.info({ collections }, 'app state sync key arrived, re-syncing blocked collections')
+        resyncAppState(collections, false).catch(error => onUnexpectedError(error, 'blocked collections resync'))
+    })
+
     return {
         ...Neele, 
         star, 
         addOrEditContact, 
         removeContact, 
+        serverProps,
         processingMutex,
         fetchPrivacySettings,
         upsertMessage,

package/lib/Socket/communities.d.ts

@@ -178,6 +178,11 @@ export declare const makeCommunitiesSocket: (config: SocketConfig) => {
     resyncAppState: (collections: readonly ("critical_unblock_low" | "regular_high" | "regular_low" | "critical_block" | "regular")[], isInitialSync: boolean) => Promise<void>;
     chatModify: (mod: import("../index.js").ChatModification, jid: string) => Promise<void>;
     cleanDirtyBits: (type: "account_sync" | "groups", fromTimestamp?: number | string) => Promise<void>;
+    serverProps: {
+        privacyTokenOn1to1: boolean;
+        profilePicPrivacyToken: boolean;
+        lidTrustedTokenIssueToLid: boolean;
+    };
     addOrEditContact: (jid: string, contact: proto.SyncActionValue.IContactAction) => Promise<void>;
     removeContact: (jid: string) => Promise<void>;
     addLabel: (jid: string, labels: import("../Types/Label.js").LabelActionBody) => Promise<void>;

package/lib/Socket/groups.d.ts

@@ -84,6 +84,11 @@ export declare const makeGroupsSocket: (config: SocketConfig) => {
     resyncAppState: (collections: readonly ("critical_block" | "critical_unblock_low" | "regular_high" | "regular_low" | "regular")[], isInitialSync: boolean) => Promise<void>
     chatModify: (mod: import("../Types").ChatModification, jid: string) => Promise<void>
     cleanDirtyBits: (type: "account_sync" | "groups", fromTimestamp?: string | number | undefined) => Promise<void>
+    serverProps: {
+        privacyTokenOn1to1: boolean
+        profilePicPrivacyToken: boolean
+        lidTrustedTokenIssueToLid: boolean
+    }
     addLabel: (jid: string, labels: import("../Types/Label").LabelActionBody) => Promise<void>
     addChatLabel: (jid: string, labelId: string) => Promise<void>
     removeChatLabel: (jid: string, labelId: string) => Promise<void>
@@ -128,4 +133,4 @@ export declare const makeGroupsSocket: (config: SocketConfig) => {
     sendWAMBuffer: (wamBuffer: Buffer) => Promise<BinaryNode>
 }
 
-export declare const extractGroupMetadata: (result: BinaryNode) => GroupMetadata
+export declare const extractGroupMetadata: (result: BinaryNode) => GroupMetadata

package/lib/Socket/groups.js

@@ -302,9 +302,15 @@ const extractGroupMetadata = (result) => {
     
     let desc
     let descId
+    let descOwner
+    let descOwnerPn
+    let descOwnerUsername
     
     if (descChild) {
         desc = WABinary_1.getBinaryNodeChildString(descChild, 'body')
+        descOwner = descChild.attrs.participant ? WABinary_1.jidNormalizedUser(descChild.attrs.participant) : undefined
+        descOwnerPn = descChild.attrs.participant_pn ? WABinary_1.jidNormalizedUser(descChild.attrs.participant_pn) : undefined
+        descOwnerUsername = descChild.attrs.participant_username || undefined
         descId = descChild.attrs.id
     }
     
@@ -318,13 +324,20 @@ const extractGroupMetadata = (result) => {
         addressingMode: mode, 
         subject: group.attrs.subject,
         subjectOwner: mode === 'lid' ? group.attrs.s_o_pn : group.attrs.s_o,
+        subjectOwnerPn: group.attrs.s_o_pn,
+        subjectOwnerUsername: group.attrs.s_o_username,
         subjectTime: +group.attrs.s_t,
         size: group.attrs?.size ? +group.attrs.size : WABinary_1.getBinaryNodeChildren(group, 'participant').length,
         creation: +group.attrs.creation,
         owner: group.attrs.creator ? WABinary_1.jidNormalizedUser(mode === 'lid' ? group.attrs.creator_pn : group.attrs.creator) : undefined,
+        ownerPn: group.attrs.creator_pn ? WABinary_1.jidNormalizedUser(group.attrs.creator_pn) : undefined,
+        ownerUsername: group.attrs.creator_username || undefined,
         ownerCountry: group.attrs.creator_country_code, 
         desc,
         descId,
+        descOwner,
+        descOwnerPn,
+        descOwnerUsername,
         linkedParent: WABinary_1.getBinaryNodeChild(group, 'linked_parent')?.attrs.jid || undefined,
         restrict: !!WABinary_1.getBinaryNodeChild(group, 'locked'),
         announce: !!WABinary_1.getBinaryNodeChild(group, 'announcement'),
@@ -337,6 +350,7 @@ const extractGroupMetadata = (result) => {
                 id: (0, WABinary_1.isJidUser)(attrs.jid) ? attrs.jid : (0, WABinary_1.jidNormalizedUser)(attrs.phone_number),
                 jid: (0, WABinary_1.isJidUser)(attrs.jid) ? attrs.jid : (0, WABinary_1.jidNormalizedUser)(attrs.phone_number),
                 lid: (0, WABinary_1.isLidUser)(attrs.jid) ? attrs.jid : attrs.lid,
+                username: attrs.participant_username || attrs.username || undefined,
                 admin: (attrs.type || null)
             };
         }),
@@ -349,4 +363,4 @@ const extractGroupMetadata = (result) => {
 module.exports = {
   makeGroupsSocket, 
   extractGroupMetadata
-}
+}

package/lib/Socket/index.d.ts

@@ -144,6 +144,11 @@ declare const makeWASocket: (config: UserFacingSocketConfig) => {
     resyncAppState: (collections: readonly ("critical_block" | "critical_unblock_low" | "regular_high" | "regular_low" | "regular")[], isInitialSync: boolean) => Promise<void>
     chatModify: (mod: import("../Types").ChatModification, jid: string) => Promise<void>
     cleanDirtyBits: (type: "account_sync" | "groups", fromTimestamp?: string | number | undefined) => Promise<void>
+    serverProps: {
+        privacyTokenOn1to1: boolean
+        profilePicPrivacyToken: boolean
+        lidTrustedTokenIssueToLid: boolean
+    }
     addLabel: (jid: string, labels: import("../Types/Label").LabelActionBody) => Promise<void>
     addChatLabel: (jid: string, labelId: string) => Promise<void>
     removeChatLabel: (jid: string, labelId: string) => Promise<void>
@@ -188,4 +193,4 @@ declare const makeWASocket: (config: UserFacingSocketConfig) => {
     sendWAMBuffer: (wamBuffer: Buffer) => Promise<import("..").BinaryNode>
 }
 
-export default makeWASocket
+export default makeWASocket

package/lib/Socket/messages-recv.d.ts

@@ -132,6 +132,11 @@ export declare const makeMessagesRecvSocket: (config: SocketConfig) => {
     resyncAppState: (collections: readonly ("critical_block" | "critical_unblock_low" | "regular_high" | "regular_low" | "regular")[], isInitialSync: boolean) => Promise<void>
     chatModify: (mod: import("../Types").ChatModification, jid: string) => Promise<void>
     cleanDirtyBits: (type: "account_sync" | "groups", fromTimestamp?: string | number | undefined) => Promise<void>
+    serverProps: {
+        privacyTokenOn1to1: boolean
+        profilePicPrivacyToken: boolean
+        lidTrustedTokenIssueToLid: boolean
+    }
     addLabel: (jid: string, labels: import("../Types/Label").LabelActionBody) => Promise<void>
     addChatLabel: (jid: string, labelId: string) => Promise<void>
     removeChatLabel: (jid: string, labelId: string) => Promise<void>