@zervonex/baileys 3.0.1 → 3.0.2

package/lib/Utils/tc-token-utils.js

@@ -1,102 +1,154 @@
-import { randomBytes } from 'crypto';
-import { getBinaryNodeChild, getBinaryNodeChildren, isHostedLidUser, isHostedPnUser, isJidMetaAI, isLidUser, isPnUser, jidNormalizedUser } from '../WABinary/index.js';
-import { unixTimestampSeconds } from './generics.js';
-import { TC_TOKEN_INDEX_KEY } from './key-store.js';
+import { randomBytes } from 'crypto'
+import { getBinaryNodeChild, getBinaryNodeChildren, isHostedLidUser, isHostedPnUser, isJidMetaAI, isLidUser, isPnUser, jidNormalizedUser } from '../WABinary/index.js'
+import { unixTimestampSeconds } from './generics.js'
 
-const BOT_PHONE_REGEX = /^1313555\d{4}$|^131655500\d{2}$/;
-const TC_TOKEN_BUCKET_DURATION = 604800; // 7 days in seconds
-const TC_TOKEN_NUM_BUCKETS = 4;      // ~28-day rolling window
+// ─── Constants ────────────────────────────────────────────────────────────────
+export const TC_TOKEN_INDEX_KEY = '__index'
+const BOT_PHONE_REGEX = /^1313555\d{4}$|^131655500\d{2}$/
+const TC_TOKEN_BUCKET_DURATION = 604800 // 7 days
+const TC_TOKEN_NUM_BUCKETS = 4          // ~28-day rolling window
+const TC_TOKEN_MIN_BYTES = 1
+const TC_TOKEN_MAX_BYTES = 120          // DMW layer constraint
+const TC_TOKEN_MAX_RECIPIENTS = 5       // feature flag 20606 default cap
 
-const currentBucket = () => Math.floor(Math.floor(Date.now() / 1000) / TC_TOKEN_BUCKET_DURATION);
-const generateTcToken = () => Buffer.concat([Buffer.from([0x04, 0x01, (Math.floor(unixTimestampSeconds() / TC_TOKEN_BUCKET_DURATION) - 2900) & 0xff]), randomBytes(8)]);
+const currentBucket = () => Math.floor(unixTimestampSeconds() / TC_TOKEN_BUCKET_DURATION)
+const generateTcToken = () => randomBytes(32) // local pre-seed fallback only; real tokens are server-issued
+
+// ─── JID helpers ──────────────────────────────────────────────────────────────
 
 export const isRegularUser = jid => {
-    if (!jid) return false;
-    const user = jid.split('@')[0] ?? '';
-    if (user === '0' || BOT_PHONE_REGEX.test(user) || isJidMetaAI(jid)) return false;
-    return !!(isPnUser(jid) || isLidUser(jid) || isHostedPnUser(jid) || isHostedLidUser(jid) || jid.endsWith('@c.us'));
-};
+    if (!jid) return false
+    const user = jid.split('@')[0] ?? ''
+    if (user === '0' || BOT_PHONE_REGEX.test(user) || isJidMetaAI(jid)) return false
+    return !!(isPnUser(jid) || isLidUser(jid) || isHostedPnUser(jid) || isHostedLidUser(jid) || jid.endsWith('@c.us'))
+}
+
+// storage key is always LID when resolvable
+export const resolveTcTokenJid = async (jid, getLIDForPN) =>
+    isLidUser(jid) ? jid : (await getLIDForPN(jid) || null)
+
+// bidirectional — respects useLidForEncryption flag
+export const resolveIssuanceJid = async (jid, issueToLid, getLIDForPN, getPNForLID) => {
+    if (issueToLid) return isLidUser(jid) ? jid : (await getLIDForPN(jid)) ?? jid
+    if (!isLidUser(jid)) return jid
+    return getPNForLID ? (await getPNForLID(jid)) ?? jid : jid
+}
+
+// ─── Expiry ───────────────────────────────────────────────────────────────────
 
 export const isTcTokenExpired = timestamp => {
-    if (timestamp == null) return true;
-    const ts = typeof timestamp === 'string' ? parseInt(timestamp) : timestamp;
-    return isNaN(ts) || ts < (currentBucket() - (TC_TOKEN_NUM_BUCKETS - 1)) * TC_TOKEN_BUCKET_DURATION;
-};
+    if (timestamp == null) return true
+    const ts = typeof timestamp === 'string' ? parseInt(timestamp) : timestamp
+    return isNaN(ts) || ts < (currentBucket() - (TC_TOKEN_NUM_BUCKETS - 1)) * TC_TOKEN_BUCKET_DURATION
+}
 
