@pontalabs/baileys 1.0.3 → 1.0.5

package/lib/Signal/libsignal.js

@@ -116,20 +116,29 @@ function makeLibSignalRepository(auth, onWhatsAppFunc, logger) {
                     }
                 }
             }
-            return auth.keys.transaction(async () => {
-                let result;
-                switch (type) {
-                    case 'pkmsg':
-                        result = await session.decryptPreKeyWhisperMessage(ciphertext);
-                        break;
-                    case 'msg':
-                        result = await session.decryptWhisperMessage(ciphertext);
-                        break;
-                    default:
-                        throw new Error(`Unknown message type: ${type}`);
+            try {
+                return await auth.keys.transaction(async () => {
+                    let result;
+                    switch (type) {
+                        case 'pkmsg':
+                            result = await session.decryptPreKeyWhisperMessage(ciphertext);
+                            break;
+                        case 'msg':
+                            result = await session.decryptWhisperMessage(ciphertext);
+                            break;
+                        default:
+                            throw new Error(`Unknown message type: ${type}`);
+                    }
+                    return result;
+                }, jid);
+            } catch (error) {
+                const errText = String(error?.message || error || '')
+                if (/bad mac|no session|invalid message|duplicate message|cannot decrypt/i.test(errText)) {
+                    await storage.removeSession(addr.toString()).catch(() => null)
+                    logger?.warn?.({ jid, type, errText }, 'reset stale session after decrypt failure')
                 }
-                return result;
-            }, jid);
+                throw error
+            }
         },
         async encryptMessage({ jid, data }) {
             const addr = jidToSignalProtocolAddress(jid);
@@ -203,6 +212,9 @@ function signalStorage({ creds, keys }) {
         storeSession: async (id, session) => {
             await keys.set({ session: { [id]: session.serialize() } });
         },
+        removeSession: async (id) => {
+            await keys.set({ session: { [id]: null } });
+        },
         isTrustedIdentity: () => {
             return true;
         },

package/lib/Socket/socket.js

@@ -197,6 +197,12 @@ const makeSocket = (config) => {
     let lastDateRecv
     let epoch = 1
     let keepAliveReq
+    // FIX: sebelumnya uploadPreKeysToServerIfRequired() cuma dipanggil SEKALI pas
+    // 'CB:success' (baru connect/reconnect). Kalau proses bot jalan lama (berhari-hari)
+    // tanpa reconnect, prekey yang kepakai server gak pernah dicek ulang sampai jumlahnya
+    // abis - baru ketahuan pas sudah kejadian error decrypt di penerima. Interval ini
+    // bikin prekey selalu "terupdate", dicek ulang berkala tanpa perlu nunggu reconnect.
+    let preKeyCheckInterval
     let qrTimer
     let closed = false
 
@@ -516,6 +522,7 @@ const makeSocket = (config) => {
             trace: error?.stack
         }, error ? 'connection errored' : 'connection closed')
         clearInterval(keepAliveReq)
+        clearInterval(preKeyCheckInterval)
         clearTimeout(qrTimer)
         ws.removeAllListeners('close')
         ws.removeAllListeners('open')
@@ -822,6 +829,16 @@ const makeSocket = (config) => {
     ws.on('CB:success', async (node) => {
         try {
             await uploadPreKeysToServerIfRequired()
+            // Jalankan ulang pengecekan prekey tiap 6 jam selama koneksi hidup, bukan
+            // cuma sekali pas connect. uploadPreKeysToServerIfRequired() sendiri sudah
+            // pintar (cuma benar-benar upload kalau count di server rendah/ada yang
+            // hilang), jadi interval ini murah dan aman dijalankan berkala.
+            clearInterval(preKeyCheckInterval)
+            preKeyCheckInterval = setInterval(() => {
+                uploadPreKeysToServerIfRequired().catch((err) => {
+                    logger.warn({ err }, 'periodic pre-key check failed')
+                })
+            }, 6 * 60 * 60 * 1000)
             await sendPassiveIq('active')
         } catch (err) {
             logger.warn({

package/lib/Utils/auth-utils.js

@@ -14,6 +14,16 @@ const crypto_2 = require("./crypto")
 const generics_1 = require("./generics")
 const mutex_1 = require("async-mutex") 
 
+
+// Cache bypass for signal-sensitive keys so runtime state doesn't keep stale
+// session/pre-key material alive after decrypt failures or identity rotation.
+const NO_CACHE_TYPES = new Set([
+    'pre-key',
+    'session',
+    'signed-pre-key',
+    'identity-key'
+])
+
 /**
  * Adds caching capability to a SignalKeyStore
  * @param store the store to add caching to
@@ -35,6 +45,11 @@ function makeCacheableSignalKeyStore(store, logger, _cache) {
     }
     return {
         async get(type, ids) {
+            if (NO_CACHE_TYPES.has(type)) {
+                logger?.trace({ type, items: ids.length }, 'bypassing cache for sensitive key type')
+                return await store.get(type, ids)
+            }
+
             return cacheMutex.runExclusive(async () => {
                 const data = {}
                 const idsToFetch = []
@@ -65,6 +80,9 @@ function makeCacheableSignalKeyStore(store, logger, _cache) {
             return cacheMutex.runExclusive(async () => {
                 let keys = 0
                 for (const type in data) {
+                    if (NO_CACHE_TYPES.has(type)) {
+                        continue
+                    }
                     for (const id in data[type]) {
                         await cache.set(getUniqueId(type, id), data[type][id])
                         keys += 1

package/lib/Utils/decode-wa-message.js

@@ -222,7 +222,24 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
         async decrypt() {
             let decryptables = 0
             if (Array.isArray(stanza.content)) {
-                for (const { tag, attrs, content } of stanza.content) {
+                // FIX: proses node non-skmsg (msg/pkmsg/plaintext) LEBIH DULU sebelum node
+                // skmsg. Root cause "bot diam/nunggu" pas ada member baru join grup lalu
+                // langsung kirim pesan: satu stanza berisi 2 node <enc> - satu tipe
+                // pkmsg/msg (isinya SenderKeyDistributionMessage buat kamu) dan satu lagi
+                // tipe skmsg (isi pesan asli, dienkripsi pakai sender-key grup). Urutan
+                // array stanza.content dari server TIDAK dijamin naruh pkmsg/msg duluan.
+                // Kalau skmsg kebetulan diproses duluan, sender-key belum ada di store ->
+                // decryptGroupMessage() gagal "No SenderKeyRecord found" -> pesan pertama
+                // dari member baru selalu gagal decrypt & jadi stub CIPHERTEXT, padahal
+                // SKDM-nya baru "sampai" sepersekian detik kemudian di iterasi berikutnya.
+                // Reorder di sini (stable, gak ubah urutan relatif node lain seperti
+                // verified_name/unavailable) supaya skmsg selalu diproses PALING TERAKHIR,
+                // setelah semua kemungkinan SKDM sudah didaftarkan ke sender-key store.
+                const orderedContent = [
+                    ...stanza.content.filter(({ tag, attrs }) => !(tag === 'enc' && attrs.type === 'skmsg')),
+                    ...stanza.content.filter(({ tag, attrs }) => tag === 'enc' && attrs.type === 'skmsg')
+                ]
+                for (const { tag, attrs, content } of orderedContent) {
                     if (tag === 'verified_name' && content instanceof Uint8Array) {
                         const cert = WAProto_1.proto.VerifiedNameCertificate.decode(content)
                         const details = WAProto_1.proto.VerifiedNameCertificate.Details.decode(cert.details)

package/lib/Utils/index.d.ts

@@ -17,4 +17,5 @@ export * from './use-single-file-auth-state'
 export * from './use-multi-file-auth-state'
 export * from './link-preview'
 export * from './event-buffer'
-export * from './process-message'
+export * from './process-message'
+export * from './signal-housekeeping'

package/lib/Utils/index.js

@@ -37,4 +37,5 @@ __exportStar(require("./use-single-file-auth-state"), exports)
 __exportStar(require("./use-multi-file-auth-state"), exports)
 __exportStar(require("./link-preview"), exports)
 __exportStar(require("./event-buffer"), exports)
-__exportStar(require("./process-message"), exports)
+__exportStar(require("./process-message"), exports)
+__exportStar(require("./signal-housekeeping"), exports)

package/lib/Utils/signal-housekeeping.d.ts

@@ -0,0 +1,19 @@
+import type { Logger } from 'pino'
+
+export interface CleanupSignalAuthFolderOptions {
+	/** File yang mtime-nya lebih tua dari ini (dalam hari) akan dihapus. Default 30. */
+	maxAgeDays?: number
+	/** Prefix nama file yang boleh dibersihkan. Default ['session-', 'sender-key-']. */
+	prefixes?: string[]
+	logger?: Logger
+}
+
+export interface CleanupSignalAuthFolderResult {
+	removed: string[]
+	scanned: number
+}
+
+export function cleanupSignalAuthFolder(
+	folder: string,
+	options?: CleanupSignalAuthFolderOptions
+): Promise<CleanupSignalAuthFolderResult>

package/lib/Utils/signal-housekeeping.js

@@ -0,0 +1,73 @@
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })
+exports.cleanupSignalAuthFolder = cleanupSignalAuthFolder
+
+const fs = require("fs/promises")
+const path = require("path")
+
+/**
+ * Bersihkan file session/sender-key yang sudah usang di folder auth yang dipakai
+ * bareng useMultiFileAuthState(). Tujuannya supaya store signal tidak numpuk terus
+ * selama bot jalan berbulan-bulan dengan ribuan kontak/grup yang sudah gak aktif.
+ *
+ * Aman dipakai karena: mtime sebuah file session-*.json / sender-key-*.json selalu
+ * ke-update setiap kali ada pertukaran pesan dengan kontak/grup itu (storeSession /
+ * storeSenderKey menulis ulang filenya). Jadi kalau sebuah file gak pernah disentuh
+ * lagi lebih dari `maxAgeDays`, itu tandanya kontak/grup itu memang sudah gak aktif -
+ * hapus filenya aman, nanti kalau ada pesan baru sesi/sender-key otomatis dibuat ulang
+ * dari prekey bundle / SenderKeyDistributionMessage yang baru.
+ *
+ * creds.json, app-state-sync-key-*.json, dan pre-key-*.json SENGAJA tidak disentuh
+ * di sini secara default - itu bukan sumber "numpuk", dan prekey yang sudah dipakai
+ * memang sudah dihapus otomatis lewat removePreKey() di libsignal.js.
+ *
+ * @param {string} folder - folder yang sama dipakai di useMultiFileAuthState()
+ * @param {object} [options]
+ * @param {number} [options.maxAgeDays=30] - file yang mtime-nya lebih tua dari ini akan dihapus
+ * @param {string[]} [options.prefixes] - prefix nama file yang boleh dibersihkan
+ * @param {import('pino').Logger} [options.logger]
+ * @returns {Promise<{ removed: string[], scanned: number }>}
+ */
+async function cleanupSignalAuthFolder(folder, options = {}) {
+	const {
+		maxAgeDays = 30,
+		prefixes = ['session-', 'sender-key-'],
+		logger
+	} = options
+
+	const removed = []
+	let scanned = 0
+	const maxAgeMs = maxAgeDays * 24 * 60 * 60 * 1000
+	const now = Date.now()
+
+	let entries
+	try {
+		entries = await fs.readdir(folder)
+	} catch (err) {
+		logger?.warn?.({ err, folder }, '[cleanupSignalAuthFolder] gagal baca folder auth')
+		return { removed, scanned }
+	}
+
+	for (const name of entries) {
+		if (!prefixes.some((p) => name.startsWith(p))) {
+			continue
+		}
+		scanned++
+		const filePath = path.join(folder, name)
+		try {
+			const stat = await fs.stat(filePath)
+			if (now - stat.mtimeMs > maxAgeMs) {
+				await fs.unlink(filePath)
+				removed.push(name)
+			}
+		} catch {
+			// File mungkin sudah kehapus proses lain (race antar-worker), aman diabaikan.
+		}
+	}
+
+	logger?.info?.({ scanned, removedCount: removed.length, maxAgeDays }, '[cleanupSignalAuthFolder] selesai')
+	return { removed, scanned }
+}
+
+module.exports = { cleanupSignalAuthFolder }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pontalabs/baileys",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "PontaLabs Baileys is a lightweight, modern, and customizable WhatsApp Web API library built on Baileys.",
   "keywords": [
     "facebook",