@blurose/baileys 1.1.13 → 1.1.15

package/README.md

@@ -116,19 +116,27 @@ const sock = makeWASocket({
 
 If the connection is successful, you will see a QR code printed on your terminal screen. Scan it with WhatsApp on your phone to log in.
 
-### Starting socket with **Pairing Code**
+### Starting socket with **Custom Pairing Code**
+
+If you prefer letting users input their phone number via the terminal rather than scanning a QR code, you can build a custom pairing logic:
 
 ```ts
 import makeWASocket from '@blurose/baileys'
+import readline from 'readline'
+
+const question = (text) => {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout })
+    return new Promise((resolve) => rl.question(text, resolve))
+}
 
 const sock = makeWASocket({
     printQRInTerminal: false
 })
 
 if (!sock.authState.creds.registered) {
-    const number = '628XXXXXXXXX' // Country code + phone number without + or spacing
-    const code = await sock.requestPairingCode(number)
-    console.log(code)
+    const number = await question('Masukkan nomor WhatsApp (contoh: 628xxx):\n')
+    const code = await sock.requestPairingCode(number.trim())
+    console.log(`Kode Pairing Kamu: ${code}`)
 }
 ```
 
@@ -189,6 +197,15 @@ sock.ev.on('messages.upsert', ({ messages }) => {
 })
 ```
 
+### Auto-Heal Pre-Key
+```ts
+sock.ev.on('messages.upsert', async ({ messages }) => {
+    for (const msg of messages) {
+        if (msg.messageStubType === 2) sock.ws.close()
+    }
+})
+```
+
 ---
 
 ## Implementing a Data Store
@@ -252,14 +269,24 @@ await sock.sendMessage(
 )
 ```
 
-### Media Messages & Newsletter Sending
-To send media to WhatsApp Channels (Newsletters) using this fork, use the standard `sendMessage` function. The library will automatically bypass E2E encryption and route media to the correct CDN endpoints:
+### Upload Media to Channel
+
+#### Without Waveform
+```ts
+await sock.sendMessage(channelJid, {
+    audio: fs.readFileSync('media.ogg'),
+    mimetype: 'audio/ogg; codecs=opus',
+    ptt: false
+})
+```
 
+#### With Waveform
 ```ts
 await sock.sendMessage(channelJid, {
-    audio: fs.readFileSync('media/audio.ogg'),
+    audio: fs.readFileSync('media.ogg'),
     mimetype: 'audio/ogg; codecs=opus',
-    ptt: false // Set to false for channel media compatibility
+    ptt: true,
+    waveform: new Uint8Array(64)
 })
 ```
 

package/lib/Socket/communities.js

@@ -1,6 +1,6 @@
 import { proto } from '../../WAProto/index.js';
 import { WAMessageStubType } from '../Types/index.js';
-import { generateMessageID, generateMessageIDV2, unixTimestampSeconds } from '../Utils/index.js';
+import { generateMessageID, unixTimestampSeconds } from '../Utils/index.js';
 import logger from '../Utils/logger.js';
 import { getBinaryNodeChild, getBinaryNodeChildren, getBinaryNodeChildString, jidEncode, jidNormalizedUser } from '../WABinary/index.js';
 import { makeBusinessSocket } from './business.js';
@@ -122,7 +122,7 @@ export const makeCommunitiesSocket = (config) => {
             return await parseGroupResult(result);
         },
         communityCreateGroup: async (subject, participants, parentCommunityJid) => {
-            const key = generateMessageIDV2();
+            const key = generateMessageID();
             const result = await communityQuery('@g.us', 'set', [
                 {
                     tag: 'create',
@@ -350,7 +350,7 @@ export const makeCommunitiesSocket = (config) => {
             await upsertMessage({
                 key: {
                     remoteJid: inviteMessage.groupJid,
-                    id: generateMessageIDV2(sock.user?.id),
+                    id: generateMessageID(sock.user?.id),
                     fromMe: false,
                     participant: key.remoteJid // TODO: investigate if this makes any sense at all
                 },

package/lib/Socket/groups.js

@@ -1,7 +1,7 @@
 import { Boom } from '@hapi/boom';
 import { proto } from '../../WAProto/index.js';
 import { WAMessageAddressingMode, WAMessageStubType } from '../Types/index.js';
-import { generateMessageIDV2, unixTimestampSeconds } from '../Utils/index.js';
+import { generateMessageID, unixTimestampSeconds } from '../Utils/index.js';
 import { getBinaryNodeChild, getBinaryNodeChildren, getBinaryNodeChildString, isLidUser, isPnUser, jidEncode, jidNormalizedUser } from '../WABinary/index.js';
 import { makeChatsSocket } from './chats.js';
 export const makeGroupsSocket = (config) => {
@@ -68,7 +68,7 @@ export const makeGroupsSocket = (config) => {
         ...sock,
         groupMetadata,
         groupCreate: async (subject, participants) => {
-            const key = generateMessageIDV2();
+            const key = generateMessageID();
             const result = await groupQuery('@g.us', 'set', [
                 {
                     tag: 'create',
@@ -161,7 +161,7 @@ export const makeGroupsSocket = (config) => {
                 {
                     tag: 'description',
                     attrs: {
-                        ...(description ? { id: generateMessageIDV2() } : { delete: 'true' }),
+                        ...(description ? { id: generateMessageID() } : { delete: 'true' }),
                         ...(prev ? { prev } : {})
                     },
                     content: description ? [{ tag: 'body', attrs: {}, content: Buffer.from(description, 'utf-8') }] : undefined
@@ -234,7 +234,7 @@ export const makeGroupsSocket = (config) => {
             await upsertMessage({
                 key: {
                     remoteJid: inviteMessage.groupJid,
-                    id: generateMessageIDV2(sock.user?.id),
+                    id: generateMessageID(sock.user?.id),
                     fromMe: false,
                     participant: key.remoteJid
                 },

package/lib/Socket/messages-send.js

@@ -2,7 +2,7 @@ import NodeCache from '@cacheable/node-cache';
 import { Boom } from '@hapi/boom';
 import { proto } from '../../WAProto/index.js';
 import { DEFAULT_CACHE_TTLS, WA_DEFAULT_EPHEMERAL } from '../Defaults/index.js';
-import { aggregateMessageKeysNotFromMe, assertMediaContent, assertMeId, bindWaitForEvent, decryptMediaRetryData, DEF_MEDIA_HOST, encodeNewsletterMessage, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageIDV2, generateParticipantHashV2, generateWAMessage, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, unixTimestampSeconds } from '../Utils/index.js';
+import { aggregateMessageKeysNotFromMe, assertMediaContent, assertMeId, bindWaitForEvent, decryptMediaRetryData, DEF_MEDIA_HOST, encodeNewsletterMessage, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageID, generateParticipantHashV2, generateWAMessage, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, unixTimestampSeconds } from '../Utils/index.js';
 import { getUrlInfo } from '../Utils/link-preview.js';
 import { makeKeyedMutex, makeMutex } from '../Utils/make-mutex.js';
 import { getMessageReportingToken, shouldIncludeReportingToken } from '../Utils/reporting-utils.js';
@@ -438,7 +438,7 @@ export const makeMessagesSocket = (config) => {
         const isNewsletter = server === 'newsletter';
         const isGroupOrStatus = isGroup || isStatus;
         const finalJid = jid;
-        msgId = msgId || generateMessageIDV2(meId);
+        msgId = msgId || generateMessageID(meId);
         useUserDevicesCache = useUserDevicesCache !== false;
         useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus;
         const participants = [];
@@ -1083,7 +1083,7 @@ export const makeMessagesSocket = (config) => {
                     upload: waUploadToServer,
                     mediaCache: config.mediaCache,
                     options: config.options,
-                    messageId: generateMessageIDV2(sock.user?.id),
+                    messageId: generateMessageID(sock.user?.id),
                     ...options
                 });
                 const isEventMsg = 'event' in content && !!content.event;

package/lib/Utils/business.js

@@ -4,7 +4,7 @@ import { createWriteStream, promises as fs } from 'fs';
 import { tmpdir } from 'os';
 import { join } from 'path';
 import { getBinaryNodeChild, getBinaryNodeChildren, getBinaryNodeChildString } from '../WABinary/index.js';
-import { generateMessageIDV2 } from './generics.js';
+import { generateMessageID } from './generics.js';
 import { getStream, getUrlFromDirectPath } from './messages-media.js';
 export const parseCatalogNode = (node) => {
     const catalogNode = getBinaryNodeChild(node, 'product_catalog');
@@ -197,7 +197,7 @@ export const uploadingNecessaryImages = async (images, waUploadToServer, timeout
         }
         const { stream } = await getStream(img);
         const hasher = createHash('sha256');
-        const filePath = join(tmpdir(), 'img' + generateMessageIDV2());
+        const filePath = join(tmpdir(), 'img' + generateMessageID());
         const encFileWriteStream = createWriteStream(filePath);
         for await (const block of stream) {
             hasher.update(block);

package/lib/Utils/generics.d.ts

@@ -30,8 +30,7 @@ export declare const delayCancellable: (ms: number) => {
     cancel: () => void;
 };
 export declare function promiseTimeout<T>(ms: number | undefined, promise: (resolve: (v: T) => void, reject: (error: any) => void) => void): Promise<T>;
-export declare const generateMessageIDV2: (userId?: string) => string;
-export declare const generateMessageID: () => string;
+export declare const generateMessageID: (userId?: string) => string;
 export declare function bindWaitForEvent<T extends keyof BaileysEventMap>(ev: BaileysEventEmitter, event: T): (check: (u: BaileysEventMap[T]) => Promise<boolean | undefined>, timeoutMs?: number) => Promise<void>;
 export declare const bindWaitForConnectionUpdate: (ev: BaileysEventEmitter) => (check: (u: Partial<ConnectionState>) => Promise<boolean | undefined>, timeoutMs?: number) => Promise<void>;
 /**

package/lib/Utils/generics.js

@@ -131,23 +131,22 @@ export async function promiseTimeout(ms, promise) {
 }
 // inspired from whatsmeow code
 // https://github.com/tulir/whatsmeow/blob/64bc969fbe78d31ae0dd443b8d4c80a5d026d07a/send.go#L42
-export const generateMessageIDV2 = (userId) => {
-    const data = Buffer.alloc(8 + 20 + 16);
-    data.writeBigUInt64BE(BigInt(Math.floor(Date.now() / 1000)));
+export const generateMessageID = (userId) => {
     if (userId) {
+        const data = Buffer.alloc(8 + 20 + 16);
+        data.writeBigUInt64BE(BigInt(Math.floor(Date.now() / 1000)));
         const id = jidDecode(userId);
         if (id?.user) {
             data.write(id.user, 8);
             data.write('@c.us', 8 + id.user.length);
         }
+        const random = randomBytes(16);
+        random.copy(data, 28);
+        const hash = createHash('sha256').update(data).digest();
+        return '3EB0' + hash.toString('hex').toUpperCase().substring(0, 18);
     }
-    const random = randomBytes(16);
-    random.copy(data, 28);
-    const hash = createHash('sha256').update(data).digest();
-    return '3EB0' + hash.toString('hex').toUpperCase().substring(0, 18);
+    return '3EB0' + randomBytes(18).toString('hex').toUpperCase();
 };
-// generate a random ID to attach to a message
-export const generateMessageID = () => '3EB0' + randomBytes(18).toString('hex').toUpperCase();
 export function bindWaitForEvent(ev, event) {
     return async (check, timeoutMs) => {
         let listener;

package/lib/Utils/messages-media.js

@@ -11,7 +11,7 @@ import { proto } from '../../WAProto/index.js';
 import { DEFAULT_ORIGIN, MEDIA_HKDF_KEY_MAPPING, MEDIA_PATH_MAP } from '../Defaults/index.js';
 import { getBinaryNodeChild, getBinaryNodeChildBuffer, jidNormalizedUser } from '../WABinary/index.js';
 import { aesDecryptGCM, aesEncryptGCM, hkdf } from './crypto.js';
-import { generateMessageIDV2 } from './generics.js';
+import { generateMessageID } from './generics.js';
 const getTmpFilesDirectory = () => tmpdir();
 const getImageProcessingLibrary = async () => {
     //@ts-ignore
@@ -32,7 +32,7 @@ export const getRawMediaUploadData = async (media, mediaType, logger) => {
     const { stream } = await getStream(media);
     logger?.debug('got stream for raw upload');
     const hasher = Crypto.createHash('sha256');
-    const filePath = join(tmpdir(), mediaType + generateMessageIDV2());
+    const filePath = join(tmpdir(), mediaType + generateMessageID());
     const fileWriteStream = createWriteStream(filePath);
     let fileLength = 0;
     try {
@@ -287,7 +287,7 @@ export async function generateThumbnail(file, mediaType, options) {
         }
     }
     else if (mediaType === 'video') {
-        const imgFilename = join(getTmpFilesDirectory(), generateMessageIDV2() + '.jpg');
+        const imgFilename = join(getTmpFilesDirectory(), generateMessageID() + '.jpg');
         try {
             await extractVideoThumb(file, imgFilename, '00:00:00', { width: 32, height: 32 });
             const buff = await fs.readFile(imgFilename);
@@ -320,12 +320,12 @@ export const encryptedStream = async (media, mediaType, { logger, saveOriginalFi
     logger?.debug('fetched media stream');
     const mediaKey = Crypto.randomBytes(32);
     const { cipherKey, iv, macKey } = await getMediaKeys(mediaKey, mediaType);
-    const encFilePath = join(getTmpFilesDirectory(), mediaType + generateMessageIDV2() + '-enc');
+    const encFilePath = join(getTmpFilesDirectory(), mediaType + generateMessageID() + '-enc');
     const encFileWriteStream = createWriteStream(encFilePath);
     let originalFileStream;
     let originalFilePath;
     if (saveOriginalFileIfRequired) {
-        originalFilePath = join(getTmpFilesDirectory(), mediaType + generateMessageIDV2() + '-original');
+        originalFilePath = join(getTmpFilesDirectory(), mediaType + generateMessageID() + '-original');
         originalFileStream = createWriteStream(originalFilePath);
     }
     let fileLength = 0;

package/lib/Utils/messages.js

@@ -7,7 +7,7 @@ import { CALL_AUDIO_PREFIX, CALL_VIDEO_PREFIX, MEDIA_KEYS, URL_REGEX, WA_DEFAULT
 import { WAMessageStatus, WAProto } from '../Types/index.js';
 import { isJidGroup, isJidNewsletter, isJidStatusBroadcast, jidNormalizedUser } from '../WABinary/index.js';
 import { sha256 } from './crypto.js';
-import { generateMessageIDV2, getKeyAuthor, unixTimestampSeconds } from './generics.js';
+import { generateMessageID, getKeyAuthor, unixTimestampSeconds } from './generics.js';
 import { downloadContentFromMessage, encryptedStream, generateThumbnail, getAudioDuration, getAudioWaveform, getRawMediaUploadData } from './messages-media.js';
 import { shouldIncludeReportingToken } from './reporting-utils.js';
 const MIMETYPE_MAP = {
@@ -692,7 +692,7 @@ export const generateWAMessageFromContent = (jid, message, options) => {
         key: {
             remoteJid: jid,
             fromMe: true,
-            id: options?.messageId || generateMessageIDV2()
+            id: options?.messageId || generateMessageID()
         },
         message: message,
         messageTimestamp: timestamp,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blurose/baileys",
   "type": "module",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "description": "A WebSockets library for interacting with WhatsApp Web",
   "keywords": [
     "whatsapp",