+// re-issue only if sender crossed into a new bucket since last issuance
 export const shouldSendNewTcToken = senderTimestamp => {
-    if (senderTimestamp === undefined) return true;
-    return currentBucket() > Math.floor(senderTimestamp / TC_TOKEN_BUCKET_DURATION);
-};
-
-export const resolveTcTokenJid = async (jid, getLIDForPN) => isLidUser(jid) ? jid : (await getLIDForPN(jid) || null);
+    if (senderTimestamp === undefined) return true
+    return currentBucket() > Math.floor(senderTimestamp / TC_TOKEN_BUCKET_DURATION)
+}
 
-export const resolveIssuanceJid = async (jid, issueToLid, getLIDForPN, getPNForLID) => {
-    if (issueToLid) return isLidUser(jid) ? jid : (await getLIDForPN(jid)) ?? jid;
-    if (!isLidUser(jid)) return jid;
-    return getPNForLID ? (await getPNForLID(jid)) ?? jid : jid;
-};
+// ─── Index ────────────────────────────────────────────────────────────────────
 
 export const readTcTokenIndex = async keys => {
     for (const key of [TC_TOKEN_INDEX_KEY, 'index']) {
-        const entry = (await keys.get('tctoken', [key]))[key];
-        if (!entry?.token?.length) continue;
+        const entry = (await keys.get('tctoken', [key]))[key]
+        if (!entry?.token?.length) continue
         try {
-            const parsed = JSON.parse(Buffer.from(entry.token).toString());
-            if (!Array.isArray(parsed)) continue;
-            return parsed.filter(j => typeof j === 'string' && j.length > 0 && j !== TC_TOKEN_INDEX_KEY && j !== 'index');
-        } catch { continue; }
+            const parsed = JSON.parse(Buffer.from(entry.token).toString())
+            if (!Array.isArray(parsed)) continue
+            return parsed.filter(j => typeof j === 'string' && j.length > 0 && j !== TC_TOKEN_INDEX_KEY && j !== 'index')
+        } catch { continue }
     }
-    return [];
-};
+    return []
+}
 
 export const buildMergedTcTokenIndexWrite = async (keys, addedJids) => {
-    const merged = new Set(await readTcTokenIndex(keys));
-    for (const jid of addedJids) if (jid && jid !== TC_TOKEN_INDEX_KEY && jid !== 'index') merged.add(jid);
-    return { [TC_TOKEN_INDEX_KEY]: { token: Buffer.from(JSON.stringify([...merged])) } };
-};
+    const merged = new Set(await readTcTokenIndex(keys))
+    for (const jid of addedJids) if (jid && jid !== TC_TOKEN_INDEX_KEY && jid !== 'index') merged.add(jid)
+    return { [TC_TOKEN_INDEX_KEY]: { token: Buffer.from(JSON.stringify([...merged])) } }
+}
+
+// ─── Pre-seed ─────────────────────────────────────────────────────────────────
 
 export const preSeedTcToken = async ({ authState, jid, getLIDForPN, logger }) => {
-    const tcTokenJid = await resolveTcTokenJid(jid, getLIDForPN);
-    const existing = await authState.keys.get('tctoken', [tcTokenJid]);
-    if (existing[tcTokenJid]?.token?.length) return { token: existing[tcTokenJid].token, storageJid: tcTokenJid };
-    const token = generateTcToken();
-    const timestamp = String(unixTimestampSeconds());
-    const indexWrite = await buildMergedTcTokenIndexWrite(authState.keys, [tcTokenJid]);
-    await authState.keys.set({ tctoken: { [tcTokenJid]: { ...(existing[tcTokenJid] || {}), token, timestamp }, ...indexWrite } });
-    logger?.debug({ jid, tcTokenJid }, 'pre-seeded locally generated tctoken');
-    return { token, storageJid: tcTokenJid };
-};
+    const tcTokenJid = await resolveTcTokenJid(jid, getLIDForPN)
+    const existing = await authState.keys.get('tctoken', [tcTokenJid])
+    if (existing[tcTokenJid]?.token?.length) return { token: existing[tcTokenJid].token, storageJid: tcTokenJid }
+    const token = generateTcToken()
+    const timestamp = String(unixTimestampSeconds())
+    const indexWrite = await buildMergedTcTokenIndexWrite(authState.keys, [tcTokenJid])
+    await authState.keys.set({ tctoken: { [tcTokenJid]: { ...(existing[tcTokenJid] || {}), token, timestamp }, ...indexWrite } })
+    logger?.debug({ jid, tcTokenJid }, 'pre-seeded locally generated tctoken')
+    return { token, storageJid: tcTokenJid }
+}
 
+// ─── Outgoing nodes ───────────────────────────────────────────────────────────
+// confirmed wire format: <tctoken>bytes</tctoken> — flat, identical to fanout format, no smax:any wrapper
+// timestamp attr is internal only, never sent on wire
 export const buildTcTokenFromJid = async ({ authState, jid, baseContent = [], getLIDForPN }) => {
     try {
-        const storageJid = await resolveTcTokenJid(jid, getLIDForPN);
-        const entry = (await authState.keys.get('tctoken', [storageJid]))?.[storageJid];
-        const { token: tcTokenBuffer, timestamp, senderTimestamp } = entry ?? {};
+        const storageJid = await resolveTcTokenJid(jid, getLIDForPN)
+        const entry = (await authState.keys.get('tctoken', [storageJid]))?.[storageJid]
+        const { token: tcTokenBuffer, timestamp, senderTimestamp } = entry ?? {}
         if (!tcTokenBuffer?.length || timestamp === undefined || isTcTokenExpired(timestamp)) {
             if (tcTokenBuffer) {
-                const cleared = senderTimestamp !== undefined ? { token: Buffer.alloc(0), senderTimestamp } : null;
-                await authState.keys.set({ tctoken: { [storageJid]: cleared } });
+                const cleared = senderTimestamp !== undefined ? { token: Buffer.alloc(0), senderTimestamp } : null
+                await authState.keys.set({ tctoken: { [storageJid]: cleared } })
             }
-            return baseContent.length > 0 ? baseContent : undefined;
+            return baseContent.length > 0 ? baseContent : undefined
         }
-        baseContent.push({ tag: 'tctoken', attrs: { t: String(timestamp) }, content: tcTokenBuffer });
-        return baseContent;
-    } catch { return baseContent.length > 0 ? baseContent : undefined; }
-};
+        if (tcTokenBuffer.length < TC_TOKEN_MIN_BYTES || tcTokenBuffer.length > TC_TOKEN_MAX_BYTES) return baseContent.length > 0 ? baseContent : undefined
+        baseContent.push({ tag: 'tctoken', attrs: {}, content: tcTokenBuffer })
+        return baseContent
+    } catch { return baseContent.length > 0 ? baseContent : undefined }
+}
+
+// fanout <to> node — confirmed wire format: <tctoken>bytes</tctoken> (no smax:any wrapper)
+// enforces per-send JID dedup (EOC.A01 Set guard) and flag-20606 recipient cap
+export const buildFanoutTcTokenNode = ({ tokenBuffer, recipientsSeen, userJid }) => {
+    if (
+        !tokenBuffer?.length
+        || tokenBuffer.length < TC_TOKEN_MIN_BYTES
+        || tokenBuffer.length > TC_TOKEN_MAX_BYTES
+        || recipientsSeen.size >= TC_TOKEN_MAX_RECIPIENTS
+        || recipientsSeen.has(userJid)
+    ) return null
+    recipientsSeen.add(userJid)
+    return { tag: 'tctoken', attrs: {}, content: tokenBuffer }
+}
 
+// ─── Incoming storage ─────────────────────────────────────────────────────────
+
+// handles both IQ result and privacy_token notification (same <tokens> structure)
+// wire format: <token type="trusted_contact" t="timestamp">bytes</token>
 export const storeTcTokensFromIqResult = async ({ result, fallbackJid, keys, getLIDForPN, onNewJidStored }) => {
-    const tokensNode = getBinaryNodeChild(result, 'tokens');
-    if (!tokensNode) return;
+    const tokensNode = getBinaryNodeChild(result, 'tokens')
+    if (!tokensNode) return
     for (const tokenNode of getBinaryNodeChildren(tokensNode, 'token')) {
-        if (tokenNode.attrs.type !== 'trusted_contact' || !(tokenNode.content instanceof Uint8Array)) continue;
-        const rawJid = jidNormalizedUser(fallbackJid || tokenNode.attrs.jid);
-        if (!isRegularUser(rawJid)) continue;
-        const storageJid = await resolveTcTokenJid(rawJid, getLIDForPN);
-        const existingEntry = (await keys.get('tctoken', [storageJid]))[storageJid];
-        const existingTs = existingEntry?.timestamp ? Number(existingEntry.timestamp) : 0;
-        const incomingTs = tokenNode.attrs.t ? Number(tokenNode.attrs.t) : 0;
-        if (!incomingTs || (existingTs > 0 && existingTs > incomingTs)) continue;
-        await keys.set({ tctoken: { [storageJid]: { ...existingEntry, token: Buffer.from(tokenNode.content), timestamp: tokenNode.attrs.t } } });
-        onNewJidStored?.(storageJid);
+        if (tokenNode.attrs.type !== 'trusted_contact') continue
+        if (!(tokenNode.content instanceof Uint8Array) || !tokenNode.content.length) continue
+        const tokenBytes = tokenNode.content
+        if (tokenBytes.length > TC_TOKEN_MAX_BYTES) continue
+        const rawJid = jidNormalizedUser(fallbackJid || tokenNode.attrs.jid)
+        if (!isRegularUser(rawJid)) continue
+        const storageJid = await resolveTcTokenJid(rawJid, getLIDForPN)
+        const existingEntry = (await keys.get('tctoken', [storageJid]))[storageJid]
+        const existingTs = existingEntry?.timestamp ? Number(existingEntry.timestamp) : 0
+        const incomingTs = tokenNode.attrs.t ? Number(tokenNode.attrs.t) : 0
+        if (!incomingTs || (existingTs > 0 && existingTs > incomingTs)) continue
+        await keys.set({ tctoken: { [storageJid]: { ...existingEntry, token: Buffer.from(tokenBytes), timestamp: tokenNode.attrs.t } } })
+        onNewJidStored?.(storageJid)
     }
-};
+}
+
+// ─── Content binding ──────────────────────────────────────────────────────────
+
+// URL-type messages only — confirmed from AbstractC2052DmX.A00()
+// wire format: <content_binding>bytes</content_binding> (flat, no wrapper)
+export const buildContentBindingNode = ({ userJid, contentBindingMap, messageType }) => {
+    if (messageType !== 'url' || !contentBindingMap?.has(userJid)) return null
+    const bytes = contentBindingMap.get(userJid)
+    if (!bytes?.length) return null
+    return { tag: 'content_binding', attrs: {}, content: bytes }
+}

package/lib/index.js

@@ -1,58 +1,57 @@
-import gradient from 'gradient-string';
+import gradient from 'gradient-string'
 import makeWASocket from './Socket/index.js'
 
-const banner = `
-╔══════════════════════════════════════════════════════════════════╗
-║                                                                  ║
-║   ███╗   ██╗███████╗██╗  ██╗██╗   ██╗███████╗                    ║
-║   ████╗  ██║██╔════╝╚██╗██╔╝██║   ██║██╔════╝                    ║
-║   ██╔██╗ ██║█████╗   ╚███╔╝ ██║   ██║███████╗                    ║
-║   ██║╚██╗██║██╔══╝   ██╔██╗ ██║   ██║╚════██║                    ║
-║   ██║ ╚████║███████╗██╔╝ ██╗╚██████╔╝███████║                    ║
-║   ╚═╝  ╚═══╝╚══════╝╚═╝  ╚═╝ ╚═════╝ ╚══════╝                    ║
-║                                                                  ║
-║        ████████╗███████╗ ██████╗██╗  ██╗                         ║
-║        ╚══██╔══╝██╔════╝██╔════╝██║  ██║                         ║
-║           ██║   █████╗  ██║     ███████║                         ║
-║           ██║   ██╔══╝  ██║     ██╔══██║                         ║
-║           ██║   ███████╗╚██████╗██║  ██║                         ║
-║           ╚═╝   ╚══════╝ ╚═════╝╚═╝  ╚═╝                         ║
-║                                                                  ║
-║              ██████╗ ██████╗  ██████╗                            ║
-║              ██╔══██╗██╔══██╗██╔═══██╗                           ║
-║              ██████╔╝██████╔╝██║   ██║                           ║
-║              ██╔═══╝ ██╔══██╗██║   ██║                           ║
-║              ██║     ██║  ██║╚██████╔╝                           ║
-║              ╚═╝     ╚═╝  ╚═╝ ╚═════╝                            ║
-║                                                                  ║
-╚══════════════════════════════════════════════════════════════════╝
-`;
+const banner = [
+    '╭───────────────────────────────────────────────────────────────────────────────────────────╮',
+    '│                                                                                           │',
+    '│  [][][][][] [][][][][] [][][][]   []      []   [][][]   []      [] [][][][][] []      []  │',
+    '│        []   []         []      [] []      [] []      [] [][]    [] []           []  []    │',
+    '│      []     []         []      [] []      [] []      [] []  []  [] []           []  []    │',
+    '│    []       [][][][]   [][][][]     []  []   []      [] []  []  [] [][][][]       []      │',
+    '│  []         []         []  []       []  []   []      [] []    [][] []           []  []    │',
+    '│  []         []         []    []       []     []      [] []      [] []           []  []    │',
+    '│  [][][][][] [][][][][] []      []     []       [][][]   []      [] [][][][][] []      []  │',
+    '│                                                                                           │',
+    '├───────────────────────────────────────────────────────────────────────────────────────────┤',
+    '│                                                                                           │',
+    '│       [][][][]     [][][]   [][][][][] []         [][][][][] []      []   [][][][]        │',
+    '│       []      [] []      []     []     []         []         []      [] []                │',
+    '│       []      [] []      []     []     []         []           []  []   []                │',
+    '│       [][][][]   [][][][][]     []     []         [][][][]       []       [][][]          │',
+    '│       []      [] []      []     []     []         []             []             []        │',
+    '│       []      [] []      []     []     []         []             []             []        │',
+    '│       [][][][]   []      [] [][][][][] [][][][][] [][][][][]     []     [][][][]          │',
+    '│                                                                                           │',
+    '╰───────────────────────────────────────────────────────────────────────────────────────────╯',
+].join('\n')
 
-const info = `
-┌───────────────────────────────────────────────────────────────────────┐
-│  📦 Package: @zervonex/baileys                                    │
-│  🔖 Version: 3.0.1                                                    │
-│  ⚡ Status:  Production Ready                                         │
-├───────────────────────────────────────────────────────────────────────┤
-│  🚀 Advanced WhatsApp Web API Client                                  │
-│  ✨ Interactive Buttons • Products • Events • Media                   │
-│  🔐 End-to-End Encryption • Multi-Device Support                      │
-│  📱 Business API • Channels • Status Updates                          │
-├───────────────────────────────────────────────────────────────────────┤
-│  💡 Built by NexusTech Pro Team                                       │
-│  📚 Docs: github.com/nexustechpro2/baileys                            │
-│  💬 Support: Join our community for updates & assistance              │
-└───────────────────────────────────────────────────────────────────────┘
-`;
+const info = [
+    '╭──────────────────────────────────────────────────────────────╮',
+    '│                                                              │',
+    '│  ◆  Package  ›  @zervonex/baileys                            │',
+    '│  ◆  Version  ›  3.0.2                                        │',
+    '│  ◆  Status   ›  Production Ready                             │',
+    '│                                                              │',
+    '├──────────────────────────── ◇◆◇ ─────────────────────────────┤',
+    '│                                                              │',
+    '│  ✦  WhatsApp Web API Client                                  │',
+    '│  ✦  Interactive Buttons  ·  Products  ·  Events  ·  Media    │',
+    '│  ✦  End-to-End Encryption  ·  Multi-Device Support           │',
+    '│  ✦  Business API  ·  Channels  ·  Status Updates             │',
+    '│                                                              │',
+    '├──────────────────────────── ◇◆◇ ─────────────────────────────┤',
+    '│                                                              │',
+    '│  ◈  Built by   ›  zervonex Team                              │',
+    '│  ◈  Formerly   ›  @nexustechpro/baileys                      │',
+    '│  ◈  Docs       ›  github.com/nexustechpro2/baileys           │',
+    '│  ◈  Support    ›  Join our community for updates             │',
+    '│                                                              │',
+    '╰──────────────────────────────────────────────────────────────╯',
+].join('\n')
 
-// Print banner with gradient
-console.log(gradient(['#00D4FF', '#0099FF', '#00D4FF'])(banner));
-
-// Print info with gradient
-console.log(gradient(['#FFD700', '#FF6B6B', '#4ECDC4'])(info));
-
-// Startup message
-console.log(gradient(['#00FF88', '#FFFFFF'])('\n🎯 Initializing Baileys Socket Connection...\n'));
+console.log(gradient(['#00FFFF', '#00BFFF', '#7B2FBE', '#FF6EC7', '#00FFFF'])(banner))
+console.log(gradient(['#FFD700', '#FFA500', '#FF6EC7', '#FFD700'])(info))
+console.log(gradient(['#00FF88', '#FFFFFF'])('\n🎯 Initializing Baileys Socket Connection...\n'))
 
 export * from '../WAProto/index.js'
 export * from './Utils/index.js'
@@ -65,4 +64,4 @@ export * from './WAUSync/index.js'
 export * from './Socket/index.js'
 export * from './Builders/index.js'
 export { makeWASocket }
-export default makeWASocket
+export default makeWASocket

package/package.json

@@ -2,15 +2,19 @@
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@zervonex/baileys",
   "type": "module",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Advanced WhatsApp Web API built on Baileys — interactive messages, buttons, carousels, products, events, payments, polls, albums, sticker packs and more.",
   "keywords": [
     "baileys",
     "baileys-mod",
     "baileys-fork",
     "nexus",
-    "nexusbot",
+    "zervonex",
     "nexustech",
+    "nexustechpro",
+    "zervo",
+    "zervonex baileys",
+    "Zervonex",
     "zervonex",
     "baileys-advanced",
     "whiskeysockets",
@@ -152,7 +156,7 @@
     "eslint": "^9",
     "eslint-config-prettier": "^10.1.2",
     "eslint-plugin-prettier": "^5.4.0",
-    "jest": "^30.0.5",
+    "jest": "^25.0.0",
     "jimp": "^1.6.0",
     "jiti": "^2.4.2",
     "json": "^11.0.0",
@@ -161,10 +165,10 @@
     "pino-pretty": "^13.1.1",
     "prettier": "^3.5.3",
     "protobufjs-cli": "^1.1.3",
-    "release-it": "^15.10.3",
-    "ts-jest": "^29.4.0",
+    "release-it": "^21.1.1",
+    "ts-jest": "^27.0.3",
     "ts-node": "^10.9.2",
-    "tsc-esm-fix": "^3.1.2",
+    "tsc-esm-fix": "^2.20.27",
     "tsup": "^8.5.1",
     "tsx": "^4.20.3",
     "typedoc": "^0.27.9",

package/lib/Utils/key-store.js

@@ -1,3 +0,0 @@
-// ─── Key Store Helpers ─────────────────────────────────────────────────────────
-// Single source of truth for blob key names — change here, changes everywhere
-export const TC_TOKEN_INDEX_KEY = '__index'